diff --git a/Zframework/widget.lua b/Zframework/widget.lua index f06f89e5..c1cc3ff6 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -671,25 +671,24 @@ end WIDGET.active={}--Table contains all active widgets WIDGET.sel=nil--Selected widget -WIDGET.lnk={ - BACK=function()SCN.back()end, - CUSval=function(k) return function() return CUSTOMENV[k] end end, - CUSrev=function(k) return function() CUSTOMENV[k]=not CUSTOMENV[k] end end, - CUSsto=function(k) return function(i) CUSTOMENV[k]=i end end, +function WIDGET.lnk_BACK() SCN.back()end +function WIDGET.lnk_CUSval(k) return function() return CUSTOMENV[k] end end +function WIDGET.lnk_CUSrev(k) return function() CUSTOMENV[k]=not CUSTOMENV[k] end end +function WIDGET.lnk_CUSsto(k) return function(i) CUSTOMENV[k]=i end end - SETval=function(k) return function() return SETTING[k] end end, - SETrev=function(k) return function() SETTING[k]=not SETTING[k] end end, - SETsto=function(k) return function(i) SETTING[k]=i end end, +function WIDGET.lnk_SETval(k) return function() return SETTING[k] end end +function WIDGET.lnk_SETrev(k) return function() SETTING[k]=not SETTING[k] end end +function WIDGET.lnk_SETsto(k) return function(i) SETTING[k]=i end end - STPval=function(k) return function() return sceneTemp[k] end end, - STPrev=function(k) return function() sceneTemp[k]=not sceneTemp[k] end end, - STPsto=function(k) return function(i) sceneTemp[k]=i end end, - STPeq=function(k,v) return function() return sceneTemp[k]==v end end, +function WIDGET.lnk_STPval(k) return function() return sceneTemp[k] end end +function WIDGET.lnk_STPrev(k) return function() sceneTemp[k]=not sceneTemp[k] end end +function WIDGET.lnk_STPsto(k) return function(i) sceneTemp[k]=i end end +function WIDGET.lnk_STPeq(k,v) return function() return sceneTemp[k]==v end end + +function WIDGET.lnk_pressKey(k) return function() love.keypressed(k) end end +function WIDGET.lnk_goScene(t,s) return function() SCN.go(t,s) end end +function WIDGET.lnk_swapScene(t,s) return function() SCN.swapTo(t,s) end end - pressKey=function(k)return function() love.keypressed(k) end end, - goScene=function(t,s)return function() SCN.go(t,s) end end, - swapScene=function(t,s)return function()SCN.swapTo(t,s) end end, -} local indexMeta={ __index=function(L,k) for i=1,#L do diff --git a/parts/scenes/account.lua b/parts/scenes/account.lua index 0780b4d3..e90392eb 100644 --- a/parts/scenes/account.lua +++ b/parts/scenes/account.lua @@ -6,5 +6,5 @@ end WIDGET.init("account",{ WIDGET.newText({name="title", x=80, y=50,font=70,align="L"}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/calculator.lua b/parts/scenes/calculator.lua index 9ad3d40c..9f447f80 100644 --- a/parts/scenes/calculator.lua +++ b/parts/scenes/calculator.lua @@ -124,23 +124,23 @@ function Pnt.calculator() end WIDGET.init("calculator",{ - WIDGET.newKey({name="_1", x=150,y=300,w=90, font=50,code=WIDGET.lnk.pressKey("1")}), - WIDGET.newKey({name="_2", x=250,y=300,w=90, font=50,code=WIDGET.lnk.pressKey("2")}), - WIDGET.newKey({name="_3", x=350,y=300,w=90, font=50,code=WIDGET.lnk.pressKey("3")}), - WIDGET.newKey({name="_4", x=150,y=400,w=90, font=50,code=WIDGET.lnk.pressKey("4")}), - WIDGET.newKey({name="_5", x=250,y=400,w=90, font=50,code=WIDGET.lnk.pressKey("5")}), - WIDGET.newKey({name="_6", x=350,y=400,w=90, font=50,code=WIDGET.lnk.pressKey("6")}), - WIDGET.newKey({name="_7", x=150,y=500,w=90, font=50,code=WIDGET.lnk.pressKey("7")}), - WIDGET.newKey({name="_8", x=250,y=500,w=90, font=50,code=WIDGET.lnk.pressKey("8")}), - WIDGET.newKey({name="_9", x=350,y=500,w=90, font=50,code=WIDGET.lnk.pressKey("9")}), - WIDGET.newKey({name="_0", x=150,y=600,w=90, font=50,code=WIDGET.lnk.pressKey("0")}), - WIDGET.newKey({name=".", x=250,y=600,w=90, color="lPurple",font=50,code=WIDGET.lnk.pressKey(".")}), - WIDGET.newKey({name="e", x=350,y=600,w=90, color="lPurple",font=50,code=WIDGET.lnk.pressKey("e")}), - WIDGET.newKey({name="+", x=450,y=300,w=90, color="lBlue", font=50,code=WIDGET.lnk.pressKey("+")}), - WIDGET.newKey({name="-", x=450,y=400,w=90, color="lBlue", font=50,code=WIDGET.lnk.pressKey("-")}), - WIDGET.newKey({name="*", x=450,y=500,w=90, color="lBlue", font=50,code=WIDGET.lnk.pressKey("*")}), - WIDGET.newKey({name="/", x=450,y=600,w=90, color="lBlue", font=50,code=WIDGET.lnk.pressKey("/")}), - WIDGET.newKey({name="<", x=550,y=300,w=90, color="lRed", font=50,code=WIDGET.lnk.pressKey("backspace")}), - WIDGET.newKey({name="=", x=550,y=400,w=90, color="lYellow",font=50,code=WIDGET.lnk.pressKey("return")}), - WIDGET.newButton({name="play", x=640,y=600,w=180,h=90, color="lGreen", font=40,code=WIDGET.lnk.pressKey("space"),hide=function()return not sceneTemp.pass end}), + WIDGET.newKey({name="_1", x=150,y=300,w=90, font=50,code=WIDGET.lnk_pressKey("1")}), + WIDGET.newKey({name="_2", x=250,y=300,w=90, font=50,code=WIDGET.lnk_pressKey("2")}), + WIDGET.newKey({name="_3", x=350,y=300,w=90, font=50,code=WIDGET.lnk_pressKey("3")}), + WIDGET.newKey({name="_4", x=150,y=400,w=90, font=50,code=WIDGET.lnk_pressKey("4")}), + WIDGET.newKey({name="_5", x=250,y=400,w=90, font=50,code=WIDGET.lnk_pressKey("5")}), + WIDGET.newKey({name="_6", x=350,y=400,w=90, font=50,code=WIDGET.lnk_pressKey("6")}), + WIDGET.newKey({name="_7", x=150,y=500,w=90, font=50,code=WIDGET.lnk_pressKey("7")}), + WIDGET.newKey({name="_8", x=250,y=500,w=90, font=50,code=WIDGET.lnk_pressKey("8")}), + WIDGET.newKey({name="_9", x=350,y=500,w=90, font=50,code=WIDGET.lnk_pressKey("9")}), + WIDGET.newKey({name="_0", x=150,y=600,w=90, font=50,code=WIDGET.lnk_pressKey("0")}), + WIDGET.newKey({name=".", x=250,y=600,w=90, color="lPurple",font=50,code=WIDGET.lnk_pressKey(".")}), + WIDGET.newKey({name="e", x=350,y=600,w=90, color="lPurple",font=50,code=WIDGET.lnk_pressKey("e")}), + WIDGET.newKey({name="+", x=450,y=300,w=90, color="lBlue", font=50,code=WIDGET.lnk_pressKey("+")}), + WIDGET.newKey({name="-", x=450,y=400,w=90, color="lBlue", font=50,code=WIDGET.lnk_pressKey("-")}), + WIDGET.newKey({name="*", x=450,y=500,w=90, color="lBlue", font=50,code=WIDGET.lnk_pressKey("*")}), + WIDGET.newKey({name="/", x=450,y=600,w=90, color="lBlue", font=50,code=WIDGET.lnk_pressKey("/")}), + WIDGET.newKey({name="<", x=550,y=300,w=90, color="lRed", font=50,code=WIDGET.lnk_pressKey("backspace")}), + WIDGET.newKey({name="=", x=550,y=400,w=90, color="lYellow",font=50,code=WIDGET.lnk_pressKey("return")}), + WIDGET.newButton({name="play", x=640,y=600,w=180,h=90, color="lGreen", font=40,code=WIDGET.lnk_pressKey("space"),hide=function()return not sceneTemp.pass end}), }) \ No newline at end of file diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index adcd72b1..548cfc7a 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -158,31 +158,31 @@ WIDGET.init("customGame",{ WIDGET.newText({name="noMsn", x=610, y=550,align="L",color="grey",hide=function()return MISSION[1]end}), --Basic - WIDGET.newSelector({name="drop",x=170, y=150,w=220,color="orange", 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},disp=WIDGET.lnk.CUSval("drop"),code=WIDGET.lnk.CUSsto("drop")}), - WIDGET.newSelector({name="lock",x=170, y=230,w=220,color="red", list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, disp=WIDGET.lnk.CUSval("lock"),code=WIDGET.lnk.CUSsto("lock")}), - WIDGET.newSelector({name="wait",x=410, y=150,w=220,color="green", list={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, disp=WIDGET.lnk.CUSval("wait"),code=WIDGET.lnk.CUSsto("wait")}), - WIDGET.newSelector({name="fall",x=410, y=230,w=220,color="yellow", list={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, disp=WIDGET.lnk.CUSval("fall"),code=WIDGET.lnk.CUSsto("fall")}), + WIDGET.newSelector({name="drop",x=170, y=150,w=220,color="orange", 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},disp=WIDGET.lnk_CUSval("drop"),code=WIDGET.lnk_CUSsto("drop")}), + WIDGET.newSelector({name="lock",x=170, y=230,w=220,color="red", list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, disp=WIDGET.lnk_CUSval("lock"),code=WIDGET.lnk_CUSsto("lock")}), + WIDGET.newSelector({name="wait",x=410, y=150,w=220,color="green", list={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, disp=WIDGET.lnk_CUSval("wait"),code=WIDGET.lnk_CUSsto("wait")}), + WIDGET.newSelector({name="fall",x=410, y=230,w=220,color="yellow", list={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, disp=WIDGET.lnk_CUSval("fall"),code=WIDGET.lnk_CUSsto("fall")}), --Else WIDGET.newSelector({name="bg", x=1070, y=150,w=250,color="yellow", list={"none","grey","glow","rgb","flink","wing","fan","badapple","welcome","aura","bg1","bg2","rainbow","rainbow2","tunnel","lightning","lightning2","matrix","space"}, - disp=WIDGET.lnk.CUSval("bg"), + disp=WIDGET.lnk_CUSval("bg"), code=function(i)CUSTOMENV.bg=i BG.set(i)end }), - WIDGET.newSelector({name="bgm", x=1070, y=230,w=250,color="yellow", list=BGM.list, disp=WIDGET.lnk.CUSval("bgm"), code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}), + WIDGET.newSelector({name="bgm", x=1070, y=230,w=250,color="yellow", list=BGM.list, disp=WIDGET.lnk_CUSval("bgm"), code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}), --Copy/Paste/Start - WIDGET.newButton({name="copy", x=1070, y=310,w=310,h=70,color="lRed", font=25,code=WIDGET.lnk.pressKey("cC")}), - WIDGET.newButton({name="paste", x=1070, y=390,w=310,h=70,color="lBlue", font=25,code=WIDGET.lnk.pressKey("cV")}), - WIDGET.newButton({name="clear", x=1070, y=470,w=310,h=70,color="lYellow",font=35,code=WIDGET.lnk.pressKey("return")}), - WIDGET.newButton({name="puzzle",x=1070, y=550,w=310,h=70,color="lMagenta",font=35,code=WIDGET.lnk.pressKey("return2"),hide=function()return not sceneTemp.initField end}), + WIDGET.newButton({name="copy", x=1070, y=310,w=310,h=70,color="lRed", font=25,code=WIDGET.lnk_pressKey("cC")}), + WIDGET.newButton({name="paste", x=1070, y=390,w=310,h=70,color="lBlue", font=25,code=WIDGET.lnk_pressKey("cV")}), + WIDGET.newButton({name="clear", x=1070, y=470,w=310,h=70,color="lYellow",font=35,code=WIDGET.lnk_pressKey("return")}), + WIDGET.newButton({name="puzzle",x=1070, y=550,w=310,h=70,color="lMagenta",font=35,code=WIDGET.lnk_pressKey("return2"),hide=function()return not sceneTemp.initField end}), --More - WIDGET.newKey({name="advance", x=730, y=190,w=220,h=90,color="red", font=35,code=WIDGET.lnk.goScene("custom_advance")}), - WIDGET.newKey({name="field", x=170, y=640,w=240,h=80,color="water", font=25,code=WIDGET.lnk.goScene("custom_field")}), - WIDGET.newKey({name="sequence", x=450, y=640,w=240,h=80,color="pink", font=25,code=WIDGET.lnk.goScene("custom_sequence")}), - WIDGET.newKey({name="mission", x=730, y=640,w=240,h=80,color="sky", font=25,code=WIDGET.lnk.goScene("custom_mission")}), + WIDGET.newKey({name="advance", x=730, y=190,w=220,h=90,color="red", font=35,code=WIDGET.lnk_goScene("custom_advance")}), + WIDGET.newKey({name="field", x=170, y=640,w=240,h=80,color="water", font=25,code=WIDGET.lnk_goScene("custom_field")}), + WIDGET.newKey({name="sequence", x=450, y=640,w=240,h=80,color="pink", font=25,code=WIDGET.lnk_goScene("custom_sequence")}), + WIDGET.newKey({name="mission", x=730, y=640,w=240,h=80,color="sky", font=25,code=WIDGET.lnk_goScene("custom_mission")}), - WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index 35b6d3ea..d3114835 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -3,35 +3,35 @@ WIDGET.init("custom_advance",{ WIDGET.newText({name="subTitle", x=530,y=50,font=35,align="L",color="grey"}), --Visual - WIDGET.newSwitch({name="block", x=620, y=430, font=25, disp=WIDGET.lnk.CUSval("block"), code=WIDGET.lnk.CUSrev("block")}), - WIDGET.newSlider({name="ghost", x=490, y=500,w=200,unit=.6,font=25, disp=WIDGET.lnk.CUSval("ghost"), code=WIDGET.lnk.CUSsto("ghost")}), - WIDGET.newSlider({name="center", x=490, y=560,w=200,unit=1, font=25, disp=WIDGET.lnk.CUSval("center"), code=WIDGET.lnk.CUSsto("center")}), + WIDGET.newSwitch({name="block", x=620, y=430, font=25, disp=WIDGET.lnk_CUSval("block"), code=WIDGET.lnk_CUSrev("block")}), + WIDGET.newSlider({name="ghost", x=490, y=500,w=200,unit=.6,font=25, disp=WIDGET.lnk_CUSval("ghost"), code=WIDGET.lnk_CUSsto("ghost")}), + WIDGET.newSlider({name="center", x=490, y=560,w=200,unit=1, font=25, disp=WIDGET.lnk_CUSval("center"), code=WIDGET.lnk_CUSsto("center")}), - WIDGET.newSwitch({name="bagLine", x=1190, y=340, disp=WIDGET.lnk.CUSval("bagLine"), code=WIDGET.lnk.CUSrev("bagLine")}), - WIDGET.newSwitch({name="highCam", x=1190, y=410, disp=WIDGET.lnk.CUSval("highCam"), code=WIDGET.lnk.CUSrev("highCam")}), - WIDGET.newSwitch({name="nextPos", x=1190, y=480, disp=WIDGET.lnk.CUSval("nextPos"), code=WIDGET.lnk.CUSrev("nextPos")}), - WIDGET.newSwitch({name="bone", x=1190, y=550, disp=WIDGET.lnk.CUSval("bone"), code=WIDGET.lnk.CUSrev("bone")}), + WIDGET.newSwitch({name="bagLine", x=1190, y=340, disp=WIDGET.lnk_CUSval("bagLine"), code=WIDGET.lnk_CUSrev("bagLine")}), + WIDGET.newSwitch({name="highCam", x=1190, y=410, disp=WIDGET.lnk_CUSval("highCam"), code=WIDGET.lnk_CUSrev("highCam")}), + WIDGET.newSwitch({name="nextPos", x=1190, y=480, disp=WIDGET.lnk_CUSval("nextPos"), code=WIDGET.lnk_CUSrev("nextPos")}), + WIDGET.newSwitch({name="bone", x=1190, y=550, disp=WIDGET.lnk_CUSval("bone"), code=WIDGET.lnk_CUSrev("bone")}), --Control - WIDGET.newSlider({name="next", x=130, y=410,w=200,unit=6, disp=WIDGET.lnk.CUSval("next"), code=WIDGET.lnk.CUSsto("next")}), - WIDGET.newSwitch({name="hold", x=260, y=480, disp=WIDGET.lnk.CUSval("hold"), code=WIDGET.lnk.CUSrev("hold")}), - WIDGET.newSwitch({name="oncehold", x=260, y=560, disp=WIDGET.lnk.CUSval("oncehold"),code=WIDGET.lnk.CUSrev("oncehold"),hide=function()return not CUSTOMENV.hold end}), + WIDGET.newSlider({name="next", x=130, y=410,w=200,unit=6, disp=WIDGET.lnk_CUSval("next"), code=WIDGET.lnk_CUSsto("next")}), + WIDGET.newSwitch({name="hold", x=260, y=480, disp=WIDGET.lnk_CUSval("hold"), code=WIDGET.lnk_CUSrev("hold")}), + WIDGET.newSwitch({name="oncehold", x=260, y=560, disp=WIDGET.lnk_CUSval("oncehold"), code=WIDGET.lnk_CUSrev("oncehold"),hide=function()return not CUSTOMENV.hold end}), - WIDGET.newSlider({name="mindas", x=180, y=150,w=400,unit=15,font=25, disp=WIDGET.lnk.CUSval("mindas"), code=WIDGET.lnk.CUSsto("mindas")}), - WIDGET.newSlider({name="minarr", x=180, y=220,w=400,unit=10,font=25, disp=WIDGET.lnk.CUSval("minarr"), code=WIDGET.lnk.CUSsto("minarr")}), - WIDGET.newSlider({name="minsdarr", x=180, y=290,w=200,unit=4, font=20, disp=WIDGET.lnk.CUSval("minsdarr"),code=WIDGET.lnk.CUSsto("minsdarr")}), + WIDGET.newSlider({name="mindas", x=180, y=150,w=400,unit=15,font=25, disp=WIDGET.lnk_CUSval("mindas"), code=WIDGET.lnk_CUSsto("mindas")}), + WIDGET.newSlider({name="minarr", x=180, y=220,w=400,unit=10,font=25, disp=WIDGET.lnk_CUSval("minarr"), code=WIDGET.lnk_CUSsto("minarr")}), + WIDGET.newSlider({name="minsdarr", x=180, y=290,w=200,unit=4, font=20, disp=WIDGET.lnk_CUSval("minsdarr"), code=WIDGET.lnk_CUSsto("minsdarr")}), --Rule - WIDGET.newSwitch({name="ospin", x=910, y=340, font=30, disp=WIDGET.lnk.CUSval("ospin"), code=WIDGET.lnk.CUSrev("ospin")}), - WIDGET.newSwitch({name="noTele", x=910, y=420, font=25, disp=WIDGET.lnk.CUSval("noTele"), code=WIDGET.lnk.CUSrev("noTele")}), - WIDGET.newSwitch({name="fineKill", x=910, y=490, font=20, disp=WIDGET.lnk.CUSval("fineKill"),code=WIDGET.lnk.CUSrev("fineKill")}), - WIDGET.newSwitch({name="easyFresh", x=910, y=560, font=20, disp=WIDGET.lnk.CUSval("easyFresh"),code=WIDGET.lnk.CUSrev("easyFresh")}), - WIDGET.newSelector({name="visible", x=840, y=60,w=260,color="lBlue", list={"show","time","fast","none"}, disp=WIDGET.lnk.CUSval("visible"), code=WIDGET.lnk.CUSsto("visible")}), - WIDGET.newSelector({name="target", x=840, y=160,w=260,color="green", list={10,20,40,100,200,500,1000,1e99}, disp=WIDGET.lnk.CUSval("target"), code=WIDGET.lnk.CUSsto("target")}), - WIDGET.newSelector({name="freshLimit", x=840, y=260,w=260,color="purple", list={0,8,15,1e99}, disp=WIDGET.lnk.CUSval("freshLimit"),code=WIDGET.lnk.CUSsto("freshLimit")}), - WIDGET.newSelector({name="opponent", x=1120, y=60,w=260,color="red", list={0,1,2,3,4,5,6,7,8,9,10}, disp=WIDGET.lnk.CUSval("opponent"),code=WIDGET.lnk.CUSsto("opponent")}), - WIDGET.newSelector({name="life", x=1120, y=160,w=260,color="red", list={0,1,2,3,5,10,15,26,42,87,500}, disp=WIDGET.lnk.CUSval("life"), code=WIDGET.lnk.CUSsto("life")}), - WIDGET.newSelector({name="pushSpeed", x=1120, y=260,w=260,color="red", list={1,2,3,5,15}, disp=WIDGET.lnk.CUSval("pushSpeed"),code=WIDGET.lnk.CUSsto("pushSpeed")}), + WIDGET.newSwitch({name="ospin", x=910, y=340, font=30, disp=WIDGET.lnk_CUSval("ospin"), code=WIDGET.lnk_CUSrev("ospin")}), + WIDGET.newSwitch({name="noTele", x=910, y=420, font=25, disp=WIDGET.lnk_CUSval("noTele"), code=WIDGET.lnk_CUSrev("noTele")}), + WIDGET.newSwitch({name="fineKill", x=910, y=490, font=20, disp=WIDGET.lnk_CUSval("fineKill"), code=WIDGET.lnk_CUSrev("fineKill")}), + WIDGET.newSwitch({name="easyFresh", x=910, y=560, font=20, disp=WIDGET.lnk_CUSval("easyFresh"),code=WIDGET.lnk_CUSrev("easyFresh")}), + WIDGET.newSelector({name="visible", x=840, y=60,w=260,color="lBlue", list={"show","time","fast","none"}, disp=WIDGET.lnk_CUSval("visible"), code=WIDGET.lnk_CUSsto("visible")}), + WIDGET.newSelector({name="target", x=840, y=160,w=260,color="green", list={10,20,40,100,200,500,1000,1e99}, disp=WIDGET.lnk_CUSval("target"), code=WIDGET.lnk_CUSsto("target")}), + WIDGET.newSelector({name="freshLimit", x=840, y=260,w=260,color="purple", list={0,8,15,1e99}, disp=WIDGET.lnk_CUSval("freshLimit"),code=WIDGET.lnk_CUSsto("freshLimit")}), + WIDGET.newSelector({name="opponent", x=1120, y=60,w=260,color="red", list={0,1,2,3,4,5,6,7,8,9,10}, disp=WIDGET.lnk_CUSval("opponent"),code=WIDGET.lnk_CUSsto("opponent")}), + WIDGET.newSelector({name="life", x=1120, y=160,w=260,color="red", list={0,1,2,3,5,10,15,26,42,87,500}, disp=WIDGET.lnk_CUSval("life"), code=WIDGET.lnk_CUSsto("life")}), + WIDGET.newSelector({name="pushSpeed", x=1120, y=260,w=260,color="red", list={1,2,3,5,15}, disp=WIDGET.lnk_CUSval("pushSpeed"),code=WIDGET.lnk_CUSsto("pushSpeed")}), - WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index 080869d6..800d7259 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -262,18 +262,18 @@ WIDGET.init("custom_field",{ WIDGET.newButton({name="any", x=600, y=400,w=120,color="lGrey", font=40,code=setPen(0)}), WIDGET.newButton({name="space", x=730, y=400,w=120,color="grey", font=65,code=setPen(-1)}), - WIDGET.newButton({name="pushLine", x=990, y=400,w=120,h=120,color="lYellow",font=20,code=WIDGET.lnk.pressKey("k")}), - WIDGET.newButton({name="delLine", x=1120, y=400,w=120,h=120,color="lYellow",font=20,code=WIDGET.lnk.pressKey("l")}), + WIDGET.newButton({name="pushLine", x=990, y=400,w=120,h=120,color="lYellow",font=20,code=WIDGET.lnk_pressKey("k")}), + WIDGET.newButton({name="delLine", x=1120, y=400,w=120,h=120,color="lYellow",font=20,code=WIDGET.lnk_pressKey("l")}), - WIDGET.newButton({name="copy", x=730, y=530,w=120,color="lRed", font=35,code=WIDGET.lnk.pressKey("cC")}), - WIDGET.newButton({name="paste", x=860, y=530,w=120,color="lBlue", font=35,code=WIDGET.lnk.pressKey("cV")}), - WIDGET.newButton({name="clear", x=990, y=530,w=120,color="white", font=40,code=WIDGET.lnk.pressKey("delete")}), - WIDGET.newSwitch({name="demo", x=755, y=640,disp=WIDGET.lnk.STPval("demo"),code=WIDGET.lnk.STPrev("demo")}), + WIDGET.newButton({name="copy", x=730, y=530,w=120,color="lRed", font=35,code=WIDGET.lnk_pressKey("cC")}), + WIDGET.newButton({name="paste", x=860, y=530,w=120,color="lBlue", font=35,code=WIDGET.lnk_pressKey("cV")}), + WIDGET.newButton({name="clear", x=990, y=530,w=120,color="white", font=40,code=WIDGET.lnk_pressKey("delete")}), + WIDGET.newSwitch({name="demo", x=755, y=640,disp=WIDGET.lnk_STPval("demo"),code=WIDGET.lnk_STPrev("demo")}), - WIDGET.newButton({name="newPage", x=100, y=110,w=160,h=110,color="sky",font=20,code=WIDGET.lnk.pressKey("n")}), - WIDGET.newButton({name="delPage", x=100, y=230,w=160,h=110,color="lRed",font=20,code=WIDGET.lnk.pressKey("m")}), - WIDGET.newButton({name="prevPage", x=100, y=350,w=160,h=110,color="lGreen",font=20,code=WIDGET.lnk.pressKey("sTab"),hide=WIDGET.lnk.STPeq("page",1)}), - WIDGET.newButton({name="nextPage", x=100, y=470,w=160,h=110,color="lGreen",font=20,code=WIDGET.lnk.pressKey("tab"),hide=function()return sceneTemp.page==#FIELD end}), + WIDGET.newButton({name="newPage", x=100, y=110,w=160,h=110,color="sky",font=20,code=WIDGET.lnk_pressKey("n")}), + WIDGET.newButton({name="delPage", x=100, y=230,w=160,h=110,color="lRed",font=20,code=WIDGET.lnk_pressKey("m")}), + WIDGET.newButton({name="prevPage", x=100, y=350,w=160,h=110,color="lGreen",font=20,code=WIDGET.lnk_pressKey("sTab"),hide=WIDGET.lnk_STPeq("page",1)}), + WIDGET.newButton({name="nextPage", x=100, y=470,w=160,h=110,color="lGreen",font=20,code=WIDGET.lnk_pressKey("tab"),hide=function()return sceneTemp.page==#FIELD end}), - WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index a742ffb0..dc071ba8 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -189,51 +189,51 @@ WIDGET.init("custom_mission",{ WIDGET.newText({name="title", x=520,y=5,font=70,align="R"}), WIDGET.newText({name="subTitle",x=530,y=50,font=35,align="L",color="grey"}), - WIDGET.newKey({name="_1", x=800, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(01)}), - WIDGET.newKey({name="_2", x=900, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(02)}), - WIDGET.newKey({name="_3", x=800, y=640, w=90, font=50,code=WIDGET.lnk.pressKey(03)}), - WIDGET.newKey({name="_4", x=900, y=640, w=90, font=50,code=WIDGET.lnk.pressKey(04)}), - WIDGET.newKey({name="any1", x=100, y=640, w=90, code=WIDGET.lnk.pressKey(05)}), - WIDGET.newKey({name="any2", x=200, y=640, w=90, code=WIDGET.lnk.pressKey(06)}), - WIDGET.newKey({name="any3", x=300, y=640, w=90, code=WIDGET.lnk.pressKey(07)}), - WIDGET.newKey({name="any4", x=400, y=640, w=90, code=WIDGET.lnk.pressKey(08)}), - WIDGET.newKey({name="PC", x=500, y=640, w=90, font=50,code=WIDGET.lnk.pressKey(09)}), + WIDGET.newKey({name="_1", x=800, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(01)}), + WIDGET.newKey({name="_2", x=900, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(02)}), + WIDGET.newKey({name="_3", x=800, y=640, w=90, font=50,code=WIDGET.lnk_pressKey(03)}), + WIDGET.newKey({name="_4", x=900, y=640, w=90, font=50,code=WIDGET.lnk_pressKey(04)}), + WIDGET.newKey({name="any1", x=100, y=640, w=90, code=WIDGET.lnk_pressKey(05)}), + WIDGET.newKey({name="any2", x=200, y=640, w=90, code=WIDGET.lnk_pressKey(06)}), + WIDGET.newKey({name="any3", x=300, y=640, w=90, code=WIDGET.lnk_pressKey(07)}), + WIDGET.newKey({name="any4", x=400, y=640, w=90, code=WIDGET.lnk_pressKey(08)}), + WIDGET.newKey({name="PC", x=500, y=640, w=90, font=50,code=WIDGET.lnk_pressKey(09)}), - WIDGET.newKey({name="Z1", x=100, y=340, w=90, font=50,code=WIDGET.lnk.pressKey(11)}), - WIDGET.newKey({name="S1", x=200, y=340, w=90, font=50,code=WIDGET.lnk.pressKey(21)}), - WIDGET.newKey({name="J1", x=300, y=340, w=90, font=50,code=WIDGET.lnk.pressKey(31)}), - WIDGET.newKey({name="L1", x=400, y=340, w=90, font=50,code=WIDGET.lnk.pressKey(41)}), - WIDGET.newKey({name="T1", x=500, y=340, w=90, font=50,code=WIDGET.lnk.pressKey(51)}), - WIDGET.newKey({name="O1", x=600, y=340, w=90, font=50,code=WIDGET.lnk.pressKey(61)}), - WIDGET.newKey({name="I1", x=700, y=340, w=90, font=50,code=WIDGET.lnk.pressKey(71)}), + WIDGET.newKey({name="Z1", x=100, y=340, w=90, font=50,code=WIDGET.lnk_pressKey(11)}), + WIDGET.newKey({name="S1", x=200, y=340, w=90, font=50,code=WIDGET.lnk_pressKey(21)}), + WIDGET.newKey({name="J1", x=300, y=340, w=90, font=50,code=WIDGET.lnk_pressKey(31)}), + WIDGET.newKey({name="L1", x=400, y=340, w=90, font=50,code=WIDGET.lnk_pressKey(41)}), + WIDGET.newKey({name="T1", x=500, y=340, w=90, font=50,code=WIDGET.lnk_pressKey(51)}), + WIDGET.newKey({name="O1", x=600, y=340, w=90, font=50,code=WIDGET.lnk_pressKey(61)}), + WIDGET.newKey({name="I1", x=700, y=340, w=90, font=50,code=WIDGET.lnk_pressKey(71)}), - WIDGET.newKey({name="Z2", x=100, y=440, w=90, font=50,code=WIDGET.lnk.pressKey(12)}), - WIDGET.newKey({name="S2", x=200, y=440, w=90, font=50,code=WIDGET.lnk.pressKey(22)}), - WIDGET.newKey({name="J2", x=300, y=440, w=90, font=50,code=WIDGET.lnk.pressKey(32)}), - WIDGET.newKey({name="L2", x=400, y=440, w=90, font=50,code=WIDGET.lnk.pressKey(42)}), - WIDGET.newKey({name="T2", x=500, y=440, w=90, font=50,code=WIDGET.lnk.pressKey(52)}), - WIDGET.newKey({name="O2", x=600, y=440, w=90, font=50,code=WIDGET.lnk.pressKey(62)}), - WIDGET.newKey({name="I2", x=700, y=440, w=90, font=50,code=WIDGET.lnk.pressKey(72)}), + WIDGET.newKey({name="Z2", x=100, y=440, w=90, font=50,code=WIDGET.lnk_pressKey(12)}), + WIDGET.newKey({name="S2", x=200, y=440, w=90, font=50,code=WIDGET.lnk_pressKey(22)}), + WIDGET.newKey({name="J2", x=300, y=440, w=90, font=50,code=WIDGET.lnk_pressKey(32)}), + WIDGET.newKey({name="L2", x=400, y=440, w=90, font=50,code=WIDGET.lnk_pressKey(42)}), + WIDGET.newKey({name="T2", x=500, y=440, w=90, font=50,code=WIDGET.lnk_pressKey(52)}), + WIDGET.newKey({name="O2", x=600, y=440, w=90, font=50,code=WIDGET.lnk_pressKey(62)}), + WIDGET.newKey({name="I2", x=700, y=440, w=90, font=50,code=WIDGET.lnk_pressKey(72)}), - WIDGET.newKey({name="Z3", x=100, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(13)}), - WIDGET.newKey({name="S3", x=200, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(23)}), - WIDGET.newKey({name="J3", x=300, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(33)}), - WIDGET.newKey({name="L3", x=400, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(43)}), - WIDGET.newKey({name="T3", x=500, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(53)}), - WIDGET.newKey({name="O3", x=600, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(63)}), - WIDGET.newKey({name="I3", x=700, y=540, w=90, font=50,code=WIDGET.lnk.pressKey(73)}), + WIDGET.newKey({name="Z3", x=100, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(13)}), + WIDGET.newKey({name="S3", x=200, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(23)}), + WIDGET.newKey({name="J3", x=300, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(33)}), + WIDGET.newKey({name="L3", x=400, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(43)}), + WIDGET.newKey({name="T3", x=500, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(53)}), + WIDGET.newKey({name="O3", x=600, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(63)}), + WIDGET.newKey({name="I3", x=700, y=540, w=90, font=50,code=WIDGET.lnk_pressKey(73)}), - WIDGET.newKey({name="O4", x=600, y=640, w=90, font=50,code=WIDGET.lnk.pressKey(64)}), - WIDGET.newKey({name="I4", x=700, y=640, w=90, font=50,code=WIDGET.lnk.pressKey(74)}), + WIDGET.newKey({name="O4", x=600, y=640, w=90, font=50,code=WIDGET.lnk_pressKey(64)}), + WIDGET.newKey({name="I4", x=700, y=640, w=90, font=50,code=WIDGET.lnk_pressKey(74)}), - WIDGET.newKey({name="left", x=800, y=440, w=90, color="lGreen", font=55,code=WIDGET.lnk.pressKey("left")}), - WIDGET.newKey({name="right", x=900, y=440, w=90, color="lGreen", font=55,code=WIDGET.lnk.pressKey("right")}), - WIDGET.newKey({name="ten", x=1000, y=440, w=90, color="lGreen", font=40,code=WIDGET.lnk.pressKey("ten")}), - WIDGET.newKey({name="backsp", x=1000, y=540, w=90, color="lYellow",font=50,code=WIDGET.lnk.pressKey("backspace")}), - WIDGET.newKey({name="reset", x=1000, y=640, w=90, color="lYellow",font=50,code=WIDGET.lnk.pressKey("delete")}), - WIDGET.newButton({name="copy", x=1140, y=440, w=170,h=80, color="lRed", font=40,code=WIDGET.lnk.pressKey("cC"),hide=function()return #MISSION==0 end}), - WIDGET.newButton({name="paste", x=1140, y=540, w=170,h=80, color="lBlue", font=40,code=WIDGET.lnk.pressKey("cV")}), - WIDGET.newSwitch({name="mission",x=1150, y=350, disp=WIDGET.lnk.CUSval("missionKill"), code=WIDGET.lnk.CUSrev("missionKill")}), + WIDGET.newKey({name="left", x=800, y=440, w=90, color="lGreen", font=55,code=WIDGET.lnk_pressKey("left")}), + WIDGET.newKey({name="right", x=900, y=440, w=90, color="lGreen", font=55,code=WIDGET.lnk_pressKey("right")}), + WIDGET.newKey({name="ten", x=1000, y=440, w=90, color="lGreen", font=40,code=WIDGET.lnk_pressKey("ten")}), + WIDGET.newKey({name="backsp", x=1000, y=540, w=90, color="lYellow",font=50,code=WIDGET.lnk_pressKey("backspace")}), + WIDGET.newKey({name="reset", x=1000, y=640, w=90, color="lYellow",font=50,code=WIDGET.lnk_pressKey("delete")}), + WIDGET.newButton({name="copy", x=1140, y=440, w=170,h=80, color="lRed", font=40,code=WIDGET.lnk_pressKey("cC"),hide=function()return #MISSION==0 end}), + WIDGET.newButton({name="paste", x=1140, y=540, w=170,h=80, color="lBlue", font=40,code=WIDGET.lnk_pressKey("cV")}), + WIDGET.newSwitch({name="mission",x=1150, y=350, disp=WIDGET.lnk_CUSval("missionKill"),code=WIDGET.lnk_CUSrev("missionKill")}), - WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index a50ebc07..f78ce176 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -178,44 +178,44 @@ WIDGET.init("custom_sequence",{ WIDGET.newSelector({name="sequence", x=1080,y=60,w=200,color="yellow", list={"bag","his4","rnd","reverb","loop","fixed"}, - disp=WIDGET.lnk.CUSval("sequence"), - code=WIDGET.lnk.CUSsto("sequence") + disp=WIDGET.lnk_CUSval("sequence"), + code=WIDGET.lnk_CUSsto("sequence") }), - WIDGET.newKey({name="Z", x=100,y=440,w=90,font=50,code=WIDGET.lnk.pressKey(1)}), - WIDGET.newKey({name="S", x=200,y=440,w=90,font=50,code=WIDGET.lnk.pressKey(2)}), - WIDGET.newKey({name="J", x=300,y=440,w=90,font=50,code=WIDGET.lnk.pressKey(3)}), - WIDGET.newKey({name="L", x=400,y=440,w=90,font=50,code=WIDGET.lnk.pressKey(4)}), - WIDGET.newKey({name="T", x=500,y=440,w=90,font=50,code=WIDGET.lnk.pressKey(5)}), - WIDGET.newKey({name="O", x=600,y=440,w=90,font=50,code=WIDGET.lnk.pressKey(6)}), - WIDGET.newKey({name="I", x=700,y=440,w=90,font=50,code=WIDGET.lnk.pressKey(7)}), + WIDGET.newKey({name="Z", x=100,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(1)}), + WIDGET.newKey({name="S", x=200,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(2)}), + WIDGET.newKey({name="J", x=300,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(3)}), + WIDGET.newKey({name="L", x=400,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(4)}), + WIDGET.newKey({name="T", x=500,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(5)}), + WIDGET.newKey({name="O", x=600,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(6)}), + WIDGET.newKey({name="I", x=700,y=440,w=90,font=50,code=WIDGET.lnk_pressKey(7)}), - WIDGET.newKey({name="Z5", x=100,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(8)}), - WIDGET.newKey({name="S5", x=200,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(9)}), - WIDGET.newKey({name="P", x=300,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(10)}), - WIDGET.newKey({name="Q", x=400,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(11)}), - WIDGET.newKey({name="F", x=500,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(12)}), - WIDGET.newKey({name="E", x=600,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(13)}), - WIDGET.newKey({name="T5", x=700,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(14)}), - WIDGET.newKey({name="U", x=800,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(15)}), - WIDGET.newKey({name="V", x=900,y=540,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(16)}), - WIDGET.newKey({name="W", x=100,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(17)}), - WIDGET.newKey({name="X", x=200,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(18)}), - WIDGET.newKey({name="J5", x=300,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(19)}), - WIDGET.newKey({name="L5", x=400,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(20)}), - WIDGET.newKey({name="R", x=500,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(21)}), - WIDGET.newKey({name="Y", x=600,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(22)}), - WIDGET.newKey({name="N", x=700,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(23)}), - WIDGET.newKey({name="H", x=800,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(24)}), - WIDGET.newKey({name="I5", x=900,y=640,w=90,color="grey",font=50,code=WIDGET.lnk.pressKey(25)}), + WIDGET.newKey({name="Z5", x=100,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(8)}), + WIDGET.newKey({name="S5", x=200,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(9)}), + WIDGET.newKey({name="P", x=300,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(10)}), + WIDGET.newKey({name="Q", x=400,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(11)}), + WIDGET.newKey({name="F", x=500,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(12)}), + WIDGET.newKey({name="E", x=600,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(13)}), + WIDGET.newKey({name="T5", x=700,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(14)}), + WIDGET.newKey({name="U", x=800,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(15)}), + WIDGET.newKey({name="V", x=900,y=540,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(16)}), + WIDGET.newKey({name="W", x=100,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(17)}), + WIDGET.newKey({name="X", x=200,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(18)}), + WIDGET.newKey({name="J5", x=300,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(19)}), + WIDGET.newKey({name="L5", x=400,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(20)}), + WIDGET.newKey({name="R", x=500,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(21)}), + WIDGET.newKey({name="Y", x=600,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(22)}), + WIDGET.newKey({name="N", x=700,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(23)}), + WIDGET.newKey({name="H", x=800,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(24)}), + WIDGET.newKey({name="I5", x=900,y=640,w=90,color="grey",font=50,code=WIDGET.lnk_pressKey(25)}), - WIDGET.newKey({name="left", x=800, y=440,w=90, color="lGreen", font=55,code=WIDGET.lnk.pressKey("left")}), - WIDGET.newKey({name="right", x=900, y=440,w=90, color="lGreen", font=55,code=WIDGET.lnk.pressKey("right")}), - WIDGET.newKey({name="ten", x=1000, y=440,w=90, color="lGreen", font=40,code=WIDGET.lnk.pressKey("ten")}), - WIDGET.newKey({name="backsp", x=1000, y=540,w=90, color="lYellow",font=50,code=WIDGET.lnk.pressKey("backspace")}), - WIDGET.newKey({name="reset", x=1000, y=640,w=90, color="lYellow",font=50,code=WIDGET.lnk.pressKey("delete")}), - WIDGET.newButton({name="copy", x=1140, y=440,w=170,h=80,color="lRed", font=40,code=WIDGET.lnk.pressKey("cC"),hide=function()return #BAG==0 end}), - WIDGET.newButton({name="paste", x=1140, y=540,w=170,h=80,color="lBlue", font=40,code=WIDGET.lnk.pressKey("cV")}), + WIDGET.newKey({name="left", x=800, y=440,w=90, color="lGreen", font=55,code=WIDGET.lnk_pressKey("left")}), + WIDGET.newKey({name="right", x=900, y=440,w=90, color="lGreen", font=55,code=WIDGET.lnk_pressKey("right")}), + WIDGET.newKey({name="ten", x=1000, y=440,w=90, color="lGreen", font=40,code=WIDGET.lnk_pressKey("ten")}), + WIDGET.newKey({name="backsp", x=1000, y=540,w=90, color="lYellow",font=50,code=WIDGET.lnk_pressKey("backspace")}), + WIDGET.newKey({name="reset", x=1000, y=640,w=90, color="lYellow",font=50,code=WIDGET.lnk_pressKey("delete")}), + WIDGET.newButton({name="copy", x=1140, y=440,w=170,h=80,color="lRed", font=40,code=WIDGET.lnk_pressKey("cC"),hide=function()return #BAG==0 end}), + WIDGET.newButton({name="paste", x=1140, y=540,w=170,h=80,color="lBlue", font=40,code=WIDGET.lnk_pressKey("cV")}), - WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index 29a292c8..5713508f 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -177,8 +177,8 @@ end WIDGET.init("dict",{ WIDGET.newText({name="title", x=20, y=5,font=70,align="L"}), WIDGET.newKey({name="keyboard", x=960, y=60,w=200,h=80,font=35,code=function()love.keyboard.setTextInput(true,0,0,1,1)end,hide=not MOBILE}), - WIDGET.newKey({name="link", x=1140, y=650,w=200,h=80,font=35,code=WIDGET.lnk.pressKey("link"),hide=function()return not sceneTemp.url end}), - WIDGET.newKey({name="up", x=1190, y=440,w=100,h=100,font=35,code=WIDGET.lnk.pressKey("up"),hide=not MOBILE}), - WIDGET.newKey({name="down", x=1190, y=550,w=100,h=100,font=35,code=WIDGET.lnk.pressKey("down"),hide=not MOBILE}), - WIDGET.newButton({name="back", x=1165, y=60,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newKey({name="link", x=1140, y=650,w=200,h=80,font=35,code=WIDGET.lnk_pressKey("link"),hide=function()return not sceneTemp.url end}), + WIDGET.newKey({name="up", x=1190, y=440,w=100,h=100,font=35,code=WIDGET.lnk_pressKey("up"),hide=not MOBILE}), + WIDGET.newKey({name="down", x=1190, y=550,w=100,h=100,font=35,code=WIDGET.lnk_pressKey("down"),hide=not MOBILE}), + WIDGET.newButton({name="back", x=1165, y=60,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/help.lua b/parts/scenes/help.lua index d3827a5e..8041de21 100644 --- a/parts/scenes/help.lua +++ b/parts/scenes/help.lua @@ -30,9 +30,9 @@ end WIDGET.init("help",{ WIDGET.newImage({name="pay1", x=20, y=20}), WIDGET.newImage({name="pay2", x=1014, y=20}), - WIDGET.newButton({name="dict", x=1140, y=410,w=220,h=70,font=35,code=WIDGET.lnk.goScene("dict")}), - WIDGET.newButton({name="staff", x=1140, y=490,w=220,h=70,font=35,code=WIDGET.lnk.goScene("staff")}), - WIDGET.newButton({name="his", x=1140, y=570,w=220,h=70,font=35,code=WIDGET.lnk.goScene("history")}), + WIDGET.newButton({name="dict", x=1140, y=410,w=220,h=70,font=35,code=WIDGET.lnk_goScene("dict")}), + WIDGET.newButton({name="staff", x=1140, y=490,w=220,h=70,font=35,code=WIDGET.lnk_goScene("staff")}), + WIDGET.newButton({name="his", x=1140, y=570,w=220,h=70,font=35,code=WIDGET.lnk_goScene("history")}), WIDGET.newButton({name="qq", x=1140, y=650,w=220,h=70,font=35,code=function()love.system.openURL("tencent://message/?uin=1046101471&Site=&Menu=yes")end,hide=MOBILE}), - WIDGET.newButton({name="back", x=640, y=600,w=170,h=80,font=35,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=640, y=600,w=170,h=80,font=35,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/history.lua b/parts/scenes/history.lua index 3bd6ce4d..1c6661ab 100644 --- a/parts/scenes/history.lua +++ b/parts/scenes/history.lua @@ -57,7 +57,7 @@ function Pnt.history() end WIDGET.init("history",{ - WIDGET.newKey({name="prev", x=1155, y=170,w=180,font=65,code=WIDGET.lnk.pressKey("up"),hide=WIDGET.lnk.STPeq("pos",1)}), - WIDGET.newKey({name="next", x=1155, y=400,w=180,font=65,code=WIDGET.lnk.pressKey("down"),hide=function()return sceneTemp.pos==#sceneTemp.text end}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newKey({name="prev", x=1155, y=170,w=180,font=65,code=WIDGET.lnk_pressKey("up"),hide=WIDGET.lnk_STPeq("pos",1)}), + WIDGET.newKey({name="next", x=1155, y=400,w=180,font=65,code=WIDGET.lnk_pressKey("down"),hide=function()return sceneTemp.pos==#sceneTemp.text end}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/intro.lua b/parts/scenes/intro.lua index c7ec6d48..a39d6d58 100644 --- a/parts/scenes/intro.lua +++ b/parts/scenes/intro.lua @@ -1,4 +1,4 @@ -local gc,sys=love.graphics,love.system +local gc=love.graphics local Timer=love.timer.getTime local abs=math.abs diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index 203c22cc..4056543a 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -11,5 +11,5 @@ WIDGET.init("lang",{ WIDGET.newButton({name="sp", x=1080, y=100,w=200,h=120,font=45,code=setLang(5)}), WIDGET.newButton({name="symbol",x=200, y=250,w=200,h=120,font=45,code=setLang(6)}), WIDGET.newButton({name="yygq", x=420, y=250,w=200,h=120,font=45,code=setLang(7)}), - WIDGET.newButton({name="back", x=640, y=600,w=200,h=80,font=35,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=640, y=600,w=200,h=80,font=35,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index 0e763db5..a749f372 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -43,5 +43,5 @@ WIDGET.init("login",{ WIDGET.newTextBox({name="code", x=380, y=360,w=626,h=60,regex="[0-9A-Za-z]"}), WIDGET.newTextBox({name="password", x=380, y=460,w=626,h=60,secret=true,regex="[ -~]"}), WIDGET.newTextBox({name="password2",x=380, y=560,w=626,h=60,secret=true,regex="[ -~]"}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index c8bc0271..1f105c03 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -34,16 +34,16 @@ function Pnt.main() end WIDGET.init("main",{ - WIDGET.newButton({name="offline", x=150,y=220,w=200,h=140,color="lRed", font=40,code=WIDGET.lnk.goScene("mode")}), - WIDGET.newButton({name="online", x=370,y=220,w=200,h=140,color="lCyan", font=40,code=WIDGET.lnk.goScene(LOGIN and"netgame"or"login")}), - WIDGET.newButton({name="custom", x=590,y=220,w=200,h=140,color="lBlue", font=40,code=WIDGET.lnk.goScene("customGame"),hide=function()return not RANKS.marathon_normal end}), - WIDGET.newButton({name="setting", x=150,y=380,w=200,h=140,color="lOrange",font=40,code=WIDGET.lnk.goScene("setting_game")}), - WIDGET.newButton({name="stat", x=370,y=380,w=200,h=140,color="lGreen", font=40,code=WIDGET.lnk.goScene("stat")}), + WIDGET.newButton({name="offline", x=150,y=220,w=200,h=140,color="lRed", font=40,code=WIDGET.lnk_goScene("mode")}), + WIDGET.newButton({name="online", x=370,y=220,w=200,h=140,color="lCyan", font=40,code=WIDGET.lnk_goScene(LOGIN and"netgame"or"login")}), + WIDGET.newButton({name="custom", x=590,y=220,w=200,h=140,color="lBlue", font=40,code=WIDGET.lnk_goScene("customGame"),hide=function()return not RANKS.marathon_normal end}), + WIDGET.newButton({name="setting", x=150,y=380,w=200,h=140,color="lOrange",font=40,code=WIDGET.lnk_goScene("setting_game")}), + WIDGET.newButton({name="stat", x=370,y=380,w=200,h=140,color="lGreen", font=40,code=WIDGET.lnk_goScene("stat")}), WIDGET.newButton({name="qplay", x=590,y=380,w=200,h=140,color="white", font=40,code=function()SCN.push()loadGame(STAT.lastPlay,true)end}), - WIDGET.newButton({name="lang", x=150,y=515,w=200,h=90,color="lYellow", font=40,code=WIDGET.lnk.goScene("lang")}), - WIDGET.newButton({name="help", x=370,y=515,w=200,h=90,color="dGreen", font=40,code=WIDGET.lnk.goScene("help")}), + WIDGET.newButton({name="lang", x=150,y=515,w=200,h=90,color="lYellow", font=40,code=WIDGET.lnk_goScene("lang")}), + WIDGET.newButton({name="help", x=370,y=515,w=200,h=90,color="dGreen", font=40,code=WIDGET.lnk_goScene("help")}), WIDGET.newButton({name="quit", x=590,y=515,w=200,h=90,color="grey", font=40,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}), - WIDGET.newKey({name="music", x=150,y=610,w=200,h=60,color="red", code=WIDGET.lnk.goScene("music")}), - WIDGET.newKey({name="sound", x=370,y=610,w=200,h=60,color="green", code=WIDGET.lnk.goScene("sound")}), - WIDGET.newKey({name="minigame", x=590,y=610,w=200,h=60,color="blue", code=WIDGET.lnk.goScene("minigame")}), + WIDGET.newKey({name="music", x=150,y=610,w=200,h=60,color="red", code=WIDGET.lnk_goScene("music")}), + WIDGET.newKey({name="sound", x=370,y=610,w=200,h=60,color="green", code=WIDGET.lnk_goScene("sound")}), + WIDGET.newKey({name="minigame", x=590,y=610,w=200,h=60,color="blue", code=WIDGET.lnk_goScene("minigame")}), }) \ No newline at end of file diff --git a/parts/scenes/minigame.lua b/parts/scenes/minigame.lua index 316e121d..a936edfd 100644 --- a/parts/scenes/minigame.lua +++ b/parts/scenes/minigame.lua @@ -3,8 +3,8 @@ function sceneInit.minigame() end WIDGET.init("minigame",{ - WIDGET.newButton({name="p15", x=240, y=250,w=350,h=120,font=40,code=WIDGET.lnk.goScene("p15")}), - WIDGET.newButton({name="schulte_G", x=640, y=250,w=350,h=120,font=40,code=WIDGET.lnk.goScene("schulte_G")}), - WIDGET.newButton({name="pong", x=1040, y=250,w=350,h=120,font=40,code=WIDGET.lnk.goScene("pong")}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="p15", x=240, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("p15")}), + WIDGET.newButton({name="schulte_G", x=640, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("schulte_G")}), + WIDGET.newButton({name="pong", x=1040, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("pong")}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index 3abd09b7..d84eeb7f 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -94,9 +94,9 @@ WIDGET.init("music",{ WIDGET.newText({name="title", x=30, y=30,font=80,align="L"}), WIDGET.newText({name="arrow", x=270, y=360,font=45,align="L"}), WIDGET.newText({name="now", x=700, y=500,font=50,align="R",hide=function()return not BGM.nowPlay end}), - WIDGET.newSlider({name="bgm", x=760, y=80,w=400, font=35,disp=WIDGET.lnk.SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}), - WIDGET.newButton({name="up", x=200, y=250,w=120, font=55,code=WIDGET.lnk.pressKey("up"),hide=function()return sceneTemp==1 end}), - WIDGET.newButton({name="play", x=200, y=390,w=120, font=35,code=WIDGET.lnk.pressKey("space"),hide=function()return SETTING.bgm==0 end}), - WIDGET.newButton({name="down", x=200, y=530,w=120, font=55,code=WIDGET.lnk.pressKey("down"),hide=function()return sceneTemp==BGM.len end}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80, font=40,code=WIDGET.lnk.BACK}), + WIDGET.newSlider({name="bgm", x=760, y=80,w=400, font=35,disp=WIDGET.lnk_SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}), + WIDGET.newButton({name="up", x=200, y=250,w=120, font=55,code=WIDGET.lnk_pressKey("up"),hide=function()return sceneTemp==1 end}), + WIDGET.newButton({name="play", x=200, y=390,w=120, font=35,code=WIDGET.lnk_pressKey("space"),hide=function()return SETTING.bgm==0 end}), + WIDGET.newButton({name="down", x=200, y=530,w=120, font=55,code=WIDGET.lnk_pressKey("down"),hide=function()return sceneTemp==BGM.len end}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/p15.lua b/parts/scenes/p15.lua index e29e7c60..b15d3cd7 100644 --- a/parts/scenes/p15.lua +++ b/parts/scenes/p15.lua @@ -316,11 +316,11 @@ function Pnt.p15() end WIDGET.init("p15",{ - WIDGET.newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen",font=40,code=WIDGET.lnk.pressKey("space")}), - WIDGET.newSlider({name="color", x=110,y=250,w=170,unit=4,show=false,font=30,disp=WIDGET.lnk.STPval("color"), code=function(v)if sceneTemp.state~=1 then sceneTemp.color=v end end,hide=WIDGET.lnk.STPeq("state",1)}), - WIDGET.newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=WIDGET.lnk.STPval("blind"), code=WIDGET.lnk.pressKey("w"), hide=WIDGET.lnk.STPeq("state",1)}), - WIDGET.newSwitch({name="slide", x=240,y=420,w=60, font=40,disp=WIDGET.lnk.STPval("slide"), code=WIDGET.lnk.pressKey("e"), hide=WIDGET.lnk.STPeq("state",1)}), - WIDGET.newSwitch({name="pathVis", x=240,y=510,w=60, font=40,disp=WIDGET.lnk.STPval("pathVis"), code=WIDGET.lnk.pressKey("r"), hide=function()return sceneTemp.state==1 or not sceneTemp.slide end}), - WIDGET.newSwitch({name="revKB", x=240,y=600,w=60, font=40,disp=WIDGET.lnk.STPval("revKB"), code=WIDGET.lnk.pressKey("t"), hide=WIDGET.lnk.STPeq("state",1)}), - WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80, font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen",font=40,code=WIDGET.lnk_pressKey("space")}), + WIDGET.newSlider({name="color", x=110,y=250,w=170,unit=4,show=false,font=30,disp=WIDGET.lnk_STPval("color"), code=function(v)if sceneTemp.state~=1 then sceneTemp.color=v end end,hide=WIDGET.lnk_STPeq("state",1)}), + WIDGET.newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=WIDGET.lnk_STPval("blind"), code=WIDGET.lnk_pressKey("w"), hide=WIDGET.lnk_STPeq("state",1)}), + WIDGET.newSwitch({name="slide", x=240,y=420,w=60, font=40,disp=WIDGET.lnk_STPval("slide"), code=WIDGET.lnk_pressKey("e"), hide=WIDGET.lnk_STPeq("state",1)}), + WIDGET.newSwitch({name="pathVis", x=240,y=510,w=60, font=40,disp=WIDGET.lnk_STPval("pathVis"), code=WIDGET.lnk_pressKey("r"), hide=function()return sceneTemp.state==1 or not sceneTemp.slide end}), + WIDGET.newSwitch({name="revKB", x=240,y=600,w=60, font=40,disp=WIDGET.lnk_STPval("revKB"), code=WIDGET.lnk_pressKey("t"), hide=WIDGET.lnk_STPeq("state",1)}), + WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 9d5fb6aa..d18f132b 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -279,9 +279,9 @@ function Pnt.pause() end WIDGET.init("pause",{ - WIDGET.newButton({name="setting", x=1120, y=70, w=240,h=90, color="lBlue", font=35,code=WIDGET.lnk.pressKey("s")}), - WIDGET.newButton({name="replay", x=640, y=250, w=240,h=100,color="lYellow",font=30,code=WIDGET.lnk.pressKey("p"),hide=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end}), - WIDGET.newButton({name="resume", x=640, y=367, w=240,h=100,color="lGreen", font=30,code=WIDGET.lnk.pressKey("escape")}), - WIDGET.newButton({name="restart", x=640, y=483, w=240,h=100,color="lRed", font=35,code=WIDGET.lnk.pressKey("r")}), - WIDGET.newButton({name="quit", x=640, y=600, w=240,h=100,font=35,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="setting", x=1120, y=70, w=240,h=90, color="lBlue", font=35,code=WIDGET.lnk_pressKey("s")}), + WIDGET.newButton({name="replay", x=640, y=250, w=240,h=100,color="lYellow",font=30,code=WIDGET.lnk_pressKey("p"),hide=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end}), + WIDGET.newButton({name="resume", x=640, y=367, w=240,h=100,color="lGreen", font=30,code=WIDGET.lnk_pressKey("escape")}), + WIDGET.newButton({name="restart", x=640, y=483, w=240,h=100,color="lRed", font=35,code=WIDGET.lnk_pressKey("r")}), + WIDGET.newButton({name="quit", x=640, y=600, w=240,h=100,font=35,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/pong.lua b/parts/scenes/pong.lua index 2fee265c..b75187ea 100644 --- a/parts/scenes/pong.lua +++ b/parts/scenes/pong.lua @@ -175,6 +175,6 @@ function Pnt.pong() end WIDGET.init("pong",{ - WIDGET.newKey({name="reset",x=640,y=45,w=150,h=50, font=35,code=WIDGET.lnk.pressKey("r")}), - WIDGET.newKey({name="back", x=640,y=675,w=150,h=50, font=35,code=WIDGET.lnk.BACK}), + WIDGET.newKey({name="reset",x=640,y=45,w=150,h=50,font=35,code=WIDGET.lnk_pressKey("r")}), + WIDGET.newKey({name="back",x=640,y=675,w=150,h=50,font=35,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index d56edc72..5580e76f 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -83,5 +83,5 @@ WIDGET.init("savedata",{ end, hide=HIDE}), - WIDGET.newButton({name="back", x=640,y=620,w=200,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=640,y=620,w=200,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/schulte_G.lua b/parts/scenes/schulte_G.lua index b16794c0..b3cc73d5 100644 --- a/parts/scenes/schulte_G.lua +++ b/parts/scenes/schulte_G.lua @@ -172,10 +172,10 @@ function Pnt.schulte_G() end WIDGET.init("schulte_G",{ - WIDGET.newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen",font=40,code=WIDGET.lnk.pressKey("space"),hide=function()return sceneTemp.state==0 end}), + WIDGET.newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen",font=40,code=WIDGET.lnk_pressKey("space"),hide=function()return sceneTemp.state==0 end}), WIDGET.newSlider({name="rank", x=130,y=250,w=150,unit=3,show=false,font=40,disp=function()return sceneTemp.rank-3 end,code=function(v)sceneTemp.rank=v+3 end,hide=function()return sceneTemp.state>0 end}), - WIDGET.newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=WIDGET.lnk.STPval("blind"), code=WIDGET.lnk.pressKey("q"),hide=WIDGET.lnk.STPeq("state",1)}), - WIDGET.newSwitch({name="disappear", x=240,y=420,w=60, font=40,disp=WIDGET.lnk.STPval("disappear"),code=WIDGET.lnk.pressKey("w"),hide=WIDGET.lnk.STPeq("state",1)}), - WIDGET.newSwitch({name="tapFX", x=240,y=510,w=60, font=40,disp=WIDGET.lnk.STPval("tapFX"), code=WIDGET.lnk.pressKey("e"),hide=WIDGET.lnk.STPeq("state",1)}), - WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80, font=40,code=WIDGET.lnk.BACK}), + WIDGET.newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=WIDGET.lnk_STPval("blind"), code=WIDGET.lnk_pressKey("q"),hide=WIDGET.lnk_STPeq("state",1)}), + WIDGET.newSwitch({name="disappear", x=240,y=420,w=60, font=40,disp=WIDGET.lnk_STPval("disappear"),code=WIDGET.lnk_pressKey("w"),hide=WIDGET.lnk_STPeq("state",1)}), + WIDGET.newSwitch({name="tapFX", x=240,y=510,w=60, font=40,disp=WIDGET.lnk_STPval("tapFX"), code=WIDGET.lnk_pressKey("e"),hide=WIDGET.lnk_STPeq("state",1)}), + WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_control.lua b/parts/scenes/setting_control.lua index 55eeddc5..8332cf35 100644 --- a/parts/scenes/setting_control.lua +++ b/parts/scenes/setting_control.lua @@ -83,13 +83,13 @@ WIDGET.init("setting_control",{ WIDGET.newText({name="title", x=80, y=50,font=70,align="L"}), WIDGET.newText({name="preview", x=520, y=540,font=40,align="R"}), - WIDGET.newSlider({name="das", x=250, y=200,w=910,unit=26,disp=WIDGET.lnk.SETval("das"), show=sliderShow,code=WIDGET.lnk.SETsto("das")}), - WIDGET.newSlider({name="arr", x=250, y=290,w=525,unit=15,disp=WIDGET.lnk.SETval("arr"), show=sliderShow,code=WIDGET.lnk.SETsto("arr")}), - WIDGET.newSlider({name="sddas", x=250, y=380,w=350,unit=10,disp=WIDGET.lnk.SETval("sddas"), show=sliderShow,code=WIDGET.lnk.SETsto("sddas")}), - WIDGET.newSlider({name="sdarr", x=250, y=470,w=140,unit=4, disp=WIDGET.lnk.SETval("sdarr"), show=sliderShow,code=WIDGET.lnk.SETsto("sdarr")}), - WIDGET.newSwitch({name="ihs", x=1100, y=290, disp=WIDGET.lnk.SETval("ihs"), code=WIDGET.lnk.SETrev("ihs")}), - WIDGET.newSwitch({name="irs", x=1100, y=380, disp=WIDGET.lnk.SETval("irs"), code=WIDGET.lnk.SETrev("irs")}), - WIDGET.newSwitch({name="ims", x=1100, y=470, disp=WIDGET.lnk.SETval("ims"), code=WIDGET.lnk.SETrev("ims")}), + WIDGET.newSlider({name="das", x=250, y=200,w=910,unit=26,disp=WIDGET.lnk_SETval("das"), show=sliderShow,code=WIDGET.lnk_SETsto("das")}), + WIDGET.newSlider({name="arr", x=250, y=290,w=525,unit=15,disp=WIDGET.lnk_SETval("arr"), show=sliderShow,code=WIDGET.lnk_SETsto("arr")}), + WIDGET.newSlider({name="sddas", x=250, y=380,w=350,unit=10,disp=WIDGET.lnk_SETval("sddas"),show=sliderShow,code=WIDGET.lnk_SETsto("sddas")}), + WIDGET.newSlider({name="sdarr", x=250, y=470,w=140,unit=4, disp=WIDGET.lnk_SETval("sdarr"),show=sliderShow,code=WIDGET.lnk_SETsto("sdarr")}), + WIDGET.newSwitch({name="ihs", x=1100, y=290, disp=WIDGET.lnk_SETval("ihs"), code=WIDGET.lnk_SETrev("ihs")}), + WIDGET.newSwitch({name="irs", x=1100, y=380, disp=WIDGET.lnk_SETval("irs"), code=WIDGET.lnk_SETrev("irs")}), + WIDGET.newSwitch({name="ims", x=1100, y=470, disp=WIDGET.lnk_SETval("ims"), code=WIDGET.lnk_SETrev("ims")}), WIDGET.newButton({name="reset", x=160, y=580,w=200,h=100,color="lRed",font=40, code=function() local _=SETTING @@ -97,5 +97,5 @@ WIDGET.init("setting_control",{ _.sddas,_.sdarr=0,2 _.ihs,_.irs,_.ims=false,false,false end}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index d1366fc9..2c4f4847 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -18,19 +18,19 @@ end WIDGET.init("setting_game",{ WIDGET.newText({name="title", x=640,y=15,font=80}), - WIDGET.newButton({name="graphic", x=200, y=80, w=240,h=80, color="lCyan", font=35,code=WIDGET.lnk.swapScene("setting_video","swipeR")}), - WIDGET.newButton({name="sound", x=1080, y=80, w=240,h=80, color="lCyan", font=35,code=WIDGET.lnk.swapScene("setting_sound","swipeL")}), + WIDGET.newButton({name="graphic", x=200, y=80, w=240,h=80, color="lCyan", font=35,code=WIDGET.lnk_swapScene("setting_video","swipeR")}), + WIDGET.newButton({name="sound", x=1080, y=80, w=240,h=80, color="lCyan", font=35,code=WIDGET.lnk_swapScene("setting_sound","swipeL")}), - WIDGET.newButton({name="ctrl", x=290, y=220, w=320,h=80, color="lYellow",font=35,code=WIDGET.lnk.goScene("setting_control")}), - WIDGET.newButton({name="key", x=640, y=220, w=320,h=80, color="lGreen", font=35,code=WIDGET.lnk.goScene("setting_key")}), - WIDGET.newButton({name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=WIDGET.lnk.goScene("setting_touch")}), - WIDGET.newSlider({name="reTime", x=350, y=340, w=300,unit=10, font=30,disp=WIDGET.lnk.SETval("reTime"), code=WIDGET.lnk.SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}), - WIDGET.newSlider({name="maxNext", x=350, y=440, w=300,unit=6, font=30,disp=WIDGET.lnk.SETval("maxNext"), code=WIDGET.lnk.SETsto("maxNext")}), - WIDGET.newButton({name="layout", x=460, y=540, w=140,h=70, font=35,code=WIDGET.lnk.goScene("setting_skin")}), - WIDGET.newSwitch({name="autoPause", x=1080, y=320, font=20,disp=WIDGET.lnk.SETval("autoPause"), code=WIDGET.lnk.SETrev("autoPause")}), - WIDGET.newSwitch({name="swap", x=1080, y=380, font=20,disp=WIDGET.lnk.SETval("swap"), code=WIDGET.lnk.SETrev("swap")}), - WIDGET.newSwitch({name="fine", x=1080, y=440, font=20,disp=WIDGET.lnk.SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end}), - WIDGET.newSwitch({name="appLock", x=1080, y=500, font=20,disp=WIDGET.lnk.SETval("appLock"), code=WIDGET.lnk.SETrev("appLock")}), - WIDGET.newButton({name="calc", x=970, y=550, w=150,h=60,color="dGrey", font=25,code=WIDGET.lnk.goScene("calculator"),hide=function()return not SETTING.appLock end}), - WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="ctrl", x=290, y=220, w=320,h=80, color="lYellow",font=35,code=WIDGET.lnk_goScene("setting_control")}), + WIDGET.newButton({name="key", x=640, y=220, w=320,h=80, color="lGreen", font=35,code=WIDGET.lnk_goScene("setting_key")}), + WIDGET.newButton({name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=WIDGET.lnk_goScene("setting_touch")}), + WIDGET.newSlider({name="reTime", x=350, y=340, w=300,unit=10, font=30,disp=WIDGET.lnk_SETval("reTime"), code=WIDGET.lnk_SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}), + WIDGET.newSlider({name="maxNext", x=350, y=440, w=300,unit=6, font=30,disp=WIDGET.lnk_SETval("maxNext"), code=WIDGET.lnk_SETsto("maxNext")}), + WIDGET.newButton({name="layout", x=460, y=540, w=140,h=70, font=35,code=WIDGET.lnk_goScene("setting_skin")}), + WIDGET.newSwitch({name="autoPause", x=1080, y=320, font=20,disp=WIDGET.lnk_SETval("autoPause"),code=WIDGET.lnk_SETrev("autoPause")}), + WIDGET.newSwitch({name="swap", x=1080, y=380, font=20,disp=WIDGET.lnk_SETval("swap"), code=WIDGET.lnk_SETrev("swap")}), + WIDGET.newSwitch({name="fine", x=1080, y=440, font=20,disp=WIDGET.lnk_SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end}), + WIDGET.newSwitch({name="appLock", x=1080, y=500, font=20,disp=WIDGET.lnk_SETval("appLock"), code=WIDGET.lnk_SETrev("appLock")}), + WIDGET.newButton({name="calc", x=970, y=550, w=150,h=60,color="dGrey", font=25,code=WIDGET.lnk_goScene("calculator"),hide=function()return not SETTING.appLock end}), + WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index 089a6ff3..4e69a923 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -137,5 +137,5 @@ WIDGET.init("setting_key",{ WIDGET.newText({name="joystick", x=540,y=30,font=25,color="lBlue"}), WIDGET.newText({name="joystick", x=1140,y=30,font=25,color="lBlue"}), WIDGET.newText({name="help", x=50,y=650,font=30,align="L"}), - WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua index 48ca2504..8d0085a2 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -68,5 +68,5 @@ WIDGET.init("setting_skin",{ end SFX.play("hold") end}), - WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 65907eed..949c26a1 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -56,16 +56,16 @@ end WIDGET.init("setting_sound",{ WIDGET.newText({name="title", x=640,y=15,font=80}), - WIDGET.newButton({name="game", x=200, y=80,w=240,h=80,color="lCyan",font=35,code=WIDGET.lnk.swapScene("setting_game","swipeR")}), - WIDGET.newButton({name="graphic", x=1080, y=80,w=240,h=80,color="lCyan",font=35,code=WIDGET.lnk.swapScene("setting_video","swipeL")}), + WIDGET.newButton({name="game", x=200, y=80,w=240,h=80,color="lCyan",font=35,code=WIDGET.lnk_swapScene("setting_game","swipeR")}), + WIDGET.newButton({name="graphic", x=1080, y=80,w=240,h=80,color="lCyan",font=35,code=WIDGET.lnk_swapScene("setting_video","swipeL")}), - WIDGET.newSlider({name="sfx", x=180, y=200,w=400, font=35,change=function()SFX.play("blip_1")end, disp=WIDGET.lnk.SETval("sfx"),code=WIDGET.lnk.SETsto("sfx")}), - WIDGET.newSlider({name="stereo", x=180, y=500,w=400, font=35,change=function()SFX.play("move",1,-1)SFX.play("lock",1,1)end,disp=WIDGET.lnk.SETval("stereo"),code=WIDGET.lnk.SETsto("stereo"),hide=function()return SETTING.sfx==0 end}), - WIDGET.newSlider({name="spawn", x=180, y=300,w=400, font=30,change=function()SFX.fplay("spawn_"..math.random(7),SETTING.spawn)end,disp=WIDGET.lnk.SETval("spawn"),code=WIDGET.lnk.SETsto("spawn")}), - WIDGET.newSlider({name="bgm", x=180, y=400,w=400, font=35,change=function()BGM.freshVolume()end, disp=WIDGET.lnk.SETval("bgm"),code=WIDGET.lnk.SETsto("bgm")}), - WIDGET.newSlider({name="vib", x=750, y=200,w=400,unit=5, font=25,change=function()VIB(2)end, disp=WIDGET.lnk.SETval("vib"),code=WIDGET.lnk.SETsto("vib")}), - WIDGET.newSlider({name="voc", x=750, y=300,w=400, font=35,change=function()VOC.play("test")end, disp=WIDGET.lnk.SETval("voc"),code=WIDGET.lnk.SETsto("voc")}), - WIDGET.newSelector({name="cv", x=1100, y=380,w=200, list={"miya"}, disp=WIDGET.lnk.STPval("cv"),code=WIDGET.lnk.STPsto("cv")}), + WIDGET.newSlider({name="sfx", x=180, y=200,w=400, font=35,change=function()SFX.play("blip_1")end, disp=WIDGET.lnk_SETval("sfx"),code=WIDGET.lnk_SETsto("sfx")}), + WIDGET.newSlider({name="stereo", x=180, y=500,w=400, font=35,change=function()SFX.play("move",1,-1)SFX.play("lock",1,1)end,disp=WIDGET.lnk_SETval("stereo"),code=WIDGET.lnk_SETsto("stereo"),hide=function()return SETTING.sfx==0 end}), + WIDGET.newSlider({name="spawn", x=180, y=300,w=400, font=30,change=function()SFX.fplay("spawn_"..math.random(7),SETTING.spawn)end,disp=WIDGET.lnk_SETval("spawn"),code=WIDGET.lnk_SETsto("spawn")}), + WIDGET.newSlider({name="bgm", x=180, y=400,w=400, font=35,change=function()BGM.freshVolume()end, disp=WIDGET.lnk_SETval("bgm"),code=WIDGET.lnk_SETsto("bgm")}), + WIDGET.newSlider({name="vib", x=750, y=200,w=400,unit=5, font=25,change=function()VIB(2)end, disp=WIDGET.lnk_SETval("vib"),code=WIDGET.lnk_SETsto("vib")}), + WIDGET.newSlider({name="voc", x=750, y=300,w=400, font=35,change=function()VOC.play("test")end, disp=WIDGET.lnk_SETval("voc"),code=WIDGET.lnk_SETsto("voc")}), + WIDGET.newSelector({name="cv", x=1100, y=380,w=200, list={"miya"}, disp=WIDGET.lnk_STPval("cv"),code=WIDGET.lnk_STPsto("cv")}), WIDGET.newButton({name="apply", x=1100, y=460,w=180,h=80, code=function()SETTING.cv=sceneTemp.cv VOC.loadAll()end,hide=function()return SETTING.cv==sceneTemp.cv end}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80, font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80, font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index 6c70e5db..73bd9f4f 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -190,12 +190,12 @@ WIDGET.init("setting_touch",{ sceneTemp.sel=nil LOG.print("[ "..sceneTemp.default.." ]") end}), - WIDGET.newSelector({name="snap", x=760,y=90,w=200,h=80,color="yellow",list={1,10,20,40,60,80},disp=WIDGET.lnk.STPval("snap"),code=WIDGET.lnk.STPsto("snap")}), + WIDGET.newSelector({name="snap", x=760,y=90,w=200,h=80,color="yellow",list={1,10,20,40,60,80},disp=WIDGET.lnk_STPval("snap"),code=WIDGET.lnk_STPsto("snap")}), WIDGET.newButton({name="option", x=520,y=190,w=200,h=80,font=40, code=function() SCN.go("setting_touchSwitch") end}), - WIDGET.newButton({name="back", x=760,y=190,w=200,h=80,font=35,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=760,y=190,w=200,h=80,font=35,code=WIDGET.lnk_BACK}), WIDGET.newSlider({name="size", x=450,y=270,w=460,unit=19,font=40,show="vkSize", disp=function() return VK_org[sceneTemp.sel].r/10-1 diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index 6a66c39f..7b09f67e 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -28,11 +28,11 @@ WIDGET.init("setting_touchSwitch",{ WIDGET.newSwitch({name="b20", x=580, y=620, font=35,disp=VKAdisp(20),code=VKAcode(20)}), WIDGET.newButton({name="norm", x=840, y=100, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=i<11 end end}), WIDGET.newButton({name="pro", x=1120, y=100, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=true end end}), - WIDGET.newSwitch({name="hide", x=1170, y=200, font=40,disp=WIDGET.lnk.SETval("VKSwitch"),code=WIDGET.lnk.SETrev("VKSwitch")}), - WIDGET.newSwitch({name="track", x=1170, y=300, font=35,disp=WIDGET.lnk.SETval("VKTrack"),code=WIDGET.lnk.SETrev("VKTrack")}), - WIDGET.newSlider({name="sfx", x=800, y=380, w=180, font=35,change=function()SFX.play("virtualKey",SETTING.VKSFX)end,disp=WIDGET.lnk.SETval("VKSFX"),code=WIDGET.lnk.SETsto("VKSFX")}), - WIDGET.newSlider({name="vib", x=800, y=460, w=180,unit=2, font=35,change=function()VIB(SETTING.VKVIB)end,disp=WIDGET.lnk.SETval("VKVIB"),code=WIDGET.lnk.SETsto("VKVIB")}), - WIDGET.newSwitch({name="icon", x=850, y=300, font=40,disp=WIDGET.lnk.SETval("VKIcon"),code=WIDGET.lnk.SETrev("VKIcon")}), + WIDGET.newSwitch({name="hide", x=1170, y=200, font=40,disp=WIDGET.lnk_SETval("VKSwitch"),code=WIDGET.lnk_SETrev("VKSwitch")}), + WIDGET.newSwitch({name="track", x=1170, y=300, font=35,disp=WIDGET.lnk_SETval("VKTrack"),code=WIDGET.lnk_SETrev("VKTrack")}), + WIDGET.newSlider({name="sfx", x=800, y=380, w=180, font=35,change=function()SFX.play("virtualKey",SETTING.VKSFX)end,disp=WIDGET.lnk_SETval("VKSFX"),code=WIDGET.lnk_SETsto("VKSFX")}), + WIDGET.newSlider({name="vib", x=800, y=460, w=180,unit=2, font=35,change=function()VIB(SETTING.VKVIB)end,disp=WIDGET.lnk_SETval("VKVIB"),code=WIDGET.lnk_SETsto("VKVIB")}), + WIDGET.newSwitch({name="icon", x=850, y=300, font=40,disp=WIDGET.lnk_SETval("VKIcon"),code=WIDGET.lnk_SETrev("VKIcon")}), WIDGET.newButton({name="tkset", x=1120, y=420, w=240,h=80, code=function() SCN.go("setting_trackSetting") @@ -40,6 +40,6 @@ WIDGET.init("setting_touchSwitch",{ hide=function() return not SETTING.VKTrack end}), - WIDGET.newSlider({name="alpha", x=840, y=540, w=400,font=40,disp=WIDGET.lnk.SETval("VKAlpha"),code=WIDGET.lnk.SETsto("VKAlpha")}), - WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newSlider({name="alpha", x=840, y=540, w=400,font=40,disp=WIDGET.lnk_SETval("VKAlpha"),code=WIDGET.lnk_SETsto("VKAlpha")}), + WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_trackSetting.lua b/parts/scenes/setting_trackSetting.lua index 318149e2..48d0b8f3 100644 --- a/parts/scenes/setting_trackSetting.lua +++ b/parts/scenes/setting_trackSetting.lua @@ -8,8 +8,8 @@ function Pnt.setting_trackSetting() end WIDGET.init("setting_trackSetting",{ - WIDGET.newSwitch({name="VKDodge", x=400, y=200, font=35, disp=WIDGET.lnk.SETval("VKDodge"),code=WIDGET.lnk.SETrev("VKDodge")}), - WIDGET.newSlider({name="VKTchW", x=140, y=310, w=1000, unit=10,font=35,disp=WIDGET.lnk.SETval("VKTchW"),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end}), - WIDGET.newSlider({name="VKCurW", x=140, y=370, w=1000, unit=10,font=35,disp=WIDGET.lnk.SETval("VKCurW"),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end}), - WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newSwitch({name="VKDodge", x=400, y=200, font=35, disp=WIDGET.lnk_SETval("VKDodge"),code=WIDGET.lnk_SETrev("VKDodge")}), + WIDGET.newSlider({name="VKTchW", x=140, y=310, w=1000, unit=10,font=35,disp=WIDGET.lnk_SETval("VKTchW"),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end}), + WIDGET.newSlider({name="VKCurW", x=140, y=370, w=1000, unit=10,font=35,disp=WIDGET.lnk_SETval("VKCurW"),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end}), + WIDGET.newButton({name="back", x=1140, y=640, w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index fa3c96f8..c7ea6008 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -8,23 +8,23 @@ end WIDGET.init("setting_video",{ WIDGET.newText({name="title", x=640,y=15,font=80}), - WIDGET.newButton({name="sound", x=200, y=80,w=240,h=80,color="lCyan",font=35,code=WIDGET.lnk.swapScene("setting_sound","swipeR")}), - WIDGET.newButton({name="game", x=1080, y=80,w=240,h=80,color="lCyan",font=35,code=WIDGET.lnk.swapScene("setting_game","swipeL")}), + WIDGET.newButton({name="sound", x=200, y=80,w=240,h=80,color="lCyan",font=35,code=WIDGET.lnk_swapScene("setting_sound","swipeR")}), + WIDGET.newButton({name="game", x=1080, y=80,w=240,h=80,color="lCyan",font=35,code=WIDGET.lnk_swapScene("setting_game","swipeL")}), - WIDGET.newSwitch({name="block", x=360, y=180, disp=WIDGET.lnk.SETval("block"), code=WIDGET.lnk.SETrev("block")}), - WIDGET.newSlider({name="ghost", x=260, y=250,w=200,unit=.6,disp=WIDGET.lnk.SETval("ghost"),show="percent",code=WIDGET.lnk.SETsto("ghost")}), - WIDGET.newSlider({name="center", x=260, y=300,w=200,unit=1, disp=WIDGET.lnk.SETval("center"), code=WIDGET.lnk.SETsto("center")}), + WIDGET.newSwitch({name="block", x=360, y=180, disp=WIDGET.lnk_SETval("block"), code=WIDGET.lnk_SETrev("block")}), + WIDGET.newSlider({name="ghost", x=260, y=250,w=200,unit=.6,disp=WIDGET.lnk_SETval("ghost"),show="percent", code=WIDGET.lnk_SETsto("ghost")}), + WIDGET.newSlider({name="center", x=260, y=300,w=200,unit=1, disp=WIDGET.lnk_SETval("center"), code=WIDGET.lnk_SETsto("center")}), - WIDGET.newSwitch({name="smooth", x=700, y=180, disp=WIDGET.lnk.SETval("smooth"), code=WIDGET.lnk.SETrev("smooth")}), - WIDGET.newSwitch({name="grid", x=700, y=240, disp=WIDGET.lnk.SETval("grid"), code=WIDGET.lnk.SETrev("grid")}), - WIDGET.newSwitch({name="bagLine", x=700, y=300, disp=WIDGET.lnk.SETval("bagLine"), code=WIDGET.lnk.SETrev("bagLine")}), + WIDGET.newSwitch({name="smooth", x=700, y=180, disp=WIDGET.lnk_SETval("smooth"), code=WIDGET.lnk_SETrev("smooth")}), + WIDGET.newSwitch({name="grid", x=700, y=240, disp=WIDGET.lnk_SETval("grid"), code=WIDGET.lnk_SETrev("grid")}), + WIDGET.newSwitch({name="bagLine", x=700, y=300, disp=WIDGET.lnk_SETval("bagLine"), code=WIDGET.lnk_SETrev("bagLine")}), - WIDGET.newSlider({name="lockFX", x=350, y=350,w=373,unit=5, disp=WIDGET.lnk.SETval("lockFX"), code=WIDGET.lnk.SETsto("lockFX")}), - WIDGET.newSlider({name="dropFX", x=350, y=400,w=373,unit=5, disp=WIDGET.lnk.SETval("dropFX"), code=WIDGET.lnk.SETsto("dropFX")}), - WIDGET.newSlider({name="moveFX", x=350, y=450,w=373,unit=5, disp=WIDGET.lnk.SETval("moveFX"), code=WIDGET.lnk.SETsto("moveFX")}), - WIDGET.newSlider({name="clearFX", x=350, y=500,w=373,unit=5, disp=WIDGET.lnk.SETval("clearFX"), code=WIDGET.lnk.SETsto("clearFX")}), - WIDGET.newSlider({name="shakeFX", x=350, y=550,w=373,unit=5, disp=WIDGET.lnk.SETval("shakeFX"), code=WIDGET.lnk.SETsto("shakeFX")}), - WIDGET.newSlider({name="atkFX", x=350, y=600,w=373,unit=5, disp=WIDGET.lnk.SETval("atkFX"), code=WIDGET.lnk.SETsto("atkFX")}), + WIDGET.newSlider({name="lockFX", x=350, y=350,w=373,unit=5, disp=WIDGET.lnk_SETval("lockFX"), code=WIDGET.lnk_SETsto("lockFX")}), + WIDGET.newSlider({name="dropFX", x=350, y=400,w=373,unit=5, disp=WIDGET.lnk_SETval("dropFX"), code=WIDGET.lnk_SETsto("dropFX")}), + WIDGET.newSlider({name="moveFX", x=350, y=450,w=373,unit=5, disp=WIDGET.lnk_SETval("moveFX"), code=WIDGET.lnk_SETsto("moveFX")}), + WIDGET.newSlider({name="clearFX", x=350, y=500,w=373,unit=5, disp=WIDGET.lnk_SETval("clearFX"), code=WIDGET.lnk_SETsto("clearFX")}), + WIDGET.newSlider({name="shakeFX", x=350, y=550,w=373,unit=5, disp=WIDGET.lnk_SETval("shakeFX"), code=WIDGET.lnk_SETsto("shakeFX")}), + WIDGET.newSlider({name="atkFX", x=350, y=600,w=373,unit=5, disp=WIDGET.lnk_SETval("atkFX"), code=WIDGET.lnk_SETsto("atkFX")}), WIDGET.newSlider({name="frame", x=350, y=650,w=373,unit=10, disp=function() return SETTING.frameMul>35 and SETTING.frameMul/10 or SETTING.frameMul/5-4 @@ -33,26 +33,26 @@ WIDGET.init("setting_video",{ SETTING.frameMul=i<5 and 5*i+20 or 10*i end}), - WIDGET.newSwitch({name="text", x=1100, y=180,font=35,disp=WIDGET.lnk.SETval("text"),code=WIDGET.lnk.SETrev("text")}), - WIDGET.newSwitch({name="score", x=1100, y=240,font=35,disp=WIDGET.lnk.SETval("score"),code=WIDGET.lnk.SETrev("score")}), - WIDGET.newSwitch({name="warn", x=1100, y=300,font=35,disp=WIDGET.lnk.SETval("warn"),code=WIDGET.lnk.SETrev("warn")}), - WIDGET.newSwitch({name="highCam", x=1100, y=360,font=35,disp=WIDGET.lnk.SETval("highCam"),code=WIDGET.lnk.SETrev("highCam")}), - WIDGET.newSwitch({name="nextPos", x=1100, y=420,font=35,disp=WIDGET.lnk.SETval("nextPos"),code=WIDGET.lnk.SETrev("nextPos")}), - WIDGET.newSwitch({name="fullscreen",x=1100, y=480,disp=WIDGET.lnk.SETval("fullscreen"), + WIDGET.newSwitch({name="text", x=1100, y=180,font=35,disp=WIDGET.lnk_SETval("text"), code=WIDGET.lnk_SETrev("text")}), + WIDGET.newSwitch({name="score", x=1100, y=240,font=35,disp=WIDGET.lnk_SETval("score"), code=WIDGET.lnk_SETrev("score")}), + WIDGET.newSwitch({name="warn", x=1100, y=300,font=35,disp=WIDGET.lnk_SETval("warn"), code=WIDGET.lnk_SETrev("warn")}), + WIDGET.newSwitch({name="highCam", x=1100, y=360,font=35,disp=WIDGET.lnk_SETval("highCam"),code=WIDGET.lnk_SETrev("highCam")}), + WIDGET.newSwitch({name="nextPos", x=1100, y=420,font=35,disp=WIDGET.lnk_SETval("nextPos"),code=WIDGET.lnk_SETrev("nextPos")}), + WIDGET.newSwitch({name="fullscreen",x=1100, y=480,disp=WIDGET.lnk_SETval("fullscreen"), code=function() SETTING.fullscreen=not SETTING.fullscreen love.window.setFullscreen(SETTING.fullscreen) love.resize(love.graphics.getWidth(),love.graphics.getHeight()) end}), - WIDGET.newSwitch({name="bg", x=1100, y=540,font=35,disp=WIDGET.lnk.SETval("bg"), + WIDGET.newSwitch({name="bg", x=1100, y=540,font=35,disp=WIDGET.lnk_SETval("bg"), code=function() BG.set("none") SETTING.bg=not SETTING.bg BG.set("space") end}), - WIDGET.newSwitch({name="power", x=990, y=640,font=35,disp=WIDGET.lnk.SETval("powerInfo"), + WIDGET.newSwitch({name="power", x=990, y=640,font=35,disp=WIDGET.lnk_SETval("powerInfo"), code=function() SETTING.powerInfo=not SETTING.powerInfo end}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/sound.lua b/parts/scenes/sound.lua index d5bcc9c4..80b26554 100644 --- a/parts/scenes/sound.lua +++ b/parts/scenes/sound.lua @@ -41,8 +41,8 @@ end WIDGET.init("sound",{ WIDGET.newText({name="title", x=30, y=15,font=70,align="L"}), - WIDGET.newSlider({name="sfx", x=510, y=60,w=330,font=35,change=function()SFX.play("blip_1")end,disp=WIDGET.lnk.SETval("sfx"),code=WIDGET.lnk.SETsto("sfx")}), - WIDGET.newSlider({name="voc", x=510, y=120,w=330,font=35,change=function()VOC.play("test")end,disp=WIDGET.lnk.SETval("voc"),code=WIDGET.lnk.SETsto("voc")}), + WIDGET.newSlider({name="sfx", x=510, y=60,w=330,font=35,change=function()SFX.play("blip_1")end,disp=WIDGET.lnk_SETval("sfx"),code=WIDGET.lnk_SETsto("sfx")}), + WIDGET.newSlider({name="voc", x=510, y=120,w=330,font=35,change=function()VOC.play("test")end,disp=WIDGET.lnk_SETval("voc"),code=WIDGET.lnk_SETsto("voc")}), WIDGET.newKey({name="move", x=110, y=140,w=160,h=50,code=function()SFX.play("move")end}), WIDGET.newKey({name="lock", x=110, y=205,w=160,h=50,code=function()SFX.play("lock")end}), @@ -64,47 +64,47 @@ WIDGET.init("sound",{ WIDGET.newKey({name="spin3", x=280, y=595,w=160,h=50,code=function()SFX.play("spin_3")end}), WIDGET.newKey({name="_pc", x=280, y=660,w=160,h=50,code=function()SFX.play("clear")end}), - WIDGET.newKey({name="_1", x=970, y=75,w=140,h=50,code=WIDGET.lnk.pressKey(1)}), - WIDGET.newKey({name="_2", x=1130, y=75,w=140,h=50,code=WIDGET.lnk.pressKey(2)}), - WIDGET.newKey({name="_3", x=970, y=140,w=140,h=50,code=WIDGET.lnk.pressKey(3)}), - WIDGET.newKey({name="_4", x=1130, y=140,w=140,h=50,code=WIDGET.lnk.pressKey(4)}), + WIDGET.newKey({name="_1", x=970, y=75,w=140,h=50,code=WIDGET.lnk_pressKey(1)}), + WIDGET.newKey({name="_2", x=1130, y=75,w=140,h=50,code=WIDGET.lnk_pressKey(2)}), + WIDGET.newKey({name="_3", x=970, y=140,w=140,h=50,code=WIDGET.lnk_pressKey(3)}), + WIDGET.newKey({name="_4", x=1130, y=140,w=140,h=50,code=WIDGET.lnk_pressKey(4)}), - WIDGET.newKey({name="z0", x=650, y=205,w=140,h=50,code=WIDGET.lnk.pressKey(10)}), - WIDGET.newKey({name="z1", x=650, y=270,w=140,h=50,code=WIDGET.lnk.pressKey(11)}), - WIDGET.newKey({name="z2", x=650, y=335,w=140,h=50,code=WIDGET.lnk.pressKey(12)}), - WIDGET.newKey({name="z3", x=650, y=400,w=140,h=50,code=WIDGET.lnk.pressKey(13)}), - WIDGET.newKey({name="t0", x=650, y=465,w=140,h=50,code=WIDGET.lnk.pressKey(50)}), - WIDGET.newKey({name="t1", x=650, y=530,w=140,h=50,code=WIDGET.lnk.pressKey(51)}), - WIDGET.newKey({name="t2", x=650, y=595,w=140,h=50,code=WIDGET.lnk.pressKey(52)}), - WIDGET.newKey({name="t3", x=650, y=660,w=140,h=50,code=WIDGET.lnk.pressKey(53)}), + WIDGET.newKey({name="z0", x=650, y=205,w=140,h=50,code=WIDGET.lnk_pressKey(10)}), + WIDGET.newKey({name="z1", x=650, y=270,w=140,h=50,code=WIDGET.lnk_pressKey(11)}), + WIDGET.newKey({name="z2", x=650, y=335,w=140,h=50,code=WIDGET.lnk_pressKey(12)}), + WIDGET.newKey({name="z3", x=650, y=400,w=140,h=50,code=WIDGET.lnk_pressKey(13)}), + WIDGET.newKey({name="t0", x=650, y=465,w=140,h=50,code=WIDGET.lnk_pressKey(50)}), + WIDGET.newKey({name="t1", x=650, y=530,w=140,h=50,code=WIDGET.lnk_pressKey(51)}), + WIDGET.newKey({name="t2", x=650, y=595,w=140,h=50,code=WIDGET.lnk_pressKey(52)}), + WIDGET.newKey({name="t3", x=650, y=660,w=140,h=50,code=WIDGET.lnk_pressKey(53)}), - WIDGET.newKey({name="s0", x=810, y=205,w=140,h=50,code=WIDGET.lnk.pressKey(20)}), - WIDGET.newKey({name="s1", x=810, y=270,w=140,h=50,code=WIDGET.lnk.pressKey(21)}), - WIDGET.newKey({name="s2", x=810, y=335,w=140,h=50,code=WIDGET.lnk.pressKey(22)}), - WIDGET.newKey({name="s3", x=810, y=400,w=140,h=50,code=WIDGET.lnk.pressKey(23)}), - WIDGET.newKey({name="o0", x=810, y=465,w=140,h=50,code=WIDGET.lnk.pressKey(60)}), - WIDGET.newKey({name="o1", x=810, y=530,w=140,h=50,code=WIDGET.lnk.pressKey(61)}), - WIDGET.newKey({name="o2", x=810, y=595,w=140,h=50,code=WIDGET.lnk.pressKey(62)}), - WIDGET.newKey({name="o3", x=810, y=660,w=140,h=50,code=WIDGET.lnk.pressKey(63)}), + WIDGET.newKey({name="s0", x=810, y=205,w=140,h=50,code=WIDGET.lnk_pressKey(20)}), + WIDGET.newKey({name="s1", x=810, y=270,w=140,h=50,code=WIDGET.lnk_pressKey(21)}), + WIDGET.newKey({name="s2", x=810, y=335,w=140,h=50,code=WIDGET.lnk_pressKey(22)}), + WIDGET.newKey({name="s3", x=810, y=400,w=140,h=50,code=WIDGET.lnk_pressKey(23)}), + WIDGET.newKey({name="o0", x=810, y=465,w=140,h=50,code=WIDGET.lnk_pressKey(60)}), + WIDGET.newKey({name="o1", x=810, y=530,w=140,h=50,code=WIDGET.lnk_pressKey(61)}), + WIDGET.newKey({name="o2", x=810, y=595,w=140,h=50,code=WIDGET.lnk_pressKey(62)}), + WIDGET.newKey({name="o3", x=810, y=660,w=140,h=50,code=WIDGET.lnk_pressKey(63)}), - WIDGET.newKey({name="j0", x=970, y=205,w=140,h=50,code=WIDGET.lnk.pressKey(30)}), - WIDGET.newKey({name="j1", x=970, y=270,w=140,h=50,code=WIDGET.lnk.pressKey(31)}), - WIDGET.newKey({name="j2", x=970, y=335,w=140,h=50,code=WIDGET.lnk.pressKey(32)}), - WIDGET.newKey({name="j3", x=970, y=400,w=140,h=50,code=WIDGET.lnk.pressKey(33)}), - WIDGET.newKey({name="i0", x=970, y=465,w=140,h=50,code=WIDGET.lnk.pressKey(70)}), - WIDGET.newKey({name="i1", x=970, y=530,w=140,h=50,code=WIDGET.lnk.pressKey(71)}), - WIDGET.newKey({name="i2", x=970, y=595,w=140,h=50,code=WIDGET.lnk.pressKey(72)}), - WIDGET.newKey({name="i3", x=970, y=660,w=140,h=50,code=WIDGET.lnk.pressKey(73)}), + WIDGET.newKey({name="j0", x=970, y=205,w=140,h=50,code=WIDGET.lnk_pressKey(30)}), + WIDGET.newKey({name="j1", x=970, y=270,w=140,h=50,code=WIDGET.lnk_pressKey(31)}), + WIDGET.newKey({name="j2", x=970, y=335,w=140,h=50,code=WIDGET.lnk_pressKey(32)}), + WIDGET.newKey({name="j3", x=970, y=400,w=140,h=50,code=WIDGET.lnk_pressKey(33)}), + WIDGET.newKey({name="i0", x=970, y=465,w=140,h=50,code=WIDGET.lnk_pressKey(70)}), + WIDGET.newKey({name="i1", x=970, y=530,w=140,h=50,code=WIDGET.lnk_pressKey(71)}), + WIDGET.newKey({name="i2", x=970, y=595,w=140,h=50,code=WIDGET.lnk_pressKey(72)}), + WIDGET.newKey({name="i3", x=970, y=660,w=140,h=50,code=WIDGET.lnk_pressKey(73)}), - WIDGET.newKey({name="l0", x=1130, y=205,w=140,h=50,code=WIDGET.lnk.pressKey(40)}), - WIDGET.newKey({name="l1", x=1130, y=270,w=140,h=50,code=WIDGET.lnk.pressKey(41)}), - WIDGET.newKey({name="l2", x=1130, y=335,w=140,h=50,code=WIDGET.lnk.pressKey(42)}), - WIDGET.newKey({name="l3", x=1130, y=400,w=140,h=50,code=WIDGET.lnk.pressKey(43)}), + WIDGET.newKey({name="l0", x=1130, y=205,w=140,h=50,code=WIDGET.lnk_pressKey(40)}), + WIDGET.newKey({name="l1", x=1130, y=270,w=140,h=50,code=WIDGET.lnk_pressKey(41)}), + WIDGET.newKey({name="l2", x=1130, y=335,w=140,h=50,code=WIDGET.lnk_pressKey(42)}), + WIDGET.newKey({name="l3", x=1130, y=400,w=140,h=50,code=WIDGET.lnk_pressKey(43)}), - WIDGET.newSwitch({name="mini", x=515, y=465,disp=WIDGET.lnk.STPval("mini"),code=WIDGET.lnk.pressKey("1")}), - WIDGET.newSwitch({name="b2b", x=515, y=530,disp=WIDGET.lnk.STPval("b2b"),code=WIDGET.lnk.pressKey("2")}), - WIDGET.newSwitch({name="b3b", x=515, y=595,disp=WIDGET.lnk.STPval("b3b"),code=WIDGET.lnk.pressKey("3")}), - WIDGET.newSwitch({name="pc", x=515, y=660,disp=WIDGET.lnk.STPval("pc"),code=WIDGET.lnk.pressKey("4")}), + WIDGET.newSwitch({name="mini", x=515, y=465,disp=WIDGET.lnk_STPval("mini"),code=WIDGET.lnk_pressKey("1")}), + WIDGET.newSwitch({name="b2b", x=515, y=530,disp=WIDGET.lnk_STPval("b2b"),code=WIDGET.lnk_pressKey("2")}), + WIDGET.newSwitch({name="b3b", x=515, y=595,disp=WIDGET.lnk_STPval("b3b"),code=WIDGET.lnk_pressKey("3")}), + WIDGET.newSwitch({name="pc", x=515, y=660,disp=WIDGET.lnk_STPval("pc"),code=WIDGET.lnk_pressKey("4")}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/staff.lua b/parts/scenes/staff.lua index 8b20b72b..61a93b44 100644 --- a/parts/scenes/staff.lua +++ b/parts/scenes/staff.lua @@ -35,5 +35,5 @@ function Pnt.staff() end WIDGET.init("staff",{ - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="back",x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), }) \ No newline at end of file diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua index 5aa724b7..3393b7ad 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -97,6 +97,6 @@ end WIDGET.init("stat",{ WIDGET.newButton({name="path",x=1000,y=540,w=250,h=80,font=25,code=function()love.system.openURL(love.filesystem.getSaveDirectory())end,hide=MOBILE}), - WIDGET.newButton({name="save",x=1000,y=640,w=250,h=80,font=25,code=WIDGET.lnk.goScene("savedata")}), - WIDGET.newButton({name="back",x=640,y=620,w=200,h=80,font=35,code=WIDGET.lnk.BACK}), + WIDGET.newButton({name="save",x=1000,y=640,w=250,h=80,font=25,code=WIDGET.lnk_goScene("savedata")}), + WIDGET.newButton({name="back",x=640,y=620,w=200,h=80,font=35,code=WIDGET.lnk_BACK}), }) \ No newline at end of file