整理代码

modes/GM.lua

@@ -38,7 +38,7 @@ return{
 		PLY.newPlayer(1,340,15)
 		players[1].modeData.event="M7"
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		mText(drawableText.line,69,370)
 		mText(drawableText.techrash,69,490)
 		mText(drawableText.grade,69,240)

modes/attacker_hard.lua

@@ -40,7 +40,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(55)
 		mStr(P.modeData.event,69,270)
 		mStr("22",69,390)

modes/attacker_ultimate.lua

@@ -49,7 +49,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(55)
 		mStr(P.modeData.event,69,270)
 		mStr(

modes/bigbang.lua

@@ -19,9 +19,9 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	score=function(P)return{P.modeData.event,P.stat.extraRate}end,
+	score=function(P)return{P.modeData.event,P.stat.finesseRate*25/P.stat.piece}end,
 	scoreDisp=function(D)return D[1].."Stage "..format("%.2f",D[2]).."%"end,
-	comp=function(a,b)return a[1]>b[1]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

modes/blind_easy.lua

@@ -13,7 +13,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		mText(drawableText.line,69,370)
 		mText(drawableText.techrash,69,490)
 		setFont(75)

modes/blind_hard.lua

@@ -17,7 +17,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		mText(drawableText.line,69,370)
 		mText(drawableText.techrash,69,490)
 		setFont(75)

modes/blind_lunatic.lua

@@ -18,7 +18,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		mText(drawableText.line,69,370)
 		mText(drawableText.techrash,69,490)
 		setFont(75)

modes/blind_normal.lua

@@ -14,7 +14,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		mText(drawableText.line,69,370)
 		mText(drawableText.techrash,69,490)
 		setFont(75)

modes/blind_ultimate.lua

@@ -17,7 +17,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		mText(drawableText.line,69,370)
 		mText(drawableText.techrash,69,490)
 		setFont(75)

modes/blind_wtf.lua

@@ -21,7 +21,7 @@ return{
 			LOG.print(text.switchSpawnSFX,color.yellow)
 		end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		if not game.result then
 			if game.replaying then
 				gc.setColor(.3,.3,.3,.7)

modes/c4wtrain_lunatic.lua

@@ -44,7 +44,7 @@ return{
 		elseif r==6 then F[1][7],F[1][6],F[1][5]=13,13,13
 		end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(P.combo,69,380)
 		mStr(P.modeData.point,69,470)

modes/c4wtrain_normal.lua

@@ -42,7 +42,7 @@ return{
 		elseif r==6 then F[1][7],F[1][6],F[1][5]=13,13,13
 		end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(P.combo,69,380)
 		mStr(P.modeData.point,69,470)

modes/classic_fast.lua

@@ -32,7 +32,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(75)
 		local r=P.gameEnv.target*.1
 		mStr(r<11 and 18 or r<22 and r+8 or r==22 and"00"or r==23 and"0a"or format("%x",r*10-220),69,280)

modes/custom_clear.lua

@@ -51,7 +51,7 @@ return{
 		modeEnv.bg=customEnv.bg
 		modeEnv.bgm=customEnv.bgm
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(55)
 		if P.gameEnv.target>1e10 then
 			mStr(P.stat.row,69,295)

modes/defender_lunatic.lua

@@ -43,7 +43,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(55)
 		mStr(P.modeData.event,69,270)
 		mStr(P.modeData.point,69,390)

modes/defender_normal.lua

@@ -43,7 +43,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(55)
 		mStr(P.modeData.event,69,270)
 		mStr(P.modeData.point,69,390)

modes/dig_hard.lua

@@ -22,7 +22,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,380)
 		mText(drawableText.wave,69,445)

modes/dig_ultimate.lua

@@ -21,7 +21,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,380)
 		mText(drawableText.wave,69,445)

modes/drought_lunatic.lua

@@ -101,7 +101,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(70)
 		local R=100-P.stat.row
 		mStr(R>=0 and R or 0,69,335)

modes/drought_normal.lua

@@ -15,7 +15,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(70)
 		local R=100-P.stat.row
 		mStr(R>=0 and R or 0,69,335)

modes/infinite.lua

@@ -9,7 +9,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/infinite_dig.lua

@@ -42,7 +42,7 @@ return{
 			P:garbageRise(13,1,P:RND(10))
 		end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(P.stat.dig,69,260)
 		mStr(P.stat.atk,69,380)

modes/marathon_hard.lua

@@ -28,7 +28,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(P.stat.row,69,390)
 		mStr(P.modeData.event*100+100,69,440)

modes/marathon_normal.lua

@@ -27,7 +27,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(P.stat.row,69,390)
 		mStr(P.modeData.point+10,69,440)

modes/master_advance.lua

@@ -55,7 +55,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(P.modeData.point,69,390)
 		mStr((P.modeData.event+1)*100,69,440)

modes/master_beginner.lua

@@ -57,7 +57,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(P.modeData.point,69,390)
 		mStr((P.modeData.event+1)*100,69,440)

modes/master_final.lua

@@ -54,7 +54,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(P.modeData.point,69,390)
 		mStr((P.modeData.event+1)*100,69,440)

modes/pcchallenge_hard.lua

@@ -13,7 +13,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		local R=100-P.stat.row
 		mStr(R>=0 and R or 0,69,320)

modes/pcchallenge_lunatic.lua

@@ -13,7 +13,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		local R=100-P.stat.row
 		mStr(R>=0 and R or 0,69,320)

modes/pcchallenge_normal.lua

@@ -12,7 +12,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		local R=100-P.stat.row
 		mStr(R>=0 and R or 0,69,320)

modes/pctrain_lunatic.lua

@@ -65,7 +65,7 @@ return{
 		PLY.newPlayer(1,340,15)
 		newPC(players[1])
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(75)
 		mStr(P.stat.pc,69,400)
 		mText(drawableText.pc,69,482)

modes/pctrain_normal.lua

@@ -56,7 +56,7 @@ return{
 		PLY.newPlayer(1,340,15)
 		newPC(players[1])
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(75)
 		mStr(P.stat.pc,69,400)
 		mText(drawableText.pc,69,482)

modes/survivor_easy.lua

@@ -22,7 +22,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,380)
 		mText(drawableText.wave,69,445)

modes/survivor_hard.lua

@@ -28,7 +28,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,380)
 		mText(drawableText.wave,69,445)

modes/survivor_lunatic.lua

@@ -23,7 +23,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,380)
 		mText(drawableText.wave,69,445)

modes/survivor_normal.lua

@@ -27,7 +27,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,380)
 		mText(drawableText.wave,69,445)

modes/survivor_ultimate.lua

@@ -29,7 +29,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,380)
 		mText(drawableText.wave,69,445)

modes/tech_finesse.lua

@@ -15,7 +15,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/tech_finesse2.lua

@@ -26,7 +26,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/tech_hard.lua

@@ -19,7 +19,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/tech_hard2.lua

@@ -23,7 +23,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/tech_lunatic.lua

@@ -19,7 +19,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/tech_lunatic2.lua

@@ -23,7 +23,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/tech_normal.lua

@@ -19,7 +19,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/tech_normal2.lua

@@ -23,7 +23,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(45)
 		mStr(format("%.1f",P.stat.atk),69,260)
 		mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)

modes/techmino49_easy.lua

@@ -56,7 +56,7 @@ return{
 			n=n+1
 		end end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(35)
 		mStr(#players.alive.."/49",69,245)
 		mStr(P.modeData.point,80,285)

modes/techmino49_hard.lua

@@ -56,7 +56,7 @@ return{
 			n=n+1
 		end end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(35)
 		mStr(#players.alive.."/49",69,245)
 		mStr(P.modeData.point,80,285)

modes/techmino49_ultimate.lua

@@ -56,7 +56,7 @@ return{
 			n=n+1
 		end end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(35)
 		mStr(#players.alive.."/49",69,245)
 		mStr(P.modeData.point,80,285)

modes/techmino99_easy.lua

@@ -56,7 +56,7 @@ return{
 			n=n+1
 		end end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(35)
 		mStr(#players.alive.."/99",69,245)
 		mStr(P.modeData.point,80,285)

modes/techmino99_hard.lua

@@ -56,7 +56,7 @@ return{
 			n=n+1
 		end end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(35)
 		mStr(#players.alive.."/99",69,245)
 		mStr(P.modeData.point,80,285)

modes/techmino99_ultimate.lua

@@ -56,7 +56,7 @@ return{
 			n=n+1
 		end end
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(35)
 		mStr(#players.alive.."/99",69,245)
 		mStr(P.modeData.point,80,285)

modes/tsd_easy.lua

@@ -21,7 +21,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,320)
 		mText(drawableText.tsd,69,385)

modes/tsd_hard.lua

@@ -22,7 +22,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,320)
 		mText(drawableText.tsd,69,385)

modes/tsd_ultimate.lua

@@ -22,7 +22,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(65)
 		mStr(P.modeData.event,69,320)
 		mText(drawableText.tsd,69,385)

modes/ultra.lua

@@ -27,7 +27,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		gc.setLineWidth(2)
 		gc.rectangle("line",55,190,32,402)
 		local T=P.stat.time/120

modes/zen.lua

@@ -9,7 +9,7 @@ return{
 	load=function()
 		PLY.newPlayer(1,340,15)
 	end,
-	mesDisp=function(P,dx,dy)
+	mesDisp=function(P)
 		setFont(70)
 		local R=200-P.stat.row
 		mStr(R>=0 and R or 0,69,335)