cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-10-04 00:10:39 +00:00
Code Issues Releases Wiki Activity

Add enemies' dying faces

Browse source
This commit is contained in:
pahaze 2021-01-01 00:39:58 -05:00
parent 37b69c4f40
commit 1475fa10ab
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/Controls.hx
View file

@ -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))
@ -415,6 +415,7 @@ class Controls extends FlxActionSet
if (gamepadsAdded.indexOf(gamepad) == -1) if (gamepadsAdded.indexOf(gamepad) == -1)
gamepadsAdded.push(gamepad); gamepadsAdded.push(gamepad);
#end #end
mergeKeyboardScheme(controls.keyboardScheme); mergeKeyboardScheme(controls.keyboardScheme);

13
source/PlayState.hx
View file

@ -725,6 +725,8 @@ class PlayState extends MusicBeatState
private var paused:Bool = false; private var paused:Bool = false;
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)
{ {
@ -783,7 +785,7 @@ class PlayState extends MusicBeatState
iconP1.updateHitbox(); iconP1.updateHitbox();
iconP2.updateHitbox(); iconP2.updateHitbox();
var iconOffset:Int = 26; var iconOffset:Int = 26;
iconP1.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01) - iconOffset); 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) 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()); */