e

Author: Yuta12342

source/objects/HealthIcon.hx

@@ -46,8 +46,45 @@ class HealthIcon extends FlxSprite
 			if(!Paths.fileExists('images/' + name + '.png', IMAGE)) name = 'icons/icon-face'; //Prevents crash from missing icon
 			var file:Dynamic = Paths.image(name);
 
-			loadGraphic(file); //Load stupidly first for getting the file size
-			type = (width < 200 ? SINGLE : ((width > 199 && width < 301) ? DEFAULT : WINNING));
+			var jsonPath:String = name;
+			var jsonData:Dynamic = null;
+
+			// Try to load JSON file
+			if (Paths.fileExists(jsonPath, TEXT)) {
+				try {
+					jsonData = haxe.Json.parse(Paths.modsImagesJson(jsonPath));
+				} catch (e:Dynamic) {
+					trace('Invalid JSON file: ' + jsonPath);
+				}
+			}
+
+			// Determine type based on JSON or fallback to size-based guessing
+			if (jsonData != null && Reflect.hasField(jsonData, 'type')) {
+				var jsonType:String = jsonData.type;
+				switch (jsonType) {
+					case 'SINGLE': type = SINGLE;
+					case 'DEFAULT': type = DEFAULT;
+					case 'WINNING': type = WINNING;
+					default:
+						trace('Invalid type in JSON: ' + jsonType);
+						loadGraphic(file); // Load to guess size
+						type = (width < 200 ? SINGLE : ((width > 199 && width < 301) ? DEFAULT : WINNING));
+				}
+			} else {
+				loadGraphic(file); // Load to guess size
+				type = (width < 200 ? SINGLE : ((width > 199 && width < 301) ? DEFAULT : WINNING));
+
+				trace('No JSON file found, guessing type based on size: ' + type + ' (' + width + 'px)');
+
+				// Create or update JSON file with guessed type
+				jsonData = { type: switch (type) {
+					case SINGLE: 'SINGLE';
+					case DEFAULT: 'DEFAULT';
+					case WINNING: 'WINNING';
+				}};
+				sys.io.File.saveContent(jsonPath, haxe.Json.stringify(jsonData, null, '\t'));
+				trace('Remembering this type for future use: ' + jsonPath);
+			}
 
 			loadGraphic(file, true, Math.floor(width / (type+1)), Math.floor(height));
 			iconOffsets[0] = iconOffsets[1] = (width - 150) / (type+1);

source/yutautil/YScriptParser.hx

@@ -590,7 +590,7 @@ class YScriptParser {
 // -------------------------
 // PROGRAM STRUCTURE
 // -------------------------
-
+    
 typedef YScriptProgram = {
     classes:Array<YClass<Dynamic>>,
     functions:Array<YFunction>,