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

Core/Spells: fixed Sunfire talent

Browse Source
This commit is contained in:
Ovahlord
2018-07-07 23:54:23 +02:00
parent 3cfddbc490
commit 88ac245bb5
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/updates/world/custom/custom_2018_07_07_02_world.sql Normal file
View File

@@ -0,0 +1,8 @@
DELETE FROM `spell_group` WHERE `id`= 1123;
INSERT INTO `spell_group` (`id`, `spell_id`) VALUES
(1123, 8921),
(1123, 93402);
DELETE FROM `spell_group_stack_rules` WHERE `group_id`= 1123;
INSERT INTO `spell_group_stack_rules` (`group_id`, `stack_rule`) VALUES
(1123, 2);

26
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -42,6 +42,7 @@ enum DruidSpells
SPELL_DRUID_SOLAR_ECLIPSE_MARKER = 67483, // Will make the yellow arrow on eclipse bar point to the yellow side (solar)
SPELL_DRUID_SOLAR_ECLIPSE = 48517,
SPELL_DRUID_LUNAR_ECLIPSE = 48518,
SPELL_DRUID_SOLAR_ECLIPSE_SUNFIRE = 94338,
SPELL_DRUID_HARMONY = 100977,
SPELL_DRUID_EFFLORESCENCE_AOE = 81262,
SPELL_DRUID_EFFLORESCENCE_HEAL = 81269,
@@ -79,6 +80,8 @@ enum DruidSpells
SPELL_DRUID_STAMPEDE_CAT_RANK_1 = 81021,
SPELL_DRUID_STAMPEDE_CAT_STATE = 109881,
SPELL_DRUID_SOLAR_BEAM_SILENCE = 81261,
SPELL_DRUID_SUNFIRE = 93402,
SPELL_DRUID_SUNFIRE_TALENT = 93401,
SPELL_DRUID_TIGER_S_FURY_ENERGIZE = 51178,
SPELL_DRUID_TREE_OF_LIFE = 33891,
SPELL_DRUID_TREE_OF_LIFE_PASSIVE_1 = 5420,
@@ -166,7 +169,10 @@ class spell_dru_eclipse : public AuraScript
SPELL_DRUID_SOLAR_ECLIPSE_MARKER,
SPELL_DRUID_SOLAR_ECLIPSE,
SPELL_DRUID_LUNAR_ECLIPSE,
SPELL_DRUID_EUPHORIA_MANA_ENERGIZE
SPELL_DRUID_EUPHORIA_MANA_ENERGIZE,
SPELL_DRUID_SUNFIRE,
SPELL_DRUID_SUNFIRE_TALENT,
SPELL_DRUID_SOLAR_ECLIPSE_SUNFIRE
});
}
@@ -185,6 +191,11 @@ class spell_dru_eclipse : public AuraScript
if (int32 amount = aurEff->GetAmount())
caster->CastCustomSpell(caster, SPELL_DRUID_EUPHORIA_MANA_ENERGIZE, &amount, 0, 0, true, nullptr, aurEff);
// Handle Sunfire talent
if (GetSpellInfo()->Id == SPELL_DRUID_SOLAR_ECLIPSE && caster->HasAura(SPELL_DRUID_SUNFIRE_TALENT))
if (!caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE_SUNFIRE))
caster->CastCustomSpell(SPELL_DRUID_SOLAR_ECLIPSE_SUNFIRE, SPELLVALUE_BASE_POINT0, SPELL_DRUID_SUNFIRE, caster, true);
// Update Eclipse Marker
if (GetSpellInfo()->Id == SPELL_DRUID_SOLAR_ECLIPSE && caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE_MARKER))
{
@@ -198,9 +209,20 @@ class spell_dru_eclipse : public AuraScript
}
}
void RemoveEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* caster = GetCaster();
if (!caster)
return;
if (GetSpellInfo()->Id == SPELL_DRUID_SOLAR_ECLIPSE && caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE_SUNFIRE))
caster->RemoveAurasDueToSpell(SPELL_DRUID_SOLAR_ECLIPSE_SUNFIRE);
}
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_dru_eclipse::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply += AuraEffectApplyFn(spell_dru_eclipse::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_eclipse::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
}
};