diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 4301b0af..8e253330 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -499,7 +499,11 @@ do--function resetGameData(args) end destroyPlayers() - GAME.curMode.load() + if GAME.curMode.load then + GAME.curMode.load() + else + PLY.newPlayer(1) + end freshPlayerPosition(args:find'q') VK.restore() if GAME.modeEnv.task then diff --git a/parts/modes/attacker_h.lua b/parts/modes/attacker_h.lua index fd002917..b0ac1bdd 100644 --- a/parts/modes/attacker_h.lua +++ b/parts/modes/attacker_h.lua @@ -35,10 +35,6 @@ return{ end, bg='rainbow2',bgm='shining terminal', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) mStr(P.modeData.wave,69,200) diff --git a/parts/modes/attacker_u.lua b/parts/modes/attacker_u.lua index 6d4e9742..be816881 100644 --- a/parts/modes/attacker_u.lua +++ b/parts/modes/attacker_u.lua @@ -43,10 +43,6 @@ return{ end, bg='rainbow2',bgm='shining terminal', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) mStr(P.modeData.wave,69,200) diff --git a/parts/modes/backfire_h.lua b/parts/modes/backfire_h.lua index bbab2c78..15413353 100644 --- a/parts/modes/backfire_h.lua +++ b/parts/modes/backfire_h.lua @@ -13,10 +13,6 @@ return{ end, bg='tunnel',bgm='echo', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.stat.atk,69,310) diff --git a/parts/modes/backfire_l.lua b/parts/modes/backfire_l.lua index 3851d227..9c1ccd4d 100644 --- a/parts/modes/backfire_l.lua +++ b/parts/modes/backfire_l.lua @@ -13,10 +13,6 @@ return{ end, bg='blackhole',bgm='echo', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.stat.atk,69,310) diff --git a/parts/modes/backfire_n.lua b/parts/modes/backfire_n.lua index 1bb2957e..f984e392 100644 --- a/parts/modes/backfire_n.lua +++ b/parts/modes/backfire_n.lua @@ -12,10 +12,6 @@ return{ end, bg='tunnel',bgm='echo', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.stat.atk,69,310) diff --git a/parts/modes/backfire_u.lua b/parts/modes/backfire_u.lua index d0f46c2b..364d383c 100644 --- a/parts/modes/backfire_u.lua +++ b/parts/modes/backfire_u.lua @@ -13,10 +13,6 @@ return{ end, bg='blackhole',bgm='echo', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.stat.atk,69,310) diff --git a/parts/modes/bigbang.lua b/parts/modes/bigbang.lua index c8164037..728bd915 100644 --- a/parts/modes/bigbang.lua +++ b/parts/modes/bigbang.lua @@ -10,10 +10,6 @@ return{ end, bg='bg1',bgm='new era', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, score=function(P)return{P.modeData.event,P.stat.finesseRate*.2/P.stat.piece}end, scoreDisp=function(D)return("%d Stage %.2f%%"):format(D[1],D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]>b[2]end, diff --git a/parts/modes/blind_e.lua b/parts/modes/blind_e.lua index bb9fbd70..1b3ca9f4 100644 --- a/parts/modes/blind_e.lua +++ b/parts/modes/blind_e.lua @@ -8,10 +8,6 @@ return{ freshLimit=10, bg='glow',bgm='push', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) mText(drawableText.line,69,300) mText(drawableText.techrash,69,420) diff --git a/parts/modes/blind_h.lua b/parts/modes/blind_h.lua index 0ad77550..24bba924 100644 --- a/parts/modes/blind_h.lua +++ b/parts/modes/blind_h.lua @@ -12,10 +12,6 @@ return{ freshLimit=15, bg='rgb',bgm='push', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) mText(drawableText.line,69,300) mText(drawableText.techrash,69,420) diff --git a/parts/modes/blind_l.lua b/parts/modes/blind_l.lua index c9ee46bf..1ba350bc 100644 --- a/parts/modes/blind_l.lua +++ b/parts/modes/blind_l.lua @@ -13,10 +13,6 @@ return{ freshLimit=15, bg='rgb',bgm='push', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) mText(drawableText.line,69,300) mText(drawableText.techrash,69,420) diff --git a/parts/modes/blind_n.lua b/parts/modes/blind_n.lua index 00345fcb..63758eb2 100644 --- a/parts/modes/blind_n.lua +++ b/parts/modes/blind_n.lua @@ -9,10 +9,6 @@ return{ dropPiece=function(P)if P.stat.row>=200 then P:win('finish')end end, bg='glow',bgm='push', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) mText(drawableText.line,69,300) mText(drawableText.techrash,69,420) diff --git a/parts/modes/blind_u.lua b/parts/modes/blind_u.lua index e6506e45..60cbd15d 100644 --- a/parts/modes/blind_u.lua +++ b/parts/modes/blind_u.lua @@ -12,10 +12,6 @@ return{ freshLimit=15, bg='rgb',bgm='far', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) mText(drawableText.line,69,300) mText(drawableText.techrash,69,420) diff --git a/parts/modes/blind_wtf.lua b/parts/modes/blind_wtf.lua index 48ee5ecf..674f37f5 100644 --- a/parts/modes/blind_wtf.lua +++ b/parts/modes/blind_wtf.lua @@ -12,7 +12,6 @@ return{ freshLimit=15, bg='none',bgm='far', }, - pauseLimit=true, load=function() PLY.newPlayer(1) if SETTING.sfx_spawn==0 then diff --git a/parts/modes/c4wtrain_l.lua b/parts/modes/c4wtrain_l.lua index 74758778..0543de6e 100644 --- a/parts/modes/c4wtrain_l.lua +++ b/parts/modes/c4wtrain_l.lua @@ -27,7 +27,6 @@ return{ freshLimit=15,ospin=false, bg='rgb',bgm='oxygen', }, - pauseLimit=true, load=function() PLY.newPlayer(1) local P=PLAYERS[1] diff --git a/parts/modes/c4wtrain_n.lua b/parts/modes/c4wtrain_n.lua index d081a690..9b956b79 100644 --- a/parts/modes/c4wtrain_n.lua +++ b/parts/modes/c4wtrain_n.lua @@ -25,7 +25,6 @@ return{ freshLimit=15,ospin=false, bg='rgb',bgm='oxygen', }, - pauseLimit=true, load=function() PLY.newPlayer(1) local P=PLAYERS[1] diff --git a/parts/modes/classic_fast.lua b/parts/modes/classic_fast.lua index 5a8890ed..e162e70c 100644 --- a/parts/modes/classic_fast.lua +++ b/parts/modes/classic_fast.lua @@ -33,9 +33,6 @@ return{ bg='rgb',bgm='magicblock', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(75) local r=P.modeData.target*.1 diff --git a/parts/modes/defender_l.lua b/parts/modes/defender_l.lua index 0b996900..d9359056 100644 --- a/parts/modes/defender_l.lua +++ b/parts/modes/defender_l.lua @@ -42,10 +42,6 @@ return{ end, bg='rainbow2',bgm='storm', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) mStr(P.modeData.wave,69,200) diff --git a/parts/modes/defender_n.lua b/parts/modes/defender_n.lua index dfbe51ad..be0a3912 100644 --- a/parts/modes/defender_n.lua +++ b/parts/modes/defender_n.lua @@ -42,10 +42,6 @@ return{ end, bg='rainbow2',bgm='storm', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) mStr(P.modeData.wave,69,200) diff --git a/parts/modes/dig_h.lua b/parts/modes/dig_h.lua index 5ac3d675..0653d3ca 100644 --- a/parts/modes/dig_h.lua +++ b/parts/modes/dig_h.lua @@ -21,10 +21,6 @@ return{ end, bg='bg2',bgm='there', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.wave,69,310) diff --git a/parts/modes/dig_u.lua b/parts/modes/dig_u.lua index 4e826741..199c7369 100644 --- a/parts/modes/dig_u.lua +++ b/parts/modes/dig_u.lua @@ -20,10 +20,6 @@ return{ end, bg='bg2',bgm='there', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.wave,69,310) diff --git a/parts/modes/drought_l.lua b/parts/modes/drought_l.lua index 16471492..3322002b 100644 --- a/parts/modes/drought_l.lua +++ b/parts/modes/drought_l.lua @@ -81,10 +81,6 @@ return{ freshLimit=15, bg='blockfall',bgm='reason', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(70) local R=100-P.stat.row diff --git a/parts/modes/drought_n.lua b/parts/modes/drought_n.lua index 76f7ff59..5f092a27 100644 --- a/parts/modes/drought_n.lua +++ b/parts/modes/drought_n.lua @@ -11,10 +11,6 @@ return{ freshLimit=15, bg='blockfall',bgm='reason', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(70) local R=100-P.stat.row diff --git a/parts/modes/infinite.lua b/parts/modes/infinite.lua index 66211df2..2bb2a07a 100644 --- a/parts/modes/infinite.lua +++ b/parts/modes/infinite.lua @@ -5,9 +5,6 @@ return{ infHold=true, bg='blockfall',bgm='infinite', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/marathon_bfmax.lua b/parts/modes/marathon_bfmax.lua index 5de0a99f..42290ac6 100644 --- a/parts/modes/marathon_bfmax.lua +++ b/parts/modes/marathon_bfmax.lua @@ -34,11 +34,7 @@ return{ mindas=7,minarr=1,minsdarr=1, bg='bg2',bgm='blank', }, - pauseLimit=true, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.stat.row,69,320) diff --git a/parts/modes/marathon_h.lua b/parts/modes/marathon_h.lua index 6e159f67..f85b8570 100644 --- a/parts/modes/marathon_h.lua +++ b/parts/modes/marathon_h.lua @@ -25,11 +25,7 @@ return{ noInitSZO=true, bg='cubes',bgm='push', }, - pauseLimit=true, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.stat.row,69,320) diff --git a/parts/modes/marathon_n.lua b/parts/modes/marathon_n.lua index d31b9ed7..e6d465a1 100644 --- a/parts/modes/marathon_n.lua +++ b/parts/modes/marathon_n.lua @@ -22,11 +22,7 @@ return{ noInitSZO=true, bg='bg2',bgm='push', }, - pauseLimit=true, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.stat.row,69,320) diff --git a/parts/modes/master_ex.lua b/parts/modes/master_ex.lua index f3dfb143..263d93c9 100644 --- a/parts/modes/master_ex.lua +++ b/parts/modes/master_ex.lua @@ -40,9 +40,6 @@ return{ bg='blockspace',bgm='hope', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) mText(drawableText.line,69,300) mText(drawableText.techrash,69,420) diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index 5bac7372..f707fa70 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -57,9 +57,6 @@ return{ bg='lightning',bgm='rectification', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.modeData.pt,69,320) diff --git a/parts/modes/master_h.lua b/parts/modes/master_h.lua index e5ac1cff..daef8b85 100644 --- a/parts/modes/master_h.lua +++ b/parts/modes/master_h.lua @@ -73,9 +73,6 @@ return{ bg='bg2',bgm='secret7th', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.modeData.pt,69,320) diff --git a/parts/modes/master_l.lua b/parts/modes/master_l.lua index 6a161e42..48258859 100644 --- a/parts/modes/master_l.lua +++ b/parts/modes/master_l.lua @@ -59,9 +59,6 @@ return{ bg='bg1',bgm='secret8th', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.modeData.pt,69,320) diff --git a/parts/modes/master_n.lua b/parts/modes/master_n.lua index ca940809..62c695bb 100644 --- a/parts/modes/master_n.lua +++ b/parts/modes/master_n.lua @@ -73,9 +73,6 @@ return{ bg='bg1',bgm='secret8th', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.modeData.pt,69,320) diff --git a/parts/modes/master_ph.lua b/parts/modes/master_ph.lua index 83ba7237..33465418 100644 --- a/parts/modes/master_ph.lua +++ b/parts/modes/master_ph.lua @@ -146,9 +146,6 @@ return{ bg='blockspace',bgm='super7th', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.modeData.pt,69,320) diff --git a/parts/modes/master_u.lua b/parts/modes/master_u.lua index 95221105..c536d35b 100644 --- a/parts/modes/master_u.lua +++ b/parts/modes/master_u.lua @@ -68,9 +68,6 @@ return{ bg='bg2',bgm='secret7th', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.modeData.pt,69,320) diff --git a/parts/modes/pc_h.lua b/parts/modes/pc_h.lua index e4c087f4..2b57960d 100644 --- a/parts/modes/pc_h.lua +++ b/parts/modes/pc_h.lua @@ -8,10 +8,6 @@ return{ ospin=false, bg='rgb',bgm='truth', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) local R=100-P.stat.row diff --git a/parts/modes/pc_inf.lua b/parts/modes/pc_inf.lua index 736457ff..14a1afcb 100644 --- a/parts/modes/pc_inf.lua +++ b/parts/modes/pc_inf.lua @@ -21,10 +21,6 @@ return{ ospin=false, bg='rgb',bgm='moonbeam', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(70) mStr(P.stat.pc,69,300) diff --git a/parts/modes/pc_l.lua b/parts/modes/pc_l.lua index a13ccf3e..4ecb20ef 100644 --- a/parts/modes/pc_l.lua +++ b/parts/modes/pc_l.lua @@ -8,10 +8,6 @@ return{ ospin=false, bg='rgb',bgm='moonbeam', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) local R=100-P.stat.row diff --git a/parts/modes/pc_n.lua b/parts/modes/pc_n.lua index a7cef4e1..6c0b0b74 100644 --- a/parts/modes/pc_n.lua +++ b/parts/modes/pc_n.lua @@ -6,10 +6,6 @@ return{ dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, bg='rgb',bgm='truth', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) local R=100-P.stat.row diff --git a/parts/modes/pctrain_l.lua b/parts/modes/pctrain_l.lua index 8185814a..95f476f8 100644 --- a/parts/modes/pctrain_l.lua +++ b/parts/modes/pctrain_l.lua @@ -52,7 +52,6 @@ return{ RS="SRS", bg='rgb',bgm='oxygen', }, - pauseLimit=true, load=function() PLY.newPlayer(1) check(PLAYERS[1]) diff --git a/parts/modes/pctrain_n.lua b/parts/modes/pctrain_n.lua index 8b90623b..199de097 100644 --- a/parts/modes/pctrain_n.lua +++ b/parts/modes/pctrain_n.lua @@ -43,7 +43,6 @@ return{ RS="SRS", bg='rgb',bgm='oxygen', }, - pauseLimit=true, load=function() PLY.newPlayer(1) check(PLAYERS[1]) diff --git a/parts/modes/rhythm_e.lua b/parts/modes/rhythm_e.lua index 16c56608..dbc44c26 100644 --- a/parts/modes/rhythm_e.lua +++ b/parts/modes/rhythm_e.lua @@ -43,11 +43,7 @@ return{ end, bg='bg2',bgm='push', }, - pauseLimit=true, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.stat.row,69,320) diff --git a/parts/modes/rhythm_h.lua b/parts/modes/rhythm_h.lua index 022357c5..190b84e3 100644 --- a/parts/modes/rhythm_h.lua +++ b/parts/modes/rhythm_h.lua @@ -43,11 +43,7 @@ return{ end, bg='bg2',bgm='secret8th', }, - pauseLimit=true, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.stat.row,69,320) diff --git a/parts/modes/rhythm_u.lua b/parts/modes/rhythm_u.lua index 0b43f541..158e23bd 100644 --- a/parts/modes/rhythm_u.lua +++ b/parts/modes/rhythm_u.lua @@ -49,11 +49,7 @@ return{ end, bg='bg2',bgm='secret7th', }, - pauseLimit=true, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(P.stat.row,69,320) diff --git a/parts/modes/solo_e.lua b/parts/modes/solo_e.lua index 8ffd02a1..70772d1b 100644 --- a/parts/modes/solo_e.lua +++ b/parts/modes/solo_e.lua @@ -7,7 +7,6 @@ return{ bufferLimit=20, bg='bg2',bgm='battle', }, - pauseLimit=true, load=function() PLY.newPlayer(1) PLY.newAIPlayer(2,AIBUILDER('9S',4)) diff --git a/parts/modes/solo_h.lua b/parts/modes/solo_h.lua index 993bfa49..89283abc 100644 --- a/parts/modes/solo_h.lua +++ b/parts/modes/solo_h.lua @@ -7,7 +7,6 @@ return{ bufferLimit=20, bg='bg2',bgm='battle', }, - pauseLimit=true, load=function() PLY.newPlayer(1) PLY.newAIPlayer(2,AIBUILDER('9S',6)) diff --git a/parts/modes/solo_l.lua b/parts/modes/solo_l.lua index a43e72b5..81c315ed 100644 --- a/parts/modes/solo_l.lua +++ b/parts/modes/solo_l.lua @@ -7,7 +7,6 @@ return{ bufferLimit=20, bg='bg2',bgm='battle', }, - pauseLimit=true, load=function() PLY.newPlayer(1) PLY.newAIPlayer(2,AIBUILDER('CC',6,2,true,30000)) diff --git a/parts/modes/solo_n.lua b/parts/modes/solo_n.lua index cbe6b10a..c075f673 100644 --- a/parts/modes/solo_n.lua +++ b/parts/modes/solo_n.lua @@ -7,7 +7,6 @@ return{ bufferLimit=20, bg='bg2',bgm='battle', }, - pauseLimit=true, load=function() PLY.newPlayer(1) PLY.newAIPlayer(2,AIBUILDER('9S',5)) diff --git a/parts/modes/solo_u.lua b/parts/modes/solo_u.lua index 8fae54bb..b0ae5a89 100644 --- a/parts/modes/solo_u.lua +++ b/parts/modes/solo_u.lua @@ -7,7 +7,6 @@ return{ bufferLimit=20, bg='bg2',bgm='battle', }, - pauseLimit=true, load=function() PLY.newPlayer(1) PLY.newAIPlayer(2,AIBUILDER('CC',7,3,true,50000)) diff --git a/parts/modes/sprintAtk.lua b/parts/modes/sprintAtk.lua index 02b2a2aa..bb07eaa1 100644 --- a/parts/modes/sprintAtk.lua +++ b/parts/modes/sprintAtk.lua @@ -6,9 +6,6 @@ return{ dropPiece=function(P)if P.stat.atk>=100 then P:win('finish')end end, bg='matrix',bgm='new era', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/sprintFix.lua b/parts/modes/sprintFix.lua index ca53a5df..276d1af0 100644 --- a/parts/modes/sprintFix.lua +++ b/parts/modes/sprintFix.lua @@ -7,9 +7,6 @@ return{ dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, bg='aura',bgm='waterfall', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=40-P.stat.row diff --git a/parts/modes/sprintLock.lua b/parts/modes/sprintLock.lua index b41e6046..37c319c9 100644 --- a/parts/modes/sprintLock.lua +++ b/parts/modes/sprintLock.lua @@ -6,9 +6,6 @@ return{ dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, bg='aura',bgm='waterfall', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=40-P.stat.row diff --git a/parts/modes/sprintMPH.lua b/parts/modes/sprintMPH.lua index 1ac9b8e3..791e4f85 100644 --- a/parts/modes/sprintMPH.lua +++ b/parts/modes/sprintMPH.lua @@ -7,9 +7,6 @@ return{ dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, bg='aura',bgm='waterfall', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=40-P.stat.row diff --git a/parts/modes/sprintPenta.lua b/parts/modes/sprintPenta.lua index ab6d1baf..ce0ae362 100644 --- a/parts/modes/sprintPenta.lua +++ b/parts/modes/sprintPenta.lua @@ -6,9 +6,6 @@ return{ dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, bg='aura',bgm='beat5th', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=40-P.stat.row diff --git a/parts/modes/sprintSmooth.lua b/parts/modes/sprintSmooth.lua index 68a578a1..7f302a29 100644 --- a/parts/modes/sprintSmooth.lua +++ b/parts/modes/sprintSmooth.lua @@ -7,9 +7,6 @@ return{ dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, bg='aura',bgm='waterfall', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=40-P.stat.row diff --git a/parts/modes/sprint_1000l.lua b/parts/modes/sprint_1000l.lua index 1211ea03..eade5306 100644 --- a/parts/modes/sprint_1000l.lua +++ b/parts/modes/sprint_1000l.lua @@ -5,9 +5,6 @@ return{ dropPiece=function(P)if P.stat.row>=1000 then P:win('finish')end end, bg='rainbow',bgm='push', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=1000-P.stat.row diff --git a/parts/modes/sprint_100l.lua b/parts/modes/sprint_100l.lua index eb5e8682..f5aeb342 100644 --- a/parts/modes/sprint_100l.lua +++ b/parts/modes/sprint_100l.lua @@ -5,9 +5,6 @@ return{ dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, bg='bg2',bgm='race', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=100-P.stat.row diff --git a/parts/modes/sprint_10l.lua b/parts/modes/sprint_10l.lua index 65f35d7c..c704abf7 100644 --- a/parts/modes/sprint_10l.lua +++ b/parts/modes/sprint_10l.lua @@ -5,9 +5,6 @@ return{ dropPiece=function(P)if P.stat.row>=10 then P:win('finish')end end, bg='bg2',bgm='race', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=10-P.stat.row diff --git a/parts/modes/sprint_20l.lua b/parts/modes/sprint_20l.lua index fe94a023..d3dc2d78 100644 --- a/parts/modes/sprint_20l.lua +++ b/parts/modes/sprint_20l.lua @@ -5,9 +5,6 @@ return{ dropPiece=function(P)if P.stat.row>=20 then P:win('finish')end end, bg='bg2',bgm='race', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=20-P.stat.row diff --git a/parts/modes/sprint_400l.lua b/parts/modes/sprint_400l.lua index d67bb17b..1dff7de2 100644 --- a/parts/modes/sprint_400l.lua +++ b/parts/modes/sprint_400l.lua @@ -5,9 +5,6 @@ return{ dropPiece=function(P)if P.stat.row>=400 then P:win('finish')end end, bg='rainbow',bgm='push', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=400-P.stat.row diff --git a/parts/modes/sprint_40l.lua b/parts/modes/sprint_40l.lua index 6febb1c6..9c7ece23 100644 --- a/parts/modes/sprint_40l.lua +++ b/parts/modes/sprint_40l.lua @@ -5,9 +5,6 @@ return{ dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, bg='bg2',bgm='race', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(55) local r=40-P.stat.row diff --git a/parts/modes/survivor_e.lua b/parts/modes/survivor_e.lua index 727ccc6f..c31681ee 100644 --- a/parts/modes/survivor_e.lua +++ b/parts/modes/survivor_e.lua @@ -22,10 +22,6 @@ return{ end, bg='glow',bgm='new era', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.wave,69,310) diff --git a/parts/modes/survivor_h.lua b/parts/modes/survivor_h.lua index b4650307..0287274b 100644 --- a/parts/modes/survivor_h.lua +++ b/parts/modes/survivor_h.lua @@ -29,10 +29,6 @@ return{ end, bg='glow',bgm='shift', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.wave,69,310) diff --git a/parts/modes/survivor_l.lua b/parts/modes/survivor_l.lua index f9b1416f..cd859fc1 100644 --- a/parts/modes/survivor_l.lua +++ b/parts/modes/survivor_l.lua @@ -23,10 +23,6 @@ return{ end, bg='glow',bgm='shift', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.wave,69,310) diff --git a/parts/modes/survivor_n.lua b/parts/modes/survivor_n.lua index 22c1a5f6..692c643e 100644 --- a/parts/modes/survivor_n.lua +++ b/parts/modes/survivor_n.lua @@ -28,10 +28,6 @@ return{ end, bg='glow',bgm='new era', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.wave,69,310) diff --git a/parts/modes/survivor_u.lua b/parts/modes/survivor_u.lua index a7ca5600..f39f03a5 100644 --- a/parts/modes/survivor_u.lua +++ b/parts/modes/survivor_u.lua @@ -28,10 +28,6 @@ return{ end, bg='welcome',bgm='here', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.wave,69,310) diff --git a/parts/modes/tech_finesse.lua b/parts/modes/tech_finesse.lua index 6ad820d4..9e604b63 100644 --- a/parts/modes/tech_finesse.lua +++ b/parts/modes/tech_finesse.lua @@ -9,9 +9,6 @@ return{ bg='flink',bgm='infinite', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/tech_finesse_f.lua b/parts/modes/tech_finesse_f.lua index 8310086c..03aafaf7 100644 --- a/parts/modes/tech_finesse_f.lua +++ b/parts/modes/tech_finesse_f.lua @@ -22,9 +22,6 @@ return{ bg='flink',bgm='infinite', }, slowMark=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/tech_h.lua b/parts/modes/tech_h.lua index e0cdd9aa..2d92df01 100644 --- a/parts/modes/tech_h.lua +++ b/parts/modes/tech_h.lua @@ -7,9 +7,6 @@ return{ dropPiece=function(P)if P.stat.atk>=100 then P:win('finish')end end, bg='matrix',bgm='down', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/tech_h_plus.lua b/parts/modes/tech_h_plus.lua index 4b3e1e5f..171733e4 100644 --- a/parts/modes/tech_h_plus.lua +++ b/parts/modes/tech_h_plus.lua @@ -19,9 +19,6 @@ return{ dropPiece=tech_check_hard, bg='matrix',bgm='down', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/tech_l.lua b/parts/modes/tech_l.lua index 304fadec..2cfe4332 100644 --- a/parts/modes/tech_l.lua +++ b/parts/modes/tech_l.lua @@ -7,9 +7,6 @@ return{ dropPiece=function(P)if P.stat.atk>=100 then P:win('finish')end end, bg='matrix',bgm='warped', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/tech_l_plus.lua b/parts/modes/tech_l_plus.lua index 6a96cca0..eb7081a7 100644 --- a/parts/modes/tech_l_plus.lua +++ b/parts/modes/tech_l_plus.lua @@ -19,9 +19,6 @@ return{ dropPiece=tech_check_hard, bg='matrix',bgm='warped', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/tech_n.lua b/parts/modes/tech_n.lua index 2eb73f74..773c5784 100644 --- a/parts/modes/tech_n.lua +++ b/parts/modes/tech_n.lua @@ -7,9 +7,6 @@ return{ dropPiece=function(P)if P.stat.atk>=100 then P:win('finish')end end, bg='matrix',bgm='new era', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/tech_n_plus.lua b/parts/modes/tech_n_plus.lua index b2211c1f..432ebe81 100644 --- a/parts/modes/tech_n_plus.lua +++ b/parts/modes/tech_n_plus.lua @@ -19,9 +19,6 @@ return{ dropPiece=tech_check_hard, bg='matrix',bgm='new era', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(45) mStr(("%.1f"):format(P.stat.atk),69,190) diff --git a/parts/modes/tsd_e.lua b/parts/modes/tsd_e.lua index fd024fb2..b8ee45cd 100644 --- a/parts/modes/tsd_e.lua +++ b/parts/modes/tsd_e.lua @@ -18,9 +18,6 @@ return{ ospin=false, bg='matrix',bgm='vapor', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.tsd,69,250) diff --git a/parts/modes/tsd_h.lua b/parts/modes/tsd_h.lua index 55e1d623..3f2570f8 100644 --- a/parts/modes/tsd_h.lua +++ b/parts/modes/tsd_h.lua @@ -18,10 +18,6 @@ return{ ospin=false, bg='matrix',bgm='vapor', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.tsd,69,250) diff --git a/parts/modes/tsd_u.lua b/parts/modes/tsd_u.lua index fc93961d..c0509a1b 100644 --- a/parts/modes/tsd_u.lua +++ b/parts/modes/tsd_u.lua @@ -27,10 +27,6 @@ return{ ospin=false, bg='matrix',bgm='vapor', }, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(65) mStr(P.modeData.tsd,69,250) diff --git a/parts/modes/ultra.lua b/parts/modes/ultra.lua index 850f4f0f..5563ac50 100644 --- a/parts/modes/ultra.lua +++ b/parts/modes/ultra.lua @@ -26,10 +26,6 @@ return{ bg='fan',bgm='memory', }, slowMark=true, - pauseLimit=true, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) gc.setLineWidth(2) gc.rectangle('line',55,110,32,402) diff --git a/parts/modes/zen.lua b/parts/modes/zen.lua index 196c694b..454ac5b9 100644 --- a/parts/modes/zen.lua +++ b/parts/modes/zen.lua @@ -6,9 +6,6 @@ return{ dropPiece=function(P)if P.stat.row>=200 then P:win('finish')end end, bg='bg2',bgm='venus', }, - load=function() - PLY.newPlayer(1) - end, mesDisp=function(P) setFont(70) local R=200-P.stat.row