Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago-SC2-data i…

…nto sc2-next

Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/ComponentList.SC2Components

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Components>
+    <Optimized/>
     <DataComponent Type="gada">GameData</DataComponent>
     <DataComponent Type="info">DocumentInfo</DataComponent>
     <DataComponent Type="mapi">MapInfo</DataComponent>

Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt

@@ -38,6 +38,7 @@ Param/Value/558C3EE5=<s val="ObjRewardSummary_Protoss">Power-up Abandoned Struct
 Param/Value/560D13C5=Hybrid Wave Set to 
 Param/Value/59DEBB2A=Preserver Prison
 Param/Value/5ADEAA3E=Mission start
+Param/Value/603F8E8E=
 Param/Value/627CD3C4=Hybrid Wave = 
 Param/Value/693D0B04=Power-up Abandoned Structures
 Param/Value/7489F48B=
@@ -51,16 +52,19 @@ Param/Value/9860ACE5=Immortal ally
 Param/Value/A20EA9E8=Pylons must be warped in to provide power to the abandoned protoss base. Use the marked locations.
 Param/Value/A425FBF3=Hybrid unleashed.
 Param/Value/A7E49313=
-Param/Value/ACA4539D=Destroy Enemy Support Bases
+Param/Value/ACA4539D=Destroy Northeast Nexus
 Param/Value/B16AD9F3=Dark Templar allies
+Param/Value/BB1448D3=Defeat Maar
 Param/Value/BF6654F6=The preservers have vital information about the Overmind and the origin of the zerg. Free them from their prisons before the knowledge is lost forever.
 Param/Value/CB554689=Hybrid Wave Set to 4 
 Param/Value/D0E36002=checks left
+Param/Value/D1BECFB0=Destroy Southwest Nexus
 Param/Value/D46EC28D=Abandoned Structures Powered
 Param/Value/DFFB989D=Dark Shrine
 Param/Value/F2B82ED1=3
 Param/Value/F78FFBD4=Power-up the Abandoned Base
 Param/Value/F974BE83=Power-up the abandoned protoss structures by warping in pylons near them. This will reveal lost technologies.
+Param/Value/FA4823DA=Destroy the enemy support bases in order to provide more resources for our cause
 Param/Value/FA59974F=Hybrid
 Param/Value/FC23C1AF=Destroy the Three Preserver Prisons
 Unit/Name/ShieldBattery=PH - Psi Dominator

Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt

@@ -1,4 +1,5 @@
 Category/Name/09801232=Utility
+Category/Name/121282A3=Location IDs
 Category/Name/14EB4AEF=Victory/Defeat
 Category/Name/2195D0B8=Leaderboard
 Category/Name/24412C6D=Briefing Cinematic
@@ -69,7 +70,7 @@ ParamDef/Name/9E4CB16B=Player
 ParamDef/Name/B5C55A5C=Player
 ParamDef/Name/CA992992=Player
 ParamDef/Name/D79F5184=MaxLife
-Trigger/Name/00D296DE=Objective Destroy Support Bases Create Q
+Trigger/Name/00D296DE=Objective Destroy Northeast Create Q
 Trigger/Name/01EDF8BF=Intro Setup
 Trigger/Name/03626603=Tip Gateway Q
 Trigger/Name/03BE333C=Init 05 Environment
@@ -107,15 +108,18 @@ Trigger/Name/3949B97F=Defeat Base Dead
 Trigger/Name/39AB2975=Pylon Place 02
 Trigger/Name/3C956BD7=Dialogue Robotics Facility Q
 Trigger/Name/3D2CFCA5=Initialization
+Trigger/Name/3DBE0A13=Objective Destroy Southwest Create Q
 Trigger/Name/41659D08=Mid Prison Cinematic End
 Trigger/Name/4395ED54=Init 06 Difficulties
 Trigger/Name/43BDBF59=Hybrid Leaves his area
 Trigger/Name/4463547E=Dialogue Templar Archives Found Q
 Trigger/Name/459CE088=Hybrid Prep for Wave
 Trigger/Name/45D0B256=Manifestation01 Resume Wave
 Trigger/Name/46381BAF=Dialogue Templar Archives Q
+Trigger/Name/4697719E=Objective DefeatMaar Create Q
 Trigger/Name/46B8B4BE=Victory Prison Objective Complete
 Trigger/Name/4874614C=Dialogue Hybrid Pissed Manifestation Dead 01 Q
+Trigger/Name/49993E50=Objective DefeatMaar Complete
 Trigger/Name/4B965950=Intro Cinematic
 Trigger/Name/4BD11B5A=Dialogue at Archivist Q
 Trigger/Name/4C28AEB3=Hybrid Waves
@@ -132,7 +136,7 @@ Trigger/Name/6185EAA6=Hybrid Enters his area
 Trigger/Name/61ED402F=Player Building Unit Activates Activates Stalker Hard/Brutal
 Trigger/Name/62D599D2=Dialogue Halt at Player Base 01 Q
 Trigger/Name/6335A8D7=Player Gathering Cash Activates Stalker
-Trigger/Name/66E5E003=Objective Destroy Support Bases Complete
+Trigger/Name/66E5E003=Objective Destroy Northeast Complete
 Trigger/Name/67AEE987=Flash Button Pylon On
 Trigger/Name/68AD0AC2=Library06
 Trigger/Name/699E46A3=Hybrid Attacks
@@ -187,6 +191,7 @@ Trigger/Name/AE842887=P4 Right Base Attack Waves
 Trigger/Name/AE901476=Psionic Shockwave - Third (Insane)
 Trigger/Name/B0BEF1CD=onDifficultyHard
 Trigger/Name/B0D2BD09=New Unit: Immortal Tip Q
+Trigger/Name/B1B953D1=Objective Destroy Southwest Complete
 Trigger/Name/B3DD1D4B=Hybrid Dies from player
 Trigger/Name/B40A45E4=Player selects pylon button
 Trigger/Name/B463E5C7=Library07
@@ -227,7 +232,6 @@ Trigger/Name/E3F771DA=Dialogue Hybrid Pissed 06 Q
 Trigger/Name/E4F77BDE=Energy Timer
 Trigger/Name/E57719B7=DEBUG - P6 Attack Wave
 Trigger/Name/E654196A=Northeast Nexus
-Trigger/Name/E832E09F=Objective Destroy Support Bases Update
 Trigger/Name/EA223C85=HI Upgrades
 Trigger/Name/EA291DF3=Hybrid Dies
 Trigger/Name/EA8F4A16=Dark Templar Attackers
@@ -261,7 +265,7 @@ Variable/Name/14290977=PylonPlayerCreatedHighTemplar
 Variable/Name/14429422=ActorVault01Spawn
 Variable/Name/1A34AE87=PylonInvisibleHighTemplar
 Variable/Name/1B8E0026=ArchTemplar03
-Variable/Name/1CE84C85=SupportBasesDestroyed
+Variable/Name/1C0DE31D=LOCATION_ID_TEMPLAR_ARCHIVES
 Variable/Name/1E206364=PingPrison02
 Variable/Name/1EAAC5F8=Zeratul
 Variable/Name/1F154E94=MineralsCollectedToActivateStalker
@@ -283,9 +287,11 @@ Variable/Name/3AF23B60=PingTwilightCouncil
 Variable/Name/3CB4FE9E=HealthPercent
 Variable/Name/3E32FA0F=Gateway01Placed
 Variable/Name/3EFCE279=LibraryDown02
+Variable/Name/420A1BD0=category
 Variable/Name/433F0AD2=ActorHybridDeathEffect
 Variable/Name/44D8E8D0=ForceStartHybridCinTimer
 Variable/Name/44EBDD59=P8_PRISON_STRUCTURE
+Variable/Name/44F779F0=LOCATION_ID_SOUTHWEST_BASE
 Variable/Name/45775EFE=LibraryAtBridge04
 Variable/Name/47700224=ObejctivePowerSecondaryBaseUpdate
 Variable/Name/4D321626=PickedUnit
@@ -303,7 +309,7 @@ Variable/Name/5E003F11=HybridReturnsToPrisons
 Variable/Name/5FB72573=HybridBossPing
 Variable/Name/603782E4=LibraryHybrid
 Variable/Name/60A3452B=HybridSoulAlive
-Variable/Name/6133E5F9=ObjectiveDestroySupportBases
+Variable/Name/6133E5F9=ObjectiveDestroyNortheast
 Variable/Name/6138E8F5=PylonPlayerCreatedDT
 Variable/Name/61DC76BB=LibraryDown01
 Variable/Name/620A41B4=GameOver
@@ -316,6 +322,7 @@ Variable/Name/694099A5=IntroHiddenUnitGroup
 Variable/Name/6969871F=HybridBusy
 Variable/Name/69857C28=PingPrison03
 Variable/Name/6A8E22B6=PingHybridBoss
+Variable/Name/6D75897A=category
 Variable/Name/70908557=LibraryAtBridge03
 Variable/Name/70FE9100=VisbilityPrisonWholeArea
 Variable/Name/74F03363=ActorAssimilator
@@ -329,12 +336,15 @@ Variable/Name/7F7DBD7B=ObjectivesAllPrisonsDestroyedUpdate
 Variable/Name/806F6F61=ActorPlace01
 Variable/Name/81922872=StalkerDialogue
 Variable/Name/82FAE156=IntroProbe01
+Variable/Name/871ECEAA=category
 Variable/Name/87DD3574=ActorGatewayPlace01
 Variable/Name/8985787B=currentUnit
 Variable/Name/8C180709=ObejctivePowerSecondaryBaseTotal
+Variable/Name/8CC31466=LOCATION_ID_DARK_SHRINE
 Variable/Name/8D919C85=IntroVoidSeeker
 Variable/Name/8F1E45DE=TimerTip
 Variable/Name/9001B905=TargetCount
+Variable/Name/90DAA02A=ObjectiveDestroySouthwest
 Variable/Name/9115686C=Target
 Variable/Name/93FA6C04=P1_USER
 Variable/Name/9451E465=HybridDeathsTracking
@@ -343,7 +353,9 @@ Variable/Name/95DDF03D=TargetCount
 Variable/Name/972C3F17=PylonPlayerCreatedRobotics
 Variable/Name/9844CABA=ActorVortexEffect
 Variable/Name/9D3BF5C6=FadeDuration
+Variable/Name/9D8967B7=ObjectiveDefeatMaar
 Variable/Name/9E9BDFA0=ActorVault02Spawn
+Variable/Name/9EFA7F7C=LOCATION_ID_MAAR
 Variable/Name/A0BB99FC=HybridMaxShields
 Variable/Name/A1DD4E00=ObejctivePowerBaseUpdate
 Variable/Name/A2BD8C2C=InCinematic
@@ -352,6 +364,7 @@ Variable/Name/A3DE3382=FadeDuration
 Variable/Name/A658885D=AttackTimer
 Variable/Name/A9BE4D72=ObejctivePowerBaseTotal
 Variable/Name/AC350C55=PrisonsObjStarted
+Variable/Name/AD278473=LOCATION_ID_NORTHWEST_PRESERVER
 Variable/Name/B2319966=MidPrisonCinematicCompleted
 Variable/Name/B2A1355E=ActorPlace02
 Variable/Name/B343912D=FadeDuration
@@ -371,6 +384,7 @@ Variable/Name/D261E0B2=FadeDuration
 Variable/Name/D36CA002=GravitonTargets
 Variable/Name/D4370CAB=IntroCinematicCompleted
 Variable/Name/D4A90F5C=Gateway01Done
+Variable/Name/D4BE5E1C=LOCATION_ID_SOUTHWEST_PRESERVER
 Variable/Name/D61A1E34=currentUnit
 Variable/Name/D6653D11=LibraryAtBridge01
 Variable/Name/D8AA51AA=ActorGateway
@@ -384,12 +398,15 @@ Variable/Name/E29DE2CA=LibraryDown03
 Variable/Name/E31DAB40=HybridPrisonsAllAlive
 Variable/Name/E3588114=Achievement-HardTimer
 Variable/Name/E8933673=IntroShuttleProbes
+Variable/Name/E9DE0BAA=LOCATION_ID_EAST_PRESERVER
 Variable/Name/EA7D856A=currentUnit
 Variable/Name/EAD8C0EB=PingTemplarArchives
+Variable/Name/EAE103F4=category
 Variable/Name/EB0F32F8=PrisonGroup
 Variable/Name/EBC088E4=InCombatIndicator
 Variable/Name/EC1433B2=currentUnit
 Variable/Name/EF880BA7=HybridKillsTracking
+Variable/Name/F143006D=LOCATION_ID_ROBOTICS_FACILITY
 Variable/Name/F160FF72=ActorHybridSpawn
 Variable/Name/F1CF3317=Plasma Targets
 Variable/Name/F1DCAAC4=HybridDeathsForDialogue
@@ -401,4 +418,5 @@ Variable/Name/FB4C542C=Target
 Variable/Name/FBD99B22=RevealerDTArea
 Variable/Name/FCB9B589=ArchTemplar02
 Variable/Name/FD098D9E=VictoryHiddenUnitGroup
+Variable/Name/FE003A42=LOCATION_ID_NORTHEAST_BASE
 Variable/Name/FEDD3E4B=SuperWarpGate_Neutral

Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Components>
+    <Optimized/>
     <DataComponent Type="gada">GameData</DataComponent>
     <DataComponent Type="info">DocumentInfo</DataComponent>
     <DataComponent Type="mapi">MapInfo</DataComponent>

Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy

@@ -29,6 +29,11 @@ void InitLibs () {
 //--------------------------------------------------------------------------------------------------
 // Constants
 //--------------------------------------------------------------------------------------------------
+const int gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK = 1;
+const int gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK = 2;
+const int gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK = 3;
+const int gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK = 4;
+const int gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK = 5;
 const int gv_pLAYER_USER = 1;
 const int gv_pLAYER_ZERG_MAIN = 2;
 const int gv_pLAYER_ZERG_SPECIAL = 3;
@@ -3889,7 +3894,7 @@ bool gt_KerriganDeepTunnelQ_Func (bool testConds, bool runActions) {
     libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll());
     auto5D28AA2D_val = gv_kerriganAttackCount;
     if (auto5D28AA2D_val == 1) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(1);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK);
         // Transmission - SoundLink("TValerian03Kerrigan00058", -1)
         libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Kerrigan00058", -1), c_transmissionDurationAdd, 0.0, true);
         // Transmission - SoundLink("TValerian03Raynor00020", -1)
@@ -3898,28 +3903,28 @@ bool gt_KerriganDeepTunnelQ_Func (bool testConds, bool runActions) {
         libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/001EB8FC") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/40499C88")));
     }
     else if (auto5D28AA2D_val == 2) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(2);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK);
         // Transmission - SoundLink("TValerian03Warfield00025", -1)
         libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Warfield00025", -1), c_transmissionDurationAdd, 0.0, true);
         Wait(2.0, c_timeReal);
         libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/EAB5D976") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/8F6AFC37")));
     }
     else if (auto5D28AA2D_val == 3) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(3);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK);
         // Transmission - SoundLink("TValerian03Raynor00028", -1)
         libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Raynor00028", -1), c_transmissionDurationAdd, 0.0, true);
         Wait(2.0, c_timeReal);
         libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/E75186CD") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/CDE6292E")));
     }
     else if (auto5D28AA2D_val == 4) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(4);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK);
         // Transmission - SoundLink("TValerian03Tychus00032", -1)
         libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Tychus00032", -1), c_transmissionDurationAdd, 0.0, true);
         Wait(2.0, c_timeReal);
         libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/1AD4E910") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/A6904814")));
     }
     else if (auto5D28AA2D_val == 5) {
-        lib5BD4895D_gf_AP_Core_sendLocationLocal(5);
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK);
         // Transmission - SoundLink("TValerian03Queen00033", -1)
         libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Queen00033", -1), c_transmissionDurationAdd, 0.0, true);
         // Transmission - SoundLink("TValerian03Sarah00034", -1)
@@ -4633,11 +4638,11 @@ bool gt_VictoryArtifactCharged_Func (bool testConds, bool runActions) {
     lv_location = 1;
     for ( ; ( (auto9F5F09C8_ai >= 0 && lv_location <= auto9F5F09C8_ae) || (auto9F5F09C8_ai < 0 && lv_location >= auto9F5F09C8_ae) ) ; lv_location += auto9F5F09C8_ai ) {
         if ((lib5BD4895D_gf_AP_Core_isLocationSent(lv_location) == false)) {
-            lib5BD4895D_gf_AP_Core_sendLocationLocal(lv_location);
+            lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lv_location);
         }
 
     }
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory);
     libNtve_gf_ChangeUnitDamage(gv_artifact, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No);
     TriggerQueueClear(c_triggerQueueRetain);
     TriggerExecute(gt_ObjectiveArtifactComplete, true, false);
@@ -4867,9 +4872,16 @@ bool gt_ObjectiveArtifactCreateQ_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerQueueEnter();
-    ObjectiveCreate(StringExternal("Param/Value/CA604703"), StringExternal("Param/Value/BFB1AA45"), c_objectiveStateActive, true);
-    lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated());
+    ObjectiveCreate(StringExternal("Param/Value/CA604703"), StringExternal("Param/Value/BFB1AA45"), c_objectiveStateHidden, true);
     gv_objective_Artifact = ObjectiveLastCreated();
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_Artifact, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_Artifact, true);
     libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian03Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/BCFF1976"));
     libNtve_gf_CreatePingFacingAngle(PlayerGroupSingle(gv_pLAYER_USER), "PingObjective", UnitGetPosition(gv_artifact), ColorWithAlpha(0.00, 100.00, 100.00, 0.00), 0.0, 135.0);
     PingSetTooltip(PingLastCreated(), StringExternal("Param/Value/0140CB99"));