diff --git a/parts/data.lua b/parts/data.lua index 119110ee..83bc32e6 100644 --- a/parts/data.lua +++ b/parts/data.lua @@ -47,17 +47,17 @@ function DATA.pasteSequence(str) end else if b>=97 and b<=125 then - ins(BAG,reg)if #BAG>2600 then return end + ins(BAG,reg) reg=b-96 elseif b>=34 and b<=96 then for _=1,b-32 do - ins(BAG,reg)if #BAG>2600 then return end + ins(BAG,reg) end reg=false end end end - if reg then ins(BAG,reg)if #BAG>2600 then return end end + if reg then ins(BAG,reg)end return true end @@ -215,9 +215,7 @@ function DATA.pasteMission(str) end end end - if reg then - ins(MISSION,reg) - end + if reg then ins(MISSION,reg)end return true end @@ -230,16 +228,14 @@ function DATA.copyQuestArgs() ENV.sequence return str end -do--function DATA.pasteQuestArgs(str) - function DATA.pasteQuestArgs(str) - if #str<4 then return end - local ENV=CUSTOMENV - ENV.holdCount= str:byte(1)-48 - ENV.ospin= str:byte(2)~=90 - ENV.missionKill= str:byte(3)~=90 - ENV.sequence= str:sub(4) - return true - end +function DATA.pasteQuestArgs(str) + if #str<4 then return end + local ENV=CUSTOMENV + ENV.holdCount= str:byte(1)-48 + ENV.ospin= str:byte(2)~=90 + ENV.missionKill= str:byte(3)~=90 + ENV.sequence= str:sub(4) + return true end --[[ diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index a00fc46b..dbdb4c2f 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -153,6 +153,7 @@ function scene.draw() end if x>1140 then x,y=100,y+36 + if y>1260 then break end end if i<=j then setFont(35) diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 9324898c..72022945 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -157,6 +157,7 @@ function scene.draw() end if x>1060 then x,y=120,y+50 + if y>1260 then break end end if i<=j then local B=miniBlock[L[i]]