cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-02-06 03:28:08 +00:00
Code Issues Releases Wiki Activity

lil healthbar polsih hehe

Browse source
This commit is contained in:
Cameron Taylor 2021-09-24 11:21:34 -04:00
parent f060e6689c
commit 707c7b6f0a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/GameOverSubstate.hx
View file

@ -169,6 +169,7 @@ class GameOverSubstate extends MusicBeatSubstate
{ {
FlxG.camera.fade(FlxColor.BLACK, 2, false, function() FlxG.camera.fade(FlxColor.BLACK, 2, false, function()
{ {
// close();
LoadingState.loadAndSwitchState(new PlayState()); LoadingState.loadAndSwitchState(new PlayState());
}); });
}); });

11
source/PlayState.hx
View file

@ -77,6 +77,7 @@ class PlayState extends MusicBeatState
private var gfSpeed:Int = 1; private var gfSpeed:Int = 1;
private var health:Float = 1; private var health:Float = 1;
private var healthDisplay:Float = 1;
private var combo:Int = 0; private var combo:Int = 0;
private var healthBarBG:FlxSprite; private var healthBarBG:FlxSprite;
@ -725,7 +726,7 @@ class PlayState extends MusicBeatState
healthBarBG.y = FlxG.height * 0.1; healthBarBG.y = FlxG.height * 0.1;
healthBar = new FlxBar(healthBarBG.x + 4, healthBarBG.y + 4, RIGHT_TO_LEFT, Std.int(healthBarBG.width - 8), Std.int(healthBarBG.height - 8), this, healthBar = new FlxBar(healthBarBG.x + 4, healthBarBG.y + 4, RIGHT_TO_LEFT, Std.int(healthBarBG.width - 8), Std.int(healthBarBG.height - 8), this,
'health', 0, 2); 'healthDisplay', 0, 2);
healthBar.scrollFactor.set(); healthBar.scrollFactor.set();
healthBar.createFilledBar(0xFFFF0000, 0xFF66FF33); healthBar.createFilledBar(0xFFFF0000, 0xFF66FF33);
// healthBar // healthBar
@ -1823,6 +1824,8 @@ class PlayState extends MusicBeatState
override public function update(elapsed:Float) override public function update(elapsed:Float)
{ {
healthDisplay = FlxMath.lerp(healthDisplay, health, 0.15);
#if !debug #if !debug
perfectMode = false; perfectMode = false;
#else #else
@ -1835,6 +1838,8 @@ class PlayState extends MusicBeatState
FlxG.sound.music.pause(); FlxG.sound.music.pause();
FlxG.sound.music.time = 0; FlxG.sound.music.time = 0;
regenNoteData(); regenNoteData();
health = 1;
// resyncVocals(); // resyncVocals();
// FlxG.sound.music.play(); // FlxG.sound.music.play();
@ -1972,8 +1977,8 @@ class PlayState extends MusicBeatState
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.value, 0, 2, 100, 0) * 0.01) - iconOffset);
iconP2.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01)) - (iconP2.width - iconOffset); iconP2.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 2, 100, 0) * 0.01)) - (iconP2.width - iconOffset);
if (health > 2) if (health > 2)
health = 2; health = 2;