Add Salvation race swaps

Ziktofel · Dec 5, 2024 · da10561 · da10561
1 parent a6d1665
commit da10561
Show file tree

Hide file tree

Showing 9 changed files with 945 additions and 405 deletions.
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/ComponentList.SC2Components
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Components>
-    <Optimized/>
     <DataComponent Type="gada">GameData</DataComponent>
     <DataComponent Type="text" Locale="enUS">GameText</DataComponent>
     <DataComponent Type="info">DocumentInfo</DataComponent>

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/MapScript.galaxy
@@ -172,6 +172,7 @@ void gf_TurnWarpedInUnit (unit lp_unit);
 //--------------------------------------------------------------------------------------------------
 // Trigger Variables
 //--------------------------------------------------------------------------------------------------
+trigger gt_FactionSwapInit;
 trigger gt_ArchipelagoInit;
 trigger gt_TransferAllyControlToPlayer;
 trigger gt_Initialization;
@@ -1108,6 +1109,45 @@ bool auto_gf_TurnWarpedInUnit_TriggerFunc (bool testConds, bool runActions) {
     return true;
 }
 
+//--------------------------------------------------------------------------------------------------
+// Trigger: Faction Swap Init
+//--------------------------------------------------------------------------------------------------
+bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
+    // Automatic Variable Declarations
+    // Actions
+    if (!runActions) {
+        return true;
+    }
+
+    if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) {
+        lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(3), "Prot", false);
+    }
+    else {
+        libABFE498B_gv_aP_Triggers_skipCutscenes = true;
+        lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(3), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, true);
+        if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")) {
+            PlayerSetRace(gv_pLAYER_01_USER, "Terr");
+            lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER_01_USER, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS);
+        }
+        else {
+            if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
+                PlayerSetRace(gv_pLAYER_01_USER, "Zerg");
+                lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER_01_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM);
+            }
+
+        }
+        libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_pLAYER_01_USER);
+        lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_pLAYER_01_USER);
+    }
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void gt_FactionSwapInit_Init () {
+    gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func");
+    TriggerAddEventGeneric(gt_FactionSwapInit, lib5BD4895D_gv_aP_Core_LOAD_FINISHED_EVENT);
+}
+
 //--------------------------------------------------------------------------------------------------
 // Trigger: Archipelago Init
 //--------------------------------------------------------------------------------------------------
@@ -6505,7 +6545,7 @@ bool gt_IntroQ_Func (bool testConds, bool runActions) {
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerQueueEnter();
     TriggerExecute(gt_IntroSetup, true, true);
-    if ((libABFE498B_gv_aP_Triggers_skipCutscenes == false)) {
+    if ((libABFE498B_gv_aP_Triggers_skipCutscenes == false) && (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) {
         TriggerExecute(gt_IntroCinematic, true, true);
         TriggerExecute(gt_IntroCinematicEnd, true, true);
     }
@@ -7405,6 +7445,7 @@ void gt_VictoryMusic_Init () {
 // Trigger Initialization
 //--------------------------------------------------------------------------------------------------
 void InitTriggers () {
+    gt_FactionSwapInit_Init();
     gt_ArchipelagoInit_Init();
     gt_TransferAllyControlToPlayer_Init();
     gt_Initialization_Init();

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/Objects b/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/Objects
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/Objects.version
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/LotV/ap_salvation.SC2Map/Preload.xml
@@ -72,6 +72,9 @@
 <Behavior id="AlarakKnockbackTriggerOverride"/>
 <Model id="PingWarning"/>
 <Model id="AiurSkybox"/>
+<Race id="Terr"/>
+<Race id="Zerg"/>
+<Race id="Prot"/>
 <Sound id="UI_DropdownListSelect"/>
 <Sound id="AmbEmitter_BirdDistant01"/>
 <Sound id="AmbEmitter_CritterDistant01"/>
@@ -235,11 +238,22 @@
 <Unit id="ArtanisVoid"/>
 <Unit id="MothershipAiur06"/>
 <Unit id="ArtifactAiur06"/>
+<Unit id="AP_Hydralisk"/>
+<Unit id="AP_SiegeTank"/>
+<Unit id="AP_SupplyDepot"/>
+<Unit id="AP_Barracks"/>
 <Unit id="AP_Assimilator"/>
+<Unit id="AP_Factory"/>
+<Unit id="AP_Ultralisk"/>
+<Unit id="AP_CreepTumorUsed"/>
+<Unit id="AP_Hellion"/>
+<Unit id="AP_Goliath"/>
+<Unit id="AP_Starport"/>
 <Unit id="AP_RoboticsFacility"/>
 <Unit id="AP_ImmortalAiur"/>
 <Unit id="AP_PhotonCannon"/>
 <Unit id="AP_Probe"/>
+<Unit id="AP_SporeCrawler"/>
 <Unit id="AP_ZealotAiur"/>
 <Unit id="AP_StalkerShakuras"/>
 <Unit id="AP_Gateway"/>
@@ -248,4 +262,16 @@
 <Unit id="AP_Forge"/>
 <Unit id="AP_Stargate"/>
 <Unit id="AP_CyberneticsCore"/>
+<Unit id="AP_Overlord"/>
+<Unit id="AP_EngineeringBay"/>
+<Unit id="AP_MissileTurret"/>
+<Unit id="AP_MercCompound"/>
+<Unit id="AP_Armory"/>
+<Unit id="AP_Queen"/>
+<Unit id="AP_SpawningPool"/>
+<Unit id="AP_EvolutionChamber"/>
+<Unit id="AP_HydraliskDen"/>
+<Unit id="AP_Spire"/>
+<Unit id="AP_RoachWarren"/>
+<Unit id="AP_ZergMercenaryCompound"/>
 </Preload>