diff options
| -rw-r--r-- | sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql (renamed from sql/updates/world/2013_07_24_00_world_spell_script_names.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2013_07_24_01_world_spell_ranks_335.sql (renamed from sql/updates/world/2013_07_24_01_world_spell_ranks.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2013_07_24_03_world_spell_proc_event_335.sql (renamed from sql/updates/world/2013_07_24_03_world_spell_proc_event.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2013_07_25_03_world_spell_script_names_434.sql | 3 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_priest.cpp | 5 |
5 files changed, 6 insertions, 2 deletions
diff --git a/sql/updates/world/2013_07_24_00_world_spell_script_names.sql b/sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql index 8c156fb2e57..8c156fb2e57 100644 --- a/sql/updates/world/2013_07_24_00_world_spell_script_names.sql +++ b/sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql diff --git a/sql/updates/world/2013_07_24_01_world_spell_ranks.sql b/sql/updates/world/2013_07_24_01_world_spell_ranks_335.sql index db1d9803596..db1d9803596 100644 --- a/sql/updates/world/2013_07_24_01_world_spell_ranks.sql +++ b/sql/updates/world/2013_07_24_01_world_spell_ranks_335.sql diff --git a/sql/updates/world/2013_07_24_03_world_spell_proc_event.sql b/sql/updates/world/2013_07_24_03_world_spell_proc_event_335.sql index 0e179e54ec8..0e179e54ec8 100644 --- a/sql/updates/world/2013_07_24_03_world_spell_proc_event.sql +++ b/sql/updates/world/2013_07_24_03_world_spell_proc_event_335.sql diff --git a/sql/updates/world/2013_07_25_03_world_spell_script_names_434.sql b/sql/updates/world/2013_07_25_03_world_spell_script_names_434.sql new file mode 100644 index 00000000000..9bf0fa9ecee --- /dev/null +++ b/sql/updates/world/2013_07_25_03_world_spell_script_names_434.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`IN (-17,17); +INSERT INTO `spell_script_names`(`spell_id`, `ScriptName`) VALUES +(17,'spell_pri_power_word_shield'); diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 4d85f1ed818..2d3b214a389 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -57,6 +57,7 @@ enum PriestSpells SPELL_PRIEST_SHADOWFORM_VISUAL_WITHOUT_GLYPH = 107903, SPELL_PRIEST_SHADOWFORM_VISUAL_WITH_GLYPH = 107904, SPELL_PRIEST_SHADOW_WORD_DEATH = 32409, + 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, @@ -714,7 +715,7 @@ class spell_pri_phantasm : public SpellScriptLoader } }; -// -17 - Power Word: Shield +// 17 - Power Word: Shield class spell_pri_power_word_shield : public SpellScriptLoader { public: @@ -755,7 +756,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader amount += int32(bonus); // Twin Disciplines - if (AuraEffect const* twinDisciplines = caster->GetAuraEffect(SPELL_AURA_ADD_PCT_MODIFIER, SPELLFAMILY_PRIEST, 0x400000, 0, 0, GetCasterGUID())) + if (AuraEffect* twinDisciplines = caster->GetAuraEffectOfRankedSpell(SPELL_PRIEST_TWIN_DISCIPLINES_RANK_1, EFFECT_1)) AddPct(amount, twinDisciplines->GetAmount()); // Focused Power |