Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-02-19 21:27:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #294 from FunkinCrew/bugfix/pico-death-anim-fix

Browse source 
Two bug fixes
This commit is contained in:
Cameron Taylor 2024-01-18 00:57:40 -05:00 committed by GitHub
commit 7dacf6876a
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 3d0c0aca06f0032aeca88a750b0ed9422e4afb07 Subproject commit 5d28d36311d95d17ec9bddaca479b0f8db088a7c

24
source/funkin/play/GameOverSubState.hx
View file

@ -23,6 +23,12 @@ import funkin.play.character.BaseCharacter;
*/ */
class GameOverSubState extends MusicBeatSubState class GameOverSubState extends MusicBeatSubState
{ {
/**
* The currently active GameOverSubState.
* There should be only one GameOverSubState in existance at a time, we can use a singleton.
*/
public static var instance:GameOverSubState = null;
/** /**
* Which alternate animation on the character to use. * Which alternate animation on the character to use.
* You can set this via script. * You can set this via script.
@ -88,6 +94,13 @@ class GameOverSubState extends MusicBeatSubState
override public function create() override public function create()
{ {
if (instance != null)
{
// TODO: Do something in this case? IDK.
trace('WARNING: GameOverSubState instance already exists. This should not happen.');
}
instance = this;
super.create(); super.create();
// //
@ -283,10 +296,10 @@ class GameOverSubState extends MusicBeatSubState
*/ */
function startDeathMusic(?startingVolume:Float = 1, force:Bool = false):Void function startDeathMusic(?startingVolume:Float = 1, force:Bool = false):Void
{ {
var musicPath = Paths.music('gameOver' + musicSuffix); var musicPath = Paths.music('gameplay/gameover/gameOver' + musicSuffix);
if (isEnding) if (isEnding)
{ {
musicPath = Paths.music('gameOverEnd' + musicSuffix); musicPath = Paths.music('gameplay/gameover/gameOverEnd' + musicSuffix);
} }
if (!gameOverMusic.playing || force) if (!gameOverMusic.playing || force)
{ {
@ -306,7 +319,7 @@ class GameOverSubState extends MusicBeatSubState
public static function playBlueBalledSFX() public static function playBlueBalledSFX()
{ {
blueballed = true; blueballed = true;
FlxG.sound.play(Paths.sound('fnf_loss_sfx' + blueBallSuffix)); FlxG.sound.play(Paths.sound('gameplay/gameover/fnf_loss_sfx' + blueBallSuffix));
} }
var playingJeffQuote:Bool = false; var playingJeffQuote:Bool = false;
@ -329,6 +342,11 @@ class GameOverSubState extends MusicBeatSubState
} }
}); });
} }
public override function toString():String
{
return "GameOverSubState";
}
} }
typedef GameOverParams = typedef GameOverParams =

1
source/funkin/play/PlayState.hx
View file

@ -1354,6 +1354,7 @@ class PlayState extends MusicBeatSubState
function loadStage(id:String):Void function loadStage(id:String):Void
{ {
currentStage = StageRegistry.instance.fetchEntry(id); currentStage = StageRegistry.instance.fetchEntry(id);
currentStage.revive(); // Stages are killed and props destroyed when the PlayState is destroyed to save memory.
if (currentStage != null) if (currentStage != null)
{ {