diff --git a/assets/images/weeb/senpai.png b/assets/images/weeb/senpai.png index 07b5adc..9fb986f 100644 Binary files a/assets/images/weeb/senpai.png and b/assets/images/weeb/senpai.png differ diff --git a/assets/images/weeb/senpai.xml b/assets/images/weeb/senpai.xml index cbdf205..d8e532e 100644 --- a/assets/images/weeb/senpai.xml +++ b/assets/images/weeb/senpai.xml @@ -2,74 +2,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/DialogueBox.hx b/source/DialogueBox.hx index 2dbd53e..f8dbfe6 100644 --- a/source/DialogueBox.hx +++ b/source/DialogueBox.hx @@ -130,7 +130,7 @@ class DialogueBox extends FlxSpriteGroup dialogueStarted = true; } - if (FlxG.keys.justPressed.SPACE) + if (FlxG.keys.justPressed.ANY) { remove(dialogue); diff --git a/source/PlayState.hx b/source/PlayState.hx index b669a03..94e3977 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -116,6 +116,8 @@ class PlayState extends MusicBeatState // how big to stretch the pixel art assets public static var daPixelZoom:Float = 6; + var inCutscene:Bool = false; + override public function create() { // var gameCam:FlxCamera = FlxG.camera; @@ -753,6 +755,7 @@ class PlayState extends MusicBeatState { if (dialogueBox != null) { + inCutscene = true; add(dialogueBox); } else @@ -768,6 +771,8 @@ class PlayState extends MusicBeatState function startCountdown():Void { + inCutscene = false; + generateStaticArrows(0); generateStaticArrows(1); @@ -1512,7 +1517,8 @@ class PlayState extends MusicBeatState }); } - keyShit(); + if (!inCutscene) + keyShit(); // if (FlxG.keys.justPressed.ONE) // endSong();