diff --git a/media/music/1989.ogg b/media/music/1989.ogg new file mode 100644 index 00000000..a09549d5 Binary files /dev/null and b/media/music/1989.ogg differ diff --git a/parts/modes/blind_e.lua b/parts/modes/blind_e.lua index ae925dd4..5f9cad05 100644 --- a/parts/modes/blind_e.lua +++ b/parts/modes/blind_e.lua @@ -6,7 +6,7 @@ return{ visible='easy', mesDisp=require"parts.eventsets.blindMesDisp".mesDisp, eventSet='checkLine_200', - bg='glow',bgm='push', + bg='glow',bgm='sugar fairy', }, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/blind_h.lua b/parts/modes/blind_h.lua index c55ca6c4..df10b80a 100644 --- a/parts/modes/blind_h.lua +++ b/parts/modes/blind_h.lua @@ -9,7 +9,7 @@ return{ freshLimit=15, mesDisp=require"parts.eventsets.blindMesDisp".mesDisp, eventSet='checkLine_200', - bg='rgb',bgm='push', + bg='rgb',bgm='sugar fairy', }, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/blind_l.lua b/parts/modes/blind_l.lua index 1add1a0d..12397415 100644 --- a/parts/modes/blind_l.lua +++ b/parts/modes/blind_l.lua @@ -10,7 +10,7 @@ return{ freshLimit=15, mesDisp=require"parts.eventsets.blindMesDisp".mesDisp, eventSet='checkLine_200', - bg='rgb',bgm='push', + bg='rgb',bgm='sugar fairy', }, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/blind_n.lua b/parts/modes/blind_n.lua index ff0df3d4..864229af 100644 --- a/parts/modes/blind_n.lua +++ b/parts/modes/blind_n.lua @@ -6,7 +6,7 @@ return{ visible='fast', mesDisp=require"parts.eventsets.blindMesDisp".mesDisp, eventSet='checkLine_200', - bg='glow',bgm='push', + bg='glow',bgm='sugar fairy', }, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/classic_e.lua b/parts/modes/classic_e.lua index 64cd21e2..f0744556 100644 --- a/parts/modes/classic_e.lua +++ b/parts/modes/classic_e.lua @@ -5,7 +5,7 @@ return{ smooth=false, face={0,0,2,2,2,0,0}, eventSet='classic_e', - bg='rgb',bgm='magicblock', + bg='rgb',bgm='1989', }, slowMark=true, score=function(P)return{P.stat.score,P.stat.row}end, diff --git a/parts/modes/classic_h.lua b/parts/modes/classic_h.lua index b0ec0fbb..4138f34e 100644 --- a/parts/modes/classic_h.lua +++ b/parts/modes/classic_h.lua @@ -5,7 +5,7 @@ return{ smooth=false, face={0,0,2,2,2,0,0}, eventSet='classic_h', - bg='rgb',bgm='magicblock', + bg='rgb',bgm='1989', }, slowMark=true, score=function(P)return{P.stat.score,P.stat.row}end, diff --git a/parts/modes/classic_u.lua b/parts/modes/classic_u.lua index bb359190..e070ac74 100644 --- a/parts/modes/classic_u.lua +++ b/parts/modes/classic_u.lua @@ -5,7 +5,7 @@ return{ smooth=false, face={0,0,2,2,2,0,0}, eventSet='classic_u', - bg='rgb',bgm='magicblock', + bg='rgb',bgm='1989', }, slowMark=true, score=function(P)return{P.stat.score,P.stat.row}end, diff --git a/parts/modes/rhythm_e.lua b/parts/modes/rhythm_e.lua index c9133548..18354ad2 100644 --- a/parts/modes/rhythm_e.lua +++ b/parts/modes/rhythm_e.lua @@ -4,7 +4,7 @@ return{ mindas=7,minarr=1,minsdarr=1, keyCancel={6}, eventSet='rhythm_e', - bg='bg2',bgm='push', + bg='bg2',bgm='magicblock', }, slowMark=true, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, diff --git a/parts/modes/techmino49_e.lua b/parts/modes/techmino49_e.lua index cabc5222..e0e24f87 100644 --- a/parts/modes/techmino49_e.lua +++ b/parts/modes/techmino49_e.lua @@ -14,7 +14,7 @@ return{ pushSpeed=2, freshLimit=15, eventSet='royale', - bg='rainbow',bgm='sugar fairy', + bg='rainbow',bgm='rockblock', }, load=function() ROYALEDATA.powerUp={2,5,10,20} diff --git a/parts/modes/techmino49_u.lua b/parts/modes/techmino49_u.lua index 69dde784..19ff0bd1 100644 --- a/parts/modes/techmino49_u.lua +++ b/parts/modes/techmino49_u.lua @@ -14,7 +14,7 @@ return{ pushSpeed=2, freshLimit=15, eventSet='royale', - bg='rainbow',bgm='magicblock', + bg='rainbow',bgm='rockblock', }, load=function() ROYALEDATA.powerUp={2,5,10,20} diff --git a/parts/modes/techmino99_e.lua b/parts/modes/techmino99_e.lua index 5d3c48a5..c1b48e2f 100644 --- a/parts/modes/techmino99_e.lua +++ b/parts/modes/techmino99_e.lua @@ -14,7 +14,7 @@ return{ pushSpeed=2, freshLimit=15, eventSet='royale', - bg='rainbow',bgm='sugar fairy', + bg='rainbow',bgm='rockblock', }, load=function() ROYALEDATA.powerUp={2,6,14,30} diff --git a/parts/modes/techmino99_u.lua b/parts/modes/techmino99_u.lua index 4c1ae85c..d3fc9b04 100644 --- a/parts/modes/techmino99_u.lua +++ b/parts/modes/techmino99_u.lua @@ -14,7 +14,7 @@ return{ pushSpeed=2, freshLimit=15, eventSet='royale', - bg='rainbow',bgm='magicblock', + bg='rainbow',bgm='rockblock', }, load=function() ROYALEDATA.powerUp={2,6,14,30} diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index fbe13b11..86277b87 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -21,6 +21,7 @@ local author={ ["jazz nihilism"]="Trebor", ["race remix"]="柒栎流星", ["sakura"]="ZUN & C29H25N3O5", + ["1989"]="C29H25N3O5", } local scene={}