Skip to content

Commit

Permalink
alphabet + dialogue BGM fixes
Browse files Browse the repository at this point in the history
yippee!!!
  • Loading branch information
GsDrunkestDriver committed May 18, 2024
1 parent a0ed5a8 commit 5f46610
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
Binary file modified assets/images/UI/default/base/alphabet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 15 additions & 3 deletions source/meta/state/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class PlayState extends MusicBeatState
public static var vocals:FlxSound;
public static var vocalsOpp:FlxSound;
public static var hasSplitVocals:Bool = false;
public static var songDialogue:FlxSound;

public static var campaignScore:Int = 0;

Expand Down Expand Up @@ -2119,6 +2120,9 @@ class PlayState extends MusicBeatState
else
ForeverTools.killMusic([songMusic, vocals, /*vocalsOpp*/]);

if (songDialogue != null)
ForeverTools.killMusic([songDialogue]);

// deliberately did not use the main.switchstate as to not unload the assets
FlxG.switchState(new PlayState());
}
Expand Down Expand Up @@ -2229,12 +2233,18 @@ class PlayState extends MusicBeatState

switch(SONG.song.toLowerCase()){
case 'deadbattle':
FlxG.sound.playMusic(Paths.music("PreSong1"));
songDialogue = new FlxSound().loadEmbedded(Paths.music("PreSong1"), false, true);
//FlxG.sound.playMusic(Paths.music("PreSong1"));
case 'reaper-rhythm':
FlxG.sound.playMusic(Paths.music("PreSong2"));
songDialogue = new FlxSound().loadEmbedded(Paths.music("PreSong1"), false, true);
//FlxG.sound.playMusic(Paths.music("PreSong2"));
case 'behold-the-apocalypse':
FlxG.sound.playMusic(Paths.music("PreSong3"));
songDialogue = new FlxSound().loadEmbedded(Paths.music("PreSong1"), false, true);
//FlxG.sound.playMusic(Paths.music("PreSong3"));
}

if (songDialogue != null)
songDialogue.play();
}
else
songIntroCutscene();
Expand Down Expand Up @@ -2265,6 +2275,8 @@ class PlayState extends MusicBeatState

private function startCountdown():Void
{
if (songDialogue != null)
songDialogue.stop();
inCutscene = false;
Conductor.songPosition = -(Conductor.crochet * 5);
swagCounter = 0;
Expand Down

0 comments on commit 5f46610

Please sign in to comment.