diff --git a/parts/eventsets/stack_e.lua b/parts/eventsets/stack_e.lua index caf95e1a..9d2eb852 100644 --- a/parts/eventsets/stack_e.lua +++ b/parts/eventsets/stack_e.lua @@ -1,4 +1,5 @@ return{ + fieldH=20, fillClear=false, mesDisp=function(P) setFont(60) @@ -6,12 +7,12 @@ return{ mText(TEXTOBJ.line,63,350) end, dropPiece=function(P) - if #P.field>P.gameEnv.fieldH then + if #P.field>20 then local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath) - local h=math.ceil((P.gameEnv.fieldH-cc-P.garbageBeneath)/2) + local h=20-cc-P.garbageBeneath if h>0 then P:garbageRise(21,h,2e10-1) - if P.garbageBeneath>=P.gameEnv.fieldH then + if P.garbageBeneath>=20 then P:lose() end end diff --git a/parts/eventsets/stack_h.lua b/parts/eventsets/stack_h.lua index 9919ebae..e4b2138f 100644 --- a/parts/eventsets/stack_h.lua +++ b/parts/eventsets/stack_h.lua @@ -1,4 +1,5 @@ return{ + fieldH=21, fillClear=false, mesDisp=function(P) setFont(60) @@ -6,12 +7,12 @@ return{ mText(TEXTOBJ.line,63,350) end, dropPiece=function(P) - if #P.field>P.gameEnv.fieldH then + if #P.field>20 then local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath) - local h=P.gameEnv.fieldH-cc-P.garbageBeneath-2 + local h=20-cc-P.garbageBeneath-2 if h>0 then P:garbageRise(21,h,2e10-1) - if P.garbageBeneath>=P.gameEnv.fieldH then + if P.garbageBeneath>=20 then P:lose() end end diff --git a/parts/eventsets/stack_u.lua b/parts/eventsets/stack_u.lua index e02e90bb..c0cb83e9 100644 --- a/parts/eventsets/stack_u.lua +++ b/parts/eventsets/stack_u.lua @@ -1,4 +1,5 @@ return{ + fieldH=21, fillClear=false, mesDisp=function(P) setFont(60) @@ -6,12 +7,12 @@ return{ mText(TEXTOBJ.line,63,350) end, dropPiece=function(P) - if #P.field>P.gameEnv.fieldH then + if #P.field>20 then local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath) - local h=P.gameEnv.fieldH-cc-P.garbageBeneath-3 + local h=20-cc-P.garbageBeneath-3 if h>0 then P:garbageRise(21,h,2e10-1) - if P.garbageBeneath>=P.gameEnv.fieldH then + if P.garbageBeneath>=20 then P:lose() end end diff --git a/parts/modes/stack_h.lua b/parts/modes/stack_h.lua index 41d5e39c..721e57cf 100644 --- a/parts/modes/stack_h.lua +++ b/parts/modes/stack_h.lua @@ -3,7 +3,6 @@ return{ env={ drop=60,lock=60, wait=0,fall=50, - fieldH=21, highCam=false, garbageSpeed=30, seqData={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}, diff --git a/parts/modes/stack_u.lua b/parts/modes/stack_u.lua index 854f2b1e..77557785 100644 --- a/parts/modes/stack_u.lua +++ b/parts/modes/stack_u.lua @@ -3,7 +3,6 @@ return{ env={ drop=60,lock=60, wait=0,fall=50, - fieldH=21, highCam=false, garbageSpeed=30, seqData={8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25},