From 987bcd7eae6707200f828f5d69a1b52ec6270f53 Mon Sep 17 00:00:00 2001 From: pahaze Date: Fri, 1 Jan 2021 00:39:58 -0500 Subject: [PATCH] Add enemies' dying faces --- source/Controls.hx | 3 ++- source/PlayState.hx | 13 +++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/source/Controls.hx b/source/Controls.hx index 7d1e2c40e..0a63dc0b1 100644 --- a/source/Controls.hx +++ b/source/Controls.hx @@ -405,7 +405,7 @@ class Controls extends FlxActionSet switch (device) { case null: - // add all + // add all #if (haxe >= "4.0.0") for (gamepad in controls.gamepadsAdded) if (!gamepadsAdded.contains(gamepad)) @@ -415,6 +415,7 @@ class Controls extends FlxActionSet if (gamepadsAdded.indexOf(gamepad) == -1) gamepadsAdded.push(gamepad); #end + mergeKeyboardScheme(controls.keyboardScheme); diff --git a/source/PlayState.hx b/source/PlayState.hx index 404a5d30c..8ac43f675 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -725,6 +725,8 @@ class PlayState extends MusicBeatState private var paused:Bool = false; var startedCountdown:Bool = false; var canPause:Bool = true; + + override public function update(elapsed:Float) { @@ -783,7 +785,7 @@ class PlayState extends MusicBeatState iconP1.updateHitbox(); iconP2.updateHitbox(); - + var iconOffset:Int = 26; iconP1.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01) - iconOffset); @@ -791,12 +793,19 @@ class PlayState extends MusicBeatState if (health > 2) health = 2; + + if (healthBar.percent < 20) iconP1.animation.curAnim.curFrame = 1; else iconP1.animation.curAnim.curFrame = 0; - + + if (healthBar.percent > 80) + iconP2.animation.curAnim.curFrame = Std.parseInt(curStage) + 1; + else + iconP2.animation.curAnim.curFrame = Std.parseInt(curStage); + /* if (FlxG.keys.justPressed.NINE) FlxG.switchState(new Charting()); */