合并自定义游戏场景和自定义-高级场景，修改场景模块指定滚动距离的变量名

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

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",

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",

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",

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",

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="<R>",
-			pushSpeed="_↑_↑_",
+			pushSpeed="_↑__",
+			garbageSpeed="#↑↑",
 
 			bufferLimit="^↑",
 			heightLimit="#↑",

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="高度上限",

parts/language/lang_zh2.lua

@@ -79,8 +79,7 @@ return{
 		},
 		customGame={
 			mod="模组(F1)",
-		},
+
-		custom_advance={
 			nextCount="预览个数",
 			holdCount="暂存个数",
 			infHold="无限暂存",

parts/scenes/customGame.lua

@@ -1,14 +1,22 @@
-local gc,sys=love.graphics,love.system
+local gc,kb,sys=love.graphics,love.keyboard,love.system
-local kb=love.keyboard
-
 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
+		if #FIELD>1 then
-
+			gc.setColor(1,1,int(TIME()*6.26)%2)
-	--Field
+			gc.print("+"..#FIELD-1,490,220)
-	setFont(40)
+		end
-	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)
 	end
 
 	--Sequence
 	if #BAG>0 then
 		gc.setColor(1,1,int(TIME()*6.26)%2)
-		gc.print("#",330,545)
+		gc.print("#"..#BAG,615,220)
-		gc.print(#BAG,360,545)
 	end
-	setFont(30)
-	gc.setColor(1,1,1)
-	gc.print(CUSTOMENV.sequence,330,510)
 
-	--Sequence
+	gc.setColor(1,1,1)
-	if #MISSION>0 then
+	gc.print(CUSTOMENV.sequence,610,250)
-		gc.setColor(1,CUSTOMENV.missionKill and 0 or 1,int(TIME()*6.26)%2)
-		gc.print("#",610,545)
-		gc.print(#MISSION,640,545)
-	end
 
 	--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.newKey{name="reset",		x=1110,	y=90,w=230,h=90,color='R',code=pressKey"delete"},
-	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.newKey{name="mod",		x=1110,	y=200,w=230,h=90,color='Z',code=pressKey"f1"},
-	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")},
 
-	--Else
+	--Mission / Field / Sequence
-	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.newKey{name="mission",	x=170,	y=180,w=240,h=80,color='N',font=25,code=pressKey"m"},
-	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},
+	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.newText{name="noMsn",	x=50,	y=220,align='L',color='H',hideF=function()return MISSION[1]end},
-	WIDGET.newButton{name="copy",	x=1070,	y=310,w=310,h=70,color='lR',font=25,code=pressKey"cC"},
+	WIDGET.newText{name="defSeq",	x=610,	y=220,align='L',color='H',hideF=function()return BAG[1]end},
-	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},
 
-	--More
+	--Selectors
-	WIDGET.newKey{name="reset",		x=730,	y=150,w=220,h=90,color='R',font=30,code=pressKey"delete"},
+	WIDGET.newSelector{name="opponent",		x=170,y=330,w=260,color='R',list=sList.opponent,	disp=CUSval("opponent"),	code=CUSsto("opponent")},
-	WIDGET.newKey{name="advance",	x=730,	y=270,w=220,h=90,color='F',font=35,code=pressKey"a"},
+	WIDGET.newSelector{name="life",			x=170,y=410,w=260,color='R',list=sList.life,		disp=CUSval("life"),		code=CUSsto("life")},
-	WIDGET.newKey{name="mod",		x=730,	y=390,w=220,h=90,color='Z',font=35,code=pressKey"f1"},
+	WIDGET.newSelector{name="pushSpeed",	x=170,y=520,w=260,color='V',list=sList.pushSpeed,	disp=CUSval("pushSpeed"),	code=CUSsto("pushSpeed")},
-	WIDGET.newKey{name="field",		x=170,	y=640,w=240,h=80,color='A',font=25,code=pressKey"f"},
+	WIDGET.newSelector{name="garbageSpeed",	x=170,y=600,w=260,color='V',list=sList.pushSpeed,	disp=CUSval("garbageSpeed"),code=CUSsto("garbageSpeed")},
-	WIDGET.newKey{name="sequence",	x=450,	y=640,w=240,h=80,color='W',font=25,code=pressKey"s"},
+	WIDGET.newSelector{name="visible",		x=170,y=710,w=260,color='lB',list=sList.visible,	disp=CUSval("visible"),		code=CUSsto("visible")},
-	WIDGET.newKey{name="mission",	x=730,	y=640,w=240,h=80,color='N',font=25,code=pressKey"m"},
+	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

parts/scenes/custom_advance.lua

@@ -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

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="system",	x=750,y=280,color='Z',align='L',fText=SYSTEM},
-	WIDGET.newText{name="version",	x=950,y=280,color='Z',font=30,align='L',fText=VERSION.string},
+	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'},

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="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',font=30,code=pressKey"p",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end},
+	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',font=30,code=pressKey"o",hideF=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 or GAME.saved 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',font=30,code=pressKey"escape"},
+	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',font=35,code=pressKey"r"},
+	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},
 }
 

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="autoPause",	x=1060,	y=310,	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="swap",		x=1060,	y=370,	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="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,	font=30,disp=SETval("dataSaving"),	code=function()SETTING.dataSaving=not SETTING.dataSaving if not SETTING.dataSaving then USERS.forceFreshAvatar()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,	font=30,disp=SETval("simpMode"),
+	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

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)},

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},