From 3451be5943299298f49dc91517a809c13e6f4124 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Sat, 3 Apr 2021 21:37:57 -0700 Subject: [PATCH] bf holding GF dead offset shit in progress --- source/Character.hx | 13 +++++++++++++ source/GameOverSubstate.hx | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/source/Character.hx b/source/Character.hx index 06745f3b3..42c320cad 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -357,6 +357,19 @@ class Character extends FlxSprite antialiasing = false; flipX = true; + case 'bf-holding-gf-dead': + frames = Paths.getSparrowAtlas('characters/bfHoldingGF-DEAD'); + quickAnimAdd('singUP', 'BF Dead with GF Loop'); + quickAnimAdd('firstDeath', 'BF Dies with GF'); + animation.addByPrefix('deathLoop', 'BF Dead with GF Loop', 24, true); + quickAnimAdd('deathConfirm', 'RETRY confirm holding gf'); + + loadOffsetFile(curCharacter); + + playAnim('firstDeath'); + + flipX = true; + case 'senpai': frames = Paths.getSparrowAtlas('characters/senpai'); quickAnimAdd('idle', 'Senpai Idle'); diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx index 79e86c748..fd082d21e 100644 --- a/source/GameOverSubstate.hx +++ b/source/GameOverSubstate.hx @@ -6,6 +6,7 @@ import flixel.FlxSubState; import flixel.math.FlxPoint; import flixel.util.FlxColor; import flixel.util.FlxTimer; +import haxe.display.Display.Package; class GameOverSubstate extends MusicBeatSubstate { @@ -31,6 +32,14 @@ class GameOverSubstate extends MusicBeatSubstate daBf = 'bf'; } + var daSong = PlayState.SONG.song.toLowerCase(); + + switch (daSong) + { + case 'stress': + daBf = 'bf-holding-gf-dead'; + } + super(); Conductor.songPosition = 0;