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

Core/Spells: fixed Paladin Consecration

Browse Source
This commit is contained in:
Ovahlord
2018-04-25 13:57:43 +02:00
parent 56ba61fc0c
commit cd4163eaca
2 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/updates/world/4.3.4/custom_2018_04_25_00_world.sql Normal file
View File

@@ -0,0 +1,11 @@
DELETE FROM `creature_template_addon` WHERE `entry`= 43499;
INSERT INTO `creature_template_addon` (`entry`, `auras`) VALUES
(43499, '81298');
DELETE FROM `spell_script_names` WHERE `ScriptName`= 'spell_pal_consecration';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(26573, 'spell_pal_consecration');
DELETE FROM `spell_bonus_data` WHERE `entry` IN (26573, 81297);
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
(81297, -1, 0, 0.04, 0, 'Paladin - Consecration');

56
src/server/scripts/Spells/spell_paladin.cpp
View File

@@ -22,6 +22,7 @@
*/
#include "ScriptMgr.h"
#include "DynamicObject.h"
#include "Group.h"
#include "Player.h"
#include "SpellAuraEffects.h"
@@ -40,6 +41,7 @@ enum PaladinSpells
SPELL_PALADIN_BLESSING_OF_LOWER_CITY_PRIEST = 37880,
SPELL_PALADIN_BLESSING_OF_LOWER_CITY_SHAMAN = 37881,
SPELL_PALADIN_CONCENTRACTION_AURA = 19746,
SPELL_PALADIN_CONSECRATION_TRIGGERED = 81297,
SPELL_PALADIN_CRUSADER_STRIKE = 35395,
SPELL_PALADIN_DIVINE_PURPOSE_PROC = 90174,
SPELL_PALADIN_DIVINE_SACRIFICE = 64205,
@@ -83,6 +85,11 @@ enum PaladinSpellIcons
PALADIN_ICON_ID_RETRIBUTION_AURA = 555
};
enum PaladinCreatures
{
NPC_PALADIN_CONSECRATION = 43499
};
/*
// 31850 - Ardent Defender
class spell_pal_ardent_defender : public SpellScriptLoader
@@ -342,6 +349,54 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader
}
};
// 26573 - Consecration
class spell_pal_consecration : public SpellScriptLoader
{
public:
spell_pal_consecration() : SpellScriptLoader("spell_pal_consecration") { }
class spell_pal_consecration_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_consecration_AuraScript);
bool Load() override
{
// Store the position of the initial Consecration cast for triggering the damage
castPos = GetCaster()->GetPosition();
return true;
}
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_CONSECRATION_TRIGGERED });
}
void HandleEffectPeriodic(AuraEffect const* aurEff)
{
// For some reason Consecration also applies on nearby enemies
// In this case the following code should not happen
if (GetTarget() != GetCaster())
return;
if (Unit* caster = GetCaster())
caster->CastSpell(castPos.GetPositionX(), castPos.GetPositionY(), castPos.GetPositionZ(), SPELL_PALADIN_CONSECRATION_TRIGGERED, true, nullptr, aurEff);
}
private:
Position castPos;
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pal_consecration_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_pal_consecration_AuraScript();
}
};
// 64205 - Divine Sacrifice
class spell_pal_divine_sacrifice : public SpellScriptLoader
{
@@ -1335,6 +1390,7 @@ void AddSC_paladin_spell_scripts()
new spell_pal_aura_mastery_immune();
new spell_pal_avenging_wrath();
new spell_pal_blessing_of_faith();
new spell_pal_consecration();
new spell_pal_divine_sacrifice();
new spell_pal_divine_storm();
new spell_pal_divine_storm_dummy();