diff --git a/parts/globalTables.lua b/parts/globalTables.lua index eee998da..0cf6a9d9 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -3,116 +3,116 @@ local function disableKey(P,key) end MODOPT={--Mod options noNext={id="NN", - key="q",x=80,y=230,color=COLOR.red, + key="q",x=80,y=230,color="red", conflict={"hideNext","fullNext"}, func=function(P)P.gameEnv.nextCount=0 end, }, fullNext={id="FN", - key="w",x=200,y=230,color=COLOR.water, + key="w",x=200,y=230,color="water", conflict={"noNext"}, func=function(P)P.gameEnv.nextCount=6 end, unranked=true, }, noHold={id="NH", - key="e",x=320,y=230,color=COLOR.red, + key="e",x=320,y=230,color="red", conflict={"multiHold"}, func=function(P)P.gameEnv.holdCount=0 end, }, 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}, conflict={"noHold"}, func=function(P,M)P.gameEnv.holdCount=M.list[M.sel] end, unranked=true, }, 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}, conflict={"noNext"}, func=function(P,M)P.gameEnv.nextStartPos=M.list[M.sel]+1 end, }, 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, }, 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, }, hidden={id="HD", - key="o",x=1040,y=230,color=COLOR.grape, + key="o",x=1040,y=230,color="grape", list={"time","fast","none"}, conflict={"coverBoard"}, func=function(P,M)P.gameEnv.visible=M.list[M.sel]end, unranked=true, }, coverBoard={id="CB", - key="p",x=1160,y=230,color=COLOR.grape, + key="p",x=1160,y=230,color="grape", list={"down","up","all"}, conflict={"hidden"}, func=function(P)LOG.print("该mod还没有做好!")end, }, maxG={id="20G", - key="a",x=140,y=350,color=COLOR.red, + key="a",x=140,y=350,color="red", conflict={"minG","suddenLock"}, func=function(P)P.gameEnv.drop=0 end, unranked=true, }, suddenLock={id="SL", - key="s",x=260,y=350,color=COLOR.red, + key="s",x=260,y=350,color="red", conflict={"maxG","infLock"}, func=function(P)P.gameEnv.lock=0 end, unranked=true, }, oneLife={id="SD", - key="d",x=380,y=350,color=COLOR.red, + key="d",x=380,y=350,color="red", conflict={"infLife"}, func=function(P)P.gameEnv.life=0 end, unranked=true, }, noTele={id="NT", - key="f",x=500,y=350,color=COLOR.red, + key="f",x=500,y=350,color="red", conflict={"teleMove"}, func=function(P)P.gameEnv.noTele=true end, }, 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, }, 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, }, 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, }, 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, }, minG={id="0G", - key="z",x=200,y=470,color=COLOR.cyan, + key="z",x=200,y=470,color="cyan", conflict={"maxG"}, func=function(P)P.gameEnv.drop=1e99 end, unranked=true, }, infLock={id="IF", - key="x",x=320,y=470,color=COLOR.cyan, + key="x",x=320,y=470,color="cyan", conflict={"suddenLock"}, func=function(P)P.gameEnv.lock=1e99 end, unranked=true, }, infLife={id="NF", - key="c",x=440,y=470,color=COLOR.cyan, + key="c",x=440,y=470,color="cyan", conflict={"oneLife"}, func=function(P)P.gameEnv.life=1e99 end, unranked=true, }, teleMove={id="TL", - key="v",x=560,y=470,color=COLOR.cyan, + key="v",x=560,y=470,color="cyan", conflict={"noTele"}, func=function(P) P.gameEnv.das,P.gameEnv.arr=0,0 @@ -124,13 +124,13 @@ MODOPT={--Mod options unranked=true, }, 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"}, func=function(P,M)P.gameEnv.sequence=M.list[M.sel]end, unranked=true, }, noRotation={id="FX", - key="n",x=800,y=470,color=COLOR.lGrey, + key="n",x=800,y=470,color="lGrey", func=function(P) disableKey(P,3) disableKey(P,4) @@ -138,7 +138,7 @@ MODOPT={--Mod options end, }, noMove={id="ST", - key="m",x=920,y=470,color=COLOR.lGrey, + key="m",x=920,y=470,color="lGrey", func=function(P) disableKey(P,1)disableKey(P,2) disableKey(P,11)disableKey(P,12) @@ -146,7 +146,11 @@ MODOPT={--Mod options disableKey(P,19)disableKey(P,20) 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 --Basic @@ -192,7 +196,6 @@ CUSTOMENV={--gameEnv for cutsom game --Else bg="none", bgm="race", - noMod=true, } FIELD={}--Field(s) for custom game diff --git a/parts/player/init.lua b/parts/player/init.lua index 0cf9715f..52586ed1 100644 --- a/parts/player/init.lua +++ b/parts/player/init.lua @@ -298,7 +298,7 @@ end function PLY.check_lineReach(P) if P.stat.row>=P.gameEnv.target then P:win("finish") -end + end end function PLY.check_attackReach(P) if P.stat.atk>=P.gameEnv.target then @@ -369,7 +369,6 @@ function PLY.newPlayer(id,x,y,size) loadGameEnv(P) applyGameEnv(P) prepareSequence(P) - end ---------------------------------------------------- return PLY \ No newline at end of file