From 7079061f22949c6b078da7a7c115c7484eeba803 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 27 May 2021 21:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=9C=BA=E6=99=AF=E5=92=8C=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89-=E9=AB=98=E7=BA=A7=E5=9C=BA=E6=99=AF=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=BA=E6=99=AF=E6=A8=A1=E5=9D=97=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=BB=9A=E5=8A=A8=E8=B7=9D=E7=A6=BB=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/scene.lua | 2 +- parts/language/lang_en.lua | 7 +- parts/language/lang_fr.lua | 7 +- parts/language/lang_pt.lua | 7 +- parts/language/lang_sp.lua | 7 +- parts/language/lang_symbol.lua | 7 +- parts/language/lang_zh.lua | 5 +- parts/language/lang_zh2.lua | 3 +- parts/scenes/customGame.lua | 132 +++++++++++++++++---------- parts/scenes/custom_advance.lua | 44 --------- parts/scenes/main_simple.lua | 4 +- parts/scenes/pause.lua | 10 +- parts/scenes/setting_game.lua | 10 +- parts/scenes/setting_touchSwitch.lua | 2 +- parts/scenes/setting_video.lua | 2 +- 15 files changed, 109 insertions(+), 140 deletions(-) delete mode 100644 parts/scenes/custom_advance.lua diff --git a/Zframework/scene.lua b/Zframework/scene.lua index e3f1993d..5f7558d6 100644 --- a/Zframework/scene.lua +++ b/Zframework/scene.lua @@ -65,7 +65,7 @@ function SCN.init(s,org) local S=scenes[s] SCN.cur=s - WIDGET.setScrollHeight(S.widgetBoxHeight) + WIDGET.setScrollHeight(S.widgetScrollHeight) WIDGET.setWidgetList(S.widgetList) SCN.sceneInit=S.sceneInit SCN.sceneBack=S.sceneBack diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e120c1a6..2892641e 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -435,10 +435,6 @@ return{ field="Edit Field (F)", sequence="Edit Sequence (S)", mission="Edit Mission (M)", - }, - custom_advance={ - title="Custom Game", - subTitle="Advance", nextCount="Next", holdCount="Hold", @@ -450,7 +446,8 @@ return{ freshLimit="Lock Reset Limit", opponent="Opponent", life="Lives", - pushSpeed="Garbage Speed", + pushSpeed="Push Speed", + garbageSpeed="Garbage Speed", bufferLimit="Buffer Limit", heightLimit="Height Limit", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 41206d3d..60c4d470 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -407,10 +407,6 @@ return{ field="Modifier la matrice (F)", sequence="Modifier la séquence (S)", mission="Modifier la mission(M)", - }, - custom_advance={ - title="Mode personnalisé", - subTitle="Avancer", nextCount="Prévisualisations de pièces", holdCount="Réserve", @@ -422,7 +418,8 @@ return{ freshLimit="Limite de réinit. du délai de verrouillage", opponent="Adversaire", life="Vie", - pushSpeed="Vitesse des lignes indésirables", + -- pushSpeed="Push Speed", + garbageSpeed="Vitesse des lignes indésirables", -- bufferLimit="Buffer Limit", -- heightLimit="Height Limit", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 252d9fe1..da73a798 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -434,10 +434,6 @@ return{ field="Editar Tab. (F)", sequence="Editar Sequência (S)", mission="Editar Missão (M)", - }, - custom_advance={ - title="Jogo Person.", - subTitle="Avançado", nextCount="Prox.", holdCount="Segurar", @@ -449,7 +445,8 @@ return{ freshLimit="Limite Reset de Trava", opponent="Oponente", life="Vidas", - pushSpeed="Velocidade De Lixo", + pushSpeed="Garbage Speed", + -- garbageSpeed="Velocidade De Lixo", -- bufferLimit="Buffer Limit", -- heightLimit="Height Limit", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 537c8f29..94b28d94 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -408,10 +408,6 @@ return{ field="Editar Tablero (F)", sequence="Editar Secuencia (S)", mission="Editar Misiones (M)", - }, - custom_advance={ - title="Juego Personalizado", - subTitle="Avanzado", nextCount="Siguiente", holdCount="Reserva", @@ -423,7 +419,8 @@ return{ freshLimit="Límite de Reinicio LD", opponent="Oponente", life="Vida", - pushSpeed="Velocidad de Basura", + -- pushSpeed="Garbage Speed", + garbageSpeed="Velocidad de Basura", -- bufferLimit="Buffer Limit", -- heightLimit="Height Limit", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 6fb2f790..a0a3e854 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -283,10 +283,6 @@ return{ field="Edit Field (F)", sequence="Edit Sequence (S)", mission="Edit Mission (M)", - }, - custom_advance={ - title="!@#$%^&*", - subTitle="##", nextCount="→", holdCount="[ ]", @@ -298,7 +294,8 @@ return{ freshLimit="@", opponent="^_^", life="", - pushSpeed="_↑_↑_", + pushSpeed="_↑__", + garbageSpeed="#↑↑", bufferLimit="^↑", heightLimit="#↑", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 3b3c73b8..ff7b162d 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -434,10 +434,6 @@ return{ field="场地编辑(F)", sequence="序列编辑(S)", mission="任务编辑(M)", - }, - custom_advance={ - title="自定义游戏", - subTitle="高级", nextCount="Next", holdCount="Hold", @@ -450,6 +446,7 @@ return{ opponent="对手", life="命数", pushSpeed="上涨速度", + garbageSpeed="垃圾行速度", bufferLimit="缓冲上限", heightLimit="高度上限", diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index e619d87f..92173186 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -79,8 +79,7 @@ return{ }, customGame={ mod="模组(F1)", - }, - custom_advance={ + nextCount="预览个数", holdCount="暂存个数", infHold="无限暂存", diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index d16b4deb..976bee4f 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -1,14 +1,22 @@ -local gc,sys=love.graphics,love.system -local kb=love.keyboard - +local gc,kb,sys=love.graphics,love.keyboard,love.system local int=math.floor +local CUSTOMENV=CUSTOMENV local function notAir(L) for i=1,10 do if L[i]>0 then return true end end end -local CUSTOMENV=CUSTOMENV +local sList={ + visible={"show","easy","slow","medium","fast","none"}, + freshLimit={0,1,2,4,6,8,10,12,15,30,1e99}, + opponent={"X","9S Lv.1","9S Lv.2","9S Lv.3","9S Lv.4","9S Lv.5","CC Lv.1","CC Lv.2","CC Lv.3","CC Lv.4","CC Lv.5"}, + life={0,1,2,3,5,10,15,26,42,87,500}, + pushSpeed={1,2,3,5,15}, + fieldH={1,2,3,4,6,8,10,15,20,30,50,100}, + heightLimit={2,3,4,6,8,10,15,20,30,50,100,150,200,1e99}, + bufferLimit={4,6,10,15,20,40,100,1e99}, +} local scene={} @@ -69,11 +77,11 @@ function scene.keyDown(key) for _,W in next,scene.widgetList do W:reset()end sure=0 SFX.play('finesseError',.7) + BG.set(CUSTOMENV.bg) + BGM.play(CUSTOMENV.bgm) else sure=50 end - elseif key=="a"then - SCN.go('custom_advance','swipeD') elseif key=="f1"then SCN.go('mod','swipeD') elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then @@ -114,10 +122,19 @@ function scene.update() end function scene.draw() + gc.translate(0,-WIDGET.scrollPos) + setFont(30) + + --Sequence + if #MISSION>0 then + gc.setColor(1,CUSTOMENV.missionKill and 0 or 1,int(TIME()*6.26)%2) + gc.print("#"..#MISSION,70,220) + end + --Field content if initField then gc.push('transform') - gc.translate(95,290) + gc.translate(330,240) gc.scale(.5) gc.setColor(1,1,1) gc.setLineWidth(3) @@ -134,71 +151,86 @@ function scene.draw() end end end gc.pop() - end - - --Field - setFont(40) - if initField and #FIELD>1 then - gc.setColor(1,1,int(TIME()*6.26)%2) - gc.print("+",275,300) - gc.print(#FIELD-1,300,300) + if #FIELD>1 then + gc.setColor(1,1,int(TIME()*6.26)%2) + gc.print("+"..#FIELD-1,490,220) + end end --Sequence if #BAG>0 then gc.setColor(1,1,int(TIME()*6.26)%2) - gc.print("#",330,545) - gc.print(#BAG,360,545) + gc.print("#"..#BAG,615,220) end - setFont(30) - gc.setColor(1,1,1) - gc.print(CUSTOMENV.sequence,330,510) - --Sequence - if #MISSION>0 then - gc.setColor(1,CUSTOMENV.missionKill and 0 or 1,int(TIME()*6.26)%2) - gc.print("#",610,545) - gc.print(#MISSION,640,545) - end + gc.setColor(1,1,1) + gc.print(CUSTOMENV.sequence,610,250) --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(TEXTURE.question,850,110) + gc.draw(TEXTURE.question,920,50) end + gc.translate(0, WIDGET.scrollPos) end +scene.widgetScrollHeight=400 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="defSeq", x=330, y=550,align='L',color='H',hideF=function()return BAG[1]end}, - WIDGET.newText{name="noMsn", x=610, y=550,align='L',color='H',hideF=function()return MISSION[1]end}, - --Basic - WIDGET.newSelector{name="drop", x=170, y=150,w=220,color='O',list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("drop"),code=CUSsto("drop")}, - WIDGET.newSelector{name="lock", x=170, y=230,w=220,color='R',list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("lock"),code=CUSsto("lock")}, - WIDGET.newSelector{name="wait", x=410, y=150,w=220,color='G',list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("wait"),code=CUSsto("wait")}, - WIDGET.newSelector{name="fall", x=410, y=230,w=220,color='Y',list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("fall"),code=CUSsto("fall")}, + 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"}, - --Else - WIDGET.newSelector{name="bg", x=1070, y=150,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=1070, y=230,w=250,color='Y',list=BGM.getList(),disp=CUSval("bgm"),code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, + --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"}, - --Copy/Paste/Start - WIDGET.newButton{name="copy", x=1070, y=310,w=310,h=70,color='lR',font=25,code=pressKey"cC"}, - WIDGET.newButton{name="paste", x=1070, y=390,w=310,h=70,color='lB',font=25,code=pressKey"cV"}, - WIDGET.newButton{name="clear", x=1070, y=470,w=310,h=70,color='lY',font=35,code=pressKey"return"}, - WIDGET.newButton{name="puzzle", x=1070, y=550,w=310,h=70,color='lM',font=35,code=pressKey"return2",hideF=function()return not initField 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}, - --More - WIDGET.newKey{name="reset", x=730, y=150,w=220,h=90,color='R',font=30,code=pressKey"delete"}, - WIDGET.newKey{name="advance", x=730, y=270,w=220,h=90,color='F',font=35,code=pressKey"a"}, - WIDGET.newKey{name="mod", x=730, y=390,w=220,h=90,color='Z',font=35,code=pressKey"f1"}, - WIDGET.newKey{name="field", x=170, y=640,w=240,h=80,color='A',font=25,code=pressKey"f"}, - WIDGET.newKey{name="sequence", x=450, y=640,w=240,h=80,color='W',font=25,code=pressKey"s"}, - WIDGET.newKey{name="mission", x=730, y=640,w=240,h=80,color='N',font=25,code=pressKey"m"}, + --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.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,font=40,code=pressKey"escape"}, + 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={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("drop"),code=CUSsto("drop")}, + WIDGET.newSelector{name="lock", x=730,y=410,w=260,color='O',list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("lock"),code=CUSsto("lock")}, + WIDGET.newSelector{name="wait", x=730,y=520,w=260,color='G',list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("wait"),code=CUSsto("wait")}, + WIDGET.newSelector{name="fall", x=730,y=600,w=260,color='G',list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},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 not initField end}, + WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=pressKey"escape"}, + + --Special rules + WIDGET.newSwitch{name="ospin", x=830, y=750,disp=CUSval("ospin"), code=CUSrev("ospin")}, + WIDGET.newSwitch{name="fineKill", x=830, y=840,disp=CUSval("fineKill"), code=CUSrev("fineKill")}, + WIDGET.newSwitch{name="b2bKill", x=830, y=930,disp=CUSval("b2bKill"), code=CUSrev("b2bKill")}, + WIDGET.newSwitch{name="easyFresh", x=1170, y=750,disp=CUSval("easyFresh"), code=CUSrev("easyFresh")}, + WIDGET.newSwitch{name="deepDrop", x=1170, y=840,disp=CUSval("deepDrop"), code=CUSrev("deepDrop")}, + WIDGET.newSwitch{name="bone", x=1170, y=930,disp=CUSval("bone"), code=CUSrev("bone")}, + + --Next & Hold + WIDGET.newSlider{name="nextCount", x=120,y=940,w=200,unit=6, disp=CUSval("nextCount"),code=CUSsto("nextCount")}, + WIDGET.newSlider{name="holdCount", x=120,y=1030,w=200,unit=6, disp=CUSval("holdCount"),code=CUSsto("holdCount")}, + WIDGET.newSwitch{name="infHold", x=560,y=940, disp=CUSval("infHold"),code=CUSrev("infHold"),hideF=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSwitch{name="phyHold", x=560,y=1030, 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}, } return scene \ No newline at end of file diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua deleted file mode 100644 index 816c4af8..00000000 --- a/parts/scenes/custom_advance.lua +++ /dev/null @@ -1,44 +0,0 @@ -local sList={ - visible={"show","easy","slow","medium","fast","none"}, - freshLimit={0,1,2,4,6,8,10,12,15,30,1e99}, - opponent={"X","9S Lv.1","9S Lv.2","9S Lv.3","9S Lv.4","9S Lv.5","CC Lv.1","CC Lv.2","CC Lv.3","CC Lv.4","CC Lv.5"}, - life={0,1,2,3,5,10,15,26,42,87,500}, - pushSpeed={1,2,3,5,15}, - fieldH={1,2,3,4,6,8,10,15,20,30,50,100}, - heightLimit={2,3,4,6,8,10,15,20,30,50,100,150,200,1e99}, - bufferLimit={4,6,10,15,20,40,100,1e99}, -} - -local scene={} - -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'}, - - --Control - WIDGET.newSlider{name="nextCount", x=180, y=150, w=200,unit=6, disp=CUSval("nextCount"),code=CUSsto("nextCount")}, - WIDGET.newSlider{name="holdCount", x=180, y=240, w=200,unit=6, disp=CUSval("holdCount"),code=CUSsto("holdCount")}, - WIDGET.newSwitch{name="infHold", x=330, y=340, disp=CUSval("infHold"),code=CUSrev("infHold"),hideF=function()return CUSTOMENV.holdCount==0 end}, - WIDGET.newSwitch{name="phyHold", x=330, y=430, disp=CUSval("phyHold"),code=CUSrev("phyHold"),hideF=function()return CUSTOMENV.holdCount==0 end}, - - --Rule - WIDGET.newSelector{name="visible", x=840, y=60, w=260,color='lB',list=sList.visible, disp=CUSval("visible"), code=CUSsto("visible")}, - WIDGET.newSelector{name="freshLimit",x=840, y=160, w=260,color='V',list=sList.freshLimit, disp=CUSval("freshLimit"), code=CUSsto("freshLimit")}, - WIDGET.newSelector{name="opponent", x=1120, y=60, w=260,color='R',list=sList.opponent, disp=CUSval("opponent"), code=CUSsto("opponent")}, - WIDGET.newSelector{name="life", x=1120, y=160, w=260,color='R',list=sList.life, disp=CUSval("life"), code=CUSsto("life")}, - WIDGET.newSelector{name="pushSpeed",x=1120, y=260, w=260,color='R',list=sList.pushSpeed, disp=CUSval("pushSpeed"), code=CUSsto("pushSpeed")}, - - WIDGET.newSelector{name="fieldH", x=570, y=350, w=260,color='N',list=sList.fieldH, disp=CUSval("fieldH"), code=CUSsto("fieldH")}, - WIDGET.newSelector{name="heightLimit",x=570,y=440, w=260,color='S',list=sList.heightLimit, disp=CUSval("heightLimit"), code=CUSsto("heightLimit")}, - WIDGET.newSelector{name="bufferLimit",x=570,y=520, w=260,color='O',list=sList.bufferLimit, disp=CUSval("bufferLimit"), code=CUSsto("bufferLimit")}, - WIDGET.newSwitch{name="ospin", x=880, y=350, font=30,disp=CUSval("ospin"), code=CUSrev("ospin")}, - WIDGET.newSwitch{name="fineKill", x=880, y=440, font=20,disp=CUSval("fineKill"), code=CUSrev("fineKill")}, - WIDGET.newSwitch{name="b2bKill", x=880, y=530, font=20,disp=CUSval("b2bKill"), code=CUSrev("b2bKill")}, - WIDGET.newSwitch{name="easyFresh", x=1160, y=350, font=20,disp=CUSval("easyFresh"), code=CUSrev("easyFresh")}, - WIDGET.newSwitch{name="deepDrop", x=1160, y=440, font=30,disp=CUSval("deepDrop"), code=CUSrev("deepDrop")}, - WIDGET.newSwitch{name="bone", x=1160, y=530, disp=CUSval("bone"), code=CUSrev("bone")}, - - WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,font=40,code=backScene}, -} - -return scene \ No newline at end of file diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua index 1aa56be2..9cce0521 100644 --- a/parts/scenes/main_simple.lua +++ b/parts/scenes/main_simple.lua @@ -16,8 +16,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="system", x=750,y=280,color='Z',font=30,align='L',fText=SYSTEM}, - WIDGET.newText{name="version", x=950,y=280,color='Z',font=30,align='L',fText=VERSION.string}, + 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,fText="...",font=50,code=goScene'setting_game'}, diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index ff90fab5..8a5927b1 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -311,11 +311,11 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="setting", x=1120,y=70,w=240,h=90, color='lB',font=35,code=pressKey"s"}, - WIDGET.newButton{name="replay", x=535,y=250,w=200,h=100,color='lY',font=30,code=pressKey"p",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end}, - WIDGET.newButton{name="save", x=745,y=250,w=200,h=100,color='G',font=30,code=pressKey"o",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 or GAME.saved end}, - WIDGET.newButton{name="resume", x=640,y=367,w=240,h=100,color='lG',font=30,code=pressKey"escape"}, - WIDGET.newButton{name="restart", x=640,y=483,w=240,h=100,color='lR',font=35,code=pressKey"r"}, + WIDGET.newButton{name="setting", x=1120,y=70,w=240,h=90, color='lB',code=pressKey"s"}, + WIDGET.newButton{name="replay", x=535,y=250,w=200,h=100,color='lY',code=pressKey"p",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end}, + WIDGET.newButton{name="save", x=745,y=250,w=200,h=100,color='G',code=pressKey"o",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 or GAME.saved end}, + WIDGET.newButton{name="resume", x=640,y=367,w=240,h=100,color='lG',code=pressKey"escape"}, + WIDGET.newButton{name="restart", x=640,y=483,w=240,h=100,color='lR',code=pressKey"r"}, WIDGET.newButton{name="quit", x=640,y=600,w=240,h=100,font=35,code=backScene}, } diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 3cc7af8e..0a641be7 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -30,11 +30,11 @@ scene.widgetList={ WIDGET.newSlider{name="reTime", x=330, y=320, w=300,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',list={'TRS','SRS','C2','C2sym','Classic','None'},disp=SETval("RS"),code=SETsto("RS")}, WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene'setting_skin'}, - WIDGET.newSwitch{name="autoPause", x=1060, y=310, font=30,disp=SETval("autoPause"), code=SETrev("autoPause")}, - WIDGET.newSwitch{name="swap", x=1060, y=370, font=25,disp=SETval("swap"), code=SETrev("swap")}, - WIDGET.newSwitch{name="fine", x=1060, y=430, font=30,disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, - WIDGET.newSwitch{name="dataSaving", x=1060, y=490, font=30,disp=SETval("dataSaving"), code=function()SETTING.dataSaving=not SETTING.dataSaving if not SETTING.dataSaving then USERS.forceFreshAvatar()end end}, - WIDGET.newSwitch{name="simpMode", x=1060, y=550, font=30,disp=SETval("simpMode"), + WIDGET.newSwitch{name="autoPause", x=1060, y=310, disp=SETval("autoPause"), code=SETrev("autoPause")}, + WIDGET.newSwitch{name="swap", x=1060, y=370, disp=SETval("swap"), code=SETrev("swap")}, + WIDGET.newSwitch{name="fine", x=1060, y=430, disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, + WIDGET.newSwitch{name="dataSaving", x=1060, y=490, disp=SETval("dataSaving"), code=function()SETTING.dataSaving=not SETTING.dataSaving if not SETTING.dataSaving then USERS.forceFreshAvatar()end end}, + WIDGET.newSwitch{name="simpMode", x=1060, y=550, disp=SETval("simpMode"), code=function() SETTING.simpMode=not SETTING.simpMode for i=1,#SCN.stack,2 do diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index 80099824..3298d797 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -19,7 +19,7 @@ local function VKAcode(n)return function()VK_org[n].ava=not VK_org[n].ava end en local function notShow()return not SETTING.VKSwitch end local function notTrack()return not(SETTING.VKSwitch and SETTING.VKTrack)end -scene.widgetBoxHeight=340 +scene.widgetScrollHeight=340 scene.widgetList={ WIDGET.newSwitch{name="b1", x=280, y=80, disp=VKAdisp(1),code=VKAcode(1)}, WIDGET.newSwitch{name="b2", x=280, y=140, disp=VKAdisp(2),code=VKAcode(2)}, diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 3afd075b..0163219f 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -7,7 +7,7 @@ function scene.sceneBack() FILE.save(SETTING,'conf/settings') end -scene.widgetBoxHeight=620 +scene.widgetScrollHeight=620 scene.widgetList={ WIDGET.newText{name="title", x=640,y=15,font=80},