bgm大规模调整

2020-10-11 02:03:35 +08:00
parent 03d600c819
commit 109da7d249
16 changed files with 36 additions and 22 deletions
--- a/Zframework/bgm.lua
+++ b/Zframework/bgm.lua
@@ -24,13 +24,27 @@ local BGM={
 	--playing=[src:playing SRC]
 }
 BGM.list={
-	"blank",
-	"race","push","way","reason",
-	"newera","oxygen","infinite","down",
-	"secret7th","secret8th",
-	"waterfall","shining terminal","distortion","far","storm",
-	"rockblock","cruelty","final","8-bit happiness","end",
-	"how feeling",
+	"blank",--menu
+	"race",--sprint, solo
+	"infinite",--infinite norm/dig, ultra, zen, tech-finesse
+	"push",--marathon, round, tsd, blind-5/6
+	"way",--dig sprint
+	"reason",--drought, blind-1/2/3/4
+
+	"secret8th",--master-1, survivor-2
+	"secret7th",--master-2, survivor-3
+	"waterfall",--sprint Penta/MPH
+	"newera",--bigbang, pc challenge, survivor-1, tech-normal
+	"oxygen",--c4w/pc train
+
+	"distortion",--master-3
+	"far",--GM
+	"shining terminal",--attacker
+	"storm",--defender, survivor-4/5
+	"down",--dig, tech-hard/lunatic
+
+	"rockblock",--classic, 49/99
+	"cruelty","final","8-bit happiness","end","how feeling",--49/99
 }
 BGM.len=#BGM.list
 function BGM.loadOne(N)
--- a/modes/blind_ultimate.lua
+++ b/modes/blind_ultimate.lua
@@ -11,7 +11,7 @@ return{
 		dropPiece=PLY.check_lineReach,
 		freshLimit=15,
 		target=200,
-		bg="rgb",bgm="way",
+		bg="rgb",bgm="push",
 	},
 	pauseLimit=true,
 	load=function()
--- a/modes/blind_wtf.lua
+++ b/modes/blind_wtf.lua
@@ -12,7 +12,7 @@ return{
 		dropPiece=PLY.check_lineReach,
 		freshLimit=15,
 		target=100,
-		bg="none",bgm="way",
+		bg="none",bgm="push",
 	},
 	pauseLimit=true,
 	load=function()
--- a/modes/defender_lunatic.lua
+++ b/modes/defender_lunatic.lua
@@ -47,7 +47,7 @@ return{
 		setFont(55)
 		mStr(P.modeData.event,69,270)
 		mStr(P.modeData.point,69,390)
-		mText(drawableText.wave,69,350)
+		mText(drawableText.wave,69,330)
 		mText(drawableText.rpm,69,450)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
--- a/modes/defender_normal.lua
+++ b/modes/defender_normal.lua
@@ -47,7 +47,7 @@ return{
 		setFont(55)
 		mStr(P.modeData.event,69,270)
 		mStr(P.modeData.point,69,390)
-		mText(drawableText.wave,69,350)
+		mText(drawableText.wave,69,330)
 		mText(drawableText.rpm,69,450)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.time}end,
--- a/modes/dig_hard.lua
+++ b/modes/dig_hard.lua
@@ -16,7 +16,7 @@ return{
 				D.event=D.event+1
 			end
 		end,
-		bg="bg2",bgm="way",
+		bg="bg2",bgm="down",
 	},
 	pauseLimit=true,
 	load=function()
--- a/modes/survivor_hard.lua
+++ b/modes/survivor_hard.lua
@@ -22,7 +22,7 @@ return{
 				P.modeData.event=P.modeData.event+1
 			end
 		end,
-		bg="glow",bgm="newera",
+		bg="glow",bgm="secret7th",
 	},
 	pauseLimit=true,
 	load=function()
--- a/modes/survivor_lunatic.lua
+++ b/modes/survivor_lunatic.lua
@@ -17,7 +17,7 @@ return{
 				P.modeData.event=P.modeData.event+1
 			end
 		end,
-		bg="glow",bgm="secret8th",
+		bg="glow",bgm="storm",
 	},
 	pauseLimit=true,
 	load=function()
--- a/modes/survivor_normal.lua
+++ b/modes/survivor_normal.lua
@@ -21,7 +21,7 @@ return{
 				P.modeData.event=d
 			end
 		end,
-		bg="glow",bgm="newera",
+		bg="glow",bgm="secret8th",
 	},
 	pauseLimit=true,
 	load=function()
--- a/modes/survivor_ultimate.lua
+++ b/modes/survivor_ultimate.lua
@@ -23,7 +23,7 @@ return{
 				P.modeData.event=P.modeData.event+1
 			end
 		end,
-		bg="rgb",bgm="secret7th",
+		bg="rgb",bgm="storm",
 	},
 	pauseLimit=true,
 	load=function()
--- a/modes/tech_finesse.lua
+++ b/modes/tech_finesse.lua
@@ -23,7 +23,7 @@ return{
 		mText(drawableText.eff,69,433)
 	end,
 	score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end,
-	scoreDisp=function(D)return D[1].." 	  "..toTime(D[2])end,
+	scoreDisp=function(D)return D[1].." Attack  "..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.atk
--- a/modes/tech_hard.lua
+++ b/modes/tech_hard.lua
@@ -14,7 +14,7 @@ return{
 		drop=20,lock=60,
 		freshLimit=15,
 		dropPiece=tech_check_easy,
-		bg="matrix",bgm="push",
+		bg="matrix",bgm="down",
 	},
 	load=function()
 		PLY.newPlayer(1,340,15)
--- a/modes/tech_hard2.lua
+++ b/modes/tech_hard2.lua
@@ -18,7 +18,7 @@ return{
 		drop=30,lock=60,
 		freshLimit=15,
 		dropPiece=tech_check_hard,
-		bg="matrix",bgm="push",
+		bg="matrix",bgm="down",
 	},
 	load=function()
 		PLY.newPlayer(1,340,15)
--- a/modes/tsd_easy.lua
+++ b/modes/tsd_easy.lua
@@ -16,7 +16,7 @@ return{
 		oncehold=false,
 		dropPiece=check_tsd,
 		ospin=false,
-		bg="matrix",bgm="reason",
+		bg="matrix",bgm="push",
 	},
 	load=function()
 		PLY.newPlayer(1,340,15)
--- a/modes/tsd_hard.lua
+++ b/modes/tsd_hard.lua
@@ -16,7 +16,7 @@ return{
 		freshLimit=15,
 		dropPiece=check_tsd,
 		ospin=false,
-		bg="matrix",bgm="reason",
+		bg="matrix",bgm="push",
 	},
 	pauseLimit=true,
 	load=function()
--- a/modes/tsd_ultimate.lua
+++ b/modes/tsd_ultimate.lua
@@ -16,7 +16,7 @@ return{
 		freshLimit=15,
 		dropPiece=check_tsd,
 		ospin=false,
-		bg="matrix",bgm="reason",
+		bg="matrix",bgm="push",
 	},
 	pauseLimit=true,
 	load=function()