diff --git a/Zframework/init.lua b/Zframework/init.lua index 03684dc9..89be2078 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -1,26 +1,26 @@ -SCR= require("Zframework/screen") -COLOR= require("Zframework/color") -SCN= require("Zframework/scene") -LOG= require("Zframework/log") -require("Zframework/toolfunc") +SCR= require"Zframework/screen" +COLOR= require"Zframework/color" +SCN= require"Zframework/scene" +LOG= require"Zframework/log" +require"Zframework/toolfunc" -VIB= require("Zframework/vibrate") -SFX= require("Zframework/sfx") +VIB= require"Zframework/vibrate" +SFX= require"Zframework/sfx" -LIGHT= require("Zframework/light") -BG= require("Zframework/background") -WIDGET= require("Zframework/widget") -TEXT= require("Zframework/text") -SYSFX= require("Zframework/sysFX") +LIGHT= require"Zframework/light" +BG= require"Zframework/background" +WIDGET= require"Zframework/widget" +TEXT= require"Zframework/text" +SYSFX= require"Zframework/sysFX" -IMG= require("Zframework/image") -BGM= require("Zframework/bgm") -VOC= require("Zframework/voice") +IMG= require"Zframework/image" +BGM= require"Zframework/bgm" +VOC= require"Zframework/voice" -LANG= require("Zframework/languages") -TASK= require("Zframework/task") -FILE= require("Zframework/file") -PROFILE=require("Zframework/profile") +LANG= require"Zframework/languages" +TASK= require"Zframework/task" +FILE= require"Zframework/file" +PROFILE=require"Zframework/profile" local ms,kb=love.mouse,love.keyboard local gc=love.graphics diff --git a/Zframework/languages.lua b/Zframework/languages.lua index 0c46e229..b3778218 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -1,11 +1,11 @@ local langList={ - require("parts/language/lang_zh"), - require("parts/language/lang_zh2"), - require("parts/language/lang_en"), - require("parts/language/lang_fr"), - require("parts/language/lang_sp"), - require("parts/language/lang_symbol"), - require("parts/language/lang_yygq"), + require"parts/language/lang_zh", + require"parts/language/lang_zh2", + require"parts/language/lang_en", + require"parts/language/lang_fr", + require"parts/language/lang_sp", + require"parts/language/lang_symbol", + require"parts/language/lang_yygq", --Add new language file to LANG folder. Attention, new language won't show in-game when you add language } local publicText={ diff --git a/main.lua b/main.lua index 9ea6750a..3b29f660 100644 --- a/main.lua +++ b/main.lua @@ -30,25 +30,25 @@ love.keyboard.setTextInput(false) love.mouse.setVisible(false) --Load modules -require("Zframework") +require"Zframework" -require("parts/list") -require("parts/globalTables") -require("parts/gametoolfunc") +require"parts/list" +require"parts/globalTables" +require"parts/gametoolfunc" SCR.setSize(1280,720)--Initialize Screen size FIELD[1]=newBoard()--Initialize field[1] -BLOCKS= require("parts/mino") -AIBUILDER= require("parts/AITemplate") -FREEROW= require("parts/freeRow") +BLOCKS= require"parts/mino" +AIBUILDER= require"parts/AITemplate" +FREEROW= require"parts/freeRow" -TEXTURE=require("parts/texture") -SKIN= require("parts/skin") -PLY= require("parts/player") -AIFUNC= require("parts/ai") -MODES= require("parts/modes") -TICK= require("parts/tick") +TEXTURE=require"parts/texture" +SKIN= require"parts/skin" +PLY= require"parts/player" +AIFUNC= require"parts/ai" +MODES= require"parts/modes" +TICK= require"parts/tick" SFX.set{ "welcome_sfx", diff --git a/parts/modes/pctrain_lunatic.lua b/parts/modes/pctrain_lunatic.lua index 7e2375da..2d021e31 100644 --- a/parts/modes/pctrain_lunatic.lua +++ b/parts/modes/pctrain_lunatic.lua @@ -2,8 +2,8 @@ local int=math.floor local pc_drop={50,45,40,35,30,26,22,18,15,12} local pc_lock={55,50,45,40,36,32,30} local pc_fall={18,16,14,12,10,9,8,7,6} -local PCbase=require("parts/modes/PCbase") -local PClist=require("parts/modes/PClist") +local PCbase=require"parts/modes/PCbase" +local PClist=require"parts/modes/PClist" local PCtype={[0]=1,2,3,2,3} local function task_PC(P) diff --git a/parts/modes/pctrain_normal.lua b/parts/modes/pctrain_normal.lua index b634110a..68bbaed5 100644 --- a/parts/modes/pctrain_normal.lua +++ b/parts/modes/pctrain_normal.lua @@ -1,5 +1,5 @@ -local PCbase=require("parts/modes/PCbase") -local PClist=require("parts/modes/PClist") +local PCbase=require"parts/modes/PCbase" +local PClist=require"parts/modes/PClist" local PCtype={ [0]=1,1,1,1,2, 1,1,1,1,3, diff --git a/parts/player/init.lua b/parts/player/init.lua index bdbaff75..3a91bd9a 100644 --- a/parts/player/init.lua +++ b/parts/player/init.lua @@ -1,14 +1,14 @@ -local Player=require("parts/player/player") -local prepareSequence=require("parts/player/prepareSequence") -local gameEnv0=require("parts/player/gameEnv0") +local Player=require"parts/player/player" +local prepareSequence=require"parts/player/prepareSequence" +local gameEnv0=require"parts/player/gameEnv0" local mt=love.math local rnd,max,min=math.random,math.max,math.min local ins=table.insert local PLY={ - update=require("parts/player/update"), - draw=require("parts/player/draw"), + update=require"parts/player/update", + draw=require"parts/player/draw", } ---------------------------------------------------- @@ -330,7 +330,7 @@ function PLY.newDemoPlayer(id,x,y,size) loadGameEnv(P) applyGameEnv(P) prepareSequence(P) - P:loadAI({ + P:loadAI{ type="CC", next=5, hold=true, @@ -338,7 +338,7 @@ function PLY.newDemoPlayer(id,x,y,size) delta=6, bag="bag", node=100000, - }) + } P:popNext() end function PLY.newRemotePlayer(id,x,y,size) diff --git a/parts/player/player.lua b/parts/player/player.lua index 9781e87a..3846fb50 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -8,7 +8,7 @@ local int,ceil,rnd=math.floor,math.ceil,math.random local max,min=math.max,math.min local ins,rem=table.insert,table.remove -local kickList=require("parts/kickList") +local kickList=require"parts/kickList" local scs=spinCenters local function without(L,e) diff --git a/parts/scenes/account.lua b/parts/scenes/account.lua index e90392eb..9a58c39e 100644 --- a/parts/scenes/account.lua +++ b/parts/scenes/account.lua @@ -5,6 +5,6 @@ function sceneInit.account() 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.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}, }) \ No newline at end of file diff --git a/parts/scenes/calculator.lua b/parts/scenes/calculator.lua index 9f447f80..b4a4188a 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 e9f718a7..f287c6f2 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -152,38 +152,38 @@ function Pnt.customGame() end WIDGET.init("customGame",{ - 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.newText({name="defSeq", x=330, y=550,align="L",color="grey",hide=function()return BAG[1]end}), - WIDGET.newText({name="noMsn", x=610, y=550,align="L",color="grey",hide=function()return MISSION[1]end}), + 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.newText{name="defSeq", x=330, y=550,align="L",color="grey",hide=function()return BAG[1]end}, + 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", + 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"), 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="mod", x=730, y=310,w=220,h=90,color="white", font=35,code=WIDGET.lnk_goScene("mod")}), - 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="mod", x=730, y=310,w=220,h=90,color="white", font=35,code=WIDGET.lnk_goScene("mod")}, + 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 bc8478c0..296293aa 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -1,40 +1,40 @@ WIDGET.init("custom_advance",{ - 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.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"}, --Visual - WIDGET.newSwitch({name="block", x=620, y=600, font=25, disp=WIDGET.lnk_CUSval("block"), code=WIDGET.lnk_CUSrev("block")}), - WIDGET.newSlider({name="ghost", x=500, y=450,w=200,unit=.6,font=25, disp=WIDGET.lnk_CUSval("ghost"), code=WIDGET.lnk_CUSsto("ghost")}), - WIDGET.newSlider({name="center", x=500, y=520,w=200,unit=1, font=25, disp=WIDGET.lnk_CUSval("center"), code=WIDGET.lnk_CUSsto("center")}), + WIDGET.newSwitch{name="block", x=620, y=600, font=25,disp=WIDGET.lnk_CUSval("block"), code=WIDGET.lnk_CUSrev("block")}, + WIDGET.newSlider{name="ghost", x=500, y=450,w=200,unit=.6,font=25,disp=WIDGET.lnk_CUSval("ghost"), code=WIDGET.lnk_CUSsto("ghost")}, + WIDGET.newSlider{name="center", x=500, y=520,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="nextCount", x=150,y=450,w=200,unit=6, disp=WIDGET.lnk_CUSval("nextCount"),code=WIDGET.lnk_CUSsto("nextCount")}), - WIDGET.newSlider({name="holdCount", x=150,y=520,w=200,unit=6, disp=WIDGET.lnk_CUSval("holdCount"),code=WIDGET.lnk_CUSsto("holdCount")}), - WIDGET.newSwitch({name="infHold", x=260,y=600, disp=WIDGET.lnk_CUSval("infHold"), code=WIDGET.lnk_CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 end}), + WIDGET.newSlider{name="nextCount", x=150,y=450,w=200,unit=6, disp=WIDGET.lnk_CUSval("nextCount"),code=WIDGET.lnk_CUSsto("nextCount")}, + WIDGET.newSlider{name="holdCount", x=150,y=520,w=200,unit=6, disp=WIDGET.lnk_CUSval("holdCount"),code=WIDGET.lnk_CUSsto("holdCount")}, + WIDGET.newSwitch{name="infHold", x=260,y=600, disp=WIDGET.lnk_CUSval("infHold"), code=WIDGET.lnk_CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 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=410, font=25, disp=WIDGET.lnk_CUSval("noTele"), code=WIDGET.lnk_CUSrev("noTele")}), - WIDGET.newSwitch({name="fineKill", x=910, y=480, font=20, disp=WIDGET.lnk_CUSval("fineKill"), code=WIDGET.lnk_CUSrev("fineKill")}), - WIDGET.newSwitch({name="b2bKill", x=910, y=550, font=20, disp=WIDGET.lnk_CUSval("b2bKill"), code=WIDGET.lnk_CUSrev("b2bKill")}), - WIDGET.newSwitch({name="easyFresh", x=910, y=620, font=20, disp=WIDGET.lnk_CUSval("easyFresh"),code=WIDGET.lnk_CUSrev("easyFresh")}), + 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=410, font=25,disp=WIDGET.lnk_CUSval("noTele"), code=WIDGET.lnk_CUSrev("noTele")}, + WIDGET.newSwitch{name="fineKill", x=910, y=480, font=20,disp=WIDGET.lnk_CUSval("fineKill"), code=WIDGET.lnk_CUSrev("fineKill")}, + WIDGET.newSwitch{name="b2bKill", x=910, y=550, font=20,disp=WIDGET.lnk_CUSval("b2bKill"), code=WIDGET.lnk_CUSrev("b2bKill")}, + WIDGET.newSwitch{name="easyFresh", x=910, y=620, font=20,disp=WIDGET.lnk_CUSval("easyFresh"),code=WIDGET.lnk_CUSrev("easyFresh")}, - WIDGET.newSelector({name="RS", x=410, y=370, w=260,color="sea", list={"TRS","SRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_CUSval("RS"),code=WIDGET.lnk_CUSsto("RS")}), - 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.newSelector{name="RS", x=410, y=370, w=260,color="sea", list={"TRS","SRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_CUSval("RS"),code=WIDGET.lnk_CUSsto("RS")}, + 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 e0a3f9f5..4f431b87 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -230,50 +230,50 @@ end local function setPen(i)return function()sceneTemp.pen=i end end WIDGET.init("custom_field",{ - WIDGET.newText({name="title", x=1020,y=5,font=70,align="R"}), - WIDGET.newText({name="subTitle", x=1030,y=50,font=35,align="L",color="grey"}), + WIDGET.newText{name="title", x=1020,y=5,font=70,align="R"}, + WIDGET.newText{name="subTitle", x=1030,y=50,font=35,align="L",color="grey"}, - WIDGET.newButton({name="b1", x=580, y=130,w=75,color=COLOR.red, code=setPen(1)}),--B1 - WIDGET.newButton({name="b2", x=660, y=130,w=75,color=COLOR.fire, code=setPen(2)}),--B2 - WIDGET.newButton({name="b3", x=740, y=130,w=75,color=COLOR.orange, code=setPen(3)}),--B3 - WIDGET.newButton({name="b4", x=820, y=130,w=75,color=COLOR.yellow, code=setPen(4)}),--B4 - WIDGET.newButton({name="b5", x=900, y=130,w=75,color=COLOR.lame, code=setPen(5)}),--B5 - WIDGET.newButton({name="b6", x=980, y=130,w=75,color=COLOR.grass, code=setPen(6)}),--B6 - WIDGET.newButton({name="b7", x=1060, y=130,w=75,color=COLOR.green, code=setPen(7)}),--B7 - WIDGET.newButton({name="b8", x=1140, y=130,w=75,color=COLOR.water, code=setPen(8)}),--B8 + WIDGET.newButton{name="b1", x=580, y=130,w=75,color=COLOR.red, code=setPen(1)},--B1 + WIDGET.newButton{name="b2", x=660, y=130,w=75,color=COLOR.fire, code=setPen(2)},--B2 + WIDGET.newButton{name="b3", x=740, y=130,w=75,color=COLOR.orange, code=setPen(3)},--B3 + WIDGET.newButton{name="b4", x=820, y=130,w=75,color=COLOR.yellow, code=setPen(4)},--B4 + WIDGET.newButton{name="b5", x=900, y=130,w=75,color=COLOR.lame, code=setPen(5)},--B5 + WIDGET.newButton{name="b6", x=980, y=130,w=75,color=COLOR.grass, code=setPen(6)},--B6 + WIDGET.newButton{name="b7", x=1060, y=130,w=75,color=COLOR.green, code=setPen(7)},--B7 + WIDGET.newButton{name="b8", x=1140, y=130,w=75,color=COLOR.water, code=setPen(8)},--B8 - WIDGET.newButton({name="b9", x=580, y=210,w=75,color=COLOR.cyan, code=setPen(9)}),--B9 - WIDGET.newButton({name="b10", x=660, y=210,w=75,color=COLOR.sky, code=setPen(10)}),--B10 - WIDGET.newButton({name="b11", x=740, y=210,w=75,color=COLOR.sea, code=setPen(11)}),--B11 - WIDGET.newButton({name="b12", x=820, y=210,w=75,color=COLOR.blue, code=setPen(12)}),--B12 - WIDGET.newButton({name="b13", x=900, y=210,w=75,color=COLOR.purple, code=setPen(13)}),--B13 - WIDGET.newButton({name="b14", x=980, y=210,w=75,color=COLOR.grape, code=setPen(14)}),--B14 - WIDGET.newButton({name="b15", x=1060, y=210,w=75,color=COLOR.magenta, code=setPen(15)}),--B15 - WIDGET.newButton({name="b16", x=1140, y=210,w=75,color=COLOR.pink, code=setPen(16)}),--B16 + WIDGET.newButton{name="b9", x=580, y=210,w=75,color=COLOR.cyan, code=setPen(9)},--B9 + WIDGET.newButton{name="b10", x=660, y=210,w=75,color=COLOR.sky, code=setPen(10)},--B10 + WIDGET.newButton{name="b11", x=740, y=210,w=75,color=COLOR.sea, code=setPen(11)},--B11 + WIDGET.newButton{name="b12", x=820, y=210,w=75,color=COLOR.blue, code=setPen(12)},--B12 + WIDGET.newButton{name="b13", x=900, y=210,w=75,color=COLOR.purple, code=setPen(13)},--B13 + WIDGET.newButton{name="b14", x=980, y=210,w=75,color=COLOR.grape, code=setPen(14)},--B14 + WIDGET.newButton{name="b15", x=1060, y=210,w=75,color=COLOR.magenta, code=setPen(15)},--B15 + WIDGET.newButton{name="b16", x=1140, y=210,w=75,color=COLOR.pink, code=setPen(16)},--B16 - WIDGET.newButton({name="b17", x=580, y=290,w=75,color="dGrey", code=setPen(17)}),--BONE - WIDGET.newButton({name="b18", x=660, y=290,w=75,color="black", code=setPen(18)}),--HIDE - WIDGET.newButton({name="b19", x=740, y=290,w=75,color="lYellow", code=setPen(19)}),--BOMB - WIDGET.newButton({name="b20", x=820, y=290,w=75,color="grey", code=setPen(20)}),--GB1 - WIDGET.newButton({name="b21", x=900, y=290,w=75,color="lGrey", code=setPen(21)}),--GB2 - WIDGET.newButton({name="b22", x=980, y=290,w=75,color="dPurple", code=setPen(22)}),--GB3 - WIDGET.newButton({name="b23", x=1060, y=290,w=75,color="dRed", code=setPen(23)}),--GB4 - WIDGET.newButton({name="b24", x=1140, y=290,w=75,color="dGreen", code=setPen(24)}),--GB5 + WIDGET.newButton{name="b17", x=580, y=290,w=75,color="dGrey", code=setPen(17)},--BONE + WIDGET.newButton{name="b18", x=660, y=290,w=75,color="black", code=setPen(18)},--HIDE + WIDGET.newButton{name="b19", x=740, y=290,w=75,color="lYellow", code=setPen(19)},--BOMB + WIDGET.newButton{name="b20", x=820, y=290,w=75,color="grey", code=setPen(20)},--GB1 + WIDGET.newButton{name="b21", x=900, y=290,w=75,color="lGrey", code=setPen(21)},--GB2 + WIDGET.newButton{name="b22", x=980, y=290,w=75,color="dPurple", code=setPen(22)},--GB3 + WIDGET.newButton{name="b23", x=1060, y=290,w=75,color="dRed", code=setPen(23)},--GB4 + WIDGET.newButton{name="b24", x=1140, y=290,w=75,color="dGreen", code=setPen(24)},--GB5 - 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="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="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 dc071ba8..ec7fcd57 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -186,54 +186,54 @@ function Pnt.custom_mission() end 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.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 c1d9c4f0..c43bae2e 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -179,50 +179,50 @@ function Pnt.custom_sequence() end WIDGET.init("custom_sequence",{ - 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.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.newSelector({name="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") - }), + }, - 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 eba053fa..7ac3433b 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -175,10 +175,10 @@ function Pnt.dict() 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.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}, }) \ No newline at end of file diff --git a/parts/scenes/help.lua b/parts/scenes/help.lua index 8041de21..af67a3b8 100644 --- a/parts/scenes/help.lua +++ b/parts/scenes/help.lua @@ -28,11 +28,11 @@ function Pnt.help() 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="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.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="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}, }) \ No newline at end of file diff --git a/parts/scenes/history.lua b/parts/scenes/history.lua index 1c6661ab..1c6b1eaf 100644 --- a/parts/scenes/history.lua +++ b/parts/scenes/history.lua @@ -23,7 +23,7 @@ end function sceneInit.history() BG.set("rainbow") sceneTemp={ - text=require("parts/updateLog"),--Text list + text=require"parts/updateLog",--Text list pos=1,--Scroll pos } if newVersionLaunch then @@ -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/lang.lua b/parts/scenes/lang.lua index 64e8e020..0d1c0cdc 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -4,12 +4,12 @@ end local function setLang(n)return function()SETTING.lang=n LANG.set(n)end end WIDGET.init("lang",{ - WIDGET.newButton({name="zh", x=200, y=100,w=200,h=120,font=45,code=setLang(1)}), - WIDGET.newButton({name="zh2", x=420, y=100,w=200,h=120,font=45,code=setLang(2)}), - WIDGET.newButton({name="en", x=640, y=100,w=200,h=120,font=45,code=setLang(3)}), - WIDGET.newButton({name="fr", x=860, y=100,w=200,h=120,font=45,code=setLang(4)}), - 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="zh", x=200, y=100,w=200,h=120,font=45,code=setLang(1)}, + WIDGET.newButton{name="zh2", x=420, y=100,w=200,h=120,font=45,code=setLang(2)}, + WIDGET.newButton{name="en", x=640, y=100,w=200,h=120,font=45,code=setLang(3)}, + WIDGET.newButton{name="fr", x=860, y=100,w=200,h=120,font=45,code=setLang(4)}, + 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}, }) \ No newline at end of file diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index a749f372..7b867a7e 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -16,12 +16,12 @@ function keyDown.login(key) elseif password~=password2 then LOG.print(text.diffPassword)return end - local data=urlencode.encode({ + local data=urlencode.encode{ username=username, email=email, password=password, code=code, - }) + } httpRequest( TICK.httpREQ_register, "api/account/register", @@ -37,11 +37,11 @@ function keyDown.login(key) end WIDGET.init("login",{ - WIDGET.newText({name="title", x=80, y=50,font=70,align="L"}), - WIDGET.newTextBox({name="username", x=380, y=160,w=500,h=60,regex="[0-9A-Za-z_]"}), - WIDGET.newTextBox({name="email", x=380, y=260,w=626,h=60,regex="[0-9A-Za-z@._-]"}), - 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.newText{name="title", x=80, y=50,font=70,align="L"}, + WIDGET.newTextBox{name="username", x=380, y=160,w=500,h=60,regex="[0-9A-Za-z_]"}, + WIDGET.newTextBox{name="email", x=380, y=260,w=626,h=60,regex="[0-9A-Za-z@._-]"}, + 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}, }) \ No newline at end of file diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index e88d3067..15174934 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")}), - 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="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.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")}, + 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="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")}, }) \ No newline at end of file diff --git a/parts/scenes/mg_15p.lua b/parts/scenes/mg_15p.lua index b87af62b..6d529f72 100644 --- a/parts/scenes/mg_15p.lua +++ b/parts/scenes/mg_15p.lua @@ -316,11 +316,11 @@ function Pnt.mg_15p() end WIDGET.init("mg_15p",{ - 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/mg_AtoZ.lua b/parts/scenes/mg_AtoZ.lua index 9b4d5f5f..ce83d0a1 100644 --- a/parts/scenes/mg_AtoZ.lua +++ b/parts/scenes/mg_AtoZ.lua @@ -111,8 +111,8 @@ function Pnt.mg_AtoZ() end WIDGET.init("mg_AtoZ",{ - WIDGET.newSelector({name="level",x=640,y=640,w=200,list={"A_Z","Z_A","Tech1","Tech2","KeyTest1","KeyTest2","hello","zzz","zxzx","stair"},disp=WIDGET.lnk_STPval("level"),code=function(i)sceneTemp.level=i;sceneTemp.target=levels[i]end,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")}), - WIDGET.newButton({name="keyboard",x=160,y=210,w=180,h=100,code=function()love.keyboard.setTextInput(true,0,select(2,SCR.xOy:transformPoint(0,500)),1,1)end,hide=not MOBILE}), - WIDGET.newButton({name="back",x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), + WIDGET.newSelector{name="level", x=640,y=640,w=200,list={"A_Z","Z_A","Tech1","Tech2","KeyTest1","KeyTest2","hello","zzz","zxzx","stair"},disp=WIDGET.lnk_STPval("level"),code=function(i)sceneTemp.level=i;sceneTemp.target=levels[i]end,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")}, + WIDGET.newButton{name="keyboard", x=160,y=210,w=180,h=100,code=function()love.keyboard.setTextInput(true,0,select(2,SCR.xOy:transformPoint(0,500)),1,1)end,hide=not MOBILE}, + 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/mg_UTTT.lua b/parts/scenes/mg_UTTT.lua index ecf80751..d4c7e47b 100644 --- a/parts/scenes/mg_UTTT.lua +++ b/parts/scenes/mg_UTTT.lua @@ -247,6 +247,6 @@ function mouseDown.mg_UTTT(x,y) end WIDGET.init("mg_UTTT",{ - WIDGET.newButton({name="reset",x=1140,y=540,w=170,h=80,font=40,color="lGreen",code=restart}), - WIDGET.newButton({name="back",x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), + WIDGET.newButton{name="reset",x=1140,y=540,w=170,h=80,font=40,color="lGreen",code=restart}, + 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/mg_pong.lua b/parts/scenes/mg_pong.lua index 45a0b89a..acf29879 100644 --- a/parts/scenes/mg_pong.lua +++ b/parts/scenes/mg_pong.lua @@ -175,6 +175,6 @@ function Pnt.mg_pong() end WIDGET.init("mg_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/mg_schulteG.lua b/parts/scenes/mg_schulteG.lua index c5f1f15e..331ae288 100644 --- a/parts/scenes/mg_schulteG.lua +++ b/parts/scenes/mg_schulteG.lua @@ -172,10 +172,10 @@ function Pnt.mg_schulteG() end WIDGET.init("mg_schulteG",{ - 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.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}, }) \ No newline at end of file diff --git a/parts/scenes/minigame.lua b/parts/scenes/minigame.lua index 2b5774da..d2a2d504 100644 --- a/parts/scenes/minigame.lua +++ b/parts/scenes/minigame.lua @@ -3,10 +3,10 @@ function sceneInit.minigame() end WIDGET.init("minigame",{ - WIDGET.newButton({name="mg_15p", x=240, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("mg_15p")}), - WIDGET.newButton({name="mg_schulteG",x=640, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("mg_schulteG")}), - WIDGET.newButton({name="mg_pong", x=1040, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("mg_pong")}), - WIDGET.newButton({name="mg_AtoZ", x=240, y=400,w=350,h=120,font=40,code=WIDGET.lnk_goScene("mg_AtoZ")}), - WIDGET.newButton({name="mg_UTTT", x=640, y=400,w=350,h=120,font=30,code=WIDGET.lnk_goScene("mg_UTTT")}), - WIDGET.newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), + WIDGET.newButton{name="mg_15p", x=240, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("mg_15p")}, + WIDGET.newButton{name="mg_schulteG",x=640, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("mg_schulteG")}, + WIDGET.newButton{name="mg_pong", x=1040, y=250,w=350,h=120,font=40,code=WIDGET.lnk_goScene("mg_pong")}, + WIDGET.newButton{name="mg_AtoZ", x=240, y=400,w=350,h=120,font=40,code=WIDGET.lnk_goScene("mg_AtoZ")}, + WIDGET.newButton{name="mg_UTTT", x=640, y=400,w=350,h=120,font=30,code=WIDGET.lnk_goScene("mg_UTTT")}, + 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/mod.lua b/parts/scenes/mod.lua index 7a33ec40..231de871 100644 --- a/parts/scenes/mod.lua +++ b/parts/scenes/mod.lua @@ -135,8 +135,8 @@ function Pnt.mod() end WIDGET.init("mod",{ - WIDGET.newText({name="title",x=80,y=50,font=70,align="L"}), - WIDGET.newText({name="unranked",x=1200,y=60,color="lRed",font=50,align="R",hide=function()return scoreValid()end}), - WIDGET.newButton({name="reset",x=1140,y=540,w=170,h=80,font=25,code=WIDGET.lnk_pressKey("tab")}), - WIDGET.newButton({name="back",x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), + WIDGET.newText{name="title", x=80,y=50,font=70,align="L"}, + WIDGET.newText{name="unranked", x=1200,y=60,color="lRed",font=50,align="R",hide=function()return scoreValid()end}, + WIDGET.newButton{name="reset", x=1140,y=540,w=170,h=80,font=25,code=WIDGET.lnk_pressKey("tab")}, + 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/mode.lua b/parts/scenes/mode.lua index 6ac6e788..9c7f1788 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -307,7 +307,7 @@ function Pnt.mode() end WIDGET.init("mode",{ - WIDGET.newKey({name="mod", x=140,y=655,w=220,h=80,font=35,code=WIDGET.lnk_goScene("mod")}), - WIDGET.newButton({name="start", x=1040,y=655,w=180,h=80,font=40,code=WIDGET.lnk_pressKey("return"),hide=function()return not mapCam.sel end}), - WIDGET.newButton({name="back", x=1200,y=655,w=120,h=80,font=40,code=WIDGET.lnk_BACK}), + WIDGET.newKey{name="mod", x=140,y=655,w=220,h=80,font=35,code=WIDGET.lnk_goScene("mod")}, + WIDGET.newButton{name="start", x=1040,y=655,w=180,h=80,font=40,code=WIDGET.lnk_pressKey("return"),hide=function()return not mapCam.sel end}, + WIDGET.newButton{name="back", x=1200,y=655,w=120,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 d84eeb7f..2324b96c 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -91,12 +91,12 @@ function Pnt.music() end 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.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}, }) \ No newline at end of file diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 3c7d6678..eb92032b 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -294,9 +294,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/play.lua b/parts/scenes/play.lua index a9b72519..9fb614c2 100644 --- a/parts/scenes/play.lua +++ b/parts/scenes/play.lua @@ -355,5 +355,5 @@ function Pnt.play() end WIDGET.init("play",{ - WIDGET.newButton({name="pause", x=1235, y=45, w=80, font=25,code=function()pauseGame()end}), + WIDGET.newButton{name="pause",x=1235,y=45,w=80,font=25,code=function()pauseGame()end}, }) \ No newline at end of file diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index 5580e76f..99ac3abe 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -38,18 +38,18 @@ local function HIDE() return not sceneTemp.reset end WIDGET.init("savedata",{ - WIDGET.newButton({name="exportUnlock", x=190,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(RANKS)end}), - WIDGET.newButton({name="exportData", x=490,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(STAT)end}), - WIDGET.newButton({name="exportSetting", x=790,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(SETTING)end}), - WIDGET.newButton({name="exportVK", x=1090,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(VK_org)end}), + WIDGET.newButton{name="exportUnlock", x=190,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(RANKS)end}, + WIDGET.newButton{name="exportData", x=490,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(STAT)end}, + WIDGET.newButton{name="exportSetting", x=790,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(SETTING)end}, + WIDGET.newButton{name="exportVK", x=1090,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(VK_org)end}, - WIDGET.newButton({name="importUnlock", x=190,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,RANKS)end}), - WIDGET.newButton({name="importData", x=490,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,STAT)end}), - WIDGET.newButton({name="importSetting", x=790,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,SETTING)end}), - WIDGET.newButton({name="importVK", x=1090,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,VK_org)end}), + WIDGET.newButton{name="importUnlock", x=190,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,RANKS)end}, + WIDGET.newButton{name="importData", x=490,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,STAT)end}, + WIDGET.newButton{name="importSetting", x=790,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,SETTING)end}, + WIDGET.newButton{name="importVK", x=1090,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,VK_org)end}, - WIDGET.newButton({name="reset", x=640,y=460,w=280,h=100,color="lRed",font=40,code=function()sceneTemp.reset=true end,hide=function()return sceneTemp.reset end}), - WIDGET.newButton({name="resetUnlock", x=340,y=460,w=280,h=100,color="red", + WIDGET.newButton{name="reset", x=640,y=460,w=280,h=100,color="lRed",font=40,code=function()sceneTemp.reset=true end,hide=function()return sceneTemp.reset end}, + WIDGET.newButton{name="resetUnlock", x=340,y=460,w=280,h=100,color="red", code=function() love.filesystem.remove("unlock.dat") SFX.play("finesseError_long") @@ -57,8 +57,8 @@ WIDGET.init("savedata",{ LOG.print("effected after restart game","message") LOG.print("fresh a rank if you regret","message") end, - hide=HIDE}), - WIDGET.newButton({name="resetData", x=640,y=460,w=280,h=100,color="red", + hide=HIDE}, + WIDGET.newButton{name="resetData", x=640,y=460,w=280,h=100,color="red", code=function() love.filesystem.remove("data.dat") SFX.play("finesseError_long") @@ -66,8 +66,8 @@ WIDGET.init("savedata",{ LOG.print("effected after restart game","message") LOG.print("play one game if you regret","message") end, - hide=HIDE}), - WIDGET.newButton({name="resetALL", x=940,y=460,w=280,h=100,color="red", + hide=HIDE}, + WIDGET.newButton{name="resetALL", x=940,y=460,w=280,h=100,color="red", code=function() local L=love.filesystem.getDirectoryItems("") for i=1,#L do @@ -81,7 +81,7 @@ WIDGET.init("savedata",{ LOG.print("effected after restart game","message") SCN.back() end, - hide=HIDE}), + 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/setting_control.lua b/parts/scenes/setting_control.lua index 8332cf35..98938b07 100644 --- a/parts/scenes/setting_control.lua +++ b/parts/scenes/setting_control.lua @@ -80,22 +80,22 @@ local function sliderShow(S) return S.."F "..int(S*16.67).."ms" end 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.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.newButton({name="reset", x=160, y=580,w=200,h=100,color="lRed",font=40, + 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 _.das,_.arr=10,2 _.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}), + 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_game.lua b/parts/scenes/setting_game.lua index 29d6cdda..e570c7c2 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -16,22 +16,22 @@ function Pnt.setting_game() end WIDGET.init("setting_game",{ - WIDGET.newText({name="title", x=640,y=15,font=80}), + 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.newSelector({name="RS", x=300, y=540, w=300,color="sea",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_SETval("RS"),code=WIDGET.lnk_SETsto("RS")}), - WIDGET.newButton({name="layout", x=580, y=540, w=200,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.newSelector{name="RS", x=300, y=540, w=300,color="sea",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_SETval("RS"),code=WIDGET.lnk_SETsto("RS")}, + WIDGET.newButton{name="layout", x=580, y=540, w=200,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 9b127824..f7abdc43 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -132,10 +132,10 @@ function Pnt.setting_key() end WIDGET.init("setting_key",{ - WIDGET.newText({name="keyboard", x=340,y=30,font=25,color="lRed"}), - WIDGET.newText({name="keyboard", x=940,y=30,font=25,color="lRed"}), - 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.newText{name="keyboard", x=340,y=30,font=25,color="lRed"}, + WIDGET.newText{name="keyboard", x=940,y=30,font=25,color="lRed"}, + 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}, }) \ No newline at end of file diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua index 8d0085a2..66abae98 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -28,45 +28,45 @@ local function nextSkin(n)return function()SKIN.next(n)end end local function nextDir(n)return function()SKIN.rotate(n)end end WIDGET.init("setting_skin",{ - WIDGET.newText({name="title", x=80,y=50,font=70}), + WIDGET.newText{name="title", x=80,y=50,font=70}, - WIDGET.newButton({name="prev", x=700,y=100,w=140,h=100,font=50,code=function()SKIN.prevSet()end}), - WIDGET.newButton({name="next", x=860,y=100,w=140,h=100,font=50,code=function()SKIN.nextSet()end}), - WIDGET.newButton({name="prev1", x=130,y=230,w=90,h=65,code=prevSkin(1)}), - WIDGET.newButton({name="prev2", x=270,y=230,w=90,h=65,code=prevSkin(2)}), - WIDGET.newButton({name="prev3", x=410,y=230,w=90,h=65,code=prevSkin(3)}), - WIDGET.newButton({name="prev4", x=550,y=230,w=90,h=65,code=prevSkin(4)}), - WIDGET.newButton({name="prev5", x=690,y=230,w=90,h=65,code=prevSkin(5)}), - WIDGET.newButton({name="prev6", x=830,y=230,w=90,h=65,code=prevSkin(6)}), - WIDGET.newButton({name="prev7", x=970,y=230,w=90,h=65,code=prevSkin(7)}), + WIDGET.newButton{name="prev", x=700,y=100,w=140,h=100,font=50,code=function()SKIN.prevSet()end}, + WIDGET.newButton{name="next", x=860,y=100,w=140,h=100,font=50,code=function()SKIN.nextSet()end}, + WIDGET.newButton{name="prev1", x=130,y=230,w=90,h=65,code=prevSkin(1)}, + WIDGET.newButton{name="prev2", x=270,y=230,w=90,h=65,code=prevSkin(2)}, + WIDGET.newButton{name="prev3", x=410,y=230,w=90,h=65,code=prevSkin(3)}, + WIDGET.newButton{name="prev4", x=550,y=230,w=90,h=65,code=prevSkin(4)}, + WIDGET.newButton{name="prev5", x=690,y=230,w=90,h=65,code=prevSkin(5)}, + WIDGET.newButton{name="prev6", x=830,y=230,w=90,h=65,code=prevSkin(6)}, + WIDGET.newButton{name="prev7", x=970,y=230,w=90,h=65,code=prevSkin(7)}, - WIDGET.newButton({name="next1", x=130,y=450,w=90,h=65,code=nextSkin(1)}), - WIDGET.newButton({name="next2", x=270,y=450,w=90,h=65,code=nextSkin(2)}), - WIDGET.newButton({name="next3", x=410,y=450,w=90,h=65,code=nextSkin(3)}), - WIDGET.newButton({name="next4", x=550,y=450,w=90,h=65,code=nextSkin(4)}), - WIDGET.newButton({name="next5", x=690,y=450,w=90,h=65,code=nextSkin(5)}), - WIDGET.newButton({name="next6", x=830,y=450,w=90,h=65,code=nextSkin(6)}), - WIDGET.newButton({name="next7", x=970,y=450,w=90,h=65,code=nextSkin(7)}), + WIDGET.newButton{name="next1", x=130,y=450,w=90,h=65,code=nextSkin(1)}, + WIDGET.newButton{name="next2", x=270,y=450,w=90,h=65,code=nextSkin(2)}, + WIDGET.newButton{name="next3", x=410,y=450,w=90,h=65,code=nextSkin(3)}, + WIDGET.newButton{name="next4", x=550,y=450,w=90,h=65,code=nextSkin(4)}, + WIDGET.newButton{name="next5", x=690,y=450,w=90,h=65,code=nextSkin(5)}, + WIDGET.newButton{name="next6", x=830,y=450,w=90,h=65,code=nextSkin(6)}, + WIDGET.newButton{name="next7", x=970,y=450,w=90,h=65,code=nextSkin(7)}, - WIDGET.newButton({name="spin1", x=130,y=540,w=90,h=65,code=nextDir(1)}), - WIDGET.newButton({name="spin2", x=270,y=540,w=90,h=65,code=nextDir(2)}), - WIDGET.newButton({name="spin3", x=410,y=540,w=90,h=65,code=nextDir(3)}), - WIDGET.newButton({name="spin4", x=550,y=540,w=90,h=65,code=nextDir(4)}), - WIDGET.newButton({name="spin5", x=690,y=540,w=90,h=65,code=nextDir(5)}), - --WIDGET.newButton({name="spin6",x=825,y=540,w=90,h=65,code=nextDir(6)}),--Cannot rotate O - WIDGET.newButton({name="spin7", x=970,y=540,w=90,h=65,code=nextDir(7)}), + WIDGET.newButton{name="spin1", x=130,y=540,w=90,h=65,code=nextDir(1)}, + WIDGET.newButton{name="spin2", x=270,y=540,w=90,h=65,code=nextDir(2)}, + WIDGET.newButton{name="spin3", x=410,y=540,w=90,h=65,code=nextDir(3)}, + WIDGET.newButton{name="spin4", x=550,y=540,w=90,h=65,code=nextDir(4)}, + WIDGET.newButton{name="spin5", x=690,y=540,w=90,h=65,code=nextDir(5)}, + --WIDGET.newButton{name="spin6",x=825,y=540,w=90,h=65,code=nextDir(6)},--Cannot rotate O + WIDGET.newButton{name="spin7", x=970,y=540,w=90,h=65,code=nextDir(7)}, - WIDGET.newButton({name="skinR", x=200,y=640,w=220,h=80,color="lPurple",font=35, + WIDGET.newButton{name="skinR", x=200,y=640,w=220,h=80,color="lPurple",font=35, code=function() SETTING.skin={1,7,11,3,14,4,9,1,7,1,7,11,3,14,4,9,14,9,11,3,11,3,1,7,4} SFX.play("rotate") - end}), - WIDGET.newButton({name="faceR", x=480,y=640,w=220,h=80,color="lRed",font=35, + end}, + WIDGET.newButton{name="faceR", x=480,y=640,w=220,h=80,color="lRed",font=35, code=function() for i=1,25 do SETTING.face[i]=0 end SFX.play("hold") - end}), - WIDGET.newButton({name="back", x=1140,y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}), + 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_sound.lua b/parts/scenes/setting_sound.lua index bd07f7a4..f3d1416e 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -54,18 +54,18 @@ function Pnt.setting_sound() end WIDGET.init("setting_sound",{ - WIDGET.newText({name="title", x=640,y=15,font=80}), + 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, disp=WIDGET.lnk_SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}), - 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","naki"}, 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.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.sx==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, disp=WIDGET.lnk_SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, + 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","naki"}, 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}, }) \ No newline at end of file diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index 73bd9f4f..df43493b 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -170,7 +170,7 @@ local virtualkeySet={ },--PC key feedback(top&in a row) } WIDGET.init("setting_touch",{ - WIDGET.newButton({name="default", x=520,y=90,w=200,h=80,font=35, + WIDGET.newButton{name="default", x=520,y=90,w=200,h=80,font=35, code=function() local D=virtualkeySet[sceneTemp.default] for i=1,#VK_org do @@ -189,14 +189,14 @@ WIDGET.init("setting_touch",{ sceneTemp.default=sceneTemp.default%5+1 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.newButton({name="option", x=520,y=190,w=200,h=80,font=40, + 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.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.newSlider({name="size", x=450,y=270,w=460,unit=19,font=40,show="vkSize", + end}, + 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 end, @@ -207,5 +207,5 @@ WIDGET.init("setting_touch",{ end, hide=function() return not sceneTemp.sel - end}), + end}, }) \ No newline at end of file diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index 7b09f67e..f06902e5 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -6,40 +6,40 @@ local function VKAdisp(n)return function()return VK_org[n].ava end end local function VKAcode(n)return function()VK_org[n].ava=not VK_org[n].ava end end WIDGET.init("setting_touchSwitch",{ - WIDGET.newSwitch({name="b1", x=280, y=80, font=35,disp=VKAdisp(1),code=VKAcode(1)}), - WIDGET.newSwitch({name="b2", x=280, y=140, font=35,disp=VKAdisp(2),code=VKAcode(2)}), - WIDGET.newSwitch({name="b3", x=280, y=200, font=35,disp=VKAdisp(3),code=VKAcode(3)}), - WIDGET.newSwitch({name="b4", x=280, y=260, font=35,disp=VKAdisp(4),code=VKAcode(4)}), - WIDGET.newSwitch({name="b5", x=280, y=320, font=35,disp=VKAdisp(5),code=VKAcode(5)}), - WIDGET.newSwitch({name="b6", x=280, y=380, font=35,disp=VKAdisp(6),code=VKAcode(6)}), - WIDGET.newSwitch({name="b7", x=280, y=440, font=35,disp=VKAdisp(7),code=VKAcode(7)}), - WIDGET.newSwitch({name="b8", x=280, y=500, font=35,disp=VKAdisp(8),code=VKAcode(8)}), - WIDGET.newSwitch({name="b9", x=280, y=560, font=35,disp=VKAdisp(9),code=VKAcode(9)}), - WIDGET.newSwitch({name="b10", x=280, y=620, font=35,disp=VKAdisp(10),code=VKAcode(10)}), - WIDGET.newSwitch({name="b11", x=580, y=80, font=35,disp=VKAdisp(11),code=VKAcode(11)}), - WIDGET.newSwitch({name="b12", x=580, y=140, font=35,disp=VKAdisp(12),code=VKAcode(12)}), - WIDGET.newSwitch({name="b13", x=580, y=200, font=35,disp=VKAdisp(13),code=VKAcode(13)}), - WIDGET.newSwitch({name="b14", x=580, y=260, font=35,disp=VKAdisp(14),code=VKAcode(14)}), - WIDGET.newSwitch({name="b15", x=580, y=320, font=35,disp=VKAdisp(15),code=VKAcode(15)}), - WIDGET.newSwitch({name="b16", x=580, y=380, font=35,disp=VKAdisp(16),code=VKAcode(16)}), - WIDGET.newSwitch({name="b17", x=580, y=440, font=35,disp=VKAdisp(17),code=VKAcode(17)}), - WIDGET.newSwitch({name="b18", x=580, y=500, font=35,disp=VKAdisp(18),code=VKAcode(18)}), - WIDGET.newSwitch({name="b19", x=580, y=560, font=35,disp=VKAdisp(19),code=VKAcode(19)}), - 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.newButton({name="tkset", x=1120, y=420, w=240,h=80, + WIDGET.newSwitch{name="b1", x=280, y=80, font=35,disp=VKAdisp(1),code=VKAcode(1)}, + WIDGET.newSwitch{name="b2", x=280, y=140, font=35,disp=VKAdisp(2),code=VKAcode(2)}, + WIDGET.newSwitch{name="b3", x=280, y=200, font=35,disp=VKAdisp(3),code=VKAcode(3)}, + WIDGET.newSwitch{name="b4", x=280, y=260, font=35,disp=VKAdisp(4),code=VKAcode(4)}, + WIDGET.newSwitch{name="b5", x=280, y=320, font=35,disp=VKAdisp(5),code=VKAcode(5)}, + WIDGET.newSwitch{name="b6", x=280, y=380, font=35,disp=VKAdisp(6),code=VKAcode(6)}, + WIDGET.newSwitch{name="b7", x=280, y=440, font=35,disp=VKAdisp(7),code=VKAcode(7)}, + WIDGET.newSwitch{name="b8", x=280, y=500, font=35,disp=VKAdisp(8),code=VKAcode(8)}, + WIDGET.newSwitch{name="b9", x=280, y=560, font=35,disp=VKAdisp(9),code=VKAcode(9)}, + WIDGET.newSwitch{name="b10", x=280, y=620, font=35,disp=VKAdisp(10),code=VKAcode(10)}, + WIDGET.newSwitch{name="b11", x=580, y=80, font=35,disp=VKAdisp(11),code=VKAcode(11)}, + WIDGET.newSwitch{name="b12", x=580, y=140, font=35,disp=VKAdisp(12),code=VKAcode(12)}, + WIDGET.newSwitch{name="b13", x=580, y=200, font=35,disp=VKAdisp(13),code=VKAcode(13)}, + WIDGET.newSwitch{name="b14", x=580, y=260, font=35,disp=VKAdisp(14),code=VKAcode(14)}, + WIDGET.newSwitch{name="b15", x=580, y=320, font=35,disp=VKAdisp(15),code=VKAcode(15)}, + WIDGET.newSwitch{name="b16", x=580, y=380, font=35,disp=VKAdisp(16),code=VKAcode(16)}, + WIDGET.newSwitch{name="b17", x=580, y=440, font=35,disp=VKAdisp(17),code=VKAcode(17)}, + WIDGET.newSwitch{name="b18", x=580, y=500, font=35,disp=VKAdisp(18),code=VKAcode(18)}, + WIDGET.newSwitch{name="b19", x=580, y=560, font=35,disp=VKAdisp(19),code=VKAcode(19)}, + 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.newButton{name="tkset", x=1120, y=420, w=240,h=80, code=function() SCN.go("setting_trackSetting") end, 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}), + 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}, }) \ No newline at end of file diff --git a/parts/scenes/setting_trackSetting.lua b/parts/scenes/setting_trackSetting.lua index 48d0b8f3..ba869836 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 c7ea6008..e25a127b 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -6,53 +6,53 @@ function sceneBack.setting_video() end WIDGET.init("setting_video",{ - WIDGET.newText({name="title", x=640,y=15,font=80}), + 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="frame", x=350, y=650,w=373,unit=10, + 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 end, code=function(i) SETTING.frameMul=i<5 and 5*i+20 or 10*i - end}), + 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"), + end}, + 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"), + end}, + 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}), + 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/sound.lua b/parts/scenes/sound.lua index 12679816..66261000 100644 --- a/parts/scenes/sound.lua +++ b/parts/scenes/sound.lua @@ -40,71 +40,71 @@ function keyDown.sound(key) 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.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.newKey({name="move", x=110, y=140,w=160,h=50,font=20,code=function()SFX.play("move")end}), - WIDGET.newKey({name="lock", x=110, y=205,w=160,h=50,font=20,code=function()SFX.play("lock")end}), - WIDGET.newKey({name="drop", x=110, y=270,w=160,h=50,font=20,code=function()SFX.play("drop")end}), - WIDGET.newKey({name="fall", x=110, y=335,w=160,h=50,font=20,code=function()SFX.play("fall")end}), - WIDGET.newKey({name="rotate", x=110, y=400,w=160,h=50,font=20,code=function()SFX.play("rotate")end}), - WIDGET.newKey({name="rotatekick",x=110, y=465,w=160,h=50,font=20,code=function()SFX.play("rotatekick")end}), - WIDGET.newKey({name="hold", x=110, y=530,w=160,h=50,font=20,code=function()SFX.play("hold")end}), - WIDGET.newKey({name="prerotate",x=110, y=595,w=160,h=50,font=20,code=function()SFX.play("prerotate")end}), - WIDGET.newKey({name="prehold", x=110, y=660,w=160,h=50,font=20,code=function()SFX.play("prehold")end}), + WIDGET.newKey{name="move", x=110, y=140,w=160,h=50,font=20,code=function()SFX.play("move")end}, + WIDGET.newKey{name="lock", x=110, y=205,w=160,h=50,font=20,code=function()SFX.play("lock")end}, + WIDGET.newKey{name="drop", x=110, y=270,w=160,h=50,font=20,code=function()SFX.play("drop")end}, + WIDGET.newKey{name="fall", x=110, y=335,w=160,h=50,font=20,code=function()SFX.play("fall")end}, + WIDGET.newKey{name="rotate", x=110, y=400,w=160,h=50,font=20,code=function()SFX.play("rotate")end}, + WIDGET.newKey{name="rotatekick",x=110, y=465,w=160,h=50,font=20,code=function()SFX.play("rotatekick")end}, + WIDGET.newKey{name="hold", x=110, y=530,w=160,h=50,font=20,code=function()SFX.play("hold")end}, + WIDGET.newKey{name="prerotate",x=110, y=595,w=160,h=50,font=20,code=function()SFX.play("prerotate")end}, + WIDGET.newKey{name="prehold", x=110, y=660,w=160,h=50,font=20,code=function()SFX.play("prehold")end}, - WIDGET.newKey({name="clear1", x=280, y=140,w=160,h=50,font=20,code=function()SFX.play("clear_1")end}), - WIDGET.newKey({name="clear2", x=280, y=205,w=160,h=50,font=20,code=function()SFX.play("clear_2")end}), - WIDGET.newKey({name="clear3", x=280, y=270,w=160,h=50,font=20,code=function()SFX.play("clear_3")end}), - WIDGET.newKey({name="clear4", x=280, y=335,w=160,h=50,font=20,code=function()SFX.play("clear_4")end}), - WIDGET.newKey({name="spin0", x=280, y=400,w=160,h=50,font=20,code=function()SFX.play("spin_0")end}), - WIDGET.newKey({name="spin1", x=280, y=465,w=160,h=50,font=20,code=function()SFX.play("spin_1")end}), - WIDGET.newKey({name="spin2", x=280, y=530,w=160,h=50,font=20,code=function()SFX.play("spin_2")end}), - WIDGET.newKey({name="spin3", x=280, y=595,w=160,h=50,font=20,code=function()SFX.play("spin_3")end}), - WIDGET.newKey({name="_pc", x=280, y=660,w=160,h=50,font=20,code=function()SFX.play("clear")end}), + WIDGET.newKey{name="clear1", x=280, y=140,w=160,h=50,font=20,code=function()SFX.play("clear_1")end}, + WIDGET.newKey{name="clear2", x=280, y=205,w=160,h=50,font=20,code=function()SFX.play("clear_2")end}, + WIDGET.newKey{name="clear3", x=280, y=270,w=160,h=50,font=20,code=function()SFX.play("clear_3")end}, + WIDGET.newKey{name="clear4", x=280, y=335,w=160,h=50,font=20,code=function()SFX.play("clear_4")end}, + WIDGET.newKey{name="spin0", x=280, y=400,w=160,h=50,font=20,code=function()SFX.play("spin_0")end}, + WIDGET.newKey{name="spin1", x=280, y=465,w=160,h=50,font=20,code=function()SFX.play("spin_1")end}, + WIDGET.newKey{name="spin2", x=280, y=530,w=160,h=50,font=20,code=function()SFX.play("spin_2")end}, + WIDGET.newKey{name="spin3", x=280, y=595,w=160,h=50,font=20,code=function()SFX.play("spin_3")end}, + WIDGET.newKey{name="_pc", x=280, y=660,w=160,h=50,font=20,code=function()SFX.play("clear")end}, - WIDGET.newKey({name="_1", x=970, y=75,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(1)}), - WIDGET.newKey({name="_2", x=1130, y=75,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(2)}), - WIDGET.newKey({name="_3", x=970, y=140,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(3)}), - WIDGET.newKey({name="_4", x=1130, y=140,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(4)}), + WIDGET.newKey{name="_1", x=970, y=75,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(1)}, + WIDGET.newKey{name="_2", x=1130, y=75,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(2)}, + WIDGET.newKey{name="_3", x=970, y=140,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(3)}, + WIDGET.newKey{name="_4", x=1130, y=140,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(4)}, - WIDGET.newKey({name="z0", x=650, y=205,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(10)}), - WIDGET.newKey({name="z1", x=650, y=270,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(11)}), - WIDGET.newKey({name="z2", x=650, y=335,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(12)}), - WIDGET.newKey({name="z3", x=650, y=400,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(13)}), - WIDGET.newKey({name="t0", x=650, y=465,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(50)}), - WIDGET.newKey({name="t1", x=650, y=530,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(51)}), - WIDGET.newKey({name="t2", x=650, y=595,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(52)}), - WIDGET.newKey({name="t3", x=650, y=660,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(53)}), + WIDGET.newKey{name="z0", x=650, y=205,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(10)}, + WIDGET.newKey{name="z1", x=650, y=270,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(11)}, + WIDGET.newKey{name="z2", x=650, y=335,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(12)}, + WIDGET.newKey{name="z3", x=650, y=400,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(13)}, + WIDGET.newKey{name="t0", x=650, y=465,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(50)}, + WIDGET.newKey{name="t1", x=650, y=530,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(51)}, + WIDGET.newKey{name="t2", x=650, y=595,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(52)}, + WIDGET.newKey{name="t3", x=650, y=660,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(53)}, - WIDGET.newKey({name="s0", x=810, y=205,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(20)}), - WIDGET.newKey({name="s1", x=810, y=270,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(21)}), - WIDGET.newKey({name="s2", x=810, y=335,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(22)}), - WIDGET.newKey({name="s3", x=810, y=400,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(23)}), - WIDGET.newKey({name="o0", x=810, y=465,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(60)}), - WIDGET.newKey({name="o1", x=810, y=530,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(61)}), - WIDGET.newKey({name="o2", x=810, y=595,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(62)}), - WIDGET.newKey({name="o3", x=810, y=660,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(63)}), + WIDGET.newKey{name="s0", x=810, y=205,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(20)}, + WIDGET.newKey{name="s1", x=810, y=270,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(21)}, + WIDGET.newKey{name="s2", x=810, y=335,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(22)}, + WIDGET.newKey{name="s3", x=810, y=400,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(23)}, + WIDGET.newKey{name="o0", x=810, y=465,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(60)}, + WIDGET.newKey{name="o1", x=810, y=530,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(61)}, + WIDGET.newKey{name="o2", x=810, y=595,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(62)}, + WIDGET.newKey{name="o3", x=810, y=660,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(63)}, - WIDGET.newKey({name="j0", x=970, y=205,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(30)}), - WIDGET.newKey({name="j1", x=970, y=270,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(31)}), - WIDGET.newKey({name="j2", x=970, y=335,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(32)}), - WIDGET.newKey({name="j3", x=970, y=400,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(33)}), - WIDGET.newKey({name="i0", x=970, y=465,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(70)}), - WIDGET.newKey({name="i1", x=970, y=530,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(71)}), - WIDGET.newKey({name="i2", x=970, y=595,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(72)}), - WIDGET.newKey({name="i3", x=970, y=660,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(73)}), + WIDGET.newKey{name="j0", x=970, y=205,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(30)}, + WIDGET.newKey{name="j1", x=970, y=270,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(31)}, + WIDGET.newKey{name="j2", x=970, y=335,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(32)}, + WIDGET.newKey{name="j3", x=970, y=400,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(33)}, + WIDGET.newKey{name="i0", x=970, y=465,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(70)}, + WIDGET.newKey{name="i1", x=970, y=530,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(71)}, + WIDGET.newKey{name="i2", x=970, y=595,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(72)}, + WIDGET.newKey{name="i3", x=970, y=660,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(73)}, - WIDGET.newKey({name="l0", x=1130, y=205,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(40)}), - WIDGET.newKey({name="l1", x=1130, y=270,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(41)}), - WIDGET.newKey({name="l2", x=1130, y=335,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(42)}), - WIDGET.newKey({name="l3", x=1130, y=400,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(43)}), + WIDGET.newKey{name="l0", x=1130, y=205,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(40)}, + WIDGET.newKey{name="l1", x=1130, y=270,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(41)}, + WIDGET.newKey{name="l2", x=1130, y=335,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(42)}, + WIDGET.newKey{name="l3", x=1130, y=400,w=140,h=50,font=20,code=WIDGET.lnk_pressKey(43)}, - WIDGET.newSwitch({name="mini", x=515, y=465,font=25,disp=WIDGET.lnk_STPval("mini"),code=WIDGET.lnk_pressKey("1")}), - WIDGET.newSwitch({name="b2b", x=515, y=530,font=25,disp=WIDGET.lnk_STPval("b2b"),code=WIDGET.lnk_pressKey("2")}), - WIDGET.newSwitch({name="b3b", x=515, y=595,font=25,disp=WIDGET.lnk_STPval("b3b"),code=WIDGET.lnk_pressKey("3")}), - WIDGET.newSwitch({name="pc", x=515, y=660,font=25,disp=WIDGET.lnk_STPval("pc"),code=WIDGET.lnk_pressKey("4")}), + WIDGET.newSwitch{name="mini", x=515, y=465,font=25,disp=WIDGET.lnk_STPval("mini"),code=WIDGET.lnk_pressKey("1")}, + WIDGET.newSwitch{name="b2b", x=515, y=530,font=25,disp=WIDGET.lnk_STPval("b2b"),code=WIDGET.lnk_pressKey("2")}, + WIDGET.newSwitch{name="b3b", x=515, y=595,font=25,disp=WIDGET.lnk_STPval("b3b"),code=WIDGET.lnk_pressKey("3")}, + WIDGET.newSwitch{name="pc", x=515, y=660,font=25,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 61a93b44..066ab116 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 e80e0959..4f7f4ee3 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -96,7 +96,7 @@ function Pnt.stat() 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="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}, }) \ No newline at end of file