From 8fe441fda211ca828de9cca7dde37ee34443303a Mon Sep 17 00:00:00 2001
From: ChillsCD <80498581+ChillsCD@users.noreply.github.com>
Date: Wed, 1 Sep 2021 17:13:50 -0400
Subject: [PATCH 1/2] Fixed Health Bar color functionality

## What's wrong with the heath bar color functionality?
You may have noticed that changing the player in debug does not change the player health bar color (i.e changing to say pico still has the blue color on the health bar). This does work with the opponents though, as it changes based on the opponent.

## What I did
I created two variables colorOne and colorTwo as Ints, and where the health bar is drawn, I made it 1st check the player, and changes colorOne to what character is being played (being bf makes it blue, changing to say dad will turn it purple). Then, it checks the opponent and changes colorTwo to the right color (if senpai was the opponent, the other side would be peach, or being pico makes it green).
---
 source/PlayState.hx | 66 +++++++++++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/source/PlayState.hx b/source/PlayState.hx
index 91f1d962fa4..e501cf09b44 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -87,6 +87,8 @@ using StringTools;
 class PlayState extends MusicBeatState
 {
 	public static var instance:PlayState = null;
+	public var colorOne:Int;
+	public var colorTwo:Int;
 
 	public static var SONG:SwagSong;
 	public static var isStoryMode:Bool = false;
@@ -858,27 +860,51 @@ class PlayState extends MusicBeatState
 		healthBar.scrollFactor.set();
 		if(FlxG.save.data.colour)
         {
-         switch (SONG.player2)
+         switch (SONG.player1)
            {
-             case 'gf':
-             healthBar.createFilledBar(0xFFFF0000, 0xFF0097C4);
-             case 'dad' | 'mom-car' | 'parents-christmas':
-             healthBar.createFilledBar(0xFF5A07F5, 0xFF0097C4);
-             case 'spooky':
-              healthBar.createFilledBar(0xFFF57E07, 0xFF0097C4);
-             case 'monster-christmas' | 'monster':
-              healthBar.createFilledBar(0xFFF5DD07, 0xFF0097C4);
-             case 'pico':
-              healthBar.createFilledBar(0xFF52B514, 0xFF0097C4);
-             case 'senpai' | 'senpai-angry':
-              healthBar.createFilledBar(0xFFF76D6D, 0xFF0097C4);
-             case 'spirit':
-              healthBar.createFilledBar(0xFFAD0505, 0xFF0097C4);
-            }
-        }
-        else
-         healthBar.createFilledBar(0xFFFF0000, 0xFF66FF33);
-        // healthBar
+			case 'bf' | 'bf-pixel' | 'bf-car' | 'bf-christmas':
+			colorOne = 0xFF31b0d1;
+            case 'gf':
+			colorOne = 0xFFa5004d;
+            case 'dad' | 'parents-christmas':
+			colorOne = 0xFFaf66ce;
+			case 'mom' | 'mom-car':
+			colorOne = 0xFFd8558e;
+            case 'spooky':
+			colorOne = 0xFFd57e00;
+            case 'monster-christmas' | 'monster':
+			colorOne = 0xFFf3ff6e;
+            case 'pico':
+			colorOne = 0xFFb7d855;
+            case 'senpai' | 'senpai-angry':
+			colorOne = 0xFFffaa6f;
+            case 'spirit':
+			colorOne = 0xFFff3c6e;
+            };
+		
+		switch (SONG.player2)
+           {
+			case 'bf' | 'bf-pixel' | 'bf-car' | 'bf-christmas':
+			colorTwo = 0xFF31b0d1;
+            case 'gf':
+			colorTwo = 0xFFa5004d;
+            case 'dad' | 'parents-christmas':
+			colorOne = 0xFFaf66ce;
+			case 'mom' | 'mom-car':
+			colorOne = 0xFFd8558e;
+            case 'spooky':
+			colorTwo = 0xFFd57e00;
+            case 'monster-christmas' | 'monster':
+			colorTwo = 0xFFf3ff6e;
+            case 'pico':
+			colorTwo = 0xFFb7d855;
+            case 'senpai' | 'senpai-angry':
+			colorTwo = 0xFFffaa6f;
+            case 'spirit':
+			colorTwo = 0xFFff3c6e;
+            };
+		// healthBar
+		healthBar.createFilledBar(colorTwo, colorOne);
 		add(healthBar);
 
 		// Add Kade Engine watermark

From b82aca45e9ff844c49875d9558518f771476b7fe Mon Sep 17 00:00:00 2001
From: ChillsCD <80498581+ChillsCD@users.noreply.github.com>
Date: Wed, 1 Sep 2021 20:22:36 -0400
Subject: [PATCH 2/2] Update PlayState.hx

---
 source/PlayState.hx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/PlayState.hx b/source/PlayState.hx
index e501cf09b44..249719105d6 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -181,7 +181,7 @@ class PlayState extends MusicBeatState
 	private var totalPlayed:Int = 0;
 	private var ss:Bool = false;
 
-	private var healthBarBG:FlxSprite;
+	private var BG:FlxSprite;
 	private var healthBar:FlxBar;
 	private var songPositionBar:Float = 0;
 
@@ -889,9 +889,9 @@ class PlayState extends MusicBeatState
             case 'gf':
 			colorTwo = 0xFFa5004d;
             case 'dad' | 'parents-christmas':
-			colorOne = 0xFFaf66ce;
+			colorTwo = 0xFFaf66ce;
 			case 'mom' | 'mom-car':
-			colorOne = 0xFFd8558e;
+			colorTwo = 0xFFd8558e;
             case 'spooky':
 			colorTwo = 0xFFd57e00;
             case 'monster-christmas' | 'monster':