diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index a064b3cb..26507b22 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -446,6 +446,21 @@ end function resumeGame() SCN.swapTo("play","none") end +function applyCustomGame() + for k,v in next,CUSTOMENV do + GAME.modeEnv[k]=v + end + if BAG[1]then + GAME.modeEnv.bag=BAG + else + GAME.modeEnv.bag=nil + end + if MISSION[1]then + GAME.modeEnv.mission=MISSION + else + GAME.modeEnv.mission=nil + end +end function loadGame(M,ifQuickPlay) freshDate() if legalGameTime()then diff --git a/parts/modes/custom_clear.lua b/parts/modes/custom_clear.lua index cfc21fd3..2a5c46a4 100644 --- a/parts/modes/custom_clear.lua +++ b/parts/modes/custom_clear.lua @@ -49,23 +49,11 @@ return{ color=COLOR.white, env={}, load=function() - for k,v in next,CUSTOMENV do - GAME.modeEnv[k]=v - end - if BAG[1]then - GAME.modeEnv.bag=BAG - else - GAME.modeEnv.bag=nil - end - if MISSION[1]then - GAME.modeEnv.mission=MISSION - else - GAME.modeEnv.mission=nil - end + applyCustomGame() GAME.modeEnv.dropPiece=PLY.check_lineReach for y=1,20 do if notAir(FIELD[1][y])then - --Switch clear mode on + --Switch clear sprint mode on GAME.modeEnv.dropPiece=checkClear break end @@ -83,8 +71,6 @@ return{ for _,P in next,PLAYERS.alive do setField(P,1) end - GAME.modeEnv.bg=CUSTOMENV.bg - GAME.modeEnv.bgm=CUSTOMENV.bgm end, mesDisp=function(P) setFont(55) diff --git a/parts/modes/custom_puzzle.lua b/parts/modes/custom_puzzle.lua index fc038587..19848e71 100644 --- a/parts/modes/custom_puzzle.lua +++ b/parts/modes/custom_puzzle.lua @@ -38,19 +38,7 @@ return{ dropPiece=puzzleCheck, }, load=function() - for k,v in next,CUSTOMENV do - GAME.modeEnv[k]=v - end - if BAG[1]then - GAME.modeEnv.bag=BAG - else - GAME.modeEnv.bag=nil - end - if MISSION[1]then - GAME.modeEnv.mission=MISSION - else - GAME.modeEnv.mission=nil - end + applyCustomGame() PLY.newPlayer(1) local L=GAME.modeEnv.opponent if L~=0 then @@ -61,8 +49,6 @@ return{ PLY.newAIPlayer(2,AIBUILDER("CC",2*L-11,int(L*.5-1.5),true,4000*L)) end end - GAME.modeEnv.bg=CUSTOMENV.bg - GAME.modeEnv.bgm=CUSTOMENV.bgm end, mesDisp=function(P) local dx,dy=P.fieldOff.x,P.fieldOff.y