Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Update Power Word: Shield script (#31400)

Browse Source
This commit is contained in:
Cristian Vintila
2025-10-24 12:20:35 +03:00
committed by GitHub
parent 1eb581610b
commit 2ddec61a7b
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/scripts/Spells/spell_priest.cpp
View File

@@ -52,7 +52,6 @@ enum PriestSpells
SPELL_PRIEST_ATONEMENT_EFFECT = 194384,
SPELL_PRIEST_ATONEMENT_HEAL = 81751,
SPELL_PRIEST_BENEDICTION = 193157,
SPELL_PRIEST_BENEVOLENCE = 415416,
SPELL_PRIEST_BLAZE_OF_LIGHT = 215768,
SPELL_PRIEST_BLAZE_OF_LIGHT_INCREASE = 355851,
SPELL_PRIEST_BLAZE_OF_LIGHT_DECREASE = 356084,
@@ -160,7 +159,6 @@ enum PriestSpells
SPELL_PRIEST_PURGE_THE_WICKED = 204197,
SPELL_PRIEST_PURGE_THE_WICKED_DUMMY = 204215,
SPELL_PRIEST_PURGE_THE_WICKED_PERIODIC = 204213,
SPELL_PRIEST_RAPTURE = 47536,
SPELL_PRIEST_RENEW = 139,
SPELL_PRIEST_RENEWED_HOPE = 197469,
SPELL_PRIEST_RENEWED_HOPE_EFFECT = 197470,
@@ -2170,15 +2168,11 @@ class spell_pri_power_word_shield : public AuraScript
SPELL_PRIEST_STRENGTH_OF_SOUL,
SPELL_PRIEST_STRENGTH_OF_SOUL_EFFECT,
SPELL_PRIEST_ATONEMENT_EFFECT,
SPELL_PRIEST_TRINITY_EFFECT,
SPELL_PRIEST_SHIELD_DISCIPLINE,
SPELL_PRIEST_SHIELD_DISCIPLINE_EFFECT,
SPELL_PVP_RULES_ENABLED_HARDCODED
}) && ValidateSpellEffect({
{ SPELL_PRIEST_MASTERY_GRACE, EFFECT_0 },
{ SPELL_PRIEST_RAPTURE, EFFECT_1 },
{ SPELL_PRIEST_BENEVOLENCE, EFFECT_0 },
{ SPELL_PRIEST_DIVINE_AEGIS, EFFECT_1 }
{ SPELL_PRIEST_MASTERY_GRACE, EFFECT_0 }
});
}
@@ -2188,7 +2182,7 @@ class spell_pri_power_word_shield : public AuraScript
if (Unit* caster = GetCaster())
{
float modifiedAmount = caster->SpellBaseDamageBonusDone(GetSpellInfo()->GetSchoolMask()) * 3.36f;
float modifiedAmount = caster->SpellBaseDamageBonusDone(GetSpellInfo()->GetSchoolMask()) * 4.638f;
if (Player* player = caster->ToPlayer())
{
@@ -2196,7 +2190,7 @@ class spell_pri_power_word_shield : public AuraScript
// Mastery: Grace (TBD: move into DoEffectCalcDamageAndHealing hook with a new SpellScript and AuraScript).
if (AuraEffect const* masteryGraceEffect = caster->GetAuraEffect(SPELL_PRIEST_MASTERY_GRACE, EFFECT_0))
if (GetUnitOwner()->HasAura(SPELL_PRIEST_ATONEMENT_EFFECT) || GetUnitOwner()->HasAura(SPELL_PRIEST_TRINITY_EFFECT))
if (GetUnitOwner()->HasAura(SPELL_PRIEST_ATONEMENT_EFFECT))
AddPct(modifiedAmount, masteryGraceEffect->GetAmount());
switch (player->GetPrimarySpecialization())
@@ -2218,22 +2212,8 @@ class spell_pri_power_word_shield : public AuraScript
float critChanceTaken = GetUnitOwner()->SpellCritChanceTaken(caster, nullptr, auraEffect, GetSpellInfo()->GetSchoolMask(), critChanceDone, GetSpellInfo()->GetAttackType());
if (roll_chance_f(critChanceTaken))
{
modifiedAmount *= 2;
// Divine Aegis
if (AuraEffect const* divineEff = caster->GetAuraEffect(SPELL_PRIEST_DIVINE_AEGIS, EFFECT_1))
AddPct(modifiedAmount, divineEff->GetAmount());
}
// Rapture talent (TBD: move into DoEffectCalcDamageAndHealing hook).
if (AuraEffect const* raptureEffect = caster->GetAuraEffect(SPELL_PRIEST_RAPTURE, EFFECT_1))
AddPct(modifiedAmount, raptureEffect->GetAmount());
// Benevolence talent
if (AuraEffect const* benevolenceEffect = caster->GetAuraEffect(SPELL_PRIEST_BENEVOLENCE, EFFECT_0))
AddPct(modifiedAmount, benevolenceEffect->GetAmount());
amount = modifiedAmount;
}
}