diff --git a/buildnumber.txt b/buildnumber.txt index 6e575a4c..d377058e 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1875 \ No newline at end of file +1876 \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 7c183aa3..5cdbf9b6 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1178,8 +1178,8 @@ class PlayState extends MusicBeatState iconP1.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 1, 0)) - iconOffset); iconP2.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 1, 0))) - (iconP2.width - iconOffset); - if (health > 2) - health = 2; + if (health > maxHealth) + health = maxHealth; iconP1.health = healthBar.percent / 100; iconP2.health = 1 - (healthBar.percent / 100); diff --git a/source/funkin/system/Song.hx b/source/funkin/system/Song.hx index 6e7ed5ef..3a3b426f 100644 --- a/source/funkin/system/Song.hx +++ b/source/funkin/system/Song.hx @@ -22,7 +22,7 @@ typedef SwagSong = var gf:String; var validScore:Bool; - var maxHealth:Null; + @:optional var maxHealth:Null; } class Song