Add Rak'Shir race swaps

Maps/ArchipelagoCampaign/LotV/ap_rak_shir.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_rak_shir.SC2Map/MapScript.galaxy

@@ -11,6 +11,7 @@ include "TriggerLibs/SwarmLib"
 include "TriggerLibs/VoidLib"
 include "TriggerLibs/VoidCampaignLib"
 include "TriggerLibs/VoidCampaignMissionLib"
+include "Lib15EF4C78"
 include "Lib30B9E51A"
 include "Lib5BD4895D"
 include "LibABFE498B"
@@ -32,6 +33,7 @@ void InitLibs () {
     libLotv_InitLib();
     libVoiC_InitLib();
     libVCMI_InitLib();
+    lib15EF4C78_InitLib();
     lib30B9E51A_InitLib();
     lib5BD4895D_InitLib();
     libABFE498B_InitLib();
@@ -183,6 +185,7 @@ void gf_OrderPowerStruggle (abilcmd lp_order, point lp_point);
 //--------------------------------------------------------------------------------------------------
 // Trigger Variables
 //--------------------------------------------------------------------------------------------------
+trigger gt_FactionSwapInit;
 trigger gt_onDifficultyCasual;
 trigger gt_onDifficultyNormal;
 trigger gt_onDifficultyHard;
@@ -1037,6 +1040,45 @@ void gf_OrderPowerStruggle (abilcmd lp_order, point lp_point) {
     UnitIssueOrder(gv_cinematicDuelBubble, OrderTargetingPoint(lp_order, lp_point), c_orderQueueReplace);
 }
 
+//--------------------------------------------------------------------------------------------------
+// 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, false);
+        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: onDifficultyCasual
 //--------------------------------------------------------------------------------------------------
@@ -4640,7 +4682,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);
     }
@@ -5520,6 +5562,7 @@ void gt_VictoryCreateSpectators2_Init () {
 // Trigger Initialization
 //--------------------------------------------------------------------------------------------------
 void InitTriggers () {
+    gt_FactionSwapInit_Init();
     gt_onDifficultyCasual_Init();
     gt_onDifficultyNormal_Init();
     gt_onDifficultyHard_Init();

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

@@ -71,6 +71,9 @@
 <Model id="PingCircleImportant"/>
 <Model id="HybridWarpInEffect"/>
 <Model id="ProtossGenericWarpInOut"/>
+<Race id="Terr"/>
+<Race id="Zerg"/>
+<Race id="Prot"/>
 <Sound id="Ping"/>
 <Sound id="Event_Taldarim02_PitDeath_Explosion"/>
 <Sound id="Event_Taldarim02_EndCine_A"/>
@@ -172,12 +175,24 @@
 <Unit id="PitAlarak"/>
 <Unit id="PitMalash"/>
 <Unit id="DuelBubbleUnit"/>
+<Unit id="AP_SiegeBreaker"/>
+<Unit id="AP_SupplyDepot"/>
 <Unit id="AP_Assimilator"/>
+<Unit id="AP_Factory"/>
+<Unit id="AP_HunterKiller"/>
 <Unit id="AP_VoidRayShakuras"/>
 <Unit id="AP_Probe"/>
 <Unit id="AP_StalkerShakuras"/>
 <Unit id="AP_Gateway"/>
 <Unit id="AP_Nexus"/>
 <Unit id="AP_Pylon"/>
 <Unit id="AP_CyberneticsCore"/>
+<Unit id="AP_Overlord"/>
+<Unit id="AP_Mutalisk"/>
+<Unit id="AP_DukesRevenge"/>
+<Unit id="AP_MercCompound"/>
+<Unit id="AP_Armory"/>
+<Unit id="AP_HydraliskDen"/>
+<Unit id="AP_Spire"/>
+<Unit id="AP_ZergMercenaryCompound"/>
 </Preload>