diff --git a/source/Character.hx b/source/Character.hx index 236544734..4e3ca03e1 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -385,6 +385,23 @@ class Character extends FlxSprite antialiasing = false; flipX = true; + case 'bf-pixel-dead': + frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/bfPixelsDEAD.png', 'assets/images/weeb/bfPixelsDEAD.xml'); + animation.addByPrefix('singUP', "BF Dies pixel", 24, false); + animation.addByPrefix('firstDeath', "BF Dies pixel", 24, false); + animation.addByPrefix('deathLoop', "Retry Loop", 24, true); + animation.addByPrefix('deathConfirm', "RETRY CONFIRM", 24, false); + animation.play('firstDeath'); + addOffset('firstDeath'); + addOffset('deathLoop'); + addOffset('deathConfirm'); + + // pixel bullshit + setGraphicSize(Std.int(width * 6)); + updateHitbox(); + antialiasing = false; + flipX = true; + case 'senpai': frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpai.png', 'assets/images/weeb/senpai.xml'); animation.addByPrefix('idle', 'Senpai Idle', 24, false); diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx index 54df50cdd..6a40b591f 100644 --- a/source/GameOverSubstate.hx +++ b/source/GameOverSubstate.hx @@ -12,21 +12,32 @@ class GameOverSubstate extends MusicBeatSubstate var bf:Boyfriend; var camFollow:FlxObject; - // var + var stageSuffix:String = ""; public function new(x:Float, y:Float) { + var daStage = PlayState.curStage; + var daBf:String = ''; + switch (daStage) + { + case 'school': + stageSuffix = '-pixel'; + daBf = 'bf-pixel-dead'; + default: + daBf = 'bf'; + } + super(); Conductor.songPosition = 0; - bf = new Boyfriend(x, y); + bf = new Boyfriend(x, y, daBf); add(bf); camFollow = new FlxObject(bf.getGraphicMidpoint().x, bf.getGraphicMidpoint().y, 1, 1); add(camFollow); - FlxG.sound.play('assets/sounds/fnf_loss_sfx' + TitleState.soundExt); + FlxG.sound.play('assets/sounds/fnf_loss_sfx' + stageSuffix + TitleState.soundExt); Conductor.changeBPM(100); // FlxG.camera.followLerp = 1; @@ -63,7 +74,7 @@ class GameOverSubstate extends MusicBeatSubstate if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished) { - FlxG.sound.playMusic('assets/music/gameOver' + TitleState.soundExt); + FlxG.sound.playMusic('assets/music/gameOver' + stageSuffix + TitleState.soundExt); } if (FlxG.sound.music.playing) @@ -88,7 +99,7 @@ class GameOverSubstate extends MusicBeatSubstate isEnding = true; bf.playAnim('deathConfirm', true); FlxG.sound.music.stop(); - FlxG.sound.play('assets/music/gameOverEnd' + TitleState.soundExt); + FlxG.sound.play('assets/music/gameOverEnd' + stageSuffix + TitleState.soundExt); new FlxTimer().start(0.7, function(tmr:FlxTimer) { FlxG.camera.fade(FlxColor.BLACK, 2, false, function()