Core/Spells: Fix some db startup error and add new
This commit is contained in:
1 parent
061edf9342
commit
54c2009318
9 files changed
+103
-87
No files matched your search
@@ -60,14 +60,14 @@ enum PriestSpells
|
||||
SPELL_PRIEST_TWIN_DISCIPLINES_RANK_1 = 47586,
|
||||
SPELL_PRIEST_T9_HEALING_2P = 67201,
|
||||
SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL = 15290,
|
||||
SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL = 64085,
|
||||
SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL = 64085
|
||||
};
|
||||
|
||||
enum PriestSpellIcons
|
||||
{
|
||||
PRIEST_ICON_ID_BORROWED_TIME = 2899,
|
||||
PRIEST_ICON_ID_DIVINE_TOUCH_TALENT = 3021,
|
||||
PRIEST_ICON_ID_PAIN_AND_SUFFERING = 2874,
|
||||
PRIEST_ICON_ID_PAIN_AND_SUFFERING = 2874
|
||||
};
|
||||
|
||||
enum MiscSpells
|
||||
@@ -440,7 +440,7 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScriptLoader
|
||||
}
|
||||
};
|
||||
|
||||
// -7001 - Lightwell Renew
|
||||
// 7001 - Lightwell Renew
|
||||
class spell_pri_lightwell_renew : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
@@ -756,7 +756,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader
|
||||
amount += int32(bonus);
|
||||
|
||||
// Twin Disciplines
|
||||
if (AuraEffect* twinDisciplines = caster->GetAuraEffectOfRankedSpell(SPELL_PRIEST_TWIN_DISCIPLINES_RANK_1, EFFECT_1))
|
||||
if (AuraEffect const* twinDisciplines = caster->GetAuraEffectOfRankedSpell(SPELL_PRIEST_TWIN_DISCIPLINES_RANK_1, EFFECT_1))
|
||||
AddPct(amount, twinDisciplines->GetAmount());
|
||||
|
||||
// Focused Power
|
||||
@@ -770,7 +770,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader
|
||||
if (dmgInfo.GetAttacker() == target)
|
||||
return;
|
||||
|
||||
if (AuraEffect* talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PRIEST_REFLECTIVE_SHIELD_R1, EFFECT_0))
|
||||
if (AuraEffect const* talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PRIEST_REFLECTIVE_SHIELD_R1, EFFECT_0))
|
||||
{
|
||||
int32 bp = CalculatePct(absorbAmount, talentAurEff->GetAmount());
|
||||
target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED, &bp, NULL, NULL, true, NULL, aurEff);
|
||||
@@ -825,49 +825,6 @@ class spell_pri_prayer_of_mending_heal : public SpellScriptLoader
|
||||
}
|
||||
};
|
||||
|
||||
// 17 - Reflective Shield
|
||||
class spell_pri_reflective_shield_trigger : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
spell_pri_reflective_shield_trigger() : SpellScriptLoader("spell_pri_reflective_shield_trigger") { }
|
||||
|
||||
class spell_pri_reflective_shield_trigger_AuraScript : public AuraScript
|
||||
{
|
||||
PrepareAuraScript(spell_pri_reflective_shield_trigger_AuraScript);
|
||||
|
||||
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
|
||||
{
|
||||
if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_R1))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void Trigger(AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
|
||||
{
|
||||
Unit* target = GetTarget();
|
||||
if (dmgInfo.GetAttacker() == target)
|
||||
return;
|
||||
|
||||
if (GetCaster())
|
||||
if (AuraEffect* talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PRIEST_REFLECTIVE_SHIELD_R1, EFFECT_0))
|
||||
{
|
||||
int32 bp = CalculatePct(absorbAmount, talentAurEff->GetAmount());
|
||||
target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED, &bp, NULL, NULL, true, NULL, aurEff);
|
||||
}
|
||||
}
|
||||
|
||||
void Register() OVERRIDE
|
||||
{
|
||||
AfterEffectAbsorb += AuraEffectAbsorbFn(spell_pri_reflective_shield_trigger_AuraScript::Trigger, EFFECT_0);
|
||||
}
|
||||
};
|
||||
|
||||
AuraScript* GetAuraScript() const OVERRIDE
|
||||
{
|
||||
return new spell_pri_reflective_shield_trigger_AuraScript();
|
||||
}
|
||||
};
|
||||
|
||||
// 139 - Renew
|
||||
class spell_pri_renew : public SpellScriptLoader
|
||||
{
|
||||
@@ -1136,7 +1093,6 @@ void AddSC_priest_spell_scripts()
|
||||
new spell_pri_phantasm();
|
||||
new spell_pri_power_word_shield();
|
||||
new spell_pri_prayer_of_mending_heal();
|
||||
new spell_pri_reflective_shield_trigger();
|
||||
new spell_pri_renew();
|
||||
new spell_pri_shadow_word_death();
|
||||
new spell_pri_shadowform();
|
||||
|
||||
Reference in new issue
Block a user