0.11.2:Pong(操作错误导致只能用覆盖文件代替合并分支)(非0.11.2最终版)

modes/classic_fast.lua

@@ -1,4 +1,5 @@
 local gc=love.graphics
+local format=string.format
 local function check_LVup(P)
 	if P.stat.row>=P.gameEnv.target then
 		P.gameEnv.target=P.gameEnv.target+10

modes/dig_10.lua

@@ -0,0 +1,40 @@
+local function check_rise(P)
+	if P.stat.dig==10 then
+		P:win()
+	end
+end
+
+return{
+	color=color.cyan,
+	env={
+		pushSpeed=6,
+		dropPiece=check_rise,
+		bg="bg1",bgm="way",
+	},
+	load=function()
+		PLY.newPlayer(1,340,15)
+		local P=players[1]
+		for _=1,10 do
+			P:garbageRise(13,1,P:RND(10))
+		end
+		P.fieldBeneath=0
+	end,
+	mesDisp=function(P)
+		setFont(55)
+		mStr(10-P.stat.dig,69,335)
+	end,
+	score=function(P)return{P.stat.time,P.stat.piece}end,
+	scoreDisp=function(D)return toTime(D[1]).."   "..D[2].." Pieces"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<10 then return end
+		local T=P.stat.time
+		return
+		T<=7 and 5 or
+		T<=12 and 4 or
+		T<=20 and 3 or
+		T<=40 and 2 or
+		T<=60 and 1 or
+		0
+	end,
+}

modes/dig_100.lua

@@ -0,0 +1,43 @@
+local function check_rise(P)
+	for i=1,math.min(8,100-P.stat.dig)-P.garbageBeneath do
+		P:garbageRise(13,1,P:RND(10))
+	end
+	if P.stat.dig==100 then
+		P:win()
+	end
+end
+
+return{
+	color=color.green,
+	env={
+		pushSpeed=6,
+		dropPiece=check_rise,
+		bg="bg2",bgm="way",
+	},
+	load=function()
+		PLY.newPlayer(1,340,15)
+		local P=players[1]
+		for _=1,10 do
+			P:garbageRise(13,1,P:RND(10))
+		end
+		P.fieldBeneath=0
+	end,
+	mesDisp=function(P)
+		setFont(55)
+		mStr(100-P.stat.dig,69,335)
+	end,
+	score=function(P)return{P.stat.time,P.stat.piece}end,
+	scoreDisp=function(D)return toTime(D[1]).."   "..D[2].." Pieces"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<10 then return end
+		local T=P.stat.time
+		return
+		T<=120 and 5 or
+		T<=160 and 4 or
+		T<=240 and 3 or
+		T<=360 and 2 or
+		T<=480 and 1 or
+		0
+	end,
+}

modes/dig_40.lua

@@ -0,0 +1,43 @@
+local function check_rise(P)
+	for i=1,math.min(8,40-P.stat.dig)-P.garbageBeneath do
+		P:garbageRise(13,1,P:RND(10))
+	end
+	if P.stat.dig==40 then
+		P:win()
+	end
+end
+
+return{
+	color=color.lBlue,
+	env={
+		pushSpeed=6,
+		dropPiece=check_rise,
+		bg="bg1",bgm="way",
+	},
+	load=function()
+		PLY.newPlayer(1,340,15)
+		local P=players[1]
+		for _=1,10 do
+			P:garbageRise(13,1,P:RND(10))
+		end
+		P.fieldBeneath=0
+	end,
+	mesDisp=function(P)
+		setFont(55)
+		mStr(40-P.stat.dig,69,335)
+	end,
+	score=function(P)return{P.stat.time,P.stat.piece}end,
+	scoreDisp=function(D)return toTime(D[1]).."   "..D[2].." Pieces"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<10 then return end
+		local T=P.stat.time
+		return
+		T<=50 and 5 or
+		T<=70 and 4 or
+		T<=90 and 3 or
+		T<=120 and 2 or
+		T<=180 and 1 or
+		0
+	end,
+}

modes/dig_400.lua

@@ -0,0 +1,43 @@
+local function check_rise(P)
+	for i=1,math.min(8,400-P.stat.dig)-P.garbageBeneath do
+		P:garbageRise(13,1,P:RND(10))
+	end
+	if P.stat.dig==400 then
+		P:win()
+	end
+end
+
+return{
+	color=color.orange,
+	env={
+		pushSpeed=6,
+		dropPiece=check_rise,
+		bg="bg2",bgm="way",
+	},
+	load=function()
+		PLY.newPlayer(1,340,15)
+		local P=players[1]
+		for _=1,10 do
+			P:garbageRise(13,1,P:RND(10))
+		end
+		P.fieldBeneath=0
+	end,
+	mesDisp=function(P)
+		setFont(55)
+		mStr(400-P.stat.dig,69,335)
+	end,
+	score=function(P)return{P.stat.time,P.stat.piece}end,
+	scoreDisp=function(D)return toTime(D[1]).."   "..D[2].." Pieces"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<10 then return end
+		local T=P.stat.time
+		return
+		T<=540 and 5 or
+		T<=720 and 4 or
+		T<=960 and 3 or
+		T<=1500 and 2 or
+		T<=1800 and 1 or
+		0
+	end,
+}

modes/infinite_dig.lua

@@ -1,7 +1,7 @@
 local format=string.format
 local function check_rise(P)
+	local L=P.garbageBeneath
 	if #P.clearedRow==0 then
-		local L=P.garbageBeneath
 		if L>0 then
 			if L<3 then
 				P:showTextF(text.almost,0,-120,80,"beat",.8)
@@ -9,15 +9,15 @@ local function check_rise(P)
 				P:showTextF(text.great,0,-120,80,"fly",.8)
 			end
 		end
-		for i=1,8-P.garbageBeneath do
+		for i=1,8-L do
 			P:garbageRise(13,1,P:RND(10))
 		end
 	else
-		if P.garbageBeneath==0 then
+		if L==0 then
 			P:showTextF(text.awesome,0,-120,80,"beat",.6)
 			SFX.play("clear")
 			BG.send(26)
-			for i=1,8-P.garbageBeneath do
+			for i=1,8 do
 				P:garbageRise(13,1,P:RND(10))
 			end
 		else

modes/marathon_normal.lua

@@ -30,7 +30,7 @@ return{
 	mesDisp=function(P,dx,dy)
 		setFont(45)
 		mStr(P.stat.row,69,390)
-		mStr(P.modeData.event*100+100,69,440)
+		mStr(P.modeData.point+10,69,440)
 		gc.rectangle("fill",25,445,90,4)
 	end,
 	score=function(P)return{P.stat.row<=200 and P.stat.row or 200,P.stat.time}end,

modes/sprintMPH.lua

@@ -1,5 +1,3 @@
-local gc=love.graphics
-local rnd=math.random
 return{
 	color=color.green,
 	env={
@@ -7,7 +5,7 @@ return{
 		next=0,hold=false,
 		sequence="rnd",
 		target=40,dropPiece=PLY.check_lineReach,
-		bg="aura",bgm="race",
+		bg="aura",bgm="waterfall",
 	},
 	load=function()
 		PLY.newPlayer(1,340,15)

modes/sprintPenta.lua

@@ -1,12 +1,10 @@
-local gc=love.graphics
-local rnd=math.random
 return{
 	color=color.green,
 	env={
 		drop=60,lock=60,
 		sequence="bag",bag={8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25},
 		target=40,dropPiece=PLY.check_lineReach,
-		bg="aura",bgm="race",
+		bg="aura",bgm="waterfall",
 	},
 	load=function()
 		PLY.newPlayer(1,340,15)

modes/sprint_10.lua

@@ -1,5 +1,3 @@
-local gc=love.graphics
-local rnd=math.random
 return{
 	color=color.cyan,
 	env={

modes/sprint_100.lua

@@ -1,5 +1,3 @@
-local gc=love.graphics
-local rnd=math.random
 return{
 	color=color.orange,
 	env={

modes/sprint_1000.lua

@@ -1,5 +1,3 @@
-local gc=love.graphics
-local rnd=math.random
 return{
 	color=color.lGrey,
 	env={

modes/sprint_20.lua

@@ -1,5 +1,3 @@
-local gc=love.graphics
-local rnd=math.random
 return{
 	color=color.lBlue,
 	env={

modes/sprint_40.lua

@@ -1,5 +1,3 @@
-local gc=love.graphics
-local rnd=math.random
 return{
 	color=color.green,
 	env={

modes/sprint_400.lua

@@ -1,5 +1,3 @@
-local gc=love.graphics
-local rnd=math.random
 return{
 	color=color.red,
 	env={