Pause music and game over music

and bump the version number

Author: VMan-2002

source/GameOverSubstate.hx

@@ -16,6 +16,9 @@ class GameOverSubstate extends MusicBeatSubstate
 
 	var stageSuffix:String = "";
 
+	public var gameOverMusicName:String = "gameOver";
+	public var gameOverMusicEndName:String = "gameOverEnd";
+
 	public function new(x:Float, y:Float)
 	{
 		var daStage = PlayState.curStage;
@@ -38,6 +41,18 @@ class GameOverSubstate extends MusicBeatSubstate
 		} else {
 			deathSound += stageSuffix;
 		}
+		gameOverMusicName += stageSuffix;
+		gameOverMusicEndName += stageSuffix;
+		if (Std.isOfType(FlxG.state, PlayState)) {
+			var thingy:PlayState = cast FlxG.state;
+			if (thingy.currentUIStyle.gameOverMusic != null) {
+				gameOverMusicName = thingy.currentUIStyle.gameOverMusic;
+			}
+			if (thingy.currentUIStyle.gameOverMusic != null) {
+				gameOverMusicEndName = thingy.currentUIStyle.gameOverMusicEnd;
+			}
+		}
+
 
 		super();
 
@@ -98,7 +113,7 @@ class GameOverSubstate extends MusicBeatSubstate
 			FlxG.camera.follow(camFollow, LOCKON, 0.01);
 
 		if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished)
-			CoolUtil.playMusic('gameOver' + stageSuffix);
+			CoolUtil.playMusic(gameOverMusicName);
 
 		if (FlxG.sound.music.playing)
 			Conductor.songPosition = FlxG.sound.music.time;
@@ -120,7 +135,7 @@ class GameOverSubstate extends MusicBeatSubstate
 			isEnding = true;
 			bf.playAnim('deathConfirm', true);
 			FlxG.sound.music.stop();
-			FlxG.sound.play(Paths.music('gameOverEnd' + stageSuffix));
+			FlxG.sound.play(Paths.music(gameOverMusicEndName));
 			new FlxTimer().start(0.7, function(tmr:FlxTimer)
 			{
 				FlxG.camera.fade(FlxColor.BLACK, 2, false, gotoplaystate);

source/Main.hx

@@ -18,7 +18,7 @@ import Sys;
 
 class Main extends Sprite
 {
-	public static final gameVersionStr = "v1.0.0 First Release";
+	public static final gameVersionStr = "v1.0.1 Funny Day 0 Patch";
 
 	var gameWidth:Int = 1280; // Width of the game in pixels (might be less / more in actual pixels depending on your zoom).
 	var gameHeight:Int = 720; // Height of the game in pixels (might be less / more in actual pixels depending on your zoom).

source/Note.hx

@@ -105,6 +105,9 @@ class SwagUIStyleFile { //Because Float->Float doesnt work with the JsonParser
 	public var iconEaseStr:Null<String>;
 	public var iconEase:Null<Float>;
 	public var font:Null<String>;
+	public var gameOverMusic:Null<String>;
+	public var gameOverMusicEnd:Null<String>;
+	public var pauseMusic:Null<String>;
 
 	public function new() {
 		return;
@@ -133,7 +136,11 @@ class SwagUIStyle {
 	public var hudThingPos:Null<Map<String, Array<Float>>>;
 	public var iconEase:Null<Float>;
 	public var iconEaseFunc:Null<Float->Float>;
-	public var font:String = "vcr font";
+	public var font:String = "vcr font"; //todo: is this implemented?
+	//todo: implement these
+	public var gameOverMusic:Null<String>;
+	public var gameOverMusicEnd:Null<String>;
+	public var pauseMusic:Null<String>;
 
 	public function new() {
 		return;
@@ -222,7 +229,9 @@ class SwagUIStyle {
 		}
 		uiStyle.font = uiStyleFile.font == null ? "vcr font" : uiStyleFile.font;
 		uiStyle.hudThingPos = uiStyleFile.hudThingPos == null ? new Map<String, Array<Float>>() : uiStyleFile.hudThingPos;
-		
+		uiStyle.gameOverMusic = uiStyleFile.gameOverMusic;
+		uiStyle.gameOverMusicEnd = uiStyleFile.gameOverMusicEnd;
+		uiStyle.pauseMusic = uiStyleFile.pauseMusic;
 		Note.loadedUIStyles.set('${modName}:${name}', uiStyle);
 		trace('loaded uistyle ${modName}:${name}');
 		return uiStyle;

source/PauseSubState.hx

@@ -30,9 +30,16 @@ class PauseSubState extends MusicBeatSubstate
 		if (Std.isOfType(FlxG.state, PlayStateOffsetCalibrate)) {
 			menuItems.remove("Exit to menu");
 		}
+		var pauseMusicName = 'breakfast';
+		if (Std.isOfType(FlxG.state, PlayState)) {
+			var thingy:PlayState = cast FlxG.state;
+			if (thingy.currentUIStyle.pauseMusic != null) {
+				pauseMusicName = thingy.currentUIStyle.pauseMusic;
+			}
+		}
 
 		//Dont use CoolUtil.playMusic here
-		pauseMusic = new FlxSound().loadEmbedded(Paths.music('breakfast'), true, true);
+		pauseMusic = new FlxSound().loadEmbedded(Paths.music(pauseMusicName), true, true);
 		pauseMusic.volume = 0;
 		pauseMusic.play(false, FlxG.random.int(0, Std.int(pauseMusic.length / 2)));