From 8e6b721a7321843e9e5fe192ebeaca0201b5662a Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 18 Sep 2020 18:26:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=87=8D=E6=96=B0=E5=88=86=E9=A1=B5+?= =?UTF-8?q?=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/languages.lua | 259 ++++++++++++++++++++++-------------- Zframework/widgetList.lua | 226 ++++++++++++++++---------------- parts/list.lua | 2 +- parts/scenes.lua | 268 ++++++++++++++++++++++---------------- 4 files changed, 437 insertions(+), 318 deletions(-) diff --git a/Zframework/languages.lua b/Zframework/languages.lua index febfcd61..9f4d8f74 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -30,8 +30,7 @@ local langList={ pause="暂停", pauseCount="暂停统计", - custom="自定义游戏", - sequence="自定义序列", + custom="自定义游戏",basic="常规",rule="规则",field="自定义场地", softdropdas="软降DAS:", softdroparr="软降ARR:", snapLevelName={"无吸附","10px吸附","20px吸附","40px吸附","60px吸附","80px吸附"}, @@ -193,19 +192,30 @@ local langList={ down="↓", back="返回", }, - custom={ + custom_norm={ drop="下落延迟",lock="锁定延迟",wait="出块等待",fall="消行延迟", next="Next",hold="Hold",oncehold="Hold一次", - block="方块透明度",ghost="阴影透明度",center="中心透明度", + block="方块可见", + ghost="阴影透明度", + center="中心透明度", bagLine="包分界线", highCam="超屏视野", nextPos="生成预览", - mindas="最小DAS",minarr="最小ARR",minsdarr="最小软降ARR", + bone="骨块", + bg="背景", + bgm="音乐", + + draw="←初始场地", + rule="更多规则(Tab)→", + back="返回", + }, + custom_rule={ + mindas="最小DAS", + minarr="最小ARR", + minsdarr="最小软降ARR", noTele="禁止瞬移", ospin="O-spin", - sequence="序列", target="目标行数", - bone="骨块", visible="能见度", freshLimit="锁延刷新限制", easyFresh="普通刷新锁延", @@ -213,13 +223,12 @@ local langList={ opponent="对手", life="命数", pushSpeed="上涨速度", - bg="背景", - bgm="音乐", - seq="序列内容(Q)", - draw="初始场地(E)", + + norm="←基本规则", + seq="序列设置(Tab)→", back="返回", }, - sequence={ + custom_seq={ Z="Z",S="S",J="J",L="L",T="T",O="O",I="I", Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U", V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5", @@ -229,9 +238,13 @@ local langList={ reset="R", copy="复制", paste="粘贴", + + sequence="序列", + rule="←更多规则", + draw="初始场地(Tab)→", back="返回", }, - draw={ + custom_draw={ b12="[ ]", any="不定", space="×", @@ -241,7 +254,9 @@ local langList={ pushLine="增加一行(K)", delLine="消除行(L)", demo="不显示×", - custom="参数(E)", + + seq="←序列设置", + norm="基础设置(Tab)→", back="返回", }, play={ @@ -273,7 +288,7 @@ local langList={ setting_video={ sound="←声音设置", game="游戏设置→", - block="方块透明度", + block="方块可见", ghost="阴影透明度", center="旋转中心透明度", smooth="平滑下落", @@ -519,8 +534,7 @@ local langList={ pause="暂停", pauseCount="暂停统计", - custom="自定义游戏", - sequence="自定义序列", + custom="自定义游戏",basic="常规",rule="规则",field="自定义场地", snapLevelName={"无吸附","10像素吸附","20像素吸附","40像素吸附","60像素吸附","80像素吸附"}, setting_game="游戏设置", setting_video="画面设置", @@ -678,19 +692,30 @@ local langList={ down="↓", back="返回", }, - custom={ + custom_norm={ drop="下落延迟",lock="锁定延迟",wait="出块等待",fall="消行延迟", - next="Next",hold="Hold",oncehold="Hold一次", - block="方块透明度",ghost="阴影透明度",center="中心透明度", + next="预览",hold="暂存",oncehold="暂存一次", + block="方块可见", + ghost="阴影透明度", + center="中心透明度", bagLine="包分界线", highCam="超屏视野", nextPos="生成预览", - mindas="最小DAS",minarr="最小ARR",minsdarr="最小软降ARR", - noTele="禁止瞬移", - ospin="O-spin", - sequence="序列", - target="目标行数", bone="骨块", + bg="背景", + bgm="音乐", + + draw="←初始场地", + rule="更多规则(Tab)→", + back="返回", + }, + custom_rule={ + mindas="最小DAS", + minarr="最小ARR", + minsdarr="最小软降ARR", + noTele="禁止瞬移", + ospin="O旋", + target="目标行数", visible="能见度", freshLimit="锁延刷新限制", easyFresh="普通刷新锁延", @@ -698,13 +723,12 @@ local langList={ opponent="对手", life="命数", pushSpeed="上涨速度", - bg="背景", - bgm="音乐", - seq="序列内容(Q)", - draw="初始场地(E)", + + norm="←基本规则", + seq="序列设置(Tab)→", back="返回", }, - sequence={ + custom_seq={ Z="Z",S="S",J="J",L="L",T="T",O="O",I="I", Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U", V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5", @@ -714,9 +738,13 @@ local langList={ reset="R", copy="复制", paste="粘贴", + + sequence="序列", + rule="←更多规则", + draw="初始场地(Tab)→", back="返回", }, - draw={ + custom_draw={ b12="[ ]", any="不定", space="×", @@ -726,7 +754,9 @@ local langList={ pushLine="增加一行(K)", delLine="消除行(L)", demo="不显示×", - custom="参数(E)", + + seq="←序列设置", + norm="基础设置(Tab)→", back="返回", }, play={ @@ -758,7 +788,7 @@ local langList={ setting_video={ sound="←声音设置", game="游戏设置→", - block="方块透明度", + block="方块可见", ghost="阴影透明度", center="旋转中心透明度", smooth="平滑下落", @@ -1004,8 +1034,7 @@ local langList={ pause="Pause", pauseCount="Pauses:", - custom="Custom Game", - sequence="Custom Sequence", + custom="Custom Game",basic="Basic",rule="Rule",field="Custom Field", snapLevelName={"Free pos","Snap-10","Snap-20","Snap-40","Snap-60","Snap-80"}, setting_game="Game Settings", setting_video="Video Settings", @@ -1153,19 +1182,30 @@ local langList={ down="↓", back="Back", }, - custom={ + custom_norm={ drop="Drop Speed",lock="Lock Delay",wait="Entry Delay",fall="Line Delay", next="Next",hold="Hold",oncehold="Hold Once", - block="Draw Block",ghost="Ghost",center="Center", + block="Draw Block", + ghost="Ghost", + center="Center", bagLine="Bag Line", highCam="Bird-eye view", nextPos="Next preview", - mindas="min DAS",minarr="min ARR",minsdarr="min SDARR", + bone="Bone Block", + bg="Background", + bgm="Music", + + draw="←Field", + rule="Rules (Tab)→", + back="Back", + }, + custom_rule={ + mindas="min DAS", + minarr="min ARR", + minsdarr="min SDARR", noTele="no Teleport", ospin="O-spin", - sequence="Sequence", target="Target", - bone="Bone Block", visible="Visibility", freshLimit="LD-Reset Limit", easyFresh="Normal Lock Reset", @@ -1173,13 +1213,12 @@ local langList={ opponent="Opponent", life="Life", pushSpeed="Garbage Speed", - bg="Background", - bgm="Music", - seq="Sequence(Q)", - draw="Edit Field (E)", + + norm="←Basic", + seq="SEQ. (Tab)→", back="Back", }, - sequence={ + custom_seq={ Z="Z",S="S",J="J",L="L",T="T",O="O",I="I", Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U", V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5", @@ -1189,9 +1228,13 @@ local langList={ reset="R", copy="Copy", paste="Paste", + + sequence="Sequence", + rule="←Rules", + draw="Field (Tab)→", back="Back", }, - draw={ + custom_draw={ b12="[ ]", any="Erase", space="×", @@ -1201,7 +1244,9 @@ local langList={ pushLine="Add Line(K)", delLine="Del Line(L)", demo="Don't show ×", - custom="Args(E)", + + seq="←Sequence", + norm="Basic (Tab)→", back="Back", }, play={ @@ -1479,8 +1524,7 @@ local langList={ pause="=", pauseCount="=:", - custom="!@#$%^&*", - sequence="!@#$%^&*", + custom="!@#$%^&*",basic="!!",rule="##",field="!@#$%^&* [##]", snapLevelName={"~","10","20","40","60","80"}, setting_game="%~~%", setting_video="{~~}", @@ -1626,34 +1670,43 @@ local langList={ down="↓", back="X", }, - custom={ + custom_norm={ drop="↓",lock="↓_",wait="→=",fall="↓=", next="→",hold="[ ]",oncehold="[ ]*1", - block="==↓==",ghost="__↓__",center="+", + block="==↓==", + ghost="__↓__", + center="+", bagLine="123|123", highCam="↑__↑", nextPos="???←", - mindas="mDAS",minarr="mARR",minsdarr="msdARR", - noTele="X→→X", - ospin="O→Any", - sequence="$=", - target="&=", bone="[]", - visible="?=", - freshLimit="@", - easyFresh="普通刷新锁延", - fineKill="12 XX 21", - opponent="^_^", - life="命数", - pushSpeed="上涨速度", bg="{~}", bgm="(~)", - seq="!!!!(Q)", - draw="####(E)", + draw="←Field", + rule="Rule (Tab)→", back="X", }, - sequence={ + custom_rule={ + mindas="mDAS", + minarr="mARR", + minsdarr="msdARR", + noTele="X→→X", + ospin="O→Any", + target="&=", + visible="?=", + freshLimit="@", + easyFresh="↓_↓_↓_", + fineKill="12 XX 21", + opponent="^_^", + life="", + pushSpeed="_↑_↑_", + + norm="←Basic", + seq="Seq (Tab)→", + back="X", + }, + custom_seq={ Z="Z",S="S",J="J",L="L",T="T",O="O",I="I", Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U", V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5", @@ -1663,9 +1716,13 @@ local langList={ reset="R", copy="→__", paste="__→", + + sequence="$=", + rule="←Rule", + draw="Field (Tab)→", back="X", }, - draw={ + custom_draw={ b12="[ ]", any="_", space="×", @@ -1675,7 +1732,9 @@ local langList={ pushLine="↑↑↑↑↑(K)", delLine="==X==(L)", demo="X ×", - custom="_?_(E)", + + seq="←Seq", + norm="Basic (Tab)→", back="X", }, play={ @@ -1953,8 +2012,7 @@ local langList={ pause="歇会", pauseCount="歇多久了", - custom="随便玩", - sequence="自定义序列", + custom="自定义",basic="普通",rule="规则",field="自定义场地", softdropdas="软降DAS:", softdroparr="软降ARR:", snapLevelName={"无吸附","10px吸附","20px吸附","40px吸附","60px吸附","80px吸附"}, @@ -2114,19 +2172,30 @@ local langList={ down="↓", back="返回", }, - custom={ + custom_norm={ drop="下落延迟",lock="锁定延迟",wait="出块等待",fall="消行延迟", next="Next",hold="Hold",oncehold="Hold一次", - block="方块透明度",ghost="阴影透明度",center="中心透明度", + block="方块可见", + ghost="阴影透明度", + center="中心透明度", bagLine="包分界线", highCam="超屏视野", nextPos="生成预览", - mindas="最小DAS",minarr="最小ARR",minsdarr="最小软降ARR", + bone="骨块", + bg="背景", + bgm="音乐", + + draw="←初始场地", + rule="更多规则(Tab)→", + back="返回", + }, + custom_rule={ + mindas="最小DAS", + minarr="最小ARR", + minsdarr="最小软降ARR", noTele="禁止瞬移", ospin="O-spin", - sequence="序列", target="目标行数", - bone="骨块", visible="能见度", freshLimit="锁延刷新限制", easyFresh="普通刷新锁延", @@ -2134,13 +2203,12 @@ local langList={ opponent="对手", life="命数", pushSpeed="上涨速度", - bg="背景", - bgm="音乐", - seq="序列内容(Q)", - draw="初始场地(E)", + + norm="←基本规则", + seq="序列设置(Tab)→", back="返回", }, - sequence={ + custom_seq={ Z="Z",S="S",J="J",L="L",T="T",O="O",I="I", Z5="Z5",S5="S5",P="P",Q="Q",F="F",E="E",T5="T5",U="U", V="V",W="W",X="X",J5="J5",L5="L5",R="R",Y="Y",N="N",H="H",I5="I5", @@ -2150,19 +2218,25 @@ local langList={ reset="R", copy="复制", paste="粘贴", + + sequence="序列", + rule="←更多规则", + draw="初始场地(Tab)→", back="返回", }, - draw={ + custom_draw={ b12="[ ]", any="不定", space="×", copy="复制", paste="粘贴", clear="清除", - pushLine="增加一行", - delLine="消除行", + pushLine="增加一行(K)", + delLine="消除行(L)", demo="不显示×", - custom="参数(E)", + + seq="←序列设置", + norm="基础设置(Tab)→", back="返回", }, play={ @@ -2459,20 +2533,15 @@ local drawableTextLoad={ "replaying", "next","hold", "win","finish","gameover","pause", - "custom","sequence", - "setting_game", - "setting_video", - "setting_sound", - "setting_sound", - "setting_control", - "setting_skin", + + "custom","basic","rule","field", + "setting_game","setting_video","setting_sound", + "setting_control","setting_skin", "keyboard","joystick", "ctrlSetHelp", - "musicRoom", - "nowPlaying", + "musicRoom","nowPlaying", "VKTchW","VKOrgW","VKCurW", - "noScore", - "highScore", + "noScore","highScore", } function LANG.getLen() return #langList diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index 3a893275..e29d034a 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -90,21 +90,22 @@ local CUSlist={ bgm={"blank","race","push","way","reason","newera","oxygen","infinite","down","secret7th","secret8th","rockblock","cruelty","final"}, } --Lambda Funcs for widgets,delete at file end -function CUSval(k) return function()return customEnv[k] end end -function CUSrev(k) return function()customEnv[k]=not customEnv[k] end end -function CUSsto(k) return function(i)customEnv[k]=i end end -function SETval(k) return function()return setting[k] end end -function SETrev(k) return function()setting[k]=not setting[k] end end -function SETsto(k) return function(i)setting[k]=i end end -function pressKey(k)return function()love.keypressed(k) end end -function setPen(i) return function()sceneTemp.pen=i end end -function prevSkin(n)return function()SKIN.prev(n) end end -function nextSkin(n)return function()SKIN.next(n) end end -function nextDir(n) return function()SKIN.rotate(n) end end -function VKAdisp(n) return function()return VK_org[n].ava end end -function VKAcode(n) return function()VK_org[n].ava=not VK_org[n].ava end end -function setLang(n) return function()LANG.set(n)setting.lang=n end end -function goScene(s) return function()SCN.go(s) end end +function CUSval(k) return function() return customEnv[k] end end +function CUSrev(k) return function() customEnv[k]=not customEnv[k] end end +function CUSsto(k) return function(i) customEnv[k]=i end end +function SETval(k) return function() return setting[k] end end +function SETrev(k) return function() setting[k]=not setting[k] end end +function SETsto(k) return function(i) setting[k]=i end end +function pressKey(k) return function() love.keypressed(k) end end +function setPen(i) return function() sceneTemp.pen=i end end +function prevSkin(n) return function() SKIN.prev(n) end end +function nextSkin(n) return function() SKIN.next(n) end end +function nextDir(n) return function() SKIN.rotate(n) end end +function VKAdisp(n) return function() return VK_org[n].ava end end +function VKAcode(n) return function() VK_org[n].ava=not VK_org[n].ava end end +function setLang(n) return function() LANG.set(n)setting.lang=n end end +function goScene(t,s) return function() SCN.go(t,s) end end +function swapScene(t,s) return function() SCN.swapTo(t,s) end end --NewXXX newText=WIDGET.newText @@ -149,12 +150,7 @@ local Widgets={ newButton({name="quit", x=590,y=610,w=160,h=100,color="lGrey", font=45,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}), }, mode={ - newButton({name="setting", x=1100,y=540,w=240,h=90,color="lGreen", font=40,code=function() - SCN.go("custom") - end, - hide=function() - return mapCam.sel~="custom_clear" and mapCam.sel~="custom_puzzle" - end}), + newButton({name="setting", x=1100,y=540,w=240,h=90,color="lGreen", font=40,code=pressKey("e"),hide=function()return mapCam.sel~="custom_clear" and mapCam.sel~="custom_puzzle"end}), newButton({name="start", x=1040,y=655,w=180,h=80,color="white", font=40,code=pressKey("return"),hide=function()return not mapCam.sel end}), newButton({name="back", x=1200,y=655,w=120,h=80,color="white", font=40,code=BACK}), }, @@ -163,53 +159,57 @@ local Widgets={ newButton({name="up", x=200, y=250, w=120, color="white", font=55,code=pressKey("up"),hide=function()return sceneTemp==1 end}), newButton({name="play", x=200, y=390, w=120, color="white", font=35,code=pressKey("space"),hide=function()return setting.bgm==0 end}), newButton({name="down", x=200, y=530, w=120, color="white", font=55,code=pressKey("down"),hide=function()return sceneTemp==BGM.len end}), - newButton({name="back", x=1140, y=640, w=180,h=80, color="white", font=35,code=BACK}), + newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, - custom={ + custom_norm={ --Basic - newSelector({name="drop", x=180, y=150+20,w=260,color="red", list=CUSlist.drop, disp=CUSval("drop"), code=CUSsto("drop")}), - newSelector({name="lock", x=180, y=230+20,w=260,color="red", list=CUSlist.lock, disp=CUSval("lock"), code=CUSsto("lock")}), - newSelector({name="wait", x=180, y=310+20,w=260,color="orange", list=CUSlist.wait, disp=CUSval("wait"), code=CUSsto("wait")}), - newSelector({name="fall", x=180, y=390+20,w=260,color="orange", list=CUSlist.fall, disp=CUSval("fall"), code=CUSsto("fall")}), + newSelector({name="drop", x=250, y=150,w=260,color="orange", list=CUSlist.drop, disp=CUSval("drop"), code=CUSsto("drop")}), + newSelector({name="lock", x=250, y=230,w=260,color="red", list=CUSlist.lock, disp=CUSval("lock"), code=CUSsto("lock")}), + newSelector({name="wait", x=250, y=310,w=260,color="green", list=CUSlist.wait, disp=CUSval("wait"), code=CUSsto("wait")}), + newSelector({name="fall", x=250, y=390,w=260,color="yellow", list=CUSlist.fall, disp=CUSval("fall"), code=CUSsto("fall")}), - newSlider({name="next", x=120, y=500,w=200,unit=6, font=30, disp=CUSval("next"), code=CUSsto("next")}), - newSwitch({name="hold", x=230, y=570, font=30, disp=CUSval("hold"), code=CUSrev("hold")}), - newSwitch({name="oncehold", x=230, y=650, font=30, disp=CUSval("oncehold"),code=CUSrev("oncehold"),hide=function()return not customEnv.hold end}), + newSlider({name="next", x=170, y=470,w=200,unit=6, font=30, disp=CUSval("next"), code=CUSsto("next")}), + newSwitch({name="hold", x=300, y=540, font=30, disp=CUSval("hold"), code=CUSrev("hold")}), + newSwitch({name="oncehold", x=300, y=620, font=30, disp=CUSval("oncehold"),code=CUSrev("oncehold"),hide=function()return not customEnv.hold end}), --Visual - newSwitch({name="block", x=570, y=150, font=25, disp=CUSval("block"), code=CUSrev("block")}), - newSlider({name="ghost", x=470, y=210,w=120,unit=.6, font=25, disp=CUSval("ghost"), code=CUSsto("ghost")}), - newSlider({name="center", x=470, y=270,w=120,unit=1, font=25, disp=CUSval("center"), code=CUSsto("center")}), - newSwitch({name="bagLine", x=570, y=340, font=30, disp=CUSval("bagLine"), code=CUSrev("bagLine")}), - newSwitch({name="highCam", x=570, y=400, font=30, disp=CUSval("highCam"), code=CUSrev("highCam")}), - newSwitch({name="nextPos", x=570, y=460, font=30, disp=CUSval("nextPos"), code=CUSrev("nextPos")}), - newSwitch({name="bone", x=570, y=520, font=30, disp=CUSval("bone"), code=CUSrev("bone")}), + newSwitch({name="block", x=700, y=160, font=25, disp=CUSval("block"), code=CUSrev("block")}), + newSlider({name="ghost", x=570, y=230,w=200,unit=.6, font=25, disp=CUSval("ghost"), code=CUSsto("ghost")}), + newSlider({name="center", x=570, y=290,w=200,unit=1, font=25, disp=CUSval("center"), code=CUSsto("center")}), + newSwitch({name="bagLine", x=1190, y=160, font=30, disp=CUSval("bagLine"), code=CUSrev("bagLine")}), + newSwitch({name="highCam", x=1190, y=230, font=30, disp=CUSval("highCam"), code=CUSrev("highCam")}), + newSwitch({name="nextPos", x=1190, y=300, font=30, disp=CUSval("nextPos"), code=CUSrev("nextPos")}), + newSwitch({name="bone", x=1190, y=370, font=30, disp=CUSval("bone"), code=CUSrev("bone")}), - --Rule - newSlider({name="mindas", x=750, y=150,w=200,unit=15,font=25, disp=CUSval("mindas"), code=CUSsto("mindas")}), - newSlider({name="minarr", x=750, y=210,w=200,unit=10,font=25, disp=CUSval("minarr"), code=CUSsto("minarr")}), - newSlider({name="minsdarr", x=750, y=270,w=200,unit=4, font=22, disp=CUSval("minsdarr"),code=CUSsto("minsdarr")}), - newSelector({name="sequence", x=520, y=600,w=200,color="green", list=CUSlist.sequence, disp=CUSval("sequence"),code=CUSsto("sequence")}), - newSwitch({name="ospin", x=860, y=340, font=30, disp=CUSval("ospin"), code=CUSrev("ospin")}), - newSwitch({name="noTele", x=860, y=400, font=25, disp=CUSval("noTele"), code=CUSrev("noTele")}), - newSwitch({name="fineKill", x=860, y=460, font=22, disp=CUSval("fineKill"),code=CUSrev("fineKill")}), - newSwitch({name="easyFresh", x=860, y=520, font=18, disp=CUSval("easyFresh"),code=CUSrev("easyFresh")}), - newSelector({name="visible", x=1120, y=60,w=260,color="lBlue", list=CUSlist.visible, disp=CUSval("visible"), code=CUSsto("visible")}), - newSelector({name="target", x=1120, y=140,w=260,color="green", list=CUSlist.target, disp=CUSval("target"), code=CUSsto("target")}), - newSelector({name="freshLimit", x=1120, y=220,w=260,color="purple", list=CUSlist.freshLimit,disp=CUSval("freshLimit"),code=CUSsto("freshLimit")}), - newSelector({name="opponent", x=1120, y=300,w=260,color="red", list=CUSlist.opponent, disp=CUSval("opponent"),code=CUSsto("opponent")}), - newSelector({name="life", x=1120, y=380,w=260,color="red", list=CUSlist.life, disp=CUSval("life"), code=CUSsto("life")}), - newSelector({name="pushSpeed", x=1120, y=460,w=260,color="red", list=CUSlist.pushSpeed, disp=CUSval("pushSpeed"),code=CUSsto("pushSpeed")}), + --Else + newSelector({name="bg", x=1140, y=460, w=220,color="yellow", list=CUSlist.bg, disp=CUSval("bg"), code=function(i)customEnv.bg=i BG.set(i)end}), + newSelector({name="bgm", x=1140, y=540, w=220,color="yellow", list=CUSlist.bgm, disp=CUSval("bgm"), code=function(i)customEnv.bgm=i BGM.play(i)end}), - --Else - newSelector({name="bg", x=800, y=600, w=220,color="yellow", list=CUSlist.bg, disp=CUSval("bg"), code=function(i)customEnv.bg=i BG.set(i)end}), - newSelector({name="bgm", x=800, y=670, w=220,color="yellow", list=CUSlist.bgm, disp=CUSval("bgm"), code=function(i)customEnv.bgm=i BGM.play(i)end}), - - newButton({name="seq", x=520, y=670, w=200,h=60, color="lGreen", font=30,code=pressKey("q")}), - newButton({name="draw", x=150, y=80, w=220,h=80, color="white", font=35,code=pressKey("e")}), - newButton({name="back", x=1140, y=640, w=180,h=80, color="white", font=35,code=BACK}), + newButton({name="draw", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_draw","swipeR")}), + newButton({name="rule", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_rule","swipeL")}), + newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, - sequence={ + custom_rule={ + --Rule + newSlider({name="mindas", x=180, y=150,w=400,unit=15,font=25, disp=CUSval("mindas"), code=CUSsto("mindas")}), + newSlider({name="minarr", x=180, y=220,w=400,unit=10,font=25, disp=CUSval("minarr"), code=CUSsto("minarr")}), + newSlider({name="minsdarr", x=180, y=290,w=200,unit=4, font=22, disp=CUSval("minsdarr"),code=CUSsto("minsdarr")}), + newSwitch({name="ospin", x=260, y=380, font=30, disp=CUSval("ospin"), code=CUSrev("ospin")}), + newSwitch({name="noTele", x=260, y=460, font=25, disp=CUSval("noTele"), code=CUSrev("noTele")}), + newSwitch({name="fineKill", x=260, y=530, font=22, disp=CUSval("fineKill"),code=CUSrev("fineKill")}), + newSwitch({name="easyFresh", x=260, y=600, font=18, disp=CUSval("easyFresh"),code=CUSrev("easyFresh")}), + newSelector({name="visible", x=800, y=160,w=260,color="lBlue", list=CUSlist.visible, disp=CUSval("visible"), code=CUSsto("visible")}), + newSelector({name="target", x=800, y=260,w=260,color="green", list=CUSlist.target, disp=CUSval("target"), code=CUSsto("target")}), + newSelector({name="freshLimit", x=800, y=360,w=260,color="purple", list=CUSlist.freshLimit,disp=CUSval("freshLimit"),code=CUSsto("freshLimit")}), + newSelector({name="opponent", x=1100, y=160,w=260,color="red", list=CUSlist.opponent, disp=CUSval("opponent"),code=CUSsto("opponent")}), + newSelector({name="life", x=1100, y=260,w=260,color="red", list=CUSlist.life, disp=CUSval("life"), code=CUSsto("life")}), + newSelector({name="pushSpeed", x=1100, y=360,w=260,color="red", list=CUSlist.pushSpeed, disp=CUSval("pushSpeed"),code=CUSsto("pushSpeed")}), + + newButton({name="norm", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_norm","swipeR")}), + newButton({name="seq", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_seq","swipeL")}), + newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), + }, + custom_seq={ newKey({name="Z", x=100, y=440, w=90, color="white", font=50,code=pressKey(1)}), newKey({name="S", x=200, y=440, w=90, color="white", font=50,code=pressKey(2)}), newKey({name="J", x=300, y=440, w=90, color="white", font=50,code=pressKey(3)}), @@ -241,40 +241,46 @@ local Widgets={ newKey({name="right", x=900, y=440, w=90, color="lGreen", font=55,code=pressKey("right")}), newKey({name="backsp", x=1000, y=440, w=90, color="lYellow",font=50,code=pressKey("backspace")}), newKey({name="reset", x=1000, y=540, w=90, color="lYellow",font=50,code=pressKey("delete")}), - newButton({name="copy", x=1140, y=440, w=170,h=90, color="lRed", font=40,code=pressKey("cC"),hide=function()return #preBag==0 end}), - newButton({name="paste", x=1140, y=540, w=170,h=90, color="lBlue", font=40,code=pressKey("cV")}), - newButton({name="back", x=1140, y=640, w=180,h=80, color="white", font=35,code=BACK}), + newButton({name="copy", x=1140, y=440, w=170,h=80, color="lRed", font=40,code=pressKey("cC"),hide=function()return #preBag==0 end}), + newButton({name="paste", x=1140, y=540, w=170,h=80, color="lBlue", font=40,code=pressKey("cV")}), + + newSelector({name="sequence",x=670, y=60, w=200,color="yellow",list=CUSlist.sequence,disp=CUSval("sequence"),code=CUSsto("sequence")}), + newButton({name="rule", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_rule","swipeR")}), + newButton({name="draw", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_draw","swipeL")}), + newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, - draw={ - newButton({name="b1", x=500+65*1, y=150, w=58, color="red", font=30,code=setPen(1)}),--B1 - newButton({name="b2", x=500+65*2, y=150, w=58, color="orange", font=30,code=setPen(2)}),--B2 - newButton({name="b3", x=500+65*3, y=150, w=58, color="yellow", font=30,code=setPen(3)}),--B3 - newButton({name="b4", x=500+65*4, y=150, w=58, color="grass", font=30,code=setPen(4)}),--B4 - newButton({name="b5", x=500+65*5, y=150, w=58, color="green", font=30,code=setPen(5)}),--B5 - newButton({name="b6", x=500+65*6, y=150, w=58, color="water", font=30,code=setPen(6)}),--B6 - newButton({name="b7", x=500+65*7, y=150, w=58, color="cyan", font=30,code=setPen(7)}),--B7 - newButton({name="b8", x=500+65*8, y=150, w=58, color="blue", font=30,code=setPen(8)}),--B8 - newButton({name="b9", x=500+65*9, y=150, w=58, color="purple", font=30,code=setPen(9)}),--B9 - newButton({name="b10", x=500+65*10,y=150, w=58, color="magenta",font=30,code=setPen(10)}),--B10 - newButton({name="b11", x=500+65*11,y=150, w=58, color="pink", font=30,code=setPen(11)}),--B11 + custom_draw={ + newButton({name="b1", x=500+65*1, y=200, w=58, color="red", font=30,code=setPen(1)}),--B1 + newButton({name="b2", x=500+65*2, y=200, w=58, color="orange", font=30,code=setPen(2)}),--B2 + newButton({name="b3", x=500+65*3, y=200, w=58, color="yellow", font=30,code=setPen(3)}),--B3 + newButton({name="b4", x=500+65*4, y=200, w=58, color="grass", font=30,code=setPen(4)}),--B4 + newButton({name="b5", x=500+65*5, y=200, w=58, color="green", font=30,code=setPen(5)}),--B5 + newButton({name="b6", x=500+65*6, y=200, w=58, color="water", font=30,code=setPen(6)}),--B6 + newButton({name="b7", x=500+65*7, y=200, w=58, color="cyan", font=30,code=setPen(7)}),--B7 + newButton({name="b8", x=500+65*8, y=200, w=58, color="blue", font=30,code=setPen(8)}),--B8 + newButton({name="b9", x=500+65*9, y=200, w=58, color="purple", font=30,code=setPen(9)}),--B9 + newButton({name="b10", x=500+65*10,y=200, w=58, color="magenta",font=30,code=setPen(10)}),--B10 + newButton({name="b11", x=500+65*11,y=200, w=58, color="pink", font=30,code=setPen(11)}),--B11 - newButton({name="b12", x=500+65*1, y=230, w=58, color="dGrey", font=30,code=setPen(12)}),--Bone - newButton({name="b13", x=500+65*2, y=230, w=58, color="grey", font=30,code=setPen(13)}),--GB1 - newButton({name="b14", x=500+65*3, y=230, w=58, color="lGrey", font=30,code=setPen(14)}),--GB2 - newButton({name="b15", x=500+65*4, y=230, w=58, color="dPurple",font=30,code=setPen(15)}),--GB3 - newButton({name="b16", x=500+65*5, y=230, w=58, color="dRed", font=30,code=setPen(16)}),--GB4 - newButton({name="b17", x=500+65*6, y=230, w=58, color="dGreen", font=30,code=setPen(17)}),--GB5 + newButton({name="b12", x=500+65*1, y=270, w=58, color="dGrey", font=30,code=setPen(12)}),--Bone + newButton({name="b13", x=500+65*2, y=270, w=58, color="grey", font=30,code=setPen(13)}),--GB1 + newButton({name="b14", x=500+65*3, y=270, w=58, color="lGrey", font=30,code=setPen(14)}),--GB2 + newButton({name="b15", x=500+65*4, y=270, w=58, color="dPurple",font=30,code=setPen(15)}),--GB3 + newButton({name="b16", x=500+65*5, y=270, w=58, color="dRed", font=30,code=setPen(16)}),--GB4 + newButton({name="b17", x=500+65*6, y=270, w=58, color="dGreen", font=30,code=setPen(17)}),--GB5 - newButton({name="any", x=600, y=360, w=120, color="lGrey", font=40,code=setPen(0)}), - newButton({name="space", x=730, y=360, w=120, color="grey", font=65,code=setPen(-1)}), - newButton({name="copy", x=920, y=360, w=120, color="lRed", font=35,code=pressKey("cC")}), - newButton({name="paste", x=1060, y=360, w=120, color="lBlue", font=35,code=pressKey("cV")}), - newButton({name="clear", x=1200, y=360, w=120, color="white", font=40,code=pressKey("delete")}), - newButton({name="pushLine", x=1060, y=500, w=120, color="lYellow",font=20,code=pressKey("k")}), - newButton({name="delLine", x=1200, y=500, w=120, color="lYellow",font=20,code=pressKey("l")}), + newButton({name="any", x=600, y=380, w=120, color="lGrey", font=40,code=setPen(0)}), + newButton({name="space", x=730, y=380, w=120, color="grey", font=65,code=setPen(-1)}), + newButton({name="copy", x=920, y=380, w=120, color="lRed", font=35,code=pressKey("cC")}), + newButton({name="paste", x=1060, y=380, w=120, color="lBlue", font=35,code=pressKey("cV")}), + newButton({name="clear", x=1200, y=380, w=120, color="white", font=40,code=pressKey("delete")}), + newButton({name="pushLine", x=1060, y=520, w=120, color="lYellow",font=20,code=pressKey("k")}), + newButton({name="delLine", x=1200, y=520, w=120, color="lYellow",font=20,code=pressKey("l")}), newSwitch({name="demo", x=755, y=640, font=30,disp=function()return sceneTemp.demo end,code=function()sceneTemp.demo=not sceneTemp.demo end}), - newButton({name="custom", x=110, y=80, w=140,h=80, color="white", font=35,code=pressKey("e")}), - newButton({name="back", x=1140, y=640, w=180,h=80, color="white", font=35,code=BACK}), + + newButton({name="seq", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_seq","swipeR")}), + newButton({name="norm", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_norm","swipeL")}), + newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, play={ newButton({name="pause", x=1235, y=45, w=80, color="white", font=25,code=function()pauseGame()end}), @@ -287,8 +293,8 @@ local Widgets={ newButton({name="quit", x=640, y=600, w=240,h=100,color="white", font=35,code=BACK}), }, setting_game={ - newButton({name="graphic", x=200, y=80, w=240,h=80, color="lCyan", font=35,code=function()SCN.swapTo("setting_video","swipeR")end}), - newButton({name="sound", x=1080, y=80, w=240,h=80, color="lCyan", font=35,code=function()SCN.swapTo("setting_sound","swipeL")end}), + newButton({name="graphic", x=200, y=80, w=240,h=80, color="lCyan", font=35,code=swapScene("setting_video","swipeR")}), + newButton({name="sound", x=1080, y=80, w=240,h=80, color="lCyan", font=35,code=swapScene("setting_sound","swipeL")}), newButton({name="ctrl", x=290, y=220, w=320,h=80, color="lYellow",font=35,code=goScene("setting_control")}), newButton({name="key", x=640, y=220, w=320,h=80, color="lGreen", font=35,code=goScene("setting_key")}), @@ -303,14 +309,14 @@ local Widgets={ newSwitch({name="fine", x=1080, y=440, font=20,disp=SETval("fine"), code=SETrev("fine")}), newSwitch({name="appLock", x=1080, y=500, font=20,disp=SETval("appLock"), code=SETrev("appLock")}), newButton({name="calc", x=970, y=550, w=150,h=60,color="dGrey", font=25,code=goScene("calculator"),hide=function()return not setting.appLock end}), - newButton({name="back", x=1140, y=640, w=180,h=80,color="white", font=35,code=BACK}), + newButton({name="back", x=1140, y=640, w=170,h=80,color="white", font=40,code=BACK}), }, setting_video={ - newButton({name="sound", x=200, y=80,w=240,h=80,color="lCyan",font=35,code=function()SCN.swapTo("setting_sound","swipeR")end}), - newButton({name="game", x=1080, y=80,w=240,h=80,color="lCyan",font=35,code=function()SCN.swapTo("setting_game","swipeL")end}), + newButton({name="sound", x=200, y=80,w=240,h=80,color="lCyan",font=35,code=swapScene("setting_sound","swipeR")}), + newButton({name="game", x=1080, y=80,w=240,h=80,color="lCyan",font=35,code=swapScene("setting_game","swipeL")}), newSwitch({name="block", x=360, y=180, font=30,disp=SETval("block"), code=SETrev("block")}), - newSlider({name="ghost", x=260, y=240,w=200,unit=.6,font=30,disp=SETval("ghost"),show="percent",code=SETsto("ghost")}), + newSlider({name="ghost", x=260, y=250,w=200,unit=.6,font=30,disp=SETval("ghost"),show="percent",code=SETsto("ghost")}), newSlider({name="center", x=260, y=300,w=200,unit=1, font=30,disp=SETval("center"), code=SETsto("center")}), newSwitch({name="smooth", x=700, y=180, font=30,disp=SETval("smooth"), code=SETrev("smooth")}), @@ -351,11 +357,11 @@ local Widgets={ code=function() setting.powerInfo=not setting.powerInfo end}), - newButton({name="back", x=1140, y=640,w=180,h=80,color="white", font=35,code=BACK}), + newButton({name="back", x=1140, y=640,w=170,h=80,color="white", font=40,code=BACK}), }, setting_sound={ - newButton({name="game", x=200, y=80,w=240,h=80,color="lCyan", font=35,code=function()SCN.swapTo("setting_game","swipeR")end}), - newButton({name="graphic", x=1080, y=80,w=240,h=80,color="lCyan", font=35,code=function()SCN.swapTo("setting_video","swipeL")end}), + newButton({name="game", x=200, y=80,w=240,h=80,color="lCyan", font=35,code=swapScene("setting_game","swipeR")}), + newButton({name="graphic", x=1080, y=80,w=240,h=80,color="lCyan", font=35,code=swapScene("setting_video","swipeL")}), newSlider({name="sfx", x=180, y=200,w=400, font=35,change=function()SFX.play("blip_1")end, disp=SETval("sfx"), code=SETsto("sfx")}), newSlider({name="stereo", x=180, y=500,w=400, font=35,change=function()SFX.play("move",1,-1)SFX.play("lock",1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hide=function()return setting.sfx==0 end}), @@ -363,7 +369,7 @@ local Widgets={ newSlider({name="bgm", x=180, y=400,w=400, font=35,change=function()BGM.freshVolume()end, disp=SETval("bgm"), code=SETsto("bgm")}), newSlider({name="vib", x=750, y=200,w=400, unit=5, font=28,change=function()VIB(2)end, disp=SETval("vib"), code=SETsto("vib")}), newSlider({name="voc", x=750, y=300,w=400, font=32,change=function()VOC.play("nya")end, disp=SETval("voc"), code=SETsto("voc")}), - newButton({name="back", x=1140, y=640,w=180,h=80,color="white", font=35,code=BACK}), + newButton({name="back", x=1140, y=640,w=170,h=80,color="white", font=40,code=BACK}), }, setting_control={ newSlider({name="das", x=250, y=200,w=910, unit=26, font=30,disp=SETval("das"), show="frame_time",code=SETsto("das")}), @@ -380,10 +386,10 @@ local Widgets={ _.sddas,_.sdarr=0,2 _.ihs,_.irs,_.ims=false,false,false end}), - newButton({name="back", x=1140, y=640,w=180,h=80,color="white",font=35,code=BACK}), + newButton({name="back", x=1140, y=640,w=170,h=80,color="white",font=40,code=BACK}), }, setting_key={ - newButton({name="back", x=1140,y=640,w=180,h=80,color="white",font=35,code=BACK}), + newButton({name="back", x=1140,y=640,w=170,h=80,color="white",font=40,code=BACK}), }, setting_skin={ newButton({name="prev", x=700,y=100,w=140,h=100,color="white",font=50,code=function()SKIN.prevSet()end}), @@ -424,7 +430,7 @@ local Widgets={ end SFX.play("hold") end}), - newButton({name="back", x=1140,y=640,w=180,h=80,color="white",font=35,code=BACK}), + newButton({name="back", x=1140,y=640,w=170,h=80,color="white",font=40,code=BACK}), }, setting_touch={ newButton({name="default", x=520,y=80,w=200,h=80,color="white",font=35, @@ -504,13 +510,13 @@ local Widgets={ return not setting.VKTrack end}), newSlider({name="alpha", x=840, y=540, w=400,font=40,disp=SETval("VKAlpha"),code=SETsto("VKAlpha")}), - newButton({name="back", x=1140, y=640, w=180,h=80,color="white",font=35,code=BACK}), + newButton({name="back", x=1140, y=640, w=170,h=80,color="white",font=40,code=BACK}), }, setting_trackSetting={ newSwitch({name="VKDodge", x=400, y=200, font=35, disp=SETval("VKDodge"),code=SETrev("VKDodge")}), newSlider({name="VKTchW", x=140, y=310, w=1000, unit=10,font=35,disp=SETval("VKTchW"),code=function(i)setting.VKTchW=i setting.VKCurW=math.max(setting.VKCurW,i)end}), newSlider({name="VKCurW", x=140, y=370, w=1000, unit=10,font=35,disp=SETval("VKCurW"),code=function(i)setting.VKCurW=i setting.VKTchW=math.min(setting.VKTchW,i)end}), - newButton({name="back", x=1140, y=640, w=180,h=80,color="white",font=35,code=BACK}), + newButton({name="back", x=1140, y=640, w=170,h=80,color="white",font=40,code=BACK}), }, setting_lang={ newButton({name="chi", x=160, y=100,w=200,h=120,color="white",font=45,code=setLang(1)}), @@ -523,7 +529,7 @@ local Widgets={ minigame={ newButton({name="p15", x=640, y=100,w=350,h=120,color="white",font=40,code=goScene("p15")}), newButton({name="schulte_G",x=640, y=250,w=350,h=120,color="white",font=40,code=goScene("schulte_G")}), - newButton({name="back", x=1140, y=640,w=180,h=80,color="white", font=35,code=BACK}), + newButton({name="back", x=1140, y=640,w=170,h=80,color="white", font=40,code=BACK}), }, p15={ newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen", font=40,code=pressKey("space")}), @@ -532,7 +538,7 @@ local Widgets={ newSwitch({name="slide", x=240,y=420,w=60, font=40,disp=function()return sceneTemp.slide end,code=pressKey("e"), hide=function()return sceneTemp.state==1 end}), newSwitch({name="pathVis", x=240,y=510,w=60, font=40,disp=function()return sceneTemp.pathVis end,code=pressKey("r"), hide=function()return sceneTemp.state==1 or not sceneTemp.slide end}), newSwitch({name="revKB", x=240,y=600,w=60, font=40,disp=function()return sceneTemp.revKB end,code=pressKey("t"), hide=function()return sceneTemp.state==1 end}), - newButton({name="back", x=1140,y=640,w=180,h=80,color="white", font=35,code=BACK}), + newButton({name="back", x=1140,y=640,w=170,h=80,color="white", font=40,code=BACK}), }, schulte_G={ newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen", font=40,code=pressKey("r"),hide=function()return sceneTemp.state==0 end}), @@ -540,7 +546,7 @@ local Widgets={ newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=function()return sceneTemp.blind end, code=pressKey("q"),hide=function()return sceneTemp.state==1 end}), newSwitch({name="disappear",x=240,y=420,w=60, font=40,disp=function()return sceneTemp.disappear end, code=pressKey("w"),hide=function()return sceneTemp.state==1 end}), newSwitch({name="tapFX", x=240,y=510,w=60, font=40,disp=function()return sceneTemp.tapFX end, code=pressKey("e"),hide=function()return sceneTemp.state==1 end}), - newButton({name="back", x=1140,y=640,w=180,h=80,color="white", font=35,code=BACK}), + newButton({name="back", x=1140,y=640,w=170,h=80,color="white", font=40,code=BACK}), }, help={ newButton({name="staff", x=980, y=500,w=150,h=80,color="white",font=32,code=goScene("staff")}), @@ -549,12 +555,12 @@ local Widgets={ newButton({name="back", x=640, y=600,w=200,h=80,color="white",font=35,code=BACK}), }, staff={ - newButton({name="back", x=1140, y=640,w=180,h=80,color="white",font=35,code=BACK}), + newButton({name="back", x=1140, y=640,w=170,h=80,color="white",font=40,code=BACK}), }, history={ newKey({name="prev", x=1155, y=170,w=180, color="white",font=65,code=pressKey("up"),hide=function()return sceneTemp.pos==1 end}), newKey({name="next", x=1155, y=400,w=180, color="white",font=65,code=pressKey("down"),hide=function()return sceneTemp.pos==#sceneTemp.text end}), - newButton({name="back", x=1140, y=640,w=180,h=80,color="white",font=35,code=BACK}), + newButton({name="back", x=1140, y=640,w=170,h=80,color="white",font=40,code=BACK}), }, stat={ newButton({name="path", x=980, y=620,w=250,h=80,color="white",font=25,code=function()love.system.openURL(love.filesystem.getSaveDirectory())end,hide=mobileHide}), diff --git a/parts/list.lua b/parts/list.lua index 1cf52c87..8e96db4e 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -195,7 +195,7 @@ drawableText={ win=T(120),finish=T(120), gameover=T(100),pause=T(120), - custom=T(80),sequence=T(80), + custom=T(80),basic=T(35),rule=T(35),field=T(35), setting_game=T(80),setting_video=T(80),setting_sound=T(80), setting_control=T(70),setting_skin=T(70), preview=T(40), diff --git a/parts/scenes.lua b/parts/scenes.lua index e680c11c..53f45a5e 100644 --- a/parts/scenes.lua +++ b/parts/scenes.lua @@ -69,11 +69,11 @@ do--calculator if S.val>0 then S.val=int(S.val/10) end - elseif k=="+"or k=="="and kb.isDown("rshift","lshift")then + elseif k=="+"or k=="="and kb.isDown("lshift","rshift")then S.sym="+" elseif k=="-"then S.sym="-" - elseif k=="*"or k=="8"and kb.isDown("rshift","lshift")then + elseif k=="*"or k=="8"and kb.isDown("lshift","rshift")then S.sym="*" elseif k=="/"then S.sym="/" @@ -1004,7 +1004,7 @@ do--mode end elseif mapCam.sel=="custom_clear" or mapCam.sel=="custom_puzzle" then if key=="e"then - SCN.go("custom") + SCN.go("custom_norm") end end end @@ -1219,92 +1219,20 @@ do--mode end end end -do--music - function sceneInit.music() - if BGM.nowPlay then - for i=1,BGM.len do - if BGM.list[i]==BGM.nowPlay then - sceneTemp=i--Music selected - return - end - end - else - sceneTemp=1 - end - end - - function wheelMoved.music(x,y) - wheelScroll(y) - end - function keyDown.music(key) - local S=sceneTemp - if key=="down"then - if S1 then - sceneTemp=S-1 - SFX.play("move",.7) - end - elseif key=="return"or key=="space"then - if BGM.nowPlay~=BGM.list[S]then - if setting.bgm>0 then - SFX.play("click") - BGM.play(BGM.list[S]) - end - else - BGM.stop() - end - elseif key=="escape"then - SCN.back() - end - end - - function Pnt.music() - gc.setColor(1,1,1)gc.draw(drawableText.musicRoom,22,23) - - gc.draw(drawableText.right,270,350+10) - setFont(50) - gc.print(BGM.list[sceneTemp],320,350+5) - setFont(35) - if sceneTemp>1 then gc.print(BGM.list[sceneTemp-1],320,350-30)end - if sceneTemp2 then gc.print(BGM.list[sceneTemp-2],320,350-50)end - if sceneTemp0 then sceneTemp.sure=sceneTemp.sure-1 end end - function Pnt.sequence() + function Pnt.custom_seq() local S=sceneTemp - gc.setColor(1,1,1)gc.draw(drawableText.sequence,122,-12) + gc.setColor(1,1,1) + gc.draw(drawableText.custom,20,5) + gc.setLineWidth(4) - gc.rectangle("line",100,100,1080,260) + gc.rectangle("line",100,110,1080,260) setFont(30) local bag=preBag local len=#bag setFont(40) - gc.print(len,120,300) + gc.print(len,120,310) local L=TEXTURE.miniBlock local lib=SKIN.libColor local set=setting.skin - local x,y=120,126 - local cx,cy=120,126 + local x,y=120,136 + local cx,cy=120,136 for i=1,len do local B=L[bag[i]] gc.setColor(lib[set[bag[i]]]) @@ -1433,9 +1398,8 @@ do--sequence end end end -do--draw - function sceneInit.draw() - BG.set("space") +do--custom_draw + function sceneInit.custom_draw() sceneTemp={ sure=0, pen=1, @@ -1449,10 +1413,10 @@ do--draw a=12,s=13,d=14,f=15,g=16,h=17, z=0,x=-1, } - function mouseDown.draw(x,y,k) - mouseMove.draw(x,y) + function mouseDown.custom_draw(x,y,k) + mouseMove.custom_draw(x,y) end - function mouseMove.draw(x,y,dx,dy) + function mouseMove.custom_draw(x,y,dx,dy) local sx,sy=int((x-200)/30)+1,20-int((y-60)/30) if sx<1 or sx>10 then sx=nil end if sy<1 or sy>20 then sy=nil end @@ -1461,7 +1425,7 @@ do--draw preField[sy][sx]=ms.isDown(1)and sceneTemp.pen or ms.isDown(2)and -1 or 0 end end - function wheelMoved.draw(x,y) + function wheelMoved.custom_draw(x,y) local pen=sceneTemp.pen if y<0 then pen=pen+1 @@ -1472,10 +1436,10 @@ do--draw end sceneTemp.pen=pen end - function touchDown.draw(id,x,y) - mouseMove.draw(x,y) + function touchDown.custom_draw(id,x,y) + mouseMove.custom_draw(x,y) end - function touchMove.draw(id,x,y,dx,dy) + function touchMove.custom_draw(id,x,y,dx,dy) local sx,sy=int((x-200)/30)+1,20-int((y-60)/30) if sx<1 or sx>10 then sx=nil end if sy<1 or sy>20 then sy=nil end @@ -1484,7 +1448,7 @@ do--draw preField[sy][sx]=sceneTemp.pen end end - function keyDown.draw(key) + function keyDown.custom_draw(key) local sx,sy,pen=sceneTemp.x,sceneTemp.y,sceneTemp.pen if key=="up"or key=="down"or key=="left"or key=="right"then if not sx then sx=1 end @@ -1509,8 +1473,12 @@ do--draw if sx and sy then preField[sy][sx]=pen end - elseif key=="e"then - SCN.swapTo("custom","swipeL") + elseif key=="tab"then + if kb.isDown("lshift","rshift")then + SCN.swapTo("custom_seq","swipeR") + else + SCN.swapTo("custom_norm","swipeL") + end elseif key=="escape"then SCN.back() elseif key=="k"then @@ -1551,12 +1519,17 @@ do--draw sceneTemp.x,sceneTemp.y,sceneTemp.pen=sx,sy,pen end - function Tmr.draw() + function Tmr.custom_draw() if sceneTemp.sure>0 then sceneTemp.sure=sceneTemp.sure-1 end end - function Pnt.draw() + function Pnt.custom_draw() local sx,sy=sceneTemp.x,sceneTemp.y + + gc.setColor(.7,.7,.7) + mText(drawableText.field,350,5) + + --Field gc.translate(200,60) gc.setColor(1,1,1,.2) gc.setLineWidth(1) @@ -1606,7 +1579,7 @@ do--draw for i=1,7 do _=setting.skin[i] gc.setColor(SKIN.libColor[_]) - mStr(text.block[i],500+65*_,65) + mStr(text.block[i],500+65*_,115) end end end @@ -2585,6 +2558,77 @@ do--setting_lang FILE.saveSetting() end end +do--music + function sceneInit.music() + if BGM.nowPlay then + for i=1,BGM.len do + if BGM.list[i]==BGM.nowPlay then + sceneTemp=i--Music selected + return + end + end + else + sceneTemp=1 + end + end + + function wheelMoved.music(x,y) + wheelScroll(y) + end + function keyDown.music(key) + local S=sceneTemp + if key=="down"then + if S1 then + sceneTemp=S-1 + SFX.play("move",.7) + end + elseif key=="return"or key=="space"then + if BGM.nowPlay~=BGM.list[S]then + if setting.bgm>0 then + SFX.play("click") + BGM.play(BGM.list[S]) + end + else + BGM.stop() + end + elseif key=="escape"then + SCN.back() + end + end + + function Pnt.music() + gc.setColor(1,1,1)gc.draw(drawableText.musicRoom,22,23) + + gc.draw(drawableText.right,270,350+10) + setFont(50) + gc.print(BGM.list[sceneTemp],320,350+5) + setFont(35) + if sceneTemp>1 then gc.print(BGM.list[sceneTemp-1],320,350-30)end + if sceneTemp2 then gc.print(BGM.list[sceneTemp-2],320,350-50)end + if sceneTemp