cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 15:37:49 +00:00
Code Issues Releases Wiki Activity

icon fixes (week 4 + positions)

Browse source
This commit is contained in:
Cameron Taylor 2022-04-29 00:22:42 -04:00
parent a8218d2542
commit 60e0668e74
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/funkin/play/HealthIcon.hx
View file

@ -1,7 +1,7 @@
package funkin.play; package funkin.play;
import flixel.math.FlxMath;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.math.FlxMath;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import funkin.play.character.CharacterData.CharacterDataParser; import funkin.play.character.CharacterData.CharacterDataParser;
import openfl.utils.Assets; import openfl.utils.Assets;
@ -95,6 +95,11 @@ class HealthIcon extends FlxSprite
*/ */
static final LEGACY_PIXEL_SIZE = 32; static final LEGACY_PIXEL_SIZE = 32;
/**
* shitty hardcoded value for a specific positioning!!!
*/
static final POSITION_OFFSET = 26;
public function new(char:String = 'bf', playerId:Int = 0) public function new(char:String = 'bf', playerId:Int = 0)
{ {
super(0, 0); super(0, 0);
@ -153,14 +158,15 @@ class HealthIcon extends FlxSprite
updateHealthIcon(PlayState.instance.health); updateHealthIcon(PlayState.instance.health);
// Update the position to match the health bar. // Update the position to match the health bar.
this.x = PlayState.instance.healthBar.x this.x = PlayState.instance.healthBar.x
+ (PlayState.instance.healthBar.width * (FlxMath.remapToRange(PlayState.instance.healthBar.value, 0, 2, 100, 0) * 0.01)); + (PlayState.instance.healthBar.width * (FlxMath.remapToRange(PlayState.instance.healthBar.value, 0, 2, 100, 0) * 0.01)
- POSITION_OFFSET);
case 1: // Dad case 1: // Dad
// Update the animation based on the current state. // Update the animation based on the current state.
updateHealthIcon(MAXIMUM_HEALTH - PlayState.instance.health); updateHealthIcon(MAXIMUM_HEALTH - PlayState.instance.health);
// Update the position to match the health bar. // Update the position to match the health bar.
this.x = PlayState.instance.healthBar.x this.x = PlayState.instance.healthBar.x
+ (PlayState.instance.healthBar.width * (FlxMath.remapToRange(PlayState.instance.healthBar.value, 0, 2, 100, 0) * 0.01)) + (PlayState.instance.healthBar.width * (FlxMath.remapToRange(PlayState.instance.healthBar.value, 0, 2, 100, 0) * 0.01))
- (this.width); - (this.width - POSITION_OFFSET);
} }
// Lerp the health icon back to its normal size, // Lerp the health icon back to its normal size,