From 6b088cc3b01bc5095ca25bbec6f92658b63195ef Mon Sep 17 00:00:00 2001
From: Gemster312 <gemster312@gmail.com>
Date: Sat, 6 Jul 2024 23:44:36 -0700
Subject: [PATCH] Objective Categorization Update for the Kaldir Storyline

---
 .../ComponentList.SC2Components               |    1 +
 .../ap_enemy_within.SC2Map/DocumentHeader     |  Bin 7969 -> 7969 bytes
 .../ap_enemy_within.SC2Map/MapScript.galaxy   |  279 ++-
 .../HotS/ap_enemy_within.SC2Map/Preload.xml   |    8 -
 .../HotS/ap_enemy_within.SC2Map/Triggers      | 1815 +++++++++++------
 .../ap_enemy_within.SC2Map/Triggers.version   |  Bin 44 -> 44 bytes
 .../LocalizedData/GameStrings.txt             |    2 +-
 .../LocalizedData/TriggerStrings.txt          |   14 +
 .../ComponentList.SC2Components               |    1 +
 .../DocumentHeader                            |  Bin 10867 -> 10867 bytes
 .../MapScript.galaxy                          |  140 +-
 .../ap_harvest_of_screams.SC2Map/Preload.xml  |    4 -
 .../ap_harvest_of_screams.SC2Map/Triggers     | 1220 ++++++-----
 .../Triggers.version                          |  Bin 44 -> 44 bytes
 .../LocalizedData/TriggerStrings.txt          |   11 +
 .../ComponentList.SC2Components               |    1 +
 .../DocumentHeader                            |  Bin 11370 -> 11370 bytes
 .../MapScript.galaxy                          |  134 +-
 .../ap_shoot_the_messenger.SC2Map/Preload.xml |    3 -
 .../ap_shoot_the_messenger.SC2Map/Triggers    | 1083 +++++++---
 .../Triggers.version                          |  Bin 44 -> 44 bytes
 .../LocalizedData/TriggerStrings.txt          |   14 +
 22 files changed, 3051 insertions(+), 1679 deletions(-)

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/ComponentList.SC2Components
index 2c400b1b8..a9ac61f9e 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/ComponentList.SC2Components
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/ComponentList.SC2Components
@@ -1,5 +1,6 @@
 <?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/HotS/ap_enemy_within.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/DocumentHeader
index f121acb453fcca8fb80940dddcf109f5034b3143..aa2f7eb582312e45398e3c557e3757828f38c108 100644
GIT binary patch
delta 45
tcmZ2zx6n?-!^k<9gMop;D42nPk(Gg0B9oB;gh5~pU-5bn-l+0d4gknG3O@h<

delta 45
tcmZ2zx6n?-!^k<9gMop;D42nPk(Gg4B7u<sghAkn53?KyZ&dj!2LQht2=xE}

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/MapScript.galaxy
index ddff8bc47..16da74d09 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/MapScript.galaxy
@@ -37,6 +37,12 @@ const int gv_pLAYER_01_USER = 1;
 const int gv_pLAYER_02_ZERG = 2;
 const int gv_pLAYER_02_ZERG2 = 3;
 const int gv_pLAYER_02_ZERG22 = 4;
+const int gv_LOCATION_ID_INFEST_GIANT_URSADON = 1;
+const int gv_LOCATION_ID_FIRST_NIADRA_EVOLUTION = 2;
+const int gv_LOCATION_ID_SECOND_NIADRA_EVOLUTION = 3;
+const int gv_LOCATION_ID_THIRD_NIADRA_EVOLUTION = 4;
+const int gv_LOCATION_ID_WARP_DRIVE = 5;
+const int gv_LOCATION_ID_STASIS_QUADRANT = 6;
 
 //--------------------------------------------------------------------------------------------------
 // Global Variables
@@ -86,15 +92,15 @@ int gv_zerglingKills;
 int gv_roachKills;
 int gv_hydraliskKills;
 int gv_ursadonKills;
-int gv_objectiveDestroyDominionBase22;
-int gv_objectiveDestroyDominionBase222;
-int gv_objectiveDestroyDominionBase2;
-int gv_objectiveDestroyDominionBase23;
-int gv_objectiveDestroyDominionBase232;
-int gv_objectiveDestroyDominionBase322;
-int gv_objectiveDestroyDominionBase3222;
-int gv_objectiveDestroyDominionBase32222;
-int gv_objectiveDestroyDominionBase323;
+int gv_objectiveKillProtoss;
+int gv_objectiveSwarmQueenSurvival;
+int gv_objectiveGainBiomass;
+int gv_objectiveFindSafePlace;
+int gv_objectiveGrow;
+int gv_objectiveDestroyWarpDrive;
+int gv_objectiveEscapeWarpDrive;
+int gv_objectiveDestroyEscapePods;
+int gv_objectiveInfestGiantUrsadon;
 unitgroup gv_cinematicHiddenUnits;
 unitgroup gv_cinematicTempUnits;
 bool gv_cinematicCompleted;
@@ -112,6 +118,8 @@ sound gv_midStasisSound;
 bool gv_midMusicCompleted;
 bool gv_victoryCinematicCompleted;
 sound gv_victoryZergSound;
+int gv_objectiveGrowMore;
+int gv_additionalGrows;
 
 void InitGlobals () {
     int init_i;
@@ -147,18 +155,19 @@ void InitGlobals () {
     for (init_i = 0; init_i <= 10; init_i += 1) {
         gv_escapePodDlgBorder[init_i] = c_invalidDialogControlId;
     }
-    gv_objectiveDestroyDominionBase22 = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase222 = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase2 = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase23 = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase232 = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase322 = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase3222 = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase32222 = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase323 = c_invalidObjectiveId;
+    gv_objectiveKillProtoss = c_invalidObjectiveId;
+    gv_objectiveSwarmQueenSurvival = c_invalidObjectiveId;
+    gv_objectiveGainBiomass = c_invalidObjectiveId;
+    gv_objectiveFindSafePlace = c_invalidObjectiveId;
+    gv_objectiveGrow = c_invalidObjectiveId;
+    gv_objectiveDestroyWarpDrive = c_invalidObjectiveId;
+    gv_objectiveEscapeWarpDrive = c_invalidObjectiveId;
+    gv_objectiveDestroyEscapePods = c_invalidObjectiveId;
+    gv_objectiveInfestGiantUrsadon = c_invalidObjectiveId;
     gv_cinematicHiddenUnits = UnitGroupEmpty();
     gv_cinematicTempUnits = UnitGroupEmpty();
     gv_midHiddenUnitGroup = UnitGroupEmpty();
+    gv_objectiveGrowMore = c_invalidObjectiveId;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -388,6 +397,8 @@ trigger gt_VictoryCinematicEnd;
 trigger gt_VictoryCleanup;
 trigger gt_VictoryZergBridge1;
 trigger gt_VictoryZergBridge2;
+trigger gt_ObjectiveGrowMoreCreate;
+trigger gt_ObjectiveGrowMoreComplete;
 trigger gt_onDifficultyCasual;
 trigger gt_onDifficultyNormal;
 trigger gt_onDifficultyHard;
@@ -1448,14 +1459,13 @@ bool gt_UpdateProtossRemainingObjective_Func (bool testConds, bool runActions) {
         gv_numberOfProtossRemaining = 0;
     }
 
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveKillProtoss, gv_numberOfProtossRemaining);
     if ((gv_escapePodPeopleRemaining == 0)) {
         TriggerExecute(gt_ObjectiveDestroyEscapePodsComplete, true, false);
     }
-    else {
-        lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase22, gv_numberOfProtossRemaining);
-    }
+
     if ((gv_numberOfProtossRemaining <= 0)) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory);
         TriggerExecute(gt_VictoryMainObjectivesCompleted, true, false);
     }
 
@@ -1653,7 +1663,7 @@ bool gt_SwarmQueenusesParasiticInvasion_Func (bool testConds, bool runActions) {
         gf_KillLargeHoldingPen(EventUnitTargetPoint());
         UnitSetOwner(EventUnitTargetUnit(), gv_pLAYER_01_USER, true);
         UnitSelect(EventUnitTargetUnit(), gv_pLAYER_01_USER, true);
-        if ((ObjectiveGetState(gv_objectiveDestroyDominionBase323) == c_objectiveStateActive)) {
+        if ((ObjectiveGetState(gv_objectiveInfestGiantUrsadon) == c_objectiveStateActive)) {
             PingDestroy(gv_giantUrsadonPing);
             libSwaC_gf_DisplayMissionObjectiveRewardFloatingText(UnitGetPosition(EventUnitTargetUnit()), "ZExpedition03Objective010", gv_pLAYER_01_USER);
             TriggerEnable(gt_GiantUrsadonDiesFailBonusObjective, false);
@@ -1795,7 +1805,7 @@ bool gt_MorphtoSwarmQueenComplete_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(2);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_NIADRA_EVOLUTION);
     if ((libABFE498B_gv_aP_Triggers_Option_grantStoryTech == true)) {
         libABFE498B_gf_AP_Triggers_Zerg_unlockZergling(gv_pLAYER_01_USER);
     }
@@ -1839,6 +1849,8 @@ bool gt_MorphtoSwarmQueenComplete_Func (bool testConds, bool runActions) {
     TriggerExecute(gt_ObjectiveDestroytheProtossCreateQ, true, false);
     TriggerExecute(gt_ObjectiveSwarmQueenSurvivalCreateQ, true, false);
     TriggerExecute(gt_TransmissionP1SwarmQueenMorphCompleteQ, true, true);
+    Wait(3.0, c_timeGame);
+    TriggerExecute(gt_ObjectiveGrowMoreCreate, true, false);
     libSwaC_gf_CreateMissionAutosavePoint(StringExternal("Param/Value/2BE39A32"));
     return true;
 }
@@ -1983,7 +1995,9 @@ bool gt_MorphtoLargeSwarmQueenComplete_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(3);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_NIADRA_EVOLUTION);
+    gv_additionalGrows = 1;
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveGrowMore, gv_additionalGrows);
     if ((libABFE498B_gv_aP_Triggers_Option_grantStoryTech == true)) {
         libABFE498B_gf_AP_Triggers_Zerg_unlockRoach(gv_pLAYER_01_USER);
     }
@@ -2157,7 +2171,10 @@ bool gt_MorphtoHugeSwarmQueenComplete_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(4);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_NIADRA_EVOLUTION);
+    gv_additionalGrows = 2;
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveGrowMore, gv_additionalGrows);
+    TriggerExecute(gt_ObjectiveGrowMoreComplete, true, false);
     if ((libABFE498B_gv_aP_Triggers_Option_grantStoryTech == true)) {
         libABFE498B_gf_AP_Triggers_Zerg_unlockHydralisk(gv_pLAYER_01_USER);
     }
@@ -2807,7 +2824,7 @@ bool gt_FirstLyoteisConsumed_Func (bool testConds, bool runActions) {
     CameraSetData(PlayerGroupSingle(gv_pLAYER_01_USER), "LarvaCamera");
     gf_ConsumeCritter(UnitFromId(16));
     Wait(1.5, c_timeGame);
-    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase2, PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom));
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveGainBiomass, PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom));
     return true;
 }
 
@@ -3659,7 +3676,7 @@ bool gt_UrsadonisConsumedResetCamera_Func (bool testConds, bool runActions) {
     UnitRemove(UnitFromId(294));
     gf_ConsumeCritter(gv_tHE_ONE_URSADON);
     Wait(1.5, c_timeGame);
-    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase2, PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom));
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveGainBiomass, PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom));
     if ((PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom) == 100)) {
         TriggerExecute(gt_ObjectiveGainBiomassComplete, true, false);
     }
@@ -4706,8 +4723,7 @@ bool gt_EnteredWarpDriveQuadrant_Func (bool testConds, bool runActions) {
     gv_warpDrivePing = PingLastCreated();
     VisRevealerCreate(gv_pLAYER_01_USER, RegionCircle(UnitGetPosition(UnitFromId(239)), 4.0));
     gv_beaconRevealer = VisRevealerLastCreated();
-    ObjectiveSetState(gv_objectiveDestroyDominionBase322, c_objectiveStateActive);
-    lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase322);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyWarpDrive, true);
     TriggerExecute(gt_TransmissionP3EnteredWarpDriveQuadQ, true, false);
     return true;
 }
@@ -5176,7 +5192,7 @@ bool gt_WarpDriveDestroyedStartCountdownQ_Func (bool testConds, bool runActions)
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(5);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WARP_DRIVE);
     VisRevealerDestroy(gv_beaconRevealer);
     TriggerExecute(gt_WarpDriveExplosions, true, false);
     SoundtrackPlay(PlayerGroupAll(), c_soundtrackCategoryMusic, "ZExpedition03MusicEvent02_WarpDriveBreach", c_soundtrackCueAny, c_soundtrackIndexAny, false);
@@ -5236,8 +5252,7 @@ bool gt_WarpDriveDestroyedStartCountdownQ_Func (bool testConds, bool runActions)
     }
 
     TriggerExecute(gt_StalkerAttackAfterWarpDriveDestroyed, true, false);
-    ObjectiveSetState(gv_objectiveDestroyDominionBase3222, c_objectiveStateActive);
-    lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase3222);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveEscapeWarpDrive, true);
     TriggerQueueEnter();
     libSwaC_gf_SetAllSoundChannelVolumesCampaign(libSwaC_ge_VolumeChannelModeCampaign_Speech);
     SoundChannelSetVolume(PlayerGroupAll(), c_soundCategoryMusic, 100.0, 1.0);
@@ -5537,7 +5552,7 @@ bool gt_EscapedWarpDriveTransition_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(6);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_STASIS_QUADRANT);
     TriggerEnable(gt_EvacuateTimerEndsDestroyWarpDriveQuadrant, false);
     UnitKill(UnitFromId(275));
     PingDestroy(gv_escapeExplosionPing);
@@ -7531,7 +7546,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    if ((ObjectiveGetState(gv_objectiveDestroyDominionBase22) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveDestroyDominionBase32222) == c_objectiveStateCompleted)) {
+    if ((ObjectiveGetState(gv_objectiveKillProtoss) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveDestroyEscapePods) == c_objectiveStateCompleted)) {
         libSwaC_gf_CampaignAwardAchievement("ZKaldir03_1", gv_pLAYER_01_USER);
     }
 
@@ -7666,10 +7681,12 @@ bool gt_ObjectiveDestroytheProtossCreate_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective01");
-    gv_objectiveDestroyDominionBase22 = ObjectiveLastCreated();
-    ObjectiveSetPriority(gv_objectiveDestroyDominionBase22, 1);
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective01", "", 0);
-    lib5BD4895D_gf_AP_Core_enableObjectiveCounter(ObjectiveLastCreated(), "remaining", 100, 0);
+    gv_objectiveKillProtoss = ObjectiveLastCreated();
+    ObjectiveSetPriority(gv_objectiveKillProtoss, 1);
+    ObjectiveShow(gv_objectiveKillProtoss, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveKillProtoss, lib5BD4895D_ge_APObjectiveCategory_Primary, "remaining", gv_numberOfProtossRemaining, 0, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillProtoss, lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKillProtoss, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7727,7 +7744,7 @@ bool gt_ObjectiveDestroytheProtossComplete_Func (bool testConds, bool runActions
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroytheProtossCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase22);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKillProtoss);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7756,7 +7773,7 @@ bool gt_ObjectiveDestroytheProtossFailed_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroytheProtossCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase22);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveKillProtoss);
     return true;
 }
 
@@ -7784,9 +7801,11 @@ bool gt_ObjectiveSwarmQueenSurvivalCreate_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective02");
-    gv_objectiveDestroyDominionBase222 = ObjectiveLastCreated();
-    ObjectiveSetPriority(gv_objectiveDestroyDominionBase222, 0);
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective02", "", 0);
+    gv_objectiveSwarmQueenSurvival = ObjectiveLastCreated();
+    ObjectiveSetPriority(gv_objectiveSwarmQueenSurvival, 0);
+    ObjectiveShow(gv_objectiveSwarmQueenSurvival, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveSwarmQueenSurvival, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveSwarmQueenSurvival, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7844,7 +7863,7 @@ bool gt_ObjectiveSwarmQueenSurvivalComplete_Func (bool testConds, bool runAction
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveSwarmQueenSurvivalCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase222);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveSwarmQueenSurvival);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7873,11 +7892,11 @@ bool gt_ObjectiveSwarmQueenSurvivalFailed_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveSwarmQueenSurvivalCreate, true, false);
-    if ((ObjectiveGetState(gv_objectiveDestroyDominionBase3222) == c_objectiveStateActive)) {
+    if ((ObjectiveGetState(gv_objectiveEscapeWarpDrive) == c_objectiveStateActive)) {
         TriggerExecute(gt_ObjectiveEscapeFailed, true, false);
     }
 
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase222);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveSwarmQueenSurvival);
     return true;
 }
 
@@ -7905,8 +7924,10 @@ bool gt_ObjectiveGainBiomassCreate_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective03");
-    gv_objectiveDestroyDominionBase2 = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective03", "", PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom));
+    gv_objectiveGainBiomass = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveGainBiomass, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveGainBiomass, lib5BD4895D_ge_APObjectiveCategory_Primary, "", PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom), libSwaC_gf_MissionObjectiveItemCount("ZExpedition03Objective03"), false);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGainBiomass, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7935,7 +7956,7 @@ bool gt_ObjectiveGainBiomassComplete_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveGainBiomassCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase2);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveGainBiomass);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7964,8 +7985,7 @@ bool gt_ObjectiveGainBiomassCompleteHideQ_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerQueueEnter();
-    libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective03", libSwaC_ge_MissionObjectiveState_Undiscovered);
-    lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase2);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGainBiomass, false);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     TriggerQueueExit();
     return true;
@@ -7995,7 +8015,7 @@ bool gt_ObjectiveGainBiomassFailed_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveGainBiomassCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase2);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveGainBiomass);
     return true;
 }
 
@@ -8022,7 +8042,11 @@ bool gt_ObjectiveFindSafePlaceCreate_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    gv_objectiveDestroyDominionBase23 = ObjectiveLastCreated();
+    libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective09");
+    gv_objectiveFindSafePlace = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveFindSafePlace, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveFindSafePlace, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindSafePlace, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8051,7 +8075,7 @@ bool gt_ObjectiveFindSafePlaceComplete_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveFindSafePlaceCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase23);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveFindSafePlace);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8080,7 +8104,7 @@ bool gt_ObjectiveFindSafePlaceCompleteHideQ_Func (bool testConds, bool runAction
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerQueueEnter();
-    libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective09", libSwaC_ge_MissionObjectiveState_Undiscovered);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindSafePlace, false);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     TriggerQueueExit();
     return true;
@@ -8110,7 +8134,7 @@ bool gt_ObjectiveFindSafePlaceFailed_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveFindSafePlaceCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase23);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveFindSafePlace);
     return true;
 }
 
@@ -8138,8 +8162,11 @@ bool gt_ObjectiveGrowCreate_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective08");
-    gv_objectiveDestroyDominionBase232 = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective08", "", 0);
+    gv_objectiveGrow = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveGrow, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveGrow, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveGrow, gv_LOCATION_ID_FIRST_NIADRA_EVOLUTION);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGrow, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8168,7 +8195,7 @@ bool gt_ObjectiveGrowComplete_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveGrowCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase232);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveGrow);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8197,8 +8224,7 @@ bool gt_ObjectiveGrowCompleteHideQ_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerQueueEnter();
-    libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective08", libSwaC_ge_MissionObjectiveState_Undiscovered);
-    lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase232);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGrow, false);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     TriggerQueueExit();
     return true;
@@ -8228,7 +8254,7 @@ bool gt_ObjectiveGrowFailed_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveGrowCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase232);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveGrow);
     return true;
 }
 
@@ -8256,9 +8282,10 @@ bool gt_ObjectiveDestroyWarpDriveCreateHidden_Func (bool testConds, bool runActi
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective05");
-    gv_objectiveDestroyDominionBase322 = ObjectiveLastCreated();
-    libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective05", libSwaC_ge_MissionObjectiveState_Undiscovered);
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective05", "", 0);
+    gv_objectiveDestroyWarpDrive = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveDestroyWarpDrive, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDestroyWarpDrive, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyWarpDrive, gv_LOCATION_ID_WARP_DRIVE);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8287,7 +8314,7 @@ bool gt_ObjectiveDestroyWarpDriveComplete_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyWarpDriveCreateHidden, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase322);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyWarpDrive);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8316,7 +8343,7 @@ bool gt_ObjectiveDestroyWarpDriveFailed_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyWarpDriveCreateHidden, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase322);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyWarpDrive);
     return true;
 }
 
@@ -8344,9 +8371,10 @@ bool gt_ObjectiveEscapeCreateHidden_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective06");
-    gv_objectiveDestroyDominionBase3222 = ObjectiveLastCreated();
-    libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective06", libSwaC_ge_MissionObjectiveState_Undiscovered);
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective06", "", 0);
+    gv_objectiveEscapeWarpDrive = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveEscapeWarpDrive, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveEscapeWarpDrive, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveEscapeWarpDrive, gv_LOCATION_ID_STASIS_QUADRANT);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8375,7 +8403,7 @@ bool gt_ObjectiveEscapeComplete_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveEscapeCreateHidden, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase3222);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveEscapeWarpDrive);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8404,7 +8432,7 @@ bool gt_ObjectiveEscapeFailed_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveEscapeCreateHidden, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase3222);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveEscapeWarpDrive);
     return true;
 }
 
@@ -8432,8 +8460,10 @@ bool gt_ObjectiveDestroyEscapePodsCreate_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective07");
-    gv_objectiveDestroyDominionBase32222 = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective07", "", 0);
+    gv_objectiveDestroyEscapePods = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveDestroyEscapePods, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDestroyEscapePods, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyEscapePods, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8491,7 +8521,7 @@ bool gt_ObjectiveDestroyEscapePodsComplete_Func (bool testConds, bool runActions
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyEscapePodsCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase32222);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyEscapePods);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8520,7 +8550,7 @@ bool gt_ObjectiveDestroyEscapePodsFailed_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyEscapePodsCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase32222);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyEscapePods);
     return true;
 }
 
@@ -8533,7 +8563,13 @@ void gt_ObjectiveDestroyEscapePodsFailed_Init () {
 // Trigger: Objective Infest Giant Ursadon Create
 //--------------------------------------------------------------------------------------------------
 bool gt_ObjectiveInfestGiantUrsadonCreate_Func (bool testConds, bool runActions) {
+    // Variable Declarations
+    int lv_category;
+
     // Automatic Variable Declarations
+    // Variable Initialization
+    lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary;
+
     // Conditions
     if (testConds) {
         if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
@@ -8548,8 +8584,11 @@ bool gt_ObjectiveInfestGiantUrsadonCreate_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective010");
-    gv_objectiveDestroyDominionBase323 = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective010", "", 0);
+    gv_objectiveInfestGiantUrsadon = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveInfestGiantUrsadon, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveInfestGiantUrsadon, lv_category, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveInfestGiantUrsadon, gv_LOCATION_ID_INFEST_GIANT_URSADON);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveInfestGiantUrsadon, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8607,7 +8646,7 @@ bool gt_ObjectiveInfestGiantUrsadonComplete_Func (bool testConds, bool runAction
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveInfestGiantUrsadonCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase323);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveInfestGiantUrsadon);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -8636,7 +8675,7 @@ bool gt_ObjectiveInfestGiantUrsadonFailed_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveInfestGiantUrsadonCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase323);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveInfestGiantUrsadon);
     return true;
 }
 
@@ -9261,10 +9300,8 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) {
 
     SoundStop(gv_midExplosionSound, true);
     SoundStop(gv_midStasisSound, true);
-    ObjectiveSetState(gv_objectiveDestroyDominionBase322, c_objectiveStateHidden);
-    lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase322);
-    ObjectiveSetState(gv_objectiveDestroyDominionBase3222, c_objectiveStateHidden);
-    lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase3222);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyWarpDrive, false);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveEscapeWarpDrive, false);
     UnitKill(UnitFromId(273));
     libNtve_gf_ShowHideUnit(UnitFromId(559), true);
     UnitKill(UnitFromId(559));
@@ -9835,6 +9872,74 @@ void gt_VictoryZergBridge2_Init () {
     gt_VictoryZergBridge2 = TriggerCreate("gt_VictoryZergBridge2_Func");
 }
 
+//--------------------------------------------------------------------------------------------------
+// Trigger: Objective GrowMore Create
+//--------------------------------------------------------------------------------------------------
+bool gt_ObjectiveGrowMoreCreate_Func (bool testConds, bool runActions) {
+    // Variable Declarations
+    int lv_category;
+
+    // Automatic Variable Declarations
+    // Variable Initialization
+    lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra;
+
+    // Conditions
+    if (testConds) {
+        if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
+            return false;
+        }
+    }
+
+    // Actions
+    if (!runActions) {
+        return true;
+    }
+
+    TriggerEnable(TriggerGetCurrent(), false);
+    ObjectiveCreate(StringExternal("Param/Value/0F4B4616"), StringToText(""), c_objectiveStateHidden, false);
+    gv_objectiveGrowMore = ObjectiveLastCreated();
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveGrowMore, lv_category, "", gv_additionalGrows, 2, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveGrowMore, gv_LOCATION_ID_SECOND_NIADRA_EVOLUTION);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveGrowMore, gv_LOCATION_ID_THIRD_NIADRA_EVOLUTION);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGrowMore, true);
+    Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void gt_ObjectiveGrowMoreCreate_Init () {
+    gt_ObjectiveGrowMoreCreate = TriggerCreate("gt_ObjectiveGrowMoreCreate_Func");
+}
+
+//--------------------------------------------------------------------------------------------------
+// Trigger: Objective GrowMore Complete
+//--------------------------------------------------------------------------------------------------
+bool gt_ObjectiveGrowMoreComplete_Func (bool testConds, bool runActions) {
+    // Automatic Variable Declarations
+    // Conditions
+    if (testConds) {
+        if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
+            return false;
+        }
+    }
+
+    // Actions
+    if (!runActions) {
+        return true;
+    }
+
+    TriggerEnable(TriggerGetCurrent(), false);
+    TriggerExecute(gt_ObjectiveGrowMoreCreate, true, false);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveGrowMore);
+    Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void gt_ObjectiveGrowMoreComplete_Init () {
+    gt_ObjectiveGrowMoreComplete = TriggerCreate("gt_ObjectiveGrowMoreComplete_Func");
+}
+
 //--------------------------------------------------------------------------------------------------
 // Trigger: onDifficultyCasual
 //--------------------------------------------------------------------------------------------------
@@ -10034,7 +10139,7 @@ bool gt_InfestUrsadon_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(1);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_INFEST_GIANT_URSADON);
     return true;
 }
 
@@ -10286,6 +10391,8 @@ void InitTriggers () {
     gt_VictoryCleanup_Init();
     gt_VictoryZergBridge1_Init();
     gt_VictoryZergBridge2_Init();
+    gt_ObjectiveGrowMoreCreate_Init();
+    gt_ObjectiveGrowMoreComplete_Init();
     gt_onDifficultyCasual_Init();
     gt_onDifficultyNormal_Init();
     gt_onDifficultyHard_Init();
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Preload.xml
index c4eacc180..c32971d49 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Preload.xml
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Preload.xml
@@ -63,14 +63,6 @@
 <Light id="StarshipDark"/>
 <Model id="PingWarning"/>
 <Model id="LasarraWarpIn"/>
-<Objective id="ZExpedition03Objective07"/>
-<Objective id="ZExpedition03Objective05"/>
-<Objective id="ZExpedition03Objective06"/>
-<Objective id="ZExpedition03Objective03"/>
-<Objective id="ZExpedition03Objective08"/>
-<Objective id="ZExpedition03Objective010"/>
-<Objective id="ZExpedition03Objective01"/>
-<Objective id="ZExpedition03Objective02"/>
 <Sound id="Sentry_ForceFieldDeath"/>
 <Sound id="Protoss_PowerDownLarge"/>
 <Sound id="UI_ConsoleIn_Zerg"/>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers
index c49183c51..49cf02975 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers
@@ -7097,6 +7097,7 @@
         <Action Type="FunctionCall" Id="2BCEB0FC"/>
         <Action Type="Comment" Id="0F8FD60E"/>
         <Action Type="FunctionCall" Id="28390605"/>
+        <Action Type="FunctionCall" Id="4F075887"/>
         <Action Type="Comment" Id="DA4F7506"/>
         <Action Type="FunctionCall" Id="F7BD0F60"/>
         <Action Type="FunctionCall" Id="97D6814B"/>
@@ -7305,48 +7306,8 @@
         <Value>0</Value>
         <ValueType Type="int"/>
     </Element>
-    <Element Type="Comment" Id="DA4F7506">
-        <Comment>
-            Escape Pod
-        </Comment>
-    </Element>
-    <Element Type="FunctionCall" Id="F7BD0F60">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-        <FunctionCall Type="FunctionCall" Id="A0482DF1"/>
-        <FunctionCall Type="FunctionCall" Id="4F075887"/>
-        <FunctionCall Type="FunctionCall" Id="D3B8FDE1"/>
-        <FunctionCall Type="FunctionCall" Id="B6ADD67A"/>
-    </Element>
-    <Element Type="FunctionCall" Id="A0482DF1">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="3F7CF15D"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
-        <Parameter Type="Param" Id="14B06A98"/>
-        <Parameter Type="Param" Id="58008FCF"/>
-        <Parameter Type="Param" Id="A20B69BF"/>
-        <Parameter Type="Param" Id="3EFBAEBF"/>
-    </Element>
-    <Element Type="Param" Id="14B06A98">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="5CF39120"/>
-        <Value>ZExpedition03Objective01</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="58008FCF">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="477FB1FF"/>
-        <Variable Type="Variable" Id="D2E679AB"/>
-    </Element>
-    <Element Type="Param" Id="A20B69BF">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="40152177"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
-    </Element>
-    <Element Type="Param" Id="3EFBAEBF">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="30CEDFE3"/>
-        <ValueType Type="text"/>
-    </Element>
     <Element Type="FunctionCall" Id="4F075887">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
         <Parameter Type="Param" Id="51F23B88"/>
         <Parameter Type="Param" Id="87941F0B"/>
     </Element>
@@ -7358,6 +7319,16 @@
         <ParameterDef Type="ParamDef" Library="5BD4895D" Id="94108556"/>
         <Variable Type="Variable" Id="D2E679AB"/>
     </Element>
+    <Element Type="Comment" Id="DA4F7506">
+        <Comment>
+            Escape Pod
+        </Comment>
+    </Element>
+    <Element Type="FunctionCall" Id="F7BD0F60">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+        <FunctionCall Type="FunctionCall" Id="D3B8FDE1"/>
+        <FunctionCall Type="FunctionCall" Id="B6ADD67A"/>
+    </Element>
     <Element Type="FunctionCall" Id="D3B8FDE1">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
@@ -7400,17 +7371,17 @@
     </Element>
     <Element Type="FunctionCall" Id="97D6814B">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-        <FunctionCall Type="FunctionCall" Id="F53BDE92"/>
+        <FunctionCall Type="FunctionCall" Id="C5D2A3DE"/>
         <FunctionCall Type="FunctionCall" Id="25EB2FB3"/>
         <FunctionCall Type="FunctionCall" Id="046C7AAC"/>
     </Element>
-    <Element Type="FunctionCall" Id="F53BDE92">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
+    <Element Type="FunctionCall" Id="C5D2A3DE">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        <Parameter Type="Param" Id="F57ACC89"/>
+        <Parameter Type="Param" Id="6A662412"/>
     </Element>
-    <Element Type="Param" Id="F57ACC89">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
+    <Element Type="Param" Id="6A662412">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
         <Variable Type="Variable" Library="5BD4895D" Id="377FF870"/>
     </Element>
     <Element Type="FunctionCall" Id="25EB2FB3">
@@ -11213,7 +11184,7 @@
         <Condition Type="FunctionCall" Id="546BE9A0"/>
         <Condition Type="FunctionCall" Id="131A6FA2"/>
         <Action Type="FunctionCall" Id="49771EF2"/>
-        <Action Type="FunctionCall" Id="392D308F"/>
+        <Action Type="FunctionCall" Id="09F971E2"/>
         <Action Type="FunctionCall" Id="224A9F18"/>
         <Action Type="FunctionCall" Id="B9318C34"/>
         <Action Type="FunctionCall" Id="F0D9B7AD"/>
@@ -11250,6 +11221,9 @@
         <Action Type="FunctionCall" Id="2B1EF2A3"/>
         <Action Type="FunctionCall" Id="0F438BDB"/>
         <Action Type="FunctionCall" Id="900292E6"/>
+        <Action Type="FunctionCall" Id="45A3F440"/>
+        <Action Type="Comment" Id="6F05AC26"/>
+        <Action Type="FunctionCall" Id="0E0AEEC6"/>
         <Action Type="FunctionCall" Id="37DB66FA"/>
     </Element>
     <Element Type="FunctionCall" Id="BDF0B9FF">
@@ -11409,14 +11383,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="392D308F">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="293C9018"/>
+    <Element Type="FunctionCall" Id="09F971E2">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="789D3A05"/>
     </Element>
-    <Element Type="Param" Id="293C9018">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>2</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="789D3A05">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="3E67DB73"/>
     </Element>
     <Element Type="FunctionCall" Id="224A9F18">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
@@ -12611,6 +12584,44 @@
         <ValueType Type="trigger"/>
         <ValueElement Type="Trigger" Id="6E2C3A12"/>
     </Element>
+    <Element Type="FunctionCall" Id="45A3F440">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
+        <Parameter Type="Param" Id="7DE516FE"/>
+        <Parameter Type="Param" Id="50FFAA4B"/>
+    </Element>
+    <Element Type="Param" Id="7DE516FE">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000419"/>
+        <Value>3.0</Value>
+        <ValueType Type="fixed"/>
+    </Element>
+    <Element Type="Param" Id="50FFAA4B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000420"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
+    </Element>
+    <Element Type="Comment" Id="6F05AC26">
+        <Comment>
+            Bonus Objective to conitnue growing
+        </Comment>
+    </Element>
+    <Element Type="FunctionCall" Id="0E0AEEC6">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
+        <Parameter Type="Param" Id="4ECEB95A"/>
+        <Parameter Type="Param" Id="E8C17884"/>
+        <Parameter Type="Param" Id="C261FBFA"/>
+    </Element>
+    <Element Type="Param" Id="4ECEB95A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000183"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000065"/>
+    </Element>
+    <Element Type="Param" Id="E8C17884">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000184"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000068"/>
+    </Element>
+    <Element Type="Param" Id="C261FBFA">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000182"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="C3162B09"/>
+    </Element>
     <Element Type="FunctionCall" Id="37DB66FA">
         <FunctionDef Type="FunctionDef" Library="SwaC" Id="25CB3756"/>
         <Parameter Type="Param" Id="2BE39A32"/>
@@ -13143,7 +13154,9 @@
         <Event Type="FunctionCall" Id="6A381946"/>
         <Condition Type="FunctionCall" Id="0F07C7D1"/>
         <Action Type="FunctionCall" Id="51D53CD7"/>
-        <Action Type="FunctionCall" Id="BAE4A71A"/>
+        <Action Type="FunctionCall" Id="AF890018"/>
+        <Action Type="FunctionCall" Id="B5491BC1"/>
+        <Action Type="FunctionCall" Id="01A65392"/>
         <Action Type="FunctionCall" Id="73364B1A"/>
         <Action Type="FunctionCall" Id="A308773B"/>
         <Action Type="FunctionCall" Id="347C953F"/>
@@ -13232,15 +13245,41 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="BAE4A71A">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="8B6905C6"/>
+    <Element Type="FunctionCall" Id="AF890018">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="6F996A1B"/>
     </Element>
-    <Element Type="Param" Id="8B6905C6">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>3</Value>
+    <Element Type="Param" Id="6F996A1B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="DD3F0AE2"/>
+    </Element>
+    <Element Type="FunctionCall" Id="B5491BC1">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+        <Parameter Type="Param" Id="F67C8B41"/>
+        <Parameter Type="Param" Id="930247E6"/>
+    </Element>
+    <Element Type="Param" Id="F67C8B41">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+        <Variable Type="Variable" Id="0B503917"/>
+    </Element>
+    <Element Type="Param" Id="930247E6">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+        <Value>1</Value>
         <ValueType Type="int"/>
     </Element>
+    <Element Type="FunctionCall" Id="01A65392">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
+        <Parameter Type="Param" Id="32F8BA9C"/>
+        <Parameter Type="Param" Id="44B4DA9B"/>
+    </Element>
+    <Element Type="Param" Id="32F8BA9C">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="883F2130"/>
+        <Variable Type="Variable" Id="23A5609A"/>
+    </Element>
+    <Element Type="Param" Id="44B4DA9B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="94108556"/>
+        <Variable Type="Variable" Id="0B503917"/>
+    </Element>
     <Element Type="FunctionCall" Id="73364B1A">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <FunctionCall Type="FunctionCall" Id="F7F11C00"/>
@@ -14307,7 +14346,10 @@
         <Condition Type="FunctionCall" Id="CD980E4F"/>
         <Condition Type="FunctionCall" Id="5C7D57F6"/>
         <Action Type="FunctionCall" Id="3D8BE536"/>
-        <Action Type="FunctionCall" Id="2B84D601"/>
+        <Action Type="FunctionCall" Id="1B25E34F"/>
+        <Action Type="FunctionCall" Id="D21A9594"/>
+        <Action Type="FunctionCall" Id="11EF8AB8"/>
+        <Action Type="FunctionCall" Id="427EB124"/>
         <Action Type="FunctionCall" Id="68E8B074"/>
         <Action Type="FunctionCall" Id="E120798A"/>
         <Action Type="FunctionCall" Id="F0034EA0"/>
@@ -14430,15 +14472,60 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="2B84D601">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="EA2F0C40"/>
+    <Element Type="FunctionCall" Id="1B25E34F">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="90C6D3FB"/>
     </Element>
-    <Element Type="Param" Id="EA2F0C40">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>4</Value>
+    <Element Type="Param" Id="90C6D3FB">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="A6FD24B6"/>
+    </Element>
+    <Element Type="FunctionCall" Id="D21A9594">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+        <Parameter Type="Param" Id="8B948070"/>
+        <Parameter Type="Param" Id="BB217195"/>
+    </Element>
+    <Element Type="Param" Id="8B948070">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+        <Variable Type="Variable" Id="0B503917"/>
+    </Element>
+    <Element Type="Param" Id="BB217195">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+        <Value>2</Value>
         <ValueType Type="int"/>
     </Element>
+    <Element Type="FunctionCall" Id="11EF8AB8">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
+        <Parameter Type="Param" Id="41270572"/>
+        <Parameter Type="Param" Id="B51C03D1"/>
+    </Element>
+    <Element Type="Param" Id="41270572">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="883F2130"/>
+        <Variable Type="Variable" Id="23A5609A"/>
+    </Element>
+    <Element Type="Param" Id="B51C03D1">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="94108556"/>
+        <Variable Type="Variable" Id="0B503917"/>
+    </Element>
+    <Element Type="FunctionCall" Id="427EB124">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
+        <Parameter Type="Param" Id="D47E2BAF"/>
+        <Parameter Type="Param" Id="B0991F16"/>
+        <Parameter Type="Param" Id="368F7DA6"/>
+    </Element>
+    <Element Type="Param" Id="D47E2BAF">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000183"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000065"/>
+    </Element>
+    <Element Type="Param" Id="B0991F16">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000184"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000068"/>
+    </Element>
+    <Element Type="Param" Id="368F7DA6">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000182"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="901C81A5"/>
+    </Element>
     <Element Type="FunctionCall" Id="68E8B074">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <FunctionCall Type="FunctionCall" Id="57FA7B6F"/>
@@ -18549,7 +18636,6 @@
         <Action Type="FunctionCall" Id="F52D42CC"/>
         <Action Type="FunctionCall" Id="6F2223A7"/>
         <Action Type="FunctionCall" Id="8805DBA4"/>
-        <Action Type="FunctionCall" Id="A24B6AB8"/>
         <Action Type="FunctionCall" Id="0DDBF7C0"/>
     </Element>
     <Element Type="FunctionCall" Id="92B91C14">
@@ -18784,50 +18870,6 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000420"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
     </Element>
-    <Element Type="FunctionCall" Id="A24B6AB8">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="700FD7F9"/>
-        <Parameter Type="Param" Id="97A06984"/>
-        <Parameter Type="Param" Id="D663512D"/>
-        <Parameter Type="Param" Id="7BD3A3CA"/>
-        <Parameter Type="Param" Id="E64E4AA9"/>
-    </Element>
-    <Element Type="Param" Id="700FD7F9">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition03Objective03</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="97A06984">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <FunctionCall Type="FunctionCall" Id="69CE9474"/>
-    </Element>
-    <Element Type="FunctionCall" Id="69CE9474">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000051"/>
-        <Parameter Type="Param" Id="259A414D"/>
-        <Parameter Type="Param" Id="06C1C30F"/>
-    </Element>
-    <Element Type="Param" Id="259A414D">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000090"/>
-        <Variable Type="Variable" Id="B470D8B8"/>
-    </Element>
-    <Element Type="Param" Id="06C1C30F">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000091"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="22B8D6F6"/>
-    </Element>
-    <Element Type="Param" Id="D663512D">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="7BD3A3CA">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="E64E4AA9">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="0DDBF7C0">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
         <Parameter Type="Param" Id="925DF976"/>
@@ -23521,7 +23563,6 @@
         <Action Type="FunctionCall" Id="33FA2F6B"/>
         <Action Type="FunctionCall" Id="4A842700"/>
         <Action Type="FunctionCall" Id="B9DF9C31"/>
-        <Action Type="FunctionCall" Id="BD9992FE"/>
         <Action Type="FunctionCall" Id="6242E3EB"/>
         <Action Type="FunctionCall" Id="28272EFF"/>
     </Element>
@@ -23799,50 +23840,6 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000420"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
     </Element>
-    <Element Type="FunctionCall" Id="BD9992FE">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="B4C18283"/>
-        <Parameter Type="Param" Id="27F84FA7"/>
-        <Parameter Type="Param" Id="FBC4EF36"/>
-        <Parameter Type="Param" Id="6FA7DA0A"/>
-        <Parameter Type="Param" Id="61E4447F"/>
-    </Element>
-    <Element Type="Param" Id="B4C18283">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition03Objective03</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="27F84FA7">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <FunctionCall Type="FunctionCall" Id="3C95FEBC"/>
-    </Element>
-    <Element Type="FunctionCall" Id="3C95FEBC">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000051"/>
-        <Parameter Type="Param" Id="0910A1A6"/>
-        <Parameter Type="Param" Id="988CC492"/>
-    </Element>
-    <Element Type="Param" Id="0910A1A6">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000090"/>
-        <Variable Type="Variable" Id="B470D8B8"/>
-    </Element>
-    <Element Type="Param" Id="988CC492">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000091"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="22B8D6F6"/>
-    </Element>
-    <Element Type="Param" Id="FBC4EF36">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="6FA7DA0A">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="61E4447F">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="6242E3EB">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
         <Parameter Type="Param" Id="EAC7F4F8"/>
@@ -29225,8 +29222,7 @@
         <Action Type="Comment" Id="43F568EF"/>
         <Action Type="FunctionCall" Id="0CB600DF"/>
         <Action Type="FunctionCall" Id="1EB6E15D"/>
-        <Action Type="FunctionCall" Id="AADD1B1C"/>
-        <Action Type="FunctionCall" Id="041BA105"/>
+        <Action Type="FunctionCall" Id="5B326664"/>
         <Action Type="FunctionCall" Id="E8664700"/>
     </Element>
     <Element Type="FunctionCall" Id="E07D9116">
@@ -29571,26 +29567,18 @@
     <Element Type="FunctionCall" Id="08395922">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000167"/>
     </Element>
-    <Element Type="FunctionCall" Id="AADD1B1C">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="5875E260"/>
-        <Parameter Type="Param" Id="57320965"/>
+    <Element Type="FunctionCall" Id="5B326664">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="196C595E"/>
+        <Parameter Type="Param" Id="D1CC71CD"/>
     </Element>
-    <Element Type="Param" Id="5875E260">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
+    <Element Type="Param" Id="196C595E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="D44CE85D"/>
     </Element>
-    <Element Type="Param" Id="57320965">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="24E7961A"/>
-    </Element>
-    <Element Type="FunctionCall" Id="041BA105">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="15BCF3BB"/>
-        <Parameter Type="Param" Id="DDDBBAE2"/>
-    </Element>
-    <Element Type="Param" Id="DDDBBAE2">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="04ED211A"/>
-        <Variable Type="Variable" Id="D44CE85D"/>
+    <Element Type="Param" Id="D1CC71CD">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="E8664700">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
@@ -32682,7 +32670,7 @@
         <Condition Type="FunctionCall" Id="A4DEFCAD"/>
         <Condition Type="FunctionCall" Id="F3975A54"/>
         <Action Type="FunctionCall" Id="136D58A8"/>
-        <Action Type="FunctionCall" Id="BC461D96"/>
+        <Action Type="FunctionCall" Id="CB386BCB"/>
         <Action Type="FunctionCall" Id="41CB8214"/>
         <Action Type="FunctionCall" Id="7CA5CF6C"/>
         <Action Type="FunctionCall" Id="9E3B03B6"/>
@@ -32731,8 +32719,7 @@
         <Action Type="FunctionCall" Id="D36CC613"/>
         <Action Type="Comment" Id="970DE6D9"/>
         <Action Type="FunctionCall" Id="DE6F9149"/>
-        <Action Type="FunctionCall" Id="48602036"/>
-        <Action Type="FunctionCall" Id="917DC1A4"/>
+        <Action Type="FunctionCall" Id="FA013CFC"/>
         <Action Type="FunctionCall" Id="806E337A"/>
     </Element>
     <Element Type="FunctionCall" Id="7D2426A5">
@@ -32798,14 +32785,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="BC461D96">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="46C2E623"/>
+    <Element Type="FunctionCall" Id="CB386BCB">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="32316CC4"/>
     </Element>
-    <Element Type="Param" Id="46C2E623">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>5</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="32316CC4">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="5B46955F"/>
     </Element>
     <Element Type="FunctionCall" Id="41CB8214">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000168"/>
@@ -33992,26 +33978,18 @@
         <ValueType Type="trigger"/>
         <ValueElement Type="Trigger" Id="9849FC3B"/>
     </Element>
-    <Element Type="FunctionCall" Id="48602036">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="11FF05E4"/>
-        <Parameter Type="Param" Id="AAA99AB8"/>
+    <Element Type="FunctionCall" Id="FA013CFC">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="FAACE0DD"/>
+        <Parameter Type="Param" Id="5BC4A907"/>
     </Element>
-    <Element Type="Param" Id="11FF05E4">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
+    <Element Type="Param" Id="FAACE0DD">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="FF76BC3A"/>
     </Element>
-    <Element Type="Param" Id="AAA99AB8">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="24E7961A"/>
-    </Element>
-    <Element Type="FunctionCall" Id="917DC1A4">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="15BCF3BB"/>
-        <Parameter Type="Param" Id="75AA6071"/>
-    </Element>
-    <Element Type="Param" Id="75AA6071">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="04ED211A"/>
-        <Variable Type="Variable" Id="FF76BC3A"/>
+    <Element Type="Param" Id="5BC4A907">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="806E337A">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="74DFFAD8"/>
@@ -36035,7 +36013,7 @@
         <Condition Type="FunctionCall" Id="7CFF3FA5"/>
         <Condition Type="FunctionCall" Id="567D6338"/>
         <Action Type="FunctionCall" Id="91B9E222"/>
-        <Action Type="FunctionCall" Id="A4D6066B"/>
+        <Action Type="FunctionCall" Id="A63EEEAF"/>
         <Action Type="FunctionCall" Id="1FC94C83"/>
         <Action Type="FunctionCall" Id="2DF3A1ED"/>
         <Action Type="FunctionCall" Id="038508D1"/>
@@ -36178,14 +36156,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="A4D6066B">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="B1EAEEC7"/>
+    <Element Type="FunctionCall" Id="A63EEEAF">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="912BB93E"/>
     </Element>
-    <Element Type="Param" Id="B1EAEEC7">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>6</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="912BB93E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="9FB4A24D"/>
     </Element>
     <Element Type="FunctionCall" Id="1FC94C83">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
@@ -52410,7 +52387,6 @@
         <Item Type="Trigger" Id="B003191D"/>
     </Element>
     <Element Type="Variable" Id="56AEB68E">
-        <Identifier>objectiveDestroyDominionBase22</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -52426,8 +52402,10 @@
         <Action Type="FunctionCall" Id="DF9B1A66"/>
         <Action Type="FunctionCall" Id="E5714C78"/>
         <Action Type="FunctionCall" Id="D1B01E28"/>
-        <Action Type="FunctionCall" Id="715E1B3E"/>
-        <Action Type="FunctionCall" Id="DAFF4041"/>
+        <Action Type="FunctionCall" Id="0B3E8155"/>
+        <Action Type="FunctionCall" Id="6002C661"/>
+        <Action Type="FunctionCall" Id="2F8ED7BE"/>
+        <Action Type="FunctionCall" Id="AEA878BE"/>
         <Action Type="FunctionCall" Id="0FA6E07E"/>
     </Element>
     <Element Type="FunctionCall" Id="85C8B824">
@@ -52521,63 +52499,88 @@
         <Value>1</Value>
         <ValueType Type="int"/>
     </Element>
-    <Element Type="FunctionCall" Id="715E1B3E">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="C2F67898"/>
-        <Parameter Type="Param" Id="61D97AD4"/>
-        <Parameter Type="Param" Id="2D988BAA"/>
-        <Parameter Type="Param" Id="DA7D58D5"/>
+    <Element Type="FunctionCall" Id="0B3E8155">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="8458554E"/>
+        <Parameter Type="Param" Id="F53D414B"/>
+        <Parameter Type="Param" Id="383A073D"/>
     </Element>
-    <Element Type="Param" Id="C2F67898">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="29D67C16"/>
+    <Element Type="Param" Id="8458554E">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="472FB27F"/>
     </Element>
-    <Element Type="FunctionCall" Id="29D67C16">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="472FB27F">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="61D97AD4">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition03Objective01</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="F53D414B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
+    </Element>
+    <Element Type="Param" Id="383A073D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="56AEB68E"/>
     </Element>
-    <Element Type="Param" Id="2D988BAA">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
+    <Element Type="FunctionCall" Id="6002C661">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="A3EF346E"/>
+        <Parameter Type="Param" Id="EB3E3072"/>
+        <Parameter Type="Param" Id="5B4FD708"/>
+        <Parameter Type="Param" Id="491739A0"/>
+        <Parameter Type="Param" Id="2DEAFF88"/>
+        <Parameter Type="Param" Id="8B853A97"/>
+    </Element>
+    <Element Type="Param" Id="A3EF346E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
+        <Variable Type="Variable" Id="56AEB68E"/>
+    </Element>
+    <Element Type="Param" Id="EB3E3072">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
+        <Value>remaining</Value>
         <ValueType Type="string"/>
     </Element>
-    <Element Type="Param" Id="DA7D58D5">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
+    <Element Type="Param" Id="5B4FD708">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
+        <Variable Type="Variable" Id="D2E679AB"/>
+    </Element>
+    <Element Type="Param" Id="491739A0">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
         <Value>0</Value>
         <ValueType Type="int"/>
     </Element>
-    <Element Type="FunctionCall" Id="DAFF4041">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="C1A3681D"/>
-        <Parameter Type="Param" Id="4D51CE05"/>
-        <Parameter Type="Param" Id="49B2AFB7"/>
-        <Parameter Type="Param" Id="5D380327"/>
-        <Parameter Type="Param" Id="C2DC990C"/>
+    <Element Type="Param" Id="2DEAFF88">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
     </Element>
-    <Element Type="Param" Id="4D51CE05">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="783E81EF"/>
-        <FunctionCall Type="FunctionCall" Id="0330D4FC"/>
+    <Element Type="Param" Id="8B853A97">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
     </Element>
-    <Element Type="FunctionCall" Id="0330D4FC">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="2F8ED7BE">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="1A0C3FFA"/>
+        <Parameter Type="Param" Id="C58D8A96"/>
     </Element>
-    <Element Type="Param" Id="49B2AFB7">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="BB87B228"/>
-        <Value>remaining</Value>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="1A0C3FFA">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="56AEB68E"/>
     </Element>
-    <Element Type="Param" Id="5D380327">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="F65441F9"/>
-        <Value>100</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="C58D8A96">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Library="5BD4895D" Id="377FF870"/>
     </Element>
-    <Element Type="Param" Id="C2DC990C">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2C73CD7D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="FunctionCall" Id="AEA878BE">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="34BBA7F1"/>
+        <Parameter Type="Param" Id="D416C96D"/>
+    </Element>
+    <Element Type="Param" Id="34BBA7F1">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="56AEB68E"/>
+    </Element>
+    <Element Type="Param" Id="D416C96D">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="0FA6E07E">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -52871,7 +52874,6 @@
         <Item Type="Trigger" Id="AC12B376"/>
     </Element>
     <Element Type="Variable" Id="7D834983">
-        <Identifier>objectiveDestroyDominionBase222</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -52887,7 +52889,9 @@
         <Action Type="FunctionCall" Id="9F5B1445"/>
         <Action Type="FunctionCall" Id="7F9FF23D"/>
         <Action Type="FunctionCall" Id="A1924781"/>
-        <Action Type="FunctionCall" Id="A924FC12"/>
+        <Action Type="FunctionCall" Id="61E05F23"/>
+        <Action Type="FunctionCall" Id="92AA3DF1"/>
+        <Action Type="FunctionCall" Id="803E3C68"/>
         <Action Type="FunctionCall" Id="4C733037"/>
     </Element>
     <Element Type="FunctionCall" Id="292D56DE">
@@ -52981,34 +52985,58 @@
         <Value>0</Value>
         <ValueType Type="int"/>
     </Element>
-    <Element Type="FunctionCall" Id="A924FC12">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="1E4FB7FE"/>
-        <Parameter Type="Param" Id="B8DC9310"/>
-        <Parameter Type="Param" Id="E2B7326F"/>
-        <Parameter Type="Param" Id="279E9B91"/>
+    <Element Type="FunctionCall" Id="61E05F23">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="50A14720"/>
+        <Parameter Type="Param" Id="0FE43187"/>
+        <Parameter Type="Param" Id="B2C1A1DA"/>
     </Element>
-    <Element Type="Param" Id="1E4FB7FE">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="9EDE6909"/>
+    <Element Type="Param" Id="50A14720">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="CD341677"/>
     </Element>
-    <Element Type="FunctionCall" Id="9EDE6909">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="CD341677">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="B8DC9310">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition03Objective02</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="0FE43187">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="E2B7326F">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="B2C1A1DA">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="7D834983"/>
     </Element>
-    <Element Type="Param" Id="279E9B91">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="FunctionCall" Id="92AA3DF1">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="61AE7CA0"/>
+        <Parameter Type="Param" Id="92FE3AD1"/>
+        <Parameter Type="Param" Id="83A4C515"/>
+    </Element>
+    <Element Type="Param" Id="61AE7CA0">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="7D834983"/>
+    </Element>
+    <Element Type="Param" Id="92FE3AD1">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="83A4C515">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="803E3C68">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="F6DABB43"/>
+        <Parameter Type="Param" Id="8816AB53"/>
+    </Element>
+    <Element Type="Param" Id="F6DABB43">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="7D834983"/>
+    </Element>
+    <Element Type="Param" Id="8816AB53">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="4C733037">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -53360,7 +53388,6 @@
         <Item Type="Trigger" Id="FCF287D5"/>
     </Element>
     <Element Type="Variable" Id="C00E28DF">
-        <Identifier>objectiveDestroyDominionBase2</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -53374,9 +53401,10 @@
         <Action Type="FunctionCall" Id="3ABE93B0"/>
         <Action Type="Comment" Id="11B562AD"/>
         <Action Type="FunctionCall" Id="225CDA5A"/>
-        <Action Type="FunctionCall" Id="12DC663B"/>
         <Action Type="FunctionCall" Id="9A4A835B"/>
-        <Action Type="FunctionCall" Id="8D5A1EA4"/>
+        <Action Type="FunctionCall" Id="87C32DC5"/>
+        <Action Type="FunctionCall" Id="4A2BD9DC"/>
+        <Action Type="FunctionCall" Id="CAB61A5F"/>
         <Action Type="FunctionCall" Id="A40B7296"/>
     </Element>
     <Element Type="FunctionCall" Id="3B145FC7">
@@ -53440,50 +53468,6 @@
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Objective"/>
     </Element>
-    <Element Type="FunctionCall" Id="12DC663B">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="00BB7920"/>
-        <Parameter Type="Param" Id="B6F21A94"/>
-        <Parameter Type="Param" Id="E7A15205"/>
-        <Parameter Type="Param" Id="E306799B"/>
-        <Parameter Type="Param" Id="B2443650"/>
-    </Element>
-    <Element Type="Param" Id="00BB7920">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition03Objective03</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="B6F21A94">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <FunctionCall Type="FunctionCall" Id="9090963D"/>
-    </Element>
-    <Element Type="FunctionCall" Id="9090963D">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000051"/>
-        <Parameter Type="Param" Id="0B02E852"/>
-        <Parameter Type="Param" Id="2ABEBD06"/>
-    </Element>
-    <Element Type="Param" Id="0B02E852">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000090"/>
-        <Variable Type="Variable" Id="B470D8B8"/>
-    </Element>
-    <Element Type="Param" Id="2ABEBD06">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000091"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="22B8D6F6"/>
-    </Element>
-    <Element Type="Param" Id="E7A15205">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="E306799B">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="B2443650">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="9A4A835B">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
         <Parameter Type="Param" Id="38A7E98F"/>
@@ -53500,47 +53484,97 @@
     <Element Type="FunctionCall" Id="436190CE">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="8D5A1EA4">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="8CCD652F"/>
-        <Parameter Type="Param" Id="76CEC0E3"/>
-        <Parameter Type="Param" Id="5FF66E85"/>
-        <Parameter Type="Param" Id="4EE3AC67"/>
+    <Element Type="FunctionCall" Id="87C32DC5">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="728571AE"/>
+        <Parameter Type="Param" Id="0AFDEA13"/>
+        <Parameter Type="Param" Id="A97D018C"/>
     </Element>
-    <Element Type="Param" Id="8CCD652F">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="23A91B36"/>
+    <Element Type="Param" Id="728571AE">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="B6019007"/>
     </Element>
-    <Element Type="FunctionCall" Id="23A91B36">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="B6019007">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="76CEC0E3">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition03Objective03</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="0AFDEA13">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
+    </Element>
+    <Element Type="Param" Id="A97D018C">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="C00E28DF"/>
     </Element>
-    <Element Type="Param" Id="5FF66E85">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
+    <Element Type="FunctionCall" Id="4A2BD9DC">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="CB85B7BC"/>
+        <Parameter Type="Param" Id="52B3A10B"/>
+        <Parameter Type="Param" Id="FECBA04B"/>
+        <Parameter Type="Param" Id="BF6378D8"/>
+        <Parameter Type="Param" Id="79D273DD"/>
+        <Parameter Type="Param" Id="07BC01C2"/>
+    </Element>
+    <Element Type="Param" Id="CB85B7BC">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
+        <Variable Type="Variable" Id="C00E28DF"/>
+    </Element>
+    <Element Type="Param" Id="52B3A10B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
         <ValueType Type="string"/>
     </Element>
-    <Element Type="Param" Id="4EE3AC67">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <FunctionCall Type="FunctionCall" Id="4E5C014F"/>
+    <Element Type="Param" Id="FECBA04B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
+        <FunctionCall Type="FunctionCall" Id="AAECA15F"/>
     </Element>
-    <Element Type="FunctionCall" Id="4E5C014F">
+    <Element Type="FunctionCall" Id="AAECA15F">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000051"/>
-        <Parameter Type="Param" Id="337589D2"/>
-        <Parameter Type="Param" Id="E0CC4ED5"/>
+        <Parameter Type="Param" Id="F9FCD6B4"/>
+        <Parameter Type="Param" Id="83B61F07"/>
     </Element>
-    <Element Type="Param" Id="337589D2">
+    <Element Type="Param" Id="F9FCD6B4">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000090"/>
         <Variable Type="Variable" Id="B470D8B8"/>
     </Element>
-    <Element Type="Param" Id="E0CC4ED5">
+    <Element Type="Param" Id="83B61F07">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000091"/>
         <Preset Type="PresetValue" Library="Ntve" Id="22B8D6F6"/>
     </Element>
+    <Element Type="Param" Id="BF6378D8">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
+        <FunctionCall Type="FunctionCall" Id="B7CA5720"/>
+    </Element>
+    <Element Type="FunctionCall" Id="B7CA5720">
+        <FunctionDef Type="FunctionDef" Library="SwaC" Id="02BE9261"/>
+        <Parameter Type="Param" Id="DF8C9272"/>
+    </Element>
+    <Element Type="Param" Id="DF8C9272">
+        <ParameterDef Type="ParamDef" Library="SwaC" Id="D3053498"/>
+        <Value>ZExpedition03Objective03</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Objective"/>
+    </Element>
+    <Element Type="Param" Id="79D273DD">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="07BC01C2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="CAB61A5F">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="02A6EAFD"/>
+        <Parameter Type="Param" Id="90F5223A"/>
+    </Element>
+    <Element Type="Param" Id="02A6EAFD">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="C00E28DF"/>
+    </Element>
+    <Element Type="Param" Id="90F5223A">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    </Element>
     <Element Type="FunctionCall" Id="A40B7296">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="7D712764"/>
@@ -53718,35 +53752,23 @@
     </Element>
     <Element Type="FunctionCall" Id="CDF36B0D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="74DFFAD8"/>
-        <FunctionCall Type="FunctionCall" Id="B37CEA84"/>
-        <FunctionCall Type="FunctionCall" Id="FCC88EF9"/>
+        <FunctionCall Type="FunctionCall" Id="DC2012CD"/>
         <FunctionCall Type="FunctionCall" Id="0593BA38"/>
     </Element>
-    <Element Type="FunctionCall" Id="B37CEA84">
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="E27F6159"/>
+    <Element Type="FunctionCall" Id="DC2012CD">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="A7CC7F7D"/>
-        <Parameter Type="Param" Id="3AF583F5"/>
-        <Parameter Type="Param" Id="331AEB43"/>
-    </Element>
-    <Element Type="Param" Id="3AF583F5">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4306A9B6"/>
-        <Preset Type="PresetValue" Library="SwaC" Id="8AA654E5"/>
+        <Parameter Type="Param" Id="438A0FD7"/>
+        <Parameter Type="Param" Id="7CE521CF"/>
     </Element>
-    <Element Type="Param" Id="331AEB43">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4B78BD12"/>
-        <Value>ZExpedition03Objective03</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="FunctionCall" Id="FCC88EF9">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="15BCF3BB"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="A7CC7F7D"/>
-        <Parameter Type="Param" Id="91CD4105"/>
-    </Element>
-    <Element Type="Param" Id="91CD4105">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="04ED211A"/>
+    <Element Type="Param" Id="438A0FD7">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="C00E28DF"/>
     </Element>
+    <Element Type="Param" Id="7CE521CF">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
+    </Element>
     <Element Type="FunctionCall" Id="0593BA38">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="A7CC7F7D"/>
@@ -53860,7 +53882,6 @@
         <Item Type="Trigger" Id="B54A4DA5"/>
     </Element>
     <Element Type="Variable" Id="C28BEFBF">
-        <Identifier>objectiveDestroyDominionBase23</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -53875,6 +53896,9 @@
         <Action Type="Comment" Id="BA6AF4A8"/>
         <Action Type="FunctionCall" Id="4344A02D"/>
         <Action Type="FunctionCall" Id="CE854461"/>
+        <Action Type="FunctionCall" Id="023036F0"/>
+        <Action Type="FunctionCall" Id="9123A957"/>
+        <Action Type="FunctionCall" Id="704E9ABA"/>
         <Action Type="FunctionCall" Id="98228153"/>
     </Element>
     <Element Type="FunctionCall" Id="594FC41B">
@@ -53929,7 +53953,6 @@
         </Comment>
     </Element>
     <Element Type="FunctionCall" Id="4344A02D">
-        <Disabled/>
         <FunctionDef Type="FunctionDef" Library="SwaC" Id="A2B49061"/>
         <Parameter Type="Param" Id="B61FE893"/>
     </Element>
@@ -53955,6 +53978,59 @@
     <Element Type="FunctionCall" Id="FC3ABB6E">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
+    <Element Type="FunctionCall" Id="023036F0">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="28DAF847"/>
+        <Parameter Type="Param" Id="F6899DD0"/>
+        <Parameter Type="Param" Id="1B3932FF"/>
+    </Element>
+    <Element Type="Param" Id="28DAF847">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="173927F3"/>
+    </Element>
+    <Element Type="FunctionCall" Id="173927F3">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
+    </Element>
+    <Element Type="Param" Id="F6899DD0">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
+    </Element>
+    <Element Type="Param" Id="1B3932FF">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="C28BEFBF"/>
+    </Element>
+    <Element Type="FunctionCall" Id="9123A957">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="60F1162D"/>
+        <Parameter Type="Param" Id="59EECDA7"/>
+        <Parameter Type="Param" Id="6330AF18"/>
+    </Element>
+    <Element Type="Param" Id="60F1162D">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="C28BEFBF"/>
+    </Element>
+    <Element Type="Param" Id="59EECDA7">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="6330AF18">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="704E9ABA">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="DA1592E2"/>
+        <Parameter Type="Param" Id="2EE7AB32"/>
+    </Element>
+    <Element Type="Param" Id="DA1592E2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="C28BEFBF"/>
+    </Element>
+    <Element Type="Param" Id="2EE7AB32">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    </Element>
     <Element Type="FunctionCall" Id="98228153">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="AD452C3B"/>
@@ -54132,24 +54208,22 @@
     </Element>
     <Element Type="FunctionCall" Id="4C9E2281">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="74DFFAD8"/>
-        <FunctionCall Type="FunctionCall" Id="9AC5F87A"/>
+        <FunctionCall Type="FunctionCall" Id="4C0E8097"/>
         <FunctionCall Type="FunctionCall" Id="431CA87A"/>
     </Element>
-    <Element Type="FunctionCall" Id="9AC5F87A">
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="E27F6159"/>
+    <Element Type="FunctionCall" Id="4C0E8097">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="A7CC7F7D"/>
-        <Parameter Type="Param" Id="F3F9A01D"/>
-        <Parameter Type="Param" Id="CBAC3AEA"/>
+        <Parameter Type="Param" Id="14350C25"/>
+        <Parameter Type="Param" Id="4372BB17"/>
     </Element>
-    <Element Type="Param" Id="F3F9A01D">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4306A9B6"/>
-        <Preset Type="PresetValue" Library="SwaC" Id="8AA654E5"/>
+    <Element Type="Param" Id="14350C25">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="C28BEFBF"/>
     </Element>
-    <Element Type="Param" Id="CBAC3AEA">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4B78BD12"/>
-        <Value>ZExpedition03Objective09</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="4372BB17">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
     <Element Type="FunctionCall" Id="431CA87A">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -54269,7 +54343,6 @@
         <Item Type="Trigger" Id="731D5FCA"/>
     </Element>
     <Element Type="Variable" Id="B3D03BCA">
-        <Identifier>objectiveDestroyDominionBase232</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -54284,7 +54357,10 @@
         <Action Type="Comment" Id="70A427FD"/>
         <Action Type="FunctionCall" Id="72586C50"/>
         <Action Type="FunctionCall" Id="D27AB036"/>
-        <Action Type="FunctionCall" Id="5E08FE24"/>
+        <Action Type="FunctionCall" Id="C7C72A7A"/>
+        <Action Type="FunctionCall" Id="AE76D701"/>
+        <Action Type="FunctionCall" Id="94E18A11"/>
+        <Action Type="FunctionCall" Id="6B9C06C3"/>
         <Action Type="FunctionCall" Id="7F0B88DC"/>
     </Element>
     <Element Type="FunctionCall" Id="D76EBFD2">
@@ -54364,34 +54440,71 @@
     <Element Type="FunctionCall" Id="CFE6E8F7">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="5E08FE24">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="793AD055"/>
-        <Parameter Type="Param" Id="63AC7273"/>
-        <Parameter Type="Param" Id="F74887ED"/>
-        <Parameter Type="Param" Id="AAF44E2A"/>
+    <Element Type="FunctionCall" Id="C7C72A7A">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="F6215FED"/>
+        <Parameter Type="Param" Id="E3E05981"/>
+        <Parameter Type="Param" Id="2DFFBE1B"/>
     </Element>
-    <Element Type="Param" Id="793AD055">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="4971A1A2"/>
+    <Element Type="Param" Id="F6215FED">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="2F3D420C"/>
     </Element>
-    <Element Type="FunctionCall" Id="4971A1A2">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="2F3D420C">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="63AC7273">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition03Objective08</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="E3E05981">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="F74887ED">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="2DFFBE1B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="B3D03BCA"/>
     </Element>
-    <Element Type="Param" Id="AAF44E2A">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="FunctionCall" Id="AE76D701">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="A7A8519E"/>
+        <Parameter Type="Param" Id="D96418AE"/>
+        <Parameter Type="Param" Id="339E144D"/>
+    </Element>
+    <Element Type="Param" Id="A7A8519E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="B3D03BCA"/>
+    </Element>
+    <Element Type="Param" Id="D96418AE">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="339E144D">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="94E18A11">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="3E15BBAF"/>
+        <Parameter Type="Param" Id="FD25E5A0"/>
+    </Element>
+    <Element Type="Param" Id="3E15BBAF">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="B3D03BCA"/>
+    </Element>
+    <Element Type="Param" Id="FD25E5A0">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="3E67DB73"/>
+    </Element>
+    <Element Type="FunctionCall" Id="6B9C06C3">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="B2FA6242"/>
+        <Parameter Type="Param" Id="8B8778E7"/>
+    </Element>
+    <Element Type="Param" Id="B2FA6242">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="B3D03BCA"/>
+    </Element>
+    <Element Type="Param" Id="8B8778E7">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="7F0B88DC">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -54570,35 +54683,23 @@
     </Element>
     <Element Type="FunctionCall" Id="3254CE6A">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="74DFFAD8"/>
-        <FunctionCall Type="FunctionCall" Id="E5F94A07"/>
-        <FunctionCall Type="FunctionCall" Id="94C2CF08"/>
+        <FunctionCall Type="FunctionCall" Id="DFE5EA49"/>
         <FunctionCall Type="FunctionCall" Id="6B1D8B69"/>
     </Element>
-    <Element Type="FunctionCall" Id="E5F94A07">
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="E27F6159"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="A7CC7F7D"/>
-        <Parameter Type="Param" Id="D5EB8200"/>
-        <Parameter Type="Param" Id="DC098230"/>
-    </Element>
-    <Element Type="Param" Id="D5EB8200">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4306A9B6"/>
-        <Preset Type="PresetValue" Library="SwaC" Id="8AA654E5"/>
-    </Element>
-    <Element Type="Param" Id="DC098230">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4B78BD12"/>
-        <Value>ZExpedition03Objective08</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="FunctionCall" Id="94C2CF08">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="15BCF3BB"/>
+    <Element Type="FunctionCall" Id="DFE5EA49">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="A7CC7F7D"/>
-        <Parameter Type="Param" Id="8C0CD59C"/>
+        <Parameter Type="Param" Id="EFC67801"/>
+        <Parameter Type="Param" Id="1D7DB2DA"/>
     </Element>
-    <Element Type="Param" Id="8C0CD59C">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="04ED211A"/>
+    <Element Type="Param" Id="EFC67801">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="B3D03BCA"/>
     </Element>
+    <Element Type="Param" Id="1D7DB2DA">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
+    </Element>
     <Element Type="FunctionCall" Id="6B1D8B69">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="A7CC7F7D"/>
@@ -54716,7 +54817,6 @@
         <Item Type="Trigger" Id="556F22CA"/>
     </Element>
     <Element Type="Variable" Id="D44CE85D">
-        <Identifier>objectiveDestroyDominionBase322</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -54732,8 +54832,9 @@
         <Action Type="Comment" Id="FE233E78"/>
         <Action Type="FunctionCall" Id="A62C2099"/>
         <Action Type="FunctionCall" Id="D4FFC583"/>
-        <Action Type="FunctionCall" Id="CA379E31"/>
-        <Action Type="FunctionCall" Id="B22981C9"/>
+        <Action Type="FunctionCall" Id="98F5BC3D"/>
+        <Action Type="FunctionCall" Id="5BE34581"/>
+        <Action Type="FunctionCall" Id="AAA1E590"/>
         <Action Type="FunctionCall" Id="9BCEEB95"/>
     </Element>
     <Element Type="FunctionCall" Id="1A3C7B8C">
@@ -54818,49 +54919,58 @@
     <Element Type="FunctionCall" Id="E00D106E">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="CA379E31">
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="E27F6159"/>
-        <Parameter Type="Param" Id="B413D084"/>
-        <Parameter Type="Param" Id="3ED77A22"/>
+    <Element Type="FunctionCall" Id="98F5BC3D">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="0AE6F5D5"/>
+        <Parameter Type="Param" Id="2CE4C610"/>
+        <Parameter Type="Param" Id="98037FFA"/>
     </Element>
-    <Element Type="Param" Id="B413D084">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4306A9B6"/>
-        <Preset Type="PresetValue" Library="SwaC" Id="8AA654E5"/>
+    <Element Type="Param" Id="0AE6F5D5">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="B5379E21"/>
     </Element>
-    <Element Type="Param" Id="3ED77A22">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4B78BD12"/>
-        <Value>ZExpedition03Objective05</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="FunctionCall" Id="B5379E21">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
+    </Element>
+    <Element Type="Param" Id="2CE4C610">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="FunctionCall" Id="B22981C9">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="B79D2739"/>
-        <Parameter Type="Param" Id="BE75A5CD"/>
-        <Parameter Type="Param" Id="864FA58E"/>
-        <Parameter Type="Param" Id="2E3DB009"/>
+    <Element Type="Param" Id="98037FFA">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="D44CE85D"/>
     </Element>
-    <Element Type="Param" Id="B79D2739">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="919E9479"/>
+    <Element Type="FunctionCall" Id="5BE34581">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="CA0B398F"/>
+        <Parameter Type="Param" Id="1A102AC0"/>
+        <Parameter Type="Param" Id="81EDED64"/>
     </Element>
-    <Element Type="FunctionCall" Id="919E9479">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="Param" Id="CA0B398F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="D44CE85D"/>
     </Element>
-    <Element Type="Param" Id="BE75A5CD">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition03Objective05</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="1A102AC0">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
     </Element>
-    <Element Type="Param" Id="864FA58E">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="81EDED64">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
     </Element>
-    <Element Type="Param" Id="2E3DB009">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="FunctionCall" Id="AAA1E590">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="483A005B"/>
+        <Parameter Type="Param" Id="4B30DE7A"/>
+    </Element>
+    <Element Type="Param" Id="483A005B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="D44CE85D"/>
+    </Element>
+    <Element Type="Param" Id="4B30DE7A">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="5B46955F"/>
     </Element>
     <Element Type="FunctionCall" Id="9BCEEB95">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -55078,7 +55188,6 @@
         <Item Type="Trigger" Id="A657B1D7"/>
     </Element>
     <Element Type="Variable" Id="FF76BC3A">
-        <Identifier>objectiveDestroyDominionBase3222</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -55094,8 +55203,9 @@
         <Action Type="Comment" Id="AC90D80A"/>
         <Action Type="FunctionCall" Id="35CF2E22"/>
         <Action Type="FunctionCall" Id="D964006E"/>
-        <Action Type="FunctionCall" Id="13AF9401"/>
-        <Action Type="FunctionCall" Id="2B524E87"/>
+        <Action Type="FunctionCall" Id="89DF659E"/>
+        <Action Type="FunctionCall" Id="E671AA18"/>
+        <Action Type="FunctionCall" Id="19830094"/>
         <Action Type="FunctionCall" Id="6335E24E"/>
     </Element>
     <Element Type="FunctionCall" Id="8E41513D">
@@ -55180,49 +55290,58 @@
     <Element Type="FunctionCall" Id="1DD361DE">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="13AF9401">
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="E27F6159"/>
-        <Parameter Type="Param" Id="89781F5F"/>
-        <Parameter Type="Param" Id="C4186080"/>
+    <Element Type="FunctionCall" Id="89DF659E">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="AB05714F"/>
+        <Parameter Type="Param" Id="9C22DD83"/>
+        <Parameter Type="Param" Id="F1388307"/>
     </Element>
-    <Element Type="Param" Id="89781F5F">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4306A9B6"/>
-        <Preset Type="PresetValue" Library="SwaC" Id="8AA654E5"/>
+    <Element Type="Param" Id="AB05714F">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="011C6A3B"/>
     </Element>
-    <Element Type="Param" Id="C4186080">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="4B78BD12"/>
-        <Value>ZExpedition03Objective06</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="FunctionCall" Id="011C6A3B">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="FunctionCall" Id="2B524E87">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="2BD73FFA"/>
-        <Parameter Type="Param" Id="3C501B2C"/>
-        <Parameter Type="Param" Id="AB08515D"/>
-        <Parameter Type="Param" Id="045CBC16"/>
+    <Element Type="Param" Id="9C22DD83">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="2BD73FFA">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="110E6E19"/>
+    <Element Type="Param" Id="F1388307">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="FF76BC3A"/>
     </Element>
-    <Element Type="FunctionCall" Id="110E6E19">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="E671AA18">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="00522CB8"/>
+        <Parameter Type="Param" Id="2F36720B"/>
+        <Parameter Type="Param" Id="776C6837"/>
     </Element>
-    <Element Type="Param" Id="3C501B2C">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition03Objective06</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="00522CB8">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="FF76BC3A"/>
     </Element>
-    <Element Type="Param" Id="AB08515D">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="2F36720B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
     </Element>
-    <Element Type="Param" Id="045CBC16">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="776C6837">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="19830094">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="4E109ECC"/>
+        <Parameter Type="Param" Id="A197F975"/>
+    </Element>
+    <Element Type="Param" Id="4E109ECC">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="FF76BC3A"/>
+    </Element>
+    <Element Type="Param" Id="A197F975">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="9FB4A24D"/>
     </Element>
     <Element Type="FunctionCall" Id="6335E24E">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -55446,7 +55565,6 @@
         <Item Type="Trigger" Id="B04F52F2"/>
     </Element>
     <Element Type="Variable" Id="C997C609">
-        <Identifier>objectiveDestroyDominionBase32222</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -55461,7 +55579,9 @@
         <Action Type="Comment" Id="F83D46B1"/>
         <Action Type="FunctionCall" Id="81070B84"/>
         <Action Type="FunctionCall" Id="637D553E"/>
-        <Action Type="FunctionCall" Id="F16D40FB"/>
+        <Action Type="FunctionCall" Id="C0634C03"/>
+        <Action Type="FunctionCall" Id="C93F5D0F"/>
+        <Action Type="FunctionCall" Id="1A802C6F"/>
         <Action Type="FunctionCall" Id="539BD565"/>
     </Element>
     <Element Type="FunctionCall" Id="4C7D6658">
@@ -55541,34 +55661,58 @@
     <Element Type="FunctionCall" Id="D86D1E0D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="F16D40FB">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="590F9219"/>
-        <Parameter Type="Param" Id="79728FC9"/>
-        <Parameter Type="Param" Id="52752BF1"/>
-        <Parameter Type="Param" Id="4DB24B8E"/>
+    <Element Type="FunctionCall" Id="C0634C03">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="F9589BA5"/>
+        <Parameter Type="Param" Id="702EA52F"/>
+        <Parameter Type="Param" Id="A342D7F8"/>
     </Element>
-    <Element Type="Param" Id="590F9219">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="FC275D83"/>
+    <Element Type="Param" Id="F9589BA5">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="30B8108E"/>
     </Element>
-    <Element Type="FunctionCall" Id="FC275D83">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="30B8108E">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="79728FC9">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition03Objective07</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="702EA52F">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="52752BF1">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="A342D7F8">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="C997C609"/>
     </Element>
-    <Element Type="Param" Id="4DB24B8E">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="FunctionCall" Id="C93F5D0F">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="7B188E3A"/>
+        <Parameter Type="Param" Id="9A15B9CF"/>
+        <Parameter Type="Param" Id="DDB5492B"/>
+    </Element>
+    <Element Type="Param" Id="7B188E3A">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="C997C609"/>
+    </Element>
+    <Element Type="Param" Id="9A15B9CF">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="DDB5492B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="1A802C6F">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="C0C594A8"/>
+        <Parameter Type="Param" Id="A848D1AD"/>
+    </Element>
+    <Element Type="Param" Id="C0C594A8">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="C997C609"/>
+    </Element>
+    <Element Type="Param" Id="A848D1AD">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="539BD565">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -55862,7 +56006,6 @@
         <Item Type="Trigger" Id="2E28A9D0"/>
     </Element>
     <Element Type="Variable" Id="61AA8DD3">
-        <Identifier>objectiveDestroyDominionBase323</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -55872,14 +56015,28 @@
         <Preset Type="PresetValue" Library="Ntve" Id="91651C80"/>
     </Element>
     <Element Type="Trigger" Id="70D25564">
+        <Variable Type="Variable" Id="35A8DA35"/>
         <Condition Type="FunctionCall" Id="5882767E"/>
         <Action Type="FunctionCall" Id="5B124A0E"/>
         <Action Type="Comment" Id="B67E705C"/>
         <Action Type="FunctionCall" Id="4AA869AB"/>
         <Action Type="FunctionCall" Id="02D738F8"/>
-        <Action Type="FunctionCall" Id="F272C11A"/>
+        <Action Type="FunctionCall" Id="8C6872D1"/>
+        <Action Type="FunctionCall" Id="300AC10E"/>
+        <Action Type="FunctionCall" Id="3D879C8A"/>
+        <Action Type="FunctionCall" Id="457D81A0"/>
         <Action Type="FunctionCall" Id="C67F2205"/>
     </Element>
+    <Element Type="Variable" Id="35A8DA35">
+        <VariableType>
+            <Type Value="preset"/>
+            <TypeElement Type="Preset" Library="5BD4895D" Id="41ABCC70"/>
+        </VariableType>
+        <Value Type="Param" Id="F44F487E"/>
+    </Element>
+    <Element Type="Param" Id="F44F487E">
+        <Preset Type="PresetValue" Library="5BD4895D" Id="4D047463"/>
+    </Element>
     <Element Type="FunctionCall" Id="5882767E">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
         <Parameter Type="Param" Id="4EE54A72"/>
@@ -55957,34 +56114,71 @@
     <Element Type="FunctionCall" Id="60A856F3">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="F272C11A">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="BB0FEFC5"/>
-        <Parameter Type="Param" Id="9C552CA0"/>
-        <Parameter Type="Param" Id="9796C3A6"/>
-        <Parameter Type="Param" Id="B4EADB21"/>
+    <Element Type="FunctionCall" Id="8C6872D1">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="28EF8058"/>
+        <Parameter Type="Param" Id="13049ABF"/>
+        <Parameter Type="Param" Id="17B7E34F"/>
     </Element>
-    <Element Type="Param" Id="BB0FEFC5">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="6257D253"/>
+    <Element Type="Param" Id="28EF8058">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="FCBE8B3B"/>
     </Element>
-    <Element Type="FunctionCall" Id="6257D253">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="FCBE8B3B">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="9C552CA0">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition03Objective010</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="13049ABF">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="9796C3A6">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="17B7E34F">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="61AA8DD3"/>
     </Element>
-    <Element Type="Param" Id="B4EADB21">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="FunctionCall" Id="300AC10E">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="A007F3B0"/>
+        <Parameter Type="Param" Id="BE721746"/>
+        <Parameter Type="Param" Id="756BDAE5"/>
+    </Element>
+    <Element Type="Param" Id="A007F3B0">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="61AA8DD3"/>
+    </Element>
+    <Element Type="Param" Id="BE721746">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="756BDAE5">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Variable Type="Variable" Id="35A8DA35"/>
+    </Element>
+    <Element Type="FunctionCall" Id="3D879C8A">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="23DC7B3A"/>
+        <Parameter Type="Param" Id="E53379D1"/>
+    </Element>
+    <Element Type="Param" Id="23DC7B3A">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="61AA8DD3"/>
+    </Element>
+    <Element Type="Param" Id="E53379D1">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="3EB811BE"/>
+    </Element>
+    <Element Type="FunctionCall" Id="457D81A0">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="23AFB1DD"/>
+        <Parameter Type="Param" Id="4E8AE4EA"/>
+    </Element>
+    <Element Type="Param" Id="23AFB1DD">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="61AA8DD3"/>
+    </Element>
+    <Element Type="Param" Id="4E8AE4EA">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="C67F2205">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -62255,10 +62449,8 @@
         <Action Type="Comment" Id="1087AA30"/>
         <Action Type="FunctionCall" Id="F477DF61"/>
         <Action Type="FunctionCall" Id="563F3270"/>
-        <Action Type="FunctionCall" Id="CF348F41"/>
-        <Action Type="FunctionCall" Id="2C68A760"/>
-        <Action Type="FunctionCall" Id="65C5E29D"/>
-        <Action Type="FunctionCall" Id="FE603BA3"/>
+        <Action Type="FunctionCall" Id="E94C877E"/>
+        <Action Type="FunctionCall" Id="B1798BE4"/>
         <Action Type="FunctionCall" Id="233D336F"/>
         <Action Type="FunctionCall" Id="C4785068"/>
         <Action Type="FunctionCall" Id="47AB80E2"/>
@@ -62851,47 +63043,31 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000315"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000113"/>
     </Element>
-    <Element Type="FunctionCall" Id="CF348F41">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="AFCC69E0"/>
-        <Parameter Type="Param" Id="9B630875"/>
+    <Element Type="FunctionCall" Id="E94C877E">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="91564D8C"/>
+        <Parameter Type="Param" Id="D49F59B3"/>
     </Element>
-    <Element Type="Param" Id="AFCC69E0">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
+    <Element Type="Param" Id="91564D8C">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="D44CE85D"/>
     </Element>
-    <Element Type="Param" Id="9B630875">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000561"/>
-    </Element>
-    <Element Type="FunctionCall" Id="2C68A760">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="15BCF3BB"/>
-        <Parameter Type="Param" Id="45A31FD9"/>
-    </Element>
-    <Element Type="Param" Id="45A31FD9">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="04ED211A"/>
-        <Variable Type="Variable" Id="D44CE85D"/>
+    <Element Type="Param" Id="D49F59B3">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="FunctionCall" Id="65C5E29D">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="ADE94129"/>
-        <Parameter Type="Param" Id="EF1A2E18"/>
+    <Element Type="FunctionCall" Id="B1798BE4">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="07BC1323"/>
+        <Parameter Type="Param" Id="AAD4E1C0"/>
     </Element>
-    <Element Type="Param" Id="ADE94129">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
+    <Element Type="Param" Id="07BC1323">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="FF76BC3A"/>
     </Element>
-    <Element Type="Param" Id="EF1A2E18">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000561"/>
-    </Element>
-    <Element Type="FunctionCall" Id="FE603BA3">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="15BCF3BB"/>
-        <Parameter Type="Param" Id="87EC4980"/>
-    </Element>
-    <Element Type="Param" Id="87EC4980">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="04ED211A"/>
-        <Variable Type="Variable" Id="FF76BC3A"/>
+    <Element Type="Param" Id="AAD4E1C0">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
     <Element Type="FunctionCall" Id="233D336F">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000077"/>
@@ -67803,12 +67979,424 @@
         <Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
     </Element>
     <Element Type="Category" Id="CB6CA4CF">
+        <Item Type="Category" Id="CE426FE2"/>
+        <Item Type="Category" Id="1D447984"/>
         <Item Type="Category" Id="429C0F2A"/>
         <Item Type="Trigger" Id="46C51841"/>
         <Item Type="Trigger" Id="9583F73F"/>
         <Item Type="Trigger" Id="A20AC5B4"/>
         <Item Type="Trigger" Id="DAC04F15"/>
     </Element>
+    <Element Type="Category" Id="CE426FE2">
+        <Item Type="Variable" Id="23A5609A"/>
+        <Item Type="Variable" Id="0B503917"/>
+        <Item Type="Trigger" Id="C3162B09"/>
+        <Item Type="Trigger" Id="901C81A5"/>
+    </Element>
+    <Element Type="Variable" Id="23A5609A">
+        <VariableType>
+            <Type Value="objective"/>
+        </VariableType>
+        <Value Type="Param" Id="025F28EE"/>
+    </Element>
+    <Element Type="Param" Id="025F28EE">
+        <Preset Type="PresetValue" Library="Ntve" Id="91651C80"/>
+    </Element>
+    <Element Type="Variable" Id="0B503917">
+        <VariableType>
+            <Type Value="int"/>
+        </VariableType>
+        <Value Type="Param" Id="33EE2D08"/>
+    </Element>
+    <Element Type="Param" Id="33EE2D08">
+        <Value>0</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Trigger" Id="C3162B09">
+        <Variable Type="Variable" Id="5A60443F"/>
+        <Condition Type="FunctionCall" Id="660C195A"/>
+        <Action Type="FunctionCall" Id="68587DC0"/>
+        <Action Type="Comment" Id="3A97F90C"/>
+        <Action Type="FunctionCall" Id="198992D1"/>
+        <Action Type="FunctionCall" Id="9D3F8736"/>
+        <Action Type="FunctionCall" Id="05622A8E"/>
+        <Action Type="FunctionCall" Id="967A8AEB"/>
+        <Action Type="FunctionCall" Id="9A41A40B"/>
+        <Action Type="FunctionCall" Id="369D7667"/>
+        <Action Type="FunctionCall" Id="57EC8BE0"/>
+    </Element>
+    <Element Type="Variable" Id="5A60443F">
+        <VariableType>
+            <Type Value="preset"/>
+            <TypeElement Type="Preset" Library="5BD4895D" Id="41ABCC70"/>
+        </VariableType>
+        <Value Type="Param" Id="8A4A5309"/>
+    </Element>
+    <Element Type="Param" Id="8A4A5309">
+        <Preset Type="PresetValue" Library="5BD4895D" Id="61BC986C"/>
+    </Element>
+    <Element Type="FunctionCall" Id="660C195A">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <Parameter Type="Param" Id="377703BA"/>
+        <Parameter Type="Param" Id="993FD9C9"/>
+        <Parameter Type="Param" Id="A61A183D"/>
+    </Element>
+    <Element Type="Param" Id="377703BA">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="F081EFC1"/>
+    </Element>
+    <Element Type="FunctionCall" Id="F081EFC1">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000112"/>
+        <Parameter Type="Param" Id="7DD1DD10"/>
+    </Element>
+    <Element Type="Param" Id="7DD1DD10">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000178"/>
+        <FunctionCall Type="FunctionCall" Id="12755857"/>
+    </Element>
+    <Element Type="FunctionCall" Id="12755857">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000217"/>
+    </Element>
+    <Element Type="Param" Id="993FD9C9">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="A61A183D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>true</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="FunctionCall" Id="68587DC0">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="082ED038"/>
+        <Parameter Type="Param" Id="4F1CFBBB"/>
+    </Element>
+    <Element Type="Param" Id="082ED038">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <FunctionCall Type="FunctionCall" Id="0C4C3290"/>
+    </Element>
+    <Element Type="FunctionCall" Id="0C4C3290">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000217"/>
+    </Element>
+    <Element Type="Param" Id="4F1CFBBB">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
+    <Element Type="Comment" Id="3A97F90C">
+        <Comment>
+            Create the objective
+        </Comment>
+    </Element>
+    <Element Type="FunctionCall" Id="198992D1">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="1D6F1270"/>
+        <Parameter Type="Param" Id="6CBC6F68"/>
+        <Parameter Type="Param" Id="73A575C2"/>
+        <Parameter Type="Param" Id="CC8E3F6D"/>
+        <Parameter Type="Param" Id="0F4B4616"/>
+    </Element>
+    <Element Type="Param" Id="6CBC6F68">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="064A402E"/>
+        <ValueType Type="text"/>
+    </Element>
+    <Element Type="Param" Id="73A575C2">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="BD92541B"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000561"/>
+    </Element>
+    <Element Type="Param" Id="CC8E3F6D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="E2D11CC0"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="0274B308"/>
+    </Element>
+    <Element Type="Param" Id="0F4B4616">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="3D400D51"/>
+        <ValueType Type="text"/>
+    </Element>
+    <Element Type="FunctionCall" Id="9D3F8736">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+        <Parameter Type="Param" Id="9CB71181"/>
+        <Parameter Type="Param" Id="ED0A93FE"/>
+    </Element>
+    <Element Type="Param" Id="9CB71181">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+        <Variable Type="Variable" Id="23A5609A"/>
+    </Element>
+    <Element Type="Param" Id="ED0A93FE">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+        <FunctionCall Type="FunctionCall" Id="BC93F28C"/>
+    </Element>
+    <Element Type="FunctionCall" Id="BC93F28C">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    </Element>
+    <Element Type="FunctionCall" Id="05622A8E">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="F5216140"/>
+        <Parameter Type="Param" Id="6CAE49D4"/>
+        <Parameter Type="Param" Id="DE1C97AA"/>
+        <Parameter Type="Param" Id="881069CC"/>
+        <Parameter Type="Param" Id="31FFFF96"/>
+        <Parameter Type="Param" Id="5310566B"/>
+    </Element>
+    <Element Type="Param" Id="F5216140">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
+        <Variable Type="Variable" Id="23A5609A"/>
+    </Element>
+    <Element Type="Param" Id="6CAE49D4">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
+        <ValueType Type="string"/>
+    </Element>
+    <Element Type="Param" Id="DE1C97AA">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
+        <Variable Type="Variable" Id="0B503917"/>
+    </Element>
+    <Element Type="Param" Id="881069CC">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
+        <Value>2</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Param" Id="31FFFF96">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="5310566B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Variable Type="Variable" Id="5A60443F"/>
+    </Element>
+    <Element Type="FunctionCall" Id="967A8AEB">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="79C3E7CE"/>
+        <Parameter Type="Param" Id="F30BE8A6"/>
+    </Element>
+    <Element Type="Param" Id="79C3E7CE">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="23A5609A"/>
+    </Element>
+    <Element Type="Param" Id="F30BE8A6">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="DD3F0AE2"/>
+    </Element>
+    <Element Type="FunctionCall" Id="9A41A40B">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="8B79C23F"/>
+        <Parameter Type="Param" Id="AD1BF937"/>
+    </Element>
+    <Element Type="Param" Id="8B79C23F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="23A5609A"/>
+    </Element>
+    <Element Type="Param" Id="AD1BF937">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="A6FD24B6"/>
+    </Element>
+    <Element Type="FunctionCall" Id="369D7667">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="65E09825"/>
+        <Parameter Type="Param" Id="D9069A15"/>
+    </Element>
+    <Element Type="Param" Id="65E09825">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="23A5609A"/>
+    </Element>
+    <Element Type="Param" Id="D9069A15">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    </Element>
+    <Element Type="FunctionCall" Id="57EC8BE0">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
+        <Parameter Type="Param" Id="47E2C519"/>
+        <Parameter Type="Param" Id="CA77BC00"/>
+    </Element>
+    <Element Type="Param" Id="47E2C519">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000420"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000012"/>
+    </Element>
+    <Element Type="Param" Id="CA77BC00">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000419"/>
+        <Variable Type="Variable" Library="SwaC" Id="DBF95DBE"/>
+    </Element>
+    <Element Type="Trigger" Id="901C81A5">
+        <Condition Type="FunctionCall" Id="5ABCBB73"/>
+        <Action Type="FunctionCall" Id="245C72A9"/>
+        <Action Type="Comment" Id="8E57AD4C"/>
+        <Action Type="FunctionCall" Id="850D3444"/>
+        <Action Type="Comment" Id="4FD19DC2"/>
+        <Action Type="FunctionCall" Id="E0D63792"/>
+        <Action Type="FunctionCall" Id="4F2C8CCB"/>
+    </Element>
+    <Element Type="FunctionCall" Id="5ABCBB73">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <Parameter Type="Param" Id="7D52B69E"/>
+        <Parameter Type="Param" Id="146624F3"/>
+        <Parameter Type="Param" Id="0CF4B404"/>
+    </Element>
+    <Element Type="Param" Id="7D52B69E">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="A3E70ADB"/>
+    </Element>
+    <Element Type="FunctionCall" Id="A3E70ADB">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000112"/>
+        <Parameter Type="Param" Id="5241B6B9"/>
+    </Element>
+    <Element Type="Param" Id="5241B6B9">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000178"/>
+        <FunctionCall Type="FunctionCall" Id="F8DDE724"/>
+    </Element>
+    <Element Type="FunctionCall" Id="F8DDE724">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000217"/>
+    </Element>
+    <Element Type="Param" Id="146624F3">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="0CF4B404">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>true</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="FunctionCall" Id="245C72A9">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="685F6510"/>
+        <Parameter Type="Param" Id="D648943A"/>
+    </Element>
+    <Element Type="Param" Id="685F6510">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <FunctionCall Type="FunctionCall" Id="2514FD40"/>
+    </Element>
+    <Element Type="FunctionCall" Id="2514FD40">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000217"/>
+    </Element>
+    <Element Type="Param" Id="D648943A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
+    <Element Type="Comment" Id="8E57AD4C">
+        <Comment>
+            Ensure that the objective exists
+        </Comment>
+    </Element>
+    <Element Type="FunctionCall" Id="850D3444">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
+        <Parameter Type="Param" Id="7C181B2D"/>
+        <Parameter Type="Param" Id="A3DBF16A"/>
+        <Parameter Type="Param" Id="0BA174F8"/>
+    </Element>
+    <Element Type="Param" Id="7C181B2D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000183"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000065"/>
+    </Element>
+    <Element Type="Param" Id="A3DBF16A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000184"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000068"/>
+    </Element>
+    <Element Type="Param" Id="0BA174F8">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000182"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="C3162B09"/>
+    </Element>
+    <Element Type="Comment" Id="4FD19DC2">
+        <Comment>
+            Update the objective
+        </Comment>
+    </Element>
+    <Element Type="FunctionCall" Id="E0D63792">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="2FBF241F"/>
+        <Parameter Type="Param" Id="26909F98"/>
+    </Element>
+    <Element Type="Param" Id="26909F98">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FBD88837"/>
+        <Variable Type="Variable" Id="23A5609A"/>
+    </Element>
+    <Element Type="FunctionCall" Id="4F2C8CCB">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
+        <Parameter Type="Param" Id="04DEF567"/>
+        <Parameter Type="Param" Id="1E61C09D"/>
+    </Element>
+    <Element Type="Param" Id="04DEF567">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000420"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000012"/>
+    </Element>
+    <Element Type="Param" Id="1E61C09D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000419"/>
+        <Variable Type="Variable" Library="SwaC" Id="DBF95DBE"/>
+    </Element>
+    <Element Type="Category" Id="1D447984">
+        <Item Type="Variable" Id="3EB811BE"/>
+        <Item Type="Variable" Id="3E67DB73"/>
+        <Item Type="Variable" Id="DD3F0AE2"/>
+        <Item Type="Variable" Id="A6FD24B6"/>
+        <Item Type="Variable" Id="5B46955F"/>
+        <Item Type="Variable" Id="9FB4A24D"/>
+    </Element>
+    <Element Type="Variable" Id="3EB811BE">
+        <Identifier>LOCATION_ID_INFEST_GIANT_URSADON</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="7B1C0FC4"/>
+    </Element>
+    <Element Type="Param" Id="7B1C0FC4">
+        <Value>1</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="3E67DB73">
+        <Identifier>LOCATION_ID_FIRST_NIADRA_EVOLUTION</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="D1EAA84C"/>
+    </Element>
+    <Element Type="Param" Id="D1EAA84C">
+        <Value>2</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="DD3F0AE2">
+        <Identifier>LOCATION_ID_SECOND_NIADRA_EVOLUTION</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="509E744D"/>
+    </Element>
+    <Element Type="Param" Id="509E744D">
+        <Value>3</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="A6FD24B6">
+        <Identifier>LOCATION_ID_THIRD_NIADRA_EVOLUTION</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="F2F79C87"/>
+    </Element>
+    <Element Type="Param" Id="F2F79C87">
+        <Value>4</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="5B46955F">
+        <Identifier>LOCATION_ID_WARP_DRIVE</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="E1496226"/>
+    </Element>
+    <Element Type="Param" Id="E1496226">
+        <Value>5</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="9FB4A24D">
+        <Identifier>LOCATION_ID_STASIS_QUADRANT</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="600D88CA"/>
+    </Element>
+    <Element Type="Param" Id="600D88CA">
+        <Value>6</Value>
+        <ValueType Type="int"/>
+    </Element>
     <Element Type="Category" Id="429C0F2A">
         <Item Type="Trigger" Id="17262B9F"/>
         <Item Type="Trigger" Id="94DA8019"/>
@@ -68169,7 +68757,7 @@
         <Event Type="FunctionCall" Id="13F1D792"/>
         <Condition Type="FunctionCall" Id="D50B504D"/>
         <Action Type="FunctionCall" Id="5ED64AC9"/>
-        <Action Type="FunctionCall" Id="FA826CBE"/>
+        <Action Type="FunctionCall" Id="419FC7B8"/>
     </Element>
     <Element Type="FunctionCall" Id="13F1D792">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="6D565EB4"/>
@@ -68228,14 +68816,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="FA826CBE">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="B8A976F6"/>
+    <Element Type="FunctionCall" Id="419FC7B8">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="59E252F4"/>
     </Element>
-    <Element Type="Param" Id="B8A976F6">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>1</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="59E252F4">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="3EB811BE"/>
     </Element>
     <Element Type="Trigger" Id="DAC04F15">
         <Variable Type="Variable" Id="AF263D54"/>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers.version
index a7f61d74e607fdcee57c923cadc552502717efcc..4b1af2ffc69e88385ee6064ac06398ef89d06a70 100644
GIT binary patch
literal 44
ocmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#2|hvke2i5Nn-@k0IsYCPyhe`

literal 44
pcmYdJNi9y#EGl7QU|^6)U}Rtg(jdSM#2|hhkk-6=IF%7d0|2rn2L}KE

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
index 69593c4f8..7e0d42ff9 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -11,6 +11,7 @@ MapInfo/Player05/Name=Hostile
 Param/Expression/4445BE7B=~A~
 Param/Value/02C35B1A=Destroy this to disable a nearby Force Field.
 Param/Value/0EB5D646=Biomass Collected
+Param/Value/0F4B4616=Grow even stronger
 Param/Value/1125924E=Lowest Escape Pod Time
 Param/Value/15916EF9=<s val="Kicker_Zerg">+75 Biomass</s>
 Param/Value/1893818B=Countdown: 
@@ -22,7 +23,6 @@ Param/Value/2BE39A32=Broodmother
 Param/Value/2F97BD64=Zergling Kills
 Param/Value/38AF6832=Move the Larva onto this Beacon.
 Param/Value/3E937DF7=Anniversary_ZExpedition03 granted
-Param/Value/3EFBAEBF=remaining
 Param/Value/42CC902F=Get To Safety
 Param/Value/457C3CD3=Move Niadra Here
 Param/Value/4B5DC244=Vent Access
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index e37e77583..136c758c7 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -4,6 +4,7 @@ Category/Name/076F90FA=Primary Objective - Destroy the Warp Drive
 Category/Name/10C7C620=Part 4 (Stasis Quadrant)
 Category/Name/1941F0D5======== OBJECTIVES =======
 Category/Name/197357EB=Midgame Cinematic
+Category/Name/1D447984=Location IDs
 Category/Name/38CAB7C5======== GAMEPLAY =======
 Category/Name/3A4135FD=Victory/Defeat
 Category/Name/3E14F489=Starting Sequence
@@ -32,6 +33,7 @@ Category/Name/C52BD72A=Tips
 Category/Name/CB6CA4CF======== ARCHIPELAGO =======
 Category/Name/CB89B1F2=Stats & Achievements
 Category/Name/CDF08ABD=Steam Vents
+Category/Name/CE426FE2=Custom Objectives
 Category/Name/CF0772E0=Part 1 (Larval Queen)
 Category/Name/DAF284C0=Bonus Objective - Infest the Giant Ursadon
 Category/Name/E8BEF289=Primary Objective - Grow
@@ -170,6 +172,7 @@ Trigger/Name/8BDFB951=Second Zealot Patrol Path
 Trigger/Name/8C8CA969=Mid Music
 Trigger/Name/8F0DDC37=Transmission - P3 - First Force Field Open Q
 Trigger/Name/8F547A6F=Larval Queen Reveal First Room
+Trigger/Name/901C81A5=Objective GrowMore Complete
 Trigger/Name/93000F72=Morph to Swarm Queen Complete
 Trigger/Name/94DA8019=onDifficultyNormal
 Trigger/Name/9539EECA=Turn off Grow to Huge Queen Blinky
@@ -220,6 +223,7 @@ Trigger/Name/C056FE49=Objective Destroy Escape Pods Create Q
 Trigger/Name/C06A7B2B=Mid Q
 Trigger/Name/C07DB8AC=Protoss Reaction in Resource Chamber
 Trigger/Name/C1EE8B01=Swarm Queen uses Parasitic Invasion
+Trigger/Name/C3162B09=Objective GrowMore Create
 Trigger/Name/C35EFD61=Intro Setup
 Trigger/Name/C38FADB4=Open Door to the Bridge
 Trigger/Name/C39AD6FE=Defeat
@@ -282,6 +286,7 @@ Trigger/Name/FEE6A5B6=Kill Helper Model - Warp Drive Vent Door
 Variable/Name/009E7C4F=VisionGroup
 Variable/Name/014479BE=EscapePodDlgMax
 Variable/Name/03F7FA70=currentUnit
+Variable/Name/0B503917=AdditionalGrows
 Variable/Name/0DBEE3C5=Stalker03
 Variable/Name/0E6C12D3=actor
 Variable/Name/0EAF9E3B=SentryTopPosition
@@ -301,9 +306,11 @@ Variable/Name/1C29105A=Stalker02
 Variable/Name/1F29C197=EscapePodTimes
 Variable/Name/207339CD=MidStasisSound
 Variable/Name/212F49C7=HydraliskKills
+Variable/Name/23A5609A=ObjectiveGrowMore
 Variable/Name/26F81928=SentryBottomPosition
 Variable/Name/3016E2BD=EscapePodShields
 Variable/Name/31A80675=WarpDrivePing
+Variable/Name/35A8DA35=category
 Variable/Name/36E595F6=FadeDuration
 Variable/Name/39A3F463=C_Width
 Variable/Name/3A292DE2=SafePlacePing
@@ -311,6 +318,8 @@ Variable/Name/3A429653=ProtossEscapePods
 Variable/Name/3B0867A9=EscapePodLife
 Variable/Name/3BBCA868=SentryLeft
 Variable/Name/3C0662AC=HelperModel_SteamVent
+Variable/Name/3E67DB73=LOCATION_ID_FIRST_NIADRA_EVOLUTION
+Variable/Name/3EB811BE=LOCATION_ID_INFEST_GIANT_URSADON
 Variable/Name/4253F7C7=SwarmQueenLife
 Variable/Name/44B2025A=Sentry01
 Variable/Name/460D40BF=currentUnit
@@ -328,7 +337,9 @@ Variable/Name/56AEB68E=ObjectiveKillProtoss
 Variable/Name/586DFBA4=MidHiddenUnitGroup
 Variable/Name/59444368=ParasiteUsed
 Variable/Name/5961773F=StasisPulses
+Variable/Name/5A60443F=category
 Variable/Name/5AEAEE18=Panel
+Variable/Name/5B46955F=LOCATION_ID_WARP_DRIVE
 Variable/Name/5E1CA16F=LasarraPosition
 Variable/Name/5E56DC65=EscapePodDlgProgressBar
 Variable/Name/5EF841BB=TimeTextTag
@@ -351,10 +362,12 @@ Variable/Name/8C4DE6E7=NumberOfUnitsSpawned
 Variable/Name/8FD95DCD=Zealot02
 Variable/Name/903F390E=IntroWarpSound1
 Variable/Name/9E6C7824=PatrollingZealot
+Variable/Name/9FB4A24D=LOCATION_ID_STASIS_QUADRANT
 Variable/Name/A0F7E071=ZergLeft
 Variable/Name/A1CF9D47=CinematicCompleted
 Variable/Name/A35882B0=HighTemplar
 Variable/Name/A6039410=UrsadonKills
+Variable/Name/A6FD24B6=LOCATION_ID_THIRD_NIADRA_EVOLUTION
 Variable/Name/A7BD8CE4=HelperModel_VentTunnel
 Variable/Name/AF263D54=targetUnit
 Variable/Name/B0E3BE6B=EssenceUnit
@@ -394,6 +407,7 @@ Variable/Name/D7F605A1=LowestTime
 Variable/Name/D98BAA3B=PLAYER_04_PODS
 Variable/Name/DA141920=EscapeExplosionPing
 Variable/Name/DC848B99=Stalker01
+Variable/Name/DD3F0AE2=LOCATION_ID_SECOND_NIADRA_EVOLUTION
 Variable/Name/E1AA5332=ExplosionAngle
 Variable/Name/E1EAFC32=PlayerUnitGroup
 Variable/Name/E28AA3B9=ZergRight
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/ComponentList.SC2Components
index b28fb66b6..ab98366c3 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/ComponentList.SC2Components
+++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/ComponentList.SC2Components
@@ -1,5 +1,6 @@
 <?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/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader
index 9a116928407bbb918ea0297bf1c0d209934bc295..ad719e61b8c7426263cd649d86fd41eefb6fb83c 100644
GIT binary patch
delta 45
tcmewy@;OAs!^k<9gMop;D42nPk(Gg0B9oB;gh61YeB*f#-l*cQ1pw^R3dH~b

delta 45
tcmewy@;OAs!^k<9gMop;D42nPk(Gg$FN2W*ghAj_)%VLFyivtp3jqJ)4GRDO

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy
index 8a03b533a..2e1d55774 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy
@@ -44,6 +44,14 @@ const int gv_pLAYER_05_PROTOSS = 5;
 const int gv_pLAYER_06_PROTOSS = 6;
 const int gv_pLAYER_09_ESSENCE = 9;
 const int gv_pLAYER_10_URSADON = 10;
+const int gv_LOCATION_ID_FIRST_URSADON_MATRIARCH = 1;
+const int gv_LOCATION_ID_NORTH_URSADON_MATRIARCH = 2;
+const int gv_LOCATION_ID_WEST_URSADON_MATRIARCH = 3;
+const int gv_LOCATION_ID_LOST_BROOD = 4;
+const int gv_LOCATION_ID_NORTHEAST_PSILINK_SPIRE = 5;
+const int gv_LOCATION_ID_NORTHWEST_PSILINK_SPIRE = 6;
+const int gv_LOCATION_ID_SOUTHWEST_PSILINK_SPIRE = 7;
+const int gv_LOCATION_ID_NAFASH = 8;
 
 //--------------------------------------------------------------------------------------------------
 // Global Variables
@@ -97,19 +105,19 @@ int gv_unfrozenStructureDestroyed;
 timer gv_speedRunTimer;
 timer gv_completionistTimer;
 int gv_largestZergForce;
-int gv_objectiveDestroyDominionBase3;
+int gv_objectiveCollectUrsadonEssence;
 int gv_ursadonEssence_Collected;
 int gv_ursadonEssence_Needed;
-int gv_objectiveDestroyDominionBase;
-int gv_objectiveDestroyDominionBase22;
+int gv_objectiveRecoverLostBrood;
+int gv_objectiveDestroyPsiLinkSpires;
 int gv_psiLinkSpiresDestroyed;
-int gv_objectiveRescueBrood;
+int gv_objectiveKillUrsadonMatriarchs;
 int gv_matriarchsKilled;
 int gv_ursadonMatriarchPingWest;
 int gv_ursadonMatriarchPingNorth;
 bool gv_aPNorthMatriarch;
 bool gv_aPSouthMatriarch;
-int gv_objectiveDestroyDominionBase2;
+int gv_objectiveFindNafashCorpse;
 bool gv_cinematicCompleted;
 unitgroup gv_cinematicTempUnits;
 unitgroup gv_cinematicHiddenUnits;
@@ -141,14 +149,14 @@ void InitGlobals () {
     gv_firstZealotAttackGroup = UnitGroupEmpty();
     gv_speedRunTimer = TimerCreate();
     gv_completionistTimer = TimerCreate();
-    gv_objectiveDestroyDominionBase3 = c_invalidObjectiveId;
+    gv_objectiveCollectUrsadonEssence = c_invalidObjectiveId;
     gv_ursadonEssence_Needed = 1;
-    gv_objectiveDestroyDominionBase = c_invalidObjectiveId;
-    gv_objectiveDestroyDominionBase22 = c_invalidObjectiveId;
-    gv_objectiveRescueBrood = c_invalidObjectiveId;
+    gv_objectiveRecoverLostBrood = c_invalidObjectiveId;
+    gv_objectiveDestroyPsiLinkSpires = c_invalidObjectiveId;
+    gv_objectiveKillUrsadonMatriarchs = c_invalidObjectiveId;
     gv_ursadonMatriarchPingWest = c_invalidPingId;
     gv_ursadonMatriarchPingNorth = c_invalidPingId;
-    gv_objectiveDestroyDominionBase2 = c_invalidObjectiveId;
+    gv_objectiveFindNafashCorpse = c_invalidObjectiveId;
     gv_cinematicTempUnits = UnitGroupEmpty();
     gv_cinematicHiddenUnits = UnitGroupEmpty();
     gv_victoryHiddenUnitGroup = UnitGroupEmpty();
@@ -1993,7 +2001,7 @@ bool gt_StartGameStage2Q_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(4);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_LOST_BROOD);
     if ((libHots_gf_DifficultyValueInt2(1, 1, 0) == 1)) {
     }
 
@@ -3714,7 +3722,7 @@ bool gt_FlashFreezeEndingRandomQ_Func (bool testConds, bool runActions) {
     lv_randomLine = RandomInt(1, 4);
     TriggerQueueEnter();
     libSwaC_gf_SetAllSoundChannelVolumesCampaign(libSwaC_ge_VolumeChannelModeCampaign_Speech);
-    if ((gv_flashFreezeRetreatLineDelivered == false) && ((ObjectiveGetState(gv_objectiveDestroyDominionBase3) == c_objectiveStateCompleted) || (ObjectiveGetState(gv_objectiveDestroyDominionBase3) == c_objectiveStateHidden))) {
+    if ((gv_flashFreezeRetreatLineDelivered == false) && ((ObjectiveGetState(gv_objectiveCollectUrsadonEssence) == c_objectiveStateCompleted) || (ObjectiveGetState(gv_objectiveCollectUrsadonEssence) == c_objectiveStateHidden))) {
         lv_deliverRetreatLine = gf_FlashFreezeRetreat();
     }
 
@@ -4226,7 +4234,7 @@ bool gt_PsiLinkSpireDestroyed_Func (bool testConds, bool runActions) {
     TriggerExecute(gt_ObjectiveDestroyPsiLinkSpiresUpdate, true, false);
     TriggerExecute(gt_CreatePingPsiLinkSpire0203, true, false);
     if ((EventUnit() == UnitFromId(7))) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(5);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHEAST_PSILINK_SPIRE);
         PingDestroy(gv_pingSpire01);
         gv_pingSpire01 = c_invalidPingId;
         UnitRemove(UnitFromId(1226));
@@ -4235,7 +4243,7 @@ bool gt_PsiLinkSpireDestroyed_Func (bool testConds, bool runActions) {
     }
 
     if ((EventUnit() == UnitFromId(5))) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(6);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHWEST_PSILINK_SPIRE);
         PingDestroy(gv_pingSpire02);
         gv_pingSpire02 = c_invalidPingId;
         UnitRemove(UnitFromId(1227));
@@ -4244,7 +4252,7 @@ bool gt_PsiLinkSpireDestroyed_Func (bool testConds, bool runActions) {
     }
 
     if ((EventUnit() == UnitFromId(6))) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(7);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_PSILINK_SPIRE);
         PingDestroy(gv_pingSpire03);
         gv_pingSpire03 = c_invalidPingId;
         UnitRemove(UnitFromId(1228));
@@ -4933,7 +4941,7 @@ bool gt_TransmissionKerriganFindsDeadQueenQ_Func (bool testConds, bool runAction
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(8);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NAFASH);
     TriggerExecute(gt_ObjectiveFindNafashCorpseComplete, true, false);
     TriggerQueueEnter();
     libSwaC_gf_PingMinimapCampaign(PlayerGroupAll(), UnitGetPosition(UnitFromId(18)), 2.0, Color(100.00, 100.00, 0.00));
@@ -6339,11 +6347,11 @@ bool gt_AchievementCompletionistRunH_Func (bool testConds, bool runActions) {
             return false;
         }
 
-        if (!((ObjectiveGetState(gv_objectiveDestroyDominionBase22) == c_objectiveStateCompleted))) {
+        if (!((ObjectiveGetState(gv_objectiveDestroyPsiLinkSpires) == c_objectiveStateCompleted))) {
             return false;
         }
 
-        if (!((ObjectiveGetState(gv_objectiveRescueBrood) == c_objectiveStateCompleted))) {
+        if (!((ObjectiveGetState(gv_objectiveKillUrsadonMatriarchs) == c_objectiveStateCompleted))) {
             return false;
         }
 
@@ -6522,7 +6530,7 @@ bool gt_VictoryPsiLinkSpiresDestroyed_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory);
     TriggerExecute(gt_VictorySequence, true, false);
     return true;
 }
@@ -6578,7 +6586,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) {
     TriggerEnable(TriggerGetCurrent(), false);
     UnitPauseAll(true);
     AITimePause(true);
-    if ((ObjectiveGetState(gv_objectiveDestroyDominionBase22) == c_objectiveStateCompleted)) {
+    if ((ObjectiveGetState(gv_objectiveDestroyPsiLinkSpires) == c_objectiveStateCompleted)) {
         libSwaC_gf_CampaignAwardAchievement("ZKaldir01_1", gv_pLAYER_01_USER);
     }
 
@@ -6722,8 +6730,11 @@ bool gt_ObjectiveCollectUrsadonEssenceCreate_Func (bool testConds, bool runActio
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition01Objective2");
-    gv_objectiveDestroyDominionBase3 = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition01Objective2", "", gv_ursadonEssence_Collected);
+    gv_objectiveCollectUrsadonEssence = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveCollectUrsadonEssence, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveCollectUrsadonEssence, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveCollectUrsadonEssence, gv_LOCATION_ID_FIRST_URSADON_MATRIARCH);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveCollectUrsadonEssence, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6752,7 +6763,7 @@ bool gt_ObjectiveCollectUrsadonEssenceComplete_Func (bool testConds, bool runAct
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveCollectUrsadonEssenceCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase3);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveCollectUrsadonEssence);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6781,7 +6792,7 @@ bool gt_ObjectiveCollectUrsadonEssenceFailed_Func (bool testConds, bool runActio
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveCollectUrsadonEssenceCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase3);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveCollectUrsadonEssence);
     return true;
 }
 
@@ -6809,8 +6820,11 @@ bool gt_ObjectiveRecoverLostBroodCreate_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition01Objective1");
-    gv_objectiveDestroyDominionBase = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition01Objective1", "", 0);
+    gv_objectiveRecoverLostBrood = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveRecoverLostBrood, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveRecoverLostBrood, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRecoverLostBrood, gv_LOCATION_ID_LOST_BROOD);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveRecoverLostBrood, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6839,7 +6853,7 @@ bool gt_ObjectiveRecoverLostBroodComplete_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveRecoverLostBroodCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRecoverLostBrood);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6868,7 +6882,7 @@ bool gt_ObjectiveRecoverLostBroodFailed_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveRecoverLostBroodCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveRecoverLostBrood);
     return true;
 }
 
@@ -6896,8 +6910,14 @@ bool gt_ObjectiveDestroyPsiLinkSpiresCreate_Func (bool testConds, bool runAction
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition01Objective04");
-    gv_objectiveDestroyDominionBase22 = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition01Objective04", "", gv_psiLinkSpiresDestroyed);
+    gv_objectiveDestroyPsiLinkSpires = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveDestroyPsiLinkSpires, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyPsiLinkSpires, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_psiLinkSpiresDestroyed, 3, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPsiLinkSpires, gv_LOCATION_ID_NORTHEAST_PSILINK_SPIRE);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPsiLinkSpires, gv_LOCATION_ID_NORTHWEST_PSILINK_SPIRE);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPsiLinkSpires, gv_LOCATION_ID_SOUTHWEST_PSILINK_SPIRE);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPsiLinkSpires, lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyPsiLinkSpires, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6925,7 +6945,7 @@ bool gt_ObjectiveDestroyPsiLinkSpiresUpdate_Func (bool testConds, bool runAction
     }
 
     TriggerExecute(gt_ObjectiveDestroyPsiLinkSpiresCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase22, gv_psiLinkSpiresDestroyed);
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyPsiLinkSpires, gv_psiLinkSpiresDestroyed);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6954,8 +6974,8 @@ bool gt_ObjectiveDestroyPsiLinkSpiresComplete_Func (bool testConds, bool runActi
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyPsiLinkSpiresCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase22, gv_psiLinkSpiresDestroyed);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase22);
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyPsiLinkSpires, gv_psiLinkSpiresDestroyed);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyPsiLinkSpires);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6984,7 +7004,7 @@ bool gt_ObjectiveDestroyPsiLinkSpiresFailed_Func (bool testConds, bool runAction
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyPsiLinkSpiresCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase22);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyPsiLinkSpires);
     return true;
 }
 
@@ -6997,7 +7017,13 @@ void gt_ObjectiveDestroyPsiLinkSpiresFailed_Init () {
 // Trigger: Objective Ursadon Matriarchs Create
 //--------------------------------------------------------------------------------------------------
 bool gt_ObjectiveUrsadonMatriarchsCreate_Func (bool testConds, bool runActions) {
+    // Variable Declarations
+    int lv_category;
+
     // Automatic Variable Declarations
+    // Variable Initialization
+    lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary;
+
     // Conditions
     if (testConds) {
         if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
@@ -7012,8 +7038,12 @@ bool gt_ObjectiveUrsadonMatriarchsCreate_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition01Objective05");
-    gv_objectiveRescueBrood = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition01Objective05", "", gv_matriarchsKilled);
+    gv_objectiveKillUrsadonMatriarchs = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveKillUrsadonMatriarchs, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveKillUrsadonMatriarchs, lv_category, "", gv_matriarchsKilled, 2, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillUrsadonMatriarchs, gv_LOCATION_ID_NORTH_URSADON_MATRIARCH);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillUrsadonMatriarchs, gv_LOCATION_ID_WEST_URSADON_MATRIARCH);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKillUrsadonMatriarchs, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7048,7 +7078,7 @@ bool gt_ObjectiveUrsadonMatriarchsUpdate_Func (bool testConds, bool runActions)
         if ((gv_aPSouthMatriarch == false)) {
             gv_aPSouthMatriarch = true;
             PingDestroy(gv_ursadonMatriarchPingWest);
-            lib5BD4895D_gf_AP_Core_sendLocationLocal(3);
+            lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_URSADON_MATRIARCH);
         }
 
     }
@@ -7056,7 +7086,7 @@ bool gt_ObjectiveUrsadonMatriarchsUpdate_Func (bool testConds, bool runActions)
         if ((gv_aPNorthMatriarch == false)) {
             gv_aPNorthMatriarch = true;
             PingDestroy(gv_ursadonMatriarchPingNorth);
-            lib5BD4895D_gf_AP_Core_sendLocationLocal(2);
+            lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTH_URSADON_MATRIARCH);
         }
 
     }
@@ -7065,7 +7095,7 @@ bool gt_ObjectiveUrsadonMatriarchsUpdate_Func (bool testConds, bool runActions)
     TriggerExecute(gt_MatriarchKilledUpgradeZergQ, true, false);
     TriggerExecute(gt_ObjectiveUrsadonMatriarchsCreate, true, false);
     libSwaC_gf_DisplayMissionObjectiveRewardFloatingText(UnitGetPosition(EventUnit()), "ZExpedition01Objective05", gv_pLAYER_01_USER);
-    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescueBrood, gv_matriarchsKilled);
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveKillUrsadonMatriarchs, gv_matriarchsKilled);
     TriggerExecute(gt_ObjectiveUrsadonMatriarchsComplete, true, false);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
@@ -7107,8 +7137,8 @@ bool gt_ObjectiveUrsadonMatriarchsComplete_Func (bool testConds, bool runActions
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveUrsadonMatriarchsCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescueBrood, gv_matriarchsKilled);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescueBrood);
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveKillUrsadonMatriarchs, gv_matriarchsKilled);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKillUrsadonMatriarchs);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7137,7 +7167,7 @@ bool gt_ObjectiveUrsadonMatriarchsFailedQ_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveUrsadonMatriarchsCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveRescueBrood);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveKillUrsadonMatriarchs);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7151,7 +7181,13 @@ void gt_ObjectiveUrsadonMatriarchsFailedQ_Init () {
 // Trigger: Objective Find Nafash Corpse Create
 //--------------------------------------------------------------------------------------------------
 bool gt_ObjectiveFindNafashCorpseCreate_Func (bool testConds, bool runActions) {
+    // Variable Declarations
+    int lv_category;
+
     // Automatic Variable Declarations
+    // Variable Initialization
+    lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra;
+
     // Conditions
     if (testConds) {
         if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
@@ -7165,9 +7201,11 @@ bool gt_ObjectiveFindNafashCorpseCreate_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    ObjectiveCreate(StringExternal("Param/Value/C5DC69B4"), StringToText(""), c_objectiveStateActive, false);
-    gv_objectiveDestroyDominionBase2 = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveSimple(gv_objectiveDestroyDominionBase2);
+    ObjectiveCreate(StringExternal("Param/Value/C5DC69B4"), StringToText(""), c_objectiveStateHidden, false);
+    gv_objectiveFindNafashCorpse = ObjectiveLastCreated();
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveFindNafashCorpse, lv_category, true);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindNafashCorpse, gv_LOCATION_ID_NAFASH);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindNafashCorpse, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7196,7 +7234,7 @@ bool gt_ObjectiveFindNafashCorpseComplete_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveFindNafashCorpseCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase2);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveFindNafashCorpse);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7225,7 +7263,7 @@ bool gt_ObjectiveFindNafashCorpseFailed_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveFindNafashCorpseCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase2);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveFindNafashCorpse);
     return true;
 }
 
@@ -7957,10 +7995,8 @@ bool gt_MidRecoverBroodCleanup_Func (bool testConds, bool runActions) {
     UnitSetPropertyFixed(gv_kerrigan, c_unitPropEnergyPercent, 100.0);
     UIAlertClear(gv_pLAYER_01_USER);
     PingDestroy(gv_pingZergBase);
-    ObjectiveShow(gv_objectiveDestroyDominionBase3, PlayerGroupAll(), false);
-    lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase3);
-    ObjectiveShow(gv_objectiveDestroyDominionBase, PlayerGroupAll(), false);
-    lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveCollectUrsadonEssence, false);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveRecoverLostBrood, false);
     TriggerEnable(gt_DefeatBaseDead, true);
     TriggerEnable(gt_DefeatKerriganDead, false);
     if ((gv_cinematicCompleted == true)) {
@@ -8637,7 +8673,7 @@ bool gt_UrsadonMatriarchFirst_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(1);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_URSADON_MATRIARCH);
     return true;
 }
 
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Preload.xml
index ebb0c2123..df2a879c8 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Preload.xml
+++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Preload.xml
@@ -49,10 +49,6 @@
 <Behavior id="YetiJump"/>
 <Behavior id="FlashFreeze"/>
 <Behavior id="AP_ImmortalShakurasAntiAirMissileDisableAttack"/>
-<Objective id="ZExpedition01Objective2"/>
-<Objective id="ZExpedition01Objective04"/>
-<Objective id="ZExpedition01Objective1"/>
-<Objective id="ZExpedition01Objective05"/>
 <Sound id="UI_BriefingUnitSelect"/>
 <Sound id="UI_TerranRescueUnit"/>
 <Sound id="Ambience_Kaldir_FlashFreeze"/>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers
index 4948eaea5..ad5ff7d72 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers
@@ -9020,7 +9020,7 @@
         <Condition Type="FunctionCall" Id="451E3ACF"/>
         <Condition Type="FunctionCall" Id="FE137623"/>
         <Action Type="FunctionCall" Id="217A0F3E"/>
-        <Action Type="FunctionCall" Id="96D5860B"/>
+        <Action Type="FunctionCall" Id="BC95B246"/>
         <Action Type="FunctionCall" Id="B46EDEB0"/>
         <Action Type="FunctionCall" Id="86B98801"/>
         <Action Type="Comment" Id="60A7C0FC"/>
@@ -9117,14 +9117,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="96D5860B">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="2324664A"/>
+    <Element Type="FunctionCall" Id="BC95B246">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="840E25DA"/>
     </Element>
-    <Element Type="Param" Id="2324664A">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>4</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="840E25DA">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="E5841B91"/>
     </Element>
     <Element Type="FunctionCall" Id="B46EDEB0">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
@@ -27487,7 +27486,7 @@
     </Element>
     <Element Type="FunctionCall" Id="BBBEBADB">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-        <FunctionCall Type="FunctionCall" Id="87040100"/>
+        <FunctionCall Type="FunctionCall" Id="B574555D"/>
         <FunctionCall Type="FunctionCall" Id="42C09D0F"/>
         <FunctionCall Type="FunctionCall" Id="AF9571D2"/>
         <FunctionCall Type="FunctionCall" Id="1EF017B2"/>
@@ -27495,15 +27494,14 @@
         <FunctionCall Type="FunctionCall" Id="F487347B"/>
         <FunctionCall Type="FunctionCall" Id="3D1B126C"/>
     </Element>
-    <Element Type="FunctionCall" Id="87040100">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
+    <Element Type="FunctionCall" Id="B574555D">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        <Parameter Type="Param" Id="C857190F"/>
+        <Parameter Type="Param" Id="D93437BC"/>
     </Element>
-    <Element Type="Param" Id="C857190F">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>5</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="D93437BC">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="5013A472"/>
     </Element>
     <Element Type="FunctionCall" Id="42C09D0F">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="6395B1F2"/>
@@ -27596,7 +27594,7 @@
     </Element>
     <Element Type="FunctionCall" Id="A9DA029B">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-        <FunctionCall Type="FunctionCall" Id="33EFD911"/>
+        <FunctionCall Type="FunctionCall" Id="B6571D5B"/>
         <FunctionCall Type="FunctionCall" Id="E2915F2E"/>
         <FunctionCall Type="FunctionCall" Id="77095D13"/>
         <FunctionCall Type="FunctionCall" Id="B6198E56"/>
@@ -27604,15 +27602,14 @@
         <FunctionCall Type="FunctionCall" Id="93AA83F9"/>
         <FunctionCall Type="FunctionCall" Id="48EAC0F4"/>
     </Element>
-    <Element Type="FunctionCall" Id="33EFD911">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
+    <Element Type="FunctionCall" Id="B6571D5B">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        <Parameter Type="Param" Id="06871393"/>
+        <Parameter Type="Param" Id="032BAD5A"/>
     </Element>
-    <Element Type="Param" Id="06871393">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>6</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="032BAD5A">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="32930D6C"/>
     </Element>
     <Element Type="FunctionCall" Id="E2915F2E">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="6395B1F2"/>
@@ -27705,22 +27702,21 @@
     </Element>
     <Element Type="FunctionCall" Id="9E413678">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-        <FunctionCall Type="FunctionCall" Id="702C89DA"/>
+        <FunctionCall Type="FunctionCall" Id="693C8D8A"/>
         <FunctionCall Type="FunctionCall" Id="0143A939"/>
         <FunctionCall Type="FunctionCall" Id="1808090A"/>
         <FunctionCall Type="FunctionCall" Id="CE74D1D5"/>
         <FunctionCall Type="FunctionCall" Id="3475F546"/>
         <FunctionCall Type="FunctionCall" Id="F2ED481A"/>
     </Element>
-    <Element Type="FunctionCall" Id="702C89DA">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
+    <Element Type="FunctionCall" Id="693C8D8A">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        <Parameter Type="Param" Id="A6E6A348"/>
+        <Parameter Type="Param" Id="214CE8C1"/>
     </Element>
-    <Element Type="Param" Id="A6E6A348">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>7</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="214CE8C1">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="50BAF2D9"/>
     </Element>
     <Element Type="FunctionCall" Id="0143A939">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="6395B1F2"/>
@@ -32389,7 +32385,7 @@
         <Condition Type="FunctionCall" Id="EED82750"/>
         <Condition Type="FunctionCall" Id="DD6D0B05"/>
         <Action Type="FunctionCall" Id="DA295DB2"/>
-        <Action Type="FunctionCall" Id="C8182971"/>
+        <Action Type="FunctionCall" Id="B2B44AC2"/>
         <Action Type="FunctionCall" Id="BCE1603B"/>
         <Action Type="FunctionCall" Id="D00A0D0D"/>
     </Element>
@@ -32606,14 +32602,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="C8182971">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="BFF5ADB6"/>
+    <Element Type="FunctionCall" Id="B2B44AC2">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="6E53AF93"/>
     </Element>
-    <Element Type="Param" Id="BFF5ADB6">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>8</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="6E53AF93">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="3635BF07"/>
     </Element>
     <Element Type="FunctionCall" Id="BCE1603B">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
@@ -43601,7 +43596,7 @@
         <Condition Type="FunctionCall" Id="09BBAC51"/>
         <Condition Type="FunctionCall" Id="CDB85D8F"/>
         <Action Type="FunctionCall" Id="8A6814A1"/>
-        <Action Type="FunctionCall" Id="46EBA66B"/>
+        <Action Type="FunctionCall" Id="50935552"/>
         <Action Type="FunctionCall" Id="71CB21A7"/>
     </Element>
     <Element Type="FunctionCall" Id="09FB8EB9">
@@ -43742,12 +43737,12 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="46EBA66B">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="8B411AD4"/>
+    <Element Type="FunctionCall" Id="50935552">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="CC775280"/>
     </Element>
-    <Element Type="Param" Id="8B411AD4">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
+    <Element Type="Param" Id="CC775280">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
         <Variable Type="Variable" Library="5BD4895D" Id="377FF870"/>
     </Element>
     <Element Type="FunctionCall" Id="71CB21A7">
@@ -44739,7 +44734,6 @@
         <Item Type="Comment" Id="6DE89D5D"/>
     </Element>
     <Element Type="Variable" Id="31895DEC">
-        <Identifier>objectiveDestroyDominionBase3</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -44773,9 +44767,11 @@
         <Action Type="FunctionCall" Id="531AC9ED"/>
         <Action Type="Comment" Id="BD76B63E"/>
         <Action Type="FunctionCall" Id="76187639"/>
-        <Action Type="FunctionCall" Id="E691E15A"/>
         <Action Type="FunctionCall" Id="A6632256"/>
-        <Action Type="FunctionCall" Id="2D599117"/>
+        <Action Type="FunctionCall" Id="E5726E2D"/>
+        <Action Type="FunctionCall" Id="DCC39EA6"/>
+        <Action Type="FunctionCall" Id="5A367A8D"/>
+        <Action Type="FunctionCall" Id="6AE22BC3"/>
         <Action Type="FunctionCall" Id="DBDB1509"/>
     </Element>
     <Element Type="FunctionCall" Id="07D0289A">
@@ -44839,37 +44835,6 @@
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Objective"/>
     </Element>
-    <Element Type="FunctionCall" Id="E691E15A">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="777CA6CE"/>
-        <Parameter Type="Param" Id="F1BFFE4F"/>
-        <Parameter Type="Param" Id="3313549B"/>
-        <Parameter Type="Param" Id="6E56AF22"/>
-        <Parameter Type="Param" Id="1F176B3C"/>
-    </Element>
-    <Element Type="Param" Id="777CA6CE">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective2</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="F1BFFE4F">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Variable Type="Variable" Id="22407D3B"/>
-    </Element>
-    <Element Type="Param" Id="3313549B">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
-    </Element>
-    <Element Type="Param" Id="6E56AF22">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="1F176B3C">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000072"/>
-    </Element>
     <Element Type="FunctionCall" Id="A6632256">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
         <Parameter Type="Param" Id="A0830115"/>
@@ -44886,33 +44851,71 @@
     <Element Type="FunctionCall" Id="E1A8950D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="2D599117">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="1A6766F9"/>
-        <Parameter Type="Param" Id="B01EC219"/>
-        <Parameter Type="Param" Id="C03E81F7"/>
-        <Parameter Type="Param" Id="3B85E0D8"/>
+    <Element Type="FunctionCall" Id="E5726E2D">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="D52282F7"/>
+        <Parameter Type="Param" Id="28678511"/>
+        <Parameter Type="Param" Id="C98A2B94"/>
     </Element>
-    <Element Type="Param" Id="1A6766F9">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="2343C53F"/>
+    <Element Type="Param" Id="D52282F7">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="D7A52F73"/>
     </Element>
-    <Element Type="FunctionCall" Id="2343C53F">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="D7A52F73">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="B01EC219">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition01Objective2</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="28678511">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="C03E81F7">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="C98A2B94">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="31895DEC"/>
     </Element>
-    <Element Type="Param" Id="3B85E0D8">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Variable Type="Variable" Id="22407D3B"/>
+    <Element Type="FunctionCall" Id="DCC39EA6">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="7C7414A0"/>
+        <Parameter Type="Param" Id="A728177F"/>
+        <Parameter Type="Param" Id="4953E69F"/>
+    </Element>
+    <Element Type="Param" Id="7C7414A0">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="31895DEC"/>
+    </Element>
+    <Element Type="Param" Id="A728177F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="4953E69F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="5A367A8D">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="7772F1CA"/>
+        <Parameter Type="Param" Id="5CC1FDED"/>
+    </Element>
+    <Element Type="Param" Id="7772F1CA">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="31895DEC"/>
+    </Element>
+    <Element Type="Param" Id="5CC1FDED">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="986CAB71"/>
+    </Element>
+    <Element Type="FunctionCall" Id="6AE22BC3">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="659C3F64"/>
+        <Parameter Type="Param" Id="E60CB7C6"/>
+    </Element>
+    <Element Type="Param" Id="659C3F64">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="31895DEC"/>
+    </Element>
+    <Element Type="Param" Id="E60CB7C6">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="DBDB1509">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -44933,8 +44936,6 @@
         <Action Type="Comment" Id="8A0DDAE4"/>
         <Action Type="FunctionCall" Id="8BA1596F"/>
         <Action Type="Comment" Id="F7ECFB5E"/>
-        <Action Type="FunctionCall" Id="F056203D"/>
-        <Action Type="FunctionCall" Id="72C74B9B"/>
         <Action Type="FunctionCall" Id="4F3F352E"/>
         <Action Type="FunctionCall" Id="52A39225"/>
     </Element>
@@ -45013,51 +45014,6 @@
             Update the objective
         </Comment>
     </Element>
-    <Element Type="FunctionCall" Id="F056203D">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="3A0DCD9C"/>
-        <Parameter Type="Param" Id="2A97DC59"/>
-    </Element>
-    <Element Type="Param" Id="3A0DCD9C">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
-        <Variable Type="Variable" Id="31895DEC"/>
-    </Element>
-    <Element Type="Param" Id="2A97DC59">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000559"/>
-    </Element>
-    <Element Type="FunctionCall" Id="72C74B9B">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="AD632676"/>
-        <Parameter Type="Param" Id="1DF9A3D9"/>
-        <Parameter Type="Param" Id="F8168452"/>
-        <Parameter Type="Param" Id="FBFD0F42"/>
-        <Parameter Type="Param" Id="CF76C40F"/>
-    </Element>
-    <Element Type="Param" Id="AD632676">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective2</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="1DF9A3D9">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Variable Type="Variable" Id="22407D3B"/>
-    </Element>
-    <Element Type="Param" Id="F8168452">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
-    </Element>
-    <Element Type="Param" Id="FBFD0F42">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="CF76C40F">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000072"/>
-    </Element>
     <Element Type="FunctionCall" Id="4F3F352E">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="2FBF241F"/>
         <Parameter Type="Param" Id="1D0B317A"/>
@@ -45183,7 +45139,6 @@
         <Item Type="Comment" Id="49D7BFD5"/>
     </Element>
     <Element Type="Variable" Id="C2C35BE2">
-        <Identifier>objectiveDestroyDominionBase</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -45198,7 +45153,10 @@
         <Action Type="Comment" Id="0C784B20"/>
         <Action Type="FunctionCall" Id="47166682"/>
         <Action Type="FunctionCall" Id="A85AFB09"/>
-        <Action Type="FunctionCall" Id="9670FABC"/>
+        <Action Type="FunctionCall" Id="AB5B96CD"/>
+        <Action Type="FunctionCall" Id="78722EC4"/>
+        <Action Type="FunctionCall" Id="ADF03533"/>
+        <Action Type="FunctionCall" Id="6EF51F4A"/>
         <Action Type="FunctionCall" Id="3F88C94C"/>
     </Element>
     <Element Type="FunctionCall" Id="5727B648">
@@ -45278,34 +45236,71 @@
     <Element Type="FunctionCall" Id="1B0F3146">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="9670FABC">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="22D921E8"/>
-        <Parameter Type="Param" Id="42EA0044"/>
-        <Parameter Type="Param" Id="2368B76C"/>
-        <Parameter Type="Param" Id="8DCC3E6F"/>
+    <Element Type="FunctionCall" Id="AB5B96CD">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="8D33223B"/>
+        <Parameter Type="Param" Id="B429417B"/>
+        <Parameter Type="Param" Id="10526666"/>
     </Element>
-    <Element Type="Param" Id="22D921E8">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="D977BD46"/>
+    <Element Type="Param" Id="8D33223B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="08163D49"/>
     </Element>
-    <Element Type="FunctionCall" Id="D977BD46">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="08163D49">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="42EA0044">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition01Objective1</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="B429417B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="2368B76C">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="10526666">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="C2C35BE2"/>
     </Element>
-    <Element Type="Param" Id="8DCC3E6F">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="FunctionCall" Id="78722EC4">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="9FB47983"/>
+        <Parameter Type="Param" Id="C835D1D6"/>
+        <Parameter Type="Param" Id="80F065ED"/>
+    </Element>
+    <Element Type="Param" Id="9FB47983">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="C2C35BE2"/>
+    </Element>
+    <Element Type="Param" Id="C835D1D6">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="80F065ED">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="ADF03533">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="185831EC"/>
+        <Parameter Type="Param" Id="8951C271"/>
+    </Element>
+    <Element Type="Param" Id="185831EC">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="C2C35BE2"/>
+    </Element>
+    <Element Type="Param" Id="8951C271">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="E5841B91"/>
+    </Element>
+    <Element Type="FunctionCall" Id="6EF51F4A">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="5F2D210C"/>
+        <Parameter Type="Param" Id="62BBF110"/>
+    </Element>
+    <Element Type="Param" Id="5F2D210C">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="C2C35BE2"/>
+    </Element>
+    <Element Type="Param" Id="62BBF110">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="3F88C94C">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -45326,8 +45321,6 @@
         <Action Type="Comment" Id="431B7638"/>
         <Action Type="FunctionCall" Id="9EB908D9"/>
         <Action Type="Comment" Id="7FF86998"/>
-        <Action Type="FunctionCall" Id="6CB02C16"/>
-        <Action Type="FunctionCall" Id="5D5DF550"/>
         <Action Type="FunctionCall" Id="FBE3BDCC"/>
         <Action Type="FunctionCall" Id="7C74AC52"/>
     </Element>
@@ -45406,52 +45399,6 @@
             Update the objective
         </Comment>
     </Element>
-    <Element Type="FunctionCall" Id="6CB02C16">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="7BE0EBAE"/>
-        <Parameter Type="Param" Id="64BA9776"/>
-    </Element>
-    <Element Type="Param" Id="7BE0EBAE">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
-        <Variable Type="Variable" Id="C2C35BE2"/>
-    </Element>
-    <Element Type="Param" Id="64BA9776">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000559"/>
-    </Element>
-    <Element Type="FunctionCall" Id="5D5DF550">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="F67508EB"/>
-        <Parameter Type="Param" Id="6C3B04FB"/>
-        <Parameter Type="Param" Id="C211FE33"/>
-        <Parameter Type="Param" Id="0A28BF30"/>
-        <Parameter Type="Param" Id="6D8C473C"/>
-    </Element>
-    <Element Type="Param" Id="F67508EB">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective1</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="6C3B04FB">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Value>1</Value>
-        <ValueType Type="int"/>
-    </Element>
-    <Element Type="Param" Id="C211FE33">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="0A28BF30">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="6D8C473C">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000072"/>
-    </Element>
     <Element Type="FunctionCall" Id="FBE3BDCC">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="2FBF241F"/>
         <Parameter Type="Param" Id="6CE4492A"/>
@@ -45578,7 +45525,6 @@
         <Item Type="Trigger" Id="7E16B52B"/>
     </Element>
     <Element Type="Variable" Id="209A7E7A">
-        <Identifier>objectiveDestroyDominionBase22</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -45602,9 +45548,14 @@
         <Action Type="FunctionCall" Id="83D550D5"/>
         <Action Type="Comment" Id="3692567A"/>
         <Action Type="FunctionCall" Id="363E947F"/>
-        <Action Type="FunctionCall" Id="D8733C05"/>
         <Action Type="FunctionCall" Id="80CB0833"/>
-        <Action Type="FunctionCall" Id="DB8A0864"/>
+        <Action Type="FunctionCall" Id="3F99AF22"/>
+        <Action Type="FunctionCall" Id="A87BA89E"/>
+        <Action Type="FunctionCall" Id="D8031034"/>
+        <Action Type="FunctionCall" Id="6BE84CB1"/>
+        <Action Type="FunctionCall" Id="4C3286AB"/>
+        <Action Type="FunctionCall" Id="FF3930B2"/>
+        <Action Type="FunctionCall" Id="2C139046"/>
         <Action Type="FunctionCall" Id="9C142C6E"/>
     </Element>
     <Element Type="FunctionCall" Id="CF763767">
@@ -45668,37 +45619,6 @@
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Objective"/>
     </Element>
-    <Element Type="FunctionCall" Id="D8733C05">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="8FCB66BF"/>
-        <Parameter Type="Param" Id="A59B2045"/>
-        <Parameter Type="Param" Id="50C4E90B"/>
-        <Parameter Type="Param" Id="314D59AD"/>
-        <Parameter Type="Param" Id="8F2FC092"/>
-    </Element>
-    <Element Type="Param" Id="8FCB66BF">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective04</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="A59B2045">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Variable Type="Variable" Id="6C95AB86"/>
-    </Element>
-    <Element Type="Param" Id="50C4E90B">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="314D59AD">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="8F2FC092">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="80CB0833">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
         <Parameter Type="Param" Id="FF3E0B3F"/>
@@ -45715,34 +45635,127 @@
     <Element Type="FunctionCall" Id="439AAD25">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="DB8A0864">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="D108A9DA"/>
-        <Parameter Type="Param" Id="533C4265"/>
-        <Parameter Type="Param" Id="FFF0456C"/>
-        <Parameter Type="Param" Id="FB62F75E"/>
+    <Element Type="FunctionCall" Id="3F99AF22">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="523B6B70"/>
+        <Parameter Type="Param" Id="796916A7"/>
+        <Parameter Type="Param" Id="490788D3"/>
     </Element>
-    <Element Type="Param" Id="D108A9DA">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="2BB17135"/>
+    <Element Type="Param" Id="523B6B70">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="CC9E67B9"/>
     </Element>
-    <Element Type="FunctionCall" Id="2BB17135">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="CC9E67B9">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="533C4265">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition01Objective04</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="796916A7">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="FFF0456C">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
+    <Element Type="Param" Id="490788D3">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="209A7E7A"/>
+    </Element>
+    <Element Type="FunctionCall" Id="A87BA89E">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="DB91C769"/>
+        <Parameter Type="Param" Id="B2622BDB"/>
+        <Parameter Type="Param" Id="83C0ADC3"/>
+        <Parameter Type="Param" Id="99290636"/>
+        <Parameter Type="Param" Id="B722F9CF"/>
+        <Parameter Type="Param" Id="80806D6C"/>
+    </Element>
+    <Element Type="Param" Id="DB91C769">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
+        <Variable Type="Variable" Id="209A7E7A"/>
+    </Element>
+    <Element Type="Param" Id="B2622BDB">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
         <ValueType Type="string"/>
     </Element>
-    <Element Type="Param" Id="FB62F75E">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
+    <Element Type="Param" Id="83C0ADC3">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
         <Variable Type="Variable" Id="6C95AB86"/>
     </Element>
+    <Element Type="Param" Id="99290636">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
+        <Value>3</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Param" Id="B722F9CF">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="80806D6C">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="D8031034">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="A2107202"/>
+        <Parameter Type="Param" Id="8BE6B86E"/>
+    </Element>
+    <Element Type="Param" Id="A2107202">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="209A7E7A"/>
+    </Element>
+    <Element Type="Param" Id="8BE6B86E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="5013A472"/>
+    </Element>
+    <Element Type="FunctionCall" Id="6BE84CB1">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="2B945BAF"/>
+        <Parameter Type="Param" Id="439EE719"/>
+    </Element>
+    <Element Type="Param" Id="2B945BAF">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="209A7E7A"/>
+    </Element>
+    <Element Type="Param" Id="439EE719">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="32930D6C"/>
+    </Element>
+    <Element Type="FunctionCall" Id="4C3286AB">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="CF7D2C3F"/>
+        <Parameter Type="Param" Id="FC7514B2"/>
+    </Element>
+    <Element Type="Param" Id="CF7D2C3F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="209A7E7A"/>
+    </Element>
+    <Element Type="Param" Id="FC7514B2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="50BAF2D9"/>
+    </Element>
+    <Element Type="FunctionCall" Id="FF3930B2">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="7A1C68DC"/>
+        <Parameter Type="Param" Id="D3A1627F"/>
+    </Element>
+    <Element Type="Param" Id="7A1C68DC">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="209A7E7A"/>
+    </Element>
+    <Element Type="Param" Id="D3A1627F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Library="5BD4895D" Id="377FF870"/>
+    </Element>
+    <Element Type="FunctionCall" Id="2C139046">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="D96AB204"/>
+        <Parameter Type="Param" Id="B32CAFEE"/>
+    </Element>
+    <Element Type="Param" Id="D96AB204">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="209A7E7A"/>
+    </Element>
+    <Element Type="Param" Id="B32CAFEE">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    </Element>
     <Element Type="FunctionCall" Id="9C142C6E">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="9AE65318"/>
@@ -45761,7 +45774,6 @@
         <Action Type="Comment" Id="AADB7F65"/>
         <Action Type="FunctionCall" Id="FA312FDE"/>
         <Action Type="Comment" Id="6B20EBB9"/>
-        <Action Type="FunctionCall" Id="EDF4A24D"/>
         <Action Type="FunctionCall" Id="81CFC46A"/>
         <Action Type="FunctionCall" Id="9DC6C36D"/>
     </Element>
@@ -45824,37 +45836,6 @@
             Update the objective
         </Comment>
     </Element>
-    <Element Type="FunctionCall" Id="EDF4A24D">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="BB3A3E38"/>
-        <Parameter Type="Param" Id="5C88070D"/>
-        <Parameter Type="Param" Id="622356D3"/>
-        <Parameter Type="Param" Id="04978E97"/>
-        <Parameter Type="Param" Id="5D93881D"/>
-    </Element>
-    <Element Type="Param" Id="BB3A3E38">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective04</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="5C88070D">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Variable Type="Variable" Id="6C95AB86"/>
-    </Element>
-    <Element Type="Param" Id="622356D3">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="04978E97">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="5D93881D">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="81CFC46A">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
         <Parameter Type="Param" Id="D41F029B"/>
@@ -45887,8 +45868,6 @@
         <Action Type="Comment" Id="15B44AEC"/>
         <Action Type="FunctionCall" Id="7F005D64"/>
         <Action Type="Comment" Id="EC252D2C"/>
-        <Action Type="FunctionCall" Id="D050C8FC"/>
-        <Action Type="FunctionCall" Id="E256CE31"/>
         <Action Type="FunctionCall" Id="1E55C479"/>
         <Action Type="FunctionCall" Id="0F989245"/>
         <Action Type="FunctionCall" Id="192411C8"/>
@@ -45968,51 +45947,6 @@
             Update the objective
         </Comment>
     </Element>
-    <Element Type="FunctionCall" Id="D050C8FC">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="9F7C18B4"/>
-        <Parameter Type="Param" Id="C7CFEFA8"/>
-    </Element>
-    <Element Type="Param" Id="9F7C18B4">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
-        <Variable Type="Variable" Id="209A7E7A"/>
-    </Element>
-    <Element Type="Param" Id="C7CFEFA8">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000559"/>
-    </Element>
-    <Element Type="FunctionCall" Id="E256CE31">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="6C05F7E4"/>
-        <Parameter Type="Param" Id="D9F170B8"/>
-        <Parameter Type="Param" Id="F6D5CE5F"/>
-        <Parameter Type="Param" Id="EEED4F59"/>
-        <Parameter Type="Param" Id="83F7AB0E"/>
-    </Element>
-    <Element Type="Param" Id="6C05F7E4">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective04</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="D9F170B8">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Variable Type="Variable" Id="6C95AB86"/>
-    </Element>
-    <Element Type="Param" Id="F6D5CE5F">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="EEED4F59">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="83F7AB0E">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="1E55C479">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
         <Parameter Type="Param" Id="65E69DA0"/>
@@ -46151,7 +46085,6 @@
         <Item Type="Trigger" Id="87FFF93D"/>
     </Element>
     <Element Type="Variable" Id="26A5E8E2">
-        <Identifier>objectiveRescueBrood</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -46209,14 +46142,28 @@
         <ValueType Type="bool"/>
     </Element>
     <Element Type="Trigger" Id="01EC1BBE">
+        <Variable Type="Variable" Id="0748906E"/>
         <Condition Type="FunctionCall" Id="C9FDA0AD"/>
         <Action Type="FunctionCall" Id="659C4F6C"/>
         <Action Type="FunctionCall" Id="7681F436"/>
-        <Action Type="FunctionCall" Id="9535A7BA"/>
         <Action Type="FunctionCall" Id="E3A9384B"/>
-        <Action Type="FunctionCall" Id="C28BEBCD"/>
+        <Action Type="FunctionCall" Id="A124F5B1"/>
+        <Action Type="FunctionCall" Id="A8FC8E6C"/>
+        <Action Type="FunctionCall" Id="35884BE8"/>
+        <Action Type="FunctionCall" Id="8A06D28F"/>
+        <Action Type="FunctionCall" Id="0BBDBED2"/>
         <Action Type="FunctionCall" Id="F65AE21C"/>
     </Element>
+    <Element Type="Variable" Id="0748906E">
+        <VariableType>
+            <Type Value="preset"/>
+            <TypeElement Type="Preset" Library="5BD4895D" Id="41ABCC70"/>
+        </VariableType>
+        <Value Type="Param" Id="FC966548"/>
+    </Element>
+    <Element Type="Param" Id="FC966548">
+        <Preset Type="PresetValue" Library="5BD4895D" Id="4D047463"/>
+    </Element>
     <Element Type="FunctionCall" Id="C9FDA0AD">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
         <Parameter Type="Param" Id="0E94CB23"/>
@@ -46273,37 +46220,6 @@
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Objective"/>
     </Element>
-    <Element Type="FunctionCall" Id="9535A7BA">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="C0634A4B"/>
-        <Parameter Type="Param" Id="32185603"/>
-        <Parameter Type="Param" Id="F786DBE8"/>
-        <Parameter Type="Param" Id="03A26FEA"/>
-        <Parameter Type="Param" Id="9B2F54B6"/>
-    </Element>
-    <Element Type="Param" Id="C0634A4B">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective05</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="32185603">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Variable Type="Variable" Id="BCCE4DCF"/>
-    </Element>
-    <Element Type="Param" Id="F786DBE8">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="03A26FEA">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="9B2F54B6">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="E3A9384B">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
         <Parameter Type="Param" Id="4CD52C79"/>
@@ -46320,34 +46236,101 @@
     <Element Type="FunctionCall" Id="C913929F">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="C28BEBCD">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="9E202B8C"/>
-        <Parameter Type="Param" Id="CBE83CBB"/>
-        <Parameter Type="Param" Id="FE41E4AA"/>
-        <Parameter Type="Param" Id="1BAFF46D"/>
+    <Element Type="FunctionCall" Id="A124F5B1">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="ADEFCF0C"/>
+        <Parameter Type="Param" Id="7D960D5F"/>
+        <Parameter Type="Param" Id="E92F6A35"/>
     </Element>
-    <Element Type="Param" Id="9E202B8C">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="E3874F39"/>
+    <Element Type="Param" Id="ADEFCF0C">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="280B0B59"/>
     </Element>
-    <Element Type="FunctionCall" Id="E3874F39">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="280B0B59">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="CBE83CBB">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition01Objective05</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="7D960D5F">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="FE41E4AA">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
+    <Element Type="Param" Id="E92F6A35">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="26A5E8E2"/>
+    </Element>
+    <Element Type="FunctionCall" Id="A8FC8E6C">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="526852C3"/>
+        <Parameter Type="Param" Id="6CB02DBA"/>
+        <Parameter Type="Param" Id="64B5D72C"/>
+        <Parameter Type="Param" Id="598B32F2"/>
+        <Parameter Type="Param" Id="F9929559"/>
+        <Parameter Type="Param" Id="8620B4B9"/>
+    </Element>
+    <Element Type="Param" Id="526852C3">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
+        <Variable Type="Variable" Id="26A5E8E2"/>
+    </Element>
+    <Element Type="Param" Id="6CB02DBA">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
         <ValueType Type="string"/>
     </Element>
-    <Element Type="Param" Id="1BAFF46D">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
+    <Element Type="Param" Id="64B5D72C">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
         <Variable Type="Variable" Id="BCCE4DCF"/>
     </Element>
+    <Element Type="Param" Id="598B32F2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
+        <Value>2</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Param" Id="F9929559">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="8620B4B9">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Variable Type="Variable" Id="0748906E"/>
+    </Element>
+    <Element Type="FunctionCall" Id="35884BE8">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="ADAB375A"/>
+        <Parameter Type="Param" Id="B32BF402"/>
+    </Element>
+    <Element Type="Param" Id="ADAB375A">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="26A5E8E2"/>
+    </Element>
+    <Element Type="Param" Id="B32BF402">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="51F8A781"/>
+    </Element>
+    <Element Type="FunctionCall" Id="8A06D28F">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="34C6A28E"/>
+        <Parameter Type="Param" Id="778C9A65"/>
+    </Element>
+    <Element Type="Param" Id="34C6A28E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="26A5E8E2"/>
+    </Element>
+    <Element Type="Param" Id="778C9A65">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="F74CDEFA"/>
+    </Element>
+    <Element Type="FunctionCall" Id="0BBDBED2">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="191B4573"/>
+        <Parameter Type="Param" Id="22ACC351"/>
+    </Element>
+    <Element Type="Param" Id="191B4573">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="26A5E8E2"/>
+    </Element>
+    <Element Type="Param" Id="22ACC351">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    </Element>
     <Element Type="FunctionCall" Id="F65AE21C">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="F4D49F6A"/>
@@ -46376,7 +46359,6 @@
         <Action Type="Comment" Id="BD42412A"/>
         <Action Type="FunctionCall" Id="EC3B9CE1"/>
         <Action Type="Comment" Id="A1C79350"/>
-        <Action Type="FunctionCall" Id="4B78B548"/>
         <Action Type="FunctionCall" Id="4C68BB3A"/>
         <Action Type="FunctionCall" Id="99E10345"/>
         <Action Type="FunctionCall" Id="AC4112CE"/>
@@ -46514,7 +46496,7 @@
         <FunctionCall Type="FunctionCall" Id="E805D31D"/>
         <FunctionCall Type="FunctionCall" Id="8C73E9C4"/>
         <FunctionCall Type="FunctionCall" Id="D48E8448"/>
-        <FunctionCall Type="FunctionCall" Id="9BA039C8"/>
+        <FunctionCall Type="FunctionCall" Id="82574A61"/>
     </Element>
     <Element Type="FunctionCall" Id="E805D31D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
@@ -46560,15 +46542,14 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="68F925F6"/>
         <Variable Type="Variable" Id="684DF003"/>
     </Element>
-    <Element Type="FunctionCall" Id="9BA039C8">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
+    <Element Type="FunctionCall" Id="82574A61">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        <Parameter Type="Param" Id="39824B1A"/>
+        <Parameter Type="Param" Id="2302923B"/>
     </Element>
-    <Element Type="Param" Id="39824B1A">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>3</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="2302923B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="F74CDEFA"/>
     </Element>
     <Element Type="FunctionCall" Id="B91852CC">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="3A1227AB"/>
@@ -46587,7 +46568,7 @@
         <FunctionCall Type="FunctionCall" Id="954E3895"/>
         <FunctionCall Type="FunctionCall" Id="160812E8"/>
         <FunctionCall Type="FunctionCall" Id="8C58E619"/>
-        <FunctionCall Type="FunctionCall" Id="A19563E8"/>
+        <FunctionCall Type="FunctionCall" Id="0311EA19"/>
     </Element>
     <Element Type="FunctionCall" Id="954E3895">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
@@ -46633,15 +46614,14 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="68F925F6"/>
         <Variable Type="Variable" Id="8675A036"/>
     </Element>
-    <Element Type="FunctionCall" Id="A19563E8">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
+    <Element Type="FunctionCall" Id="0311EA19">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        <Parameter Type="Param" Id="A1145EC2"/>
+        <Parameter Type="Param" Id="3366358E"/>
     </Element>
-    <Element Type="Param" Id="A1145EC2">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>2</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="3366358E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="51F8A781"/>
     </Element>
     <Element Type="FunctionCall" Id="0C518C30">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
@@ -46727,37 +46707,6 @@
             Update the objective
         </Comment>
     </Element>
-    <Element Type="FunctionCall" Id="4B78B548">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="E7258712"/>
-        <Parameter Type="Param" Id="F72E01C7"/>
-        <Parameter Type="Param" Id="23293C89"/>
-        <Parameter Type="Param" Id="52AB4CB5"/>
-        <Parameter Type="Param" Id="5104666F"/>
-    </Element>
-    <Element Type="Param" Id="E7258712">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective05</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="F72E01C7">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Variable Type="Variable" Id="BCCE4DCF"/>
-    </Element>
-    <Element Type="Param" Id="23293C89">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="52AB4CB5">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="5104666F">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="4C68BB3A">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
         <Parameter Type="Param" Id="F5FB3F8F"/>
@@ -46810,9 +46759,7 @@
         <Action Type="FunctionCall" Id="E0FCC372"/>
         <Action Type="Comment" Id="FC3C3BDC"/>
         <Action Type="FunctionCall" Id="EDA5F941"/>
-        <Action Type="FunctionCall" Id="66FCAC46"/>
         <Action Type="Comment" Id="702E8916"/>
-        <Action Type="FunctionCall" Id="3C4D57A6"/>
         <Action Type="FunctionCall" Id="79AF2F78"/>
         <Action Type="FunctionCall" Id="9F69ADFC"/>
         <Action Type="FunctionCall" Id="E0782465"/>
@@ -46943,57 +46890,11 @@
         <ValueType Type="trigger"/>
         <ValueElement Type="Trigger" Id="01EC1BBE"/>
     </Element>
-    <Element Type="FunctionCall" Id="66FCAC46">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="AA566215"/>
-        <Parameter Type="Param" Id="3F6994DE"/>
-    </Element>
-    <Element Type="Param" Id="AA566215">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
-        <Variable Type="Variable" Id="26A5E8E2"/>
-    </Element>
-    <Element Type="Param" Id="3F6994DE">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000559"/>
-    </Element>
     <Element Type="Comment" Id="702E8916">
         <Comment>
             Update the campaign progress for this objective.  This must be done whenever an objective&apos;s progress changes.
         </Comment>
     </Element>
-    <Element Type="FunctionCall" Id="3C4D57A6">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="7516D4D6"/>
-        <Parameter Type="Param" Id="12724EB3"/>
-        <Parameter Type="Param" Id="467923B0"/>
-        <Parameter Type="Param" Id="7196F9A6"/>
-        <Parameter Type="Param" Id="045F1899"/>
-    </Element>
-    <Element Type="Param" Id="7516D4D6">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective05</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="12724EB3">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Value>2</Value>
-        <ValueType Type="int"/>
-    </Element>
-    <Element Type="Param" Id="467923B0">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="7196F9A6">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="045F1899">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
     <Element Type="FunctionCall" Id="79AF2F78">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
         <Parameter Type="Param" Id="E5467B4F"/>
@@ -47135,7 +47036,6 @@
         <Item Type="Comment" Id="1A5B1453"/>
     </Element>
     <Element Type="Variable" Id="48B6AAF1">
-        <Identifier>objectiveDestroyDominionBase2</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -47145,14 +47045,27 @@
         <Preset Type="PresetValue" Library="Ntve" Id="91651C80"/>
     </Element>
     <Element Type="Trigger" Id="D6099DD3">
+        <Variable Type="Variable" Id="F1BD908A"/>
         <Condition Type="FunctionCall" Id="773BB55A"/>
         <Action Type="FunctionCall" Id="09C45AC9"/>
         <Action Type="Comment" Id="F62DF4A7"/>
         <Action Type="FunctionCall" Id="83CB3892"/>
         <Action Type="FunctionCall" Id="0E20F5E5"/>
-        <Action Type="FunctionCall" Id="77721D9C"/>
+        <Action Type="FunctionCall" Id="35A5DC6E"/>
+        <Action Type="FunctionCall" Id="98296F4E"/>
+        <Action Type="FunctionCall" Id="BA1ECC07"/>
         <Action Type="FunctionCall" Id="B93DB18C"/>
     </Element>
+    <Element Type="Variable" Id="F1BD908A">
+        <VariableType>
+            <Type Value="preset"/>
+            <TypeElement Type="Preset" Library="5BD4895D" Id="41ABCC70"/>
+        </VariableType>
+        <Value Type="Param" Id="C73D4276"/>
+    </Element>
+    <Element Type="Param" Id="C73D4276">
+        <Preset Type="PresetValue" Library="5BD4895D" Id="61BC986C"/>
+    </Element>
     <Element Type="FunctionCall" Id="773BB55A">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
         <Parameter Type="Param" Id="A6486CCB"/>
@@ -47217,7 +47130,7 @@
     </Element>
     <Element Type="Param" Id="FA8A4AE7">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="BD92541B"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="24E7961A"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000561"/>
     </Element>
     <Element Type="Param" Id="C50F745F">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="E2D11CC0"/>
@@ -47243,14 +47156,51 @@
     <Element Type="FunctionCall" Id="21915735">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="77721D9C">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="04D0947E"/>
-        <Parameter Type="Param" Id="6785EA92"/>
+    <Element Type="FunctionCall" Id="35A5DC6E">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="EB4BC3B4"/>
+        <Parameter Type="Param" Id="530AF32E"/>
+        <Parameter Type="Param" Id="3592D97D"/>
+    </Element>
+    <Element Type="Param" Id="EB4BC3B4">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="48B6AAF1"/>
+    </Element>
+    <Element Type="Param" Id="530AF32E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>true</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="3592D97D">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Variable Type="Variable" Id="F1BD908A"/>
+    </Element>
+    <Element Type="FunctionCall" Id="98296F4E">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="95DA83BD"/>
+        <Parameter Type="Param" Id="4B968162"/>
+    </Element>
+    <Element Type="Param" Id="95DA83BD">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="48B6AAF1"/>
+    </Element>
+    <Element Type="Param" Id="4B968162">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="3635BF07"/>
+    </Element>
+    <Element Type="FunctionCall" Id="BA1ECC07">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="F723EBF5"/>
+        <Parameter Type="Param" Id="C63D3049"/>
     </Element>
-    <Element Type="Param" Id="6785EA92">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2CEC2675"/>
+    <Element Type="Param" Id="F723EBF5">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="48B6AAF1"/>
     </Element>
+    <Element Type="Param" Id="C63D3049">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    </Element>
     <Element Type="FunctionCall" Id="B93DB18C">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="0AE1560F"/>
@@ -47270,8 +47220,6 @@
         <Action Type="Comment" Id="8FD88D78"/>
         <Action Type="FunctionCall" Id="1A3FFFBB"/>
         <Action Type="Comment" Id="7FBB2038"/>
-        <Action Type="FunctionCall" Id="1075358B"/>
-        <Action Type="FunctionCall" Id="D0C49F26"/>
         <Action Type="FunctionCall" Id="18151041"/>
         <Action Type="FunctionCall" Id="7F50F422"/>
     </Element>
@@ -47350,52 +47298,6 @@
             Update the objective
         </Comment>
     </Element>
-    <Element Type="FunctionCall" Id="1075358B">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000440"/>
-        <Parameter Type="Param" Id="5AAF454F"/>
-        <Parameter Type="Param" Id="BFE31C4A"/>
-    </Element>
-    <Element Type="Param" Id="5AAF454F">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000853"/>
-        <Variable Type="Variable" Id="48B6AAF1"/>
-    </Element>
-    <Element Type="Param" Id="BFE31C4A">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000854"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000559"/>
-    </Element>
-    <Element Type="FunctionCall" Id="D0C49F26">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="7F82022B"/>
-        <Parameter Type="Param" Id="9D1B50D1"/>
-        <Parameter Type="Param" Id="3CD2A4F7"/>
-        <Parameter Type="Param" Id="94A3797A"/>
-        <Parameter Type="Param" Id="06E6EC85"/>
-    </Element>
-    <Element Type="Param" Id="7F82022B">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition01Objective1</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="9D1B50D1">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Value>1</Value>
-        <ValueType Type="int"/>
-    </Element>
-    <Element Type="Param" Id="3CD2A4F7">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
-    </Element>
-    <Element Type="Param" Id="94A3797A">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
-    </Element>
-    <Element Type="Param" Id="06E6EC85">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000072"/>
-    </Element>
     <Element Type="FunctionCall" Id="18151041">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="2FBF241F"/>
         <Parameter Type="Param" Id="0D23A89D"/>
@@ -53554,10 +53456,8 @@
         <Action Type="FunctionCall" Id="9A45F21B"/>
         <Action Type="FunctionCall" Id="6B9D02FA"/>
         <Action Type="FunctionCall" Id="52FD5238"/>
-        <Action Type="FunctionCall" Id="03D683FF"/>
-        <Action Type="FunctionCall" Id="E3957328"/>
-        <Action Type="FunctionCall" Id="14B66BE0"/>
-        <Action Type="FunctionCall" Id="FC7FC965"/>
+        <Action Type="FunctionCall" Id="3690BE2C"/>
+        <Action Type="FunctionCall" Id="E26C0420"/>
         <Action Type="FunctionCall" Id="2CCE125C"/>
         <Action Type="FunctionCall" Id="6A20E7CC"/>
         <Action Type="Comment" Id="46AF803E"/>
@@ -55132,64 +55032,32 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="68F925F6"/>
         <Variable Type="Variable" Id="FBEDA95E"/>
     </Element>
-    <Element Type="FunctionCall" Id="03D683FF">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
-        <Parameter Type="Param" Id="50A5D857"/>
-        <Parameter Type="Param" Id="EC203414"/>
-        <Parameter Type="Param" Id="F50B2DCF"/>
-    </Element>
-    <Element Type="Param" Id="50A5D857">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
-        <FunctionCall Type="FunctionCall" Id="15C0DBBB"/>
-    </Element>
-    <Element Type="FunctionCall" Id="15C0DBBB">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
+    <Element Type="FunctionCall" Id="3690BE2C">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="1DD99AD9"/>
+        <Parameter Type="Param" Id="A73ED4F9"/>
     </Element>
-    <Element Type="Param" Id="EC203414">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
-    </Element>
-    <Element Type="Param" Id="F50B2DCF">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+    <Element Type="Param" Id="1DD99AD9">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="31895DEC"/>
     </Element>
-    <Element Type="FunctionCall" Id="E3957328">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="15BCF3BB"/>
-        <Parameter Type="Param" Id="8F94FF10"/>
-    </Element>
-    <Element Type="Param" Id="8F94FF10">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="04ED211A"/>
-        <Variable Type="Variable" Id="31895DEC"/>
-    </Element>
-    <Element Type="FunctionCall" Id="14B66BE0">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
-        <Parameter Type="Param" Id="9AF45E3E"/>
-        <Parameter Type="Param" Id="249C5202"/>
-        <Parameter Type="Param" Id="3CAEB4AE"/>
-    </Element>
-    <Element Type="Param" Id="9AF45E3E">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
-        <FunctionCall Type="FunctionCall" Id="4FD33547"/>
-    </Element>
-    <Element Type="FunctionCall" Id="4FD33547">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
-    </Element>
-    <Element Type="Param" Id="249C5202">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+    <Element Type="Param" Id="A73ED4F9">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="3CAEB4AE">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
-        <Variable Type="Variable" Id="C2C35BE2"/>
-    </Element>
-    <Element Type="FunctionCall" Id="FC7FC965">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="15BCF3BB"/>
-        <Parameter Type="Param" Id="4CFCFECE"/>
+    <Element Type="FunctionCall" Id="E26C0420">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="92C473E7"/>
+        <Parameter Type="Param" Id="43034D84"/>
     </Element>
-    <Element Type="Param" Id="4CFCFECE">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="04ED211A"/>
+    <Element Type="Param" Id="92C473E7">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="C2C35BE2"/>
     </Element>
+    <Element Type="Param" Id="43034D84">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
+    </Element>
     <Element Type="FunctionCall" Id="2CCE125C">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
         <Parameter Type="Param" Id="DF0E26B3"/>
@@ -59053,6 +58921,7 @@
         <Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
     </Element>
     <Element Type="Category" Id="6F59E1F6">
+        <Item Type="Category" Id="77AE09E1"/>
         <Item Type="Category" Id="5070BA85"/>
         <Item Type="Category" Id="BC9B1F52"/>
         <Item Type="FunctionDef" Id="75548205"/>
@@ -59060,6 +58929,112 @@
         <Item Type="Trigger" Id="37A4F923"/>
         <Item Type="Trigger" Id="F489EF0C"/>
     </Element>
+    <Element Type="Category" Id="77AE09E1">
+        <Item Type="Variable" Id="986CAB71"/>
+        <Item Type="Variable" Id="51F8A781"/>
+        <Item Type="Variable" Id="F74CDEFA"/>
+        <Item Type="Variable" Id="E5841B91"/>
+        <Item Type="Variable" Id="5013A472"/>
+        <Item Type="Variable" Id="32930D6C"/>
+        <Item Type="Variable" Id="50BAF2D9"/>
+        <Item Type="Variable" Id="3635BF07"/>
+    </Element>
+    <Element Type="Variable" Id="986CAB71">
+        <Identifier>LOCATION_ID_FIRST_URSADON_MATRIARCH</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="3749D911"/>
+    </Element>
+    <Element Type="Param" Id="3749D911">
+        <Value>1</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="51F8A781">
+        <Identifier>LOCATION_ID_NORTH_URSADON_MATRIARCH</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="EC1BCEC3"/>
+    </Element>
+    <Element Type="Param" Id="EC1BCEC3">
+        <Value>2</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="F74CDEFA">
+        <Identifier>LOCATION_ID_WEST_URSADON_MATRIARCH</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="6D104BE6"/>
+    </Element>
+    <Element Type="Param" Id="6D104BE6">
+        <Value>3</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="E5841B91">
+        <Identifier>LOCATION_ID_LOST_BROOD</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="C6EB4F9F"/>
+    </Element>
+    <Element Type="Param" Id="C6EB4F9F">
+        <Value>4</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="5013A472">
+        <Identifier>LOCATION_ID_NORTHEAST_PSILINK_SPIRE</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="BB513F88"/>
+    </Element>
+    <Element Type="Param" Id="BB513F88">
+        <Value>5</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="32930D6C">
+        <Identifier>LOCATION_ID_NORTHWEST_PSILINK_SPIRE</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="5DF31027"/>
+    </Element>
+    <Element Type="Param" Id="5DF31027">
+        <Value>6</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="50BAF2D9">
+        <Identifier>LOCATION_ID_SOUTHWEST_PSILINK_SPIRE</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="23FFF7D2"/>
+    </Element>
+    <Element Type="Param" Id="23FFF7D2">
+        <Value>7</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="3635BF07">
+        <Identifier>LOCATION_ID_NAFASH</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="FEE4B9F1"/>
+    </Element>
+    <Element Type="Param" Id="FEE4B9F1">
+        <Value>8</Value>
+        <ValueType Type="int"/>
+    </Element>
     <Element Type="Category" Id="5070BA85">
         <Item Type="FunctionDef" Id="DA0A1AB9"/>
     </Element>
@@ -59776,7 +59751,7 @@
         <Condition Type="FunctionCall" Id="F5CB7268"/>
         <Condition Type="FunctionCall" Id="EF644884"/>
         <Action Type="FunctionCall" Id="EEA231C3"/>
-        <Action Type="FunctionCall" Id="BF945334"/>
+        <Action Type="FunctionCall" Id="5D199AE4"/>
     </Element>
     <Element Type="FunctionCall" Id="2597B42F">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="FF16983A"/>
@@ -59850,13 +59825,12 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="BF945334">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="2DE4C601"/>
+    <Element Type="FunctionCall" Id="5D199AE4">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="5788069F"/>
     </Element>
-    <Element Type="Param" Id="2DE4C601">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>1</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="5788069F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="986CAB71"/>
     </Element>
 </TriggerData>
\ No newline at end of file
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version
index e0c6aa4d6167a1f7495ef887bf9086d832848276..72139f657fec1e392d8fe8b4d4fec7caa2e240c0 100644
GIT binary patch
literal 44
qcmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#2|h&BLl-{`<^r)#Q*@a3<mE2

literal 44
qcmYdJNi9y#EGl7QU|`_OU}Rtg(jdSK#2|hIBLhQ;xoaAbVgLZE00syE

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 2197a0e29..b33f106a4 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -15,6 +15,7 @@ Category/Name/618FC7C6=Debug
 Category/Name/684BC26C=Flash Freeze
 Category/Name/6CA7F69B======== OBJECTIVES =======
 Category/Name/6F59E1F6======== ARCHIPELAGO =======
+Category/Name/77AE09E1=Location IDs
 Category/Name/885B00E0=Main Objective - Recover Lost Brood
 Category/Name/916B6E65=Ursadon Behaviors
 Category/Name/A1EBD7CD=Campaign Mission
@@ -244,6 +245,7 @@ Variable/Name/02E8C526=StartingHatchery
 Variable/Name/031E89DA=FadeDuratioin
 Variable/Name/03EF75D2=Ursadon_CenterNorth
 Variable/Name/0513D93C=Soundtrack
+Variable/Name/0748906E=category
 Variable/Name/0780B88F=VisibilitySpire01
 Variable/Name/08D04A5A=PLAYER_02_RESCUE_ZERG
 Variable/Name/0A683C06=DeliverRetreatLine
@@ -266,9 +268,11 @@ Variable/Name/2992968B=playerGroup
 Variable/Name/2AFE9BF2=currentUnit
 Variable/Name/2F9750F7=LargestZergForce
 Variable/Name/31895DEC=ObjectiveCollectUrsadonEssence
+Variable/Name/32930D6C=LOCATION_ID_NORTHWEST_PSI-LINK_SPIRE
 Variable/Name/33C20B4B=PLAYER_10_URSADON
 Variable/Name/352E6C6A=VisibilitySpire03
 Variable/Name/3620FDE7=Owner
+Variable/Name/3635BF07=LOCATION_ID_NAFASH
 Variable/Name/367F82A2=ESSENCE_Ursadon
 Variable/Name/38DBA272=currentUnit
 Variable/Name/3DDF366B=FlashFreezeDuration_Window
@@ -279,6 +283,9 @@ Variable/Name/45A29DD1=FlashFreezeActive
 Variable/Name/4652F608=Ursadon_CenterSouth
 Variable/Name/473D6933=SpireActorModel01
 Variable/Name/48B6AAF1=ObjectiveFindNafashCorpse
+Variable/Name/5013A472=LOCATION_ID_NORTHEAST_PSI-LINK_SPIRE
+Variable/Name/50BAF2D9=LOCATION_ID_SOUTHWEST_PSI-LINK_SPIRE
+Variable/Name/51F8A781=LOCATION_ID_NORTH_URSADON_MATRIARCH
 Variable/Name/55A19E62=VictoryZerg
 Variable/Name/57075A22=FadeDuration
 Variable/Name/5800A47D=Soundtrack
@@ -312,6 +319,7 @@ Variable/Name/94BAE39F=FlashFreeze_Duration
 Variable/Name/94C59571=MatriarchActor
 Variable/Name/95817396=DelayTop
 Variable/Name/97030D13=THE_ONE_KERRIGAN
+Variable/Name/986CAB71=LOCATION_ID_FIRST_URSADON_MATRIARCH
 Variable/Name/9AE34E09=CinematicKerrigan
 Variable/Name/9C9C0A38=CompletionistTimer
 Variable/Name/9EB95045=Random
@@ -354,6 +362,7 @@ Variable/Name/DAE15D50=CinematicZergling
 Variable/Name/DC0DE0D0=UrsadonEssence_Needed
 Variable/Name/E0F025BC=VictoryZerg
 Variable/Name/E40AB925=ProtossPlayers
+Variable/Name/E5841B91=LOCATION_ID_LOST_BROOD
 Variable/Name/E64436C2=CinematicTempUnits
 Variable/Name/E8A527A5=InCinematic
 Variable/Name/E943ADF6=Shield
@@ -365,6 +374,8 @@ Variable/Name/EE8440F3=Position
 Variable/Name/EEE9A14D=DROP_UNITS
 Variable/Name/EF5BE4BF=StartingVision
 Variable/Name/F00A88F4=PLAYER_01_USER
+Variable/Name/F1BD908A=category
+Variable/Name/F74CDEFA=LOCATION_ID_WEST_URSADON_MATRIARCH
 Variable/Name/F771F7AC=ProtossKilledDuringFlashFreeze
 Variable/Name/FBEDA95E=PingZergBase
 Variable/Name/FD0CC27F=DelayBottom
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/ComponentList.SC2Components
index c8f4a47f3..2dce1a8f1 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/ComponentList.SC2Components
+++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/ComponentList.SC2Components
@@ -1,5 +1,6 @@
 <?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/HotS/ap_shoot_the_messenger.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/DocumentHeader
index b37d808a6e64090ea232c73436ee8995231edd9e..75b2074254afaa60d2b096fcab2f3aa6b99e37ab 100644
GIT binary patch
delta 45
tcmaDA@hU>a!^k<9gMop;D42nPk(Gg0B9oB;ghAkpmTnjbZ&Y#90RZFY36=l=

delta 45
tcmaDA@hU>a!^k<9gMop;D42nPk(GhxbuuFZ2!nub{;IhkyivtX2LKC23<CfF

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/MapScript.galaxy
index b9bf95e2c..2c3c0a5f9 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/MapScript.galaxy
@@ -49,6 +49,15 @@ const fixed gv_warningDistance = 25.0;
 const int gv_stasisChamberPingIndex = 0;
 const string gv_launchFacilityType = "ProtossDockingBayUnit";
 const int gv_objectiveFindFrozenZergTotal = 4;
+const int gv_LOCATION_ID_EAST_STATIS_CHAMBER = 1;
+const int gv_LOCATION_ID_CENTER_STATIS_CHAMBER = 2;
+const int gv_LOCATION_ID_WEST_STATIS_CHAMBER = 3;
+const int gv_LOCATION_ID_DESTROY_4_SHUTTLES = 4;
+const int gv_LOCATION_ID_FROZEN_EXPANSION = 5;
+const int gv_LOCATION_ID_SOUTHWEST_FROZEN_ZERG = 6;
+const int gv_LOCATION_ID_SOUTHEAST_FROZEN_ZERG = 7;
+const int gv_LOCATION_ID_WEST_FROZEN_ZERG = 8;
+const int gv_LOCATION_ID_EAST_FROZEN_ZERG = 9;
 
 //--------------------------------------------------------------------------------------------------
 // Global Preset Declarations
@@ -104,7 +113,7 @@ int gv_nexusDestroyedCount;
 int gv_feralZergUnfrozen;
 int gv_feralZergFrozenTotal;
 int gv_dockingBaysDestroyed;
-int gv_objectiveDestroyDominionBase;
+int gv_objectiveDestroyAllProtossShuttles;
 int gv_shuttleWavesRemaining;
 int gv_objectiveNoShuttleCanEscape;
 int gv_objectiveBonusDestroyStasisChamber;
@@ -145,7 +154,7 @@ void InitGlobals () {
         gv_stasisChamberPingArray[init_i] = c_invalidPingId;
     }
     gv_noShuttleHasSlowedDown = true;
-    gv_objectiveDestroyDominionBase = c_invalidObjectiveId;
+    gv_objectiveDestroyAllProtossShuttles = c_invalidObjectiveId;
     gv_shuttleWavesRemaining = 8;
     gv_objectiveNoShuttleCanEscape = c_invalidObjectiveId;
     gv_objectiveBonusDestroyStasisChamber = c_invalidObjectiveId;
@@ -271,6 +280,7 @@ trigger gt_ObjectiveNoShuttleCanEscapeComplete;
 trigger gt_ObjectiveNoShuttleCanEscapeFailed;
 trigger gt_ObjectiveDestroyStasisChamberCreate;
 trigger gt_ObjectiveDestroyStasisChamberUpdate;
+trigger gt_ObjectiveDestroyStatisChamberDeactivate;
 trigger gt_ObjectiveDestroyStasisChamberComplete;
 trigger gt_ObjectiveFindFrozenZergCreate;
 trigger gt_ObjectiveFindFrozenZergUpdate;
@@ -3213,7 +3223,7 @@ bool gt_RescueFrozenZergExpansion_Func (bool testConds, bool runActions) {
     libSwaC_gf_PingMinimapCampaign(PlayerGroupSingle(gv_pLAYER_01_USER), UnitGetPosition(UnitFromId(1)), 2.0, Color(0.00, 100.00, 0.00));
     UIAlertUnit("Trigger", gv_pLAYER_01_USER, StringExternal("Param/Value/66AC2FE8"), null, UnitFromId(1));
     TriggerExecute(gt_TransmissionFrozenBaseRescuedQ, true, false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(5);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FROZEN_EXPANSION);
     TriggerExecute(gt_ObjectiveFindFrozenZergBaseComplete, true, false);
     auto5E51DAD4_g = UnitGroup(null, gv_pLAYER_07_FROZENZERG, RegionFromId(13), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
     auto5E51DAD4_u = UnitGroupCount(auto5E51DAD4_g, c_unitCountAll);
@@ -4407,7 +4417,7 @@ bool gt_VictoryDockingBaysDestroyed_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     if ((gv_shuttleWavesRemaining > 4)) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(4);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_DESTROY_4_SHUTTLES);
     }
 
     libSwaC_gf_UpdateMissionObjectiveText("ZExpedition02Objective2", 0, false, StringExternal("Param/Value/DCC58208"));
@@ -4439,7 +4449,7 @@ bool gt_VictorySequence_Func (bool testConds, bool runActions) {
         return true;
     }
 
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory);
     gv_gameOver = true;
     SoundtrackPlay(PlayerGroupAll(), c_soundtrackCategoryMusic, "ZExpedition02MusicCutscene_MissionVictoryStinger", c_soundtrackCueAny, c_soundtrackIndexAny, false);
     if ((UnitIsAlive(gv_kerrigan) == true)) {
@@ -4476,7 +4486,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    if ((ObjectiveGetState(gv_objectiveDestroyDominionBase) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveNoShuttleCanEscape) == c_objectiveStateCompleted)) {
+    if ((ObjectiveGetState(gv_objectiveDestroyAllProtossShuttles) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveNoShuttleCanEscape) == c_objectiveStateCompleted)) {
         libSwaC_gf_CampaignAwardAchievement("ZKaldir02_1", gv_pLAYER_01_USER);
     }
 
@@ -4765,8 +4775,12 @@ bool gt_ObjectiveDestroyAllProtossShuttlesCreate_Func (bool testConds, bool runA
 
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition02Objective2");
-    gv_objectiveDestroyDominionBase = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition02Objective2", gf_Objective_LabelText(), gv_shuttleWavesRemaining);
+    gv_objectiveDestroyAllProtossShuttles = ObjectiveLastCreated();
+    ObjectiveShow(gv_objectiveDestroyAllProtossShuttles, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyAllProtossShuttles, lib5BD4895D_ge_APObjectiveCategory_Primary, gf_Objective_LabelText(), gv_shuttleWavesRemaining, 0, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyAllProtossShuttles, gv_LOCATION_ID_DESTROY_4_SHUTTLES);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyAllProtossShuttles, lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyAllProtossShuttles, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -4808,14 +4822,14 @@ bool gt_ObjectiveDestroyAllProtossShuttlesUpdate_Func (bool testConds, bool runA
 
     TriggerExecute(gt_ObjectiveDestroyAllProtossShuttlesCreate, true, false);
     gv_shuttleWavesRemaining -= 1;
-    lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase, gf_Objective_LabelText());
-    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase, gv_shuttleWavesRemaining);
+    lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyAllProtossShuttles, gf_Objective_LabelText());
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyAllProtossShuttles, gv_shuttleWavesRemaining);
     if ((gv_shuttleWavesRemaining <= 0)) {
         TriggerExecute(gt_VictorySequence, true, false);
     }
 
     if ((gv_shuttleWavesRemaining == 4)) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(4);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_DESTROY_4_SHUTTLES);
     }
 
     return true;
@@ -4846,7 +4860,7 @@ bool gt_ObjectiveDestroyAllProtossShuttlesComplete_Func (bool testConds, bool ru
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyAllProtossShuttlesCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyAllProtossShuttles);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -4875,7 +4889,7 @@ bool gt_ObjectiveDestroyAllProtossShuttlesFailed_Func (bool testConds, bool runA
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyAllProtossShuttlesCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase);
+    lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyAllProtossShuttles);
     return true;
 }
 
@@ -4904,7 +4918,9 @@ bool gt_ObjectiveNoShuttleCanEscapeCreate_Func (bool testConds, bool runActions)
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition02Objective3");
     gv_objectiveNoShuttleCanEscape = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition02Objective3", "", 0);
+    ObjectiveShow(gv_objectiveNoShuttleCanEscape, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveNoShuttleCanEscape, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveNoShuttleCanEscape, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -4933,7 +4949,7 @@ bool gt_ObjectiveNoShuttleCanEscapeComplete_Func (bool testConds, bool runAction
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveNoShuttleCanEscapeCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyAllProtossShuttles);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -4977,7 +4993,13 @@ void gt_ObjectiveNoShuttleCanEscapeFailed_Init () {
 // Trigger: Objective Destroy Stasis Chamber Create
 //--------------------------------------------------------------------------------------------------
 bool gt_ObjectiveDestroyStasisChamberCreate_Func (bool testConds, bool runActions) {
+    // Variable Declarations
+    int lv_category;
+
     // Automatic Variable Declarations
+    // Variable Initialization
+    lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary;
+
     // Conditions
     if (testConds) {
         if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
@@ -4993,7 +5015,12 @@ bool gt_ObjectiveDestroyStasisChamberCreate_Func (bool testConds, bool runAction
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZExpedition02Objective1");
     gv_objectiveBonusDestroyStasisChamber = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition02Objective1", "", 0);
+    ObjectiveShow(gv_objectiveBonusDestroyStasisChamber, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveBonusDestroyStasisChamber, lv_category, "", gv_stasisChamberDestroyed, libSwaC_gf_MissionObjectiveItemCount("ZExpedition02Objective1"), true);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveBonusDestroyStasisChamber, gv_LOCATION_ID_EAST_STATIS_CHAMBER);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveBonusDestroyStasisChamber, gv_LOCATION_ID_CENTER_STATIS_CHAMBER);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveBonusDestroyStasisChamber, gv_LOCATION_ID_WEST_STATIS_CHAMBER);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveBonusDestroyStasisChamber, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -5030,6 +5057,39 @@ void gt_ObjectiveDestroyStasisChamberUpdate_Init () {
     gt_ObjectiveDestroyStasisChamberUpdate = TriggerCreate("gt_ObjectiveDestroyStasisChamberUpdate_Func");
 }
 
+//--------------------------------------------------------------------------------------------------
+// Trigger: Objective Destroy Statis Chamber Deactivate
+//--------------------------------------------------------------------------------------------------
+bool gt_ObjectiveDestroyStatisChamberDeactivate_Func (bool testConds, bool runActions) {
+    // Automatic Variable Declarations
+    // Conditions
+    if (testConds) {
+        if (!(((lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_EAST_STATIS_CHAMBER] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_CENTER_STATIS_CHAMBER] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_WEST_STATIS_CHAMBER] == false)))) {
+            return false;
+        }
+    }
+
+    // Actions
+    if (!runActions) {
+        return true;
+    }
+
+    TriggerEnable(gt_ObjectiveDestroyStasisChamberCreate, false);
+    TriggerEnable(gt_ObjectiveDestroyStasisChamberUpdate, false);
+    TriggerEnable(gt_TransmissionStasisChamberIntroQ, false);
+    TriggerEnable(gt_TransmissionStasisChamberDestroyedQ, false);
+    TriggerEnable(gt_StasisChamberDestroyed, false);
+    TriggerEnable(gt_ShowBonusObjectiveProximity, false);
+    TriggerEnable(gt_BonusObjectiveIntroQ, false);
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void gt_ObjectiveDestroyStatisChamberDeactivate_Init () {
+    gt_ObjectiveDestroyStatisChamberDeactivate = TriggerCreate("gt_ObjectiveDestroyStatisChamberDeactivate_Func");
+    TriggerAddEventTimeElapsed(gt_ObjectiveDestroyStatisChamberDeactivate, 2.0, c_timeGame);
+}
+
 //--------------------------------------------------------------------------------------------------
 // Trigger: Objective Destroy Stasis Chamber Complete
 //--------------------------------------------------------------------------------------------------
@@ -5063,7 +5123,13 @@ void gt_ObjectiveDestroyStasisChamberComplete_Init () {
 // Trigger: Objective Find Frozen Zerg Create
 //--------------------------------------------------------------------------------------------------
 bool gt_ObjectiveFindFrozenZergCreate_Func (bool testConds, bool runActions) {
+    // Variable Declarations
+    int lv_category;
+
     // Automatic Variable Declarations
+    // Variable Initialization
+    lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra;
+
     // Conditions
     if (testConds) {
         if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
@@ -5077,9 +5143,14 @@ bool gt_ObjectiveFindFrozenZergCreate_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    ObjectiveCreate(StringExternal("Param/Value/2AB0D04A"), StringToText(""), c_objectiveStateActive, false);
+    ObjectiveCreate(StringExternal("Param/Value/2AB0D04A"), StringToText(""), c_objectiveStateHidden, false);
     gv_objectiveFindFrozenZerg = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(gv_objectiveFindFrozenZerg, "", gv_objectiveFindFrozenZergFound, gv_objectiveFindFrozenZergTotal);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveFindFrozenZerg, lv_category, "", gv_objectiveFindFrozenZergFound, gv_objectiveFindFrozenZergTotal, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZerg, gv_LOCATION_ID_EAST_FROZEN_ZERG);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZerg, gv_LOCATION_ID_WEST_FROZEN_ZERG);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZerg, gv_LOCATION_ID_SOUTHEAST_FROZEN_ZERG);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZerg, gv_LOCATION_ID_SOUTHWEST_FROZEN_ZERG);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindFrozenZerg, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -5154,7 +5225,13 @@ void gt_ObjectiveFindFrozenZergComplete_Init () {
 // Trigger: Objective Find Frozen Zerg Base Create
 //--------------------------------------------------------------------------------------------------
 bool gt_ObjectiveFindFrozenZergBaseCreate_Func (bool testConds, bool runActions) {
+    // Variable Declarations
+    int lv_category;
+
     // Automatic Variable Declarations
+    // Variable Initialization
+    lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra;
+
     // Conditions
     if (testConds) {
         if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
@@ -5168,9 +5245,11 @@ bool gt_ObjectiveFindFrozenZergBaseCreate_Func (bool testConds, bool runActions)
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    ObjectiveCreate(StringExternal("Param/Value/43CE71A7"), StringToText(""), c_objectiveStateActive, false);
+    ObjectiveCreate(StringExternal("Param/Value/43CE71A7"), StringToText(""), c_objectiveStateHidden, false);
     gv_objectiveFindFrozenZergBase = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveSimple(gv_objectiveFindFrozenZergBase);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveFindFrozenZergBase, lv_category, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZergBase, gv_LOCATION_ID_FROZEN_EXPANSION);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindFrozenZergBase, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6077,7 +6156,7 @@ bool gt_StasisChamberDestroyedEast_Func (bool testConds, bool runActions) {
         return true;
     }
 
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(1);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_STATIS_CHAMBER);
     return true;
 }
 
@@ -6108,7 +6187,7 @@ bool gt_StasisChamberDestroyedCenter_Func (bool testConds, bool runActions) {
         return true;
     }
 
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(2);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_CENTER_STATIS_CHAMBER);
     return true;
 }
 
@@ -6139,7 +6218,7 @@ bool gt_StasisChamberDestroyedWest_Func (bool testConds, bool runActions) {
         return true;
     }
 
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(3);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_STATIS_CHAMBER);
     return true;
 }
 
@@ -6179,7 +6258,7 @@ bool gt_SouthwestFrozenZerg_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(6);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_FROZEN_ZERG);
     TriggerExecute(gt_ObjectiveFindFrozenZergUpdate, true, false);
     return true;
 }
@@ -6220,7 +6299,7 @@ bool gt_WestFrozenZerg_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(8);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_FROZEN_ZERG);
     TriggerExecute(gt_ObjectiveFindFrozenZergUpdate, true, false);
     return true;
 }
@@ -6261,7 +6340,7 @@ bool gt_SoutheastFrozenZerg_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(7);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHEAST_FROZEN_ZERG);
     TriggerExecute(gt_ObjectiveFindFrozenZergUpdate, true, false);
     return true;
 }
@@ -6302,7 +6381,7 @@ bool gt_EastFrozenZerg_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(9);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_FROZEN_ZERG);
     TriggerExecute(gt_ObjectiveFindFrozenZergUpdate, true, false);
     return true;
 }
@@ -6410,6 +6489,7 @@ void InitTriggers () {
     gt_ObjectiveNoShuttleCanEscapeFailed_Init();
     gt_ObjectiveDestroyStasisChamberCreate_Init();
     gt_ObjectiveDestroyStasisChamberUpdate_Init();
+    gt_ObjectiveDestroyStatisChamberDeactivate_Init();
     gt_ObjectiveDestroyStasisChamberComplete_Init();
     gt_ObjectiveFindFrozenZergCreate_Init();
     gt_ObjectiveFindFrozenZergUpdate_Init();
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Preload.xml
index f506ee230..d835a1395 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Preload.xml
+++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Preload.xml
@@ -40,9 +40,6 @@
 <Behavior id="AP_makeCreep8x6Enhanced"/>
 <Model id="MinimapPing"/>
 <Model id="PingArrow"/>
-<Objective id="ZExpedition02Objective2"/>
-<Objective id="ZExpedition02Objective1"/>
-<Objective id="ZExpedition02Objective3"/>
 <Sound id="UI_TerranRescueUnit"/>
 <Sound id="Hybrid_Blink"/>
 <Sound id="UI_ZergWarning"/>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers
index 09ede69ab..ad03cb49f 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers
@@ -21875,7 +21875,7 @@
         <Action Type="FunctionCall" Id="EDF07726"/>
         <Action Type="Comment" Id="49F86D32"/>
         <Action Type="FunctionCall" Id="CF82C8E8"/>
-        <Action Type="FunctionCall" Id="0CDFB81E"/>
+        <Action Type="FunctionCall" Id="D456673C"/>
         <Action Type="FunctionCall" Id="68FE2C38"/>
         <Action Type="FunctionCall" Id="5E51DAD4"/>
         <Action Type="FunctionCall" Id="51E66347"/>
@@ -22270,14 +22270,13 @@
         <ValueType Type="trigger"/>
         <ValueElement Type="Trigger" Id="02374D46"/>
     </Element>
-    <Element Type="FunctionCall" Id="0CDFB81E">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="729E4369"/>
+    <Element Type="FunctionCall" Id="D456673C">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="29530CEC"/>
     </Element>
-    <Element Type="Param" Id="729E4369">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>5</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="29530CEC">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="333CBF01"/>
     </Element>
     <Element Type="FunctionCall" Id="68FE2C38">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
@@ -29018,18 +29017,17 @@
     </Element>
     <Element Type="FunctionCall" Id="393C1DF8">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-        <FunctionCall Type="FunctionCall" Id="403D5EC1"/>
+        <FunctionCall Type="FunctionCall" Id="57EE8898"/>
         <FunctionCall Type="FunctionCall" Id="C1391E64"/>
     </Element>
-    <Element Type="FunctionCall" Id="403D5EC1">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
+    <Element Type="FunctionCall" Id="57EE8898">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        <Parameter Type="Param" Id="CF47CD6E"/>
+        <Parameter Type="Param" Id="7B69CB36"/>
     </Element>
-    <Element Type="Param" Id="CF47CD6E">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>4</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="7B69CB36">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="6B8AA530"/>
     </Element>
     <Element Type="FunctionCall" Id="C1391E64">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
@@ -29112,7 +29110,7 @@
     </Element>
     <Element Type="Trigger" Id="24867130">
         <Condition Type="FunctionCall" Id="AEF19B6C"/>
-        <Action Type="FunctionCall" Id="D9A2D72E"/>
+        <Action Type="FunctionCall" Id="148BE5B5"/>
         <Action Type="FunctionCall" Id="6BBDD572"/>
         <Action Type="FunctionCall" Id="ED4617EC"/>
         <Action Type="FunctionCall" Id="519D881F"/>
@@ -29141,12 +29139,12 @@
         <Value>false</Value>
         <ValueType Type="bool"/>
     </Element>
-    <Element Type="FunctionCall" Id="D9A2D72E">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="026D336A"/>
+    <Element Type="FunctionCall" Id="148BE5B5">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="8DE9128E"/>
     </Element>
-    <Element Type="Param" Id="026D336A">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
+    <Element Type="Param" Id="8DE9128E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
         <Variable Type="Variable" Library="5BD4895D" Id="377FF870"/>
     </Element>
     <Element Type="FunctionCall" Id="6BBDD572">
@@ -31042,7 +31040,6 @@
         <ValueGameType Type="Unit"/>
     </Element>
     <Element Type="Variable" Id="A561A5D7">
-        <Identifier>objectiveDestroyDominionBase</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -31120,8 +31117,11 @@
         <Action Type="Comment" Id="94F5A256"/>
         <Action Type="FunctionCall" Id="EA06D44B"/>
         <Action Type="FunctionCall" Id="37FB27E1"/>
-        <Action Type="FunctionCall" Id="81D8C3B3"/>
-        <Action Type="FunctionCall" Id="06F432CC"/>
+        <Action Type="FunctionCall" Id="33C8E0C5"/>
+        <Action Type="FunctionCall" Id="05752FDE"/>
+        <Action Type="FunctionCall" Id="E659C78B"/>
+        <Action Type="FunctionCall" Id="F3DA9AF6"/>
+        <Action Type="FunctionCall" Id="FF7492C6"/>
         <Action Type="FunctionCall" Id="BF6AF593"/>
     </Element>
     <Element Type="FunctionCall" Id="7BB98D85">
@@ -31201,65 +31201,103 @@
     <Element Type="FunctionCall" Id="56A6A13D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="81D8C3B3">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="3F7CF15D"/>
-        <Parameter Type="Param" Id="12D0CB25"/>
-        <Parameter Type="Param" Id="41ED9DAF"/>
-        <Parameter Type="Param" Id="4F7D1471"/>
-        <Parameter Type="Param" Id="EDF52A4A"/>
+    <Element Type="FunctionCall" Id="33C8E0C5">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="284CB5EB"/>
+        <Parameter Type="Param" Id="153062D6"/>
+        <Parameter Type="Param" Id="D14EDB0A"/>
     </Element>
-    <Element Type="Param" Id="12D0CB25">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="5CF39120"/>
-        <Value>ZExpedition02Objective2</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="284CB5EB">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="E8954A74"/>
     </Element>
-    <Element Type="Param" Id="41ED9DAF">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="477FB1FF"/>
-        <Variable Type="Variable" Id="E831172A"/>
+    <Element Type="FunctionCall" Id="E8954A74">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="4F7D1471">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="40152177"/>
+    <Element Type="Param" Id="153062D6">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="EDF52A4A">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="30CEDFE3"/>
-        <FunctionCall Type="FunctionCall" Id="56EEB969"/>
+    <Element Type="Param" Id="D14EDB0A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="A561A5D7"/>
+    </Element>
+    <Element Type="FunctionCall" Id="05752FDE">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="FF39016B"/>
+        <Parameter Type="Param" Id="724E1AE6"/>
+        <Parameter Type="Param" Id="7B8D2CA4"/>
+        <Parameter Type="Param" Id="E5F5D621"/>
+        <Parameter Type="Param" Id="730EEB2A"/>
+        <Parameter Type="Param" Id="BF5DC945"/>
+    </Element>
+    <Element Type="Param" Id="FF39016B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
+        <Variable Type="Variable" Id="A561A5D7"/>
     </Element>
-    <Element Type="FunctionCall" Id="56EEB969">
+    <Element Type="Param" Id="724E1AE6">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
+        <FunctionCall Type="FunctionCall" Id="CDACB7C8"/>
+    </Element>
+    <Element Type="FunctionCall" Id="CDACB7C8">
         <FunctionDef Type="FunctionDef" Id="CDF82198"/>
     </Element>
-    <Element Type="FunctionCall" Id="06F432CC">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="59FEBCD7"/>
-        <Parameter Type="Param" Id="54E0601F"/>
-        <Parameter Type="Param" Id="801254B7"/>
-        <Parameter Type="Param" Id="2F554756"/>
+    <Element Type="Param" Id="7B8D2CA4">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
+        <Variable Type="Variable" Id="E831172A"/>
     </Element>
-    <Element Type="Param" Id="59FEBCD7">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="5872997C"/>
+    <Element Type="Param" Id="E5F5D621">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
+        <Value>0</Value>
+        <ValueType Type="int"/>
     </Element>
-    <Element Type="FunctionCall" Id="5872997C">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="Param" Id="730EEB2A">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
     </Element>
-    <Element Type="Param" Id="54E0601F">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition02Objective2</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="BF5DC945">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
     </Element>
-    <Element Type="Param" Id="801254B7">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <FunctionCall Type="FunctionCall" Id="8C04A1A0"/>
+    <Element Type="FunctionCall" Id="E659C78B">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="7DCFAD12"/>
+        <Parameter Type="Param" Id="6B12869C"/>
     </Element>
-    <Element Type="FunctionCall" Id="8C04A1A0">
-        <FunctionDef Type="FunctionDef" Id="CDF82198"/>
+    <Element Type="Param" Id="7DCFAD12">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="A561A5D7"/>
     </Element>
-    <Element Type="Param" Id="2F554756">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Variable Type="Variable" Id="E831172A"/>
+    <Element Type="Param" Id="6B12869C">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="6B8AA530"/>
+    </Element>
+    <Element Type="FunctionCall" Id="F3DA9AF6">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="AAFBFB5E"/>
+        <Parameter Type="Param" Id="F92DA24A"/>
+    </Element>
+    <Element Type="Param" Id="AAFBFB5E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="A561A5D7"/>
+    </Element>
+    <Element Type="Param" Id="F92DA24A">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Library="5BD4895D" Id="377FF870"/>
+    </Element>
+    <Element Type="FunctionCall" Id="FF7492C6">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="7FB9A624"/>
+        <Parameter Type="Param" Id="D012BD9F"/>
+    </Element>
+    <Element Type="Param" Id="7FB9A624">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="A561A5D7"/>
+    </Element>
+    <Element Type="Param" Id="D012BD9F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="BF6AF593">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -31283,7 +31321,6 @@
         <Action Type="Comment" Id="D38BBB92"/>
         <Action Type="FunctionCall" Id="DE6B2230"/>
         <Action Type="FunctionCall" Id="62C35851"/>
-        <Action Type="FunctionCall" Id="CDD082D5"/>
         <Action Type="FunctionCall" Id="495EFB43"/>
         <Action Type="FunctionCall" Id="1842BA9E"/>
         <Action Type="FunctionCall" Id="C0C86670"/>
@@ -31436,35 +31473,6 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="7B3B0884"/>
         <Variable Type="Variable" Id="E831172A"/>
     </Element>
-    <Element Type="FunctionCall" Id="CDD082D5">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="3F7CF15D"/>
-        <Parameter Type="Param" Id="A418E6DE"/>
-        <Parameter Type="Param" Id="6AEFD94A"/>
-        <Parameter Type="Param" Id="7C4BAF76"/>
-        <Parameter Type="Param" Id="67B5C25E"/>
-    </Element>
-    <Element Type="Param" Id="A418E6DE">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="5CF39120"/>
-        <Value>ZExpedition02Objective2</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="6AEFD94A">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="477FB1FF"/>
-        <Variable Type="Variable" Id="E831172A"/>
-    </Element>
-    <Element Type="Param" Id="7C4BAF76">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="40152177"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
-    </Element>
-    <Element Type="Param" Id="67B5C25E">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="30CEDFE3"/>
-        <FunctionCall Type="FunctionCall" Id="0B446F97"/>
-    </Element>
-    <Element Type="FunctionCall" Id="0B446F97">
-        <FunctionDef Type="FunctionDef" Id="CDF82198"/>
-    </Element>
     <Element Type="FunctionCall" Id="495EFB43">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="B6C980F1"/>
         <Parameter Type="Param" Id="C534F82C"/>
@@ -31541,18 +31549,17 @@
     </Element>
     <Element Type="FunctionCall" Id="28C937AC">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
-        <FunctionCall Type="FunctionCall" Id="11B2C504"/>
+        <FunctionCall Type="FunctionCall" Id="83CF5539"/>
         <FunctionCall Type="FunctionCall" Id="6BFEE917"/>
     </Element>
-    <Element Type="FunctionCall" Id="11B2C504">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
+    <Element Type="FunctionCall" Id="83CF5539">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
-        <Parameter Type="Param" Id="4005C78A"/>
+        <Parameter Type="Param" Id="E6A4A510"/>
     </Element>
-    <Element Type="Param" Id="4005C78A">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>4</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="E6A4A510">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="6B8AA530"/>
     </Element>
     <Element Type="FunctionCall" Id="6BFEE917">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
@@ -31791,7 +31798,9 @@
         <Action Type="Comment" Id="9023619E"/>
         <Action Type="FunctionCall" Id="44E33156"/>
         <Action Type="FunctionCall" Id="FD5E0D95"/>
-        <Action Type="FunctionCall" Id="B0868525"/>
+        <Action Type="FunctionCall" Id="45E77390"/>
+        <Action Type="FunctionCall" Id="D3DA11DD"/>
+        <Action Type="FunctionCall" Id="157101B9"/>
         <Action Type="FunctionCall" Id="9B9CEF17"/>
     </Element>
     <Element Type="FunctionCall" Id="1335DF1C">
@@ -31871,34 +31880,58 @@
     <Element Type="FunctionCall" Id="491DB1BE">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="B0868525">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="851DF297"/>
-        <Parameter Type="Param" Id="023D92A3"/>
-        <Parameter Type="Param" Id="89D468A1"/>
-        <Parameter Type="Param" Id="C3C83491"/>
+    <Element Type="FunctionCall" Id="45E77390">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="6413EA8F"/>
+        <Parameter Type="Param" Id="9DB29EB5"/>
+        <Parameter Type="Param" Id="1C2B1460"/>
     </Element>
-    <Element Type="Param" Id="851DF297">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="F4FCBE9F"/>
+    <Element Type="Param" Id="6413EA8F">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="54027045"/>
     </Element>
-    <Element Type="FunctionCall" Id="F4FCBE9F">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="54027045">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="023D92A3">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
-        <Value>ZExpedition02Objective3</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="Param" Id="9DB29EB5">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="89D468A1">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="1C2B1460">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="9A086BCF"/>
     </Element>
-    <Element Type="Param" Id="C3C83491">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="FunctionCall" Id="D3DA11DD">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="F682C27B"/>
+        <Parameter Type="Param" Id="84511292"/>
+        <Parameter Type="Param" Id="A2452822"/>
+    </Element>
+    <Element Type="Param" Id="F682C27B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="9A086BCF"/>
+    </Element>
+    <Element Type="Param" Id="84511292">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="A2452822">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="157101B9">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="1654C69D"/>
+        <Parameter Type="Param" Id="018926F9"/>
+    </Element>
+    <Element Type="Param" Id="1654C69D">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="9A086BCF"/>
+    </Element>
+    <Element Type="Param" Id="018926F9">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="9B9CEF17">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -32147,6 +32180,7 @@
         <Item Type="Variable" Id="81FDE8CF"/>
         <Item Type="Trigger" Id="C0882E73"/>
         <Item Type="Trigger" Id="62A71978"/>
+        <Item Type="Trigger" Id="47552536"/>
         <Item Type="Trigger" Id="09F02B3B"/>
     </Element>
     <Element Type="Variable" Id="81FDE8CF">
@@ -32159,15 +32193,30 @@
         <Preset Type="PresetValue" Library="Ntve" Id="91651C80"/>
     </Element>
     <Element Type="Trigger" Id="C0882E73">
+        <Variable Type="Variable" Id="89A97B10"/>
         <Condition Type="FunctionCall" Id="D551A308"/>
         <Action Type="FunctionCall" Id="F716F248"/>
         <Action Type="Comment" Id="51218C5B"/>
         <Action Type="FunctionCall" Id="83417C62"/>
         <Action Type="FunctionCall" Id="194F68BF"/>
-        <Action Type="FunctionCall" Id="503301BF"/>
-        <Action Type="FunctionCall" Id="A425E526"/>
+        <Action Type="FunctionCall" Id="16891838"/>
+        <Action Type="FunctionCall" Id="D4DF7405"/>
+        <Action Type="FunctionCall" Id="60F3EE1C"/>
+        <Action Type="FunctionCall" Id="DE4283AC"/>
+        <Action Type="FunctionCall" Id="FD80FDDE"/>
+        <Action Type="FunctionCall" Id="8EB78B28"/>
         <Action Type="FunctionCall" Id="F41AFBEA"/>
     </Element>
+    <Element Type="Variable" Id="89A97B10">
+        <VariableType>
+            <Type Value="preset"/>
+            <TypeElement Type="Preset" Library="5BD4895D" Id="41ABCC70"/>
+        </VariableType>
+        <Value Type="Param" Id="6A0ED993"/>
+    </Element>
+    <Element Type="Param" Id="6A0ED993">
+        <Preset Type="PresetValue" Library="5BD4895D" Id="4D047463"/>
+    </Element>
     <Element Type="FunctionCall" Id="D551A308">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
         <Parameter Type="Param" Id="D42DAA39"/>
@@ -32245,66 +32294,122 @@
     <Element Type="FunctionCall" Id="69FFE14B">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="503301BF">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="SwaC" Id="BA9E1E49"/>
-        <Parameter Type="Param" Id="34FFF815"/>
-        <Parameter Type="Param" Id="95D4AFF8"/>
-        <Parameter Type="Param" Id="DE9309FC"/>
-        <Parameter Type="Param" Id="1A6522A3"/>
-        <Parameter Type="Param" Id="D36667D9"/>
-    </Element>
-    <Element Type="Param" Id="34FFF815">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="2581C7DF"/>
-        <Value>ZExpedition02Objective1</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
+    <Element Type="FunctionCall" Id="16891838">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="F6D1F5EB"/>
+        <Parameter Type="Param" Id="A8AF9C04"/>
+        <Parameter Type="Param" Id="0FD98602"/>
     </Element>
-    <Element Type="Param" Id="95D4AFF8">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BA589D1A"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="F6D1F5EB">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="FAF475D0"/>
     </Element>
-    <Element Type="Param" Id="DE9309FC">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="EC6CD314"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    <Element Type="FunctionCall" Id="FAF475D0">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
     </Element>
-    <Element Type="Param" Id="1A6522A3">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="BBBEE37A"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="50BDC6EF"/>
+    <Element Type="Param" Id="A8AF9C04">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
     </Element>
-    <Element Type="Param" Id="D36667D9">
-        <ParameterDef Type="ParamDef" Library="SwaC" Id="93B1287F"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
+    <Element Type="Param" Id="0FD98602">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="81FDE8CF"/>
+    </Element>
+    <Element Type="FunctionCall" Id="D4DF7405">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="A2335247"/>
+        <Parameter Type="Param" Id="E445EF8F"/>
+        <Parameter Type="Param" Id="218C7EC5"/>
+        <Parameter Type="Param" Id="2D530251"/>
+        <Parameter Type="Param" Id="3DF588D2"/>
+        <Parameter Type="Param" Id="5C137D8B"/>
+    </Element>
+    <Element Type="Param" Id="A2335247">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
+        <Variable Type="Variable" Id="81FDE8CF"/>
     </Element>
-    <Element Type="FunctionCall" Id="A425E526">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="564FE692"/>
-        <Parameter Type="Param" Id="C7F85114"/>
-        <Parameter Type="Param" Id="DFE01B5B"/>
-        <Parameter Type="Param" Id="A7F386F3"/>
+    <Element Type="Param" Id="E445EF8F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
+        <ValueType Type="string"/>
     </Element>
-    <Element Type="Param" Id="564FE692">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="2139B68C"/>
+    <Element Type="Param" Id="218C7EC5">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
+        <Variable Type="Variable" Id="EB8E8AA8"/>
     </Element>
-    <Element Type="FunctionCall" Id="2139B68C">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="Param" Id="2D530251">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
+        <FunctionCall Type="FunctionCall" Id="78763A36"/>
     </Element>
-    <Element Type="Param" Id="C7F85114">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
+    <Element Type="FunctionCall" Id="78763A36">
+        <FunctionDef Type="FunctionDef" Library="SwaC" Id="02BE9261"/>
+        <Parameter Type="Param" Id="A5EC7681"/>
+    </Element>
+    <Element Type="Param" Id="A5EC7681">
+        <ParameterDef Type="ParamDef" Library="SwaC" Id="D3053498"/>
         <Value>ZExpedition02Objective1</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Objective"/>
     </Element>
-    <Element Type="Param" Id="DFE01B5B">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
-        <ValueType Type="string"/>
+    <Element Type="Param" Id="3DF588D2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>true</Value>
+        <ValueType Type="bool"/>
     </Element>
-    <Element Type="Param" Id="A7F386F3">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
-        <Value>0</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="5C137D8B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Variable Type="Variable" Id="89A97B10"/>
+    </Element>
+    <Element Type="FunctionCall" Id="60F3EE1C">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="7E1EF71F"/>
+        <Parameter Type="Param" Id="391935E2"/>
+    </Element>
+    <Element Type="Param" Id="7E1EF71F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="81FDE8CF"/>
+    </Element>
+    <Element Type="Param" Id="391935E2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="E6928370"/>
+    </Element>
+    <Element Type="FunctionCall" Id="DE4283AC">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="7A7B3534"/>
+        <Parameter Type="Param" Id="3E2533D8"/>
+    </Element>
+    <Element Type="Param" Id="7A7B3534">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="81FDE8CF"/>
+    </Element>
+    <Element Type="Param" Id="3E2533D8">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="B95B0121"/>
+    </Element>
+    <Element Type="FunctionCall" Id="FD80FDDE">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="BD5A6818"/>
+        <Parameter Type="Param" Id="D9DCCCD2"/>
+    </Element>
+    <Element Type="Param" Id="BD5A6818">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="81FDE8CF"/>
+    </Element>
+    <Element Type="Param" Id="D9DCCCD2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="CBA076BE"/>
+    </Element>
+    <Element Type="FunctionCall" Id="8EB78B28">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="992F9949"/>
+        <Parameter Type="Param" Id="8A00DBD5"/>
+    </Element>
+    <Element Type="Param" Id="992F9949">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="81FDE8CF"/>
+    </Element>
+    <Element Type="Param" Id="8A00DBD5">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="FunctionCall" Id="F41AFBEA">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
@@ -32381,6 +32486,207 @@
         <ParameterDef Type="ParamDef" Library="5BD4895D" Id="94108556"/>
         <Variable Type="Variable" Id="EB8E8AA8"/>
     </Element>
+    <Element Type="Trigger" Id="47552536">
+        <Event Type="FunctionCall" Id="A5C5AD7A"/>
+        <Condition Type="FunctionCall" Id="93974E1B"/>
+        <Action Type="FunctionCall" Id="0CF451EB"/>
+        <Action Type="FunctionCall" Id="0776BA4F"/>
+        <Action Type="FunctionCall" Id="06BE474F"/>
+        <Action Type="FunctionCall" Id="6652856E"/>
+        <Action Type="FunctionCall" Id="F0965AA0"/>
+        <Action Type="FunctionCall" Id="08687C4A"/>
+        <Action Type="FunctionCall" Id="67D6110B"/>
+    </Element>
+    <Element Type="FunctionCall" Id="A5C5AD7A">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="BF7A3439"/>
+        <Parameter Type="Param" Id="E96714B0"/>
+        <Parameter Type="Param" Id="962B8FD4"/>
+    </Element>
+    <Element Type="Param" Id="E96714B0">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="D5175014"/>
+        <Value>2.0</Value>
+        <ValueType Type="fixed"/>
+    </Element>
+    <Element Type="Param" Id="962B8FD4">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="BCEBDC95"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
+    </Element>
+    <Element Type="FunctionCall" Id="93974E1B">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000132"/>
+        <FunctionCall Type="FunctionCall" Id="C4A9A61D"/>
+        <FunctionCall Type="FunctionCall" Id="21B12EAA"/>
+        <FunctionCall Type="FunctionCall" Id="4377AC5F"/>
+    </Element>
+    <Element Type="FunctionCall" Id="C4A9A61D">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000002"/>
+        <Parameter Type="Param" Id="B10360A8"/>
+        <Parameter Type="Param" Id="B9424103"/>
+        <Parameter Type="Param" Id="0A915107"/>
+    </Element>
+    <Element Type="Param" Id="B10360A8">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Library="5BD4895D" Id="1FEE1ECF"/>
+        <Array Type="Param" Id="605FEDF1"/>
+    </Element>
+    <Element Type="Param" Id="605FEDF1">
+        <Variable Type="Variable" Id="E6928370"/>
+    </Element>
+    <Element Type="Param" Id="B9424103">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="0A915107">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="FunctionCall" Id="21B12EAA">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000002"/>
+        <Parameter Type="Param" Id="7032C27A"/>
+        <Parameter Type="Param" Id="F7D90425"/>
+        <Parameter Type="Param" Id="70608E26"/>
+    </Element>
+    <Element Type="Param" Id="7032C27A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Library="5BD4895D" Id="1FEE1ECF"/>
+        <Array Type="Param" Id="C6FE18F7"/>
+    </Element>
+    <Element Type="Param" Id="C6FE18F7">
+        <Variable Type="Variable" Id="B95B0121"/>
+    </Element>
+    <Element Type="Param" Id="F7D90425">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="70608E26">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="FunctionCall" Id="4377AC5F">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000002"/>
+        <Parameter Type="Param" Id="09713792"/>
+        <Parameter Type="Param" Id="484F6970"/>
+        <Parameter Type="Param" Id="2E281036"/>
+    </Element>
+    <Element Type="Param" Id="09713792">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Library="5BD4895D" Id="1FEE1ECF"/>
+        <Array Type="Param" Id="F6DAA3CC"/>
+    </Element>
+    <Element Type="Param" Id="F6DAA3CC">
+        <Variable Type="Variable" Id="CBA076BE"/>
+    </Element>
+    <Element Type="Param" Id="484F6970">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="2E281036">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="FunctionCall" Id="0CF451EB">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="41C7488F"/>
+        <Parameter Type="Param" Id="4193FD76"/>
+    </Element>
+    <Element Type="Param" Id="41C7488F">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="C0882E73"/>
+    </Element>
+    <Element Type="Param" Id="4193FD76">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
+    <Element Type="FunctionCall" Id="0776BA4F">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="D6A1419B"/>
+        <Parameter Type="Param" Id="4EAFD627"/>
+    </Element>
+    <Element Type="Param" Id="D6A1419B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="62A71978"/>
+    </Element>
+    <Element Type="Param" Id="4EAFD627">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
+    <Element Type="FunctionCall" Id="06BE474F">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="B6FCC962"/>
+        <Parameter Type="Param" Id="88DF2E6D"/>
+    </Element>
+    <Element Type="Param" Id="B6FCC962">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="EB5B4997"/>
+    </Element>
+    <Element Type="Param" Id="88DF2E6D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
+    <Element Type="FunctionCall" Id="6652856E">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="E9132A73"/>
+        <Parameter Type="Param" Id="463BF528"/>
+    </Element>
+    <Element Type="Param" Id="E9132A73">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="8051A575"/>
+    </Element>
+    <Element Type="Param" Id="463BF528">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
+    <Element Type="FunctionCall" Id="F0965AA0">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="CF121318"/>
+        <Parameter Type="Param" Id="E9E1E955"/>
+    </Element>
+    <Element Type="Param" Id="CF121318">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="1F48077B"/>
+    </Element>
+    <Element Type="Param" Id="E9E1E955">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
+    <Element Type="FunctionCall" Id="08687C4A">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="95CB02B4"/>
+        <Parameter Type="Param" Id="7E21648D"/>
+    </Element>
+    <Element Type="Param" Id="95CB02B4">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="C56F4514"/>
+    </Element>
+    <Element Type="Param" Id="7E21648D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
+    <Element Type="FunctionCall" Id="67D6110B">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
+        <Parameter Type="Param" Id="3FF30676"/>
+        <Parameter Type="Param" Id="DC9D6D32"/>
+    </Element>
+    <Element Type="Param" Id="3FF30676">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000176"/>
+        <ValueType Type="trigger"/>
+        <ValueElement Type="Trigger" Id="28B48E0A"/>
+    </Element>
+    <Element Type="Param" Id="DC9D6D32">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
+    </Element>
     <Element Type="Trigger" Id="09F02B3B">
         <Condition Type="FunctionCall" Id="5A84A714"/>
         <Action Type="FunctionCall" Id="4A3139CB"/>
@@ -32525,14 +32831,30 @@
         <ValueType Type="int"/>
     </Element>
     <Element Type="Trigger" Id="9B0C66D6">
+        <Variable Type="Variable" Id="130228EC"/>
         <Condition Type="FunctionCall" Id="FF43FF85"/>
         <Action Type="FunctionCall" Id="EDDBE6AB"/>
         <Action Type="Comment" Id="15D32191"/>
         <Action Type="FunctionCall" Id="81397105"/>
         <Action Type="FunctionCall" Id="105E8DBD"/>
-        <Action Type="FunctionCall" Id="89F05CDE"/>
+        <Action Type="FunctionCall" Id="4FFC7363"/>
+        <Action Type="FunctionCall" Id="458FDEF3"/>
+        <Action Type="FunctionCall" Id="B050AB89"/>
+        <Action Type="FunctionCall" Id="1F27FF8E"/>
+        <Action Type="FunctionCall" Id="A068C350"/>
+        <Action Type="FunctionCall" Id="0E26DE92"/>
         <Action Type="FunctionCall" Id="815A1ED3"/>
     </Element>
+    <Element Type="Variable" Id="130228EC">
+        <VariableType>
+            <Type Value="preset"/>
+            <TypeElement Type="Preset" Library="5BD4895D" Id="41ABCC70"/>
+        </VariableType>
+        <Value Type="Param" Id="ECA1F842"/>
+    </Element>
+    <Element Type="Param" Id="ECA1F842">
+        <Preset Type="PresetValue" Library="5BD4895D" Id="61BC986C"/>
+    </Element>
     <Element Type="FunctionCall" Id="FF43FF85">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
         <Parameter Type="Param" Id="88AEDDD2"/>
@@ -32597,7 +32919,7 @@
     </Element>
     <Element Type="Param" Id="8687993A">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="BD92541B"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="24E7961A"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000561"/>
     </Element>
     <Element Type="Param" Id="A33B0B80">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="E2D11CC0"/>
@@ -32623,29 +32945,105 @@
     <Element Type="FunctionCall" Id="27F63F8D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="89F05CDE">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="FE1BDA0E"/>
-        <Parameter Type="Param" Id="615D29B5"/>
-        <Parameter Type="Param" Id="C077520C"/>
-        <Parameter Type="Param" Id="001B18EB"/>
-        <Parameter Type="Param" Id="8A8FDCEE"/>
-    </Element>
-    <Element Type="Param" Id="615D29B5">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E909766D"/>
+    <Element Type="FunctionCall" Id="4FFC7363">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="5DFB54DF"/>
+        <Parameter Type="Param" Id="7D30777B"/>
+        <Parameter Type="Param" Id="32D92715"/>
+        <Parameter Type="Param" Id="C8040316"/>
+        <Parameter Type="Param" Id="823F7357"/>
+        <Parameter Type="Param" Id="E1C5E8F5"/>
+    </Element>
+    <Element Type="Param" Id="5DFB54DF">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
         <Variable Type="Variable" Id="A4119AA3"/>
     </Element>
-    <Element Type="Param" Id="C077520C">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2A53C544"/>
+    <Element Type="Param" Id="7D30777B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
         <ValueType Type="string"/>
     </Element>
-    <Element Type="Param" Id="001B18EB">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="097B95D1"/>
+    <Element Type="Param" Id="32D92715">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
         <Variable Type="Variable" Id="448554A3"/>
     </Element>
-    <Element Type="Param" Id="8A8FDCEE">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="D03E7D9C"/>
+    <Element Type="Param" Id="C8040316">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
         <Variable Type="Variable" Id="F3DC9DD8"/>
     </Element>
+    <Element Type="Param" Id="823F7357">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="E1C5E8F5">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Variable Type="Variable" Id="130228EC"/>
+    </Element>
+    <Element Type="FunctionCall" Id="458FDEF3">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="E0C5DE30"/>
+        <Parameter Type="Param" Id="2D72EAE2"/>
+    </Element>
+    <Element Type="Param" Id="E0C5DE30">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="A4119AA3"/>
+    </Element>
+    <Element Type="Param" Id="2D72EAE2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="C03BE7AF"/>
+    </Element>
+    <Element Type="FunctionCall" Id="B050AB89">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="4D8957B6"/>
+        <Parameter Type="Param" Id="17A3D259"/>
+    </Element>
+    <Element Type="Param" Id="4D8957B6">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="A4119AA3"/>
+    </Element>
+    <Element Type="Param" Id="17A3D259">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="EB11954F"/>
+    </Element>
+    <Element Type="FunctionCall" Id="1F27FF8E">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="AB74770D"/>
+        <Parameter Type="Param" Id="D3706326"/>
+    </Element>
+    <Element Type="Param" Id="AB74770D">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="A4119AA3"/>
+    </Element>
+    <Element Type="Param" Id="D3706326">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="60D71325"/>
+    </Element>
+    <Element Type="FunctionCall" Id="A068C350">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="B76B40FF"/>
+        <Parameter Type="Param" Id="C2FEA8D1"/>
+    </Element>
+    <Element Type="Param" Id="B76B40FF">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="A4119AA3"/>
+    </Element>
+    <Element Type="Param" Id="C2FEA8D1">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="F5E886DB"/>
+    </Element>
+    <Element Type="FunctionCall" Id="0E26DE92">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="6B8AAB63"/>
+        <Parameter Type="Param" Id="10AF12AE"/>
+    </Element>
+    <Element Type="Param" Id="6B8AAB63">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="A4119AA3"/>
+    </Element>
+    <Element Type="Param" Id="10AF12AE">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    </Element>
     <Element Type="FunctionCall" Id="815A1ED3">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="03B1199E"/>
@@ -32907,14 +33305,27 @@
         <Preset Type="PresetValue" Library="Ntve" Id="91651C80"/>
     </Element>
     <Element Type="Trigger" Id="96F51698">
+        <Variable Type="Variable" Id="DD3A392C"/>
         <Condition Type="FunctionCall" Id="9FF33E69"/>
         <Action Type="FunctionCall" Id="493087B1"/>
         <Action Type="Comment" Id="27FD1C4B"/>
         <Action Type="FunctionCall" Id="EE73F439"/>
         <Action Type="FunctionCall" Id="39475388"/>
-        <Action Type="FunctionCall" Id="813D7427"/>
+        <Action Type="FunctionCall" Id="5B769EE9"/>
+        <Action Type="FunctionCall" Id="EC67D7D6"/>
+        <Action Type="FunctionCall" Id="0930EB9B"/>
         <Action Type="FunctionCall" Id="46126D75"/>
     </Element>
+    <Element Type="Variable" Id="DD3A392C">
+        <VariableType>
+            <Type Value="preset"/>
+            <TypeElement Type="Preset" Library="5BD4895D" Id="41ABCC70"/>
+        </VariableType>
+        <Value Type="Param" Id="C4AC90DD"/>
+    </Element>
+    <Element Type="Param" Id="C4AC90DD">
+        <Preset Type="PresetValue" Library="5BD4895D" Id="61BC986C"/>
+    </Element>
     <Element Type="FunctionCall" Id="9FF33E69">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
         <Parameter Type="Param" Id="965367CF"/>
@@ -32979,7 +33390,7 @@
     </Element>
     <Element Type="Param" Id="CE5714EF">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="BD92541B"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="24E7961A"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000561"/>
     </Element>
     <Element Type="Param" Id="A121AD5B">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="E2D11CC0"/>
@@ -33005,14 +33416,51 @@
     <Element Type="FunctionCall" Id="B0B70AB8">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="813D7427">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="04D0947E"/>
-        <Parameter Type="Param" Id="BB783EDF"/>
+    <Element Type="FunctionCall" Id="5B769EE9">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
+        <Parameter Type="Param" Id="C1A6EEC6"/>
+        <Parameter Type="Param" Id="529A9FC6"/>
+        <Parameter Type="Param" Id="B0F02A80"/>
+    </Element>
+    <Element Type="Param" Id="C1A6EEC6">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+        <Variable Type="Variable" Id="71AFDBBF"/>
+    </Element>
+    <Element Type="Param" Id="529A9FC6">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="B0F02A80">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+        <Variable Type="Variable" Id="DD3A392C"/>
+    </Element>
+    <Element Type="FunctionCall" Id="EC67D7D6">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="D0131E34"/>
+        <Parameter Type="Param" Id="843E51F8"/>
+    </Element>
+    <Element Type="Param" Id="D0131E34">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="71AFDBBF"/>
+    </Element>
+    <Element Type="Param" Id="843E51F8">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Id="333CBF01"/>
+    </Element>
+    <Element Type="FunctionCall" Id="0930EB9B">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="DAA64CE9"/>
+        <Parameter Type="Param" Id="270E1FCC"/>
     </Element>
-    <Element Type="Param" Id="BB783EDF">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2CEC2675"/>
+    <Element Type="Param" Id="DAA64CE9">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
         <Variable Type="Variable" Id="71AFDBBF"/>
     </Element>
+    <Element Type="Param" Id="270E1FCC">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
+    </Element>
     <Element Type="FunctionCall" Id="46126D75">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="A238133C"/>
@@ -38901,12 +39349,132 @@
         <Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
     </Element>
     <Element Type="Category" Id="F768646C">
+        <Item Type="Category" Id="C385A601"/>
         <Item Type="Category" Id="80D72685"/>
         <Item Type="Trigger" Id="534B103E"/>
         <Item Type="Trigger" Id="68486EF8"/>
         <Item Type="Category" Id="B5BC3B18"/>
         <Item Type="Category" Id="CE208223"/>
     </Element>
+    <Element Type="Category" Id="C385A601">
+        <Item Type="Variable" Id="E6928370"/>
+        <Item Type="Variable" Id="B95B0121"/>
+        <Item Type="Variable" Id="CBA076BE"/>
+        <Item Type="Variable" Id="6B8AA530"/>
+        <Item Type="Variable" Id="333CBF01"/>
+        <Item Type="Variable" Id="F5E886DB"/>
+        <Item Type="Variable" Id="60D71325"/>
+        <Item Type="Variable" Id="EB11954F"/>
+        <Item Type="Variable" Id="C03BE7AF"/>
+    </Element>
+    <Element Type="Variable" Id="E6928370">
+        <Identifier>LOCATION_ID_EAST_STATIS_CHAMBER</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="77CCC99F"/>
+    </Element>
+    <Element Type="Param" Id="77CCC99F">
+        <Value>1</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="B95B0121">
+        <Identifier>LOCATION_ID_CENTER_STATIS_CHAMBER</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="D8C5337E"/>
+    </Element>
+    <Element Type="Param" Id="D8C5337E">
+        <Value>2</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="CBA076BE">
+        <Identifier>LOCATION_ID_WEST_STATIS_CHAMBER</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="B777265F"/>
+    </Element>
+    <Element Type="Param" Id="B777265F">
+        <Value>3</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="6B8AA530">
+        <Identifier>LOCATION_ID_DESTROY_4_SHUTTLES</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="C1ABA7FF"/>
+    </Element>
+    <Element Type="Param" Id="C1ABA7FF">
+        <Value>4</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="333CBF01">
+        <Identifier>LOCATION_ID_FROZEN_EXPANSION</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="1694F13D"/>
+    </Element>
+    <Element Type="Param" Id="1694F13D">
+        <Value>5</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="F5E886DB">
+        <Identifier>LOCATION_ID_SOUTHWEST_FROZEN_ZERG</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="59EE0DDD"/>
+    </Element>
+    <Element Type="Param" Id="59EE0DDD">
+        <Value>6</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="60D71325">
+        <Identifier>LOCATION_ID_SOUTHEAST_FROZEN_ZERG</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="B6F1BF2F"/>
+    </Element>
+    <Element Type="Param" Id="B6F1BF2F">
+        <Value>7</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="EB11954F">
+        <Identifier>LOCATION_ID_WEST_FROZEN_ZERG</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="BA647A75"/>
+    </Element>
+    <Element Type="Param" Id="BA647A75">
+        <Value>8</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Variable" Id="C03BE7AF">
+        <Identifier>LOCATION_ID_EAST_FROZEN_ZERG</Identifier>
+        <VariableType>
+            <Type Value="int"/>
+            <Constant/>
+        </VariableType>
+        <Value Type="Param" Id="FFDF79E1"/>
+    </Element>
+    <Element Type="Param" Id="FFDF79E1">
+        <Value>9</Value>
+        <ValueType Type="int"/>
+    </Element>
     <Element Type="Category" Id="80D72685">
         <Item Type="Trigger" Id="C6122EF4"/>
         <Item Type="Trigger" Id="6DAE0C94"/>
@@ -39262,7 +39830,7 @@
         <Event Type="FunctionCall" Id="107F6BBF"/>
         <Condition Type="FunctionCall" Id="22FD6D23"/>
         <Condition Type="FunctionCall" Id="2866F7C1"/>
-        <Action Type="FunctionCall" Id="59B7DFC4"/>
+        <Action Type="FunctionCall" Id="387E4A6D"/>
     </Element>
     <Element Type="FunctionCall" Id="107F6BBF">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000090"/>
@@ -39311,20 +39879,19 @@
         <Value>false</Value>
         <ValueType Type="bool"/>
     </Element>
-    <Element Type="FunctionCall" Id="59B7DFC4">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="0EB38040"/>
+    <Element Type="FunctionCall" Id="387E4A6D">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="C3E90031"/>
     </Element>
-    <Element Type="Param" Id="0EB38040">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>1</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="C3E90031">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="E6928370"/>
     </Element>
     <Element Type="Trigger" Id="A877A4E5">
         <Event Type="FunctionCall" Id="55458D8B"/>
         <Condition Type="FunctionCall" Id="5C7FBDE4"/>
         <Condition Type="FunctionCall" Id="CC4BEC9E"/>
-        <Action Type="FunctionCall" Id="429F9AD2"/>
+        <Action Type="FunctionCall" Id="50ECD29C"/>
     </Element>
     <Element Type="FunctionCall" Id="55458D8B">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000090"/>
@@ -39373,20 +39940,19 @@
         <Value>false</Value>
         <ValueType Type="bool"/>
     </Element>
-    <Element Type="FunctionCall" Id="429F9AD2">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="BCE48696"/>
+    <Element Type="FunctionCall" Id="50ECD29C">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="3EB0B751"/>
     </Element>
-    <Element Type="Param" Id="BCE48696">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>2</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="3EB0B751">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="B95B0121"/>
     </Element>
     <Element Type="Trigger" Id="02F8C83A">
         <Event Type="FunctionCall" Id="17119A6A"/>
         <Condition Type="FunctionCall" Id="1D37ABD7"/>
         <Condition Type="FunctionCall" Id="29AF360F"/>
-        <Action Type="FunctionCall" Id="AA6EC5F7"/>
+        <Action Type="FunctionCall" Id="BA96DC2E"/>
     </Element>
     <Element Type="FunctionCall" Id="17119A6A">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000090"/>
@@ -39435,14 +40001,13 @@
         <Value>false</Value>
         <ValueType Type="bool"/>
     </Element>
-    <Element Type="FunctionCall" Id="AA6EC5F7">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="C82D7A40"/>
+    <Element Type="FunctionCall" Id="BA96DC2E">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="485B1B89"/>
     </Element>
-    <Element Type="Param" Id="C82D7A40">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>3</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="485B1B89">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="CBA076BE"/>
     </Element>
     <Element Type="Category" Id="CE208223">
         <Item Type="Trigger" Id="BD80F8CE"/>
@@ -39457,7 +40022,7 @@
         <Condition Type="FunctionCall" Id="D64B6389"/>
         <Condition Type="FunctionCall" Id="18C27184"/>
         <Action Type="FunctionCall" Id="5D74B40F"/>
-        <Action Type="FunctionCall" Id="D4C68856"/>
+        <Action Type="FunctionCall" Id="48585175"/>
         <Action Type="FunctionCall" Id="7BA49A7C"/>
     </Element>
     <Element Type="FunctionCall" Id="9A139EA0">
@@ -39603,14 +40168,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="D4C68856">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="9E47C575"/>
+    <Element Type="FunctionCall" Id="48585175">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="7E358677"/>
     </Element>
-    <Element Type="Param" Id="9E47C575">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>6</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="7E358677">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="F5E886DB"/>
     </Element>
     <Element Type="FunctionCall" Id="7BA49A7C">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
@@ -39638,7 +40202,7 @@
         <Condition Type="FunctionCall" Id="92074B07"/>
         <Condition Type="FunctionCall" Id="E2244DFC"/>
         <Action Type="FunctionCall" Id="E2939674"/>
-        <Action Type="FunctionCall" Id="8557422F"/>
+        <Action Type="FunctionCall" Id="A7A60627"/>
         <Action Type="FunctionCall" Id="BF0E1334"/>
     </Element>
     <Element Type="FunctionCall" Id="1C709A5F">
@@ -39784,14 +40348,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="8557422F">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="0FC1E899"/>
+    <Element Type="FunctionCall" Id="A7A60627">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="C3CDE27B"/>
     </Element>
-    <Element Type="Param" Id="0FC1E899">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>8</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="C3CDE27B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="EB11954F"/>
     </Element>
     <Element Type="FunctionCall" Id="BF0E1334">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
@@ -39819,7 +40382,7 @@
         <Condition Type="FunctionCall" Id="A86712BB"/>
         <Condition Type="FunctionCall" Id="780B939B"/>
         <Action Type="FunctionCall" Id="03E27BAF"/>
-        <Action Type="FunctionCall" Id="5E17ABA7"/>
+        <Action Type="FunctionCall" Id="F0BD1BE9"/>
         <Action Type="FunctionCall" Id="23E5A183"/>
     </Element>
     <Element Type="FunctionCall" Id="D748E160">
@@ -39965,14 +40528,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="5E17ABA7">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="4AB3812A"/>
+    <Element Type="FunctionCall" Id="F0BD1BE9">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="8CDECE28"/>
     </Element>
-    <Element Type="Param" Id="4AB3812A">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>7</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="8CDECE28">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="60D71325"/>
     </Element>
     <Element Type="FunctionCall" Id="23E5A183">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
@@ -40000,7 +40562,7 @@
         <Condition Type="FunctionCall" Id="C7F6EC7E"/>
         <Condition Type="FunctionCall" Id="C8256636"/>
         <Action Type="FunctionCall" Id="4FAE1ACD"/>
-        <Action Type="FunctionCall" Id="149A9030"/>
+        <Action Type="FunctionCall" Id="D695B29F"/>
         <Action Type="FunctionCall" Id="66B00ADD"/>
     </Element>
     <Element Type="FunctionCall" Id="DBBD18A9">
@@ -40146,14 +40708,13 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000177"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
-    <Element Type="FunctionCall" Id="149A9030">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="C755178C"/>
+    <Element Type="FunctionCall" Id="D695B29F">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="D07FB07B"/>
     </Element>
-    <Element Type="Param" Id="C755178C">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
-        <Value>9</Value>
-        <ValueType Type="int"/>
+    <Element Type="Param" Id="D07FB07B">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="C03BE7AF"/>
     </Element>
     <Element Type="FunctionCall" Id="66B00ADD">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers.version
index 9ecc46014e0abc22880bf120cc8be7a96f0e9f8c..d72159707a4c8a765ed5c832db60d241f527a88e 100644
GIT binary patch
literal 44
ocmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#2|hfkj{7RNn-@k0I>lEnE(I)

literal 44
pcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(Y{jAf2&6FpUvN0|3`12pRwY

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 455def7f9..7b55615e8 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -24,6 +24,7 @@ Category/Name/B5BC3B18=StasisChambers
 Category/Name/BA8845F8======== GAMEPLAY =======
 Category/Name/BF77F330=Cinematic Variables
 Category/Name/C153E1A7=Shuttles Create Wave
+Category/Name/C385A601=Location IDs
 Category/Name/C4702FF8=Tips
 Category/Name/C807414E=In Combat Check
 Category/Name/CB578672=Stats & Achievements
@@ -136,6 +137,7 @@ Trigger/Name/40309A3D=Transmission: Docking Bay Destroyed Q
 Trigger/Name/40F0BAAD=Shuttle Send Wave 01
 Trigger/Name/45ECFEA1=Transmission: Shuttle Launch 06 Q
 Trigger/Name/46B05084=Transmission: Shuttle Launch 02 Q
+Trigger/Name/47552536=Objective Destroy Statis Chamber Deactivate
 Trigger/Name/49F50C5E=Start Upgrades (Normal)
 Trigger/Name/4C5BC8AB=Create Auto Saves
 Trigger/Name/4DC35103=Initialization
@@ -234,6 +236,7 @@ Variable/Name/04659B11=foreachint_i
 Variable/Name/09444D1B=NexusDestroyedCount
 Variable/Name/0D57D24C=PLAYER_02_SHUTTLE_BLUE
 Variable/Name/0E5CD9F4=Color
+Variable/Name/130228EC=category
 Variable/Name/138D6CA6=FadeDuration
 Variable/Name/13B20AB7=FadeDuration
 Variable/Name/158C0C16=WarningCounter
@@ -255,6 +258,7 @@ Variable/Name/2BCEBA84=lv_EvacPoint
 Variable/Name/2F5310E2=Offset
 Variable/Name/2FAB2529=ShuttleLaunched
 Variable/Name/2FFB52C6=EvacShuttleType
+Variable/Name/333CBF01=LOCATION_ID_FROZEN_EXPANSION
 Variable/Name/34F59F3B=ShuttleStoreDestination_cv
 Variable/Name/350B4BD0=ShuttleIdentifier_cv
 Variable/Name/353DB6C4=ShuttleIDStore_cv
@@ -276,6 +280,8 @@ Variable/Name/56CDE09F=ShuttleShields
 Variable/Name/56DA0A62=Index
 Variable/Name/58112AB7=Warp Away Panel
 Variable/Name/5D0BF7AA=ShuttleUnit
+Variable/Name/60D71325=LOCATION_ID_SOUTHEAST_FROZEN_ZERG
+Variable/Name/6B8AA530=LOCATION_ID_DESTROY_4_SHUTTLES
 Variable/Name/6D28E861=distance chunks
 Variable/Name/6D6BE244=VictoryKerrigan
 Variable/Name/701DC7E9=VictoryZerg
@@ -294,6 +300,7 @@ Variable/Name/81FDE8CF=ObjectiveBonusDestroyStasisChamber
 Variable/Name/840DF5C6=lv_EscortGroup
 Variable/Name/840FA217=AlternateVictory
 Variable/Name/870D84B7=LaunchFacilityType
+Variable/Name/89A97B10=category
 Variable/Name/89C7AFA7=VictoryHiddenUnitGroup
 Variable/Name/89ED41DB=distance between launch and evac
 Variable/Name/8B0AAD5D=LaunchTrans_WAIT
@@ -320,8 +327,10 @@ Variable/Name/AFA3F007=PLAYER_07_FROZENZERG
 Variable/Name/B1FB5E96=StasisChamberPingArray
 Variable/Name/B8217ACA=EscortIncrement
 Variable/Name/B9550754=ShuttleEscapePoint
+Variable/Name/B95B0121=LOCATION_ID_CENTER_STATIS_CHAMBER
 Variable/Name/BDBCDE9D=Movement Speed
 Variable/Name/C029EF92=GameOver
+Variable/Name/C03BE7AF=LOCATION_ID_EAST_FROZEN_ZERG
 Variable/Name/C2C1DB92=Angle
 Variable/Name/C562C2C7=FirstWave
 Variable/Name/C5B854F7=IntroHydras
@@ -329,6 +338,7 @@ Variable/Name/C5C13F2F=ShuttleSpeed
 Variable/Name/C6D054DF=lv_i
 Variable/Name/C6DA6BB9=ProtossPlayers
 Variable/Name/C91BE7B9=Warp Away Value
+Variable/Name/CBA076BE=LOCATION_ID_WEST_STATIS_CHAMBER
 Variable/Name/CF56E621=MapMusicTrack
 Variable/Name/CFC1F25B=C_Height
 Variable/Name/D127C8D0=lv_ShuttlePosition
@@ -336,20 +346,24 @@ Variable/Name/D3B387E2=EscortHeight
 Variable/Name/D572EC45=Radius
 Variable/Name/D626D20A=FeralZergFrozenTotal
 Variable/Name/DCFDBF78=CinematicTempUnits
+Variable/Name/DD3A392C=category
 Variable/Name/DEA0756B=InCinematic
 Variable/Name/DF0722EB=Warp Away ProgressBar
 Variable/Name/E0915EC2=IntroShuttle
 Variable/Name/E188175F=CinematicHiddenUnits
 Variable/Name/E2108845=IntroHydra3
 Variable/Name/E3F61AE1=Soundtrack
+Variable/Name/E6928370=LOCATION_ID_EAST_STATIS_CHAMBER
 Variable/Name/E831172A=ShuttleWavesRemaining
 Variable/Name/E9795B8F=RevealRightGate
 Variable/Name/EA562404=DockingBaysDestroyed
+Variable/Name/EB11954F=LOCATION_ID_WEST_FROZEN_ZERG
 Variable/Name/EB8E8AA8=StasisChamberDestroyed
 Variable/Name/EEFC0270=PLAYER_03_PROTOSS_GREEN
 Variable/Name/F249FE69=index
 Variable/Name/F3DC9DD8=ObjectiveFindFrozenZergTotal
 Variable/Name/F48FF916=currentUnit
+Variable/Name/F5E886DB=LOCATION_ID_SOUTHWEST_FROZEN_ZERG
 Variable/Name/F6F0A545=dist b/w pings
 Variable/Name/FA5B0329=StasisChamberPingIndex
 Variable/Name/FCC975C2=InCombatIndicator