SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dropPiece事件改名hook_drop

Browse Source
This commit is contained in:
MrZ626
2021-11-12 23:20:29 +08:00
parent fce08c83ef
commit 8cbb4a38bc
62 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parts/eventsets/backfire_0.lua
View File

@@ -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

2
parts/eventsets/backfire_120.lua
View File

@@ -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

2
parts/eventsets/backfire_30.lua
View File

@@ -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

2
parts/eventsets/backfire_60.lua
View File

@@ -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

2
parts/eventsets/c4wCheck_easy.lua
View File

@@ -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

2
parts/eventsets/c4wCheck_hard.lua
View File

@@ -1,5 +1,5 @@
return{
dropPiece=function(P)
hook_drop=function(P)
if P.lastPiece.row==0 then
P:lose()
else

2
parts/eventsets/checkAttack_100.lua
View File

@@ -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

2
parts/eventsets/checkClearBoard.lua
View File

@@ -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

2
parts/eventsets/checkLine_10.lua
View File

@@ -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

2
parts/eventsets/checkLine_100.lua
View File

@@ -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

2
parts/eventsets/checkLine_1000.lua
View File

@@ -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

2
parts/eventsets/checkLine_20.lua
View File

@@ -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

2
parts/eventsets/checkLine_200.lua
View File

@@ -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

2
parts/eventsets/checkLine_40.lua
View File

@@ -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

2
parts/eventsets/checkLine_400.lua
View File

@@ -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

2
parts/eventsets/checkTurn_1.lua
View File

@@ -1,5 +1,5 @@
return{
dropPiece=function(P)
hook_drop=function(P)
if #PLY_ALIVE>1 then
P.control=false
local id1=P.sid

2
parts/eventsets/checkTurn_7.lua
View File

@@ -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

2
parts/eventsets/classic_e.lua
View File

@@ -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

2
parts/eventsets/classic_h.lua
View File

@@ -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

2
parts/eventsets/classic_u.lua
View File

@@ -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

2
parts/eventsets/dig_100l.lua
View File

@@ -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

2
parts/eventsets/dig_10l.lua
View File

@@ -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

2
parts/eventsets/dig_400l.lua
View File

@@ -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

2
parts/eventsets/dig_40l.lua
View File

@@ -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

2
parts/eventsets/marathon_bfmax.lua
View File

@@ -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

2
parts/eventsets/marathon_h.lua
View File

@@ -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

2
parts/eventsets/marathon_inf.lua
View File

@@ -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

2
parts/eventsets/marathon_n.lua
View File

@@ -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')

2
parts/eventsets/master_ex.lua
View File

@@ -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

2
parts/eventsets/master_final.lua
View File

@@ -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

2
parts/eventsets/master_h.lua
View File

@@ -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

2
parts/eventsets/master_m.lua
View File

@@ -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')

2
parts/eventsets/master_n.lua
View File

@@ -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

2
parts/eventsets/master_ph.lua
View File

@@ -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

2
parts/eventsets/pc_inf.lua
View File

@@ -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

2
parts/eventsets/pctrain_l.lua
View File

@@ -46,6 +46,6 @@ return{
mStr(P.stat.pc,63,340)
mText(TEXTOBJ.pc,63,410)
end,
dropPiece=check,
hook_drop=check,
task=check,
}

2
parts/eventsets/pctrain_n.lua
View File

@@ -37,6 +37,6 @@ return{
mStr(P.stat.pc,63,340)
mText(TEXTOBJ.pc,63,410)
end,
dropPiece=check,
hook_drop=check,
task=check,
}

2
parts/eventsets/sprintMD.lua
View File

@@ -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

2
parts/eventsets/sprintSym.lua
View File

@@ -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]

2
parts/eventsets/stack_e.lua
View File

@@ -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

2
parts/eventsets/stack_u.lua
View File

@@ -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

2
parts/eventsets/techrash_n.lua
View File

@@ -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

4
parts/eventsets/techrash_u.lua
View File

@@ -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

2
parts/eventsets/tsd_e.lua
View File

@@ -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

2
parts/eventsets/tsd_h.lua
View File

@@ -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

4
parts/eventsets/tsd_u.lua
View File

@@ -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

6
parts/modes/backfire_h.lua
View File

@@ -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)

6
parts/modes/backfire_l.lua
View File

@@ -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)

6
parts/modes/backfire_n.lua
View File

@@ -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)

6
parts/modes/backfire_u.lua
View File

@@ -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)

2
parts/modes/c4wtrain_l.lua
View File

@@ -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',
},

2
parts/modes/c4wtrain_n.lua
View File

@@ -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',
},

4
parts/modes/custom_clear.lua
View File

@@ -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)

2
parts/modes/custom_puzzle.lua
View File

@@ -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

2
parts/modes/infinite_dig.lua
View File

@@ -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)

2
parts/modes/tech_finesse_f.lua
View File

@@ -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,

2
parts/modes/tech_h_plus.lua
View File

@@ -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',
},

2
parts/modes/tech_l_plus.lua
View File

@@ -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',
},

2
parts/modes/tech_n_plus.lua
View File

@@ -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',
},

2
parts/player/gameEnv0.lua
View File

@@ -61,7 +61,7 @@ return{
noInitSZO=false,
mesDisp={},
dropPiece={},
hook_drop={},
task={},
eventSet="X",

4
parts/player/init.lua
View File

@@ -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])

9
parts/player/player.lua
View File

@@ -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