From 8e9d3a5964a65cc5ad878b0f39a3fd92600cebdf Mon Sep 17 00:00:00 2001 From: QAston Date: Sat, 18 Apr 2009 11:52:47 +0200 Subject: [PATCH] *Make Shadow Embrace reduce hots effect. *Fix Glyph of Conflagrate. --HG-- branch : trunk --- sql/updates/2773_world_spell_linked_spell.sql | 6 ++++++ src/game/SpellEffects.cpp | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 sql/updates/2773_world_spell_linked_spell.sql diff --git a/sql/updates/2773_world_spell_linked_spell.sql b/sql/updates/2773_world_spell_linked_spell.sql new file mode 100644 index 0000000000..90f5f8de19 --- /dev/null +++ b/sql/updates/2773_world_spell_linked_spell.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (32386, 32388, 32389, 32390, 32391); +INSERT INTO `spell_linked_spell` VALUES (32386, 60448, 1, 'Shadow Embrace Rank1'); +INSERT INTO `spell_linked_spell` VALUES (32388, 60465, 1, 'Shadow Embrace Rank2'); +INSERT INTO `spell_linked_spell` VALUES (32389, 60466, 1, 'Shadow Embrace Rank3'); +INSERT INTO `spell_linked_spell` VALUES (32390, 60467, 1, 'Shadow Embrace Rank4'); +INSERT INTO `spell_linked_spell` VALUES (32391, 60468, 1, 'Shadow Embrace Rank5'); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index ae468f0fdb..d321d2d6e3 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -451,6 +451,9 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) // Conflagrate - consumes immolate if (m_spellInfo->TargetAuraState == AURA_STATE_IMMOLATE) { + // Glyph of Conflagrate + if (m_caster->HasAura(56235)) + break; // for caster applied auras only Unit::AuraEffectList const &mPeriodic = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); for(Unit::AuraEffectList::const_iterator i = mPeriodic.begin(); i != mPeriodic.end(); ++i)