Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: updated Master of Elements script to new model and simplified code

Browse Source
This commit is contained in:
Ovahlord
2019-12-06 16:40:41 +01:00
parent 5d21f24d36
commit f990fbb7ab
2 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/custom/custom_2019_12_06_00_world.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `spell_proc` SET `SchoolMask`= 0, `SpellTypeMask`= 1 WHERE `SpellId`= -29074;

60
src/server/scripts/Spells/spell_mage.cpp
View File

@@ -1001,47 +1001,37 @@ class spell_mage_mana_shield : public SpellScriptLoader
};
// -29074 - Master of Elements
class spell_mage_master_of_elements : public SpellScriptLoader
class spell_mage_master_of_elements : public AuraScript
{
public:
spell_mage_master_of_elements() : SpellScriptLoader("spell_mage_master_of_elements") { }
PrepareAuraScript(spell_mage_master_of_elements);
class spell_mage_master_of_elements_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_master_of_elements_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE });
}
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE });
}
bool CheckProc(ProcEventInfo& eventInfo)
{
return eventInfo.GetDamageInfo()->GetSpellInfo() != nullptr;
}
bool CheckProc(ProcEventInfo& eventInfo)
{
return eventInfo.GetDamageInfo()->GetSpellInfo() != nullptr;
}
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
SpellInfo const* spell = eventInfo.GetSpellInfo();
int32 mana = int32(spell->CalcPowerCost(GetTarget(), spell->GetSchoolMask()));
mana = CalculatePct(mana, aurEff->GetAmount());
int32 mana = int32(eventInfo.GetDamageInfo()->GetSpellInfo()->CalcPowerCost(GetTarget(), eventInfo.GetDamageInfo()->GetSchoolMask()));
mana = CalculatePct(mana, aurEff->GetAmount());
if (mana)
GetTarget()->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, nullptr, aurEff);
}
if (mana > 0)
GetTarget()->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, nullptr, aurEff);
}
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_master_of_elements_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_mage_master_of_elements_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_mage_master_of_elements_AuraScript();
}
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_master_of_elements::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_mage_master_of_elements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// -86181 - Nether Vortex
@@ -2346,7 +2336,7 @@ void AddSC_mage_spell_scripts()
RegisterAuraScript(spell_mage_living_bomb);
new spell_mage_mage_ward();
new spell_mage_mana_shield();
new spell_mage_master_of_elements();
RegisterAuraScript(spell_mage_master_of_elements);
RegisterSpellAndAuraScriptPair(spell_mage_mirror_image, spell_mage_mirror_image_AurasScript);
RegisterAuraScript(spell_mage_nether_vortex);
RegisterAuraScript(spell_mage_offensive_state_dnd);