Add Steps of the Rite race swaps

Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.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>

Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/MapScript.galaxy

@@ -171,6 +171,7 @@ void gf_AscendantBehaviour (unit lp_ascendant);
 //--------------------------------------------------------------------------------------------------
 // Trigger Variables
 //--------------------------------------------------------------------------------------------------
+trigger gt_FactionSwapInit;
 trigger gt_onDifficultyCasual;
 trigger gt_onDifficultyNormal;
 trigger gt_onDifficultyHard;
@@ -804,6 +805,44 @@ bool auto_gf_AscendantBehaviour_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(5), "Prot", false);
+    }
+    else {
+        libABFE498B_gv_aP_Triggers_skipCutscenes = true;
+        lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), 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");
+}
+
 //--------------------------------------------------------------------------------------------------
 // Trigger: onDifficultyCasual
 //--------------------------------------------------------------------------------------------------
@@ -1024,6 +1063,7 @@ bool gt_Initialization_Func (bool testConds, bool runActions) {
     TriggerExecute(gt_Init04MusicSound, true, false);
     TriggerExecute(gt_Init05Environment, true, false);
     TriggerExecute(gt_Init06Difficulties, true, false);
+    TriggerExecute(gt_FactionSwapInit, true, true);
     TriggerExecute(gt_IntroQ, true, true);
     TriggerExecute(gt_StartGameQ, true, false);
     return true;
@@ -1636,6 +1676,10 @@ bool gt_VoidRayIntro_Func (bool testConds, bool runActions) {
         if (!((libVCMI_gf_PlayerInCinematicModeCampaign() == false))) {
             return false;
         }
+
+        if (!((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut"))) {
+            return false;
+        }
     }
 
     // Actions
@@ -5018,7 +5062,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);
     }
@@ -5761,6 +5805,7 @@ void gt_VictoryMusic_Init () {
 // Trigger Initialization
 //--------------------------------------------------------------------------------------------------
 void InitTriggers () {
+    gt_FactionSwapInit_Init();
     gt_onDifficultyCasual_Init();
     gt_onDifficultyNormal_Init();
     gt_onDifficultyHard_Init();

Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/Preload.xml

@@ -66,6 +66,9 @@
 <Model id="PingCircle"/>
 <Model id="ZeratulStunModel"/>
 <Model id="VulcanChampionShieldRestoreImpact"/>
+<Race id="Terr"/>
+<Race id="Zerg"/>
+<Race id="Prot"/>
 <Sound id="HighTemplar_Death"/>
 <Sound id="Hybrid_WarpIn"/>
 <Sound id="Urun_GravitonBeamStart"/>
@@ -175,7 +178,15 @@
 <Unit id="PitMalash"/>
 <Unit id="TerrazineTempleNESW"/>
 <Unit id="TerrazineTempleNWSE"/>
+<Unit id="AP_SILiberator"/>
+<Unit id="AP_SiegeBreaker"/>
+<Unit id="AP_BrynhildFighter"/>
+<Unit id="AP_SupplyDepot"/>
 <Unit id="AP_Assimilator"/>
+<Unit id="AP_Factory"/>
+<Unit id="AP_Lurker"/>
+<Unit id="AP_CreepTumorUsed"/>
+<Unit id="AP_Starport"/>
 <Unit id="AP_VoidRayShakuras"/>
 <Unit id="AP_Probe"/>
 <Unit id="AP_ZealotAiur"/>
@@ -185,4 +196,11 @@
 <Unit id="AP_Pylon"/>
 <Unit id="AP_Forge"/>
 <Unit id="AP_Stargate"/>
+<Unit id="AP_Overlord"/>
+<Unit id="AP_SIStarport"/>
+<Unit id="AP_MercCompound"/>
+<Unit id="AP_Armory"/>
+<Unit id="AP_LurkerDen"/>
+<Unit id="AP_EvolutionChamber"/>
+<Unit id="AP_ZergMercenaryCompound"/>
 </Preload>