From 0d6743c409b233ab9d1aeb8bc131189171698e70 Mon Sep 17 00:00:00 2001
From: Ziktofel <ziktofel@gmail.com>
Date: Thu, 4 Jul 2024 16:56:48 +0200
Subject: [PATCH] Add damage tooltips for charged stages for other Void Ray
 vairants

---
 .../Base.SC2Data/GameData/EffectData.xml                       | 2 +-
 .../Base.SC2Data/GameData/UpgradeData.xml                      | 1 +
 .../enUS.SC2Data/LocalizedData/GameStrings.txt                 | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index cd42756c2..9ee22aba4 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -7418,7 +7418,7 @@
     <CEffectDamage id="AP_VoidRayVoidEnhancedDamage">
         <ValidatorArray value="AP_HaveVoidRaySwarmDamageBoost"/>
         <EditorCategories value="Race:Protoss"/>
-        <AttributeBonus index="Armored" value="6"/>
+        <AttributeBonus index="Armored" value="4"/>
     </CEffectDamage>
     <CEffectDamage id="AP_VoidRayChargeBeamBounce1Damage" parent="DU_WEAP">
         <EditorCategories value="Race:Protoss"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 4149ccef2..3a29afd6d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11229,6 +11229,7 @@
     </CUpgrade>
     <CUpgrade id="AP_DestroyerChargingBeam">
         <EffectArray Operation="Set" Reference="Effect,AP_VoidRayChargeBeamBounce3DamageSet,EffectArray[0]" Value="AP_VoidRayChargeBeamBounce3DamageUpgraded"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_VoidRayChargeBeamBounce,Tip" Value="Weapon/Tip/AP_VoidRayChargeBeamBounceUpgraded"/>
         <AffectedUnitArray value="AP_VoidRayTaldarim"/>
     </CUpgrade>
     <CUpgrade id="AP_ArbiterCloakFieldRange">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 0985e1873..f8a6a464c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -5716,4 +5716,7 @@ Weapon/Tip/AP_Lurker=<c val="#ColorAttackInfo">Must be burrowed to attack.</c>
 Weapon/Tip/AP_MedivacSiegeTankAirlift=Requires a loaded Siege Tank in Siege mode. If used with Siege Breakers, does <d ref="Effect,AP_ArcliteShockCannonDummy,Amount - Effect,AP_CrucioShockCannonDummy,Amount"/> extra damage.
 Weapon/Tip/AP_NovaWeaponBlazefireBlade=Deals <d ref="Effect,AP_NovaWeaponBlazefireBladeDamageCloaked,Amount - Effect,AP_NovaWeaponBlazefireBladeDamageUncloaked,Amount"/> extra damage if Nova is cloaked
 Weapon/Tip/AP_PrismaticBeam=Deals <d ref="Effect,AP_PrismaticBeamMUx2,Amount"/> (<d ref="Effect,AP_PrismaticBeamMUx2,Amount + Effect,AP_PrismaticBeamMUx2,AttributeBonus[Armored]"/> vs Armored) damage if halfway charged,<n/><d ref="Effect,AP_PrismaticBeamMUx3,Amount"/> (<d ref="Effect,AP_PrismaticBeamMUx3,Amount + Effect,AP_PrismaticBeamMUx3,AttributeBonus[Armored]"/> vs Armored) damage if fully charged.
+Weapon/Tip/AP_VoidRayChargeBeamRange=Deals <d ref="Effect,AP_VoidRayChargeBeamBaseDamageCharge2,Amount"/> (<d ref="Effect,AP_VoidRayChargeBeamBaseDamageCharge2,Amount + Effect,AP_VoidRayChargeBeamBaseDamageCharge2,AttributeBonus[Armored]"/> vs Armored) damage if halfway charged,<n/><d ref="Effect,AP_VoidRayChargeBeamBaseDamageCharge3,Amount"/> (<d ref="Effect,AP_VoidRayChargeBeamBaseDamageCharge3,Amount + Effect,AP_VoidRayChargeBeamBaseDamageCharge3,AttributeBonus[Armored]"/> vs Armored) damage if fully charged.
+Weapon/Tip/AP_VoidRayChargeBeamBounce=Deals <d ref="Effect,AP_VoidRayChargeBeamBounce1Damage,Amount"/> damage to <d ref="Effect,AP_VoidRayChargeBeamBounce1Search,MaxCount"/> secondary target if not charged,<n/><d ref="Effect,AP_VoidRayChargeBeamBounce2Damage,Amount"/> (<d ref="Effect,AP_VoidRayChargeBeamBounce2Damage,Amount + Effect,AP_VoidRayChargeBeamBounce2Damage,AttributeBonus[Armored]"/> vs Armored) damage to <d ref="Effect,AP_VoidRayChargeBeamBounce2Search,MaxCount"/> secondary targets if halfway charged,<n/><d ref="Effect,AP_VoidRayChargeBeamBounce3Damage,Amount"/> (<d ref="Effect,AP_VoidRayChargeBeamBounce3Damage,Amount + Effect,AP_VoidRayChargeBeamBounce3Damage,AttributeBonus[Armored]"/> vs Armored) damage to <d ref="Effect,AP_VoidRayChargeBeamBounce3Search,MaxCount"/> secondary targets damage if fully charged.
+Weapon/Tip/AP_VoidRayChargeBeamBounceUpgraded=Deals <d ref="Effect,AP_VoidRayChargeBeamBounce1Damage,Amount"/> damage to <d ref="Effect,AP_VoidRayChargeBeamBounce1Search,MaxCount"/> secondary target if not charged,<n/><d ref="Effect,AP_VoidRayChargeBeamBounce2Damage,Amount"/> (<d ref="Effect,AP_VoidRayChargeBeamBounce2Damage,Amount + Effect,AP_VoidRayChargeBeamBounce2Damage,AttributeBonus[Armored]"/> vs Armored) damage to <d ref="Effect,AP_VoidRayChargeBeamBounce2Search,MaxCount"/> secondary targets if halfway charged,<n/><d ref="Effect,AP_VoidRayChargeBeamBounce3DamageUpgraded,Amount"/> (<d ref="Effect,AP_VoidRayChargeBeamBounce3DamageUpgraded,Amount + Effect,AP_VoidRayChargeBeamBounce3DamageUpgraded,AttributeBonus[Armored]"/> vs Armored) damage to <d ref="Effect,AP_VoidRayChargeBeamBounce3Search,MaxCount"/> secondary targets damage if fully charged.
 Weapon/Tip/AP_Talons=