Last minute fixes

ThatRozebudDude · Oct 25, 2021 · 2e12876 · 2e12876
1 parent 0a12497
commit 2e12876
Show file tree

Hide file tree

Showing 23 changed files with 6 additions and 5 deletions.
diff --git a/assets/sounds/death/emmi1.ogg b/assets/sounds/death/emmi1.ogg
diff --git a/assets/sounds/death/emmi10.ogg b/assets/sounds/death/emmi10.ogg
diff --git a/assets/sounds/death/emmi11.ogg b/assets/sounds/death/emmi11.ogg
diff --git a/assets/sounds/death/emmi12.ogg b/assets/sounds/death/emmi12.ogg
diff --git a/assets/sounds/death/emmi13.ogg b/assets/sounds/death/emmi13.ogg
diff --git a/assets/sounds/death/emmi14.ogg b/assets/sounds/death/emmi14.ogg
diff --git a/assets/sounds/death/emmi15.ogg b/assets/sounds/death/emmi15.ogg
diff --git a/assets/sounds/death/emmi16.ogg b/assets/sounds/death/emmi16.ogg
diff --git a/assets/sounds/death/emmi17.ogg b/assets/sounds/death/emmi17.ogg
diff --git a/assets/sounds/death/emmi18.ogg b/assets/sounds/death/emmi18.ogg
diff --git a/assets/sounds/death/emmi19.ogg b/assets/sounds/death/emmi19.ogg
diff --git a/assets/sounds/death/emmi2.ogg b/assets/sounds/death/emmi2.ogg
diff --git a/assets/sounds/death/emmi20.ogg b/assets/sounds/death/emmi20.ogg
diff --git a/assets/sounds/death/emmi21.ogg b/assets/sounds/death/emmi21.ogg
diff --git a/assets/sounds/death/emmi3.ogg b/assets/sounds/death/emmi3.ogg
diff --git a/assets/sounds/death/emmi4.ogg b/assets/sounds/death/emmi4.ogg
diff --git a/assets/sounds/death/emmi5.ogg b/assets/sounds/death/emmi5.ogg
diff --git a/assets/sounds/death/emmi6.ogg b/assets/sounds/death/emmi6.ogg
diff --git a/assets/sounds/death/emmi7.ogg b/assets/sounds/death/emmi7.ogg
diff --git a/assets/sounds/death/emmi8.ogg b/assets/sounds/death/emmi8.ogg
diff --git a/assets/sounds/death/emmi9.ogg b/assets/sounds/death/emmi9.ogg
diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx
@@ -81,7 +81,10 @@ class GameOverSubstate extends MusicBeatSubstate
 
 		if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished)
 		{
-			FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix));
+			if (PlayState.SONG.song.toLowerCase() == 'glamour'){
+				FlxG.sound.play(Paths.sound("death/emmi" + FlxG.random.int(1, 21)));
+			}
+			FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix), 0.6);
 		}
 
 		if (FlxG.sound.music.playing)

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -336,11 +336,9 @@ class PlayState extends MusicBeatState
 		var gfVersion:String = 'gf';
 
 		if (SONG.gf == null) {
-			switch(storyWeek)
+			switch(SONG.song.toLowerCase())
 			{
-				case 4: gfVersion = 'gf-car';
-				case 5: gfVersion = 'gf-christmas';
-				case 6: gfVersion = 'gf-pixel';
+				case "glamour": gfVersion = 'gf-cola';
 			}
 
 			SONG.gf = gfVersion;