Skip to content

Commit

Permalink
Core/Spells: Grouped up cataclysm spells DBC changes on LoadSpellCust…
Browse files Browse the repository at this point in the history 
…omAttr, will make it easier to spot and clean up hacks, also it will be useful in the future for further expansions :P
  • Loading branch information
@Greymane
Greymane committed Aug 22, 2012
1 parent e05ae74 commit c70956e
Showing 1 changed file with 93 additions and 86 deletions.
179 changes: 93 additions & 86 deletions src/server/game/Spells/SpellMgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2979,6 +2979,8 @@ void SpellMgr::LoadSpellCustomAttr()

switch (spellInfo->Id)
{
// CATACLYSM SPELLS CHANGES
//
case 79638: // Enhanced Strength
case 79640: // Enhanced Intellect
spellInfo->DurationEntry = sSpellDurationStore.LookupEntry(367); // 2 hours instead of 1
Expand All @@ -3004,6 +3006,97 @@ void SpellMgr::LoadSpellCustomAttr()
case 28271: // Polymorph (other animal)
spellInfo->ProcCharges = 1;
break;
// Need this otherwise we'll be having multiple chance rolls for judgement.
case 85117: // Divine Purpose (Rank 1)
case 86172: // Divine Purpose (Rank 2)
spellInfo->AttributesEx3 = 0;
break;
case 90174: // Divine Purpose Proc
spellInfo->ProcCharges = 1;
break;
case 88667: // Holy Word: Sanctuary 3yd Dummy
spellInfo->SpellFamilyName = SPELLFAMILY_PRIEST;
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(15);
spellInfo->DurationEntry = sSpellDurationStore.LookupEntry(85);
break;
case 88668: // Holy Word: Sanctuary 3yd Heal
spellInfo->SpellFamilyName = SPELLFAMILY_PRIEST;
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(15);
break;
case 88685: // Holy Word: Sanctuary 6yd Dummy
case 88686: // Holy Word: Sanctuary 6yd Heal
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(29);
break;
case 73510: // Mind Spike
spellInfo->Effects[0].TriggerSpell = 0;
spellInfo->Effects[2].TargetA = TARGET_UNIT_TARGET_ENEMY;
break;
case 56641: // Steady Shot
spellInfo->Effects[2].TargetA = TARGET_UNIT_CASTER;
break;
case 87934: // Serpent Spread
case 87935:
spellInfo->Effects[0].Effect = SPELL_EFFECT_APPLY_AURA;
spellInfo->Effects[0].ApplyAuraName = SPELL_AURA_DUMMY;
break;
case 65156: // Juggernaut Buff
spellInfo->AttributesEx3 |= SPELL_ATTR3_CAN_PROC_WITH_TRIGGERED;
break;
case 80353: // Time Warp
spellInfo->ExcludeCasterAuraSpell = 80354; // Temporal Displacement
break;
case 90355: // Ancient Hysteria
spellInfo->ExcludeCasterAuraSpell = 95809; // Insanity
break;
case 94338: // Sunfire (Eclipse)
spellInfo->Effects[0].BasePoints = 93402;
break;
case 5176: // Wrath
case 2912: // Starfire
case 78674: // Starsurge
spellInfo->Effects[1].Effect = SPELL_EFFECT_DUMMY;
spellInfo->Effects[1].TargetA = TARGET_UNIT_CASTER;
break;
// Below = TO BE CHECKED ONES
case 82992: // Crowley's ride vehicle
spellInfo->Effects[0].BasePoints = 60683;
break;
case 81913: case 81914: // Die by the Sword
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 77486: // Shadow orb power
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 33191: case 78228: // Harnessed Shadows
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 80128: // Impending Victory Rank 1
case 80129: // Impending Victory Rank 2
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 80979: // Thunderstruck Rank 1
case 80980: // Thunderstruck Rank 2
spellInfo->Effects[1].TriggerSpell = 0;
break;
case 84604: // Hold the Line Rank 1
case 84621: // Hold the Line Rank 2
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 83359: // Sic 'Em Rank 1
case 89388: // Sic 'Em Rank 2
spellInfo->ProcCharges = 1;
break;
case 85084: // Howling Gale
spellInfo->Effects[0].TriggerSpell = 85085;
break;
case 85085: // Howling Gale
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(18); // 15 yard
break;
case 84101: // Deepholm Intro Taxi
spellInfo->Effects[0].Effect = SPELL_EFFECT_DUMMY;
break;
// ENDOF CATACLYSM SPELLS CHANGES
//
case 1680: // Whirlwind (Fury)
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry (14);
spellInfo->Effects[1].RadiusEntry = sSpellRadiusStore.LookupEntry (14);
Expand All @@ -3017,14 +3110,6 @@ void SpellMgr::LoadSpellCustomAttr()
case 42835: // Spout
spellInfo->Effects[0].Effect = 0; // remove damage effect, only anim is needed
break;
// Need this otherwise we'll be having multiple chance rolls for judgement.
case 85117: // Divine Purpose (Rank 1)
case 86172: // Divine Purpose (Rank 2)
spellInfo->AttributesEx3 = 0;
break;
case 90174: // Divine Purpose Proc
spellInfo->ProcCharges = 1;
break;
case 30657: // Quake
spellInfo->Effects[0].TriggerSpell = 30571;
break;
Expand All @@ -3048,34 +3133,9 @@ void SpellMgr::LoadSpellCustomAttr()
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(14);
spellInfo->Effects[1].RadiusEntry = sSpellRadiusStore.LookupEntry(14);
break;
case 88667: // Holy Word: Sanctuary 3yd Dummy
spellInfo->SpellFamilyName = SPELLFAMILY_PRIEST;
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(15);
spellInfo->DurationEntry = sSpellDurationStore.LookupEntry(85);
break;
case 88668: // Holy Word: Sanctuary 3yd Heal
spellInfo->SpellFamilyName = SPELLFAMILY_PRIEST;
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(15);
break;
case 88685: // Holy Word: Sanctuary 6yd Dummy
case 88686: // Holy Word: Sanctuary 6yd Heal
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(29);
break;
case 73510: // Mind Spike
spellInfo->Effects[0].TriggerSpell = 0;
spellInfo->Effects[2].TargetA = TARGET_UNIT_TARGET_ENEMY;
break;
case 36350: // They Must Burn Bomb Aura (self)
spellInfo->Effects[0].TriggerSpell = 36325; // They Must Burn Bomb Drop (DND)
break;
case 56641: // Steady Shot
spellInfo->Effects[2].TargetA = TARGET_UNIT_CASTER;
break;
case 87934: // Serpent Spread
case 87935:
spellInfo->Effects[0].Effect = SPELL_EFFECT_APPLY_AURA;
spellInfo->Effects[0].ApplyAuraName = SPELL_AURA_DUMMY;
break;
case 49838: // Stop Time
spellInfo->AttributesEx3 |= SPELL_ATTR3_NO_INITIAL_AGGRO;
break;
Expand All @@ -3096,12 +3156,6 @@ void SpellMgr::LoadSpellCustomAttr()
case 2825: // Bloodlust
spellInfo->ExcludeCasterAuraSpell = 57724; // Sated
break;
case 80353: // Time Warp
spellInfo->ExcludeCasterAuraSpell = 80354; // Temporal Displacement
break;
case 90355: // Ancient Hysteria
spellInfo->ExcludeCasterAuraSpell = 95809; // Insanity
break;
case 59725: // Improved Spell Reflection - aoe aura
// Target entry seems to be wrong for this spell :/
spellInfo->Effects[0].TargetA = TARGET_UNIT_CASTER_AREA_PARTY;
Expand Down Expand Up @@ -3153,9 +3207,6 @@ void SpellMgr::LoadSpellCustomAttr()
case 53385: // Divine Storm (Damage)
spellInfo->MaxAffectedTargets = 4;
break;
case 65156: // Juggernaut Buff
spellInfo->AttributesEx3 |= SPELL_ATTR3_CAN_PROC_WITH_TRIGGERED;
break;
case 38310: // Multi-Shot
case 42005: // Bloodboil
case 38296: // Spitfire Totem
Expand All @@ -3178,33 +3229,10 @@ void SpellMgr::LoadSpellCustomAttr()
case 50312: // Unholy Frenzy
spellInfo->MaxAffectedTargets = 15;
break;
case 81913: case 81914: // Die by the Sword
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 77486: // Shadow orb power
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 33191: case 78228: // Harnessed Shadows
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 38794: case 33711: // Murmur's Touch
spellInfo->MaxAffectedTargets = 1;
spellInfo->Effects[0].TriggerSpell = 33760;
break;
case 80128: // Impending Victory Rank 1
case 80129: // Impending Victory Rank 2
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 80979: // Thunderstruck Rank 1
case 80980: // Thunderstruck Rank 2
spellInfo->Effects[1].TriggerSpell = 0;
break;
case 84604: // Hold the Line Rank 1
case 84621: // Hold the Line Rank 2
spellInfo->Effects[0].TriggerSpell = 0;
break;
case 83359: // Sic 'Em Rank 1
case 89388: // Sic 'Em Rank 2
case 17941: // Shadow Trance
case 22008: // Netherwind Focus
case 31834: // Light's Grace
Expand Down Expand Up @@ -3374,35 +3402,14 @@ void SpellMgr::LoadSpellCustomAttr()
case 50421: // Scent of Blood
spellInfo->Effects[0].TriggerSpell = 50422;
break;
case 85084: // Howling Gale
spellInfo->Effects[0].TriggerSpell = 85085;
break;
case 85085: // Howling Gale
spellInfo->Effects[0].RadiusEntry = sSpellRadiusStore.LookupEntry(18); // 15 yard
break;
case 84101: // Deepholm Intro Taxi
spellInfo->Effects[0].Effect = SPELL_EFFECT_DUMMY;
break;
case 50029: // Veteran of the Third War
spellInfo->Effects[0].MiscValue = 2;
break;
case 94338: // Sunfire (Eclipse)
spellInfo->Effects[0].BasePoints = 93402;
break;
case 5176: // Wrath
case 2912: // Starfire
case 78674: // Starsurge
spellInfo->Effects[1].Effect = SPELL_EFFECT_DUMMY;
spellInfo->Effects[1].TargetA = TARGET_UNIT_CASTER;
break;
case 70728: // Exploit Weakness (needs target selection script)
case 70840: // Devious Minds (needs target selection script)
spellInfo->Effects[0].TargetA = TARGET_UNIT_CASTER;
spellInfo->Effects[0].TargetB = TARGET_UNIT_PET;
break;
case 82992: // Crowley's ride vehicle
spellInfo->Effects[0].BasePoints = 60683;
break;
case 70893: // Culling The Herd (needs target selection script)
spellInfo->Effects[0].TargetA = TARGET_UNIT_CASTER;
spellInfo->Effects[0].TargetB = TARGET_UNIT_MASTER;
Expand Down

0 comments on commit c70956e

Please sign in to comment.