FUCK.

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:Array<{name:String, color:String}> // Uno mod colors used in the slot
+	?unoColorsUsed:Array<{name:String, color_code:String}> // Uno mod colors used in the slot
 }
 
 abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {
@@ -74,7 +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;
+	private function get_unoColorsUsed():Array<{name:String, color_code:String}> return this.unoColorsUsed;
 
 	public function get(key:String):Dynamic {
 		return Reflect.field(this, key);

source/archipelago/APItem.hx

@@ -141,7 +141,7 @@ class APItem {
     public static var pendingDamage:Float = 0.0; // Damage that will be applied when conditions are met
     public static var extraItemInventory:Array<CustomModItem> = [];
 
-    public static var unoColorsUnlocked:Array<{name:String, color:String}> = [];
+    public static var unoColorsUnlocked:Array<{name:String, color_code:String}> = [];
 
     public static var unknownSongs:Bool = false; // If true, songs are unknown.
 
@@ -462,7 +462,7 @@ class APItem {
                         var color = FlxG.random.getObject(availableColors);
                         unoColorsUnlocked.push(color);
                         popup('You got the color ${color.name}!', "You got an UNO Color!");
-                        trace('UNO Color acquired: ${color.name} (${color.color})');
+                        trace('UNO Color acquired: ${color.name} (${color.color_code})');
                     } else {
                         popup('You already have all available colors!', "UNO Color Filler");
                     }

source/archipelago/traps/games/APUnoTrapState.hx

@@ -70,7 +70,7 @@ class APUnoTrapState extends UnoTestState {
             var unoColors = APItem.unoColorsUnlocked;
 
             var unoColorsWithInt = [for (colorInfo in unoColors) {
-                var colorInt = Std.parseInt('0x${colorInfo.color}');
+                var colorInt = FlxColor.fromString('${colorInfo.color_code}');
                 {name: colorInfo.name, color: colorInt};
             }];
             var usableColors:Array<UnoColor> = [];
@@ -101,7 +101,7 @@ class APUnoTrapState extends UnoTestState {
                         new FlxTimer().start(2.0, function(timer) {
                             archipelago.APInfo.inMinigame = archipelago.APInfo.APMinigame.None;
                             if (previousState != null) {
-                                FlxG.switchState(Type.createInstance(previousState, []));
+                                LoadingState.loadAndSwitchState(Type.createInstance(previousState, []));
                             } else {
                                 StageData.loadDirectory(PlayState.SONG);
 							    LoadingState.loadAndSwitchState(new archipelago.APPlayState());