diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-01-13 20:38:32 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2018-01-13 20:49:43 -0300 |
| commit | 3b01cccd7eafaff9f3b8236a544e4fa46818926c (patch) | |
| tree | 3050d54bb7ec0171d2407c180cc713bd5ccfb929 /src/server/game/Entities | |
| parent | 31a3a6f0c5249d7d7547cb7732547dce21c1be0c (diff) | |
Core/Spell: SpellValueOverrides encapsulation
- No sense to let scripts use SpellValueOverrides, we already have modifiers in CastSpellExtraArgs struct
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
3 files changed, 5 insertions, 5 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); } |
