mod重新整理

2020-11-23 21:11:31 +08:00
parent 8cc53bfb46
commit 3116fff552
4 changed files with 102 additions and 129 deletions
--- a/parts/globalTables.lua
+++ b/parts/globalTables.lua
@@ -2,147 +2,109 @@ local function disableKey(P,key)
 	table.insert(P.gameEnv.keyCancel,key)
 end
 MODOPT={--Mod options
-	noNext={no=0,id="NN",
-		key="q",x=80,y=230,color="red",
-		conflict={"hideNext","fullNext"},
-		func=function(P)P.gameEnv.nextCount=0 end,
+	next={no=0,id="NX",
+		key="q",x=80,y=230,color="orange",
+		list={0,1,2,3,4,5,6},
+		func=function(P,M)P.gameEnv.nextCount=M.list[M.sel]end,
 	},
-	fullNext={no=1,id="FN",
-		key="w",x=200,y=230,color="water",
-		conflict={"noNext"},
-		func=function(P)P.gameEnv.nextCount=6 end,
+	hold={no=1,id="HL",
+		key="w",x=200,y=230,color="orange",
+		list={0,1,2,3,4,5,6},
+		func=function(P,M)P.gameEnv.holdCount=M.list[M.sel]end,
 		unranked=true,
 	},
-	noHold={no=2,id="NH",
-		key="e",x=320,y=230,color="red",
-		conflict={"multiHold"},
-		func=function(P)P.gameEnv.holdCount=0 end,
-	},
-	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={no=4,id="FL",
-		key="y",x=680,y=230,color="orange",
+	hideNext={no=2,id="FL",
+		key="e",x=320,y=230,color="water",
 		list={1,2,3,4,5},
-		conflict={"noNext"},
 		func=function(P,M)P.gameEnv.nextStartPos=M.list[M.sel]+1 end,
 	},
-	hideBlock={no=5,id="HB",
-		key="u",x=800,y=230,color="orange",
+	infHold={no=3,id="IH",
+		key="r",x=440,y=230,color="water",
+		func=function(P,M)P.gameEnv.infHold=true end,
+		unranked=true,
+	},
+	hideBlock={no=4,id="HB",
+		key="y",x=680,y=230,color="purple",
 		func=function(P)P.gameEnv.block=false end,
 	},
-	hideGhost={no=6,id="HG",
-		key="i",x=920,y=230,color="orange",
+	hideGhost={no=5,id="HG",
+		key="u",x=800,y=230,color="purple",
 		func=function(P)P.gameEnv.ghost=false end,
 	},
-	hidden={no=7,id="HD",
-		key="o",x=1040,y=230,color="grape",
+	hidden={no=6,id="HD",
+		key="i",x=920,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={no=8,id="CB",
-		key="p",x=1160,y=230,color="grape",
+	hideBoard={no=7,id="HB",
+		key="o",x=1040,y=230,color="grape",
 		list={"down","up","all"},
-		conflict={"hidden"},
+		func=function(P)LOG.print("该mod还没有做好!")end,
+	},
+	flipBoard={no=8,id="FB",
+		key="p",x=1160,y=230,color="grass",
+		list={"UD","LR","180"},
 		func=function(P)LOG.print("该mod还没有做好!")end,
 	},

-	maxG={no=9,id="20G",
+	dropDelay={no=9,id="DT",
 		key="a",x=140,y=350,color="red",
-		conflict={"minG","suddenLock"},
-		func=function(P)P.gameEnv.drop=0 end,
+		list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
+		func=function(P,M)P.gameEnv.drop=M.list[M.sel]end,
 		unranked=true,
 	},
-	suddenLock={no=10,id="SL",
+	lockDelay={no=10,id="LT",
 		key="s",x=260,y=350,color="red",
-		conflict={"maxG","infLock"},
-		func=function(P)P.gameEnv.lock=0 end,
+		list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
+		func=function(P,M)P.gameEnv.lock=M.list[M.sel]end,
 		unranked=true,
 	},
-	oneLife={no=11,id="SD",
+	waitDelay={no=11,id="ST",
 		key="d",x=380,y=350,color="red",
-		conflict={"infLife"},
-		func=function(P)P.gameEnv.life=0 end,
+		list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
+		func=function(P,M)P.gameEnv.wait=M.list[M.sel]end,
 		unranked=true,
 	},
-	noTele={no=12,id="NT",
+	fallDelay={no=12,id="CT",
 		key="f",x=500,y=350,color="red",
-		conflict={"teleMove"},
-		func=function(P)P.gameEnv.noTele=true end,
+		list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
+		func=function(P,M)P.gameEnv.fall=M.list[M.sel]end,
+		unranked=true,
 	},
-	customSeq={no=13,id="CS",
-		key="g",x=620,y=350,color="blue",
-		list={"bag","his4","rnd","reverb"},
-		func=function(P,M)P.gameEnv.sequence=M.list[M.sel]end,
+	life={no=13,id="LF",
+		key="j",x=860,y=350,color="yellow",
+		list={0,1,2,3,5,10,15,26,42,87,500},
+		func=function(P,M)P.gameEnv.life=M.list[M.sel]end,
 		unranked=true,
 	},
 	forceB2B={no=14,id="FB",
-		key="h",x=740,y=350,color="yellow",
+		key="k",x=980,y=350,color="yellow",
 		func=function(P)P.gameEnv.b2bKill=true end,
 	},
 	forceFinesse={no=15,id="PF",
-		key="j",x=860,y=350,color="yellow",
+		key="l",x=1100,y=350,color="yellow",
 		func=function(P)P.gameEnv.fineKill=true end,
 	},
-	mirror={no=16,id="MR",
-		key="k",x=980,y=350,color="grass",
-		func=function(P)LOG.print("该mod还没有做好!")end,
-	},
-	flip={no=17,id="HR",
-		key="l",x=1100,y=350,color="grass",
-		func=function(P)LOG.print("该mod还没有做好!")end,
-	},

-	minG={no=18,id="0G",
-		key="z",x=200,y=470,color="cyan",
-		conflict={"maxG"},
-		func=function(P)P.gameEnv.drop=1e99 end,
-		unranked=true,
-	},
-	infLock={no=19,id="IF",
-		key="x",x=320,y=470,color="cyan",
-		conflict={"suddenLock"},
-		func=function(P)P.gameEnv.lock=1e99 end,
-		unranked=true,
-	},
-	infLife={no=20,id="NF",
-		key="c",x=440,y=470,color="cyan",
-		conflict={"oneLife"},
-		func=function(P)P.gameEnv.life=1e99 end,
-		unranked=true,
-	},
-	teleMove={no=21,id="TL",
-		key="v",x=560,y=470,color="cyan",
-		conflict={"noTele"},
+	tele={no=16,id="TL",
+		key="z",x=200,y=470,color="lGrey",
 		func=function(P)
 			P.gameEnv.das,P.gameEnv.arr=0,0
 			P.gameEnv.sddas,P.gameEnv.sdarr=0,0
-			disableKey(P,14)
-			disableKey(P,15)
-			disableKey(P,16)
 		end,
 		unranked=true,
 	},
-	boneBlock={no=22,id="BN",
-		key="b",x=680,y=470,color="blue",
-		func=function(P,M)P.gameEnv.bone=true end,
-	},
-	noRotation={no=23,id="FX",
-		key="n",x=800,y=470,color="lGrey",
+	noRotation={no=17,id="FX",
+		key="x",x=320,y=470,color="lGrey",
 		func=function(P)
 			disableKey(P,3)
 			disableKey(P,4)
 			disableKey(P,5)
 		end,
 	},
-	noMove={no=24,id="ST",
-		key="m",x=920,y=470,color="lGrey",
+	noMove={no=18,id="GL",
+		key="c",x=440,y=470,color="lGrey",
 		func=function(P)
 			disableKey(P,1)disableKey(P,2)
 			disableKey(P,11)disableKey(P,12)
@@ -150,6 +112,22 @@ MODOPT={--Mod options
 			disableKey(P,19)disableKey(P,20)
 		end,
 	},
+	customSeq={no=19,id="CS",
+		key="b",x=680,y=470,color="blue",
+		list={"bag","his4","rnd","reverb"},
+		func=function(P,M)P.gameEnv.sequence=M.list[M.sel]end,
+		unranked=true,
+	},
+	pushSpeed={no=20,id="PS",
+		key="n",x=800,y=470,color="blue",
+		list={.5,1,2,3,5,15,1e99},
+		func=function(P,M)P.gameEnv.pushSpeed=M.list[M.sel]end,
+		unranked=true,
+	},
+	boneBlock={no=21,id="BN",
+		key="m",x=920,y=470,color="blue",
+		func=function(P,M)P.gameEnv.bone=true end,
+	},
 }
 for _,M in next,MODOPT do
 	M.sel,M.time=0,0