diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/DocumentHeader
index 6268d3205..10c64e112 100644
Binary files a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/DocumentHeader differ
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/MapScript.galaxy
index b1a3abb5d..c188e3ba2 100644
--- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/MapScript.galaxy
@@ -1363,7 +1363,17 @@ bool auto_gf_CreateUnitforWarpConduit_TriggerFunc (bool testConds, bool runActio
// Trigger: Faction Swap Init
//--------------------------------------------------------------------------------------------------
bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
+ // Variable Declarations
+ unit lv_unit;
+
// Automatic Variable Declarations
+ unitgroup autoFC4AB7A9_g;
+ int autoFC4AB7A9_u;
+ unitgroup auto80907350_g;
+ int auto80907350_u;
+
+ // Variable Initialization
+
// Actions
if (!runActions) {
return true;
@@ -1379,6 +1389,22 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
PlayerSetRace(gv_pLAYER_01_USER, "Terr");
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER_01_USER, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS);
libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_01_USER, "AP_HaveGhostOrSpectreOrThorNuke", 1);
+ UnitMagazineArm(UnitFromId(967990270), AbilityCommand("AP_ArmSiloWithNuke", 0), 1);
+ UnitMagazineArm(UnitFromId(85777247), AbilityCommand("AP_ArmSiloWithNuke", 0), 1);
+ autoFC4AB7A9_g = UnitGroup("AP_Ghost", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+ autoFC4AB7A9_u = UnitGroupCount(autoFC4AB7A9_g, c_unitCountAll);
+ for (;; autoFC4AB7A9_u -= 1) {
+ lv_unit = UnitGroupUnitFromEnd(autoFC4AB7A9_g, autoFC4AB7A9_u);
+ if (lv_unit == null) { break; }
+ UnitSetPropertyFixed(lv_unit, c_unitPropEnergyPercent, 100.0);
+ }
+ auto80907350_g = UnitGroup("AP_GhostResourceEfficiency", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+ auto80907350_u = UnitGroupCount(auto80907350_g, c_unitCountAll);
+ for (;; auto80907350_u -= 1) {
+ lv_unit = UnitGroupUnitFromEnd(auto80907350_g, auto80907350_u);
+ if (lv_unit == null) { break; }
+ UnitSetPropertyFixed(lv_unit, c_unitPropEnergyPercent, 100.0);
+ }
}
else {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
@@ -1584,7 +1610,7 @@ bool gt_Initialization_Func (bool testConds, bool runActions) {
TriggerExecute(gt_Init04MusicSound, true, false);
TriggerExecute(gt_Init05Environment, true, false);
TriggerExecute(gt_Init06Difficulties, true, false);
- auto98A67803_g = UnitGroup("AP_Ghost", c_playerAny, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+ auto98A67803_g = UnitGroup("AP_MercWraith", c_playerAny, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
auto98A67803_u = UnitGroupCount(auto98A67803_g, c_unitCountAll);
for (;; auto98A67803_u -= 1) {
auto98A67803_var = UnitGroupUnitFromEnd(auto98A67803_g, auto98A67803_u);
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Objects b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Objects
index fe689a631..415e00d18 100644
--- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Objects
+++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Objects
@@ -6509,23 +6509,23 @@
-
+
-
+
-
+
-
+
@@ -6534,22 +6534,22 @@
-
+
-
+
-
+
-
+
@@ -6558,41 +6558,41 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
@@ -6609,10 +6609,10 @@
-
-
+
+
@@ -6620,24 +6620,24 @@
-
+
-
+
-
+
-
+
@@ -6763,50 +6763,50 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
@@ -6823,26 +6823,26 @@
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
@@ -6908,10 +6908,10 @@
+
-
@@ -7032,7 +7032,6 @@
-
@@ -7164,6 +7163,9 @@
+
+
+
@@ -7178,15 +7180,15 @@
-
-
-
+
+
+
@@ -7269,9 +7271,6 @@
-
-
-
@@ -7280,6 +7279,9 @@
+
+
+
@@ -7295,25 +7297,27 @@
+
-
+
+
@@ -7417,15 +7421,15 @@
+
+
+
-
-
-
@@ -7474,13 +7478,12 @@
-
+
-
@@ -7490,6 +7493,9 @@
+
+
+
@@ -7514,17 +7520,17 @@
-
+
-
+
+
-
@@ -7559,15 +7565,15 @@
-
+
+
-
-
+
@@ -7581,6 +7587,10 @@
+
+
+
+
@@ -7588,10 +7598,6 @@
-
-
-
-
@@ -7635,8 +7641,8 @@
-
+
@@ -7728,16 +7734,16 @@
-
-
-
-
+
+
+
+
@@ -7745,15 +7751,15 @@
-
-
-
+
+
+
@@ -7780,6 +7786,12 @@
+
+
+
+
+
+
@@ -7787,7 +7799,7 @@
-
+
@@ -7797,7 +7809,7 @@
-
+
@@ -7810,12 +7822,6 @@
-
-
-
-
-
-
@@ -7836,18 +7842,18 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -7892,12 +7898,12 @@
+
-
@@ -7967,13 +7973,13 @@
+
-
@@ -7994,6 +8000,7 @@
+
@@ -8001,7 +8008,6 @@
-
@@ -8041,14 +8047,14 @@
-
+
-
+
@@ -8056,14 +8062,14 @@
-
-
-
+
+
+
@@ -8071,12 +8077,12 @@
-
+
+
-
-
+
@@ -8126,16 +8132,16 @@
-
-
-
-
+
+
+
+
@@ -8204,13 +8210,13 @@
-
+
-
+
@@ -8223,6 +8229,9 @@
+
+
+
@@ -8303,25 +8312,26 @@
-
+
+
-
-
-
-
+
+
+
+
@@ -8347,9 +8357,6 @@
-
-
-
@@ -8357,10 +8364,13 @@
-
+
+
+
+
@@ -8402,10 +8412,6 @@
-
-
-
-
@@ -8413,13 +8419,17 @@
+
+
+
+
+
-
@@ -8452,6 +8462,7 @@
+
@@ -8459,7 +8470,6 @@
-
@@ -8476,22 +8486,19 @@
-
-
-
-
+
-
+
@@ -8504,13 +8511,10 @@
-
-
-
-
+
@@ -8521,13 +8525,15 @@
+
+
+
-
@@ -8535,14 +8541,15 @@
-
+
+
-
+
@@ -8592,6 +8599,11 @@
+
+
+
+
+
@@ -8599,11 +8611,6 @@
-
-
-
-
-
@@ -8632,10 +8639,10 @@
+
-
@@ -8676,11 +8683,11 @@
+
-
@@ -8713,16 +8720,16 @@
-
-
-
-
+
+
+
+
@@ -8763,17 +8770,17 @@
-
-
-
-
-
+
+
+
+
+
@@ -8821,6 +8828,7 @@
+
@@ -8828,7 +8836,6 @@
-
@@ -8836,7 +8843,6 @@
-
@@ -8889,6 +8895,7 @@
+
@@ -8976,11 +8983,11 @@
+
-
@@ -9001,15 +9008,15 @@
-
+
+
-
-
+
@@ -9054,10 +9061,10 @@
-
+
-
+
@@ -9075,12 +9082,12 @@
+
-
@@ -9160,15 +9167,15 @@
-
-
-
+
+
+
@@ -9255,15 +9262,15 @@
-
-
-
+
+
+
@@ -9519,6 +9526,9 @@
+
+
+
@@ -9559,7 +9569,6 @@
-
@@ -9581,13 +9590,13 @@
-
-
-
+
+
+
@@ -9647,6 +9656,12 @@
+
+
+
+
+
+
@@ -9855,7 +9870,6 @@
-
@@ -9863,7 +9877,6 @@
-
@@ -9878,7 +9891,6 @@
-
@@ -9888,11 +9900,19 @@
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Objects.version
index b383fc6d5..1672c2e3a 100644
Binary files a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Objects.version and b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Objects.version differ
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Preload.xml
index 101d45120..da1e5c4e5 100644
--- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Preload.xml
+++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Preload.xml
@@ -195,6 +195,7 @@
+
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Triggers
index 03b5e8037..2f376f117 100644
--- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_reach.SC2Map/Triggers
@@ -14,9 +14,19 @@