diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 587ac5e58..de15dc2ef 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1575,31 +1575,95 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& case 38794: // Murmur's Touch (h) case 44869: // Spectral Blast case 45976: // Open Portal + case 48278: // Paralyze (Utgarde Pinnacle) case 50988: // Glare of the Tribunal (Halls of Stone) + case 54148: // Ritual of the Sword (Utgarde Pinnacle, Svala) + case 55479: // Forced Obedience (Naxxramas, Razovius) case 59870: // Glare of the Tribunal (h) (Halls of Stone) + case 62016: // Charge Orb (Ulduar, Thorim) + case 62301: // Cosmic Smash (Ulduar, Algalon) + case 62488: // Activate Construct (Ulduar, Ignis) + case 63018: // Searing Light + case 63024: // Gravity Bomb (Ulduar, XT-002) + case 63387: // Rapid Burst + case 63795: // Psychosis (Ulduar, Yogg-Saron) + case 62042: // Stormhammer (Ulduar, Thorim) case 64218: // Overcharge - case 68950: // Fear + case 64234: // Gravity Bomb (h) (Ulduar, XT-002) + case 64531: // Rapid Burst (h) + case 65121: // Searing Light (h) + case 65301: // Psychosis (Ulduar, Yogg-Saron) + case 65950: // Touch of Light (ToCrusader, Val'kyr Twins) + case 66001: // Touch of Darkness (ToCrusader, Val'kyr Twins) + case 66152: // Bullet Controller Summon Periodic Trigger Light (ToCrusader) + case 66153: // Bullet Controller Summon Periodic Trigger Dark (ToCrusader) + case 66332: // Nerubian Burrower (Mode 0) (ToCrusader, Anub'arak) + case 66336: // Mistress' Kiss (ToCrusader, Jaraxxus) + case 66339: // Summon Scarab (ToCrusader, Anub'arak) + case 67077: // Mistress' Kiss (Mode 2) (ToCrusader, Jaraxxus) + case 67281: // Touch of Darkness (Mode 1) + case 67282: // Touch of Darkness (Mode 2) + case 67283: // Touch of Darkness (Mode 3) + case 67296: // Touch of Light (Mode 1) + case 67297: // Touch of Light (Mode 2) + case 67298: // Touch of Light (Mode 3) + case 68950: // Fear (FoS) case 68912: // Wailing Souls (FoS) case 69048: // Mirrored Soul (FoS) + case 69674: // Mutated Infection (ICC, Rotface) + case 70882: // Slime Spray Summon Trigger (ICC, Rotface) + case 70920: // Unbound Plague Search Effect (ICC, Putricide) + case 71224: // Mutated Infection (Mode 1) + case 72091: // Frozen Orb (Vault of Archavon, Toravon) + case 73022: // Mutated Infection (Mode 2) + case 73023: // Mutated Infection (Mode 3) + case 51146: // Searching Gaze (Halls Of Stone) unMaxTargets = 1; break; case 28542: // Life Drain case 66013: // Penetrating Cold (10 man) + case 67755: // Nerubian Burrower (Mode 1) (ToCrusader, Anub'arak) + case 67756: // Nerubian Burrower (Mode 2) (ToCrusader, Anub'arak) case 68509: // Penetrating Cold (10 man heroic) + case 69055: // Bone Slice (ICC, Lord Marrowgar) + case 69278: // Gas spore (ICC, Festergut) + case 70341: // Slime Puddle (ICC, Putricide) + case 71336: // Pact of the Darkfallen + case 71390: // Pact of the Darkfallen unMaxTargets = 2; break; case 28796: // Poison Bolt Volley case 29213: // Curse of the Plaguebringer case 31298: // Sleep + case 39992: // Needle Spine Targeting (BT, Warlord Najentus) + case 51904: // Limiting the count of Summoned Ghouls + case 54522: + case 60936: // Surge of Power (h) (Malygos) + case 61693: // Arcane Storm (Malygos) + case 64598: // Cosmic Smash (h) (Ulduar, Algalon) + case 70814: // Bone Slice (ICC, Lord Marrowgar, heroic) + case 72095: // Frozen Orb (h) (Vault of Archavon, Toravon) unMaxTargets = 3; break; + case 67757: // Nerubian Burrower (Mode 3) (ToCrusader, Anub'arak) + case 71221: // Gas spore (Mode 1) (ICC, Festergut) + unMaxTargets = 4; + break; case 30843: // Enfeeble TODO: exclude top threat target from target selection case 42005: // Bloodboil TODO: need to be 5 targets(players) furthest away from caster + case 45641: // Fire Bloom (SWP, Kil'jaeden) case 55665: // Life Drain (h) + case 58917: // Consume Minions + case 64604: // Nature Bomb (Ulduar, Freya) + case 67076: // Mistress' Kiss (Mode 1) (ToCrusader, Jaraxxus) + case 67078: // Mistress' Kiss (Mode 3) (ToCrusader, Jaraxxus) case 67700: // Penetrating Cold (25 man) case 68510: // Penetrating Cold (25 man, heroic) unMaxTargets = 5; break; + case 61694: // Arcane Storm (h) (Malygos) + unMaxTargets = 7; + break; case 54098: // Poison Bolt Volley (h) case 54835: // Curse of the Plaguebringer (h) unMaxTargets = 10; @@ -1607,6 +1671,17 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& case 25991: // Poison Bolt Volley (Pincess Huhuran) unMaxTargets = 15; break; + case 61916: // Lightning Whirl (Ulduar, Stormcaller Brundir) + unMaxTargets = urand(2, 3); + break; + case 46771: // Flame Sear (SWP, Grand Warlock Alythess) + unMaxTargets = urand(3, 5); + break; + case 63482: // Lightning Whirl (h) (Ulduar, Stormcaller Brundir) + unMaxTargets = urand(3, 6); + break; + default: + break; } break; } @@ -1631,6 +1706,12 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& unMaxTargets = 2; break; } + case SPELLFAMILY_DEATHKNIGHT: + { + if (m_spellInfo->SpellIconID == 1737) // Corpse Explosion // TODO - spell 50445? + unMaxTargets = 1; + break; + } case SPELLFAMILY_PALADIN: if (m_spellInfo->Id == 20424) // Seal of Command (2 more target for single targeted spell) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b30058844..291b40bb7 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11936" + #define REVISION_NR "11937" #endif // __REVISION_NR_H__