diff options
53 files changed, 137 insertions, 129 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 5d93f452b68..a053e694bd1 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1692,7 +1692,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 b780408e67a..4eea3a24ac6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -8181,7 +8181,11 @@ void Player::ApplyAzeriteEssence(AzeriteItem* item, uint32 azeriteEssenceId, uin if (major && currentRank == 1) { if (apply) - CastSpell(this, SPELL_ID_HEART_ESSENCE_ACTION_BAR_OVERRIDE, CastSpellExtraArgs(TRIGGERED_FULL_MASK).AddSpellBP0(azeriteEssencePower->MajorPowerDescription)); + { + CastSpellExtraArgs args(TRIGGERED_FULL_MASK); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, azeriteEssencePower->MajorPowerDescription); + CastSpell(this, SPELL_ID_HEART_ESSENCE_ACTION_BAR_OVERRIDE, args); + } else RemoveAurasDueToSpell(SPELL_ID_HEART_ESSENCE_ACTION_BAR_OVERRIDE); } @@ -8403,7 +8407,7 @@ void Player::CastItemCombatSpell(DamageInfo const& damageInfo, Item* item, ItemT for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { if (spellInfo->GetEffect(i)->IsEffect()) - args.SpellValueOverrides.AddMod(static_cast<SpellValueMod>(SPELLVALUE_BASE_POINT0 + i), CalculatePct(spellInfo->GetEffect(i)->CalcValue(this), effectPct)); + args.AddSpellMod(static_cast<SpellValueMod>(SPELLVALUE_BASE_POINT0 + i), CalculatePct(spellInfo->GetEffect(i)->CalcValue(this), effectPct)); } } CastSpell(target, spellInfo->Id, args); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9bb993c6ed1..94dffe2efaf 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12798,7 +12798,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 @@ -12833,7 +12833,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.AddSpellMod(SPELLVALUE_BASE_POINT0, 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 7a1b1028041..597b2365b16 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4914,7 +4914,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); } @@ -5150,7 +5150,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); } @@ -5548,7 +5548,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); } } @@ -5703,7 +5703,7 @@ void AuraEffect::HandleProcTriggerSpellWithValueAuraProc(AuraApplication* aurApp if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId, GetBase()->GetCastDifficulty())) { 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()); } diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 89c5b832600..bc964c8e55c 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1329,7 +1329,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); } } @@ -1382,7 +1382,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b { float multiplier = float(aurEff->GetAmount()); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(CalculatePct(caster->GetMaxPower(POWER_MANA), multiplier)); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(caster->GetMaxPower(POWER_MANA), multiplier)); caster->CastSpell(caster, 47755, args); } } diff --git a/src/server/game/Spells/SpellDefines.h b/src/server/game/Spells/SpellDefines.h index 40d0944fc26..83b48de53ec 100644 --- a/src/server/game/Spells/SpellDefines.h +++ b/src/server/game/Spells/SpellDefines.h @@ -268,7 +268,7 @@ struct TC_GAME_API CastSpellExtraArgs CastSpellExtraArgs& SetOriginalCaster(ObjectGuid const& guid) { OriginalCaster = guid; return *this; } CastSpellExtraArgs& SetCastDifficulty(Difficulty castDifficulty) { CastDifficulty = castDifficulty; 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; @@ -277,17 +277,16 @@ struct TC_GAME_API CastSpellExtraArgs Difficulty CastDifficulty = Difficulty(0); struct { - public: - void AddMod(SpellValueMod mod, int32 val) { data.emplace_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 a5620b9293c..ff0d7043e8b 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -713,7 +713,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex /*effIndex*/) // set basepoints for trigger with value effect if (effectInfo->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); @@ -757,7 +757,7 @@ void Spell::EffectTriggerMissileSpell(SpellEffIndex /*effIndex*/) // set basepoints for trigger with value effect if (effectInfo->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); @@ -794,7 +794,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; } @@ -811,7 +811,7 @@ void Spell::EffectForceCast(SpellEffIndex /*effIndex*/) CastSpellExtraArgs args(TRIGGERED_FULL_MASK); if (effectInfo->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); } @@ -2033,7 +2033,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); @@ -3393,7 +3393,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); } } @@ -3793,7 +3793,9 @@ void Spell::EffectFeedPet(SpellEffIndex effIndex) player->DestroyItemCount(foodItem, count, true); /// @todo fix crash when a spell has two effects, both pointed at the same item target - m_caster->CastSpell(pet, effectInfo->TriggerSpell, CastSpellExtraArgs(SPELLVALUE_BASE_POINT0, pct).SetTriggerFlags(TRIGGERED_FULL_MASK)); + CastSpellExtraArgs args(TRIGGERED_FULL_MASK); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, pct); + m_caster->CastSpell(pet, effectInfo->TriggerSpell, args); } void Spell::EffectDismissPet(SpellEffIndex effIndex) @@ -4474,7 +4476,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 17e6a3d7f90..aaf0c43a0cf 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 a3ceef97f9e..5f5270d541c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -139,7 +139,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/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index da40c8b471d..400d200731a 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 2b2979b9976..30445f19871 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 e1a41a10f76..d1a7b76000b 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 2251d623f4d..30d28e2534f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1244,13 +1244,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); } @@ -1518,7 +1518,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); } @@ -1572,7 +1572,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 abf508a0cc8..a710153e77c 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 7ea2afc6e84..36ceb9ed465 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -310,7 +310,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; @@ -319,7 +319,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); @@ -934,7 +934,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 62cd1612387..4d8171b2485 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -221,7 +221,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 98c0ab31afc..31087b1cd0c 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()->GetEffect(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 d2528ba1eb5..10ea4cee459 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -314,7 +314,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)); @@ -721,8 +721,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 0be06b2a1ef..4f6d632a34d 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 @@ -410,7 +410,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.AddSpellMod(SPELLVALUE_BASE_POINT0, 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 929da4802fd..20792fca212 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 9cadcd57cb2..376bdf785ca 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 fd526afb7d4..1bfceb5e201 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -236,7 +236,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 28066e2dadd..18c53996bc7 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 @@ -727,7 +727,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); } @@ -814,7 +814,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 0f9ce61e6ca..a5b9f97bd30 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -435,7 +435,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; @@ -1020,7 +1020,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 1e32b9475c2..731f70b21bb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1843,7 +1843,7 @@ class spell_igb_rocket_pack : public SpellScriptLoader SpellInfo const* damageInfo = sSpellMgr->AssertSpellInfo(SPELL_ROCKET_PACK_DAMAGE, GetCastDifficulty()); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); args.CastDifficulty = GetCastDifficulty(); - args.SpellValueOverrides.AddBP0(2 * (damageInfo->GetEffect(EFFECT_0)->CalcValue() + aurEff->GetTickNumber() * aurEff->GetPeriod())); + args.AddSpellBP0(2 * (damageInfo->GetEffect(EFFECT_0)->CalcValue() + aurEff->GetTickNumber() * aurEff->GetPeriod())); GetTarget()->CastSpell(nullptr, SPELL_ROCKET_PACK_DAMAGE, args); GetTarget()->CastSpell(nullptr, SPELL_ROCKET_BURST, TRIGGERED_FULL_MASK); } @@ -2254,7 +2254,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); } @@ -2323,7 +2323,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 ffc5cb24ec6..e635d0fa73e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -436,7 +436,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 21df2c282c0..7fd0ac79401 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -820,7 +820,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); } @@ -852,7 +852,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); } } @@ -869,7 +869,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); } @@ -1327,7 +1327,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); } @@ -1341,7 +1341,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader int32 heal = healSpellInfo->GetEffect(EFFECT_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 3ac7ac56463..4e95483e4b1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -371,7 +371,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 78c6a79800d..084756d9005 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -2118,7 +2118,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); @@ -2217,7 +2217,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); @@ -2235,8 +2235,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); @@ -2651,7 +2651,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); } @@ -2919,7 +2919,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); } } @@ -3021,7 +3021,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 75f71b16024..9d073c527a8 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->AddUnitFlag2(UnitFlags2(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 3d1350040f6..2e717a883e8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -737,7 +737,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 e1c049ea7d0..c827f31a78a 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 78b68897d45..c529a580917 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -207,7 +207,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 f1b83835ee4..8ee6948d5c4 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 c46140419b4..5c650b734b0 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 66020e81cd2..c44c9a76d2b 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 8737e8a2425..a1850adcf0e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -1051,7 +1051,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 9a8399068e2..7888203470d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -2501,7 +2501,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); } @@ -2515,7 +2515,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)) @@ -2745,7 +2745,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 175440f6fe0..5735d0d82d0 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_dh.cpp b/src/server/scripts/Spells/spell_dh.cpp index ea4a389834a..406456513e8 100644 --- a/src/server/scripts/Spells/spell_dh.cpp +++ b/src/server/scripts/Spells/spell_dh.cpp @@ -44,7 +44,10 @@ class spell_dh_chaos_strike : public AuraScript void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_CHAOS_STRIKE_ENERGIZE, CastSpellExtraArgs(TRIGGERED_FULL_MASK).AddSpellBP0(aurEff->GetAmount()).SetTriggeringAura(aurEff)); + CastSpellExtraArgs args(TRIGGERED_FULL_MASK); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); + args.SetTriggeringAura(aurEff); + GetTarget()->CastSpell(GetTarget(), SPELL_CHAOS_STRIKE_ENERGIZE, args); } void Register() override diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 12ff19eb64c..fb46a1ee3e3 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -145,7 +145,7 @@ public: if (!GetTarget()->HasAura(SPELL_DK_VOLATILE_SHIELDING)) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(absorbAmount, 2 * absorbAmount * 100 / maxHealth)); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(absorbAmount, 2 * absorbAmount * 100 / maxHealth)); GetTarget()->CastSpell(GetTarget(), SPELL_DK_RUNIC_POWER_ENERGIZE, args); } } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index bede40f705b..d155182247b 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -930,7 +930,7 @@ public: return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(healInfo->GetHeal(), aurEff->GetAmount())); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_DRUID_LIVING_SEED_PROC, args); } @@ -965,7 +965,7 @@ public: { PreventDefaultAction(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(aurEff->GetAmount()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()); GetTarget()->CastSpell(GetTarget(), SPELL_DRUID_LIVING_SEED_HEAL, args); } @@ -1489,7 +1489,7 @@ class spell_dru_t3_8p_bonus : public SpellScriptLoader int32 amount = CalculatePct(m->Amount, aurEff->GetAmount()); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(nullptr, SPELL_DRUID_EXHILARATE, args); } @@ -1574,7 +1574,7 @@ public: amount += target->GetRemainingPeriodicAmount(caster->GetGUID(), SPELL_DRUID_LANGUISH, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, amount); caster->CastSpell(target, SPELL_DRUID_LANGUISH, args); } @@ -1682,7 +1682,7 @@ public: PreventDefaultAction(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(eventInfo.GetHealInfo()->GetHeal()); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, 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 01fa16c6772..076aa4bb39a 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); } @@ -782,7 +782,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); } } @@ -1839,7 +1839,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()->GetEffect(aurEff->GetEffIndex())->TriggerSpell, args); } @@ -3118,7 +3118,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 8bbae3ec773..3d947c59db5 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -1187,7 +1187,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); @@ -1196,7 +1196,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 ed8f1eb38d5..c36f78d76dd 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -183,7 +183,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); } @@ -416,7 +416,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); + args.AddSpellBP0(100); owner->CastSpell(caster, SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED, args); caster->CastSpell(caster, SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF, true); } @@ -467,7 +467,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); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index b430b514fac..d890faa67a9 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -193,7 +193,7 @@ class spell_item_alchemist_stone : public AuraScript Unit* caster = eventInfo.GetActionTarget(); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellBP0(amount); caster->CastSpell(nullptr, spellId, args); } @@ -438,7 +438,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); } } @@ -502,7 +502,7 @@ class spell_item_deadly_precision_dummy : public SpellScript { SpellInfo const* spellInfo = sSpellMgr->AssertSpellInfo(SPELL_DEADLY_PRECISION, GetCastDifficulty()); 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); } @@ -962,7 +962,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); } @@ -1300,7 +1300,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); } @@ -1458,7 +1458,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); } @@ -1494,7 +1494,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); } @@ -1918,7 +1918,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); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 7d26d58b008..60203a08c5b 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -658,7 +658,7 @@ class spell_mage_ignite : public AuraScript amount += eventInfo.GetProcTarget()->GetRemainingPeriodicAmount(eventInfo.GetActor()->GetGUID(), SPELL_MAGE_IGNITE, SPELL_AURA_PERIODIC_DAMAGE); CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(amount); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, amount); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_MAGE_IGNITE, args); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 9a91831da93..59eea2cc385 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -818,7 +818,7 @@ class spell_pal_light_s_beacon : public SpellScriptLoader if (!applications.empty()) { CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(heal); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, heal); eventInfo.GetActor()->CastSpell(applications.front()->GetTarget(), SPELL_PALADIN_BEACON_OF_LIGHT_HEAL, args); } return; @@ -1039,7 +1039,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 33a46e94a44..f7bf7a68672 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -146,7 +146,7 @@ class spell_pri_aq_3p_bonus : public SpellScriptLoader return; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddBP0(CalculatePct(static_cast<int32>(healInfo->GetHeal()), 10)); + args.AddSpellBP0(CalculatePct(static_cast<int32>(healInfo->GetHeal()), 10)); caster->CastSpell(caster, SPELL_PRIEST_ORACULAR_HEAL, args); } @@ -352,7 +352,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(); } @@ -1092,7 +1092,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); } @@ -1140,8 +1140,8 @@ class spell_pri_vampiric_embrace : public SpellScriptLoader int32 teamHeal = selfHeal / 2; CastSpellExtraArgs args(aurEff); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT0, teamHeal); - args.SpellValueOverrides.AddMod(SPELLVALUE_BASE_POINT1, selfHeal); + args.AddSpellMod(SPELLVALUE_BASE_POINT0, teamHeal); + args.AddSpellMod(SPELLVALUE_BASE_POINT1, selfHeal); GetTarget()->CastSpell(nullptr, SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL, args); } @@ -1210,7 +1210,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); } } diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 6c3e8d9cd6a..ebf21e033bf 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 25ba6f0006d..033e8b255be 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); } } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index cdef3647137..eac7c5911f6 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -1244,7 +1244,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); } @@ -1295,7 +1295,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); } @@ -1391,7 +1391,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); } diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 555748be8ab..6cba63461fb 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -449,7 +449,7 @@ class spell_warr_item_t10_prot_4p_bonus : public SpellScriptLoader Unit* target = eventInfo.GetActionTarget(); int32 bp0 = CalculatePct(target->GetMaxHealth(), GetSpellInfo()->GetEffect(EFFECT_1)->CalcValue()); CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.SpellValueOverrides.AddBP0(bp0); + args.AddSpellBP0(bp0); target->CastSpell(nullptr, SPELL_WARRIOR_STOICISM, args); } |