diff --git a/sql/updates/world/custom/custom_2019_02_19_03_world.sql b/sql/updates/world/custom/custom_2019_02_19_03_world.sql new file mode 100644 index 0000000000..3e9143945e --- /dev/null +++ b/sql/updates/world/custom/custom_2019_02_19_03_world.sql @@ -0,0 +1 @@ +UPDATE `spell_proc` SET `SpellPhaseMask`=2 WHERE `SpellId`= 77222; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7424d13b3f..199ad39dab 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6645,35 +6645,6 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin } } - // Custom scripted damage - switch (spellProto->SpellFamilyName) - { - case SPELLFAMILY_DEATHKNIGHT: - // Impurity (dummy effect) - if (GetTypeId() == TYPEID_PLAYER) - { - PlayerSpellMap const& playerSpells = ToPlayer()->GetSpellMap(); - for (auto itr = playerSpells.begin(); itr != playerSpells.end(); ++itr) - { - if (itr->second->state == PLAYERSPELL_REMOVED || itr->second->disabled) - continue; - - switch (itr->first) - { - case 49220: - case 49633: - case 49635: - case 49636: - case 49638: - if (SpellInfo const* proto = sSpellMgr->GetSpellInfo(itr->first)) - AddPct(ApCoeffMod, proto->Effects[EFFECT_0].CalcValue()); - break; - } - } - } - break; - } - // Done fixed damage bonus auras int32 DoneAdvertisedBenefit = SpellBaseDamageBonusDone(spellProto->GetSchoolMask()); @@ -7084,8 +7055,10 @@ int32 Unit::SpellBaseDamageBonusTaken(SpellSchoolMask schoolMask) const AuraEffectList const& mDamageTaken = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_TAKEN); for (AuraEffectList::const_iterator i = mDamageTaken.begin(); i != mDamageTaken.end(); ++i) + { if (((*i)->GetMiscValue() & schoolMask) != 0) TakenAdvertisedBenefit += (*i)->GetAmount(); + } return TakenAdvertisedBenefit; } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 65a11b37ca..ae4510bdb1 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -1302,63 +1302,58 @@ public: }; // 77222 - Elemental Overload -class spell_sha_elemental_overload : public SpellScriptLoader +class spell_sha_elemental_overload : public AuraScript { -public: - spell_sha_elemental_overload() : SpellScriptLoader("spell_sha_elemental_overload") { } + PrepareAuraScript(spell_sha_elemental_overload); - class spell_sha_elemental_overload_AuraScript : public AuraScript + bool Validate(SpellInfo const* /*spellInfo*/) override { - PrepareAuraScript(spell_sha_elemental_overload_AuraScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override - { - return ValidateSpellInfo({ SPELL_SHAMAN_LIGHTNING_BOLT, SPELL_SHAMAN_LIGHTNING_BOLT_TRIGGERED, - SPELL_SHAMAN_CHAIN_LIGHTNING, SPELL_SHAMAN_CHAIN_LIGHTNING_TRIGGERED, - SPELL_SHAMAN_LAVA_BURST, SPELL_SHAMAN_LAVA_BURST_TRIGGERED }); - } - - bool CheckProc(ProcEventInfo& /*eventInfo*/) - { - return roll_chance_i(GetEffect(EFFECT_0)->GetAmount()); - } - - void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) - { - PreventDefaultAction(); - - if (Unit* target = eventInfo.GetProcTarget()) + return ValidateSpellInfo( { - if (Unit* caster = GetCaster()) + SPELL_SHAMAN_LIGHTNING_BOLT, + SPELL_SHAMAN_LIGHTNING_BOLT_TRIGGERED, + SPELL_SHAMAN_CHAIN_LIGHTNING, + SPELL_SHAMAN_CHAIN_LIGHTNING_TRIGGERED, + SPELL_SHAMAN_LAVA_BURST, + SPELL_SHAMAN_LAVA_BURST_TRIGGERED + }); + } + + bool CheckProc(ProcEventInfo& /*eventInfo*/) + { + return roll_chance_i(GetEffect(EFFECT_0)->GetAmount()); + } + + void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + { + PreventDefaultAction(); + + if (Unit* target = eventInfo.GetProcTarget()) + { + if (Unit* caster = GetCaster()) + { + switch (eventInfo.GetProcSpell()->GetSpellInfo()->Id) { - switch (eventInfo.GetProcSpell()->GetSpellInfo()->Id) - { - case SPELL_SHAMAN_LIGHTNING_BOLT: - caster->CastSpell(target, SPELL_SHAMAN_LIGHTNING_BOLT_TRIGGERED, true); - break; - case SPELL_SHAMAN_CHAIN_LIGHTNING: - caster->CastSpell(target, SPELL_SHAMAN_CHAIN_LIGHTNING_TRIGGERED, true); - break; - case SPELL_SHAMAN_LAVA_BURST: - caster->CastSpell(target, SPELL_SHAMAN_LAVA_BURST_TRIGGERED, true); - break; - default: - break; - } + case SPELL_SHAMAN_LIGHTNING_BOLT: + caster->CastSpell(target, SPELL_SHAMAN_LIGHTNING_BOLT_TRIGGERED, true); + break; + case SPELL_SHAMAN_CHAIN_LIGHTNING: + caster->CastSpell(target, SPELL_SHAMAN_CHAIN_LIGHTNING_TRIGGERED, true); + break; + case SPELL_SHAMAN_LAVA_BURST: + caster->CastSpell(target, SPELL_SHAMAN_LAVA_BURST_TRIGGERED, true); + break; + default: + break; } } } + } - void Register() override - { - DoCheckProc += AuraCheckProcFn(spell_sha_elemental_overload_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_elemental_overload_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); - } - }; - - AuraScript* GetAuraScript() const override + void Register() override { - return new spell_sha_elemental_overload_AuraScript(); + DoCheckProc += AuraCheckProcFn(spell_sha_elemental_overload::CheckProc); + OnEffectProc += AuraEffectProcFn(spell_sha_elemental_overload::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -2024,7 +2019,7 @@ void AddSC_shaman_spell_scripts() new spell_sha_earthbind_totem(); new spell_sha_earthen_power(); new spell_sha_earthliving_weapon(); - new spell_sha_elemental_overload(); + RegisterAuraScript(spell_sha_elemental_overload); new spell_sha_feedback(); new spell_sha_fire_nova(); new spell_sha_flame_shock();