diff --git a/modes/tech_finesse+.lua b/modes/tech_finesse+.lua index 2bc38b78..534504f1 100644 --- a/modes/tech_finesse+.lua +++ b/modes/tech_finesse+.lua @@ -3,7 +3,7 @@ local function tech_check_hard(P) if #P.clearedRow>0 and P.lastClear<10 or P.lastClear==74 then P:lose() end - if P.stat.row>=200 then + if P.stat.atk>=200 then P:win("finish") end end @@ -14,7 +14,6 @@ return{ arr=0, drop=1e99,lock=60, freshLimit=15, - target=200, fineKill=true, dropPiece=tech_check_hard, bg="flink",bgm="infinite", @@ -30,17 +29,23 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, + score=function(P)return{P.stat.atk<=200 and P.stat.atk or 200,P.stat.time}end, + scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=150 and 4 or - L>=100 and 3 or - L>=70 and 2 or - L>=40 and 1 or - L>=10 and 0 + local L=P.stat.atk + if L>=200 then + local T=P.stat.time + return + T<120 and 5 or + T<150 and 4 or + 3 + else + return + L>=150 and 3 or + L>=100 and 2 or + L>=60 and 1 or + L>=20 and 0 + end end, } \ No newline at end of file diff --git a/modes/tech_finesse.lua b/modes/tech_finesse.lua index 191e322b..871fa801 100644 --- a/modes/tech_finesse.lua +++ b/modes/tech_finesse.lua @@ -7,7 +7,7 @@ return{ drop=1e99,lock=60, freshLimit=15, target=200, - dropPiece=PLY.reach_winCheck, + dropPiece=PLY.check_attackReach, fineKill=true, bg="flink",bgm="infinite", }, @@ -22,17 +22,23 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, + score=function(P)return{P.stat.atk<=200 and P.stat.atk or 200,P.stat.time}end, + scoreDisp=function(D)return D[1].." "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=150 and 4 or - L>=100 and 3 or - L>=70 and 2 or - L>=40 and 1 or - L>=10 and 0 + local L=P.stat.atk + if L>=200 then + local T=P.stat.time + return + T<120 and 5 or + T<150 and 4 or + 3 + else + return + L>=150 and 3 or + L>=100 and 2 or + L>=60 and 1 or + L>=20 and 0 + end end, } \ No newline at end of file diff --git a/modes/tech_hard+.lua b/modes/tech_hard+.lua index 9a86748b..58546a53 100644 --- a/modes/tech_hard+.lua +++ b/modes/tech_hard+.lua @@ -3,7 +3,7 @@ local function tech_check_hard(P) if #P.clearedRow>0 and P.lastClear<10 or P.lastClear==74 then P:lose() end - if P.stat.row>=200 then + if P.stat.atk>=200 then P:win("finish") end end @@ -13,7 +13,6 @@ return{ env={ drop=30,lock=60, freshLimit=15, - target=200, dropPiece=tech_check_hard, bg="matrix",bgm="push", }, @@ -27,17 +26,23 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, + score=function(P)return{P.stat.atk<=200 and P.stat.atk or 200,P.stat.time}end, + scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=126 and 4 or - L>=90 and 3 or - L>=60 and 2 or - L>=30 and 1 or - L>=5 and 0 + local L=P.stat.atk + if L>=200 then + local T=P.stat.time + return + T<130 and 5 or + T<160 and 4 or + 3 + else + return + L>=150 and 3 or + L>=100 and 2 or + L>=60 and 1 or + L>=20 and 0 + end end, } \ No newline at end of file diff --git a/modes/tech_hard.lua b/modes/tech_hard.lua index 4788e80b..c19064ba 100644 --- a/modes/tech_hard.lua +++ b/modes/tech_hard.lua @@ -3,7 +3,7 @@ local function tech_check_easy(P) if #P.clearedRow>0 and P.b2b<40 then P:lose() end - if P.stat.row>=200 then + if P.stat.atk>=200 then P:win("finish") end end @@ -13,7 +13,6 @@ return{ env={ drop=20,lock=60, freshLimit=15, - target=200, dropPiece=tech_check_easy, bg="matrix",bgm="push", }, @@ -27,17 +26,23 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, + score=function(P)return{P.stat.atk<=200 and P.stat.atk or 200,P.stat.time}end, + scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=126 and 4 or - L>=90 and 3 or - L>=60 and 2 or - L>=30 and 1 or - L>=5 and 0 + local L=P.stat.atk + if L>=200 then + local T=P.stat.time + return + T<120 and 5 or + T<150 and 4 or + 3 + else + return + L>=150 and 3 or + L>=100 and 2 or + L>=60 and 1 or + L>=20 and 0 + end end, } \ No newline at end of file diff --git a/modes/tech_lunatic+.lua b/modes/tech_lunatic+.lua index 54d244c3..ecb5c1b5 100644 --- a/modes/tech_lunatic+.lua +++ b/modes/tech_lunatic+.lua @@ -3,7 +3,7 @@ local function tech_check_hard(P) if #P.clearedRow>0 and P.lastClear<10 or P.lastClear==74 then P:lose() end - if P.stat.row>=200 then + if P.stat.atk>=200 then P:win("finish") end end @@ -13,7 +13,6 @@ return{ env={ _20G=true,lock=60, freshLimit=15, - target=200, dropPiece=tech_check_hard, bg="matrix",bgm="down", }, @@ -27,17 +26,23 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, + score=function(P)return{P.stat.atk<=200 and P.stat.atk or 200,P.stat.time}end, + scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=140 and 4 or - L>=90 and 3 or - L>=60 and 2 or - L>=30 and 1 or - L>=5 and 0 + local L=P.stat.atk + if L>=200 then + local T=P.stat.time + return + T<140 and 5 or + T<180 and 4 or + 3 + else + return + L>=150 and 3 or + L>=100 and 2 or + L>=60 and 1 or + L>=20 and 0 + end end, } \ No newline at end of file diff --git a/modes/tech_lunatic.lua b/modes/tech_lunatic.lua index be8999ca..2a8c295f 100644 --- a/modes/tech_lunatic.lua +++ b/modes/tech_lunatic.lua @@ -3,7 +3,7 @@ local function tech_check_easy(P) if #P.clearedRow>0 and P.b2b<40 then P:lose() end - if P.stat.row>=200 then + if P.stat.atk>=200 then P:win("finish") end end @@ -13,7 +13,6 @@ return{ env={ _20G=true,lock=60, freshLimit=15, - target=200, dropPiece=tech_check_easy, bg="matrix",bgm="down", }, @@ -27,17 +26,23 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, + score=function(P)return{P.stat.atk<=200 and P.stat.atk or 200,P.stat.time}end, + scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=140 and 4 or - L>=90 and 3 or - L>=60 and 2 or - L>=30 and 1 or - L>=5 and 0 + local L=P.stat.atk + if L>=200 then + local T=P.stat.time + return + T<130 and 5 or + T<160 and 4 or + 3 + else + return + L>=150 and 3 or + L>=100 and 2 or + L>=60 and 1 or + L>=20 and 0 + end end, } \ No newline at end of file diff --git a/modes/tech_normal+.lua b/modes/tech_normal+.lua index 4fef8eff..cff6f668 100644 --- a/modes/tech_normal+.lua +++ b/modes/tech_normal+.lua @@ -3,7 +3,7 @@ local function tech_check_hard(P) if #P.clearedRow>0 and P.lastClear<10 or P.lastClear==74 then P:lose() end - if P.stat.row>=200 then + if P.stat.atk>=200 then P:win("finish") end end @@ -13,7 +13,6 @@ return{ env={ oncehold=false, drop=1e99,lock=1e99, - target=200, dropPiece=tech_check_hard, bg="matrix",bgm="newera", }, @@ -27,17 +26,23 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, + score=function(P)return{P.stat.atk<=200 and P.stat.atk or 200,P.stat.time}end, + scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=126 and 4 or - L>=80 and 3 or - L>=50 and 2 or - L>=20 and 1 or - L>=5 and 0 + local L=P.stat.atk + if L>=200 then + local T=P.stat.time + return + T<130 and 5 or + T<160 and 4 or + 3 + else + return + L>=150 and 3 or + L>=100 and 2 or + L>=60 and 1 or + L>=20 and 0 + end end, } \ No newline at end of file diff --git a/modes/tech_normal.lua b/modes/tech_normal.lua index b82390ce..4b052ff3 100644 --- a/modes/tech_normal.lua +++ b/modes/tech_normal.lua @@ -3,7 +3,7 @@ local function tech_check_easy(P) if #P.clearedRow>0 and P.b2b<40 then P:lose() end - if P.stat.row>=200 then + if P.stat.atk>=200 then P:win("finish") end end @@ -13,7 +13,6 @@ return{ env={ oncehold=false, drop=1e99,lock=1e99, - target=200, dropPiece=tech_check_easy, bg="matrix",bgm="newera", }, @@ -27,17 +26,23 @@ return{ mText(drawableText.atk,69,313) mText(drawableText.eff,69,433) end, - score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, + score=function(P)return{P.stat.atk<=200 and P.stat.atk or 200,P.stat.time}end, + scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=126 and 4 or - L>=80 and 3 or - L>=50 and 2 or - L>=20 and 1 or - L>=5 and 0 + local L=P.stat.atk + if L>=200 then + local T=P.stat.time + return + T<120 and 5 or + T<150 and 4 or + 3 + else + return + L>=150 and 3 or + L>=100 and 2 or + L>=60 and 1 or + L>=20 and 0 + end end, } \ No newline at end of file