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

Core/Spells: fixed Arcane Potency proc entry and updated spell script to new model

Browse Source 
closes #45
This commit is contained in:
Ovahlord
2019-03-31 05:11:20 +02:00
parent 164b511888
commit 80ac0f856b
2 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/custom/custom_2019_03_31_02_world.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_proc` WHERE `SpellId`= -31571;
INSERT INTO `spell_proc` (`SpellId`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `Cooldown`, `Charges`, `Chance`) VALUES
(-31571, 3, 0, 0, 0x00000008, 0x00008000, 4, 0, 0, 0, 0, 0, 100);

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

@@ -147,52 +147,41 @@ enum MiscSpells
};
// -31571 - Arcane Potency
class spell_mage_arcane_potency : public SpellScriptLoader
class spell_mage_arcane_potency : public AuraScript
{
public:
spell_mage_arcane_potency () : SpellScriptLoader("spell_mage_arcane_potency") { }
PrepareAuraScript(spell_mage_arcane_potency);
class spell_mage_arcane_potency_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_arcane_potency_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
return ValidateSpellInfo(
{
SPELL_MAGE_ARCANE_POTENCY_RANK_1,
SPELL_MAGE_ARCANE_POTENCY_RANK_2,
SPELL_MAGE_ARCANE_POTENCY_TRIGGER_RANK_1,
SPELL_MAGE_ARCANE_POTENCY_TRIGGER_RANK_2
});
}
SPELL_MAGE_ARCANE_POTENCY_RANK_1,
SPELL_MAGE_ARCANE_POTENCY_RANK_2,
SPELL_MAGE_ARCANE_POTENCY_TRIGGER_RANK_1,
SPELL_MAGE_ARCANE_POTENCY_TRIGGER_RANK_2
});
}
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
{
PreventDefaultAction();
uint32 spellId = 0;
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
{
PreventDefaultAction();
uint32 spellId = 0;
if (GetSpellInfo()->Id == SPELL_MAGE_ARCANE_POTENCY_RANK_1)
spellId = SPELL_MAGE_ARCANE_POTENCY_TRIGGER_RANK_1;
else if (GetSpellInfo()->Id == SPELL_MAGE_ARCANE_POTENCY_RANK_2)
spellId = SPELL_MAGE_ARCANE_POTENCY_TRIGGER_RANK_2;
if (!spellId)
return;
if (GetSpellInfo()->Id == SPELL_MAGE_ARCANE_POTENCY_RANK_1)
spellId = SPELL_MAGE_ARCANE_POTENCY_TRIGGER_RANK_1;
else if (GetSpellInfo()->Id == SPELL_MAGE_ARCANE_POTENCY_RANK_2)
spellId = SPELL_MAGE_ARCANE_POTENCY_TRIGGER_RANK_2;
if (!spellId)
return;
GetTarget()->CastSpell(GetTarget(), spellId, true, nullptr, aurEff);
GetTarget()->CastSpell(GetTarget(), spellId, true, nullptr, aurEff);
}
}
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_arcane_potency_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_mage_arcane_potency_AuraScript();
}
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_arcane_potency::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
enum MageSpellIcons
@@ -2158,7 +2147,7 @@ class spell_mage_fingers_of_frost_charges : public AuraScript
void AddSC_mage_spell_scripts()
{
new spell_mage_arcane_potency();
RegisterAuraScript(spell_mage_arcane_potency);
new spell_mage_blast_wave();
new spell_mage_blazing_speed();
new spell_mage_blizzard();