From 3ab6e6e9d3e0af5fa94a36295fc916029b2c3633 Mon Sep 17 00:00:00 2001 From: Lasercar Date: Wed, 29 Jan 2025 22:48:02 +1000 Subject: [PATCH 1/2] Make the game over music loop for pico's explosion the default --- preload/scripts/characters/pico-playable.hxc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/preload/scripts/characters/pico-playable.hxc b/preload/scripts/characters/pico-playable.hxc index f7f31c3ed..8041c37fc 100644 --- a/preload/scripts/characters/pico-playable.hxc +++ b/preload/scripts/characters/pico-playable.hxc @@ -245,7 +245,6 @@ class PicoPlayerCharacter extends MultiSparrowCharacter { clearCasings(); // Reset to standard death animation. - GameOverSubState.musicSuffix = '-pico'; GameOverSubState.blueBallSuffix = '-pico'; PauseSubState.musicSuffix = '-pico'; @@ -261,6 +260,8 @@ class PicoPlayerCharacter extends MultiSparrowCharacter { deathSpriteRetry.animation.play('idle'); deathSpriteRetry.visible = true; GameOverSubState.instance.startDeathMusic(1.0, false); + // set the game over music to the default to make it loop properly + GameOverSubState.musicSuffix = '-pico'; // force the deathloop to play in here, since we are starting the music early it // doesn't check this in gameover substate ! // also no animation suffix 🤔 From 0811fb6ecdf48e488d3d3bf2e467f2865b2d9434 Mon Sep 17 00:00:00 2001 From: Lasercar Date: Sat, 1 Feb 2025 18:56:46 +1000 Subject: [PATCH 2/2] Bonus fix - don't play the stab death animation for pico's explosion --- preload/scripts/characters/pico-playable.hxc | 1 + 1 file changed, 1 insertion(+) diff --git a/preload/scripts/characters/pico-playable.hxc b/preload/scripts/characters/pico-playable.hxc index 8041c37fc..9c7e557bb 100644 --- a/preload/scripts/characters/pico-playable.hxc +++ b/preload/scripts/characters/pico-playable.hxc @@ -111,6 +111,7 @@ class PicoPlayerCharacter extends MultiSparrowCharacter { if (GameOverSubState.blueBallSuffix == '-pico-explode') { // Explosion death animation. doExplosionDeath(); + return; // Don't play the stab death animation, sure, pico is set as invisible, but still good to do this } else { // Standard death animation. createDeathSprites();