Merge pull request #3729 from dracosvk/RadiusIndex

Core/Spells: Change magic numbers for EffectRadiusIndex into enum with actual effect radii

2 files changed, 91 insertions, 29 deletions

diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 35e380736c5..17780273966 100755
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2969,7 +2969,7 @@ void SpellMgr::LoadDbcDataCorrections()
                 spellInfo->EffectImplicitTargetB[0] = 0;
                 break;
             case 31344: // Howl of Azgalor
-                spellInfo->EffectRadiusIndex[0] = 12; // 100yards instead of 50000?!
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_100_YARDS; // 100yards instead of 50000?!
                 break;
             case 42818: // Headless Horseman - Wisp Flight Port
             case 42821: // Headless Horseman - Wisp Flight Missile
@@ -3005,7 +3005,7 @@ void SpellMgr::LoadDbcDataCorrections()
             case 59725: // Improved Spell Reflection - aoe aura
                 // Target entry seems to be wrong for this spell :/
                 spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_CASTER_AREA_PARTY;
-                spellInfo->EffectRadiusIndex[0] = 45;
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_10_YARDS_2;
                 break;
             case 44978: case 45001: case 45002: // Wild Magic
             case 45004: case 45006: case 45010: // Wild Magic
@@ -3109,7 +3109,7 @@ void SpellMgr::LoadDbcDataCorrections()
                 spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_CASTER;
                 break;
             case 29809: // Desecration Arm - 36 instead of 37 - typo? :/
-                spellInfo->EffectRadiusIndex[0] = 37;
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_7_YARDS;
                 break;
             // Master Shapeshifter: missing stance data for forms other than bear - bear version has correct data
             // To prevent aura staying on target after talent unlearned
@@ -3235,7 +3235,7 @@ void SpellMgr::LoadDbcDataCorrections()
             // ULDUAR SPELLS
             //
             case 62374: // Pursued (Flame Leviathan)
-                spellInfo->EffectRadiusIndex[0] = 28;   // 50000yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
                 break;
             case 63342: // Focused Eyebeam Summon Trigger (Kologarn)
                 spellInfo->MaxAffectedTargets = 1;
@@ -3303,7 +3303,7 @@ void SpellMgr::LoadDbcDataCorrections()
                 break;
             case 69055: // Saber Lash (Lord Marrowgar)
             case 70814: // Saber Lash (Lord Marrowgar)
-                spellInfo->EffectRadiusIndex[0] = 8;    // 5yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_5_YARDS;    // 5yd
                 break;
             case 69075: // Bone Storm (Lord Marrowgar)
             case 70834: // Bone Storm (Lord Marrowgar)
@@ -3315,7 +3315,7 @@ void SpellMgr::LoadDbcDataCorrections()
             case 71160: // Plague Stench (Stinky)
             case 71161: // Plague Stench (Stinky)
             case 71123: // Decimate (Stinky & Precious)
-                spellInfo->EffectRadiusIndex[0] = 12;   // 100yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_100_YARDS;   // 100yd
                 break;
             case 72723: // Resistant Skin (Deathbringer Saurfang adds)
                 // this spell initially granted Shadow damage immunity, however it was removed but the data was left in client
@@ -3342,7 +3342,7 @@ void SpellMgr::LoadDbcDataCorrections()
             case 72464: // Mutated Plague (Professor Putricide)
             case 72506: // Mutated Plague (Professor Putricide)
             case 72507: // Mutated Plague (Professor Putricide)
-                spellInfo->EffectRadiusIndex[0] = 28;   // 50000yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
                 break;
             case 70911: // Unbound Plague (Professor Putricide) (needs target selection script)
             case 72854: // Unbound Plague (Professor Putricide) (needs target selection script)
@@ -3353,7 +3353,7 @@ void SpellMgr::LoadDbcDataCorrections()
             case 71518: // Unholy Infusion Quest Credit (Professor Putricide)
             case 72934: // Blood Infusion Quest Credit (Blood-Queen Lana'thel)
             case 72289: // Frost Infusion Quest Credit (Sindragosa)
-                spellInfo->EffectRadiusIndex[0] = 28;   // another missing radius
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_50000_YARDS;   // another missing radius
                 break;
             case 71708: // Empowered Flare (Blood Prince Council)
             case 72785: // Empowered Flare (Blood Prince Council)
@@ -3380,7 +3380,7 @@ void SpellMgr::LoadDbcDataCorrections()
                 break;
             case 72706: // Achievement Check (Valithria Dreamwalker)
             case 71357: // Order Whelp
-                spellInfo->EffectRadiusIndex[0] = 22;   // 200yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS;   // 200yd
                 break;
             case 70598: // Sindragosa's Fury
                 spellInfo->EffectImplicitTargetA[0] = TARGET_DEST_CASTER;
@@ -3404,12 +3404,12 @@ void SpellMgr::LoadDbcDataCorrections()
             case 73708: // Defile
             case 73709: // Defile
             case 73710: // Defile
-                spellInfo->EffectRadiusIndex[0] = 22;   // 200yd
-                spellInfo->EffectRadiusIndex[1] = 22;   // 200yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS;   // 200yd
+                spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_200_YARDS;   // 200yd
                 break;
             case 69030: // Val'kyr Target Search
-                spellInfo->EffectRadiusIndex[0] = 22;   // 200yd
-                spellInfo->EffectRadiusIndex[1] = 22;   // 200yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS;   // 200yd
+                spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_200_YARDS;   // 200yd
                 break;
             case 69198: // Raging Spirit Visual
                 spellInfo->rangeIndex = 13;             // 50000yd
@@ -3418,9 +3418,9 @@ void SpellMgr::LoadDbcDataCorrections()
             case 74295: // Harvest Souls
             case 74296: // Harvest Souls
             case 74297: // Harvest Souls
-                spellInfo->EffectRadiusIndex[0] = 28;   // 50000yd
-                spellInfo->EffectRadiusIndex[1] = 28;   // 50000yd
-                spellInfo->EffectRadiusIndex[2] = 28;   // 50000yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
+                spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
+                spellInfo->EffectRadiusIndex[2] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
                 break;
             case 73655: // Harvest Soul
                 spellInfo->AttributesEx3 |= SPELL_ATTR3_NO_DONE_BONUS;
@@ -3432,34 +3432,34 @@ void SpellMgr::LoadDbcDataCorrections()
                 spellInfo->DurationIndex = 28;          // 5 seconds
                 break;
             case 73529: // Shadow Trap
-                spellInfo->EffectRadiusIndex[1] = 13;   // 10yd
+                spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_10_YARDS;   // 10yd
                 break;
             case 74282: // Shadow Trap (searcher)
-                spellInfo->EffectRadiusIndex[0] = 15;   // 3yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_3_YARDS;   // 3yd
                 break;
             case 72595: // Restore Soul
             case 73650: // Restore Soul
-                spellInfo->EffectRadiusIndex[0] = 22;   // 200yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS;   // 200yd
                 break;
             case 74086: // Destroy Soul
-                spellInfo->EffectRadiusIndex[0] = 22;   // 200yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS;   // 200yd
                 break;
             case 74302: // Summon Spirit Bomb
             case 74342: // Summon Spirit Bomb
-                spellInfo->EffectRadiusIndex[0] = 22;   // 200yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS;   // 200yd
                 spellInfo->MaxAffectedTargets = 1;
                 break;
             case 74341: // Summon Spirit Bomb
             case 74343: // Summon Spirit Bomb
-                spellInfo->EffectRadiusIndex[0] = 22;   // 200yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_200_YARDS;   // 200yd
                 spellInfo->MaxAffectedTargets = 3;
                 break;
             case 73579: // Summon Spirit Bomb
-                spellInfo->EffectRadiusIndex[0] = 20;   // 25yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_25_YARDS;   // 25yd
                 break;
             case 72350: // Fury of Frostmourne
-                spellInfo->EffectRadiusIndex[0] = 28;   // 50000yd
-                spellInfo->EffectRadiusIndex[1] = 28;   // 50000yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
+                spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
                 break;
             case 75127: // Kill Frostmourne Players
             case 72351: // Fury of Frostmourne
@@ -3467,18 +3467,18 @@ void SpellMgr::LoadDbcDataCorrections()
             case 72429: // Mass Resurrection
             case 73159: // Play Movie
             case 73582: // Trigger Vile Spirit (Inside, Heroic)
-                spellInfo->EffectRadiusIndex[0] = 28;   // 50000yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
                 break;
             case 72376: // Raise Dead
                 spellInfo->MaxAffectedTargets = 3;
-                spellInfo->EffectRadiusIndex[0] = 28;   // 50000yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_50000_YARDS;   // 50000yd
                 break;
             case 71809: // Jump
                 spellInfo->rangeIndex = 3;              // 20yd
-                spellInfo->EffectRadiusIndex[0] = 20;   // 25yd
+                spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_25_YARDS;   // 25yd
                 break;
             case 72405: // Broken Frostmourne
-                spellInfo->EffectRadiusIndex[1] = 22;   // 200yd
+                spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_200_YARDS;   // 200yd
                 break;
             default:
                 break;
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index a3c4779e9f3..98c3f0abc49 100755
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -381,6 +381,68 @@ struct SpellTargetPosition
     float  target_Orientation;
 };
 
+// Enum with EffectRadiusIndex and their actual radius
+enum EffectRadiusIndex
+{
+    EFFECT_RADIUS_2_YARDS       = 7,
+    EFFECT_RADIUS_5_YARDS       = 8,
+    EFFECT_RADIUS_20_YARDS      = 9,
+    EFFECT_RADIUS_30_YARDS      = 10,
+    EFFECT_RADIUS_45_YARDS      = 11,
+    EFFECT_RADIUS_100_YARDS     = 12,
+    EFFECT_RADIUS_10_YARDS      = 13,
+    EFFECT_RADIUS_8_YARDS       = 14,
+    EFFECT_RADIUS_3_YARDS       = 15,
+    EFFECT_RADIUS_1_YARD        = 16,
+    EFFECT_RADIUS_13_YARDS      = 17,
+    EFFECT_RADIUS_15_YARDS      = 18,
+    EFFECT_RADIUS_18_YARDS      = 19,
+    EFFECT_RADIUS_25_YARDS      = 20,
+    EFFECT_RADIUS_35_YARDS      = 21,
+    EFFECT_RADIUS_200_YARDS     = 22,
+    EFFECT_RADIUS_40_YARDS      = 23,
+    EFFECT_RADIUS_65_YARDS      = 24,
+    EFFECT_RADIUS_70_YARDS      = 25,
+    EFFECT_RADIUS_4_YARDS       = 26,
+    EFFECT_RADIUS_50_YARDS      = 27,
+    EFFECT_RADIUS_50000_YARDS   = 28,
+    EFFECT_RADIUS_6_YARDS       = 29,
+    EFFECT_RADIUS_500_YARDS     = 30,
+    EFFECT_RADIUS_80_YARDS      = 31,
+    EFFECT_RADIUS_12_YARDS      = 32,
+    EFFECT_RADIUS_99_YARDS      = 33,
+    EFFECT_RADIUS_55_YARDS      = 35,
+    EFFECT_RADIUS_0_YARDS       = 36,
+    EFFECT_RADIUS_7_YARDS       = 37,
+    EFFECT_RADIUS_21_YARDS      = 38,
+    EFFECT_RADIUS_34_YARDS      = 39,
+    EFFECT_RADIUS_9_YARDS       = 40,
+    EFFECT_RADIUS_150_YARDS     = 41,
+    EFFECT_RADIUS_11_YARDS      = 42,
+    EFFECT_RADIUS_16_YARDS      = 43,
+    EFFECT_RADIUS_0_5_YARDS     = 44,   // 0.5 yards
+    EFFECT_RADIUS_10_YARDS_2    = 45,
+    EFFECT_RADIUS_5_YARDS_2     = 46,
+    EFFECT_RADIUS_15_YARDS_2    = 47,
+    EFFECT_RADIUS_60_YARDS      = 48,
+    EFFECT_RADIUS_90_YARDS      = 49,
+    EFFECT_RADIUS_15_YARDS_3    = 50,
+    EFFECT_RADIUS_60_YARDS_2    = 51,
+    EFFECT_RADIUS_5_YARDS_3     = 52,
+    EFFECT_RADIUS_60_YARDS_3    = 53,
+    EFFECT_RADIUS_50000_YARDS_2 = 54,
+    EFFECT_RADIUS_130_YARDS     = 55,
+    EFFECT_RADIUS_38_YARDS      = 56,
+    EFFECT_RADIUS_45_YARDS_2    = 57,
+    EFFECT_RADIUS_32_YARDS      = 59,
+    EFFECT_RADIUS_44_YARDS      = 60,
+    EFFECT_RADIUS_14_YARDS      = 61,
+    EFFECT_RADIUS_47_YARDS      = 62,
+    EFFECT_RADIUS_23_YARDS      = 63,
+    EFFECT_RADIUS_3_5_YARDS     = 64,   // 3.5 yards
+    EFFECT_RADIUS_80_YARDS_2    = 65
+};
+
 typedef UNORDERED_MAP<uint32, SpellTargetPosition> SpellTargetPositionMap;
 
 // Spell pet auras