Merge pull request #163 from Gemster312/sc2-next

Objective Categorization Update for the Artifact Storyline

Maps/ArchipelagoCampaign/WoL/ap_smash_and_grab.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_smash_and_grab.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt

@@ -16,6 +16,7 @@ Param/Value/0CBF253A=
 Param/Value/0EEA773C=
 Param/Value/1091C250=Cleared the bridge.
 Param/Value/1BB42988=/
+Param/Value/346EB163=
 Param/Value/35A1F683=Destroy the three Stone Zealots protecting the artifact.
 Param/Value/36CCD36B=
 Param/Value/3A5CA4C7=Stetmann has asked that you collect ancient protoss relics so he can study them to gain better insight into protoss technology.
@@ -37,7 +38,9 @@ Param/Value/9AC9EB9B=Stalkers
 Param/Value/9B7E042C=Zerg close to Artifact
 Param/Value/9E172D60=Get to the Artifact
 Param/Value/9F2E56B5=Protoss Research Earned
+Param/Value/9F5DDE87=Find Protoss Relics
 Param/Value/A8C79452=Move a unit close to this to gain research points.
+Param/Value/B4F7F5A8=Forcefield Areas Busted
 Param/Value/CBDA1C7D=Find Protoss Relics
 Param/Value/CDC448F8=Get to the Artifact
 Param/Value/CE2CE6AB=Anniversary TTychus_01 granted

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

@@ -1,8 +1,11 @@
 Category/Name/098EC9D8======== MAIN =======
 Category/Name/0E40FB72=Initialization
+Category/Name/10CB74D5=Location IDs
 Category/Name/20A95534=Map Objectives
 Category/Name/256E2B07=Primary Objective - Get to the Artifact
 Category/Name/294B5756=Primary Objective - Destroy the Statues
+Category/Name/2F2CB559=Forcefields
+Category/Name/3230D3A3=Relics
 Category/Name/415DBDEC=Zerg
 Category/Name/48390174=Save Points
 Category/Name/64ADBD72=Victory Cinematic
@@ -40,6 +43,7 @@ Trigger/Name/0E05BB04=Zerg Artifact Q
 Trigger/Name/0EE39FD1=Victory Cinematic
 Trigger/Name/12B23966=Intro Sequence
 Trigger/Name/12DA160E=Add Zerg Speed Bump Unit
+Trigger/Name/151FC894=Objective - Forcefields - Update
 Trigger/Name/155B5A5D=onDifficultyHard
 Trigger/Name/16C2694A=Dragoon Warp-In
 Trigger/Name/17CD8655=Zerg Attack Waves - Protoss
@@ -58,8 +62,10 @@ Trigger/Name/2566653A=Defeat
 Trigger/Name/28F4D27E=Init 02 Players
 Trigger/Name/31620314=Upper Statue Reveal
 Trigger/Name/31F00BFC=Upper Protoss Attack Waves
+Trigger/Name/32DEA8E8=Objective - Forcefields - Complete
 Trigger/Name/3446C03A=AI Upgrades H
 Trigger/Name/3467968A=Objective - Relics - Create Q
+Trigger/Name/3477879D=Objective - Relics - Remove
 Trigger/Name/353E036D=Zerg Structure Killed by Player
 Trigger/Name/35414D10=First Forcefield Area Busted
 Trigger/Name/36DE4B2C=Defeat - Base Dead
@@ -140,6 +146,7 @@ Trigger/Name/EF802634=Intro Briefing Cinematic
 Trigger/Name/F0572254=Zerg Speed Bump Controller
 Trigger/Name/F0C85DA9=Artifact Guardian Activation South
 Trigger/Name/F2B540B8=Artifact Shield Activation
+Trigger/Name/F4B9A6DD=Objective - Forcefields - Create Q
 Trigger/Name/F56803DE=Muta Flank Attack
 Trigger/Name/F6D01D17=Protoss Mana
 Trigger/Name/F86BF6DB=Save Point 1 Q
@@ -150,6 +157,7 @@ Variable/Name/092D5022=currentUnit
 Variable/Name/0B79336B=StalkerTarget
 Variable/Name/0FA2D72C=DragoonSpawnComplete
 Variable/Name/1779F6F0=Stat-ZergKilledByPlayer
+Variable/Name/1C85B9FF=LOCATION_ID_SECOND_FORCEFIELD_AREA_BUSTED
 Variable/Name/1CFB95AF=HighTemplar
 Variable/Name/23134BA5=ZerglingGroupSouth
 Variable/Name/28EF27E0=Enemies
@@ -163,10 +171,12 @@ Variable/Name/3140FE82=Stalker1
 Variable/Name/31F1DAF0=NullifierTop
 Variable/Name/333FC4B5=PsiCooldowns
 Variable/Name/34F82C8F=HighTemplarPosition
+Variable/Name/363E5007=LOCATION_ID_SECOND_RELIC
+Variable/Name/375CB76B=category
 Variable/Name/39EE7D02=P2_ZERG
 Variable/Name/3D5F48EB=Nullifier1
 Variable/Name/3F351306=AP_Stalker
-Variable/Name/414DF3D5=StatuesDestoyed
+Variable/Name/414DF3D5=StatuesDestroyed
 Variable/Name/42340BDD=Drone2
 Variable/Name/443B466A=ExtraUnits
 Variable/Name/4604FC7F=RelicsNeeded
@@ -177,6 +187,7 @@ Variable/Name/4DF4EAE0=HighTemplarPoints
 Variable/Name/4FFC73D9=i
 Variable/Name/523B3A57=Nullifier2Position
 Variable/Name/5281DF41=PsiCooldown
+Variable/Name/535331DC=LOCATION_ID_FOURTH_RELIC
 Variable/Name/5411E37A=DropPodGroup
 Variable/Name/57C4F5B6=i
 Variable/Name/5C2BD1D9=DropPoint
@@ -204,7 +215,9 @@ Variable/Name/7F70BB74=PlayerUnits
 Variable/Name/853B4BDF=i
 Variable/Name/86ED344A=ProtossPlayers
 Variable/Name/8C00CEBC=VictoryPending
+Variable/Name/8EF693CD=LOCATION_ID_THIRD_RELIC
 Variable/Name/910712B4=InitialStalkers
+Variable/Name/9333EF9A=Objective_Forcefields
 Variable/Name/956C9792=Target
 Variable/Name/98B68697=CreepRegionsSize
 Variable/Name/9A06535A=ArtifactGuardiansSouth
@@ -213,6 +226,7 @@ Variable/Name/9D7C6BEA=CreepRegions
 Variable/Name/9EE37391=SwannDropship
 Variable/Name/9F163C51=RelicPingActor
 Variable/Name/A230CAD2=ZergSpeedBumpUnits
+Variable/Name/A53BE5C7=category
 Variable/Name/A5DE406A=PlayerHasMercTech
 Variable/Name/A72065A3=P1_USER
 Variable/Name/A73D727B=EnemyGroup
@@ -222,16 +236,19 @@ Variable/Name/AE6E7A0F=NullifierBottomPosition
 Variable/Name/AF2FCE46=HighTemplarsSize
 Variable/Name/B13994E3=P5_UPPER_CAUSEWAY
 Variable/Name/B26E1D6F=FadeDuration
+Variable/Name/B5D673E3=LOCATION_ID_FIRST_RELIC
 Variable/Name/BC3B47B0=Achievement-HardTimer
 Variable/Name/BD6707BF=SpineCrawlers
 Variable/Name/C16957E5=ZergArtifactAttackers
+Variable/Name/C4852331=LOCATION_ID_FIRST_FORCEFIELD_AREA_BUSTED
 Variable/Name/C562A04B=SpineCrawlerPoints
 Variable/Name/C6D0BBC5=Drone1
 Variable/Name/C8014419=VictoryDropship
 Variable/Name/C806E0C6=i
 Variable/Name/C8481786=SavePoint2UnitGroup
 Variable/Name/CEEBC096=NullifierBottom
 Variable/Name/D1D5A249=Objective_GetToTheArtifact
+Variable/Name/D619C1F2=ForcefieldsBusted
 Variable/Name/D6243C72=ArtifactGuardiansNorth
 Variable/Name/D763B3C2=ExpirationTimer
 Variable/Name/D853C25C=currentUnit
@@ -243,7 +260,6 @@ Variable/Name/E4082E65=P6_FIRST_PROTOSS
 Variable/Name/E4CD78B1=Artifact
 Variable/Name/E654DBAC=Stat-StoneGuardianKillCount
 Variable/Name/E7F64912=Stat-ProtossKilledByPlayer
-Variable/Name/E9551CE5=StatuesKilled
 Variable/Name/EBF88614=AP_StalkerPosition
 Variable/Name/ECA8842F=i
 Variable/Name/EEFA565A=P4_LOWER_CAUSEWAY

Maps/ArchipelagoCampaign/WoL/ap_supernova.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>