diff options
54 files changed, 258 insertions, 259 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 29c275a0922..df32c680c09 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1880,7 +1880,7 @@ void Pet::CastPetAura(PetAura const* aura) args.TriggerFlags = TRIGGERED_FULL_MASK; if (auraId == 35696) // Demonic Knowledge - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, CalculatePct(aura->GetDamage(), GetStat(STAT_STAMINA) + GetStat(STAT_INTELLECT))); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(aura->GetDamage(), GetStat(STAT_STAMINA) + GetStat(STAT_INTELLECT))); CastSpell(this, auraId, args); } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index b98daee4fd3..e70f8d626cc 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -8024,7 +8024,7 @@ void Player::CastItemCombatSpell(DamageInfo const& damageInfo, Item* item, ItemT for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if (spellInfo->Effects[i].IsEffect()) - args.SpellValueOverrides.AddMod(static_cast<SpellValueMod>(SPELLVALUE_BASE_POINT0 + i), CalculatePct(spellInfo->Effects[i].CalcValue(this), effectPct)); + args.AddSpellMod(static_cast<SpellValueMod>(SPELLVALUE_BASE_POINT0 + i), CalculatePct(spellInfo->Effects[i].CalcValue(this), effectPct)); } } CastSpell(target, spellInfo->Id, args); @@ -13685,7 +13685,7 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool // Cast custom spell vs all equal basepoints got from enchant_amount if (basepoints) for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) - args.SpellValueOverrides.AddMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), basepoints); + args.AddSpellMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), basepoints); CastSpell(this, enchant_spell_id, args); } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 5020baa928f..620cbc31555 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13278,7 +13278,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId) { CastSpellExtraArgs args(flags); args.OriginalCaster = origCasterGUID; - args.SpellValueOverrides.AddMod(SpellValueMod(SPELLVALUE_BASE_POINT0+i), seatId+1); + args.AddSpellMod(SpellValueMod(SPELLVALUE_BASE_POINT0+i), seatId+1); caster->CastSpell(target, itr->second.spellId, args); } else // This can happen during Player::_LoadAuras @@ -13312,7 +13312,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId) void Unit::EnterVehicle(Unit* base, int8 seatId) { CastSpellExtraArgs args(TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE); - args.SpellValueOverrides.AddBP0(seatId + 1); + args.AddSpellBP0(seatId + 1); CastSpell(base, VEHICLE_SPELL_RIDE_HARDCODED, args); } diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index f093b2cc508..a7969a265c8 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1174,7 +1174,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const if (aurEff->GetSpellInfo()->SpellIconID == 240 && aurEff->GetMiscValue() == 3) { CastSpellExtraArgs args(this); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount() / 2); // For each 2% Intelligence, you get 1% stamina and 1% attack power. + args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount() / 2); // For each 2% Intelligence, you get 1% stamina and 1% attack power. target->CastSpell(target, HotWSpellId, args); break; @@ -1206,7 +1206,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); target->CastSpell(target, 48420, args); } break; @@ -1216,14 +1216,14 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); target->CastSpell(target, 48418, args); } // Survival of the Fittest if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE, SPELLFAMILY_DRUID, 961, 0)) { CastSpellExtraArgs args(this); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, aurEff->GetSpellInfo()->Effects[EFFECT_2].CalcValue()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetSpellInfo()->Effects[EFFECT_2].CalcValue()); target->CastSpell(target, 62069, args); } break; @@ -1232,7 +1232,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); target->CastSpell(target, 48421, args); } break; @@ -1241,7 +1241,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const if (AuraEffect const* aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); target->CastSpell(target, 48422, args); } break; @@ -1721,7 +1721,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo case FORM_CAT: { CastSpellExtraArgs args(this); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, std::min(oldPower, FurorChance)); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, std::min(oldPower, FurorChance)); target->SetPower(POWER_ENERGY, 0); target->CastSpell(target, 17099, args); break; @@ -4885,7 +4885,7 @@ void AuraEffect::HandleAuraLinked(AuraApplication const* aurApp, uint8 mode, boo CastSpellExtraArgs args(this); if (GetAmount()) // If amount avalible cast with basepoints (Crypt Fever for example) - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, GetAmount()); caster->CastSpell(target, triggeredSpellId, args); } @@ -5058,7 +5058,7 @@ void AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick(Unit* target, Unit* { CastSpellExtraArgs args(this); for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) - args.SpellValueOverrides.AddMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), GetAmount()); + args.AddSpellMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), GetAmount()); triggerCaster->CastSpell(target, triggerSpellId, args); TC_LOG_DEBUG("spells", "AuraEffect::HandlePeriodicTriggerSpellWithValueAuraTick: Spell %u Trigger %u", GetId(), triggeredSpellInfo->Id); } @@ -5491,7 +5491,7 @@ void AuraEffect::HandlePeriodicManaLeechAuraTick(Unit* target, Unit* caster) con int32 feedAmount = CalculatePct(gainedAmount, manaFeedVal); CastSpellExtraArgs args(this); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, feedAmount); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, feedAmount); caster->CastSpell(caster, 32554, args); } } @@ -5661,7 +5661,7 @@ void AuraEffect::HandleProcTriggerSpellWithValueAuraProc(AuraApplication* aurApp if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId)) { CastSpellExtraArgs args(this); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, GetAmount()); triggerCaster->CastSpell(triggerTarget, triggerSpellId, args); TC_LOG_DEBUG("spells", "AuraEffect::HandleProcTriggerSpellWithValueAuraProc: Triggering spell %u with value %d from aura %u proc", triggeredSpellInfo->Id, GetAmount(), GetId()); } @@ -5761,7 +5761,7 @@ void AuraEffect::HandleRaidProcFromChargeWithValueAuraProc(AuraApplication* aurA CastSpellExtraArgs args(this); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, GetAmount()); // next target selection if (jumps > 0) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 5d34233fc00..3c5ea6ab08e 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1303,7 +1303,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (caster->HasAura(64760)) { CastSpellExtraArgs args(GetEffect(EFFECT_0)); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, GetEffect(EFFECT_0)->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, GetEffect(EFFECT_0)->GetAmount()); caster->CastSpell(target, 64801, args); } } @@ -1342,7 +1342,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b { // Refresh or add visual aura CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, sSpellMgr->AssertSpellInfo(74396)->StackAmount); + args.AddSpellMod(SPELLVALUE_AURA_STACK, sSpellMgr->AssertSpellInfo(74396)->StackAmount); target->CastSpell(nullptr, 74396, args); break; } @@ -1369,8 +1369,8 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b CastSpellExtraArgs args(devouringPlague), args2(devouringPlague); int32 basepoints0 = CalculatePct(devouringPlague->GetTotalTicks() * static_cast<int32>(damage), aurEff->GetAmount()); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, basepoints0); - args2.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, CalculatePct(basepoints0, 15)); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, basepoints0); + args2.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(basepoints0, 15)); caster->CastSpell(target, 63675, args); caster->CastSpell(nullptr, 75999, args2); } @@ -1384,7 +1384,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b // instantly heal m_amount% of the absorb-value int32 heal = glyph->GetAmount() * GetEffect(0)->GetAmount()/100; CastSpellExtraArgs args(GetEffect(0)); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, heal); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, heal); caster->CastSpell(GetUnitOwner(), 56160, args); } } @@ -1526,7 +1526,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b { int32 basepoints0 = aurEff->GetAmount() * caster->GetCreateMana() / 100; CastSpellExtraArgs args(GetEffect(0)); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, basepoints0); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, basepoints0); caster->CastSpell(caster, 64103, args); } } @@ -1560,7 +1560,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b multiplier += 0.5f; CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(CalculatePct(caster->GetMaxPower(POWER_MANA), multiplier)); + args.AddSpellBP0(CalculatePct(caster->GetMaxPower(POWER_MANA), multiplier)); caster->CastSpell(caster, 47755, args); } // effect on aura target @@ -1575,7 +1575,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b case POWER_MANA: { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(CalculatePct(target->GetMaxPower(POWER_MANA), 2)); + args.AddSpellBP0(CalculatePct(target->GetMaxPower(POWER_MANA), 2)); caster->CastSpell(target, 63654, args); break; } @@ -1669,7 +1669,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b target->RemoveAurasDueToSpell(31666); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); target->CastSpell(target, 31665, args); } } diff --git a/src/server/game/Spells/SpellDefines.h b/src/server/game/Spells/SpellDefines.h index 9adb83d87e3..2a38f1627e7 100644 --- a/src/server/game/Spells/SpellDefines.h +++ b/src/server/game/Spells/SpellDefines.h @@ -171,7 +171,7 @@ struct TC_GAME_API CastSpellExtraArgs CastSpellExtraArgs& SetTriggeringAura(AuraEffect const* triggeringAura) { TriggeringAura = triggeringAura; return *this; } CastSpellExtraArgs& SetOriginalCaster(ObjectGuid const& guid) { OriginalCaster = guid; return *this; } CastSpellExtraArgs& AddSpellMod(SpellValueMod mod, int32 val) { SpellValueOverrides.AddMod(mod, val); return *this; } - CastSpellExtraArgs& AddSpellBP0(int32 val) { SpellValueOverrides.AddBP0(val); return *this; } + CastSpellExtraArgs& AddSpellBP0(int32 val) { return AddSpellMod(SPELLVALUE_BASE_POINT0, val); } // because i don't want to type SPELLVALUE_BASE_POINT0 300 times TriggerCastFlags TriggerFlags = TRIGGERED_NONE; Item* CastItem = nullptr; @@ -179,17 +179,16 @@ struct TC_GAME_API CastSpellExtraArgs ObjectGuid OriginalCaster = ObjectGuid::Empty; struct { - public: - void AddMod(SpellValueMod mod, int32 val) { data.push_back({ mod, val }); } - void AddBP0(int32 bp0) { AddMod(SPELLVALUE_BASE_POINT0, bp0); } // because i don't want to type SPELLVALUE_BASE_POINT0 300 times + friend struct CastSpellExtraArgs; + friend class Unit; private: - auto begin() const { return data.cbegin(); } - auto end() const { return data.cend(); } + void AddMod(SpellValueMod mod, int32 val) { data.push_back({ mod, val }); } - std::vector<std::pair<SpellValueMod, int32>> data; + auto begin() const { return data.cbegin(); } + auto end() const { return data.cend(); } - friend class Unit; + std::vector<std::pair<SpellValueMod, int32>> data; } SpellValueOverrides; }; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 2e43d43bd81..11848bf9a93 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -464,7 +464,7 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) { int32 bp0 = aurEff->GetId() == 54037 ? 4 : 8; CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, bp0); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, bp0); m_caster->CastSpell(m_caster, 54425, args); } } @@ -858,7 +858,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) // set basepoints for trigger with value effect if (m_spellInfo->Effects[effIndex].Effect == SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE) for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) - args.SpellValueOverrides.AddMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), damage); + args.AddSpellMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), damage); // original caster guid only for GO cast m_caster->CastSpell(targets, spellInfo->Id, args); @@ -902,7 +902,7 @@ void Spell::EffectTriggerMissileSpell(SpellEffIndex effIndex) // set basepoints for trigger with value effect if (m_spellInfo->Effects[effIndex].Effect == SPELL_EFFECT_TRIGGER_MISSILE_SPELL_WITH_VALUE) for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) - args.SpellValueOverrides.AddMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), damage); + args.AddSpellMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), damage); // original caster guid only for GO cast m_caster->CastSpell(targets, spellInfo->Id, args); @@ -939,7 +939,7 @@ void Spell::EffectForceCast(SpellEffIndex effIndex) case 52349: // Overtake { CastSpellExtraArgs args(m_originalCasterGUID); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, damage); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, damage); unitTarget->CastSpell(unitTarget, spellInfo->Id, args); return; } @@ -956,7 +956,7 @@ void Spell::EffectForceCast(SpellEffIndex effIndex) CastSpellExtraArgs args(TRIGGERED_FULL_MASK); if (m_spellInfo->Effects[effIndex].Effect == SPELL_EFFECT_FORCE_CAST_WITH_VALUE) for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) - args.SpellValueOverrides.AddMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), damage); + args.AddSpellMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), damage); unitTarget->CastSpell(m_caster, spellInfo->Id, args); } @@ -2282,7 +2282,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex) // if we have small value, it indicates seat position if (basePoints > 0 && basePoints < MAX_VEHICLE_SEATS) - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, basePoints); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, basePoints); m_originalCaster->CastSpell(summon, spellId, args); @@ -2419,7 +2419,7 @@ void Spell::EffectDispel(SpellEffIndex effIndex) if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->GetCategory() == SPELLCATEGORY_DEVOUR_MAGIC) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, m_spellInfo->Effects[EFFECT_1].CalcValue()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, m_spellInfo->Effects[EFFECT_1].CalcValue()); m_caster->CastSpell(m_caster, 19658, args); // Glyph of Felhunter if (Unit* owner = m_caster->GetOwner()) @@ -3855,7 +3855,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (totem && totem->IsTotem()) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, damage); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, damage); m_caster->CastSpell(totem, 55277, args); } } @@ -3863,7 +3863,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) if (AuraEffect* aur = unitTarget->GetAuraEffect(63298, 0)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, damage * aur->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, damage * aur->GetAmount()); m_caster->CastSpell(unitTarget, 55277, args); } break; @@ -4292,7 +4292,7 @@ void Spell::EffectFeedPet(SpellEffIndex effIndex) /// @todo fix crash when a spell has two effects, both pointed at the same item target CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, benefit); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, benefit); m_caster->CastSpell(pet, m_spellInfo->Effects[effIndex].TriggerSpell, args); } @@ -4889,7 +4889,7 @@ void Spell::EffectDestroyAllTotems(SpellEffIndex /*effIndex*/) if (mana) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, mana); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, mana); m_caster->CastSpell(m_caster, 39104, args); } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index accc8affb9f..43210d99de6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -262,7 +262,7 @@ struct boss_coren_direbrew : public BossAI { CastSpellExtraArgs args; args.TriggerFlags = TRIGGERED_FULL_MASK; - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, 1); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); me->CastSpell(nullptr, SPELL_MOLE_MACHINE_TARGET_PICKER, args); events.Repeat(Seconds(15)); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index c6fac6b03c5..0461c7a188c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -141,7 +141,7 @@ class spell_baron_geddon_inferno : public SpellScriptLoader CastSpellExtraArgs args; args.TriggerFlags = TRIGGERED_FULL_MASK; args.TriggeringAura = aurEff; - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, damageForTick[aurEff->GetTickNumber() - 1]); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, damageForTick[aurEff->GetTickNumber() - 1]); GetTarget()->CastSpell(nullptr, SPELL_INFERNO_DMG, args); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 818fd205679..1dfbce63c42 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -175,7 +175,7 @@ class boss_akilzon : public CreatureScript CastSpellExtraArgs args; args.TriggerFlags = TRIGGERED_FULL_MASK; args.OriginalCaster = me->GetGUID(); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, bp0); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, bp0); Cloud->CastSpell(target, SPELL_ZAP, args); } } @@ -200,7 +200,7 @@ class boss_akilzon : public CreatureScript CastSpellExtraArgs args; args.TriggerFlags = TRIGGERED_FULL_MASK; args.OriginalCaster = Cloud->GetGUID(); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, bp0); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, bp0); Cloud->CastSpell(trigger, SPELL_ZAP, args); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index ab3bb028838..1ee3ece1567 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -286,7 +286,7 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader Unit* actor = eventInfo.GetActor(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, damageInfo->GetDamage() * 3); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, damageInfo->GetDamage() * 3); actor->CastSpell(actor, SPELL_VAMPIRIC_AURA_HEAL, args); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 3328cdd4636..6b2deab32c8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -1453,7 +1453,7 @@ public: return; } CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, 500 + rand32() % 700); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, 500 + rand32() % 700); me->CastSpell(me->GetVictim(), SPELL_EXPLODING_SHOT, args); ExplodeTimer = 5000 + rand32() % 5000; } else ExplodeTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index d4308a162ae..960a62aaa84 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -261,7 +261,7 @@ class spell_ahn_kahet_swarm : public SpellScriptLoader { CastSpellExtraArgs args; args.TriggerFlags = TRIGGERED_FULL_MASK; - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, _targetCount); + args.AddSpellMod(SPELLVALUE_AURA_STACK, _targetCount); GetCaster()->CastSpell(GetCaster(), SPELL_SWARM_BUFF, args); } } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index fe78ac3266b..feb4f6f355a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1239,13 +1239,13 @@ class npc_combustion_consumption : public CreatureScript return; CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, stackAmount + 1); + args.AddSpellMod(SPELLVALUE_AURA_STACK, stackAmount + 1); me->CastSpell(me, SPELL_SCALE_AURA, args); DoCastSelf(_damageSpell); int32 damage = 1200 + (stackAmount * 1290); // Needs more research. CastSpellExtraArgs args2; - args2.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, damage); + args2.AddSpellMod(SPELLVALUE_BASE_POINT0, damage); summoner->CastSpell(summoner, _explosionSpell, args2); } @@ -1514,7 +1514,7 @@ class spell_halion_combustion_consumption_periodic : public SpellScriptLoader CastSpellExtraArgs args(aurEff); args.OriginalCaster = caster->GetGUID(); - args.SpellValueOverrides.AddMod(SPELLVALUE_RADIUS_MOD, radius); + args.AddSpellMod(SPELLVALUE_RADIUS_MOD, radius); caster->CastSpell(nullptr, triggerSpell, args); } @@ -1568,7 +1568,7 @@ class spell_halion_marks : public SpellScriptLoader // Stacks marker CastSpellExtraArgs args(GetCasterGUID()); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, aurEff->GetBase()->GetStackAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, aurEff->GetBase()->GetStackAmount()); GetTarget()->CastSpell(GetTarget(), _summonSpellId, args); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 0237074292e..958800ca41e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -198,7 +198,7 @@ class spell_ruby_sanctum_rallying_shout : public SpellScriptLoader if (_targetCount && !GetCaster()->HasAura(SPELL_RALLY)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, _targetCount); + args.AddSpellMod(SPELLVALUE_AURA_STACK, _targetCount); GetCaster()->CastSpell(GetCaster(), SPELL_RALLY, args); } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 6f77a251f31..d97d31b1c25 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -312,7 +312,7 @@ class boss_anubarak_trial : public CreatureScript case EVENT_PENETRATING_COLD: { CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, RAID_MODE(2, 5, 2, 5)); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, RAID_MODE(2, 5, 2, 5)); me->CastSpell(nullptr, SPELL_PENETRATING_COLD, args); events.ScheduleEvent(EVENT_PENETRATING_COLD, 20 * IN_MILLISECONDS, 0, PHASE_MELEE); return; @@ -321,7 +321,7 @@ class boss_anubarak_trial : public CreatureScript if (IsHeroic() || !_reachedPhase3) { CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, RAID_MODE(1, 2, 2, 4)); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, RAID_MODE(1, 2, 2, 4)); me->CastSpell(nullptr, SPELL_SUMMON_BURROWER, args); } events.ScheduleEvent(EVENT_SUMMON_NERUBIAN, 45*IN_MILLISECONDS, 0, PHASE_MELEE); @@ -937,7 +937,7 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader if (lifeLeeched < 250) lifeLeeched = 250; CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, lifeLeeched); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, lifeLeeched); // Damage caster->CastSpell(target, SPELL_LEECHING_SWARM_DMG, args); // Heal diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 911b7e0daef..a8e901ea05b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -223,7 +223,7 @@ class boss_jaraxxus : public CreatureScript case EVENT_NETHER_POWER: { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, RAID_MODE(5, 10, 5, 10)); + args.AddSpellMod(SPELLVALUE_AURA_STACK, RAID_MODE(5, 10, 5, 10)); me->CastSpell(me, SPELL_NETHER_POWER, args); events.ScheduleEvent(EVENT_NETHER_POWER, 40 * IN_MILLISECONDS); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 3be810bc222..e85c91987a4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -1198,7 +1198,7 @@ class spell_jormungars_slime_pool : public AuraScript int32 const radius = static_cast<int32>(((aurEff->GetTickNumber() / 60.f) * 0.9f + 0.1f) * 10000.f * 2.f / 3.f); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_RADIUS_MOD, radius); + args.AddSpellMod(SPELLVALUE_RADIUS_MOD, radius); GetTarget()->CastSpell(nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, args); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 695bff84fe4..002b8557586 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -323,7 +323,7 @@ struct boss_twin_baseAI : public BossAI if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true, true, OtherEssenceSpellId)) { CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, 1); // @todo spellmgr correction instead? + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); // @todo spellmgr correction instead? me->CastSpell(target, TouchSpellId, args); } events.ScheduleEvent(EVENT_TOUCH, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS)); @@ -731,8 +731,8 @@ class spell_bullet_controller : public AuraScript return; CastSpellExtraArgs args1(TRIGGERED_FULL_MASK), args2(TRIGGERED_FULL_MASK); - args1.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, urand(1, 6)); - args2.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, urand(1, 6)); + args1.AddSpellMod(SPELLVALUE_MAX_TARGETS, urand(1, 6)); + args2.AddSpellMod(SPELLVALUE_MAX_TARGETS, urand(1, 6)); caster->CastSpell(GetTarget(), SPELL_SUMMON_PERIODIC_LIGHT, args1); caster->CastSpell(GetTarget(), SPELL_SUMMON_PERIODIC_DARK, args2); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 71e65e26e3b..d73f8a7f077 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -411,7 +411,7 @@ class spell_devourer_of_souls_mirrored_soul_proc : public SpellScriptLoader return; CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), 45)); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), 45)); GetTarget()->CastSpell(GetCaster(), SPELL_MIRRORED_SOUL_DAMAGE, args); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 637bca3d44b..cb0830a62f0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -153,7 +153,7 @@ class spell_marwyn_shared_suffering : public SpellScriptLoader if (remainingDamage > 0) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, remainingDamage); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, remainingDamage); caster->CastSpell(GetTarget(), SPELL_SHARED_SUFFERING_DISPEL, args); } } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index bf4bdf39f46..6c0a3e20301 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -406,7 +406,7 @@ class player_overlord_brandAI : public PlayerAI if (Unit* victim = tyrannus->GetVictim()) { CastSpellExtraArgs args(tyrannus->GetGUID()); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); me->CastSpell(victim, SPELL_OVERLORD_BRAND_DAMAGE, args); } } @@ -416,7 +416,7 @@ class player_overlord_brandAI : public PlayerAI if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannusGUID)) { CastSpellExtraArgs args(tyrannus->GetGUID()); - args.SpellValueOverrides.AddBP0(addHealth * 5.5f); + args.AddSpellBP0(addHealth * 5.5f); me->CastSpell(tyrannus, SPELL_OVERLORD_BRAND_HEAL, args); } } diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index a122ea8d34e..e1e9117fb50 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -235,7 +235,7 @@ class spell_moorabi_mojo_frenzy : public SpellScriptLoader Unit* owner = GetUnitOwner(); int32 castSpeedBonus = (100.0f - owner->GetHealthPct()) * 4; // between 0% and 400% cast speed bonus CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(castSpeedBonus); + args.AddSpellBP0(castSpeedBonus); owner->CastSpell(owner, SPELL_MOJO_FRENZY_CAST_SPEED, args); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index a0ff0a6b8ae..3a2a9a1a8da 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -729,7 +729,7 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); GetTarget()->CastSpell(GetTarget(), SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL, args); } @@ -816,7 +816,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader damage = int32(damage * multiplier); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); GetTarget()->CastSpell(GetTarget(), SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE, args); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 7cc7c1adf38..92251489963 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -436,7 +436,7 @@ class boss_deathbringer_saurfang : public CreatureScript if (me->GetPower(POWER_ENERGY) != me->GetMaxPower(POWER_ENERGY)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(1); + args.AddSpellBP0(1); target->CastSpell(nullptr, SPELL_BLOOD_LINK_DUMMY, args); } break; @@ -1021,7 +1021,7 @@ class spell_deathbringer_blood_link : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetEffectValue()); + args.AddSpellBP0(GetEffectValue()); GetHitUnit()->CastSpell(GetHitUnit(), SPELL_BLOOD_LINK_POWER, args); PreventHitDefaultEffect(EFFECT_0); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index f5144da0b22..a0f2665f910 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1848,7 +1848,7 @@ class spell_igb_rocket_pack : public SpellScriptLoader { SpellInfo const* damageInfo = sSpellMgr->AssertSpellInfo(SPELL_ROCKET_PACK_DAMAGE); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(2 * (damageInfo->Effects[EFFECT_0].CalcValue() + aurEff->GetTickNumber() * aurEff->GetAmplitude())); + args.AddSpellBP0(2 * (damageInfo->Effects[EFFECT_0].CalcValue() + aurEff->GetTickNumber() * aurEff->GetAmplitude())); GetTarget()->CastSpell(nullptr, SPELL_ROCKET_PACK_DAMAGE, args); GetTarget()->CastSpell(nullptr, SPELL_ROCKET_BURST, TRIGGERED_FULL_MASK); } @@ -2256,7 +2256,7 @@ class spell_igb_burning_pitch : public SpellScriptLoader { PreventHitDefaultEffect(effIndex); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(8000); + args.AddSpellBP0(8000); GetCaster()->CastSpell(nullptr, GetEffectValue(), args); GetHitUnit()->CastSpell(GetHitUnit(), SPELL_BURNING_PITCH, TRIGGERED_FULL_MASK); } @@ -2325,7 +2325,7 @@ class spell_igb_rocket_artillery_explosion : public SpellScriptLoader if (InstanceScript* instance = GetCaster()->GetInstanceScript()) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(5000); + args.AddSpellBP0(5000); GetCaster()->CastSpell(nullptr, instance->GetData(DATA_TEAM_IN_INSTANCE) == HORDE ? SPELL_BURNING_PITCH_DAMAGE_A : SPELL_BURNING_PITCH_DAMAGE_H, args); } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 26976dbc8a5..08d1c9f89fc 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -437,7 +437,7 @@ class boss_lady_deathwhisper : public CreatureScript .Schedule(Seconds(12), GROUP_TWO, [this](TaskContext summonShade) { CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, Is25ManRaid() ? 2 : 1); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, Is25ManRaid() ? 2 : 1); me->CastSpell(nullptr, SPELL_SUMMON_SPIRITS, args); summonShade.Repeat(); }); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index c6a998cd170..ca4634f2f56 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -823,7 +823,7 @@ class npc_gas_cloud : public CreatureScript void CastMainSpell() override { CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, 10); + args.AddSpellMod(SPELLVALUE_AURA_STACK, 10); me->CastSpell(me, SPELL_GASEOUS_BLOAT, args); } @@ -855,7 +855,7 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader if (!target->HasAura(GetId())) { CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, 10); + args.AddSpellMod(SPELLVALUE_AURA_STACK, 10); caster->CastSpell(caster, SPELL_GASEOUS_BLOAT, args); } } @@ -872,7 +872,7 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader dmg += mod * i; CastSpellExtraArgs args; - args.SpellValueOverrides.AddBP0(dmg); + args.AddSpellBP0(dmg); caster->CastSpell(nullptr, SPELL_EXPUNGED_GAS, args); } @@ -1333,7 +1333,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); GetTarget()->CastSpell(GetTarget(), triggerSpell, args); } @@ -1347,7 +1347,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader int32 heal = healSpellInfo->Effects[0].CalcValue() * GetStackAmount(); CastSpellExtraArgs args(GetCasterGUID()); - args.SpellValueOverrides.AddBP0(heal); + args.AddSpellBP0(heal); GetTarget()->CastSpell(GetTarget(), healSpell, args); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 4376e55967b..4b65faa55f7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -370,7 +370,7 @@ class boss_sindragosa : public CreatureScript case POINT_AIR_PHASE: { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, RAID_MODE<int32>(2, 5, 2, 6)); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, RAID_MODE<int32>(2, 5, 2, 6)); me->CastSpell(nullptr, SPELL_ICE_TOMB_TARGET, args); me->SetFacingTo(float(M_PI), true); events.ScheduleEvent(EVENT_AIR_MOVEMENT_FAR, 1); @@ -513,7 +513,7 @@ class boss_sindragosa : public CreatureScript case EVENT_ICE_TOMB: { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, 1); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); me->CastSpell(nullptr, SPELL_ICE_TOMB_TARGET, args); events.ScheduleEvent(EVENT_ICE_TOMB, urand(16000, 23000)); break; @@ -1253,7 +1253,7 @@ class spell_sindragosa_instability : public SpellScriptLoader { CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); GetTarget()->CastSpell(GetTarget(), SPELL_BACKLASH, args); } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 1640293328c..dd0b1b7b72f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -2141,7 +2141,7 @@ class spell_the_lich_king_necrotic_plague : public SpellScriptLoader } CastSpellExtraArgs args(GetCasterGUID()); - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, 1); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); GetTarget()->CastSpell(nullptr, SPELL_NECROTIC_PLAGUE_JUMP, args); if (Unit* caster = GetCaster()) caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); @@ -2237,7 +2237,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader } CastSpellExtraArgs args(GetCasterGUID()); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, GetStackAmount()); + args.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount()); GetTarget()->CastSpell(nullptr, SPELL_NECROTIC_PLAGUE_JUMP, args); if (Unit* caster = GetCaster()) caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); @@ -2255,8 +2255,8 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader return; CastSpellExtraArgs args(GetCasterGUID()); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, GetStackAmount()); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, AURA_REMOVE_BY_ENEMY_SPELL); // add as marker (spell has no effect 1) + args.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, AURA_REMOVE_BY_ENEMY_SPELL); // add as marker (spell has no effect 1) GetTarget()->CastSpell(nullptr, SPELL_NECROTIC_PLAGUE_JUMP, args); if (Unit* caster = GetCaster()) caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); @@ -2671,7 +2671,7 @@ class spell_the_lich_king_life_siphon : public SpellScriptLoader void TriggerHeal() { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetHitDamage() * 10); + args.AddSpellBP0(GetHitDamage() * 10); GetHitUnit()->CastSpell(GetCaster(), SPELL_LIFE_SIPHON_HEAL, args); } @@ -2939,7 +2939,7 @@ class spell_the_lich_king_soul_rip : public SpellScriptLoader { CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(5000 * aurEff->GetTickNumber()); + args.AddSpellBP0(5000 * aurEff->GetTickNumber()); caster->CastSpell(GetTarget(), SPELL_SOUL_RIP_DAMAGE, args); } } @@ -3038,7 +3038,7 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(damageInfo->GetDamage() / 2); + args.AddSpellBP0(damageInfo->GetDamage() / 2); GetTarget()->CastSpell(GetTarget(), SPELL_DARK_HUNGER_HEAL, args); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 46890132586..ca820785719 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -888,7 +888,7 @@ class boss_sister_svalna : public CreatureScript { Talk(EMOTE_SVALNA_IMPALE, target); CastSpellExtraArgs args; - args.SpellValueOverrides.AddBP0(1); + args.AddSpellBP0(1); summon->CastSpell(target, VEHICLE_SPELL_RIDE_HARDCODED, args); summon->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_UNK1 | UNIT_FLAG2_ALLOW_ENEMY_INTERACT); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index c93c613aed7..8b3cdfb060c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -730,7 +730,7 @@ class spell_four_horsemen_mark : public SpellScriptLoader if (damage) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); caster->CastSpell(GetTarget(), SPELL_MARK_DAMAGE, args); } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index ee0f20cb8f8..c833ad54684 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -318,7 +318,7 @@ public: if (damage > 0) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); GetCaster()->CastSpell(unit, SPELL_DECIMATE_DMG, args); } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 76aa9588252..240475c974e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -204,7 +204,7 @@ class spell_grobbulus_poison_cloud : public SpellScriptLoader int32 mod = int32(((float(aurEff->GetTickNumber()) / aurEff->GetTotalTicks()) * 0.9f + 0.1f) * 10000 * 2 / 3); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_RADIUS_MOD, mod); + args.AddSpellMod(SPELLVALUE_RADIUS_MOD, mod); GetTarget()->CastSpell(nullptr, triggerSpell, args); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 1cf1a1ca100..c514fff54b0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -929,7 +929,7 @@ public: { mana = target->ModifyPower(POWER_MANA, -mana); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(-mana * 10); + args.AddSpellBP0(-mana * 10); target->CastSpell(target, SPELL_MANA_DETONATION_DAMAGE, args); } } @@ -964,7 +964,7 @@ class spell_kelthuzad_frost_blast : public AuraScript if (Unit* caster = GetCaster()) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(GetTarget()->CountPctFromMaxHealth(26)); + args.AddSpellBP0(GetTarget()->CountPctFromMaxHealth(26)); caster->CastSpell(GetTarget(), SPELL_FROST_BLAST_DMG, args); } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index ad2f0e1761b..d634963bf2b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -380,7 +380,7 @@ class boss_freya : public CreatureScript Talk(SAY_AGGRO_WITH_ELDER); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, 150); + args.AddSpellMod(SPELLVALUE_AURA_STACK, 150); me->CastSpell(me, SPELL_ATTUNED_TO_NATURE, args); events.ScheduleEvent(EVENT_WAVE, 10000); @@ -757,7 +757,7 @@ class boss_elder_brightleaf : public CreatureScript if (Aura* aura = me->GetAura(SPELL_FLUX_AURA)) stackAmount = aura->GetStackAmount(); CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, stackAmount); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, stackAmount); me->CastSpell(me, SPELL_SOLAR_FLARE, args); events.ScheduleEvent(EVENT_SOLAR_FLARE, urand(5000, 10000)); break; @@ -844,7 +844,7 @@ class boss_elder_stonebark : public CreatureScript if (me->HasAura(SPELL_PETRIFIED_BARK)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); who->CastSpell(who, SPELL_PETRIFIED_BARK_DMG, args); damage = 0; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index d33313ec3ac..aa7f28a77ab 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -467,7 +467,7 @@ class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader if (Unit* caster = GetCaster()) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, aurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, aurEff->GetAmount()); caster->CastSpell(GetTarget(), SPELL_MARK_OF_THE_FACELESS_DAMAGE, args); } } @@ -533,8 +533,8 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader { int32 mana = int32(aurEff->GetAmount() * std::pow(2.0f, GetStackAmount())); // mana restore - bp * 2^stackamount CastSpellExtraArgs args1(TRIGGERED_FULL_MASK), args2(TRIGGERED_FULL_MASK); - args1.SpellValueOverrides.AddBP0(mana); - args2.SpellValueOverrides.AddBP0(mana * 2); + args1.AddSpellBP0(mana); + args2.AddSpellBP0(mana * 2); caster->CastSpell(GetTarget(), SPELL_SARONITE_VAPORS_ENERGIZE, args1); caster->CastSpell(GetTarget(), SPELL_SARONITE_VAPORS_DAMAGE, args2); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 3bbb13258f1..f35f2a82d62 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -1049,7 +1049,7 @@ public: int32 damage = int32(200 * std::pow(2.0f, GetStackAmount())); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); caster->CastSpell(caster, SPELL_BITING_COLD_DAMAGE, args); if (caster->isMoving()) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index af81915f694..7bc35eb3710 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -2498,7 +2498,7 @@ class spell_yogg_saron_empowered : public SpellScriptLoader // 64161 void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, 9); + args.AddSpellMod(SPELLVALUE_AURA_STACK, 9); GetTarget()->CastSpell(GetTarget(), SPELL_EMPOWERED_BUFF, args); } @@ -2512,7 +2512,7 @@ class spell_yogg_saron_empowered : public SpellScriptLoader // 64161 { target->RemoveAurasDueToSpell(SPELL_WEAKENED); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, stack); + args.AddSpellMod(SPELLVALUE_AURA_STACK, stack); target->CastSpell(target, SPELL_EMPOWERED_BUFF, args); } else if (!target->HealthAbovePct(1) && !target->HasAura(SPELL_WEAKENED)) @@ -2742,7 +2742,7 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader // 63305 return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), 60)); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), 60)); GetTarget()->CastSpell(damageInfo->GetAttacker(), SPELL_GRIM_REPRISAL_DAMAGE, args); } diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index e16206f5050..720c915c974 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -1178,7 +1178,7 @@ struct npc_infernal_rain_hellfire : public ScriptedAI if (random->isMoving() && random->GetPositionZ() < 118.0f) { CastSpellExtraArgs args; - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, 1); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); me->CastSpell(random, SPELL_INFERNAL_RAIN, args); } } diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index bda0a4257ce..4fb4bfb5816 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -342,7 +342,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader // damage absorbed by Anti-Magic Shell energizes the DK with additional runic power. // This, if I'm not mistaken, shows that we get back ~20% of the absorbed damage as runic power. CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(absorbAmount, 20)); + args.AddSpellBP0(CalculatePct(absorbAmount, 20)); GetTarget()->CastSpell(GetTarget(), SPELL_DK_RUNIC_POWER_ENERGIZE, args); } @@ -527,7 +527,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(damageInfo->GetDamage() * 1.5f); + args.AddSpellBP0(damageInfo->GetDamage() * 1.5f); GetTarget()->CastSpell(_procTarget, SPELL_DK_BLOOD_GORGED_HEAL, args); } @@ -593,7 +593,7 @@ class spell_dk_butchery : public SpellScriptLoader { PreventDefaultAction(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); eventInfo.GetActor()->CastSpell(nullptr, SPELL_DK_BUTCHERY_RUNIC_POWER, args); } @@ -686,12 +686,12 @@ class spell_dk_corpse_explosion : public SpellScriptLoader CastSpellExtraArgs args(TRIGGERED_FULL_MASK); if (effIndex == EFFECT_0) { - args.SpellValueOverrides.AddBP0(GetEffectValue()); + args.AddSpellBP0(GetEffectValue()); GetCaster()->CastSpell(target, GetSpellInfo()->Effects[EFFECT_1].CalcValue(), args); } else if (effIndex == EFFECT_1) { - args.SpellValueOverrides.AddBP0(GetSpell()->CalculateDamage(EFFECT_0, nullptr)); + args.AddSpellBP0(GetSpell()->CalculateDamage(EFFECT_0, nullptr)); GetCaster()->CastSpell(target, GetEffectValue(), args); } } @@ -811,7 +811,7 @@ class spell_dk_death_and_decay : public SpellScriptLoader if (!caster) return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); caster->CastSpell(GetTarget(), SPELL_DK_DEATH_AND_DECAY_DAMAGE, args); } @@ -850,7 +850,7 @@ class spell_dk_death_coil : public SpellScriptLoader if (caster->IsFriendlyTo(target)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetEffectValue() * 1.5f); + args.AddSpellBP0(GetEffectValue() * 1.5f); caster->CastSpell(target, SPELL_DK_DEATH_COIL_HEAL, args); } else @@ -859,7 +859,7 @@ class spell_dk_death_coil : public SpellScriptLoader if (AuraEffect const* auraEffect = caster->GetAuraEffect(SPELL_DK_ITEM_SIGIL_VENGEFUL_HEART, EFFECT_1)) damage += auraEffect->GetBaseAmount(); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); caster->CastSpell(target, SPELL_DK_DEATH_COIL_DAMAGE, args); } } @@ -1140,7 +1140,7 @@ class spell_dk_death_strike : public SpellScriptLoader // @todo castspell refactor note: this is not triggered - is this intended?? CastSpellExtraArgs args; - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); caster->CastSpell(caster, SPELL_DK_DEATH_STRIKE_HEAL, args); } } @@ -1394,7 +1394,7 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader if ((target->HasAura(SPELL_DK_FROST_PRESENCE) || target->HasAura(SPELL_DK_UNHOLY_PRESENCE)) && !target->HasAura(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, aurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, aurEff->GetAmount()); target->CastSpell(target, SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED, args); } } @@ -1448,7 +1448,7 @@ public: if (DamageInfo* dmgInfo = eventInfo.GetDamageInfo()) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(dmgInfo->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(dmgInfo->GetDamage(), aurEff->GetAmount())); eventInfo.GetActor()->CastSpell(eventInfo.GetActor(), SPELL_DK_IMPROVED_BLOOD_PRESENCE_HEAL, args); } } @@ -1493,7 +1493,7 @@ class spell_dk_improved_frost_presence : public SpellScriptLoader if ((target->HasAura(SPELL_DK_BLOOD_PRESENCE) || target->HasAura(SPELL_DK_UNHOLY_PRESENCE)) && !target->HasAura(SPELL_DK_FROST_PRESENCE_TRIGGERED)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); target->CastSpell(target, SPELL_DK_FROST_PRESENCE_TRIGGERED, args); } } @@ -1549,14 +1549,14 @@ class spell_dk_improved_unholy_presence : public SpellScriptLoader int32 basePoints = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); CastSpellExtraArgs args(aurEff); for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) - args.SpellValueOverrides.AddMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), basePoints); + args.AddSpellMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), basePoints); target->CastSpell(target, SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, args); } if ((target->HasAura(SPELL_DK_BLOOD_PRESENCE) || target->HasAura(SPELL_DK_FROST_PRESENCE)) && !target->HasAura(SPELL_DK_UNHOLY_PRESENCE_TRIGGERED)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); target->CastSpell(target, SPELL_DK_UNHOLY_PRESENCE_TRIGGERED, args); } } @@ -1684,7 +1684,7 @@ class spell_dk_necrosis : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); eventInfo.GetActor()->CastSpell(eventInfo.GetProcTarget(), SPELL_DK_NECROSIS_DAMAGE, args); } @@ -1821,7 +1821,7 @@ class spell_dk_presence : public SpellScriptLoader if (!target->HasAura(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, impAurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, impAurEff->GetAmount()); target->CastSpell(target, SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED, args); } } @@ -1836,7 +1836,7 @@ class spell_dk_presence : public SpellScriptLoader if (!target->HasAura(SPELL_DK_FROST_PRESENCE_TRIGGERED)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(impAurEff->GetAmount()); + args.AddSpellBP0(impAurEff->GetAmount()); target->CastSpell(target, SPELL_DK_FROST_PRESENCE_TRIGGERED, args); } } @@ -1856,13 +1856,13 @@ class spell_dk_presence : public SpellScriptLoader int32 bp = impAurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue(); CastSpellExtraArgs args(aurEff); for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) - args.SpellValueOverrides.AddMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), bp); + args.AddSpellMod(SpellValueMod(SPELLVALUE_BASE_POINT0 + i), bp); target->CastSpell(target, SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, args); } else if (!target->HasAura(SPELL_DK_UNHOLY_PRESENCE_TRIGGERED)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(impAurEff->GetAmount()); + args.AddSpellBP0(impAurEff->GetAmount()); target->CastSpell(target, SPELL_DK_UNHOLY_PRESENCE_TRIGGERED, args); } } @@ -2228,7 +2228,7 @@ class spell_dk_scourge_strike : public SpellScriptLoader AddPct(bp, aurEff->GetAmount()); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); caster->CastSpell(unitTarget, SPELL_DK_SCOURGE_STRIKE_TRIGGERED, args); } } @@ -2467,7 +2467,7 @@ class spell_dk_unholy_blight : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_DK_UNHOLY_BLIGHT_DAMAGE, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_DK_UNHOLY_BLIGHT_DAMAGE, args); } @@ -2529,7 +2529,7 @@ class spell_dk_vendetta : public SpellScriptLoader PreventDefaultAction(); Unit* const caster = eventInfo.GetActor(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(caster->CountPctFromMaxHealth(aurEff->GetAmount())); + args.AddSpellBP0(caster->CountPctFromMaxHealth(aurEff->GetAmount())); caster->CastSpell(nullptr, SPELL_DK_VENDETTA_HEAL, args); } @@ -2574,7 +2574,7 @@ class spell_dk_wandering_plague : public SpellScriptLoader int32 amount = CalculatePct(static_cast<int32>(damageInfo->GetDamage()), aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_DK_WANDERING_PLAGUE_DAMAGE, args); } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index fd56e6fc1af..c9bb513eb5a 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -334,7 +334,7 @@ class spell_dru_enrage : public SpellScriptLoader if (AuraEffect const* aurEff = target->GetAuraEffectOfRankedSpell(SPELL_DRUID_KING_OF_THE_JUNGLE, EFFECT_0)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); target->CastSpell(target, SPELL_DRUID_ENRAGE_MOD_DAMAGE, args); } @@ -507,7 +507,7 @@ class spell_dru_frenzied_regeneration : public AuraScript int32 const mod = std::min(static_cast<int32>(rage), 100); int32 const regen = CalculatePct(GetTarget()->GetMaxHealth(), GetTarget()->CalculateSpellDamage(nullptr, GetSpellInfo(), EFFECT_1) * mod / 100.f); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(regen); + args.AddSpellBP0(regen); GetTarget()->CastSpell(nullptr, SPELL_DRUID_FRENZIED_REGENERATION_HEAL, args); GetTarget()->SetPower(POWER_RAGE, rage - mod); } @@ -578,7 +578,7 @@ class spell_dru_glyph_of_innervate : public SpellScriptLoader amount /= spellInfo->GetMaxTicks(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(nullptr, SPELL_DRUID_GLYPH_OF_INNERVATE_REGEN, args); } @@ -661,7 +661,7 @@ class spell_dru_glyph_of_rejuvenation : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); eventInfo.GetActor()->CastSpell(eventInfo.GetProcTarget(), SPELL_DRUID_GLYPH_OF_REJUVENATION_HEAL, args); } @@ -958,7 +958,7 @@ class spell_dru_leader_of_the_pack : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(caster->CountPctFromMaxHealth(aurEff->GetAmount())); + args.AddSpellBP0(caster->CountPctFromMaxHealth(aurEff->GetAmount())); caster->CastSpell(nullptr, SPELL_DRUID_IMP_LEADER_OF_THE_PACK_HEAL, args); // Because of how proc system works, we can't store proc cd on db, it would be applied to entire aura @@ -973,7 +973,7 @@ class spell_dru_leader_of_the_pack : public SpellScriptLoader ASSERT(impLotpMana); CastSpellExtraArgs args2(aurEff); - args2.SpellValueOverrides.AddBP0(CalculatePct(caster->GetMaxPower(POWER_MANA), impLotpMana->GetSpellInfo()->Effects[EFFECT_1].CalcValue())); + args2.AddSpellBP0(CalculatePct(caster->GetMaxPower(POWER_MANA), impLotpMana->GetSpellInfo()->Effects[EFFECT_1].CalcValue())); caster->CastSpell(nullptr, SPELL_DRUID_IMP_LEADER_OF_THE_PACK_MANA, args2); } @@ -1019,13 +1019,13 @@ class spell_dru_lifebloom : public SpellScriptLoader // restore mana CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(CalculatePct(caster->GetCreateMana(), GetSpellInfo()->ManaCostPercentage) * stack / 2); + args.AddSpellBP0(CalculatePct(caster->GetCreateMana(), GetSpellInfo()->ManaCostPercentage) * stack / 2); caster->CastSpell(caster, SPELL_DRUID_LIFEBLOOM_ENERGIZE, args); } CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(healAmount); + args.AddSpellBP0(healAmount); target->CastSpell(GetTarget(), SPELL_DRUID_LIFEBLOOM_FINAL_HEAL, args); } @@ -1083,7 +1083,7 @@ class spell_dru_living_seed : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_DRUID_LIVING_SEED_PROC, args); } @@ -1118,7 +1118,7 @@ class spell_dru_living_seed_proc : public SpellScriptLoader { PreventDefaultAction(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); GetTarget()->CastSpell(GetTarget(), SPELL_DRUID_LIVING_SEED_HEAL, args); } @@ -1461,7 +1461,7 @@ class spell_dru_savage_defense : public SpellScriptLoader PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(caster->GetTotalAttackPowerValue(BASE_ATTACK), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(caster->GetTotalAttackPowerValue(BASE_ATTACK), aurEff->GetAmount())); caster->CastSpell(nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, args); } @@ -1651,7 +1651,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader { Unit* target = GetTarget(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(target->CountPctFromMaxHealth(aurEff->GetAmount())); + args.AddSpellBP0(target->CountPctFromMaxHealth(aurEff->GetAmount())); target->CastSpell(target, SPELL_DRUID_SURVIVAL_INSTINCTS, args); } @@ -1727,7 +1727,7 @@ class spell_dru_tiger_s_fury : public SpellScriptLoader if (AuraEffect const* aurEff = GetHitUnit()->GetAuraEffectOfRankedSpell(SPELL_DRUID_KING_OF_THE_JUNGLE, EFFECT_1)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); GetHitUnit()->CastSpell(GetHitUnit(), SPELL_DRUID_TIGER_S_FURY_ENERGIZE, args); } } @@ -1895,7 +1895,7 @@ class spell_dru_t3_8p_bonus : public SpellScriptLoader Unit* caster = eventInfo.GetActor(); int32 amount = CalculatePct(spellInfo->CalcPowerCost(caster, spellInfo->GetSchoolMask()), aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(nullptr, SPELL_DRUID_EXHILARATE, args); } @@ -2118,7 +2118,7 @@ class spell_dru_t10_balance_4p_bonus : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_DRUID_LANGUISH, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_DRUID_LANGUISH, args); } @@ -2226,7 +2226,7 @@ class spell_dru_t10_restoration_4p_bonus_dummy : public SpellScriptLoader PreventDefaultAction(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(eventInfo.GetHealInfo()->GetHeal()); + args.AddSpellBP0(eventInfo.GetHealInfo()->GetHeal()); eventInfo.GetActor()->CastSpell(nullptr, SPELL_DRUID_REJUVENATION_T10_PROC, args); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 30ff34b8531..c8c76295188 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -493,7 +493,7 @@ class spell_gen_blood_reserve : public AuraScript Unit* caster = eventInfo.GetActionTarget(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); caster->CastSpell(caster, SPELL_GEN_BLOOD_RESERVE_HEAL, args); caster->RemoveAura(SPELL_GEN_BLOOD_RESERVE_AURA); } @@ -534,7 +534,7 @@ class spell_gen_blade_warding : public AuraScript bp += spellInfo->Effects[EFFECT_0].CalcValue(caster); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); caster->CastSpell(eventInfo.GetActor(), SPELL_GEN_BLADE_WARDING_TRIGGERED, args); } @@ -817,7 +817,7 @@ class spell_gen_chaos_blast : public SpellScript if (Unit* target = GetHitUnit()) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(basepoints0); + args.AddSpellBP0(basepoints0); caster->CastSpell(target, SPELL_CHAOS_BLAST, args); } } @@ -2070,7 +2070,7 @@ class spell_gen_negative_energy_periodic : public AuraScript PreventDefaultAction(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, aurEff->GetTickNumber() / 10 + 1); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, aurEff->GetTickNumber() / 10 + 1); GetTarget()->CastSpell(nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, args); } @@ -3183,7 +3183,7 @@ class spell_gen_vampiric_touch : public AuraScript Unit* caster = eventInfo.GetActor(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(damageInfo->GetDamage() / 2); + args.AddSpellBP0(damageInfo->GetDamage() / 2); caster->CastSpell(caster, SPELL_VAMPIRIC_TOUCH_HEAL, args); } diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 8911e2824c9..d8fbcc7e1c4 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -1185,7 +1185,7 @@ class spell_brewfest_ram : public SpellScriptLoader case SPELL_RAM_CANTER: { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, 1); + args.AddSpellMod(SPELLVALUE_AURA_STACK, 1); target->CastSpell(target, SPELL_RAM_FATIGUE, args); if (aurEff->GetTickNumber() == 8) target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_YELLOW, true); @@ -1194,7 +1194,7 @@ class spell_brewfest_ram : public SpellScriptLoader case SPELL_RAM_GALLOP: { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, target->HasAura(SPELL_RAM_FATIGUE) ? 4 : 5 /*Hack*/); + args.AddSpellMod(SPELLVALUE_AURA_STACK, target->HasAura(SPELL_RAM_FATIGUE) ? 4 : 5 /*Hack*/); target->CastSpell(target, SPELL_RAM_FATIGUE, args); if (aurEff->GetTickNumber() == 8) target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_RED, true); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index bb741a94819..16aabf45d1e 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -181,7 +181,7 @@ class spell_hun_ascpect_of_the_viper : public SpellScriptLoader AddPct(mana, glyph->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(mana); + args.AddSpellBP0(mana); GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_ASPECT_OF_THE_VIPER_ENERGIZE, args); } @@ -290,7 +290,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader if (spellId) { CastSpellExtraArgs args(TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_SPELL_AND_CATEGORY_CD)); - args.SpellValueOverrides.AddBP0(basePoint); + args.AddSpellBP0(basePoint); caster->CastSpell(unitTarget, spellId, args); } } @@ -330,7 +330,7 @@ class spell_hun_cobra_strikes : public SpellScriptLoader SpellInfo const* triggeredSpellInfo = sSpellMgr->AssertSpellInfo(GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, triggeredSpellInfo->StackAmount); + args.AddSpellMod(SPELLVALUE_AURA_STACK, triggeredSpellInfo->StackAmount); GetTarget()->CastSpell(nullptr, triggeredSpellInfo->Id, args); } @@ -450,7 +450,7 @@ class spell_hun_glyph_of_arcane_shot : public SpellScriptLoader // castspell refactor note: this is not triggered - is this intended? CastSpellExtraArgs args; - args.SpellValueOverrides.AddBP0(mana); + args.AddSpellBP0(mana); GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_GLYPH_OF_ARCANE_SHOT, args); } @@ -515,7 +515,7 @@ class spell_hun_explosive_shot : public AuraScript if (Unit* caster = GetCaster()) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); caster->CastSpell(GetTarget(), SPELL_HUNTER_EXPLOSIVE_SHOT_DAMAGE, args); } } @@ -719,7 +719,7 @@ class spell_hun_last_stand_pet : public SpellScriptLoader { Unit* caster = GetCaster(); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(caster->CountPctFromMaxHealth(30)); + args.AddSpellBP0(caster->CountPctFromMaxHealth(30)); caster->CastSpell(caster, SPELL_HUNTER_PET_LAST_STAND_TRIGGERED, args); } @@ -1045,7 +1045,7 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader if (!caster->HasAura(SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(100); // @todo shouldn't this be in spellmgr if it's constant? + args.AddSpellBP0(100); // @todo shouldn't this be in spellmgr if it's constant? owner->CastSpell(caster, SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED, args); caster->CastSpell(caster, SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF, true); } @@ -1103,7 +1103,7 @@ public: bp += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_HUNTER_PIERCING_SHOTS, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); caster->CastSpell(target, SPELL_HUNTER_PIERCING_SHOTS, args); } } @@ -1142,7 +1142,7 @@ class spell_hun_rapid_recuperation : public SpellScriptLoader Unit* target = GetTarget(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(target->GetMaxPower(POWER_MANA), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(target->GetMaxPower(POWER_MANA), aurEff->GetAmount())); target->CastSpell(target, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, args); } @@ -1294,7 +1294,7 @@ class spell_hun_roar_of_sacrifice : public SpellScriptLoader PreventDefaultAction(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), aurEff->GetAmount())); eventInfo.GetActor()->CastSpell(GetCaster(), SPELL_ROAR_OF_SACRIFICE_TRIGGERED, args); } @@ -1532,7 +1532,7 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(nullptr, SPELL_HUNTER_THRILL_OF_THE_HUNT_MANA, args); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 603cf953b56..b47ad57c781 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -192,7 +192,7 @@ class spell_item_alchemists_stone : public AuraScript } CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(spellInfo->Effects[i].CalcValue(caster), 40)); + args.AddSpellBP0(CalculatePct(spellInfo->Effects[i].CalcValue(caster), 40)); caster->CastSpell(nullptr, spellId, args); } } @@ -437,7 +437,7 @@ class spell_item_blessing_of_ancient_kings : public AuraScript else { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(absorb); + args.AddSpellBP0(absorb); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_PROTECTION_OF_ANCIENT_KINGS, args); } } @@ -501,7 +501,7 @@ class spell_item_deadly_precision_dummy : public SpellScript { SpellInfo const* spellInfo = sSpellMgr->AssertSpellInfo(SPELL_DEADLY_PRECISION); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddMod(SPELLVALUE_AURA_STACK, spellInfo->StackAmount); + args.AddSpellMod(SPELLVALUE_AURA_STACK, spellInfo->StackAmount); GetCaster()->CastSpell(GetCaster(), spellInfo->Id, args); } @@ -955,7 +955,7 @@ class spell_item_frozen_shadoweave : public AuraScript Unit* caster = eventInfo.GetActor(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); caster->CastSpell(nullptr, SPELL_SHADOWMEND, args); } @@ -1316,7 +1316,7 @@ class spell_item_necrotic_touch : public AuraScript return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); GetTarget()->CastSpell(nullptr, SPELL_ITEM_NECROTIC_TOUCH_PROC, args); } @@ -1469,7 +1469,7 @@ class spell_item_persistent_shield : public AuraScript return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp0); + args.AddSpellBP0(bp0); caster->CastSpell(target, SPELL_PERSISTENT_SHIELD_TRIGGERED, args); } @@ -1505,7 +1505,7 @@ class spell_item_pet_healing : public AuraScript return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); eventInfo.GetActor()->CastSpell(nullptr, SPELL_HEALTH_LINK, args); } @@ -1929,7 +1929,7 @@ class spell_item_swift_hand_justice_dummy : public AuraScript Unit* caster = eventInfo.GetActor(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(caster->CountPctFromMaxHealth(aurEff->GetAmount())); + args.AddSpellBP0(caster->CountPctFromMaxHealth(aurEff->GetAmount())); caster->CastSpell(nullptr, SPELL_SWIFT_HAND_OF_JUSTICE_HEAL, args); } @@ -3568,7 +3568,7 @@ class spell_item_charm_witch_doctor : public AuraScript { int32 bp = CalculatePct(target->GetCreateHealth(),aurEff->GetSpellInfo()->Effects[1].CalcValue()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); eventInfo.GetActor()->CastSpell(target, SPELL_CHARM_WITCH_DOCTOR_PROC, args); } } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index a676403651a..5c8d57c65f2 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -99,7 +99,7 @@ class spell_mage_incanters_absorbtion_base_AuraScript : public AuraScript { int32 bp = CalculatePct(absorbAmount, talentAurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); target->CastSpell(target, SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED, args); } } @@ -288,7 +288,7 @@ class spell_mage_burnout : public SpellScriptLoader mana = CalculatePct(mana, aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(mana); + args.AddSpellBP0(mana); GetTarget()->CastSpell(GetTarget(), SPELL_MAGE_BURNOUT, args); } @@ -531,7 +531,7 @@ class spell_mage_empowered_fire : public SpellScriptLoader Unit* target = GetTarget(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(target->GetCreateMana(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(target->GetCreateMana(), aurEff->GetAmount())); target->CastSpell(target, SPELL_MAGE_EMPOWERED_FIRE_PROC, args); } @@ -634,7 +634,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader int32 bp = dmgInfo.GetDamage(); dmgInfo.AbsorbDamage(bp); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); target->CastSpell(target, SPELL_MAGE_FROST_WARDING_TRIGGERED, args); absorbAmount = 0; PreventDefaultAction(); @@ -998,7 +998,7 @@ class spell_mage_ignite : public SpellScriptLoader amount += eventInfo.GetProcTarget()->GetRemainingPeriodicAmount(eventInfo.GetActor()->GetGUID(), SPELL_MAGE_IGNITE, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_MAGE_IGNITE, args); } @@ -1073,7 +1073,7 @@ class spell_mage_magic_absorption : public SpellScriptLoader Unit* caster = eventInfo.GetActionTarget(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(caster->GetMaxPower(POWER_MANA), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(caster->GetMaxPower(POWER_MANA), aurEff->GetAmount())); caster->CastSpell(caster, SPELL_MAGE_MAGIC_ABSORPTION_MANA, args); } @@ -1175,7 +1175,7 @@ class spell_mage_master_of_elements : public SpellScriptLoader if (mana > 0) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(mana); + args.AddSpellBP0(mana); GetTarget()->CastSpell(GetTarget(), SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, args); } } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 82e734fd821..c105b9b68f8 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -189,7 +189,7 @@ class spell_pal_ardent_defender : public SpellScriptLoader float defenseFactor = std::min(1.0f, defenseSkillValue / reqDefForMaxHeal); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(victim->CountPctFromMaxHealth(lroundf(_healPct * defenseFactor))); + args.AddSpellBP0(victim->CountPctFromMaxHealth(lroundf(_healPct * defenseFactor))); victim->CastSpell(victim, PAL_SPELL_ARDENT_DEFENDER_HEAL, args); victim->GetSpellHistory()->AddCooldown(PAL_SPELL_ARDENT_DEFENDER_HEAL, 0, std::chrono::minutes(2)); } @@ -311,7 +311,7 @@ class spell_pal_avenging_wrath : public SpellScriptLoader if (AuraEffect const* aurEff = target->GetAuraEffectOfRankedSpell(SPELL_PALADIN_SANCTIFIED_WRATH_TALENT_R1, EFFECT_2)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); target->CastSpell(target, SPELL_PALADIN_SANCTIFIED_WRATH, args); } } @@ -587,7 +587,7 @@ class spell_pal_divine_storm : public SpellScriptLoader { Unit* caster = GetCaster(); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(CalculatePct(GetHitDamage(), _healPct)); + args.AddSpellBP0(CalculatePct(GetHitDamage(), _healPct)); caster->CastSpell(caster, SPELL_PALADIN_DIVINE_STORM_DUMMY, args); } @@ -630,7 +630,7 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader return; CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetEffectValue() / _targetCount); + args.AddSpellBP0(GetEffectValue() / _targetCount); GetCaster()->CastSpell(GetHitUnit(), SPELL_PALADIN_DIVINE_STORM_HEAL, args); } @@ -710,7 +710,7 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader // return damage % to attacker but < 50% own total health int32 damage = std::min(CalculatePct(static_cast<int32>(damageInfo->GetDamage()), aurEff->GetAmount()), static_cast<int32>(GetTarget()->GetMaxHealth()) / 2); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE, args); } @@ -753,7 +753,7 @@ class spell_pal_glyph_of_divinity : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, spellInfo->Effects[EFFECT_1].CalcValue() * 2); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, spellInfo->Effects[EFFECT_1].CalcValue() * 2); caster->CastSpell(nullptr, SPELL_PALADIN_GLYPH_OF_DIVINITY_PROC, args); } @@ -825,7 +825,7 @@ class spell_pal_glyph_of_holy_light_dummy : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); eventInfo.GetActor()->CastSpell(eventInfo.GetProcTarget(), SPELL_PALADIN_GLYPH_OF_HOLY_LIGHT_HEAL, args); } @@ -1089,7 +1089,7 @@ public: Unit* target = eventInfo.GetActor(); // Paladin is the target of the energize uint32 bp = CalculatePct(originalSpell->CalcPowerCost(target, originalSpell->GetSchoolMask()), aurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); target->CastSpell(target, SPELL_PALADIN_ILLUMINATION_ENERGIZE, args); } } @@ -1296,7 +1296,7 @@ class spell_pal_infusion_of_light : public SpellScriptLoader AddPct(bp0, bonus->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp0); + args.AddSpellBP0(bp0); target->CastSpell(procTarget, SPELL_PALADIN_FLASH_OF_LIGHT_PROC, args); } } @@ -1526,7 +1526,7 @@ class spell_pal_judgement_of_light_heal : public SpellScriptLoader CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(caster->CountPctFromMaxHealth(aurEff->GetAmount())); + args.AddSpellBP0(caster->CountPctFromMaxHealth(aurEff->GetAmount())); caster->CastSpell(nullptr, SPELL_PALADIN_JUDGEMENT_OF_LIGHT_HEAL, args); } @@ -1572,7 +1572,7 @@ class spell_pal_judgement_of_wisdom_mana : public SpellScriptLoader int32 const amount = CalculatePct(static_cast<int32>(caster->GetCreateMana()), spellInfo->Effects[EFFECT_0].CalcValue()); CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(nullptr, spellInfo->Id, args); } @@ -1769,7 +1769,7 @@ class spell_pal_light_s_beacon : public SpellScriptLoader /// but that will break animation on clientside /// caster in spell packets must be the healing unit CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(heal); + args.AddSpellBP0(heal); eventInfo.GetActor()->CastSpell(beaconTarget, healSpellId, args); } @@ -1883,7 +1883,7 @@ class spell_pal_righteous_vengeance : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_PALADIN_RIGHTEOUS_VENGEANCE_DAMAGE, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_PALADIN_RIGHTEOUS_VENGEANCE_DAMAGE, args); } @@ -2026,7 +2026,7 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader holy += eventInfo.GetProcTarget()->SpellBaseDamageBonusTaken(SPELL_SCHOOL_MASK_HOLY); int32 bp = int32((ap * 0.022f + 0.044f * holy) * GetTarget()->GetAttackTime(BASE_ATTACK) / 1000); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS, args); } @@ -2122,7 +2122,7 @@ class spell_pal_seal_of_vengeance : public SpellScriptLoader amount /= maxStacks; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, DamageSpell, args); } @@ -2206,7 +2206,7 @@ class spell_pal_spiritual_attunement : public SpellScriptLoader int32 amount = CalculatePct(static_cast<int32>(healInfo->GetEffectiveHeal()), aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); eventInfo.GetActionTarget()->CastSpell(nullptr, SPELL_PALADIN_SPIRITUAL_ATTUNEMENT_MANA, args); } @@ -2258,7 +2258,7 @@ class spell_pal_sheath_of_light : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_PALADIN_SHEATH_OF_LIGHT_HEAL, SPELL_AURA_PERIODIC_HEAL); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_PALADIN_SHEATH_OF_LIGHT_HEAL, args); } @@ -2376,7 +2376,7 @@ class spell_pal_t8_2p_bonus : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_PALADIN_HOLY_MENDING, SPELL_AURA_PERIODIC_HEAL); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_PALADIN_HOLY_MENDING, args); } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index e3664c16f3f..fdfa7292c25 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -131,7 +131,7 @@ class spell_pri_aq_3p_bonus : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(healInfo->GetHeal(), 10)); + args.AddSpellBP0(CalculatePct(healInfo->GetHeal(), 10)); caster->CastSpell(caster, SPELL_PRIEST_ORACULAR_HEAL, args); } @@ -180,7 +180,7 @@ public: bp += target->GetRemainingPeriodicAmount(target->GetGUID(), triggerSpell, SPELL_AURA_PERIODIC_HEAL); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); target->CastSpell(target, triggerSpell, args); } @@ -333,7 +333,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader absorb = std::min(absorb, eventInfo.GetProcTarget()->getLevel() * 125); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(absorb); + args.AddSpellBP0(absorb); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_PRIEST_DIVINE_AEGIS, args); } @@ -411,7 +411,7 @@ class spell_pri_glyph_of_dispel_magic : public SpellScriptLoader Unit* target = eventInfo.GetProcTarget(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(target->CountPctFromMaxHealth(aurEff->GetAmount())); + args.AddSpellBP0(target->CountPctFromMaxHealth(aurEff->GetAmount())); eventInfo.GetActor()->CastSpell(target, SPELL_PRIEST_GLYPH_OF_DISPEL_MAGIC_HEAL, args); } @@ -454,7 +454,7 @@ class spell_pri_glyph_of_prayer_of_healing : public SpellScriptLoader ASSERT(triggeredSpellInfo->GetMaxTicks() > 0); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount()) / triggeredSpellInfo->GetMaxTicks()); + args.AddSpellBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount()) / triggeredSpellInfo->GetMaxTicks()); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL, args); } @@ -509,7 +509,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader // remove the aura now, we don't want 40% healing bonus Remove(AURA_REMOVE_BY_ENEMY_SPELL); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(healAmount); + args.AddSpellBP0(healAmount); target->CastSpell(target, SPELL_PRIEST_GUARDIAN_SPIRIT_HEAL, args); absorbAmount = dmgInfo.GetDamage(); } @@ -1035,7 +1035,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader if (AuraEffect* talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PRIEST_REFLECTIVE_SHIELD_R1, EFFECT_0)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(absorbAmount, talentAurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(absorbAmount, talentAurEff->GetAmount())); target->CastSpell(dmgInfo.GetAttacker(), SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED, args); } } @@ -1118,7 +1118,7 @@ class spell_pri_renew : public SpellScriptLoader heal *= GetSpellInfo()->GetMaxTicks(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(heal, empoweredRenewAurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(heal, empoweredRenewAurEff->GetAmount())); caster->CastSpell(GetTarget(), SPELL_PRIEST_EMPOWERED_RENEW, args); } } @@ -1202,7 +1202,7 @@ class spell_pri_shadow_word_death : public SpellScriptLoader AddPct(damage, aurEff->GetAmount()); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); GetCaster()->CastSpell(GetCaster(), SPELL_PRIEST_SHADOW_WORD_DEATH, args); } @@ -1243,8 +1243,8 @@ class spell_pri_vampiric_embrace : public SpellScriptLoader int32 selfHeal = CalculatePct(static_cast<int32>(damageInfo->GetDamage()), aurEff->GetAmount()); int32 partyHeal = selfHeal / 5; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(partyHeal); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, selfHeal); + args.AddSpellBP0(partyHeal); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, selfHeal); eventInfo.GetActor()->CastSpell(nullptr, SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL, args); } @@ -1294,7 +1294,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader { // backfire damage CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount() * 8); + args.AddSpellBP0(aurEff->GetAmount() * 8); caster->CastSpell(target, SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL, args); } } @@ -1435,7 +1435,7 @@ class spell_pri_t10_heal_2p_bonus : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_PRIEST_BLESSED_HEALING, SPELL_AURA_PERIODIC_HEAL); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_PRIEST_BLESSED_HEALING, args); } diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 1b02774e5fc..f8abdd8cea4 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -2282,7 +2282,7 @@ class spell_q12919_gymers_grab : public SpellScriptLoader if (!GetHitCreature()) return; CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(2); + args.AddSpellBP0(2); GetHitCreature()->CastSpell(GetCaster(), SPELL_RIDE_GYMER, args); GetHitCreature()->CastSpell(GetHitCreature(), SPELL_GRABBED, true); } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index e04c0f76791..53e7c01a947 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -85,7 +85,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader if (DamageInfo* damageInfo = eventInfo.GetDamageInfo()) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(damageInfo->GetDamage()); + args.AddSpellBP0(damageInfo->GetDamage()); GetTarget()->CastSpell(_procTarget, SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK, args); } } @@ -593,7 +593,7 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader if (!target->HasAura(SPELL_ROGUE_PREY_ON_THE_WEAK)) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetSpellInfo()->Effects[EFFECT_0].CalcValue()); + args.AddSpellBP0(GetSpellInfo()->Effects[EFFECT_0].CalcValue()); target->CastSpell(target, SPELL_ROGUE_PREY_ON_THE_WEAK, args); } } @@ -638,7 +638,7 @@ class spell_rog_quick_recovery : public SpellScriptLoader Unit* caster = eventInfo.GetActor(); int32 amount = CalculatePct(spellInfo->CalcPowerCost(caster, spellInfo->GetSchoolMask()), aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(nullptr, SPELL_ROGUE_QUICK_RECOVERY_ENERGY, args); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index be2e27ab540..df260380b97 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -121,7 +121,7 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); eventInfo.GetActor()->CastSpell(nullptr, SPELL_SHAMAN_ANCESTRAL_AWAKENING_DUMMY, args); } @@ -171,7 +171,7 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader return; CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetEffectValue()); + args.AddSpellBP0(GetEffectValue()); GetCaster()->CastSpell(target, SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC, args); } @@ -400,7 +400,7 @@ class spell_sha_cleansing_totem_pulse : public SpellScriptLoader if (GetCaster() && GetHitUnit() && GetOriginalCaster()) { CastSpellExtraArgs args(GetOriginalCaster()->GetGUID()); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, 1); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, 1); GetCaster()->CastSpell(GetHitUnit(), SPELL_SHAMAN_CLEANSING_TOTEM_EFFECT, args); } } @@ -445,7 +445,7 @@ class spell_sha_earth_shield : public SpellScriptLoader CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_EARTH_SHIELD_HEAL, args); } @@ -764,7 +764,7 @@ class spell_sha_flametongue_weapon : public SpellScriptLoader // All done, now proc damage CastSpellExtraArgs args(aurEff); args.CastItem = item; - args.SpellValueOverrides.AddBP0(fireDamage + spellPowerBonus); + args.AddSpellBP0(fireDamage + spellPowerBonus); player->CastSpell(target, SPELL_SHAMAN_FLAMETONGUE_ATTACK, args); } @@ -892,7 +892,7 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); caster->CastSpell(nullptr, SPELL_SHAMAN_GLYPH_OF_HEALING_WAVE_HEAL, args); } @@ -952,8 +952,8 @@ class spell_sha_glyph_of_totem_of_wrath : public SpellScriptLoader int32 bp0 = CalculatePct(totemSpell->Effects[EFFECT_0].CalcValue(caster), aurEff->GetAmount()); int32 bp1 = CalculatePct(totemSpell->Effects[EFFECT_1].CalcValue(caster), aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp0); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, bp1); + args.AddSpellBP0(bp0); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, bp1); caster->CastSpell(nullptr, SPELL_SHAMAN_TOTEM_OF_WRATH_SPELL_POWER, args); } @@ -1010,7 +1010,7 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader } CastSpellExtraArgs args(GetOriginalCaster()->GetGUID()); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); caster->CastSpell(target, SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL, args); } } @@ -1279,7 +1279,7 @@ class spell_sha_item_mana_surge : public SpellScriptLoader int32 mana = spellInfo->CalcPowerCost(GetTarget(), eventInfo.GetSchoolMask()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(mana, 35)); + args.AddSpellBP0(CalculatePct(mana, 35)); GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_ITEM_MANA_SURGE, args); } @@ -1549,7 +1549,7 @@ class spell_sha_mana_spring_totem : public SpellScriptLoader if (target->getPowerType() == POWER_MANA) { CastSpellExtraArgs args(GetOriginalCaster()->GetGUID()); - args.SpellValueOverrides.AddBP0(GetEffectValue()); + args.AddSpellBP0(GetEffectValue()); caster->CastSpell(target, SPELL_SHAMAN_MANA_SPRING_TOTEM_ENERGIZE, args); } } @@ -1582,7 +1582,7 @@ class spell_sha_mana_tide : public AuraScript PreventDefaultAction(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); GetTarget()->CastSpell(nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, args); } @@ -1622,7 +1622,7 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader effValue += dummy->GetAmount(); // Regenerate 6% of Total Mana Every 3 secs CastSpellExtraArgs args(GetOriginalCaster()->GetGUID()); - args.SpellValueOverrides.AddBP0(CalculatePct(unitTarget->GetMaxPower(POWER_MANA), effValue)); + args.AddSpellBP0(CalculatePct(unitTarget->GetMaxPower(POWER_MANA), effValue)); caster->CastSpell(unitTarget, SPELL_SHAMAN_MANA_TIDE_TOTEM, args); } } @@ -1670,7 +1670,7 @@ public: if (target->HealthBelowPctDamaged(healthpct, damageInfo->GetDamage())) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(target->GetMaxHealth(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(target->GetMaxHealth(), aurEff->GetAmount())); target->CastSpell(target, SPELL_SHAMAN_NATURE_GUARDIAN, args); // Threat reduction is around 10% confirmed in retail and from wiki @@ -1758,7 +1758,7 @@ class spell_sha_shamanistic_rage : public SpellScriptLoader Unit* target = GetTarget(); int32 amount = CalculatePct(static_cast<int32>(target->GetTotalAttackPowerValue(BASE_ATTACK)), aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); target->CastSpell(target, SPELL_SHAMAN_SHAMANISTIC_RAGE_PROC, args); } @@ -1802,7 +1802,7 @@ class spell_sha_spirit_hunt : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); caster->CastSpell(caster, SPELL_SHAMAN_SPIRIT_HUNT_HEAL, args); caster->CastSpell(target, SPELL_SHAMAN_SPIRIT_HUNT_HEAL, args); } @@ -2084,7 +2084,7 @@ class spell_sha_t8_elemental_4p_bonus : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_SHAMAN_ELECTRIFIED, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_SHAMAN_ELECTRIFIED, args); } @@ -2135,7 +2135,7 @@ class spell_sha_t9_elemental_4p_bonus : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_SHAMAN_LAVA_BURST_BONUS_DAMAGE, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_SHAMAN_LAVA_BURST_BONUS_DAMAGE, args); } @@ -2231,7 +2231,7 @@ class spell_sha_t10_restoration_4p_bonus : public SpellScriptLoader amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_SHAMAN_CHAINED_HEAL, SPELL_AURA_PERIODIC_HEAL); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(target, SPELL_SHAMAN_CHAINED_HEAL, args); } @@ -2327,7 +2327,7 @@ class spell_sha_windfury_weapon : public SpellScriptLoader int32 amount = static_cast<int32>(extraAttackPower / 14.f * player->GetAttackTime(attType) / 1000.f); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); // Attack twice for (uint8 i = 0; i < 2; ++i) player->CastSpell(eventInfo.GetProcTarget(), spellId, args); diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index bd82af3bd8b..4f5aa72c759 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -426,7 +426,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader SpellInfo const* spellInfo = sSpellMgr->AssertSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_VOIDWALKER); int32 hp = targetCreature->CountPctFromMaxHealth(GetCaster()->CalculateSpellDamage(targetCreature, spellInfo, 0)); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(hp); + args.AddSpellBP0(hp); targetCreature->CastSpell(targetCreature, SPELL_WARLOCK_DEMONIC_EMPOWERMENT_VOIDWALKER, args); //unitTarget->CastSpell(unitTarget, 54441, true); break; @@ -490,7 +490,7 @@ class spell_warl_drain_soul : public SpellScriptLoader int32 amount = CalculatePct(caster->GetMaxPower(POWER_MANA), impDrainSoul->GetSpellInfo()->Effects[EFFECT_2].CalcValue()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(nullptr, SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_PROC, args); } @@ -573,7 +573,7 @@ class spell_warl_fel_synergy : public SpellScriptLoader int32 heal = CalculatePct(static_cast<int32>(eventInfo.GetDamageInfo()->GetDamage()), aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(heal); + args.AddSpellBP0(heal); GetTarget()->CastSpell(nullptr, SPELL_WARLOCK_FEL_SYNERGY_HEAL, args); // TARGET_UNIT_PET } @@ -730,7 +730,7 @@ class spell_warl_haunt : public SpellScriptLoader { CastSpellExtraArgs args(aurEff); args.OriginalCaster = GetCasterGUID(); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellBP0(aurEff->GetAmount()); GetTarget()->CastSpell(caster, SPELL_WARLOCK_HAUNT_HEAL, args); } } @@ -832,7 +832,7 @@ class spell_warl_life_tap : public SpellScriptLoader // @todo castspell refactor note: this is not triggered - intended? CastSpellExtraArgs args; - args.SpellValueOverrides.AddBP0(mana); + args.AddSpellBP0(mana); caster->CastSpell(target, SPELL_WARLOCK_LIFE_TAP_ENERGIZE, args); // Mana Feed @@ -844,7 +844,7 @@ class spell_warl_life_tap : public SpellScriptLoader { ApplyPct(manaFeedVal, mana); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(manaFeedVal); + args.AddSpellBP0(manaFeedVal); caster->CastSpell(caster, SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2, args); } } @@ -990,7 +990,7 @@ class spell_warl_demonic_pact : public SpellScriptLoader { int32 bp0 = static_cast<int32>((aurEff->GetAmount() * owner->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_MAGIC) + 100.0f) / 100.0f); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(bp0); + args.AddSpellBP0(bp0); owner->CastSpell(nullptr, SPELL_WARLOCK_DEMONIC_PACT_PROC, args); } } @@ -1287,7 +1287,7 @@ class spell_warl_siphon_life : public SpellScriptLoader AddPct(amount, glyph->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); GetTarget()->CastSpell(GetTarget(), SPELL_WARLOCK_SIPHON_LIFE_HEAL, args); } @@ -1340,7 +1340,7 @@ class spell_warl_soul_leech : public SpellScriptLoader Unit* caster = eventInfo.GetActor(); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); + args.AddSpellBP0(CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount())); caster->CastSpell(caster, SPELL_WARLOCK_SOUL_LEECH_HEAL, args); // Improved Soul Leech code below @@ -1465,7 +1465,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader { // backfire damage and silence CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount() * 9); + args.AddSpellBP0(aurEff->GetAmount() * 9); caster->CastSpell(dispelInfo->GetDispeller(), SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL, args); } } diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index d8e9ed66ad3..9c303319037 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -112,7 +112,7 @@ class spell_warr_bloodthirst : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetEffectValue()); + args.AddSpellBP0(GetEffectValue()); GetCaster()->CastSpell(GetCaster(), SPELL_WARRIOR_BLOODTHIRST, args); } @@ -176,7 +176,7 @@ class spell_warr_charge : public SpellScriptLoader { Unit* caster = GetCaster(); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetEffectValue()); + args.AddSpellBP0(GetEffectValue()); caster->CastSpell(caster, SPELL_WARRIOR_CHARGE, args); // Juggernaut crit bonus @@ -245,7 +245,7 @@ class spell_warr_damage_shield : public SpellScriptLoader // % of amount blocked int32 damage = CalculatePct(int32(GetTarget()->GetShieldBlockValue()), aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARRIOR_DAMAGE_SHIELD_DAMAGE, args); } @@ -299,7 +299,7 @@ class spell_warr_deep_wounds : public SpellScriptLoader damage += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_WARRIOR_DEEP_WOUNDS_PERIODIC, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); caster->CastSpell(target, SPELL_WARRIOR_DEEP_WOUNDS_PERIODIC, args); } } @@ -353,7 +353,7 @@ class spell_warr_deep_wounds_aura : public SpellScriptLoader damage = (actor->GetFloatValue(UNIT_FIELD_MINDAMAGE) + actor->GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2.f; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(damage); + args.AddSpellBP0(damage); actor->CastSpell(eventInfo.GetProcTarget(), GetSpellInfo()->Effects[EFFECT_0].TriggerSpell, args); } @@ -409,7 +409,7 @@ class spell_warr_execute : public SpellScriptLoader int32 bp = GetEffectValue() + int32(rageUsed * spellInfo->Effects[effIndex].DamageMultiplier + caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.2f); CastSpellExtraArgs args(GetOriginalCaster()->GetGUID()); - args.SpellValueOverrides.AddBP0(bp); + args.AddSpellBP0(bp); caster->CastSpell(target, SPELL_WARRIOR_EXECUTE, args); } } @@ -569,7 +569,7 @@ class spell_warr_improved_spell_reflection : public SpellScriptLoader PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_MAX_TARGETS, aurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_MAX_TARGETS, aurEff->GetAmount()); caster->CastSpell(caster, SPELL_WARRIOR_IMPROVED_SPELL_REFLECTION_TRIGGER, args); } @@ -635,7 +635,7 @@ class spell_warr_item_t10_prot_4p_bonus : public SpellScriptLoader Unit* target = eventInfo.GetActionTarget(); int32 bp0 = CalculatePct(target->GetMaxHealth(), GetSpellInfo()->Effects[EFFECT_1].CalcValue()); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(bp0); + args.AddSpellBP0(bp0); target->CastSpell(nullptr, SPELL_WARRIOR_STOICISM, args); } @@ -670,7 +670,7 @@ class spell_warr_last_stand : public SpellScriptLoader { Unit* caster = GetCaster(); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(caster->CountPctFromMaxHealth(GetEffectValue())); + args.AddSpellBP0(caster->CountPctFromMaxHealth(GetEffectValue())); caster->CastSpell(caster, SPELL_WARRIOR_LAST_STAND_TRIGGERED, args); } @@ -912,7 +912,7 @@ class spell_warr_slam : public SpellScriptLoader if (!GetHitUnit()) return; CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(GetEffectValue()); + args.AddSpellBP0(GetEffectValue()); GetCaster()->CastSpell(GetHitUnit(), SPELL_WARRIOR_SLAM, args); } @@ -963,7 +963,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader else { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(damageInfo->GetDamage()); + args.AddSpellBP0(damageInfo->GetDamage()); GetTarget()->CastSpell(_procTarget, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_1, args); } } |