diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index 3e156489..8c98ded2 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -311,10 +311,10 @@ end scene.widgetList={ WIDGET.newButton{name="reset", x=160, y=100,w=180,h=100,color='lG',font=40,code=pressKey"space"}, colorSelector, - WIDGET.newSwitch{name="invis", x=240, y=330,w=60,font=40,disp=function()return invis end, code=pressKey"w",hideF=ifGaming}, - WIDGET.newSwitch{name="slide", x=240, y=420,w=60,font=40,disp=function()return slide end, code=pressKey"e",hideF=ifGaming}, - WIDGET.newSwitch{name="pathVis",x=240, y=510,w=60,font=40,disp=function()return pathVis end,code=pressKey"r",hideF=function()return state==1 or not slide end}, - WIDGET.newSwitch{name="revKB", x=240, y=600,w=60,font=40,disp=function()return revKB end, code=pressKey"t",hideF=ifGaming}, + WIDGET.newSwitch{name="invis", x=240, y=330,lim=200,font=40,disp=function()return invis end, code=pressKey"w",hideF=ifGaming}, + WIDGET.newSwitch{name="slide", x=240, y=420,lim=200,font=40,disp=function()return slide end, code=pressKey"e",hideF=ifGaming}, + WIDGET.newSwitch{name="pathVis",x=240, y=510,lim=200,font=40,disp=function()return pathVis end,code=pressKey"r",hideF=function()return state==1 or not slide end}, + WIDGET.newSwitch{name="revKB", x=240, y=600,lim=200,font=40,disp=function()return revKB end, code=pressKey"t",hideF=ifGaming}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene}, } diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index b671e864..290cc269 100644 --- a/parts/scenes/app_2048.lua +++ b/parts/scenes/app_2048.lua @@ -481,15 +481,15 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset", x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, - WIDGET.newSwitch{name="invis", x=240,y=300,w=60,font=40,disp=function()return invis end,code=pressKey"q",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="tapControl",x=240,y=370,w=60,font=40,disp=function()return tapControl end,code=pressKey"w",hideF=function()return state==1 end}, + WIDGET.newButton{name="reset", x=155, y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, + WIDGET.newSwitch{name="invis", x=240, y=300,lim=200,font=40,disp=function()return invis end,code=pressKey"q",hideF=function()return state==1 end}, + WIDGET.newSwitch{name="tapControl",x=240, y=370,lim=200,font=40,disp=function()return tapControl end,code=pressKey"w",hideF=function()return state==1 end}, - WIDGET.newKey{name="up", x=155,y=460,w=100,fText="↑",font=50, color='Y',code=pressKey"up", hideF=function()return tapControl end}, - WIDGET.newKey{name="down", x=155,y=660,w=100,fText="↓",font=50, color='Y',code=pressKey"down", hideF=function()return tapControl end}, - WIDGET.newKey{name="left", x=55,y=560,w=100,fText="←",font=50, color='Y',code=pressKey"left", hideF=function()return tapControl end}, - WIDGET.newKey{name="right", x=255,y=560,w=100,fText="→",font=50,color='Y',code=pressKey"right", hideF=function()return tapControl end}, - WIDGET.newKey{name="skip", x=155,y=400,w=100,font=20, color='Y',code=pressKey"space", hideF=function()return state~=1 or not skipper.cd or skipper.cd>0 end}, + WIDGET.newKey{name="up", x=155, y=460,w=100,fText="↑",font=50, color='Y',code=pressKey"up", hideF=function()return tapControl end}, + WIDGET.newKey{name="down", x=155, y=660,w=100,fText="↓",font=50, color='Y',code=pressKey"down", hideF=function()return tapControl end}, + WIDGET.newKey{name="left", x=55, y=560,w=100,fText="←",font=50, color='Y',code=pressKey"left", hideF=function()return tapControl end}, + WIDGET.newKey{name="right", x=255, y=560,w=100,fText="→",font=50,color='Y',code=pressKey"right", hideF=function()return tapControl end}, + WIDGET.newKey{name="skip", x=155, y=400,w=100,font=20, color='Y',code=pressKey"space", hideF=function()return state~=1 or not skipper.cd or skipper.cd>0 end}, WIDGET.newKey{name="record1", x=1100,y=390,w=220,h=50,fText="", color='H',code=pressKey"1", hideF=function()return state==2 end}, WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="", color='H',code=pressKey"2", hideF=function()return state==2 end}, WIDGET.newKey{name="replay1", x=1245,y=390,w=50,fText="!", color='G',code=pressKey"c1", hideF=function()return state==2 or #repeater.seq[1]==0 end}, diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index 9efbb7d3..9dee2ed4 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -45,7 +45,7 @@ local colorSelector=WIDGET.newSelector{name="color",x=150,y=360,w=290, list={"black","dGray","gray","lGray","dRed","red","lRed","dFire","fire","lFire","dOrange","orange","lOrange","dYellow","yellow","lYellow","dLime","lime","lLime","dJade","jade","lJade","dGreen","green","lGreen","dAqua","aqua","lAqua","dCyan","cyan","lCyan","dNavy","navy","lNavy","dSea","sea","lSea","dBlue","blue","lBlue","dViolet","violet","lViolet","dPurple","purple","lPurple","dMagenta","magenta","lMagenta","dWine","wine","lWine"}, disp=function()return tileColor end,code=function(m)tileColor=m end } -local arcadeSwitch=WIDGET.newSwitch{name="arcade",x=230,y=430,font=40,disp=function()return arcade end,code=pressKey"e"} +local arcadeSwitch=WIDGET.newSwitch{name="arcade",x=240,y=430,lim=200,font=40,disp=function()return arcade end,code=pressKey"e"} local function freshSelectors() local f=state~=0 modeSelector.hide=f diff --git a/parts/scenes/app_link.lua b/parts/scenes/app_link.lua index 4a4afe6d..c3ed84e0 100644 --- a/parts/scenes/app_link.lua +++ b/parts/scenes/app_link.lua @@ -40,9 +40,9 @@ local colorList={ } gc.setDefaultFilter('nearest','nearest') local iconList={ - GC.DO{10,10,{'fRect',3.5,3.5,4,4}}, + GC.DO{10,10,{'fRect',2,2,6,6}}, GC.DO{10,10,{'dRect',2.5,2.5,5,5}}, - GC.DO{10,10,{'fCirc',5,5,2.5}}, + GC.DO{10,10,{'fCirc',5,5,2}}, GC.DO{10,10,{'fRect',2,2,2,6},{'fRect',6.5,2,2,6}}, GC.DO{10,10,{'fRect',2,2,1,1},{'fRect',3,3,1,1},{'fRect',4,4,1,1},{'fRect',5,5,1,1},{'fRect',6,6,1,1},{'fRect',7,7,1,1}}, GC.DO{10,10,{'fRect',2,2,2,2},{'fRect',2,6,2,2},{'fRect',6,2,2,2},{'fRect',6,6,2,2}}, @@ -327,7 +327,7 @@ function scene.draw() if t then gc_setColor(colorList[t]) gc_rectangle('fill',x-1,y-1,1,1) - gc_setColor(0,0,0,.3) + gc_setColor(0,0,0,.26) gc_draw(iconList[t],x-1,y-1,nil,.1,.1) end end diff --git a/parts/scenes/app_schulteG.lua b/parts/scenes/app_schulteG.lua index 03a731ba..c4ef1084 100644 --- a/parts/scenes/app_schulteG.lua +++ b/parts/scenes/app_schulteG.lua @@ -170,10 +170,10 @@ end scene.widgetList={ WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"space",hideF=function()return state==0 end}, - WIDGET.newSlider{name="rank", x=130,y=250,w=150,unit=3,show=false,font=40,disp=function()return rank-3 end,code=function(v)rank=v+3 end,hideF=function()return state>0 end}, - WIDGET.newSwitch{name="invis", x=240,y=330,w=60, font=40,disp=function()return invis end, code=pressKey"q",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="disappear",x=240,y=420,w=60, font=40,disp=function()return disappear end,code=pressKey"w",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="tapFX", x=240,y=510,w=60, font=40,disp=function()return tapFX end, code=pressKey"e",hideF=function()return state==1 end}, + WIDGET.newSlider{name="rank", x=130,y=250,lim=105,w=150,unit=3,show=false,font=40,disp=function()return rank-3 end,code=function(v)rank=v+3 end,hideF=function()return state>0 end}, + WIDGET.newSwitch{name="invis", x=240,y=330,lim=200,font=40,disp=function()return invis end, code=pressKey"q",hideF=function()return state==1 end}, + WIDGET.newSwitch{name="disappear",x=240,y=420,lim=200,font=40,disp=function()return disappear end,code=pressKey"w",hideF=function()return state==1 end}, + WIDGET.newSwitch{name="tapFX", x=240,y=510,lim=200,font=40,disp=function()return tapFX end, code=pressKey"e",hideF=function()return state==1 end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene}, } diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index e760f90c..d7f808f4 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -302,9 +302,9 @@ end scene.widgetList={ WIDGET.newButton{name="reset",x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, - WIDGET.newSwitch{name="next", x=240,y=235,font=40,disp=function()return nexts end,code=pressKey"q",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="invis",x=240,y=305,font=40,disp=function()return invis end,code=pressKey"w",hideF=function()return state==1 end}, - WIDGET.newSwitch{name="fast", x=240,y=375,font=30,disp=function()return fast end,code=pressKey"e",hideF=function()return state==1 end}, + 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}, } diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index 97f63a2c..2d807121 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -237,21 +237,21 @@ scene.widgetList={ WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,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')}, + WIDGET.newSwitch{name="ospin", x=850, y=750,lim=210,disp=CUSval('ospin'), code=CUSrev('ospin')}, + WIDGET.newSwitch{name="fineKill", x=850, y=840,lim=210,disp=CUSval('fineKill'), code=CUSrev('fineKill')}, + WIDGET.newSwitch{name="b2bKill", x=850, y=930,lim=210,disp=CUSval('b2bKill'), code=CUSrev('b2bKill')}, + WIDGET.newSwitch{name="easyFresh", x=1170,y=750,lim=250,disp=CUSval('easyFresh'),code=CUSrev('easyFresh')}, + WIDGET.newSwitch{name="deepDrop", x=1170,y=840,lim=250,disp=CUSval('deepDrop'), code=CUSrev('deepDrop')}, + WIDGET.newSwitch{name="bone", x=1170,y=930,lim=250,disp=CUSval('bone'), code=CUSrev('bone')}, --Rule set WIDGET.newSelector{name="eventSet", x=310, y=880,w=360,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')}, --Next & Hold - WIDGET.newSlider{name="nextCount", x=140, y=960,w=180,unit=6, disp=CUSval('nextCount'),code=CUSsto('nextCount')}, - WIDGET.newSlider{name="holdCount", x=140, y=1030,w=180,unit=6,disp=CUSval('holdCount'),code=CUSsto('holdCount')}, - WIDGET.newSwitch{name="infHold", x=560, y=960, 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}, + WIDGET.newSlider{name="nextCount", x=140, y=960, lim=130,w=180,unit=6,disp=CUSval('nextCount'),code=CUSsto('nextCount')}, + WIDGET.newSlider{name="holdCount", x=140, y=1030,lim=130,w=180,unit=6,disp=CUSval('holdCount'),code=CUSsto('holdCount')}, + WIDGET.newSwitch{name="infHold", x=560, y=960, lim=200, disp=CUSval('infHold'),code=CUSrev('infHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSwitch{name="phyHold", x=560, y=1030,lim=200, disp=CUSval('phyHold'),code=CUSrev('phyHold'),hideF=function()return CUSTOMENV.holdCount==0 end}, --BG & BGM WIDGET.newSelector{name="bg", x=840, y=1030,w=250,color='Y',list=BG.getList(),disp=CUSval('bg'),code=function(i)CUSTOMENV.bg=i BG.set(i)end}, diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index e102aaef..1903b15a 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -484,7 +484,7 @@ scene.widgetList={ WIDGET.newButton{name="copy", x=730, y=530,w=120,color='lR', font=35,code=pressKey"cC"}, WIDGET.newButton{name="paste", x=860, y=530,w=120,color='lB', font=35,code=pressKey"cV"}, WIDGET.newButton{name="clear", x=990, y=530,w=120,color='Z', font=40,code=pressKey"delete"}, - WIDGET.newSwitch{name="demo", x=755, y=640,disp=function()return demo end,code=function()demo=not demo end}, + WIDGET.newSwitch{name="demo", x=755, y=640,lim=220,disp=function()return demo end,code=function()demo=not demo end}, WIDGET.newButton{name="newPg", x=100, y=110,w=160,h=110,color='N',font=20,code=pressKey"n"}, WIDGET.newButton{name="delPg", x=100, y=230,w=160,h=110,color='lR',font=20,code=pressKey"m"}, diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index a56c1f52..c3f03d37 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -239,7 +239,7 @@ scene.widgetList={ WIDGET.newKey{name="reset", x=1000,y=640,w=90, color='lY',font=50,code=pressKey"delete"}, 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,disp=CUSval('missionKill'),code=CUSrev('missionKill')}, + 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}, } diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index da7f3eb4..0b35225f 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -96,21 +96,21 @@ scene.widgetList={ WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene}, --Special rules - WIDGET.newSwitch{name="ospin", x=830, y=750,disp=ROOMval('ospin'), code=ROOMrev('ospin')}, - WIDGET.newSwitch{name="fineKill", x=830, y=840,disp=ROOMval('fineKill'), code=ROOMrev('fineKill')}, - WIDGET.newSwitch{name="b2bKill", x=830, y=930,disp=ROOMval('b2bKill'), code=ROOMrev('b2bKill')}, - WIDGET.newSwitch{name="easyFresh", x=1170,y=750,disp=ROOMval('easyFresh'),code=ROOMrev('easyFresh')}, - WIDGET.newSwitch{name="deepDrop", x=1170,y=840,disp=ROOMval('deepDrop'), code=ROOMrev('deepDrop')}, - WIDGET.newSwitch{name="bone", x=1170,y=930,disp=ROOMval('bone'), code=ROOMrev('bone')}, + WIDGET.newSwitch{name="ospin", x=850, y=750,lim=210,disp=ROOMval('ospin'), code=ROOMrev('ospin')}, + WIDGET.newSwitch{name="fineKill", x=850, y=840,lim=210,disp=ROOMval('fineKill'), code=ROOMrev('fineKill')}, + WIDGET.newSwitch{name="b2bKill", x=850, y=930,lim=210,disp=ROOMval('b2bKill'), code=ROOMrev('b2bKill')}, + WIDGET.newSwitch{name="easyFresh", x=1170,y=750,lim=250,disp=ROOMval('easyFresh'),code=ROOMrev('easyFresh')}, + WIDGET.newSwitch{name="deepDrop", x=1170,y=840,lim=250,disp=ROOMval('deepDrop'), code=ROOMrev('deepDrop')}, + WIDGET.newSwitch{name="bone", x=1170,y=930,lim=250,disp=ROOMval('bone'), code=ROOMrev('bone')}, --Rule set WIDGET.newSelector{name="eventSet", x=310,y=880,w=360,color='H',list=sList.eventSet,disp=ROOMval('eventSet'),code=ROOMsto('eventSet')}, --Next & Hold - WIDGET.newSlider{name="nextCount", x=140,y=960,w=200,unit=6, disp=ROOMval('nextCount'),code=ROOMsto('nextCount')}, - WIDGET.newSlider{name="holdCount", x=140,y=1030,w=200,unit=6, disp=ROOMval('holdCount'),code=ROOMsto('holdCount')}, - WIDGET.newSwitch{name="infHold", x=560,y=960, disp=ROOMval('infHold'),code=ROOMrev('infHold'),hideF=function()return ROOMENV.holdCount==0 end}, - WIDGET.newSwitch{name="phyHold", x=560,y=1030, disp=ROOMval('phyHold'),code=ROOMrev('phyHold'),hideF=function()return ROOMENV.holdCount==0 end}, + WIDGET.newSlider{name="nextCount", x=140, y=960, lim=130,w=200,unit=6,disp=ROOMval('nextCount'),code=ROOMsto('nextCount')}, + WIDGET.newSlider{name="holdCount", x=140, y=1030,lim=130,w=200,unit=6,disp=ROOMval('holdCount'),code=ROOMsto('holdCount')}, + WIDGET.newSwitch{name="infHold", x=560, y=960, lim=200, disp=ROOMval('infHold'),code=ROOMrev('infHold'),hideF=function()return ROOMENV.holdCount==0 end}, + WIDGET.newSwitch{name="phyHold", x=560, y=1030,lim=200, disp=ROOMval('phyHold'),code=ROOMrev('phyHold'),hideF=function()return ROOMENV.holdCount==0 end}, } return scene diff --git a/parts/scenes/setting_control.lua b/parts/scenes/setting_control.lua index 121c2fe2..94ac03ce 100644 --- a/parts/scenes/setting_control.lua +++ b/parts/scenes/setting_control.lua @@ -84,15 +84,15 @@ scene.widgetList={ WIDGET.newText{name="title", x=80, y=50,font=70,align='L'}, WIDGET.newText{name="preview", x=520, y=610,font=40,align='R'}, - WIDGET.newSlider{name="das", x=250, y=190,w=600,unit=20,disp=SETval('das'), show=_sliderShow,code=SETsto('das')}, - WIDGET.newSlider{name="arr", x=250, y=260,w=525,unit=15,disp=SETval('arr'), show=_sliderShow,code=SETsto('arr')}, - WIDGET.newSlider{name="sddas", x=250, y=330,w=350,unit=10,disp=SETval('sddas'), show=_sliderShow,code=SETsto('sddas')}, - WIDGET.newSlider{name="sdarr", x=250, y=400,w=140,unit=4, disp=SETval('sdarr'), show=_sliderShow,code=SETsto('sdarr')}, - WIDGET.newSlider{name="dascut", x=250, y=470,w=600,unit=20,disp=SETval('dascut'), show=_sliderShow,code=SETsto('dascut')}, - WIDGET.newSlider{name="dropcut",x=250, y=540,w=300,unit=10,disp=SETval('dropcut'),show=_sliderShow,code=SETsto('dropcut')}, - WIDGET.newSwitch{name="ihs", x=1100, y=260, disp=SETval('ihs'), code=SETrev('ihs')}, - WIDGET.newSwitch{name="irs", x=1100, y=330, disp=SETval('irs'), code=SETrev('irs')}, - WIDGET.newSwitch{name="ims", x=1100, y=400, disp=SETval('ims'), code=SETrev('ims')}, + WIDGET.newSlider{name="das", x=250, y=190,lim=230,w=600,unit=20,disp=SETval('das'), show=_sliderShow,code=SETsto('das')}, + WIDGET.newSlider{name="arr", x=250, y=260,lim=230,w=525,unit=15,disp=SETval('arr'), show=_sliderShow,code=SETsto('arr')}, + WIDGET.newSlider{name="sddas", x=250, y=330,lim=230,w=350,unit=10,disp=SETval('sddas'), show=_sliderShow,code=SETsto('sddas')}, + WIDGET.newSlider{name="sdarr", x=250, y=400,lim=230,w=140,unit=4, disp=SETval('sdarr'), show=_sliderShow,code=SETsto('sdarr')}, + WIDGET.newSlider{name="dascut", x=250, y=470,lim=230,w=600,unit=20,disp=SETval('dascut'), show=_sliderShow,code=SETsto('dascut')}, + WIDGET.newSlider{name="dropcut",x=250, y=540,lim=230,w=300,unit=10,disp=SETval('dropcut'),show=_sliderShow,code=SETsto('dropcut')}, + WIDGET.newSwitch{name="ihs", x=1100, y=260,lim=300, disp=SETval('ihs'), code=SETrev('ihs')}, + WIDGET.newSwitch{name="irs", x=1100, y=330,lim=300, disp=SETval('irs'), code=SETrev('irs')}, + WIDGET.newSwitch{name="ims", x=1100, y=400,lim=300, disp=SETval('ims'), code=SETrev('ims')}, WIDGET.newButton{name="reset", x=160, y=640,w=200,h=100,color='lR',font=40, code=function() local _=SETTING diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 74716482..16e26765 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -40,15 +40,15 @@ scene.widgetList={ WIDGET.newButton{name="ctrl", x=290, y=220, w=320,h=80,color='lY',font=35,code=goScene'setting_control'}, WIDGET.newButton{name="key", x=640, y=220, w=320,h=80,color='lG',font=35,code=goScene'setting_key'}, WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80,color='lB',font=35,code=goScene'setting_touch'}, - WIDGET.newSlider{name="reTime", x=330, y=320, w=300,unit=10,disp=SETval('reTime'),code=SETsto('reTime'),show=function(S)return(.5+S.disp()*.25).."s"end}, + WIDGET.newSlider{name="reTime", x=330, y=320, w=300,lim=180,unit=10,disp=SETval('reTime'),code=SETsto('reTime'),show=function(S)return(.5+S.disp()*.25).."s"end}, WIDGET.newSelector{name="RS", x=300, y=420, w=300,color='S',list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'},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.newSelector{name="menuPos", x=980, y=320, w=300,color='O',list={'left','middle','right'},disp=SETval('menuPos'),code=SETsto('menuPos')}, - WIDGET.newSwitch{name="sysCursor" ,x=1060, y=390, disp=SETval('sysCursor'),code=switchCursor}, - WIDGET.newSwitch{name="autoPause", x=1060, y=450, disp=SETval('autoPause'),code=SETrev('autoPause')}, - WIDGET.newSwitch{name="swap", x=1060, y=510, disp=SETval('swap'), code=SETrev('swap')}, - WIDGET.newSwitch{name="autoSave", x=600, y=800, disp=SETval('autoSave'), code=SETrev('autoSave')}, - WIDGET.newSwitch{name="simpMode", x=1060, y=800, disp=SETval('simpMode'), + WIDGET.newSwitch{name="sysCursor" ,x=1060, y=390, lim=580,disp=SETval('sysCursor'),code=switchCursor}, + WIDGET.newSwitch{name="autoPause", x=1060, y=450, lim=580,disp=SETval('autoPause'),code=SETrev('autoPause')}, + WIDGET.newSwitch{name="swap", x=1060, y=510, lim=580,disp=SETval('swap'), code=SETrev('swap')}, + WIDGET.newSwitch{name="autoSave", x=600, y=800, lim=430,disp=SETval('autoSave'), code=SETrev('autoSave')}, + WIDGET.newSwitch{name="simpMode", x=1060, y=800, lim=380,disp=SETval('simpMode'), code=function() SETTING.simpMode=not SETTING.simpMode for i=1,#SCN.stack,2 do diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 3edfe39e..6ffde3ad 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -78,17 +78,17 @@ scene.widgetList={ WIDGET.newButton{name="game", x=200, y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeR')}, WIDGET.newButton{name="graphic", x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeL')}, - WIDGET.newSlider{name="mainVol", x=300, y=170,w=520,color='lG',disp=SETval('mainVol'),code=function(v)SETTING.mainVol=v love.audio.setVolume(SETTING.mainVol)end}, - WIDGET.newSlider{name="bgm", x=300, y=240,w=420,color='lG',disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, - WIDGET.newSlider{name="sfx", x=300, y=310,w=420,color='lC',change=function()SFX.play('blip_1')end,disp=SETval('sfx'),code=SETsto('sfx')}, - WIDGET.newSlider{name="stereo", x=300, y=380,w=420,color='lC',change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval('stereo'),code=SETsto('stereo'),hideF=function()return SETTING.sfx==0 end}, - WIDGET.newSlider{name="spawn", x=300, y=450,w=420,color='lC',change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,disp=SETval('sfx_spawn'),code=SETsto('sfx_spawn')}, - WIDGET.newSlider{name="warn", x=300, y=520,w=420,color='lC',change=function()SFX.fplay('warning',SETTING.sfx_warn)end,disp=SETval('sfx_warn'),code=SETsto('sfx_warn')}, - WIDGET.newSlider{name="vib", x=300, y=590,w=420,color='lN',unit=10,change=function()VIB(2)end,disp=SETval('vib'),code=SETsto('vib')}, - WIDGET.newSlider{name="voc", x=300, y=660,w=420,color='lN',change=function()VOC.play('test')end,disp=SETval('voc'),code=SETsto('voc')}, + WIDGET.newSlider{name="mainVol", x=300, y=170,w=520,lim=220,color='lG',disp=SETval('mainVol'),code=function(v)SETTING.mainVol=v love.audio.setVolume(SETTING.mainVol)end}, + WIDGET.newSlider{name="bgm", x=300, y=240,w=420,lim=220,color='lG',disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, + WIDGET.newSlider{name="sfx", x=300, y=310,w=420,lim=220,color='lC',change=function()SFX.play('blip_1')end,disp=SETval('sfx'),code=SETsto('sfx')}, + WIDGET.newSlider{name="stereo", x=300, y=380,w=420,lim=220,color='lC',change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval('stereo'),code=SETsto('stereo'),hideF=function()return SETTING.sfx==0 end}, + WIDGET.newSlider{name="spawn", x=300, y=450,w=420,lim=220,color='lC',change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,disp=SETval('sfx_spawn'),code=SETsto('sfx_spawn')}, + WIDGET.newSlider{name="warn", x=300, y=520,w=420,lim=220,color='lC',change=function()SFX.fplay('warning',SETTING.sfx_warn)end,disp=SETval('sfx_warn'),code=SETsto('sfx_warn')}, + WIDGET.newSlider{name="vib", x=300, y=590,w=420,lim=220,color='lN',unit=10,change=function()VIB(2)end,disp=SETval('vib'),code=SETsto('vib')}, + WIDGET.newSlider{name="voc", x=300, y=660,w=420,lim=220,color='lN',change=function()VOC.play('test')end,disp=SETval('voc'),code=SETsto('voc')}, - WIDGET.newSwitch{name="autoMute", x=1150,y=210,disp=SETval('autoMute'),code=SETrev('autoMute')}, - WIDGET.newSwitch{name="fine", x=1150,y=270,disp=SETval('fine'),code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, + WIDGET.newSwitch{name="autoMute", x=1150,y=210,lim=380,disp=SETval('autoMute'),code=SETrev('autoMute')}, + WIDGET.newSwitch{name="fine", x=1150,y=270,lim=380,disp=SETval('fine'),code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, WIDGET.newSelector{name="sfxPack",x=1100,y=340,w=200,list={'chiptune'},disp=function()return sfxPack end,code=function(i)sfxPack=i end}, WIDGET.newButton{name="apply", x=1100,y=410,w=180,h=60,code=function()SETTING.sfxPack=sfxPack SFX.load('media/effect/'..sfxPack..'/')end,hideF=function()return SETTING.sfxPack==sfxPack end}, diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index ce7ce23c..6ebb96a7 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -21,39 +21,39 @@ local function _notTrack()return not(SETTING.VKSwitch and SETTING.VKTrack)end 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)}, - WIDGET.newSwitch{name="b3", x=280, y=200, disp=_VKAdisp(3),code=_VKAcode(3)}, - WIDGET.newSwitch{name="b4", x=280, y=260, disp=_VKAdisp(4),code=_VKAcode(4)}, - WIDGET.newSwitch{name="b5", x=280, y=320, disp=_VKAdisp(5),code=_VKAcode(5)}, - WIDGET.newSwitch{name="b6", x=280, y=380, disp=_VKAdisp(6),code=_VKAcode(6)}, - WIDGET.newSwitch{name="b7", x=280, y=440, disp=_VKAdisp(7),code=_VKAcode(7)}, - WIDGET.newSwitch{name="b8", x=280, y=500, disp=_VKAdisp(8),code=_VKAcode(8)}, - WIDGET.newSwitch{name="b9", x=280, y=560, disp=_VKAdisp(9),code=_VKAcode(9)}, - WIDGET.newSwitch{name="b10", x=280, y=620, disp=_VKAdisp(10),code=_VKAcode(10)}, - WIDGET.newSwitch{name="b11", x=580, y=80, disp=_VKAdisp(11),code=_VKAcode(11)}, - WIDGET.newSwitch{name="b12", x=580, y=140, disp=_VKAdisp(12),code=_VKAcode(12)}, - WIDGET.newSwitch{name="b13", x=580, y=200, disp=_VKAdisp(13),code=_VKAcode(13)}, - WIDGET.newSwitch{name="b14", x=580, y=260, disp=_VKAdisp(14),code=_VKAcode(14)}, - WIDGET.newSwitch{name="b15", x=580, y=320, disp=_VKAdisp(15),code=_VKAcode(15)}, - WIDGET.newSwitch{name="b16", x=580, y=380, disp=_VKAdisp(16),code=_VKAcode(16)}, - WIDGET.newSwitch{name="b17", x=580, y=440, disp=_VKAdisp(17),code=_VKAcode(17)}, - WIDGET.newSwitch{name="b18", x=580, y=500, disp=_VKAdisp(18),code=_VKAcode(18)}, - WIDGET.newSwitch{name="b19", x=580, y=560, disp=_VKAdisp(19),code=_VKAcode(19)}, - WIDGET.newSwitch{name="b20", x=580, y=620, disp=_VKAdisp(20),code=_VKAcode(20)}, + WIDGET.newSwitch{name="b1", x=280, y=80, lim=230,disp=_VKAdisp(1),code=_VKAcode(1)}, + WIDGET.newSwitch{name="b2", x=280, y=140, lim=230,disp=_VKAdisp(2),code=_VKAcode(2)}, + WIDGET.newSwitch{name="b3", x=280, y=200, lim=230,disp=_VKAdisp(3),code=_VKAcode(3)}, + WIDGET.newSwitch{name="b4", x=280, y=260, lim=230,disp=_VKAdisp(4),code=_VKAcode(4)}, + WIDGET.newSwitch{name="b5", x=280, y=320, lim=230,disp=_VKAdisp(5),code=_VKAcode(5)}, + WIDGET.newSwitch{name="b6", x=280, y=380, lim=230,disp=_VKAdisp(6),code=_VKAcode(6)}, + WIDGET.newSwitch{name="b7", x=280, y=440, lim=230,disp=_VKAdisp(7),code=_VKAcode(7)}, + WIDGET.newSwitch{name="b8", x=280, y=500, lim=230,disp=_VKAdisp(8),code=_VKAcode(8)}, + WIDGET.newSwitch{name="b9", x=280, y=560, lim=230,disp=_VKAdisp(9),code=_VKAcode(9)}, + WIDGET.newSwitch{name="b10", x=280, y=620, lim=230,disp=_VKAdisp(10),code=_VKAcode(10)}, + WIDGET.newSwitch{name="b11", x=580, y=80, lim=230,disp=_VKAdisp(11),code=_VKAcode(11)}, + WIDGET.newSwitch{name="b12", x=580, y=140, lim=230,disp=_VKAdisp(12),code=_VKAcode(12)}, + WIDGET.newSwitch{name="b13", x=580, y=200, lim=230,disp=_VKAdisp(13),code=_VKAcode(13)}, + WIDGET.newSwitch{name="b14", x=580, y=260, lim=230,disp=_VKAdisp(14),code=_VKAcode(14)}, + WIDGET.newSwitch{name="b15", x=580, y=320, lim=230,disp=_VKAdisp(15),code=_VKAcode(15)}, + WIDGET.newSwitch{name="b16", x=580, y=380, lim=230,disp=_VKAdisp(16),code=_VKAcode(16)}, + WIDGET.newSwitch{name="b17", x=580, y=440, lim=230,disp=_VKAdisp(17),code=_VKAcode(17)}, + WIDGET.newSwitch{name="b18", x=580, y=500, lim=230,disp=_VKAdisp(18),code=_VKAcode(18)}, + WIDGET.newSwitch{name="b19", x=580, y=560, lim=230,disp=_VKAdisp(19),code=_VKAcode(19)}, + WIDGET.newSwitch{name="b20", x=580, y=620, lim=230,disp=_VKAdisp(20),code=_VKAcode(20)}, - WIDGET.newButton{name="norm", x=840, y=80, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=i<11 end end}, - WIDGET.newButton{name="pro", x=1120, y=80, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=true end end}, - WIDGET.newSwitch{name="hide", x=1150, y=200, font=40,disp=SETval('VKSwitch'),code=SETrev('VKSwitch')}, - WIDGET.newSwitch{name="icon", x=1150, y=300, font=40,disp=SETval('VKIcon'),code=SETrev('VKIcon'),hideF=_notShow}, - WIDGET.newSlider{name="sfx", x=830, y=380, w=400, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval('VKSFX'),code=SETsto('VKSFX'),hideF=_notShow}, - WIDGET.newSlider{name="vib", x=830, y=450, w=400,unit=6, font=35,change=function()VIB(SETTING.VKVIB)end,disp=SETval('VKVIB'),code=SETsto('VKVIB'),hideF=_notShow}, - WIDGET.newSlider{name="alpha", x=830, y=520, w=400, font=40,disp=SETval('VKAlpha'),code=SETsto('VKAlpha'),hideF=_notShow}, + WIDGET.newButton{name="norm", x=840, y=80, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=i<11 end end}, + WIDGET.newButton{name="pro", x=1120, y=80, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=true end end}, + WIDGET.newSwitch{name="hide", x=1150, y=200, lim=400, font=40,disp=SETval('VKSwitch'),code=SETrev('VKSwitch')}, + WIDGET.newSwitch{name="icon", x=1150, y=300, lim=400, font=40,disp=SETval('VKIcon'),code=SETrev('VKIcon'),hideF=_notShow}, + WIDGET.newSlider{name="sfx", x=830, y=380, lim=160,w=400, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval('VKSFX'),code=SETsto('VKSFX'),hideF=_notShow}, + WIDGET.newSlider{name="vib", x=830, y=450, lim=160,w=400,unit=6, font=35,change=function()VIB(SETTING.VKVIB)end,disp=SETval('VKVIB'),code=SETsto('VKVIB'),hideF=_notShow}, + WIDGET.newSlider{name="alpha", x=830, y=520, lim=160,w=400, font=40,disp=SETval('VKAlpha'),code=SETsto('VKAlpha'),hideF=_notShow}, - WIDGET.newSwitch{name="track", x=360, y=720, font=35,disp=SETval('VKTrack'),code=SETrev('VKTrack'),hideF=_notShow}, - WIDGET.newSwitch{name="dodge", x=800, y=720, font=35,disp=SETval('VKDodge'),code=SETrev('VKDodge'),hideF=_notTrack}, - WIDGET.newSlider{name="tchW", x=140, y=860, w=1000, font=35,disp=SETval('VKTchW'),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end,hideF=_notTrack}, - WIDGET.newSlider{name="curW", x=140, y=930, w=1000, font=35,disp=SETval('VKCurW'),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end,hideF=_notTrack}, + WIDGET.newSwitch{name="track", x=360, y=720, lim=250, font=35,disp=SETval('VKTrack'),code=SETrev('VKTrack'),hideF=_notShow}, + WIDGET.newSwitch{name="dodge", x=800, y=720, lim=250, font=35,disp=SETval('VKDodge'),code=SETrev('VKDodge'),hideF=_notTrack}, + WIDGET.newSlider{name="tchW", x=140, y=860, w=1000, font=35,disp=SETval('VKTchW'),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end,hideF=_notTrack}, + WIDGET.newSlider{name="curW", x=140, y=930, w=1000, font=35,disp=SETval('VKCurW'),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end,hideF=_notTrack}, WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,code=backScene}, } diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 35f74914..df94829b 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -38,39 +38,39 @@ scene.widgetList={ WIDGET.newButton{name="sound", x=200,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_sound','swipeR')}, WIDGET.newButton{name="game", x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeL')}, - WIDGET.newSwitch{name="block", x=380,y=180,disp=SETval('block'),code=SETrev('block')}, - WIDGET.newSwitch{name="smooth", x=380,y=250,disp=SETval('smooth'),code=SETrev('smooth')}, - WIDGET.newSwitch{name="upEdge", x=380,y=320,disp=SETval('upEdge'),code=SETrev('upEdge')}, - WIDGET.newSwitch{name="bagLine", x=380,y=390,disp=SETval('bagLine'),code=SETrev('bagLine')}, + WIDGET.newSwitch{name="block", x=380,y=180,lim=300,disp=SETval('block'),code=SETrev('block')}, + WIDGET.newSwitch{name="smooth", x=380,y=250,lim=300,disp=SETval('smooth'),code=SETrev('smooth')}, + WIDGET.newSwitch{name="upEdge", x=380,y=320,lim=300,disp=SETval('upEdge'),code=SETrev('upEdge')}, + WIDGET.newSwitch{name="bagLine", x=380,y=390,lim=300,disp=SETval('bagLine'),code=SETrev('bagLine')}, - WIDGET.newSelector{name="ghostType", x=915,y=180,w=350,list={'color','gray','colorCell','grayCell','colorLine','grayLine'},disp=SETval('ghostType'),code=SETsto('ghostType')}, - WIDGET.newSlider{name="ghost", x=740,y=240,w=350,unit=1,disp=SETval('ghost'), show="percent",code=SETsto('ghost')}, - WIDGET.newSlider{name="center", x=740,y=300,w=350,unit=1,disp=SETval('center'), show="percent",code=SETsto('center')}, - WIDGET.newSlider{name="grid", x=740,y=360,w=350,unit=.4,disp=SETval('grid'), show="percent",code=SETsto('grid')}, - WIDGET.newSlider{name="lineNum", x=740,y=420,w=350,unit=1,disp=SETval('lineNum'), show="percent",code=SETsto('lineNum')}, + WIDGET.newSelector{name="ghostType", x=915,y=180, w=350,list={'color','gray','colorCell','grayCell','colorLine','grayLine'},disp=SETval('ghostType'),code=SETsto('ghostType')}, + WIDGET.newSlider{name="ghost", x=740,y=240,lim=280,w=350,unit=1,disp=SETval('ghost'), show="percent",code=SETsto('ghost')}, + WIDGET.newSlider{name="center", x=740,y=300,lim=280,w=350,unit=1,disp=SETval('center'), show="percent",code=SETsto('center')}, + WIDGET.newSlider{name="grid", x=740,y=360,lim=280,w=350,unit=.4,disp=SETval('grid'), show="percent",code=SETsto('grid')}, + WIDGET.newSlider{name="lineNum", x=740,y=420,lim=280,w=350,unit=1,disp=SETval('lineNum'), show="percent",code=SETsto('lineNum')}, - WIDGET.newSlider{name="lockFX", x=330,y=460,w=540,unit=5,disp=SETval('lockFX'), code=SETsto('lockFX')}, - WIDGET.newSlider{name="dropFX", x=330,y=520,w=540,unit=5,disp=SETval('dropFX'), code=SETsto('dropFX')}, - WIDGET.newSlider{name="moveFX", x=330,y=580,w=540,unit=5,disp=SETval('moveFX'), code=SETsto('moveFX')}, - WIDGET.newSlider{name="clearFX", x=330,y=640,w=540,unit=5,disp=SETval('clearFX'), code=SETsto('clearFX')}, - WIDGET.newSlider{name="splashFX", x=330,y=700,w=540,unit=5,disp=SETval('splashFX'), code=SETsto('splashFX')}, - WIDGET.newSlider{name="shakeFX", x=330,y=760,w=540,unit=5,disp=SETval('shakeFX'), code=SETsto('shakeFX')}, - WIDGET.newSlider{name="atkFX", x=330,y=820,w=540,unit=5,disp=SETval('atkFX'), code=SETsto('atkFX')}, - WIDGET.newSelector{name="frame", x=600,y=890,w=460,list={8,10,13,17,22,29,37,47,62,80,100},disp=SETval('frameMul'),code=SETsto('frameMul')}, + WIDGET.newSlider{name="lockFX", x=330,y=460,lim=280,w=540,unit=5,disp=SETval('lockFX'), code=SETsto('lockFX')}, + WIDGET.newSlider{name="dropFX", x=330,y=520,lim=280,w=540,unit=5,disp=SETval('dropFX'), code=SETsto('dropFX')}, + WIDGET.newSlider{name="moveFX", x=330,y=580,lim=280,w=540,unit=5,disp=SETval('moveFX'), code=SETsto('moveFX')}, + WIDGET.newSlider{name="clearFX", x=330,y=640,lim=280,w=540,unit=5,disp=SETval('clearFX'), code=SETsto('clearFX')}, + WIDGET.newSlider{name="splashFX", x=330,y=700,lim=280,w=540,unit=5,disp=SETval('splashFX'), code=SETsto('splashFX')}, + WIDGET.newSlider{name="shakeFX", x=330,y=760,lim=280,w=540,unit=5,disp=SETval('shakeFX'), code=SETsto('shakeFX')}, + WIDGET.newSlider{name="atkFX", x=330,y=820,lim=280,w=540,unit=5,disp=SETval('atkFX'), code=SETsto('atkFX')}, + WIDGET.newSelector{name="frame", x=600,y=890,lim=280,w=460,list={8,10,13,17,22,29,37,47,62,80,100},disp=SETval('frameMul'),code=SETsto('frameMul')}, - WIDGET.newSwitch{name="text", x=450,y=980,disp=SETval('text'), code=SETrev('text')}, - WIDGET.newSwitch{name="score", x=450,y=1030,disp=SETval('score'), code=SETrev('score')}, - WIDGET.newSwitch{name="bufferWarn", x=450,y=1100,disp=SETval('bufferWarn'), code=SETrev('bufferWarn')}, - WIDGET.newSwitch{name="showSpike", x=450,y=1150,disp=SETval('showSpike'), code=SETrev('showSpike')}, - WIDGET.newSwitch{name="nextPos", x=450,y=1220,disp=SETval('nextPos'), code=SETrev('nextPos')}, - WIDGET.newSwitch{name="highCam", x=450,y=1270,disp=SETval('highCam'), code=SETrev('highCam')}, - WIDGET.newSwitch{name="warn", x=450,y=1340,disp=SETval('warn'), code=SETrev('warn')}, + WIDGET.newSwitch{name="text", x=450,y=980,lim=360,disp=SETval('text'), code=SETrev('text')}, + WIDGET.newSwitch{name="score", x=450,y=1030,lim=360,disp=SETval('score'), code=SETrev('score')}, + WIDGET.newSwitch{name="bufferWarn", x=450,y=1100,lim=360,disp=SETval('bufferWarn'), code=SETrev('bufferWarn')}, + WIDGET.newSwitch{name="showSpike", x=450,y=1150,lim=360,disp=SETval('showSpike'), code=SETrev('showSpike')}, + WIDGET.newSwitch{name="nextPos", x=450,y=1220,lim=360,disp=SETval('nextPos'), code=SETrev('nextPos')}, + WIDGET.newSwitch{name="highCam", x=450,y=1270,lim=360,disp=SETval('highCam'), code=SETrev('highCam')}, + WIDGET.newSwitch{name="warn", x=450,y=1340,lim=360,disp=SETval('warn'), code=SETrev('warn')}, - WIDGET.newSwitch{name="clickFX", x=950,y=980,disp=SETval('clickFX'), code=SETrev('clickFX')}, - WIDGET.newSwitch{name="power", x=950,y=1070,disp=SETval('powerInfo'), code=SETrev('powerInfo')}, - WIDGET.newSwitch{name="clean", x=950,y=1160,disp=SETval('cleanCanvas'), code=SETrev('cleanCanvas')}, - WIDGET.newSwitch{name="fullscreen", x=950,y=1250,disp=SETval('fullscreen'), code=switchFullscreen}, - WIDGET.newSwitch{name="bg", x=950,y=1340,disp=SETval('bg'), + WIDGET.newSwitch{name="clickFX", x=950,y=980,lim=360,disp=SETval('clickFX'), code=SETrev('clickFX')}, + WIDGET.newSwitch{name="power", x=950,y=1070,lim=360,disp=SETval('powerInfo'), code=SETrev('powerInfo')}, + WIDGET.newSwitch{name="clean", x=950,y=1160,lim=360,disp=SETval('cleanCanvas'), code=SETrev('cleanCanvas')}, + WIDGET.newSwitch{name="fullscreen", x=950,y=1250,lim=360,disp=SETval('fullscreen'), code=switchFullscreen}, + WIDGET.newSwitch{name="bg", x=950,y=1340,lim=360,disp=SETval('bg'), code=function() BG.set('none') SETTING.bg=not SETTING.bg