diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index fda33727..4fe3614e 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -539,12 +539,7 @@ return{ custom_sequence={ title="Custom Game", subTitle="Sequence", - sequence="Sequence", - - Z="Z",S="S",J="J",L="L",T="T",O="O",I="I",left="←",right="→",ten="→→",backsp="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,fText=TEXTURE.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_UTTT.lua b/parts/scenes/app_UTTT.lua index cd364e67..11adfe2d 100644 --- a/parts/scenes/app_UTTT.lua +++ b/parts/scenes/app_UTTT.lua @@ -231,7 +231,7 @@ 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,fText=TEXTURE.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_arithmetic.lua b/parts/scenes/app_arithmetic.lua index f0cb3496..2913c68c 100644 --- a/parts/scenes/app_arithmetic.lua +++ b/parts/scenes/app_arithmetic.lua @@ -215,7 +215,7 @@ scene.widgetList={ 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,fText=TEXTURE.back,code=pressKey"escape"}, + 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 13089988..77e13144 100644 --- a/parts/scenes/app_calc.lua +++ b/parts/scenes/app_calc.lua @@ -139,7 +139,7 @@ scene.widgetList={ 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,fText=TEXTURE.back,code=backScene}, + 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 02443384..0fd37aa6 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,fText=TEXTURE.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_cubefield.lua b/parts/scenes/app_cubefield.lua index 4af56d7c..90609aaf 100644 --- a/parts/scenes/app_cubefield.lua +++ b/parts/scenes/app_cubefield.lua @@ -315,7 +315,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="back",x=1140,y=80,w=170,h=80,fText=TEXTURE.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 ac4ef9da..833134b4 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,fText=TEXTURE.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 f6fc749b..9bde45a2 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -383,7 +383,7 @@ scene.widgetList={ 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,fText=TEXTURE.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 78861183..63bf428c 100644 --- a/parts/scenes/app_link.lua +++ b/parts/scenes/app_link.lua @@ -402,7 +402,7 @@ 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,h=60,fText=TEXTURE.back,code=pressKey"escape"}, + 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 0eba0bfb..a0d56338 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',fText=TEXTURE.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 e3b22064..bd3367ab 100644 --- a/parts/scenes/app_pong.lua +++ b/parts/scenes/app_pong.lua @@ -177,7 +177,7 @@ 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,fText=TEXTURE.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_reflect.lua b/parts/scenes/app_reflect.lua index 74d23924..afe18738 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,fText=TEXTURE.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 50940282..4bda41a3 100644 --- a/parts/scenes/app_schulteG.lua +++ b/parts/scenes/app_schulteG.lua @@ -171,7 +171,7 @@ scene.widgetList={ 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,fText=TEXTURE.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_tap.lua b/parts/scenes/app_tap.lua index 4608a353..89f5810c 100644 --- a/parts/scenes/app_tap.lua +++ b/parts/scenes/app_tap.lua @@ -72,7 +72,7 @@ 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,fText=TEXTURE.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_ten.lua b/parts/scenes/app_ten.lua index 2e8a83ed..c1ea2de3 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -306,7 +306,7 @@ scene.widgetList={ 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,fText=TEXTURE.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/customGame.lua b/parts/scenes/customGame.lua index 18e3b00b..d9406799 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -221,7 +221,7 @@ scene.widgetList={ 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,fText=TEXTURE.back,code=pressKey"escape"}, + 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')}, diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index fc32637d..babc84f9 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -501,7 +501,7 @@ scene.widgetList={ 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,fText=TEXTURE.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 c3f03d37..746add9c 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -232,16 +232,16 @@ scene.widgetList={ 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"}, - WIDGET.newKey{name="right", x=900, y=440,w=90, color='lG',font=55,code=pressKey"right"}, - WIDGET.newKey{name="ten", x=1000,y=440,w=90, color='lG',font=40,code=pressKey"ten"}, - WIDGET.newKey{name="backsp", x=1000,y=540,w=90, color='lY',font=50,code=pressKey"backspace"}, - WIDGET.newKey{name="reset", x=1000,y=640,w=90, color='lY',font=50,code=pressKey"delete"}, + 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_or_delete}, + WIDGET.newKey{name="reset", x=1000,y=640,w=90, color='lY',font=60,code=pressKey"delete",fText=CHAR.key.clear}, WIDGET.newButton{name="copy", x=1140,y=440,w=170,h=80,color='lR',font=40,code=pressKey"cC",hideF=function()return #MISSION==0 end}, WIDGET.newButton{name="paste", x=1140,y=540,w=170,h=80,color='lB',font=40,code=pressKey"cV"}, 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,fText=TEXTURE.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 42947098..9ae11e56 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -195,48 +195,48 @@ scene.widgetList={ disp=CUSval('sequence'),code=CUSsto('sequence') }, - WIDGET.newKey{name="Z", x=120,y=460,w=80,font=50,code=pressKey(1)}, - WIDGET.newKey{name="S", x=200,y=460,w=80,font=50,code=pressKey(2)}, - WIDGET.newKey{name="J", x=280,y=460,w=80,font=50,code=pressKey(3)}, - WIDGET.newKey{name="L", x=360,y=460,w=80,font=50,code=pressKey(4)}, - WIDGET.newKey{name="T", x=440,y=460,w=80,font=50,code=pressKey(5)}, - WIDGET.newKey{name="O", x=520,y=460,w=80,font=50,code=pressKey(6)}, - WIDGET.newKey{name="I", x=600,y=460,w=80,font=50,code=pressKey(7)}, - WIDGET.newKey{name="left", x=680,y=460,w=80,color='lG',font=55,code=pressKey"left"}, - WIDGET.newKey{name="right", x=760,y=460,w=80,color='lG',font=55,code=pressKey"right"}, - WIDGET.newKey{name="ten", x=840,y=460,w=80,color='lG',font=40,code=pressKey"ten"}, - WIDGET.newKey{name="backsp",x=920,y=460,w=80,color='lY',font=50,code=pressKey"backspace"}, - WIDGET.newKey{name="reset", x=1000,y=460,w=80,color='lY',font=25,code=pressKey"delete"}, + WIDGET.newKey{name="Z", x=120,y=460,w=80,font=90,code=pressKey(1),fText=CHAR.mino.Z}, + WIDGET.newKey{name="S", x=200,y=460,w=80,font=90,code=pressKey(2),fText=CHAR.mino.S}, + WIDGET.newKey{name="J", x=280,y=460,w=80,font=90,code=pressKey(3),fText=CHAR.mino.J}, + WIDGET.newKey{name="L", x=360,y=460,w=80,font=90,code=pressKey(4),fText=CHAR.mino.L}, + WIDGET.newKey{name="T", x=440,y=460,w=80,font=90,code=pressKey(5),fText=CHAR.mino.T}, + WIDGET.newKey{name="O", x=520,y=460,w=80,font=90,code=pressKey(6),fText=CHAR.mino.O}, + WIDGET.newKey{name="I", x=600,y=460,w=80,font=90,code=pressKey(7),fText=CHAR.mino.I}, + WIDGET.newKey{name="left", x=680,y=460,w=80,color='lG',font=55,code=pressKey"left",fText=CHAR.key.left}, + WIDGET.newKey{name="right", x=760,y=460,w=80,color='lG',font=55,code=pressKey"right",fText=CHAR.key.right}, + WIDGET.newKey{name="ten", x=840,y=460,w=80,color='lG',font=55,code=pressKey"ten",fText=CHAR.key.macTab}, + WIDGET.newKey{name="backsp",x=920,y=460,w=80,color='lY',font=55,code=pressKey"backspace",fText=CHAR.key.backspace_or_delete}, + WIDGET.newKey{name="reset", x=1000,y=460,w=80,color='lY',font=60,code=pressKey"delete",fText=CHAR.key.clear}, - WIDGET.newKey{name="Z5", x=120,y=550,w=80,color='lH',font=50,code=pressKey(8)}, - WIDGET.newKey{name="S5", x=200,y=550,w=80,color='lH',font=50,code=pressKey(9)}, - WIDGET.newKey{name="P", x=280,y=550,w=80,color='lH',font=50,code=pressKey(10)}, - WIDGET.newKey{name="Q", x=360,y=550,w=80,color='lH',font=50,code=pressKey(11)}, - WIDGET.newKey{name="F", x=440,y=550,w=80,color='lH',font=50,code=pressKey(12)}, - WIDGET.newKey{name="E", x=520,y=550,w=80,color='lH',font=50,code=pressKey(13)}, - WIDGET.newKey{name="T5", x=600,y=550,w=80,color='lH',font=50,code=pressKey(14)}, - WIDGET.newKey{name="U", x=680,y=550,w=80,color='lH',font=50,code=pressKey(15)}, - WIDGET.newKey{name="V", x=760,y=550,w=80,color='lH',font=50,code=pressKey(16)}, - WIDGET.newKey{name="I3", x=840,y=550,w=80,color='H',font=50,code=pressKey(26)}, - WIDGET.newKey{name="C", x=920,y=550,w=80,color='H',font=50,code=pressKey(27)}, - WIDGET.newKey{name="rnd", x=1000,y=550,w=80,color='R',font=25,code=pressKey"="}, + WIDGET.newKey{name="Z5", x=120,y=550,w=80,color='lH',font=65,code=pressKey(8),fText=CHAR.mino.Z5}, + WIDGET.newKey{name="S5", x=200,y=550,w=80,color='lH',font=65,code=pressKey(9),fText=CHAR.mino.S5}, + WIDGET.newKey{name="P", x=280,y=550,w=80,color='lH',font=65,code=pressKey(10),fText=CHAR.mino.P}, + WIDGET.newKey{name="Q", x=360,y=550,w=80,color='lH',font=65,code=pressKey(11),fText=CHAR.mino.Q}, + WIDGET.newKey{name="F", x=440,y=550,w=80,color='lH',font=65,code=pressKey(12),fText=CHAR.mino.F}, + WIDGET.newKey{name="E", x=520,y=550,w=80,color='lH',font=65,code=pressKey(13),fText=CHAR.mino.E}, + WIDGET.newKey{name="T5", x=600,y=550,w=80,color='lH',font=65,code=pressKey(14),fText=CHAR.mino.T5}, + WIDGET.newKey{name="U", x=680,y=550,w=80,color='lH',font=65,code=pressKey(15),fText=CHAR.mino.U}, + WIDGET.newKey{name="V", x=760,y=550,w=80,color='lH',font=65,code=pressKey(16),fText=CHAR.mino.V}, + WIDGET.newKey{name="I3", x=840,y=550,w=80,color='H',font=90,code=pressKey(26),fText=CHAR.mino.I3}, + WIDGET.newKey{name="C", x=920,y=550,w=80,color='H',font=90,code=pressKey(27),fText=CHAR.mino.C}, + WIDGET.newKey{name="rnd", x=1000,y=550,w=80,color='R',font=70,code=pressKey"=",fText=CHAR.icon.mrz}, - WIDGET.newKey{name="W", x=120,y=640,w=80,color='lH',font=50,code=pressKey(17)}, - WIDGET.newKey{name="X", x=200,y=640,w=80,color='lH',font=50,code=pressKey(18)}, - WIDGET.newKey{name="J5", x=280,y=640,w=80,color='lH',font=50,code=pressKey(19)}, - WIDGET.newKey{name="L5", x=360,y=640,w=80,color='lH',font=50,code=pressKey(20)}, - WIDGET.newKey{name="R", x=440,y=640,w=80,color='lH',font=50,code=pressKey(21)}, - WIDGET.newKey{name="Y", x=520,y=640,w=80,color='lH',font=50,code=pressKey(22)}, - WIDGET.newKey{name="N", x=600,y=640,w=80,color='lH',font=50,code=pressKey(23)}, - WIDGET.newKey{name="H", x=680,y=640,w=80,color='lH',font=50,code=pressKey(24)}, - WIDGET.newKey{name="I5", x=760,y=640,w=80,color='lH',font=50,code=pressKey(25)}, - WIDGET.newKey{name="I2", x=840,y=640,w=80,color='dH',font=50,code=pressKey(28)}, - WIDGET.newKey{name="O1", x=920,y=640,w=80,color='dH',font=50,code=pressKey(29)}, + WIDGET.newKey{name="W", x=120,y=640,w=80,color='lH',font=65,code=pressKey(17),fText=CHAR.mino.W}, + WIDGET.newKey{name="X", x=200,y=640,w=80,color='lH',font=65,code=pressKey(18),fText=CHAR.mino.X}, + WIDGET.newKey{name="J5", x=280,y=640,w=80,color='lH',font=65,code=pressKey(19),fText=CHAR.mino.J5}, + WIDGET.newKey{name="L5", x=360,y=640,w=80,color='lH',font=65,code=pressKey(20),fText=CHAR.mino.L5}, + WIDGET.newKey{name="R", x=440,y=640,w=80,color='lH',font=65,code=pressKey(21),fText=CHAR.mino.R}, + WIDGET.newKey{name="Y", x=520,y=640,w=80,color='lH',font=65,code=pressKey(22),fText=CHAR.mino.Y}, + WIDGET.newKey{name="N", x=600,y=640,w=80,color='lH',font=65,code=pressKey(23),fText=CHAR.mino.N}, + WIDGET.newKey{name="H", x=680,y=640,w=80,color='lH',font=65,code=pressKey(24),fText=CHAR.mino.H}, + WIDGET.newKey{name="I5", x=760,y=640,w=80,color='lH',font=65,code=pressKey(25),fText=CHAR.mino.I5}, + WIDGET.newKey{name="I2", x=840,y=640,w=80,color='dH',font=100,code=pressKey(28),fText=CHAR.mino.I2}, + WIDGET.newKey{name="O1", x=920,y=640,w=80,color='dH',font=100,code=pressKey(29),fText=CHAR.mino.O1}, WIDGET.newButton{name="copy", x=1140,y=460,w=170,h=80,color='lR',font=40,code=pressKey"cC",hideF=function()return #BAG==0 end}, WIDGET.newButton{name="paste",x=1140,y=550,w=170,h=80,color='lB',font=40,code=pressKey"cV"}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.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/depause.lua b/parts/scenes/depause.lua index 5978ad61..2219b5eb 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,fText=TEXTURE.game.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 95f6ddc8..cb6ab29b 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -187,7 +187,7 @@ scene.widgetList={ 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,fText=TEXTURE.back,code=backScene}, + 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 7fdbcee3..69045de9 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=35,code=goScene'app_console'}, - WIDGET.newKey{name="quit",x=1140,y=640,w=170,h=80,font=35,code=backScene}, + 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.thick_cross,code=backScene}, } return scene diff --git a/parts/scenes/game.lua b/parts/scenes/game.lua index 6fb818b9..db651ce3 100644 --- a/parts/scenes/game.lua +++ b/parts/scenes/game.lua @@ -379,7 +379,6 @@ function scene.draw() --Warning drawWarning() end - scene.widgetList={ WIDGET.newKey{name="rep0", x=40,y=50,w=60, code=_rep0, fText=TEXTURE.rep.rep0}, WIDGET.newKey{name="repP8", x=105,y=50,w=60,code=_repP8, fText=TEXTURE.rep.repP8}, @@ -387,9 +386,9 @@ scene.widgetList={ WIDGET.newKey{name="rep1", x=235,y=50,w=60,code=_rep1, fText=TEXTURE.rep.rep1}, WIDGET.newKey{name="rep2", x=300,y=50,w=60,code=_rep2, fText=TEXTURE.rep.rep2}, WIDGET.newKey{name="rep5", x=365,y=50,w=60,code=_rep5, fText=TEXTURE.rep.rep5}, - WIDGET.newKey{name="step", x=430,y=50,w=60,code=_step, fText=TEXTURE.rep.step}, - WIDGET.newKey{name="restart",x=0,y=45,w=60, code=_restart, fText=TEXTURE.game.restart}, - WIDGET.newKey{name="pause", x=0,y=45,w=60, code=pauseGame,fText=TEXTURE.game.pause}, + WIDGET.newKey{name="step", x=430,y=50,w=60,code=_step, font=35,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 5792bd08..9f92b43a 100644 --- a/parts/scenes/history.lua +++ b/parts/scenes/history.lua @@ -24,7 +24,7 @@ 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,fText=TEXTURE.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/lang.lua b/parts/scenes/lang.lua index 3f9019e5..38097a79 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.grass, color='lG',font=35,code=function()_setLang('grass')end}, WIDGET.newButton{x=420,y=550,w=200,h=120,fText=langList.yygq, color='D', font=35,code=function()_setLang('yygq')end}, WIDGET.newButton{x=640,y=550,w=200,h=120,fText=langList.symbol,color='dH',font=35,code=function()_setLang('symbol')end}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.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 7d9e71bc..6d86ba02 100644 --- a/parts/scenes/launchpad.lua +++ b/parts/scenes/launchpad.lua @@ -223,7 +223,7 @@ scene.widgetList={ WIDGET.newSlider{name="voc", x=1000,y=220,lim=130,w=250,disp=SETval('voc'),code=SETsto('voc'),change=function()VOC.play('test')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,fText=TEXTURE.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/login.lua b/parts/scenes/login.lua index 63e55f3e..db96704e 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -36,7 +36,7 @@ scene.widgetList={ 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,fText=TEXTURE.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/main.lua b/parts/scenes/main.lua index 970898bc..508f4446 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -196,10 +196,10 @@ scene.widgetList={ 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",fText=TEXTURE.music}, - WIDGET.newButton{name="lang", x=280,y=80,w=100, color='lN',code=pressKey"3",fText=TEXTURE.language}, - WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color='lB',align='R',edge=30,code=pressKey"x",fText=TEXTURE.info}, - WIDGET.newButton{name="manual", x=1390,y=670,w=600,h=70, color='lR',align='L',edge=30,code=pressKey"m",fText=TEXTURE.question}, + 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 9babb22f..7fb8d3c9 100644 --- a/parts/scenes/main_simple.lua +++ b/parts/scenes/main_simple.lua @@ -20,10 +20,10 @@ scene.widgetList={ 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,fText=TEXTURE.setting,code=goScene'setting_game'}, - WIDGET.newButton{name="lang", x=1000,y=560,w=120,fText=TEXTURE.language,code=goScene'lang'}, + 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="manual", x=1160,y=400,w=120,fText=TEXTURE.sure,code=goScene'manual'}, - WIDGET.newButton{name="quit", x=1160,y=560,w=120,fText=TEXTURE.quit,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end}, + WIDGET.newButton{name="quit", x=1160,y=560,w=120,font=60,fText=CHAR.icon.thick_cross,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 cbb06ee6..140df538 100644 --- a/parts/scenes/manual.lua +++ b/parts/scenes/manual.lua @@ -24,7 +24,7 @@ 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,fText=TEXTURE.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/mod.lua b/parts/scenes/mod.lua index eb7b9313..300ad194 100644 --- a/parts/scenes/mod.lua +++ b/parts/scenes/mod.lua @@ -158,7 +158,7 @@ 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,fText=TEXTURE.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/mode.lua b/parts/scenes/mode.lua index f3ac6179..896c80b8 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -332,7 +332,7 @@ 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,fText=TEXTURE.back,code=backScene}, + 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 11d4dede..83e85f84 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -115,11 +115,11 @@ scene.widgetList={ 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.freshVolume()end}, - WIDGET.newButton{name="up", x=200,y=250,w=120,code=pressKey"up",hideF=function()return selected==1 end,fText=GC.DO{32,32,{'setLW',4},{'line',2,28,16,4,30,28}}}, - WIDGET.newButton{name="play", x=200,y=390,w=120,code=pressKey"space",fText=GC.DO{64,64,{'fPoly',14+3,10,14+3,54,55+3,32}}}, - WIDGET.newButton{name="down", x=200,y=530,w=120,code=pressKey"down",hideF=function()return selected==#bgmList end,fText=GC.DO{32,32,{'setLW',4},{'line',2,4,16,28,30,4}}}, + 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,fText=TEXTURE.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_game.lua b/parts/scenes/net_game.lua index 221b462b..006f1442 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -339,12 +339,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,fText=TEXTURE.setting,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="...",font=35, code=_switchChat}, - WIDGET.newKey{name="quit", x=890,y=45,w=60,fText=TEXTURE.quit_small, 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.thick_cross,code=_quit}, } return scene diff --git a/parts/scenes/net_league.lua b/parts/scenes/net_league.lua index 0cca0cdc..108f480e 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",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=goScene'setting_game'}, + 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,fText=TEXTURE.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_menu.lua b/parts/scenes/net_menu.lua index 77d457c1..6c553d17 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",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=goScene'setting_game'}, + 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.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,fText=TEXTURE.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 0b35225f..4d8e7fe2 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -93,7 +93,7 @@ scene.widgetList={ --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,fText=TEXTURE.back,code=backScene}, + 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')}, diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index f87f5ad3..b7265291 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -144,13 +144,13 @@ end scene.widgetList={ roomList, passwordBox, - WIDGET.newKey{name="setting", x=1200,y=160,w=90,h=90,fText=TEXTURE.setting,code=pressKey"s"}, + 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,fText=TEXTURE.back,code=pressKey"escape"}, + 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/register.lua b/parts/scenes/register.lua index b6b8b373..b3f2513e 100644 --- a/parts/scenes/register.lua +++ b/parts/scenes/register.lua @@ -28,7 +28,7 @@ scene.widgetList={ 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,fText=TEXTURE.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 c9803d67..95624fdd 100644 --- a/parts/scenes/replays.lua +++ b/parts/scenes/replays.lua @@ -160,9 +160,9 @@ scene.widgetList={ listBox, WIDGET.newButton{name="export",x=200,y=640,w=70,color='lG',code=pressKey"cC",fText=GC.DO{50,50,{'fRect',8,44,34,4},{'fRect',22,17,6,23},{'fPoly',25,5,10,20,40,20}}}, WIDGET.newButton{name="import",x=300,y=640,w=70,color='lN',code=pressKey"cV",fText=GC.DO{50,50,{'fRect',8,44,34,4},{'fRect',22,5,6,23},{'fPoly',25,40,10,25,40,25}}}, - WIDGET.newButton{name="play", x=700,y=640,w=170,h=80,color='lY',code=pressKey"return",fText=GC.DO{50,50,{'fPoly',10,0,49,24,10,49}}}, - WIDGET.newButton{name="delete",x=850,y=640,w=80,h=80,color='lR',code=pressKey"delete",fText=GC.DO{50,50,{'setLW',8},{'line',5,5,45,45},{'line',5,45,45,5}}}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene}, + 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=40,fText=CHAR.icon.thick_cross}, + 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 3c348f78..6f32ec71 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -82,7 +82,7 @@ scene.widgetList={ 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,fText=TEXTURE.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_control.lua b/parts/scenes/setting_control.lua index 40758893..fbb69edc 100644 --- a/parts/scenes/setting_control.lua +++ b/parts/scenes/setting_control.lua @@ -105,7 +105,7 @@ scene.widgetList={ _.sddas,_.sdarr=0,2 _.ihs,_.irs,_.ims=false,false,false end}, - WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.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 16e26765..e5a8e3b5 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -58,7 +58,7 @@ scene.widgetList={ end end end}, - WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.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 e3bea1db..8d772bde 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -150,7 +150,7 @@ scene.widgetList={ 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,fText=TEXTURE.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 92de0a97..0de2918c 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -114,7 +114,7 @@ scene.widgetList={ end SFX.play('hold') end}, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.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 820fac29..4d379f99 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -95,7 +95,7 @@ scene.widgetList={ 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={'miya','mono','xiaoya','miku'},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,fText=TEXTURE.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_touch.lua b/parts/scenes/setting_touch.lua index 682371b2..0cd81e60 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -114,8 +114,8 @@ scene.widgetList={ 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,fText=TEXTURE.more,code=function()SCN.go('setting_touchSwitch')end}, - WIDGET.newButton{name="back", x=750,y=190,w=200,h=80,fText=TEXTURE.back,code=backScene}, + 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}, WIDGET.newKey{name="load1", x=585,y=290,w=90,h=70,code=_load1}, WIDGET.newKey{name="save2", x=695,y=290,w=90,h=70,code=_save2}, diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index be42d1a5..5e64629d 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -55,7 +55,7 @@ scene.widgetList={ 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,fText=TEXTURE.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 25053588..9794e75b 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -90,7 +90,7 @@ scene.widgetList={ code=function(v)SETTING.fieldSatur=v;applyFieldSatur(SETTING.fieldSatur)end }, - WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.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 471fa077..cfc614ae 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,fText=TEXTURE.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 44729d1c..0fbd0eab 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -127,7 +127,7 @@ scene.widgetList={ 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,fText=TEXTURE.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/texture.lua b/parts/texture.lua index 77f6628a..0421f737 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -163,97 +163,6 @@ TEXTURE.sure=GC.DO{48,64, {'fRect',18,53,11,11}, } -TEXTURE.setting=GC.DO{64,64, - {'setLW',8}, - {'dCirc',32,32,18}, - {'setLW',10}, - {'line',52,32,64,32}, - {'line',32,52,32,64}, - {'line',12,32,0,32}, - {'line',32,12,32,0}, - {'line',45,45,55,55}, - {'line',19,45,9,55}, - {'line',19,19,9,9}, - {'line',45,19,55,9}, -} - -TEXTURE.music=GC.DO{64,64, - {'setLW',6}, - {'line',19,9,60,7}, - {'setLW',2}, - {'line',20,9,20,49}, - {'line',59,7,59,47}, - {'fElps',11,49,11,8}, - {'fElps',50,47,11,8}, -} - -TEXTURE.mute=GC.DO{64,64, - {'mDraw',TEXTURE.music,32,32,0,.9}, - {'setLW',4}, - {'line',6,6,57,57}, -} - -TEXTURE.language=GC.DO{64,64, - {'setLW',2}, - {'dCirc',32,32,30}, - {'line',2,31,62,31}, - {'line',31,2,31,62}, - {'dArc',10,31,40,-.8,.8}, - {'dArc',53,31,40,2.3,3.9}, -} - -TEXTURE.info=GC.DO{50,50, - {'setLW',3}, - {'dCirc',25,25,22}, - {'fRect',22,11,6,6}, - {'fRect',22,20,6,20}, -} - -TEXTURE.question=GC.DO{50,50, - {'setLW',3}, - {'dCirc',25,25,22}, - {'setFT',40}, - {'mText','?',26,-1}, -} - -TEXTURE.more=GC.DO{60,15, - {'fCirc',10,7,6}, - {'fCirc',30,7,6}, - {'fCirc',50,7,6}, -} - -TEXTURE.back=GC.DO{60,55, - {'setLW',6}, - {'line',11,10,40,10}, - {'line',10,40,40,40}, - {'dArc',40,25,15,-1.6,1.6}, - {'setLW',4}, - {'line',20,50,10,40,20,30}, -} - -TEXTURE.quit=GC.DO{50,50, - {'setCL',1,1,1}, - {'draw',GC.DO{50,50, - {'setLW',7}, - {'line',5,5,45,45}, - {'line',5,45,45,5}, - }} -} - -TEXTURE.quit_small=GC.DO{30,30, - {'setCL',1,1,1}, - {'draw',GC.DO{30,30, - {'setLW',4}, - {'line',2,2,28,28}, - {'line',2,28,28,2}, - }} -} - -TEXTURE.game={--In-game icons - restart=GC.DO{32,32,{'setLW',3},{'dArc',16,16,11,.7,5.5},{'setLW',2.5},{'line',21,.7,24,8,16,11}}, - pause=GC.DO{18,23,{'fRect',0,0,3,23},{'fRect',15,0,3,23}}, -} - TEXTURE.rep={--Replay speed buttons rep0=GC.DO{50,50,{'fRect',11,8,8,34},{'fRect',31,8,8,34}}, repP8=GC.DO{50,50,{'setFT',15},{'mText',"0.125x",25,15}}, @@ -265,4 +174,5 @@ TEXTURE.rep={--Replay speed buttons } gc.setCanvas() +setmetatable(TEXTURE,{__index=function(_,i)error(i)end}) return TEXTURE