Merge pull request #220 from MatthewMarinets/mm/war_council_skirmisher

sc2: Adding Skirmisher and Vanguard War Council upgrades

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml

@@ -4721,6 +4721,10 @@
         <Icon value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
     </CButton>
+    <CButton id="AP_SkirmisherPeerContempt">
+        <Icon value="assets\textures\btn-upgrade-protoss-alarak-combatmastery.dds"/>
+        <AlertIcon value="assets\textures\btn-upgrade-protoss-alarak-combatmastery.dds"/>
+    </CButton>
     <CButton id="AP_PermanentlyCloakedOracle">
         <Icon value="Assets\Textures\btn-upgrade-vorazun-oraclepermanentlycloaked.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-vorazun-oraclepermanentlycloaked.dds"/>
@@ -4818,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_VanguardFusionMortars">
+        <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"/>

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

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml

@@ -2847,6 +2847,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeCorsairSustainingDisruptionCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveSkirmisherPeerContempt">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeSkirmisherPeerContemptCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveOraclePermanentCloak">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeOraclePermanentCloakCompleteOnly"/>
@@ -2957,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_HaveVanguardFusionMortars">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeVanguardFusionMortarsCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveImmortalAirAttack">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeImmortalAirAttackCompleteOnly"/>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml

@@ -5243,6 +5243,10 @@
         <Count Link="AP_CorsairSustainingDisruption" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeSkirmisherPeerContemptCompleteOnly">
+        <Count Link="AP_SkirmisherPeerContempt" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeOraclePermanentCloakCompleteOnly">
         <Count Link="AP_OraclePermanentCloak" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
@@ -5345,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_CountUpgradeVanguardFusionMortarsCompleteOnly">
+        <Count Link="AP_VanguardFusionMortars" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeImmortalAirAttackCompleteOnly">
         <Count Link="AP_ImmortalAirAttack" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml

@@ -12044,6 +12044,7 @@
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_ImprovedIonCannons" Type="Passive" Requirements="AP_HaveImprovedIonCannons" Row="1" Column="0"/>
             <LayoutButtons Face="AP_AnionPulseCrystals" Type="Passive" Requirements="AP_HaveAnionPulseCrystals" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_SkirmisherPeerContempt" Type="Passive" Requirements="AP_HaveSkirmisherPeerContempt" Row="1" Column="2"/>
         </CardLayouts>
         <Radius value="0.75"/>
         <SeparationRadius value="0.75"/>
@@ -12896,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_VanguardFusionMortars" Type="Passive" Requirements="AP_HaveVanguardFusionMortars" Row="1" Column="3"/>
         </CardLayouts>
         <Radius value="0.75"/>
         <SeparationRadius value="0.625"/>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml

@@ -11330,6 +11330,12 @@
         <EffectArray Reference="Unit,AP_CorsairMP,ShieldsStart" Value="20"/>
         <AffectedUnitArray value="AP_CorsairMP"/>
     </CUpgrade>
+    <CUpgrade id="AP_SkirmisherPeerContempt">
+        <EffectArray Operation="Set" Reference="Weapon,AP_IonCannonsTaldarim,TargetFilters" Value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <EffectArray Operation="Set" Reference="Button,AP_PhoenixTaldarim,Tooltip" Value="Button/Tooltip/AP_PhoenixTaldarimAA"/>
+        <EffectArray Operation="Set" Reference="Unit,AP_PhoenixTaldarim,Description" Value="Button/Tooltip/AP_PhoenixTaldarimAA"/>
+        <AffectedUnitArray value="AP_PhoenixTaldarim"/>
+    </CUpgrade>
     <CUpgrade id="AP_OraclePermanentCloak">
         <Icon value="Assets\Textures\btn-upgrade-vorazun-oraclepermanentlycloaked.dds"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
@@ -11496,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_VanguardFusionMortars">
+        <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"/>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml

@@ -1673,7 +1673,7 @@
         <AllowedMovement value="Moving"/>
     </CWeaponLegacy>
     <CWeaponLegacy id="AP_IonCannonsTaldarim" parent="AP_IonCannons">
-        <TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
     </CWeaponLegacy>
     <CWeaponLegacy id="AP_BroodlingStrike">
         <EditorCategories value="Race:Zerg"/>
@@ -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">

Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt

@@ -1525,6 +1525,7 @@ Button/Name/AP_SiegeTankJumpJet=Jump Jets
 Button/Name/AP_SiegeTankTransportHook=Transport Hook
 Button/Name/AP_SingularityAnchor=Tomahawk Power Cells
 Button/Name/AP_SingularityCharge=Singularity Charge
+Button/Name/AP_SkirmisherPeerContempt=Peer Contempt
 Button/Name/AP_SlayerBlink=Phase Blink
 Button/Name/AP_Snipe=Sniper Round
 Button/Name/AP_SoASuperShield=Shield Overcharge
@@ -1671,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_VanguardFusionMortars=Fusion Mortars
 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
@@ -2470,7 +2473,8 @@ Button/Tooltip/AP_PersonalDefensiveMatrix=Provides Nova with a shield that reduc
 Button/Tooltip/AP_PhaseBlaster=Warp Prisms are equipped with a Phase Blaster weapon to attack ground and air targets.
 Button/Tooltip/AP_PhasingMode=Transforms the Warp Prism to Phasing Mode and generates a power radius similar to that of a Pylon. The Warp Prism cannot move in this mode.
 Button/Tooltip/AP_PhoenixAiur=Aiur Faction<n/>Air superiority starfighter. Can use Graviton Beam on two enemy units simultaneously.<n/><n/><c val="ffff8a">Can attack air units.</c>
-Button/Tooltip/AP_PhoenixTaldarim=Tal'darim Faction<n/>Fast skirmish starfighter.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
+Button/Tooltip/AP_PhoenixTaldarim=Tal'darim Faction<n/>Fast skirmish starfighter.<n/><n/><c val="ffff8a">Can attack ground units.</c>
+Button/Tooltip/AP_PhoenixTaldarimAA=Tal'darim Faction<n/>Fast skirmish starfighter.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_PhoenixAiurGravitonBeam=Makes the target unit float in the air, disabling its abilities. Effect lasts up to <d time="10"/>.<n/><n/><c val="#ColorAttackInfo">Massive units are immune.</c>
 Button/Tooltip/AP_PhoenixAiurGravitonBeamPassive=Graviton Beam affects an additional enemy ground unit near the primary target.
 Button/Tooltip/AP_PhoenixHallucination=These hallucinated copies function like the original unit, but they cannot use active abilities, deal damage, warp in structures, or gather resources, and they die more easily. Hallucinations last <d time="60"/> before they disappear.
@@ -2676,6 +2680,7 @@ Button/Tooltip/AP_SiegeTankSieged=Heavy tank. Long-range artillery in Siege Mode
 Button/Tooltip/AP_SiegeTankTransportHook=Allows Siege Tanks to be transported while in Siege Mode.
 Button/Tooltip/AP_SingularityAnchor=Wraith starts with 100 additional energy.
 Button/Tooltip/AP_SingularityCharge=Increases the Dragoon's attack range by 2.
+Button/Tooltip/AP_SkirmisherPeerContempt=Allows Skirmishers to target air units.
 Button/Tooltip/AP_Slayer=Tal'darim Faction<n/>Ranged attack strider. Can use Blink.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_SlayerBlink=Teleports the Slayer to a nearby target location. Ability can only be used once every <d ref="Abil,AP_BlinkSlayer,Cost[0].Cooldown.TimeUse"/> seconds. After using Phase Blink, the Slayer's next attack within <d ref="Behavior,AP_PhaseBlinkDamage,Duration"/> seconds will deal double damage.
 Button/Tooltip/AP_Snipe=A careful shot, dealing 45 damage. Ignores armor.<n/><n/><c val="#ColorAttackInfo">Can only target biological units.</c>
@@ -2834,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_VanguardFusionMortars=<c val="ffff8a">Vanguards</c> deal +<d ref="Upgrade,AP_VanguardFusionMortars,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.
@@ -4654,8 +4661,11 @@ RequirementNode/Tooltip/AP_CountUpgradeDragoonPhalanxSuitCompleteOnly=Find Phala
 RequirementNode/Tooltip/AP_CountUpgradeEnergizerMobileChronoBeamCompleteOnly=Find Mobile Chrono Beam (Energizer)
 RequirementNode/Tooltip/AP_CountUpgradeHavocEnduringSightCompleteOnly=Find Enduring Sight (Havoc)
 RequirementNode/Tooltip/AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly=Find Plasma Surge (High Templar)
+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_CountUpgradeVanguardFusionMortarsCompleteOnly=Find Fusion Mortars (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