Merge pull request #169 from Gemster312/sc2-next

Objective Categorization Update for the Umoja Storyline

Maps/ArchipelagoCampaign/HotS/ap_back_in_the_saddle.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_back_in_the_saddle.SC2Map/Preload.xml

@@ -118,13 +118,6 @@
 <Model id="BriefingUnitSelectRedSmall"/>
 <Model id="RaynorLab"/>
 <Model id="KerriganGhostLab"/>
-<Objective id="ZLab02Objective02"/>
-<Objective id="ZLab02Objective04"/>
-<Objective id="ZLab02Objective06"/>
-<Objective id="ZLab02Objective03"/>
-<Objective id="ZLab02Objective01"/>
-<Objective id="ZLab02Objective05"/>
-<Objective id="ZLab02Objective07"/>
 <Sound id="UI_TechConsole_Popup"/>
 <Sound id="Thor_Movement"/>
 <Sound id="Medivac_Load"/>

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

@@ -72,6 +72,7 @@ Param/Value/B111C448=Enemy Sighted
 Param/Value/BAD73F7A=Archangel
 Param/Value/BB583CCF=Archangel
 Param/Value/BD187A1F=<s val="SwarmReticleZergMainObjective">Recovery Terminal Online</s>
+Param/Value/BD30545F=Have Kerrigan talk about her abilities
 Param/Value/BDCCDCCD=
 Param/Value/BEF8D18C=Get here before the door closes.
 Param/Value/BF6865FF=Bring Kerrigan here to access the security system.

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

@@ -14,12 +14,14 @@ Category/Name/57080A11=Utility
 Category/Name/59234C62=Variables
 Category/Name/5967B39C=Initialization
 Category/Name/639B4110=Starting Sequence
+Category/Name/68BAD4FE=Custom Objectives
 Category/Name/73629A5D=Variables
 Category/Name/75EC494C======== CINEMATIC =======
 Category/Name/78163FE3=STAGE 3 (Tram Ride)
 Category/Name/7BD31AB6=Difficulty
 Category/Name/7C3FCC1C=Variables
 Category/Name/86583DA6=STAGE 2 (Lower Level)
+Category/Name/886A9C7A=Kerrigan Abilities
 Category/Name/8A1E080C=Cinematic Variables
 Category/Name/A6614A23======== MAIN =======
 Category/Name/A9251060=Stats & Achievements
@@ -34,6 +36,7 @@ Category/Name/C9A08EC8=Midgame Cinematic - Stage 4 - Debark Tram
 Category/Name/CBCE3CFC======== ARCHIPELAGO =======
 Category/Name/CC6675C1=Main Objective - Get to Door
 Category/Name/CCB6D84B=Global Variables
+Category/Name/D12C2B6C=Location IDs
 Category/Name/D852E091=Midgame Cinematic - Stage 3 - Board Tram
 Category/Name/EB3DD210=Button Dimensions
 Category/Name/EBCEEA89=Tips
@@ -148,6 +151,7 @@ Trigger/Name/41A54D2A=Objective Destroy the Archangel Failed
 Trigger/Name/42350298=Create/Update Archangel Boss Bar
 Trigger/Name/4326D927=Tram Engine Under Attack Warning
 Trigger/Name/436F5A18=Objective Hold Out At Door Create
+Trigger/Name/4387710F=Objective Kerrigan Abilities Complete
 Trigger/Name/43D8F888=Start AI
 Trigger/Name/446C5366=Objective Get to Sublevel Door Create
 Trigger/Name/453C529C=First Marauder Engaged
@@ -285,6 +289,7 @@ Trigger/Name/CAB55255=Intro Cinematic End
 Trigger/Name/CB70E844=Dead End 02 Q
 Trigger/Name/CC8B8056=Teach Crushing Grip Q
 Trigger/Name/CCC1A694=Move Umojan to Defensive Positions
+Trigger/Name/CD9BC1EA=Objective Kerrigan Abilities Update
 Trigger/Name/CDD8858C=Tip Mission Help Q
 Trigger/Name/CE9C504D=Healerbot Recharging
 Trigger/Name/D0910FB8=Mid Cleanup - Stage 3
@@ -294,6 +299,7 @@ Trigger/Name/D1B99B1B=Button - Release Zerg
 Trigger/Name/D3865EE1=Drop Pod Crashing 02
 Trigger/Name/D59EFA2F=Archangel Attack - Minigun Strafe (Stage 1)
 Trigger/Name/D61B7B51=Dominion Attack - Gate 03 (Hard)
+Trigger/Name/D6D2C8D9=Objective Kerrigan Abilities Create
 Trigger/Name/D704FB43=Mid Q - Stage 4
 Trigger/Name/D726BE30=Zerg Stream from Sublevel (Hard)
 Trigger/Name/D7E04A61=Start Second Lockdown Timer
@@ -369,6 +375,7 @@ Variable/Name/176F3A4E=S1_BridgeBattleRevealer
 Variable/Name/18991070=S2_LockdownDoorPing
 Variable/Name/1C9EF8CE=FadeDuration
 Variable/Name/1CF08657=PLAYER_02_DOMINION
+Variable/Name/1F0BDA34=KerriganAbilitiesMentioned
 Variable/Name/1FC7F665=Terminal
 Variable/Name/1FED4943=Soundtrack
 Variable/Name/21519403=MidKerriganActor
@@ -399,6 +406,7 @@ Variable/Name/3BD0050E=S1_UseCrushingGripHerePingActor
 Variable/Name/3D26C75D=S1_UseCrushingGripHereTag
 Variable/Name/3DE05795=S1_ObjectivePing
 Variable/Name/3FC48C5C=ArchangelFacing
+Variable/Name/4116F7FB=LOCATION_ID_CRUSHING_GRIP
 Variable/Name/43B97992=KineticBlastUses
 Variable/Name/4437DCC3=MapMusicTrack
 Variable/Name/446D4CD9=CrushingGripUses
@@ -413,7 +421,10 @@ Variable/Name/4D35C19B=S1_SublevelDoorDominion
 Variable/Name/4D4EDB8B=S1_HealBotScientist
 Variable/Name/4D54214B=S4_ArchangelBarrageCount
 Variable/Name/4DB54BFB=FadeDuration
+Variable/Name/4FDC3F28=LOCATION_ID_DEFEND_THE_TRAM
 Variable/Name/53492477=S2_LockdownTimer
+Variable/Name/5391E3FA=LOCATION_ID_REACH_THE_SUBLEVEL
+Variable/Name/5496B62F=ObjectiveKerriganAbilities
 Variable/Name/54D84684=Gate
 Variable/Name/55D80DD7=S1_BridgeCrushingGripDominion
 Variable/Name/55FA4197=ArchangelStrafeShots
@@ -494,6 +505,7 @@ Variable/Name/A7D1C515=NewTooltip
 Variable/Name/A8B18E02=Second Group Sound Origin
 Variable/Name/AAACA065=DropPodUnits
 Variable/Name/AB216502=AngleTarget
+Variable/Name/ABA4A5A2=LOCATION_ID_DOOR_SECTION_CLEARED
 Variable/Name/AC39E660=Button2ndPositionY
 Variable/Name/AD020EED=MidCinematicArchangel
 Variable/Name/AD681AB2=InitialPosition
@@ -517,6 +529,7 @@ Variable/Name/C173F41C=FadeDuration
 Variable/Name/C2A09D5C=Panel Release Zerg
 Variable/Name/C30D0465=S3_TRAM_ENGINE_MAX_LIFE
 Variable/Name/C4B7A994=S4_ArchangelBossBar
+Variable/Name/C4D429B5=category
 Variable/Name/C5DD6602=SecurityComputerInCameraMode
 Variable/Name/C870A28F=S4_DominionAttackers
 Variable/Name/C9492AAE=ArchangelPosition
@@ -560,6 +573,7 @@ Variable/Name/EC6CF7ED=GasTurret01
 Variable/Name/EF667C22=CinematicCompleted
 Variable/Name/EFB79585=ArchangelStrafeCount
 Variable/Name/F184311A=S3_TramBossBarID
+Variable/Name/F249DB36=LOCATION_ID_KINETIC_BLAST
 Variable/Name/F359B94A=S4_UmojanArchangelGroup
 Variable/Name/F3D4C07F=S1_IdleChatterCheck
 Variable/Name/F5DAA7EF=SecurityComputerActive

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