Merge branch 'AP-CustomEx' of https://github.com/Z11Coding/Mixtape-Engine-Rework into AP-CustomEx

Author: Z11Coding

.github/workflows/main.yml

@@ -7,9 +7,9 @@ name: Build
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ main, Archipelago ]
+    branches: [ main, Archipelago, AP-CustomEx ]
   pull_request:
-    branches: [ main, Archipelago ]
+    branches: [ main, Archipelago, AP-CustomEx ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

Project.xml

@@ -143,8 +143,8 @@
 
 	<!--Mixtape stuff needed-->
 	<haxelib name="openfl" /> <!-- Game engine backend -->
-	<haxelib name="openflCamera" />
-	<haxelib name="openflMicrophone" />
+	<!-- <haxelib name="openflCamera" />
+	<haxelib name="openflMicrophone" /> -->
 	<haxelib name="haxeui-core" /> <!-- UI framework -->
 	<haxelib name="haxeui-flixel" /> <!-- Integrate HaxeUI with Flixel -->
 	<haxelib name="flixel-text-input" /> <!-- Improved text field rendering for HaxeUI -->

setup/windows.bat

@@ -20,6 +20,7 @@ haxelib install actuate 1.9.0
 haxelib install flixel-ui 2.6.1
 haxelib install hscript 2.5.0
 haxelib install noisehx 0.0.1
+haxelib install deflatex
 haxelib install haxeui-core 1.7.0
 haxelib install haxeui-flixel 1.7.0
 haxelib install funkin-modchart 1.2.3

source/archipelago/APInfo.hx

@@ -23,7 +23,8 @@ typedef APSlotDataType = {
 	selectedSongs: Array<String>,
 	songData: Map<String, SongDetailData>,
 	?custom_weeks: Dynamic, // Custom weeks data from HScript processing
-	?song_modifications: Dynamic // Song additions/exclusions data
+	?song_modifications: Dynamic, // Song additions/exclusions data
+	?unoColorsUsed:{name:String, color:String} // Uno mod colors used in the slot
 }
 
 abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {

source/archipelago/APItem.hx

@@ -141,6 +141,8 @@ 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}> = [];
+
     private var toSync:Bool = true;
     public var triggered:Bool = false;
 
@@ -440,6 +442,17 @@ class APItem {
             case "UNO Color Filler":
                 return new APItem(name, ConditionHelper.Everywhere(), function() {
                     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; });
+                    });
+                    if (availableColors.length > 0) {
+                        var color = FlxG.random.choice(availableColors);
+                        unoColorsUnlocked.push(color);
+                        popup('You got the color ${color.name}!', "You got an UNO Color!");
+                    } else {
+                        popup('You already have all available colors!', "UNO Color Filler");
+                    }
 
                 }, true, true);
 

source/archipelago/traps/games/APUnoTrapState.hx

@@ -61,8 +61,25 @@ class APUnoTrapState extends UnoTestState {
                 trace("Added 4 Pong-UNO cards to AP trap deck!");
             }
 
+            // Get any custom UNO colors from AP slot data
+            var unoColors = APItem.unoColorsUnlocked;
+
+            var unoColorsWithInt = [for (colorInfo in unoColors) {
+                var colorInt = FlxColor.fromString(colorInfo.color);
+                {name: colorInfo.name, color: colorInt};
+            }];
+            var usableColors:Array<UnoColor> = [];
+
+
+            usableColors = (UnoCard.UnoColor.createCustomColorsFromObjects(unoColorsWithInt));
+
+            // If none unlocked, use gray.
+            if (usableColors.length == 0) {
+                usableColors = [UnoColor.CUSTOM(FlxColor.GRAY, "Gray")];
+            }
+
             // Create UNO game with custom cards
-            unoGame = new UnoGame(null, true, customCards.length > 0 ? customCards : null);
+            unoGame = new UnoGame(usableColors, false, customCards.length > 0 ? customCards : null);
 
             // Randomize UNO rules for the trap
             randomizeUnoRules();

source/managers/FreeplayManager.hx

@@ -101,6 +101,8 @@ class FreeplayManager {
         }
         #else
         return switch (instance != null && instance.isType(FreeplayManager, true)) {
+
+            eaww
             case true:
                 trace("Using existing FreeplayManager instance.");
                 if (ensureLoaded) instance.reloadFreeplay(true);