整理代码,修复自定义模式用不了mod

This commit is contained in:
MrZ626
2020-11-22 12:53:57 +08:00
parent 2783a7978f
commit 976814e039
2 changed files with 30 additions and 28 deletions

View File

@@ -3,116 +3,116 @@ local function disableKey(P,key)
end end
MODOPT={--Mod options MODOPT={--Mod options
noNext={id="NN", noNext={id="NN",
key="q",x=80,y=230,color=COLOR.red, key="q",x=80,y=230,color="red",
conflict={"hideNext","fullNext"}, conflict={"hideNext","fullNext"},
func=function(P)P.gameEnv.nextCount=0 end, func=function(P)P.gameEnv.nextCount=0 end,
}, },
fullNext={id="FN", fullNext={id="FN",
key="w",x=200,y=230,color=COLOR.water, key="w",x=200,y=230,color="water",
conflict={"noNext"}, conflict={"noNext"},
func=function(P)P.gameEnv.nextCount=6 end, func=function(P)P.gameEnv.nextCount=6 end,
unranked=true, unranked=true,
}, },
noHold={id="NH", noHold={id="NH",
key="e",x=320,y=230,color=COLOR.red, key="e",x=320,y=230,color="red",
conflict={"multiHold"}, conflict={"multiHold"},
func=function(P)P.gameEnv.holdCount=0 end, func=function(P)P.gameEnv.holdCount=0 end,
}, },
multiHold={id="MH", multiHold={id="MH",
key="r",x=440,y=230,color=COLOR.water, key="r",x=440,y=230,color="water",
list={2,3,4,5,6}, list={2,3,4,5,6},
conflict={"noHold"}, conflict={"noHold"},
func=function(P,M)P.gameEnv.holdCount=M.list[M.sel] end, func=function(P,M)P.gameEnv.holdCount=M.list[M.sel] end,
unranked=true, unranked=true,
}, },
hideNext={id="FL", hideNext={id="FL",
key="y",x=680,y=230,color=COLOR.orange, key="y",x=680,y=230,color="orange",
list={1,2,3,4,5}, list={1,2,3,4,5},
conflict={"noNext"}, conflict={"noNext"},
func=function(P,M)P.gameEnv.nextStartPos=M.list[M.sel]+1 end, func=function(P,M)P.gameEnv.nextStartPos=M.list[M.sel]+1 end,
}, },
hideBlock={id="HB", hideBlock={id="HB",
key="u",x=800,y=230,color=COLOR.orange, key="u",x=800,y=230,color="orange",
func=function(P)P.gameEnv.block=false end, func=function(P)P.gameEnv.block=false end,
}, },
hideGhost={id="HG", hideGhost={id="HG",
key="i",x=920,y=230,color=COLOR.orange, key="i",x=920,y=230,color="orange",
func=function(P)P.gameEnv.ghost=false end, func=function(P)P.gameEnv.ghost=false end,
}, },
hidden={id="HD", hidden={id="HD",
key="o",x=1040,y=230,color=COLOR.grape, key="o",x=1040,y=230,color="grape",
list={"time","fast","none"}, list={"time","fast","none"},
conflict={"coverBoard"}, conflict={"coverBoard"},
func=function(P,M)P.gameEnv.visible=M.list[M.sel]end, func=function(P,M)P.gameEnv.visible=M.list[M.sel]end,
unranked=true, unranked=true,
}, },
coverBoard={id="CB", coverBoard={id="CB",
key="p",x=1160,y=230,color=COLOR.grape, key="p",x=1160,y=230,color="grape",
list={"down","up","all"}, list={"down","up","all"},
conflict={"hidden"}, conflict={"hidden"},
func=function(P)LOG.print("该mod还没有做好!")end, func=function(P)LOG.print("该mod还没有做好!")end,
}, },
maxG={id="20G", maxG={id="20G",
key="a",x=140,y=350,color=COLOR.red, key="a",x=140,y=350,color="red",
conflict={"minG","suddenLock"}, conflict={"minG","suddenLock"},
func=function(P)P.gameEnv.drop=0 end, func=function(P)P.gameEnv.drop=0 end,
unranked=true, unranked=true,
}, },
suddenLock={id="SL", suddenLock={id="SL",
key="s",x=260,y=350,color=COLOR.red, key="s",x=260,y=350,color="red",
conflict={"maxG","infLock"}, conflict={"maxG","infLock"},
func=function(P)P.gameEnv.lock=0 end, func=function(P)P.gameEnv.lock=0 end,
unranked=true, unranked=true,
}, },
oneLife={id="SD", oneLife={id="SD",
key="d",x=380,y=350,color=COLOR.red, key="d",x=380,y=350,color="red",
conflict={"infLife"}, conflict={"infLife"},
func=function(P)P.gameEnv.life=0 end, func=function(P)P.gameEnv.life=0 end,
unranked=true, unranked=true,
}, },
noTele={id="NT", noTele={id="NT",
key="f",x=500,y=350,color=COLOR.red, key="f",x=500,y=350,color="red",
conflict={"teleMove"}, conflict={"teleMove"},
func=function(P)P.gameEnv.noTele=true end, func=function(P)P.gameEnv.noTele=true end,
}, },
forceB2B={id="FB", forceB2B={id="FB",
key="h",x=740,y=350,color=COLOR.yellow, key="h",x=740,y=350,color="yellow",
func=function(P)P.gameEnv.b2bKill=true end, func=function(P)P.gameEnv.b2bKill=true end,
}, },
forceFinesse={id="PF", forceFinesse={id="PF",
key="j",x=860,y=350,color=COLOR.yellow, key="j",x=860,y=350,color="yellow",
func=function(P)P.gameEnv.fineKill=true end, func=function(P)P.gameEnv.fineKill=true end,
}, },
mirror={id="MR", mirror={id="MR",
key="k",x=980,y=350,color=COLOR.grass, key="k",x=980,y=350,color="grass",
func=function(P)LOG.print("该mod还没有做好!")end, func=function(P)LOG.print("该mod还没有做好!")end,
}, },
flip={id="HR", flip={id="HR",
key="l",x=1100,y=350,color=COLOR.grass, key="l",x=1100,y=350,color="grass",
func=function(P)LOG.print("该mod还没有做好!")end, func=function(P)LOG.print("该mod还没有做好!")end,
}, },
minG={id="0G", minG={id="0G",
key="z",x=200,y=470,color=COLOR.cyan, key="z",x=200,y=470,color="cyan",
conflict={"maxG"}, conflict={"maxG"},
func=function(P)P.gameEnv.drop=1e99 end, func=function(P)P.gameEnv.drop=1e99 end,
unranked=true, unranked=true,
}, },
infLock={id="IF", infLock={id="IF",
key="x",x=320,y=470,color=COLOR.cyan, key="x",x=320,y=470,color="cyan",
conflict={"suddenLock"}, conflict={"suddenLock"},
func=function(P)P.gameEnv.lock=1e99 end, func=function(P)P.gameEnv.lock=1e99 end,
unranked=true, unranked=true,
}, },
infLife={id="NF", infLife={id="NF",
key="c",x=440,y=470,color=COLOR.cyan, key="c",x=440,y=470,color="cyan",
conflict={"oneLife"}, conflict={"oneLife"},
func=function(P)P.gameEnv.life=1e99 end, func=function(P)P.gameEnv.life=1e99 end,
unranked=true, unranked=true,
}, },
teleMove={id="TL", teleMove={id="TL",
key="v",x=560,y=470,color=COLOR.cyan, key="v",x=560,y=470,color="cyan",
conflict={"noTele"}, conflict={"noTele"},
func=function(P) func=function(P)
P.gameEnv.das,P.gameEnv.arr=0,0 P.gameEnv.das,P.gameEnv.arr=0,0
@@ -124,13 +124,13 @@ MODOPT={--Mod options
unranked=true, unranked=true,
}, },
customSeq={id="CS", customSeq={id="CS",
key="b",x=680,y=470,color=COLOR.purple, key="b",x=680,y=470,color="purple",
list={"bag","his4","rnd","reverb"}, list={"bag","his4","rnd","reverb"},
func=function(P,M)P.gameEnv.sequence=M.list[M.sel]end, func=function(P,M)P.gameEnv.sequence=M.list[M.sel]end,
unranked=true, unranked=true,
}, },
noRotation={id="FX", noRotation={id="FX",
key="n",x=800,y=470,color=COLOR.lGrey, key="n",x=800,y=470,color="lGrey",
func=function(P) func=function(P)
disableKey(P,3) disableKey(P,3)
disableKey(P,4) disableKey(P,4)
@@ -138,7 +138,7 @@ MODOPT={--Mod options
end, end,
}, },
noMove={id="ST", noMove={id="ST",
key="m",x=920,y=470,color=COLOR.lGrey, key="m",x=920,y=470,color="lGrey",
func=function(P) func=function(P)
disableKey(P,1)disableKey(P,2) disableKey(P,1)disableKey(P,2)
disableKey(P,11)disableKey(P,12) disableKey(P,11)disableKey(P,12)
@@ -146,7 +146,11 @@ MODOPT={--Mod options
disableKey(P,19)disableKey(P,20) disableKey(P,19)disableKey(P,20)
end, end,
}, },
}for _,M in next,MODOPT do M.sel,M.time=0,0 end }
for _,M in next,MODOPT do
M.sel,M.time=0,0
M.color=COLOR[M.color]
end
CUSTOMENV={--gameEnv for cutsom game CUSTOMENV={--gameEnv for cutsom game
--Basic --Basic
@@ -192,7 +196,6 @@ CUSTOMENV={--gameEnv for cutsom game
--Else --Else
bg="none", bg="none",
bgm="race", bgm="race",
noMod=true,
} }
FIELD={}--Field(s) for custom game FIELD={}--Field(s) for custom game

View File

@@ -298,7 +298,7 @@ end
function PLY.check_lineReach(P) function PLY.check_lineReach(P)
if P.stat.row>=P.gameEnv.target then if P.stat.row>=P.gameEnv.target then
P:win("finish") P:win("finish")
end end
end end
function PLY.check_attackReach(P) function PLY.check_attackReach(P)
if P.stat.atk>=P.gameEnv.target then if P.stat.atk>=P.gameEnv.target then
@@ -369,7 +369,6 @@ function PLY.newPlayer(id,x,y,size)
loadGameEnv(P) loadGameEnv(P)
applyGameEnv(P) applyGameEnv(P)
prepareSequence(P) prepareSequence(P)
end end
--------------------------</Public>-------------------------- --------------------------</Public>--------------------------
return PLY return PLY