From d5a55658f61a4bfbada07fc8b9e388757a500b5e Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sat, 27 Jul 2024 17:11:15 -0700
Subject: [PATCH] sc2: Adding Vanguard war council upgrades -- Agony Launchers
 and Rapid-fire Cannons

---
 .../Base.SC2Data/GameData/ButtonData.xml               | 10 ++++++++++
 .../Base.SC2Data/GameData/EffectData.xml               |  1 -
 .../Base.SC2Data/GameData/RequirementData.xml          |  8 ++++++++
 .../Base.SC2Data/GameData/RequirementNodeData.xml      |  8 ++++++++
 .../Base.SC2Data/GameData/UnitData.xml                 |  2 ++
 .../Base.SC2Data/GameData/UpgradeData.xml              | 10 ++++++++++
 .../Base.SC2Data/GameData/WeaponData.xml               |  3 ++-
 .../enUS.SC2Data/LocalizedData/GameStrings.txt         |  6 ++++++
 8 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 0cf5b7f9c..2cc2457e3 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4822,6 +4822,16 @@
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-vanguard-aoeradiusincreased.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_VanguardRapidfireCannon">
+        <Icon value="assets\textures\btn-upgrade-mengsk-engineeringbay-orbitaldrop.dds"/>
+        <AlertIcon value="assets\textures\btn-upgrade-mengsk-engineeringbay-orbitaldrop.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_VanguardAgonyLaunchers">
+        <Icon value="assets\textures\btn-upgrade-protoss-vanguard-increasedarmordamage.dds"/>
+        <AlertIcon value="assets\textures\btn-upgrade-protoss-vanguard-increasedarmordamage.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
     <CButton id="AP_ImmortalSingularityCharge">
         <Icon value="Assets\Textures\BTN-Upgrade-Artanis-SingularityCharge.dds"/>
         <EditorCategories value="Race:Protoss"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 55a6293af..1b544fe58 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -8263,7 +8263,6 @@
     </CEffectApplyBehavior>
     <CEffectDamage id="AP_ImmortalTaldarimWeaponDamage" parent="DU_WEAP_MISSILE">
         <EditorCategories value="Race:Protoss"/>
-        <AttributeBonus index="Armored" value="7"/>
         <Amount value="8"/>
     </CEffectDamage>
     <CEffectSet id="AP_ImmortalTaldarimWeaponDamageSet">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 9c049bbb1..8f3b534d2 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2961,6 +2961,14 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeAlarakVanguardIncreaseSplashAreaCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveVanguardRapidfireCannon">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeVanguardRapidfireCannonCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveVanguardAgonyLaunchers">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeVanguardAgonyLaunchersCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveImmortalAirAttack">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeImmortalAirAttackCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index d56e9e780..c0be6db59 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5349,6 +5349,14 @@
         <Count Link="AP_AlarakVanguardIncreaseSplashArea" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeVanguardRapidfireCannonCompleteOnly">
+        <Count Link="AP_VanguardRapidfireCannon" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeVanguardAgonyLaunchersCompleteOnly">
+        <Count Link="AP_VanguardAgonyLaunchers" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeImmortalAirAttackCompleteOnly">
         <Count Link="AP_ImmortalAirAttack" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 3accff792..d8ecd139b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -12897,6 +12897,8 @@
             <!--            <LayoutButtons Face="AP_VanguardStriderStabilization" Type="Passive" Requirements="AP_HaveAlarakVanguardMovingShot" Row="1" Column="0"/>-->
             <LayoutButtons Face="AP_VanguardSolariteEnhancedScatterCannon" Type="Passive" Requirements="AP_HaveAlarakVanguardLongshot" Row="1" Column="0"/>
             <LayoutButtons Face="AP_VanguardMatterDispersion" Type="Passive" Requirements="AP_HaveAlarakVanguardIncreaseSplashArea" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_VanguardRapidfireCannon" Type="Passive" Requirements="AP_HaveVanguardRapidfireCannon" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_VanguardAgonyLaunchers" Type="Passive" Requirements="AP_HaveVanguardAgonyLaunchers" Row="1" Column="3"/>
         </CardLayouts>
         <Radius value="0.75"/>
         <SeparationRadius value="0.625"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index ba789260c..ba9def70e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11502,6 +11502,16 @@
         <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_ImmortalTaldarim"/>
     </CUpgrade>
+    <CUpgrade id="AP_VanguardRapidfireCannon">
+        <EffectArray Operation="Subtract" Reference="Weapon,AP_ImmortalTaldarim,Period" Value="2.25"/>
+        <EditorCategories value="Race:Protoss"/>
+        <AffectedUnitArray value="AP_ImmortalTaldarim"/>
+    </CUpgrade>
+    <CUpgrade id="AP_VanguardAgonyLaunchers">
+        <EffectArray Reference="Effect,AP_ImmortalTaldarimWeaponDamage,AttributeBonus[Armored]" Value="7"/>
+        <EditorCategories value="Race:Protoss"/>
+        <AffectedUnitArray value="AP_ImmortalTaldarim"/>
+    </CUpgrade>
     <CUpgrade id="AP_ImmortalAirAttack">
         <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptors,TargetFilters" Value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_AnnihilatorParticleDisruptors,TargetFilters" Value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index 32f108722..0a26461a6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -1832,11 +1832,12 @@
     <CWeaponLegacy id="AP_ImmortalTaldarim">
         <EditorCategories value="Race:Protoss"/>
         <Icon value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel0.dds"/>
+        <Options index="DisplayCooldown" value="1"/>
         <DisplayEffect value="AP_ImmortalTaldarimWeaponDamage"/>
         <DisplayAttackCount value="16"/>
         <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <Range value="6"/>
-        <Period value="3.75"/>
+        <Period value="6"/>
         <Effect value="AP_ImmortalTaldarimWeaponRandomLarge"/>
     </CWeaponLegacy>
     <CWeaponLegacy id="AP_PhaseDisruptersAir">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index f3e0723ef..3fdb9412e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1672,7 +1672,9 @@ Button/Name/AP_ValkyrieATSRockets=Flechette Missiles
 Button/Name/AP_ValkyrieAntiGravityDrive=Launching Vector Compensator
 Button/Name/AP_ValkyrieEnhancedClusterLaunchers=Enhanced Cluster Launchers
 Button/Name/AP_ValkyrieSCBW=Build Valkyrie
+Button/Name/AP_VanguardAgonyLaunchers=Agony Launchers
 Button/Name/AP_VanguardMatterDispersion=Matter Dispersion
+Button/Name/AP_VanguardRapidfireCannon=Rapid-Fire Cannon
 Button/Name/AP_VanguardSolariteEnhancedScatterCannon=Agony Launchers
 Button/Name/AP_VanguardStriderStabilization=Strider Stabilization
 Button/Name/AP_ViciousGlaive=Vicious Glaive
@@ -2837,7 +2839,9 @@ Button/Tooltip/AP_ValkyrieEnhancedClusterLaunchers=Valkyrie fires 2 additional r
 Button/Tooltip/AP_ValkyrieSCBW=Advanced anti-aircraft fighter. Able to use cluster missiles that deal area damage to air targets.<n/><n/><c val="#ColorAttackInfo">Can attack air units.</c>
 Button/Tooltip/AP_ValkyrieShapedHull=Increases Valkyrie life by 50.
 Button/Tooltip/AP_ValkyrieSpeedBoost=Increases the Valkyrie's movement speed by 70% for <d time="8"/>.
+Button/Tooltip/AP_VanguardAgonyLaunchers=<c val="ffff8a">Vanguards</c> deal +<d ref="Upgrade,AP_VanguardAgonyLaunchers,EffectArray[0].Value"/> damage to armoured targets per attack.
 Button/Tooltip/AP_VanguardMatterDispersion=Increases the area of the <c val="ffff8a">Vanguard's</c> splash damage by <d ref="($UpgradeEffectArrayValue:AP_AlarakVanguardIncreaseSplashArea:Effect,AP_ImmortalTaldarimWeaponSearch,AreaArray[0].Radius$/Effect,AP_ImmortalTaldarimWeaponSearch,AreaArray[0].Radius-1)*100" player="0"/>%
+Button/Tooltip/AP_VanguardRapidfireCannon=<c val="ffff8a">Vanguards</c> fire <d ref="($UpgradeEffectArrayValue:AP_VanguardRapidfireCannon:Weapon,AP_ImmortalTaldarim,Period$) / Weapon,AP_ImmortalTaldarim,Period * 100" player="0"/>% faster.
 Button/Tooltip/AP_VanguardSolariteEnhancedScatterCannon=Increases Vanguard attack range by 2.
 Button/Tooltip/AP_VanguardStriderStabilization=Vanguards can attack while moving.
 Button/Tooltip/AP_ViciousGlaive=Attacks bounce three additional times, hitting up to six targets. Bounces also travel farther.
@@ -4660,6 +4664,8 @@ RequirementNode/Tooltip/AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly=Find P
 RequirementNode/Tooltip/AP_CountUpgradeSkirmisherPeerContemptCompleteOnly=Find Peer Contempt (Skirmisher)
 RequirementNode/Tooltip/AP_CountUpgradeSlayerBlinkCompleteOnly=Find Phase Blink (Slayer)
 RequirementNode/Tooltip/AP_CountUpgradeStalkerPhaseReactorCompleteOnly=Find Phase Reactor (Stalker)
+RequirementNode/Tooltip/AP_CountUpgradeVanguardAgonyLaunchersCompleteOnly=Find Agony Launchers (Vanguard)
+RequirementNode/Tooltip/AP_CountUpgradeVanguardRapidfireCannonCompleteOnly=Find Rapid-Fire Cannon (Vanguard)
 RequirementNode/Tooltip/AP_CountUpgradeVoidZealotWhirlwindCompleteOnly=Find Whirlwind (Zealot)
 RequirementNode/Tooltip/AP_CountUpgradeTerranInfantryWeaponsUltraCapacitorsLevel1CompleteOnly=Terran Infantry Weapons Level 1
 RequirementNode/Tooltip/AP_CountUpgradeTerranInfantryWeaponsUltraCapacitorsLevel2CompleteOnly=Terran Infantry Weapons Level 2