mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-28 21:19:27 +00:00
Add enemies' dying faces
This commit is contained in:
parent
1cc08a2241
commit
987bcd7eae
|
@ -405,7 +405,7 @@ class Controls extends FlxActionSet
|
||||||
switch (device)
|
switch (device)
|
||||||
{
|
{
|
||||||
case null:
|
case null:
|
||||||
// add all
|
// add all
|
||||||
#if (haxe >= "4.0.0")
|
#if (haxe >= "4.0.0")
|
||||||
for (gamepad in controls.gamepadsAdded)
|
for (gamepad in controls.gamepadsAdded)
|
||||||
if (!gamepadsAdded.contains(gamepad))
|
if (!gamepadsAdded.contains(gamepad))
|
||||||
|
@ -416,6 +416,7 @@ class Controls extends FlxActionSet
|
||||||
gamepadsAdded.push(gamepad);
|
gamepadsAdded.push(gamepad);
|
||||||
#end
|
#end
|
||||||
|
|
||||||
|
|
||||||
mergeKeyboardScheme(controls.keyboardScheme);
|
mergeKeyboardScheme(controls.keyboardScheme);
|
||||||
|
|
||||||
case Gamepad(id):
|
case Gamepad(id):
|
||||||
|
|
|
@ -726,6 +726,8 @@ class PlayState extends MusicBeatState
|
||||||
var startedCountdown:Bool = false;
|
var startedCountdown:Bool = false;
|
||||||
var canPause:Bool = true;
|
var canPause:Bool = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
override public function update(elapsed:Float)
|
override public function update(elapsed:Float)
|
||||||
{
|
{
|
||||||
#if !debug
|
#if !debug
|
||||||
|
@ -792,11 +794,18 @@ class PlayState extends MusicBeatState
|
||||||
if (health > 2)
|
if (health > 2)
|
||||||
health = 2;
|
health = 2;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (healthBar.percent < 20)
|
if (healthBar.percent < 20)
|
||||||
iconP1.animation.curAnim.curFrame = 1;
|
iconP1.animation.curAnim.curFrame = 1;
|
||||||
else
|
else
|
||||||
iconP1.animation.curAnim.curFrame = 0;
|
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)
|
/* if (FlxG.keys.justPressed.NINE)
|
||||||
FlxG.switchState(new Charting()); */
|
FlxG.switchState(new Charting()); */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue