diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 9e0eedad..ab25b09a 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -501,8 +501,8 @@ function gameStart() end end function scoreValid() - for _,v in next,GAME.mod do - if v.unranked then + for _,M in next,GAME.mod do + if M.unranked then return false end end diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 628a55e4..4d94aaed 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -2,116 +2,116 @@ local function disableKey(P,key) table.insert(P.gameEnv.keyCancel,key) end MODOPT={--Mod options - noNext={id="NN", + noNext={no=0,id="NN", key="q",x=80,y=230,color="red", conflict={"hideNext","fullNext"}, func=function(P)P.gameEnv.nextCount=0 end, }, - fullNext={id="FN", + fullNext={no=1,id="FN", key="w",x=200,y=230,color="water", conflict={"noNext"}, func=function(P)P.gameEnv.nextCount=6 end, unranked=true, }, - noHold={id="NH", + noHold={no=2,id="NH", key="e",x=320,y=230,color="red", conflict={"multiHold"}, func=function(P)P.gameEnv.holdCount=0 end, }, - multiHold={id="MH", + multiHold={no=3,id="MH", 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", + hideNext={no=4,id="FL", 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", + hideBlock={no=5,id="HB", key="u",x=800,y=230,color="orange", func=function(P)P.gameEnv.block=false end, }, - hideGhost={id="HG", + hideGhost={no=6,id="HG", key="i",x=920,y=230,color="orange", func=function(P)P.gameEnv.ghost=false end, }, - hidden={id="HD", + hidden={no=7,id="HD", 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", + coverBoard={no=8,id="CB", key="p",x=1160,y=230,color="grape", list={"down","up","all"}, conflict={"hidden"}, func=function(P)LOG.print("该mod还没有做好!")end, }, - maxG={id="20G", + maxG={no=9,id="20G", key="a",x=140,y=350,color="red", conflict={"minG","suddenLock"}, func=function(P)P.gameEnv.drop=0 end, unranked=true, }, - suddenLock={id="SL", + suddenLock={no=10,id="SL", key="s",x=260,y=350,color="red", conflict={"maxG","infLock"}, func=function(P)P.gameEnv.lock=0 end, unranked=true, }, - oneLife={id="SD", + oneLife={no=11,id="SD", key="d",x=380,y=350,color="red", conflict={"infLife"}, func=function(P)P.gameEnv.life=0 end, unranked=true, }, - noTele={id="NT", + noTele={no=12,id="NT", key="f",x=500,y=350,color="red", conflict={"teleMove"}, func=function(P)P.gameEnv.noTele=true end, }, - forceB2B={id="FB", + forceB2B={no=13,id="FB", key="h",x=740,y=350,color="yellow", func=function(P)P.gameEnv.b2bKill=true end, }, - forceFinesse={id="PF", + forceFinesse={no=14,id="PF", key="j",x=860,y=350,color="yellow", func=function(P)P.gameEnv.fineKill=true end, }, - mirror={id="MR", + mirror={no=15,id="MR", key="k",x=980,y=350,color="grass", func=function(P)LOG.print("该mod还没有做好!")end, }, - flip={id="HR", + flip={no=16,id="HR", key="l",x=1100,y=350,color="grass", func=function(P)LOG.print("该mod还没有做好!")end, }, - minG={id="0G", + minG={no=17,id="0G", key="z",x=200,y=470,color="cyan", conflict={"maxG"}, func=function(P)P.gameEnv.drop=1e99 end, unranked=true, }, - infLock={id="IF", + infLock={no=18,id="IF", key="x",x=320,y=470,color="cyan", conflict={"suddenLock"}, func=function(P)P.gameEnv.lock=1e99 end, unranked=true, }, - infLife={id="NF", + infLife={no=19,id="NF", key="c",x=440,y=470,color="cyan", conflict={"oneLife"}, func=function(P)P.gameEnv.life=1e99 end, unranked=true, }, - teleMove={id="TL", + teleMove={no=20,id="TL", key="v",x=560,y=470,color="cyan", conflict={"noTele"}, func=function(P) @@ -123,13 +123,13 @@ MODOPT={--Mod options end, unranked=true, }, - customSeq={id="CS", + customSeq={no=21,id="CS", 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", + noRotation={no=22,id="FX", key="n",x=800,y=470,color="lGrey", func=function(P) disableKey(P,3) @@ -137,7 +137,7 @@ MODOPT={--Mod options disableKey(P,5) end, }, - noMove={id="ST", + noMove={no=23,id="ST", key="m",x=920,y=470,color="lGrey", func=function(P) disableKey(P,1)disableKey(P,2) diff --git a/parts/scenes/mod.lua b/parts/scenes/mod.lua index 1a970dd9..7a33ec40 100644 --- a/parts/scenes/mod.lua +++ b/parts/scenes/mod.lua @@ -1,6 +1,9 @@ local gc=love.graphics local ins,rem=table.insert,table.remove +local function modComp(a,b) + return a.no0 then + if scoreValid()then + gc.setColor(.7,.7,.7,T*.3) + else + gc.setColor(1,0,0,T*.3) + end + gc.rectangle("fill",780,575,485,140) + setFont(35) + for _,M in next,MODOPT do + if M.sel>0 then + i=M.color + gc.setColor(i[1],i[2],i[3],T) + i=M.no + mStr(M.id,810+i%8*60,575+int(i/8)*45) + end + end + end + --Level rank if GAME.rank>0 then local str=text.ranks[GAME.rank] @@ -216,7 +236,8 @@ function Pnt.pause() --Finesse rank & trophy if S.rank then setFont(60) - gc.setColor(S.fnsRankColor[1],S.fnsRankColor[2],S.fnsRankColor[3],T) + local c=S.fnsRankColor + gc.setColor(c[1],c[2],c[3],T) gc.print(S.rank,420,635) if S.trophy then setFont(40)