diff options
| author | Ovahlord <dreadkiller@gmx.de> | 2023-11-15 15:03:26 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2023-11-15 15:03:26 +0100 |
| commit | f2f0c266493ee8f49d497d60cd30cfd3a3c65b13 (patch) | |
| tree | 65e82cfc96f92abd79e48593f956ca676f818c77 /src/server/scripts | |
| parent | 2a5703aff685392d3db90a22a811804293f2f568 (diff) | |
Core/DataStores: fixed loading game tables
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Spells/spell_azerite.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_monk.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_paladin.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_priest.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/Spells/spell_azerite.cpp b/src/server/scripts/Spells/spell_azerite.cpp index 794e588da9f..5216c468dc7 100644 --- a/src/server/scripts/Spells/spell_azerite.cpp +++ b/src/server/scripts/Spells/spell_azerite.cpp @@ -604,9 +604,9 @@ class spell_item_corruption_grasping_tendrils : public AuraScript void CalcAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { - Player* player = GetUnitOwner()->ToPlayer(); - amount = std::clamp(10.0f + player->GetRatingBonusValue(CR_CORRUPTION) - player->GetRatingBonusValue(CR_CORRUPTION_RESISTANCE), 0.0f, 99.0f); - canBeRecalculated = false; + //Player* player = GetUnitOwner()->ToPlayer(); + //amount = std::clamp(10.0f + player->GetRatingBonusValue(CR_CORRUPTION) - player->GetRatingBonusValue(CR_CORRUPTION_RESISTANCE), 0.0f, 99.0f); + //canBeRecalculated = false; } void Register() override diff --git a/src/server/scripts/Spells/spell_monk.cpp b/src/server/scripts/Spells/spell_monk.cpp index 6e66c820454..a3c56b8cb2a 100644 --- a/src/server/scripts/Spells/spell_monk.cpp +++ b/src/server/scripts/Spells/spell_monk.cpp @@ -129,8 +129,8 @@ class spell_monk_life_cocoon : public SpellScript void CalculateAbsorb(SpellEffIndex /*effIndex*/) { int32 absorb = GetCaster()->CountPctFromMaxHealth(GetEffectValue()); - if (Player* player = GetCaster()->ToPlayer()) - AddPct(absorb, player->GetRatingBonusValue(CR_VERSATILITY_HEALING_DONE)); + //if (Player* player = GetCaster()->ToPlayer()) + // AddPct(absorb, player->GetRatingBonusValue(CR_VERSATILITY_HEALING_DONE)); if (AuraEffect* calmingCoalescence = GetCaster()->GetAuraEffect(SPELL_MONK_CALMING_COALESCENCE, EFFECT_0, GetCaster()->GetGUID())) { diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index e6079efb253..4d3cc799b87 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -1329,8 +1329,8 @@ class spell_pal_shield_of_vengeance : public AuraScript void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { amount = CalculatePct(GetUnitOwner()->GetMaxHealth(), GetEffectInfo(EFFECT_1).CalcValue()); - if (Player const* player = GetUnitOwner()->ToPlayer()) - AddPct(amount, player->GetRatingBonusValue(CR_VERSATILITY_DAMAGE_DONE) + player->GetTotalAuraModifier(SPELL_AURA_MOD_VERSATILITY)); + //if (Player const* player = GetUnitOwner()->ToPlayer()) + // AddPct(amount, player->GetRatingBonusValue(CR_VERSATILITY_DAMAGE_DONE) + player->GetTotalAuraModifier(SPELL_AURA_MOD_VERSATILITY)); _initialAmount = amount; } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 1da42380a9d..883d92321c9 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -1884,7 +1884,7 @@ class spell_pri_power_word_shield : public AuraScript if (Player* player = caster->ToPlayer()) { - AddPct(modifiedAmount, player->GetRatingBonusValue(CR_VERSATILITY_DAMAGE_DONE)); + //AddPct(modifiedAmount, player->GetRatingBonusValue(CR_VERSATILITY_DAMAGE_DONE)); // 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)) |
