Objective Categorization Update for the Char Storyline

Maps/ArchipelagoCampaign/HotS/ap_domination.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>

Maps/ArchipelagoCampaign/HotS/ap_domination.SC2Map/Preload.xml

@@ -68,10 +68,6 @@
 <Model id="BriefingUnitSelectZergSmall"/>
 <Model id="KerriganSearchImpact"/>
 <Model id="ZagaraEggCollection"/>
-<Objective id="ZChar01Objective1"/>
-<Objective id="ZChar01Objective3"/>
-<Objective id="ZChar01Objective2"/>
-<Objective id="ZChar01Objective5"/>
 <Sound id="UI_TerranPing"/>
 <Sound id="UI_TerranRescueUnit"/>
 <Sound id="UI_ResourcePickup"/>

Maps/ArchipelagoCampaign/HotS/ap_domination.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt

@@ -23,6 +23,7 @@ Param/Value/25B22369=Infested Command Center
 Param/Value/26BD98AC=Zagara Attack
 Param/Value/35A995CA=Move Kerrigan Here
 Param/Value/46C99FA4=An uprooted Spine Crawler can move but not attack. Use Root to enable its attack.
+Param/Value/48E24130=Repel Zagara's Attack
 Param/Value/4C33B895=Infested Command Center
 Param/Value/50FB92C3=Zagara Returns In:
 Param/Value/52EBBB47=Zagara

Maps/ArchipelagoCampaign/HotS/ap_domination.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt

@@ -12,10 +12,12 @@ Category/Name/7D18442D=Bonus Objective - Find Baneling Nests
 Category/Name/8370D92A=Eggs
 Category/Name/8BFD4E5A=Variables
 Category/Name/8FA8F08F=AI Attack Waves
+Category/Name/944689C6=Custom Objectives
 Category/Name/A22763B2======== MAIN =======
 Category/Name/A5723261=Debug
 Category/Name/A9A166FD=EggsVariable
 Category/Name/C0D4E471=Main Objective - Destroy Zagara
+Category/Name/C3F5DE3B=Location IDs
 Category/Name/C6DF2AB3=Campaign Mission
 Category/Name/D1BBBA49=Objectives
 Category/Name/DEA9FFBC=Main Objective - Collect Eggs
@@ -143,9 +145,11 @@ Trigger/Name/A33ED1CF=Achievement: Baneling Kills
 Trigger/Name/A3B57F08=50 Egg Q
 Trigger/Name/A955ACC9=Objective - Zagara Eggs - Failed
 Trigger/Name/AB383BE6=Infested Command Center Destroyed
+Trigger/Name/AB47600C=Objective - Repel Zagara - Complete
 Trigger/Name/AC388767=Victory - Zagara's Base Destroyed
 Trigger/Name/AC7128AF=Objective - Collect Eggs - Complete
 Trigger/Name/AD7E5281=onDifficultyBrutal
+Trigger/Name/AD9B7AA1=Objective - Repel Zagara - Create
 Trigger/Name/AE32B2CB=Spine Crawler Transform
 Trigger/Name/AF064DE4=90 Egg Q
 Trigger/Name/B2019440=Mid Q
@@ -172,6 +176,7 @@ Trigger/Name/CCA53F97=Infested Command Center Destroyed Center
 Trigger/Name/CDBBC1A8=Victory Cinematic
 Trigger/Name/D1C23102=Zagara Escorts Created
 Trigger/Name/D44E0580=Zagara First Attack Q
+Trigger/Name/D64D92FC=Objective - Destroy Infested CC - Deactivate
 Trigger/Name/D7062AB0=Victory Cheat
 Trigger/Name/D73BDE62=Egg Cluster Assignment
 Trigger/Name/D78BE8EB=Zagara First Defeat
@@ -197,20 +202,24 @@ Variable/Name/02D55D68=TimesZagaraDefeated
 Variable/Name/03D3F4C2=CurrentEggCluster
 Variable/Name/04062510=ZergPlayers
 Variable/Name/04D9B254=Angle
+Variable/Name/06E5755D=category
 Variable/Name/086D250C=EggActor
 Variable/Name/091BBE3C=VisibilityRegions
 Variable/Name/095A9CE1=NumberOfEggs
 Variable/Name/09E2C3B8=currentUnit
 Variable/Name/0A9E1599=FeralZergGroup
 Variable/Name/0CEFD256=Zagara
 Variable/Name/0DA35A24=i
+Variable/Name/1317F410=LOCATION_ID_CENTER_INFESTED_COMMAND_CENTER
 Variable/Name/168A2F35=EggPoint
 Variable/Name/1AB39ADB=Target
+Variable/Name/1BCF5D42=LOCATION_ID_SOUTHWEST_BANELING_NEST
 Variable/Name/21A75412=BanelingKills
 Variable/Name/27040D84=Unit
 Variable/Name/27170EF0=EggNests
 Variable/Name/29FA5B27=IntroMusicFinished
 Variable/Name/2BD4339E=FiredOnce
+Variable/Name/30DA8F95=LOCATION_ID_NORTH_INFESTED_COMMAND_CENTER
 Variable/Name/337E5480=AP First Zagara
 Variable/Name/339897B0=TimeoutTimer
 Variable/Name/339F6AB7=Index
@@ -225,8 +234,10 @@ Variable/Name/3E5F8FE4=IntroTempUnits
 Variable/Name/3FB43C07=ZagaraAlive
 Variable/Name/4019F167=EggsLostToZagara
 Variable/Name/4348C52E=PLAYER_01_USER
+Variable/Name/439A33D2=LOCATION_ID_SOUTHEAST_BANELING_NEST
 Variable/Name/444B848D=MidMusicFinished
 Variable/Name/45136532=GameOver
+Variable/Name/469EC7DA=LOCATION_ID_REPEL_ZAGARA
 Variable/Name/480B962F=ZagaraEscortsSpawned
 Variable/Name/4A5C1210=MilitaryUnits
 Variable/Name/4D1AD6D0=VictoryKerrigan
@@ -252,6 +263,7 @@ Variable/Name/724B3EA0=Soundtrack
 Variable/Name/73642C11=PLAYER_02_ZAGARA
 Variable/Name/73961657=currentUnit
 Variable/Name/76DB87E4=MapMusicTrack
+Variable/Name/79AF7A55=LOCATION_ID_NORTH_BANELING_NEST
 Variable/Name/7C4DEE96=i
 Variable/Name/7D2BCDD8=CorruptionTime
 Variable/Name/7F1185A6=PLAYER_06_FERAL_BANELINGS
@@ -275,6 +287,7 @@ Variable/Name/A6B19BB1=ObjectiveFindBanelingNests
 Variable/Name/A870297C=VisiblilityRevealers
 Variable/Name/AA26EF64=NumberOfSpawns
 Variable/Name/ABCB7437=ZagaraBossPing
+Variable/Name/AD5F892E=LOCATION_ID_CLOSE_BANELING_NEST
 Variable/Name/B0DF1BAA=NearestBanelingEgg
 Variable/Name/B180F8E3=Index
 Variable/Name/B1FCE0A9=MidSpawnedUnitsSelected
@@ -290,6 +303,7 @@ Variable/Name/BFD09681=FadeDuration
 Variable/Name/C26259D7=VictoryZerg
 Variable/Name/C2D28516=i
 Variable/Name/C37A34C8=ZagaraLifeRegen
+Variable/Name/C4D947F0=LOCATION_ID_SOUTH_BANELING_NEST
 Variable/Name/C4E18EAF=FadeDuratioin
 Variable/Name/C60C9299=WaitTime
 Variable/Name/C7CA4EF3=CorruptionEffect
@@ -319,6 +333,8 @@ Variable/Name/F0890C61=PLAYER_05_BANELING_EGGS
 Variable/Name/F174013A=MidSpawnedUnits
 Variable/Name/F17BB846=BanelingEggsCollected
 Variable/Name/F6975E2C=BanelingNestsRescued
+Variable/Name/F699DF9A=ObjectiveRepelZagara
+Variable/Name/F6B85E45=LOCATION_ID_NORTHEAST_BANELING_NEST
 Variable/Name/F9E51242=NumberOfEggClusters
 Variable/Name/F9EC98BB=CenterPoint
 Variable/Name/F9F4D8B7=50EggAttackSent

Maps/ArchipelagoCampaign/HotS/ap_fire_in_the_sky.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>

Maps/ArchipelagoCampaign/HotS/ap_fire_in_the_sky.SC2Map/MapScript.galaxy

@@ -46,6 +46,15 @@ const int gv_gorgonsDestroyedQuota = 7;
 const int gv_scourgeNestsGoal = 7;
 const int gv_objectiveZergBiomassGoal = 3;
 const int gv_zergToFind = 5;
+const int gv_LOCATION_ID_WEST_BIOMASS = 1;
+const int gv_LOCATION_ID_NORTH_BIOMASS = 2;
+const int gv_LOCATION_ID_SOUTH_BIOMASS = 3;
+const int gv_LOCATION_ID_DESTROY_3_GORGONS = 4;
+const int gv_LOCATION_ID_CLOSE_ZERG_RESCUE = 5;
+const int gv_LOCATION_ID_SOUTH_ZERG_RESCUE = 6;
+const int gv_LOCATION_ID_NORTH_ZERG_RESCUE = 7;
+const int gv_LOCATION_ID_WEST_QUEEN_RESCUE = 8;
+const int gv_LOCATION_ID_EAST_QUEEN_RESCUE = 9;
 
 //--------------------------------------------------------------------------------------------------
 // Global Variables
@@ -254,6 +263,7 @@ trigger gt_ObjectiveActivateScourgeNestComplete;
 trigger gt_ObjectiveFindZergBiomassCreate;
 trigger gt_ObjectiveFindZergBiomassUpdate;
 trigger gt_ObjectiveFindZergBiomassComplete;
+trigger gt_ObjectiveFindZergBiomassRemove;
 trigger gt_ObjectiveFindZergCreate;
 trigger gt_ObjectiveFindZergUpdate;
 trigger gt_ObjectiveFindZergComplete;
@@ -2604,7 +2614,7 @@ bool gt_ZergRescueTop_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     gv_zergFound = (gv_zergFound + 1);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(7);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTH_ZERG_RESCUE);
     TriggerExecute(gt_ObjectiveFindZergUpdate, true, false);
     VisRevealArea(gv_pLAYER_01_USER, RegionFromId(11), 0.0, true);
     while (!(((UnitIsAlive(UnitFromId(168)) == false) || (UnitGetOwner(UnitFromId(168)) == 1)) && ((UnitIsAlive(UnitFromId(245)) == false) || (UnitGetOwner(UnitFromId(245)) == 1)) && ((UnitIsAlive(UnitFromId(292)) == false) || (UnitGetOwner(UnitFromId(292)) == 1)))) {
@@ -2669,7 +2679,7 @@ bool gt_ZergRescueCenter_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     gv_zergFound = (gv_zergFound + 1);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(5);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_CLOSE_ZERG_RESCUE);
     TriggerExecute(gt_ObjectiveFindZergUpdate, true, false);
     VisRevealArea(gv_pLAYER_01_USER, RegionFromId(1), 8.0, true);
     UnitIssueOrder(UnitFromId(392), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(166)), c_orderQueueReplace);
@@ -2735,7 +2745,7 @@ bool gt_ZergRescueBottom_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     gv_zergFound = (gv_zergFound + 1);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(6);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTH_ZERG_RESCUE);
     TriggerExecute(gt_ObjectiveFindZergUpdate, true, false);
     while (!(((UnitIsAlive(UnitFromId(50)) == false) || (UnitGetOwner(UnitFromId(50)) == 1)) && ((UnitIsAlive(UnitFromId(51)) == false) || (UnitGetOwner(UnitFromId(51)) == 1)))) {
         Wait(1.0, c_timeGame);
@@ -2791,7 +2801,7 @@ bool gt_QueenRescue01_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     gv_zergFound = (gv_zergFound + 1);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(8);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_QUEEN_RESCUE);
     TriggerExecute(gt_ObjectiveFindZergUpdate, true, false);
     libNtve_gf_CreateUnitsAtPoint2(1, "AP_QueenBurrowed", 0, gv_pLAYER_01_USER, PointFromId(612));
     gv_rescuedQueen = UnitLastCreated();
@@ -2840,7 +2850,7 @@ bool gt_QueenRescue02_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     gv_zergFound = (gv_zergFound + 1);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(9);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_QUEEN_RESCUE);
     TriggerExecute(gt_ObjectiveFindZergUpdate, true, false);
     libNtve_gf_CreateUnitsAtPoint2(1, "AP_QueenBurrowed", 0, gv_pLAYER_01_USER, PointFromId(430));
     gv_rescuedQueen = UnitLastCreated();
@@ -3792,7 +3802,7 @@ bool gt_VictorySequence_Func (bool testConds, bool runActions) {
     }
 
     gv_gameOver = true;
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory);
     Wait(2.0, c_timeReal);
     TriggerExecute(gt_ObjectiveDestroyGorgonsComplete, true, false);
     TriggerExecute(gt_ObjectiveActivateScourgeNestComplete, true, true);
@@ -4207,7 +4217,11 @@ bool gt_ObjectiveDestroyGorgonsCreate_Func (bool testConds, bool runActions) {
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZChar02Objective03");
     gv_objectiveDestroyGorgons = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZChar02Objective03", "", gv_gorgonsDestroyed);
+    ObjectiveShow(gv_objectiveDestroyGorgons, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyGorgons, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_gorgonsDestroyed, libSwaC_gf_MissionObjectiveItemCount("ZChar02Objective03"), false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyGorgons, gv_LOCATION_ID_DESTROY_3_GORGONS);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyGorgons, lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyGorgons, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -4234,7 +4248,7 @@ bool gt_ObjectiveDestroyGorgonsUpdate_Func (bool testConds, bool runActions) {
     }
 
     if ((gv_gorgonsDestroyed == 3)) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(4);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_DESTROY_3_GORGONS);
     }
 
     return true;
@@ -4302,7 +4316,9 @@ bool gt_ObjectiveActivateScourgeNestCreate_Func (bool testConds, bool runActions
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZChar02Objective2");
     gv_objectiveActivateScourgeNests = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZChar02Objective2", "", gv_scourgeNestsActivatedCount);
+    ObjectiveShow(gv_objectiveActivateScourgeNests, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveActivateScourgeNests, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_scourgeNestsActivatedCount, libSwaC_gf_MissionObjectiveItemCount("ZChar02Objective2"), false);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveActivateScourgeNests, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -4378,11 +4394,11 @@ void gt_ObjectiveActivateScourgeNestComplete_Init () {
 //--------------------------------------------------------------------------------------------------
 bool gt_ObjectiveFindZergBiomassCreate_Func (bool testConds, bool runActions) {
     // Variable Declarations
-    int lv_i;
+    int lv_category;
 
     // Automatic Variable Declarations
     // Variable Initialization
-    lv_i = 1;
+    lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary;
 
     // Conditions
     if (testConds) {
@@ -4399,7 +4415,12 @@ bool gt_ObjectiveFindZergBiomassCreate_Func (bool testConds, bool runActions) {
     TriggerEnable(TriggerGetCurrent(), false);
     libSwaC_gf_CreateObjectiveCampaign("ZChar02Objective02");
     gv_objectiveFindZergBiomass = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZChar02Objective02", "", gv_objectiveZergBiomassFound);
+    ObjectiveShow(gv_objectiveFindZergBiomass, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveFindZergBiomass, lv_category, "", gv_objectiveZergBiomassFound, libSwaC_gf_MissionObjectiveItemCount("ZChar02Objective02"), true);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindZergBiomass, gv_LOCATION_ID_WEST_BIOMASS);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindZergBiomass, gv_LOCATION_ID_NORTH_BIOMASS);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindZergBiomass, gv_LOCATION_ID_SOUTH_BIOMASS);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindZergBiomass, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -4424,6 +4445,10 @@ bool gt_ObjectiveFindZergBiomassUpdate_Func (bool testConds, bool runActions) {
             return false;
         }
 
+        if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
+            return false;
+        }
+
         if (!((UnitIsAlive(EventUnitRangeUnit()) == true))) {
             return false;
         }
@@ -4497,11 +4522,51 @@ void gt_ObjectiveFindZergBiomassComplete_Init () {
     TriggerAddEventTimePeriodic(gt_ObjectiveFindZergBiomassComplete, 1.0, c_timeGame);
 }
 
+//--------------------------------------------------------------------------------------------------
+// Trigger: Objective Find Zerg Biomass Remove
+//--------------------------------------------------------------------------------------------------
+bool gt_ObjectiveFindZergBiomassRemove_Func (bool testConds, bool runActions) {
+    // Automatic Variable Declarations
+    // Conditions
+    if (testConds) {
+        if (!(((lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_WEST_BIOMASS] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_NORTH_BIOMASS] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_SOUTH_BIOMASS] == false)))) {
+            return false;
+        }
+    }
+
+    // Actions
+    if (!runActions) {
+        return true;
+    }
+
+    UnitRemove(UnitFromId(1831));
+    UnitRemove(UnitFromId(1824));
+    UnitRemove(UnitFromId(1832));
+    TriggerEnable(gt_ObjectiveFindZergBiomassCreate, false);
+    TriggerEnable(gt_ObjectiveFindZergBiomassUpdate, false);
+    TriggerEnable(gt_ObjectiveFindZergBiomassWest, false);
+    TriggerEnable(gt_ObjectiveFindZergBiomassNorth, false);
+    TriggerEnable(gt_ObjectiveFindZergBiomassSouth, false);
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void gt_ObjectiveFindZergBiomassRemove_Init () {
+    gt_ObjectiveFindZergBiomassRemove = TriggerCreate("gt_ObjectiveFindZergBiomassRemove_Func");
+    TriggerAddEventTimeElapsed(gt_ObjectiveFindZergBiomassRemove, 2.0, c_timeGame);
+}
+
 //--------------------------------------------------------------------------------------------------
 // Trigger: Objective Find Zerg Create
 //--------------------------------------------------------------------------------------------------
 bool gt_ObjectiveFindZergCreate_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))) {
@@ -4515,9 +4580,15 @@ bool gt_ObjectiveFindZergCreate_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    ObjectiveCreate(StringExternal("Param/Value/0C182B22"), StringToText(""), c_objectiveStateActive, false);
+    ObjectiveCreate(StringExternal("Param/Value/0C182B22"), StringToText(""), c_objectiveStateHidden, false);
     gv_objectiveFindZerg = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(gv_objectiveFindZerg, "", gv_zergFound, gv_zergToFind);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveFindZerg, lv_category, "", gv_zergFound, gv_zergToFind, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindZerg, gv_LOCATION_ID_CLOSE_ZERG_RESCUE);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindZerg, gv_LOCATION_ID_SOUTH_ZERG_RESCUE);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindZerg, gv_LOCATION_ID_NORTH_ZERG_RESCUE);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindZerg, gv_LOCATION_ID_WEST_QUEEN_RESCUE);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindZerg, gv_LOCATION_ID_EAST_QUEEN_RESCUE);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindZerg, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -6183,7 +6254,7 @@ bool gt_ObjectiveFindZergBiomassWest_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(1);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_BIOMASS);
     return true;
 }
 
@@ -6219,7 +6290,7 @@ bool gt_ObjectiveFindZergBiomassNorth_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(2);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTH_BIOMASS);
     return true;
 }
 
@@ -6255,7 +6326,7 @@ bool gt_ObjectiveFindZergBiomassSouth_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(3);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTH_BIOMASS);
     return true;
 }
 
@@ -6351,6 +6422,7 @@ void InitTriggers () {
     gt_ObjectiveFindZergBiomassCreate_Init();
     gt_ObjectiveFindZergBiomassUpdate_Init();
     gt_ObjectiveFindZergBiomassComplete_Init();
+    gt_ObjectiveFindZergBiomassRemove_Init();
     gt_ObjectiveFindZergCreate_Init();
     gt_ObjectiveFindZergUpdate_Init();
     gt_ObjectiveFindZergComplete_Init();