0.8.2+α

class.lua

@@ -51,22 +51,39 @@ function button:FX()
 	--[0=ripple],timer,duration,x,y,w,h
 end
 function button:draw()
-	local C=self.color
-	gc.setColor(C)
-	gc.setLineWidth(3)gc.rectangle("line",self.x,self.y,self.w,self.h,4)
-	gc.setColor(C[1],C[2],C[3],.4)
-	gc.setLineWidth(5)gc.rectangle("line",self.x,self.y,self.w,self.h,4)
+	local x,y,w,h=self.x,self.y,self.w,self.h
+	local r,g,b=unpack(self.color)
 	if self==widget_sel then
-		gc.rectangle("fill",self.x,self.y,self.w,self.h,4)
-	end--Highlight when Selected
+		gc.setColor(r*.7,g*.7,b*.7)
+		gc.rectangle("fill",x,y,w,h)
+		x,y,w,h=x+w,y+h,-w,-h
+	else
+		gc.setColor(r*.9,g*.9,b*.9)
+		gc.rectangle("fill",x,y,w,h)
+	end
+	gc.setLineWidth(3)
+	gc.setColor(.4+r*.6,.4+g*.6,.4+b*.6)
+	gc.line(x,y+h,x,y,x+w,y)
+	gc.setColor(r*.6,g*.6,b*.6)
+	gc.line(x,y+h,x+w,y+h,x+w,y)
+	if self==widget_sel then
+		x,y,w,h=x+w,y+h,-w,-h
+	end
 	local t=self.text
 	if t then
 		if type(t)=="function"then t=t()end
 		setFont(self.font)
-		local y0=self.y+self.h*.5-self.font*.7
-		gc.printf(t,self.x-2,y0-1,self.w,"center")
-		gc.setColor(C)
-		gc.printf(t,self.x,y0,self.w,"center")
+		local y0=y+h*.5-self.font*.7
+		gc.setColor(1,1,1,.5)
+		if self==widget_sel then
+			gc.printf(t,x+2,y0+1,w,"center")
+			gc.setColor(r*.5,g*.5,b*.5)
+			gc.printf(t,x,y0,w,"center")
+		else
+			gc.printf(t,x,y0-1,w,"center")
+			gc.setColor(r*.6,g*.6,b*.6)
+			gc.printf(t,x-2,y0-2,w,"center")
+		end
 	end
 end
 function button:getInfo()
@@ -84,27 +101,32 @@ function newSwitch(x,y,font,disp,code,hide,N)
 	}for k,v in next,switch do _[k]=v end return _
 end
 function switch:isAbove(x,y)
-	return x>self.x and x<self.x+100 and y>self.y-20 and y<self.y+20
+	return x>self.x and x<self.x+50 and y>self.y-25 and y<self.y+25
 end
 function switch:FX()
 	sysFX[#sysFX+1]=self.disp()and
-	{1,0,15,1,.4,.4,self.x,self.y-20,50,40,0}--Switched on
-	or{1,0,15,.4,1,.4,self.x+50,self.y-20,50,40,0}--Switched off
+	{1,0,15,.4,1,.4,self.x,self.y-25,50,50,0}--Switched on
+	or{1,0,15,1,.4,.4,self.x,self.y-25,50,50,0}--Switched off
 	--[1=square fade],timer,duration,r,g,b,x,y,w,h
 end
 function switch:draw()
-	local x,y=self.x,self.y-20
+	local x,y=self.x,self.y-25
 	if self.disp()then
-		gc.setColor(.6,1,.6)
-		gc.rectangle("fill",x+50,y,50,40,3)
-		--ON
+		gc.setColor(.9,1,.9)
+		gc.setLineWidth(6)
+		gc.line(x+5,y+25,x+18,y+38,x+45,y+11)
+	end--checked
+	if self==widget_sel then
+		gc.setColor(1,1,1,.4)
 	else
-		gc.setColor(1,.6,.6)
-		gc.rectangle("fill",x,y,50,40,3)
-		--OFF
-	end--switch
-	gc.setColor(1,1,1,self==widget_sel and 1 or .6)
-	gc.setLineWidth(3)gc.rectangle("line",x-3,y-3,106,46,5)
+		gc.setColor(1,1,1,.2)
+	end
+	gc.rectangle("fill",x,y,50,50)
+	gc.setLineWidth(3)
+	gc.setColor(1,1,1)
+	gc.line(x,y+50,x,y,x+50,y)
+	gc.setColor(1,1,1,.7)
+	gc.line(x,y+50,x+50,y+50,x+50,y)
 	--frame
 	local t=self.text
 	if t then
@@ -138,27 +160,34 @@ function slider:FX(pos)
 	--[1=square fade],timer,duration,r,g,b,x,y,w,h
 end
 function slider:draw()
-	local S=self==widget_sel
-	gc.setColor(1,1,1,S and 1 or .5)
+	local x,y=self.x,self.y
+	gc.setColor(1,1,1,self==widget_sel and 1 or .5)
 	gc.setLineWidth(2)
-	local x1,x2=self.x,self.x+self.w
+	local x1,x2=x,x+self.w
 	for p=0,self.unit do
 		local x=x1+(x2-x1)*p/self.unit
-		gc.line(x,self.y+7,x,self.y-7)
+		gc.line(x,y+7,x,y-7)
 	end
 	--units
 	gc.setLineWidth(5)
-	gc.line(x1,self.y,x2,self.y)
+	gc.line(x1,y,x2,y)
 	--axis
-	gc.setColor(1,1,1)
-	gc.rectangle("fill",x1+(x2-x1)*self.disp()/self.unit-8,self.y-15,17,30)
-	--block
 	local t=self.text
 	if t then
 		gc.setColor(1,1,1)
 		setFont(self.font)
-		gc.printf(t,self.x-312,self.y-self.font*.7,300,"right")
+		gc.printf(t,x-312,y-self.font*.7,300,"right")
 	end
+	--text
+	local x,y=x1+(x2-x1)*self.disp()/self.unit-8,y-15
+	gc.setColor(.8,.8,.8)
+	gc.rectangle("fill",x,y,17,30)
+	gc.setLineWidth(2)
+	gc.setColor(.5,.5,.5)
+	gc.line(x,y+30,x+17,y+30,x+17,y)
+	gc.setColor(1,1,1)
+	gc.line(x,y+30,x,y,x+17,y)
+	--block
 end
 function slider:getInfo()
 	print(format("x=%d,y=%d,w=%d",self.x,self.y,self.w))

conf.lua

@@ -1,5 +1,5 @@
 math.randomseed(os.time())
-gameVersion="Alpha V0.8.1"
+gameVersion="Alpha V0.8.2+"
 function love.conf(t)
 	t.identity="Techmino"--Save directory name
 	t.version="11.1"

dataList.lua

@@ -1373,7 +1373,6 @@ modes.c4wtrain={
 	end,
 	mesDisp=function(P,dx,dy)
 		setFont(45)
-		mStr(max(100-P.stat.row,0),-82,220)
 		mStr(P.combo,-82,310)
 		mStr(P.modeData.point,-82,400)
 		mDraw(drawableText.combo,-82,358)

language/chi.lua

@@ -113,7 +113,7 @@ return{
 		hotseat="友尽模式",
 	},
 
-	load={"加载语音ing","加载音乐ing","加载音效ing","加载完成",},
+	load={[0]="加载完成","加载语音ing","加载音乐ing","加载音效ing",},
 	tips={
 		"不是动画,真的在加载!",
 		"大满贯10连击消四全清!",
@@ -307,16 +307,11 @@ return{
 			back=BK,
 		},
 		setting_touch={
-			hide="显示虚拟按键",
-			track="按键自动跟踪",
-			tkset="跟踪设置",
 			default="默认组合",
 			snap=function()return text.snapLevelName[snapLevel]end,
-			alpha=function()return setting.VKAlpha.."0%"end,
-			icon="图标",
-			size="大小",
-			toggle="开关",
+			more="更多",
 			back=BK,
+			size="大小",
 		},
 		setting_touchSwitch={
 			b1=	actName[1],b2=actName[2],b3=actName[3],b4=actName[4],
@@ -326,6 +321,11 @@ return{
 			b17=actName[17],b18=actName[18],b19=actName[19],b20=actName[20],
 			norm="标准",
 			pro="专业",
+			hide="显示虚拟按键",
+			track="按键自动跟踪",
+			icon="图标",
+			tkset="跟踪设置",
+			alpha="透明度",
 			back=BK,
 		},
 		setting_trackSetting={

language/chi_full.lua

@@ -113,7 +113,7 @@ return{
 		hotseat="友尽模式",
 	},
 
-	load={"加载语音ing","加载音乐ing","加载音效ing","加载完成",},
+	load={[0]="加载完成","加载语音ing","加载音乐ing","加载音效ing",},
 	tips={
 		"不是动画,真的在加载!",
 		"大满贯10连击消四全清!",
@@ -308,16 +308,11 @@ return{
 			back=BK,
 		},
 		setting_touch={
-			hide="显示虚拟按键",
-			track="按键自动跟踪",
-			tkset="跟踪设置",
 			default="默认组合",
 			snap=function()return text.snapLevelName[snapLevel]end,
-			alpha=function()return setting.VKAlpha.."0%"end,
-			icon="图标",
-			size="大小",
-			toggle="开关",
+			more="更多",
 			back=BK,
+			size="大小",
 		},
 		setting_touchSwitch={
 			b1=	actName[1],b2=actName[2],b3=actName[3],b4=actName[4],
@@ -327,6 +322,11 @@ return{
 			b17=actName[17],b18=actName[18],b19=actName[19],b20=actName[20],
 			norm="标准",
 			pro="专业",
+			hide="显示虚拟按键",
+			track="按键自动跟踪",
+			icon="图标",
+			tkset="跟踪设置",
+			alpha="透明度",
 			back=BK,
 		},
 		setting_trackSetting={
@@ -348,4 +348,4 @@ return{
 			back=BK,
 		},
 	},
-}
+}--译

language/eng.lua

@@ -111,7 +111,7 @@ return{
 		hotseat="",
 	},
 
-	load={"Loading VOICE","Loading BGM","Loading SFX","Finished",},
+	load={[0]="Finished","Loading VOICE","Loading BGM","Loading SFX",},
 	tips={
 		"Not animation,real loading!",
 		"Back to Back 10 combo Techrash PC!",
@@ -306,16 +306,11 @@ Lib used:
 			back=BK,
 		},
 		setting_touch={
-			hide="Show Virtual Key",
-			track="Auto track",
-			tkset="Track setting",
 			default="Defaults",
 			snap=function()return text.snapLevelName[snapLevel]end,
-			alpha=function()return setting.VKAlpha.."0%"end,
-			icon="Icon",
-			size="Size",
-			toggle="Toggle",
+			more="More",
 			back=BK,
+			size="Size",
 		},
 		setting_touchSwitch={
 			b1=	actName[1],b2=actName[2],b3=actName[3],b4=actName[4],
@@ -325,6 +320,11 @@ Lib used:
 			b17=actName[17],b18=actName[18],b19=actName[19],b20=actName[20],
 			norm="Normal",
 			pro="Professioanl",
+			hide="Show Virtual Key",
+			track="Auto track",
+			icon="Icon",
+			tkset="Track setting",
+			alpha="Alpha",
 			back=BK,
 		},
 		setting_trackSetting={

list.lua

@@ -97,6 +97,7 @@ voiceName={
 	"win","lose",
 	"bye",
 	"nya","voc_nya",
+	"egg",
 }
 voiceList={
 	zspin={"zspin_1","zspin_2","zspin_3"},
@@ -121,6 +122,7 @@ voiceList={
 	bye={"bye_1","bye_2"},
 	nya={"nya_1","nya_2","nya_3","nya_4"},
 	voc_nya={"nya_11","nya_12","nya_13","nya_21","nya_22"},
+	egg={"egg_1","egg_2"},
 }
 
 musicID={
@@ -323,12 +325,12 @@ local skinName={
 Widget={
 	load={},intro={},quit={},
 	main={
-		play=	newButton(150,280,200,160,C.red,		55,function()scene.push()scene.swapTo("mode")end,			nil,"setting"),
+		play=	newButton(150,280,200,160,C.lightRed,		55,function()scene.push()scene.swapTo("mode")end,			nil,"setting"),
 		setting=newButton(370,280,200,160,C.lightBlue,	45,function()scene.push()scene.swapTo("setting_game")end,	nil,"music"),
 		music=	newButton(590,280,200,160,C.lightPurple,32,function()scene.push()scene.swapTo("music")end,			nil,"help"),
-		help=	newButton(150,460,200,160,C.yellow,		50,function()scene.push()scene.swapTo("help")end,			nil,"stat"),
-		stat=	newButton(370,460,200,160,C.cyan,		43,function()scene.push()scene.swapTo("stat")end,			nil,"qplay"),
-		qplay=	newButton(540,415,100,70,C.lightGreen,	23,function()scene.push()loadGame(modeSel,levelSel)end,	nil,"lang"),
+		help=	newButton(150,460,200,160,C.lightYellow,		50,function()scene.push()scene.swapTo("help")end,			nil,"stat"),
+		stat=	newButton(370,460,200,160,C.lightCyan,		43,function()scene.push()scene.swapTo("stat")end,			nil,"qplay"),
+		qplay=	newButton(540,415,100,70,C.lightOrange,	23,function()scene.push()loadGame(modeSel,levelSel)end,	nil,"lang"),
 		lang=	newButton(590,505,200,70,C.lightRed,	45,function()
 			setting.lang=setting.lang%#langName+1
 			swapLanguage(setting.lang)
@@ -339,13 +341,13 @@ Widget={
 		quit=	newButton(370,620,280,100,C.lightGrey,	55,function()VOICE("bye")scene.swapTo("quit","slowFade")end,nil,"play"),
 	},
 	mode={
-		up=		newButton(1000,	210,200,140,C.white,	75,pressKey("up"),		function()return modeSel==1 end),
-		down=	newButton(1000,	430,200,140,C.white,	75,pressKey("down"),	function()return modeSel==#modeID end),
-		left=	newButton(190,	160,100,80,	C.white,	35,pressKey("left"),	function()return levelSel==1 end),
-		right=	newButton(350,	160,100,80,	C.white,	35,pressKey("right"),	function()return levelSel==#modes[modeID[modeSel]].level end),
-		start=	newButton(1000,	600,250,100,C.green,	45,function()scene.push()loadGame(modeSel,levelSel)end),
-		custom=	newButton(275,	420,200,90,	C.yellow,	35,function()scene.push()scene.swapTo("custom")end),
-		back=	newButton(640,	630,230,90,	C.white,	40,scene.back),
+		up=		newButton(1000,	210,200,140,C.white,		75,pressKey("up"),		function()return modeSel==1 end),
+		down=	newButton(1000,	430,200,140,C.white,		75,pressKey("down"),	function()return modeSel==#modeID end),
+		left=	newButton(190,	150,100,80,	C.white,		35,pressKey("left"),	function()return levelSel==1 end),
+		right=	newButton(350,	150,100,80,	C.white,		35,pressKey("right"),	function()return levelSel==#modes[modeID[modeSel]].level end),
+		start=	newButton(1000,	600,250,100,C.lightGreen,	45,function()scene.push()loadGame(modeSel,levelSel)end),
+		custom=	newButton(275,	460,200,90,	C.lightYellow,	35,function()scene.push()scene.swapTo("custom")end),
+		back=	newButton(640,	630,230,90,	C.white,		40,scene.back),
 	},
 	music={
 		bgm=	newSlider(760,	80,400,10,35,nil,SETdisp("bgm"),function(i)setting.bgm=i;BGM(bgmPlaying)end),
@@ -359,14 +361,14 @@ Widget={
 		down=	newButton(1000,	460,100,100,C.white,		45,function()sel=sel%#customID+1 end),
 		left=	newButton(880,	340,100,100,C.white,		45,pressKey("left")),
 		right=	newButton(1120,	340,100,100,C.white,		45,pressKey("right")),
-		start1=	newButton(880,	580,220,70,	C.green,		35,function()scene.push()loadGame(0,1)end),
+		start1=	newButton(880,	580,220,70,	C.lightGreen,	35,function()scene.push()loadGame(0,1)end),
 		start2=	newButton(1120,	580,220,70,	C.lightPurple,	35,function()scene.push()loadGame(0,2)end),
-		draw=	newButton(1000,	90,	190,85,	C.cyan,			35,function()scene.push()scene.swapTo("draw")end),
-		set1=	newButton(640,	160,240,75,	C.lightRed,		35,function()useDefaultSet(1)end),
-		set2=	newButton(640,	250,240,75,	C.lightRed,		35,function()useDefaultSet(2)end),
-		set3=	newButton(640,	340,240,75,	C.lightRed,		35,function()useDefaultSet(3)end),
-		set4=	newButton(640,	430,240,75,	C.lightRed,		35,function()useDefaultSet(4)end),
-		set5=	newButton(640,	520,240,75,	C.lightRed,		35,function()useDefaultSet(5)end),
+		draw=	newButton(1000,	90,	190,85,	C.lightCyan,			35,function()scene.push()scene.swapTo("draw")end),
+		set1=	newButton(640,	160,240,75,	C.lightYellow,	35,function()useDefaultSet(1)end),
+		set2=	newButton(640,	250,240,75,	C.lightYellow,	35,function()useDefaultSet(2)end),
+		set3=	newButton(640,	340,240,75,	C.lightYellow,	35,function()useDefaultSet(3)end),
+		set4=	newButton(640,	430,240,75,	C.lightYellow,	35,function()useDefaultSet(4)end),
+		set5=	newButton(640,	520,240,75,	C.lightYellow,	35,function()useDefaultSet(5)end),
 		back=	newButton(640,	630,180,60,	C.white,		35,scene.back),
 	},
 	draw={
@@ -405,9 +407,9 @@ Widget={
 		quit=	newButton(640,600,240,100,C.white,45,scene.back),
 	},
 	setting_game={
-		graphic=newButton(200,80,240,80,C.lightGreen,35,function()scene.swapTo("setting_graphic")end,	nil,"sound"),
-		sound=	newButton(1080,80,240,80,C.lightGreen,35,function()scene.swapTo("setting_sound")end,	nil,"dasD"),
-		dasD=	newButton(180,230,50,50,C.white,35,function()
+		graphic=newButton(200,80,240,80,C.lightCyan,35,function()scene.swapTo("setting_graphic")end,	nil,"sound"),
+		sound=	newButton(1080,80,240,80,C.lightCyan,35,function()scene.swapTo("setting_sound")end,	nil,"dasD"),
+		dasD=	newButton(180,230,50,50,C.white,40,function()
 			setting.das=(setting.das-1)%31
 			if setting.arr>setting.das then
 				setting.arr=setting.das
@@ -415,7 +417,7 @@ Widget={
 				SFX("blip_1",.4)
 			end
 			end,nil,"dasU"),
-		dasU=	newButton(400,230,50,50,C.white,35,function()
+		dasU=	newButton(400,230,50,50,C.white,40,function()
 			setting.das=(setting.das+1)%31
 			if setting.arr>setting.das then
 				setting.das=setting.arr
@@ -423,7 +425,7 @@ Widget={
 				SFX("blip_1",.4)
 			end
 			end,nil,"arrD"),
-		arrD=	newButton(500,230,50,50,C.white,35,function()
+		arrD=	newButton(500,230,50,50,C.white,40,function()
 			setting.arr=(setting.arr-1)%16
 			if setting.arr>setting.das then
 				setting.das=setting.arr
@@ -431,7 +433,7 @@ Widget={
 				SFX("blip_1",.4)
 			end
 			end,nil,"arrU"),
-		arrU=	newButton(720,230,50,50,C.white,35,function()
+		arrU=	newButton(720,230,50,50,C.white,40,function()
 			setting.arr=(setting.arr+1)%16
 			if setting.arr>setting.das then
 				setting.das=setting.arr
@@ -439,20 +441,20 @@ Widget={
 				SFX("blip_1",.4)
 			end
 			end,nil,"sddasD"),
-		sddasD=	newButton(180,340,50,50,C.white,35,	function()setting.sddas=(setting.sddas-1)%11 end,	nil,"sddasU"),
-		sddasU=	newButton(400,340,50,50,C.white,35,	function()setting.sddas=(setting.sddas+1)%11 end,	nil,"sdarrD"),
-		sdarrD=	newButton(500,340,50,50,C.white,35,	function()setting.sdarr=(setting.sdarr-1)%4 end,	nil,"sdarrU"),
-		sdarrU=	newButton(720,340,50,50,C.white,35,	function()setting.sdarr=(setting.sdarr+1)%4 end,	nil,"quickR"),
-		quickR=	newSwitch(560,430,35,SETdisp("quickR"),	SETrev("quickR"),									nil,"swap"),
-		swap=	newSwitch(560,510,20,SETdisp("swap"),	SETrev("swap"),										nil,"fine"),
-		fine=	newSwitch(560,590,20,SETdisp("fine"),	SETrev("fine"),										nil,"ctrl"),
+		sddasD=	newButton(180,340,50,50,C.white,40,	function()setting.sddas=(setting.sddas-1)%11 end,	nil,"sddasU"),
+		sddasU=	newButton(400,340,50,50,C.white,40,	function()setting.sddas=(setting.sddas+1)%11 end,	nil,"sdarrD"),
+		sdarrD=	newButton(500,340,50,50,C.white,40,	function()setting.sdarr=(setting.sdarr-1)%4 end,	nil,"sdarrU"),
+		sdarrU=	newButton(720,340,50,50,C.white,40,	function()setting.sdarr=(setting.sdarr+1)%4 end,	nil,"quickR"),
+		quickR=	newSwitch(580,430,35,SETdisp("quickR"),	SETrev("quickR"),									nil,"swap"),
+		swap=	newSwitch(580,510,20,SETdisp("swap"),	SETrev("swap"),										nil,"fine"),
+		fine=	newSwitch(580,590,20,SETdisp("fine"),	SETrev("fine"),										nil,"ctrl"),
 		ctrl=	newButton(1020,230,320,80,C.white,35,function()scene.push()scene.swapTo("setting_key")end,	nil,"touch"),
 		touch=	newButton(1020,340,320,80,C.white,35,function()scene.push()scene.swapTo("setting_touch")end,nil,"back"),
 		back=	newButton(1160,600,160,160,C.white,50,scene.back,nil,"graphic"),
 	},
 	setting_graphic={
-		sound=	newButton(200,80,240,80,C.lightGreen,35,function()scene.swapTo("setting_sound")end,	nil,"game"),
-		game=	newButton(1080,80,240,80,C.lightGreen,35,function()scene.swapTo("setting_game")end,	nil,"ghost"),
+		sound=	newButton(200,80,240,80,C.lightCyan,35,function()scene.swapTo("setting_sound")end,	nil,"game"),
+		game=	newButton(1080,80,240,80,C.lightCyan,35,function()scene.swapTo("setting_game")end,	nil,"ghost"),
 		ghost=	newSwitch(310,180,35,SETdisp("ghost"),						SETrev("ghost"),		nil,"center"),
 		center=	newSwitch(580,180,35,SETdisp("center"),						SETrev("center"),		nil,"smo"),
 		smo=	newSwitch(310,260,25,SETdisp("smo"),						SETrev("smo"),			nil,"grid"),
@@ -479,8 +481,8 @@ Widget={
 		back=	newButton(1160,600,160,160,C.white,50,scene.back,nil,"sound"),
 		},
 	setting_sound={
-		game=	newButton(200,80,240,80,C.lightGreen,35,function()scene.swapTo("setting_game")end,							nil,"graphic"),
-		graphic=newButton(1080,80,240,80,C.lightGreen,35,function()scene.swapTo("setting_graphic")end,						nil,"sfx"),
+		game=	newButton(200,80,240,80,C.lightCyan,35,function()scene.swapTo("setting_game")end,							nil,"graphic"),
+		graphic=newButton(1080,80,240,80,C.lightCyan,35,function()scene.swapTo("setting_graphic")end,						nil,"sfx"),
 		sfx=	newSlider(180,250,400,10,35,function()SFX("blip_1")end,						SETdisp("sfx"),		SETsto("sfx"),	nil,"bgm"),
 		bgm=	newSlider(750,250,400,10,35,function()BGM(bgmPlaying or"blank")end,			SETdisp("bgm"),		SETsto("bgm"),	nil,"vib"),
 		vib=	newSlider(180,440,400,5	,35,function()VIB(1)end,							SETdisp("vib"),		SETsto("vib"),	nil,"voc"),
@@ -492,13 +494,7 @@ Widget={
 		back=newButton(1140,650,200,80,C.white,45,scene.back),
 	},
 	setting_touch={
-		hide=	newSwitch(810,140,40,SETdisp("VKSwitch"),SETrev("VKSwitch")),
-		track=	newSwitch(810,220,40,SETdisp("VKTrack"),SETrev("VKTrack")),
-		tkset=	newButton(450,220,170,80,C.white,25,function()
-			scene.push()
-			scene.swapTo("setting_trackSetting")
-			end,function()return not setting.VKTrack end),
-		default=newButton(450,320,170,80,C.white,35,function()
+		default=newButton(520,80,170,80,C.white,35,function()
 				local D=virtualkeySet[defaultSel]
 				for i=1,#VK_org do
 					VK_org[i].ava=false
@@ -513,53 +509,56 @@ Widget={
 				end--Replace keys
 			defaultSel=defaultSel%5+1
 			end),
-		snap=	newButton(640,320,170,80,C.white,35,function()
+		snap=	newButton(760,80,170,80,C.white,35,function()
 			snapLevel=snapLevel%6+1
 			end),
-			--VK=T,70,50,27/T,130,50,27/T,190,50,27/T,250,50,27/T,310,50,27/T,370,50,27/T,430,50,27/T,490,50,27/T,550,50,27/T,610,50,27/T,670,50,27/T,730,50,27/T,790,50,27/T,850,50,27/T,910,50,27/T,970,50,27/T,739,789,897/T,1090,50,27/T,1150,50,27/T,1210,50,27
-		alpha=	newButton(830,320,170,80,C.white,40,function()
-			setting.VKAlpha=(setting.VKAlpha+1)%11
-			--Adjust virtualkey alpha
-			end),
-		icon=	newButton(495,420,260,80,C.white,40,SETrev("VKIcon")),
-			--Switch virtualkey icon
-		size=	newButton(785,420,260,80,C.white,40,function()
-			if sel then
-				local B=VK_org[sel]
-				B.r=B.r+10
-				if B.r>=150 then B.r=B.r-110 end
-			end
-			end),
-		toggle=	newButton(495,520,260,80,C.white,40,function()
+		more=	newButton(520,180,170,80,C.white,40,function()
 			scene.push()
 			scene.swapTo("setting_touchSwitch")
 			end),
-		back=	newButton(785,520,260,80,C.white,40,scene.back),
+		back=	newButton(760,180,170,80,C.white,40,scene.back),
+		size=	newSlider(360,120,560,14,40,nil,function()
+			return VK_org[sel].r/10-1
+		end,
+		function(v)
+			if sel then
+				VK_org[sel].r=10+v*10
+			end
+			end,
+		function()return not sel end),
 	},
 	setting_touchSwitch={
-		b1=		newSwitch(300,80,	35,VKAdisp(1),VKAcode(1)),
-		b2=		newSwitch(300,140,	35,VKAdisp(2),VKAcode(2)),
-		b3=		newSwitch(300,200,	35,VKAdisp(3),VKAcode(3)),
-		b4=		newSwitch(300,260,	35,VKAdisp(4),VKAcode(4)),
-		b5=		newSwitch(300,320,	35,VKAdisp(5),VKAcode(5)),
-		b6=		newSwitch(300,380,	35,VKAdisp(6),VKAcode(6)),
-		b7=		newSwitch(300,440,	35,VKAdisp(7),VKAcode(7)),
-		b8=		newSwitch(300,500,	35,VKAdisp(8),VKAcode(8)),
-		b9=		newSwitch(300,560,	35,VKAdisp(9),VKAcode(9)),
-		b10=	newSwitch(300,620,	35,VKAdisp(10),VKAcode(10)),
-		b11=	newSwitch(760,80,	35,VKAdisp(11),VKAcode(11)),
-		b12=	newSwitch(760,140,	35,VKAdisp(12),VKAcode(12)),
-		b13=	newSwitch(760,200,	35,VKAdisp(13),VKAcode(13)),
-		b14=	newSwitch(760,260,	35,VKAdisp(14),VKAcode(14)),
-		b15=	newSwitch(760,320,	35,VKAdisp(15),VKAcode(15)),
-		b16=	newSwitch(760,380,	35,VKAdisp(16),VKAcode(16)),
-		b17=	newSwitch(760,440,	35,VKAdisp(17),VKAcode(17)),
-		b18=	newSwitch(760,500,	35,VKAdisp(18),VKAcode(18)),
-		b19=	newSwitch(760,560,	35,VKAdisp(19),VKAcode(19)),
-		b20=	newSwitch(760,620,	35,VKAdisp(20),VKAcode(20)),
-		norm=	newButton(1080,150,240,80,C.white,45,function()for i=1,20 do VK_org[i].ava=i<11 end end),
-		pro=	newButton(1080,300,240,80,C.white,35,function()for i=1,20 do VK_org[i].ava=true end end),
-		back=	newButton(1080,600,240,80,C.white,45,scene.back),
+		b1=		newSwitch(280,80,	35,VKAdisp(1),VKAcode(1)),
+		b2=		newSwitch(280,140,	35,VKAdisp(2),VKAcode(2)),
+		b3=		newSwitch(280,200,	35,VKAdisp(3),VKAcode(3)),
+		b4=		newSwitch(280,260,	35,VKAdisp(4),VKAcode(4)),
+		b5=		newSwitch(280,320,	35,VKAdisp(5),VKAcode(5)),
+		b6=		newSwitch(280,380,	35,VKAdisp(6),VKAcode(6)),
+		b7=		newSwitch(280,440,	35,VKAdisp(7),VKAcode(7)),
+		b8=		newSwitch(280,500,	35,VKAdisp(8),VKAcode(8)),
+		b9=		newSwitch(280,560,	35,VKAdisp(9),VKAcode(9)),
+		b10=	newSwitch(280,620,	35,VKAdisp(10),VKAcode(10)),
+		b11=	newSwitch(620,80,	35,VKAdisp(11),VKAcode(11)),
+		b12=	newSwitch(620,140,	35,VKAdisp(12),VKAcode(12)),
+		b13=	newSwitch(620,200,	35,VKAdisp(13),VKAcode(13)),
+		b14=	newSwitch(620,260,	35,VKAdisp(14),VKAcode(14)),
+		b15=	newSwitch(620,320,	35,VKAdisp(15),VKAcode(15)),
+		b16=	newSwitch(620,380,	35,VKAdisp(16),VKAcode(16)),
+		b17=	newSwitch(620,440,	35,VKAdisp(17),VKAcode(17)),
+		b18=	newSwitch(620,500,	35,VKAdisp(18),VKAcode(18)),
+		b19=	newSwitch(620,560,	35,VKAdisp(19),VKAcode(19)),
+		b20=	newSwitch(620,620,	35,VKAdisp(20),VKAcode(20)),
+		norm=	newButton(840,100,240,80,C.white,45,function()for i=1,20 do VK_org[i].ava=i<11 end end),
+		pro=	newButton(1120,100,240,80,C.white,35,function()for i=1,20 do VK_org[i].ava=true end end),
+		hide=	newSwitch(1170,200,40,SETdisp("VKSwitch"),SETrev("VKSwitch")),
+		track=	newSwitch(1170,300,35,SETdisp("VKTrack"),SETrev("VKTrack")),
+		icon=	newSwitch(850,300,40,SETdisp("VKIcon"),SETrev("VKIcon")),
+		tkset=	newButton(1120,400,240,80,C.white,32,function()
+			scene.push()
+			scene.swapTo("setting_trackSetting")
+			end,function()return not setting.VKTrack end),
+		alpha=	newSlider(840,490,400,10,40,nil,SETdisp("VKAlpha"),SETsto("VKAlpha")),
+		back=	newButton(1100,600,240,80,C.white,45,scene.back),
 	},
 	setting_trackSetting={
 		VKDodge=newSwitch(400,200,	35,SETdisp("VKDodge"),SETrev("VKDodge")),

main.lua

@@ -83,12 +83,11 @@ if sys.getPowerInfo()~="unknown"then
 			gc.clear(0,0,0,.25)
 			gc.setLineWidth(4)
 			local charging=state=="charging"
-			gc.setColor(1,1,1)
 			if state=="nobattery"then
+				gc.setColor(1,1,1)
 				gc.setLineWidth(2)
-				gc.line(74,5,99,22)
-			end
-			if pow<100 then
+				gc.line(74,5,100,22)
+			else
 				if charging then	gc.setColor(0,1,0)
 				elseif pow>50 then	gc.setColor(1,1,1)
 				elseif pow>26 then	gc.setColor(1,1,0)
@@ -96,16 +95,18 @@ if sys.getPowerInfo()~="unknown"then
 				else				gc.setColor(.5,0,1)
 				end
 				gc.rectangle("fill",76,6,pow*.22,14)
-				setFont(14)
-				gc.setColor(0,0,0)
-				gc.print(pow,77,2)
-				gc.print(pow,77,4)
-				gc.print(pow,79,2)
-				gc.print(pow,79,4)
-				gc.setColor(1,1,1)
-				gc.draw(batteryImage,73,3)
-				gc.print(pow,78,3)
+				if pow<100 then
+					setFont(14)
+					gc.setColor(0,0,0)
+					gc.print(pow,77,2)
+					gc.print(pow,77,4)
+					gc.print(pow,79,2)
+					gc.print(pow,79,4)
+					gc.setColor(1,1,1)
+					gc.print(pow,78,3)
+				end
 			end
+			gc.draw(batteryImage,73,3)
 			setFont(25)
 			gc.print(os.date("%H:%M",os.time()),3,-5)
 			gc.pop()gc.setCanvas()
@@ -119,13 +120,14 @@ local function getNewBlock()
 	t.bn,t.size=FX_BGblock.next,2+3*rnd()
 	t.b=blocks[t.bn][rnd(0,3)]
 	t.x=rnd(-#t.b[1]*t.size*30+100,1180)
-	t.y=-#t.b*30*t.size
+	t.y=0
+	t.ty=720+#t.b*30*t.size
 	t.v=t.size*(1+rnd())
 	FX_BGblock.next=FX_BGblock.next%7+1
 	return t
 end
 local function onVirtualkey(x,y)
-	local dist,nearest=1e15
+	local dist,nearest=1e10
 	for K=1,#virtualkey do
 		local b=virtualkey[K]
 		if b.ava then
@@ -139,6 +141,21 @@ local function onVirtualkey(x,y)
 	end
 	return nearest
 end
+local function onVK_org(x,y)
+	local dist,nearest=1e10
+	for K=1,#VK_org do
+		local b=VK_org[K]
+		if b.ava then
+			local d1=(x-b.x)^2+(y-b.y)^2
+			if d1<b.r^2 then
+				if d1<dist then
+					nearest,dist=K,d1
+				end
+			end
+		end
+	end
+	return nearest
+end
 -------------------------------------------------------------
 local floatWheel=0
 local function wheelScroll(y)
@@ -353,6 +370,19 @@ function keyDown.draw(key)
 	end
 end
 
+function mouseDown.setting_sound(x,y,k)
+	if Timer()-sel>5 and x>780 and x<980 and y>470 then
+		VOICE("egg")
+		sel=Timer()
+	end
+end
+function touchDown.setting_sound(id,x,y)
+	if Timer()-sel>5 and x>780 and x<980 and y>470 then
+		VOICE("egg")
+		sel=Timer()
+	end
+end
+
 function keyDown.setting_key(key)
 	if key=="escape"then
 		if keyboardSetting then
@@ -444,15 +474,10 @@ end
 
 function mouseDown.setting_touch(x,y,k)
 	if k==2 then scene.back()end
-	for K=1,#VK_org do
-		local B=VK_org[K]
-		if (x-B.x)^2+(y-B.y)^2<B.r^2 then
-			sel=K
-		end
-	end
+	sel=onVK_org(x,y)or sel
 end
 function mouseMove.setting_touch(x,y,dx,dy)
-	if sel and ms.isDown(1)then
+	if sel and ms.isDown(1)and not widget_sel then
 		local B=VK_org[sel]
 		B.x,B.y=B.x+dx,B.y+dy
 	end
@@ -465,12 +490,7 @@ function mouseUp.setting_touch(x,y,k)
 	end
 end
 function touchDown.setting_touch(id,x,y)
-	for K=1,#VK_org do
-		local B=VK_org[K]
-		if (x-B.x)^2+(y-B.y)^2<B.r^2 then
-			sel=K
-		end
-	end
+	sel=onVK_org(x,y)or sel
 end
 function touchUp.setting_touch(id,x,y)
 	if sel then
@@ -483,7 +503,7 @@ function touchUp.setting_touch(id,x,y)
 	end
 end
 function touchMove.setting_touch(id,x,y,dx,dy)
-	if sel then
+	if sel and not widget_sel then
 		local B=VK_org[sel]
 		B.x,B.y=B.x+dx,B.y+dy
 	end
@@ -892,8 +912,9 @@ function love.update(dt)
 		end
 	end
 	for i=#FX_BGblock,1,-1 do
-		FX_BGblock[i].y=FX_BGblock[i].y+FX_BGblock[i].v
-		if FX_BGblock[i].y>720 then rem(FX_BGblock,i)end
+		local B=FX_BGblock[i]
+		B.y=B.y+B.v
+		if B.y>B.ty then rem(FX_BGblock,i)end
 	end
 	if setting.bgblock then
 		FX_BGblock.tm=FX_BGblock.tm-1
@@ -979,7 +1000,7 @@ function love.draw()
 		local size=FX_BGblock[n].size
 		for i=1,#b do for j=1,#b[1]do
 			if b[i][j]then
-				gc.draw(img,FX_BGblock[n].x+(j-1)*30*size,FX_BGblock[n].y+(i-1)*30*size,nil,size)
+				gc.draw(img,FX_BGblock[n].x+(j-1)*30*size,FX_BGblock[n].y-i*30*size,nil,size)
 			end
 		end end
 	end--Draw BG falling blocks
@@ -1041,7 +1062,6 @@ function love.draw()
 	gc.setColor(1,1,1)
 	gc.print(FPS(),5,700)
 	if devMode>0 then
-		love.timer.sleep(.2)
 		gc.setColor(1,devMode==2 and .5 or 1,1)
 		gc.print("Tasks:"..#Task,5,600)
 		gc.print("Voices:"..#voiceQueue,5,620)

paint.lua

@@ -235,7 +235,10 @@ function Pnt.load()
 	gc.setColor(1,1,1)
 	gc.rectangle("line",300,330,680,60,5)
 	setFont(35)
-	mStr(text.load[L[1]],640,335)
+	gc.print(text.load[L[1]],340,335)
+	if loading[1]~=0 then
+		gc.printf(loading[2].."/"..loading[3],795,335,150,"right")
+	end
 	setFont(25)
 	mStr(L[4],640,400)
 end
@@ -273,10 +276,11 @@ function Pnt.mode()
 	setFont(35)
 	local lv=modes[modeID[modeSel]].level[levelSel]
 	gc.setColor(modeLevelColor[lv]or color.white)
-	mStr(lv,270,215)
+	mStr(lv,270,200)
 	setFont(25)
 	gc.setColor(color.white)
-	mStr(text.modeInfo[modeID[modeSel]],270,255)
+	mStr(text.modeInfo[modeID[modeSel]],270,240)
+	
 	setFont(75)
 	gc.setColor(color.grey)
 	mStr(text.modeName[modeSel],643,273)
@@ -356,7 +360,7 @@ function Pnt.draw()
 	gc.translate(-200,-60)
 	if clearSureTime>0 then
 		gc.setColor(1,1,1,clearSureTime*.02)
-		gc.draw(drawableText.question,760,11)
+		gc.draw(drawableText.question,660,11)
 	end
 	if pen>0 then
 		gc.setLineWidth(13)
@@ -473,8 +477,18 @@ function Pnt.setting_graphic()
 	gc.draw(blockSkin[7-int(Timer()*2)%7],890,390,nil,2)
 end
 function Pnt.setting_sound()
-	gc.setColor(1,1,1)
+	gc.setColor(1,1,1,.8)
 	mDraw(drawableText.setting_sound,640,15)
+	local t=Timer()
+	local x,y=790,370+10*sin(t*.4)
+	gc.translate(x,y)
+	gc.draw(miya_ch,0,0)
+	gc.setColor(1,1,1,.7)
+	gc.draw(miya_f1,4,47+4*sin(t*.9))
+	gc.draw(miya_f2,42,107+5*sin(t))
+	gc.draw(miya_f3,93,126+3*sin(t*.7))
+	gc.draw(miya_f4,129,98+3*sin(t*.7))
+	gc.translate(-x,-y)
 end
 function Pnt.setting_key()
 	local a=.3+sin(Timer()*15)*.1
@@ -526,6 +540,9 @@ function Pnt.setting_key()
 	gc.draw(drawableText.ctrlSetHelp,50,650)
 end
 function Pnt.setting_touch()
+	gc.setColor(1,1,1)
+	gc.setLineWidth(7)gc.rectangle("line",340,15,600,690)
+	gc.setLineWidth(3)gc.rectangle("line",490,85,300,600)
 	VirtualkeyPreview()
 	local d=snapLevelValue[snapLevel]
 	if d>=10 then

player.lua

@@ -94,7 +94,7 @@ local TRS={
 		[31]={TMP1,{0,-1},	{0,1},	{1,0},	{0,-2}	},
 	},--S
 	[3]={
-		[01]={TMP1,{-1,0},	{-1,1},	{0,-2},	{-1,-2},{0,1},	{-1,-1}	},
+		[01]={TMP1,{-1,0},	{-1,1},	{0,-2},	{-1,-2},{-1,-1},{0,1}	},
 		[10]={TMP1,{1,0},	{1,-1},	{0,2},	{1,2},	{0,-1},	{1,1}	},
 		[03]={TMP1,{1,0},	{1,1},	{0,-2},	{-1,1}	},
 		[30]={TMP1,{-1,0},	{-1,-1},{0,2},	{-1,2}	},
@@ -110,7 +110,7 @@ local TRS={
 	[4]={
 		[01]={TMP1,{-1,0},	{-1,1},	{0,-2},	{1,1}	},
 		[10]={TMP1,{1,0},	{1,-1},	{0,2},	{1,2}	},
-		[03]={TMP1,{1,0},	{1,1},	{0,-2},	{1,-2},	{0,1},	{1,-1}	},
+		[03]={TMP1,{1,0},	{1,1},	{0,-2},	{1,-2},	{1,-1},	{0,1}	},
 		[30]={TMP1,{-1,0},	{-1,-1},{0,2},	{-1,2},	{0,-1},	{-1,1}	},
 		[12]={TMP1,{1,0},	{1,-1},	{-1,0},	{0,2},	{1,2}	},
 		[21]={TMP1,{-1,0},	{-1,1},	{1,0},	{0,-2},	{-1,-2}	},
@@ -126,9 +126,9 @@ local TRS={
 		[10]={TMP1,{1,0},	{1,-1},	{0,2},	{1,2},	{0,-1},	{1,1}},
 		[03]={TMP1,{1,0},	{1,1},	{0,-2},	{1,-2}	},
 		[30]={TMP1,{-1,0},	{-1,-1},{0,2},	{-1,2},	{0,-1}	},
-		[12]={TMP1,{1,0},	{1,-1},	{0,-1},	{0,2},	{1,2},	{-1,-1}},
+		[12]={TMP1,{1,0},	{1,-1},	{0,-1},	{-1,-1},{0,2},	{1,2}},
 		[21]={TMP1,{-1,0},	{-1,1},	{0,-2},	{-1,-2},{1,1}	},
-		[32]={TMP1,{-1,0},	{-1,-1},{0,-1},	{0,2},	{-1,2},	{1,-1}},
+		[32]={TMP1,{-1,0},	{-1,-1},{0,-1},	{1,-1},	{0,2},	{-1,2}},
 		[23]={TMP1,{1,0},	{1,1},	{0,-2},	{1,-2},	{-1,1}	},
 		[02]={TMP1,{-1,0},	{1,0},	{0,1}	},
 		[20]={TMP1,{1,0},	{-1,0},	{0,-1}	},
@@ -744,8 +744,8 @@ function player.draw_norm(P)
 	gc.translate(P.x,P.y)gc.scale(P.size)
 	--Camera
 	gc.setColor(0,0,0,.6)gc.rectangle("fill",0,0,600,690)
-	gc.setLineWidth(7)gc.setColor(frameColor[P.strength])gc.rectangle("line",0,0,600,690,3)
-	--Frame
+	gc.setLineWidth(7)gc.setColor(frameColor[P.strength])gc.rectangle("line",0,0,600,690)
+	--Boarder
 	gc.translate(150+P.fieldOff.x,70+P.fieldOff.y)
 	if P.gameEnv.grid then
 		gc.setLineWidth(1)
@@ -945,14 +945,13 @@ function player.draw_norm(P)
 	end--Draw starting counter
 	drawTexts(P.bonus)--Bonus texts
 	setFont(25)
+	drawDial(360,520,P.dropSpeed)
+	drawDial(405,575,P.keySpeed)
 	gc.setColor(1,1,1)
 	mStr(format("%.2f",P.stat.time),-82,518)--Time
 	mStr(P.score1,-82,560)--Score
 	gc.draw(drawableText.bpm,390,490)
-	gc.draw(drawableText.kpm,350,583)
-	setFont(25)
-	drawDial(360,520,P.dropSpeed)
-	drawDial(405,575,P.keySpeed)
+	gc.draw(drawableText.kpm,344,583)
 	--Speed dials
 	gc.setColor(1,1,1)
 	modes[curMode.id].mesDisp(P,P.fieldOff.x,P.fieldOff.y)--Other messages

scene.lua

@@ -82,6 +82,7 @@ local sceneInit={
 		curBG="none"
 	end,
 	setting_sound=function()
+		sel=0--last sound time
 		curBG="none"
 	end,
 	setting_key=function()

sound.lua

@@ -1,4 +1,5 @@
 local rnd=math.random
+local rem=table.remove
 local vibrateLevel={0,.015,.02,.03,.04,.05,.06,.07,.08,.09}
 function VIB(t)
 	if setting.vib>0 then

texture.lua

@@ -84,6 +84,12 @@ background1=N("/image/BG/bg1.jpg")
 background2=N("/image/BG/bg2.png")
 groupCode=N("/image/mess/groupcode.png")
 payCode=N("/image/mess/paycode.png")
+
+miya_ch=N("/image/miya/ch.png")
+miya_f1=N("/image/miya/f1.png")
+miya_f2=N("/image/miya/f2.png")
+miya_f3=N("/image/miya/f3.png")
+miya_f4=N("/image/miya/f4.png")
 drawableText={
 	question=T(100,"?"),
 	bpm=T(15,"BPM"),kpm=T(15,"KPM"),

timer.lua

@@ -34,7 +34,7 @@ function Tmr.load()
 		L[2]=L[2]+1
 		if L[2]>L[3]then
 			for i=1,L[2]do sfx[i]=nil end
-			L[1],L[2],L[3]=4,1,1
+			L[1],L[2],L[3]=0,1,1
 			SFX("welcome",.2)
 		end
 	else

updateLog.lua

@@ -27,6 +27,13 @@ Future outlook:
 		infinite 1v1
 		square mode
 		more FXs & 3d features & animations
+0.8.2+:
+	GUI adjusted
+	added a cute cat
+0.8.2:
+	new widget appearence
+	GUI adjusted
+	bug fixed
 0.8.1:
 	more FX level
 	better battery info displaying