diff options
| author | megamage <none@none> | 2009-08-05 16:39:09 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-08-05 16:39:09 -0500 |
| commit | 5b1e8ef6ff333412d23448684954581af39f0e2e (patch) | |
| tree | d208b729a3cf377010d529e0d9a75e30b8a75ce7 /src | |
| parent | 907342d5b0e7a68024fcc77ea125bc36ff3bacaa (diff) | |
[8309] Fixed paladin judgement selection code in some places. Author: KAPATEJIb
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellEffects.cpp | 6 | ||||
| -rw-r--r-- | src/game/SpellMgr.h | 3 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 9b414ed9f66..db5cb899f8f 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -5359,8 +5359,8 @@ void Spell::EffectScriptEffect(uint32 effIndex) } case SPELLFAMILY_PALADIN: { - // Judgement - if (m_spellInfo->SpellFamilyFlags[0] & 0x800000 || m_spellInfo->SpellFamilyFlags[2] & 0x8) + // Judgement (seal trigger) + if (m_spellInfo->Category == SPELLCATEGORY_JUDGEMENT) { if(!unitTarget || !unitTarget->isAlive()) return; @@ -5370,12 +5370,12 @@ void Spell::EffectScriptEffect(uint32 effIndex) // Judgement self add switch switch (m_spellInfo->Id) { - case 41467: break; // Judgement case 53407: spellId1 = 20184; break; // Judgement of Justice case 20271: // Judgement of Light case 57774: spellId1 = 20185; break; // Judgement of Light case 53408: spellId1 = 20186; break; // Judgement of Wisdom default: + sLog.outError("Unsupported Judgement (seal trigger) spell (Id: %u) in Spell::EffectScriptEffect",m_spellInfo->Id); return; } // all seals have aura dummy in 2 effect diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index c85431256a0..0aae9fc43a4 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -44,7 +44,8 @@ struct SpellModifier; enum SpellCategories { SPELLCATEGORY_HEALTH_MANA_POTIONS = 4, - SPELLCATEGORY_DEVOUR_MAGIC = 12 + SPELLCATEGORY_DEVOUR_MAGIC = 12, + SPELLCATEGORY_JUDGEMENT = 1210, // Judgement (seal trigger) }; enum SpellDisableTypes diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index fae807a5a6c..794a3e7bcd0 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6409,8 +6409,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger triggered_spell_id = 40471; chance = 15.0f; } - // Judgement - else if( procSpell->SpellFamilyFlags[0] & 0x800000 ) + // Judgement (any) + else if (GetSpellSpecific(procSpell->Id)==SPELL_JUDGEMENT) { triggered_spell_id = 40472; chance = 50.0f; |