diff --git a/main.lua b/main.lua index 569b9850..6a7b4c95 100644 --- a/main.lua +++ b/main.lua @@ -292,6 +292,14 @@ do if RANKS.tsd_u then RANKS.tsd_u=0 end needSave=true end + if STAT.version==1600 then + RANKS.stack_20l=nil + RANKS.stack_40l=nil + RANKS.stack_100l=nil + fs.remove('record/stack_20l.rec') + fs.remove('record/stack_40l.rec') + fs.remove('record/stack_100l.rec') + end if STAT.version~=VERSION.code then STAT.version=VERSION.code needSave=true diff --git a/parts/modes/stack_100l.lua b/parts/modes/stack_100l.lua index f15c60f4..441033a5 100644 --- a/parts/modes/stack_100l.lua +++ b/parts/modes/stack_100l.lua @@ -1,31 +1,41 @@ +local function getHoleCount(P) + local hole=0 + for x=1,10 do + for y=1,98 do + if not P:solid(x,y)then + holes=holes+1 + end + end + end + return hole +end return{ color=COLOR.cyan, env={ - drop=60,lock=60, + drop=60,lock=120, freshLimit=15, fieldH=100, highCam=true, fillClear=false, seqData={1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}, - sequence='bag', - bg='none',bgm='there', + bg='blockrain',bgm='there', }, mesDisp=function(P) setFont(60) mStr(P.stat.piece,63,280) mText(drawableText.piece,63,350) end, - score=function(P)return{P.stat.piece,P.stat.time}end, - scoreDisp=function(D)return D[1].." Pieces".." "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=215 and 5 or - B>=208 and 4 or - B>=200 and 3 or - B>=190 and 2 or - B>=180 and 1 or - 0 + H<=2 and 5 or + H<=5 and 4 or + H<=10 and 3 or + H<=15 and 2 or + H<=20 and 1 or + H<=26 and 0 end, } \ No newline at end of file diff --git a/parts/modes/stack_20l.lua b/parts/modes/stack_20l.lua index f4066d58..a6084a22 100644 --- a/parts/modes/stack_20l.lua +++ b/parts/modes/stack_20l.lua @@ -1,28 +1,41 @@ +local function getHoleCount(P) + local hole=0 + for x=1,10 do + for y=1,20 do + if not P:solid(x,y)then + holes=holes+1 + end + end + end + return hole +end return{ color=COLOR.cyan, env={ drop=60,lock=60, freshLimit=15, + fieldH=20, highCam=true, fillClear=false, - bg='none',bgm='there', + seqData={1,2,3,4,5,6,7}, + bg='blockrain',bgm='there', }, mesDisp=function(P) setFont(60) mStr(P.stat.piece,63,280) mText(drawableText.piece,63,350) end, - score=function(P)return{P.stat.piece,P.stat.time}end, - scoreDisp=function(D)return D[1].." Pieces".." "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=55 and 5 or - B>=52 and 4 or - B>=49 and 3 or - B>=47 and 2 or - B>=44 and 1 or - 0 + H==0 and 5 or + H<=1 and 4 or + H<=2 and 3 or + H<=4 and 2 or + H<=7 and 1 or + H<=10 and 0 end, } \ No newline at end of file diff --git a/parts/modes/stack_40l.lua b/parts/modes/stack_40l.lua index 02893d8e..0a7a1c05 100644 --- a/parts/modes/stack_40l.lua +++ b/parts/modes/stack_40l.lua @@ -1,30 +1,41 @@ +local function getHoleCount(P) + local hole=0 + for x=1,10 do + for y=1,39 do + if not P:solid(x,y)then + holes=holes+1 + end + end + end + return hole +end return{ color=COLOR.cyan, env={ - drop=60,lock=60, + drop=60,lock=90, freshLimit=15, fieldH=40, highCam=true, fillClear=false, seqData={1,2,3,4,5,6,7,1,2,3,4,5,6,7,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}, - bg='none',bgm='there', + bg='blockrain',bgm='there', }, mesDisp=function(P) setFont(60) mStr(P.stat.piece,63,280) mText(drawableText.piece,63,350) end, - score=function(P)return{P.stat.piece,P.stat.time}end, - scoreDisp=function(D)return D[1].." Pieces".." "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=90 and 5 or - B>=87 and 4 or - B>=83 and 3 or - B>=78 and 2 or - B>=70 and 1 or - 0 + H==0 and 5 or + H<=1 and 4 or + H<=3 and 3 or + H<=6 and 2 or + H<=10 and 1 or + H<=20 and 0 end, } \ No newline at end of file