0.7.25α

ai.lua

@@ -8,8 +8,76 @@
 	4deepShape
 	BlockedWells;
 ]]
-local abs=math.abs
+local int,ceil,min,abs,rnd=math.floor,math.ceil,math.min,math.abs,math.random
+local ins,rem=table.insert,table.remove
+local Timer=love.timer.getTime
+-- controlname:
+-- 1~5:mL,mR,rR,rL,rF,
+-- 6~10:hD,sD,H,A,R,
+-- 11~13:LL,RR,DD
+local blockPos={4,4,4,4,4,5,4}
+local scs={{1,2},{1,2},{1,2},{1,2},{1,2},{1.5,1.5},{0.5,2.5}}
+-------------------------------------------------Cold clear
+local CCblockID={4,3,5,6,1,2,0}
+if system~="Windows"then goto SKIP end
+require("CCloader")
+BOT={
+	getConf=	cc.get_default_config	,--()options,weights
+	--setConf=	cc.set_options			,--(options,hold,20g,bag7)
 
+	new=		cc.launch_async			,--(options,weights)bot
+	addNext=	cc.add_next_piece_async	,--(bot,piece)
+	update=		cc.reset_async			,--(bot,field,b2b,combo)
+	think=		cc.request_next_move	,--(bot)
+	getMove=	cc.poll_next_move		,--(bot)success,hold,move
+	ifDead=		cc.is_dead_async		,--(bot)dead
+	destroy=	cc.destroy_async		,--(bot)
+
+	setHold=	cc.set_hold				,--(opt,bool)
+	set20G=		cc.set_20g				,--(opt,bool)
+	setBag=		cc.set_bag7				,--(opt,bool)
+	setNode=	cc.set_max_nodes		,--(opt,bool)
+	free=		cc.free					,--(opt/wei)
+}
+function CC_updateField(P)
+	local F,i={},1
+	for y=1,#P.field do
+		for x=1,10 do
+			F[i],i=P.field[y][x]>0,i+1
+		end
+	end
+	while i<400 do
+		F[i],i=false,i+1
+	end
+	BOT.update(P.AI_bot,F,P.b2b>=100,P.combo)
+end
+function CC_switch20G(P)
+	P.AIdata._20G=true
+	P.AI_keys={}
+	BOT.destroy(P.AI_bot)
+	local opt,wei=BOT.getConf()
+		BOT.setHold(opt,P.AIdata.hold)
+		BOT.set20G(opt,P.AIdata._20G)
+		BOT.setBag(opt,P.AIdata.bag7)
+		BOT.setNode(opt,P.AIdata.node)
+	P.AI_bot=BOT.new(opt,wei)
+	BOT.free(opt)BOT.free(wei)
+	for i=1,P.AIdata.next do
+		BOT.addNext(P.AI_bot,CCblockID[P.next[i].id])
+	end
+	CC_updateField(P)
+	P.hd={bk={{}},id=0,color=0,name=0}P.holded=false
+	P.cur=rem(P.next,1)
+	P.sc,P.dir=scs[P.cur.id],0
+	P.r,P.c=#P.cur.bk,#P.cur.bk[1]
+	P.curX,P.curY=blockPos[P.cur.id],21+ceil(P.fieldBeneath/30)-P.r+min(int(#P.field*.2),2)
+
+	P.freshNext()
+	BOT.addNext(P.AI_bot,CCblockID[P.next[P.AIdata.next].id])
+	collectgarbage()
+end
+::SKIP::
+-------------------------------------------------⑨Stack setup
 local dirCount={1,1,3,3,3,0,1}
 local spinOffset={
 	{1,0,0},--S
@@ -20,12 +88,6 @@ local spinOffset={
 	{0,0,0},--O
 	{2,0,1},--I
 }for i=1,7 do spinOffset[i][0]=0 end
---[[
-	controlname:
-	1~5:mL,mR,rR,rL,rF,
-	6~10:hD,sD,H,A,R,
-	11~13:LL,RR,DD
-]]
 local FCL={
 	[1]={
 		{{11},{11,2},{1},{},{2},{2,2},{12,1},{12}},
@@ -68,7 +130,7 @@ local function resetField(f0,f,start)
 		end
 	end
 end
-local function getScore(field,bn,cb,cx,cy)
+local function getScore(field,cb,cy)
 	local score=0
 	local highest=0
 	local height=getNewRow(0)
@@ -83,7 +145,7 @@ local function getScore(field,bn,cb,cx,cy)
 		clear=clear+1
 		::L::
 	end
-	if #field==0 then return 9e99 end--PC best
+	if #field==0 then return 1e99 end--PC best
 	for x=1,10 do
 		local h=#field
 		::L::if field[h][x]==0 and h>1 then
@@ -123,58 +185,111 @@ local function getScore(field,bn,cb,cx,cy)
 	if mh1>3 then score=score-40-mh1*30 end
 	return score
 end
-function AI_getControls(ctrl)
+-------------------------------------------------
-	local Tfield={}--test field
+AI_think={
-	local field_org=P.field
+	["9S"]={
-	for i=1,#field_org do
+		function(P,ctrl)
-		Tfield[i]=getNewRow(0)
+			local Tfield={}--test field
-		for j=1,10 do
+			local field_org=P.field
-			Tfield[i][j]=field_org[i][j]
+			for i=1,#field_org do
-		end
+				Tfield[i]=getNewRow(0)
-	end
+				for j=1,10 do
-	local best={x=1,dir=0,hold=false,score=-9e99}
+					Tfield[i][j]=field_org[i][j]
-	for ifhold=0,P.gameEnv.hold and 1 or 0 do
+				end
-		local bn=ifhold==0 and P.cur.id or P.hold.id>0 and P.hold.id or P.next[1].id
+			end
-		for dir=0,dirCount[bn] do--each dir
+			local best={x=1,dir=0,hold=false,score=-1e99}
-			local cb=blocks[bn][dir]
+			for ifhold=0,P.gameEnv.hold and 1 or 0 do
-			for cx=1,11-#cb[1]do--each pos
+				local bn=ifhold==0 and P.cur.id or P.hd.id>0 and P.hd.id or P.next[1].id
-				local cy=#Tfield+1
+				for dir=0,dirCount[bn] do--each dir
-				::L::if not ifoverlapAI(Tfield,cb,cx,cy-1)then
+					local cb=blocks[bn][dir]
-					cy=cy-1
+					for cx=1,11-#cb[1]do--each pos
-					goto L
+						local cy=#Tfield+1
-				end--move to bottom
+						::L::if not ifoverlapAI(Tfield,cb,cx,cy-1)then
-				for i=1,#cb do
+							cy=cy-1
-					local y=cy+i-1
+							goto L
-					if not Tfield[y]then Tfield[y]=getNewRow(0)end
+						end--move to bottom
-					for j=1,#cb[1]do
+						for i=1,#cb do
-						if cb[i][j]then
+							local y=cy+i-1
-							Tfield[y][cx+j-1]=1
+							if not Tfield[y]then Tfield[y]=getNewRow(0)end
-						end
+							for j=1,#cb[1]do
-					end
+								if cb[i][j]then
-				end--simulate lock
+									Tfield[y][cx+j-1]=1
-				local score=getScore(Tfield,bn,cb,cx,cy)
+								end
-				if score>best.score then
+							end
-					best={bn=bn,x=cx,dir=dir,hold=ifhold==1,score=score}
+						end--simulate lock
+						local score=getScore(Tfield,cb,cy)
+						if score>best.score then
+							best={bn=bn,x=cx,dir=dir,hold=ifhold==1,score=score}
+						end
+						resetField(field_org,Tfield,cy)
+					end
 				end
-				resetField(field_org,Tfield,cy)
 			end
-		end
-	end
 
-	::L::
+			::L::
-	if #Tfield>0 then
+			if #Tfield>0 then
-		removeRow(Tfield,1)
+				removeRow(Tfield,1)
-		goto L
+				goto L
-	end--Release cache
+			end--Release cache
-	local p=#ctrl+1
+			local p=#ctrl+1
-	if best.hold then
+			if best.hold then
-		ctrl[p]=8
+				ctrl[p]=8
-		p=p+1
+				p=p+1
-	end
+			end
-	local l=FCL[best.bn][best.dir+1][best.x]
+			local l=FCL[best.bn][best.dir+1][best.x]
-	for i=1,#l do
+			for i=1,#l do
-		ctrl[p]=l[i]
+				ctrl[p]=l[i]
-		p=p+1
+				p=p+1
-	end
+			end
-	ctrl[p]=6
+			ctrl[p]=6
-end
+			return 2
+		end,
+		function(P)
+			P.AI_delay=P.AI_delay0
+			if Timer()-P.modeData.point>P.modeData.event then
+				P.modeData.point=Timer()
+				P.modeData.event=P.AI_delay0+rnd(2,10)
+				P:changeAtkMode(rnd()<.85 and 1 or #P.atker>3 and 4 or rnd()<.3 and 2 or 3)
+			end
+			return 1
+		end,
+	},
+	["CC"]={
+		function(P)
+			if P.AI_needFresh then
+				CC_updateField(P)
+				P.AI_needFresh=false
+			end
+			BOT.think(P.AI_bot)
+			return 2
+		end,--start thinking
+		function(P,ctrl)
+			if BOT.ifDead(P.AI_bot)then ins(ctrl,6)return 3 end
+			local success,hold,move=BOT.getMove(P.AI_bot)
+			if success then
+				if hold then ctrl[1]=8 end--Hold
+				while move[1]do
+					local m=rem(move,1)
+					if m<4 then
+						ins(ctrl,m+1)
+					elseif not P.AIdata._20G then
+						ins(ctrl,13)
+					end
+				end
+				ins(ctrl,6)
+				return 3
+			else
+				return 2--stay this stage
+			end
+		end,--poll keys
+		function(P)
+			P.AI_delay=P.AI_delay0
+			if Timer()-P.modeData.point>P.modeData.event then
+				P.modeData.point=Timer()
+				P.modeData.event=P.AI_delay0+rnd(2,10)
+				P:changeAtkMode(rnd()<.85 and 1 or #P.atker>3 and 4 or rnd()<.3 and 2 or 3)
+			end
+			return 1
+		end,--check if time to change target
+	},
+}--AI think stage

class.lua

@@ -1,17 +1,13 @@
-Task={}
+local gc=love.graphics
 local rem=table.remove
-
+local format=string.format
-metatable_task={__index=Task}
+Task={}
 function newTask(code,P,data)
-	local id=#Task+1
+	Task[#Task+1]={
-	local obj={
 		code=code,
 		P=P,
 		data=data,
-		id=id,
 	}
-	setmetatable(obj,metatable_task)
-	Task[id]=obj
 end
 function clearTask(opt)
 	if opt=="all"then
@@ -34,14 +30,137 @@ function clearTask(opt)
 		end
 	end
 end
-function Task:update()
+
-	if(not self.P or self.P and scene=="play")and self:code(self.P,self.data)then
+local button={type="button"}
-		local e=#Task
+function newButton(x,y,w,h,color,font,code,hide,N)
-		for i=1,e do
+	local _={
-			if Task[i]==self then
+		x=x-w*.5,y=y-h*.5,
-				Task[e],Task[i]=nil,Task[e]
+		w=w,h=h,
-				return
+		color=color,
-			end
+		font=font,
-		end
+		code=code,
+		hide=hide,
+		next=N,
+	}for k,v in next,button do _[k]=v end return _
+end
+function button:isAbove(x,y)
+	return x>self.x and x<self.x+self.w and y>self.y and y<self.y+self.h
+end
+function button:FX()
+	sysFX[#sysFX+1]={0,0,10,self.x,self.y,self.w,self.h}
+	--[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)
+	if self==widget_sel then
+		gc.rectangle("fill",self.x,self.y,self.w,self.h,4)
+	end--Highlight when Selected
+	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")
 	end
 end
+function button:getInfo()
+	print(format("x=%d,y=%d,w=%d,h=%d,font=%d",self.x,self.y,self.w,self.h,self.font))
+end
+
+local switch={type="switch"}
+function newSwitch(x,y,font,disp,code,hide,N)
+	local _={
+		x=x,y=y,font=font,
+		disp=disp,
+		code=code,
+		hide=hide,
+		next=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
+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=square fade],timer,duration,r,g,b,x,y,w,h
+end
+function switch:draw()
+	local x,y=self.x,self.y-20
+	if self.disp()then
+		gc.setColor(.6,1,.6)
+		gc.rectangle("fill",x+50,y,50,40,3)
+		--ON
+	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)
+	--frame
+	local t=self.text
+	if t then
+		if type(t)=="function"then t=t()end
+		gc.setColor(1,1,1)
+		setFont(self.font)
+		gc.printf(t,x-412,y+20-self.font*.7,400,"right")
+	end
+end
+function switch:getInfo()
+	print(format("x=%d,y=%d,font=%d",self.x,self.y,self.font))
+end
+
+local slider={type="slider"}
+function newSlider(x,y,w,unit,font,change,disp,code,hide,N)
+	local _={
+		x=x,y=y,
+		w=w,unit=unit,
+		font=font,
+		change=change,
+		disp=disp,
+		code=code,
+		hide=hide,
+		next=N,
+	}for k,v in next,slider do _[k]=v end return _
+end
+function slider:isAbove(x,y)
+	return x>self.x-10 and x<self.x+self.w+10 and y>self.y-20 and y<self.y+20
+end
+function slider:FX(pos)
+	sysFX[#sysFX+1]={1,0,10,1,1,1,self.x+self.w*pos/self.unit-8,self.y-15,17,30}
+	--[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)
+	gc.setLineWidth(2)
+	local x1,x2=self.x,self.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)
+	end
+	--units
+	gc.setLineWidth(5)
+	gc.line(x1,self.y,x2,self.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")
+	end
+end
+function slider:getInfo()
+	print(format("x=%d,y=%d,w=%d",self.x,self.y,self.w))
+end

conf.lua

@@ -1,4 +1,4 @@
-gameVersion="Alpha V0.7.22"
+gameVersion="Alpha V0.7.25"
 function love.conf(t)
 	t.identity="Techmino"--Save directory name
 	t.version="11.1"

document.txt

@@ -0,0 +1,31 @@
+攻击系统：
+消1/2/3/4攻击0/1/2/4
+spin1/2/3攻击2/4/6,若mini则减半
+b2b：增加1~2(tetris)/1~3(spin)攻击
+b3b：满b2b效果+1额外抵挡
+PC：其它攻击与6~8(本局内递增)取高+2额外抵挡
+连击：0,0,1,1,2,2,3,3,4,4,3……
+
+
+抵消逻辑：发动攻击时，若缓冲条有攻击则先用额外抵挡再用攻击力抵消受到的攻击，多余的攻击力会发送给对手，没有用上的额外抵挡会被丢弃。
+
+
+攻击延迟：消2/3的攻击生效最快，消四其次，spin攻击生效较慢，高连击生效最慢，b2b或者b3b增加攻击力的同时也会减缓一点生效时间，mini大幅增加生效时间。
+
+
+back to back点数说明：取值范围0~1200
+在40及以上特殊消除时b2b,在1000以上特殊消除时b3b,1200封顶
+消四+100
+空spin加20，不超过1000
+spin1~3+50/100/180 (mini*.5)
+普通消除-250
+1000以上空放一块-40(不减到低于1000)
+
+
+吃鸡模式：
+许多玩家同时进行一局游戏（其它的是AI，不是真人），坚持到最后的玩家胜利。随着玩家数量的减少，方块下落/垃圾生效速度/垃圾升起速度都会增加。淘汰其它玩家后可以获得一个徽章和该玩家持有的徽章，增强自己的攻击力。
+玩家可选四个攻击模式：
+1.随机：每次攻击后10%随机锁定一个玩家
+2.最多徽章：攻击后或者锁定玩家死亡时锁定徽章最多的玩家
+3.最高：攻击后或者锁定玩家死亡时锁定场地最高的玩家（每秒刷新）
+4.反击：攻击所有锁定自己的玩家（AOE），若无则伏击随机玩家

language/chi.lua

@@ -1,4 +1,3 @@
-local SWC={[true]="开",[false]="关"}
 local BK="返回"
 return{
 	atkModeName={"随机","徽章","击杀","反击"},
@@ -15,9 +14,10 @@ return{
 	PC="Perfect Clear",
 	hold="暂存",next="下一个",
 
-	stage={"关卡 1","关卡 2","关卡 3","关卡 4","关卡 5",},
+	stage=function(n)return"关卡 "..n end,
-	awesome="精彩。",
+	great="Great!",
-	continue="继续。",
+	awesome="Awesome.",
+	continue="Continue.",
 	maxspeed="最高速度",
 	speedup="速度加快",
 
@@ -25,7 +25,7 @@ return{
 	lose="失败",
 	pause="暂停",
 	finish="结束",
-	pauseTime="暂停时间",
+	pauseCount="暂停统计",
 
 	custom="自定义游戏",
 	customOption={
@@ -44,7 +44,7 @@ return{
 		bgm="背景音乐:",
 	},
 	customVal={
-		drop={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞","[20G]"},
+		drop={"[20G]",1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
 		lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
 		wait=nil,
 		fall=nil,
@@ -54,21 +54,25 @@ return{
 		visible={"可见","半隐","全隐","瞬隐"},
 		target={10,20,40,100,200,500,1000,"∞"},
 		freshLimit={0,8,15,"∞"},
-		opponent={"无电脑",1,2,3,4,5,6,7,8,9,10,11},
+		opponent={"无电脑","9S Lv1","9S Lv2","9S Lv3","9S Lv4","9S Lv5","CC Lv1","CC Lv2","CC Lv3","CC Lv4","CC Lv5","CC Lv6"},
 	},
 	softdropdas="软降DAS:",
 	softdroparr="软降ARR:",
 	snapLevelName={"任意摆放","10px吸附","20px吸附","40px吸附","60px吸附","80px吸附"},
 	keyboard="键盘",joystick="手柄",
 	space="空格",enter="回车",
-	setting2Help="方向键选择/翻页,回车修改,esc返回",
+	ctrlSetHelp="方向键选择/翻页,回车修改,esc返回",
+	setting_game="游戏设置",
+	setting_graphic="画面设置",
+	setting_sound="声音设置",
 	musicRoom="音乐室",
 	nowPlaying="正在播放:",
 
 	actName={"左移:","右移:","顺时针旋转:","逆时针旋转:","180°旋转","硬降:","软降:","暂存:","功能键:","重新开始:","左瞬移:","右瞬移:","软降到底:"},
 	modeName={
 		[0]="自定义",
-		"竞速","马拉松","大师","经典","禅","无尽","单挑","仅TSD","隐形","挖掘","生存","科研",
+		"竞速","马拉松","大师","经典","禅","无尽","单挑","回合制","仅TSD","隐形",
+		"挖掘","生存","防守","进攻","科研",
 		"C4W练习","全清训练","全清挑战","49人混战","99人混战","干旱","多人",
 	},
 	modeInfo={
@@ -79,10 +83,13 @@ return{
 		zen="无重力消除200行",
 		infinite="科研沙盒",
 		solo="打败AI",
+		round="下棋",
 		tsd="尽可能做TSD",
 		blind="最强大脑",
 		dig="核能挖掘机",
-		survivor="防守练习",
+		survivor="你能存活多久?",
+		defender="防守练习",
+		attacker="进攻练习",
 		tech="尽可能不要普通消除",
 		c4wtrain="无 限 连 击",
 		pctrain="熟悉全清定式的组合",
@@ -110,14 +117,20 @@ return{
 		"适度游戏益脑,沉迷游戏伤身,合理安排时间,享受健康生活",
 		"合群了就会消失,但是消失不代表没有意义",
 		"学会使用两个旋转键,三个更好",
-		"更小的DAS和ARR拥有更高的操作上限",
+		"更小的DAS和ARR拥有更高的操作上限(如果你还能控制得了的话)",
 		"注意到\"旋转\"到底对方块做了些什么吗?",
-		"20G是一套全新的游戏规则",
+		"20G本质是一套全新的游戏规则",
 		"不要在上课时玩游戏!",
 		"本游戏难度上限很高,做好心理准备",
 		"方块可以不是个休闲游戏",
 		"调到特殊的日期也不会发生什么的",
 		"3.1415926535897932384",
+		"2.7182818284590452353",
+		"Let-The-Bass-Kick!",
+		"使用love2d引擎制作",
+		"哪里不舒服的话先看看设置有没有你想要改的",
+		"有建议的话可以把信息反馈给作者~",
+		"本游戏不叫铁壳米诺",
 	},
 	stat={
 		"游戏运行次数:",
@@ -147,14 +160,16 @@ return{
 		"使用LOVE2D引擎",
 		"作者:MrZ   邮箱:1046101471@qq.com",
 		"程序:MrZ  美术:MrZ  音乐:MrZ  音效:MrZ 语音:Miya",
-		"使用工具:VScode,GFIE,Beepbox,Goldwave",
+		"使用工具:VScode,GFIE,Beepbox,Goldwave,Cold_Clear",
-		"特别感谢:Farter,196,Teatube,Flyz,T830,[所有测试人员]和 你!",
+		"特别感谢:Farter,Flyz,196,Teatube,T830,[所有测试人员]和 你!",
 		"错误或者建议请附带相关信息发送到作者邮箱~",
 	},
 	support="支持作者",
 	group="官方QQ群",
-	ButtonText={
+	warning="禁 止 私 自 传 播",
+	WidgetText={
 		main={
+			lang="中文",
 			qplay="快速开始",
 			play="开始",
 			setting="设置",
@@ -173,7 +188,7 @@ return{
 			back=BK,
 		},
 		music={
-			bgm=function()return"音乐:"..SWC[setting.bgm]end,
+			bgm="BGM",
 			up="↑",
 			play="播放",
 			down="↓",
@@ -216,45 +231,58 @@ return{
 			pause="暂停",
 		},
 		pause={
-			resume="继续",
+			resume=	"继续",
-			quit="退出",
+			restart="重新开始",
+			quit=	"退出",
 		},
-		setting={
+		setting_game={
-			ghost=function()return"阴影:"..SWC[setting.ghost]end,
+			graphic="←画面设置",
-			center=function()return"旋转中心:"..SWC[setting.center]end,
+			sound="声音设置→",
-			grid=function()return"网格:"..SWC[setting.grid]end,
-			swap=function()return setting.swap and"目标选择:组合键"or"目标选择:循环"end,
-			fxs=function()return setting.fxs>0 and"特效等级:"..setting.fxs or"特效 关"end,
-			bg=function()return"背景:"..SWC[setting.bg]end,
 			dasD="-",dasU="+",
 			arrD="-",arrU="+",
 			sddasD="-",sddasU="+",
 			sdarrD="-",sdarrU="+",
-			ctrl="控制设置",
+			quickR="快速重新开始",
-			touch="触摸设置",
+			swap="组合键切换攻击模式",
-			lang=function()return langName[setting.lang]end,
+			back=BK,
-			sfx=function()return"音效:"..SWC[setting.sfx]end,
+		},
-			bgm=function()return"音乐:"..SWC[setting.bgm]end,
+		setting_graphic={
-			vib=function()return "震动:"..setting.vib end,
+			sound="←声音设置",
-			voc=function()return"语音:"..SWC[setting.voc]end,
+			game="游戏设置→",
-			fullscreen=function()return"全屏:"..SWC[setting.fullscreen]end,
+			ghost="阴影",
-			bgblock=function()return"背景动画:"..SWC[setting.bgblock]end,
+			grid="网格",
-			frame=function()return"绘制帧:"..setting.frameMul.."%"end,
+			center="旋转中心",
 			skin="皮肤",
-			smo=function()return"平滑下落:"..SWC[setting.smo]end,
+			bg="背景",
-			back="保存&返回",
+			bgblock="背景动画",
-		},
+			smo="平滑下落",
-		setting2={
+			dropFX="下落特效等级",
+			shakeFX="晃动特效等级",
+			atkFX="攻击特效等级",
+			fullscreen="全屏",
+			frame="绘制帧率",
 			back=BK,
 		},
-		setting3={
+		setting_sound={
+			game="←游戏设置",
+			graphic="画面设置→",
+			sfx="音效",
+			bgm="音乐",
+			vib="震动",
+			voc="语音",
 			back=BK,
+		},
+		setting_control={
+			back=BK,
+		},
+		setting_touch={
 			hide=function()return setting.virtualkeySwitch and"隐藏虚拟按键"or"显示虚拟按键"end,
 			default="默认组合",
 			snap=function()return text.snapLevelName[snapLevel]end,
 			alpha=function()return setting.virtualkeyAlpha.."0%"end,
 			icon="图标",
 			size="大小",
+			back=BK,
 		},
 		help={
 			his="历史",
@@ -262,8 +290,8 @@ return{
 			back=BK,
 		},
 		history={
-			prev="←",
+			prev="↑",
-			next="→",
+			next="↓",
 			back=BK,
 		},
 		stat={

language/chi_full.lua

@@ -1,4 +1,3 @@
-local SWC={[true]="开",[false]="关"}
 local BK="返回"
 return{
 	atkModeName={"随机","徽章","击杀","反击"},
@@ -15,7 +14,8 @@ return{
 	PC="场地全清",
 	hold="暂存",next="下一个",
 
-	stage={"关卡 1","关卡 2","关卡 3","关卡 4","关卡 5",},
+	stage=function(n)return"关卡 "..n end,
+	great="不错!",
 	awesome="精彩。",
 	continue="继续。",
 	maxspeed="最高速度",
@@ -25,7 +25,7 @@ return{
 	lose="失败",
 	pause="暂停",
 	finish="结束",
-	pauseTime="暂停时间",
+	pauseCount="暂停统计",
 
 	custom="自定义游戏",
 	customOption={
@@ -44,7 +44,7 @@ return{
 		bgm="背景音乐:",
 	},
 	customVal={
-		drop={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞","[20G]"},
+		drop={"[20G]",1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
 		lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
 		wait=nil,
 		fall=nil,
@@ -54,21 +54,25 @@ return{
 		visible={"可见","半隐","全隐","瞬隐"},
 		target={10,20,40,100,200,500,1000,"∞"},
 		freshLimit={0,8,15,"∞"},
-		opponent={"无电脑",1,2,3,4,5,6,7,8,9,10,11},
+		opponent={"无电脑","9S Lv1","9S Lv2","9S Lv3","9S Lv4","9S Lv5","CC Lv1","CC Lv2","CC Lv3","CC Lv4","CC Lv5","CC Lv6"},
 	},
 	softdropdas="软降DAS:",
 	softdroparr="软降ARR:",
 	snapLevelName={"任意摆放","10px吸附","20px吸附","40px吸附","60px吸附","80px吸附"},
 	keyboard="键盘",joystick="手柄",
 	space="空格",enter="回车",
-	setting2Help="方向键选择/翻页,回车修改,esc返回",
+	ctrlSetHelp="方向键选择/翻页,回车修改,esc返回",
+	setting_game="游戏设置",
+	setting_graphic="画面设置",
+	setting_sound="声音设置",
 	musicRoom="音乐室",
 	nowPlaying="正在播放:",
 
 	actName={"左移:","右移:","顺时针旋转:","逆时针旋转:","180°旋转","硬降:","软降:","暂存:","功能键:","重新开始:","左瞬移:","右瞬移:","软降到底:"},
 	modeName={
 		[0]="自定义",
-		"竞速","马拉松","大师","经典","禅","无尽","单挑","仅TSD","隐形","挖掘","生存","科研",
+		"竞速","马拉松","大师","经典","禅","无尽","单挑","回合制","仅TSD","隐形",
+		"挖掘","生存","防守","进攻","科研",
 		"C4W练习","全清训练","全清挑战","49人混战","99人混战","干旱","多人",
 	},
 	modeInfo={
@@ -79,10 +83,13 @@ return{
 		zen="无重力消除200行",
 		infinite="科研沙盒",
 		solo="打败AI",
+		round="下棋",
 		tsd="尽可能做T旋双清",
 		blind="最强大脑",
 		dig="核能挖掘机",
-		survivor="防守练习",
+		survivor="你能存活多久?",
+		defender="防守练习",
+		attacker="进攻练习",
 		tech="尽可能不要普通消除!",
 		c4wtrain="无 限 连 击",
 		pctrain="熟悉全清定式的组合",
@@ -110,14 +117,20 @@ return{
 		"适度游戏益脑,沉迷游戏伤身,合理安排时间,享受健康生活",
 		"合群了就会消失,但是消失不代表没有意义",
 		"学会使用两个旋转键,三个更好",
-		"更小的DAS和ARR拥有更高的操作上限",
+		"更小的DAS和ARR拥有更高的操作上限(如果你还能控制得了的话)",
 		"注意到\"旋转\"到底对方块做了些什么吗?",
-		"20G是一套全新的游戏规则",
+		"20G本质是一套全新的游戏规则",
 		"不要在上课时玩游戏!",
 		"本游戏难度上限很高,做好心理准备",
 		"方块可以不是个休闲游戏",
 		"调到特殊的日期也不会发生什么的",
 		"3.1415926535897932384",
+		"2.7182818284590452353",
+		"Let-The-Bass-Kick!",
+		"使用love2d引擎制作",
+		"哪里不舒服的话先看看设置有没有你想要改的",
+		"有建议的话可以把信息反馈给作者~",
+		"郑重声明本游戏不叫[铁壳米诺]",
 	},
 	stat={
 		"游戏运行次数:",
@@ -147,14 +160,16 @@ return{
 		"使用LOVE2D引擎",
 		"作者:MrZ   邮箱:1046101471@qq.com",
 		"程序:MrZ  美术:MrZ  音乐:MrZ  音效:MrZ 语音:Miya",
-		"使用工具:VScode,GFIE,Beepbox,Goldwave",
+		"使用工具:VScode,GFIE,Beepbox,Goldwave,Cold_Clear",
-		"特别感谢:Farter,Teatube,196,Flyz,T830,[所有测试人员]和 你!",
+		"特别感谢:Farter,Flyz,196,Teatube,T830,[所有测试人员]和 你!",
 		"错误或者建议请附带相关信息发送到作者邮箱~",
 	},
 	support="支持作者",
 	group="官方QQ群",
-	ButtonText={
+	warning="禁 止 私 自 传 播",
+	WidgetText={
 		main={
+			lang="全中文",
 			qplay="快速开始",
 			play="开始",
 			setting="设置",
@@ -173,7 +188,7 @@ return{
 			back=BK,
 		},
 		music={
-			bgm=function()return"音乐:"..SWC[setting.bgm]end,
+			bgm="BGM",
 			up="↑",
 			play="播放",
 			down="↓",
@@ -216,45 +231,59 @@ return{
 			pause="暂停",
 		},
 		pause={
-			resume="继续",
+			resume=	"继续",
-			quit="退出",
+			restart="重新开始",
+			quit=	"退出",
 		},
-		setting={
+
-			ghost=function()return"阴影:"..SWC[setting.ghost]end,
+		setting_game={
-			center=function()return"旋转中心:"..SWC[setting.center]end,
+			graphic="←画面设置",
-			grid=function()return"网格:"..SWC[setting.grid]end,
+			sound="声音设置→",
-			swap=function()return setting.swap and"目标选择:组合键"or"目标选择:循环"end,
-			fxs=function()return setting.fxs>0 and"特效等级:"..setting.fxs or"特效 关"end,
-			bg=function()return"背景:"..SWC[setting.bg]end,
 			dasD="-",dasU="+",
 			arrD="-",arrU="+",
 			sddasD="-",sddasU="+",
 			sdarrD="-",sdarrU="+",
-			ctrl="控制设置",
+			quickR="快速重新开始",
-			touch="触摸设置",
+			swap="组合键切换攻击模式",
-			lang=function()return langName[setting.lang]end,
+			back=BK,
-			sfx=function()return"音效:"..SWC[setting.sfx]end,
+		},
-			bgm=function()return"音乐:"..SWC[setting.bgm]end,
+		setting_graphic={
-			vib=function()return "震动:"..setting.vib end,
+			sound="←声音设置",
-			voc=function()return"语音:"..SWC[setting.voc]end,
+			game="游戏设置→",
-			fullscreen=function()return"全屏:"..SWC[setting.fullscreen]end,
+			ghost="阴影",
-			bgblock=function()return"背景动画:"..SWC[setting.bgblock]end,
+			grid="网格",
-			frame=function()return"绘制帧:"..setting.frameMul.."%"end,
+			center="旋转中心",
 			skin="皮肤",
-			smo=function()return"平滑下落:"..SWC[setting.smo]end,
+			bg="背景",
-			back="保存&返回",
+			bgblock="背景动画",
-		},
+			smo="平滑下落",
-		setting2={
+			dropFX="下落特效等级",
+			shakeFX="晃动特效等级",
+			atkFX="攻击特效等级",
+			fullscreen="全屏",
+			frame="绘制帧率",
 			back=BK,
 		},
-		setting3={
+		setting_sound={
+			game="←游戏设置",
+			graphic="画面设置→",
+			sfx="音效",
+			bgm="音乐",
+			vib="震动",
+			voc="语音",
 			back=BK,
+		},
+		setting_control={
+			back=BK,
+		},
+		setting_touch={
 			hide=function()return setting.virtualkeySwitch and"隐藏虚拟按键"or"显示虚拟按键"end,
 			default="默认组合",
 			snap=function()return text.snapLevelName[snapLevel]end,
 			alpha=function()return setting.virtualkeyAlpha.."0%"end,
 			icon="图标",
 			size="大小",
+			back=BK,
 		},
 		help={
 			his="历史",
@@ -262,8 +291,8 @@ return{
 			back=BK,
 		},
 		history={
-			prev="←",
+			prev="↑",
-			next="→",
+			next="↓",
 			back=BK,
 		},
 		stat={

language/eng.lua

@@ -1,4 +1,3 @@
-local SWC={[true]="ON",[false]="OFF"}
 local BK="Back"
 return{
 	atkModeName={"Random","Badges","K.O.s","Counters"},
@@ -15,7 +14,8 @@ return{
 	PC="Perfect Clear",
 	hold="Hold",next="Next",
 
-	stage={"STAGE 1","STAGE 2","STAGE 3","STAGE 4","STAGE 5",},
+	stage=function(n)return"STAGE "..n end,
+	great="Great!",
 	awesome="Awesome.",
 	continue="Continue.",
 	maxspeed="Max speed",
@@ -25,7 +25,7 @@ return{
 	lose="LOSE",
 	pause="PAUSE",
 	finish="FINISH",
-	pauseTime="Pause time",
+	pauseCount="Pause Count",
 
 	custom="Custom Game",
 	customOption={
@@ -44,7 +44,7 @@ return{
 		bgm="BGM:",
 	},
 	customVal={
-		drop={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞","[20G]"},
+		drop={"[20G]",1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
 		lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
 		wait=nil,
 		fall=nil,
@@ -54,21 +54,25 @@ return{
 		visible={"normal","time","invisible","sudden"},
 		target={10,20,40,100,200,500,1000,"∞"},
 		freshLimit={0,8,15,"∞"},
-		opponent={"No CPU",1,2,3,4,5,6,7,8,9,10,11},
+		opponent={"No CPU","9S Lv1","9S Lv2","9S Lv3","9S Lv4","9S Lv5","CC Lv1","CC Lv2","CC Lv3","CC Lv4","CC Lv5","CC Lv6"},
 	},
 	softdropdas="Down DAS:",
 	softdroparr="Down ARR:",
 	snapLevelName={"Free pos","Snap-10","Snap-20","Snap-40","Snap-60","Snap-80"},
 	keyboard="Keyboard",joystick="Joystick",
 	space="Space",enter="Enter",
-	setting2Help="Arrowkey to select/change slot,Enter to change,Esc back",
+	ctrlSetHelp="Arrowkey to select/change slot,Enter to change,Esc back",
+	setting_game="Game setting",
+	setting_graphic="Graphic setting",
+	setting_sound="Sound setting",
 	musicRoom="Music Room",
 	nowPlaying="Now Playing:",
 
 	actName={"Move Left:","Move Right:","Rotate Right:","Rotate Left:","Rotate Flip:","Hard Drop:","Soft Drop:","Hold:","Function:","Restart:","Instant Left:","Instant Right:","Ins Down:"},
 	modeName={
 		[0]="Custom",
-		"Sprint","Marathon","Master","Classic","Zen","Infinite","1v1","TSD-only","Blind","Dig","Survivor","Tech",
+		"Sprint","Marathon","Master","Classic","Zen","Infinite","1v1","Round","TSD-only","Blind",
+		"Dig","Survivor","Defender","Attacker","Tech",
 		"C4W Train","PC Train","PC Challenge","Techmino49","Techmino99","Drought","Hotseat",
 	},
 	modeInfo={
@@ -79,10 +83,13 @@ return{
 		zen="Clear 200 Lines without gravity",
 		infinite="Infinite game,infinite happiness",
 		solo="Beat AI",
+		round="Chess?",
 		tsd="Make more T-spin-doubles",
 		blind="Invisible board",
 		dig="Downstack!",
-		survivor="Hand them!",
+		survivor="Survive Longer!",
+		defender="Hand them!",
+		attacker="Attacking better then defending",
 		tech="Don't do normal clear",
 		c4wtrain="Infinite combo",
 		pctrain="Let's learn some PCs",
@@ -110,14 +117,20 @@ return{
 		"Playing too much = taking drugs",
 		"Disappearing doesn't mean useless",
 		"Try to use two rotate button,three better",
-		"Small DAS&ARR can make you faster,if you can adapt to it",
+		"Small DAS&ARR can make you faster,if you can control block correctly",
 		"Have you noticed what does \"rotating\" do to block?",
-		"20G is a brand new game rule",
+		"20G actually is a brand new game rule",
 		"Do not play game in class!",
 		"This game can be very hard,be mentally perpared",
 		"This in not a casual game",
 		"Nothing will happen when some special day come",
 		"3.1415926535897932384",
+		"2.7182818284590452353",
+		"Let-The-Bass-Kick!",
+		"Powered by love2d",
+		"Find out what's in the setting!",
+		"Any suggestions to author!~",
+		"Techmino=Technique+tetromino",
 	},
 	stat={
 		"Games run:",
@@ -147,14 +160,16 @@ return{
 		"Powered by LOVE2D",
 		"Author:MrZ   E-mail:1046101471@qq.com",
 		"Programe:MrZ  Art:MrZ  Music:MrZ  SFX:MrZ VOICE:Miya",
-		"Tool used:VScode,GFIE,Beepbox,Goldwave",
+		"Tool used:VScode,GFIE,Beepbox,Goldwave,Cold_Clear",
-		"Special thanks:Farter,Teatube,196,Flyz,T830,[all test staff] and YOU!",
+		"Special thanks:Farter,Flyz,196,Teatube,T830,[all test staff] and YOU!",
 		"Any bugs/suggestions to my E-mail.",
 	},
 	support="Support Author",
 	group="Official QQ Group",
-	ButtonText={
+	warning="DO NOT DISTRIBUTE",
+	WidgetText={
 		main={
+			lang="English",
 			qplay="Qplay",
 			play="Play",
 			setting="Settings",
@@ -173,7 +188,7 @@ return{
 			back=BK,
 		},
 		music={
-			bgm=function()return"BGM:"..SWC[setting.bgm]end,
+			bgm="BGM",
 			up="↑",
 			play="Play",
 			down="↓",
@@ -217,44 +232,59 @@ return{
 		},
 		pause={
 			resume="Resume",
+			restart="Restart",
 			quit="Quit",
 		},
-		setting={
+		setting_game={
-			ghost=function()return"Ghost:"..SWC[setting.ghost]end,
+			graphic="←Graphic",
-			center=function()return"Center:"..SWC[setting.center]end,
+			sound="Sound→",
-			grid=function()return"Grid:"..SWC[setting.grid]end,
-			swap=function()return setting.swap and"Swap:comboKey"or"Swap:loop"end,
-			fxs=function()return setting.fxs>0 and"FX level:"..setting.fxs or"NO FX"end,
-			bg=function()return"BG:"..SWC[setting.bg]end,
 			dasD="-",dasU="+",
 			arrD="-",arrU="+",
 			sddasD="-",sddasU="+",
 			sdarrD="-",sdarrU="+",
-			ctrl="Control settings",
+			quickR="Quick restart",
-			touch="Touch settings",
+			swap="Combo key to change ATK mode",
-			lang=function()return langName[setting.lang]end,
+			ctrl="Control Setting",
-			sfx=function()return"SFX:"..SWC[setting.sfx]end,
+			touch="Touch Setting",
-			bgm=function()return"BGM:"..SWC[setting.bgm]end,
+			back=BK,
-			voc=function()return"VOC:"..SWC[setting.voc]end,
+		},
-			vib=function()return "VIB:"..setting.vib end,
+		setting_graphic={
-			fullscreen=function()return"Fullscreen:"..SWC[setting.fullscreen]end,
+			sound="←Sound",
-			bgblock=function()return"BG animation:"..SWC[setting.bgblock]end,
+			game="Game→",
-			frame=function()return"FrameDraw:"..setting.frameMul.."%"end,
+			ghost="Ghost",
+			grid="Grid",
+			center="Center",
 			skin="Skin",
-			smo=function()return"SmoothDrop:"..SWC[setting.smo]end,
+			bg="Background",
-			back="Save&Back",
+			bgblock="BG animation",
-		},
+			smo="Smoooth drop",
-		setting2={
+			dropFX="Drop FX level",
+			shakeFX="Shake FX level",
+			atkFX="ATK FX level",
+			fullscreen="Fullscreen",
+			frame="drawFPS",
 			back=BK,
 		},
-		setting3={
+		setting_sound={
+			game="←Game",
+			graphic="Graphic→",
+			sfx="SFX",
+			bgm="BGM",
+			vib="VIB",
+			voc="VOC",
 			back=BK,
+		},
+		setting_control={
+			back=BK,
+		},
+		setting_touch={
 			hide=function()return setting.virtualkeySwitch and"Hide Virtual Key"or"Show Virtual Key"end,
 			default="Defaults",
 			snap=function()return text.snapLevelName[snapLevel]end,
 			alpha=function()return setting.virtualkeyAlpha.."0%"end,
 			icon="Icon",
 			size="Size",
+			back=BK,
 		},
 		help={
 			his="History",
@@ -262,8 +292,8 @@ return{
 			back=BK,
 		},
 		history={
-			prev="←",
+			prev="↑",
-			next="→",
+			next="↓",
 			back=BK,
 		},
 		stat={

list.lua

@@ -2,7 +2,7 @@ local gc=love.graphics
 local tc,kb=love.touch,love.keyboard
 local sys=love.system
 local fs=love.filesystem
-local mobile=mobile
+local mobile=system=="Android"or system=="iOS"
 
 actName={"moveLeft","moveRight","rotRight","rotLeft","rotFlip","hardDrop","softDrop","hold","func","restart","insLeft","insRight","insDown"}
 color={
@@ -79,16 +79,17 @@ bgm={
 	"secret8th",
 	"rockblock",
 	"8-bit happiness",
+	"shining terminal",
 	"end",
 }
-voiceList={
+voiceBank={}
+voiceName={
 	"Z","S","L","J","T","O","I",
 	"single","double","triple","tts",
 	"spin","spin_","mini","b2b","b3b","pc",
 	"win","lose","voc_nya","nya",
 }
-voiceBank={}
+voiceList={
-voice={
 	Z={"Z_1","Z_2"},
 	S={"S_1","S_2"},
 	J={"J_1","J_2"},
@@ -120,12 +121,13 @@ musicID={
 	"push",
 	"reason",
 	"infinite",
-	"cruelty",
-	"final",
 	"secret7th",
 	"secret8th",
+	"shining terminal",
 	"rockblock",
 	"8-bit happiness",
+	"cruelty",
+	"final",
 	"end",
 }
 customID={
@@ -139,7 +141,7 @@ customID={
 	"bg","bgm",
 }
 customRange={
-	drop={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99,-1},
+	drop={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
 	lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
 	wait={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
 	fall={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
@@ -149,7 +151,7 @@ customRange={
 	visible={"show","time","fast","none"},
 	target={10,20,40,100,200,500,1000,1e99},
 	freshLimit={0,8,15,1e99},
-	opponent={0,60,30,20,15,10,7,5,4,3,2,1},
+	opponent={0,1,2,3,4,5,11,12,13,14,15,16},
 	bg={"none","game1","game2","game3","strap","rgb","glow","matrix"},
 	bgm={"blank","way","race","newera","push","reason","infinite","secret7th","secret8th","rockblock"},
 }
@@ -160,27 +162,31 @@ up0to4={[0]="000%UP","025%UP","050%UP","075%UP","100%UP",}
 
 modeID={
 	[0]="custom",
-	"sprint","marathon","master","classic","zen","infinite","solo","tsd","blind","dig","survivor","tech",
+	"sprint","marathon","master","classic","zen","infinite","solo","round","tsd","blind",
+	"dig","survivor","defender","attacker","tech",
 	"c4wtrain","pctrain","pcchallenge","techmino49","techmino99","drought","hotseat",
 }
 modeLevel={
 	sprint={"10L","20L","40L","100L","400L","1000L"},
 	marathon={"EASY","NORMAL","HARD"},
-	master={"LUNATIC","ULTIMATE"},
+	master={"LUNATIC","ULTIMATE","FINAL"},
 	classic={"CTWC"},
 	zen={"NORMAL"},
 	infinite={"NORMAL","EXTRA"},
-	solo={"EASY","NORMAL","HARD","LUNATIC"},
+	solo={"EASY","EASY+","NORMAL","NORMAL+","HARD","HARD+","LUNATIC","LUNATIC+","ULTIMATE"},
+	round={"EASY","NORMAL","HARD","LUNATIC","ULTIMATE"},
 	tsd={"NORMAL","HARD"},
 	blind={"EASY","HARD","HARD+","LUNATIC","ULTIMATE","GM"},
 	dig={"NORMAL","LUNATIC"},
 	survivor={"EASY","NORMAL","HARD","LUNATIC","ULTIMATE","EXTRA"},
+	defender={"NORMAL","LUNATIC"},
+	attacker={"HARD","ULTIMATE"},
 	tech={"NORMAL","NORMAL+","HARD","HARD+","LUNATIC","LUNATIC+",},
 	c4wtrain={"NORMAL","LUNATIC"},
 	pctrain={"NORMAL","EXTRA"},
 	pcchallenge={"NORMAL","HARD","LUNATIC"},
-	techmino49={"EASY","NORMAL","HARD","LUNATIC","ULTIMATE"},
+	techmino49={"EASY","HARD","ULTIMATE"},
-	techmino99={"EASY","NORMAL","HARD","LUNATIC","ULTIMATE"},
+	techmino99={"EASY","HARD","ULTIMATE"},
 	drought={"NORMAL","MESS"},
 	hotseat={"2P","3P","4P",},
 	custom={"Normal","Puzzle"},
@@ -265,7 +271,7 @@ local customSet={
 	{18,20,1,1,7,1,1,1,8,3,8,3,3},
 	{22,22,1,1,7,3,1,1,8,4,1,7,7},
 	{20,20,1,1,7,1,1,3,8,3,1,7,8},
-	{23,11,8,11,4,1,2,1,8,3,1,4,9},
+	{1,11,8,11,4,1,2,1,8,3,1,4,9},
 }
 local function useDefaultSet(n)
 	for i=1,#customSet[n]do
@@ -274,194 +280,206 @@ local function useDefaultSet(n)
 	curBG=customRange.bg[customSel[12]]
 	BGM(customRange.bgm[customSel[13]])
 end
-Buttons={
+Widget={
-	load={},
+	load={},intro={},quit={},
-	intro={},
 	main={
-		qplay=	{x=160,y=300,w=150,	h=150,	rgb=color.lightRed,	f=40,code=function()loadGame(modeSel,levelSel)end,down="stat",right="play"},
+		play=	newButton(150,280,200,160,color.red,		70,function()gotoScene("mode")end,			nil,"setting"),
-		play=	{x=380,y=300,w=240,	h=240,	rgb=color.red,		f=70,code=function()gotoScene("mode")end,down="stat",left="qplay",right="setting"},
+		setting=newButton(370,280,200,160,color.lightBlue,	50,function()gotoScene("setting_game")end,	nil,"music"),
-		setting={x=640,y=300,w=240,	h=240,	rgb=color.lightBlue,f=55,code=function()gotoScene("setting")end,down="stat",left="play",right="music"},
+		music=	newButton(590,280,200,160,color.lightPurple,37,function()gotoScene("music")end,			nil,"help"),
-		music=	{x=900,y=300,w=240,	h=240,	rgb=color.lightCyan,f=42,code=function()gotoScene("music")end,down="help",left="setting",right="quit"},
+		help=	newButton(150,460,200,160,color.yellow,		55,function()gotoScene("help")end,			nil,"stat"),
-		stat=	{x=640,y=560,w=240,	h=240,	rgb=color.cyan,		f=55,code=function()gotoScene("stat")end,up="setting",left="play",right="help"},
+		stat=	newButton(370,460,200,160,color.cyan,		48,function()gotoScene("stat")end,			nil,"qplay"),
-		help=	{x=900,y=560,w=240,	h=240,	rgb=color.yellow,	f=55,code=function()gotoScene("help")end,up="music",left="stat",right="quit"},
+		qplay=	newButton(540,415,100,70,color.lightGreen,	28,function()loadGame(modeSel,levelSel)end,	nil,"lang"),
-		quit=	{x=1180,y=620,w=120,h=120,	rgb=color.lightGrey,f=50,code=function()gotoScene("quit")end,up="setting",left="help"},
+		lang=	newButton(590,505,200,70,color.lightRed,	50,function()
-	},
-	mode={
-		up=		{x=1000,y=210,w=200,h=140,	rgb=color.white,	f=80,	code=function()love.keypressed("up")end,	hide=function()return modeSel==1 end,},
-		down=	{x=1000,y=430,w=200,h=140,	rgb=color.white,	f=80,	code=function()love.keypressed("down")end,	hide=function()return modeSel==#modeID end,},
-		left=	{x=190,	y=160,w=100,h=80,	rgb=color.white,			code=function()love.keypressed("left")end,	hide=function()return levelSel==1 end,},
-		right=	{x=350,	y=160,w=100,h=80,	rgb=color.white,			code=function()love.keypressed("right")end,	hide=function()return levelSel==#modeLevel[modeID[modeSel]]end,},
-		start=	{x=1000,y=600,w=250,h=100,	rgb=color.green,	f=50,	code=function()loadGame(modeSel,levelSel)end},
-		custom=	{x=275,	y=420,w=200,h=90,	rgb=color.yellow,			code=function()gotoScene("custom")end},
-		back=	{x=640,	y=630,w=230,h=90,	rgb=color.white,	f=45,	code=back},
-	},
-	music={
-		bgm=	{x=1100,y=80,	w=160,	h=80,	rgb=color.white,code=function()BGM()setting.bgm=not setting.bgm end},
-		up=		{x=1100,y=200,	w=120,	h=120,	rgb=color.white,f=40,hide=function()return not setting.bgm end,code=function()sel=(sel-2)%#musicID+1 end},
-		play=	{x=1100,y=340,	w=120,	h=120,	rgb=color.white,f=40,hide=function()return not setting.bgm end,code=function()BGM(musicID[sel])end},
-		down=	{x=1100,y=480,	w=120,	h=120,	rgb=color.white,f=50,hide=function()return not setting.bgm end,code=function()sel=sel%#musicID+1 end},
-		back=	{x=640,	y=630,	w=230,	h=90,	rgb=color.white,f=45,code=back},
-	},
-	custom={
-		up=		{x=1000,y=220,	w=100,h=100,	rgb=color.white,f=50,	code=function()sel=(sel-2)%#customID+1 end},
-		down=	{x=1000,y=460,	w=100,h=100,	rgb=color.white,f=50,	code=function()sel=sel%#customID+1 end},
-		left=	{x=880,	y=340,	w=100,h=100,	rgb=color.white,f=50,	code=function()
-			customSel[sel]=(customSel[sel]-2)%#customRange[customID[sel]]+1
-			if sel==12 then
-				curBG=customRange.bg[customSel[12]]
-			elseif sel==13 then
-				BGM(customRange.bgm[customSel[13]])
-			end
-			end},
-		right=	{x=1120,y=340,	w=100,h=100,	rgb=color.white,f=50,	code=function()
-			customSel[sel]=customSel[sel]%#customRange[customID[sel]]+1
-			if sel==12 then
-				curBG=customRange.bg[customSel[12]]
-			elseif sel==13 then
-				BGM(customRange.bgm[customSel[13]])
-			end
-			end},
-		start1=	{x=880,	y=580,	w=220,h=70,	rgb=color.green,		code=function()loadGame(0,1)end},
-		start2=	{x=1120,y=580,	w=220,h=70,	rgb=color.lightPurple,	code=function()loadGame(0,2)end},
-		draw=	{x=1000,y=90,	w=190,h=85,	rgb=color.cyan,			code=function()gotoScene("draw")end},
-		set1=	{x=640,	y=160,	w=240,h=75,	rgb=color.lightRed,		code=function()useDefaultSet(1)end},
-		set2=	{x=640,	y=250,	w=240,h=75,	rgb=color.lightRed,		code=function()useDefaultSet(2)end},
-		set3=	{x=640,	y=340,	w=240,h=75,	rgb=color.lightRed,		code=function()useDefaultSet(3)end},
-		set4=	{x=640,	y=430,	w=240,h=75,	rgb=color.lightRed,		code=function()useDefaultSet(4)end},
-		set5=	{x=640,	y=520,	w=240,h=75,	rgb=color.lightRed,		code=function()useDefaultSet(5)end},
-		back=	{x=640,	y=630,	w=180,h=60,	rgb=color.white,		code=back},
-	},
-	draw={
-		any=	{x=700,	y=80,w=120,h=120,	f=45,	rgb=color.lightGrey,code=function()pen=-1 end},
-		block1=	{x=840,	y=80,w=120,h=120,	f=65,	rgb=color.red,		code=function()pen=1 end},
-		block2=	{x=980,	y=80,w=120,h=120,	f=65,	rgb=color.green,	code=function()pen=2 end},
-		block3=	{x=1120,y=80,w=120,h=120,	f=65,	rgb=color.orange,	code=function()pen=3 end},
-		block4=	{x=840,	y=220,w=120,h=120,	f=65,	rgb=color.blue,		code=function()pen=4 end},
-		block5=	{x=980,	y=220,w=120,h=120,	f=65,	rgb=color.magenta,	code=function()pen=5 end},
-		block6=	{x=1120,y=220,w=120,h=120,	f=65,	rgb=color.yellow,	code=function()pen=6 end},
-		block7=	{x=840,	y=360,w=120,h=120,	f=65,	rgb=color.cyan,		code=function()pen=7 end},
-		gb1=	{x=980,	y=360,w=120,h=120,	f=65,	rgb=color.darkGrey,	code=function()pen=9 end},
-		gb2=	{x=1120,y=360,w=120,h=120,	f=65,	rgb=color.grey,		code=function()pen=10 end},
-		gb3=	{x=840,	y=500,w=120,h=120,	f=65,	rgb=color.darkPurple,code=function()pen=11 end},
-		gb4=	{x=980,	y=500,w=120,h=120,	f=65,	rgb=color.darkRed,	code=function()pen=12 end},
-		gb5=	{x=1120,y=500,w=120,h=120,	f=65,	rgb=color.darkGreen,code=function()pen=13 end},
-		space=	{x=840,	y=640,w=120,h=120,	f=70,	rgb=color.grey,		code=function()pen=0 end},
-		clear=	{x=1120,y=640,w=120,h=120,	f=45,	rgb=color.white,	code=function()
-			if clearSureTime>15 then
-				for y=1,20 do for x=1,10 do preField[y][x]=-1 end end
-				clearSureTime=0
-			else
-				clearSureTime=50
-			end
-			end},
-		back=	{x=1235,y=45,w=80,h=80,		f=35,	rgb=color.white,	code=back},
-	},
-	play={
-		pause={x=1235,y=45,w=80,h=80,rgb=color.white,f=30,code=pauseGame},
-	},
-	pause={
-		resume=	{x=640,y=400,w=240,h=100,	rgb=color.white,f=50,code=resumeGame},
-		quit=	{x=640,y=550,w=240,h=100,	rgb=color.white,f=50,code=back},
-	},
-	setting={--Normal setting
-		ghost=	{x=290,	y=90,	w=210,	h=60,		rgb=color.white,code=function()setting.ghost=not setting.ghost end,down="grid",right="center"},
-		center=	{x=505,	y=90,	w=210,	h=60,		rgb=color.white,code=function()setting.center=not setting.center end,down="swap",left="ghost",right="sfx"},
-		grid=	{x=290,	y=160,	w=210,	h=60,		rgb=color.white,code=function()setting.grid=not setting.grid end,up="ghost",down="fxs",right="swap"},
-		swap=	{x=505,	y=160,	w=210,	h=60,f=28,	rgb=color.white,code=function()setting.swap=not setting.swap end,up="center",down="bg",left="grid",right="vib"},
-		fxs=	{x=290,	y=230,	w=210,	h=60,		rgb=color.white,code=function()setting.fxs=(setting.fxs+1)%4 end,up="grid",down="dasU",right="bg"},
-		bg=		{x=505,	y=230,	w=210,	h=60,		rgb=color.white,code=function()setting.bg=not setting.bg end,up="swap",down="arrD",left="fxs",right="fullscreen"},
-		dasD=	{x=210,	y=300,	w=50,	h=50,		rgb=color.white,code=function()setting.das=(setting.das-1)%31 end,up="fxs",down="sddasD",right="dasU"},
-		dasU=	{x=370,	y=300,	w=50,	h=50,		rgb=color.white,code=function()setting.das=(setting.das+1)%31 end,up="fxs",down="sddasU",left="dasD",right="arrD"},
-		arrD=	{x=425,	y=300,	w=50,	h=50,		rgb=color.white,code=function()setting.arr=(setting.arr-1)%16 end,up="bg",down="sdarrD",left="dasU",right="arrU"},
-		arrU=	{x=585,	y=300,	w=50,	h=50,		rgb=color.white,code=function()setting.arr=(setting.arr+1)%16 end,up="bg",down="sdarrU",left="arrD",right="bgblock"},--3~6
-		sddasD=	{x=210,	y=370,	w=50,	h=50,		rgb=color.white,code=function()setting.sddas=(setting.sddas-1)%11 end,up="dasD",down="ctrl",right="sddasU"},
-		sddasU=	{x=370,	y=370,	w=50,	h=50,		rgb=color.white,code=function()setting.sddas=(setting.sddas+1)%11 end,up="dasU",down="ctrl",left="sddasD",right="sdarrD"},
-		sdarrD=	{x=425,	y=370,	w=50,	h=50,		rgb=color.white,code=function()setting.sdarr=(setting.sdarr-1)%4 end,up="arrD",down="ctrl",left="sddasU",right="sdarrU"},
-		sdarrU=	{x=585,	y=370,	w=50,	h=50,		rgb=color.white,code=function()setting.sdarr=(setting.sdarr+1)%4 end,up="arrU",down="ctrl",left="sdarrD",right="frame"},
-
-		ctrl=	{x=340,y=440,	w=310,	h=60,rgb=color.green,	code=function()gotoScene("setting2")end,up="sddasU",down="touch",left="lang",right="skin"},
-		touch=	{x=340,y=510,	w=310,	h=60,rgb=color.yellow,code=function()gotoScene("setting3")end,up="ctrl",down="back",right="lang"},
-		lang=	{x=580,y=510,	w=150,	h=60,rgb=color.red,	code=function()
 			setting.lang=setting.lang%#langName+1
 			swapLanguage(setting.lang)
-			end,up="sdarrU",down="back",left="touch",right="skin"},
+			end,nil,"quit"),
-
+		quit=	newButton(370,620,280,100,color.lightGrey,	60,function()gotoScene("quit")end,			nil,"play"),
-		sfx=	{x=760,y=90,	w=160,	h=60,		rgb=color.white,code=function()setting.sfx=not setting.sfx end,down="vib",left="center",right="bgm"},
+	},
-		bgm=	{x=940,y=90,	w=160,	h=60,		rgb=color.white,code=function()BGM()setting.bgm=not setting.bgm BGM("blank")end,down="voc",left="sfx"},
+	mode={
-		vib=	{x=760,y=160,	w=160,	h=60,rgb=color.white,	code=function()setting.vib=(setting.vib+1)%6 VIB(1)end,up="sfx",down="fullscreen",left="swap",right="voc"},
+		up=		newButton(1000,210,200,140,color.white,	80,function()love.keypressed("up")end,function()return modeSel==1 end),
-		voc=	{x=940,y=160,	w=160,	h=60,rgb=color.white,code=function()setting.voc=not setting.voc end,up="sfx",down="fullscreen",left="vib"},
+		down=	newButton(1000,430,200,140,color.white,	80,function()love.keypressed("down")end,function()return modeSel==#modeID end),
-		fullscreen=	{x=850,y=230,w=340,	h=60,rgb=color.white,	code=function()
+		left=	newButton(190,	160,100,80,	color.white,40,function()love.keypressed("left")end,function()return levelSel==1 end),
+		right=	newButton(350,	160,100,80,	color.white,40,function()love.keypressed("right")end,function()return levelSel==#modeLevel[modeID[modeSel]]end),
+		start=	newButton(1000,600,250,100,color.green,	50,function()loadGame(modeSel,levelSel)end),
+		custom=	newButton(275,	420,200,90,	color.yellow,40,function()gotoScene("custom")end),
+		back=	newButton(640,	630,230,90,	color.white,45,back),
+	},
+	music={
+		bgm=	newSlider(760,80,400,8,40,nil,function()return setting.bgm end,function(i)setting.bgm=i;BGM(bgmPlaying)end),
+		up=		newButton(1100,200,120,120,color.white,60,function()love.keypressed("up")end),
+		play=	newButton(1100,340,120,120,color.white,40,function()love.keypressed("space")end,function()return setting.bgm==0 end),
+		down=	newButton(1100,480,120,120,color.white,60,function()love.keypressed("down")end),
+		back=	newButton(640,	630,230,90,	color.white,45,back),
+	},
+	custom={
+		up=		newButton(1000,220,100,100,color.white,			50,function()sel=(sel-2)%#customID+1 end),
+		down=	newButton(1000,460,100,100,color.white,			50,function()sel=sel%#customID+1 end),
+		left=	newButton(880,	340,100,100,color.white,		50,function()love.keypressed("left")end),
+		right=	newButton(1120,340,100,100,color.white,			50,function()love.keypressed("right")end),
+		start1=	newButton(880,	580,220,70,	color.green,		40,function()loadGame(0,1)end),
+		start2=	newButton(1120,580,220,70,	color.lightPurple,	40,function()loadGame(0,2)end),
+		draw=	newButton(1000,90,	190,85,	color.cyan,			40,function()gotoScene("draw")end),
+		set1=	newButton(640,	160,240,75,	color.lightRed,		40,function()useDefaultSet(1)end),
+		set2=	newButton(640,	250,240,75,	color.lightRed,		40,function()useDefaultSet(2)end),
+		set3=	newButton(640,	340,240,75,	color.lightRed,		40,function()useDefaultSet(3)end),
+		set4=	newButton(640,	430,240,75,	color.lightRed,		40,function()useDefaultSet(4)end),
+		set5=	newButton(640,	520,240,75,	color.lightRed,		40,function()useDefaultSet(5)end),
+		back=	newButton(640,	630,180,60,	color.white,		40,back),
+	},
+	draw={
+		any=	newButton(700,	80,	120,120,color.lightGrey,	45,function()pen=0 end),
+		block1=	newButton(840,	80,	120,120,color.red,			65,function()pen=1 end),
+		block2=	newButton(980,	80,	120,120,color.green,		65,function()pen=2 end),
+		block3=	newButton(1120,80,	120,120,color.orange,		65,function()pen=3 end),
+		block4=	newButton(840,	220,120,120,color.blue,			65,function()pen=4 end),
+		block5=	newButton(980,	220,120,120,color.magenta,		65,function()pen=5 end),
+		block6=	newButton(1120,220,120,120,color.yellow,		65,function()pen=6 end),
+		block7=	newButton(840,	360,120,120,color.cyan,			65,function()pen=7 end),
+		gb1=	newButton(980,	360,120,120,color.darkGrey,		65,function()pen=9 end),
+		gb2=	newButton(1120,360,120,120,color.grey,			65,function()pen=10 end),
+		gb3=	newButton(840,	500,120,120,color.darkPurple,	65,function()pen=11 end),
+		gb4=	newButton(980,	500,120,120,color.darkRed,		65,function()pen=12 end),
+		gb5=	newButton(1120,500,120,120,color.darkGreen,		65,function()pen=13 end),
+		space=	newButton(840,	640,120,120,color.grey,			70,function()pen=-1 end),
+		clear=	newButton(1120,640,120,120,color.white,			45,function()love.keypressed("delete")end),
+		back=	newButton(1235,45,	80,	80,	color.white,		35,back),
+	},
+	play={
+		pause=	newButton(1235,45,80,80,color.white,30,pauseGame),
+	},
+	pause={
+		resume=	newButton(640,290,240,100,color.white,50,resumeGame),
+		restart=newButton(640,445,240,100,color.white,50,function()
+			clearTask("play")
+			updateStat()
+			resetGameData()
+			gotoScene("play","none")
+			end),
+		quit=	newButton(640,600,240,100,color.white,50,back),
+	},
+	setting_game={
+		graphic=newButton(200,80,240,80,color.lightGreen,40,function()gotoScene("setting_graphic")end,	nil,"sound"),
+		sound=	newButton(1080,80,240,80,color.lightGreen,40,function()gotoScene("setting_sound")end,	nil,"dasD"),
+		dasD=	newButton(180,230,50,50,color.white,40,function()setting.das=(setting.das-1)%31 end,nil,"dasU"),
+		dasU=	newButton(400,230,50,50,color.white,40,function()setting.das=(setting.das+1)%31 end,nil,"arrD"),
+		arrD=	newButton(500,230,50,50,color.white,40,function()
+			setting.arr=(setting.arr-1)%16
+			if setting.arr>setting.das then
+				setting.das=setting.arr
+				Widget.setting_game.dasU:FX()
+				SFX("blip_1",.4)
+			end
+			end,nil,"arrU"),
+		arrU=	newButton(720,230,50,50,color.white,40,function()
+			setting.arr=(setting.arr+1)%16
+			if setting.arr>setting.das then
+				setting.das=setting.arr
+				Widget.setting_game.dasU:FX()
+				SFX("blip_1",.4)
+			end
+			end,nil,"sddasD"),
+		sddasD=	newButton(180,340,50,50,color.white,40,function()setting.sddas=(setting.sddas-1)%11 end,	nil,"sddasU"),
+		sddasU=	newButton(400,340,50,50,color.white,40,function()setting.sddas=(setting.sddas+1)%11 end,	nil,"sdarrD"),
+		sdarrD=	newButton(500,340,50,50,color.white,40,function()setting.sdarr=(setting.sdarr-1)%4 end,		nil,"sdarrU"),
+		sdarrU=	newButton(720,340,50,50,color.white,40,function()setting.sdarr=(setting.sdarr+1)%4 end,		nil,"quickR"),
+		quickR=	newSwitch(560,440,40,function()return setting.quickR end,function()setting.quickR=not setting.quickR end,	nil,"swap"),
+		swap=	newSwitch(560,530,25,function()return setting.swap end,function()setting.swap=not setting.swap end,			nil,"ctrl"),
+		ctrl=	newButton(1020,230,320,80,color.white,40,function()gotoScene("setting_control")end,			nil,"touch"),
+		touch=	newButton(1020,340,320,80,color.white,40,function()gotoScene("setting_touch")end,			nil,"back"),
+		back=	newButton(1160,600,160,160,color.white,55,back,nil,"graphic"),
+	},
+	setting_graphic={
+		sound=	newButton(200,80,240,80,color.lightGreen,40,function()gotoScene("setting_sound")end,	nil,"game"),
+		game=	newButton(1080,80,240,80,color.lightGreen,40,function()gotoScene("setting_game")end,	nil,"ghost"),
+		ghost=	newSwitch(310,180,40,function()return setting.ghost end,	function()setting.ghost=	not setting.ghost end,	nil,"center"),
+		center=	newSwitch(580,180,40,function()return setting.center end,	function()setting.center=	not setting.center end,	nil,"smo"),
+		smo=	newSwitch(310,260,25,function()return setting.smo end,		function()setting.smo=		not setting.smo end,	nil,"grid"),
+		grid=	newSwitch(580,260,40,function()return setting.grid end,		function()setting.grid=		not setting.grid end,	nil,"dropFX"),
+		dropFX=	newSlider(310,350,373,3,40,nil,function()return setting.dropFX end,		function(i)setting.dropFX=i end,		nil,"shakeFX"),
+		shakeFX=newSlider(310,430,373,3,40,nil,function()return setting.shakeFX end,	function(i)setting.shakeFX=i end,		nil,"atkFX"),
+		atkFX=	newSlider(310,510,373,3,40,nil,function()return setting.atkFX end,		function(i)setting.atkFX=i end,			nil,"frame"),
+		frame=	newSlider(310,590,373,10,40,nil,function()return setting.frameMul>35 and setting.frameMul/10 or setting.frameMul/5-4 end,function(i)setting.frameMul=i<5 and 5*i+20 or 10*i end,nil,"fullscreen"),
+		fullscreen=newSwitch(990,180,40,function()return setting.fullscreen end,function()
 			setting.fullscreen=not setting.fullscreen
 			love.window.setFullscreen(setting.fullscreen)
 			if not setting.fullscreen then
-				love.resize(gc.getWidth(),gc.getHeight())
+			love.resize(gc.getWidth(),gc.getHeight())
 			end
-			end,up="vib",down="bgblock",left="bg"},
+			end,nil,"bg"),
-		bgblock={x=850,y=300,	w=340,	h=60,rgb=color.white,	code=function()
+		bg=		newSwitch(990,250,40,function()return setting.bg end,function()setting.bg=not setting.bg end,	nil,"bgblock"),
-			setting.bgblock=not setting.bgblock
+		bgblock=newSwitch(990,330,40,function()return setting.bgblock end,function()
-			--if not setting.bgblock then for i=1,16 do BGblockList[i].v=3*BGblockList[i].v end end
+			setting.bgblock=not setting.bgblock--if not setting.bgblock then for i=1,16 do FX_BGblock.list[i].v=3*FX_BGblock.list[i].v end end
-			end,up="fullscreen",down="frame",left="arrU"},
+			end,nil,"skin"),
-		frame=	{x=850,y=370,	w=340,	h=60,rgb=color.white,	code=function()
+		skin=	newButton(860,470,120,60,color.white,40,function()
-			setting.frameMul=setting.frameMul+(setting.frameMul<50 and 5 or 10)
-			if setting.frameMul>100 then setting.frameMul=25 end
-			end,up="bgblock",down="skin",left="sdarrU"},
-		skin=	{x=740,y=440,	w=120,	h=60,rgb=color.white,	code=function()
 			setting.skin=setting.skin%6+1
 			changeBlockSkin(setting.skin)
-			end,up="frame",down="back",left="ctrl",right="smo"},
+			end,nil,"back"),
-		smo=	{x=920,y=440,	w=200,	h=60,f=27,rgb=color.white,	code=function()
+		back=	newButton(1160,600,160,160,color.white,55,back,nil,"sound"),
-			setting.smo=not setting.smo
+		},
-			end,up="frame",down="back",left="skin"},
+	setting_sound={
-		back=	{x=640,y=620,	w=300,h=70,rgb=color.white,	code=back,up="lang"},
+		game=	newButton(200,80,240,80,color.lightGreen,40,function()gotoScene("setting_game")end,	nil,"graphic"),
+		graphic=newButton(1080,80,240,80,color.lightGreen,40,function()gotoScene("setting_graphic")end,	nil,"sfx"),
+		sfx=newSlider(180,250,400,8,40,function()SFX("blip_1")end,				function()return setting.sfx end,function(i)setting.sfx=i end,nil,"bgm"),
+		bgm=newSlider(750,250,400,8,40,function()BGM(bgmPlaying or"blank")end,	function()return setting.bgm end,function(i)setting.bgm=i end,nil,"vib"),
+		vib=newSlider(180,440,400,5,40,function()VIB(1)end,						function()return setting.vib end,function(i)setting.vib=i end,nil,"voc"),
+		voc=newSlider(750,440,400,8,40,function()VOICE("nya")end,				function()return setting.voc end,function(i)setting.voc=i end,nil,"back"),
+		back=newButton(1160,600,160,160,color.white,55,back,nil,"game"),
 	},
-	setting2={--Control setting
+	setting_control={
-		back={x=840,y=630,w=180,h=60,rgb=color.white,code=back},
+		back=newButton(840,630,180,60,color.white,40,back),
 	},
-	setting3={--Touch setting
+	setting_touch={
-		back={x=640,y=410,w=170,h=80,f=45,code=back},
+		hide=	newButton(640,210,500,80,color.white,45,function()
-		hide={x=640,y=210,w=500,h=80,f=45,code=function()
 			setting.virtualkeySwitch=not setting.virtualkeySwitch
-			end},
+			end),
-		default={x=450,y=310,w=170,h=80,code=function()
+		default=newButton(450,310,170,80,color.white,40,function()
 			for K=1,#virtualkey do
 				local b,b0=virtualkey[K],virtualkeySet[defaultSel][K]
 				b[1],b[2],b[3],b[4]=b0[1],b0[2],b0[3],b0[4]
 			end--Default virtualkey
 			defaultSel=defaultSel%5+1
-			end},
+			end),
-		snap={x=640,y=310,w=170,h=80,code=function()
+		snap=	newButton(640,310,170,80,color.white,40,function()
 			snapLevel=snapLevel%6+1
-			end},
+			end),
-		alpha={x=830,y=310,w=170,h=80,f=45,code=function()
+		alpha=	newButton(830,310,170,80,color.white,45,function()
 			setting.virtualkeyAlpha=(setting.virtualkeyAlpha+1)%11
 			--Adjust virtualkey alpha
-			end},
+			end),
-		icon={x=450,y=410,w=170,h=80,f=45,code=function()
+		icon=	newButton(450,410,170,80,color.white,45,function()
 			setting.virtualkeyIcon=not setting.virtualkeyIcon
 			--Switch virtualkey icon
-			end},
+			end),
-		size={x=830,y=410,w=170,h=80,f=45,code=function()
+		size=	newButton(830,410,170,80,color.white,45,function()
 			if sel then
 				local b=virtualkey[sel]
 				b[4]=b[4]+10
 				if b[4]==150 then b[4]=40 end
 				b[3]=b[4]^2
 			end
-			end},
+			end),
+		back=	newButton(640,410,170,80,color.white,45,back),
 	},
 	help={
-		his={x=1050,y=520,w=230,h=60,rgb=color.white,code=function()gotoScene("history")end,down="qq",left="back"},
+		his=	newButton(1050,520,230,60,color.white,40,function()gotoScene("history")end,nil,"back"),
-		qq={x=1050,y=600,w=230,h=60,hide=function()return mobile end,rgb=color.white,code=function()sys.openURL("tencent://message/?uin=1046101471&Site=&Menu=yes")end,up="his",left="back"},
+		qq=		newButton(1050,600,230,60,color.white,40,function()sys.openURL("tencent://message/?uin=1046101471&Site=&Menu=yes")end,	function()return mobile end,"his"),
-		back={x=640,y=600,w=180,h=60,rgb=color.white,code=back,up="his",right="qq"},
+		back=	newButton(640,	600,180,60,color.white,40,back,nil,"qq"),
 	},
 	history={
-		prev=	{x=75,	y=320,w=100,	h=300,	rgb=color.white,hide=function()return sel==1 end,code=function()sel=sel-1 end},
+		prev=	newButton(1155,170,180,180,color.white,70,function()love.keypressed("up")end,function()return sel==1 end),
-		next=	{x=1205,y=320,w=100,	h=300,	rgb=color.white,hide=function()return sel==#updateLog end,code=function()sel=sel+1 end},
+		next=	newButton(1155,400,180,180,color.white,70,function()love.keypressed("down")end,function()return sel==#updateLog-22 end),
-		back=	{x=640,	y=640,w=200,h=70,	rgb=color.white,code=back},
+		back=	newButton(1155,600,180,90,color.white,40,back),
 	},
 	stat={
-		path={x=980,y=590,w=250,h=60,f=30,rgb=color.white,hide=function()return mobile end,code=function()sys.openURL(fs.getSaveDirectory())end,left="back"},
+		path=	newButton(980,590,250,60,color.white,30,function()sys.openURL(fs.getSaveDirectory())end,function()return mobile end,"back"),
-		back={x=640,y=590,w=180,h=60,rgb=color.white,code=back,right="path"},
+		back=	newButton(640,590,180,60,color.white,40,back,nil,"path"),
 	},
-	sel=nil,--selected button id(integer)
 }
+for S,L in next,Widget do
+	for N,W in next,L do
+		if W.next then
+			W.next,L[W.next].prev=L[W.next],W
+		end
+	end
+end
+widget_sel=nil--selected widget object

paint.lua

@@ -7,30 +7,18 @@ local format=string.format
 
 local Timer=love.timer.getTime
 local scr=scr
-local attackColor={
-	{color.darkGrey,color.white},
-	{color.grey,color.white},
-	{color.lightPurple,color.white},
-	{color.lightRed,color.white},
-	{color.darkGreen,color.cyan},
-}
-local frameColor={
-	[0]=color.white,
-	color.lightGreen,
-	color.lightBlue,
-	color.lightPurple,
-	color.lightOrange,
-}
 local modeLevelColor={
 	EASY=color.cyan,
 	NORMAL=color.green,
 	HARD=color.magenta,
 	LUNATIC=color.red,
+	EXTRA=color.lightMagenta,
+	ULTIMATE=color.lightYellow,
+	FINAL=color.lightGrey,
+	["EASY+"]=color.darkCyan,
 	["NORMAL+"]=color.darkGreen,
 	["HARD+"]=color.darkMagenta,
 	["LUNATIC+"]=color.darkRed,
-	EXTRA=color.lightMagenta,
-	ULTIMATE=color.lightYellow,
 
 	MESS=color.lightGrey,
 	GM=color.blue,
@@ -104,12 +92,12 @@ local function stencil_miniTitle()
 	end
 end
 
-FX={
+FX_BGblock={tm=150,next=7,ct=0,list={{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},{v=0},}}--Falling tetrominos on background
-	flash=0,--Black screen(frame)
+FX_attack={}--Attack beam
-	shake=0,--Screen shake(frame)
+FX_badge={}--Badge thrown
-	attack={},--Attack beam
+sysFX={}
-	badge={},--badge thrown
+FX_ripple={}--Ripple&SqrShade
-	
+textFX={
 	appear=function(t,a)
 		setFont(t.font)
 		gc.setColor(1,1,1,a)
@@ -178,16 +166,6 @@ FX={
 	end,
 }
 
-local function drawDial(x,y,speed)
-	gc.setColor(1,1,1)
-	mStr(int(speed),x,y-18)
-	gc.draw(dialCircle,x,y,nil,nil,nil,32,32)
-	gc.setColor(1,1,1,.6)
-	gc.draw(dialNeedle,x,y,2.094+(speed<=175 and .02094*speed or 4.712-52.36/(speed-125)),nil,nil,5,4)
-end
-local function drawPixel(y,x,id)
-	gc.draw(blockSkin[id],30*x-30,600-30*y)
-end
 local function drawAtkPointer(x,y)
 	local t=sin(Timer()*20)
 	gc.setColor(.2,.7+t*.2,1,.6+t*.4)
@@ -228,46 +206,45 @@ end
 
 local scs={{1,2},nil,nil,nil,nil,{1.5,1.5},{0.5,2.5}}for i=2,5 do scs[i]=scs[1]end
 local matrixT={}for i=0,15 do matrixT[i]={}for j=0,8 do matrixT[i][j]=mt.noise(i,j)+2 end end
-local Pnt={}
+local Pnt={BG={}}
-Pnt.BG={
+function Pnt.BG.none()
-none=function()
 	gc.clear(.15,.15,.15)
-end,
+end
-grey=function()
+function Pnt.BG.grey()
 	gc.clear(.3,.3,.3)
-end,
+end
-lightGrey=function()
+function Pnt.BG.lightGrey()
 	gc.clear(.5,.5,.5)
-end,
+end
-glow=function()
+function Pnt.BG.glow()
 	local t=((sin(Timer()*.5)+sin(Timer()*.7)+sin(Timer()*.9+1)+sin(Timer()*1.5)+sin(Timer()*2+3))+5)*.05
 	gc.clear(t,t,t)
-end,
+end
-game1=function()
+function Pnt.BG.game1()
 	gc.setColor(1,1,1)
 	gc.draw(background1,640,360,Timer()*.15,12,nil,64,64)
-end,
+end--Rainbow
-game2=function()
+function Pnt.BG.game2()
 	gc.setColor(1,.5,.5)
 	gc.draw(background1,640,360,Timer()*.2,12,nil,64,64)
-end,
+end--Red rainbow
-game3=function()
+function Pnt.BG.game3()
 	gc.setColor(.6,.6,1)
 	gc.draw(background1,640,360,Timer()*.25,12,nil,64,64)
-end,
+end--Blue rainbow
-game4=function()
+function Pnt.BG.game4()
 	gc.setColor(.1,.5,.5)
 	local x=Timer()%4*320
 	gc.draw(background2,x,0,nil,10)
 	gc.draw(background2,x-1280,0,nil,10)
-end,
+end--Fast strap
-game5=function()
+function Pnt.BG.game5()
 	local t=2.5-Timer()%20%6%2.5
 	if t<.5 then gc.clear(t,t,t)
 	else gc.clear(0,0,0)
 	end
-end,
+end--Lightning
-game6=function()
+function Pnt.BG.game6()
 	local t=1.2-Timer()%10%3%1.2
 	if t<.5 then gc.clear(t,t,t)
 	else gc.clear(0,0,0)
@@ -275,21 +252,21 @@ game6=function()
 	gc.setColor(.3,.3,.3)
 	local r=7-int(Timer()*.5)%7
 	gc.draw(mouseBlock[r],640,360,Timer()%3.1416*6,400,400,scs[r][2]-.5,#blocks[r][0]-scs[r][1]+.5)
-end,
+end--Fast lightning&spining tetromino
-rgb=function()
+function Pnt.BG.rgb()
 	gc.clear(
 		sin(Timer()*1.2)*.15+.5,
 		sin(Timer()*1.5)*.15+.5,
 		sin(Timer()*1.9)*.15+.5
 	)
-end,
+end
-strap=function()
+function Pnt.BG.strap()
 	gc.setColor(1,1,1)
 	local x=Timer()%32*40
 	gc.draw(background2,x,0,nil,10)
 	gc.draw(background2,x-1280,0,nil,10)
-end,
+end
-matrix=function()
+function Pnt.BG.matrix()
 	gc.clear(.15,.15,.15)
 	for i=0,15 do
 		for j=0,8 do
@@ -298,8 +275,7 @@ matrix=function()
 			gc.rectangle("fill",80*i,80*j,80,80)
 		end
 	end
-end,
+end
-}
 
 function Pnt.load()
 	gc.setLineWidth(4)
@@ -330,17 +306,19 @@ function Pnt.intro()
 end
 function Pnt.main()
 	gc.setColor(1,1,1)
-	gc.draw(titleImage,280,30,nil,1.3)
+	gc.draw(coloredTitleImage,60,30,nil,1.3)
-	setFont(30)
+	gc.draw(drawableText.warning,595-drawableText.warning:getWidth(),128)
-	gc.print(gameVersion,290,125)
-	gc.print(system,845,95)
 	setFont(35)
-	mStr(modeLevel[modeID[modeSel]][levelSel],160,180)
+	gc.print(gameVersion,70,125)
-	mStr(text.modeName[modeSel],160,380)
+	gc.print(system,610,100)
+	gc.print(modeLevel[modeID[modeSel]][levelSel],600,373)
+	setFont(30)
+	gc.print(text.modeName[modeSel],600,414)
+	players[1]:demoDraw()
 end
 function Pnt.mode()
 	gc.setColor(1,1,1)
-	gc.draw(titleImage,810,30)
+	gc.draw(titleImage,830,30)
 	setFont(40)
 	gc.setColor(modeLevelColor[modeLevel[modeID[modeSel]][levelSel]]or color.white)
 	mStr(modeLevel[modeID[modeSel]][levelSel],270,215)
@@ -361,34 +339,42 @@ function Pnt.mode()
 end
 function Pnt.music()
 	gc.setColor(1,1,1,.3+sin(Timer()*5)*.2)
-	gc.rectangle("fill",45,98+30*sel,237,30)
+	gc.rectangle("fill",45,98+30*sel,250,30)
 	gc.setColor(.8,.8,.8)
 	gc.draw(drawableText.musicRoom,20,20)
 	gc.setColor(1,1,1)
 	gc.draw(drawableText.musicRoom,22,23)
-	gc.draw(drawableText.nowPlaying,520,83)
+	gc.draw(drawableText.nowPlaying,490,390)
 	setFont(35)
 	for i=1,#musicID do
 		gc.print(musicID[i],50,90+30*i)
 	end
-	setFont(50)
+	gc.draw(titleImage,640,310,nil,1.5,nil,206,35)
-	gc.setColor(sin(Timer()*.5)*.2+.8,sin(Timer()*.7)*.2+.8,sin(Timer())*.2+.8)
+	if bgmPlaying then
-	gc.print(bgmPlaying or"",600,140)
+		setFont(50)
+		gc.setColor(sin(Timer()*.5)*.2+.8,sin(Timer()*.7)*.2+.8,sin(Timer())*.2+.8)
+		mStr(bgmPlaying or"",630,460)
+		local t=-Timer()%2.3/2
+		if t<1 then
+			gc.setColor(1,1,1,t)
+			gc.draw(coloredTitleImage,640,310,nil,1.5+.1-.1*t,1.5+.3-.3*t,206,35)
+		end
+	end
 end
 function Pnt.custom()
 	gc.setColor(1,1,1,.3+sin(Timer()*8)*.2)
-	gc.rectangle("fill",25,95+40*sel,465,40)
+	gc.rectangle("fill",25,95+40*sel,480,40)
 	gc.setColor(.8,.8,.8)gc.draw(drawableText.custom,20,20)
 	gc.setColor(1,1,1)gc.draw(drawableText.custom,22,23)
 	setFont(40)
 	for i=1,#customID do
 		local k=customID[i]
 		local y=90+40*i
-		gc.printf(text.customOption[k],30,y,320,"right")
+		gc.printf(text.customOption[k],15,y,320,"right")
 		if text.customVal[k]then
-			gc.print(text.customVal[k][customSel[i]],350,y)
+			gc.print(text.customVal[k][customSel[i]],335,y)
 		else
-			gc.print(customRange[k][customSel[i]],350,y)
+			gc.print(customRange[k][customSel[i]],335,y)
 		end
 	end
 end
@@ -405,8 +391,8 @@ function Pnt.draw()
 	for y=1,20 do for x=1,10 do
 		local B=preField[y][x]
 		if B>0 then
-			drawPixel(y,x,B)
+			gc.draw(blockSkin[B],30*x-30,600-30*y)
-		elseif B==0 then
+		elseif B==-1 then
 			gc.line(30*x-25,605-30*y,30*x-5,625-30*y)
 			gc.line(30*x-25,625-30*y,30*x-5,605-30*y)
 		end
@@ -424,7 +410,7 @@ function Pnt.draw()
 		gc.setLineWidth(13)
 		gc.setColor(blockColor[pen])
 		gc.rectangle("line",945,605,70,70)
-	elseif pen==0 then
+	elseif pen==-1 then
 		gc.setLineWidth(5)
 		gc.setColor(.9,.9,.9)
 		gc.line(960,620,1000,660)
@@ -433,282 +419,35 @@ function Pnt.draw()
 end
 function Pnt.play()
 	for p=1,#players do
-		P=players[p]
+		players[p]:draw()
-		if P.small then
+	end
-			P.frameWait=P.frameWait-1
-			if P.frameWait==0 then
-				P.frameWait=8
-				gc.setCanvas(P.canvas)
-				gc.clear(0,0,0,.4)
-				gc.push("transform")
-				gc.origin()
-				gc.setColor(1,1,1,P.result and max(20-P.endCounter,0)*.05 or 1)
-				local h=#P.clearing
-				local F=P.field
-				for j=1,#F do
-					if j==P.clearing[h]and P.falling>-1 then
-						h=h-1
-					else
-						for i=1,10 do if F[j][i]>0 then
-							gc.draw(blockSkinmini[F[j][i]],6*i-6,120-6*j)
-						end end
-					end
-				end--Field
-				if P.alive then
-					gc.setLineWidth(2)
-					gc.setColor(frameColor[P.strength])gc.rectangle("line",1,1,58,118)
-				end--Draw boarder
-				if modeEnv.royaleMode then
-					gc.setColor(1,1,1)
-					for i=1,P.strength do
-						gc.draw(badgeIcon,12*i-7,4,nil,.5)
-					end
-				end
-				if P.result then
-					gc.setColor(1,1,1,min(P.endCounter,60)*.01)
-					setFont(22)mStr(P.result,32,47)
-					setFont(20)mStr(P.rank,30,82)
-				end
-				gc.pop()
-				gc.setCanvas()
-			end
-			gc.setColor(1,1,1)
-			gc.draw(P.canvas,P.x,P.y,nil,P.size*10)
-			if P.killMark then
-				gc.setLineWidth(3)
-				gc.setColor(1,0,0,min(P.endCounter,25)*.04)
-				gc.circle("line",P.centerX,P.centerY,(840-20*min(P.endCounter,30))*P.size)
-			end
-		else
-			gc.push("transform")
-			gc.translate(P.x,P.y)gc.scale(P.size)--Position
-			gc.setColor(0,0,0,.6)gc.rectangle("fill",0,0,600,690)--Background
-			gc.setLineWidth(7)
-			gc.setColor(frameColor[P.strength])gc.rectangle("line",0,0,600,690,3)--Big frame
-			gc.translate(150+P.fieldOffX,70+P.fieldOffY)
-			if P.gameEnv.grid then
-				gc.setLineWidth(1)
-				gc.setColor(1,1,1,.2)
-				for x=1,9 do gc.line(30*x,-10,30*x,600)end
-				for y=0,19 do
-					y=30*(y-int(P.fieldBeneath/30))+P.fieldBeneath
-					gc.line(0,y,300,y)
-				end
-			end--Grid lines
-			gc.translate(0,P.fieldBeneath)
-			gc.setScissor(scr.x+P.absFieldX*scr.k,scr.y+P.absFieldY*scr.k,300*P.size*scr.k,610*P.size*scr.k)
-			-- local dy=setting.smo and(P.y_img~=P.curY and min(P.dropDelay,8e98)/P.gameEnv.drop or min(P.lockDelay,8e98)/P.gameEnv.lock)^4*30 or 0
-				local dy,stepY=0,setting.smo and (1-(P.falling/P.gameEnv.fall)^3)*30 or 0
-				local h=#P.clearing
-				for j=int(P.fieldBeneath/30+1),#P.field do
-					if j==P.clearing[h]and P.falling>-1 then
-						h=h-1
-						dy=dy+stepY
-						gc.translate(0,stepY)
-						gc.setColor(1,1,1,P.falling/P.gameEnv.fall)
-						gc.rectangle("fill",0,600-30*j,320,30-stepY)
-					else
-						for i=1,10 do
-							if P.field[j][i]>0 then
-								gc.setColor(1,1,1,min(P.visTime[j][i]*.05,1))
-								drawPixel(j,i,P.field[j][i])
-							end
-						end
-					end
-				end--Field
-				gc.translate(0,-dy)
-				for i=1,#P.shade do
-					local S=P.shade[i]
-					gc.setColor(1,1,1,S[1]*.12)
-					for x=S[3],S[5]do
-						for y=S[6],S[4]do
-							drawPixel(y,x,S[2])
-						end
-					end
-				end--shade FX
-				if P.waiting==-1 then
-					if P.gameEnv.ghost then
-						gc.setColor(1,1,1,.3)
-						for i=1,P.r do for j=1,P.c do
-							if P.cur.bk[i][j]then
-								drawPixel(i+P.y_img-1,j+P.curX-1,P.cur.color)
-							end
-						end end
-					end--Ghost
-					local dy=setting.smo and(P.y_img~=P.curY and min(P.dropDelay,8e98)/P.gameEnv.drop or min(P.lockDelay,8e98)/P.gameEnv.lock)^4*30 or 0
-					gc.translate(0,-dy)
-					if P.gameEnv.block then
-						gc.setColor(1,1,1,P.lockDelay/P.gameEnv.lock)
-						for i=1,P.r do for j=1,P.c do
-							if P.cur.bk[i][j]then
-								gc.rectangle("fill",30*(j+P.curX-1)-33,597-30*(i+P.curY-1),36,36)
-							end
-						end end--BlockShade(lockdelay indicator)
-						gc.setColor(1,1,1)
-						for i=1,P.r do for j=1,P.c do
-							if P.cur.bk[i][j]then
-								drawPixel(i+P.curY-1,j+P.curX-1,P.cur.color)
-							end
-						end end--Block
-					end
-					if P.gameEnv.center then
-						gc.setColor(1,1,1)
-						local x=30*(P.curX+P.sc[2]-1)-30+15
-						gc.draw(spinCenter,x,600-30*(P.curY+P.sc[1]-1)+15,nil,nil,nil,4,4)
-						gc.translate(0,dy)
-						gc.setColor(1,1,1,.5)
-						gc.draw(spinCenter,x,600-30*(P.y_img+P.sc[1]-1)+15,nil,nil,nil,4,4)
-						goto E
-					end--Rotate center
-					gc.translate(0,dy)
-				end
-			::E::
-			gc.setScissor()--In-playField things
-			gc.setColor(1,1,1)
-			gc.draw(PTC.dust[p])
-			gc.translate(0,-P.fieldBeneath)
-			gc.setBlendMode("replace","alphamultiply")--SPEED UPUP(?)
-				gc.setLineWidth(2)
-				gc.rectangle("line",-1,-11,302,612)--Draw boarder
-				gc.rectangle("line",301,0,15,601)--Draw atkBuffer boarder
-				local h=0
-				for i=1,#P.atkBuffer do
-					local A=P.atkBuffer[i]
-					local bar=A.amount*30
-					if h+bar>600 then bar=600-h end
-					if not A.sent then
-						if A.time<20 then
-							bar=bar*(20*A.time)^.5*.05
-							--Appear
-						end
-						if A.countdown>0 then
-							gc.setColor(attackColor[A.lv][1])
-							gc.rectangle("fill",303,599-h,11,-bar+3)
-							gc.setColor(attackColor[A.lv][2])
-							gc.rectangle("fill",303,599-h+(-bar+3),11,-(-bar+3)*(1-A.countdown/A.cd0))
-							--Timing
-						else
-							local t=sin((Timer()-i)*30)*.5+.5
-							local c1,c2=attackColor[A.lv][1],attackColor[A.lv][2]
-							gc.setColor(c1[1]*t+c2[1]*(1-t),c1[2]*t+c2[2]*(1-t),c1[3]*t+c2[3]*(1-t))
-							gc.rectangle("fill",303,599-h,11,-bar+3)
-							--Warning
-						end
-					else
-						gc.setColor(attackColor[A.lv][1])
-						bar=bar*(20-A.time)*.05
-						gc.rectangle("fill",303,599-h,11,-bar+2)
-						--Disappear
-					end
-					h=h+bar
-				end--Buffer line
-				local a,b=P.b2b,P.b2b1 if a>b then a,b=b,a end
-				gc.setColor(.8,1,.2)
-				gc.rectangle("fill",-14,599,11,-b*.5)
-				gc.setColor(P.b2b<40 and color.white or P.b2b<=1e3 and color.lightRed or color.lightBlue)
-				gc.rectangle("fill",-14,599,11,-a*.5)
-				if Timer()%1<.5 then
-					gc.rectangle("fill",-15,b<40 and 578.5 or 98.5,13,3)
-				end
-				gc.setColor(1,1,1)
-				gc.rectangle("line",-16,-3,15,604)--Draw b2b bar boarder
-				--B2B indictator
-				gc.translate(-P.fieldOffX,-P.fieldOffY)
-			gc.setBlendMode("alpha")
-
-			if P.gameEnv.hold then
-				mDraw(drawableText.hold,-82,-10)
-				if P.holded then gc.setColor(.6,.6,.6)end
-				for i=1,#P.hold.bk do
-					local B=P.hold.bk
-					for j=1,#B[1]do
-						if B[i][j]then
-							drawPixel(i+17.5-#B*.5,j-2.7-#B[1]*.5,P.hold.color)
-						end
-					end
-				end
-			end--Hold
-			gc.setColor(1,1,1)
-			mDraw(drawableText.next,381,-10)
-			local N=1
-			::L::
-			if N<=P.gameEnv.next and P.next[N]then
-				local b,c=P.next[N].bk,P.next[N].color
-				for i=1,#b do for j=1,#b[1] do
-					if b[i][j]then
-						drawPixel(i+20-2.4*N-#b*.5,j+12.7-#b[1]*.5,c)
-					end
-				end end
-				N=N+1
-				goto L
-			end
-			--Next
-			gc.setColor(.8,.8,.8)
-			gc.draw(drawableText.modeName,-135,-65)
-			gc.draw(drawableText.levelName,437-drawableText.levelName:getWidth(),-65)
-			gc.setColor(1,1,1)
-			if frame<180 then
-				local count=179-frame
-				gc.push("transform")
-					gc.translate(155,220)
-					setFont(100)
-					if count%60>45 then gc.scale(1+(count%60-45)^2*.01,1)end
-					mStr(int(count/60+1),0,0)
-				gc.pop()
-			end--Draw starting counter
-			for i=1,#P.bonus do
-				P.bonus[i]:draw(min((30-abs(P.bonus[i].t-30))*.05,1)*(not P.bonus[i].inf and #P.field>(9-P.bonus[i].dy*.0333)and .7 or 1))
-			end--Effects
-			setFont(30)
-			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(30)
-			drawDial(360,520,P.dropSpeed)
-			drawDial(405,575,P.keySpeed)
-			--Speed dials
-			gc.setColor(1,1,1)
-			if mesDisp[curMode.id]then mesDisp[curMode.id]()end--Other messages
-			if modeEnv.royaleMode then
-				if P.atkMode then
-					gc.setColor(1,.8,0,P.swappingAtkMode*.02)
-					gc.rectangle("fill",RCPB[2*P.atkMode-1],RCPB[2*P.atkMode],90,35,8,4)
-				end
-				gc.setColor(1,1,1,P.swappingAtkMode*.025)
-				gc.draw(royaleCtrlPad)
-			end
-			gc.pop()
-		end
-	end--Draw players
 	gc.setLineWidth(5)
-	for i=1,#FX.attack do
+	for i=1,#FX_attack do
-		local A=FX.attack[i]
+		local A=FX_attack[i]
 		gc.push("transform")
-			local a=A.a
+			local a=A.t<10 and A.a*A.t*.05 or A.t>50 and A.a*(6-A.t*.1)or A.a
-			if A.t<20 then
-				gc.translate(A.x1,A.y1)
-				a=a*A.t*.05
-			elseif A.t<80 then
-				local t=((A.t-20)*.016667)t=(3-2*t)*t*t
-				gc.translate(A.x1*(1-t)+A.x2*t,A.y1*(1-t)+A.y2*t)
-			else
-				gc.translate(A.x2,A.y2)
-				a=a*(5-A.t*.05)
-			end
-			gc.rotate(A.t*.1)
 			gc.setColor(A.r,A.g,A.b,a*.5)
 			gc.circle("line",0,0,A.rad,A.corner)
+			local L=A.drag
+			for i=1,#L,2 do
+				gc.setColor(A.r,A.g,A.b,a*i*.05)
+				gc.translate(L[i],L[i+1])
+				gc.rotate(A.t*.1)
+				gc.circle("fill",0,0,A.rad,A.corner)
+				gc.rotate(-A.t*.1)
+				gc.translate(-L[i],-L[i+1])
+			end
 			gc.setColor(A.r,A.g,A.b,a)
+			gc.translate(A.x,A.y)
+			gc.rotate(A.t*.1)
 			gc.circle("fill",0,0,A.rad,A.corner)
 		gc.pop()
-	end
+	end--FX animation
 	gc.setColor(1,1,1)
 	if setting.virtualkeySwitch then drawVirtualkey()end
 	if modeEnv.royaleMode then
-		for i=1,#FX.badge do
+		for i=1,#FX_badge do
-			local b=FX.badge[i]
+			local b=FX_badge[i]
 			gc.setColor(1,1,1,b.t<10 and b.t*.1 or b.t<50 and 1 or(60-b.t)*.1)
 			if b.t<10 then
 				gc.draw(badgeIcon,b[1]-14,b[2]-14)
@@ -719,26 +458,24 @@ function Pnt.play()
 				gc.draw(badgeIcon,b[3]-14,b[4]-14)
 			end
 		end
-		P=players[1]
+		local P=players[1]
 		gc.setLineWidth(5)
 		gc.setColor(.8,1,0,.2)
-		for i=1,#players[1].atker do
+		for i=1,#P.atker do
-			local p=players[1].atker[i]
+			local p=P.atker[i]
 			gc.line(p.centerX,p.centerY,P.centerX,P.centerY)
 		end
 		if P.atkMode~=4 then
 			if P.atking then drawAtkPointer(P.atking.centerX,P.atking.centerY)end
 		else
-			for i=1,#players[1].atker do
+			for i=1,#P.atker do
-				local p=players[1].atker[i]
+				local p=P.atker[i]
 				drawAtkPointer(p.centerX,p.centerY)
 			end
 		end
 	end
 	if restartCount>0 then
-		gc.setColor(1,.7,.7,.5+restartCount*.02)
+		gc.setColor(0,0,0,restartCount/20)
-		gc.arc("fill",640,360,735,-1.5708,restartCount*0.3696-1.5708)
-		gc.setColor(0,0,0,restartCount/17)
 		gc.rectangle("fill",0,0,1280,720)
 	end
 end
@@ -749,7 +486,7 @@ function Pnt.pause()
 	gc.setColor(1,1,1,pauseTimer*.02)
 	setFont(30)
 	if pauseCount>0 then
-		gc.print(text.pauseTime..":["..pauseCount.."] "..format("%0.2f",pauseTime).."s",110,150)
+		gc.print(text.pauseCount..":["..pauseCount.."] "..format("%0.2f",pauseTime).."s",110,150)
 	end
 	for i=1,7 do
 		gc.print(text.stat[i+3],110,30*i+270)
@@ -761,22 +498,32 @@ function Pnt.pause()
 	end
 	setFont(40)
 	if system~="Android"then
-		mStr(text.space.."/"..text.enter,640,300)
+		mStr(text.space.."/"..text.enter,640,190)
-		gc.print("ESC",610,598)
+		mStr("Ctrl+R",640,351)
+		gc.print("ESC",610,506)
 	end
-	mDraw(gamefinished and drawableText.finish or drawableText.pause,640,140-12*(5-pauseTimer*.1)^2)
+	mDraw(gamefinished and drawableText.finish or drawableText.pause,640,60-10*(5-pauseTimer*.1)^1.5)
 end
-function Pnt.setting()
+function Pnt.setting_game()
 	gc.setColor(1,1,1)
-	setFont(35)
+	mDraw(drawableText.setting_game,640,15)
-	mStr("DAS:"..setting.das,290,278)
+	setFont(40)
-	mStr("ARR:"..setting.arr,506,278)
+	mStr("DAS:"..setting.das,290,205)
-	setFont(21)
+	mStr("ARR:"..setting.arr,610,205)
-	mStr(text.softdropdas..setting.sddas,290,357)
+	setFont(28)
-	mStr(text.softdroparr..setting.sdarr,506,357)
+	mStr(text.softdropdas..setting.sddas,290,323)
-	gc.draw(blockSkin[7-int(Timer()*2)%7],820,480,nil,2)
+	mStr(text.softdroparr..setting.sdarr,610,323)
 end
-function Pnt.setting2()
+function Pnt.setting_graphic()
+	gc.setColor(1,1,1)
+	mDraw(drawableText.setting_graphic,640,15)
+	gc.draw(blockSkin[7-int(Timer()*2)%7],940,440,nil,2)
+end
+function Pnt.setting_sound()
+	gc.setColor(1,1,1)
+	mDraw(drawableText.setting_sound,640,15)
+end
+function Pnt.setting_control()
 	local a=.3+sin(Timer()*15)*.1
 	if keyboardSetting then
 		gc.setColor(1,.5,.5,a)
@@ -806,12 +553,12 @@ function Pnt.setting2()
 	gc.line(40,550,640,550)
 	mDraw(drawableText.keyboard,340,0)
 	mDraw(drawableText.joystick,540,0)
-	gc.draw(drawableText.setting2Help,50,620)
+	gc.draw(drawableText.ctrlSetHelp,50,620)
 	setFont(40)
 	gc.print("P"..int(curBoard*.5+.5).."/P4",420,560)
 	gc.print(curBoard.."/8",580,560)
 end
-function Pnt.setting3()
+function Pnt.setting_touch()
 	VirtualkeyPreview()
 	local d=snapLevelValue[snapLevel]
 	if d>=10 then
@@ -831,7 +578,7 @@ function Pnt.help()
 	for i=1,11 do
 		gc.printf(text.help[i],140,15+43*i,1000,"center")
 	end
-	gc.draw(titleImage,250,600,.2,1+.05*sin(Timer()*2),nil,212,35)
+	gc.draw(titleImage,250,600,.2,1+.05*sin(Timer()*2),nil,206,35)
 	gc.setLineWidth(5)
 	gc.rectangle("line",17,17,260,260)
 	gc.rectangle("line",1077,17,186,186)
@@ -850,15 +597,17 @@ function Pnt.stat()
 		gc.print(text.stat[i],400,30*i-5)
 		gc.print(statOpt(i),720,30*i-5)
 	end
-	gc.draw(titleImage,260,600,.2+.07*sin(Timer()*3),nil,nil,212,35)
+	gc.draw(titleImage,260,600,.2+.07*sin(Timer()*3),nil,nil,206,35)
 end
 function Pnt.history()
 	gc.setColor(.2,.2,.2,.7)
-	gc.rectangle("fill",150,35,980,530)
+	gc.rectangle("fill",30,45,1000,632)
 	gc.setColor(1,1,1)
 	gc.setLineWidth(4)
-	gc.rectangle("line",150,35,980,530)
+	gc.rectangle("line",30,45,1000,632)
 	setFont(25)
-	gc.print(updateLog[sel],160,40)
+	for i=0,min(22,#updateLog-sel)do
+		gc.print(updateLog[sel+i],40,50+27*(i))
+	end
 end
 return Pnt

texture.lua

@@ -46,6 +46,7 @@ c:release()
 
 gc.setDefaultFilter("linear","linear")
 titleImage=N("/image/mess/title.png")
+coloredTitleImage=N("/image/mess/title_colored.png")
 dialCircle=N("/image/mess/dialCircle.png")
 dialNeedle=N("/image/mess/dialNeedle.png")
 badgeIcon=N("/image/mess/badge.png")
@@ -65,9 +66,11 @@ drawableText={
 	next=T(40),hold=T(40),
 	pause=T(120),finish=T(120),
 	custom=T(80),
+	setting_game=T(80),setting_graphic=T(80),setting_sound=T(80),
 	keyboard=T(25),joystick=T(25),
-	setting2Help=T(25),
+	ctrlSetHelp=T(25),
 	musicRoom=T(80),
 	nowPlaying=T(50),
+	warning=T(30),
 }
 c=gc.setCanvas()

timer.lua

@@ -3,17 +3,17 @@ local Timer=love.timer.getTime
 local int,abs,rnd,max,min,sin=math.floor,math.abs,math.random,math.max,math.min,math.sin
 local ins,rem=table.insert,table.remove
 
-return{
+local Tmr={}
-load=function()
+function Tmr.load()
 	local t=Timer()
 	::R::
 	if loading==1 then
-		if loadnum<=#voiceList then
+		if loadnum<=#voiceName then
-			local N=voiceList[loadnum]
+			local N=voiceName[loadnum]
-			for i=1,#voice[N]do
+			for i=1,#voiceList[N]do
-				voice[N][i]=love.audio.newSource("VOICE/"..voice[N][i]..".ogg","static")
+				voiceBank[voiceList[N][i]]={love.audio.newSource("VOICE/"..voiceList[N][i]..".ogg","static")}
 			end
-			loadprogress=loadnum/#voiceList
+			loadprogress=loadnum/#voiceName
 			loadnum=loadnum+1
 		else
 			loading=2
@@ -49,31 +49,48 @@ load=function()
 			gotoScene("intro","none")
 		end
 	end
-end,
+end
-intro=function()
+function Tmr.intro()
 	count=count+1
 	if count==200 then count=80 end
-end,
+end
-draw=function()
+function Tmr.main(dt)
+	players[1]:update(dt)
+end
+function Tmr.draw()
 	if clearSureTime>0 then clearSureTime=clearSureTime-1 end
-end,
+end
-play=function(dt)
+function Tmr.play(dt)
 	frame=frame+1
 	stat.time=stat.time+dt
-	for i=#FX.attack,1,-1 do
+	for i=#FX_attack,1,-1 do
-		local b=FX.attack[i]
+		local b=FX_attack[i]
 		b.t=b.t+1
-		local t0=b.t*.025--t in [0,1]
+		if b.t>50 then
-		local t=(sin(1.5*(2*t0-1))+1)*.5
+			b.rad=b.rad*1.08+.2
-		if t0==1 then
+			b.x,b.y=b.x2,b.y2
-			rem(FX.attack,i)
+		elseif b.t>10 then
+			local t=((b.t-10)*.025)t=(3-2*t)*t*t
+			b.x,b.y=b.x1*(1-t)+b.x2*t,b.y1*(1-t)+b.y2*t
+		end
+		if b.t<60 then
+			local L=FX_attack[i].drag
+			if #L==6*setting.atkFX then
+				rem(L,1)rem(L,1)
+			end
+			ins(L,b.x)ins(L,b.y)
+		else
+			for i=1,#FX_attack do
+				FX_attack[i]=FX_attack[i+1]
+			end
 		end
 	end
-	for i=#FX.badge,1,-1 do
+
-		local b=FX.badge[i]
+	for i=#FX_badge,1,-1 do
+		local b=FX_badge[i]
 		b.t=b.t+1
 		if b.t==60 then
-			rem(FX.badge,i)
+			rem(FX_badge,i)
 		end
 	end
 	for i=1,#virtualkey do
@@ -81,18 +98,6 @@ play=function(dt)
 			virtualkeyPressTime[i]=virtualkeyPressTime[i]-1
 		end
 	end
-	local E=#FX.attack
-	for i=E,1,-1 do
-		local A=FX.attack[i]
-		A.t=A.t+1
-		if A.t>=100 then
-			for j=i,E do
-				FX.attack[j]=FX.attack[j+1]
-			end--remove [i]
-		elseif A.t>80 then
-			A.rad=A.rad*1.08+.2
-		end
-	end
 
 	if frame<180 then
 		if frame==179 then
@@ -101,9 +106,13 @@ play=function(dt)
 			SFX("ready")
 		end
 		for p=1,#players do
-			P=players[p]
+			local P=players[p]
-			if P.keyPressing[1]or P.keyPressing[2]then
+			if P.keyPressing[1]then
-				P.moving=P.moving+(P.moving>0 and 1 or -1)
+				if P.moving>0 then P.moving=0 end
+				P.moving=P.moving-1
+			elseif P.keyPressing[2]then
+				if P.moving<0 then P.moving=0 end
+				P.moving=P.moving+1
 			else
 				P.moving=0
 			end
@@ -112,7 +121,7 @@ play=function(dt)
 		return
 	elseif players[1].keyPressing[10]then
 		restartCount=restartCount+1
-		if restartCount>17 then
+		if restartCount>20 then
 			clearTask("play")
 			updateStat()
 			resetGameData()
@@ -122,207 +131,17 @@ play=function(dt)
 		restartCount=max(restartCount-2,0)
 	end--Counting,include pre-das,directy RETURN,or restart counting
 	for p=1,#players do
-		P=players[p]
+		local P=players[p]
-		if P.timing then P.stat.time=P.stat.time+dt end
+		P:update(dt)
-		if P.alive then
-			if not P.small then
-				local v=0
-				for i=2,10 do v=v+i*(i-1)*7.2/(frame-P.keyTime[i])end P.keySpeed=P.keySpeed*.99+v*.1
-				v=0
-				for i=2,10 do v=v+i*(i-1)*7.2/(frame-P.dropTime[i])end P.dropSpeed=P.dropSpeed*.99+v*.1
-				--Update speeds
-				if modeEnv.royaleMode then
-					if P.keyPressing[9]then
-						P.swappingAtkMode=min(P.swappingAtkMode+2,30)
-					else
-						P.swappingAtkMode=P.swappingAtkMode+((#P.field>15 and P.swappingAtkMode>4 or P.swappingAtkMode>8)and -1 or 1)
-					end
-				end
-			end
-
-			if P.ai and P.waiting==-1 then
-				P.ai.controlDelay=P.ai.controlDelay-1
-				if P.ai.controlDelay==0 then
-					if #P.ai.controls>0 then
-						local C=P.ai.controls
-						pressKey(C[1],P)releaseKey(C[1],P)
-						local k=#C for i=1,k do C[i]=C[i+1]end--table.remove(C,1)
-						P.ai.controlDelay=P.ai.controlDelay0+1
-					else
-						AI_getControls(P.ai.controls)
-						P.ai.controlDelay=P.ai.controlDelay0+2
-						if Timer()-P.modeData.point>P.modeData.event then
-							P.modeData.point=Timer()
-							P.modeData.event=P.ai.controlDelay0+rnd(2,10)
-							changeAtkMode(rnd()<.85 and 1 or #P.atker>3 and 4 or rnd()<.3 and 2 or 3)
-						end
-					end
-				end
-			end
-			if not P.keepVisible then
-				for j=1,#P.field do for i=1,10 do
-					if P.visTime[j][i]>0 then P.visTime[j][i]=P.visTime[j][i]-1 end
-				end end
-			end--Fresh visible time
-
-			if P.keyPressing[1]or P.keyPressing[2]then
-				P.moving=P.moving+(P.moving>0 and 1 or -1)
-				local d=abs(P.moving)-P.gameEnv.das
-				if d>1 then
-					if P.gameEnv.arr>0 then
-						if d%P.gameEnv.arr==0 then
-							act[P.moving>0 and"moveRight"or"moveLeft"](true)
-						end
-					else
-						act[P.moving>0 and"insRight"or"insLeft"]()
-					end
-				end
-			else
-				P.moving=0
-			end
-			if P.keyPressing[7]and not P.keyPressing[9]then
-				local d=abs(P.downing)-P.gameEnv.sddas
-				P.downing=P.downing+1
-				if d>1 then
-					if P.gameEnv.sdarr>0 then
-						if d%P.gameEnv.sdarr==0 then
-							act.down1()
-						end
-					else
-						act.insDown()
-					end
-				end
-			else
-				P.downing=0
-			end
-			if P.falling>=0 then
-				P.falling=P.falling-1
-				if P.falling>=0 then goto stop end
-				if P.human and P.gameEnv.fall>0 and #P.field>P.clearing[1]then SFX("fall")end
-				for i=1,#P.clearing do
-					removeRow(P.field,P.clearing[i])
-					removeRow(P.visTime,P.clearing[i])
-				end
-				for i=1,#P.clearing do
-					P.clearing[i]=nil
-				end
-			end
-			if P.waiting>=0 then
-				P.waiting=P.waiting-1
-				if P.waiting==-1 then resetblock()end
-				goto stop
-			end
-			if P.curY~=P.y_img then
-				if P.dropDelay>=0 then
-					P.dropDelay=P.dropDelay-1
-					if P.dropDelay>=0 then goto stop end
-				end
-				drop()
-				if P.y_img~=P.curY then
-					P.dropDelay=P.gameEnv.drop
-				end
-				if P.freshTime<=P.gameEnv.freshLimit then
-					P.lockDelay=P.gameEnv.lock
-				end
-			else
-				P.lockDelay=P.lockDelay-1
-				if P.lockDelay>=0 then goto stop end
-				drop()
-			end
-			::stop::
-			if P.b2b1==P.b2b then
-			elseif P.b2b1<P.b2b then
-				P.b2b1=min(P.b2b1*.98+P.b2b*.02+.4,P.b2b)
-			else
-				P.b2b1=max(P.b2b1*.95+P.b2b*.05-.6,P.b2b)
-			end
-			--Alive
-		else
-			if not P.small then
-				P.keySpeed=P.keySpeed*.96+P.stat.key/P.stat.time*60*.04
-				P.dropSpeed=P.dropSpeed*.96+P.stat.piece/P.stat.time*60*.04
-				--Final average speeds
-				if modeEnv.royaleMode then
-					P.swappingAtkMode=min(P.swappingAtkMode+2,30)
-				end
-			end
-			if P.falling>=0 then
-				P.falling=P.falling-1
-				if P.falling>=0 then goto stop end
-				if P.human and P.gameEnv.fall>0 and #P.field>P.clearing[1]then SFX("fall")end
-				for i=1,#P.clearing do
-					removeRow(P.field,P.clearing[i])
-					removeRow(P.visTime,P.clearing[i])
-				end
-				for i=1,#P.clearing do
-					P.clearing[i]=nil
-				end
-			end::stop::
-			if P.endCounter<40 then
-				for j=1,#P.field do for i=1,10 do
-					if P.visTime[j][i]<20 then P.visTime[j][i]=P.visTime[j][i]+.5 end
-				end end--Make field visible
-			end
-			if P.b2b1>0 then P.b2b1=max(0,P.b2b1*.92-1)end
-			--Dead
-		end
-		if P.stat.score>P.score1 then
-			if P.stat.score-P.score1<10 then
-				P.score1=P.score1+1
-			else
-				P.score1=int(min(P.score1*.9+P.stat.score*.1+1))
-			end
-		end
-		for i=#P.shade,1,-1 do
-			local S=P.shade[i]
-			S[1]=S[1]-1+setting.fxs*.25
-			if S[1]<=0 then
-				rem(P.shade,i)
-			end
-		end
-		if P.fieldOffY>0 then
-			P.fieldOffY=P.fieldOffY-(P.fieldOffY>3 and 2 or 1)
-		end
-		if P.fieldOffX~=0 then
-			P.fieldOffX=P.fieldOffX-(P.fieldOffX>0 and 1 or -1)
-		end
-		for i=#P.bonus,1,-1 do
-			local b=P.bonus[i]
-			if b.inf then
-				if b.t<30 then
-					b.t=b.t+.5
-				end
-			else
-				b.t=b.t+b.speed
-				if b.t>=60 then rem(P.bonus,i)end
-			end
-		end
-		for i=#P.atkBuffer,1,-1 do
-			local atk=P.atkBuffer[i]
-			atk.time=atk.time+1
-			if not atk.sent then
-				if atk.countdown>0 then
-					atk.countdown=atk.countdown-garbageSpeed
-				end
-			else
-				if atk.time>20 then
-					rem(P.atkBuffer,i)
-				end
-			end
-		end
-		if P.fieldBeneath>0 then P.fieldBeneath=max(P.fieldBeneath-pushSpeed,0)end
-		if not P.small then
-			PTC.dust[p]:update(dt)
-		end
 	end
 	if modeEnv.royaleMode and frame%120==0 then freshMostDangerous()end
-end,
+end
-pause=function(dt)
+function Tmr.pause(dt)
 	if not gamefinished then
 		pauseTime=pauseTime+dt
 	end
 	if pauseTimer<50 and not wd.isMinimized()then
 		pauseTimer=pauseTimer+1
 	end
-end,
+end
-}
+return Tmr

toolfunc.lua

@@ -24,7 +24,27 @@ end
 function mDraw(s,x,y)
 	gc.draw(s,x-s:getWidth()*.5,y)
 end
-
+function destroyPlayers()
+	for i=#players,1,-1 do
+		local P=players[i]
+		if P.canvas then P.canvas:release()end
+		while P.field[1]do
+			removeRow(P.field)
+			removeRow(P.visTime)
+		end
+		if P.AI_mode=="CC"then
+			BOT.free(P.bot_opt)
+			BOT.free(P.bot_wei)
+			BOT.destroy(P.AI_bot)
+			P.AI_mode=nil
+		end
+		players[i]=nil
+	end
+	for i=#players.alive,1,-1 do
+		players.alive[i]=nil
+	end
+	players.human=0
+end
 function getNewRow(val)
 	local t=rem(freeRow)
 	for i=1,10 do
@@ -49,24 +69,21 @@ end
 langName={"中文","全中文","English"}
 local langID={"chi","chi_full","eng"}
 local drawableTextLoad={
-	"next",
+	"next","hold",
-	"hold",
+	"pause","finish",
-	"pause",
-	"finish",
 	"custom",
-	"keyboard",
+	"setting_game","setting_graphic","setting_sound",
-	"joystick",
+	"keyboard","joystick",
-	"setting2Help",
+	"ctrlSetHelp",
 	"musicRoom",
 	"nowPlaying",
+	"warning",
 }
 function swapLanguage(l)
 	text=require("language/"..langID[l])
-	Buttons.sel=nil
+	for S,L in next,Widget do
-	for S,L in next,Buttons do
+		for N,W in next,L do
-		for N,B in next,L do
+			W.text=text.WidgetText[S][N]
-			B.alpha=0
-			B.t=text.ButtonText[S][N]
 		end
 	end
 	gc.push("transform")
@@ -91,6 +108,7 @@ function changeBlockSkin(n)
 	n=n-1
 	gc.push("transform")
 	gc.origin()
+	gc.setColor(1,1,1)
 	for i=1,13 do
 		gc.setCanvas(blockSkin[i])
 		gc.draw(blockImg,30-30*i,-30*n)
@@ -101,14 +119,14 @@ function changeBlockSkin(n)
 	gc.setCanvas()
 end
 
-local vibrateLevel={0,.02,.03,.04,.05,.06,.07,.08}
+local vibrateLevel={0,.015,.02,.03,.04,.05,.06,.07,.08,.09}
 function VIB(t)
 	if setting.vib>0 then
 		love.system.vibrate(vibrateLevel[setting.vib+t])
 	end
 end
 function SFX(s,v)
-	if setting.sfx then
+	if setting.sfx>0 then
 		local n=1
 		::L::if sfx[s][n]:isPlaying()then
 			n=n+1
@@ -119,34 +137,60 @@ function SFX(s,v)
 			end
 			goto L
 		end::quit::
-		sfx[s][n]:setVolume(v or 1)
+		sfx[s][n]:setVolume((v or 1)*setting.sfx*.125)
 		sfx[s][n]:play()
 	end
 end
-function VOICE(s,n)
+function getFreeVoiceChannel()
-	if setting.voc then
+	local i=#voiceQueue
-		voicePlaying[#voicePlaying+1]=voice[s][n or rnd(#voice[s])]
+	for i=1,i do
-		if #voicePlaying==1 then
+		if #voiceQueue[i]==0 then return i end
-			voicePlaying[1]:play()
+	end
+	voiceQueue[i+1]={}
+	return i+1
+end
+function VOICE(s,chn)
+	if setting.voc>0 then
+		if chn then
+			voiceQueue[chn][#voiceQueue[chn]+1]=voiceList[s][rnd(#voiceList[s])]
+			--添加到[chn]
+		else
+			voiceQueue[getFreeVoiceChannel()]={voiceList[s][rnd(#voiceList[s])]}
+			--自动查找/创建空轨
 		end
 	end
 end
 function BGM(s)
-	if setting.bgm and bgmPlaying~=s then
+	if setting.bgm>0 then
-		if bgmPlaying then newTask(Event_task.bgmFadeOut,nil,bgmPlaying)end
+		if bgmPlaying~=s then
-		for i=#Task,1,-1 do
+			if bgmPlaying then newTask(Event_task.bgmFadeOut,nil,bgmPlaying)end
-			local T=Task[i]
+			for i=#Task,1,-1 do
-			if T.code==Event_task.bgmFadeIn then
+				local T=Task[i]
-				T.code=Event_task.bgmFadeOut
+				if T.code==Event_task.bgmFadeIn then
-			elseif T.code==Event_task.bgmFadeOut and T.data==s then
+					T.code=Event_task.bgmFadeOut
-				rem(Task,i)
+				elseif T.code==Event_task.bgmFadeOut and T.data==s then
+					rem(Task,i)
+				end
+			end
+			if s then
+				newTask(Event_task.bgmFadeIn,nil,s)
+				bgm[s]:play()
+			end
+			bgmPlaying=s
+		else
+			if bgmPlaying then
+				local v=setting.bgm*.125
+				bgm[bgmPlaying]:setVolume(v)
+				if v>0 then
+					bgm[bgmPlaying]:play()
+				else
+					bgm[bgmPlaying]:pause()
+				end
 			end
 		end
-		if s then
+	elseif bgmPlaying then
-			newTask(Event_task.bgmFadeIn,nil,s)
+		bgm[bgmPlaying]:pause()
-			bgm[s]:play()
+		bgmPlaying=nil
-		end
-		bgmPlaying=s
 	end
 end
 
@@ -162,7 +206,7 @@ local swapDeck_data={
 	{7,0,8,9},{1,0,2,8},{5,2,4,8},{6,0,15,8},
 }--Block id [ZSLJTOI] ,dir,x,y
 local swap={
-	none={2,1,d=function()end},
+	none={2,1,d=null},
 	flash={8,1,d=function()gc.clear(1,1,1)end},
 	fade={30,15,d=function()
 		local t=1-abs(sceneSwaping.time*.06667-1)
@@ -199,7 +243,7 @@ function gotoScene(s,style)
 			time=swap[style][1],mid=swap[style][2],
 			draw=swap[style].d
 		}
-		Buttons.sel=nil
+		widget_sel=nil
 		if style~="none"then
 			SFX("swipe")
 		end
@@ -217,26 +261,26 @@ local prevMenu={
 	music="main",
 	mode="main",
 	custom="mode",
-	draw=function()
+	draw="custom",
-		kb.setKeyRepeat(false)
-		gotoScene("custom")
-	end,
 	play=function()
+		kb.setKeyRepeat(true)
 		updateStat()
 		clearTask("play")
 		gotoScene(curMode.id~="custom"and"mode"or"custom","deck")
 	end,
-	pause=nil,
+	setting_game=function()
-	setting=function()
 		saveSetting()
 		gotoScene("main")
 	end,
-	setting2="setting",
+	setting_control="setting_game",
-	setting3="setting",
+	setting_touch=	"setting_game",
 	help="main",
 	history="help",
 	stat="main",
-}prevMenu.pause=prevMenu.play
+}
+prevMenu.pause=prevMenu.play
+prevMenu.setting_graphic=prevMenu.setting_game
+prevMenu.setting_sound=prevMenu.setting_game
 function back()
 	local t=prevMenu[scene]
 	if type(t)=="string"then
@@ -249,20 +293,18 @@ function pauseGame()
 	pauseTimer=0--Pause timer for animation
 	if not gamefinished then
 		pauseCount=pauseCount+1
-		if bgmPlaying then bgm[bgmPlaying]:pause()end
 	end
 	for i=1,#players.alive do
 		local l=players.alive[i].keyPressing
 		for j=1,#l do
 			if l[j]then
-				releaseKey(j,players.alive[i])
+				players.alive[i]:releaseKey(j)
 			end
 		end
 	end
 	gotoScene("pause","none")
 end
 function resumeGame()
-	if bgmPlaying then bgm[bgmPlaying]:play()end
 	gotoScene("play","fade")
 end
 local dataOpt={
@@ -319,13 +361,32 @@ function loadSetting()
 		local p=find(t[i],"=")
 		if p then
 			local t,v=sub(t[i],1,p-1),sub(t[i],p+1)
-			if t=="sfx"or t=="bgm"or t=="bgblock"or t=="voc"then
+			if t=="sfx"or t=="bgm"or t=="voc"then
-				setting[t]=v=="true"
+				setting[t]=toN(v:match("[012345678]"))or setting[t]
 			elseif t=="vib"then
 				setting.vib=toN(v:match("[012345]"))or 0
 			elseif t=="fullscreen"then
 				setting.fullscreen=v=="true"
 				love.window.setFullscreen(setting.fullscreen)
+			elseif t=="virtualkeyAlpha"then
+				setting.virtualkeyAlpha=min(int(abs(toN(v))),10)
+			elseif
+				t=="ghost"or t=="center"or t=="grid"or t=="swap"or
+				t=="quickR"or t=="bgblock"or t=="smo"or
+				t=="virtualkeyIcon"or t=="virtualkeySwitch"
+			then
+				setting[t]=v=="true"
+			elseif t=="frameMul"then
+				setting.frameMul=min(max(toN(v)or 100,0),100)
+			elseif t=="das"or t=="arr"or t=="sddas"or t=="sdarr"then
+				v=toN(v)if not v or v<0 then v=0 end
+				setting[t]=int(v)
+			elseif t=="dropFX"or t=="shakeFX"or t=="atkFX"then
+				setting[t]=toN(v:match("[0123]"))or 0
+			elseif t=="lang"then
+				setting[t]=toN(v:match("[123]"))or 1
+			elseif t=="skin"then
+				setting[t]=toN(v:match("[123456]"))or 1
 			elseif t=="keymap"then
 				v=splitS(v,"/")
 				for i=1,16 do
@@ -344,44 +405,35 @@ function loadSetting()
 						end
 					end
 				end
-			elseif t=="virtualkeyAlpha"then
-				setting.virtualkeyAlpha=min(int(abs(toN(v))),10)
-			elseif t=="virtualkeyIcon"or t=="virtualkeySwitch"then
-				setting[t]=v=="true"
-			elseif t=="frameMul"then
-				setting.frameMul=min(max(toN(v)or 100,0),100)
-			elseif t=="das"or t=="arr"or t=="sddas"or t=="sdarr"then
-				v=toN(v)if not v or v<0 then v=0 end
-				setting[t]=int(v)
-			elseif t=="ghost"or t=="center"or t=="grid"or t=="swap"or t=="bg"or t=="smo"then
-				setting[t]=v=="true"
-			elseif t=="fxs"then
-				setting[t]=toN(v:match("[0123]"))or 0
-			elseif t=="lang"then
-				setting[t]=toN(v:match("[123]"))or 1
-			elseif t=="skin"then
-				setting[t]=toN(v:match("[123456]"))or 1
 			end
 		end
 	end
 end
 local saveOpt={
-	"ghost","center",
-	"grid","swap",
-	"fxs","bg",
 	"das","arr",
 	"sddas","sdarr",
+	"quickR",
+	"swap",
+
+	"ghost","center",
+	"smo","grid",
+	"dropFX",
+	"shakeFX",
+	"atkFX",
+	"frameMul",
+
+	"fullscreen",
+	"bg",
+	"bgblock",
 	"lang",
+	"skin",
 
 	"sfx","bgm",
 	"vib","voc",
-	"fullscreen",
+	
-	"bgblock",
-	"skin","smo",
 	"virtualkeyAlpha",
 	"virtualkeyIcon",
 	"virtualkeySwitch",
-	"frameMul",
 }
 function saveSetting()
 	local vk={}

updateLog.lua

@@ -1,27 +1,46 @@
-return{
+local S=[=[
-[=[Future outlook:
+Future outlook:
-	"classic" rule
+	GUI:
-	backfire mode
+		highscore of most modes
-	Encrypt source code(JIT to byte code)
+		custom block color/direction
-	game recording
+		custom sequence
-	virtual key switch(all keys)
+		virtual key switch(all keys)
-	easier CTWC
+	Normal Things:
-	fineese/bigbang mode
+		combo mode
-	more FXs
+		any screen size
-	TTT mode
+		CC smarter(think of gaebage buffer)
-	smarter AI
+		fineese/bigbang mode & easier CTWC
+		new AI:task-Z
+		game recording
+		TTT mode
+	Hard Things:
+		Encrypt source code(JIT to byte code)
 		infinite 1v1
 		square mode
-		3d features
+		more FXs & 3d features & animations
-		layer-feeling
+0.7.25:
-		more animation]=],[=[
+	demo play at main menu
+	ALMOST reconstructed WHOLE PLAYER SYSTEM,NEED TEST
+	many bug fixed
+0.7.24(0.7.23):
+	REMAKE ALL BGM!
+	more settings with brand new GUI!
+	new mode:Master-Final
+	new modes:attacker & defender(not survivor!)
+	add restart button when pause
+	Code Clear added,face it bravely!(Windows only)
+	change falling animation
+	new GUI details
+	louder sound
+	code optimized
+	many bugs fixed
 0.7.22:
 	scoring system
 	smooth dropping
 	can change FX level
 	new attaking FX
 	new bone skin
-	baattery info/time display
+	battery info/time display
 	in-game update log(this page)
 	fast game
 	much many more better GUI details
@@ -33,7 +52,7 @@ return{
 0.7.21:
 	new title image
 	more GUI details
-	many bugs fixed]=],[=[
+	many bugs fixed
 0.7.20:
 	add music room
 	change block/space apperance in draw mode
@@ -50,7 +69,7 @@ return{
 	add 2 new block skins
 	new difficulty in infinite mode
 	new background/sound effect in master mode
-	bug fixed]=],[=[
+	bug fixed
 0.7.18:
 	3 new block skins!(one skin origional by Miya(nya~))
 	better restarting(to prevent mistakenly touching)
@@ -66,7 +85,7 @@ return{
 	adjust difficulty of PC train mode
 	adjust vibrate level for mobile devices
 	little optimized
-	bugs fixed]=],[=[
+	bugs fixed
 0.7.16:
 	bugs fixed
 	change rules of custom puzzle mode
@@ -79,7 +98,7 @@ return{
 	can pause game with animation
 	change icon of "Functional key"
 	speed optimized
-	bugs fixed]=],[=[
+	bugs fixed
 0.7.14:
 	drawing mode in custom game
 	can adjust virtual keys with mouse
@@ -90,7 +109,7 @@ return{
 	little game rule change
 	bugs fixed(AI control error)
 0.7.13:
-	Chniese game name:方块研究所
+	Chinese game name:方块研究所
 	SUPER COOL instant moving effect
 	new b2b bar style & animation
 	new transition animation
@@ -98,7 +117,7 @@ return{
 	adjust delay algorithm(probably cause controlfeel changing,please reset your DAS setting)
 	code reconstructed
 	bugs fixed(error when seq=his,size of custom oppo)
-	debug key change to F8]=],[=[
+	debug key change to F8
 0.7.12:
 	AI learned to switch attack mode
 	seperate master mode from marathon mode
@@ -111,7 +130,7 @@ return{
 	grid switch
 	swap target by combo key/press
 	some Chinese translaton editted
-	[reconstruct event system]]=],[=[
+	[reconstruct event system]
 0.7.11:
 	some Chinese translaton editted
 	add bone block in 2 hardest marathon(new block-fresh system)
@@ -122,7 +141,7 @@ return{
 	clearer attacking pointer
 	fix 6 next in classic mode
 	add QR code in help page
-	change some detials]=],[=[
+	change some detials
 0.7.10:
 	更完全的中文翻译
 	add Classic mode
@@ -135,7 +154,7 @@ return{
 	change rotate system
 	change BGM&BG set
 	code optimized
-	fix bugs]=],[=[
+	fix bugs
 0.7.8:
 	GPU usage decreased much more than before
 	add virtual key animation
@@ -150,7 +169,7 @@ return{
 	combine some modes
 	change some GUI
 	more SFXs
-	fix bugs]=],[=[
+	fix bugs
 0.7.6:
 	new font
 	add DIFFICULTY selection
@@ -162,7 +181,7 @@ return{
 	better GUI&change speed&BGM in royale mode
 	more FXs in royale mode
 	fix all attacking bug of royale mode
-	change sequence of TSD-only mode to bag7]=],[=[
+	change sequence of TSD-only mode to bag7
 0.7.5:
 	reduce difficuly of PC training mode,and add more patterns
 	reduce difficuly of death mode
@@ -176,7 +195,7 @@ return{
 	change game icon
 	adjust GUI of royale mode
 	change sequence of TSD-only mode
-	royale mode use LESS GPU]=],[=[
+	royale mode use LESS GPU
 0.7.4:
 	add a lot of bugs
 0.7.3:
@@ -192,5 +211,15 @@ return{
 	remove non-sense s/z spin double
 	GUI position editted
 	grid BG changed
-	smarter AI]=]
+	smarter AI
-}
+]=]
+local find,sub=string.find,string.sub
+local L,n,p={},1,1
+local eof=#S
+repeat
+	p1=find(S,"\n",p)
+	L[n]=sub(S,p,p1-1)
+	n=n+1
+	p=p1+1
+until p1==eof
+return L