0.8.8

conf.lua

@@ -1,10 +1,10 @@
-gameVersion="Alpha V0.8.5-"
+gameVersion="Alpha V0.8.8"
 function love.conf(t)
 	t.identity="Techmino"--Save directory name
 	t.version="11.1"
-	t.console=X
-	t.gammacorrect=X
-	t.appendidentity=X--Search files in source before save directory
+	t.console=false
+	t.gammacorrect=false
+	t.appendidentity=false--Search files in source before save directory
 	t.accelerometerjoystick=false--ios/android加速度计=摇杆
 	t.audio.mixwithsystem=true
 
@@ -13,23 +13,23 @@ function love.conf(t)
 	W.icon="/image/icon.png"
 	W.width,W.height=1280,720
 	W.minwidth,W.minheight=640,360
-	W.borderless=X
-	W.resizable=1
+	W.borderless=false
+	W.resizable=true
 	W.fullscreentype="desktop"--"exclusive"
-	W.fullscreen=X
+	W.fullscreen=false
 	W.vsync=0--0:∞fps
-	W.msaa=X--The number of samples to use with multi-sampled antialiasing (number)
+	W.msaa=false--The number of samples to use with multi-sampled antialiasing (number)
 	W.depth=0--Bits per sample in the depth buffer
 	W.stencil=1--Bits per sample in the stencil buffer
 	W.display=1--Monitor ID
-	W.highdpi=X--Enable high-dpi mode for the window on a Retina display (boolean)
+	W.highdpi=false--Enable high-dpi mode for the window on a Retina display (boolean)
 	W.x,W.y=nil
 
 	local M=t.modules
-	M.window,M.system,M.event=1,1,1
-	M.audio,M.sound=1,1
-	M.math,M.data=1,1
-	M.timer,M.graphics,M.font,M.image=1,1,1,1
-	M.mouse,M.touch,M.keyboard,M.joystick=1,1,1,1
-	M.physics,M.thread,M.video=X
+	M.window,M.system,M.event=true,true,true
+	M.audio,M.sound=true,true
+	M.math,M.data=true,true
+	M.timer,M.graphics,M.font,M.image=true,true,true,true
+	M.mouse,M.touch,M.keyboard,M.joystick=true,true,true,true
+	M.physics,M.thread,M.video=false,false,false
 end

dataList.lua

@@ -23,29 +23,10 @@ end
 -------------------------<Events>-------------------------
 local function gameOver()
 	local M=curMode
-	if M.score then
+	local R=M.getRank
+	if R then
 		local P=players[1]
-		local D=M.score(P)
-		local L=M.records
-		local p=#L--排名数-1
-		if p>0 then
-			::L::
-			if M.comp(D,L[p])then--是否靠前
-				p=p-1
-				if p>0 then
-					goto L
-				end
-			end
-		end
-		if p<10 then
-			if p==0 then
-				P:showText(text.newRecord,0,-100,100,"beat",.5)
-			end
-			ins(L,p+1,D)
-			if L[11]then L[11]=nil end
-			saveRecord(M.saveFileName,L)
-		end
-		local R=M.getRank(P)--new rank
+		R=R(P)--new rank
 		if R then
 			local r=modeRanks[M.id]--old rank
 			if R>r then
@@ -55,12 +36,34 @@ local function gameOver()
 						local m=M.unlock[i]
 						modeRanks[m]=modes[m].score and 0 or 6
 					end
+					saveUnlock()
 				end
 			end
+			local D=M.score(P)
+			local L=M.records
+			local p=#L--排名数-1
+			if p>0 then
+				::L::
+				if M.comp(D,L[p])then--是否靠前
+					p=p-1
+					if p>0 then
+						goto L
+					end
+				end
+			end
+			if p<10 then
+				if p==0 then
+					P:showText(text.newRecord,0,-100,100,"beat",.5)
+				end
+				D.date=os.date("%Y/%m/%d %H:%M")
+				ins(L,p+1,D)
+				if L[11]then L[11]=nil end
+				saveRecord(M.saveFileName,L)
+			end
 		end
 	end
 end--Save record
-local function die(P)
+local function die(P)--Same thing when win/lose,not really die!
 	P.alive=false
 	P.control=false
 	P.timing=false
@@ -76,7 +79,7 @@ local function die(P)
 			P.visTime[i][j]=min(P.visTime[i][j],20)
 		end
 	end
-end--Same thing when win/lose/finish
+end
 Event={}
 function Event.reach_winCheck(P)
 	if P.stat.row>=P.gameEnv.target then
@@ -87,7 +90,7 @@ function Event.win(P,result)
 	die(P)
 	P.result="WIN"
 	if modeEnv.royaleMode then
-		P.rank=1
+		P.modeData.event=1
 		P:changeAtk()
 	end
 	if P.human then
@@ -129,8 +132,8 @@ function Event.lose(P)
 	P.result="K.O."
 	if modeEnv.royaleMode then
 		P:changeAtk()
-		P.rank=#players.alive+1
-		P:showText(P.rank,0,-120,60,"appear",1,12)
+		P.modeData.event=#players.alive+1
+		P:showText(P.modeData.event,0,-120,60,"appear",1,12)
 		P.strength=0
 		if P.lastRecv then
 			local A,i=P,0
@@ -141,7 +144,7 @@ function Event.lose(P)
 				if P.id==1 or A.id==1 then
 					P.killMark=A.id==1
 				end
-				A.ko,A.badge=A.ko+1,A.badge+P.badge+1
+				A.modeData.point,A.badge=A.modeData.point+1,A.badge+P.badge+1
 				for i=A.strength+1,4 do
 					if A.badge>=royaleData.powerUp[i]then
 						A.strength=i
@@ -253,91 +256,91 @@ end
 -------------------------</Tasks>-------------------------
 -------------------------<Modes>--------------------------
 modes={
-	{"sprint_10",						id=1,	x=0,		y=0,		shape=1,size=35,unlock={2,3}},
-	{"sprint_20",						id=2,	x=-300,		y=0,		shape=1,size=45,unlock={73,74,75}},
-	{"sprint_40",						id=3,	x=0,		y=-400,		shape=1,size=55,unlock={4,9}},
-	{"sprint_100",						id=4,	x=-200,		y=-400,		shape=1,size=45,unlock={5,7}},
-	{"sprint_400",						id=5,	x=-400,		y=-400,		shape=1,size=35,unlock={6}},
-	{"sprint_1000",						id=6,	x=-600,		y=-400,		shape=1,size=35,unlock={}},
-		{"drought_normal",				id=7,	x=-400,		y=-200,		shape=1,size=35,unlock={8}},
-		{"drought_lunatic",				id=8,	x=-600,		y=-200,		shape=1,size=35,unlock={}},
-	{"marathon_normal",					id=9,	x=0,		y=-600,		shape=1,size=55,unlock={10,11,22,31,36,37,48,68,71,72}},
-	{"marathon_hard",					id=10,	x=0,		y=-800,		shape=1,size=45,unlock={27}},
-		{"solo_1",						id=11,	x=-300,		y=-1000,	shape=1,size=35,unlock={12}},
-		{"solo_2",						id=12,	x=-500,		y=-1000,	shape=1,size=35,unlock={13}},
-		{"solo_3",						id=13,	x=-700,		y=-1000,	shape=1,size=35,unlock={14,16}},
-		{"solo_4",						id=14,	x=-900,		y=-1000,	shape=1,size=35,unlock={15}},
-		{"solo_5",						id=15,	x=-1100,	y=-1000,	shape=1,size=35,unlock={}},
-			{"techmino49_easy",			id=16,	x=-900,		y=-1200,	shape=1,size=35,unlock={17,19}},
-			{"techmino49_hard",			id=17,	x=-900,		y=-1400,	shape=1,size=35,unlock={18}},
-			{"techmino49_ultimate",		id=18,	x=-900,		y=-1600,	shape=1,size=35,unlock={}},
+	{"sprint_10",						id=1,	x=0,		y=0,		size=35,shape=1,icon="timer",	unlock={2,3}},
+	{"sprint_20",						id=2,	x=-300,		y=0,		size=45,shape=1,icon="timer",	unlock={73,74,75}},
+	{"sprint_40",						id=3,	x=0,		y=-400,		size=55,shape=1,icon="timer",	unlock={4,9}},
+	{"sprint_100",						id=4,	x=-200,		y=-400,		size=45,shape=1,icon="timer",	unlock={5,7}},
+	{"sprint_400",						id=5,	x=-400,		y=-400,		size=35,shape=1,icon="timer",	unlock={6}},
+	{"sprint_1000",						id=6,	x=-600,		y=-400,		size=35,shape=1,icon="timer",	unlock={}},
+		{"drought_normal",				id=7,	x=-400,		y=-200,		size=35,shape=1,icon="noI",		unlock={8}},
+		{"drought_lunatic",				id=8,	x=-600,		y=-200,		size=35,shape=1,icon="mess",	unlock={}},
+	{"marathon_normal",					id=9,	x=0,		y=-600,		size=55,shape=1,icon="flag",	unlock={10,11,22,31,36,37,48,68,71,72}},
+	{"marathon_hard",					id=10,	x=0,		y=-800,		size=45,shape=1,icon="flag",	unlock={27}},
+		{"solo_1",						id=11,	x=-300,		y=-1000,	size=35,shape=1,icon="solo",	unlock={12}},
+		{"solo_2",						id=12,	x=-500,		y=-1000,	size=35,shape=1,icon="solo",	unlock={13}},
+		{"solo_3",						id=13,	x=-700,		y=-1000,	size=35,shape=1,icon="solo",	unlock={14,16}},
+		{"solo_4",						id=14,	x=-900,		y=-1000,	size=35,shape=1,icon="solo",	unlock={15}},
+		{"solo_5",						id=15,	x=-1100,	y=-1000,	size=35,shape=1,icon="solo",	unlock={}},
+			{"techmino49_easy",			id=16,	x=-900,		y=-1200,	size=35,shape=1,icon="",		unlock={17,19}},
+			{"techmino49_hard",			id=17,	x=-900,		y=-1400,	size=35,shape=1,icon="",		unlock={18}},
+			{"techmino49_ultimate",		id=18,	x=-900,		y=-1600,	size=35,shape=1,icon="",		unlock={}},
 
-			{"techmino99_easy",			id=19,	x=-1100,	y=-1400,	shape=1,size=35,unlock={20}},
-			{"techmino99_hard",			id=20,	x=-1100,	y=-1600,	shape=1,size=35,unlock={21}},
-			{"techmino99_ultimate",		id=21,	x=-1100,	y=-1800,	shape=1,size=35,unlock={}},
-		{"round_1",						id=22,	x=-300,		y=-800,		shape=1,size=35,unlock={23}},
-		{"round_2",						id=23,	x=-500,		y=-800,		shape=1,size=35,unlock={24}},
-		{"round_3",						id=24,	x=-700,		y=-800,		shape=1,size=35,unlock={25}},
-		{"round_4",						id=25,	x=-900,		y=-800,		shape=1,size=35,unlock={26}},
-		{"round_5",						id=26,	x=-1100,	y=-800,		shape=1,size=35,unlock={}},
+			{"techmino99_easy",			id=19,	x=-1100,	y=-1400,	size=35,shape=1,icon="",		unlock={20}},
+			{"techmino99_hard",			id=20,	x=-1100,	y=-1600,	size=35,shape=1,icon="",		unlock={21}},
+			{"techmino99_ultimate",		id=21,	x=-1100,	y=-1800,	size=35,shape=1,icon="",		unlock={}},
+		{"round_1",						id=22,	x=-300,		y=-800,		size=35,shape=1,icon="round",	unlock={23}},
+		{"round_2",						id=23,	x=-500,		y=-800,		size=35,shape=1,icon="round",	unlock={24}},
+		{"round_3",						id=24,	x=-700,		y=-800,		size=35,shape=1,icon="round",	unlock={25}},
+		{"round_4",						id=25,	x=-900,		y=-800,		size=35,shape=1,icon="round",	unlock={26}},
+		{"round_5",						id=26,	x=-1100,	y=-800,		size=35,shape=1,icon="round",	unlock={}},
 
-		{"master_beginner",				id=27,	x=0,		y=-1000,	shape=1,size=35,unlock={28}},
-		{"master_adavnce",				id=28,	x=0,		y=-1200,	shape=1,size=35,unlock={29,30}},
-		{"master_final",				id=29,	x=0,		y=-1400,	shape=1,size=35,unlock={}},
-		{"GM",							id=30,	x=150,		y=-1500,	shape=1,size=35,unlock={}},
+		{"master_beginner",				id=27,	x=0,		y=-1000,	size=35,shape=1,icon="",		unlock={28}},
+		{"master_adavnce",				id=28,	x=0,		y=-1200,	size=35,shape=1,icon="",		unlock={29,30}},
+		{"master_final",				id=29,	x=0,		y=-1400,	size=35,shape=1,icon="",		unlock={}},
+		{"GM",							id=30,	x=150,		y=-1500,	size=35,shape=1,icon="",		unlock={}},
 
-		{"blind_easy",					id=31,	x=150,		y=-700,		shape=1,size=35,unlock={32}},
-		{"blind_normal",				id=32,	x=150,		y=-800,		shape=1,size=35,unlock={33}},
-		{"blind_hard",					id=33,	x=150,		y=-900,		shape=1,size=35,unlock={34}},
-		{"blind_lunatic",				id=34,	x=150,		y=-1000,	shape=1,size=35,unlock={35}},
-		{"blind_ultimate",				id=35,	x=150,		y=-1100,	shape=1,size=35,unlock={}},
+		{"blind_easy",					id=31,	x=150,		y=-700,		size=35,shape=1,icon="",		unlock={32}},
+		{"blind_normal",				id=32,	x=150,		y=-800,		size=35,shape=1,icon="",		unlock={33}},
+		{"blind_hard",					id=33,	x=150,		y=-900,		size=35,shape=1,icon="",		unlock={34}},
+		{"blind_lunatic",				id=34,	x=150,		y=-1000,	size=35,shape=1,icon="",		unlock={35}},
+		{"blind_ultimate",				id=35,	x=150,		y=-1100,	size=35,shape=1,icon="",		unlock={}},
 
-		{"classic_fast",				id=36,	x=-300,		y=-1200,	shape=1,size=35,unlock={}},
+		{"classic_fast",				id=36,	x=-300,		y=-1200,	size=35,shape=2,icon="classic",	unlock={}},
         
-		{"survivor_easy",				id=37,	x=300,		y=-600,		shape=1,size=35,unlock={38}},
-		{"survivor_normal",				id=38,	x=500,		y=-600,		shape=1,size=35,unlock={39,42,44,46}},
-		{"survivor_hard",				id=39,	x=700,		y=-600,		shape=1,size=35,unlock={40}},
-		{"survivor_lunatic",			id=40,	x=900,		y=-600,		shape=1,size=35,unlock={41}},
-		{"survivor_ultimate",			id=41,	x=1100,		y=-600,		shape=1,size=35,unlock={}},
-			{"attacker_hard",			id=42,	x=300,		y=-800,		shape=1,size=35,unlock={43}},
-			{"attacker_ultimate",		id=43,	x=300,		y=-1000,	shape=1,size=35,unlock={}},
+		{"survivor_easy",				id=37,	x=300,		y=-600,		size=35,shape=1,icon="",		unlock={38}},
+		{"survivor_normal",				id=38,	x=500,		y=-600,		size=35,shape=1,icon="",		unlock={39,42,44,46}},
+		{"survivor_hard",				id=39,	x=700,		y=-600,		size=35,shape=1,icon="",		unlock={40}},
+		{"survivor_lunatic",			id=40,	x=900,		y=-600,		size=35,shape=1,icon="",		unlock={41}},
+		{"survivor_ultimate",			id=41,	x=1100,		y=-600,		size=35,shape=1,icon="",		unlock={}},
+			{"attacker_hard",			id=42,	x=300,		y=-800,		size=35,shape=1,icon="",		unlock={43}},
+			{"attacker_ultimate",		id=43,	x=300,		y=-1000,	size=35,shape=1,icon="",		unlock={}},
 
-			{"defender_normal",			id=44,	x=500,		y=-800,		shape=1,size=35,unlock={45}},
-			{"defender_lunatic",		id=45,	x=500,		y=-1000,	shape=1,size=35,unlock={}},
+			{"defender_normal",			id=44,	x=500,		y=-800,		size=35,shape=1,icon="",		unlock={45}},
+			{"defender_lunatic",		id=45,	x=500,		y=-1000,	size=35,shape=1,icon="",		unlock={}},
 
-			{"dig_hard",				id=46,	x=700,		y=-800,		shape=1,size=35,unlock={47}},
-			{"dig_ultimate",			id=47,	x=700,		y=-1000,	shape=1,size=35,unlock={}},
+			{"dig_hard",				id=46,	x=700,		y=-800,		size=35,shape=1,icon="",		unlock={47}},
+			{"dig_ultimate",			id=47,	x=700,		y=-1000,	size=35,shape=1,icon="",		unlock={}},
 
-		{"bigbang",						id=48,	x=400,		y=-400,		shape=1,size=55,unlock={49,51,56}},
-			{"c4wtrain_normal",			id=49,	x=700,		y=-400,		shape=1,size=35,unlock={50}},
-			{"c4wtrain_lunatic",		id=50,	x=900,		y=-400,		shape=1,size=35,unlock={}},
+		{"bigbang",						id=48,	x=400,		y=-400,		size=55,shape=1,icon="",		unlock={49,51,56}},
+			{"c4wtrain_normal",			id=49,	x=700,		y=-400,		size=35,shape=1,icon="",		unlock={50}},
+			{"c4wtrain_lunatic",		id=50,	x=900,		y=-400,		size=35,shape=1,icon="",		unlock={}},
 
-			{"pctrain_normal",			id=51,	x=700,		y=-200,		shape=1,size=35,unlock={52,53}},
-			{"pctrain_lunatic",			id=52,	x=900,		y=-200,		shape=1,size=35,unlock={}},
-				{"pcchallenge_normal",	id=53,	x=800,		y=-100,		shape=1,size=35,unlock={54}},
-				{"pcchallenge_hard",	id=54,	x=1000,		y=-100,		shape=1,size=35,unlock={55}},
-				{"pcchallenge_lunatic",	id=55,	x=1200,		y=-100,		shape=1,size=35,unlock={}},
-			{"tech_normal",				id=56,	x=400,		y=-100,		shape=1,size=35,unlock={57,58}},
-			{"tech_normal+",			id=57,	x=650,		y=150,		shape=1,size=35,unlock={64,67}},
-			{"tech_hard",				id=58,	x=400,		y=50,		shape=1,size=35,unlock={59,60}},
-			{"tech_hard+",				id=59,	x=250,		y=50,		shape=1,size=35,unlock={}},
-			{"tech_lunatic",			id=60,	x=400,		y=200,		shape=1,size=35,unlock={61,62}},
-			{"tech_lunatic+",			id=61,	x=250,		y=200,		shape=1,size=35,unlock={}},
-			{"tech_ultimate",			id=62,	x=400,		y=350,		shape=1,size=35,unlock={63}},
-			{"tech_ultimate+",			id=63,	x=250,		y=350,		shape=1,size=35,unlock={}},
-				{"tsd_easy",			id=64,	x=800,		y=200,		shape=1,size=35,unlock={65}},
-				{"tsd_hard",			id=65,	x=1000,		y=200,		shape=1,size=35,unlock={66}},
-				{"tsd_ultimate",		id=66,	x=1200,		y=200,		shape=1,size=35,unlock={}},
+			{"pctrain_normal",			id=51,	x=700,		y=-200,		size=35,shape=1,icon="",		unlock={52,53}},
+			{"pctrain_lunatic",			id=52,	x=900,		y=-200,		size=35,shape=1,icon="",		unlock={}},
+				{"pcchallenge_normal",	id=53,	x=800,		y=-100,		size=35,shape=1,icon="",		unlock={54}},
+				{"pcchallenge_hard",	id=54,	x=1000,		y=-100,		size=35,shape=1,icon="",		unlock={55}},
+				{"pcchallenge_lunatic",	id=55,	x=1200,		y=-100,		size=35,shape=1,icon="",		unlock={}},
+			{"tech_normal",				id=56,	x=400,		y=-100,		size=35,shape=1,icon="",		unlock={57,58}},
+			{"tech_normal+",			id=57,	x=650,		y=150,		size=35,shape=1,icon="",		unlock={64,67}},
+			{"tech_hard",				id=58,	x=400,		y=50,		size=35,shape=1,icon="",		unlock={59,60}},
+			{"tech_hard+",				id=59,	x=250,		y=50,		size=35,shape=1,icon="",		unlock={}},
+			{"tech_lunatic",			id=60,	x=400,		y=200,		size=35,shape=1,icon="",		unlock={61,62}},
+			{"tech_lunatic+",			id=61,	x=250,		y=200,		size=35,shape=1,icon="",		unlock={}},
+			{"tech_ultimate",			id=62,	x=400,		y=350,		size=35,shape=1,icon="",		unlock={63}},
+			{"tech_ultimate+",			id=63,	x=250,		y=350,		size=35,shape=1,icon="",		unlock={}},
+				{"tsd_easy",			id=64,	x=800,		y=200,		size=35,shape=1,icon="",		unlock={65}},
+				{"tsd_hard",			id=65,	x=1000,		y=200,		size=35,shape=1,icon="",		unlock={66}},
+				{"tsd_ultimate",		id=66,	x=1200,		y=200,		size=35,shape=1,icon="",		unlock={}},
 
-				{"ultra",				id=67,	x=650,		y=400,		shape=1,size=35,unlock={}},
-		{"zen",							id=68,	x=-900,		y=-600,		shape=1,size=35,unlock={69,70}},
-		{"infinite",					id=69,	x=-900,		y=-400,		shape=1,size=35,unlock={}},
-		{"infinite_dig",				id=70,	x=-1100,	y=-600,		shape=1,size=35,unlock={}},
-		{"custom_clear",				id=71,	x=200,		y=-350,		shape=2,size=45,unlock={}},
-		{"custom_puzzle",				id=72,	x=200,		y=-200,		shape=2,size=45,unlock={}},
-	{"hotseat_2P",						id=73,	x=-300,		y=200,		shape=2,size=45,unlock={}},
-	{"hotseat_3P",						id=74,	x=-450,		y=200,		shape=2,size=45,unlock={}},
-	{"hotseat_4P",						id=75,	x=-600,		y=200,		shape=2,size=45,unlock={}},
+				{"ultra",				id=67,	x=650,		y=400,		size=35,shape=1,icon="",		unlock={}},
+		{"zen",							id=68,	x=-900,		y=-600,		size=35,shape=1,icon="zen",		unlock={69,70}},
+		{"infinite",					id=69,	x=-900,		y=-400,		size=35,shape=1,icon="",		unlock={}},
+		{"infinite_dig",				id=70,	x=-1100,	y=-600,		size=35,shape=1,icon="",		unlock={}},
+		{"custom_clear",				id=71,	x=200,		y=-350,		size=45,shape=3,icon="custom",	unlock={}},
+		{"custom_puzzle",				id=72,	x=200,		y=-200,		size=45,shape=3,icon="puzzle",	unlock={}},
+	{"hotseat_2P",						id=73,	x=-300,		y=200,		size=45,shape=3,icon="",		unlock={}},
+	{"hotseat_3P",						id=74,	x=-450,		y=200,		size=45,shape=3,icon="",		unlock={}},
+	{"hotseat_4P",						id=75,	x=-600,		y=200,		size=45,shape=3,icon="",		unlock={}},
 }
 modeRanks={}
 for i=1,#modes do

default_data.lua

@@ -1,7 +1,10 @@
 setting={
 	das=10,arr=2,
 	sddas=0,sdarr=2,
-	quickR=true,swap=true,
+	reTime=10,
+	maxNext=6,
+	quickR=true,
+	swap=true,
 	fine=false,
 	--game
 
@@ -14,13 +17,13 @@ setting={
 
 	fullscreen=false,
 	bg=true,
-	bgblock=true,
+	bgspace=true,
 	lang=1,
 	skin=1,
 	--graphic
 
 	sfx=10,bgm=7,
-	vib=3,voc=0,
+	vib=0,voc=0,
 	stereo=6,
 	--sound
 
@@ -32,12 +35,12 @@ setting={
 		{},{},{},{},{},{},{},
 		--joystick
 	},
-	VKSwitch=true,
-	VKTrack=true,--If tracked
-	VKDodge=false,--If repel
-	VKTchW=3,--Touch Weight
-	VKCurW=4,--CurPos Weight
-	VKIcon=true,
+	VKSwitch=false,--if disp
+	VKTrack=false,--if tracked
+	VKDodge=false,--if dodge
+	VKTchW=3,--Touch-Pos Weight
+	VKCurW=4,--Cur-Pos Weight
+	VKIcon=true,--if disp icon
 	VKAlpha=3,
 	--control
 }

document.txt

@@ -11,12 +11,19 @@ spin判定:
 	细节不赘述
 
 攻击系统:
-	消1/2/3/4攻击0/1/2/4
-	spin1/2/3攻击2/4/6,若mini则减半
-	B2B:增加1~2(techrash)/1~3(spin)攻击
-	B3B:满B2B效果+1额外抵挡
-	PC:将其它的伤害之和开根号后向上取整，再+6~10(本局内递增)+2额外抵挡
-	连击:0,0,1,1,2,2,3,3,4,4,3……
+	普通消除:
+		消1/2/3/4攻击0.25/1.25/2.25/4
+	特殊消除:
+		spin1/2/3攻击2/4/6,若mini则减半
+		B2B:加1(techrash/spin1/spin2)或2(spin3)攻击
+		B3B:在B2B效果之上再+1攻击和+1额外抵挡
+		连击:0,0,1,1,2,2,3,3,4,4,3……
+	特殊消除会增加B2B点数,让之后的特殊消除获得B2B(B3B)增益(详细说明见下文)
+	PC:将上述伤害之和开根号，再+6~10(本局内递增)+2额外抵挡(注:本局消行数>4时会将B2B点数拉满)
+	根据上述规则计算后，向下取整，攻击打出
+
+分数系统:
+	玩得越牛逼得分越高嗷(
 
 攻击延迟:
 	消2/3的攻击生效最快,消四其次,spin攻击生效较慢,高连击生效最慢
@@ -27,13 +34,12 @@ spin判定:
 	没有用上的额外抵挡会被丢弃,最后剩下的攻击力会发送给对手
 
 back to back(B2B)点数说明:
-	B2B点数的范围在0~1200
-	在40及以上特殊消除时B2B,在1000以上特殊消除时B3B,1200封顶
-	消四+100
-	空spin加20,不超过1000
-	spin1~3+50/100/180 (mini*.5)
+	B2B点数的范围在0~1200,在点数>=40时进行特殊消除为B2B,>1000时特殊消除为B3B
 	普通消除-250
-	1000以上空放一块-40(不减到低于1000)
+	spin1/2/3:+50/100/180(mini减半)
+	消四:+100
+	空spin:+20,此法得到的点数不能超过1000
+	当点数在1000以上时空放一块-40(不减到低于1000)
 
 混战模式说明:
 	许多玩家同时进行一局游戏（对手都是AI,不是真人）.随着玩家数量的减少,方块下落/垃圾生效速度/垃圾升起速度都会增加.淘汰其它玩家后可以获得一个徽章和该玩家持有的徽章,增强自己的攻击力.

language/chi.lua

@@ -39,7 +39,7 @@ return{
 
 	custom="自定义游戏",
 	customOption={
-		drop="下落延迟:",
+		drop="下落速度:",
 		lock="锁定延迟:",
 		wait="放块延迟:",
 		fall="消行延迟:",
@@ -54,7 +54,7 @@ return{
 		bgm="背景音乐:",
 	},
 	customVal={
-		drop={"[20G]",1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
+		drop={"0G","1/180G","1/60G","1/40G","1/30G","1/25G","1/20G","1/18G","1/16G","1/14G","1/12G","1/10G","1/9G","1/8G","1/7G","1/6G","1/5G","1/4G","1/3G","1/2G","1G","2G","4G","8G","20G"},
 		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,
@@ -68,7 +68,7 @@ return{
 	},
 	softdropdas="软降DAS:",
 	softdroparr="软降ARR:",
-	snapLevelName={"任意摆放","10px吸附","20px吸附","40px吸附","60px吸附","80px吸附"},
+	snapLevelName={"无吸附","10px吸附","20px吸附","40px吸附","60px吸附","80px吸附"},
 	keyboard="键盘",joystick="手柄",
 	space="空格",enter="回车",
 	ctrlSetHelp="方向键选择/翻页,回车修改,esc返回",
@@ -81,6 +81,7 @@ return{
 	settingSaved="设置已保存",
 	settingSavingError="设置保存失败:",
 	statSavingError="数据保存失败:",
+	unlockSavingError="解锁保存失败",
 	copySuccess="已复制到剪切板",
 	dataCorrupted="数据损坏",
 	VKTchW="触摸点权重",
@@ -89,6 +90,7 @@ return{
 	noScore="暂无成绩",
 	highScore="最佳成绩",
 	newRecord="打破纪录",
+	errorMsg="Techmino遇到了问题,需要重新启动.\n我们已收集了一些错误信息,你可以向作者进行反馈.",
 
 	actName=actName,
 
@@ -171,7 +173,7 @@ return{
 ]],
 	support="支持作者",
 	group="官方QQ群",
-	warning="禁 止 私 自 传 播",
+	warning="禁止直接传播游戏本体",
 	WidgetText={
 		main={
 			lang="言/A",
@@ -245,6 +247,8 @@ return{
 			arrD="-",arrU="+",
 			sddasD="-",sddasU="+",
 			sdarrD="-",sdarrU="+",
+			reTime="开局等待时间",
+			maxNext="最大预览数量",
 			quickR="快速重新开始",
 			swap="组合键切换攻击模式",
 			fine="极简操作提示音",
@@ -260,7 +264,7 @@ return{
 			center="旋转中心",
 			skin="皮肤",
 			bg="背景",
-			bgblock="背景动画",
+			bgspace="星空背景",
 			smo="平滑下落",
 			dropFX="下落特效等级",
 			shakeFX="晃动特效等级",

language/chi_full.lua

@@ -39,7 +39,7 @@ return{
 
 	custom="自定义游戏",
 	customOption={
-		drop="下落延迟:",
+		drop="下落速度:",
 		lock="锁定延迟:",
 		wait="放块延迟:",
 		fall="消行延迟:",
@@ -54,7 +54,7 @@ return{
 		bgm="背景音乐:",
 	},
 	customVal={
-		drop={"[20G]",1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
+		drop={"0G","1/180G","1/60G","1/40G","1/30G","1/25G","1/20G","1/18G","1/16G","1/14G","1/12G","1/10G","1/9G","1/8G","1/7G","1/6G","1/5G","1/4G","1/3G","1/2G","1G","2G","4G","8G","20G"},
 		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,
@@ -68,7 +68,7 @@ return{
 	},
 	softdropdas="软降DAS:",
 	softdroparr="软降ARR:",
-	snapLevelName={"任意摆放","10px吸附","20px吸附","40px吸附","60px吸附","80px吸附"},
+	snapLevelName={"无吸附","10px吸附","20px吸附","40px吸附","60px吸附","80px吸附"},
 	keyboard="键盘",joystick="手柄",
 	space="空格",enter="回车",
 	ctrlSetHelp="方向键选择/翻页,回车修改,esc返回",
@@ -81,6 +81,7 @@ return{
 	settingSaved="设置已保存",
 	settingSavingError="设置保存失败:",
 	statSavingError="数据保存失败:",
+	unlockSavingError="解锁保存失败",
 	copySuccess="已复制到剪切板",
 	dataCorrupted="数据损坏",
 	VKTchW="触摸点权重",
@@ -89,6 +90,7 @@ return{
 	noScore="暂无成绩",
 	highScore="最佳成绩",
 	newRecord="打破纪录",
+	errorMsg="Techmino遇到了问题,需要重新启动.\n我们已收集了一些错误信息,你可以向作者进行反馈.",
 
 	actName=actName,
 
@@ -171,7 +173,7 @@ return{
 ]],
 	support="支持作者",
 	group="官方QQ群",
-	warning="禁 止 私 自 传 播",
+	warning="禁止直接传播游戏本体",
 	WidgetText={
 		main={
 			lang="言/A",
@@ -246,6 +248,8 @@ return{
 			arrD="-",arrU="+",
 			sddasD="-",sddasU="+",
 			sdarrD="-",sdarrU="+",
+			reTime="开局等待时间",
+			maxNext="最大预览数量",
 			quickR="快速重新开始",
 			swap="组合键切换攻击模式",
 			fine="极简操作提示音",
@@ -261,7 +265,7 @@ return{
 			center="旋转中心",
 			skin="皮肤",
 			bg="背景",
-			bgblock="背景动画",
+			bgspace="星空背景",
 			smo="平滑下落",
 			dropFX="下落特效等级",
 			shakeFX="晃动特效等级",

language/eng.lua

@@ -37,7 +37,7 @@ return{
 
 	custom="Custom Game",
 	customOption={
-		drop="Drop delay:",
+		drop="Drop speed:",
 		lock="Lock delay:",
 		wait="Next piece delay:",
 		fall="Clear row delay:",
@@ -52,7 +52,7 @@ return{
 		bgm="BGM:",
 	},
 	customVal={
-		drop={"[20G]",1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,"∞"},
+		drop={"0G","1/180G","1/60G","1/40G","1/30G","1/25G","1/20G","1/18G","1/16G","1/14G","1/12G","1/10G","1/9G","1/8G","1/7G","1/6G","1/5G","1/4G","1/3G","1/2G","1G","2G","4G","8G","20G"},
 		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,
@@ -79,6 +79,7 @@ return{
 	settingSaved="Setting saved",
 	settingSavingError="Failed to save setting:",
 	statSavingError="Failed to save stat:",
+	unlockSavingError="Failed to save unlock:",
 	copySuccess="Copy Success",
 	dataCorrupted="Data Corrupted",
 	VKTchW="Touch weight",
@@ -87,6 +88,7 @@ return{
 	noScore="No Score Yet",
 	highScore="Highscore",
 	newRecord="New Rocord",
+	errorMsg="Techmino ran into a problem and needs to restart.\nWe collected some error info,and you can send them to author.",
 
 	actName=actName,
 	
@@ -170,7 +172,7 @@ Lib used:
 ]],
 	support="Support Author",
 	group="Official QQ Group",
-	warning="DO NOT DISTRIBUTE",
+	warning="DO NOT SHARE APP",
 	WidgetText={
 		main={
 			lang="言/A",
@@ -244,6 +246,8 @@ Lib used:
 			arrD="-",arrU="+",
 			sddasD="-",sddasU="+",
 			sdarrD="-",sdarrU="+",
+			reTime="Delay before game",
+			maxNext="Max next count",
 			quickR="Quick restart",
 			swap="Combo key to change ATK mode",
 			fine="Finesse error SFX",
@@ -259,7 +263,7 @@ Lib used:
 			center="Center",
 			skin="Skin",
 			bg="Background",
-			bgblock="BG animation",
+			bgspace="BG space",
 			smo="Smoooth drop",
 			dropFX="Drop FX level",
 			shakeFX="Shake FX level",

list.lua

@@ -58,8 +58,8 @@ blockColor={
 }
 sfx={
 	"welcome",
-	"click",
-	"error","error_long",
+	"click","enter",
+	"finesseError","finesseError_long",
 	--Stereo sfxs(cannot set position)
 	"button","swipe",
 	"ready","start","win","fail","collect",
@@ -72,6 +72,8 @@ sfx={
 	"spin_0","spin_1","spin_2","spin_3",
 	"emit","blip_1","blip_2",
 	"perfectclear",
+
+	"error",
 	--Mono sfxs
 }
 bgm={
@@ -160,7 +162,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},
+	drop={1e99,180,60,40,30,25,20,18,16,14,12,10,9,8,7,6,5,4,3,2,1,.5,.25,.125,0},
 	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},

main.lua

@@ -2,15 +2,17 @@
 第一次搞这么大的工程,参考价值不是很大
 如果你有时间并且也热爱俄罗斯方块的话,来看代码或者帮助优化的话欢迎!
 ]]
+math.randomseed(os.time()*626)
 local love=love
 local ms,kb,tc=love.mouse,love.keyboard,love.touch
 local gc,sys=love.graphics,love.system
 local Timer=love.timer.getTime
 local int,rnd,max,min=math.floor,math.random,math.max,math.min
+local abs=math.abs
 local rem=table.remove
 
-package.path="?.lua"
-NULL=function()end
+package.path="?.lua"--boost
+function NULL()end
 --Libs
 -------------------------------------------------------------
 system=sys.getOS()
@@ -18,10 +20,11 @@ local xOy=love.math.newTransform()
 local mx,my,mouseShow=-20,-20,false
 local touching=nil--第一触摸ID
 local touchDist=nil
+joysticks={}
 
 local devMode=0
 players={alive={},human=0}
-scr={x=0,y=0,w=nil,h=nil,k=1}
+scr={x=0,y=0,w=0,h=0,rad=0,k=1}--x,y,wid,hei,radius,scale K
 local scr=scr
 mapCam={
 	sel=nil,--selected mode ID
@@ -51,13 +54,14 @@ kb.setTextInput(false)
 ms.setVisible(false)
 --Application Vars
 -------------------------------------------------------------
-customSel={22,22,1,1,7,3,1,1,8,4,1,1,1}
+customSel={1,22,1,1,7,3,1,1,8,4,1,1,1}
 preField={h=20}
 for i=1,10 do preField[i]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}end
 for i=11,20 do preField[i]={0,0,0,0,0,0,0,0,0,0}end
 freeRow={L=40}for i=1,40 do freeRow[i]={0,0,0,0,0,0,0,0,0,0}end
 --Game system Vars
 -------------------------------------------------------------
+space=require("parts/space")local space=space
 setFont=require("parts/font")
 blocks=require("parts/mino")
 -- require("parts/light")
@@ -118,19 +122,6 @@ if sys.getPowerInfo()~="unknown"then
 		end
 	end
 end
-local function getNewBlock()
-	FX_BGblock.ct=FX_BGblock.ct+1
-	if FX_BGblock.ct==17 then FX_BGblock.ct=1 end
-	local t=FX_BGblock.list[FX_BGblock.ct]
-	t.bn,t.size=FX_BGblock.next,2+3*rnd()
-	t.b=blocks[t.bn][rnd(0,3)]
-	t.x=rnd(-#t.b[1]*t.size*30+100,1180)
-	t.y=0
-	t.ty=720+#t.b*30*t.size
-	t.v=t.size*(1+rnd())
-	FX_BGblock.next=FX_BGblock.next%7+1
-	return t
-end
 local function onVirtualkey(x,y)
 	local dist,nearest=1e10
 	for K=1,#virtualkey do
@@ -221,6 +212,8 @@ local function onMode(x,y)
 			if M.shape==1 then
 				if x>M.x-s and x<M.x+s and y>M.y-s and y<M.y+s then return _ end
 			elseif M.shape==2 then
+				if abs(x-M.x)+abs(y-M.y)<s then return _ end
+			elseif M.shape==3 then
 				if(x-M.x)^2+(y-M.y)^2<s^2 then return _ end
 			end
 		end
@@ -253,13 +246,19 @@ function mouseClick.mode(x,y,k)
 	local _=cam.sel
 	if not cam.sel or x<920 then
 		local __=onMode(x,y)
-		if __ and _~=__ then
-			SFX("click")
-			cam.moving=true
-			_=modes[__]
-			cam.x,cam.y=_.x*cam.k+180,_.y*cam.k
+		if _~=__ then
+			if __ then
+				SFX("click")
+				cam.moving=true
+				_=modes[__]
+				cam.x=_.x*cam.k+180
+				cam.y=_.y*cam.k
+				cam.sel=__
+			else
+				cam.sel=nil
+				cam.x=cam.x-180
+			end
 		end
-		cam.sel=__
 	end
 	cam.keyCtrl=false
 end
@@ -432,10 +431,10 @@ function keyDown.draw(key)
 		end
 	elseif key=="escape"then
 		scene.back()
-	elseif key=="c"then
-		if kb.isDown("lctrl","rctrl")then copyBoard()end
-	elseif key=="v"then
-		if kb.isDown("lctrl","rctrl")then pasteBoard()end
+	elseif key=="c"and kb.isDown("lctrl","rctrl")then
+		copyBoard()
+	elseif key=="v"and kb.isDown("lctrl","rctrl")then
+		pasteBoard()
 	else
 		pen=penKey[key]or pen
 	end
@@ -449,6 +448,17 @@ function mouseDown.setting_sound(x,y,k)
 		if t>1 then
 			VOICE((t<1.5 or t>15)and"doubt"or rnd()<.8 and"happy"or"egg")
 			sceneTemp.last=Timer()
+			if rnd()<.26 then
+				for i=1,#modes do
+					local M=modes[i]
+					for i=1,#M.unlock do
+						local m=M.unlock[i]
+						modeRanks[m]=modes[m].score and(modeRanks[m]and max(modeRanks[m],0)or 0)or 6
+					end
+				end
+				saveUnlock()
+				TEXT("DEVMODE:UNLOCKALL",640,360,50,"stretch",.6)
+			end
 		end
 	end
 end
@@ -461,7 +471,7 @@ function keyDown.setting_key(key)
 	if key=="escape"then
 		if s.kS then
 			s.kS=false
-			SFX("error",.5)
+			SFX("finesseError",.5)
 		else
 			scene.back()
 		end
@@ -470,9 +480,11 @@ function keyDown.setting_key(key)
 			for y=1,20 do
 				if setting.keyMap[l][y]==key then
 					setting.keyMap[l][y]=""
+					goto L
 				end
 			end
 		end
+		::L::
 		setting.keyMap[s.board][s.kb]=key
 		SFX("reach",.5)
 		s.kS=false
@@ -506,7 +518,7 @@ function gamepadDown.setting_key(key)
 	if key=="back"then
 		if s.jS then
 			s.jS=false
-			SFX("error",.5)
+			SFX("finesseError",.5)
 		else
 			scene.back()
 		end
@@ -515,31 +527,33 @@ function gamepadDown.setting_key(key)
 			for y=1,20 do
 				if setting.keyMap[l][y]==key then
 					setting.keyMap[l][y]=""
+					goto L
 				end
 			end
 		end
+		::L::
 		setting.keyMap[8+s.board][s.js]=key
 		SFX("reach",.5)
 		s.jS=false
 	elseif key=="start"then
 		s.jS=true
 		SFX("lock",.5)
-	elseif key=="up"then
+	elseif key=="dpup"then
 		if s.js>1 then
 			s.js=s.js-1
 			SFX("move",.5)
 		end
-	elseif key=="down"then
+	elseif key=="dpdown"then
 		if s.js<20 then
 			s.js=s.js+1
 			SFX("move",.5)
 		end
-	elseif key=="left"then
+	elseif key=="dpleft"then
 		if s.board>1 then
 			s.board=s.board-1
 			SFX("rotate",.5)
 		end
-	elseif key=="right"then
+	elseif key=="dpright"then
 		if s.board<8 then
 			s.board=s.board+1
 			SFX("rotate",.5)
@@ -647,7 +661,7 @@ function touchMove.play(id,x,y,dx,dy)
 	end
 end
 function keyDown.play(key)
-	if key=="escape"and not scene.swapping then
+	if key=="escape"then
 		(frame<180 and back or pauseGame)()
 		return
 	end
@@ -745,7 +759,7 @@ local function widgetControl_key(i)
 			widget_sel=select(2,next(Widget[scene.cur]))
 		end
 	elseif i=="space"or i=="return"then
-		if not scene.swapping and widget_sel then
+		if widget_sel then
 			widgetPress(widget_sel)
 		end
 	elseif i=="left"or i=="right"then
@@ -769,10 +783,8 @@ local function widgetControl_gamepad(i)
 			widget_sel=select(2,next(Widget[scene.cur]))
 		end
 	elseif i=="start"then
-		if not scene.swapping and widget_sel then
-			if not scene.swapping and widget_sel then
-				widgetPress(widget_sel)
-			end
+		if widget_sel then
+			widgetPress(widget_sel)
 		end
 	elseif i=="dpleft"or i=="dpright"then
 		if widget_sel then
@@ -789,26 +801,29 @@ local function widgetControl_gamepad(i)
 end
 local lastX,lastY--last clickDown pos
 function love.mousepressed(x,y,k,t,num)
-	if devMode>0 then print(x,y)end
 	if t then return end
+	mouseShow=true
 	mx,my=xOy:inverseTransformPoint(x,y)
+	if devMode>0 then print(mx,my)end
+	if scene.swapping then return end
 	if mouseDown[scene.cur]then
 		mouseDown[scene.cur](mx,my,k)
 	elseif k==2 then
 		scene.back()
 	end
 	if k==1 then
-		if widget_sel and not scene.swapping then
+		if widget_sel then
 			widgetPress(widget_sel,mx,my)
 		end
 	end
 	lastX=mx
 	lastY=my
-	mouseShow=true
 end
 function love.mousemoved(x,y,dx,dy,t)
 	if t then return end
+	mouseShow=true
 	mx,my=xOy:inverseTransformPoint(x,y)
+	if scene.swapping then return end
 	dx,dy=dx/scr.k,dy/scr.k
 	if mouseMove[scene.cur]then
 		mouseMove[scene.cur](mx,my,dx,dy)
@@ -824,11 +839,11 @@ function love.mousemoved(x,y,dx,dy,t)
 			end
 		end
 	end
-	mouseShow=true
 end
 function love.mousereleased(x,y,k,t,num)
 	if t then return end
 	mx,my=xOy:inverseTransformPoint(x,y)
+	if t or scene.swapping then return end
 	if mouseUp[scene.cur]then
 		mouseUp[scene.cur](mx,my,k)
 	end
@@ -837,11 +852,13 @@ function love.mousereleased(x,y,k,t,num)
 	end
 end
 function love.wheelmoved(x,y)
+	if scene.swapping then return end
 	if wheelMoved[scene.cur]then wheelMoved[scene.cur](x,y)end
 end
 
 function love.touchpressed(id,x,y)
 	mouseShow=false
+	if scene.swapping then return end
 	if not touching then
 		touching=id
 		love.touchmoved(id,x,y,0,0)
@@ -853,6 +870,7 @@ function love.touchpressed(id,x,y)
 	end
 end
 function love.touchmoved(id,x,y,dx,dy)
+	if scene.swapping then return end
 	x,y=xOy:inverseTransformPoint(x,y)
 	if touchMove[scene.cur]then
 		touchMove[scene.cur](id,x,y,dx/scr.k,dy/scr.k)
@@ -873,10 +891,11 @@ function love.touchmoved(id,x,y,dx,dy)
 	end
 end
 function love.touchreleased(id,x,y)
+	if scene.swapping then return end
 	x,y=xOy:inverseTransformPoint(x,y)
 	if id==touching then
 		touching=nil
-		if widget_sel and not scene.swapping then
+		if widget_sel then
 			widgetPress(widget_sel,x,y)
 		end
 		widget_sel=nil
@@ -890,6 +909,7 @@ function love.touchreleased(id,x,y)
 end
 function love.keypressed(i)
 	mouseShow=false
+	if scene.swapping then return end
 	if i=="f8"then devMode=0
 	elseif i=="f9"then devMode=1
 	elseif i=="f10"then devMode=2
@@ -904,6 +924,8 @@ function love.keypressed(i)
 		elseif i=="q"then
 			local W=widget_sel
 			if W then W:getInfo()end
+		elseif i=="e"then
+			error("Error Test")
 		elseif widget_sel then
 			local W=widget_sel
 			if i=="left"then W.x=W.x-10
@@ -926,9 +948,21 @@ function love.keypressed(i)
 	end
 end
 function love.keyreleased(i)
+	if scene.swapping then return end
 	if keyUp[scene.cur]then keyUp[scene.cur](i)end
 end
 
+function love.joystickadded(JS)
+	joysticks[#joysticks+1]=JS
+end
+function love.joystickremoved(JS)
+	for i=1,#joysticks do
+		if joysticks[i]==JS then
+			rem(joysticks,i)
+			return
+		end
+	end
+end
 local keyMirror={
 	dpup="up",
 	dpdown="down",
@@ -939,6 +973,7 @@ local keyMirror={
 }
 function love.gamepadpressed(joystick,i)
 	mouseShow=false
+	if scene.swapping then return end
 	if gamepadDown[scene.cur]then gamepadDown[scene.cur](i)
 	elseif keyDown[scene.cur]then keyDown[scene.cur](keyMirror[i]or i)
 	elseif i=="back"then scene.back()
@@ -946,13 +981,31 @@ function love.gamepadpressed(joystick,i)
 	end
 end
 function love.gamepadreleased(joystick,i)
+	if scene.swapping then return end
 	if gamepadUp[scene.cur]then gamepadUp[scene.cur](i)
 	end
 end
 --[[
-function love.joystickpressed(js,k)end
-function love.joystickaxis(js,axis,val)end
-function love.joystickhat(js,hat,dir)end
+function love.joystickpressed(JS,k)
+	mouseShow=false
+	if scene.swapping then return end
+	if gamepadDown[scene.cur]then gamepadDown[scene.cur](i)
+	elseif keyDown[scene.cur]then keyDown[scene.cur](keyMirror[i]or i)
+	elseif i=="back"then scene.back()
+	else widgetControl_gamepad(i)
+	end
+end
+function love.joystickreleased(JS,k)
+	if scene.swapping then return end
+	if gamepadUp[scene.cur]then gamepadUp[scene.cur](i)
+	end
+end
+function love.joystickaxis(JS,axis,val)
+	
+end
+function love.joystickhat(JS,hat,dir)
+
+end
 function love.sendData(data)end
 function love.receiveData(id,data)end
 ]]
@@ -962,6 +1015,7 @@ end
 function love.resize(w,h)
 	love.timer.sleep(.26)
 	scr.w,scr.h,scr.r=w,h,h/w
+	scr.rad=(w^2+h^2)^.5
 	if scr.r>=.5625 then
 		scr.k=w/1280
 		scr.x,scr.y=0,(h-w*9/16)*.5
@@ -969,14 +1023,19 @@ function love.resize(w,h)
 		scr.k=h/720
 		scr.x,scr.y=(w-h*16/9)*.5,0
 	end
-	gc.origin()
 	xOy=xOy:setTransformation(w*.5,h*.5,nil,scr.k,nil,640,360)
-	gc.replaceTransform(xOy)
+	if setting.bgspace then
+		space.resize(w,h)
+		space.new()
+	end
 end
 function love.focus(f)
 	if system~="Android" and not f and scene.cur=="play"then pauseGame()end
 end
 function love.update(dt)
+	if setting.bgspace then
+		space.update()
+	end
 	for i=#sysFX,1,-1 do
 		local S=sysFX[i]
 		S[2]=S[2]+1
@@ -986,18 +1045,6 @@ function love.update(dt)
 			end
 		end
 	end
-	for i=#FX_BGblock,1,-1 do
-		local B=FX_BGblock[i]
-		B.y=B.y+B.v
-		if B.y>B.ty then rem(FX_BGblock,i)end
-	end
-	if setting.bgblock then
-		FX_BGblock.tm=FX_BGblock.tm-1
-		if FX_BGblock.tm==0 then
-			FX_BGblock[#FX_BGblock+1]=getNewBlock()
-			FX_BGblock.tm=rnd(20,30)
-		end
-	end
 	for i=#texts,1,-1 do
 		local t=texts[i]
 		t.c=t.c+t.spd
@@ -1076,105 +1123,162 @@ function love.update(dt)
 		W:update()
 	end--更新控件
 end
+function love.errorhandler(msg)
+	local PUMP,POLL=love.event.pump,love.event.poll
+	love.mouse.setVisible(true)
+	love.audio.stop()
+	local err={"Error:"..msg}
+	local trace=debug.traceback("",2)
+	local c=2
+	for l in string.gmatch(trace,"(.-)\n")do
+		if c>2 then
+			if not string.find(l,"boot")then
+				err[c]=string.gsub(l,"^\t*","")
+				c=c+1
+			end
+		else
+			err[2]="Traceback"
+			c=3
+		end
+	end
+	print(table.concat(err,"\n"),1,c-2)
+	-- err=err:gsub("%[string \"(.-)\"%]","%1")
+	local CAP
+	local function _(_)CAP=gc.newImage(_)end
+	gc.captureScreenshot(_)
+	local T=0
+	return function()
+		PUMP()
+		for e,a,b in POLL()do
+			if e=="quit"or a=="escape"then
+				destroyPlayers()
+				return 1
+			elseif a=="return"or a=="start"then
+				destroyPlayers()
+				return"restart"
+			elseif e=="resize"then
+				T=2
+				love.resize(a,b)
+			end
+		end
+		T=T+1
+		if T==1 then
+			if sfx.error then
+				SFX("error",.8)
+			end
+		elseif T==2 then
+			gc.clear(.3,.5,.9)
+		elseif T==3 then
+			gc.setColor(1,1,1)
+			gc.push("transform")
+			gc.replaceTransform(xOy)
+			gc.draw(CAP,100,365,nil,512/CAP:getWidth(),288/CAP:getHeight())
+			gc.pop()
+		elseif T==4 then
+			gc.push("transform")
+			gc.replaceTransform(xOy)
+			setFont(120)
+			gc.print(":(",100,40)
+			setFont(38)
+			gc.printf(text.errorMsg,100,200,1280-100)
+			setFont(20)
+			gc.print(err[1],626,360)
+			gc.print("TRACEBACK",626,410)
+			for i=4,#err-2 do
+				gc.print(err[i],626,355+20*i)
+			end
+			gc.pop()
+		end
+		gc.present()
+		love.timer.sleep(.1)
+	end
+end
+
 local scs={1,2,1,2,1,2,1,2,1,2,1.5,1.5,.5,2.5}
 local FPS=love.timer.getFPS
 function love.draw()
 	gc.discard()--SPEED UPUPUP!
 	Pnt.BG[setting.bg and curBG or"grey"]()
-	gc.setColor(1,1,1,.2)
-	for n=1,#FX_BGblock do
-		local b,img=FX_BGblock[n].b,blockSkin[FX_BGblock[n].bn]
-		local size=FX_BGblock[n].size
-		for i=1,#b do for j=1,#b[1]do
-			if b[i][j]then
-				gc.draw(img,FX_BGblock[n].x+(j-1)*30*size,FX_BGblock[n].y-i*30*size,nil,size)
+	if setting.bgspace then
+		space.draw()
+	end
+	gc.push("transform")
+		gc.replaceTransform(xOy)
+		if Pnt[scene.cur]then Pnt[scene.cur]()end
+		for k,W in next,Widget[scene.cur]do
+			if not(W.hide and W.hide())then
+				W:draw()
 			end
-		end end
-	end--Draw BG falling blocks
-	if Pnt[scene.cur]then Pnt[scene.cur]()end
-	for k,W in next,Widget[scene.cur]do
-		if not(W.hide and W.hide())then
-			W:draw()
-		end
-	end--Draw widgets
-	if mouseShow then
-		local r=Timer()*.5
-		gc.setColor(1,1,1,min(1-math.abs(1-r%1*2),.3))
-		r=int(r)%7+1
-		gc.draw(miniBlock[r],mx,my,Timer()%3.1416*4,20,20,scs[2*r]-.5,#blocks[r][0]-scs[2*r-1]+.5)
-		gc.setColor(1,1,1,.5)gc.circle("fill",mx,my,5)
-		gc.setColor(1,1,1)gc.circle("fill",mx,my,3)
-	end--Awesome mouse!
+		end--Draw widgets
+		if mouseShow then
+			local r=Timer()*.5
+			gc.setColor(1,1,1,min(1-math.abs(1-r%1*2),.3))
+			r=int(r)%7+1
+			gc.draw(miniBlock[r],mx,my,Timer()%3.1416*4,20,20,scs[2*r]-.5,#blocks[r][0]-scs[2*r-1]+.5)
+			gc.setColor(1,1,1,.5)gc.circle("fill",mx,my,5)
+			gc.setColor(1,1,1)gc.circle("fill",mx,my,3)
+		end--Awesome mouse!
+		gc.setLineWidth(6)
+		for i=1,#sysFX do
+			local S=sysFX[i]
+			if S[1]==0 then
+				gc.setColor(1,1,1,1-S[2]/S[3])
+				local r=(10*S[2]/S[3])^1.2
+				gc.rectangle("line",S[4]-r,S[5]-r,S[6]+2*r,S[7]+2*r)
+				--按钮波纹
+			elseif S[1]==1 then
+				gc.setColor(S[4],S[5],S[6],1-S[2]/S[3])
+				gc.rectangle("fill",S[7],S[8],S[9],S[10],2)
+				--开关/滑条残影
+			end
+		end--guiFXs
+		for i=1,#texts do
+			local t=texts[i]
+			local p=t.c
+			gc.setColor(1,1,1,p<.2 and p*5 or p<.8 and 1 or 5-p*5)
+			setFont(t.font)
+			t:draw()
+		end--Floating Texts
+	gc.pop()
 	gc.setColor(1,1,1)
 	if powerInfoCanvas then
 		gc.draw(powerInfoCanvas)
 	end--Power Info
-	gc.setLineWidth(6)
-	for i=1,#sysFX do
-		local S=sysFX[i]
-		if S[1]==0 then
-			gc.setColor(1,1,1,1-S[2]/S[3])
-			local r=(10*S[2]/S[3])^1.2
-			gc.rectangle("line",S[4]-r,S[5]-r,S[6]+2*r,S[7]+2*r)
-			--按钮波纹
-		elseif S[1]==1 then
-			gc.setColor(S[4],S[5],S[6],1-S[2]/S[3])
-			gc.rectangle("fill",S[7],S[8],S[9],S[10],2)
-			--开关/滑条残影
-		end
-	end--guiFXs
-	for i=1,#texts do
-		local t=texts[i]
-		local p=t.c
-		gc.setColor(1,1,1,p<.2 and p*5 or p<.8 and 1 or 5-p*5)
-		setFont(t.font)
-		t:draw()
-	end--Floating Texts
 	if scene.swapping then
-		scene.swap.draw(scene.swap.time)
-	end--Swapping animation
-	if scr.r~=.5625 then
-		gc.setColor(0,0,0)
-		if scr.r>.5625 then
-			local d=(scr.h-scr.w*9/16)*.5/scr.k
-			gc.rectangle("fill",0,0,1280,-d)
-			gc.rectangle("fill",0,720,1280,d)
-		else--高窗口
-			local d=(scr.w-scr.h*16/9)*.5/scr.k
-			gc.rectangle("fill",0,0,-d,720)
-			gc.rectangle("fill",1280,0,d,720)
-		end--扁窗口
-	end--Black side
+		local _=scene.swap
+		_.draw(_.time)
+	end--Scene swapping animation
 	setFont(15)
 	gc.setColor(1,1,1)
-	gc.print(FPS(),5,700)
+	local _=scr.h-20
+	gc.print(FPS(),5,_)
 	if devMode>0 then
-		gc.setColor(1,devMode==2 and .5 or 1,1)
-		gc.print("Tasks:"..#Task,5,600)
-		gc.print("Voices:"..#voiceQueue,5,620)
-		gc.print("Mouse:"..mx.." "..my,5,640)
-		gc.print("Free Row:"..#freeRow.."/"..freeRow.L,5,660)
-		gc.print("Cache used:"..gcinfo(),5,680)
-	end
+		gc.setColor(1,1,devMode==2 and .6 or 1)
+		gc.print("Cache used:"..gcinfo(),5,_-20)
+		gc.print("Free Row:"..#freeRow.."/"..freeRow.L,5,_-40)
+		gc.print("Mouse:"..mx.." "..my,5,_-60)
+		gc.print("Voices:"..#voiceQueue,5,_-80)
+		gc.print("Tasks:"..#Task,5,_-100)
+	end--DEV info
 end
 function love.run()
 	local T=love.timer
-	local lastFrame,lastFreshPow=T.getTime(),T.getTime()
+	local sleep=T.sleep
+	local lastFrame,lastFreshPow=T.getTime()
+	local lastFreshPow=lastFrame
 	local readyDrawFrame=0
 	local mini=love.window.isMinimized
 	local PUMP,POLL=love.event.pump,love.event.poll
 	love.resize(gc.getWidth(),gc.getHeight())
 	scene.init("load")--Scene Launch
-	while true do
+	return function()
 		PUMP()
 		for N,a,b,c,d,e in POLL()do
-			if N=="quit"then
-				destroyPlayers()
-				saveStat()
-				saveSetting()
-				goto END
-			elseif love[N]then
+			if love[N]then
 				love[N](a,b,c,d,e)
+			elseif N=="quit"then
+				destroyPlayers()
+				return 1
 			end
 		end
 		T.step()
@@ -1188,25 +1292,24 @@ function love.run()
 			end
 		end
 		if Timer()-lastFrame<.058 then
-			T.sleep(.01)
+			sleep(.01)
 		end
 		while Timer()-lastFrame<.0158 do
-			T.sleep(.001)
-		end
+			sleep(.001)
+		end--try easily control 60FPS
 		lastFrame=Timer()
 		if Timer()-lastFreshPow>1 then
 			updatePowerInfo()
 			lastFreshPow=Timer()
 		end
 	end
-	::END::
 end
 -------------------------------------------------------------
 local F=love.filesystem
 if F.getInfo("data")then
 	F.write("data.dat",F.read("data"))
 	F.remove("data")
-end
+end	
 if F.getInfo("userdata")then
 	F.write("data.dat",F.read("userdata"))
 	F.remove("userdata")
@@ -1223,16 +1326,16 @@ end
 FILE={
 	data=F.newFile("data.dat"),
 	setting=F.newFile("setting.dat"),
-	vk=F.newFile("vk"),
+	unlock=F.newFile("unlock.dat"),
 }
+if F.getInfo("unlock.dat")then loadUnlock()end
 if F.getInfo("data.dat")then loadStat()end
 if F.getInfo("setting.dat")then
 	loadSetting()
 elseif system=="Android"or system=="iOS" then
 	setting.swap=false
-else
-	setting.VKSwitch=false
+	setting.VKSwitch=true
+	setting.vib=3
 end
-math.randomseed(os.time()*626)
-swapLanguage(setting.lang)
+changeLanguage(setting.lang)
 changeBlockSkin(setting.skin)

modes/GM.lua

@@ -4,6 +4,7 @@ local function score(P)
 	local F=false
 	if P.modeData.point<70 then--if Less then MM
 		local R=#P.cleared
+		if R==0 then return end
 		if R==4 then R=10 end
 		P.modeData.point=P.modeData.point+R
 		P.modeData.event=sectionName[int(P.modeData.point*.1)+1]
@@ -12,14 +13,14 @@ end
 
 return{
 	name={
-		"大师",
-		"大师",
-		"GM",
+		"宗师",
+		"宗师",
+		"GrandMaster",
 	},
 	level={
-		"",
-		"",
-		"",
+		"GM",
+		"GM",
+		"GM",
 	},
 	info={
 		"成为方块大师",
@@ -42,11 +43,12 @@ return{
 				Event.win(P,"finish")
 			end
 		end,
-		arr=1,
+		minarr=1,
 		bg="game3",bgm="shining terminal",
 },
 	load=function()
 		newPlayer(1,340,15)
+		players[1].modeData.event="M7"
 	end,
 	mesDisp=function(P,dx,dy)
 		mDraw(drawableText.line,-82,300)
@@ -63,6 +65,6 @@ return{
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]>b[2]end,
 	getRank=function(P)
 		local P=P.modeData.point
-		return P==80 and 5 or P>=70 and 4 or P>=60 and 3 or P>=40 and 2 or P>=20 and 1
+		return P==80 and 5 or P>=70 and 4 or P>=60 and 3 or P>=40 and 2 or P>=20 and 1 or P>=5 and 0
 	end,
 }

modes/attacker_hard.lua

@@ -66,7 +66,7 @@ return{
 	scoreDisp=function(D)return D[1].." Waves   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
-		local W=P.modedata.event
-		return W>100 and 4 or W>=80 and 3 or W>=50 and 2 or W>=20 and 1
+		local W=P.modeData.event
+		return W>100 and 4 or W>=80 and 3 or W>=50 and 2 or W>=20 and 1 or W>=5 and 0
 	end,
 }

modes/attacker_ultimate.lua

@@ -79,7 +79,7 @@ return{
 	scoreDisp=function(D)return D[1].." Waves   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
-		local W=P.modedata.event
-		return W>40 and 4 or W>=30 and 3 or W>=20 and 2 or W>=10 and 1
+		local W=P.modeData.event
+		return W>40 and 4 or W>=30 and 3 or W>=20 and 2 or W>=10 and 1 or W>=5 and 0
 	end,
 }

modes/bigbang.lua

@@ -34,8 +34,10 @@ return{
 		newPlayer(1,340,15)
 	end,
 	mesDisp=function(P,dx,dy)
-		setFont(50)
-		mStr("UNFINISHED",150,100)
+		setFont(60)
+		for i=1,5 do
+			mStr("UNFINISHED",120+10*i,100+50*i)
+		end
 	end,
 	score=function(P)return{P.modeData.event,P.stat.extraRate}end,
 	scoreDisp=function(D)return D[1].."Stage "..format("%.2f",D[2]).."%"end,

modes/blind_easy.lua

@@ -1,3 +1,4 @@
+local min=math.min
 return{
 	name={
 		"隐形",
@@ -33,12 +34,12 @@ return{
 		mStr(P.stat.row,-82,220)
 		mStr(P.stat.clear_4,-82,340)
 	end,
-	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	score=function(P)return{min(P.stat.row or 200),P.stat.time}end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
-		if L==200 then
+		if L>=200 then
 			local T=P.stat.time
 			return
 			T<=140 and 5 or
@@ -48,7 +49,8 @@ return{
 			return
 			L>=150 and 3 or
 			L>=100 and 2 or
-			L>=40 and 1
+			L>=40 and 1 or
+			L>=1 and 0
 		end
 	end,
 }

modes/blind_hard.lua

@@ -1,3 +1,4 @@
+local min=math.min
 return{
 	name={
 		"隐形",
@@ -35,12 +36,12 @@ return{
 		mStr(P.stat.row,-82,220)
 		mStr(P.stat.clear_4,-82,340)
 	end,
-	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	score=function(P)return{min(P.stat.row or 200),P.stat.time}end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
-		if L==200 then
+		if L>=200 then
 			local T=P.stat.time
 			return
 			T<=150 and 5 or
@@ -50,7 +51,8 @@ return{
 			return
 			L>=150 and 3 or
 			L>=90 and 2 or
-			L>=40 and 1
+			L>=40 and 1 or
+			L>=1 and 0
 		end
 	end,
 }

modes/blind_lunatic.lua

@@ -1,3 +1,4 @@
+local min=math.min
 return{
 	name={
 		"隐形",
@@ -35,12 +36,12 @@ return{
 		mStr(P.stat.row,-82,220)
 		mStr(P.stat.clear_4,-82,340)
 	end,
-	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	score=function(P)return{min(P.stat.row or 200),P.stat.time}end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
-		if L==200 then
+		if L>=200 then
 			local T=P.stat.time
 			return
 			T<=180 and 5 or
@@ -50,7 +51,8 @@ return{
 			return
 			L>=150 and 3 or
 			L>=100 and 2 or
-			L>=40 and 1
+			L>=40 and 1 or
+			L>=1 and 0
 		end
 	end,
 }

modes/blind_normal.lua

@@ -1,3 +1,4 @@
+local min=math.min
 return{
 	name={
 		"隐形",
@@ -34,12 +35,12 @@ return{
 		mStr(P.stat.row,-82,220)
 		mStr(P.stat.clear_4,-82,340)
 	end,
-	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	score=function(P)return{min(P.stat.row or 200),P.stat.time}end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
-		if L==200 then
+		if L>=200 then
 			local T=P.stat.time
 			return
 			T<=150 and 5 or
@@ -49,7 +50,8 @@ return{
 			return
 			L>=150 and 3 or
 			L>=100 and 2 or
-			L>=40 and 1
+			L>=40 and 1 or
+			L>=1 and 0
 		end
 	end,
 }

modes/blind_ultimate.lua

@@ -1,3 +1,4 @@
+local min=math.min
 return{
 	name={
 		"隐形",
@@ -36,16 +37,17 @@ return{
 		mStr(P.stat.row,-82,220)
 		mStr(P.stat.clear_4,-82,340)
 	end,
-	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	score=function(P)return{min(P.stat.row or 200),P.stat.time}end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
+		L>=200 and 5 or
 		L>=100 and 4 or
 		L>=50 and 3 or
 		L>=26 and 2 or
-		L>=10 and 1
+		L>=10 and 1 or
+		L>=1 and 0
 	end,
 }

modes/c4wtrain_lunatic.lua

@@ -1,4 +1,4 @@
-local rnd=math.random
+local rnd,min=math.random,math.min
 local function check_c4w(P)
 	for i=1,#P.cleared do
 		P.field[#P.field+1]=getNewRow(10)
@@ -65,7 +65,7 @@ return{
 		mDraw(drawableText.combo,-82,358)
 		mDraw(drawableText.mxcmb,-82,450)
 	end,
-	score=function(P)return{P.combo<=100 and P.combo or 100,P.stat.time}end,
+	score=function(P)return{min(P.combo,100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Combo   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
@@ -80,7 +80,8 @@ return{
 			return
 			L>=70 and 3 or
 			L>=40 and 2 or
-			L>=20 and 1
+			L>=20 and 1 or
+			L>=5 and 0
 		end
 	end,
 }

modes/c4wtrain_normal.lua

@@ -1,4 +1,4 @@
-local rnd=math.random
+local rnd,min=math.random,math.min
 local function check_c4w(P)
 	for i=1,#P.cleared do
 		P.field[#P.field+1]=getNewRow(10)
@@ -63,7 +63,7 @@ return{
 		mDraw(drawableText.combo,-82,358)
 		mDraw(drawableText.mxcmb,-82,450)
 	end,
-	score=function(P)return{P.modeData.point<=100 and P.modeData.point or 100,P.stat.time}end,
+	score=function(P)return{min(P.modeData.point,100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Combo   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
@@ -78,7 +78,8 @@ return{
 		else
 			return
 			L>=60 and 2 or
-			L>=30 and 1
+			L>=30 and 1 or
+			L>=10 and 0
 		end
 	end,
 }

modes/classic_fast.lua

@@ -40,6 +40,7 @@ return{
 		target=10,dropPiece=check_LVup,
 		bg="rgb",bgm="rockblock",
 	},
+	slowmark=true,
 	load=function()
 		newPlayer(1,340,15)
 	end,
@@ -54,7 +55,7 @@ return{
 		gc.rectangle("fill",-125,375,90,4)
 	end,
 	score=function(P)return{P.stat.row,P.stat.score}end,
-	scoreDisp=function(D)return D[1].." Rows   "..D[2]end,
+	scoreDisp=function(D)return D[1].." Lines   "..D[2]end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]>b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
@@ -63,6 +64,7 @@ return{
 		L>=191 and 4 or
 		L>=110 and 3 or
 		L>=50 and 2 or
-		L>=2 and 1
+		L>=5 and 1 or
+		L>=1 and 0
 	end,
 }

modes/defender_lunatic.lua

@@ -73,6 +73,7 @@ return{
 		W>=80 and 4 or
 		W>=55 and 3 or
 		W>=30 and 2 or
-		W>=20 and 1
+		W>=20 and 1 or
+		L>=5 and 0
 	end,
 }

modes/defender_normal.lua

@@ -73,6 +73,7 @@ return{
 		W>=100 and 4 or
 		W>=70 and 3 or
 		W>=40 and 2 or
-		W>=10 and 1
+		W>=10 and 1 or
+		L>=3 and 0
 	end,
 }

modes/dig_hard.lua

@@ -40,7 +40,7 @@ return{
 		mDraw(drawableText.wave,-82,375)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.row}end,
-	scoreDisp=function(D)return D[1].." Waves   "..D[2].." Rows"end,
+	scoreDisp=function(D)return D[1].." Waves   "..D[2].." Lines"end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local W=P.modeData.event
@@ -49,6 +49,7 @@ return{
 		W>=110 and 4 or
 		W>=80 and 3 or
 		W>=50 and 2 or
-		W>=20 and 1
+		W>=20 and 1 or
+		L>=5 and 0
 	end,
 }

modes/dig_ultimate.lua

@@ -39,7 +39,7 @@ return{
 		mDraw(drawableText.wave,-82,375)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.row}end,
-	scoreDisp=function(D)return D[1].." Waves   "..D[2].." Rows"end,
+	scoreDisp=function(D)return D[1].." Waves   "..D[2].." Lines"end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local W=P.modeData.event
@@ -48,6 +48,7 @@ return{
 		W>=100 and 4 or
 		W>=80 and 3 or
 		W>=50 and 2 or
-		W>=20 and 1
+		W>=20 and 1 or
+		L>=5 and 0
 	end,
 }

modes/drought_lunatic.lua

@@ -1,3 +1,4 @@
+local min=math.min
 return{
 	name={
 		"干旱",
@@ -31,17 +32,23 @@ return{
 		local R=100-P.stat.row
 		mStr(R>=0 and R or 0,-82,280)
 	end,
-	score=function(P)return{P.stat.row<=100 and P.stat.row or 100,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	score=function(P)return{min(P.stat.row,100),P.stat.time}end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
-		if P.stat.row<100 then return end
-		local T=P.stat.time
-		return 
-		T<=70 and 5 or
-		T<=110 and 4 or
-		T<=160 and 3 or
-		T<=240 and 2 or
-		1
+		local L=P.stat.row
+		if L>=100 then
+			local T=P.stat.time
+			return 
+			T<=70 and 5 or
+			T<=110 and 4 or
+			T<=160 and 3 or
+			T<=240 and 2 or
+			1
+		else
+			return
+			L>=50 and 1 or
+			L>=10 and 0
+		end
 	end,
 }

modes/drought_normal.lua

@@ -1,3 +1,4 @@
+local min=math.min
 return{
 	name={
 		"干旱",
@@ -31,17 +32,23 @@ return{
 		local R=100-P.stat.row
 		mStr(R>=0 and R or 0,-82,280)
 	end,
-	score=function(P)return{P.stat.row<=100 and P.stat.row or 100,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	score=function(P)return{min(P.stat.row,100),P.stat.time}end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
-		if P.stat.row<100 then return end
-		local T=P.stat.time
-		return 
-		T<=65 and 5 or
-		T<=100 and 4 or
-		T<=145 and 3 or
-		T<=220 and 2 or
-		1
+		local L=P.stat.row
+		if L>=100 then
+			local T=P.stat.time
+			return 
+			T<=65 and 5 or
+			T<=100 and 4 or
+			T<=145 and 3 or
+			T<=220 and 2 or
+			1
+		else
+			return
+			L>=50 and 1 or
+			L>=10 and 0
+		end
 	end,
 }

modes/infinite.lua

@@ -32,7 +32,7 @@ return{
 		mDraw(drawableText.eff,-82,425)
 	end,
 	score=function(P)return{P.stat.score}end,
-	scoreDisp=function(D)return D[1]end,
+	scoreDisp=function(D)return tostring(D[1])end,
 	comp=function(a,b)return a[1]>b[1]end,
 	getRank=function(P)
 		local L=P.stat.row
@@ -41,6 +41,7 @@ return{
 		L>=1500 and 4 or
 		L>=1000 and 3 or
 		L>=500 and 2 or
-		L>=100 and 1
+		L>=100 and 1 or
+		L>=20 and 0
 	end,
 }

modes/infinite_dig.lua

@@ -49,7 +49,7 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.modeData.point}end,
-	scoreDisp=function(D)return D[1].." Rows"end,
+	scoreDisp=function(D)return D[1].." Lines"end,
 	comp=function(a,b)return a[1]>b[1]end,
 	getRank=function(P)
 		local L=P.modeData.point
@@ -58,6 +58,7 @@ return{
 		L>=400 and 4 or
 		L>=200 and 3 or
 		L>=100 and 2 or
-		L>=10 and 1
+		L>=40 and 1 or
+		L>=5 and 0
 	end,
 }

modes/marathon_hard.lua

@@ -1,7 +1,16 @@
 local gc=love.graphics
 local function check(P)
-	if P.stat.row>=200 then
-		Event.win(P,"finish")
+	if P.stat.row>=P.gameEnv.target then
+		local T=P.gameEnv.target
+		if T==50 then
+			P.gameEnv.drop=.25
+			P.gameEnv.target=100
+		elseif T==100 then
+			P.gameEnv._20G=true
+			P.gameEnv.target=200
+		else
+			Event.win(P,"finish")
+		end
 	end
 end
 
@@ -23,34 +32,37 @@ return{
 	},
 	color=color.magenta,
 	env={
-		_20G=true,fall=15,
-		dropPiece=check,
+		drop=.5,fall=30,
+		target=50,dropPiece=check,
+		mindas=7,minarr=1,minsdarr=1,
 		bg="strap",bgm="race",
 	},
+	slowmark=true,
 	load=function()
 		newPlayer(1,340,15)
 	end,
 	mesDisp=function(P,dx,dy)
 		setFont(45)
 		mStr(P.stat.row,-82,320)
-		mStr(200,-82,370)
+		mStr(P.gameEnv.target,-82,370)
 		gc.rectangle("fill",-125,375,90,4)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
-		if L==200 then
+		if L>=200 then
 			local T=P.stat.time
 			return
 			T<=200 and 5 or
-			T<=260 and 4 or
+			T<=270 and 4 or
 			3
 		else
 			return
 			L>=100 and 2 or
-			L>=50 and 1
+			L>=50 and 1 or
+			L>=10 and 0
 		end
 	end,
 }

modes/marathon_normal.lua

@@ -1,15 +1,14 @@
 local gc=love.graphics
-local marathon_drop={[0]=60,48,40,30,24,18,15,12,10,8,7,6,5,4,3,2,1,1,0,0}
+local dropSpeed={[0]=60,50,40,30,25,20,15,12,9,7,5,4,3,2,1,1,.5,.5,.25,.25}
 local function check_LVup(P)
 	local T=P.modeData.point+10
 	if P.stat.row>=T then
 		if T==200 then
 			Event.win(P,"finish")
 		else
-			P.gameEnv.drop=marathon_drop[T/10]
-			if T==180 then P.gameEnv._20G=true end
-			SFX("reach")
+			P.gameEnv.drop=dropSpeed[T/10]
 			P.modeData.point=T
+			SFX("reach")
 		end
 	end
 end
@@ -32,10 +31,13 @@ return{
 	},
 	color=color.green,
 	env={
-		drop=60,fall=20,
+		fall=30,
 		target=10,dropPiece=check_LVup,
+		mindas=7,minarr=1,minsdarr=1,
+		minsdarr=1,
 		bg="strap",bgm="way",
 	},
+	slowmark=true,
 	load=function()
 		newPlayer(1,340,15)
 	end,
@@ -46,20 +48,21 @@ return{
 		gc.rectangle("fill",-125,375,90,4)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows   "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
-		if L==200 then
+		if L>=200 then
 			local T=P.stat.time
 			return
-			T<=180 and 5 or
-			T<=240 and 4 or
+			T<=185 and 5 or
+			T<=250 and 4 or
 			3
 		else
 			return
 			L>=150 and 2 or
-			L>=100 and 1
+			L>=100 and 1 or
+			L>=20 and 0
 		end
 	end,
 }

modes/master_adavnce.lua

@@ -55,10 +55,11 @@ return{
 		wait=death_wait[1],
 		fall=death_fall[1],
 		dropPiece=score,
-		das=6,arr=1,
+		mindas=6,minarr=1,
 		freshLimit=15,
 		bg="game2",bgm="secret7th",
 	},
+	slowmark=true,
 	load=function()
 		newPlayer(1,340,15)
 	end,
@@ -74,18 +75,19 @@ return{
 		return a[1]>b[1]or(a[1]==b[1]and(a[2]<b[2]or a[2]==b[2]and a[3]<b[3]))
 	end,
 	getRank=function(P)
-		local L=P.stat.row
+		local L=P.stat.techrash
 		local S=P.modeData.point
 		if S==500 then
 			return
-			L<=260 and 5 or
-			L<=320 and 4 or
+			L>=30 and 5 or
+			L>=25 and 4 or
 			3
 		else
 			return
 			S>=426 and 3 or
 			S>=326 and 2 or
-			S>=226 and 1
+			S>=226 and 1 or
+			S>=50 and 0
 		end
 	end,
 }

modes/master_beginner.lua

@@ -63,6 +63,7 @@ return{
 		freshLimit=15,
 		bg="strap",bgm="secret8th",
 	},
+	slowmark=true,
 	load=function()
 		newPlayer(1,340,15)
 	end,
@@ -78,18 +79,19 @@ return{
 		return a[1]>b[1]or(a[1]==b[1]and(a[2]<b[2]or a[2]==b[2]and a[3]<b[3]))
 	end,
 	getRank=function(P)
-		local L=P.stat.row
+		local L=P.stat.techrash
 		local S=P.modeData.point
 		if S==500 then
 			return
-			L<=250 and 5 or
-			L<=300 and 4 or
+			L>=30 and 5 or
+			L>=25 and 4 or
 			3
 		else
 			return
 			S>=420 and 3 or
 			S>=250 and 2 or
-			S>=120 and 1
+			S>=120 and 1 or
+			S>=30 and 0
 		end
 	end,
 }

modes/master_final.lua

@@ -54,11 +54,12 @@ return{
 		_20G=true,lock=12,
 		wait=10,fall=10,
 		dropPiece=score,
-		das=5,arr=1,
+		mindas=5,minarr=1,
 		freshLimit=15,
 		easyFresh=false,bone=true,
 		bg="none",bgm="shining terminal",
 	},
+	slowmark=true,
 	load=function()
 		newPlayer(1,340,15)
 	end,
@@ -79,6 +80,7 @@ return{
 		S>=800 and 4 or
 		S>=600 and 3 or
 		S>=400 and 2 or
-		S>=200 and 1
+		S>=200 and 1 or
+		L>=50 and 0
 	end,
 }

modes/pcchallenge_hard.lua

@@ -52,6 +52,7 @@ return{
 		L>=13 and 4 or
 		L>=10 and 3 or
 		L>=7 and 2 or
-		L>=4 and 1
+		L>=4 and 1 or
+		L>=1 and 0
 	end,
 }

modes/pcchallenge_lunatic.lua

@@ -52,6 +52,7 @@ return{
 		L>=12 and 4 or
 		L>=9 and 3 or
 		L>=6 and 2 or
-		L>=3 and 1
+		L>=3 and 1 or
+		L>=1 and 0
 	end,
 }

modes/pcchallenge_normal.lua

@@ -51,6 +51,7 @@ return{
 		L>=20 and 4 or
 		L>=16 and 3 or
 		L>=13 and 2 or
-		L>=10 and 1
+		L>=10 and 1 or
+		L>=1 and 0
 	end,
 }

modes/pctrain_lunatic.lua

@@ -109,6 +109,7 @@ return{
 		L>=40 and 4 or
 		L>=30 and 3 or
 		L>=20 and 2 or
-		L>=10 and 1
+		L>=10 and 1 or
+		L>=1 and 0
 	end,
 }

modes/pctrain_normal.lua

@@ -92,6 +92,7 @@ return{
 		L>=60 and 4 or
 		L>=40 and 3 or
 		L>=25 and 2 or
-		L>=15 and 1
+		L>=15 and 1 or
+		L>=1 and 0
 	end,
 }

modes/round_1.lua

@@ -28,7 +28,7 @@ return{
 	},
 	color=color.cyan,
 	env={
-		drop=60,lock=60,
+		drop=1e99,lock=1e99,
 		oncehold=false,
 		dropPiece=update_round,
 		bg="game2",bgm="push",

modes/round_2.lua

@@ -28,7 +28,7 @@ return{
 	},
 	color=color.green,
 	env={
-		drop=60,lock=60,
+		drop=1e99,lock=1e99,
 		oncehold=false,
 		dropPiece=update_round,
 		bg="game2",bgm="push",

modes/round_3.lua

@@ -28,7 +28,7 @@ return{
 	},
 	color=color.magenta,
 	env={
-		drop=60,lock=60,
+		drop=1e99,lock=1e99,
 		oncehold=false,
 		dropPiece=update_round,
 		bg="game2",bgm="push",

modes/round_4.lua

@@ -28,7 +28,7 @@ return{
 	},
 	color=color.red,
 	env={
-		drop=60,lock=60,
+		drop=1e99,lock=1e99,
 		oncehold=false,
 		dropPiece=update_round,
 		bg="game2",bgm="push",

modes/round_5.lua

@@ -28,7 +28,7 @@ return{
 	},
 	color=color.lightYellow,
 	env={
-		drop=60,lock=60,
+		drop=1e99,lock=1e99,
 		oncehold=false,
 		dropPiece=update_round,
 		bg="game2",bgm="push",

modes/sprint_10.lua

@@ -48,6 +48,7 @@ return{
 		T<=10 and 4 or
 		T<=25 and 3 or
 		T<=40 and 2 or
-		T<=60 and 1
+		T<=60 and 1 or
+		0
 	end,
 }

modes/sprint_100.lua

@@ -48,6 +48,7 @@ return{
 		T<=90 and 4 or
 		T<=130 and 3 or
 		T<=200 and 2 or
-		T<=270 and 1
+		T<=270 and 1 or
+		0
 	end,
 }

modes/sprint_1000.lua

@@ -48,6 +48,7 @@ return{
 		T<=1000 and 4 or
 		T<=1400 and 3 or
 		T<=2200 and 2 or
-		T<=3000 and 1
+		T<=3000 and 1 or
+		0
 	end,
-}
+}	

modes/sprint_20.lua

@@ -48,6 +48,7 @@ return{
 		T<=18 and 4 or
 		T<=45 and 3 or
 		T<=70 and 2 or
-		T<=100 and 1
+		T<=100 and 1 or
+		0
 	end,
 }

modes/sprint_40.lua

@@ -47,7 +47,8 @@ return{
 		T<=25 and 5 or
 		T<=32 and 4 or
 		T<=40 and 3 or
-		T<=60 and 2 or
-		T<=100 and 1
+		T<=62 and 2 or
+		T<=126 and 1 or
+		0
 	end,
 }

modes/sprint_400.lua

@@ -48,6 +48,7 @@ return{
 		T<=330 and 4 or
 		T<=420 and 3 or
 		T<=626 and 2 or
-		T<=1000 and 1
+		T<=1000 and 1 or
+		0
 	end,
 }

modes/survivor_easy.lua

@@ -19,7 +19,6 @@ return{
 	env={
 		drop=30,lock=45,
 		freshLimit=10,
-		visible="time",
 		task=function(P)
 			if not P.control then return end
 			P.modeData.counter=P.modeData.counter+1
@@ -38,11 +37,9 @@ return{
 		newPlayer(1,340,15)
 	end,
 	mesDisp=function(P,dx,dy)
-		mDraw(drawableText.line,-82,300)
-		mDraw(drawableText.techrash,-82,420)
-		setFont(75)
-		mStr(P.stat.row,-82,220)
-		mStr(P.stat.clear_4,-82,340)
+		setFont(65)
+		mStr(P.modeData.event,-82,310)
+		mDraw(drawableText.wave,-82,375)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..toTime(D[2])end,
@@ -54,6 +51,7 @@ return{
 		W>=60 and 4 or
 		W>=45 and 3 or
 		W>=30 and 2 or
-		W>=15 and 1
+		W>=15 and 1 or
+		W>=5 and 0
 	end,
 }

modes/survivor_hard.lua

@@ -19,7 +19,6 @@ return{
 	env={
 		drop=30,lock=45,
 		freshLimit=10,
-		visible="time",
 		task=function(P)
 			if not P.control then return end
 			P.modeData.counter=P.modeData.counter+1
@@ -43,11 +42,9 @@ return{
 		newPlayer(1,340,15)
 	end,
 	mesDisp=function(P,dx,dy)
-		mDraw(drawableText.line,-82,300)
-		mDraw(drawableText.techrash,-82,420)
-		setFont(75)
-		mStr(P.stat.row,-82,220)
-		mStr(P.stat.clear_4,-82,340)
+		setFont(65)
+		mStr(P.modeData.event,-82,310)
+		mDraw(drawableText.wave,-82,375)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..toTime(D[2])end,
@@ -59,6 +56,7 @@ return{
 		W>=60 and 4 or
 		W>=45 and 3 or
 		W>=30 and 2 or
-		W>=15 and 1
+		W>=15 and 1 or
+		W>=5 and 0
 	end,
 }

modes/survivor_lunatic.lua

@@ -19,7 +19,6 @@ return{
 	env={
 		drop=30,lock=45,
 		freshLimit=10,
-		visible="time",
 		task=function(P)
 			if not P.control then return end
 			P.modeData.counter=P.modeData.counter+1
@@ -39,11 +38,9 @@ return{
 		newPlayer(1,340,15)
 	end,
 	mesDisp=function(P,dx,dy)
-		mDraw(drawableText.line,-82,300)
-		mDraw(drawableText.techrash,-82,420)
-		setFont(75)
-		mStr(P.stat.row,-82,220)
-		mStr(P.stat.clear_4,-82,340)
+		setFont(65)
+		mStr(P.modeData.event,-82,310)
+		mDraw(drawableText.wave,-82,375)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..toTime(D[2])end,
@@ -55,6 +52,7 @@ return{
 		W>=80 and 4 or
 		W>=55 and 3 or
 		W>=30 and 2 or
-		W>=15 and 1
+		W>=15 and 1 or
+		W>=5 and 0
 	end,
 }

modes/survivor_normal.lua

@@ -19,7 +19,6 @@ return{
 	env={
 		drop=30,lock=45,
 		freshLimit=10,
-		visible="time",
 		task=function(P)
 			if not P.control then return end
 			P.modeData.counter=P.modeData.counter+1
@@ -43,11 +42,9 @@ return{
 		newPlayer(1,340,15)
 	end,
 	mesDisp=function(P,dx,dy)
-		mDraw(drawableText.line,-82,300)
-		mDraw(drawableText.techrash,-82,420)
-		setFont(75)
-		mStr(P.stat.row,-82,220)
-		mStr(P.stat.clear_4,-82,340)
+		setFont(65)
+		mStr(P.modeData.event,-82,310)
+		mDraw(drawableText.wave,-82,375)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Waves   "..toTime(D[2])end,
@@ -59,6 +56,7 @@ return{
 		W>=55 and 4 or
 		W>=45 and 3 or
 		W>=30 and 2 or
-		W>=15 and 1
+		W>=15 and 1 or
+		W>=5 and 0
 	end,
 }

modes/survivor_ultimate.lua

@@ -58,6 +58,7 @@ return{
 		W>=26 and 4 or
 		W>=20 and 3 or
 		W>=10 and 2 or
-		W>=5 and 1
+		W>=5 and 1 or
+		W>=1 and 0
 	end,
 }

modes/tech_hard+.lua

@@ -1,3 +1,4 @@
+local format=string.format
 local function tech_check_ultimate(P)
 	if #P.cleared>0 and P.lastClear<10 or P.lastClear==74 then
 		Event.lose(P)
@@ -39,15 +40,16 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines  "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
-		L==126 and 4 or
-		L==90 and 3 or
-		L==60 and 2 or
-		L==30 and 1
+		L>=200 and 5 or
+		L>=126 and 4 or
+		L>=90 and 3 or
+		L>=60 and 2 or
+		L>=30 and 1 or
+		L>=5 and 0
 	end,
 }

modes/tech_hard.lua

@@ -1,3 +1,4 @@
+local format=string.format
 local function tech_check_easy(P)
 	if #P.cleared>0 and P.b2b<40 then
 		Event.lose(P)
@@ -39,15 +40,16 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines  "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
-		L==126 and 4 or
-		L==90 and 3 or
-		L==60 and 2 or
-		L==30 and 1
+		L>=200 and 5 or
+		L>=126 and 4 or
+		L>=90 and 3 or
+		L>=60 and 2 or
+		L>=30 and 1 or
+		L>=5 and 0
 	end,
 }

modes/tech_lunatic+.lua

@@ -1,3 +1,4 @@
+local format=string.format
 local function tech_check_ultimate(P)
 	if #P.cleared>0 and P.lastClear<10 or P.lastClear==74 then
 		Event.lose(P)
@@ -39,15 +40,16 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines  "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
-		L==140 and 4 or
-		L==90 and 3 or
-		L==60 and 2 or
-		L==30 and 1
+		L>=200 and 5 or
+		L>=140 and 4 or
+		L>=90 and 3 or
+		L>=60 and 2 or
+		L>=30 and 1 or
+		L>=5 and 0
 	end,
 }

modes/tech_lunatic.lua

@@ -1,3 +1,4 @@
+local format=string.format
 local function tech_check_hard(P)
 	if #P.cleared>0 and P.lastClear<10 then
 		Event.lose(P)
@@ -39,15 +40,16 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines  "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
-		L==140 and 4 or
-		L==90 and 3 or
-		L==60 and 2 or
-		L==30 and 1
+		L>=200 and 5 or
+		L>=140 and 4 or
+		L>=90 and 3 or
+		L>=60 and 2 or
+		L>=30 and 1 or
+		L>=5 and 0
 	end,
 }

modes/tech_normal+.lua

@@ -1,3 +1,4 @@
+local format=string.format
 local function tech_check_ultimate(P)
 	if #P.cleared>0 and P.lastClear<10 or P.lastClear==74 then
 		Event.lose(P)
@@ -39,15 +40,16 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines  "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
-		L==126 and 4 or
-		L==80 and 3 or
-		L==50 and 2 or
-		L==20 and 1
+		L>=200 and 5 or
+		L>=126 and 4 or
+		L>=80 and 3 or
+		L>=50 and 2 or
+		L>=20 and 1 or
+		L>=5 and 0
 	end,
 }

modes/tech_normal.lua

@@ -1,3 +1,4 @@
+local format=string.format
 local function tech_check_easy(P)
 	if #P.cleared>0 and P.b2b<40 then
 		Event.lose(P)
@@ -39,15 +40,16 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines  "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
-		L==126 and 4 or
-		L==80 and 3 or
-		L==50 and 2 or
-		L==20 and 1
+		L>=200 and 5 or
+		L>=126 and 4 or
+		L>=80 and 3 or
+		L>=50 and 2 or
+		L>=20 and 1 or
+		L>=5 and 0
 	end,
 }

modes/tech_ultimate+.lua

@@ -1,3 +1,4 @@
+local format=string.format
 local function tech_check_ultimate(P)
 	if #P.cleared>0 and P.lastClear<10 or P.lastClear==74 then
 		Event.lose(P)
@@ -40,15 +41,16 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines  "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
-		L==150 and 4 or
-		L==100 and 3 or
-		L==70 and 2 or
-		L==40 and 1
+		L>=200 and 5 or
+		L>=150 and 4 or
+		L>=100 and 3 or
+		L>=70 and 2 or
+		L>=40 and 1 or
+		L>=10 and 0
 	end,
 }

modes/tech_ultimate.lua

@@ -1,3 +1,4 @@
+local format=string.format
 local function tech_check_hard(P)
 	if #P.cleared>0 and P.lastClear<10 then
 		Event.lose(P)
@@ -40,15 +41,16 @@ return{
 		mDraw(drawableText.eff,-82,475)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." Rows  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Lines  "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local L=P.stat.row
 		return
-		L==200 and 5 or
-		L==150 and 4 or
-		L==100 and 3 or
-		L==70 and 2 or
-		L==40 and 1
+		L>=200 and 5 or
+		L>=150 and 4 or
+		L>=100 and 3 or
+		L>=70 and 2 or
+		L>=40 and 1 or
+		L>=10 and 0
 	end,
 }

modes/techmino49_easy.lua

@@ -74,7 +74,7 @@ return{
 	mesDisp=function(P,dx,dy)
 		setFont(35)
 		mStr(#players.alive.."/49",-82,175)
-		mStr(P.ko,-70,215)
+		mStr(P.modeData.point,-70,215)
 		gc.draw(drawableText.ko,-127,225)
 		setFont(20)
 		gc.setColor(1,.5,0,.6)
@@ -86,16 +86,17 @@ return{
 			gc.draw(badgeIcon,16*i-138,260)
 		end
 	end,
-	score=function(P)return{P.rank,P.ko}end,
+	score=function(P)return{P.modeData.event,P.modeData.point}end,
 	scoreDisp=function(D)return"NO."..D[1].."   KO:"..D[2]end,
 	comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]>b[2]end,
 	getRank=function(P)
-		local R=P.rank
+		local R=P.modeData.event
 		return
 		R==1 and 5 or
 		R<=3 and 4 or
 		R<=5 and 3 or
 		R<=10 and 2 or
-		R<=15 and 1
+		R<=15 and 1 or
+		R<=45 and 0
 	end,
 }

modes/techmino49_hard.lua

@@ -74,7 +74,7 @@ return{
 	mesDisp=function(P,dx,dy)
 		setFont(35)
 		mStr(#players.alive.."/49",-82,175)
-		mStr(P.ko,-70,215)
+		mStr(P.modeData.point,-70,215)
 		gc.draw(drawableText.ko,-127,225)
 		setFont(20)
 		gc.setColor(1,.5,0,.6)
@@ -86,16 +86,17 @@ return{
 			gc.draw(badgeIcon,16*i-138,260)
 		end
 	end,
-	score=function(P)return{P.rank,P.ko}end,
+	score=function(P)return{P.modeData.event,P.modeData.point}end,
 	scoreDisp=function(D)return"NO."..D[1].."   KO:"..D[2]end,
 	comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]>b[2]end,
 	getRank=function(P)
-		local R=P.rank
+		local R=P.modeData.event
 		return
 		R==1 and 5 or
 		R==2 and 4 or
 		R<=4 and 3 or
 		R<=6 and 2 or
-		R<=8 and 1
+		R<=8 and 1 or
+		R<=45 and 0
 	end,
 }

modes/techmino49_ultimate.lua

@@ -74,7 +74,7 @@ return{
 	mesDisp=function(P,dx,dy)
 		setFont(35)
 		mStr(#players.alive.."/49",-82,175)
-		mStr(P.ko,-70,215)
+		mStr(P.modeData.point,-70,215)
 		gc.draw(drawableText.ko,-127,225)
 		setFont(20)
 		gc.setColor(1,.5,0,.6)
@@ -86,16 +86,17 @@ return{
 			gc.draw(badgeIcon,16*i-138,260)
 		end
 	end,
-	score=function(P)return{P.rank,P.ko}end,
+	score=function(P)return{P.modeData.event,P.modeData.point}end,
 	scoreDisp=function(D)return"NO."..D[1].."   KO:"..D[2]end,
 	comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]>b[2]end,
 	getRank=function(P)
-		local R=P.rank
+		local R=P.modeData.event
 		return
 		R==1 and 5 or
 		R==2 and 4 or
 		R==3 and 3 or
 		R==4 and 2 or
-		R<=6 and 1
+		R<=6 and 1 or
+		R<=45 and 0
 	end,
 }

modes/techmino99_easy.lua

@@ -74,7 +74,7 @@ return{
 	mesDisp=function(P,dx,dy)
 		setFont(35)
 		mStr(#players.alive.."/99",-82,175)
-		mStr(P.ko,-70,215)
+		mStr(P.modeData.point,-70,215)
 		gc.draw(drawableText.ko,-127,225)
 		setFont(20)
 		gc.setColor(1,.5,0,.6)
@@ -86,16 +86,17 @@ return{
 			gc.draw(badgeIcon,16*i-138,260)
 		end
 	end,
-	score=function(P)return{P.rank,P.ko}end,
+	score=function(P)return{P.modeData.event,P.modeData.point}end,
 	scoreDisp=function(D)return"NO."..D[1].."   KO:"..D[2]end,
 	comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]>b[2]end,
 	getRank=function(P)
-		local R=P.rank
+		local R=P.modeData.event
 		return
 		R==1 and 5 or
 		R<=3 and 4 or
 		R<=6 and 3 or
 		R<=10 and 2 or
-		R<=20 and 1
+		R<=20 and 1 or
+		R<=90 and 0
 	end,
 }

modes/techmino99_hard.lua

@@ -74,7 +74,7 @@ return{
 	mesDisp=function(P,dx,dy)
 		setFont(35)
 		mStr(#players.alive.."/99",-82,175)
-		mStr(P.ko,-70,215)
+		mStr(P.modeData.point,-70,215)
 		gc.draw(drawableText.ko,-127,225)
 		setFont(20)
 		gc.setColor(1,.5,0,.6)
@@ -86,16 +86,17 @@ return{
 			gc.draw(badgeIcon,16*i-138,260)
 		end
 	end,
-	score=function(P)return{P.rank,P.ko}end,
+	score=function(P)return{P.modeData.event,P.modeData.point}end,
 	scoreDisp=function(D)return"NO."..D[1].."   KO:"..D[2]end,
 	comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]>b[2]end,
 	getRank=function(P)
-		local R=P.rank
+		local R=P.modeData.event
 		return
 		R==1 and 5 or
 		R<=3 and 4 or
 		R<=6 and 3 or
 		R<=8 and 2 or
-		R<=10 and 1
+		R<=10 and 1 or
+		R<=90 and 0
 	end,
 }

modes/techmino99_ultimate.lua

@@ -58,7 +58,7 @@ return{
 			if L[n]then
 				newPlayer(n,46*i-36,97*j-72,.068,AITemplate("9S",rnd(4,6)))
 			else
-				newPlayer(n,46*i-36,97*j-72,.068,AITemplate("CC",rnd(4,6)-1,LV+1,true,LV*10000))
+				newPlayer(n,46*i-36,97*j-72,.068,AITemplate("CC",rnd(4,6)-1,4,true,30000))
 			end
 			n=n+1
 		end end
@@ -66,7 +66,7 @@ return{
 			if L[n]then
 				newPlayer(n,46*i+264,97*j-72,.068,AITemplate("9S",rnd(4,6)))
 			else
-				newPlayer(n,46*i+264,97*j-72,.068,AITemplate("CC",rnd(4,6)-1,LV+1,true,LV*10000))
+				newPlayer(n,46*i+264,97*j-72,.068,AITemplate("CC",rnd(4,6)-1,4,true,30000))
 			end
 			n=n+1
 		end end
@@ -74,7 +74,7 @@ return{
 	mesDisp=function(P,dx,dy)
 		setFont(35)
 		mStr(#players.alive.."/99",-82,175)
-		mStr(P.ko,-70,215)
+		mStr(P.modeData.point,-70,215)
 		gc.draw(drawableText.ko,-127,225)
 		setFont(20)
 		gc.setColor(1,.5,0,.6)
@@ -86,16 +86,17 @@ return{
 			gc.draw(badgeIcon,16*i-138,260)
 		end
 	end,
-	score=function(P)return{P.rank,P.ko}end,
+	score=function(P)return{P.modeData.event,P.modeData.point}end,
 	scoreDisp=function(D)return"NO."..D[1].."   KO:"..D[2]end,
 	comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]>b[2]end,
 	getRank=function(P)
-		local R=P.rank
+		local R=P.modeData.event
 		return
 		R==1 and 5 or
 		R==2 and 4 or
 		R==3 and 3 or
 		R<=5 and 2 or
-		R<=7 and 1
+		R<=7 and 1 or
+		R<=90 and 0
 	end,
 }

modes/tsd_easy.lua

@@ -41,7 +41,7 @@ return{
 		mDraw(drawableText.tsd,-82,407)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
-	scoreDisp=function(D)return"NO."..D[1]"   KO:"..D[2]end,
+	scoreDisp=function(D)return D[1].."TSD   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local T=P.modeData.event
@@ -50,6 +50,7 @@ return{
 		T>=20 and 4 or
 		T>=15 and 3 or
 		T>=10 and 2 or
-		T>=6 and 1
+		T>=6 and 1 or
+		T>=1 and 0
 	end,
 }

modes/tsd_hard.lua

@@ -41,7 +41,7 @@ return{
 		mDraw(drawableText.tsd,-82,407)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
-	scoreDisp=function(D)return"NO."..D[1]"   KO:"..D[2]end,
+	scoreDisp=function(D)return D[1].."TSD   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local T=P.modeData.event
@@ -50,6 +50,7 @@ return{
 		T>=19 and 4 or
 		T>=16 and 3 or
 		T>=13 and 2 or
-		T>=10 and 1
+		T>=10 and 1 or
+		T>=1 and 0
 	end,
 }

modes/tsd_ultimate.lua

@@ -41,7 +41,7 @@ return{
 		mDraw(drawableText.tsd,-82,407)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
-	scoreDisp=function(D)return"NO."..D[1]"   KO:"..D[2]end,
+	scoreDisp=function(D)return D[1].."TSD   "..toTime(D[2])end,
 	comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
 	getRank=function(P)
 		local T=P.modeData.event
@@ -50,6 +50,7 @@ return{
 		T>=18 and 4 or
 		T>=16 and 3 or
 		T>=14 and 2 or
-		T>=12 and 1
+		T>=12 and 1 or
+		T>=1 and 0
 	end,
 }

modes/ultra.lua

@@ -1,3 +1,4 @@
+local gc=love.graphics
 return{
 	name={
 		"限时打分",
@@ -33,7 +34,7 @@ return{
 		gc.arc("fill",-40,100,50,0,1)
 	end,
 	score=function(P)return{P.score}end,
-	scoreDisp=function(D)return D[1]end,
+	scoreDisp=function(D)return tostring(D[1])end,
 	comp=function(a,b)return a[1]>b[1]end,
 	getRank=function(P)
 		local T=P.stat.score

modes/zen.lua

@@ -30,15 +30,15 @@ return{
 		mStr(R>=0 and R or 0,-82,280)
 	end,
 	score=function(P)return{P.stat.score}end,
-	scoreDisp=function(D)return D[1]end,
+	scoreDisp=function(D)return tostring(D[1])end,
 	comp=function(a,b)return a[1]>b[1]end,
 	getRank=function(P)
 		local T=P.stat.score
 		return
-		T>=1e5 and 5 or
-		T>=8e4 and 4 or
-		T>=5e4 and 3 or
-		T>=2e4 and 2 or
+		T>=12e4 and 5 or
+		T>=10e4 and 4 or
+		T>=6e4 and 3 or
+		T>=3e4 and 2 or
 		T>=1e4 and 1
 	end,
 }

paint.lua

@@ -1,12 +1,11 @@
 local gc=love.graphics
 local setFont=setFont
-local int,abs,rnd,max,min,sin=math.floor,math.abs,math.random,math.max,math.min,math.sin
+local int,ceil,rnd,max,min,sin=math.floor,math.ceil,math.random,math.max,math.min,math.sin
 local format=string.format
 
 local Timer=love.timer.getTime
 local scr=scr
 local modeRankColor={
-	[0]=color.darkGrey,	--Not pass
 	color.bronze,		--Rank1
 	color.lightGrey,	--Rank2
 	color.lightYellow,	--Rank3
@@ -31,8 +30,6 @@ local function stencil_miniTitle()
 	end
 end
 
-FX_BGblock={tm=150,next=7,ct=0,list={}}--Falling tetrominos on background
-for _=1,16 do FX_BGblock.list[_]={v=0}end
 FX_attack={}--Attack beam
 FX_badge={}--Badge thrown
 sysFX={}
@@ -61,21 +58,19 @@ end
 local function drawVirtualkey()
 	local a=setting.VKAlpha*.1
 	for i=1,#virtualkey do
-		if i~=9 or modeEnv.Fkey then
-			local B=virtualkey[i]
-			if B.ava then
-				local _=virtualkeyDown[i]and gc.setColor(.7,.7,.7,a)or gc.setColor(1,1,1,a)--Dark magic
-				gc.setLineWidth(B.r*.07)
-				local ΔY=virtualkeyPressTime[i]
-				gc.circle("line",B.x,B.y+ΔY,B.r)--Outline circle
-				if setting.VKIcon then
-					gc.draw(VKIcon[i],B.x,B.y+ΔY,nil,B.r*.025,nil,18,18)
-				end--Icon
-				if ΔY>0 then
-					gc.setColor(1,1,1,a*ΔY*.1)
-					gc.circle("line",B.x,B.y,B.r*(1.4-ΔY*.04))
-				end--Ripple
-			end
+		local B=virtualkey[i]
+		if B.ava then
+			local _=virtualkeyDown[i]and gc.setColor(.7,.7,.7,a)or gc.setColor(1,1,1,a)--Dark magic
+			gc.setLineWidth(B.r*.07)
+			local ΔY=virtualkeyPressTime[i]
+			gc.circle("line",B.x,B.y+ΔY,B.r)--Outline circle
+			if setting.VKIcon then
+				gc.draw(VKIcon[i],B.x,B.y+ΔY,nil,B.r*.025,nil,18,18)
+			end--Icon
+			if ΔY>0 then
+				gc.setColor(1,1,1,a*ΔY*.1)
+				gc.circle("line",B.x,B.y,B.r*(1.4-ΔY*.04))
+			end--Ripple
 		end
 	end
 end
@@ -84,6 +79,9 @@ local Pnt={BG={}}
 function Pnt.BG.none()
 	gc.clear(.15,.15,.15)
 end
+function Pnt.BG.black()
+	gc.clear()
+end
 function Pnt.BG.grey()
 	gc.clear(.3,.3,.3)
 end
@@ -103,35 +101,37 @@ function Pnt.BG.rgb()
 end
 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)
+	local x=Timer()%16*-64
+	::L::
+	gc.draw(background2,x,0,nil,8,scr.h)
+	x=x+1024--image width*8
+	if x<scr.w then goto L end
 end
 function Pnt.BG.flink()
 	local t=.13-Timer()%3%1.7
-	if t<.25 then
-		gc.clear(t,t,t)
-	else
-		gc.clear(0,0,0)
+	if t<.25 then gc.clear(t,t,t)
+	else gc.clear(0,0,0)
 	end
 end
 function Pnt.BG.game1()
 	gc.setColor(1,1,1)
-	gc.draw(background1,640,360,Timer()*.15,12,nil,64,64)
+	gc.draw(background1,scr.w*.5,scr.h*.5,Timer()*.15,scr.rad*.0625,nil,16,16)
 end--Rainbow
 function Pnt.BG.game2()
 	gc.setColor(1,.5,.5)
-	gc.draw(background1,640,360,Timer()*.2,12,nil,64,64)
+	gc.draw(background1,scr.w*.5,scr.h*.5,Timer()*.15,scr.rad*.0625,nil,16,16)
 end--Red rainbow
 function Pnt.BG.game3()
 	gc.setColor(.6,.6,1)
-	gc.draw(background1,640,360,Timer()*.25,12,nil,64,64)
+	gc.draw(background1,scr.w*.5,scr.h*.5,Timer()*.15,scr.rad*.0625,nil,16,16)
 end--Blue rainbow
 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)
+	local x=Timer()%8*-128
+	::L::
+	gc.draw(background2,x,0,nil,8,scr.h)
+	x=x+1024--image width*8
+	if x<scr.w then goto L end
 end--Fast strap
 function Pnt.BG.game5()
 	local t=2.5-Timer()%20%6%2.5
@@ -149,16 +149,19 @@ function Pnt.BG.game6()
 	local r=7-int(Timer()*.5)%7
 	gc.draw(miniBlock[r],640,360,Timer()%3.1416*6,400,400,scs[2*r]-.5,#blocks[r][0]-scs[2*r-1]+.5)
 end--Fast lightning&spining tetromino
-local matrixT={}for i=0,15 do matrixT[i]={}for j=0,8 do matrixT[i][j]=love.math.noise(i,j)+2 end end
+local matrixT={}for i=1,20 do matrixT[i]={}for j=1,20 do matrixT[i][j]=love.math.noise(i,j)+2 end end
 function Pnt.BG.matrix()
+	gc.scale(scr.k)
 	gc.clear(.15,.15,.15)
-	for i=0,15 do
-		for j=0,8 do
+	local _=ceil(scr.y/80)
+	for i=1,ceil(scr.x/80)do
+		for j=1,_ do
 			local t=sin(matrixT[i][j]*Timer())*.2+.2
 			gc.setColor(1,1,1,t)
-			gc.rectangle("fill",80*i,80*j,80,80)
+			gc.rectangle("fill",80*i,80*j,-80,-80)
 		end
 	end
+	gc.scale(1/scr.k)
 end
 
 function Pnt.load()
@@ -208,12 +211,14 @@ function Pnt.mode()
 	gc.scale(cam.zoomK)
 	gc.translate(-cam.x1,-cam.y1)
 	gc.scale(cam.k1)
-	local MM,R=modes,modeRanks
+	local MM=modes
+	local R=modeRanks
+	setFont(30)
 	for _=1,#MM do
 		local M=MM[_]
 		if R[_]then
 			gc.setLineWidth(8)
-			gc.setColor(1,1,1,.15)
+			gc.setColor(1,1,1,.2)
 			for _=1,#M.unlock do
 				local m=M.unlock[_]
 				if R[m]then
@@ -223,9 +228,16 @@ function Pnt.mode()
 			end
 
 			local S=M.size
-			local d=((M.x-(cam.x1-180)/cam.k1)^2+(M.y-cam.y1/cam.k1)^2)^.5
-			if d<600 then S=S*(1.3-d*0.0005) end
-			gc.setColor(modeRankColor[modeRanks[M.id]])
+			local d=((M.x-(cam.x1+(cam.sel and -180 or 0))/cam.k1)^2+(M.y-cam.y1/cam.k1)^2)^.55
+			if d<500 then S=S*(1.25-d*0.0005) end
+			local c=modeRankColor[modeRanks[M.id]]
+			if c then
+				gc.setColor(c)
+			else
+				c=.5+sin(Timer()*6+_)*.2
+				S=S*(.8+c*.5)
+				gc.setColor(c,c,c)
+			end
 			if M.shape==1 then--Rectangle
 				gc.rectangle("fill",M.x-S,M.y-S,2*S,2*S)
 				if cam.sel==_ then
@@ -233,42 +245,73 @@ function Pnt.mode()
 					gc.setLineWidth(10)
 					gc.rectangle("line",M.x-S+5,M.y-S+5,2*S-10,2*S-10)
 				end
-			elseif M.shape==2 then--Octagon
+			elseif M.shape==2 then--diamond
+				gc.circle("fill",M.x,M.y,S+5,4)
+				if cam.sel==_ then
+					gc.setColor(1,1,1)
+					gc.setLineWidth(10)
+					gc.circle("line",M.x,M.y,S+5,4)
+				end
+			elseif M.shape==3 then--Octagon
 				gc.circle("fill",M.x,M.y,S,8)
 				if cam.sel==_ then
 					gc.setColor(1,1,1)
 					gc.setLineWidth(10)
-					gc.circle("line",M.x,M.y,S-5,8)
+					gc.circle("line",M.x,M.y,S,8)
 				end
 			end
+			if M.icon then
+				local i=M.icon
+				local l=i:getWidth()*.5
+				local k=S/l*.8
+				gc.setColor(0,0,0,2)
+				gc.draw(i,M.x-1,M.y-1,nil,k,nil,l,l)
+				gc.draw(i,M.x-1,M.y+1,nil,k,nil,l,l)
+				gc.draw(i,M.x+1,M.y-1,nil,k,nil,l,l)
+				gc.draw(i,M.x+1,M.y+1,nil,k,nil,l,l)
+				gc.setColor(1,1,1)
+				gc.draw(i,M.x,M.y,nil,k,nil,l,l)
+			end
 		end
 	end
 	gc.pop()
 	if cam.sel then
 		local M=MM[cam.sel]
 		local lang=setting.lang
-		gc.setColor(.6,.6,.6,.5)
+		gc.setColor(.7,.7,.7,.5)
 		gc.rectangle("fill",920,0,360,720)--Info board
 		gc.setColor(M.color)
-		setFont(40)
-		mStr(M.name[lang],1030,5)
-		setFont(30)
-		mStr(M.level[lang],1030,50)
+		setFont(40)mStr(M.name[lang],1100,5)
+		setFont(30)mStr(M.level[lang],1100,50)
 		gc.setColor(1,1,1)
-		setFont(30)
-		gc.printf(M.info[lang],1100-180,130,360,"center")
-		local L=M.records
-		if L[1]then
+		setFont(28)gc.printf(M.info[lang],920,110,360,"center")
+		if M.slowmark then
+			gc.draw(ctrlSpeedLimit,1230,50,nil,.4)
+		end
+		if M.score then
 			mDraw(drawableText.highScore,1100,240)
-			gc.setColor(.3,.3,.3,.8)
+			gc.setColor(.4,.4,.4,.8)
 			gc.rectangle("fill",940,290,320,280)--Highscore board
+			local L=M.records
 			gc.setColor(1,1,1)
-			setFont(23)
-			for i=1,#L do
-				gc.print(M.scoreDisp(L[i]),955,275+25*i)
+			if L[1]then
+				for i=1,#L do
+					local t=M.scoreDisp(L[i])
+					local s=#t
+					local dy
+					if s<15 then		dy=0
+					elseif s<25 then	dy=2
+					else				dy=4
+					end
+					setFont(int(26-s*.4))
+					gc.print(t,955,275+dy+25*i)
+					setFont(10)
+					local _=L[i].date
+					if _ then gc.print(_,1155,284+25*i)end
+				end
+			else
+				mDraw(drawableText.noScore,1100,370)
 			end
-		elseif M.score then
-			mDraw(drawableText.noScore,1100,370)
 		end
 	end
 	if cam.keyCtrl then
@@ -424,7 +467,10 @@ end
 function Pnt.pause()
 	Pnt.play()
 	gc.setColor(0,0,0,pauseTimer*.015)
-	gc.rectangle("fill",0,0,1280,720)
+	gc.push("transform")
+		gc.origin()
+		gc.rectangle("fill",0,0,scr.w,scr.h)
+	gc.pop()
 	gc.setColor(1,1,1,pauseTimer*.02)
 	setFont(25)
 	if pauseCount>0 then
@@ -449,12 +495,12 @@ end
 function Pnt.setting_game()
 	gc.setColor(1,1,1)
 	mDraw(drawableText.setting_game,640,15)
-	setFont(35)
-	mStr("DAS:"..setting.das,290,205)
-	mStr("ARR:"..setting.arr,610,205)
-	setFont(23)
-	mStr(text.softdropdas..setting.sddas,290,323)
-	mStr(text.softdroparr..setting.sdarr,610,323)
+	setFont(33)
+	mStr("DAS:"..setting.das.."F",290,205)
+	mStr("ARR:"..setting.arr.."F",610,205)
+	setFont(22)
+	mStr(text.softdropdas..setting.sddas.."F",290,323)
+	mStr(text.softdroparr..setting.sdarr.."F",610,323)
 end
 function Pnt.setting_graphic()
 	gc.setColor(1,1,1)

parts/space.lua

@@ -0,0 +1,112 @@
+local gc=love.graphics
+local sin,cos,rnd,min=math.sin,math.cos,math.random,math.min
+
+local W,H,R--w,h+=100,r=real Radius
+local stars={}
+local planet={}
+
+local function newPlanet()
+	local a=rnd()*3.142
+	local r=(H+W)*(rnd()*2+1)*.06
+	planet.r=r
+	planet.x=W*.5+cos(a)*(R+r)
+	planet.y=H*.5+sin(a)*(R+r)
+	planet.vx=-cos(a+rnd()-.5)*.2
+	planet.vy=-sin(a+rnd()-.5)*.2
+	planet.R=.7+rnd()*.2
+	planet.G=.7+rnd()*.1
+end
+
+local space={}--LIB
+function space.resize(w,h)
+	R=((w*.5)^2+(h*.5)^2)^.5
+	W,H=w+100,h+100
+end
+function space.new()
+	newPlanet()
+	for i=1,2600,5 do
+		local s=0.75*2^(rnd()*1.5)
+		stars[i]=s					--size
+		stars[i+1]=rnd(W)			--x
+		stars[i+2]=rnd(H)			--y
+		stars[i+3]=(rnd()-.5)*.05*s	--vx
+		stars[i+4]=(rnd()-.5)*.05*s	--vy
+	end--800 stars
+end
+function space.translate(dx,dy)
+	planet.x=planet.x+dx*.26
+	planet.y=planet.y+dy*.26
+	for i=1,2600,5 do
+		local s=stars[i]
+		stars[i+1]=stars[i+1]+dx*s
+		stars[i+2]=stars[i+2]+dy*s
+	end
+end
+function space.scale(k)
+	planet.r=planet.r*k^.15
+	for i=1,2600,5 do
+		local s=stars[i]
+		local x=stars[i+1]
+		local y=stars[i+2]
+		s=s*k
+		x=W*.5+(x-W*.5)*k
+		y=H*.5+(y-H*.5)*k
+		if k>1 then
+			if x%W~=x or y%H~=y then
+				s=.75
+				x=W*.5+(rnd()-.5)*W*.5
+				y=H*.5+(rnd()-.5)*H*.5
+			end
+			--out,new small one
+		elseif s<.75 then
+			local vx,vy
+			repeat
+				s=rnd()*.75+2.25
+				stars[i]=s			--size
+				x=rnd(W)			--x
+				y=rnd(H)			--y
+				vx=(rnd()-.5)*.15	--vx
+				vy=(rnd()-.5)*.15	--vy
+			until x<100 or x>W-100 or y<100 or y>H-100
+			stars[i+3]=vx
+			stars[i+4]=vy
+			--disappear,new big one
+		end
+		stars[i]=s
+		stars[i+1]=x
+		stars[i+2]=y
+	end
+end
+function space.update(dt)
+	local x,y=planet.x,planet.y
+	planet.x=planet.x+planet.vx
+	planet.y=planet.y+planet.vy
+	if((planet.x-W*.5)^2+(planet.y-H*.5)^2)^.5>R+planet.r then
+		newPlanet()
+	end
+	for i=1,2600,5 do
+		stars[i+1]=(stars[i+1]+stars[i+3])%W
+		stars[i+2]=(stars[i+2]+stars[i+4])%H
+	end--stars moving
+end
+function space.draw()
+	if not stars[1]then return end
+	gc.translate(-50,-50)
+	gc.setLineWidth(7)
+	gc.setColor(planet.R,planet.G,.6,.2)
+	gc.circle("line",planet.x,planet.y,planet.r+1)
+	gc.setColor(planet.R,planet.G,.6,.5)
+	gc.circle("fill",planet.x,planet.y,planet.r)
+	gc.setColor(1,1,1)
+	for i=1,2600,5 do
+		local x,y=stars[i+1],stars[i+2]
+		gc.circle("fill",x,y,stars[i])
+	end
+	gc.translate(50,50)
+end
+function space.discard()
+	stars={}
+	planet={}
+	collectgarbage()
+end
+return space

player.lua

@@ -4,6 +4,7 @@ local Timer=love.timer.getTime
 local int,ceil,abs,rnd,max,min=math.floor,math.ceil,math.abs,math.random,math.max,math.min
 local ins,rem=table.insert,table.remove
 local format=string.format
+local actName=actName--controllings' id
 local scr=scr--screen camera
 -------------------------</Head>-------------------------
 
@@ -27,6 +28,7 @@ local gameEnv0={
 	freshLimit=1e99,easyFresh=true,
 	fine=false,fineKill=false,
 	target=1e99,dropPiece=NULL,
+	mindas=0,minarr=0,minsdarr=0,
 	bg="none",bgm="race"
 }
 local renATK={[0]=0,0,0,1,1,2,2,3,3,4,4}--3 else
@@ -41,9 +43,10 @@ local spinSCR={--[blockName][row]
 	{250,800,1500},--T
 	{300,1000,2200},--O
 	{300,1000,1800},--I
-}--MUL:1.2,2.0
---Techrash:1K;MUL:1.3,1.8
---Mini*=.5
+}
+--B2BMUL:1.2/2.0
+--Techrash:1K;MUL:1.3/1.8
+--Mini*=.6
 local visible_opt={show=1e99,time=300,fast=20,none=5}
 local reAtk={0,0,1,1,1,2,2,3,3}
 local reDef={0,1,1,2,3,3,4,4,5}
@@ -100,8 +103,8 @@ local TRS={
 		[03]={TMP1,{1,0},	{1,1},	{0,-2},	{-1,1}	},
 		[30]={TMP1,{-1,0},	{-1,-1},{0,2},	{-1,2}	},
 		[12]={TMP1,{1,0},	{1,-1},	{0,2},	{1,2},	{1,1}	},
-		[21]={TMP1,{-1,0},	{-1,1},	{0,-2},	{-1,-2},{-1,-1}	},
-		[32]={TMP1,{-1,0},	{-1,-1},{1,0},	{0,2},	{-1,2}	},
+		[21]={TMP1,{-1,0},	{-1,-1},{-1,1},	{0,-2},	{-1,-2},{-1,-1}	},
+		[32]={TMP1,{-1,0},	{-1,-1},{-1,1},	{1,0},	{0,2},	{-1,2}	},
 		[23]={TMP1,{1,0},	{1,1},	{-1,0},	{0,-2},	{1,-2}	},
 		[02]={TMP1,{1,0},	{-1,0},	{0,-1},	{0,1}	},
 		[20]={TMP1,{-1,0},	{1,0},	{0,1},	{0,-1}	},
@@ -113,10 +116,10 @@ local TRS={
 		[10]={TMP1,{1,0},	{1,-1},	{0,2},	{1,2}	},
 		[03]={TMP1,{1,0},	{1,1},	{0,-2},	{1,-2},	{1,-1},	{0,1}	},
 		[30]={TMP1,{-1,0},	{-1,-1},{0,2},	{-1,2},	{0,-1},	{-1,1}	},
-		[12]={TMP1,{1,0},	{1,-1},	{-1,0},	{0,2},	{1,2}	},
+		[12]={TMP1,{1,0},	{1,-1},	{1,1},	{-1,0},	{0,2},	{1,2}	},
 		[21]={TMP1,{-1,0},	{-1,1},	{1,0},	{0,-2},	{-1,-2}	},
 		[32]={TMP1,{-1,0},	{-1,-1},{0,2},	{-1,2},	{-1,1}	},
-		[23]={TMP1,{1,0},	{1,1},	{0,-2},	{1,-2},	{1,-1}	},
+		[23]={TMP1,{1,0},	{1,-1},	{1,1},	{0,-2},	{1,-2},	{1,-1}	},
 		[02]={TMP1,{-1,0},	{1,0},	{0,-1},	{0,1}	},
 		[20]={TMP1,{1,0},	{-1,0},	{0,1},	{0,-1}	},
 		[13]={TMP1,{0,-1},	{1,0},	{0,1}	},
@@ -515,7 +518,7 @@ function Pdraw_small(P)
 		if P.result then
 			gc.setColor(1,1,1,min(P.endCounter,60)*.01)
 			setFont(17)mStr(P.result,32,47)
-			setFont(15)mStr(P.rank,30,82)
+			setFont(15)mStr(P.modeData.event,30,82)
 		end
 		gc.pop()
 		gc.setCanvas()
@@ -724,11 +727,23 @@ function player.update(P,dt)
 			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
+			local D=P.dropDelay
+			if D>1 then
+				P.dropDelay=D-1
+				goto stop
+			end
+			if D==1 then
+				P.curY=P.curY-1
+			else
+				local _=P.curY-P.y_img--max fall dist
+				D=1/D--fall dist
+				if D<_ then
+					P.curY=P.curY-D
+					assert(P.curY==int(P.curY),"y:"..P.curY.." fall:"..D.." D_env:"..P.gameEnv.drop)
+				else
+					P.curY=P.y_img
+				end
 			end
-			P.curY=P.curY-1
 			P.spinLast=false
 			if P.y_img~=P.curY then
 				P.dropDelay=P.gameEnv.drop
@@ -962,10 +977,10 @@ function player.fineError(P,rate)
 	P.stat.extraRate=P.stat.extraRate+rate
 	if P.human then
 		if P.gameEnv.fineKill then
-			SFX("error_long")
+			SFX("finesseError_long")
 			Event.lose(P)
 		elseif setting.fine then
-			SFX("error")
+			SFX("finesseError")
 		end
 	elseif P.gameEnv.fineKill then
 		Event.lose(P)
@@ -1507,7 +1522,7 @@ function player.drop(P)--Place piece
 					P:showText(text.mini,0,-80,35,"appear")
 					send=send*.5
 					sendTime=sendTime+60
-					cscore=cscore*.5
+					cscore=cscore*.6
 					P.b2b=P.b2b+b2bPoint[cc]*.5
 					if P.human then
 						VOICE("mini",CHN)
@@ -1524,7 +1539,7 @@ function player.drop(P)--Place piece
 			elseif #P.field>0 then
 				P.b2b=max(P.b2b-250,0)
 				P:showText(text.clear[cc],0,-30,27+cc*3,"appear",(8-cc)*.3)
-				send=cc-1
+				send=cc-.75
 				sendTime=20+send*20
 				cscore=cscore+clearSCR[cc]
 				P.lastClear=cc
@@ -1542,7 +1557,7 @@ function player.drop(P)--Place piece
 		end
 		if #P.field==0 then
 			P:showText(text.PC,0,-80,50,"flicker")
-			send=ceil(send^.5)+min(6+P.stat.pc,10)
+			send=send^.5+min(6+P.stat.pc,10)
 			exblock=exblock+2
 			sendTime=sendTime+60
 			if P.stat.row>4 then
@@ -2084,10 +2099,9 @@ function newPlayer(id,x,y,size,AIdata)
 	P.field,P.visTime={},{}
 	P.atkBuffer={sum=0}
 
-	P.ko,P.badge,P.strength=0,0,0
+	P.badge,P.strength=0,0
 	P.atkMode,P.swappingAtkMode=1,20
 	P.atker,P.atking,P.lastRecv={}
-	P.rank=nil
 	--Royale-related
 
 	P.gameEnv={}--Current game setting environment
@@ -2099,7 +2113,12 @@ function newPlayer(id,x,y,size,AIdata)
 		else
 			P.gameEnv[k]=v
 		end
-	end--reset current game settings
+	end--load game settings
+	P.gameEnv.das=max(P.gameEnv.das,P.gameEnv.mindas)
+	P.gameEnv.arr=max(P.gameEnv.arr,P.gameEnv.minarr)
+	P.gameEnv.sdarr=max(P.gameEnv.sdarr,P.gameEnv.minsdarr)
+	if not AIdata then P.gameEnv.next=min(P.gameEnv.next,setting.maxNext)end--AIdata is not human
+	
 	P.cur={bk={{}},id=0,color=0,name=0}--shape,shapeID,colorID,nameID
 		P.sc,P.dir,P.r,P.c={0,0},0,0,0--spinCenter,direction,row,col
 		P.curX,P.curY,P.y_img=0,0,0--x,y,ghostY

scene.lua

@@ -47,10 +47,16 @@ local sceneInit={
 		end
 	end,
 	mode=function()
-		curBG="none"
+		curBG="black"
 		BGM("blank")
 		destroyPlayers()
-		mapCam.zoomK=scene.swap.tar=="mode"and 5 or 1
+		local cam=mapCam
+		cam.zoomK=scene.swap.tar=="mode"and 5 or 1
+		if cam.sel then
+			local M=modes[cam.sel]
+			cam.x,cam.y=M.x*cam.k+180,M.y*cam.k
+			cam.x1,cam.y1=cam.x,cam.y
+		end
 	end,
 	custom=function()
 		sceneTemp=1--option select
@@ -135,7 +141,7 @@ local sceneInit={
 		sceneTemp={
 			S.run,
 			S.game,
-			format("%0.1fHr",S.time*2.78e-4),
+			format("%.1fHr",S.time*2.78e-4),
 			S.key,
 			S.rotate,
 			S.hold,
@@ -149,8 +155,8 @@ local sceneInit={
 			"["..S.spin_0.."]/"..S.spin_1.."/"..S.spin_2.."/"..S.spin_3,
 			S.b2b.."[+"..S.b3b.."]",
 			S.pc,
-			format("%0.2f",S.atk/S.row),
-			S.extraPiece.."["..(int(S.extraRate/S.piece*10000)*.01).."%]",
+			format("%.2f",S.atk/S.row),
+			format("%d[%.2f%%]",S.extraPiece,max(100-S.extraRate/S.piece*100,0)),
 		}
 	end,
 	history=function()
@@ -162,17 +168,6 @@ local sceneInit={
 		love.event.quit()
 	end,
 }
-local swapDeck_data={
-	{4,0,1,1},{6,0,15,1},{5,0,9,1},{6,0,6,1},
-	{1,0,3,1},{3,0,12,1},{1,1,8,1},{2,1,4,2},
-	{3,2,13,2},{4,1,12,2},{5,2,1,2},{7,1,11,2},
-	{2,1,9,3},{3,0,6,3},{4,2,14,3},{1,0,4,4},
-	{7,1,1,4},{6,0,2,4},{5,2,6,4},{6,0,14,5},
-	{3,3,15,5},{4,0,7,6},{7,1,10,5},{5,0,2,6},
-	{2,1,1,7},{1,0,4,6},{4,1,13,5},{1,1,6,7},
-	{5,3,11,5},{3,2,11,7},{6,0,8,7},{4,2,12,8},
-	{7,0,8,9},{1,0,2,8},{5,2,4,8},{6,0,15,8},
-}--Block id [ZSLJTOI] ,dir,x,y
 local gc=love.graphics
 local swap={
 	none={1,0,NULL},
@@ -180,37 +175,17 @@ local swap={
 	fade={30,15,function(t)
 		local t=t>15 and 2-t/15 or t/15
 		gc.setColor(0,0,0,t)
-		gc.rectangle("fill",0,0,1280,720)
+		gc.rectangle("fill",0,0,scr.w,scr.h)
 	end},
 	fade_togame={120,20,function(t)
 		local t=t>20 and (120-t)/100 or t/20
 		gc.setColor(0,0,0,t)
-		gc.rectangle("fill",0,0,1280,720)
+		gc.rectangle("fill",0,0,scr.w,scr.h)
 	end},
 	slowFade={180,90,function(t)
 		local t=t>90 and 2-t/90 or t/90
 		gc.setColor(0,0,0,t)
-		gc.rectangle("fill",0,0,1280,720)
-	end},
-	deck={50,8,function(t)
-		gc.setColor(1,1,1)
-		if t>8 then
-			local t=t<15 and 15 or t
-			for i=1,51-t do
-				local bn=swapDeck_data[i][1]
-				local b=blocks[bn][swapDeck_data[i][2]]
-				local cx,cy=swapDeck_data[i][3],swapDeck_data[i][4]
-				for y=1,#b do for x=1,#b[1]do
-					if b[y][x]then
-						gc.draw(blockSkin[bn],80*(cx+x-2),80*(10-cy-y),nil,8/3)
-					end
-				end end
-			end
-		end
-		if t<17 then
-			gc.setColor(1,1,1,1-(t>8 and t-8 or 8-t)*.125)
-			gc.rectangle("fill",0,0,1280,720)
-		end
+		gc.rectangle("fill",0,0,scr.w,scr.h)
 	end},
 }--Scene swapping animations
 local backFunc={
@@ -236,7 +211,8 @@ function scene.push(tar,style)
 	end
 end
 function scene.pop()
-	scene.seq={}
+	local _=scene.seq
+	_[#_-1]=nil
 end
 function scene.swapTo(tar,style)
 	local S=scene.swap
@@ -253,15 +229,13 @@ function scene.swapTo(tar,style)
 	end
 end
 function scene.back()
-	if not scene.swapping then
-		if backFunc[scene.cur] then backFunc[scene.cur]()end
-		--func when scene end
-		local m=#scene.seq
-		if m>0 then
-			scene.swapTo(scene.seq[m-1],scene.seq[m])
-			scene.seq[m],scene.seq[m-1]=nil
-			--Poll&Back to preScene
-		end
+	if backFunc[scene.cur] then backFunc[scene.cur]()end
+	--func when scene end
+	local m=#scene.seq
+	if m>0 then
+		scene.swapTo(scene.seq[m-1],scene.seq[m])
+		scene.seq[m],scene.seq[m-1]=nil
+		--Poll&Back to preScene
 	end
 end
 return scene

texture.lua

@@ -77,26 +77,8 @@ clearDust:setColors(1,1,1,.5,1,1,1,0)
 --Dust particles
 
 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")
-spinCenter=N("/image/mess/spinCenter.png")
 batteryImage=N("/image/mess/power.png")
 
-background1=N("/image/BG/bg1.jpg")
-background2=N("/image/BG/bg2.png")
-groupCode=N("/image/mess/groupcode.png")
-payCode=N("/image/mess/paycode.png")
-
-miya={
-	ch=N("/image/miya/ch.png"),
-	f1=N("/image/miya/f1.png"),
-	f2=N("/image/miya/f2.png"),
-	f3=N("/image/miya/f3.png"),
-	f4=N("/image/miya/f4.png"),
-}
 drawableText={
 	question=T(100,"?"),
 	bpm=T(15,"BPM"),kpm=T(15,"KPM"),

timer.lua

@@ -1,4 +1,5 @@
 local wd=love.window
+local gc=love.graphics
 local kb=love.keyboard
 local Timer=love.timer.getTime
 local int,abs,rnd,max,min,sin=math.floor,math.abs,math.random,math.max,math.min,math.sin
@@ -42,15 +43,40 @@ function Tmr.load()
 		local m=modes[L[2]]
 		modes[L[2]]=require("modes/"..m[1])
 		local M=modes[L[2]]
-		M.saveFileName,M.x,M.y,M.shape,M.size,M.id,M.unlock=m[1],m.x,m.y,m.shape,m.size,m.id,m.unlock
-		M.records=loadRecord(m[1])
+		M.saveFileName,M.id=m[1],m.id
+		M.x,M.y,M.size,M.shape=m.x,m.y,m.size,m.shape
+		M.unlock=m.unlock
+		M.records=loadRecord(m[1])or M.score and{}
+		-- M.icon=gc.newImage("image/modeIcon/"..m.icon..".png")
+		-- M.icon=gc.newImage("image/modeIcon/custom.png")
 		L[2]=L[2]+1
 		if L[2]>L[3]then
 			L[1],L[2],L[3]=5,1,1
 		end
 	elseif L[1]==5 then
 		--------------------------Loading some other things here?
-		
+		local N=gc.newImage
+		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")
+		spinCenter=N("/image/mess/spinCenter.png")
+		ctrlSpeedLimit=N("/image/mess/ctrlSpeedLimit.png")
+		speedLimit=N("/image/mess/speedLimit.png")
+
+		background1=N("/image/BG/bg1.png")
+		background2=N("/image/BG/bg2.png")
+		groupCode=N("/image/mess/groupcode.png")
+		payCode=N("/image/mess/paycode.png")
+
+		miya={
+			ch=N("/image/miya/ch.png"),
+			f1=N("/image/miya/f1.png"),
+			f2=N("/image/miya/f2.png"),
+			f3=N("/image/miya/f3.png"),
+			f4=N("/image/miya/f4.png"),
+		}
 		--------------------------
 		L[1],L[2],L[3]=0,1,1
 		SFX("welcome",.2)
@@ -74,10 +100,17 @@ function Tmr.mode(dt)
 	local cam=mapCam
 	local F
 	local x,y,k=cam.x,cam.y,cam.k
-	if kb.isDown("up",	"w")	then y=y-10*k;F=true end
-	if kb.isDown("down","s")	then y=y+10*k;F=true end
-	if kb.isDown("left","a")	then x=x-10*k;F=true end
-	if kb.isDown("right","d")	then x=x+10*k;F=true end
+	if kb.isDown("up",	"w")then y=y-10*k;F=true end
+	if kb.isDown("down","s")then y=y+10*k;F=true end
+	if kb.isDown("left","a")then x=x-10*k;F=true end
+	if kb.isDown("right","d")then x=x+10*k;F=true end
+	local js1=joysticks[1]
+	if js1 then
+		if js1:isDown("dpup")then y=y-10*k;F=true end
+		if js1:isDown("dpdown")then y=y+10*k;F=true end
+		if js1:isDown("dpleft")then x=x-10*k;F=true end
+		if js1:isDown("dpright")then x=x+10*k;F=true end
+	end
 	if F or cam.keyCtrl and(x-cam.x1)^2+(y-cam.y1)^2>2.6 then
 		if F then
 			cam.keyCtrl=true
@@ -86,12 +119,14 @@ function Tmr.mode(dt)
 		local MM,R=modes,modeRanks
 		for _=1,#MM do
 			if R[_]then
+				local __
 				local M=MM[_]
 				local s=M.size
-				local __
 				if M.shape==1 then
 					if x>M.x-s and x<M.x+s and y>M.y-s and y<M.y+s then __=_ end
 				elseif M.shape==2 then
+					if abs(x-M.x)+abs(y-M.y)<s then __=_ end
+				elseif M.shape==3 then
 					if(x-M.x)^2+(y-M.y)^2<s^2 then __=_ end
 				end
 				if __ and cam.sel~=__ then
@@ -110,23 +145,24 @@ function Tmr.mode(dt)
 	end
 	cam.x,cam.y=x,y
 	--keyboard controlling
-
+	
+	space.scale(.85+k/cam.k1*.15)
+	space.translate((cam.x1/cam.k1-cam.x/k)*.03*k,(cam.y1/cam.k1-cam.y/k)*.03*k)
 	cam.x1=cam.x1*.85+x*.15
 	cam.y1=cam.y1*.85+y*.15
 	cam.k1=cam.k1*.85+k*.15
 	local _=scene.swap.tar
 	cam.zoomMethod=_=="play"and 1 or _=="mode"and 2
 	if cam.zoomMethod==1 then
-		if cam.zoomK<60 then
-			if cam.sel then
-				local M=modes[cam.sel]
-				cam.x=cam.x*.8+M.x*cam.k*.2
-				cam.y=cam.y*.8+M.y*cam.k*.2
-			end
-			_=cam.zoomK
-			if _<1 then _=_*1.1 end
-			cam.zoomK=_*1.06
+		if cam.sel then
+			local M=modes[cam.sel]
+			cam.x=cam.x*.8+M.x*cam.k*.2
+			cam.y=cam.y*.8+M.y*cam.k*.2
 		end
+		_=cam.zoomK
+		if _<.8 then _=_*1.05 end
+		if _<1.1 then _=_*1.05 end
+		cam.zoomK=_*1.05
 	elseif cam.zoomMethod==2 then
 		cam.zoomK=cam.zoomK^.9
 	end

toolfunc.lua

@@ -1,6 +1,7 @@
 local tm=love.timer
 local gc=love.graphics
 local kb=love.keyboard
+local data=love.data
 local int,abs,rnd,max,min=math.floor,math.abs,math.random,math.max,math.min
 local sub,find,format,char,byte=string.sub,string.find,string.format,string.char,string.byte
 local ins,rem=table.insert,table.remove
@@ -20,12 +21,12 @@ end
 
 function toTime(s)
 	if s<60 then
-		return format("%.2fs",s)
+		return format("%.3fs",s)
 	elseif s<3600 then
-		return format("%dm%.2fs",int(s/60),s%60)
+		return format("%d:%.2f",int(s/60),s%60)
 	else
 		local h=int(s/3600)
-		return format("%dh%dm%.2fs",h,int(s-h/60),s%60)
+		return format("%d:%d:%.2f",h,int(s-h/60),s%60)
 	end
 end
 function mStr(s,x,y)
@@ -95,7 +96,7 @@ local drawableTextLoad={
 	"noScore",
 	"highScore",
 }
-function swapLanguage(l)
+function changeLanguage(l)
 	text=require("language/"..langID[l])
 	for S,L in next,Widget do
 		for N,W in next,L do
@@ -142,58 +143,76 @@ function restoreVirtualKey()
 		B.y=O.y
 		B.r=O.r
 	end
+	if not modeEnv.Fkey then
+		virtualkey[9].ava=false
+	end
 end
 function copyBoard()
 	local str=""
-	for y=1,20 do
-		local L=""
+	local H=0
+	for y=20,1,-1 do
 		for x=1,10 do
-			local s=preField[y][x]
-			if s>7 then s=s-1 end
-			L=L..char(66+s)
+			if preField[y][x]~=0 then
+				H=y
+				goto L
+			end
 		end
-		str=str..L.."\n"
 	end
-	love.system.setClipboardText("Techmino sketchpad:\n"..str)
+	::L::
+	for y=1,H do
+		local S=""
+		local L=preField[y]
+		for x=1,10,2 do
+			local H=L[x]
+			local L=L[x+1]
+			if H<8 then H=H+1 end
+			if L<8 then L=L+1 end
+			S=S..char(H*16+L)
+		end
+		str=str..S
+	end
+	love.system.setClipboardText("Techmino sketchpad:"..data.encode("string","base64",data.compress("string","deflate",str)))
 	TEXT(text.copySuccess,350,360,40,"appear",.5)
 end
 function pasteBoard()
 	local str=love.system.getClipboardText()
-	local len=#str
-	local s,p,P,_=0,1,10--sum,pStr,pField
-	if sub(str,1,20)=="Techmino sketchpad:\n"then
-		p=21
-	else
-		p=find(str,":")
-		if p then
-			p=p+1
+	local fX,fY=1,1--*ptr for Field(r*10+(c-1))
+	local _,__
+	local p=find(str,":")--ptr*
+	if p then str=sub(str,p+1)end
+	str=data.decompress("string","deflate",data.decode("string","base64",str))
+	p=1
+	::LOOP::
+		_=byte(str,p)--1byte
+		if not _ then
+			if fX~=1 then goto ERROR
+			else goto FINISH
+			end
+		end--str end
+		__=_%16--low4b
+		_=(_-__)/16--high4b
+		if _>12 or __>12 then goto ERROR end--illegal blockid
+		if _<9 then _=_-1 end if __<9 then __=__-1 end
+		preField[fY][fX]=_;preField[fY][fX+1]=__
+		if fX<9 then
+			fX=fX+2
 		else
-			p=find(str,"[A-N]")
+			if fY==20 then goto FINISH end
+			fX=1;fY=fY+1
 		end
-	end
-	::L1::
-	_=byte(str,p)
-	if _<65 or _>78 then
 		p=p+1
-		goto L1
-	end
-	::L2::
-	if s==200 then return end
-	if p>len then
-		if s~=200 then
-			goto E
+	goto LOOP
+
+	::FINISH::
+		for y=fY+1,20 do
+			for x=1,10 do
+				preField[y][x]=0
+			end
 		end
-	end
-	_=byte(sub(str,p))-66
-	if _>-2 and _<13 then
-		if _>7 then _=_+1 end
-		preField[int(P/10)][P%10+1]=_
-		s,P=s+1,P+1
-	end
-	p=p+1
-	goto L2
-	::E::
-	TEXT(text.dataCorrupted,350,360,35,"flicker",.5)
+	goto END
+	::ERROR::
+		TEXT(text.dataCorrupted,350,360,35,"flicker",.5)
+	::END::
 end
 
 function updateStat()
@@ -305,10 +324,11 @@ function loadGame(M)
 	drawableText.levelName:set(M.level[lang])
 	needResetGameData=true
 	scene.swapTo("play","fade_togame")
+	SFX("enter")
 end
 function resetPartGameData()
 	gameResult=false
-	frame=30
+	frame=150-setting.reTime*15
 	destroyPlayers()
 	curMode.load()
 	texts={}
@@ -332,7 +352,7 @@ function resetPartGameData()
 end
 function resetGameData()
 	gameResult=false
-	frame=0
+	frame=150-setting.reTime*15
 	garbageSpeed=1
 	pauseTime=0--Time paused
 	pauseCount=0--Times paused
@@ -390,22 +410,27 @@ function loadRecord(N)
 		setfenv(s,T)
 		T[1]=s()
 		return T[1]
-	else
-		return{}
 	end
 end
 local function dumpTable(L)
 	local s="{\n"
 	for k,v in next,L do
 		local T
+		T=type(k)
+			if T=="number"then k="["..k.."]="
+			elseif T=="string"then k=k.."="
+			else error("Error data type!")
+			end
 		T=type(v)
 			if T=="number"then v=tostring(v)
 			elseif T=="string"then v="\""..v.."\""
 			elseif T=="table"then v=dumpTable(v)
 			else error("Error data type!")
 			end
-		s=s.."["..k.."]="..v..",\n"
+		s=s..k..v..",\n"
 	end
+	print(s)
+	print("---")
 	return s.."}"
 end
 function saveRecord(N,L)
@@ -422,6 +447,35 @@ function delRecord(N)
 	fs.remove(N..".dat")
 end
 
+function saveUnlock()
+	local t={}
+	local RR=modeRanks
+	for i=1,#RR do
+		t[i]=RR[i]or"X"
+	end
+	t=concat(t,",")
+	local F=FILE.unlock
+	F:open("w")
+	local _=F:write(t)
+	F:flush()
+	F:close()
+	if not _ then
+		TEXT(text.unlockSavingError..mes,640,480,40,"appear",.4)
+	end
+end
+function loadUnlock()
+	local F=FILE.unlock
+	F:open("r")
+	local t=F:read()
+	F:close()
+	t=splitS(t,",")
+	for i=1,#modeRanks do
+		local v=toN(t[i])
+		if not v or v<0 or v>6 or v~=int(v)then v=false end
+		modeRanks[i]=v
+	end
+end
+
 local statOpy={
 	"run","game","time",
 	"extraPiece","extraRate",
@@ -435,27 +489,17 @@ function loadStat()
 	local F=FILE.data
 	F:open("r")
 	local t=F:read()
-	t=splitS(t,"\r\n")
 	F:close()
+	t=splitS(t,"\r\n")
 	for i=1,#t do
 		local p=find(t[i],"=")
 		if p then
 			local t,v=sub(t[i],1,p-1),sub(t[i],p+1)
-			if t=="rank"then
-				v=splitS(v,",")
-				for i=1,#modeRanks do
-					local v=toN(v[i])
-					if not v or v<0 or v>6 or v~=int(v)then v=false end
-					modeRanks[i]=v
-				end
-			else
-				if t=="gametime"then t="time"end
-				for i=1,#statOpy do
-					if t==statOpy[i]then
-						v=toN(v)if not v or v<0 then v=0 end
-						stat[t]=v
-						break
-					end
+			for i=1,#statOpy do
+				if t==statOpy[i]then
+					v=toN(v)if not v or v<0 then v=0 end
+					stat[t]=v
+					break
 				end
 			end
 		end
@@ -490,17 +534,19 @@ function loadSetting()
 	local F=FILE.setting
 	F:open("r")
 	local t=F:read()
-	t=splitS(t,"\r\n")
 	F:close()
+	t=splitS(t,"\r\n")
 	for i=1,#t do
 		local p=find(t[i],"=")
 		if p then
 			local t,v=sub(t[i],1,p-1),sub(t[i],p+1)
-			if
+			if--10档的设置
 				--声音
 				t=="sfx"or t=="bgm"or t=="voc"or t=="stereo"or
 				--三个触摸设置项
-				t=="VKTchW"or t=="VKCurW"or t=="VKAlpha"
+				t=="VKTchW"or t=="VKCurW"or t=="VKAlpha"or
+				--重开时间
+				t=="reTime"
 			then
 				v=toN(v)
 				if v and v==int(v)and v>=0 and v<=10 then
@@ -515,7 +561,7 @@ function loadSetting()
 				--开关设置们
 				t=="bg"or
 				t=="ghost"or t=="center"or t=="grid"or t=="swap"or
-				t=="quickR"or t=="fine"or t=="bgblock"or t=="smo"or
+				t=="quickR"or t=="fine"or t=="bgspace"or t=="smo"or
 				t=="VKSwitch"or t=="VKTrack"or t=="VKDodge"or t=="VKIcon"
 			then
 				setting[t]=v=="true"
@@ -556,6 +602,7 @@ end
 local saveOpt={
 	"das","arr",
 	"sddas","sdarr",
+	"reTime",
 	"quickR",
 	"swap",
 	"fine",
@@ -569,7 +616,7 @@ local saveOpt={
 
 	"fullscreen",
 	"bg",
-	"bgblock",
+	"bgspace",
 	"lang",
 	"skin",
 
@@ -614,8 +661,8 @@ function saveSetting()
 	F:flush()
 	F:close()
 	if _ then
-		TEXT(text.settingSaved,640,360,80,"appear")
+		TEXT(text.settingSaved,370,330,30,"appear")
 	else
-		TEXT(text.settingSavingError..mes,640,360,40,"appear",.4)
+		TEXT(text.settingSavingError.."123",370,350,20,"appear",.3)
 	end
 end

updateLog.lua

@@ -1,23 +1,20 @@
---[[
-big bang未完成
-]]
 local S=[=[
-Patron(rmb10+):
-	Fireboos
-	gggf
-	Sasoric
+"Patron"(rmb10+):
+	"Fireboos"
+	"gggf"
+	"Sasoric"
+	sfqr
 	T080
-	Ykzl
-	zxc
+	"Ykzl"
+	"zxc"
+	10元
 	?[D*a]
 Future outlook:
 	New mode system with:
 		rythem mode
 		combo mode
-		bigbang mode
 		puzzle mode(ttt)
 		square mode
-		finesse practice mode
 		infinite 1v1
 	Other:
 		puzzle import/output(ttt)
@@ -25,7 +22,6 @@ Future outlook:
 		(powerinfo switch)
 		virtualWidgets like joysticks
 		splashing block
-		ajustable next count
 		custom block color/direction
 		custom block sequence
 		CC smarter(think of garbage buffer)
@@ -34,13 +30,37 @@ Future outlook:
 		auto GUI position in any screen size
 		more FXs & 3d features & animations
 		Encrypt source code(compile to byte code)
+0.8.8:
+	background now is cool space with planets and stars,not boring falling tetrominos!
+	records with date
+	adjustable waiting time before start
+	ajustable maxnext count
+	new error page and a new voice
+	tiny change in rotate system(JL pistol-spin)
+	marked the modes with limited das/arr
+	an unlock-all easter egg
+	bugs fixed(some mode error)
+0.8.7:
+	better user experience in mode selecting
+	support 2^n G falling speed
+	speed of marathon mode changed
+	shorter clipboard string(when air above)
+	attack system/score system little changed
+	bugs fixed(rank system,some mode error when enter)(again!)
 0.8.6:
+	gamepad can adjust key
+	add SFX when enter game
+	map GUI little adjusted
+	event system little changed(no ctrl when scene swapping)
+	bugs fixed(rank system,some mode error when enter)
+0.8.5-:
 	mode map!Brandly new GUI for mode selecting
 	mode unlock system,not that scary for noob
 	every mode has rank calculating method(may some mistakes/inappropriate number)
 	save 10 best recoreds for each mode
 	can save/share custom map now
 	new mode:Big Bang
+	button appearance changed
 	better widget performence
 	many bug fixed
 0.8.4:
@@ -189,7 +209,7 @@ Future outlook:
 	bugs fixed
 0.7.14:
 	drawing mode in custom game
-	can adjust virtual keys with mouse
+	adjustable virtual keys with mouse
 	speed optimized
 	rotate also create shade
 0.7.13+:

widgetList.lua

@@ -73,11 +73,11 @@ local virtualkeySet={
 	},--PC key feedback(top&in a row)
 }
 local customSet={
-	{20,20,1,1,7,1,1,1,3,4,1,2,3},
-	{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},
-	{1,11,8,11,4,1,2,1,8,3,1,4,9},
+	{3,20,1,1,7,1,1,1,3,4,1,2,3},
+	{5,20,1,1,7,1,1,1,8,3,8,3,3},
+	{1,22,1,1,7,3,1,1,8,4,1,7,7},
+	{3,20,1,1,7,1,1,3,8,3,1,7,8},
+	{25,11,8,11,4,1,2,1,8,3,1,4,9},
 }
 local function useDefaultSet(n)
 	for i=1,#customSet[n]do
@@ -139,19 +139,19 @@ local Widget={
 		setting=newButton(370,280,200,160,C.lightBlue,		45,function()scene.push()scene.swapTo("setting_game")end,	nil,"music"),
 		music=	newButton(590,280,200,160,C.lightPurple,	32,function()scene.push()scene.swapTo("music")end,			nil,"help"),
 		help=	newButton(150,460,200,160,C.lightYellow,	50,function()scene.push()scene.swapTo("help")end,			nil,"stat"),
-		stat=	newButton(370,460,200,160,C.lightCyan,		43,function()scene.push()scene.swapTo("stat")end,			nil,"lang"),
+		stat=	newButton(370,460,200,160,C.lightCyan,		43,function()scene.push()scene.swapTo("stat")end,			nil,"quit"),
+		quit=	newButton(590,460,200,160,C.lightGrey,		55,function()VOICE("bye")scene.swapTo("quit","slowFade")end,nil,"lang"),
 		lang=	newButton(150,610,160,100,C.lightGreen,		45,function()
 			setting.lang=setting.lang%#langName+1
-			swapLanguage(setting.lang)
+			changeLanguage(setting.lang)
 			TEXT(text.lang,370,610,50,"appear",1.6)
-			end,nil,"quit"),
-		quit=	newButton(590,460,200,160,C.lightGrey,		55,function()VOICE("bye")scene.swapTo("quit","slowFade")end,nil,"play"),
+			end,nil,"play"),
 	},
 	mode={
 		draw=	newButton(1100,	440,220,90,C.lightYellow,	40,function()scene.push()scene.swapTo("draw")end,function()return mapCam.sel~=71 and mapCam.sel~=72 end),
 		setting=newButton(1100,	540,220,90,C.lightGreen,	40,function()scene.push()scene.swapTo("custom")end,function()return mapCam.sel~=71 and mapCam.sel~=72 end),
-		start=	newButton(1100,	640,220,90,C.lightGrey,		40,function()scene.push()loadGame(mapCam.sel)end,function()return not mapCam.sel end),
-		back=	newButton(1205,	50,	130,80,	C.white,		40,scene.back),
+		start=	newButton(1040,	655,180,80,C.lightGrey,		40,function()scene.push()loadGame(mapCam.sel)end,function()return not mapCam.sel end),
+		back=	newButton(1200,	655,120,80,C.white,			40,scene.back),
 		--function()scene.push()scene.swapTo("custom")end
 	},
 	music={
@@ -244,16 +244,18 @@ local Widget={
 				SFX("blip_1",.4)
 			end
 			end,nil,"sddasD"),
-		sddasD=	newButton(180,340,50,50,C.white,40,	function()setting.sddas=(setting.sddas-1)%11 end,	nil,"sddasU"),
-		sddasU=	newButton(400,340,50,50,C.white,40,	function()setting.sddas=(setting.sddas+1)%11 end,	nil,"sdarrD"),
-		sdarrD=	newButton(500,340,50,50,C.white,40,	function()setting.sdarr=(setting.sdarr-1)%4 end,	nil,"sdarrU"),
-		sdarrU=	newButton(720,340,50,50,C.white,40,	function()setting.sdarr=(setting.sdarr+1)%4 end,	nil,"quickR"),
-		quickR=	newSwitch(580,430,35,SETdisp("quickR"),	SETrev("quickR"),									nil,"swap"),
-		swap=	newSwitch(580,510,20,SETdisp("swap"),	SETrev("swap"),										nil,"fine"),
-		fine=	newSwitch(580,590,20,SETdisp("fine"),	SETrev("fine"),										nil,"ctrl"),
+		sddasD=	newButton(180,340,50,50,C.white,40,	function()setting.sddas=(setting.sddas-1)%11 end,		nil,"sddasU"),
+		sddasU=	newButton(400,340,50,50,C.white,40,	function()setting.sddas=(setting.sddas+1)%11 end,		nil,"sdarrD"),
+		sdarrD=	newButton(500,340,50,50,C.white,40,	function()setting.sdarr=(setting.sdarr-1)%4 end,		nil,"sdarrU"),
+		sdarrU=	newButton(720,340,50,50,C.white,40,	function()setting.sdarr=(setting.sdarr+1)%4 end,		nil,"reTime"),
+		reTime=	newSlider(350,430,300,10,30,nil,	SETdisp("reTime"),		SETsto("reTime"),				nil,"maxNext"),
+		maxNext=newSlider(350,510,300,6,30,nil,		SETdisp("maxNext"),		SETsto("maxNext"),				nil,"quickR"),
+		quickR=	newSwitch(1000,430,35,				SETdisp("quickR"),		SETrev("quickR"),				nil,"swap"),
+		swap=	newSwitch(1000,510,19,				SETdisp("swap"),		SETrev("swap"),					nil,"fine"),
+		fine=	newSwitch(1000,590,20,				SETdisp("fine"),		SETrev("fine"),					nil,"ctrl"),
 		ctrl=	newButton(1020,230,320,80,C.white,35,function()scene.push()scene.swapTo("setting_key")end,	nil,"touch"),
 		touch=	newButton(1020,340,320,80,C.white,35,function()scene.push()scene.swapTo("setting_touch")end,nil,"back"),
-		back=	newButton(1160,600,160,160,C.white,50,scene.back,nil,"graphic"),
+		back=	newButton(1160,600,160,160,C.white,50,scene.back,											nil,"graphic"),
 	},
 	setting_graphic={
 		sound=	newButton(200,80,240,80,C.lightCyan,35,function()scene.swapTo("setting_sound")end,	nil,"game"),
@@ -273,8 +275,15 @@ local Widget={
 			love.resize(love.graphics.getWidth(),love.graphics.getHeight())
 			end
 			end,nil,"bg"),
-		bg=		newSwitch(990,250,35,SETdisp("bg"),SETrev("bg"),nil,"bgblock"),
-		bgblock=newSwitch(990,330,35,SETdisp("bgblock"),SETrev("bgblock"),nil,"skin"),--if not setting.bgblock then for i=1,16 do FX_BGblock.list[i].v=3*FX_BGblock.list[i].v end end
+		bg=		newSwitch(990,250,35,SETdisp("bg"),SETrev("bg"),nil,"bgspace"),
+		bgspace=newSwitch(990,330,35,SETdisp("bgspace"),function()
+			setting.bgspace=not setting.bgspace
+			if setting.bgspace then
+				space.new()
+			else
+				space.discard()
+			end
+			end,nil,"skin"),
 		skin=	newButton(810,420,120,60,C.white,35,function()
 			local _=setting.skin%8+1
 			setting.skin=_