From 5a568df6cd8cb20964225dfdf04686af48ad762c Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 27 Oct 2021 01:03:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=90=8D=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E6=94=B9=E7=94=A8=E5=8D=95=E5=BC=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/about.lua | 14 ++--- parts/scenes/account.lua | 4 +- parts/scenes/app_15p.lua | 14 ++--- parts/scenes/app_2048.lua | 26 ++++----- parts/scenes/app_AtoZ.lua | 8 +-- parts/scenes/app_UTTT.lua | 4 +- parts/scenes/app_arithmetic.lua | 26 ++++----- parts/scenes/app_calc.lua | 38 ++++++------ parts/scenes/app_cannon.lua | 2 +- parts/scenes/app_console.lua | 6 +- parts/scenes/app_cubefield.lua | 2 +- parts/scenes/app_dropper.lua | 2 +- parts/scenes/app_dtw.lua | 12 ++-- parts/scenes/app_link.lua | 6 +- parts/scenes/app_polyforge.lua | 2 +- parts/scenes/app_pong.lua | 4 +- parts/scenes/app_reflect.lua | 2 +- parts/scenes/app_schulteG.lua | 12 ++-- parts/scenes/app_tap.lua | 4 +- parts/scenes/app_ten.lua | 10 ++-- parts/scenes/customGame.lua | 80 +++++++++++++------------- parts/scenes/custom_field.lua | 80 +++++++++++++------------- parts/scenes/custom_mission.lua | 86 ++++++++++++++-------------- parts/scenes/custom_sequence.lua | 82 +++++++++++++------------- parts/scenes/depause.lua | 2 +- parts/scenes/dict.lua | 20 +++---- parts/scenes/error.lua | 4 +- parts/scenes/game.lua | 18 +++--- parts/scenes/history.lua | 4 +- parts/scenes/lang.lua | 2 +- parts/scenes/launchpad.lua | 14 ++--- parts/scenes/legals.lua | 4 +- parts/scenes/login.lua | 14 ++--- parts/scenes/main.lua | 24 ++++---- parts/scenes/main_simple.lua | 16 +++--- parts/scenes/manual.lua | 4 +- parts/scenes/mod.lua | 8 +-- parts/scenes/mode.lua | 6 +- parts/scenes/music.lua | 20 +++---- parts/scenes/net_game.lua | 16 +++--- parts/scenes/net_league.lua | 6 +- parts/scenes/net_menu.lua | 12 ++-- parts/scenes/net_newRoom.lua | 60 +++++++++---------- parts/scenes/net_rooms.lua | 18 +++--- parts/scenes/pause.lua | 18 +++--- parts/scenes/register.lua | 18 +++--- parts/scenes/replays.lua | 12 ++-- parts/scenes/savedata.lua | 30 +++++----- parts/scenes/setting_control.lua | 26 ++++----- parts/scenes/setting_game.lua | 32 +++++------ parts/scenes/setting_key.lua | 44 +++++++------- parts/scenes/setting_skin.lua | 52 ++++++++--------- parts/scenes/setting_sound.lua | 36 ++++++------ parts/scenes/setting_touch.lua | 20 +++---- parts/scenes/setting_touchSwitch.lua | 64 ++++++++++----------- parts/scenes/setting_video.lua | 72 +++++++++++------------ parts/scenes/staff.lua | 2 +- parts/scenes/stat.lua | 6 +- 58 files changed, 615 insertions(+), 615 deletions(-) diff --git a/parts/scenes/about.lua b/parts/scenes/about.lua index a198c878..63543009 100644 --- a/parts/scenes/about.lua +++ b/parts/scenes/about.lua @@ -58,13 +58,13 @@ function scene.draw() end scene.widgetList={ - WIDGET.newImage{name="pay1", x=20, y=20,hide=SYSTEM=='iOS'}, - WIDGET.newImage{name="pay2", x=1014,y=20,hide=SYSTEM=='iOS'}, - WIDGET.newButton{name="staff", x=1140,y=380,w=220,h=80,font=35,code=goScene'staff'}, - WIDGET.newButton{name="his", x=1140,y=470,w=220,h=80,font=35,code=goScene'history'}, - WIDGET.newButton{name="legals", x=1140,y=560,w=220,h=80,font=35,code=goScene'legals'}, - WIDGET.newButton{name="qq", x=1140,y=650,w=220,h=80,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=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newImage{name='pay1', x=20, y=20,hide=SYSTEM=='iOS'}, + WIDGET.newImage{name='pay2', x=1014,y=20,hide=SYSTEM=='iOS'}, + WIDGET.newButton{name='staff', x=1140,y=380,w=220,h=80,font=35,code=goScene'staff'}, + WIDGET.newButton{name='his', x=1140,y=470,w=220,h=80,font=35,code=goScene'history'}, + WIDGET.newButton{name='legals', x=1140,y=560,w=220,h=80,font=35,code=goScene'legals'}, + WIDGET.newButton{name='qq', x=1140,y=650,w=220,h=80,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=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/account.lua b/parts/scenes/account.lua index 4e102cd1..17908c5b 100644 --- a/parts/scenes/account.lua +++ b/parts/scenes/account.lua @@ -7,8 +7,8 @@ function scene.sceneInit() end scene.widgetList={ - 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=60,fText=CHAR.icon.back,code=backScene}, + 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=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index a8851da5..6af7ebe1 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -13,7 +13,7 @@ local color,invis='color1' local slide,pathVis,revKB local function ifGaming()return state==1 end -local colorSelector=WIDGET.newSelector{name="color",x=150,y=240,w=200,list={'color1','rainbow','color2','gray','black'},color='lY',disp=function()return color end,code=function(v)if state~=1 then color=v end end,hideF=ifGaming} +local colorSelector=WIDGET.newSelector{name='color',x=150,y=240,w=200,list={'color1','rainbow','color2','gray','black'},color='lY',disp=function()return color end,code=function(v)if state~=1 then color=v end end,hideF=ifGaming} function scene.sceneInit() BG.set('rainbow2') @@ -309,13 +309,13 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset", x=160, y=100,w=180,h=100,color='lG',font=40,code=pressKey"space"}, + WIDGET.newButton{name='reset', x=160, y=100,w=180,h=100,color='lG',font=40,code=pressKey"space"}, colorSelector, - WIDGET.newSwitch{name="invis", x=240, y=330,lim=200,font=40,disp=function()return invis end, code=pressKey"w",hideF=ifGaming}, - WIDGET.newSwitch{name="slide", x=240, y=420,lim=200,font=40,disp=function()return slide end, code=pressKey"e",hideF=ifGaming}, - WIDGET.newSwitch{name="pathVis",x=240, y=510,lim=200,font=40,disp=function()return pathVis end,code=pressKey"r",hideF=function()return state==1 or not slide end}, - WIDGET.newSwitch{name="revKB", x=240, y=600,lim=200,font=40,disp=function()return revKB end, code=pressKey"t",hideF=ifGaming}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newSwitch{name='invis', x=240, y=330,lim=200,font=40,disp=function()return invis end, code=pressKey"w",hideF=ifGaming}, + WIDGET.newSwitch{name='slide', x=240, y=420,lim=200,font=40,disp=function()return slide end, code=pressKey"e",hideF=ifGaming}, + WIDGET.newSwitch{name='pathVis',x=240, y=510,lim=200,font=40,disp=function()return pathVis end,code=pressKey"r",hideF=function()return state==1 or not slide end}, + WIDGET.newSwitch{name='revKB', x=240, y=600,lim=200,font=40,disp=function()return revKB end, code=pressKey"t",hideF=ifGaming}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index 4cec8e02..d032bb2a 100644 --- a/parts/scenes/app_2048.lua +++ b/parts/scenes/app_2048.lua @@ -480,20 +480,20 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset", x=155, y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, - WIDGET.newSwitch{name="invis", x=240, y=300,lim=200,font=40,disp=function()return invis end,code=pressKey"q",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="tapControl",x=240, y=370,lim=200,font=40,disp=function()return tapControl end,code=pressKey"w",hideF=function()return state==1 end}, + WIDGET.newButton{name='reset', x=155, y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, + WIDGET.newSwitch{name='invis', x=240, y=300,lim=200,font=40,disp=function()return invis end,code=pressKey"q",hideF=function()return state==1 end}, + WIDGET.newSwitch{name='tapControl',x=240, y=370,lim=200,font=40,disp=function()return tapControl end,code=pressKey"w",hideF=function()return state==1 end}, - WIDGET.newKey{name="up", x=155, y=460,w=100,fText="↑",font=50, color='Y',code=pressKey"up", hideF=function()return tapControl end}, - WIDGET.newKey{name="down", x=155, y=660,w=100,fText="↓",font=50, color='Y',code=pressKey"down", hideF=function()return tapControl end}, - WIDGET.newKey{name="left", x=55, y=560,w=100,fText="←",font=50, color='Y',code=pressKey"left", hideF=function()return tapControl end}, - WIDGET.newKey{name="right", x=255, y=560,w=100,fText="→",font=50,color='Y',code=pressKey"right", hideF=function()return tapControl end}, - WIDGET.newKey{name="skip", x=155, y=400,w=100,font=20, color='Y',code=pressKey"space", hideF=function()return state~=1 or not skipper.cd or skipper.cd>0 end}, - WIDGET.newKey{name="record1", x=1100,y=390,w=220,h=50,fText="", color='H',code=pressKey"1", hideF=function()return state==2 end}, - WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="", color='H',code=pressKey"2", hideF=function()return state==2 end}, - WIDGET.newKey{name="replay1", x=1245,y=390,w=50,fText="!", color='G',code=pressKey"c1", hideF=function()return state==2 or #repeater.seq[1]==0 end}, - WIDGET.newKey{name="replay2", x=1245,y=450,w=50,fText="!", color='G',code=pressKey"c2", hideF=function()return state==2 or #repeater.seq[2]==0 end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='up', x=155, y=460,w=100,fText="↑",font=50, color='Y',code=pressKey"up", hideF=function()return tapControl end}, + WIDGET.newKey{name='down', x=155, y=660,w=100,fText="↓",font=50, color='Y',code=pressKey"down", hideF=function()return tapControl end}, + WIDGET.newKey{name='left', x=55, y=560,w=100,fText="←",font=50, color='Y',code=pressKey"left", hideF=function()return tapControl end}, + WIDGET.newKey{name='right', x=255, y=560,w=100,fText="→",font=50,color='Y',code=pressKey"right", hideF=function()return tapControl end}, + WIDGET.newKey{name='skip', x=155, y=400,w=100,font=20, color='Y',code=pressKey"space", hideF=function()return state~=1 or not skipper.cd or skipper.cd>0 end}, + WIDGET.newKey{name='record1', x=1100,y=390,w=220,h=50,fText="", color='H',code=pressKey"1", hideF=function()return state==2 end}, + WIDGET.newKey{name='record2', x=1100,y=450,w=220,h=50,fText="", color='H',code=pressKey"2", hideF=function()return state==2 end}, + WIDGET.newKey{name='replay1', x=1245,y=390,w=50,fText="!", color='G',code=pressKey"c1", hideF=function()return state==2 or #repeater.seq[1]==0 end}, + WIDGET.newKey{name='replay2', x=1245,y=450,w=50,fText="!", color='G',code=pressKey"c2", hideF=function()return state==2 or #repeater.seq[2]==0 end}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_AtoZ.lua b/parts/scenes/app_AtoZ.lua index 6ce47c27..26c8295e 100644 --- a/parts/scenes/app_AtoZ.lua +++ b/parts/scenes/app_AtoZ.lua @@ -116,10 +116,10 @@ function scene.draw() end scene.widgetList={ - WIDGET.newSelector{name="level", x=640,y=640,w=200,list={'A_Z','Z_A','Tech1','Tech2','KeyTest1','KeyTest2','Hello','Roll1','Roll2','Roll3','ZZZ','ZXZX','ZMZM','Stair','Stair2','Stair3','BPW'},disp=function()return levelName end,code=function(i)levelName=i;targetString=levels[i]end,hideF=function()return state>0 end}, - WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color='lG',font=40,code=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=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newSelector{name='level', x=640,y=640,w=200,list={'A_Z','Z_A','Tech1','Tech2','KeyTest1','KeyTest2','Hello','Roll1','Roll2','Roll3','ZZZ','ZXZX','ZMZM','Stair','Stair2','Stair3','BPW'},disp=function()return levelName end,code=function(i)levelName=i;targetString=levels[i]end,hideF=function()return state>0 end}, + WIDGET.newButton{name='reset', x=160,y=100,w=180,h=100,color='lG',font=40,code=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=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_UTTT.lua b/parts/scenes/app_UTTT.lua index 04f73c21..684440f0 100644 --- a/parts/scenes/app_UTTT.lua +++ b/parts/scenes/app_UTTT.lua @@ -231,8 +231,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset",x=1140,y=540,w=170,h=80,font=40,color='lG',code=restart}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='reset',x=1140,y=540,w=170,h=80,font=40,color='lG',code=restart}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_arithmetic.lua b/parts/scenes/app_arithmetic.lua index 2913c68c..e92847d4 100644 --- a/parts/scenes/app_arithmetic.lua +++ b/parts/scenes/app_arithmetic.lua @@ -203,19 +203,19 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="X",x=540,y=620,w=90,font=60,fText="X",code=pressKey"backspace"}, - WIDGET.newKey{name="0",x=640,y=620,w=90,font=60,fText="0",code=pressKey"0"}, - WIDGET.newKey{name="-",x=740,y=620,w=90,font=60,fText="-",code=pressKey"-"}, - WIDGET.newKey{name="1",x=540,y=520,w=90,font=60,fText="1",code=pressKey"1"}, - WIDGET.newKey{name="2",x=640,y=520,w=90,font=60,fText="2",code=pressKey"2"}, - WIDGET.newKey{name="3",x=740,y=520,w=90,font=60,fText="3",code=pressKey"3"}, - WIDGET.newKey{name="4",x=540,y=420,w=90,font=60,fText="4",code=pressKey"4"}, - WIDGET.newKey{name="5",x=640,y=420,w=90,font=60,fText="5",code=pressKey"5"}, - WIDGET.newKey{name="6",x=740,y=420,w=90,font=60,fText="6",code=pressKey"6"}, - WIDGET.newKey{name="7",x=540,y=320,w=90,font=60,fText="7",code=pressKey"7"}, - WIDGET.newKey{name="8",x=640,y=320,w=90,font=60,fText="8",code=pressKey"8"}, - WIDGET.newKey{name="9",x=740,y=320,w=90,font=60,fText="9",code=pressKey"9"}, - WIDGET.newButton{name="back",x=1200,y=660,w=110,h=60,font=60,fText=CHAR.icon.back,code=pressKey"escape"}, + WIDGET.newKey{name='X',x=540,y=620,w=90,font=60,fText="X",code=pressKey"backspace"}, + WIDGET.newKey{name='0',x=640,y=620,w=90,font=60,fText="0",code=pressKey"0"}, + WIDGET.newKey{name='-',x=740,y=620,w=90,font=60,fText="-",code=pressKey"-"}, + WIDGET.newKey{name='1',x=540,y=520,w=90,font=60,fText="1",code=pressKey"1"}, + WIDGET.newKey{name='2',x=640,y=520,w=90,font=60,fText="2",code=pressKey"2"}, + WIDGET.newKey{name='3',x=740,y=520,w=90,font=60,fText="3",code=pressKey"3"}, + WIDGET.newKey{name='4',x=540,y=420,w=90,font=60,fText="4",code=pressKey"4"}, + WIDGET.newKey{name='5',x=640,y=420,w=90,font=60,fText="5",code=pressKey"5"}, + WIDGET.newKey{name='6',x=740,y=420,w=90,font=60,fText="6",code=pressKey"6"}, + WIDGET.newKey{name='7',x=540,y=320,w=90,font=60,fText="7",code=pressKey"7"}, + WIDGET.newKey{name='8',x=640,y=320,w=90,font=60,fText="8",code=pressKey"8"}, + WIDGET.newKey{name='9',x=740,y=320,w=90,font=60,fText="9",code=pressKey"9"}, + WIDGET.newButton{name='back',x=1200,y=660,w=110,h=60,font=60,fText=CHAR.icon.back,code=pressKey"escape"}, } return scene diff --git a/parts/scenes/app_calc.lua b/parts/scenes/app_calc.lua index 7f3e140b..ac40ec13 100644 --- a/parts/scenes/app_calc.lua +++ b/parts/scenes/app_calc.lua @@ -121,25 +121,25 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="_1",x=145,y=300,w=90,fText="1",font=50,code=pressKey"1"}, - WIDGET.newKey{name="_2",x=245,y=300,w=90,fText="2",font=50,code=pressKey"2"}, - WIDGET.newKey{name="_3",x=345,y=300,w=90,fText="3",font=50,code=pressKey"3"}, - WIDGET.newKey{name="_4",x=145,y=400,w=90,fText="4",font=50,code=pressKey"4"}, - WIDGET.newKey{name="_5",x=245,y=400,w=90,fText="5",font=50,code=pressKey"5"}, - WIDGET.newKey{name="_6",x=345,y=400,w=90,fText="6",font=50,code=pressKey"6"}, - WIDGET.newKey{name="_7",x=145,y=500,w=90,fText="7",font=50,code=pressKey"7"}, - WIDGET.newKey{name="_8",x=245,y=500,w=90,fText="8",font=50,code=pressKey"8"}, - WIDGET.newKey{name="_9",x=345,y=500,w=90,fText="9",font=50,code=pressKey"9"}, - WIDGET.newKey{name="_0",x=145,y=600,w=90,fText="0",font=50,code=pressKey"0"}, - WIDGET.newKey{name=".",x=245,y=600,w=90,fText=".",color='lM',font=50,code=pressKey"."}, - WIDGET.newKey{name="e",x=345,y=600,w=90,fText="e",color='lM',font=50,code=pressKey"e"}, - WIDGET.newKey{name="+",x=445,y=300,w=90,fText="+",color='lB',font=50,code=pressKey"+"}, - WIDGET.newKey{name="-",x=445,y=400,w=90,fText="-",color='lB',font=50,code=pressKey"-"}, - WIDGET.newKey{name="*",x=445,y=500,w=90,fText="*",color='lB',font=50,code=pressKey"*"}, - WIDGET.newKey{name="/",x=445,y=600,w=90,fText="/",color='lB',font=50,code=pressKey"/"}, - WIDGET.newKey{name="<",x=545,y=300,w=90,fText="<",color='lR',font=50,code=pressKey"backspace"}, - WIDGET.newKey{name="=",x=545,y=400,w=90,fText="=",color='lY',font=50,code=pressKey"return"}, - WIDGET.newKey{name="back",x=1135,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='_1',x=145,y=300,w=90,fText="1",font=50,code=pressKey"1"}, + WIDGET.newKey{name='_2',x=245,y=300,w=90,fText="2",font=50,code=pressKey"2"}, + WIDGET.newKey{name='_3',x=345,y=300,w=90,fText="3",font=50,code=pressKey"3"}, + WIDGET.newKey{name='_4',x=145,y=400,w=90,fText="4",font=50,code=pressKey"4"}, + WIDGET.newKey{name='_5',x=245,y=400,w=90,fText="5",font=50,code=pressKey"5"}, + WIDGET.newKey{name='_6',x=345,y=400,w=90,fText="6",font=50,code=pressKey"6"}, + WIDGET.newKey{name='_7',x=145,y=500,w=90,fText="7",font=50,code=pressKey"7"}, + WIDGET.newKey{name='_8',x=245,y=500,w=90,fText="8",font=50,code=pressKey"8"}, + WIDGET.newKey{name='_9',x=345,y=500,w=90,fText="9",font=50,code=pressKey"9"}, + WIDGET.newKey{name='_0',x=145,y=600,w=90,fText="0",font=50,code=pressKey"0"}, + WIDGET.newKey{name='.',x=245,y=600,w=90,fText=".",color='lM',font=50,code=pressKey"."}, + WIDGET.newKey{name='e',x=345,y=600,w=90,fText="e",color='lM',font=50,code=pressKey"e"}, + WIDGET.newKey{name='+',x=445,y=300,w=90,fText="+",color='lB',font=50,code=pressKey"+"}, + WIDGET.newKey{name='-',x=445,y=400,w=90,fText="-",color='lB',font=50,code=pressKey"-"}, + WIDGET.newKey{name='*',x=445,y=500,w=90,fText="*",color='lB',font=50,code=pressKey"*"}, + WIDGET.newKey{name='/',x=445,y=600,w=90,fText="/",color='lB',font=50,code=pressKey"/"}, + WIDGET.newKey{name='<',x=545,y=300,w=90,fText="<",color='lR',font=50,code=pressKey"backspace"}, + WIDGET.newKey{name='=',x=545,y=400,w=90,fText="=",color='lY',font=50,code=pressKey"return"}, + WIDGET.newKey{name='back',x=1135,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_cannon.lua b/parts/scenes/app_cannon.lua index 0fd37aa6..f3b6769d 100644 --- a/parts/scenes/app_cannon.lua +++ b/parts/scenes/app_cannon.lua @@ -125,7 +125,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_console.lua b/parts/scenes/app_console.lua index 9803fbc8..d2043c8c 100644 --- a/parts/scenes/app_console.lua +++ b/parts/scenes/app_console.lua @@ -3,8 +3,8 @@ local kb=love.keyboard local ins,rem=table.insert,table.remove local C=COLOR -local inputBox=WIDGET.newInputBox{name="input",x=40,y=650,w=1200,h=50} -local outputBox=WIDGET.newTextBox{name="output",x=40,y=30,w=1200,h=610,font=25,lineH=25,fix=true} +local inputBox=WIDGET.newInputBox{name='input',x=40,y=650,w=1200,h=50} +local outputBox=WIDGET.newTextBox{name='output',x=40,y=30,w=1200,h=610,font=25,lineH=25,fix=true} local function log(str)outputBox:push(str)end log{C.lP,"Techmino Console"} @@ -653,7 +653,7 @@ local commands={}do commands.cls.code() outputBox:clear() outputBox.h=500 - local button=WIDGET.newButton{name="bye",x=640,y=615,w=426,h=100,code=function() + local button=WIDGET.newButton{name='bye',x=640,y=615,w=426,h=100,code=function() TASK.new(function() WIDGET.active.bye.hide=true for _=1,30 do coroutine.yield()end diff --git a/parts/scenes/app_cubefield.lua b/parts/scenes/app_cubefield.lua index 6bc27156..541013e5 100644 --- a/parts/scenes/app_cubefield.lua +++ b/parts/scenes/app_cubefield.lua @@ -316,7 +316,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="back",x=1140,y=80,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=1140,y=80,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_dropper.lua b/parts/scenes/app_dropper.lua index 833134b4..19b784c3 100644 --- a/parts/scenes/app_dropper.lua +++ b/parts/scenes/app_dropper.lua @@ -234,7 +234,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="back",x=1140,y=60,w=170,h=80,font=60,fText=CHAR.icon.back,code=pressKey"escape"}, + WIDGET.newButton{name='back',x=1140,y=60,w=170,h=80,font=60,fText=CHAR.icon.back,code=pressKey"escape"}, } return scene diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index 9bde45a2..79eca89f 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -25,7 +25,7 @@ local reset=error--function, defined later local bgm="secret7th" local tileColor="black" local mode="Normal" -local modeSelector=WIDGET.newSelector{name="mode",x=150,y=220,w=290, +local modeSelector=WIDGET.newSelector{name='mode',x=150,y=220,w=290, list={ "Normal", "Split", @@ -41,12 +41,12 @@ local modeSelector=WIDGET.newSelector{name="mode",x=150,y=220,w=290, "Quadstream", },disp=function()return mode end,code=function(m)mode=m reset()end } -local bgmSelector=WIDGET.newSelector{name="bgm",x=150,y=290,w=290,list=BGM.getList(),disp=function()return bgm end,code=function(i)bgm=i BGM.play(i)end} -local colorSelector=WIDGET.newSelector{name="color",x=150,y=360,w=290, +local bgmSelector=WIDGET.newSelector{name='bgm',x=150,y=290,w=290,list=BGM.getList(),disp=function()return bgm end,code=function(i)bgm=i BGM.play(i)end} +local colorSelector=WIDGET.newSelector{name='color',x=150,y=360,w=290, list={"black","dGray","gray","lGray","dRed","red","lRed","dFire","fire","lFire","dOrange","orange","lOrange","dYellow","yellow","lYellow","dLime","lime","lLime","dJade","jade","lJade","dGreen","green","lGreen","dAqua","aqua","lAqua","dCyan","cyan","lCyan","dNavy","navy","lNavy","dSea","sea","lSea","dBlue","blue","lBlue","dViolet","violet","lViolet","dPurple","purple","lPurple","dMagenta","magenta","lMagenta","dWine","wine","lWine"}, disp=function()return tileColor end,code=function(m)tileColor=m end } -local arcadeSwitch=WIDGET.newSwitch{name="arcade",x=240,y=430,lim=200,font=40,disp=function()return arcade end,code=pressKey"e"} +local arcadeSwitch=WIDGET.newSwitch{name='arcade',x=240,y=430,lim=200,font=40,disp=function()return arcade end,code=pressKey"e"} local function freshSelectors() local f=state~=0 modeSelector.hide=f @@ -380,10 +380,10 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset",x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, + WIDGET.newButton{name='reset',x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, modeSelector,bgmSelector,colorSelector, arcadeSwitch, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_link.lua b/parts/scenes/app_link.lua index 63bf428c..f1a7ff8d 100644 --- a/parts/scenes/app_link.lua +++ b/parts/scenes/app_link.lua @@ -400,9 +400,9 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset",x=80,y=60,w=110,h=60,color='lG',code=pressKey"r",hideF=function()return state==0 end}, - WIDGET.newSwitch{name="invis",x=100,y=140,lim=80,disp=function()return invis end,code=pressKey"q",hideF=function()return state==1 end}, - WIDGET.newButton{name="back",x=1200,y=660,w=110,font=50,fText=CHAR.icon.back,code=pressKey"escape"}, + WIDGET.newButton{name='reset',x=80,y=60,w=110,h=60,color='lG',code=pressKey"r",hideF=function()return state==0 end}, + WIDGET.newSwitch{name='invis',x=100,y=140,lim=80,disp=function()return invis end,code=pressKey"q",hideF=function()return state==1 end}, + WIDGET.newButton{name='back',x=1200,y=660,w=110,font=50,fText=CHAR.icon.back,code=pressKey"escape"}, } return scene diff --git a/parts/scenes/app_polyforge.lua b/parts/scenes/app_polyforge.lua index a0d56338..a20b1855 100644 --- a/parts/scenes/app_polyforge.lua +++ b/parts/scenes/app_polyforge.lua @@ -163,7 +163,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="back",x=1140,y=60,w=170,h=80,color='D',font=60,fText=CHAR.icon.back,code=pressKey"escape"}, + WIDGET.newKey{name='back',x=1140,y=60,w=170,h=80,color='D',font=60,fText=CHAR.icon.back,code=pressKey"escape"}, } return scene diff --git a/parts/scenes/app_pong.lua b/parts/scenes/app_pong.lua index bd3367ab..14d96696 100644 --- a/parts/scenes/app_pong.lua +++ b/parts/scenes/app_pong.lua @@ -176,8 +176,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="reset",x=640,y=45,w=150,h=50,font=35,code=pressKey"r"}, - WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,font=40,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='reset',x=640,y=45,w=150,h=50,font=35,code=pressKey"r"}, + WIDGET.newKey{name='back',x=640,y=675,w=150,h=50,font=40,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_reflect.lua b/parts/scenes/app_reflect.lua index afe18738..94ec2ba7 100644 --- a/parts/scenes/app_reflect.lua +++ b/parts/scenes/app_reflect.lua @@ -131,7 +131,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,font=40,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=640,y=675,w=150,h=50,font=40,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_schulteG.lua b/parts/scenes/app_schulteG.lua index 4bda41a3..2d484fa0 100644 --- a/parts/scenes/app_schulteG.lua +++ b/parts/scenes/app_schulteG.lua @@ -166,12 +166,12 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"space",hideF=function()return state==0 end}, - WIDGET.newSlider{name="rank", x=130,y=250,lim=105,w=150,unit=3,show=false,font=40,disp=function()return rank-3 end,code=function(v)rank=v+3 end,hideF=function()return state>0 end}, - WIDGET.newSwitch{name="invis", x=240,y=330,lim=200,font=40,disp=function()return invis end, code=pressKey"q",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="disappear",x=240,y=420,lim=200,font=40,disp=function()return disappear end,code=pressKey"w",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="tapFX", x=240,y=510,lim=200,font=40,disp=function()return tapFX end, code=pressKey"e",hideF=function()return state==1 end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='reset', x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"space",hideF=function()return state==0 end}, + WIDGET.newSlider{name='rank', x=130,y=250,lim=105,w=150,unit=3,show=false,font=40,disp=function()return rank-3 end,code=function(v)rank=v+3 end,hideF=function()return state>0 end}, + WIDGET.newSwitch{name='invis', x=240,y=330,lim=200,font=40,disp=function()return invis end, code=pressKey"q",hideF=function()return state==1 end}, + WIDGET.newSwitch{name='disappear',x=240,y=420,lim=200,font=40,disp=function()return disappear end,code=pressKey"w",hideF=function()return state==1 end}, + WIDGET.newSwitch{name='tapFX', x=240,y=510,lim=200,font=40,disp=function()return tapFX end, code=pressKey"e",hideF=function()return state==1 end}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_tap.lua b/parts/scenes/app_tap.lua index 89f5810c..96704e9e 100644 --- a/parts/scenes/app_tap.lua +++ b/parts/scenes/app_tap.lua @@ -71,8 +71,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="tap",x=640,y=540,w=626,h=260,fText="TAP",color='Z',font=100,code=function(i)love.keypressed('b'..i)end}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='tap',x=640,y=540,w=626,h=260,fText="TAP",color='Z',font=100,code=function(i)love.keypressed('b'..i)end}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index c1ea2de3..fdc34a3f 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -302,11 +302,11 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset",x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, - WIDGET.newSwitch{name="next", x=240,y=235,lim=200,font=40,disp=function()return nexts end,code=pressKey"q",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="invis",x=240,y=305,lim=200,font=40,disp=function()return invis end,code=pressKey"w",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="fast", x=240,y=375,lim=200,font=30,disp=function()return fast end,code=pressKey"e",hideF=function()return state==1 end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='reset',x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, + WIDGET.newSwitch{name='next', x=240,y=235,lim=200,font=40,disp=function()return nexts end,code=pressKey"q",hideF=function()return state==1 end}, + WIDGET.newSwitch{name='invis',x=240,y=305,lim=200,font=40,disp=function()return invis end,code=pressKey"w",hideF=function()return state==1 end}, + WIDGET.newSwitch{name='fast', x=240,y=375,lim=200,font=30,disp=function()return fast end,code=pressKey"e",hideF=function()return state==1 end}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index ad363ea4..6bebb387 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -182,64 +182,64 @@ end scene.widgetScrollHeight=400 scene.widgetList={ - WIDGET.newText{name="title", x=520,y=15,font=70,align='R'}, + WIDGET.newText{name='title', x=520,y=15,font=70,align='R'}, - WIDGET.newKey{name="reset", x=1110,y=90,w=230,h=90,color='R',code=pressKey"delete"}, - WIDGET.newKey{name="mod", x=1110,y=200,w=230,h=90,color='Z',code=pressKey"f1"}, + WIDGET.newKey{name='reset', x=1110,y=90,w=230,h=90,color='R',code=pressKey"delete"}, + WIDGET.newKey{name='mod', x=1110,y=200,w=230,h=90,color='Z',code=pressKey"f1"}, --Mission / Field / Sequence - WIDGET.newKey{name="mission", x=170,y=180,w=240,h=80,color='N',font=25,code=pressKey"m"}, - WIDGET.newKey{name="field", x=450,y=180,w=240,h=80,color='A',font=25,code=pressKey"f"}, - WIDGET.newKey{name="sequence", x=730,y=180,w=240,h=80,color='W',font=25,code=pressKey"s"}, + WIDGET.newKey{name='mission', x=170,y=180,w=240,h=80,color='N',font=25,code=pressKey"m"}, + WIDGET.newKey{name='field', x=450,y=180,w=240,h=80,color='A',font=25,code=pressKey"f"}, + WIDGET.newKey{name='sequence', x=730,y=180,w=240,h=80,color='W',font=25,code=pressKey"s"}, - WIDGET.newText{name="noMsn", x=50, y=220,align='L',color='H',hideF=function()return MISSION[1]end}, - WIDGET.newText{name="defSeq", x=610,y=220,align='L',color='H',hideF=function()return BAG[1]end}, + WIDGET.newText{name='noMsn', x=50, y=220,align='L',color='H',hideF=function()return MISSION[1]end}, + WIDGET.newText{name='defSeq', x=610,y=220,align='L',color='H',hideF=function()return BAG[1]end}, --Selectors - WIDGET.newSelector{name="opponent", x=170,y=330,w=260,color='R',list=sList.opponent, disp=CUSval('opponent'), code=CUSsto('opponent')}, - WIDGET.newSelector{name="life", x=170,y=410,w=260,color='R',list=sList.life, disp=CUSval('life'), code=CUSsto('life')}, - WIDGET.newSelector{name="pushSpeed", x=170,y=520,w=260,color='V',list=sList.pushSpeed, disp=CUSval('pushSpeed'), code=CUSsto('pushSpeed')}, - WIDGET.newSelector{name="garbageSpeed",x=170,y=600,w=260,color='V',list=sList.pushSpeed, disp=CUSval('garbageSpeed'),code=CUSsto('garbageSpeed')}, - WIDGET.newSelector{name="visible", x=170,y=710,w=260,color='lB',list=sList.visible, disp=CUSval('visible'), code=CUSsto('visible')}, - WIDGET.newSelector{name="freshLimit", x=170,y=790,w=260,color='lB',list=sList.freshLimit,disp=CUSval('freshLimit'), code=CUSsto('freshLimit')}, + WIDGET.newSelector{name='opponent', x=170,y=330,w=260,color='R',list=sList.opponent, disp=CUSval('opponent'), code=CUSsto('opponent')}, + WIDGET.newSelector{name='life', x=170,y=410,w=260,color='R',list=sList.life, disp=CUSval('life'), code=CUSsto('life')}, + WIDGET.newSelector{name='pushSpeed', x=170,y=520,w=260,color='V',list=sList.pushSpeed, disp=CUSval('pushSpeed'), code=CUSsto('pushSpeed')}, + WIDGET.newSelector{name='garbageSpeed',x=170,y=600,w=260,color='V',list=sList.pushSpeed, disp=CUSval('garbageSpeed'),code=CUSsto('garbageSpeed')}, + WIDGET.newSelector{name='visible', x=170,y=710,w=260,color='lB',list=sList.visible, disp=CUSval('visible'), code=CUSsto('visible')}, + WIDGET.newSelector{name='freshLimit', x=170,y=790,w=260,color='lB',list=sList.freshLimit,disp=CUSval('freshLimit'), code=CUSsto('freshLimit')}, - WIDGET.newSelector{name="fieldH", x=450,y=600,w=260,color='N',list=sList.fieldH, disp=CUSval('fieldH'), code=CUSsto('fieldH')}, - WIDGET.newSelector{name="heightLimit", x=450,y=710,w=260,color='S',list=sList.heightLimit,disp=CUSval('heightLimit'), code=CUSsto('heightLimit')}, - WIDGET.newSelector{name="bufferLimit", x=450,y=790,w=260,color='B',list=sList.bufferLimit,disp=CUSval('bufferLimit'), code=CUSsto('bufferLimit')}, + WIDGET.newSelector{name='fieldH', x=450,y=600,w=260,color='N',list=sList.fieldH, disp=CUSval('fieldH'), code=CUSsto('fieldH')}, + WIDGET.newSelector{name='heightLimit', x=450,y=710,w=260,color='S',list=sList.heightLimit,disp=CUSval('heightLimit'), code=CUSsto('heightLimit')}, + WIDGET.newSelector{name='bufferLimit', x=450,y=790,w=260,color='B',list=sList.bufferLimit,disp=CUSval('bufferLimit'), code=CUSsto('bufferLimit')}, - WIDGET.newSelector{name="drop", x=730,y=330,w=260,color='O',list=sList.drop,disp=CUSval('drop'),code=CUSsto('drop')}, - WIDGET.newSelector{name="lock", x=730,y=410,w=260,color='O',list=sList.lock,disp=CUSval('lock'),code=CUSsto('lock')}, - WIDGET.newSelector{name="wait", x=730,y=520,w=260,color='G',list=sList.wait,disp=CUSval('wait'),code=CUSsto('wait')}, - WIDGET.newSelector{name="fall", x=730,y=600,w=260,color='G',list=sList.fall,disp=CUSval('fall'),code=CUSsto('fall')}, + WIDGET.newSelector{name='drop', x=730,y=330,w=260,color='O',list=sList.drop,disp=CUSval('drop'),code=CUSsto('drop')}, + WIDGET.newSelector{name='lock', x=730,y=410,w=260,color='O',list=sList.lock,disp=CUSval('lock'),code=CUSsto('lock')}, + WIDGET.newSelector{name='wait', x=730,y=520,w=260,color='G',list=sList.wait,disp=CUSval('wait'),code=CUSsto('wait')}, + WIDGET.newSelector{name='fall', x=730,y=600,w=260,color='G',list=sList.fall,disp=CUSval('fall'),code=CUSsto('fall')}, --Copy / Paste / Start - WIDGET.newButton{name="copy", x=1070,y=300,w=310,h=70,color='lR',font=25,code=pressKey"cC"}, - WIDGET.newButton{name="paste", x=1070,y=380,w=310,h=70,color='lB',font=25,code=pressKey"cV"}, - WIDGET.newButton{name="clear", x=1070,y=460,w=310,h=70,color='lY',font=35,code=pressKey"return"}, - WIDGET.newButton{name="puzzle", x=1070,y=540,w=310,h=70,color='lM',font=35,code=pressKey"return2",hideF=function()return #FIELD[1]==0 end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=pressKey"escape"}, + WIDGET.newButton{name='copy', x=1070,y=300,w=310,h=70,color='lR',font=25,code=pressKey"cC"}, + WIDGET.newButton{name='paste', x=1070,y=380,w=310,h=70,color='lB',font=25,code=pressKey"cV"}, + WIDGET.newButton{name='clear', x=1070,y=460,w=310,h=70,color='lY',font=35,code=pressKey"return"}, + WIDGET.newButton{name='puzzle', x=1070,y=540,w=310,h=70,color='lM',font=35,code=pressKey"return2",hideF=function()return #FIELD[1]==0 end}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=pressKey"escape"}, --Rule set - WIDGET.newSelector{name="eventSet", x=930, y=740,w=360,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')}, + WIDGET.newSelector{name='eventSet', x=930, y=740,w=360,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')}, --Special rules - WIDGET.newSwitch{name="ospin", x=850, y=810,lim=210,disp=CUSval('ospin'), code=CUSrev('ospin')}, - WIDGET.newSwitch{name="fineKill", x=850, y=870,lim=210,disp=CUSval('fineKill'), code=CUSrev('fineKill')}, - WIDGET.newSwitch{name="b2bKill", x=850, y=930,lim=210,disp=CUSval('b2bKill'), code=CUSrev('b2bKill')}, - WIDGET.newSwitch{name="easyFresh", x=1170,y=810,lim=250,disp=CUSval('easyFresh'),code=CUSrev('easyFresh')}, - WIDGET.newSwitch{name="deepDrop", x=1170,y=870,lim=250,disp=CUSval('deepDrop'), code=CUSrev('deepDrop')}, - WIDGET.newSwitch{name="bone", x=1170,y=930,lim=250,disp=CUSval('bone'), code=CUSrev('bone')}, + WIDGET.newSwitch{name='ospin', x=850, y=810,lim=210,disp=CUSval('ospin'), code=CUSrev('ospin')}, + WIDGET.newSwitch{name='fineKill', x=850, y=870,lim=210,disp=CUSval('fineKill'), code=CUSrev('fineKill')}, + WIDGET.newSwitch{name='b2bKill', x=850, y=930,lim=210,disp=CUSval('b2bKill'), code=CUSrev('b2bKill')}, + WIDGET.newSwitch{name='easyFresh', x=1170,y=810,lim=250,disp=CUSval('easyFresh'),code=CUSrev('easyFresh')}, + WIDGET.newSwitch{name='deepDrop', x=1170,y=870,lim=250,disp=CUSval('deepDrop'), code=CUSrev('deepDrop')}, + WIDGET.newSwitch{name='bone', x=1170,y=930,lim=250,disp=CUSval('bone'), code=CUSrev('bone')}, --Next & Hold - WIDGET.newSelector{name="holdMode", x=310, y=890, w=300,color='lY',list=sList.holdMode,disp=CUSval('holdMode'),code=CUSsto('holdMode')}, - WIDGET.newSlider{name="nextCount", x=140, y=960, lim=130,w=180,unit=6,disp=CUSval('nextCount'),code=CUSsto('nextCount')}, - WIDGET.newSlider{name="holdCount", x=140, y=1030,lim=130,w=180,unit=6,disp=CUSval('holdCount'),code=CUSsto('holdCount')}, - WIDGET.newSwitch{name="infHold", x=560, y=960, lim=200, disp=CUSval('infHold'),code=CUSrev('infHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, - WIDGET.newSwitch{name="phyHold", x=560, y=1030,lim=200, disp=CUSval('phyHold'),code=CUSrev('phyHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSelector{name='holdMode', x=310, y=890, w=300,color='lY',list=sList.holdMode,disp=CUSval('holdMode'),code=CUSsto('holdMode')}, + WIDGET.newSlider{name='nextCount', x=140, y=960, lim=130,w=180,unit=6,disp=CUSval('nextCount'),code=CUSsto('nextCount')}, + WIDGET.newSlider{name='holdCount', x=140, y=1030,lim=130,w=180,unit=6,disp=CUSval('holdCount'),code=CUSsto('holdCount')}, + WIDGET.newSwitch{name='infHold', x=560, y=960, lim=200, disp=CUSval('infHold'),code=CUSrev('infHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSwitch{name='phyHold', x=560, y=1030,lim=200, disp=CUSval('phyHold'),code=CUSrev('phyHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, --BG & BGM - WIDGET.newSelector{name="bg", x=840, y=1030,w=250,color='Y',list=BG.getList(),disp=CUSval('bg'),code=function(i)CUSTOMENV.bg=i BG.set(i)end}, - WIDGET.newSelector{name="bgm", x=1120,y=1030,w=250,color='Y',list=BGM.getList(),disp=CUSval('bgm'),code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, + WIDGET.newSelector{name='bg', x=840, y=1030,w=250,color='Y',list=BG.getList(),disp=CUSval('bg'),code=function(i)CUSTOMENV.bg=i BG.set(i)end}, + WIDGET.newSelector{name='bgm', x=1120,y=1030,w=250,color='Y',list=BGM.getList(),disp=CUSval('bgm'),code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, } return scene diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index 16102a70..d70472a7 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -450,53 +450,53 @@ end local function _setPen(i)return function(k)pens[k]=i end end scene.widgetList={ - 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='H'}, + 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='H'}, - WIDGET.newButton{name="b1", x=580, y=130,w=76,fText="",color='R',code=_setPen(1)},--B1 - WIDGET.newButton{name="b2", x=660, y=130,w=76,fText="",color='F',code=_setPen(2)},--B2 - WIDGET.newButton{name="b3", x=740, y=130,w=76,fText="",color='O',code=_setPen(3)},--B3 - WIDGET.newButton{name="b4", x=820, y=130,w=76,fText="",color='Y',code=_setPen(4)},--B4 - WIDGET.newButton{name="b5", x=900, y=130,w=76,fText="",color='L',code=_setPen(5)},--B5 - WIDGET.newButton{name="b6", x=980, y=130,w=76,fText="",color='J',code=_setPen(6)},--B6 - WIDGET.newButton{name="b7", x=1060,y=130,w=76,fText="",color='G',code=_setPen(7)},--B7 - WIDGET.newButton{name="b8", x=1140,y=130,w=76,fText="",color='A',code=_setPen(8)},--B8 + WIDGET.newButton{name='b1', x=580, y=130,w=76,fText="",color='R',code=_setPen(1)},--B1 + WIDGET.newButton{name='b2', x=660, y=130,w=76,fText="",color='F',code=_setPen(2)},--B2 + WIDGET.newButton{name='b3', x=740, y=130,w=76,fText="",color='O',code=_setPen(3)},--B3 + WIDGET.newButton{name='b4', x=820, y=130,w=76,fText="",color='Y',code=_setPen(4)},--B4 + WIDGET.newButton{name='b5', x=900, y=130,w=76,fText="",color='L',code=_setPen(5)},--B5 + WIDGET.newButton{name='b6', x=980, y=130,w=76,fText="",color='J',code=_setPen(6)},--B6 + WIDGET.newButton{name='b7', x=1060,y=130,w=76,fText="",color='G',code=_setPen(7)},--B7 + WIDGET.newButton{name='b8', x=1140,y=130,w=76,fText="",color='A',code=_setPen(8)},--B8 - WIDGET.newButton{name="b9", x=580, y=210,w=76,fText="",color='C',code=_setPen(9)},--B9 - WIDGET.newButton{name="b10", x=660, y=210,w=76,fText="",color='N',code=_setPen(10)},--B10 - WIDGET.newButton{name="b11", x=740, y=210,w=76,fText="",color='S',code=_setPen(11)},--B11 - WIDGET.newButton{name="b12", x=820, y=210,w=76,fText="",color='B',code=_setPen(12)},--B12 - WIDGET.newButton{name="b13", x=900, y=210,w=76,fText="",color='V',code=_setPen(13)},--B13 - WIDGET.newButton{name="b14", x=980, y=210,w=76,fText="",color='P',code=_setPen(14)},--B14 - WIDGET.newButton{name="b15", x=1060,y=210,w=76,fText="",color='M',code=_setPen(15)},--B15 - WIDGET.newButton{name="b16", x=1140,y=210,w=76,fText="",color='W',code=_setPen(16)},--B16 + WIDGET.newButton{name='b9', x=580, y=210,w=76,fText="",color='C',code=_setPen(9)},--B9 + WIDGET.newButton{name='b10', x=660, y=210,w=76,fText="",color='N',code=_setPen(10)},--B10 + WIDGET.newButton{name='b11', x=740, y=210,w=76,fText="",color='S',code=_setPen(11)},--B11 + WIDGET.newButton{name='b12', x=820, y=210,w=76,fText="",color='B',code=_setPen(12)},--B12 + WIDGET.newButton{name='b13', x=900, y=210,w=76,fText="",color='V',code=_setPen(13)},--B13 + WIDGET.newButton{name='b14', x=980, y=210,w=76,fText="",color='P',code=_setPen(14)},--B14 + WIDGET.newButton{name='b15', x=1060,y=210,w=76,fText="",color='M',code=_setPen(15)},--B15 + WIDGET.newButton{name='b16', x=1140,y=210,w=76,fText="",color='W',code=_setPen(16)},--B16 - WIDGET.newButton{name="b17", x=580, y=290,w=76,font=40,fText=CHAR.icon.bone, color='dH',code=_setPen(17)},--BONE - WIDGET.newButton{name="b18", x=660, y=290,w=76,font=40,fText=CHAR.icon.invis, color='D', code=_setPen(18)},--HIDE - WIDGET.newButton{name="b19", x=740, y=290,w=76,font=40,fText=CHAR.icon.bomb, color='lY',code=_setPen(19)},--BOMB - WIDGET.newButton{name="b20", x=820, y=290,w=76,font=40,fText=CHAR.icon.garbage,color='H', code=_setPen(20)},--GB1 - WIDGET.newButton{name="b21", x=900, y=290,w=76,font=40,fText=CHAR.icon.garbage,color='lH',code=_setPen(21)},--GB2 - WIDGET.newButton{name="b22", x=980, y=290,w=76,font=40,fText=CHAR.icon.garbage,color='dV',code=_setPen(22)},--GB3 - WIDGET.newButton{name="b23", x=1060,y=290,w=76,font=40,fText=CHAR.icon.garbage,color='dR',code=_setPen(23)},--GB4 - WIDGET.newButton{name="b24", x=1140,y=290,w=76,font=40,fText=CHAR.icon.garbage,color='dG',code=_setPen(24)},--GB5 + WIDGET.newButton{name='b17', x=580, y=290,w=76,font=40,fText=CHAR.icon.bone, color='dH',code=_setPen(17)},--BONE + WIDGET.newButton{name='b18', x=660, y=290,w=76,font=40,fText=CHAR.icon.invis, color='D', code=_setPen(18)},--HIDE + WIDGET.newButton{name='b19', x=740, y=290,w=76,font=40,fText=CHAR.icon.bomb, color='lY',code=_setPen(19)},--BOMB + WIDGET.newButton{name='b20', x=820, y=290,w=76,font=40,fText=CHAR.icon.garbage,color='H', code=_setPen(20)},--GB1 + WIDGET.newButton{name='b21', x=900, y=290,w=76,font=40,fText=CHAR.icon.garbage,color='lH',code=_setPen(21)},--GB2 + WIDGET.newButton{name='b22', x=980, y=290,w=76,font=40,fText=CHAR.icon.garbage,color='dV',code=_setPen(22)},--GB3 + WIDGET.newButton{name='b23', x=1060,y=290,w=76,font=40,fText=CHAR.icon.garbage,color='dR',code=_setPen(23)},--GB4 + WIDGET.newButton{name='b24', x=1140,y=290,w=76,font=40,fText=CHAR.icon.garbage,color='dG',code=_setPen(24)},--GB5 - WIDGET.newButton{name="any", x=600, y=400,w=120,color='lH', font=40,code=_setPen(0)}, - WIDGET.newButton{name="space", x=730, y=400,w=120,color='H', font=55,code=_setPen(-1),fText=CHAR.icon.cross_thick}, - WIDGET.newButton{name="smart", x=860, y=400,w=120,color='lG', font=30,code=_setPen(-2)}, - WIDGET.newButton{name="push", x=990, y=400,w=120,h=120,color='lY',font=20,code=pressKey"k"}, - WIDGET.newButton{name="del", x=1120,y=400,w=120,h=120,color='lY',font=20,code=pressKey"l"}, + WIDGET.newButton{name='any', x=600, y=400,w=120,color='lH', font=40,code=_setPen(0)}, + WIDGET.newButton{name='space', x=730, y=400,w=120,color='H', font=55,code=_setPen(-1),fText=CHAR.icon.cross_thick}, + WIDGET.newButton{name='smart', x=860, y=400,w=120,color='lG', font=30,code=_setPen(-2)}, + WIDGET.newButton{name='push', x=990, y=400,w=120,h=120,color='lY',font=20,code=pressKey"k"}, + WIDGET.newButton{name='del', x=1120,y=400,w=120,h=120,color='lY',font=20,code=pressKey"l"}, - WIDGET.newButton{name="copy", x=730, y=530,w=120,color='lR',font=60,fText=CHAR.icon.export,code=pressKey"cC"}, - WIDGET.newButton{name="paste", x=860, y=530,w=120,color='lB',font=60,fText=CHAR.icon.import,code=pressKey"cV"}, - WIDGET.newButton{name="clear", x=990, y=530,w=120,color='Z', font=70,fText=CHAR.icon.trash,code=pressKey"delete"}, - WIDGET.newSwitch{name="demo", x=755, y=640,lim=220,disp=function()return demo end,code=function()demo=not demo end}, + WIDGET.newButton{name='copy', x=730, y=530,w=120,color='lR',font=60,fText=CHAR.icon.export,code=pressKey"cC"}, + WIDGET.newButton{name='paste', x=860, y=530,w=120,color='lB',font=60,fText=CHAR.icon.import,code=pressKey"cV"}, + WIDGET.newButton{name='clear', x=990, y=530,w=120,color='Z', font=70,fText=CHAR.icon.trash,code=pressKey"delete"}, + WIDGET.newSwitch{name='demo', x=755, y=640,lim=220,disp=function()return demo end,code=function()demo=not demo end}, - WIDGET.newButton{name="newPg", x=100, y=110,w=160,h=110,color='N', font=20,code=pressKey"n"}, - WIDGET.newButton{name="delPg", x=100, y=230,w=160,h=110,color='lR',font=20,code=pressKey"m"}, - WIDGET.newButton{name="prevPg", x=100, y=350,w=160,h=110,color='lG',font=20,code=pressKey"pageup",hideF=function()return page==1 end}, - WIDGET.newButton{name="nextPg", x=100, y=470,w=160,h=110,color='lG',font=20,code=pressKey"pagedown",hideF=function()return page==#FIELD end}, + WIDGET.newButton{name='newPg', x=100, y=110,w=160,h=110,color='N', font=20,code=pressKey"n"}, + WIDGET.newButton{name='delPg', x=100, y=230,w=160,h=110,color='lR',font=20,code=pressKey"m"}, + WIDGET.newButton{name='prevPg', x=100, y=350,w=160,h=110,color='lG',font=20,code=pressKey"pageup",hideF=function()return page==1 end}, + WIDGET.newButton{name='nextPg', x=100, y=470,w=160,h=110,color='lG',font=20,code=pressKey"pagedown",hideF=function()return page==#FIELD end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 97687f66..e618d313 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -187,56 +187,56 @@ function scene.draw() end scene.widgetList={ - 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='H'}, + 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='H'}, - WIDGET.newKey{name="_1", x=800,y=540,w=90,font=50,code=pressKey(01)}, - WIDGET.newKey{name="_2", x=900,y=540,w=90,font=50,code=pressKey(02)}, - WIDGET.newKey{name="_3", x=800,y=640,w=90,font=50,code=pressKey(03)}, - WIDGET.newKey{name="_4", x=900,y=640,w=90,font=50,code=pressKey(04)}, - WIDGET.newKey{name="any1", x=100,y=640,w=90, code=pressKey(05)}, - WIDGET.newKey{name="any2", x=200,y=640,w=90, code=pressKey(06)}, - WIDGET.newKey{name="any3", x=300,y=640,w=90, code=pressKey(07)}, - WIDGET.newKey{name="any4", x=400,y=640,w=90, code=pressKey(08)}, - WIDGET.newKey{name="PC", x=500,y=640,w=90,font=50,code=pressKey(09)}, + WIDGET.newKey{name='_1', x=800,y=540,w=90,font=50,code=pressKey(01)}, + WIDGET.newKey{name='_2', x=900,y=540,w=90,font=50,code=pressKey(02)}, + WIDGET.newKey{name='_3', x=800,y=640,w=90,font=50,code=pressKey(03)}, + WIDGET.newKey{name='_4', x=900,y=640,w=90,font=50,code=pressKey(04)}, + WIDGET.newKey{name='any1', x=100,y=640,w=90, code=pressKey(05)}, + WIDGET.newKey{name='any2', x=200,y=640,w=90, code=pressKey(06)}, + WIDGET.newKey{name='any3', x=300,y=640,w=90, code=pressKey(07)}, + WIDGET.newKey{name='any4', x=400,y=640,w=90, code=pressKey(08)}, + WIDGET.newKey{name='PC', x=500,y=640,w=90,font=50,code=pressKey(09)}, - WIDGET.newKey{name="Z1", x=100,y=340,w=90,font=50,code=pressKey(11)}, - WIDGET.newKey{name="S1", x=200,y=340,w=90,font=50,code=pressKey(21)}, - WIDGET.newKey{name="J1", x=300,y=340,w=90,font=50,code=pressKey(31)}, - WIDGET.newKey{name="L1", x=400,y=340,w=90,font=50,code=pressKey(41)}, - WIDGET.newKey{name="T1", x=500,y=340,w=90,font=50,code=pressKey(51)}, - WIDGET.newKey{name="O1", x=600,y=340,w=90,font=50,code=pressKey(61)}, - WIDGET.newKey{name="I1", x=700,y=340,w=90,font=50,code=pressKey(71)}, + WIDGET.newKey{name='Z1', x=100,y=340,w=90,font=50,code=pressKey(11)}, + WIDGET.newKey{name='S1', x=200,y=340,w=90,font=50,code=pressKey(21)}, + WIDGET.newKey{name='J1', x=300,y=340,w=90,font=50,code=pressKey(31)}, + WIDGET.newKey{name='L1', x=400,y=340,w=90,font=50,code=pressKey(41)}, + WIDGET.newKey{name='T1', x=500,y=340,w=90,font=50,code=pressKey(51)}, + WIDGET.newKey{name='O1', x=600,y=340,w=90,font=50,code=pressKey(61)}, + WIDGET.newKey{name='I1', x=700,y=340,w=90,font=50,code=pressKey(71)}, - WIDGET.newKey{name="Z2", x=100,y=440,w=90,font=50,code=pressKey(12)}, - WIDGET.newKey{name="S2", x=200,y=440,w=90,font=50,code=pressKey(22)}, - WIDGET.newKey{name="J2", x=300,y=440,w=90,font=50,code=pressKey(32)}, - WIDGET.newKey{name="L2", x=400,y=440,w=90,font=50,code=pressKey(42)}, - WIDGET.newKey{name="T2", x=500,y=440,w=90,font=50,code=pressKey(52)}, - WIDGET.newKey{name="O2", x=600,y=440,w=90,font=50,code=pressKey(62)}, - WIDGET.newKey{name="I2", x=700,y=440,w=90,font=50,code=pressKey(72)}, + WIDGET.newKey{name='Z2', x=100,y=440,w=90,font=50,code=pressKey(12)}, + WIDGET.newKey{name='S2', x=200,y=440,w=90,font=50,code=pressKey(22)}, + WIDGET.newKey{name='J2', x=300,y=440,w=90,font=50,code=pressKey(32)}, + WIDGET.newKey{name='L2', x=400,y=440,w=90,font=50,code=pressKey(42)}, + WIDGET.newKey{name='T2', x=500,y=440,w=90,font=50,code=pressKey(52)}, + WIDGET.newKey{name='O2', x=600,y=440,w=90,font=50,code=pressKey(62)}, + WIDGET.newKey{name='I2', x=700,y=440,w=90,font=50,code=pressKey(72)}, - WIDGET.newKey{name="Z3", x=100,y=540,w=90,font=50,code=pressKey(13)}, - WIDGET.newKey{name="S3", x=200,y=540,w=90,font=50,code=pressKey(23)}, - WIDGET.newKey{name="J3", x=300,y=540,w=90,font=50,code=pressKey(33)}, - WIDGET.newKey{name="L3", x=400,y=540,w=90,font=50,code=pressKey(43)}, - WIDGET.newKey{name="T3", x=500,y=540,w=90,font=50,code=pressKey(53)}, - WIDGET.newKey{name="O3", x=600,y=540,w=90,font=50,code=pressKey(63)}, - WIDGET.newKey{name="I3", x=700,y=540,w=90,font=50,code=pressKey(73)}, + WIDGET.newKey{name='Z3', x=100,y=540,w=90,font=50,code=pressKey(13)}, + WIDGET.newKey{name='S3', x=200,y=540,w=90,font=50,code=pressKey(23)}, + WIDGET.newKey{name='J3', x=300,y=540,w=90,font=50,code=pressKey(33)}, + WIDGET.newKey{name='L3', x=400,y=540,w=90,font=50,code=pressKey(43)}, + WIDGET.newKey{name='T3', x=500,y=540,w=90,font=50,code=pressKey(53)}, + WIDGET.newKey{name='O3', x=600,y=540,w=90,font=50,code=pressKey(63)}, + WIDGET.newKey{name='I3', x=700,y=540,w=90,font=50,code=pressKey(73)}, - WIDGET.newKey{name="O4", x=600,y=640,w=90,font=50,code=pressKey(64)}, - WIDGET.newKey{name="I4", x=700,y=640,w=90,font=50,code=pressKey(74)}, + WIDGET.newKey{name='O4', x=600,y=640,w=90,font=50,code=pressKey(64)}, + WIDGET.newKey{name='I4', x=700,y=640,w=90,font=50,code=pressKey(74)}, - WIDGET.newKey{name="left", x=800, y=440,w=90, color='lG',font=55,code=pressKey"left", fText=CHAR.key.left}, - WIDGET.newKey{name="right", x=900, y=440,w=90, color='lG',font=55,code=pressKey"right", fText=CHAR.key.right}, - WIDGET.newKey{name="ten", x=1000,y=440,w=90, color='lG',font=55,code=pressKey"ten", fText=CHAR.key.macTab}, - WIDGET.newKey{name="backsp", x=1000,y=540,w=90, color='lY',font=55,code=pressKey"backspace",fText=CHAR.key.backspace}, - WIDGET.newKey{name="reset", x=1000,y=640,w=90, color='lY',font=50,code=pressKey"delete", fText=CHAR.icon.trash}, - WIDGET.newButton{name="copy", x=1140,y=440,w=170,h=80,color='lR',font=50,code=pressKey"cC", fText=CHAR.icon.export,hideF=function()return #MISSION==0 end}, - WIDGET.newButton{name="paste", x=1140,y=540,w=170,h=80,color='lB',font=50,code=pressKey"cV", fText=CHAR.icon.import}, - WIDGET.newSwitch{name="mission",x=1150,y=340,lim=280,disp=CUSval('missionKill'),code=CUSrev('missionKill')}, + WIDGET.newKey{name='left', x=800, y=440,w=90, color='lG',font=55,code=pressKey"left", fText=CHAR.key.left}, + WIDGET.newKey{name='right', x=900, y=440,w=90, color='lG',font=55,code=pressKey"right", fText=CHAR.key.right}, + WIDGET.newKey{name='ten', x=1000,y=440,w=90, color='lG',font=55,code=pressKey"ten", fText=CHAR.key.macTab}, + WIDGET.newKey{name='backsp', x=1000,y=540,w=90, color='lY',font=55,code=pressKey"backspace",fText=CHAR.key.backspace}, + WIDGET.newKey{name='reset', x=1000,y=640,w=90, color='lY',font=50,code=pressKey"delete", fText=CHAR.icon.trash}, + WIDGET.newButton{name='copy', x=1140,y=440,w=170,h=80,color='lR',font=50,code=pressKey"cC", fText=CHAR.icon.export,hideF=function()return #MISSION==0 end}, + WIDGET.newButton{name='paste', x=1140,y=540,w=170,h=80,color='lB',font=50,code=pressKey"cV", fText=CHAR.icon.import}, + WIDGET.newSwitch{name='mission',x=1150,y=340,lim=280,disp=CUSval('missionKill'),code=CUSrev('missionKill')}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 697c823f..7e0eda64 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -183,56 +183,56 @@ function scene.draw() end scene.widgetList={ - 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='H'}, + 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='H'}, - WIDGET.newSelector{name="sequence",x=1080,y=60,w=200,color='Y', + WIDGET.newSelector{name='sequence',x=1080,y=60,w=200,color='Y', list={'bag','bagES','his','hisPool','c2','rnd','mess','reverb','loop','fixed'}, disp=CUSval('sequence'),code=CUSsto('sequence') }, - WIDGET.newKey{name="Z", x=120,y=460,w=80,font=90,fText=CHAR.mino.Z,code=pressKey(1)}, - WIDGET.newKey{name="S", x=200,y=460,w=80,font=90,fText=CHAR.mino.S,code=pressKey(2)}, - WIDGET.newKey{name="J", x=280,y=460,w=80,font=90,fText=CHAR.mino.J,code=pressKey(3)}, - WIDGET.newKey{name="L", x=360,y=460,w=80,font=90,fText=CHAR.mino.L,code=pressKey(4)}, - WIDGET.newKey{name="T", x=440,y=460,w=80,font=90,fText=CHAR.mino.T,code=pressKey(5)}, - WIDGET.newKey{name="O", x=520,y=460,w=80,font=90,fText=CHAR.mino.O,code=pressKey(6)}, - WIDGET.newKey{name="I", x=600,y=460,w=80,font=90,fText=CHAR.mino.I,code=pressKey(7)}, - WIDGET.newKey{name="left", x=680,y=460,w=80,color='lG',font=55,fText=CHAR.key.left, code=pressKey"left"}, - WIDGET.newKey{name="right", x=760,y=460,w=80,color='lG',font=55,fText=CHAR.key.right, code=pressKey"right"}, - WIDGET.newKey{name="ten", x=840,y=460,w=80,color='lG',font=55,fText=CHAR.key.macTab, code=pressKey"ten"}, - WIDGET.newKey{name="backsp",x=920,y=460,w=80,color='lY',font=55,fText=CHAR.key.backspace,code=pressKey"backspace"}, - WIDGET.newKey{name="reset", x=1000,y=460,w=80,color='lY',font=50,fText=CHAR.icon.trash, code=pressKey"delete"}, + WIDGET.newKey{name='Z', x=120,y=460,w=80,font=90,fText=CHAR.mino.Z,code=pressKey(1)}, + WIDGET.newKey{name='S', x=200,y=460,w=80,font=90,fText=CHAR.mino.S,code=pressKey(2)}, + WIDGET.newKey{name='J', x=280,y=460,w=80,font=90,fText=CHAR.mino.J,code=pressKey(3)}, + WIDGET.newKey{name='L', x=360,y=460,w=80,font=90,fText=CHAR.mino.L,code=pressKey(4)}, + WIDGET.newKey{name='T', x=440,y=460,w=80,font=90,fText=CHAR.mino.T,code=pressKey(5)}, + WIDGET.newKey{name='O', x=520,y=460,w=80,font=90,fText=CHAR.mino.O,code=pressKey(6)}, + WIDGET.newKey{name='I', x=600,y=460,w=80,font=90,fText=CHAR.mino.I,code=pressKey(7)}, + WIDGET.newKey{name='left', x=680,y=460,w=80,color='lG',font=55,fText=CHAR.key.left, code=pressKey"left"}, + WIDGET.newKey{name='right', x=760,y=460,w=80,color='lG',font=55,fText=CHAR.key.right, code=pressKey"right"}, + WIDGET.newKey{name='ten', x=840,y=460,w=80,color='lG',font=55,fText=CHAR.key.macTab, code=pressKey"ten"}, + WIDGET.newKey{name='backsp',x=920,y=460,w=80,color='lY',font=55,fText=CHAR.key.backspace,code=pressKey"backspace"}, + WIDGET.newKey{name='reset', x=1000,y=460,w=80,color='lY',font=50,fText=CHAR.icon.trash, code=pressKey"delete"}, - WIDGET.newKey{name="Z5", x=120,y=550,w=80,color='lH',font=65,fText=CHAR.mino.Z5, code=pressKey(8)}, - WIDGET.newKey{name="S5", x=200,y=550,w=80,color='lH',font=65,fText=CHAR.mino.S5, code=pressKey(9)}, - WIDGET.newKey{name="P", x=280,y=550,w=80,color='lH',font=65,fText=CHAR.mino.P, code=pressKey(10)}, - WIDGET.newKey{name="Q", x=360,y=550,w=80,color='lH',font=65,fText=CHAR.mino.Q, code=pressKey(11)}, - WIDGET.newKey{name="F", x=440,y=550,w=80,color='lH',font=65,fText=CHAR.mino.F, code=pressKey(12)}, - WIDGET.newKey{name="E", x=520,y=550,w=80,color='lH',font=65,fText=CHAR.mino.E, code=pressKey(13)}, - WIDGET.newKey{name="T5", x=600,y=550,w=80,color='lH',font=65,fText=CHAR.mino.T5, code=pressKey(14)}, - WIDGET.newKey{name="U", x=680,y=550,w=80,color='lH',font=65,fText=CHAR.mino.U, code=pressKey(15)}, - WIDGET.newKey{name="V", x=760,y=550,w=80,color='lH',font=65,fText=CHAR.mino.V, code=pressKey(16)}, - WIDGET.newKey{name="I3", x=840,y=550,w=80,color='H',font=90,fText=CHAR.mino.I3, code=pressKey(26)}, - WIDGET.newKey{name="C", x=920,y=550,w=80,color='H',font=90,fText=CHAR.mino.C, code=pressKey(27)}, - WIDGET.newKey{name="rnd", x=1000,y=550,w=80,color='R',font=70,fText=CHAR.icon.onebag, code=pressKey"="}, + WIDGET.newKey{name='Z5', x=120,y=550,w=80,color='lH',font=65,fText=CHAR.mino.Z5, code=pressKey(8)}, + WIDGET.newKey{name='S5', x=200,y=550,w=80,color='lH',font=65,fText=CHAR.mino.S5, code=pressKey(9)}, + WIDGET.newKey{name='P', x=280,y=550,w=80,color='lH',font=65,fText=CHAR.mino.P, code=pressKey(10)}, + WIDGET.newKey{name='Q', x=360,y=550,w=80,color='lH',font=65,fText=CHAR.mino.Q, code=pressKey(11)}, + WIDGET.newKey{name='F', x=440,y=550,w=80,color='lH',font=65,fText=CHAR.mino.F, code=pressKey(12)}, + WIDGET.newKey{name='E', x=520,y=550,w=80,color='lH',font=65,fText=CHAR.mino.E, code=pressKey(13)}, + WIDGET.newKey{name='T5', x=600,y=550,w=80,color='lH',font=65,fText=CHAR.mino.T5, code=pressKey(14)}, + WIDGET.newKey{name='U', x=680,y=550,w=80,color='lH',font=65,fText=CHAR.mino.U, code=pressKey(15)}, + WIDGET.newKey{name='V', x=760,y=550,w=80,color='lH',font=65,fText=CHAR.mino.V, code=pressKey(16)}, + WIDGET.newKey{name='I3', x=840,y=550,w=80,color='H',font=90,fText=CHAR.mino.I3, code=pressKey(26)}, + WIDGET.newKey{name='C', x=920,y=550,w=80,color='H',font=90,fText=CHAR.mino.C, code=pressKey(27)}, + WIDGET.newKey{name='rnd', x=1000,y=550,w=80,color='R',font=70,fText=CHAR.icon.onebag, code=pressKey"="}, - WIDGET.newKey{name="W", x=120,y=640,w=80,color='lH',font=65,fText=CHAR.mino.W, code=pressKey(17)}, - WIDGET.newKey{name="X", x=200,y=640,w=80,color='lH',font=65,fText=CHAR.mino.X, code=pressKey(18)}, - WIDGET.newKey{name="J5", x=280,y=640,w=80,color='lH',font=65,fText=CHAR.mino.J5, code=pressKey(19)}, - WIDGET.newKey{name="L5", x=360,y=640,w=80,color='lH',font=65,fText=CHAR.mino.L5, code=pressKey(20)}, - WIDGET.newKey{name="R", x=440,y=640,w=80,color='lH',font=65,fText=CHAR.mino.R, code=pressKey(21)}, - WIDGET.newKey{name="Y", x=520,y=640,w=80,color='lH',font=65,fText=CHAR.mino.Y, code=pressKey(22)}, - WIDGET.newKey{name="N", x=600,y=640,w=80,color='lH',font=65,fText=CHAR.mino.N, code=pressKey(23)}, - WIDGET.newKey{name="H", x=680,y=640,w=80,color='lH',font=65,fText=CHAR.mino.H, code=pressKey(24)}, - WIDGET.newKey{name="I5", x=760,y=640,w=80,color='lH',font=65,fText=CHAR.mino.I5, code=pressKey(25)}, - WIDGET.newKey{name="I2", x=840,y=640,w=80,color='dH',font=100,fText=CHAR.mino.I2, code=pressKey(28)}, - WIDGET.newKey{name="O1", x=920,y=640,w=80,color='dH',font=100,fText=CHAR.mino.O1, code=pressKey(29)}, + WIDGET.newKey{name='W', x=120,y=640,w=80,color='lH',font=65,fText=CHAR.mino.W, code=pressKey(17)}, + WIDGET.newKey{name='X', x=200,y=640,w=80,color='lH',font=65,fText=CHAR.mino.X, code=pressKey(18)}, + WIDGET.newKey{name='J5', x=280,y=640,w=80,color='lH',font=65,fText=CHAR.mino.J5, code=pressKey(19)}, + WIDGET.newKey{name='L5', x=360,y=640,w=80,color='lH',font=65,fText=CHAR.mino.L5, code=pressKey(20)}, + WIDGET.newKey{name='R', x=440,y=640,w=80,color='lH',font=65,fText=CHAR.mino.R, code=pressKey(21)}, + WIDGET.newKey{name='Y', x=520,y=640,w=80,color='lH',font=65,fText=CHAR.mino.Y, code=pressKey(22)}, + WIDGET.newKey{name='N', x=600,y=640,w=80,color='lH',font=65,fText=CHAR.mino.N, code=pressKey(23)}, + WIDGET.newKey{name='H', x=680,y=640,w=80,color='lH',font=65,fText=CHAR.mino.H, code=pressKey(24)}, + WIDGET.newKey{name='I5', x=760,y=640,w=80,color='lH',font=65,fText=CHAR.mino.I5, code=pressKey(25)}, + WIDGET.newKey{name='I2', x=840,y=640,w=80,color='dH',font=100,fText=CHAR.mino.I2, code=pressKey(28)}, + WIDGET.newKey{name='O1', x=920,y=640,w=80,color='dH',font=100,fText=CHAR.mino.O1, code=pressKey(29)}, - WIDGET.newButton{name="copy", x=1140,y=460,w=170,h=80,color='lR',font=50,fText=CHAR.icon.export,code=pressKey"cC",hideF=function()return #BAG==0 end}, - WIDGET.newButton{name="paste",x=1140,y=550,w=170,h=80,color='lB',font=50,fText=CHAR.icon.import,code=pressKey"cV"}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='copy', x=1140,y=460,w=170,h=80,color='lR',font=50,fText=CHAR.icon.export,code=pressKey"cC",hideF=function()return #BAG==0 end}, + WIDGET.newButton{name='paste',x=1140,y=550,w=170,h=80,color='lB',font=50,fText=CHAR.icon.import,code=pressKey"cV"}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/depause.lua b/parts/scenes/depause.lua index 2219b5eb..872be53a 100644 --- a/parts/scenes/depause.lua +++ b/parts/scenes/depause.lua @@ -48,7 +48,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="pause",x=0,y=45,w=60,code=pauseGame,font=40,fText=CHAR.icon.pause}, + WIDGET.newKey{name='pause',x=0,y=45,w=60,code=pauseGame,font=40,fText=CHAR.icon.pause}, } return scene diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index d0598917..10c798e5 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -1,7 +1,7 @@ local gc=love.graphics -local inputBox=WIDGET.newInputBox{name="input",x=20,y=110,w=762,h=60,font=40,limit=32} -local copyButton=WIDGET.newKey{name="copy",x=940,y=655,w=200,h=80,font=35,code=pressKey"cC"} +local inputBox=WIDGET.newInputBox{name='input',x=20,y=110,w=762,h=60,font=40,limit=32} +local copyButton=WIDGET.newKey{name='copy',x=940,y=655,w=200,h=80,font=35,code=pressKey"cC"} local int,abs=math.floor,math.abs local min,sin=math.min,math.sin local ins=table.insert @@ -202,16 +202,16 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="book", x=20,y=15,font=70,align='L',fText=CHAR.icon.zBook}, - WIDGET.newText{name="title", x=100,y=15,font=70,align='L'}, + WIDGET.newText{name='book', x=20,y=15,font=70,align='L',fText=CHAR.icon.zBook}, + WIDGET.newText{name='title', x=100,y=15,font=70,align='L'}, inputBox, copyButton, - WIDGET.newKey{name="link", x=1150,y=655,w=200,h=80,font=35,code=pressKey"link",hideF=function()return not _getList()[selected].url end}, - WIDGET.newKey{name="up", x=1130,y=460,w=60,h=90,font=35,fText="↑",code=pressKey"up",hide=not MOBILE}, - WIDGET.newKey{name="down", x=1130,y=560,w=60,h=90,font=35,fText="↓",code=pressKey"down",hide=not MOBILE}, - WIDGET.newKey{name="pageup", x=1210,y=460,w=80,h=90,font=35,fText="↑↑",code=pressKey"pageup",hide=not MOBILE}, - WIDGET.newKey{name="pagedown",x=1210,y=560,w=80,h=90,font=35,fText="↓↓",code=pressKey"pagedown",hide=not MOBILE}, - WIDGET.newButton{name="back", x=1165,y=60,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='link', x=1150,y=655,w=200,h=80,font=35,code=pressKey"link",hideF=function()return not _getList()[selected].url end}, + WIDGET.newKey{name='up', x=1130,y=460,w=60,h=90,font=35,fText="↑",code=pressKey"up",hide=not MOBILE}, + WIDGET.newKey{name='down', x=1130,y=560,w=60,h=90,font=35,fText="↓",code=pressKey"down",hide=not MOBILE}, + WIDGET.newKey{name='pageup', x=1210,y=460,w=80,h=90,font=35,fText="↑↑",code=pressKey"pageup",hide=not MOBILE}, + WIDGET.newKey{name='pagedown',x=1210,y=560,w=80,h=90,font=35,fText="↓↓",code=pressKey"pagedown",hide=not MOBILE}, + WIDGET.newButton{name='back', x=1165,y=60,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/error.lua b/parts/scenes/error.lua index 77ac25c4..9bf21ad3 100644 --- a/parts/scenes/error.lua +++ b/parts/scenes/error.lua @@ -39,8 +39,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="console",x=940,y=640,w=170,h=80,font=65,fText=CHAR.icon.console,code=goScene'app_console'}, - WIDGET.newKey{name="quit",x=1140,y=640,w=170,h=80,font=40,fText=CHAR.icon.cross_thick,code=love.event.quit}, + WIDGET.newKey{name='console',x=940,y=640,w=170,h=80,font=65,fText=CHAR.icon.console,code=goScene'app_console'}, + WIDGET.newKey{name='quit',x=1140,y=640,w=170,h=80,font=40,fText=CHAR.icon.cross_thick,code=love.event.quit}, } return scene diff --git a/parts/scenes/game.lua b/parts/scenes/game.lua index e6bc58da..89207d46 100644 --- a/parts/scenes/game.lua +++ b/parts/scenes/game.lua @@ -380,15 +380,15 @@ function scene.draw() drawWarning() end scene.widgetList={ - WIDGET.newKey{name="rep0", x=40,y=50,w=60, code=_rep0, font=40,fText=CHAR.icon.pause}, - WIDGET.newKey{name="repP8", x=105,y=50,w=60,code=_repP8, font=40,fText=CHAR.icon.speedOneEights}, - WIDGET.newKey{name="repP2", x=170,y=50,w=60,code=_repP2, font=40,fText=CHAR.icon.speedOneHalf}, - WIDGET.newKey{name="rep1", x=235,y=50,w=60,code=_rep1, font=40,fText=CHAR.icon.speedOne}, - WIDGET.newKey{name="rep2", x=300,y=50,w=60,code=_rep2, font=40,fText=CHAR.icon.speedTwo}, - WIDGET.newKey{name="rep5", x=365,y=50,w=60,code=_rep5, font=40,fText=CHAR.icon.speedFive}, - WIDGET.newKey{name="step", x=430,y=50,w=60,code=_step, font=40,fText=CHAR.icon.nextFrame}, - WIDGET.newKey{name="restart",x=0,y=45,w=60, code=_restart, font=40,fText=CHAR.icon.retry_spin}, - WIDGET.newKey{name="pause", x=0,y=45,w=60, code=pauseGame,font=40,fText=CHAR.icon.pause}, + WIDGET.newKey{name='rep0', x=40,y=50,w=60, code=_rep0, font=40,fText=CHAR.icon.pause}, + WIDGET.newKey{name='repP8', x=105,y=50,w=60,code=_repP8, font=40,fText=CHAR.icon.speedOneEights}, + WIDGET.newKey{name='repP2', x=170,y=50,w=60,code=_repP2, font=40,fText=CHAR.icon.speedOneHalf}, + WIDGET.newKey{name='rep1', x=235,y=50,w=60,code=_rep1, font=40,fText=CHAR.icon.speedOne}, + WIDGET.newKey{name='rep2', x=300,y=50,w=60,code=_rep2, font=40,fText=CHAR.icon.speedTwo}, + WIDGET.newKey{name='rep5', x=365,y=50,w=60,code=_rep5, font=40,fText=CHAR.icon.speedFive}, + WIDGET.newKey{name='step', x=430,y=50,w=60,code=_step, font=40,fText=CHAR.icon.nextFrame}, + WIDGET.newKey{name='restart',x=0,y=45,w=60, code=_restart, font=40,fText=CHAR.icon.retry_spin}, + WIDGET.newKey{name='pause', x=0,y=45,w=60, code=pauseGame,font=40,fText=CHAR.icon.pause}, } return scene diff --git a/parts/scenes/history.lua b/parts/scenes/history.lua index 9f92b43a..9514f89d 100644 --- a/parts/scenes/history.lua +++ b/parts/scenes/history.lua @@ -23,8 +23,8 @@ function scene.keyDown(key) end scene.widgetList={ - WIDGET.newTextBox{name="texts",x=30,y=45,w=1000,h=640,font=20,fix=true}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newTextBox{name='texts',x=30,y=45,w=1000,h=640,font=20,fix=true}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index e856a756..df3c6a73 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -34,7 +34,7 @@ scene.widgetList={ WIDGET.newButton{x=200,y=550,w=200,h=120,fText=langList.zh_grass,color='lG',code=function()_setLang('zh_grass')end}, WIDGET.newButton{x=420,y=550,w=200,h=120,fText=langList.zh_yygq, color='D', code=function()_setLang('zh_yygq')end}, WIDGET.newButton{x=640,y=550,w=200,h=120,fText=langList.symbol, color='dH',code=function()_setLang('symbol')end}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua index 3e2f4111..629628e2 100644 --- a/parts/scenes/launchpad.lua +++ b/parts/scenes/launchpad.lua @@ -217,13 +217,13 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="title", x=640, y=-5,font=50}, - WIDGET.newSlider{name="bgm", x=1000,y=80, lim=130,w=250,disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.setVol(SETTING.bgm)end}, - WIDGET.newSlider{name="sfx", x=1000,y=150,lim=130,w=250,disp=SETval('sfx'),code=function(v)SETTING.sfx=v SFX.setVol(SETTING.sfx)end}, - WIDGET.newSlider{name="voc", x=1000,y=220,lim=130,w=250,disp=SETval('voc'),code=function(v)SETTING.voc=v VOC.setVol(SETTING.voc)end}, - WIDGET.newSwitch{name="label",x=1200,y=290,lim=160,disp=function()return showLabel end,code=pressKey"space",}, - WIDGET.newButton{name="music",x=1140,y=540,w=170,h=80,font=40,code=pressKey"tab"}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newText{name='title', x=640, y=-5,font=50}, + WIDGET.newSlider{name='bgm', x=1000,y=80, lim=130,w=250,disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.setVol(SETTING.bgm)end}, + WIDGET.newSlider{name='sfx', x=1000,y=150,lim=130,w=250,disp=SETval('sfx'),code=function(v)SETTING.sfx=v SFX.setVol(SETTING.sfx)end}, + WIDGET.newSlider{name='voc', x=1000,y=220,lim=130,w=250,disp=SETval('voc'),code=function(v)SETTING.voc=v VOC.setVol(SETTING.voc)end}, + WIDGET.newSwitch{name='label',x=1200,y=290,lim=160,disp=function()return showLabel end,code=pressKey"space",}, + WIDGET.newButton{name='music',x=1140,y=540,w=170,h=80,font=40,code=pressKey"tab"}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/legals.lua b/parts/scenes/legals.lua index 4e61408e..017183e6 100644 --- a/parts/scenes/legals.lua +++ b/parts/scenes/legals.lua @@ -27,8 +27,8 @@ function scene.keyDown(key) end scene.widgetList={ - WIDGET.newTextBox{name="texts",x=30,y=45,w=1000,h=640,font=15,fix=true}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newTextBox{name='texts',x=30,y=45,w=1000,h=640,font=15,fix=true}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index ee6f8967..fe0655f4 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -1,5 +1,5 @@ -local emailBox=WIDGET.newInputBox{name="email",x=380,y=200,w=500,h=60,limit=128} -local passwordBox=WIDGET.newInputBox{name="password",x=380,y=300,w=620,h=60,secret=true,regex="[ -~]",limit=64} +local emailBox=WIDGET.newInputBox{name='email',x=380,y=200,w=500,h=60,limit=128} +local passwordBox=WIDGET.newInputBox{name='password',x=380,y=300,w=620,h=60,secret=true,regex="[ -~]",limit=64} local savePW=false @@ -30,13 +30,13 @@ function scene.sceneInit() end scene.widgetList={ - WIDGET.newText{name="title", x=80, y=50,font=70,align='L'}, - WIDGET.newButton{name="register",x=1140,y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('register','swipeR')end}, + WIDGET.newText{name='title', x=80, y=50,font=70,align='L'}, + WIDGET.newButton{name='register',x=1140,y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('register','swipeR')end}, emailBox, passwordBox, - WIDGET.newSwitch{name="keepPW", x=900, y=420,disp=function()return savePW end,code=function()savePW=not savePW end}, - WIDGET.newKey{name="login", x=1140,y=540,w=170,h=80,font=40,code=_login}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newSwitch{name='keepPW', x=900, y=420,disp=function()return savePW end,code=function()savePW=not savePW end}, + WIDGET.newKey{name='login', x=1140,y=540,w=170,h=80,font=40,code=_login}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index cb0899f0..9e7aa78c 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -184,20 +184,20 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="offline",x=-1200,y=210,w=800,h=100,color='lR',font=45,align='R',edge=30,code=pressKey"1"}, - WIDGET.newButton{name="qplay", x=-1200,y=330,w=800,h=100,color='lM',font=40,align='R',edge=30,code=pressKey"q"}, - WIDGET.newButton{name="online", x=-1200,y=450,w=800,h=100,color='lV',font=45,align='R',edge=30,code=pressKey"a"}, - WIDGET.newButton{name="custom", x=-1200,y=570,w=800,h=100,color='lS',font=45,align='R',edge=30,code=pressKey"z"}, + WIDGET.newButton{name='offline',x=-1200,y=210,w=800,h=100,color='lR',font=45,align='R',edge=30,code=pressKey"1"}, + WIDGET.newButton{name='qplay', x=-1200,y=330,w=800,h=100,color='lM',font=40,align='R',edge=30,code=pressKey"q"}, + WIDGET.newButton{name='online', x=-1200,y=450,w=800,h=100,color='lV',font=45,align='R',edge=30,code=pressKey"a"}, + WIDGET.newButton{name='custom', x=-1200,y=570,w=800,h=100,color='lS',font=45,align='R',edge=30,code=pressKey"z"}, - WIDGET.newButton{name="setting",x=2480,y=210,w=800,h=100, color='lO',font=40,align='L',edge=30,code=pressKey"-"}, - WIDGET.newButton{name="stat", x=2480,y=330,w=800,h=100, color='lL',font=40,align='L',edge=30,code=pressKey"p"}, - WIDGET.newButton{name="dict", x=2480,y=450,w=800,h=100, color='lG',font=40,align='L',edge=30,code=pressKey"l"}, - WIDGET.newButton{name="replays",x=2480,y=570,w=800,h=100, color='lC',font=40,align='L',edge=30,code=pressKey","}, + WIDGET.newButton{name='setting',x=2480,y=210,w=800,h=100, color='lO',font=40,align='L',edge=30,code=pressKey"-"}, + WIDGET.newButton{name='stat', x=2480,y=330,w=800,h=100, color='lL',font=40,align='L',edge=30,code=pressKey"p"}, + WIDGET.newButton{name='dict', x=2480,y=450,w=800,h=100, color='lG',font=40,align='L',edge=30,code=pressKey"l"}, + WIDGET.newButton{name='replays',x=2480,y=570,w=800,h=100, color='lC',font=40,align='L',edge=30,code=pressKey","}, - WIDGET.newButton{name="music", x=120,y=80,w=100, color='lO',code=pressKey"2",font=70,fText=CHAR.icon.music}, - WIDGET.newButton{name="lang", x=280,y=80,w=100, color='lN',code=pressKey"3",font=70,fText=CHAR.icon.language}, - WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color='lB',align='R',edge=20,code=pressKey"x",font=50,fText=CHAR.icon.info}, - WIDGET.newButton{name="manual", x=1390,y=670,w=600,h=70, color='lR',align='L',edge=20,code=pressKey"m",font=50,fText=CHAR.icon.help}, + WIDGET.newButton{name='music', x=120,y=80,w=100, color='lO',code=pressKey"2",font=70,fText=CHAR.icon.music}, + WIDGET.newButton{name='lang', x=280,y=80,w=100, color='lN',code=pressKey"3",font=70,fText=CHAR.icon.language}, + WIDGET.newButton{name='about', x=-110,y=670,w=600,h=70, color='lB',align='R',edge=20,code=pressKey"x",font=50,fText=CHAR.icon.info}, + WIDGET.newButton{name='manual', x=1390,y=670,w=600,h=70, color='lR',align='L',edge=20,code=pressKey"m",font=50,fText=CHAR.icon.help}, } return scene diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua index 0ea31244..9f8d63b9 100644 --- a/parts/scenes/main_simple.lua +++ b/parts/scenes/main_simple.lua @@ -16,14 +16,14 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="system", x=750,y=280,color='Z',align='L',fText=SYSTEM}, - WIDGET.newText{name="version", x=950,y=280,color='Z',align='L',fText=VERSION.string}, - WIDGET.newButton{name="sprint", x=260,y=480,w=260,font=50,code=function()loadGame('sprint_40l',true)end}, - WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame('marathon_n',true)end}, - WIDGET.newButton{name="setting", x=1000,y=400,w=120,font=90,fText=CHAR.icon.settings,code=goScene'setting_game'}, - WIDGET.newButton{name="lang", x=1000,y=560,w=120,font=90,fText=CHAR.icon.language,code=goScene'lang'}, - WIDGET.newButton{name="dict", x=1160,y=400,w=120,font=90,fText=CHAR.icon.zBook,code=goScene'dict'}, - WIDGET.newButton{name="quit", x=1160,y=560,w=120,font=80,fText=CHAR.key.macEsc,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end}, + WIDGET.newText{name='system', x=750,y=280,color='Z',align='L',fText=SYSTEM}, + WIDGET.newText{name='version', x=950,y=280,color='Z',align='L',fText=VERSION.string}, + WIDGET.newButton{name='sprint', x=260,y=480,w=260,font=50,code=function()loadGame('sprint_40l',true)end}, + WIDGET.newButton{name='marathon',x=640,y=480,w=260,font=50,code=function()loadGame('marathon_n',true)end}, + WIDGET.newButton{name='setting', x=1000,y=400,w=120,font=90,fText=CHAR.icon.settings,code=goScene'setting_game'}, + WIDGET.newButton{name='lang', x=1000,y=560,w=120,font=90,fText=CHAR.icon.language,code=goScene'lang'}, + WIDGET.newButton{name='dict', x=1160,y=400,w=120,font=90,fText=CHAR.icon.zBook,code=goScene'dict'}, + WIDGET.newButton{name='quit', x=1160,y=560,w=120,font=80,fText=CHAR.key.macEsc,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end}, } return scene diff --git a/parts/scenes/manual.lua b/parts/scenes/manual.lua index 10b70bcf..2dad512b 100644 --- a/parts/scenes/manual.lua +++ b/parts/scenes/manual.lua @@ -29,8 +29,8 @@ function scene.keyDown(key) end scene.widgetList={ - WIDGET.newTextBox{name="texts",x=30,y=45,w=1000,h=640,font=15,fix=true}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newTextBox{name='texts',x=30,y=45,w=1000,h=640,font=15,fix=true}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/mod.lua b/parts/scenes/mod.lua index 300ad194..a4a0cf62 100644 --- a/parts/scenes/mod.lua +++ b/parts/scenes/mod.lua @@ -155,10 +155,10 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="title", x=80,y=50,font=70,align='L'}, - WIDGET.newText{name="unranked",x=1200,y=60,color='Y',font=50,align='R'}, - WIDGET.newButton{name="reset", x=1140,y=540,w=170,h=80,font=25,code=pressKey"tab"}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newText{name='title', x=80,y=50,font=70,align='L'}, + WIDGET.newText{name='unranked',x=1200,y=60,color='Y',font=50,align='R'}, + WIDGET.newButton{name='reset', x=1140,y=540,w=170,h=80,font=25,code=pressKey"tab"}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index 4033358c..9b3c10c7 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -329,9 +329,9 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="mod", x=140,y=655,w=220,h=80,font=35,code=goScene'mod'}, - WIDGET.newButton{name="start",x=1040,y=655,w=180,h=80,font=40,code=pressKey"return",hideF=function()return not mapCam.sel end}, - WIDGET.newButton{name="back", x=1200,y=655,w=120,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='mod', x=140,y=655,w=220,h=80,font=35,code=goScene'mod'}, + WIDGET.newButton{name='start',x=1040,y=655,w=180,h=80,font=40,code=pressKey"return",hideF=function()return not mapCam.sel end}, + WIDGET.newButton{name='back', x=1200,y=655,w=120,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index e2ea9421..fbe13b11 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -107,21 +107,21 @@ function scene.draw() end scene.widgetList={ - 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',hideF=function()return not BGM.nowPlay end}, - WIDGET.newSlider{name="slide",x=480,y=600,w=400, + 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',hideF=function()return not BGM.nowPlay end}, + WIDGET.newSlider{name='slide',x=480,y=600,w=400, disp=function()return BGM.playing:tell()/BGM.playing:getDuration()%1 end, show=false, code=function(v)BGM.seek(v*BGM.playing:getDuration())end, hideF=function()return not BGM.nowPlay end }, - WIDGET.newSlider{name="bgm", x=760,y=80,w=400,disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.setVol(SETTING.bgm)end}, - WIDGET.newButton{name="up", x=200,y=250,w=120,code=pressKey"up",hideF=function()return selected==1 end,font=60,fText=CHAR.key.up}, - WIDGET.newButton{name="play", x=200,y=390,w=120,code=pressKey"space",font=65,fText=CHAR.icon.play_pause}, - WIDGET.newButton{name="down", x=200,y=530,w=120,code=pressKey"down",hideF=function()return selected==#bgmList end,font=60,fText=CHAR.key.down}, - WIDGET.newButton{name="sound",x=1140,y=540,w=170,h=80,font=40,code=pressKey"tab"}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newSlider{name='bgm', x=760,y=80,w=400,disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.setVol(SETTING.bgm)end}, + WIDGET.newButton{name='up', x=200,y=250,w=120,code=pressKey"up",hideF=function()return selected==1 end,font=60,fText=CHAR.key.up}, + WIDGET.newButton{name='play', x=200,y=390,w=120,code=pressKey"space",font=65,fText=CHAR.icon.play_pause}, + WIDGET.newButton{name='down', x=200,y=530,w=120,code=pressKey"down",hideF=function()return selected==#bgmList end,font=60,fText=CHAR.key.down}, + WIDGET.newButton{name='sound',x=1140,y=540,w=170,h=80,font=40,code=pressKey"tab"}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index 5cf8ec70..7ad2ac53 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -10,8 +10,8 @@ local ins=table.insert local SCR,VK,NET,NETPLY=SCR,VK,NET,NETPLY local PLAYERS,GAME=PLAYERS,GAME -local textBox=WIDGET.newTextBox{name="texts",x=340,y=80,w=600,h=560} -local inputBox=WIDGET.newInputBox{name="input",x=340,y=660,w=600,h=50,limit=256} +local textBox=WIDGET.newTextBox{name='texts',x=340,y=80,w=600,h=560} +local inputBox=WIDGET.newInputBox{name='input',x=340,y=660,w=600,h=50,limit=256} local playing local lastUpstreamTime @@ -343,12 +343,12 @@ local function _hideF_ingame2()return _hideReadyUI()or not NETPLY.getSelfReady() scene.widgetList={ textBox, inputBox, - WIDGET.newKey{name="setting", x=1200,y=160,w=90,h=90,font=60,fText=CHAR.icon.settings,code=_gotoSetting,hideF=_hideF_ingame}, - WIDGET.newKey{name="ready", x=1060,y=510,w=360,h=90,color='lG',font=35, code=_setReady,hideF=_hideF_ingame}, - WIDGET.newKey{name="spectate",x=1060,y=610,w=360,h=90,color='lO',font=35, code=_setSpectate,hideF=_hideF_ingame}, - WIDGET.newKey{name="cancel", x=1060,y=560,w=360,h=120,color='lH',font=40,code=_setCancel,hideF=_hideF_ingame2}, - WIDGET.newKey{name="chat", x=390,y=45,w=60,fText="···", code=_switchChat}, - WIDGET.newKey{name="quit", x=890,y=45,w=60,font=30,fText=CHAR.icon.cross_thick,code=_quit}, + WIDGET.newKey{name='setting', x=1200,y=160,w=90,h=90,font=60,fText=CHAR.icon.settings,code=_gotoSetting,hideF=_hideF_ingame}, + WIDGET.newKey{name='ready', x=1060,y=510,w=360,h=90,color='lG',font=35, code=_setReady,hideF=_hideF_ingame}, + WIDGET.newKey{name='spectate',x=1060,y=610,w=360,h=90,color='lO',font=35, code=_setSpectate,hideF=_hideF_ingame}, + WIDGET.newKey{name='cancel', x=1060,y=560,w=360,h=120,color='lH',font=40,code=_setCancel,hideF=_hideF_ingame2}, + WIDGET.newKey{name='chat', x=390,y=45,w=60,fText="···", code=_switchChat}, + WIDGET.newKey{name='quit', x=890,y=45,w=60,font=30,fText=CHAR.icon.cross_thick,code=_quit}, } return scene diff --git a/parts/scenes/net_league.lua b/parts/scenes/net_league.lua index 108f480e..8b441457 100644 --- a/parts/scenes/net_league.lua +++ b/parts/scenes/net_league.lua @@ -15,9 +15,9 @@ function scene.draw() drawOnlinePlayerCount() end scene.widgetList={ - WIDGET.newKey{name="setting",x=1200,y=160,w=90,h=90,font=60,fText=CHAR.icon.settings,code=goScene'setting_game'}, - WIDGET.newKey{name="match",x=640,y=500,w=760,h=140,font=60,code=function()MES.new('warn',text.notFinished)end}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='setting',x=1200,y=160,w=90,h=90,font=60,fText=CHAR.icon.settings,code=goScene'setting_game'}, + WIDGET.newKey{name='match',x=640,y=500,w=760,h=140,font=60,code=function()MES.new('warn',text.notFinished)end}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index 6c553d17..9b595c5d 100644 --- a/parts/scenes/net_menu.lua +++ b/parts/scenes/net_menu.lua @@ -16,11 +16,11 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="setting", x=1200,y=160,w=90, h=90,code=goScene'setting_game',font=60,fText=CHAR.icon.settings}, - WIDGET.newButton{name="league",x=640, y=180,w=350,h=120,font=40,color='D',code=goScene'net_league'}, - WIDGET.newButton{name="ffa", x=640, y=360,w=350,h=120,font=40,color='D',code=function()MES.new('warn',text.notFinished)--[[NET.enterRoom({name="ffa"})]]end}, - WIDGET.newButton{name="rooms", x=640, y=540,w=350,h=120,font=40,code=goScene'net_rooms'}, - WIDGET.newButton{name="logout",x=880, y=40,w=180, h=60,color='dR', + WIDGET.newKey{name='setting', x=1200,y=160,w=90, h=90,code=goScene'setting_game',font=60,fText=CHAR.icon.settings}, + WIDGET.newButton{name='league',x=640, y=180,w=350,h=120,font=40,color='D',code=goScene'net_league'}, + WIDGET.newButton{name='ffa', x=640, y=360,w=350,h=120,font=40,color='D',code=function()MES.new('warn',text.notFinished)--[[NET.enterRoom({name='ffa'})]]end}, + WIDGET.newButton{name='rooms', x=640, y=540,w=350,h=120,font=40,code=goScene'net_rooms'}, + WIDGET.newButton{name='logout',x=880, y=40,w=180, h=60,color='dR', code=function() if TIME()-lastLogoutTime<1 then if USER.uid then @@ -36,7 +36,7 @@ scene.widgetList={ lastLogoutTime=TIME() end end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index f53dbcb7..e33464a7 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -1,10 +1,10 @@ local ROOMENV=ROOMENV -local roomName=WIDGET.newText{name="roomName", x=40,y=115,align='L'} +local roomName=WIDGET.newText{name='roomName', x=40,y=115,align='L'} local roomNameBox=WIDGET.newInputBox{ x=40,y=160,w=540,h=60,limit=64} -local password=WIDGET.newText{name="password", x=40,y=255,align='L'} +local password=WIDGET.newText{name='password', x=40,y=255,align='L'} local passwordBox=WIDGET.newInputBox{ x=40,y=300,w=540,h=60,limit=64} -local description=WIDGET.newText{name="description", x=650,y=55,align='L'} +local description=WIDGET.newText{name='description', x=650,y=55,align='L'} local descriptionBox=WIDGET.newInputBox{ x=650,y=100,w=550,h=160,font=25,limit=256} local sList={ @@ -64,7 +64,7 @@ end scene.widgetScrollHeight=400 scene.widgetList={ - WIDGET.newText{name="title",x=40,y=15,font=70,align='L'}, + WIDGET.newText{name='title',x=40,y=15,font=70,align='L'}, --Room name/password/description roomName, @@ -75,42 +75,42 @@ scene.widgetList={ descriptionBox, --Selectors - WIDGET.newSelector{name="life", x=170,y=410,w=260,color='R',list=sList.life, disp=ROOMval('life'), code=ROOMsto('life')}, - WIDGET.newSelector{name="pushSpeed", x=170,y=520,w=260,color='V',list=sList.pushSpeed, disp=ROOMval('pushSpeed'), code=ROOMsto('pushSpeed')}, - WIDGET.newSelector{name="garbageSpeed", x=170,y=600,w=260,color='V',list=sList.pushSpeed, disp=ROOMval('garbageSpeed'), code=ROOMsto('garbageSpeed')}, - WIDGET.newSelector{name="visible", x=170,y=710,w=260,color='lB',list=sList.visible, disp=ROOMval('visible'), code=ROOMsto('visible')}, - WIDGET.newSelector{name="freshLimit", x=170,y=790,w=260,color='lB',list=sList.freshLimit, disp=ROOMval('freshLimit'), code=ROOMsto('freshLimit')}, + WIDGET.newSelector{name='life', x=170,y=410,w=260,color='R',list=sList.life, disp=ROOMval('life'), code=ROOMsto('life')}, + WIDGET.newSelector{name='pushSpeed', x=170,y=520,w=260,color='V',list=sList.pushSpeed, disp=ROOMval('pushSpeed'), code=ROOMsto('pushSpeed')}, + WIDGET.newSelector{name='garbageSpeed', x=170,y=600,w=260,color='V',list=sList.pushSpeed, disp=ROOMval('garbageSpeed'), code=ROOMsto('garbageSpeed')}, + WIDGET.newSelector{name='visible', x=170,y=710,w=260,color='lB',list=sList.visible, disp=ROOMval('visible'), code=ROOMsto('visible')}, + WIDGET.newSelector{name='freshLimit', x=170,y=790,w=260,color='lB',list=sList.freshLimit, disp=ROOMval('freshLimit'), code=ROOMsto('freshLimit')}, - WIDGET.newSelector{name="fieldH", x=450,y=600,w=260,color='N',list=sList.fieldH, disp=ROOMval('fieldH'), code=ROOMsto('fieldH')}, - WIDGET.newSelector{name="heightLimit", x=450,y=710,w=260,color='S',list=sList.heightLimit, disp=ROOMval('heightLimit'), code=ROOMsto('heightLimit')}, - WIDGET.newSelector{name="bufferLimit", x=450,y=790,w=260,color='B',list=sList.bufferLimit, disp=ROOMval('bufferLimit'), code=ROOMsto('bufferLimit')}, + WIDGET.newSelector{name='fieldH', x=450,y=600,w=260,color='N',list=sList.fieldH, disp=ROOMval('fieldH'), code=ROOMsto('fieldH')}, + WIDGET.newSelector{name='heightLimit', x=450,y=710,w=260,color='S',list=sList.heightLimit, disp=ROOMval('heightLimit'), code=ROOMsto('heightLimit')}, + WIDGET.newSelector{name='bufferLimit', x=450,y=790,w=260,color='B',list=sList.bufferLimit, disp=ROOMval('bufferLimit'), code=ROOMsto('bufferLimit')}, - WIDGET.newSelector{name="drop", x=730,y=330,w=260,color='O',list=sList.drop,disp=ROOMval('drop'),code=ROOMsto('drop')}, - WIDGET.newSelector{name="lock", x=730,y=410,w=260,color='O',list=sList.lock,disp=ROOMval('lock'),code=ROOMsto('lock')}, - WIDGET.newSelector{name="wait", x=730,y=520,w=260,color='G',list=sList.wait,disp=ROOMval('wait'),code=ROOMsto('wait')}, - WIDGET.newSelector{name="fall", x=730,y=600,w=260,color='G',list=sList.fall,disp=ROOMval('fall'),code=ROOMsto('fall')}, + WIDGET.newSelector{name='drop', x=730,y=330,w=260,color='O',list=sList.drop,disp=ROOMval('drop'),code=ROOMsto('drop')}, + WIDGET.newSelector{name='lock', x=730,y=410,w=260,color='O',list=sList.lock,disp=ROOMval('lock'),code=ROOMsto('lock')}, + WIDGET.newSelector{name='wait', x=730,y=520,w=260,color='G',list=sList.wait,disp=ROOMval('wait'),code=ROOMsto('wait')}, + WIDGET.newSelector{name='fall', x=730,y=600,w=260,color='G',list=sList.fall,disp=ROOMval('fall'),code=ROOMsto('fall')}, --Capacity & Create & Back - WIDGET.newSelector{name="capacity", x=1070,y=330,w=310,color='lY',list={2,3,4,5,7,10,17,31,49,99},disp=ROOMval('capacity'),code=ROOMsto('capacity')}, - WIDGET.newButton{name="create", x=1070,y=480,w=310,h=140,color='lN',font=40,code=pressKey"return"}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newSelector{name='capacity', x=1070,y=330,w=310,color='lY',list={2,3,4,5,7,10,17,31,49,99},disp=ROOMval('capacity'),code=ROOMsto('capacity')}, + WIDGET.newButton{name='create', x=1070,y=480,w=310,h=140,color='lN',font=40,code=pressKey"return"}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, --Special rules - WIDGET.newSwitch{name="ospin", x=850, y=750,lim=210,disp=ROOMval('ospin'), code=ROOMrev('ospin')}, - WIDGET.newSwitch{name="fineKill", x=850, y=840,lim=210,disp=ROOMval('fineKill'), code=ROOMrev('fineKill')}, - WIDGET.newSwitch{name="b2bKill", x=850, y=930,lim=210,disp=ROOMval('b2bKill'), code=ROOMrev('b2bKill')}, - WIDGET.newSwitch{name="easyFresh", x=1170,y=750,lim=250,disp=ROOMval('easyFresh'),code=ROOMrev('easyFresh')}, - WIDGET.newSwitch{name="deepDrop", x=1170,y=840,lim=250,disp=ROOMval('deepDrop'), code=ROOMrev('deepDrop')}, - WIDGET.newSwitch{name="bone", x=1170,y=930,lim=250,disp=ROOMval('bone'), code=ROOMrev('bone')}, + WIDGET.newSwitch{name='ospin', x=850, y=750,lim=210,disp=ROOMval('ospin'), code=ROOMrev('ospin')}, + WIDGET.newSwitch{name='fineKill', x=850, y=840,lim=210,disp=ROOMval('fineKill'), code=ROOMrev('fineKill')}, + WIDGET.newSwitch{name='b2bKill', x=850, y=930,lim=210,disp=ROOMval('b2bKill'), code=ROOMrev('b2bKill')}, + WIDGET.newSwitch{name='easyFresh', x=1170,y=750,lim=250,disp=ROOMval('easyFresh'),code=ROOMrev('easyFresh')}, + WIDGET.newSwitch{name='deepDrop', x=1170,y=840,lim=250,disp=ROOMval('deepDrop'), code=ROOMrev('deepDrop')}, + WIDGET.newSwitch{name='bone', x=1170,y=930,lim=250,disp=ROOMval('bone'), code=ROOMrev('bone')}, --Rule set - WIDGET.newSelector{name="eventSet", x=310,y=880,w=360,color='H',list=sList.eventSet,disp=ROOMval('eventSet'),code=ROOMsto('eventSet')}, + WIDGET.newSelector{name='eventSet', x=310,y=880,w=360,color='H',list=sList.eventSet,disp=ROOMval('eventSet'),code=ROOMsto('eventSet')}, --Next & Hold - WIDGET.newSlider{name="nextCount", x=140, y=960, lim=130,w=200,unit=6,disp=ROOMval('nextCount'),code=ROOMsto('nextCount')}, - WIDGET.newSlider{name="holdCount", x=140, y=1030,lim=130,w=200,unit=6,disp=ROOMval('holdCount'),code=ROOMsto('holdCount')}, - WIDGET.newSwitch{name="infHold", x=560, y=960, lim=200, disp=ROOMval('infHold'),code=ROOMrev('infHold'),hideF=function()return ROOMENV.holdCount==0 end}, - WIDGET.newSwitch{name="phyHold", x=560, y=1030,lim=200, disp=ROOMval('phyHold'),code=ROOMrev('phyHold'),hideF=function()return ROOMENV.holdCount==0 end}, + WIDGET.newSlider{name='nextCount', x=140, y=960, lim=130,w=200,unit=6,disp=ROOMval('nextCount'),code=ROOMsto('nextCount')}, + WIDGET.newSlider{name='holdCount', x=140, y=1030,lim=130,w=200,unit=6,disp=ROOMval('holdCount'),code=ROOMsto('holdCount')}, + WIDGET.newSwitch{name='infHold', x=560, y=960, lim=200, disp=ROOMval('infHold'),code=ROOMrev('infHold'),hideF=function()return ROOMENV.holdCount==0 end}, + WIDGET.newSwitch{name='phyHold', x=560, y=1030,lim=200, disp=ROOMval('phyHold'),code=ROOMrev('phyHold'),hideF=function()return ROOMENV.holdCount==0 end}, } return scene diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index ce37f0e3..0fdb1f84 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -9,7 +9,7 @@ local gc_print,gc_printf=gc.print,gc.printf local NET=NET local fetchTimer -local roomList=WIDGET.newListBox{name="roomList",x=50,y=50,w=800,h=440,lineH=40,drawF=function(item,id,ifSel) +local roomList=WIDGET.newListBox{name='roomList',x=50,y=50,w=800,h=440,lineH=40,drawF=function(item,id,ifSel) setFont(35) if ifSel then gc_setColor(1,1,1,.3) @@ -35,7 +35,7 @@ local function _hidePW() local R=roomList:getSel() return not R or not R.private end -local passwordBox=WIDGET.newInputBox{name="password",x=350,y=505,w=500,h=50,secret=true,hideF=_hidePW,limit=64} +local passwordBox=WIDGET.newInputBox{name='password',x=350,y=505,w=500,h=50,secret=true,hideF=_hidePW,limit=64} --[[roomList[n]={ rid="qwerty", @@ -144,13 +144,13 @@ end scene.widgetList={ roomList, passwordBox, - WIDGET.newKey{name="setting", x=1200,y=160,w=90,h=90,font=60,fText=CHAR.icon.settings,code=pressKey"s"}, - WIDGET.newText{name="refreshing",x=450,y=240,font=45,hideF=function()return not NET.getlock('fetchRoom')end}, - WIDGET.newText{name="noRoom", x=450,y=245,font=40,hideF=function()return roomList:getLen()>0 or NET.getlock('fetchRoom')end}, - WIDGET.newKey{name="refresh", x=250,y=630,w=140,h=120,code=_fetchRoom,hideF=function()return fetchTimer>7 end}, - WIDGET.newKey{name="new", x=510,y=630,w=260,h=120,code=pressKey"n"}, - WIDGET.newKey{name="join", x=780,y=630,w=140,h=120,code=pressKey"return",hideF=function()return roomList:getLen()==0 or NET.getlock('enterRoom')end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=pressKey"escape"}, + WIDGET.newKey{name='setting', x=1200,y=160,w=90,h=90,font=60,fText=CHAR.icon.settings,code=pressKey"s"}, + WIDGET.newText{name='refreshing',x=450,y=240,font=45,hideF=function()return not NET.getlock('fetchRoom')end}, + WIDGET.newText{name='noRoom', x=450,y=245,font=40,hideF=function()return roomList:getLen()>0 or NET.getlock('fetchRoom')end}, + WIDGET.newKey{name='refresh', x=250,y=630,w=140,h=120,code=_fetchRoom,hideF=function()return fetchTimer>7 end}, + WIDGET.newKey{name='new', x=510,y=630,w=260,h=120,code=pressKey"n"}, + WIDGET.newKey{name='join', x=780,y=630,w=140,h=120,code=pressKey"return",hideF=function()return roomList:getLen()==0 or NET.getlock('enterRoom')end}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=pressKey"escape"}, } return scene diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 2ca68e81..9361034d 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -344,23 +344,23 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="resume", x=290,y=240,w=300,h=70,code=pressKey"escape"}, - WIDGET.newKey{name="restart", x=290,y=340,w=300,h=70,code=pressKey"r",hideF=function()return GAME.fromRepMenu end}, - WIDGET.newKey{name="setting", x=290,y=440,w=300,h=70,code=pressKey"s",hideF=function()return GAME.fromRepMenu end}, - WIDGET.newKey{name="quit", x=290,y=540,w=300,h=70,code=pressKey"q"}, - WIDGET.newKey{name="tas", x=290,y=620,w=240,h=50,code=pressKey"t",hideF=function()return not SETTING.allowTAS or GAME.tasUsed or GAME.result or GAME.replaying end}, - WIDGET.newKey{name="page_prev",x=500,y=390,w=70,code=pressKey"tab",noFrame=true, + WIDGET.newKey{name='resume', x=290,y=240,w=300,h=70,code=pressKey"escape"}, + WIDGET.newKey{name='restart', x=290,y=340,w=300,h=70,code=pressKey"r",hideF=function()return GAME.fromRepMenu end}, + WIDGET.newKey{name='setting', x=290,y=440,w=300,h=70,code=pressKey"s",hideF=function()return GAME.fromRepMenu end}, + WIDGET.newKey{name='quit', x=290,y=540,w=300,h=70,code=pressKey"q"}, + WIDGET.newKey{name='tas', x=290,y=620,w=240,h=50,code=pressKey"t",hideF=function()return not SETTING.allowTAS or GAME.tasUsed or GAME.result or GAME.replaying end}, + WIDGET.newKey{name='page_prev',x=500,y=390,w=70,code=pressKey"tab",noFrame=true, fText=GC.DO{70,70,{'setLW',2}, {'dRPol',33,35,32,3,6,3.142},{'dRPol',45,35,32,3,6,3.142}}, fShade=GC.DO{70,70,{'setCL',1,1,1,.4},{'draw',GC.DO{70,70,{'setCL',1,1,1,1},{'fRPol',33,35,32,3,6,3.142},{'fRPol',45,35,32,3,6,3.142}}}}, hideF=function()return PLAYERS[1].frameRun<=180 end, }, - WIDGET.newKey{name="page_next",x=1230,y=390,w=70,code=pressKey"Stab",noFrame=true, + WIDGET.newKey{name='page_next',x=1230,y=390,w=70,code=pressKey"Stab",noFrame=true, fText=GC.DO{70,70,{'setLW',2}, {'dRPol',37,35,32,3,6},{'dRPol',25,35,32,3,6}}, fShade=GC.DO{70,70,{'setCL',1,1,1,.4},{'draw',GC.DO{70,70,{'setCL',1,1,1,1},{'fRPol',37,35,32,3,6},{'fRPol',25,35,32,3,6}}}}, hideF=function()return PLAYERS[1].frameRun<=180 end, }, - WIDGET.newKey{name="replay", x=865,y=165,w=200,h=40,font=25,code=pressKey"p",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end}, - WIDGET.newKey{name="save", x=1075,y=165,w=200,h=40,font=25,code=pressKey"o",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 or GAME.saved end}, + WIDGET.newKey{name='replay', x=865,y=165,w=200,h=40,font=25,code=pressKey"p",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end}, + WIDGET.newKey{name='save', x=1075,y=165,w=200,h=40,font=25,code=pressKey"o",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 or GAME.saved end}, } return scene diff --git a/parts/scenes/register.lua b/parts/scenes/register.lua index 4eb66bc8..28e92426 100644 --- a/parts/scenes/register.lua +++ b/parts/scenes/register.lua @@ -18,17 +18,17 @@ local function _register() end scene.widgetList={ - WIDGET.newText{name="title", x=80, y=50,font=70,align='L'}, - WIDGET.newButton{name="login", x=1140,y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('login','swipeL')end}, - WIDGET.newInputBox{name="username", x=380, y=200,w=500,h=60,regex="[0-9A-Za-z_]",limit=64}, - WIDGET.newInputBox{name="email", x=380, y=300,w=626,h=60,limit=128}, - WIDGET.newInputBox{name="password", x=380, y=400,w=626,h=60,secret=true,regex="[ -~]",limit=64}, - WIDGET.newInputBox{name="password2",x=380, y=500,w=626,h=60,secret=true,regex="[ -~]",limit=64}, + WIDGET.newText{name='title', x=80, y=50,font=70,align='L'}, + WIDGET.newButton{name='login', x=1140,y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('login','swipeL')end}, + WIDGET.newInputBox{name='username', x=380, y=200,w=500,h=60,regex="[0-9A-Za-z_]",limit=64}, + WIDGET.newInputBox{name='email', x=380, y=300,w=626,h=60,limit=128}, + WIDGET.newInputBox{name='password', x=380, y=400,w=626,h=60,secret=true,regex="[ -~]",limit=64}, + WIDGET.newInputBox{name='password2',x=380, y=500,w=626,h=60,secret=true,regex="[ -~]",limit=64}, - WIDGET.newKey{name="register", x=640, y=640,w=300,h=80,font=40,code=_register,hideF=function()return NET.getlock('register')end}, - WIDGET.newText{name="registering", x=640, y=605,font=50,hideF=function()return not NET.getlock('register')end}, + WIDGET.newKey{name='register', x=640, y=640,w=300,h=80,font=40,code=_register,hideF=function()return NET.getlock('register')end}, + WIDGET.newText{name='registering', x=640, y=605,font=50,hideF=function()return not NET.getlock('register')end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/replays.lua b/parts/scenes/replays.lua index 22a8758a..65d8abfa 100644 --- a/parts/scenes/replays.lua +++ b/parts/scenes/replays.lua @@ -6,7 +6,7 @@ local gc_print,gc_printf=gc.print,gc.printf local kb=love.keyboard local setFont=FONT.set -local listBox=WIDGET.newListBox{name="list",x=50,y=50,w=1200,h=520,lineH=40,drawF=function(rep,id,ifSel) +local listBox=WIDGET.newListBox{name='list',x=50,y=50,w=1200,h=520,lineH=40,drawF=function(rep,id,ifSel) if ifSel then gc_setColor(1,1,1,.3) gc_rectangle('fill',0,0,1200,40) @@ -152,11 +152,11 @@ end scene.widgetList={ listBox, - WIDGET.newButton{name="export",x=200,y=640,w=70,color='lG',code=pressKey"cC",font=50,fText=CHAR.icon.export}, - WIDGET.newButton{name="import",x=300,y=640,w=70,color='lN',code=pressKey"cV",font=50,fText=CHAR.icon.import}, - WIDGET.newButton{name="play", x=700,y=640,w=170,h=80,color='lY',code=pressKey"return",font=65,fText=CHAR.icon.play}, - WIDGET.newButton{name="delete",x=850,y=640,w=80,h=80,color='lR',code=pressKey"delete",font=50,fText=CHAR.icon.trash}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='export',x=200,y=640,w=70,color='lG',code=pressKey"cC",font=50,fText=CHAR.icon.export}, + WIDGET.newButton{name='import',x=300,y=640,w=70,color='lN',code=pressKey"cV",font=50,fText=CHAR.icon.import}, + WIDGET.newButton{name='play', x=700,y=640,w=170,h=80,color='lY',code=pressKey"return",font=65,fText=CHAR.icon.play}, + WIDGET.newButton{name='delete',x=850,y=640,w=80,h=80,color='lR',code=pressKey"delete",font=50,fText=CHAR.icon.trash}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index 92986200..7aa806ef 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -19,14 +19,14 @@ local function _parseCB() end end scene.widgetList={ - WIDGET.newText{name="export", x=55,y=45,color='lY',align='L',font=50}, - WIDGET.newButton{name="unlock", x=190,y=170,w=280,h=100,color='lY',code=function()_dumpCB(RANKS)end}, - WIDGET.newButton{name="data", x=490,y=170,w=280,h=100,color='lY',code=function()_dumpCB(STAT)end}, - WIDGET.newButton{name="setting", x=790,y=170,w=280,h=100,color='lY',code=function()_dumpCB(SETTING)end}, - WIDGET.newButton{name="vk", x=1090,y=170,w=280,h=100,color='lY',code=function()_dumpCB(VK_ORG)end}, + WIDGET.newText{name='export', x=55,y=45,color='lY',align='L',font=50}, + WIDGET.newButton{name='unlock', x=190,y=170,w=280,h=100,color='lY',code=function()_dumpCB(RANKS)end}, + WIDGET.newButton{name='data', x=490,y=170,w=280,h=100,color='lY',code=function()_dumpCB(STAT)end}, + WIDGET.newButton{name='setting', x=790,y=170,w=280,h=100,color='lY',code=function()_dumpCB(SETTING)end}, + WIDGET.newButton{name='vk', x=1090,y=170,w=280,h=100,color='lY',code=function()_dumpCB(VK_ORG)end}, - WIDGET.newText{name="import", x=55,y=265,color='lR',align='L',font=50}, - WIDGET.newButton{name="unlock", x=190,y=390,w=280,h=100,color='lR', + WIDGET.newText{name='import', x=55,y=265,color='lR',align='L',font=50}, + WIDGET.newButton{name='unlock', x=190,y=390,w=280,h=100,color='lR', code=function() local D=_parseCB() if D then @@ -43,7 +43,7 @@ scene.widgetList={ MES.new('error',text.dataCorrupted) end end}, - WIDGET.newButton{name="data", x=490,y=390,w=280,h=100,color='lR', + WIDGET.newButton{name='data', x=490,y=390,w=280,h=100,color='lR', code=function() local D=_parseCB() if D then @@ -54,7 +54,7 @@ scene.widgetList={ MES.new('error',text.dataCorrupted) end end}, - WIDGET.newButton{name="setting", x=790,y=390,w=280,h=100,color='lR', + WIDGET.newButton{name='setting', x=790,y=390,w=280,h=100,color='lR', code=function() local D=_parseCB() if D then @@ -66,7 +66,7 @@ scene.widgetList={ MES.new('error',text.dataCorrupted) end end}, - WIDGET.newButton{name="vk", x=1090,y=390,w=280,h=100,color='lR', + WIDGET.newButton{name='vk', x=1090,y=390,w=280,h=100,color='lR', code=function() local D=_parseCB() if D then @@ -78,11 +78,11 @@ scene.widgetList={ end end}, - WIDGET.newText{name="couldSave", x=55,y=485,color='lB',align='L',font=50}, - WIDGET.newText{name="notLogin", x=55,y=550,color='dB',align='L',font=30,hideF=function()return WS.status('user')=='running'end}, - WIDGET.newButton{name="upload", x=190,y=610,w=280,h=90,color='lB',font=25,code=NET.uploadSave,hideF=function()return WS.status('user')~='running'end}, - WIDGET.newButton{name="download", x=490,y=610,w=280,h=90,color='lB',font=25,code=NET.downloadSave,hideF=function()return WS.status('user')~='running'end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newText{name='couldSave', x=55,y=485,color='lB',align='L',font=50}, + WIDGET.newText{name='notLogin', x=55,y=550,color='dB',align='L',font=30,hideF=function()return WS.status('user')=='running'end}, + WIDGET.newButton{name='upload', x=190,y=610,w=280,h=90,color='lB',font=25,code=NET.uploadSave,hideF=function()return WS.status('user')~='running'end}, + WIDGET.newButton{name='download', x=490,y=610,w=280,h=90,color='lB',font=25,code=NET.downloadSave,hideF=function()return WS.status('user')~='running'end}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_control.lua b/parts/scenes/setting_control.lua index fbb69edc..4bb88353 100644 --- a/parts/scenes/setting_control.lua +++ b/parts/scenes/setting_control.lua @@ -86,26 +86,26 @@ local function _sliderShow(S) return S.."F "..math.floor(S*16.67).."ms" end scene.widgetList={ - WIDGET.newText{name="title", x=80, y=50,font=70,align='L'}, - WIDGET.newText{name="preview", x=520, y=610,font=40,align='R'}, + WIDGET.newText{name='title', x=80, y=50,font=70,align='L'}, + WIDGET.newText{name='preview', x=520, y=610,font=40,align='R'}, - WIDGET.newSlider{name="das", x=250, y=190,lim=230,w=600,unit=20,disp=SETval('das'), show=_sliderShow,code=SETsto('das')}, - WIDGET.newSlider{name="arr", x=250, y=260,lim=230,w=525,unit=15,disp=SETval('arr'), show=_sliderShow,code=SETsto('arr')}, - WIDGET.newSlider{name="sddas", x=250, y=330,lim=230,w=350,unit=10,disp=SETval('sddas'), show=_sliderShow,code=SETsto('sddas')}, - WIDGET.newSlider{name="sdarr", x=250, y=400,lim=230,w=140,unit=4, disp=SETval('sdarr'), show=_sliderShow,code=SETsto('sdarr')}, - WIDGET.newSlider{name="dascut", x=250, y=470,lim=230,w=600,unit=20,disp=SETval('dascut'), show=_sliderShow,code=SETsto('dascut')}, - WIDGET.newSlider{name="dropcut",x=250, y=540,lim=230,w=300,unit=10,disp=SETval('dropcut'),show=_sliderShow,code=SETsto('dropcut')}, - WIDGET.newSwitch{name="ihs", x=1100, y=260,lim=300, disp=SETval('ihs'), code=SETrev('ihs')}, - WIDGET.newSwitch{name="irs", x=1100, y=330,lim=300, disp=SETval('irs'), code=SETrev('irs')}, - WIDGET.newSwitch{name="ims", x=1100, y=400,lim=300, disp=SETval('ims'), code=SETrev('ims')}, - WIDGET.newButton{name="reset", x=160, y=640,w=200,h=100,color='lR',font=40, + WIDGET.newSlider{name='das', x=250, y=190,lim=230,w=600,unit=20,disp=SETval('das'), show=_sliderShow,code=SETsto('das')}, + WIDGET.newSlider{name='arr', x=250, y=260,lim=230,w=525,unit=15,disp=SETval('arr'), show=_sliderShow,code=SETsto('arr')}, + WIDGET.newSlider{name='sddas', x=250, y=330,lim=230,w=350,unit=10,disp=SETval('sddas'), show=_sliderShow,code=SETsto('sddas')}, + WIDGET.newSlider{name='sdarr', x=250, y=400,lim=230,w=140,unit=4, disp=SETval('sdarr'), show=_sliderShow,code=SETsto('sdarr')}, + WIDGET.newSlider{name='dascut', x=250, y=470,lim=230,w=600,unit=20,disp=SETval('dascut'), show=_sliderShow,code=SETsto('dascut')}, + WIDGET.newSlider{name='dropcut',x=250, y=540,lim=230,w=300,unit=10,disp=SETval('dropcut'),show=_sliderShow,code=SETsto('dropcut')}, + WIDGET.newSwitch{name='ihs', x=1100, y=260,lim=300, disp=SETval('ihs'), code=SETrev('ihs')}, + WIDGET.newSwitch{name='irs', x=1100, y=330,lim=300, disp=SETval('irs'), code=SETrev('irs')}, + WIDGET.newSwitch{name='ims', x=1100, y=400,lim=300, disp=SETval('ims'), code=SETrev('ims')}, + WIDGET.newButton{name='reset', x=160, y=640,w=200,h=100,color='lR',font=40, code=function() local _=SETTING _.das,_.arr,_.dascut=10,2,0 _.sddas,_.sdarr=0,2 _.ihs,_.irs,_.ims=false,false,false end}, - WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 5f5d2914..fa321998 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -31,24 +31,24 @@ function scene.draw() end scene.widgetList={ - 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='lC',font=35,code=swapScene('setting_video','swipeR')}, - WIDGET.newButton{name="sound", x=1080, y=80, w=240,h=80,color='lC',font=35,code=swapScene('setting_sound','swipeL')}, + WIDGET.newButton{name='graphic', x=200, y=80, w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeR')}, + WIDGET.newButton{name='sound', x=1080, y=80, w=240,h=80,color='lC',font=35,code=swapScene('setting_sound','swipeL')}, - WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,color='lR',font=35,code=goScene'setting_skin'}, + WIDGET.newButton{name='layout', x=250, y=540, w=200,h=70,color='lR',font=35,code=goScene'setting_skin'}, - WIDGET.newButton{name="ctrl", x=290, y=220, w=320,h=80,color='lY',font=35,code=goScene'setting_control'}, - WIDGET.newButton{name="key", x=640, y=220, w=320,h=80,color='lG',font=35,code=goScene'setting_key'}, - WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80,color='lB',font=35,code=goScene'setting_touch'}, - WIDGET.newSlider{name="reTime", x=330, y=320, w=300,lim=180,unit=10,disp=SETval('reTime'), code=SETsto('reTime'),show=function(S)return(.5+S.disp()*.25).."s"end}, - WIDGET.newSelector{name="RS", x=300, y=420, w=300,color='S', disp=SETval('RS'), code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'}}, - WIDGET.newSelector{name="menuPos", x=980, y=320, w=300,color='O', disp=SETval('menuPos'), code=SETsto('menuPos'),list={'left','middle','right'}}, - WIDGET.newSwitch{name="sysCursor" ,x=1060, y=390, lim=580, disp=SETval('sysCursor'),code=function()SETTING.sysCursor=not SETTING.sysCursor applyCursor()end}, - WIDGET.newSwitch{name="autoPause", x=1060, y=450, lim=580, disp=SETval('autoPause'),code=SETrev('autoPause')}, - WIDGET.newSwitch{name="autoSave", x=1060, y=500, lim=580, disp=SETval('autoSave'), code=SETrev('autoSave')}, - WIDGET.newSwitch{name="autoLogin", x=960, y=580, lim=480, disp=SETval('autoLogin'),code=SETrev('autoLogin')}, - WIDGET.newSwitch{name="simpMode", x=960, y=640, lim=480, disp=SETval('simpMode'), + WIDGET.newButton{name='ctrl', x=290, y=220, w=320,h=80,color='lY',font=35,code=goScene'setting_control'}, + WIDGET.newButton{name='key', x=640, y=220, w=320,h=80,color='lG',font=35,code=goScene'setting_key'}, + WIDGET.newButton{name='touch', x=990, y=220, w=320,h=80,color='lB',font=35,code=goScene'setting_touch'}, + WIDGET.newSlider{name='reTime', x=330, y=320, w=300,lim=180,unit=10,disp=SETval('reTime'), code=SETsto('reTime'),show=function(S)return(.5+S.disp()*.25).."s"end}, + WIDGET.newSelector{name='RS', x=300, y=420, w=300,color='S', disp=SETval('RS'), code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'}}, + WIDGET.newSelector{name='menuPos', x=980, y=320, w=300,color='O', disp=SETval('menuPos'), code=SETsto('menuPos'),list={'left','middle','right'}}, + WIDGET.newSwitch{name='sysCursor' ,x=1060, y=390, lim=580, disp=SETval('sysCursor'),code=function()SETTING.sysCursor=not SETTING.sysCursor applyCursor()end}, + WIDGET.newSwitch{name='autoPause', x=1060, y=450, lim=580, disp=SETval('autoPause'),code=SETrev('autoPause')}, + WIDGET.newSwitch{name='autoSave', x=1060, y=500, lim=580, disp=SETval('autoSave'), code=SETrev('autoSave')}, + WIDGET.newSwitch{name='autoLogin', x=960, y=580, lim=480, disp=SETval('autoLogin'),code=SETrev('autoLogin')}, + WIDGET.newSwitch{name='simpMode', x=960, y=640, lim=480, disp=SETval('simpMode'), code=function() SETTING.simpMode=not SETTING.simpMode for i=1,#SCN.stack,2 do @@ -58,7 +58,7 @@ scene.widgetList={ end end end}, - WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640, w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index 93aabe43..27356562 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -126,31 +126,31 @@ local function _setSel(i) end end scene.widgetList={ - WIDGET.newKey{name="a1",x=160,y=40,w=200,h=60,code=function()_setSel(1)end}, - WIDGET.newKey{name="a2",x=160,y=100,w=200,h=60,code=function()_setSel(2)end}, - WIDGET.newKey{name="a3",x=160,y=160,w=200,h=60,code=function()_setSel(3)end}, - WIDGET.newKey{name="a4",x=160,y=220,w=200,h=60,code=function()_setSel(4)end}, - WIDGET.newKey{name="a5",x=160,y=280,w=200,h=60,code=function()_setSel(5)end}, - WIDGET.newKey{name="a6",x=160,y=340,w=200,h=60,code=function()_setSel(6)end}, - WIDGET.newKey{name="a7",x=160,y=400,w=200,h=60,code=function()_setSel(7)end}, - WIDGET.newKey{name="a8",x=160,y=460,w=200,h=60,code=function()_setSel(8)end}, - WIDGET.newKey{name="a9",x=160,y=520,w=200,h=60,code=function()_setSel(9)end}, - WIDGET.newKey{name="a10",x=160,y=580,w=200,h=60,code=function()_setSel(10)end}, + WIDGET.newKey{name='a1',x=160,y=40,w=200,h=60,code=function()_setSel(1)end}, + WIDGET.newKey{name='a2',x=160,y=100,w=200,h=60,code=function()_setSel(2)end}, + WIDGET.newKey{name='a3',x=160,y=160,w=200,h=60,code=function()_setSel(3)end}, + WIDGET.newKey{name='a4',x=160,y=220,w=200,h=60,code=function()_setSel(4)end}, + WIDGET.newKey{name='a5',x=160,y=280,w=200,h=60,code=function()_setSel(5)end}, + WIDGET.newKey{name='a6',x=160,y=340,w=200,h=60,code=function()_setSel(6)end}, + WIDGET.newKey{name='a7',x=160,y=400,w=200,h=60,code=function()_setSel(7)end}, + WIDGET.newKey{name='a8',x=160,y=460,w=200,h=60,code=function()_setSel(8)end}, + WIDGET.newKey{name='a9',x=160,y=520,w=200,h=60,code=function()_setSel(9)end}, + WIDGET.newKey{name='a10',x=160,y=580,w=200,h=60,code=function()_setSel(10)end}, - WIDGET.newKey{name="a11",x=800,y=40,w=200,h=60,code=function()_setSel(11)end}, - WIDGET.newKey{name="a12",x=800,y=100,w=200,h=60,code=function()_setSel(12)end}, - WIDGET.newKey{name="a13",x=800,y=160,w=200,h=60,code=function()_setSel(13)end}, - WIDGET.newKey{name="a14",x=800,y=220,w=200,h=60,code=function()_setSel(14)end}, - WIDGET.newKey{name="a15",x=800,y=280,w=200,h=60,code=function()_setSel(15)end}, - WIDGET.newKey{name="a16",x=800,y=340,w=200,h=60,code=function()_setSel(16)end}, - WIDGET.newKey{name="a17",x=800,y=400,w=200,h=60,code=function()_setSel(17)end}, - WIDGET.newKey{name="a18",x=800,y=460,w=200,h=60,code=function()_setSel(18)end}, - WIDGET.newKey{name="a19",x=800,y=520,w=200,h=60,code=function()_setSel(19)end}, - WIDGET.newKey{name="a20",x=800,y=580,w=200,h=60,code=function()_setSel(20)end}, + WIDGET.newKey{name='a11',x=800,y=40,w=200,h=60,code=function()_setSel(11)end}, + WIDGET.newKey{name='a12',x=800,y=100,w=200,h=60,code=function()_setSel(12)end}, + WIDGET.newKey{name='a13',x=800,y=160,w=200,h=60,code=function()_setSel(13)end}, + WIDGET.newKey{name='a14',x=800,y=220,w=200,h=60,code=function()_setSel(14)end}, + WIDGET.newKey{name='a15',x=800,y=280,w=200,h=60,code=function()_setSel(15)end}, + WIDGET.newKey{name='a16',x=800,y=340,w=200,h=60,code=function()_setSel(16)end}, + WIDGET.newKey{name='a17',x=800,y=400,w=200,h=60,code=function()_setSel(17)end}, + WIDGET.newKey{name='a18',x=800,y=460,w=200,h=60,code=function()_setSel(18)end}, + WIDGET.newKey{name='a19',x=800,y=520,w=200,h=60,code=function()_setSel(19)end}, + WIDGET.newKey{name='a20',x=800,y=580,w=200,h=60,code=function()_setSel(20)end}, - WIDGET.newKey{name="restart",x=160,y=670,w=200,h=60,code=function()_setSel(0)end}, + WIDGET.newKey{name='restart',x=160,y=670,w=200,h=60,code=function()_setSel(0)end}, - WIDGET.newButton{name="back",x=1140,y=640,w=190,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=190,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua index 95b971ed..5cf473ba 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -72,39 +72,39 @@ local function _nextDir(i) end scene.widgetList={ - WIDGET.newText{name="title", x=80,y=50,font=70,align='L'}, + WIDGET.newText{name='title', x=80,y=50,font=70,align='L'}, - WIDGET.newSelector{name="skinSet",x=780,y=100,w=320,list=SKIN.getList(),disp=SETval('skinSet'),code=SETsto('skinSet')}, - WIDGET.newButton{name="prev1", x=130,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(1)end}, - WIDGET.newButton{name="prev2", x=270,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(2)end}, - WIDGET.newButton{name="prev3", x=410,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(3)end}, - WIDGET.newButton{name="prev4", x=550,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(4)end}, - WIDGET.newButton{name="prev5", x=690,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(5)end}, - WIDGET.newButton{name="prev6", x=830,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(6)end}, - WIDGET.newButton{name="prev7", x=970,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(7)end}, + WIDGET.newSelector{name='skinSet',x=780,y=100,w=320,list=SKIN.getList(),disp=SETval('skinSet'),code=SETsto('skinSet')}, + WIDGET.newButton{name='prev1', x=130,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(1)end}, + WIDGET.newButton{name='prev2', x=270,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(2)end}, + WIDGET.newButton{name='prev3', x=410,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(3)end}, + WIDGET.newButton{name='prev4', x=550,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(4)end}, + WIDGET.newButton{name='prev5', x=690,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(5)end}, + WIDGET.newButton{name='prev6', x=830,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(6)end}, + WIDGET.newButton{name='prev7', x=970,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(7)end}, - WIDGET.newButton{name="next1", x=130,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(1)end}, - WIDGET.newButton{name="next2", x=270,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(2)end}, - WIDGET.newButton{name="next3", x=410,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(3)end}, - WIDGET.newButton{name="next4", x=550,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(4)end}, - WIDGET.newButton{name="next5", x=690,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(5)end}, - WIDGET.newButton{name="next6", x=830,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(6)end}, - WIDGET.newButton{name="next7", x=970,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(7)end}, + WIDGET.newButton{name='next1', x=130,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(1)end}, + WIDGET.newButton{name='next2', x=270,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(2)end}, + WIDGET.newButton{name='next3', x=410,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(3)end}, + WIDGET.newButton{name='next4', x=550,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(4)end}, + WIDGET.newButton{name='next5', x=690,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(5)end}, + WIDGET.newButton{name='next6', x=830,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(6)end}, + WIDGET.newButton{name='next7', x=970,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(7)end}, - WIDGET.newButton{name="spin1", x=130,y=540,w=80,h=65,code=function()_nextDir(1)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name="spin2", x=270,y=540,w=80,h=65,code=function()_nextDir(2)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name="spin3", x=410,y=540,w=80,h=65,code=function()_nextDir(3)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name="spin4", x=550,y=540,w=80,h=65,code=function()_nextDir(4)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name="spin5", x=690,y=540,w=80,h=65,code=function()_nextDir(5)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name="spin6", x=825,y=540,w=80,h=65,code=function()_nextDir(6)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name="spin7", x=970,y=540,w=80,h=65,code=function()_nextDir(7)end,font=50,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin1', x=130,y=540,w=80,h=65,code=function()_nextDir(1)end,font=50,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin2', x=270,y=540,w=80,h=65,code=function()_nextDir(2)end,font=50,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin3', x=410,y=540,w=80,h=65,code=function()_nextDir(3)end,font=50,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin4', x=550,y=540,w=80,h=65,code=function()_nextDir(4)end,font=50,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin5', x=690,y=540,w=80,h=65,code=function()_nextDir(5)end,font=50,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin6', x=825,y=540,w=80,h=65,code=function()_nextDir(6)end,font=50,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin7', x=970,y=540,w=80,h=65,code=function()_nextDir(7)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name="skinR", x=200,y=640,w=220,h=80,color='lV',font=35, + WIDGET.newButton{name='skinR', x=200,y=640,w=220,h=80,color='lV',font=35, code=function() SETTING.skin={1,7,11,3,14,4,9,1,7,2,6,10,2,13,5,9,15,10,11,3,10,2,16,8,4,10,13,2,8} SFX.play('rotate') end}, - WIDGET.newButton{name="faceR", x=480,y=640,w=220,h=80,color='lR',font=35, + WIDGET.newButton{name='faceR', x=480,y=640,w=220,h=80,color='lR',font=35, code=function() for i=1,29 do SETTING.face[i]=0 @@ -114,7 +114,7 @@ scene.widgetList={ end SFX.play('hold') end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index bf652590..39223e83 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -74,28 +74,28 @@ function scene.draw() end scene.widgetList={ - 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='lC',font=35,code=swapScene('setting_game','swipeR')}, - WIDGET.newButton{name="graphic", x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeL')}, + WIDGET.newButton{name='game', x=200, y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeR')}, + WIDGET.newButton{name='graphic', x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeL')}, - WIDGET.newSlider{name="mainVol", x=300, y=170,w=420,lim=220,color='lG',disp=SETval('mainVol'), code=function(v)SETTING.mainVol=v love.audio.setVolume(SETTING.mainVol)end}, - WIDGET.newSlider{name="bgm", x=300, y=240,w=420,lim=220,color='lG',disp=SETval('bgm'), code=function(v)SETTING.bgm=v BGM.setVol(SETTING.bgm)end}, - WIDGET.newSlider{name="sfx", x=300, y=310,w=420,lim=220,color='lC',disp=SETval('sfx'), code=function(v)SETTING.sfx=v SFX.setVol(SETTING.sfx)end, change=function()SFX.play('blip_1')end}, - WIDGET.newSlider{name="stereo", x=300, y=380,w=420,lim=220,color='lC',disp=SETval('stereo'), code=function(v)SETTING.stereo=v SFX.setStereo(SETTING.stereo)end,change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,hideF=function()return SETTING.sfx==0 end}, - WIDGET.newSlider{name="spawn", x=300, y=450,w=420,lim=220,color='lC',disp=SETval('sfx_spawn'), code=function(v)SETTING.sfx_spawn=v end, change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,}, - WIDGET.newSlider{name="warn", x=300, y=520,w=420,lim=220,color='lC',disp=SETval('sfx_warn'), code=function(v)SETTING.sfx_warn=v end, change=function()SFX.fplay('warning',SETTING.sfx_warn)end}, - WIDGET.newSlider{name="vib", x=300, y=590,w=420,lim=220,color='lN',disp=SETval('vib'),unit=10,code=function(v)SETTING.vib=v end, change=function()if SETTING.vib>0 then VIB(SETTING.vib+2)end end}, - WIDGET.newSlider{name="voc", x=300, y=660,w=420,lim=220,color='lN',disp=SETval('voc'), code=function(v)SETTING.voc=v VOC.setVol(SETTING.voc)end, change=function()VOC.play('test')end}, + WIDGET.newSlider{name='mainVol', x=300, y=170,w=420,lim=220,color='lG',disp=SETval('mainVol'), code=function(v)SETTING.mainVol=v love.audio.setVolume(SETTING.mainVol)end}, + WIDGET.newSlider{name='bgm', x=300, y=240,w=420,lim=220,color='lG',disp=SETval('bgm'), code=function(v)SETTING.bgm=v BGM.setVol(SETTING.bgm)end}, + WIDGET.newSlider{name='sfx', x=300, y=310,w=420,lim=220,color='lC',disp=SETval('sfx'), code=function(v)SETTING.sfx=v SFX.setVol(SETTING.sfx)end, change=function()SFX.play('blip_1')end}, + WIDGET.newSlider{name='stereo', x=300, y=380,w=420,lim=220,color='lC',disp=SETval('stereo'), code=function(v)SETTING.stereo=v SFX.setStereo(SETTING.stereo)end,change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,hideF=function()return SETTING.sfx==0 end}, + WIDGET.newSlider{name='spawn', x=300, y=450,w=420,lim=220,color='lC',disp=SETval('sfx_spawn'), code=function(v)SETTING.sfx_spawn=v end, change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,}, + WIDGET.newSlider{name='warn', x=300, y=520,w=420,lim=220,color='lC',disp=SETval('sfx_warn'), code=function(v)SETTING.sfx_warn=v end, change=function()SFX.fplay('warning',SETTING.sfx_warn)end}, + WIDGET.newSlider{name='vib', x=300, y=590,w=420,lim=220,color='lN',disp=SETval('vib'),unit=10,code=function(v)SETTING.vib=v end, change=function()if SETTING.vib>0 then VIB(SETTING.vib+2)end end}, + WIDGET.newSlider{name='voc', x=300, y=660,w=420,lim=220,color='lN',disp=SETval('voc'), code=function(v)SETTING.voc=v VOC.setVol(SETTING.voc)end, change=function()VOC.play('test')end}, - WIDGET.newSwitch{name="autoMute", x=1150,y=180,lim=380,disp=SETval('autoMute'),code=SETrev('autoMute')}, - WIDGET.newSwitch{name="fine", x=1150,y=250,lim=380,disp=SETval('fine'),code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, + WIDGET.newSwitch{name='autoMute', x=1150,y=180,lim=380,disp=SETval('autoMute'),code=SETrev('autoMute')}, + WIDGET.newSwitch{name='fine', x=1150,y=250,lim=380,disp=SETval('fine'),code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, - WIDGET.newSelector{name="sfxPack",x=1100,y=330,w=200,color='lV',list=SFXPACKS,disp=function()return sfxPack end,code=function(i)sfxPack=i end}, - WIDGET.newButton{name="apply", x=1100,y=400,w=180,h=60,code=function()SETTING.sfxPack=sfxPack SFX.load('media/effect/'..sfxPack..'/')end,hideF=function()return SETTING.sfxPack==sfxPack end}, - WIDGET.newSelector{name="vocPack",x=1100,y=470,w=200,color='lV',list=VOCPACKS,disp=function()return vocPack end,code=function(i)vocPack=i end}, - WIDGET.newButton{name="apply", x=1100,y=540,w=180,h=60,code=function()SETTING.vocPack=vocPack VOC.load('media/vocal/'..vocPack..'/')end,hideF=function()return SETTING.vocPack==vocPack end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newSelector{name='sfxPack',x=1100,y=330,w=200,color='lV',list=SFXPACKS,disp=function()return sfxPack end,code=function(i)sfxPack=i end}, + WIDGET.newButton{name='apply', x=1100,y=400,w=180,h=60,code=function()SETTING.sfxPack=sfxPack SFX.load('media/effect/'..sfxPack..'/')end,hideF=function()return SETTING.sfxPack==sfxPack end}, + WIDGET.newSelector{name='vocPack',x=1100,y=470,w=200,color='lV',list=VOCPACKS,disp=function()return vocPack end,code=function(i)vocPack=i end}, + WIDGET.newButton{name='apply', x=1100,y=540,w=180,h=60,code=function()SETTING.vocPack=vocPack VOC.load('media/vocal/'..vocPack..'/')end,hideF=function()return SETTING.vocPack==vocPack end}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index 7fd19aa3..07a6a4a7 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -106,21 +106,21 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="default",x=530,y=90,w=200,h=80,font=35, + WIDGET.newButton{name='default',x=530,y=90,w=200,h=80,font=35, code=function() VK.changeSet(defaultSetSelect) MES.new('check',"==[ "..defaultSetSelect.." ]==") defaultSetSelect=defaultSetSelect%5+1 selected=false end}, - WIDGET.newSelector{name="snap", x=750,y=90,w=200,h=80,color='Y',list={1,10,20,40,60,80},disp=function()return snapUnit end,code=function(i)snapUnit=i end}, - WIDGET.newButton{name="option", x=530,y=190,w=200,h=80,font=60,fText=CHAR.icon.menu,code=function()SCN.go('setting_touchSwitch')end}, - WIDGET.newButton{name="back", x=750,y=190,w=200,h=80,font=60,fText=CHAR.icon.back,code=backScene}, - WIDGET.newKey{name="save1", x=475,y=290,w=90,h=70,code=_save1,font=45,fText=CHAR.icon.saveOne}, - WIDGET.newKey{name="load1", x=585,y=290,w=90,h=70,code=_load1,font=45,fText=CHAR.icon.loadOne}, - WIDGET.newKey{name="save2", x=695,y=290,w=90,h=70,code=_save2,font=45,fText=CHAR.icon.saveTwo}, - WIDGET.newKey{name="load2", x=805,y=290,w=90,h=70,code=_load2,font=45,fText=CHAR.icon.loadTwo}, - WIDGET.newSlider{name="size", x=440,y=370,w=460,unit=19,font=40,show="vkSize", + WIDGET.newSelector{name='snap', x=750,y=90,w=200,h=80,color='Y',list={1,10,20,40,60,80},disp=function()return snapUnit end,code=function(i)snapUnit=i end}, + WIDGET.newButton{name='option', x=530,y=190,w=200,h=80,font=60,fText=CHAR.icon.menu,code=function()SCN.go('setting_touchSwitch')end}, + WIDGET.newButton{name='back', x=750,y=190,w=200,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='save1', x=475,y=290,w=90,h=70,code=_save1,font=45,fText=CHAR.icon.saveOne}, + WIDGET.newKey{name='load1', x=585,y=290,w=90,h=70,code=_load1,font=45,fText=CHAR.icon.loadOne}, + WIDGET.newKey{name='save2', x=695,y=290,w=90,h=70,code=_save2,font=45,fText=CHAR.icon.saveTwo}, + WIDGET.newKey{name='load2', x=805,y=290,w=90,h=70,code=_load2,font=45,fText=CHAR.icon.loadTwo}, + WIDGET.newSlider{name='size', x=440,y=370,w=460,unit=19,font=40,show="vkSize", disp=function() return VK_ORG[selected].r/10-1 end, @@ -132,7 +132,7 @@ scene.widgetList={ hideF=function() return not selected end}, - WIDGET.newKey{name="shape", x=640,y=600,w=200,h=80,code=function()SETTING.VKSkin=VK.nextShape()end}, + WIDGET.newKey{name='shape', x=640,y=600,w=200,h=80,code=function()SETTING.VKSkin=VK.nextShape()end}, } return scene diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index bdba3071..d7eb7000 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -21,41 +21,41 @@ local function _notTrack()return not(SETTING.VKSwitch and SETTING.VKTrack)end scene.widgetScrollHeight=340 scene.widgetList={ - WIDGET.newSwitch{name="b1", x=280, y=80, lim=230,disp=_VKAdisp(1),code=_VKAcode(1)}, - WIDGET.newSwitch{name="b2", x=280, y=140, lim=230,disp=_VKAdisp(2),code=_VKAcode(2)}, - WIDGET.newSwitch{name="b3", x=280, y=200, lim=230,disp=_VKAdisp(3),code=_VKAcode(3)}, - WIDGET.newSwitch{name="b4", x=280, y=260, lim=230,disp=_VKAdisp(4),code=_VKAcode(4)}, - WIDGET.newSwitch{name="b5", x=280, y=320, lim=230,disp=_VKAdisp(5),code=_VKAcode(5)}, - WIDGET.newSwitch{name="b6", x=280, y=380, lim=230,disp=_VKAdisp(6),code=_VKAcode(6)}, - WIDGET.newSwitch{name="b7", x=280, y=440, lim=230,disp=_VKAdisp(7),code=_VKAcode(7)}, - WIDGET.newSwitch{name="b8", x=280, y=500, lim=230,disp=_VKAdisp(8),code=_VKAcode(8)}, - WIDGET.newSwitch{name="b9", x=280, y=560, lim=230,disp=_VKAdisp(9),code=_VKAcode(9)}, - WIDGET.newSwitch{name="b10", x=280, y=620, lim=230,disp=_VKAdisp(10),code=_VKAcode(10)}, - WIDGET.newSwitch{name="b11", x=580, y=80, lim=230,disp=_VKAdisp(11),code=_VKAcode(11)}, - WIDGET.newSwitch{name="b12", x=580, y=140, lim=230,disp=_VKAdisp(12),code=_VKAcode(12)}, - WIDGET.newSwitch{name="b13", x=580, y=200, lim=230,disp=_VKAdisp(13),code=_VKAcode(13)}, - WIDGET.newSwitch{name="b14", x=580, y=260, lim=230,disp=_VKAdisp(14),code=_VKAcode(14)}, - WIDGET.newSwitch{name="b15", x=580, y=320, lim=230,disp=_VKAdisp(15),code=_VKAcode(15)}, - WIDGET.newSwitch{name="b16", x=580, y=380, lim=230,disp=_VKAdisp(16),code=_VKAcode(16)}, - WIDGET.newSwitch{name="b17", x=580, y=440, lim=230,disp=_VKAdisp(17),code=_VKAcode(17)}, - WIDGET.newSwitch{name="b18", x=580, y=500, lim=230,disp=_VKAdisp(18),code=_VKAcode(18)}, - WIDGET.newSwitch{name="b19", x=580, y=560, lim=230,disp=_VKAdisp(19),code=_VKAcode(19)}, - WIDGET.newSwitch{name="b20", x=580, y=620, lim=230,disp=_VKAdisp(20),code=_VKAcode(20)}, + WIDGET.newSwitch{name='b1', x=280, y=80, lim=230,disp=_VKAdisp(1),code=_VKAcode(1)}, + WIDGET.newSwitch{name='b2', x=280, y=140, lim=230,disp=_VKAdisp(2),code=_VKAcode(2)}, + WIDGET.newSwitch{name='b3', x=280, y=200, lim=230,disp=_VKAdisp(3),code=_VKAcode(3)}, + WIDGET.newSwitch{name='b4', x=280, y=260, lim=230,disp=_VKAdisp(4),code=_VKAcode(4)}, + WIDGET.newSwitch{name='b5', x=280, y=320, lim=230,disp=_VKAdisp(5),code=_VKAcode(5)}, + WIDGET.newSwitch{name='b6', x=280, y=380, lim=230,disp=_VKAdisp(6),code=_VKAcode(6)}, + WIDGET.newSwitch{name='b7', x=280, y=440, lim=230,disp=_VKAdisp(7),code=_VKAcode(7)}, + WIDGET.newSwitch{name='b8', x=280, y=500, lim=230,disp=_VKAdisp(8),code=_VKAcode(8)}, + WIDGET.newSwitch{name='b9', x=280, y=560, lim=230,disp=_VKAdisp(9),code=_VKAcode(9)}, + WIDGET.newSwitch{name='b10', x=280, y=620, lim=230,disp=_VKAdisp(10),code=_VKAcode(10)}, + WIDGET.newSwitch{name='b11', x=580, y=80, lim=230,disp=_VKAdisp(11),code=_VKAcode(11)}, + WIDGET.newSwitch{name='b12', x=580, y=140, lim=230,disp=_VKAdisp(12),code=_VKAcode(12)}, + WIDGET.newSwitch{name='b13', x=580, y=200, lim=230,disp=_VKAdisp(13),code=_VKAcode(13)}, + WIDGET.newSwitch{name='b14', x=580, y=260, lim=230,disp=_VKAdisp(14),code=_VKAcode(14)}, + WIDGET.newSwitch{name='b15', x=580, y=320, lim=230,disp=_VKAdisp(15),code=_VKAcode(15)}, + WIDGET.newSwitch{name='b16', x=580, y=380, lim=230,disp=_VKAdisp(16),code=_VKAcode(16)}, + WIDGET.newSwitch{name='b17', x=580, y=440, lim=230,disp=_VKAdisp(17),code=_VKAcode(17)}, + WIDGET.newSwitch{name='b18', x=580, y=500, lim=230,disp=_VKAdisp(18),code=_VKAcode(18)}, + WIDGET.newSwitch{name='b19', x=580, y=560, lim=230,disp=_VKAdisp(19),code=_VKAcode(19)}, + WIDGET.newSwitch{name='b20', x=580, y=620, lim=230,disp=_VKAdisp(20),code=_VKAcode(20)}, - WIDGET.newButton{name="norm", x=840, y=80, 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=80, 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=1150, y=200, lim=400, font=40,disp=SETval('VKSwitch'),code=SETrev('VKSwitch')}, - WIDGET.newSwitch{name="icon", x=1150, y=300, lim=400, font=40,disp=SETval('VKIcon'),code=SETrev('VKIcon'),hideF=_notShow}, - WIDGET.newSlider{name="sfx", x=830, y=380, lim=160,w=400, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval('VKSFX'),code=SETsto('VKSFX'),hideF=_notShow}, - WIDGET.newSlider{name="vib", x=830, y=450, lim=160,w=400,unit=6, font=35,change=function()if SETTING.vib>0 then VIB(SETTING.vib+SETTING.VKVIB)end end,disp=SETval('VKVIB'),code=SETsto('VKVIB'),hideF=_notShow}, - WIDGET.newSlider{name="alpha", x=830, y=520, lim=160,w=400, font=40,disp=SETval('VKAlpha'),code=SETsto('VKAlpha'),hideF=_notShow}, + WIDGET.newButton{name='norm', x=840, y=80, 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=80, 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=1150, y=200, lim=400, font=40,disp=SETval('VKSwitch'),code=SETrev('VKSwitch')}, + WIDGET.newSwitch{name='icon', x=1150, y=300, lim=400, font=40,disp=SETval('VKIcon'),code=SETrev('VKIcon'),hideF=_notShow}, + WIDGET.newSlider{name='sfx', x=830, y=380, lim=160,w=400, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval('VKSFX'),code=SETsto('VKSFX'),hideF=_notShow}, + WIDGET.newSlider{name='vib', x=830, y=450, lim=160,w=400,unit=6, font=35,change=function()if SETTING.vib>0 then VIB(SETTING.vib+SETTING.VKVIB)end end,disp=SETval('VKVIB'),code=SETsto('VKVIB'),hideF=_notShow}, + WIDGET.newSlider{name='alpha', x=830, y=520, lim=160,w=400, font=40,disp=SETval('VKAlpha'),code=SETsto('VKAlpha'),hideF=_notShow}, - WIDGET.newSwitch{name="track", x=360, y=720, lim=250, font=35,disp=SETval('VKTrack'),code=SETrev('VKTrack'),hideF=_notShow}, - WIDGET.newSwitch{name="dodge", x=800, y=720, lim=250, font=35,disp=SETval('VKDodge'),code=SETrev('VKDodge'),hideF=_notTrack}, - WIDGET.newSlider{name="tchW", x=140, y=860, w=1000, font=35,disp=SETval('VKTchW'),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end,hideF=_notTrack}, - WIDGET.newSlider{name="curW", x=140, y=930, w=1000, font=35,disp=SETval('VKCurW'),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end,hideF=_notTrack}, + WIDGET.newSwitch{name='track', x=360, y=720, lim=250, font=35,disp=SETval('VKTrack'),code=SETrev('VKTrack'),hideF=_notShow}, + WIDGET.newSwitch{name='dodge', x=800, y=720, lim=250, font=35,disp=SETval('VKDodge'),code=SETrev('VKDodge'),hideF=_notTrack}, + WIDGET.newSlider{name='tchW', x=140, y=860, w=1000, font=35,disp=SETval('VKTchW'),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end,hideF=_notTrack}, + WIDGET.newSlider{name='curW', x=140, y=930, w=1000, font=35,disp=SETval('VKCurW'),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end,hideF=_notTrack}, - WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640, w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 0f8248b3..a82c2c89 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -33,64 +33,64 @@ end scene.widgetScrollHeight=900 scene.widgetList={ - 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='lC',font=35,code=swapScene('setting_sound','swipeR')}, - WIDGET.newButton{name="game", x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeL')}, + WIDGET.newButton{name='sound', x=200,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_sound','swipeR')}, + WIDGET.newButton{name='game', x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeL')}, - WIDGET.newSwitch{name="block", x=380,y=180,lim=300,disp=SETval('block'),code=SETrev('block')}, - WIDGET.newSwitch{name="smooth", x=380,y=250,lim=300,disp=SETval('smooth'),code=SETrev('smooth')}, - WIDGET.newSwitch{name="upEdge", x=380,y=320,lim=300,disp=SETval('upEdge'),code=SETrev('upEdge')}, - WIDGET.newSwitch{name="bagLine", x=380,y=390,lim=300,disp=SETval('bagLine'),code=SETrev('bagLine')}, + WIDGET.newSwitch{name='block', x=380,y=180,lim=300,disp=SETval('block'),code=SETrev('block')}, + WIDGET.newSwitch{name='smooth', x=380,y=250,lim=300,disp=SETval('smooth'),code=SETrev('smooth')}, + WIDGET.newSwitch{name='upEdge', x=380,y=320,lim=300,disp=SETval('upEdge'),code=SETrev('upEdge')}, + WIDGET.newSwitch{name='bagLine', x=380,y=390,lim=300,disp=SETval('bagLine'),code=SETrev('bagLine')}, - WIDGET.newSelector{name="ghostType", x=915,y=180, w=350,list={'color','gray','colorCell','grayCell','colorLine','grayLine'},disp=SETval('ghostType'),code=SETsto('ghostType')}, - WIDGET.newSlider{name="ghost", x=740,y=240,lim=280,w=350,unit=1,disp=SETval('ghost'), show="percent",code=SETsto('ghost')}, - WIDGET.newSlider{name="center", x=740,y=300,lim=280,w=350,unit=1,disp=SETval('center'), show="percent",code=SETsto('center')}, - WIDGET.newSlider{name="grid", x=740,y=360,lim=280,w=350,unit=.4,disp=SETval('grid'), show="percent",code=SETsto('grid')}, - WIDGET.newSlider{name="lineNum", x=740,y=420,lim=280,w=350,unit=1,disp=SETval('lineNum'), show="percent",code=SETsto('lineNum')}, + WIDGET.newSelector{name='ghostType', x=915,y=180, w=350,list={'color','gray','colorCell','grayCell','colorLine','grayLine'},disp=SETval('ghostType'),code=SETsto('ghostType')}, + WIDGET.newSlider{name='ghost', x=740,y=240,lim=280,w=350,unit=1,disp=SETval('ghost'), show="percent",code=SETsto('ghost')}, + WIDGET.newSlider{name='center', x=740,y=300,lim=280,w=350,unit=1,disp=SETval('center'), show="percent",code=SETsto('center')}, + WIDGET.newSlider{name='grid', x=740,y=360,lim=280,w=350,unit=.4,disp=SETval('grid'), show="percent",code=SETsto('grid')}, + WIDGET.newSlider{name='lineNum', x=740,y=420,lim=280,w=350,unit=1,disp=SETval('lineNum'), show="percent",code=SETsto('lineNum')}, - WIDGET.newSlider{name="lockFX", x=330,y=460,lim=280,w=540,unit=5,disp=SETval('lockFX'), code=SETsto('lockFX')}, - WIDGET.newSlider{name="dropFX", x=330,y=520,lim=280,w=540,unit=5,disp=SETval('dropFX'), code=SETsto('dropFX')}, - WIDGET.newSlider{name="moveFX", x=330,y=580,lim=280,w=540,unit=5,disp=SETval('moveFX'), code=SETsto('moveFX')}, - WIDGET.newSlider{name="clearFX", x=330,y=640,lim=280,w=540,unit=5,disp=SETval('clearFX'), code=SETsto('clearFX')}, - WIDGET.newSlider{name="splashFX", x=330,y=700,lim=280,w=540,unit=5,disp=SETval('splashFX'), code=SETsto('splashFX')}, - WIDGET.newSlider{name="shakeFX", x=330,y=760,lim=280,w=540,unit=5,disp=SETval('shakeFX'), code=SETsto('shakeFX')}, - WIDGET.newSlider{name="atkFX", x=330,y=820,lim=280,w=540,unit=5,disp=SETval('atkFX'), code=SETsto('atkFX')}, + WIDGET.newSlider{name='lockFX', x=330,y=460,lim=280,w=540,unit=5,disp=SETval('lockFX'), code=SETsto('lockFX')}, + WIDGET.newSlider{name='dropFX', x=330,y=520,lim=280,w=540,unit=5,disp=SETval('dropFX'), code=SETsto('dropFX')}, + WIDGET.newSlider{name='moveFX', x=330,y=580,lim=280,w=540,unit=5,disp=SETval('moveFX'), code=SETsto('moveFX')}, + WIDGET.newSlider{name='clearFX', x=330,y=640,lim=280,w=540,unit=5,disp=SETval('clearFX'), code=SETsto('clearFX')}, + WIDGET.newSlider{name='splashFX', x=330,y=700,lim=280,w=540,unit=5,disp=SETval('splashFX'), code=SETsto('splashFX')}, + WIDGET.newSlider{name='shakeFX', x=330,y=760,lim=280,w=540,unit=5,disp=SETval('shakeFX'), code=SETsto('shakeFX')}, + WIDGET.newSlider{name='atkFX', x=330,y=820,lim=280,w=540,unit=5,disp=SETval('atkFX'), code=SETsto('atkFX')}, - WIDGET.newSelector{name="frame", x=400,y=890,lim=280,w=460,list={8,10,13,17,22,29,37,47,62,80,100},disp=SETval('frameMul'),code=SETsto('frameMul')}, - WIDGET.newSwitch{name="FTlock", x=950,y=890,lim=290,disp=SETval('FTLock'), code=SETrev('FTLock')}, + WIDGET.newSelector{name='frame', x=400,y=890,lim=280,w=460,list={8,10,13,17,22,29,37,47,62,80,100},disp=SETval('frameMul'),code=SETsto('frameMul')}, + WIDGET.newSwitch{name='FTlock', x=950,y=890,lim=290,disp=SETval('FTLock'), code=SETrev('FTLock')}, - WIDGET.newSwitch{name="text", x=450,y=980,lim=360,disp=SETval('text'), code=SETrev('text')}, - WIDGET.newSwitch{name="score", x=450,y=1030,lim=360,disp=SETval('score'), code=SETrev('score')}, - WIDGET.newSwitch{name="bufferWarn", x=450,y=1100,lim=360,disp=SETval('bufferWarn'), code=SETrev('bufferWarn')}, - WIDGET.newSwitch{name="showSpike", x=450,y=1150,lim=360,disp=SETval('showSpike'), code=SETrev('showSpike')}, - WIDGET.newSwitch{name="nextPos", x=450,y=1220,lim=360,disp=SETval('nextPos'), code=SETrev('nextPos')}, - WIDGET.newSwitch{name="highCam", x=450,y=1270,lim=360,disp=SETval('highCam'), code=SETrev('highCam')}, - WIDGET.newSwitch{name="warn", x=450,y=1340,lim=360,disp=SETval('warn'), code=SETrev('warn')}, + WIDGET.newSwitch{name='text', x=450,y=980,lim=360,disp=SETval('text'), code=SETrev('text')}, + WIDGET.newSwitch{name='score', x=450,y=1030,lim=360,disp=SETval('score'), code=SETrev('score')}, + WIDGET.newSwitch{name='bufferWarn', x=450,y=1100,lim=360,disp=SETval('bufferWarn'), code=SETrev('bufferWarn')}, + WIDGET.newSwitch{name='showSpike', x=450,y=1150,lim=360,disp=SETval('showSpike'), code=SETrev('showSpike')}, + WIDGET.newSwitch{name='nextPos', x=450,y=1220,lim=360,disp=SETval('nextPos'), code=SETrev('nextPos')}, + WIDGET.newSwitch{name='highCam', x=450,y=1270,lim=360,disp=SETval('highCam'), code=SETrev('highCam')}, + WIDGET.newSwitch{name='warn', x=450,y=1340,lim=360,disp=SETval('warn'), code=SETrev('warn')}, - WIDGET.newSwitch{name="clickFX", x=950,y=980,lim=360,disp=SETval('clickFX'), code=SETrev('clickFX')}, - WIDGET.newSwitch{name="power", x=950,y=1070,lim=360,disp=SETval('powerInfo'), code=SETrev('powerInfo')}, - WIDGET.newSwitch{name="clean", x=950,y=1160,lim=360,disp=SETval('cleanCanvas'), code=SETrev('cleanCanvas')}, - WIDGET.newSwitch{name="fullscreen", x=950,y=1250,lim=360,disp=SETval('fullscreen'), code=function()SETTING.fullscreen=not SETTING.fullscreen applyFullscreen()end}, - WIDGET.newSwitch{name="bg", x=950,y=1340,lim=360,disp=SETval('bg'), + WIDGET.newSwitch{name='clickFX', x=950,y=980,lim=360,disp=SETval('clickFX'), code=SETrev('clickFX')}, + WIDGET.newSwitch{name='power', x=950,y=1070,lim=360,disp=SETval('powerInfo'), code=SETrev('powerInfo')}, + WIDGET.newSwitch{name='clean', x=950,y=1160,lim=360,disp=SETval('cleanCanvas'), code=SETrev('cleanCanvas')}, + WIDGET.newSwitch{name='fullscreen', x=950,y=1250,lim=360,disp=SETval('fullscreen'), code=function()SETTING.fullscreen=not SETTING.fullscreen applyFullscreen()end}, + WIDGET.newSwitch{name='bg', x=950,y=1340,lim=360,disp=SETval('bg'), code=function() BG.set('none') SETTING.bg=not SETTING.bg BG.set() end}, - WIDGET.newSelector{name="blockSatur", x=800,y=1440,w=300,color='lN', + WIDGET.newSelector{name='blockSatur', x=800,y=1440,w=300,color='lN', list={'normal','soft','gray','light','color'}, disp=SETval('blockSatur'), code=function(v)SETTING.blockSatur=v;applyBlockSatur(SETTING.blockSatur)end }, - WIDGET.newSelector{name="fieldSatur", x=800,y=1540,w=300,color='lN', + WIDGET.newSelector{name='fieldSatur', x=800,y=1540,w=300,color='lN', list={'normal','soft','gray','light','color'}, disp=SETval('fieldSatur'), code=function(v)SETTING.fieldSatur=v;applyFieldSatur(SETTING.fieldSatur)end }, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/staff.lua b/parts/scenes/staff.lua index cfc614ae..71984ace 100644 --- a/parts/scenes/staff.lua +++ b/parts/scenes/staff.lua @@ -94,7 +94,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua index 0aea3ee6..c042d70a 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -121,7 +121,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="path",x=820,y=540,w=250,h=80,font=25, + WIDGET.newButton{name='path',x=820,y=540,w=250,h=80,font=25, code=function() if SYSTEM=="Windows"or SYSTEM=="Linux"then love.system.openURL(SAVEDIR) @@ -130,8 +130,8 @@ scene.widgetList={ end end }, - WIDGET.newButton{name="save",x=820,y=640,w=250,h=80,font=25,code=goScene'savedata'}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='save',x=820,y=640,w=250,h=80,font=25,code=goScene'savedata'}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } return scene