141414151515

assets/songs/deadbattle/dialogue.json

@@ -27,7 +27,8 @@
 			{
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
-				"text": "Hello darling, good to see you again."
+				"text": "Hello darling, good to see you again.",
+				"voiceLine":"hidarling1"
 			},
 			{
 				"portrait": "bf",
@@ -41,7 +42,8 @@
 			{
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
-				"text": "So... You must be the 'rising star' \nI've been hearing about..."
+				"text": "So... You must be the 'rising star' \nI've been hearing about...",
+				"voiceLine": "risingstar2"
 			},
 			{
 				"portrait": "bf",
@@ -51,7 +53,8 @@
 			{
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
-				"text": "Yes, and I heard how he treated you. \nAnd I'm not happy about it."
+				"text": "Yes, and I heard how he treated you. \nAnd I'm not happy about it.",
+				"voiceLine": "treatedyou3"
 			},
 			{
 				"portrait": "bf",
@@ -66,7 +69,8 @@
 			{
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
-				"text": "SILENCE!"
+				"text": "SILENCE!",
+				"voiceLine": "silence44"
 			},
 			{
 				"portrait": "bf",
@@ -81,17 +85,20 @@
 			{
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
-				"text": "Now, now, sweetheart. I'll deal with him, \nyou sit down and let your old man teach \nthis boy a lesson he won't forget."
+				"text": "Now, now, sweetheart. I'll deal with him, \nyou sit down and let your old man teach \nthis boy a lesson he won't forget.",
+				"voiceLine": "idk5"
 			},
 			{
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
-				"text": "So... Boy, you think you can mess with my kin?"
+				"text": "So... Boy, you think you can mess with my kin?",
+				"voiceLine": "mess6"
 			},
 			{
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
-				"text": "Let me tell you now, that's a sin."
+				"text": "Let me tell you now, that's a sin.",
+				"voiceLine": "sin7"
 			}
 	]
 }

assets/songs/reaper-rhythm/dialogue.json

@@ -11,8 +11,7 @@
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
 				"text": "Haha! What's wrong, boy? \nCan't handle someone NOT giving \nyou a window to breathe?",
-				"sounds":"whatswrong1",
-				"soundPath":"assets/sounds/"
+				"voiceLine": "whatswrong1"
 			},
 			{
 				"portrait": "bf",
@@ -22,18 +21,22 @@
 			{
 				"portrait": "senpai",
 				"expression": "Senpai Portrait Enter",
-				"text": "Hmph... Using a guitar is 'unfair'? \nLike I give a damn!"
+				"text": "Hmph... Using a guitar is 'unfair'? \nLike I give a damn!",
+				"voiceLine":"igiveadamn2"
 			},
 			{
-				"text":  "But... I'll admit, your singing is \nimpeccable. I honestly didn't expect \nyou to keep up."
+				"text":  "But... I'll admit, your singing is \nimpeccable. I honestly didn't expect \nyou to keep up.",
+				"voiceLine":"yoursinging3"
 			},
 			{
-				"text": "Hmm, very well boy. \nYou want me to sing?"
+				"text": "Hmm, very well boy. \nYou want me to sing?",
+				"voiceLine":"wantmetosing4"
 			},
 			{
 				"portrait": "bf",
 				"expression": "Smug Talk",
-				"text":  "CLOAK REVEAL ANIM HERE"
+				"text":  "CLOAK REVEAL ANIM HERE",
+				"voiceLine":"letssing5"
 			}
 	]
 }

source/Init.hx

@@ -56,12 +56,6 @@ class Init extends FlxState
 			'Whether to use a controller instead of the keyboard to play.',
 			NOT_FORCED
 		],
-		'Auto Pause' => [
-			true,
-			Checkmark,
-			'Whether to pause the game automatically if the window is unfocused.',
-			NOT_FORCED
-		],
 		'FPS Counter' => [true, Checkmark, 'Whether to display the FPS counter.', NOT_FORCED],
 		'Memory Counter' => [
 			true,
@@ -340,7 +334,7 @@ class Init extends FlxState
 
 	public static function updateAll()
 	{
-		FlxG.autoPause = trueSettings.get('Auto Pause');
+		FlxG.autoPause = true;
 
 		Overlay.updateDisplayInfo(trueSettings.get('FPS Counter'), trueSettings.get('Debug Info'), trueSettings.get('Memory Counter'));
 

source/gameObjects/userInterface/DialogueBox.hx

@@ -5,6 +5,7 @@ import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.group.FlxSpriteGroup;
 import flixel.math.FlxPoint;
+import flixel.sound.FlxSound;
 import flixel.text.FlxText;
 import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
@@ -39,6 +40,7 @@ typedef DialogueDataDef =
 
 	var speed:Null<Int>;
 	var scale:Null<Int>;
+	var voiceLine:Null<String>;
 }
 
 typedef BoxDataDef =
@@ -89,6 +91,7 @@ class DialogueBox extends FlxSpriteGroup
 	public var whenDaFinish:Void->Void;
 
 	public var textStarted:Bool = false;
+	public var voiceline:FlxSound;
 
 	public static function createDialogue(thisDialogue:String):DialogueBox
 	{
@@ -211,6 +214,18 @@ class DialogueBox extends FlxSpriteGroup
 		// If the text has started, build the text
 		else
 			startText();
+
+
+		if (voiceline!=null)
+			{
+				voiceline.stop(); 
+			}
+		if (pageData.voiceLine!=null)
+			{
+				voiceline=new FlxSound().loadEmbedded(Paths.file("images/dialogue/boxes/gd/" + pageData.voiceLine + "." + Paths.SOUND_EXT),false,true);
+				voiceline.play();
+			}
+			alphabetText.playSounds=curCharacter!="senpai"; //senpai for now, then should be gd
 	}
 
 	public function updateTextBox(force:Bool = false)
@@ -507,6 +522,10 @@ class DialogueBox extends FlxSpriteGroup
 	override function update(elapsed:Float)
 	{
 
+		if(FlxG.keys.justPressed.SHIFT){
+			if(voiceline!=null){voiceline.stop();}
+			trace('bye bye');
+		}
 		portrait.animation.paused = alphabetText.finishedLine;
 		if (portrait.animation.paused)
 			portrait.animation.finish();
@@ -515,6 +534,11 @@ class DialogueBox extends FlxSpriteGroup
 		if (bgFade.alpha > 0.6)
 			bgFade.alpha = 0.6;
 
+		if (FlxG.keys.justPressed.ENTER) 
+			{
+				if(voiceline!=null){voiceline.stop();}
+			}
+
 		super.update(elapsed);
 	}
 }

source/meta/state/PlayState.hx

@@ -2245,6 +2245,7 @@ class PlayState extends MusicBeatState
 
 			if (songDialogue != null)
 				songDialogue.play();
+				songDialogue.volume=0.7;
 		}
 		else
 			songIntroCutscene();

source/meta/state/menus/MainMenuState.hx

@@ -38,7 +38,6 @@ class MainMenuState extends MusicBeatState
 
 	public var camFollow:FlxObject;
 
-	public var menuItem:MainMenuItem;
 	// the create 'state'
 	override function create()
 	{
@@ -92,7 +91,7 @@ class MainMenuState extends MusicBeatState
 		// loop through the menu options
 		for (i in 0...optionShit.length)
 		{
-			menuItem=new MainMenuItem();
+			var menuItem:MainMenuItem=new MainMenuItem();
 			menuItem.frames = Paths.getSparrowAtlas('menus/base/title/MENU/menu_' + optionShit[i]);
 			menuItem.ID = i;
 			// add the animations in a cool way (real
@@ -249,15 +248,15 @@ class MainMenuState extends MusicBeatState
 						menuItems[i].onOverlap();
 
 						switch(i){
-							case 0:
+							case 0://s
 							menuItems[i].x=-15;
 							menuItems[i].y=5.5;			
-							case 1:
+							case 1://f
 							menuItems[i].x=320;
-							menuItems[i].y=5.5;
-							case 2:
+								menuItems[i].y=5.5;
+							case 2://o
 							menuItems[i].x=676;
-							menuItems[i].y=5.5;
+								menuItems[i].y=5.5;
 						}
 
 						break;
@@ -269,18 +268,19 @@ class MainMenuState extends MusicBeatState
 				menuItems[i].onAway();
 				curSelected = -1;
 				switch(i){
-					case 0:
-					menuItems[i].x=15;
-					menuItems[i].y=49.5;
-					case 1:
+					case 0: //s
+						menuItems[i].x=15;
+						menuItems[i].y=49.5;
+					case 1: //f
 					menuItems[i].x=350;
-					menuItems[i].y=49.5;
-					case 2:
+						menuItems[i].y=49.5;
+					case 2: //o
 					menuItems[i].x=696;
-					menuItems[i].y=49.5;
+						menuItems[i].y=49.5;
 				}
 			}
 		}
+
 		if (curSelected!=-1&&curSelected<menuItems.length&&menuItems[curSelected]!=null){
 			if (FlxG.mouse.justPressed&&menuItems[curSelected].onClick!=null){
 				menuItems[curSelected].onClick();

source/meta/subState/PauseSubState.hx

@@ -131,7 +131,7 @@ class PauseSubState extends MusicBeatSubState
 					PlayState.deaths = 0;
 
 					if (PlayState.isStoryMode)
-						Main.switchState(this, new StoryMenuState());
+						Main.switchState(this, new MainMenuState());
 					else
 						Main.switchState(this, new FreeplayState());
 			}