closes #1131 and #1112

Author: moxie-coder

source/HealthIcon.hx

@@ -61,7 +61,7 @@ class HealthIcon extends FlxSprite
 			var iconAsset:FlxGraphic = FlxG.bitmap.add(Paths.image(name));
 
 			if (iconAsset == null)
-				iconAsset == Paths.image('icons/icon-face');
+				iconAsset = Paths.image('icons/icon-face');
 			else if (!Paths.fileExists('images/icons/icon-face.png', IMAGE)){
 				// throw "Don't delete the placeholder icon";
 				trace("Warning: could not find the placeholder icon, expect crashes!");
@@ -90,13 +90,23 @@ class HealthIcon extends FlxSprite
 				playAnim('normal');
 			} else {
 				if (iconMeta?.hasWinIcon || iSize == 3) {
-					loadGraphic(file, true, Math.floor(width / 3), Math.floor(height)); //Then load it fr // winning icons go br
+					loadGraphic(iconAsset, true, Math.floor(width / 3), Math.floor(height)); //Then load it fr // winning icons go br
+					initialWidth = width;
+					initialHeight = height;
 					iconOffsets[0] = (width - 150) / 3;
 					iconOffsets[1] = (height - 150) / 3;
+					updateHitbox();
+
+					animation.add(char, [0, 1, 2], 0, false, isPlayer);
 				} else {
-					loadGraphic(file, true, Math.floor(width / 2), Math.floor(height)); //Then load it fr // winning icons go br
+					loadGraphic(iconAsset, true, Math.floor(width / 2), Math.floor(height)); //Then load it fr // winning icons go br
+					initialWidth = width;
+					initialHeight = height;
 					iconOffsets[0] = (width - 150) / 2;
 					iconOffsets[1] = (height - 150) / 2;
+					updateHitbox();
+
+					animation.add(char, [0, 1], 0, false, isPlayer);
 				}
 			}
 

source/PlayState.hx

@@ -181,9 +181,9 @@ class PlayState extends MusicBeatState
 	public var maxCombo:Float = 0;
 	public var missCombo:Int = 0;
 
-		var notesAddedCount:Int = 0;
-		var notesToRemoveCount:Int = 0;
-		var oppNotesToRemoveCount:Int = 0;
+	var notesAddedCount:Int = 0;
+	var notesToRemoveCount:Int = 0;
+	var oppNotesToRemoveCount:Int = 0;
 	public var iconBopsThisFrame:Int = 0;
 	public var iconBopsTotal:Int = 0;
 
@@ -416,22 +416,22 @@ class PlayState extends MusicBeatState
 
 	var theListBotplay:Array<String> = [];
 
-		var formattedScore:String;
-		var formattedSongMisses:String;
-		var formattedCombo:String;
-		var formattedMaxCombo:String;
-		var formattedNPS:String;
-		var formattedMaxNPS:String;
-		var formattedOppNPS:String;
-		var formattedMaxOppNPS:String;
-		var formattedEnemyHits:String;
-		var npsString:String;
-		var accuracy:String;
-		var fcString:String;
-		var hitsound:FlxSound;
-
-		var botText:String;
-		var tempScore:String;
+	var formattedScore:String;
+	var formattedSongMisses:String;
+	var formattedCombo:String;
+	var formattedMaxCombo:String;
+	var formattedNPS:String;
+	var formattedMaxNPS:String;
+	var formattedOppNPS:String;
+	var formattedMaxOppNPS:String;
+	var formattedEnemyHits:String;
+	var npsString:String;
+	var accuracy:String;
+	var fcString:String;
+	var hitsound:FlxSound;
+
+	var botText:String;
+	var tempScore:String;
 
 	var startingTime:Float = haxe.Timer.stamp();
 	var endingTime:Float = haxe.Timer.stamp();

source/options/BaseOptionsMenu.hx

@@ -1,6 +1,5 @@
 package options;
 
-import flash.text.TextField;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.addons.display.FlxGridOverlay;
@@ -14,7 +13,6 @@ import flash.text.TextField;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.util.FlxSave;
-import haxe.Json;
 import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxTimer;

source/options/OptionsState.hx

@@ -1,6 +1,5 @@
 package options;
 
-import flash.text.TextField;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.FlxCamera;
@@ -16,7 +15,6 @@ import flixel.FlxG;
 import flixel.FlxObject;
 import flixel.FlxSprite;
 import flixel.util.FlxSave;
-import haxe.Json;
 import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxTimer;
@@ -47,8 +45,10 @@ class OptionsState extends MusicBeatState
 	function openSelectedSubstate(label:String) {
 		switch(label) {
 			case 'Note Colors':
-				if (!ClientPrefs.enableColorShader) CoolUtil.coolError("It appears that you don't have the 'Enable Note Colors' option enabled!\nTo prevent a crash, you cannot access this menu unless you turn the option on.\nYou can find it in the Visuals & UI menu.", "JS Engine Anti-Crash Tool");
-				else openSubState(new options.NotesSubState());
+				if (!ClientPrefs.enableColorShader) 
+					CoolUtil.coolError("It appears that you don't have the 'Enable Note Colors' option enabled!\nTo prevent a crash, you cannot access this menu unless you turn the option on.\nYou can find it in the Visuals & UI menu.", "JS Engine Anti-Crash Tool");
+				else
+					openSubState(new options.NotesSubState());
 			case 'Controls':
 				openSubState(new options.ControlsSubState());
 			case 'Graphics':
@@ -81,6 +81,9 @@ class OptionsState extends MusicBeatState
 		otherCamera = new FlxCamera();
 		subCamera.bgColor.alpha = 0;
 		otherCamera.bgColor.alpha = 0;
+		// proper fix
+		if (onPlayState && PlayState.SONG.disableNoteRGB)
+			options.remove('Note Colors');
 
 		FlxG.cameras.add(subCamera, false);
 		FlxG.cameras.add(otherCamera, false);