Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
Conflicts: sql/updates/world/2015_11_09_02_world335.sql sql/updates/world/2015_11_09_02_world_335.sql sql/updates/world/2015_11_11_24_world_from_335_was_2015_11_09_02_world.sql sql/updates/world/2015_12_16_02_world335.sql sql/updates/world/2015_12_16_02_world_335.sql sql/updates/world/2015_12_18_19_world_from_335_was_2015_12_16_02_world_335.sql sql/updates/world/2016_01_02_00_world335.sql sql/updates/world/2016_01_02_00_world_335.sql sql/updates/world/2016_01_04_28_world_from_335_was_2016_01_02_00_world_335.sql sql/updates/world/2016_01_10_05_world335.sql sql/updates/world/2016_01_10_05_world_335.sql sql/updates/world/2016_01_12_01_world335.sql sql/updates/world/2016_01_12_01_world_335.sql sql/updates/world/2016_01_12_02_world335.sql sql/updates/world/2016_01_12_02_world_335.sql sql/updates/world/2016_01_14_12_world_from_335_was_2016_01_10_05_world_335.sql sql/updates/world/2016_01_14_14_world_from_335_was_2016_01_12_01_world_335.sql sql/updates/world/2016_01_14_15_world_from_335_was_2016_01_12_02_world_335.sql sql/updates/world/2016_01_15_00_world.sql sql/updates/world/2016_01_17_10_world.sql sql/updates/world/2016_01_17_11_world.sql sql/updates/world/2016_01_17_12_world.sql sql/updates/world/2016_01_17_13_world.sql sql/updates/world/2016_01_17_14_world.sql sql/updates/world/2016_01_17_15_world.sql sql/updates/world/2016_01_18_00_world.sql sql/updates/world/2016_01_19_00_world.sql sql/updates/world/2016_01_19_01_world.sql sql/updates/world/2016_01_19_02_world.sql sql/updates/world/2016_01_19_03_world.sql src/server/scripts/Spells/spell_paladin.cpp
This commit is contained in:
commit
67bb4c0c3c
26 files changed
+1684
-793
No files matched your search
@@ -41,6 +41,12 @@ enum PaladinSpells
|
||||
SPELL_PALADIN_CONCENTRACTION_AURA = 19746,
|
||||
SPELL_PALADIN_DIVINE_PURPOSE_PROC = 90174,
|
||||
SPELL_PALADIN_DIVINE_SACRIFICE = 64205,
|
||||
SPELL_PALADIN_BEACON_OF_LIGHT = 53563,
|
||||
SPELL_PALADIN_BEACON_OF_LIGHT_HEAL_1 = 53652,
|
||||
SPELL_PALADIN_BEACON_OF_LIGHT_HEAL_2 = 53653,
|
||||
SPELL_PALADIN_BEACON_OF_LIGHT_HEAL_3 = 53654,
|
||||
SPELL_PALADIN_HOLY_LIGHT = 635,
|
||||
|
||||
SPELL_PALADIN_DIVINE_STORM = 53385,
|
||||
SPELL_PALADIN_DIVINE_STORM_DUMMY = 54171,
|
||||
SPELL_PALADIN_DIVINE_STORM_HEAL = 54172,
|
||||
@@ -49,7 +55,6 @@ enum PaladinSpells
|
||||
SPELL_PALADIN_FORBEARANCE = 25771,
|
||||
SPELL_PALADIN_GLYPH_OF_SALVATION = 63225,
|
||||
SPELL_PALADIN_HAND_OF_SACRIFICE = 6940,
|
||||
SPELL_PALADIN_HOLY_LIGHT = 635,
|
||||
SPELL_PALADIN_HOLY_SHOCK_R1 = 20473,
|
||||
SPELL_PALADIN_HOLY_SHOCK_R1_DAMAGE = 25912,
|
||||
SPELL_PALADIN_HOLY_SHOCK_R1_HEALING = 25914,
|
||||
@@ -1010,6 +1015,68 @@ class spell_pal_lay_on_hands : public SpellScriptLoader
|
||||
}
|
||||
};
|
||||
|
||||
// 53651 - Light's Beacon - Beacon of Light
|
||||
class spell_pal_light_s_beacon : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
spell_pal_light_s_beacon() : SpellScriptLoader("spell_pal_light_s_beacon") { }
|
||||
|
||||
class spell_pal_light_s_beacon_AuraScript : public AuraScript
|
||||
{
|
||||
PrepareAuraScript(spell_pal_light_s_beacon_AuraScript);
|
||||
|
||||
bool Validate(SpellInfo const* /*spellInfo*/) override
|
||||
{
|
||||
if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_BEACON_OF_LIGHT)
|
||||
|| !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BEACON_OF_LIGHT_HEAL_1)
|
||||
|| !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BEACON_OF_LIGHT_HEAL_2)
|
||||
|| !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BEACON_OF_LIGHT_HEAL_3)
|
||||
|| !sSpellMgr->GetSpellInfo(SPELL_PALADIN_HOLY_LIGHT))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CheckProc(ProcEventInfo& eventInfo)
|
||||
{
|
||||
if (GetTarget()->HasAura(SPELL_PALADIN_BEACON_OF_LIGHT, eventInfo.GetActor()->GetGUID()))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
|
||||
{
|
||||
PreventDefaultAction();
|
||||
|
||||
SpellInfo const* procSpell = eventInfo.GetSpellInfo();
|
||||
if (!procSpell)
|
||||
return;
|
||||
|
||||
uint32 healSpellId = procSpell->IsRankOf(sSpellMgr->GetSpellInfo(SPELL_PALADIN_HOLY_LIGHT)) ? SPELL_PALADIN_BEACON_OF_LIGHT_HEAL_1 : SPELL_PALADIN_BEACON_OF_LIGHT_HEAL_3;
|
||||
uint32 heal = CalculatePct(eventInfo.GetHealInfo()->GetHeal(), aurEff->GetAmount());
|
||||
|
||||
Unit* beaconTarget = GetCaster();
|
||||
if (!beaconTarget || !beaconTarget->HasAura(SPELL_PALADIN_BEACON_OF_LIGHT, eventInfo.GetActor()->GetGUID()))
|
||||
return;
|
||||
|
||||
/// @todo: caster must be the healed unit to perform distance checks correctly
|
||||
/// but that will break animation on clientside
|
||||
/// caster in spell packets must be the healing unit
|
||||
eventInfo.GetActor()->CastCustomSpell(healSpellId, SPELLVALUE_BASE_POINT0, heal, beaconTarget, true);
|
||||
}
|
||||
|
||||
void Register() override
|
||||
{
|
||||
DoCheckProc += AuraCheckProcFn(spell_pal_light_s_beacon_AuraScript::CheckProc);
|
||||
OnEffectProc += AuraEffectProcFn(spell_pal_light_s_beacon_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
|
||||
}
|
||||
};
|
||||
|
||||
AuraScript* GetAuraScript() const override
|
||||
{
|
||||
return new spell_pal_light_s_beacon_AuraScript();
|
||||
}
|
||||
};
|
||||
|
||||
// 31789 - Righteous Defense
|
||||
class spell_pal_righteous_defense : public SpellScriptLoader
|
||||
{
|
||||
@@ -1295,6 +1362,7 @@ void AddSC_paladin_spell_scripts()
|
||||
new spell_pal_item_healing_discount();
|
||||
new spell_pal_judgement();
|
||||
new spell_pal_lay_on_hands();
|
||||
new spell_pal_light_s_beacon();
|
||||
new spell_pal_righteous_defense();
|
||||
new spell_pal_sacred_shield();
|
||||
new spell_pal_shield_of_the_righteous();
|
||||
|
||||
Reference in new issue
Block a user