w

Author: Yuta12342

source/archipelago/APInfo.hx

@@ -24,7 +24,7 @@ typedef APSlotDataType = {
 	songData: Map<String, SongDetailData>,
 	?custom_weeks: Dynamic, // Custom weeks data from HScript processing
 	?song_modifications: Dynamic, // Song additions/exclusions data
-	?unoColorsUsed:{name:String, color:String} // Uno mod colors used in the slot
+	?unoColorsUsed:Array<{name:String, color:String}> // Uno mod colors used in the slot
 }
 
 abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {
@@ -59,6 +59,7 @@ abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {
 	public var songData(get, never):Map<String, SongDetailData>;
 	public var custom_weeks(get, never):Dynamic;
 	public var song_modifications(get, never):Dynamic;
+	public var unoColorsUsed(get, never):Array<{name:String, color:String}>;
 
 	private function get_deathLink():Bool return this.deathLink;
 	private function get_fullSongCount():Int return this.fullSongCount;
@@ -73,6 +74,7 @@ abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {
 	private function get_songData():Map<String, SongDetailData> return this.songData;
 	private function get_custom_weeks():Dynamic return this.custom_weeks;
 	private function get_song_modifications():Dynamic return this.song_modifications;
+	private function get_unoColorsUsed():Array<{name:String, color:String}> return this.unoColorsUsed;
 
 	public function get(key:String):Dynamic {
 		return Reflect.field(this, key);

source/archipelago/APItem.hx

@@ -444,10 +444,10 @@ class APItem {
                     popup('You got an UNO color!', "You got an UNO Color Filler!");
                     // Get a random color from APInfo's SlotData that isn't already unlocked.
                     var availableColors = APInfo.slotData.unoColorsUsed.filter(function(c) {
-                        return !unoColorsUnlocked.exists(function(uc) { return uc.name == c.name; });
+                        return !unoColorsUnlocked.arrayContainsObject(c);
                     });
                     if (availableColors.length > 0) {
-                        var color = FlxG.random.choice(availableColors);
+                        var color = FlxG.random.getObject(availableColors);
                         unoColorsUnlocked.push(color);
                         popup('You got the color ${color.name}!', "You got an UNO Color!");
                     } else {

source/yutautil/CollectionUtils.hx

@@ -689,7 +689,7 @@ class CollectionUtils
 		}
 	}
 
-	public static function isType(ob:Dynamic, type:Class<Dynamic>, ?NoSupers:Bool)
+	public static inline function isType(ob:Dynamic, type:Class<Dynamic>, ?NoSupers:Bool)
 	{
 		var c = type;
 		var o = ob;
@@ -699,6 +699,35 @@ class CollectionUtils
 		return type == Type.getClass(ob) && Std.is(o, type);
 	}
 
+	public static function compareObjects(obj1:Dynamic, obj2:Dynamic):Bool
+	{
+		if (obj1 == null || obj2 == null) return obj1 == obj2;
+		var fields1 = Reflect.fields(obj1);
+		var fields2 = Reflect.fields(obj2);
+		if (fields1.length != fields2.length) return false;
+		for (field in fields1)
+		{
+			if (!Reflect.hasField(obj2, field)) return false;
+			var val1 = Reflect.field(obj1, field);
+			var val2 = Reflect.field(obj2, field);
+			if (Std.is(val1, Dynamic) && Std.is(val2, Dynamic))
+			{
+				if (!compareObjects(val1, val2)) return false;
+			}
+			else if (val1 != val2) return false;
+		}
+		return true;
+	}
+
+	public static function arrayContainsObject<T>(arr:Array<T>, obj:T):Bool
+	{
+		for (item in arr)
+		{
+			if (compareObjects(item, obj)) return true;
+		}
+		return false;
+	}
+
 
 	public static inline function truthy(input:Dynamic):Bool
 	{