Merge pull request #177 from Gemster312/sc2-next

Objective Categorization Update for the Zerus Storyline

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

@@ -114,10 +114,6 @@
 <Model id="PingBoss"/>
 <Model id="PrimalLocustFlyingBirthModel"/>
 <Model id="ZergGenericAOECursor"/>
-<Objective id="ZZerus03Objective03"/>
-<Objective id="ZZerus03Objective02"/>
-<Objective id="ZZerus03Objective01"/>
-<Objective id="ZZerus03Objective04"/>
 <Sound id="Destructible_RockDeath"/>
 <Sound id="UI_MiniMapPing"/>
 <Sound id="UI_ObjectiveDiscoveredStinger"/>

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

@@ -14,13 +14,10 @@ Param/Value/03688D93=Kraith
 Param/Value/0C09E048=
 Param/Value/0FC1641B=Kraith Fight
 Param/Value/115B533F=Kraith
-Param/Value/11FFDDB0=)<n/>(RelicsRemaining Remains in this Area
 Param/Value/152FD787=Pack Leader
 Param/Value/1ACF8EA7=Kraith Defeated
 Param/Value/1B488576=Kerrigan Kills
-Param/Value/22436B2C=RelicsRemaining
 Param/Value/284CB2FA=Yagdra Fight
-Param/Value/2CB3963C=RelicsRemaining
 Param/Value/2E9E303E=Time to Kill Yagdra
 Param/Value/364DA5E3=Kerrigan has died.
 Param/Value/36FDD762=Time to Kill Kraith
@@ -33,34 +30,21 @@ Param/Value/47A48363=Zurvan
 Param/Value/4D454772=Slivan Fight
 Param/Value/4D6617C0=Kraith
 Param/Value/5F0279A7=Yagdra
-Param/Value/623B89F8=RelicsRemaining
 Param/Value/7720B73D=Yagdra Defeated
 Param/Value/7A62DF68=Pack Leader
-Param/Value/7AD0F53F=)<n/>(RelicsRemaining Remains in this Area
 Param/Value/7F6CCA53=Slivan
 Param/Value/8601DC6F=Anniversary_ZZerus03 granted
 Param/Value/96A66F42=Zurvan
 Param/Value/9AF4770E=Dehaka's Right Arm
-Param/Value/A2E9EC88=)<n/>(None Remain in this Area
-Param/Value/AF3506AA=)<n/>(RelicsRemaining Remains in this Area
-Param/Value/B2C9F5A1=RelicsRemaining
-Param/Value/B4B53686=RelicsRemaining
 Param/Value/B4FEC3EF=Tips
-Param/Value/B7019BCF=)<n/>(RelicsRemaining Remains in this Area
 Param/Value/C1432651=Yagdra
 Param/Value/CE1DA88B=Slivan
-Param/Value/CEF3FA31=RelicsRemaining
-Param/Value/D0251AF1=)<n/>(RelicsRemaining Remain in this Area
 Param/Value/D234859F=Slivan
-Param/Value/D4110535=RelicsRemaining
-Param/Value/DAEB6E65=RelicsRemaining
 Param/Value/DB7020E3=It's still bleeding profusely.
-Param/Value/DCC1D3D5=)<n/>(None remain in this Area
 Param/Value/E19A4E6D=Dehaka's Pack
 Param/Value/E4B5AD80=Xel'Naga Relic
 Param/Value/E534D60D=Time to Kill Slivan
 Param/Value/E76E14FD=Yagdra
-Param/Value/E7C4511D=)<n/>(RelicsRemaining Remain in this Area
 Param/Value/EEE3D065=Zurvan Fight
 Param/Value/F92D94B7=Fulmic Highlands
 Param/Value/F9AF7107=Slivan

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

@@ -1,4 +1,5 @@
 Category/Name/13E49E8C=Victory Cinematic
+Category/Name/168FF51E=Location IDs
 Category/Name/1AB07245=Achievements
 Category/Name/23EA4265=Main Objective - Kerrigan Must Survive
 Category/Name/24CB189D=Slivan Intro Cinematic
@@ -216,6 +217,7 @@ Trigger/Name/80349885=Slivan Music
 Trigger/Name/809C93E8=Intro Kraith Effects
 Trigger/Name/81759F85=Objective - Slay Zurvan - Create
 Trigger/Name/81D6ED60=Yagdra Music
+Trigger/Name/8687799B=Objective - Xel'Naga Relics - Remove
 Trigger/Name/8767E08B=Init 04 Music/Sound
 Trigger/Name/87F33BD8=onDifficultyHard
 Trigger/Name/884DA06F=Objective - Xel'Naga Relics - Create
@@ -354,6 +356,7 @@ Variable/Name/291C340E=CinematicCompleted
 Variable/Name/296CC0E5=SlivanMeleeGroup2
 Variable/Name/29B9859F=YagdraFirstTunnel
 Variable/Name/2A910379=HelperUnit
+Variable/Name/2CD6C89A=LOCATION_ID_SLIVAN
 Variable/Name/2FE3FA53=FadeDuration
 Variable/Name/30441EDD=FriendlyRoaches
 Variable/Name/320F655B=BossLocation
@@ -383,13 +386,15 @@ Variable/Name/41D4A7A0=YagdraEngaged
 Variable/Name/42E0D530=TargetLightningRegion
 Variable/Name/44C2620E=FadeDuration
 Variable/Name/45CEA301=i
+Variable/Name/462CA373=LOCATION_ID_FOURTH_RELIC
 Variable/Name/479DB0A6=Soundtrack
 Variable/Name/47B20140=FadeDuration
 Variable/Name/47D421F6=Yagdra
 Variable/Name/47E68B7D=RockKilled
 Variable/Name/48721CB4=BossFacing
 Variable/Name/4B567529=PlayerUnits
 Variable/Name/4BB2A796=FadeDuration
+Variable/Name/4BE51F90=category
 Variable/Name/4C6C9E2F=PondSiegePoints
 Variable/Name/4C6CF1E5=TargetTunnelPoint
 Variable/Name/4D201CBD=Soundtrack
@@ -411,6 +416,8 @@ Variable/Name/5B696CBB=FriendlyHydras
 Variable/Name/5BD71377=CritterGroup
 Variable/Name/5BED40AA=PatrolPointCount
 Variable/Name/5F55BE49=ZurvanHelper
+Variable/Name/5F8CADC5=LOCATION_ID_THIRD_RELIC
+Variable/Name/6064EE1E=LOCATION_ID_YAGDRA
 Variable/Name/62622522=ZurvanQuakeSound2
 Variable/Name/65DE3AB9=ZurvanTenctaclesActive
 Variable/Name/65F7A36D=PLAYER_06_RESCUE
@@ -466,6 +473,7 @@ Variable/Name/90F15106=VictoryShotChanneling
 Variable/Name/92E53A1B=TargetActor
 Variable/Name/9303B511=b
 Variable/Name/932AC576=BarrageTarget
+Variable/Name/9442479D=LOCATION_ID_FIRST_RELIC
 Variable/Name/94CDAE8B=TempUnit
 Variable/Name/95AD740F=FriendlyHydras
 Variable/Name/964E1D65=ObjectiveSlayPrimarchs
@@ -492,6 +500,7 @@ Variable/Name/A26FBEAC=PLAYER_04_SLIVAN
 Variable/Name/A2DD722A=FriendlyRoaches
 Variable/Name/A3472693=FriendlyHydras
 Variable/Name/A437B68C=KraithEngaged
+Variable/Name/A4E7934A=LOCATION_ID_KRAITH
 Variable/Name/A52A2AF5=ZurvanPing
 Variable/Name/A56EDDBA=SlivanMeleeGroup1
 Variable/Name/A6ACC054=CinematicTempUnits
@@ -574,6 +583,7 @@ Variable/Name/E92AF303=YagdraRescueKill
 Variable/Name/E97DCCDA=Distance
 Variable/Name/EA625FB0=Indicator
 Variable/Name/EAB0FE6B=RespawnTimer
+Variable/Name/EC3FA872=LOCATION_ID_SECOND_RELIC
 Variable/Name/ECA4C11E=PondSiegeUnits
 Variable/Name/ED8CDFFF=YagdraAbilityUsed
 Variable/Name/EDA3D851=HelperUnit

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