Merge pull request #1100 from JordanSantiagoYT/patch-2

Author: moxie-coder

hmm.json

@@ -65,7 +65,7 @@
       "ref": "768740a56b26aa0c072720e0d1236b94afe68e3e",
       "url": "https://github.com/Dot-Stuff/flxanimate"
     },
-   {
+    {
       "name": "hxdiscord_rpc",
       "type": "git",
       "dir": null,
@@ -79,7 +79,7 @@
       "ref": "master",
       "url": "https://github.com/th2l-devs/linc_luajit"
     },
-   {
+    {
       "name": "funkin.vis",
       "type": "git",
       "dir": null,
@@ -96,14 +96,14 @@
     {
       "name": "away3d",
       "type": "git",
-      "dir":  null,
+      "dir": null,
       "ref": "master",
       "url": "https://github.com/moxie-coder/away3d"
     },
     {
       "name": "tjson",
       "type": "git",
-      "dir":  null,
+      "dir": null,
       "ref": "master",
       "url": "https://github.com/moxie-coder/tjson"
     }

source/HealthIcon.hx

@@ -1,15 +1,18 @@
 package;
 
 import haxe.Json;
+import openfl.utils.Assets;
 
 using StringTools;
 
 // metadatas for icons
-// so I don't have to deal with stupid annoying icons cutting off
+// allows for animated icons and such
 typedef IconMeta = {
 	?noAntialiasing:Bool,
 	?fps:Int,
-	?frameOrder:Array<String> // ["normal", "losing", "winning"]
+	// ?frameOrder:Array<String> // ["normal", "losing", "winning"]
+	// ?isAnimated:Bool,
+	?hasWinIcon:Bool,
 }
 class HealthIcon extends FlxSprite
 {
@@ -62,39 +65,106 @@ class HealthIcon extends FlxSprite
 				// throw "Don't delete the placeholder icon";
 				trace("Warning: could not find the placeholder icon, expect crashes!");
 			}
-			if (iconMeta?.frameOrder != null){
-				final framesCount:Int = Math.floor(file.width / file.height);
-				final frameWidth:Int = Math.floor(file.width / framesCount);
-				loadGraphic(file, true, frameWidth, Math.floor(file.height));
+			final iSize:Float = Math.round(file.width / file.height);
+			/*
+			loadGraphic(file, true, Math.floor(file.width / iSize), Math.floor(file.height));
+			initialWidth = width;
+			initialHeight = height;
+			iconOffsets[0] = (width - 150) / iSize;
+			iconOffsets[1] = (height - 150) / iSize;
+
+			updateHitbox();
+			*/
+			if (file.width == 300) {
+				loadGraphic(file, true, Math.floor(file.width / 2), Math.floor(file.height));
+				iconOffsets[0] = (width - 150) / iSize;
+				iconOffsets[1] = (height - 150) / iSize;
 				initialWidth = width;
 				initialHeight = height;
-
-				iconOffsets[0] = (width - 150) / framesCount;
-				iconOffsets[1] = (height - 150) / framesCount;
-			}
-			else
-			{
-				final iSize:Float = Math.round(file.width / file.height);
-				loadGraphic(file, true, Math.floor(file.width / iSize), Math.floor(file.height));
+				updateHitbox();
+				animation.add(char, [0, 1], 0, false, isPlayer);
+			} else if (file.width == 450) {
+				loadGraphic(file, true, Math.floor(file.width / 3), Math.floor(file.height));
+				iconOffsets[0] = (width - 150) / iSize;
+				iconOffsets[1] = (height - 150) / iSize;
 				initialWidth = width;
 				initialHeight = height;
+				updateHitbox();
+				animation.add(char, [0, 1, 2], 0, false, isPlayer);
+			} else if (Paths.fileExists('images/$name.xml', TEXT)) {
+				frames = Paths.getSparrowAtlas(name);
+				final iconPrefixes = checkAvailablePrefixes(Paths.getPath('images/$name.xml', TEXT));
+				final hasWinning = iconPrefixes.get('winning');
+				final hasLosing = iconPrefixes.get('losing');
+				final fps:Float = iconMeta.fps ??= 24;
+				final loop = fps > 0;
+
+				// Always add "normal"
+				animation.addByPrefix('normal', 'normal', fps, loop, isPlayer);
+
+				// Add "losing", fallback to "normal"
+				animation.addByPrefix('losing', hasLosing ? 'losing' : 'normal', fps, loop, isPlayer);
+
+				// Add "winning", fallback to "normal"
+				animation.addByPrefix('winning', hasWinning ? 'winning' : 'normal', fps, loop, isPlayer);
+				playAnim('normal');
+			} else { // This is just an attempt for other icon support, will detect is less than 300 or more than 300. If 300 or less, only 2 icons, if more, 3 icons.
+				var num:Int = Std.int(Math.round(file.width / file.height));
+				if (file.width % file.height != 0 || num >= 4) {
+						// weird icon, maybe has padding?
+						num = 3; // fallback
+				}
+				if (file.width < 300) {
+					num = 2;
+				} else if (file.width >= 300) {
+					num = 3;
+				}
+
+				loadGraphic(file, true, Math.floor(file.width / num), Math.floor(file.height));
 				iconOffsets[0] = (width - 150) / iSize;
 				iconOffsets[1] = (height - 150) / iSize;
-			}
+				initialWidth = width;
+				initialHeight = height;
+				updateHitbox();
 
-			updateHitbox();
+				function getWinIcon():Array<Int>
+				{
+					return (iconMeta?.hasWinIcon || num == 3) ? [0, 1, 2] : [0, 1];
+				}
 
-			animation.add(char, [for(i in 0...frames.frames.length) i], 0, false, isPlayer);
+				final winShit:Array<Int> = (num == 2) ? [0, 1] : getWinIcon();
+				animation.add(char, winShit, 0, false, isPlayer);
+			}
+
+			// animation.add(char, [for(i in 0...frames.frames.length) i], 0, false, isPlayer);
 			animation.play(char);
 			this.char = char;
 
-			antialiasing = ClientPrefs.globalAntialiasing;
+			antialiasing = (ClientPrefs.globalAntialiasing || iconMeta?.noAntialiasing);
 			if(char.endsWith('-pixel')) {
 				antialiasing = false;
 			}
 		}
 	}
 
+	function checkAvailablePrefixes(xmlPath:String):Map<String, Bool> {
+		final result = new Map<String, Bool>();
+		result.set("normal", false);
+		result.set("losing", false);
+		result.set("winning", false);
+
+		final xml:Xml = Xml.parse(Assets.getText(xmlPath));
+		final root:Xml = xml.firstElement();
+		for (node in root.elements()) {
+				final name = node.get("name");
+				for (prefix in result.keys()) {
+						if (name.startsWith(prefix)) result.set(prefix, true);
+				}
+		}
+
+		return result;
+	}
+
 	public function bounce() {
 		if(canBounce) {
 			var mult:Float = 1.2;
@@ -103,6 +173,11 @@ class HealthIcon extends FlxSprite
 		}
 	}
 
+	public function playAnim(anim:String) {
+		if (animation.exists(anim))
+			animation.play(anim);
+	}
+
 	public static function getFile(name:String):IconMeta {
 		var characterPath:String = 'images/icons/$name.json';
 		var path:String = Paths.getPath(characterPath);
@@ -119,6 +194,7 @@ class HealthIcon extends FlxSprite
 		var json:IconMeta = cast Json.parse(rawJson);
 		if (json.noAntialiasing == null) json.noAntialiasing = false;
 		if (json.fps == null) json.fps = 24;
+		if (json.hasWinIcon == null) json.hasWinIcon = true;
 		// if (json.frameOrder == null) json.frameOrder = ['normal', 'losing', 'winning'];
 		return json;
 	}

source/PlayState.hx

@@ -633,7 +633,7 @@ class PlayState extends MusicBeatState
 				boyfriend: [770, 100],
 				girlfriend: [400, 130],
 				opponent: [100, 100],
-				hide_girlfriend: false,
+				hide_girlfriend: true,
 
 				camera_boyfriend: [0, 0],
 				camera_opponent: [0, 0],