Merge pull request #175 from Gemster312/sc2-next

Objective Categorization Update for the Kaldir Storyline

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>

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"/>

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

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,16 +306,20 @@ 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
 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

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>