diff --git a/main.lua b/main.lua index c227d81e..c3f6f528 100644 --- a/main.lua +++ b/main.lua @@ -289,6 +289,18 @@ do if RANKS.tsd_u then RANKS.tsd_u=0 end needSave=true end + if STAT.version==1601 then + RANKS.round_e=nil + RANKS.round_n=nil + RANKS.round_h=nil + RANKS.round_l=nil + RANKS.round_u=nil + fs.remove('record/round_e.rec') + fs.remove('record/round_n.rec') + fs.remove('record/round_h.rec') + fs.remove('record/round_l.rec') + fs.remove('record/round_u.rec') + end if RANKS.stack_20l then RANKS.stack_20l=nil RANKS.stack_40l=nil diff --git a/parts/modes/round_e.lua b/parts/modes/round_e.lua index 1dcb44f3..04cb5fe6 100644 --- a/parts/modes/round_e.lua +++ b/parts/modes/round_e.lua @@ -1,5 +1,5 @@ local function update_round(P) - if #PLY_ALIVE>1 then + if P.stat.piece%7==0 and #PLY_ALIVE>1 then P.control=false local ID=P.id repeat @@ -13,6 +13,7 @@ end return{ color=COLOR.cyan, env={ + life=1, drop=300,lock=300, infHold=true, dropPiece=update_round, @@ -22,7 +23,7 @@ return{ }, load=function() PLY.newPlayer(1) - PLY.newAIPlayer(2,AIBUILDER('CC',7,1,true,10000)) + PLY.newAIPlayer(2,AIBUILDER('CC',8,1,true,8000)) end, score=function(P)return{P.stat.piece,P.stat.time}end, scoreDisp=function(D)return D[1].." Pieces "..STRING.time(D[2])end, @@ -31,10 +32,10 @@ return{ if P.result=='win'then local T=P.stat.piece return - T<=23 and 5 or - T<=26 and 4 or - T<=40 and 3 or - T<=60 and 2 or + T<=7*8 and 5 or + T<=7*10 and 4 or + T<=7*15 and 3 or + T<=7*26 and 2 or 1 end end, diff --git a/parts/modes/round_h.lua b/parts/modes/round_h.lua index fbeed6f9..5a142a01 100644 --- a/parts/modes/round_h.lua +++ b/parts/modes/round_h.lua @@ -1,5 +1,5 @@ local function update_round(P) - if #PLY_ALIVE>1 then + if P.stat.piece%7==0 and #PLY_ALIVE>1 then P.control=false local ID=P.id repeat @@ -13,6 +13,7 @@ end return{ color=COLOR.magenta, env={ + life=1, drop=300,lock=300, infHold=true, dropPiece=update_round, @@ -22,7 +23,7 @@ return{ }, load=function() PLY.newPlayer(1) - PLY.newAIPlayer(2,AIBUILDER('CC',7,2,true,16000)) + PLY.newAIPlayer(2,AIBUILDER('CC',8,2,true,16000)) end, score=function(P)return{P.stat.piece,P.stat.time}end, scoreDisp=function(D)return D[1].." Pieces "..STRING.time(D[2])end, @@ -31,10 +32,10 @@ return{ if P.result=='win'then local T=P.stat.piece return - T<=30 and 5 or - T<=40 and 4 or - T<=55 and 3 or - T<=75 and 2 or + T<=7*8 and 5 or + T<=7*10 and 4 or + T<=7*15 and 3 or + T<=7*26 and 2 or 1 end end, diff --git a/parts/modes/round_l.lua b/parts/modes/round_l.lua index 4068013f..08542fd7 100644 --- a/parts/modes/round_l.lua +++ b/parts/modes/round_l.lua @@ -1,5 +1,5 @@ local function update_round(P) - if #PLY_ALIVE>1 then + if P.stat.piece%7==0 and #PLY_ALIVE>1 then P.control=false local ID=P.id repeat @@ -13,6 +13,7 @@ end return{ color=COLOR.red, env={ + life=1, drop=300,lock=300, infHold=true, dropPiece=update_round, @@ -22,7 +23,7 @@ return{ }, load=function() PLY.newPlayer(1) - PLY.newAIPlayer(2,AIBUILDER('CC',7,3,true,26000)) + PLY.newAIPlayer(2,AIBUILDER('CC',8,3,true,26000)) end, score=function(P)return{P.stat.piece,P.stat.time}end, scoreDisp=function(D)return D[1].." Pieces "..STRING.time(D[2])end, @@ -31,10 +32,10 @@ return{ if P.result=='win'then local T=P.stat.piece return - T<=30 and 5 or - T<=40 and 4 or - T<=55 and 3 or - T<=75 and 2 or + T<=7*8 and 5 or + T<=7*10 and 4 or + T<=7*15 and 3 or + T<=7*26 and 2 or 1 end end, diff --git a/parts/modes/round_n.lua b/parts/modes/round_n.lua index 952ae0c1..9250898f 100644 --- a/parts/modes/round_n.lua +++ b/parts/modes/round_n.lua @@ -1,5 +1,5 @@ local function update_round(P) - if #PLY_ALIVE>1 then + if P.stat.piece%7==0 and #PLY_ALIVE>1 then P.control=false local ID=P.id repeat @@ -13,6 +13,7 @@ end return{ color=COLOR.green, env={ + life=1, drop=300,lock=300, infHold=true, dropPiece=update_round, @@ -22,7 +23,7 @@ return{ }, load=function() PLY.newPlayer(1) - PLY.newAIPlayer(2,AIBUILDER('CC',7,1,true,13000)) + PLY.newAIPlayer(2,AIBUILDER('CC',8,1,true,13000)) end, score=function(P)return{P.stat.piece,P.stat.time}end, scoreDisp=function(D)return D[1].." Pieces "..STRING.time(D[2])end, @@ -31,10 +32,10 @@ return{ if P.result=='win'then local T=P.stat.piece return - T<=23 and 5 or - T<=26 and 4 or - T<=40 and 3 or - T<=60 and 2 or + T<=7*8 and 5 or + T<=7*10 and 4 or + T<=7*15 and 3 or + T<=7*26 and 2 or 1 end end, diff --git a/parts/modes/round_u.lua b/parts/modes/round_u.lua index b2f8643b..f3d33960 100644 --- a/parts/modes/round_u.lua +++ b/parts/modes/round_u.lua @@ -1,5 +1,5 @@ local function update_round(P) - if #PLY_ALIVE>1 then + if P.stat.piece%7==0 and #PLY_ALIVE>1 then P.control=false local ID=P.id repeat @@ -13,6 +13,7 @@ end return{ color=COLOR.lYellow, env={ + life=1, drop=300,lock=300, infHold=true, dropPiece=update_round, @@ -22,7 +23,7 @@ return{ }, load=function() PLY.newPlayer(1) - PLY.newAIPlayer(2,AIBUILDER('CC',7,3,true,40000)) + PLY.newAIPlayer(2,AIBUILDER('CC',8,4,true,40000)) end, score=function(P)return{P.stat.piece,P.stat.time}end, scoreDisp=function(D)return D[1].." Pieces "..STRING.time(D[2])end, @@ -31,10 +32,10 @@ return{ if P.result=='win'then local T=P.stat.piece return - T<=30 and 5 or - T<=40 and 4 or - T<=55 and 3 or - T<=75 and 2 or + T<=7*8 and 5 or + T<=7*10 and 4 or + T<=7*15 and 3 or + T<=7*26 and 2 or 1 end end,