From 8cbb4a38bc852f102af5596cc6dd90e95cccdf2a Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 12 Nov 2021 23:20:29 +0800 Subject: [PATCH] =?UTF-8?q?dropPiece=E4=BA=8B=E4=BB=B6=E6=94=B9=E5=90=8Dho?= =?UTF-8?q?ok=5Fdrop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/eventsets/backfire_0.lua | 2 +- parts/eventsets/backfire_120.lua | 2 +- parts/eventsets/backfire_30.lua | 2 +- parts/eventsets/backfire_60.lua | 2 +- parts/eventsets/c4wCheck_easy.lua | 2 +- parts/eventsets/c4wCheck_hard.lua | 2 +- parts/eventsets/checkAttack_100.lua | 2 +- parts/eventsets/checkClearBoard.lua | 2 +- parts/eventsets/checkLine_10.lua | 2 +- parts/eventsets/checkLine_100.lua | 2 +- parts/eventsets/checkLine_1000.lua | 2 +- parts/eventsets/checkLine_20.lua | 2 +- parts/eventsets/checkLine_200.lua | 2 +- parts/eventsets/checkLine_40.lua | 2 +- parts/eventsets/checkLine_400.lua | 2 +- parts/eventsets/checkTurn_1.lua | 2 +- parts/eventsets/checkTurn_7.lua | 2 +- parts/eventsets/classic_e.lua | 2 +- parts/eventsets/classic_h.lua | 2 +- parts/eventsets/classic_u.lua | 2 +- parts/eventsets/dig_100l.lua | 2 +- parts/eventsets/dig_10l.lua | 2 +- parts/eventsets/dig_400l.lua | 2 +- parts/eventsets/dig_40l.lua | 2 +- parts/eventsets/marathon_bfmax.lua | 2 +- parts/eventsets/marathon_h.lua | 2 +- parts/eventsets/marathon_inf.lua | 2 +- parts/eventsets/marathon_n.lua | 2 +- parts/eventsets/master_ex.lua | 2 +- parts/eventsets/master_final.lua | 2 +- parts/eventsets/master_h.lua | 2 +- parts/eventsets/master_m.lua | 2 +- parts/eventsets/master_n.lua | 2 +- parts/eventsets/master_ph.lua | 2 +- parts/eventsets/pc_inf.lua | 2 +- parts/eventsets/pctrain_l.lua | 2 +- parts/eventsets/pctrain_n.lua | 2 +- parts/eventsets/sprintMD.lua | 2 +- parts/eventsets/sprintSym.lua | 2 +- parts/eventsets/stack_e.lua | 2 +- parts/eventsets/stack_u.lua | 2 +- parts/eventsets/techrash_n.lua | 2 +- parts/eventsets/techrash_u.lua | 4 ++-- parts/eventsets/tsd_e.lua | 2 +- parts/eventsets/tsd_h.lua | 2 +- parts/eventsets/tsd_u.lua | 4 ++-- parts/modes/backfire_h.lua | 6 +++--- parts/modes/backfire_l.lua | 6 +++--- parts/modes/backfire_n.lua | 6 +++--- parts/modes/backfire_u.lua | 6 +++--- parts/modes/c4wtrain_l.lua | 2 +- parts/modes/c4wtrain_n.lua | 2 +- parts/modes/custom_clear.lua | 4 ++-- parts/modes/custom_puzzle.lua | 2 +- parts/modes/infinite_dig.lua | 2 +- parts/modes/tech_finesse_f.lua | 2 +- parts/modes/tech_h_plus.lua | 2 +- parts/modes/tech_l_plus.lua | 2 +- parts/modes/tech_n_plus.lua | 2 +- parts/player/gameEnv0.lua | 2 +- parts/player/init.lua | 4 ++-- parts/player/player.lua | 9 +++++---- 62 files changed, 78 insertions(+), 77 deletions(-) diff --git a/parts/eventsets/backfire_0.lua b/parts/eventsets/backfire_0.lua index 7a93bfe5..8c4a012c 100644 --- a/parts/eventsets/backfire_0.lua +++ b/parts/eventsets/backfire_0.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if P.lastPiece.atk>0 then P:receive(nil,P.lastPiece.atk,0,generateLine(P.holeRND:random(10))) end diff --git a/parts/eventsets/backfire_120.lua b/parts/eventsets/backfire_120.lua index 22ae96b8..4a284a48 100644 --- a/parts/eventsets/backfire_120.lua +++ b/parts/eventsets/backfire_120.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if P.lastPiece.atk>0 then P:receive(nil,P.lastPiece.atk,120,generateLine(P.holeRND:random(10))) end diff --git a/parts/eventsets/backfire_30.lua b/parts/eventsets/backfire_30.lua index 6d086d49..bb949c4a 100644 --- a/parts/eventsets/backfire_30.lua +++ b/parts/eventsets/backfire_30.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if P.lastPiece.atk>0 then P:receive(nil,P.lastPiece.atk,30,generateLine(P.holeRND:random(10))) end diff --git a/parts/eventsets/backfire_60.lua b/parts/eventsets/backfire_60.lua index fb0c62e7..22e7ff04 100644 --- a/parts/eventsets/backfire_60.lua +++ b/parts/eventsets/backfire_60.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if P.lastPiece.atk>0 then P:receive(nil,P.lastPiece.atk,60,generateLine(P.holeRND:random(10))) end diff --git a/parts/eventsets/c4wCheck_easy.lua b/parts/eventsets/c4wCheck_easy.lua index b5a9ea44..5f81dd24 100644 --- a/parts/eventsets/c4wCheck_easy.lua +++ b/parts/eventsets/c4wCheck_easy.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if P.lastPiece.row>0 then for _=1,#P.clearedRow do local h=#P.field diff --git a/parts/eventsets/c4wCheck_hard.lua b/parts/eventsets/c4wCheck_hard.lua index 4ae9b80d..e2ecc4d8 100644 --- a/parts/eventsets/c4wCheck_hard.lua +++ b/parts/eventsets/c4wCheck_hard.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if P.lastPiece.row==0 then P:lose() else diff --git a/parts/eventsets/checkAttack_100.lua b/parts/eventsets/checkAttack_100.lua index 32749cc3..e112a2c7 100644 --- a/parts/eventsets/checkAttack_100.lua +++ b/parts/eventsets/checkAttack_100.lua @@ -6,7 +6,7 @@ return{ mText(TEXTOBJ.atk,63,243) mText(TEXTOBJ.eff,63,363) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.atk>=100 then P:win('finish') end diff --git a/parts/eventsets/checkClearBoard.lua b/parts/eventsets/checkClearBoard.lua index aa8a1124..603280fd 100644 --- a/parts/eventsets/checkClearBoard.lua +++ b/parts/eventsets/checkClearBoard.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if P.garbageBeneath==0 then local D=P.modeData D.finished=D.finished+1 diff --git a/parts/eventsets/checkLine_10.lua b/parts/eventsets/checkLine_10.lua index 475ebef6..02edb80a 100644 --- a/parts/eventsets/checkLine_10.lua +++ b/parts/eventsets/checkLine_10.lua @@ -6,7 +6,7 @@ return{ mStr(r,63,265) PLY.draw.drawTargetLine(P,r) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=10 then P:win('finish') end diff --git a/parts/eventsets/checkLine_100.lua b/parts/eventsets/checkLine_100.lua index 46e84bcf..2c6bef5c 100644 --- a/parts/eventsets/checkLine_100.lua +++ b/parts/eventsets/checkLine_100.lua @@ -6,7 +6,7 @@ return{ mStr(r,63,265) PLY.draw.drawTargetLine(P,r) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=100 then P:win('finish') end diff --git a/parts/eventsets/checkLine_1000.lua b/parts/eventsets/checkLine_1000.lua index 6443c155..c1321251 100644 --- a/parts/eventsets/checkLine_1000.lua +++ b/parts/eventsets/checkLine_1000.lua @@ -6,7 +6,7 @@ return{ mStr(r,63,265) PLY.draw.drawTargetLine(P,r) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=1000 then P:win('finish') end diff --git a/parts/eventsets/checkLine_20.lua b/parts/eventsets/checkLine_20.lua index ca8f527a..d901ec8d 100644 --- a/parts/eventsets/checkLine_20.lua +++ b/parts/eventsets/checkLine_20.lua @@ -6,7 +6,7 @@ return{ mStr(r,63,265) PLY.draw.drawTargetLine(P,r) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=20 then P:win('finish') end diff --git a/parts/eventsets/checkLine_200.lua b/parts/eventsets/checkLine_200.lua index bbeb562f..e7512897 100644 --- a/parts/eventsets/checkLine_200.lua +++ b/parts/eventsets/checkLine_200.lua @@ -6,7 +6,7 @@ return{ mStr(r,63,265) PLY.draw.drawTargetLine(P,r) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=200 then P:win('finish') end diff --git a/parts/eventsets/checkLine_40.lua b/parts/eventsets/checkLine_40.lua index 0affb33a..bd8f2956 100644 --- a/parts/eventsets/checkLine_40.lua +++ b/parts/eventsets/checkLine_40.lua @@ -6,7 +6,7 @@ return{ mStr(r,63,265) PLY.draw.drawTargetLine(P,r) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=40 then P:win('finish') end diff --git a/parts/eventsets/checkLine_400.lua b/parts/eventsets/checkLine_400.lua index c7ea4368..3457f3c5 100644 --- a/parts/eventsets/checkLine_400.lua +++ b/parts/eventsets/checkLine_400.lua @@ -6,7 +6,7 @@ return{ mStr(r,63,265) PLY.draw.drawTargetLine(P,r) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=400 then P:win('finish') end diff --git a/parts/eventsets/checkTurn_1.lua b/parts/eventsets/checkTurn_1.lua index d24316a4..c0ca5c3f 100644 --- a/parts/eventsets/checkTurn_1.lua +++ b/parts/eventsets/checkTurn_1.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if #PLY_ALIVE>1 then P.control=false local id1=P.sid diff --git a/parts/eventsets/checkTurn_7.lua b/parts/eventsets/checkTurn_7.lua index af3398c0..bf0ce2d7 100644 --- a/parts/eventsets/checkTurn_7.lua +++ b/parts/eventsets/checkTurn_7.lua @@ -1,5 +1,5 @@ return{ - dropPiece=function(P) + hook_drop=function(P) if P.stat.piece%7==0 and #PLY_ALIVE>1 then P.control=false local id1=P.sid diff --git a/parts/eventsets/classic_e.lua b/parts/eventsets/classic_e.lua index 303df960..f30a56a3 100644 --- a/parts/eventsets/classic_e.lua +++ b/parts/eventsets/classic_e.lua @@ -22,7 +22,7 @@ return{ task=function(P) P.modeData.target=10 end, - dropPiece=function(P) + hook_drop=function(P) local D=P.modeData if P.stat.row>=D.target then if D.target==110 then diff --git a/parts/eventsets/classic_h.lua b/parts/eventsets/classic_h.lua index 72982232..84e01460 100644 --- a/parts/eventsets/classic_h.lua +++ b/parts/eventsets/classic_h.lua @@ -22,7 +22,7 @@ return{ task=function(P) P.modeData.target=10 end, - dropPiece=function(P) + hook_drop=function(P) local D=P.modeData if P.stat.row>=D.target then if D.target==110 then diff --git a/parts/eventsets/classic_u.lua b/parts/eventsets/classic_u.lua index 815c4fda..6b71af5b 100644 --- a/parts/eventsets/classic_u.lua +++ b/parts/eventsets/classic_u.lua @@ -22,7 +22,7 @@ return{ task=function(P) P.modeData.target=10 end, - dropPiece=function(P) + hook_drop=function(P) local D=P.modeData if P.stat.row>=D.target then if D.target==100 then diff --git a/parts/eventsets/dig_100l.lua b/parts/eventsets/dig_100l.lua index 8f2bad7c..5c2299ac 100644 --- a/parts/eventsets/dig_100l.lua +++ b/parts/eventsets/dig_100l.lua @@ -3,7 +3,7 @@ return{ setFont(55) mStr(100-P.stat.dig,63,265) end, - dropPiece=function(P) + hook_drop=function(P) for _=1,math.min(10,100-P.stat.dig)-P.garbageBeneath do P:garbageRise(21,1,P:getHolePos()) end diff --git a/parts/eventsets/dig_10l.lua b/parts/eventsets/dig_10l.lua index aa522d70..eccb9854 100644 --- a/parts/eventsets/dig_10l.lua +++ b/parts/eventsets/dig_10l.lua @@ -3,7 +3,7 @@ return{ setFont(55) mStr(10-P.stat.dig,63,265) end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.dig==10 then P:win('finish') end diff --git a/parts/eventsets/dig_400l.lua b/parts/eventsets/dig_400l.lua index 2acc0011..1a56310d 100644 --- a/parts/eventsets/dig_400l.lua +++ b/parts/eventsets/dig_400l.lua @@ -3,7 +3,7 @@ return{ setFont(55) mStr(400-P.stat.dig,63,265) end, - dropPiece=function(P) + hook_drop=function(P) for _=1,math.min(10,400-P.stat.dig)-P.garbageBeneath do P:garbageRise(21,1,P:getHolePos()) end diff --git a/parts/eventsets/dig_40l.lua b/parts/eventsets/dig_40l.lua index 8b7da2d7..11c24040 100644 --- a/parts/eventsets/dig_40l.lua +++ b/parts/eventsets/dig_40l.lua @@ -3,7 +3,7 @@ return{ setFont(55) mStr(40-P.stat.dig,63,265) end, - dropPiece=function(P) + hook_drop=function(P) for _=1,math.min(10,40-P.stat.dig)-P.garbageBeneath do P:garbageRise(21,1,P:getHolePos()) end diff --git a/parts/eventsets/marathon_bfmax.lua b/parts/eventsets/marathon_bfmax.lua index 5b974a59..078c5b3f 100644 --- a/parts/eventsets/marathon_bfmax.lua +++ b/parts/eventsets/marathon_bfmax.lua @@ -11,7 +11,7 @@ return{ task=function(P) P.modeData.target=10 end, - dropPiece=function(P) + hook_drop=function(P) local flag local l=P.lastPiece if P.combo>1 then flag=true;P:showText("2x",0,-220,40,'flicker',.3)end diff --git a/parts/eventsets/marathon_h.lua b/parts/eventsets/marathon_h.lua index c8ddb2b6..51414e19 100644 --- a/parts/eventsets/marathon_h.lua +++ b/parts/eventsets/marathon_h.lua @@ -10,7 +10,7 @@ return task=function(P) P.modeData.target=50 end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=P.modeData.target then if P.modeData.target==50 then P.gameEnv.drop=.25 diff --git a/parts/eventsets/marathon_inf.lua b/parts/eventsets/marathon_inf.lua index 88cbca60..80e8fa12 100644 --- a/parts/eventsets/marathon_inf.lua +++ b/parts/eventsets/marathon_inf.lua @@ -30,7 +30,7 @@ return task=function(P) P.modeData.target=10 end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=P.modeData.target then if P.modeData.target%300==0 then P.gameEnv.wait=P.gameEnv.wait-1 diff --git a/parts/eventsets/marathon_n.lua b/parts/eventsets/marathon_n.lua index 2c2afa2e..05fd377e 100644 --- a/parts/eventsets/marathon_n.lua +++ b/parts/eventsets/marathon_n.lua @@ -12,7 +12,7 @@ return task=function(P) P.modeData.target=10 end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=P.modeData.target then if P.modeData.target==200 then P:win('finish') diff --git a/parts/eventsets/master_ex.lua b/parts/eventsets/master_ex.lua index e12d7f80..c3845c1b 100644 --- a/parts/eventsets/master_ex.lua +++ b/parts/eventsets/master_ex.lua @@ -30,7 +30,7 @@ return{ mStr(P.stat.row,63,230) mStr(P.stat.clears[4],63,340) end, - dropPiece=function(P) + hook_drop=function(P) if P.modeData.rankPoint<140-passPoint then--If Less then X local R=#P.clearedRow if R>0 then diff --git a/parts/eventsets/master_final.lua b/parts/eventsets/master_final.lua index a8f54a2d..869494f7 100644 --- a/parts/eventsets/master_final.lua +++ b/parts/eventsets/master_final.lua @@ -8,7 +8,7 @@ return{ mesDisp=function(P) PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, - dropPiece=function(P) + hook_drop=function(P) local D=P.modeData local c=#P.clearedRow diff --git a/parts/eventsets/master_h.lua b/parts/eventsets/master_h.lua index 7f9775d0..d52d0148 100644 --- a/parts/eventsets/master_h.lua +++ b/parts/eventsets/master_h.lua @@ -12,7 +12,7 @@ return{ mesDisp=function(P) PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, - dropPiece=function(P) + hook_drop=function(P) local D=P.modeData local c=#P.clearedRow diff --git a/parts/eventsets/master_m.lua b/parts/eventsets/master_m.lua index e9cf91ea..41a01474 100644 --- a/parts/eventsets/master_m.lua +++ b/parts/eventsets/master_m.lua @@ -14,7 +14,7 @@ return task=function(P) P.modeData.target=10 end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=P.modeData.target then if P.modeData.target==200 then P:win('finish') diff --git a/parts/eventsets/master_n.lua b/parts/eventsets/master_n.lua index 1abbcaf2..8f44877f 100644 --- a/parts/eventsets/master_n.lua +++ b/parts/eventsets/master_n.lua @@ -12,7 +12,7 @@ return{ mesDisp=function(P) PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, - dropPiece=function(P) + hook_drop=function(P) local D=P.modeData local c=#P.clearedRow diff --git a/parts/eventsets/master_ph.lua b/parts/eventsets/master_ph.lua index 2174c1b9..8f83a236 100644 --- a/parts/eventsets/master_ph.lua +++ b/parts/eventsets/master_ph.lua @@ -13,7 +13,7 @@ return mesDisp=function(P) PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, - dropPiece=function(P) + hook_drop=function(P) local p=P.modeData.pt+P.lastPiece.row if p>=P.modeData.target then local ENV=P.gameEnv diff --git a/parts/eventsets/pc_inf.lua b/parts/eventsets/pc_inf.lua index 3ffb1883..78b8f07a 100644 --- a/parts/eventsets/pc_inf.lua +++ b/parts/eventsets/pc_inf.lua @@ -5,7 +5,7 @@ return{ mStr(P.stat.pc,63,340) mText(TEXTOBJ.pc,63,410) end, - dropPiece=function(P) + hook_drop=function(P) if P.lastPiece.pc and P.stat.row%4==0 then P.gameEnv.heightLimit=4 if P.stat.pc%5==0 then diff --git a/parts/eventsets/pctrain_l.lua b/parts/eventsets/pctrain_l.lua index e6fa9d30..4088b7db 100644 --- a/parts/eventsets/pctrain_l.lua +++ b/parts/eventsets/pctrain_l.lua @@ -46,6 +46,6 @@ return{ mStr(P.stat.pc,63,340) mText(TEXTOBJ.pc,63,410) end, - dropPiece=check, + hook_drop=check, task=check, } diff --git a/parts/eventsets/pctrain_n.lua b/parts/eventsets/pctrain_n.lua index 8d5dfaa8..74961a25 100644 --- a/parts/eventsets/pctrain_n.lua +++ b/parts/eventsets/pctrain_n.lua @@ -37,6 +37,6 @@ return{ mStr(P.stat.pc,63,340) mText(TEXTOBJ.pc,63,410) end, - dropPiece=check, + hook_drop=check, task=check, } diff --git a/parts/eventsets/sprintMD.lua b/parts/eventsets/sprintMD.lua index dcbe6aa1..0c18a7e1 100644 --- a/parts/eventsets/sprintMD.lua +++ b/parts/eventsets/sprintMD.lua @@ -36,7 +36,7 @@ return{ end end end, - dropPiece=function(P) + hook_drop=function(P) if P.stat.row>=40 then P:win('finish') end diff --git a/parts/eventsets/sprintSym.lua b/parts/eventsets/sprintSym.lua index 02900a61..2457a189 100644 --- a/parts/eventsets/sprintSym.lua +++ b/parts/eventsets/sprintSym.lua @@ -14,7 +14,7 @@ return{ mStr(r,63,265) PLY.draw.drawTargetLine(P,r) end, - dropPiece=function(P) + hook_drop=function(P) local F=P.field for y=1,#F do local l=F[y] diff --git a/parts/eventsets/stack_e.lua b/parts/eventsets/stack_e.lua index b103b175..8340694b 100644 --- a/parts/eventsets/stack_e.lua +++ b/parts/eventsets/stack_e.lua @@ -7,7 +7,7 @@ return{ mText(TEXTOBJ.line,63,350) PLY.draw.drawMarkLine(P,20,.3,1,1,TIME()%.42<.21 and .95 or .6) end, - dropPiece=function(P) + hook_drop=function(P) if #P.field>20 then local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath) local h=20-cc-P.garbageBeneath diff --git a/parts/eventsets/stack_u.lua b/parts/eventsets/stack_u.lua index 36df7758..890c3854 100644 --- a/parts/eventsets/stack_u.lua +++ b/parts/eventsets/stack_u.lua @@ -7,7 +7,7 @@ return{ mText(TEXTOBJ.line,63,350) PLY.draw.drawMarkLine(P,17,.3,1,1,TIME()%.42<.21 and .95 or .6) end, - dropPiece=function(P) + hook_drop=function(P) if #P.field>20 then local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath) local h=20-cc-P.garbageBeneath-3 diff --git a/parts/eventsets/techrash_n.lua b/parts/eventsets/techrash_n.lua index d1906e63..f9200006 100644 --- a/parts/eventsets/techrash_n.lua +++ b/parts/eventsets/techrash_n.lua @@ -4,7 +4,7 @@ return{ mStr(P.stat.clear[7][4],63,250) mText(TEXTOBJ.techrash,63,315) end, - dropPiece=function(P) + hook_drop=function(P) if P.lastPiece.row>0 and P.lastPiece.row<4 then P:lose() end diff --git a/parts/eventsets/techrash_u.lua b/parts/eventsets/techrash_u.lua index 84b231bf..b32e99be 100644 --- a/parts/eventsets/techrash_u.lua +++ b/parts/eventsets/techrash_u.lua @@ -8,12 +8,12 @@ return{ PLY.draw.applyField(P) local L=P.modeData.history for i=1,#L do - gc.setColor(1,.3,.3,.45-i*.04) + gc.setColor(1,.3,.3,.5-i*.04) gc.rectangle('fill',30*L[i]-30,0,30,600) end PLY.draw.cancelField(P) end, - dropPiece=function(P) + hook_drop=function(P) local C=P.lastPiece if C.row>0 then if C.row==4 then diff --git a/parts/eventsets/tsd_e.lua b/parts/eventsets/tsd_e.lua index 252ec0e6..cc6e450a 100644 --- a/parts/eventsets/tsd_e.lua +++ b/parts/eventsets/tsd_e.lua @@ -4,7 +4,7 @@ return{ mStr(P.modeData.tsd,63,250) mText(TEXTOBJ.tsd,63,315) end, - dropPiece=function(P) + hook_drop=function(P) local C=P.lastPiece if C.row>0 then if C.id==5 and C.row==2 and C.spin then diff --git a/parts/eventsets/tsd_h.lua b/parts/eventsets/tsd_h.lua index 4d7594f2..d028b00f 100644 --- a/parts/eventsets/tsd_h.lua +++ b/parts/eventsets/tsd_h.lua @@ -13,7 +13,7 @@ return{ PLY.draw.cancelField(P) end end, - dropPiece=function(P) + hook_drop=function(P) local C=P.lastPiece if C.row>0 then if C.id==5 and C.row==2 and C.spin then diff --git a/parts/eventsets/tsd_u.lua b/parts/eventsets/tsd_u.lua index cb59e140..09f95d28 100644 --- a/parts/eventsets/tsd_u.lua +++ b/parts/eventsets/tsd_u.lua @@ -8,12 +8,12 @@ return{ PLY.draw.applyField(P) local L=P.modeData.history for i=1,#L do - gc.setColor(1,.3,.3,.3-i*.05) + gc.setColor(1,.3,.3,.4-i*.05) gc.rectangle('fill',30*L[i]-30,0,30,600) end PLY.draw.cancelField(P) end, - dropPiece=function(P) + hook_drop=function(P) local C=P.lastPiece if C.row>0 then if C.id==5 and C.row==2 and C.spin then diff --git a/parts/modes/backfire_h.lua b/parts/modes/backfire_h.lua index ccb61096..41362223 100644 --- a/parts/modes/backfire_h.lua +++ b/parts/modes/backfire_h.lua @@ -2,9 +2,9 @@ return{ env={ drop=10,lock=60, freshLimit=15, - dropPiece={ - require'parts.eventsets.backfire_60'.dropPiece, - require'parts.eventsets.checkAttack_100'.dropPiece, + hook_drop={ + require'parts.eventsets.backfire_60'.hook_drop, + require'parts.eventsets.checkAttack_100'.hook_drop, }, mesDisp=function(P) setFont(60) diff --git a/parts/modes/backfire_l.lua b/parts/modes/backfire_l.lua index ed0f1a01..11594296 100644 --- a/parts/modes/backfire_l.lua +++ b/parts/modes/backfire_l.lua @@ -2,9 +2,9 @@ return{ env={ drop=5,lock=45, freshLimit=15, - dropPiece={ - require'parts.eventsets.backfire_30'.dropPiece, - require'parts.eventsets.checkAttack_100'.dropPiece, + hook_drop={ + require'parts.eventsets.backfire_30'.hook_drop, + require'parts.eventsets.checkAttack_100'.hook_drop, }, mesDisp=function(P) setFont(60) diff --git a/parts/modes/backfire_n.lua b/parts/modes/backfire_n.lua index 5e2ebf11..95776265 100644 --- a/parts/modes/backfire_n.lua +++ b/parts/modes/backfire_n.lua @@ -1,9 +1,9 @@ return{ env={ drop=30,lock=60, - dropPiece={ - require'parts.eventsets.backfire_120'.dropPiece, - require'parts.eventsets.checkAttack_100'.dropPiece, + hook_drop={ + require'parts.eventsets.backfire_120'.hook_drop, + require'parts.eventsets.checkAttack_100'.hook_drop, }, mesDisp=function(P) setFont(60) diff --git a/parts/modes/backfire_u.lua b/parts/modes/backfire_u.lua index 5911aef5..46836e2a 100644 --- a/parts/modes/backfire_u.lua +++ b/parts/modes/backfire_u.lua @@ -2,9 +2,9 @@ return{ env={ drop=2,lock=30, freshLimit=10, - dropPiece={ - require'parts.eventsets.backfire_0'.dropPiece, - require'parts.eventsets.checkAttack_100'.dropPiece, + hook_drop={ + require'parts.eventsets.backfire_0'.hook_drop, + require'parts.eventsets.checkAttack_100'.hook_drop, }, mesDisp=function(P) setFont(60) diff --git a/parts/modes/c4wtrain_l.lua b/parts/modes/c4wtrain_l.lua index e10ec65c..36481230 100644 --- a/parts/modes/c4wtrain_l.lua +++ b/parts/modes/c4wtrain_l.lua @@ -2,7 +2,7 @@ return{ env={ drop=5,lock=30, freshLimit=15,ospin=false, - dropPiece=require'parts.eventsets.c4wCheck_hard'.dropPiece, + hook_drop=require'parts.eventsets.c4wCheck_hard'.hook_drop, eventSet='c4wBase', bg='rgb',bgm='oxygen', }, diff --git a/parts/modes/c4wtrain_n.lua b/parts/modes/c4wtrain_n.lua index 8d26194f..9cc66233 100644 --- a/parts/modes/c4wtrain_n.lua +++ b/parts/modes/c4wtrain_n.lua @@ -2,7 +2,7 @@ return{ env={ drop=30,lock=60,infHold=true, freshLimit=15,ospin=false, - dropPiece=require'parts.eventsets.c4wCheck_easy'.dropPiece, + hook_drop=require'parts.eventsets.c4wCheck_easy'.hook_drop, eventSet='c4wBase', bg='rgb',bgm='oxygen', }, diff --git a/parts/modes/custom_clear.lua b/parts/modes/custom_clear.lua index 23b607f5..5d0ff984 100644 --- a/parts/modes/custom_clear.lua +++ b/parts/modes/custom_clear.lua @@ -5,9 +5,9 @@ return{ --Switch clear sprint mode on if #FIELD[1]>0 then - GAME.modeEnv.dropPiece=require'parts.eventsets.checkClearBoard'.dropPiece + GAME.modeEnv.hook_drop=require'parts.eventsets.checkClearBoard'.hook_drop else - GAME.modeEnv.dropPiece=NULL + GAME.modeEnv.hook_drop=NULL end PLY.newPlayer(1) local AItype=GAME.modeEnv.opponent:sub(1,2) diff --git a/parts/modes/custom_puzzle.lua b/parts/modes/custom_puzzle.lua index d07d5d7a..8eba6be9 100644 --- a/parts/modes/custom_puzzle.lua +++ b/parts/modes/custom_puzzle.lua @@ -4,7 +4,7 @@ local ply_applyField=PLY.draw.applyField return{ env={ fkey1=function(P)P.modeData.showMark=1-P.modeData.showMark end, - dropPiece=function(P) + hook_drop=function(P) local D=P.modeData local F=FIELD[D.finished+1] for y=1,#F do diff --git a/parts/modes/infinite_dig.lua b/parts/modes/infinite_dig.lua index 41fdeb66..8d3e7947 100644 --- a/parts/modes/infinite_dig.lua +++ b/parts/modes/infinite_dig.lua @@ -30,7 +30,7 @@ return{ drop=1e99,lock=1e99, infHold=true, pushSpeed=1.2, - dropPiece=check_rise, + hook_drop=check_rise, mesDisp=function(P) setFont(45) mStr(P.stat.dig,63,190) diff --git a/parts/modes/tech_finesse_f.lua b/parts/modes/tech_finesse_f.lua index d841276c..97848668 100644 --- a/parts/modes/tech_finesse_f.lua +++ b/parts/modes/tech_finesse_f.lua @@ -17,7 +17,7 @@ return{ drop=1e99,lock=60, freshLimit=15, fineKill=true, - dropPiece=tech_check_hard, + hook_drop=tech_check_hard, bg='flink',bgm='infinite', }, slowMark=true, diff --git a/parts/modes/tech_h_plus.lua b/parts/modes/tech_h_plus.lua index f60cfac4..d67216bc 100644 --- a/parts/modes/tech_h_plus.lua +++ b/parts/modes/tech_h_plus.lua @@ -15,7 +15,7 @@ return{ env={ drop=30,lock=60, freshLimit=15, - dropPiece=tech_check_hard, + hook_drop=tech_check_hard, eventSet='checkAttack_100', bg='matrix',bgm='down', }, diff --git a/parts/modes/tech_l_plus.lua b/parts/modes/tech_l_plus.lua index 9241a27a..cfe7b617 100644 --- a/parts/modes/tech_l_plus.lua +++ b/parts/modes/tech_l_plus.lua @@ -15,7 +15,7 @@ return{ env={ drop=0,lock=60, freshLimit=15, - dropPiece=tech_check_hard, + hook_drop=tech_check_hard, eventSet='checkAttack_100', bg='matrix',bgm='warped', }, diff --git a/parts/modes/tech_n_plus.lua b/parts/modes/tech_n_plus.lua index e0f31e35..3be58912 100644 --- a/parts/modes/tech_n_plus.lua +++ b/parts/modes/tech_n_plus.lua @@ -15,7 +15,7 @@ return{ env={ infHold=true, drop=1e99,lock=1e99, - dropPiece=tech_check_hard, + hook_drop=tech_check_hard, eventSet='checkAttack_100', bg='matrix',bgm='new era', }, diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 5b557b03..b443b790 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -61,7 +61,7 @@ return{ noInitSZO=false, mesDisp={}, - dropPiece={}, + hook_drop={}, task={}, eventSet="X", diff --git a/parts/player/init.lua b/parts/player/init.lua index 4da5a30c..f1d5435d 100644 --- a/parts/player/init.lua +++ b/parts/player/init.lua @@ -303,7 +303,7 @@ local function _applyGameEnv(P)--Finish gameEnv processing --Apply events ENV.mesDisp=_mergeFuncTable(ENV.mesDisp,{}) - ENV.dropPiece=_mergeFuncTable(ENV.dropPiece,{}) + ENV.hook_drop=_mergeFuncTable(ENV.hook_drop,{}) ENV.task=_mergeFuncTable(ENV.task,{}) --Apply eventSet @@ -314,7 +314,7 @@ local function _applyGameEnv(P)--Finish gameEnv processing for k,v in next,eventSet do if k=='mesDisp'or - k=='dropPiece'or + k=='hook_drop'or k=='task' then _mergeFuncTable(v,ENV[k]) diff --git a/parts/player/player.lua b/parts/player/player.lua index 657b3581..48144ab1 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -314,7 +314,7 @@ function Player:setRS(RSname) end function Player:triggerDropEvents() - local L=self.gameEnv.dropPiece + local L=self.gameEnv.hook_drop for i=1,#L do L[i](self) end @@ -2333,7 +2333,9 @@ function Player:revive() SFX.play('emit') end function Player:win(result) - if self.result then return end + if self.result then + return + end self:_die() self.result='win' if GAME.modeEnv.royaleMode then @@ -2374,8 +2376,7 @@ function Player:lose(force) if self.life>0 then self:revive() return - end - if self.type=='remote'then + elseif self.type=='remote'then self.waiting=1e99 return end