Skip to content

Commit

Permalink
remove fakeout death
Browse files Browse the repository at this point in the history
  • Loading branch information
Vortex2Oblivion committed Dec 6, 2024
1 parent e5923bb commit 1e1e2b6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 27 deletions.
1 change: 0 additions & 1 deletion assets/shared/images/characters/bfFakeOut/Animation.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/shared/images/characters/bfFakeOut/spritemap1.json

This file was deleted.

Binary file not shown.
28 changes: 3 additions & 25 deletions source/substates/GameOverSubstate.hx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ class GameOverSubstate extends MusicBeatSubstate {

public static var instance:GameOverSubstate = null;

var gameOverRoll:Bool = FlxG.random.bool((1 / 4096) * 100);
var fakeout:FlxAtlasSprite;

public function new(x:Float, y:Float) {
instance = this;
super();
Expand All @@ -34,7 +31,7 @@ class GameOverSubstate extends MusicBeatSubstate {
FlxG.camera.scroll.set();
FlxG.camera.target = null;

if (Options.getData("quickRestart") && !gameOverRoll) {
if (Options.getData("quickRestart")) {
PlayState.instance.call("onRetry", []);
PlayState.SONG.speed = PlayState.previousScrollSpeedLmao;
FlxG.resetState();
Expand All @@ -53,27 +50,8 @@ class GameOverSubstate extends MusicBeatSubstate {
if (FlxG.sound.music.active)
FlxG.sound.music.stop();

if (gameOverRoll) {
bf.visible = false;
var soundlol:FlxSound = new FlxSound().loadEmbedded(Paths.sound("deaths/fakeout_death", "shared"));
soundlol.play();
soundlol.onComplete = () -> {
bfDies();
fakeout.visible = false;
}
fakeout = new FlxAtlasSprite(bf.x * 1.5, bf.y * 1.75, Paths.getTextureAtlas('characters/bfFakeOut', 'shared'), {
FrameRate: 24.0,
Reversed: false,
ShowPivot: false,
Antialiasing: Options.getData("antialiasing"),
ScrollFactor: new FlxPoint(bf.scrollFactor.x, bf.scrollFactor.y),
});
fakeout.anim.addBySymbol('fakeoutDeath', 'fake out death BF', 24, false);
fakeout.anim.play('fakeoutDeath', true);
add(fakeout);
} else {
bfDies();
}

bfDies();
}

function bfDies() {
Expand Down

0 comments on commit 1e1e2b6

Please sign in to comment.