diff --git a/parts/eventsets/classic_e.lua b/parts/eventsets/classic_e.lua index fc45ff67..98061047 100644 --- a/parts/eventsets/classic_e.lua +++ b/parts/eventsets/classic_e.lua @@ -7,21 +7,21 @@ end local function GetGravity(lvl) lvl=lvl%256 return - lvl==0 and 48 or - lvl==1 and 43 or - lvl==2 and 38 or - lvl==3 and 33 or - lvl==4 and 28 or - lvl==5 and 23 or - lvl==6 and 18 or - lvl==7 and 13 or - lvl==8 and 8 or - lvl==9 and 6 or - lvl<13 and 5 or - lvl<16 and 4 or - lvl<19 and 3 or - lvl<29 and 2 or - 1 + lvl==0 and 48 or + lvl==1 and 43 or + lvl==2 and 38 or + lvl==3 and 33 or + lvl==4 and 28 or + lvl==5 and 23 or + lvl==6 and 18 or + lvl==7 and 13 or + lvl==8 and 8 or + lvl==9 and 6 or + lvl<13 and 5 or + lvl<16 and 4 or + lvl<19 and 3 or + lvl<29 and 2 or + 1 end return { das=16,arr=6, diff --git a/parts/eventsets/classic_h.lua b/parts/eventsets/classic_h.lua index be1ebb52..0cd353e5 100644 --- a/parts/eventsets/classic_h.lua +++ b/parts/eventsets/classic_h.lua @@ -7,21 +7,21 @@ end local function GetGravity(lvl) lvl=lvl%256 return - lvl==0 and 48 or - lvl==1 and 43 or - lvl==2 and 38 or - lvl==3 and 33 or - lvl==4 and 28 or - lvl==5 and 23 or - lvl==6 and 18 or - lvl==7 and 13 or - lvl==8 and 8 or - lvl==9 and 6 or - lvl<13 and 5 or - lvl<16 and 4 or - lvl<19 and 3 or - lvl<29 and 2 or - 1 + lvl==0 and 48 or + lvl==1 and 43 or + lvl==2 and 38 or + lvl==3 and 33 or + lvl==4 and 28 or + lvl==5 and 23 or + lvl==6 and 18 or + lvl==7 and 13 or + lvl==8 and 8 or + lvl==9 and 6 or + lvl<13 and 5 or + lvl<16 and 4 or + lvl<19 and 3 or + lvl<29 and 2 or + 1 end return { das=16,arr=6, diff --git a/parts/eventsets/classic_l.lua b/parts/eventsets/classic_l.lua index a2d2f176..1b603412 100644 --- a/parts/eventsets/classic_l.lua +++ b/parts/eventsets/classic_l.lua @@ -7,21 +7,21 @@ end local function GetGravity(lvl) lvl=lvl%256 return - lvl==0 and 48 or - lvl==1 and 43 or - lvl==2 and 38 or - lvl==3 and 33 or - lvl==4 and 28 or - lvl==5 and 23 or - lvl==6 and 18 or - lvl==7 and 13 or - lvl==8 and 8 or - lvl==9 and 6 or - lvl<13 and 5 or - lvl<16 and 4 or - lvl<19 and 3 or - lvl<29 and 2 or - 1 + lvl==0 and 48 or + lvl==1 and 43 or + lvl==2 and 38 or + lvl==3 and 33 or + lvl==4 and 28 or + lvl==5 and 23 or + lvl==6 and 18 or + lvl==7 and 13 or + lvl==8 and 8 or + lvl==9 and 6 or + lvl<13 and 5 or + lvl<16 and 4 or + lvl<19 and 3 or + lvl<29 and 2 or + 1 end return { das=16,arr=6, diff --git a/parts/eventsets/master_g.lua b/parts/eventsets/master_g.lua index 810a74e4..ddf28238 100644 --- a/parts/eventsets/master_g.lua +++ b/parts/eventsets/master_g.lua @@ -15,54 +15,54 @@ local cool_time={3120,3120,2940,2700,2700,2520,2520,2280,2280,0} local regret_time= {5400,4500,4500,4080,3600,3600,3000,3000,3000,3000} local function getGrav(l) return - l<30 and 64 or - l<35 and 43 or - l<40 and 32 or - l<50 and 26 or - l<60 and 21 or - l<70 and 16 or - l<80 and 8 or - l<90 and 6 or - l<120 and 4 or - l<160 and 3 or - l<200 and 2 or - l<220 and 64 or - l<230 and 8 or - l<233 and 4 or - l<236 and 3 or - l<243 and 2 or - l<300 and 1 or - l<360 and 0.5 or - l<450 and 0.25 or - 0 + l<30 and 64 or + l<35 and 43 or + l<40 and 32 or + l<50 and 26 or + l<60 and 21 or + l<70 and 16 or + l<80 and 8 or + l<90 and 6 or + l<120 and 4 or + l<160 and 3 or + l<200 and 2 or + l<220 and 64 or + l<230 and 8 or + l<233 and 4 or + l<236 and 3 or + l<243 and 2 or + l<300 and 1 or + l<360 and 0.5 or + l<450 and 0.25 or + 0 end local function getLock(l) return - l<900 and 30 or - l<1100 and 19 or - 15 + l<900 and 30 or + l<1100 and 19 or + 15 end local function getWait(l) return - l<700 and 23 or - l<800 and 16 or - l<1000 and 12 or - l<1100 and 7 or - 6 + l<700 and 23 or + l<800 and 16 or + l<1000 and 12 or + l<1100 and 7 or + 6 end local function getFall(l) return - l<500 and 25 or - l<600 and 18 or - l<700 and 12 or - l<800 and 8 or - 4 + l<500 and 25 or + l<600 and 18 or + l<700 and 12 or + l<800 and 8 or + 4 end local function getDas(l) return - l<500 and 10 or - l<900 and 8 or - 6 + l<500 and 10 or + l<900 and 8 or + 6 end local function getCurrentGrade(D) if not D.int_grade then D.int_grade=0 end diff --git a/parts/modes/attacker_h.lua b/parts/modes/attacker_h.lua index a66f3ea2..5387c1b6 100644 --- a/parts/modes/attacker_h.lua +++ b/parts/modes/attacker_h.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=50 and 5 or - W>=40 and 4 or - W>=30 and 3 or - W>=20 and 2 or - W>=10 and 1 or - W>=5 and 0 + W>=50 and 5 or + W>=40 and 4 or + W>=30 and 3 or + W>=20 and 2 or + W>=10 and 1 or + W>=5 and 0 end, } diff --git a/parts/modes/attacker_u.lua b/parts/modes/attacker_u.lua index 95ded0d2..ad169c6d 100644 --- a/parts/modes/attacker_u.lua +++ b/parts/modes/attacker_u.lua @@ -12,11 +12,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=50 and 5 or - W>=40 and 4 or - W>=30 and 3 or - W>=20 and 2 or - W>=10 and 1 or - W>=5 and 0 + W>=50 and 5 or + W>=40 and 4 or + W>=30 and 3 or + W>=20 and 2 or + W>=10 and 1 or + W>=5 and 0 end, } diff --git a/parts/modes/backfire_h.lua b/parts/modes/backfire_h.lua index 2a0ac157..56aeeafa 100644 --- a/parts/modes/backfire_h.lua +++ b/parts/modes/backfire_h.lua @@ -21,14 +21,14 @@ return { if L>=100 then local T=P.stat.time return - T<50 and 5 or - T<65 and 4 or - T<100 and 3 or - T<130 and 2 or - 1 + T<50 and 5 or + T<65 and 4 or + T<100 and 3 or + T<130 and 2 or + 1 else return - L>=50 and 0 + L>=50 and 0 end end, } diff --git a/parts/modes/backfire_l.lua b/parts/modes/backfire_l.lua index 4da3dce1..2111c955 100644 --- a/parts/modes/backfire_l.lua +++ b/parts/modes/backfire_l.lua @@ -21,14 +21,14 @@ return { if L>=100 then local T=P.stat.time return - T<55 and 5 or - T<70 and 4 or - T<110 and 3 or - T<150 and 2 or - 1 + T<55 and 5 or + T<70 and 4 or + T<110 and 3 or + T<150 and 2 or + 1 else return - L>=50 and 0 + L>=50 and 0 end end, } diff --git a/parts/modes/backfire_n.lua b/parts/modes/backfire_n.lua index 96adcf20..8f3918aa 100644 --- a/parts/modes/backfire_n.lua +++ b/parts/modes/backfire_n.lua @@ -20,14 +20,14 @@ return { if L>=100 then local T=P.stat.time return - T<45 and 5 or - T<60 and 4 or - T<90 and 3 or - T<120 and 2 or - 1 + T<45 and 5 or + T<60 and 4 or + T<90 and 3 or + T<120 and 2 or + 1 else return - L>=50 and 0 + L>=50 and 0 end end, } diff --git a/parts/modes/backfire_u.lua b/parts/modes/backfire_u.lua index bf08d84e..84765432 100644 --- a/parts/modes/backfire_u.lua +++ b/parts/modes/backfire_u.lua @@ -21,14 +21,14 @@ return { if L>=100 then local T=P.stat.time return - T<60 and 5 or - T<80 and 4 or - T<120 and 3 or - T<180 and 2 or - 1 + T<60 and 5 or + T<80 and 4 or + T<120 and 3 or + T<180 and 2 or + 1 else return - L>=50 and 0 + L>=50 and 0 end end, } diff --git a/parts/modes/big_h.lua b/parts/modes/big_h.lua index c7428572..02d53cd9 100644 --- a/parts/modes/big_h.lua +++ b/parts/modes/big_h.lua @@ -15,14 +15,14 @@ return { if L>=200 then local T=P.stat.time return - T<=120 and 5 or - T<=180 and 4 or - 3 + T<=120 and 5 or + T<=180 and 4 or + 3 else return - L>=100 and 2 or - L>=50 and 1 or - L>=10 and 0 + L>=100 and 2 or + L>=50 and 1 or + L>=10 and 0 end end, } diff --git a/parts/modes/big_n.lua b/parts/modes/big_n.lua index 8a3e95c6..4ac1bcb9 100644 --- a/parts/modes/big_n.lua +++ b/parts/modes/big_n.lua @@ -15,14 +15,14 @@ return { if L>=200 then local T=P.stat.time return - T<=120 and 5 or - T<=180 and 4 or - 3 + T<=120 and 5 or + T<=180 and 4 or + 3 else return - L>=150 and 2 or - L>=100 and 1 or - L>=20 and 0 + L>=150 and 2 or + L>=100 and 1 or + L>=20 and 0 end end, } diff --git a/parts/modes/blind_e.lua b/parts/modes/blind_e.lua index bfeb4906..8ec28a09 100644 --- a/parts/modes/blind_e.lua +++ b/parts/modes/blind_e.lua @@ -15,15 +15,15 @@ return { if L>=200 then local T=P.stat.time return - T<=140 and 5 or - T<=200 and 4 or - 3 + T<=140 and 5 or + T<=200 and 4 or + 3 else return - L>=150 and 3 or - L>=100 and 2 or - L>=40 and 1 or - L>=1 and 0 + L>=150 and 3 or + L>=100 and 2 or + L>=40 and 1 or + L>=1 and 0 end end, } diff --git a/parts/modes/blind_h.lua b/parts/modes/blind_h.lua index 528c6c67..3ced0bbc 100644 --- a/parts/modes/blind_h.lua +++ b/parts/modes/blind_h.lua @@ -18,15 +18,15 @@ return { if L>=200 then local T=P.stat.time return - T<=180 and 5 or - T<=240 and 4 or - 3 + T<=180 and 5 or + T<=240 and 4 or + 3 else return - L>=150 and 3 or - L>=90 and 2 or - L>=40 and 1 or - L>=1 and 0 + L>=150 and 3 or + L>=90 and 2 or + L>=40 and 1 or + L>=1 and 0 end end, } diff --git a/parts/modes/blind_l.lua b/parts/modes/blind_l.lua index 06aa6d9d..7d309a60 100644 --- a/parts/modes/blind_l.lua +++ b/parts/modes/blind_l.lua @@ -19,15 +19,15 @@ return { if L>=200 then local T=P.stat.time return - T<=200 and 5 or - T<=250 and 4 or - 3 + T<=200 and 5 or + T<=250 and 4 or + 3 else return - L>=150 and 3 or - L>=100 and 2 or - L>=40 and 1 or - L>=1 and 0 + L>=150 and 3 or + L>=100 and 2 or + L>=40 and 1 or + L>=1 and 0 end end, } diff --git a/parts/modes/blind_n.lua b/parts/modes/blind_n.lua index 1afb4e2c..5f5f2a26 100644 --- a/parts/modes/blind_n.lua +++ b/parts/modes/blind_n.lua @@ -15,15 +15,15 @@ return { if L>=200 then local T=P.stat.time return - T<=180 and 5 or - T<=220 and 4 or - 3 + T<=180 and 5 or + T<=220 and 4 or + 3 else return - L>=126 and 3 or - L>=80 and 2 or - L>=40 and 1 or - L>=1 and 0 + L>=126 and 3 or + L>=80 and 2 or + L>=40 and 1 or + L>=1 and 0 end end, } diff --git a/parts/modes/blind_u.lua b/parts/modes/blind_u.lua index 42a01e91..6cca11ff 100644 --- a/parts/modes/blind_u.lua +++ b/parts/modes/blind_u.lua @@ -16,11 +16,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=100 and 5 or - L>=75 and 4 or - L>=50 and 3 or - L>=26 and 2 or - L>=10 and 1 or - L>=1 and 0 + L>=100 and 5 or + L>=75 and 4 or + L>=50 and 3 or + L>=26 and 2 or + L>=10 and 1 or + L>=1 and 0 end, } diff --git a/parts/modes/blind_wtf.lua b/parts/modes/blind_wtf.lua index 0b72b81b..052a87d2 100644 --- a/parts/modes/blind_wtf.lua +++ b/parts/modes/blind_wtf.lua @@ -65,11 +65,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=40 and 5 or - L>=30 and 4 or - L>=20 and 3 or - L>=10 and 2 or - L>=5 and 1 or - L>=2 and 0 + L>=40 and 5 or + L>=30 and 4 or + L>=20 and 3 or + L>=10 and 2 or + L>=5 and 1 or + L>=2 and 0 end, } diff --git a/parts/modes/c4wtrain_l.lua b/parts/modes/c4wtrain_l.lua index d6125ec4..182fa235 100644 --- a/parts/modes/c4wtrain_l.lua +++ b/parts/modes/c4wtrain_l.lua @@ -14,15 +14,15 @@ return { if L==100 then local T=P.stat.time return - T<=40 and 5 or - T<=60 and 4 or - 3 + T<=40 and 5 or + T<=60 and 4 or + 3 else return - L>=70 and 3 or - L>=40 and 2 or - L>=20 and 1 or - L>=5 and 0 + L>=70 and 3 or + L>=40 and 2 or + L>=20 and 1 or + L>=5 and 0 end end, } diff --git a/parts/modes/c4wtrain_n.lua b/parts/modes/c4wtrain_n.lua index 62f75974..564542ae 100644 --- a/parts/modes/c4wtrain_n.lua +++ b/parts/modes/c4wtrain_n.lua @@ -14,15 +14,15 @@ return { if L>=100 then local T=P.stat.time return - T<=32 and 5 or - T<=50 and 4 or - T<=80 and 3 or - 2 + T<=32 and 5 or + T<=50 and 4 or + T<=80 and 3 or + 2 else return - L>=60 and 2 or - L>=30 and 1 or - L>=10 and 0 + L>=60 and 2 or + L>=30 and 1 or + L>=10 and 0 end end, } diff --git a/parts/modes/classic_e.lua b/parts/modes/classic_e.lua index 4503bdba..a01e78c0 100644 --- a/parts/modes/classic_e.lua +++ b/parts/modes/classic_e.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=140 and 4 or - L>=100 and 3 or - L>=60 and 2 or - L>=30 and 1 or - L>=10 and 0 + L>=200 and 5 or + L>=140 and 4 or + L>=100 and 3 or + L>=60 and 2 or + L>=30 and 1 or + L>=10 and 0 end, } diff --git a/parts/modes/classic_h.lua b/parts/modes/classic_h.lua index f5ab8fb0..c824790b 100644 --- a/parts/modes/classic_h.lua +++ b/parts/modes/classic_h.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=140 and 4 or - L>=100 and 3 or - L>=60 and 2 or - L>=30 and 1 or - L>=1 and 0 + L>=200 and 5 or + L>=140 and 4 or + L>=100 and 3 or + L>=60 and 2 or + L>=30 and 1 or + L>=1 and 0 end, } diff --git a/parts/modes/classic_l.lua b/parts/modes/classic_l.lua index 472772dc..8283b2ef 100644 --- a/parts/modes/classic_l.lua +++ b/parts/modes/classic_l.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=140 and 4 or - L>=100 and 3 or - L>=60 and 2 or - L>=30 and 1 or - L>=1 and 0 + L>=200 and 5 or + L>=140 and 4 or + L>=100 and 3 or + L>=60 and 2 or + L>=30 and 1 or + L>=1 and 0 end, } \ No newline at end of file diff --git a/parts/modes/classic_u.lua b/parts/modes/classic_u.lua index ab89b63c..f3f0cd89 100644 --- a/parts/modes/classic_u.lua +++ b/parts/modes/classic_u.lua @@ -13,10 +13,10 @@ return { getRank=function(P) local L=P.stat.row return - L>=15 and 5 or - L>=10 and 4 or - L>=6 and 3 or - L>=3 and 2 or - L>=1 and 1 + L>=15 and 5 or + L>=10 and 4 or + L>=6 and 3 or + L>=3 and 2 or + L>=1 and 1 end, } diff --git a/parts/modes/defender_l.lua b/parts/modes/defender_l.lua index d8603247..a4365b88 100644 --- a/parts/modes/defender_l.lua +++ b/parts/modes/defender_l.lua @@ -12,11 +12,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=100 and 5 or - W>=80 and 4 or - W>=55 and 3 or - W>=30 and 2 or - W>=20 and 1 or - W>=5 and 0 + W>=100 and 5 or + W>=80 and 4 or + W>=55 and 3 or + W>=30 and 2 or + W>=20 and 1 or + W>=5 and 0 end, } diff --git a/parts/modes/defender_n.lua b/parts/modes/defender_n.lua index 9d799fca..3abc430c 100644 --- a/parts/modes/defender_n.lua +++ b/parts/modes/defender_n.lua @@ -12,11 +12,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=120 and 5 or - W>=100 and 4 or - W>=70 and 3 or - W>=40 and 2 or - W>=10 and 1 or - W>=3 and 0 + W>=120 and 5 or + W>=100 and 4 or + W>=70 and 3 or + W>=40 and 2 or + W>=10 and 1 or + W>=3 and 0 end, } diff --git a/parts/modes/dig_100l.lua b/parts/modes/dig_100l.lua index 4469bbac..457d993b 100644 --- a/parts/modes/dig_100l.lua +++ b/parts/modes/dig_100l.lua @@ -11,11 +11,11 @@ return { if P.stat.dig<100 then return end local T=P.stat.time return - T<=120 and 5 or - T<=160 and 4 or - T<=240 and 3 or - T<=360 and 2 or - T<=480 and 1 or - 0 + T<=120 and 5 or + T<=160 and 4 or + T<=240 and 3 or + T<=360 and 2 or + T<=480 and 1 or + 0 end, } diff --git a/parts/modes/dig_10l.lua b/parts/modes/dig_10l.lua index c5cbd5cc..4c3f78ae 100644 --- a/parts/modes/dig_10l.lua +++ b/parts/modes/dig_10l.lua @@ -11,11 +11,11 @@ return { if P.stat.dig<10 then return end local T=P.stat.time return - T<=7 and 5 or - T<=12 and 4 or - T<=20 and 3 or - T<=40 and 2 or - T<=60 and 1 or - 0 + T<=7 and 5 or + T<=12 and 4 or + T<=20 and 3 or + T<=40 and 2 or + T<=60 and 1 or + 0 end, } diff --git a/parts/modes/dig_400l.lua b/parts/modes/dig_400l.lua index bcbffe0f..65a14263 100644 --- a/parts/modes/dig_400l.lua +++ b/parts/modes/dig_400l.lua @@ -11,11 +11,11 @@ return { if P.stat.dig<400 then return end local T=P.stat.time return - T<=540 and 5 or - T<=720 and 4 or - T<=960 and 3 or - T<=1500 and 2 or - T<=1800 and 1 or - 0 + T<=540 and 5 or + T<=720 and 4 or + T<=960 and 3 or + T<=1500 and 2 or + T<=1800 and 1 or + 0 end, } diff --git a/parts/modes/dig_40l.lua b/parts/modes/dig_40l.lua index c4276f3c..20fd78de 100644 --- a/parts/modes/dig_40l.lua +++ b/parts/modes/dig_40l.lua @@ -11,11 +11,11 @@ return { if P.stat.dig<40 then return end local T=P.stat.time return - T<=50 and 5 or - T<=70 and 4 or - T<=90 and 3 or - T<=120 and 2 or - T<=180 and 1 or - 0 + T<=50 and 5 or + T<=70 and 4 or + T<=90 and 3 or + T<=120 and 2 or + T<=180 and 1 or + 0 end, } diff --git a/parts/modes/dig_eff_100l.lua b/parts/modes/dig_eff_100l.lua index f3b38d08..fa3e6782 100644 --- a/parts/modes/dig_eff_100l.lua +++ b/parts/modes/dig_eff_100l.lua @@ -13,11 +13,11 @@ return { if P.stat.dig<100 then return end local P=P.stat.piece return - P<=250 and 5 or - P<=300 and 4 or - P<=370 and 3 or - P<=450 and 2 or - P<=550 and 1 or - 0 + P<=250 and 5 or + P<=300 and 4 or + P<=370 and 3 or + P<=450 and 2 or + P<=550 and 1 or + 0 end, } diff --git a/parts/modes/dig_eff_10l.lua b/parts/modes/dig_eff_10l.lua index 4caa0a24..6112ce02 100644 --- a/parts/modes/dig_eff_10l.lua +++ b/parts/modes/dig_eff_10l.lua @@ -13,11 +13,11 @@ return { if P.stat.dig<10 then return end local P=P.stat.piece return - P<=14 and 5 or - P<=20 and 4 or - P<=25 and 3 or - P<=30 and 2 or - P<=40 and 1 or - 0 + P<=14 and 5 or + P<=20 and 4 or + P<=25 and 3 or + P<=30 and 2 or + P<=40 and 1 or + 0 end, } diff --git a/parts/modes/dig_eff_400l.lua b/parts/modes/dig_eff_400l.lua index c2b1432f..a37a5507 100644 --- a/parts/modes/dig_eff_400l.lua +++ b/parts/modes/dig_eff_400l.lua @@ -13,11 +13,11 @@ return { if P.stat.dig<400 then return end local P=P.stat.piece return - P<=1120 and 5 or - P<=1280 and 4 or - P<=1440 and 3 or - P<=1600 and 2 or - P<=1800 and 1 or - 0 + P<=1120 and 5 or + P<=1280 and 4 or + P<=1440 and 3 or + P<=1600 and 2 or + P<=1800 and 1 or + 0 end, } diff --git a/parts/modes/dig_eff_40l.lua b/parts/modes/dig_eff_40l.lua index 5c15e492..41805d19 100644 --- a/parts/modes/dig_eff_40l.lua +++ b/parts/modes/dig_eff_40l.lua @@ -13,11 +13,11 @@ return { if P.stat.dig<40 then return end local P=P.stat.piece return - P<=95 and 5 or - P<=115 and 4 or - P<=130 and 3 or - P<=160 and 2 or - P<=200 and 1 or - 0 + P<=95 and 5 or + P<=115 and 4 or + P<=130 and 3 or + P<=160 and 2 or + P<=200 and 1 or + 0 end, } diff --git a/parts/modes/dig_h.lua b/parts/modes/dig_h.lua index 0e4a0ebc..65e09e1a 100644 --- a/parts/modes/dig_h.lua +++ b/parts/modes/dig_h.lua @@ -12,11 +12,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=150 and 5 or - W>=110 and 4 or - W>=80 and 3 or - W>=50 and 2 or - W>=20 and 1 or - P.stat.row>=5 and 0 + W>=150 and 5 or + W>=110 and 4 or + W>=80 and 3 or + W>=50 and 2 or + W>=20 and 1 or + P.stat.row>=5 and 0 end, } diff --git a/parts/modes/dig_quad_10l.lua b/parts/modes/dig_quad_10l.lua index abf43226..a1c9038d 100644 --- a/parts/modes/dig_quad_10l.lua +++ b/parts/modes/dig_quad_10l.lua @@ -39,11 +39,11 @@ return { local piece = P.stat.piece if dig < 4 then return end return - dig < 7 and 0 or - dig < 10 and 1 or - piece > 103 and 2 or - piece > 92 and 3 or - piece > 81 and 4 or - 5 + dig < 7 and 0 or + dig < 10 and 1 or + piece > 103 and 2 or + piece > 92 and 3 or + piece > 81 and 4 or + 5 end, } diff --git a/parts/modes/dig_u.lua b/parts/modes/dig_u.lua index 3040eee4..ce8480b5 100644 --- a/parts/modes/dig_u.lua +++ b/parts/modes/dig_u.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=150 and 5 or - W>=110 and 4 or - W>=80 and 3 or - W>=50 and 2 or - W>=20 and 1 or - P.stat.row>=5 and 0 + W>=150 and 5 or + W>=110 and 4 or + W>=80 and 3 or + W>=50 and 2 or + W>=20 and 1 or + P.stat.row>=5 and 0 end, } diff --git a/parts/modes/drought_l.lua b/parts/modes/drought_l.lua index e1a3b50e..9f8ab44e 100644 --- a/parts/modes/drought_l.lua +++ b/parts/modes/drought_l.lua @@ -85,15 +85,15 @@ return { if L>=100 then local T=P.stat.time return - T<=110 and 5 or - T<=126 and 4 or - T<=160 and 3 or - T<=240 and 2 or - 1 + T<=110 and 5 or + T<=126 and 4 or + T<=160 and 3 or + T<=240 and 2 or + 1 else return - L>=50 and 1 or - L>=10 and 0 + L>=50 and 1 or + L>=10 and 0 end end, } diff --git a/parts/modes/drought_n.lua b/parts/modes/drought_n.lua index 5b2be90e..e9e1dd8e 100644 --- a/parts/modes/drought_n.lua +++ b/parts/modes/drought_n.lua @@ -17,15 +17,15 @@ return { if L>=100 then local T=P.stat.time return - T<=80 and 5 or - T<=100 and 4 or - T<=150 and 3 or - T<=210 and 2 or - 1 + T<=80 and 5 or + T<=100 and 4 or + T<=150 and 3 or + T<=210 and 2 or + 1 else return - L>=50 and 1 or - L>=10 and 0 + L>=50 and 1 or + L>=10 and 0 end end, } diff --git a/parts/modes/marathon_bfmax.lua b/parts/modes/marathon_bfmax.lua index 1408600a..f47e501c 100644 --- a/parts/modes/marathon_bfmax.lua +++ b/parts/modes/marathon_bfmax.lua @@ -11,14 +11,14 @@ return { if L>=200 then local T=P.stat.time return - T<=400 and 5 or - T<=600 and 4 or - 3 + T<=400 and 5 or + T<=600 and 4 or + 3 else return - L>=150 and 2 or - L>=80 and 1 or - L>=20 and 0 + L>=150 and 2 or + L>=80 and 1 or + L>=20 and 0 end end, } diff --git a/parts/modes/marathon_h.lua b/parts/modes/marathon_h.lua index 5cee731b..c22db668 100644 --- a/parts/modes/marathon_h.lua +++ b/parts/modes/marathon_h.lua @@ -15,14 +15,14 @@ return { if L>=200 then local T=P.stat.time return - T<=240 and 5 or - T<=360 and 4 or - 3 + T<=240 and 5 or + T<=360 and 4 or + 3 else return - L>=100 and 2 or - L>=50 and 1 or - L>=10 and 0 + L>=100 and 2 or + L>=50 and 1 or + L>=10 and 0 end end, } diff --git a/parts/modes/marathon_n.lua b/parts/modes/marathon_n.lua index 5184e53f..ba38cd64 100644 --- a/parts/modes/marathon_n.lua +++ b/parts/modes/marathon_n.lua @@ -15,14 +15,14 @@ return { if L>=200 then local T=P.stat.time return - T<=240 and 5 or - T<=360 and 4 or - 3 + T<=240 and 5 or + T<=360 and 4 or + 3 else return - L>=150 and 2 or - L>=100 and 1 or - L>=20 and 0 + L>=150 and 2 or + L>=100 and 1 or + L>=20 and 0 end end, } diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index 3b17d017..6b96af28 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local S=P.modeData.pt return - S>=1000 and 5 or - S>=800 and 4 or - S>=600 and 3 or - S>=400 and 2 or - S>=200 and 1 or - S>=50 and 0 + S>=1000 and 5 or + S>=800 and 4 or + S>=600 and 3 or + S>=400 and 2 or + S>=200 and 1 or + S>=50 and 0 end, } diff --git a/parts/modes/master_m.lua b/parts/modes/master_m.lua index 968df227..9bf41cc0 100644 --- a/parts/modes/master_m.lua +++ b/parts/modes/master_m.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=140 and 4 or - L>=100 and 3 or - L>=70 and 2 or - L>=30 and 1 or - L>=5 and 0 + L>=200 and 5 or + L>=140 and 4 or + L>=100 and 3 or + L>=70 and 2 or + L>=30 and 1 or + L>=5 and 0 end, } diff --git a/parts/modes/master_ph.lua b/parts/modes/master_ph.lua index 00f88459..bd393edf 100644 --- a/parts/modes/master_ph.lua +++ b/parts/modes/master_ph.lua @@ -10,11 +10,11 @@ return { getRank=function(P) local p=P.modeData.pt return - P.result=='win' and 5 or - p>=226 and 4 or - p>=162 and 3 or - p>=62 and 2 or - p>=42 and 1 or - p>=26 and 0 + P.result=='win' and 5 or + p>=226 and 4 or + p>=162 and 3 or + p>=62 and 2 or + p>=42 and 1 or + p>=26 and 0 end, } diff --git a/parts/modes/pc_h.lua b/parts/modes/pc_h.lua index b9424b27..36ad474a 100644 --- a/parts/modes/pc_h.lua +++ b/parts/modes/pc_h.lua @@ -18,11 +18,11 @@ return { getRank=function(P) local L=P.stat.pc return - L>=24 and 5 or - L>=20 and 4 or - L>=16 and 3 or - L>=12 and 2 or - L>=8 and 1 or - L>=1 and 0 + L>=24 and 5 or + L>=20 and 4 or + L>=16 and 3 or + L>=12 and 2 or + L>=8 and 1 or + L>=1 and 0 end, } diff --git a/parts/modes/pc_inf.lua b/parts/modes/pc_inf.lua index 6981e551..19b860a1 100644 --- a/parts/modes/pc_inf.lua +++ b/parts/modes/pc_inf.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local L=P.stat.pc return - L>=50 and 5 or - L>=40 and 4 or - L>=30 and 3 or - L>=20 and 2 or - L>=10 and 1 or - L>=5 and 0 + L>=50 and 5 or + L>=40 and 4 or + L>=30 and 3 or + L>=20 and 2 or + L>=10 and 1 or + L>=5 and 0 end, } diff --git a/parts/modes/pc_l.lua b/parts/modes/pc_l.lua index 5df7a76f..1b298d4a 100644 --- a/parts/modes/pc_l.lua +++ b/parts/modes/pc_l.lua @@ -18,11 +18,11 @@ return { getRank=function(P) local L=P.stat.pc return - L>=24 and 5 or - L>=20 and 4 or - L>=16 and 3 or - L>=12 and 2 or - L>=8 and 1 or - L>=1 and 0 + L>=24 and 5 or + L>=20 and 4 or + L>=16 and 3 or + L>=12 and 2 or + L>=8 and 1 or + L>=1 and 0 end, } diff --git a/parts/modes/pc_n.lua b/parts/modes/pc_n.lua index 2d8928e5..6cfc927c 100644 --- a/parts/modes/pc_n.lua +++ b/parts/modes/pc_n.lua @@ -16,11 +16,11 @@ return { getRank=function(P) local L=P.stat.pc return - L>=24 and 5 or - L>=20 and 4 or - L>=16 and 3 or - L>=12 and 2 or - L>=8 and 1 or - L>=1 and 0 + L>=24 and 5 or + L>=20 and 4 or + L>=16 and 3 or + L>=12 and 2 or + L>=8 and 1 or + L>=1 and 0 end, } diff --git a/parts/modes/pctrain_l.lua b/parts/modes/pctrain_l.lua index e672667c..b42e54dc 100644 --- a/parts/modes/pctrain_l.lua +++ b/parts/modes/pctrain_l.lua @@ -14,11 +14,11 @@ return { getRank=function(P) local L=P.stat.pc return - L>=50 and 5 or - L>=42 and 4 or - L>=26 and 3 or - L>=18 and 2 or - L>=10 and 1 or - L>=3 and 0 + L>=50 and 5 or + L>=42 and 4 or + L>=26 and 3 or + L>=18 and 2 or + L>=10 and 1 or + L>=3 and 0 end, } diff --git a/parts/modes/pctrain_n.lua b/parts/modes/pctrain_n.lua index 79762437..4e8a98a1 100644 --- a/parts/modes/pctrain_n.lua +++ b/parts/modes/pctrain_n.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local L=P.stat.pc return - L>=60 and 5 or - L>=42 and 4 or - L>=26 and 3 or - L>=18 and 2 or - L>=10 and 1 or - L>=2 and 0 + L>=60 and 5 or + L>=42 and 4 or + L>=26 and 3 or + L>=18 and 2 or + L>=10 and 1 or + L>=2 and 0 end, } diff --git a/parts/modes/round_e.lua b/parts/modes/round_e.lua index 0d6bad4e..cee22969 100644 --- a/parts/modes/round_e.lua +++ b/parts/modes/round_e.lua @@ -19,11 +19,11 @@ return { if P.result=='win' then local T=P.stat.piece return - T<=7*10 and 5 or - T<=7*13 and 4 or - T<=7*18 and 3 or - T<=7*26 and 2 or - 1 + T<=7*10 and 5 or + T<=7*13 and 4 or + T<=7*18 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 350f5e88..45c595ed 100644 --- a/parts/modes/round_h.lua +++ b/parts/modes/round_h.lua @@ -19,11 +19,11 @@ return { if P.result=='win' then local T=P.stat.piece return - T<=7*10 and 5 or - T<=7*13 and 4 or - T<=7*18 and 3 or - T<=7*26 and 2 or - 1 + T<=7*10 and 5 or + T<=7*13 and 4 or + T<=7*18 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 5ee1acad..2b2e8523 100644 --- a/parts/modes/round_l.lua +++ b/parts/modes/round_l.lua @@ -19,11 +19,11 @@ return { if P.result=='win' then local T=P.stat.piece return - T<=7*10 and 5 or - T<=7*13 and 4 or - T<=7*18 and 3 or - T<=7*26 and 2 or - 1 + T<=7*10 and 5 or + T<=7*13 and 4 or + T<=7*18 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 ecc92521..0245023c 100644 --- a/parts/modes/round_n.lua +++ b/parts/modes/round_n.lua @@ -19,11 +19,11 @@ return { if P.result=='win' then local T=P.stat.piece return - T<=7*10 and 5 or - T<=7*13 and 4 or - T<=7*18 and 3 or - T<=7*26 and 2 or - 1 + T<=7*10 and 5 or + T<=7*13 and 4 or + T<=7*18 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 67e98080..0b548549 100644 --- a/parts/modes/round_u.lua +++ b/parts/modes/round_u.lua @@ -19,11 +19,11 @@ return { if P.result=='win' then local T=P.stat.piece return - T<=7*10 and 5 or - T<=7*13 and 4 or - T<=7*18 and 3 or - T<=7*26 and 2 or - 1 + T<=7*10 and 5 or + T<=7*13 and 4 or + T<=7*18 and 3 or + T<=7*26 and 2 or + 1 end end, } diff --git a/parts/modes/secret_grade.lua b/parts/modes/secret_grade.lua index da8d55bc..7e7fbd99 100644 --- a/parts/modes/secret_grade.lua +++ b/parts/modes/secret_grade.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local G=P.modeData.rankPts return - G>=23 and 5 or - G>=21 and 4 or - G>=19 and 3 or - G>=15 and 2 or - G>=11 and 1 or - G>=7 and 0 + G>=23 and 5 or + G>=21 and 4 or + G>=19 and 3 or + G>=15 and 2 or + G>=11 and 1 or + G>=7 and 0 end, } diff --git a/parts/modes/solo_e.lua b/parts/modes/solo_e.lua index 20bed375..8eae9edd 100644 --- a/parts/modes/solo_e.lua +++ b/parts/modes/solo_e.lua @@ -16,11 +16,11 @@ return { if P.result=='win' then local T=P.stat.time return - T<=50 and 5 or - T<=80 and 4 or - T<=120 and 3 or - T<=180 and 2 or - 1 + T<=50 and 5 or + T<=80 and 4 or + T<=120 and 3 or + T<=180 and 2 or + 1 end end, } diff --git a/parts/modes/solo_h.lua b/parts/modes/solo_h.lua index ba05bfd8..0ea7d7b6 100644 --- a/parts/modes/solo_h.lua +++ b/parts/modes/solo_h.lua @@ -16,11 +16,11 @@ return { if P.result=='win' then local T=P.stat.time return - T<=50 and 5 or - T<=80 and 4 or - T<=120 and 3 or - T<=180 and 2 or - 1 + T<=50 and 5 or + T<=80 and 4 or + T<=120 and 3 or + T<=180 and 2 or + 1 end end, } diff --git a/parts/modes/solo_l.lua b/parts/modes/solo_l.lua index f032c17d..a638a309 100644 --- a/parts/modes/solo_l.lua +++ b/parts/modes/solo_l.lua @@ -16,9 +16,9 @@ return { if P.result=='win' then local L=P.life return - L>=2 and 5 or - L>=1 and 4 or - 3 + L>=2 and 5 or + L>=1 and 4 or + 3 end end, } diff --git a/parts/modes/solo_n.lua b/parts/modes/solo_n.lua index 796c839c..6f69d04a 100644 --- a/parts/modes/solo_n.lua +++ b/parts/modes/solo_n.lua @@ -16,11 +16,11 @@ return { if P.result=='win' then local T=P.stat.time return - T<=50 and 5 or - T<=80 and 4 or - T<=120 and 3 or - T<=180 and 2 or - 1 + T<=50 and 5 or + T<=80 and 4 or + T<=120 and 3 or + T<=180 and 2 or + 1 end end, } diff --git a/parts/modes/solo_u.lua b/parts/modes/solo_u.lua index dfbfff4f..86739e05 100644 --- a/parts/modes/solo_u.lua +++ b/parts/modes/solo_u.lua @@ -16,9 +16,9 @@ return { if P.result=='win' then local L=P.life return - L>=2 and 5 or - L>=1 and 4 or - 3 + L>=2 and 5 or + L>=1 and 4 or + 3 end end, } diff --git a/parts/modes/sprint123.lua b/parts/modes/sprint123.lua index 83a7d1da..d9d705e2 100644 --- a/parts/modes/sprint123.lua +++ b/parts/modes/sprint123.lua @@ -12,11 +12,11 @@ return { if P.stat.row<40 then return end local T=P.stat.time return - T<=42 and 5 or - T<=62 and 4 or - T<=104 and 3 or - T<=130 and 2 or - T<=160 and 1 or - 0 + T<=42 and 5 or + T<=62 and 4 or + T<=104 and 3 or + T<=130 and 2 or + T<=160 and 1 or + 0 end, } diff --git a/parts/modes/sprintAtk.lua b/parts/modes/sprintAtk.lua index 7b599c0f..4424826e 100644 --- a/parts/modes/sprintAtk.lua +++ b/parts/modes/sprintAtk.lua @@ -11,11 +11,11 @@ return { if P.stat.atk<100 then return end local T=P.stat.time return - T<40 and 5 or - T<50 and 4 or - T<70 and 3 or - T<100 and 2 or - T<150 and 1 or - 0 + T<40 and 5 or + T<50 and 4 or + T<70 and 3 or + T<100 and 2 or + T<150 and 1 or + 0 end, } diff --git a/parts/modes/sprintFix.lua b/parts/modes/sprintFix.lua index 5dd8ca54..3980daf1 100644 --- a/parts/modes/sprintFix.lua +++ b/parts/modes/sprintFix.lua @@ -9,14 +9,14 @@ return { local L=P.stat.row if L<40 then return - L>25 and 2 or - L>10 and 1 or - L>5 and 0 + L>25 and 2 or + L>10 and 1 or + L>5 and 0 end local T=P.stat.time return - T<=260 and 5 or - T<=420 and 4 or - 3 + T<=260 and 5 or + T<=420 and 4 or + 3 end, } diff --git a/parts/modes/sprintLock.lua b/parts/modes/sprintLock.lua index 857d8af4..6167a631 100644 --- a/parts/modes/sprintLock.lua +++ b/parts/modes/sprintLock.lua @@ -8,11 +8,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=40 and 5 or - L>=32 and 4 or - L>=24 and 3 or - L>=16 and 2 or - L>=10 and 1 or - L>=5 and 0 + L>=40 and 5 or + L>=32 and 4 or + L>=24 and 3 or + L>=16 and 2 or + L>=10 and 1 or + L>=5 and 0 end, } diff --git a/parts/modes/sprintMPH.lua b/parts/modes/sprintMPH.lua index bebede3b..6f8bd17a 100644 --- a/parts/modes/sprintMPH.lua +++ b/parts/modes/sprintMPH.lua @@ -13,11 +13,11 @@ return { if P.stat.row<40 then return end local T=P.stat.time return - T<=60 and 5 or - T<=70 and 4 or - T<=90 and 3 or - T<=110 and 2 or - T<=140 and 1 or - 0 + T<=60 and 5 or + T<=70 and 4 or + T<=90 and 3 or + T<=110 and 2 or + T<=140 and 1 or + 0 end, } diff --git a/parts/modes/sprintPenta.lua b/parts/modes/sprintPenta.lua index e8bcb412..784dfff2 100644 --- a/parts/modes/sprintPenta.lua +++ b/parts/modes/sprintPenta.lua @@ -12,11 +12,11 @@ return { if P.stat.row<40 then return end local T=P.stat.time return - T<=76 and 5 or - T<=90 and 4 or - T<=150 and 3 or - T<=260 and 2 or - T<=500 and 1 or - 0 + T<=76 and 5 or + T<=90 and 4 or + T<=150 and 3 or + T<=260 and 2 or + T<=500 and 1 or + 0 end, } diff --git a/parts/modes/sprintSmooth.lua b/parts/modes/sprintSmooth.lua index e868fadc..7d90ec3d 100644 --- a/parts/modes/sprintSmooth.lua +++ b/parts/modes/sprintSmooth.lua @@ -10,11 +10,11 @@ return { if P.stat.row<40 then return end local T=P.stat.time return - T<=30 and 5 or - T<=45 and 4 or - T<=60 and 3 or - T<=90 and 2 or - T<=150 and 1 or - 0 + T<=30 and 5 or + T<=45 and 4 or + T<=60 and 3 or + T<=90 and 2 or + T<=150 and 1 or + 0 end, } diff --git a/parts/modes/sprint_1000l.lua b/parts/modes/sprint_1000l.lua index a59dc78a..03b85bb5 100644 --- a/parts/modes/sprint_1000l.lua +++ b/parts/modes/sprint_1000l.lua @@ -11,11 +11,11 @@ return { if P.stat.row<1000 then return end local T=P.stat.time return - T<=750 and 5 or - T<=900 and 4 or - T<=1260 and 3 or - T<=1620 and 2 or - T<=2000 and 1 or - 0 + T<=750 and 5 or + T<=900 and 4 or + T<=1260 and 3 or + T<=1620 and 2 or + T<=2000 and 1 or + 0 end, } diff --git a/parts/modes/sprint_10l.lua b/parts/modes/sprint_10l.lua index 53efd048..b74a8287 100644 --- a/parts/modes/sprint_10l.lua +++ b/parts/modes/sprint_10l.lua @@ -11,11 +11,11 @@ return { if P.stat.row<10 then return end local T=P.stat.time return - T<=7 and 5 or - T<=10 and 4 or - T<=25 and 3 or - T<=40 and 2 or - T<=62 and 1 or - 0 + T<=7 and 5 or + T<=10 and 4 or + T<=25 and 3 or + T<=40 and 2 or + T<=62 and 1 or + 0 end, } diff --git a/parts/modes/sprint_20l.lua b/parts/modes/sprint_20l.lua index d094a4b2..daae8ed2 100644 --- a/parts/modes/sprint_20l.lua +++ b/parts/modes/sprint_20l.lua @@ -11,11 +11,11 @@ return { if P.stat.row<20 then return end local T=P.stat.time return - T<=13 and 5 or - T<=18 and 4 or - T<=32.6 and 3 or - T<=62.6 and 2 or - T<=126 and 1 or - 0 + T<=13 and 5 or + T<=18 and 4 or + T<=32.6 and 3 or + T<=62.6 and 2 or + T<=126 and 1 or + 0 end, } diff --git a/parts/modes/sprint_400l.lua b/parts/modes/sprint_400l.lua index 02aeaaf2..890ee57f 100644 --- a/parts/modes/sprint_400l.lua +++ b/parts/modes/sprint_400l.lua @@ -11,11 +11,11 @@ return { if P.stat.row<400 then return end local T=P.stat.time return - T<=300 and 5 or - T<=380 and 4 or - T<=500 and 3 or - T<=626 and 2 or - T<=800 and 1 or - 0 + T<=300 and 5 or + T<=380 and 4 or + T<=500 and 3 or + T<=626 and 2 or + T<=800 and 1 or + 0 end, } diff --git a/parts/modes/strategy_e.lua b/parts/modes/strategy_e.lua index e71dc72b..a51ed2f1 100644 --- a/parts/modes/strategy_e.lua +++ b/parts/modes/strategy_e.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=170 and 4 or - L>=150 and 3 or - L>=120 and 2 or - L>=60 and 1 or - L>=26 and 0 + L>=200 and 5 or + L>=170 and 4 or + L>=150 and 3 or + L>=120 and 2 or + L>=60 and 1 or + L>=26 and 0 end, } diff --git a/parts/modes/strategy_e_plus.lua b/parts/modes/strategy_e_plus.lua index 816ea039..b708f680 100644 --- a/parts/modes/strategy_e_plus.lua +++ b/parts/modes/strategy_e_plus.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=170 and 4 or - L>=150 and 3 or - L>=120 and 2 or - L>=60 and 1 or - L>=26 and 0 + L>=200 and 5 or + L>=170 and 4 or + L>=150 and 3 or + L>=120 and 2 or + L>=60 and 1 or + L>=26 and 0 end, } diff --git a/parts/modes/strategy_h.lua b/parts/modes/strategy_h.lua index b878f891..a5cdae3c 100644 --- a/parts/modes/strategy_h.lua +++ b/parts/modes/strategy_h.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=160 and 4 or - L>=120 and 3 or - L>=70 and 2 or - L>=40 and 1 or - L>=16 and 0 + L>=200 and 5 or + L>=160 and 4 or + L>=120 and 3 or + L>=70 and 2 or + L>=40 and 1 or + L>=16 and 0 end, } diff --git a/parts/modes/strategy_h_plus.lua b/parts/modes/strategy_h_plus.lua index 4149638c..ccc3368d 100644 --- a/parts/modes/strategy_h_plus.lua +++ b/parts/modes/strategy_h_plus.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=160 and 4 or - L>=120 and 3 or - L>=70 and 2 or - L>=40 and 1 or - L>=16 and 0 + L>=200 and 5 or + L>=160 and 4 or + L>=120 and 3 or + L>=70 and 2 or + L>=40 and 1 or + L>=16 and 0 end, } diff --git a/parts/modes/strategy_u.lua b/parts/modes/strategy_u.lua index 64d72e53..5578fbbb 100644 --- a/parts/modes/strategy_u.lua +++ b/parts/modes/strategy_u.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=150 and 4 or - L>=80 and 3 or - L>=40 and 2 or - L>=20 and 1 or - L>=10 and 0 + L>=200 and 5 or + L>=150 and 4 or + L>=80 and 3 or + L>=40 and 2 or + L>=20 and 1 or + L>=10 and 0 end, } diff --git a/parts/modes/strategy_u_plus.lua b/parts/modes/strategy_u_plus.lua index 919d72cc..e6fc5a3c 100644 --- a/parts/modes/strategy_u_plus.lua +++ b/parts/modes/strategy_u_plus.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=150 and 4 or - L>=80 and 3 or - L>=40 and 2 or - L>=20 and 1 or - L>=10 and 0 + L>=200 and 5 or + L>=150 and 4 or + L>=80 and 3 or + L>=40 and 2 or + L>=20 and 1 or + L>=10 and 0 end, } diff --git a/parts/modes/survivor_e.lua b/parts/modes/survivor_e.lua index 7473b3f1..88842620 100644 --- a/parts/modes/survivor_e.lua +++ b/parts/modes/survivor_e.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=100 and 5 or - W>=60 and 4 or - W>=45 and 3 or - W>=30 and 2 or - W>=15 and 1 or - W>=5 and 0 + W>=100 and 5 or + W>=60 and 4 or + W>=45 and 3 or + W>=30 and 2 or + W>=15 and 1 or + W>=5 and 0 end, } diff --git a/parts/modes/survivor_h.lua b/parts/modes/survivor_h.lua index 4256d39c..0cebd4a0 100644 --- a/parts/modes/survivor_h.lua +++ b/parts/modes/survivor_h.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=90 and 5 or - W>=60 and 4 or - W>=45 and 3 or - W>=30 and 2 or - W>=15 and 1 or - W>=5 and 0 + W>=90 and 5 or + W>=60 and 4 or + W>=45 and 3 or + W>=30 and 2 or + W>=15 and 1 or + W>=5 and 0 end, } diff --git a/parts/modes/survivor_l.lua b/parts/modes/survivor_l.lua index aa1679e2..cac9177a 100644 --- a/parts/modes/survivor_l.lua +++ b/parts/modes/survivor_l.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=110 and 5 or - W>=80 and 4 or - W>=55 and 3 or - W>=30 and 2 or - W>=15 and 1 or - W>=5 and 0 + W>=110 and 5 or + W>=80 and 4 or + W>=55 and 3 or + W>=30 and 2 or + W>=15 and 1 or + W>=5 and 0 end, } diff --git a/parts/modes/survivor_n.lua b/parts/modes/survivor_n.lua index 4c8f32aa..a97d62b5 100644 --- a/parts/modes/survivor_n.lua +++ b/parts/modes/survivor_n.lua @@ -11,11 +11,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=80 and 5 or - W>=55 and 4 or - W>=45 and 3 or - W>=30 and 2 or - W>=15 and 1 or - W>=5 and 0 + W>=80 and 5 or + W>=55 and 4 or + W>=45 and 3 or + W>=30 and 2 or + W>=15 and 1 or + W>=5 and 0 end, } diff --git a/parts/modes/survivor_u.lua b/parts/modes/survivor_u.lua index fec32998..6ac7cbd2 100644 --- a/parts/modes/survivor_u.lua +++ b/parts/modes/survivor_u.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local W=P.modeData.wave return - W>=35 and 5 or - W>=26 and 4 or - W>=20 and 3 or - W>=10 and 2 or - W>=5 and 1 or - W>=1 and 0 + W>=35 and 5 or + W>=26 and 4 or + W>=20 and 3 or + W>=10 and 2 or + W>=5 and 1 or + W>=1 and 0 end, } diff --git a/parts/modes/tech_finesse.lua b/parts/modes/tech_finesse.lua index d9c05809..4f086dd2 100644 --- a/parts/modes/tech_finesse.lua +++ b/parts/modes/tech_finesse.lua @@ -16,14 +16,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_finesse_f.lua b/parts/modes/tech_finesse_f.lua index bd0d14cb..76aa0fe1 100644 --- a/parts/modes/tech_finesse_f.lua +++ b/parts/modes/tech_finesse_f.lua @@ -37,14 +37,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_finesse_lock.lua b/parts/modes/tech_finesse_lock.lua index 4cc56bb2..5331053e 100644 --- a/parts/modes/tech_finesse_lock.lua +++ b/parts/modes/tech_finesse_lock.lua @@ -15,14 +15,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_finesse_lock_f.lua b/parts/modes/tech_finesse_lock_f.lua index 6e38ac79..a103d5e1 100644 --- a/parts/modes/tech_finesse_lock_f.lua +++ b/parts/modes/tech_finesse_lock_f.lua @@ -16,14 +16,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_h.lua b/parts/modes/tech_h.lua index daa0ff8c..a614f54e 100644 --- a/parts/modes/tech_h.lua +++ b/parts/modes/tech_h.lua @@ -14,14 +14,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_h_plus.lua b/parts/modes/tech_h_plus.lua index d6615369..a2ecc993 100644 --- a/parts/modes/tech_h_plus.lua +++ b/parts/modes/tech_h_plus.lua @@ -27,14 +27,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_l.lua b/parts/modes/tech_l.lua index 11a57dcf..f4af8a6e 100644 --- a/parts/modes/tech_l.lua +++ b/parts/modes/tech_l.lua @@ -14,14 +14,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_l_plus.lua b/parts/modes/tech_l_plus.lua index f8bf0c6b..62d992be 100644 --- a/parts/modes/tech_l_plus.lua +++ b/parts/modes/tech_l_plus.lua @@ -27,14 +27,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_n.lua b/parts/modes/tech_n.lua index f870ac73..081b9dd8 100644 --- a/parts/modes/tech_n.lua +++ b/parts/modes/tech_n.lua @@ -14,14 +14,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/tech_n_plus.lua b/parts/modes/tech_n_plus.lua index 913cba5b..fef7dec8 100644 --- a/parts/modes/tech_n_plus.lua +++ b/parts/modes/tech_n_plus.lua @@ -27,14 +27,14 @@ return { if A>=100 then local T=P.stat.time return - T<50 and 5 or - T<70 and 4 or - T<100 and 3 or - 2 + T<50 and 5 or + T<70 and 4 or + T<100 and 3 or + 2 else return - A>=60 and 1 or - A>=30 and 0 + A>=60 and 1 or + A>=30 and 0 end end, } diff --git a/parts/modes/techmino49_e.lua b/parts/modes/techmino49_e.lua index 4910c710..7640f4ae 100644 --- a/parts/modes/techmino49_e.lua +++ b/parts/modes/techmino49_e.lua @@ -45,11 +45,11 @@ return { getRank=function(P) local R=P.modeData.place return - R==1 and 5 or - R<=3 and 4 or - R<=5 and 3 or - R<=10 and 2 or - R<=15 and 1 or - R<=45 and 0 + R==1 and 5 or + R<=3 and 4 or + R<=5 and 3 or + R<=10 and 2 or + R<=15 and 1 or + R<=45 and 0 end, } diff --git a/parts/modes/techmino49_h.lua b/parts/modes/techmino49_h.lua index 736d97e4..6d71db68 100644 --- a/parts/modes/techmino49_h.lua +++ b/parts/modes/techmino49_h.lua @@ -45,11 +45,11 @@ return { getRank=function(P) local R=P.modeData.place return - R==1 and 5 or - R==2 and 4 or - R<=4 and 3 or - R<=6 and 2 or - R<=8 and 1 or - R<=45 and 0 + R==1 and 5 or + R==2 and 4 or + R<=4 and 3 or + R<=6 and 2 or + R<=8 and 1 or + R<=45 and 0 end, } diff --git a/parts/modes/techmino49_u.lua b/parts/modes/techmino49_u.lua index 436e9a4e..8a26c311 100644 --- a/parts/modes/techmino49_u.lua +++ b/parts/modes/techmino49_u.lua @@ -45,11 +45,11 @@ return { getRank=function(P) local R=P.modeData.place return - R==1 and 5 or - R==2 and 4 or - R==3 and 3 or - R==4 and 2 or - R<=6 and 1 or - R<=45 and 0 + R==1 and 5 or + R==2 and 4 or + R==3 and 3 or + R==4 and 2 or + R<=6 and 1 or + R<=45 and 0 end, } diff --git a/parts/modes/techmino99_e.lua b/parts/modes/techmino99_e.lua index ac439bbe..0d528cfe 100644 --- a/parts/modes/techmino99_e.lua +++ b/parts/modes/techmino99_e.lua @@ -45,11 +45,11 @@ return { getRank=function(P) local R=P.modeData.place return - R==1 and 5 or - R<=3 and 4 or - R<=6 and 3 or - R<=10 and 2 or - R<=20 and 1 or - R<=90 and 0 + R==1 and 5 or + R<=3 and 4 or + R<=6 and 3 or + R<=10 and 2 or + R<=20 and 1 or + R<=90 and 0 end, } diff --git a/parts/modes/techmino99_h.lua b/parts/modes/techmino99_h.lua index 3df1a156..78962ee9 100644 --- a/parts/modes/techmino99_h.lua +++ b/parts/modes/techmino99_h.lua @@ -45,11 +45,11 @@ return { getRank=function(P) local R=P.modeData.place return - R==1 and 5 or - R<=3 and 4 or - R<=6 and 3 or - R<=8 and 2 or - R<=10 and 1 or - R<=90 and 0 + R==1 and 5 or + R<=3 and 4 or + R<=6 and 3 or + R<=8 and 2 or + R<=10 and 1 or + R<=90 and 0 end, } diff --git a/parts/modes/techmino99_u.lua b/parts/modes/techmino99_u.lua index 4e4e43b6..c897b520 100644 --- a/parts/modes/techmino99_u.lua +++ b/parts/modes/techmino99_u.lua @@ -45,11 +45,11 @@ return { getRank=function(P) local R=P.modeData.place return - R==1 and 5 or - R==2 and 4 or - R==3 and 3 or - R<=5 and 2 or - R<=7 and 1 or - R<=90 and 0 + R==1 and 5 or + R==2 and 4 or + R==3 and 3 or + R<=5 and 2 or + R<=7 and 1 or + R<=90 and 0 end, } diff --git a/parts/modes/techrash_n.lua b/parts/modes/techrash_n.lua index cd85ce72..b6e7f6be 100644 --- a/parts/modes/techrash_n.lua +++ b/parts/modes/techrash_n.lua @@ -9,11 +9,11 @@ return { getRank=function(P) local T=P.stat.clear[7][4] return - T>=100 and 5 or - T>=75 and 4 or - T>=50 and 3 or - T==30 and 2 or - T>=15 and 1 or - T>=5 and 0 + T>=100 and 5 or + T>=75 and 4 or + T>=50 and 3 or + T==30 and 2 or + T>=15 and 1 or + T>=5 and 0 end, } diff --git a/parts/modes/techrash_u.lua b/parts/modes/techrash_u.lua index 170da13e..8dd34d99 100644 --- a/parts/modes/techrash_u.lua +++ b/parts/modes/techrash_u.lua @@ -9,11 +9,11 @@ return { getRank=function(P) local T=P.stat.clear[7][4] return - T>=20 and 5 or - T>=16 and 4 or - T>=12 and 3 or - T==8 and 2 or - T>=4 and 1 or - T>=2 and 0 + T>=20 and 5 or + T>=16 and 4 or + T>=12 and 3 or + T==8 and 2 or + T>=4 and 1 or + T>=2 and 0 end, } diff --git a/parts/modes/tsd_e.lua b/parts/modes/tsd_e.lua index 48429489..fbbde1df 100644 --- a/parts/modes/tsd_e.lua +++ b/parts/modes/tsd_e.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local T=P.modeData.tsd return - T>=20 and 5 or - T>=18 and 4 or - T>=15 and 3 or - T>=10 and 2 or - T>=4 and 1 or - T>=1 and 0 + T>=20 and 5 or + T>=18 and 4 or + T>=15 and 3 or + T>=10 and 2 or + T>=4 and 1 or + T>=1 and 0 end, } diff --git a/parts/modes/tsd_h.lua b/parts/modes/tsd_h.lua index f90217b0..e91b86d9 100644 --- a/parts/modes/tsd_h.lua +++ b/parts/modes/tsd_h.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local T=P.modeData.tsd return - T>=20 and 5 or - T>=18 and 4 or - T>=15 and 3 or - T>=11 and 2 or - T>=7 and 1 or - T>=3 and 0 + T>=20 and 5 or + T>=18 and 4 or + T>=15 and 3 or + T>=11 and 2 or + T>=7 and 1 or + T>=3 and 0 end, } diff --git a/parts/modes/tsd_u.lua b/parts/modes/tsd_u.lua index 4ce77a82..b012720c 100644 --- a/parts/modes/tsd_u.lua +++ b/parts/modes/tsd_u.lua @@ -13,11 +13,11 @@ return { getRank=function(P) local T=P.modeData.tsd return - T>=20 and 5 or - T>=18 and 4 or - T>=16 and 3 or - T>=13 and 2 or - T>=10 and 1 or - T>=4 and 0 + T>=20 and 5 or + T>=18 and 4 or + T>=16 and 3 or + T>=13 and 2 or + T>=10 and 1 or + T>=4 and 0 end, } diff --git a/parts/modes/ultra.lua b/parts/modes/ultra.lua index 1790c622..bb920c32 100644 --- a/parts/modes/ultra.lua +++ b/parts/modes/ultra.lua @@ -14,10 +14,10 @@ return { getRank=function(P) local T=P.stat.score return - T>=62000 and 5 or - T>=50000 and 4 or - T>=26000 and 3 or - T>=10000 and 2 or - T>=6200 and 1 + T>=62000 and 5 or + T>=50000 and 4 or + T>=26000 and 3 or + T>=10000 and 2 or + T>=6200 and 1 end, } diff --git a/parts/modes/zen.lua b/parts/modes/zen.lua index 95d7c276..1fc097a5 100644 --- a/parts/modes/zen.lua +++ b/parts/modes/zen.lua @@ -11,10 +11,10 @@ return { getRank=function(P) local T=P.stat.score return - T>=126000 and 5 or - T>=100000 and 4 or - T>=60000 and 3 or - T>=30000 and 2 or - T>=10000 and 1 + T>=126000 and 5 or + T>=100000 and 4 or + T>=60000 and 3 or + T>=30000 and 2 or + T>=10000 and 1 end, } diff --git a/parts/scenes/app_mahjong.lua b/parts/scenes/app_mahjong.lua index 44c8bb9b..8d55b468 100644 --- a/parts/scenes/app_mahjong.lua +++ b/parts/scenes/app_mahjong.lua @@ -67,14 +67,14 @@ local function _getPoolCardArea(i) local row=math.floor((i-1)/10) local col=i-row*10 return - 240+70*col,45+95*row, - 60,84 + 240+70*col,45+95*row, + 60,84 end local function _getHandCardArea(i) return - 20+70*i+(i==14 and 30 or 0),480, - 60,84 + 20+70*i+(i==14 and 30 or 0),480, + 60,84 end local function _newGame()