diff options
79 files changed, 419 insertions, 242 deletions
diff --git a/sql/updates/7823_world_spelldifficulty_dbc.sql b/sql/updates/7823_world_spelldifficulty_dbc.sql new file mode 100644 index 00000000000..7a7cc1de325 --- /dev/null +++ b/sql/updates/7823_world_spelldifficulty_dbc.sql @@ -0,0 +1,194 @@ +INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`,`spellid2`,`spellid3`) VALUES +(3002, 44189, 46164, 0, 0), -- SPELL_FIREBALL_NORMAL / SPELL_FIREBALL_HEROIC +(3003, 44190, 46163, 0, 0), -- SPELL_FLAMESTRIKE1_NORMAL / SPELL_FLAMESTRIKE1_HEROIC +(3004, 44174, 46192, 0, 0), -- SPELL_RENEW_NORMAL / SPELL_RENEW_HEROIC +(3005, 14032, 15654, 0, 0), -- SPELL_SW_PAIN_NORMAL / SPELL_SW_PAIN_HEROIC +(3006, 44318, 46380, 0, 0), -- SPELL_CHAIN_LIGHTNING / SPELL_H_CHAIN_LIGHTNING +(3007, 44319, 46381, 0, 0), -- SPELL_ARCANE_SHOCK / SPELL_H_ARCANE_SHOCK +(3008, 52771, 58830, 0, 0), -- SPELL_WOUNDING_STRIKE / H_SPELL_WOUNDING_STRIKE +(3009, 52720, 58852, 0, 0), -- SPELL_CARRION_SWARM / H_SPELL_CARRION_SWARM +(3010, 52722, 58850, 0, 0), -- SPELL_MIND_BLAST / H_SPELL_MIND_BLAST +(3011, 52721, 58849, 0, 0), -- SPELL_SLEEP / H_SPELL_SLEEP +(3012, 52666, 58824, 0, 0), -- SPELL_DISEASE_EXPULSION / H_SPELL_DISEASE_EXPULSION +(3013, 52696, 58823, 0, 0), -- SPELL_CONSTRICTING_CHAINS / H_SPELL_CONSTRICTING_CHAINS +(3014, 57725, 58828, 0, 0), -- SPELL_SHADOW_BOLT / H_SPELL_SHADOW_BOLT +(3015, 52445, 58822, 0, 0), -- SPELL_EXORCISM_N / SPELL_EXORCISM_H +(3016, 31473, 39049, 0, 0), -- SPELL_SAND_BREATH / H_SPELL_SAND_BREATH +(3017, 31457, 38538, 0, 0), -- SPELL_ARCANE_BLAST / H_SPELL_ARCANE_BLAST +(3018, 31472, 38539, 0, 0), -- SPELL_ARCANE_DISCHARGE / H_SPELL_ARCANE_DISCHARGE +(3019, 31475, 38593, 0, 0), -- SPELL_WING_BUFFET / H_SPELL_WING_BUFFET +(3020, 56130, 59467, 0, 0), -- SPELL_BROOD_PLAGUE / H_SPELL_BROOD_PLAGUE +(3021, 57941, 59974, 0, 0), -- SPELL_MIND_FLAY / H_SPELL_MIND_FLAY +(3022, 57942, 59975, 0, 0), -- SPELL_SHADOW_BOLT_VOLLEY / H_SPELL_SHADOW_BOLT_VOLLEY +(3023, 57949, 59978, 0, 0), -- SPELL_SHIVER / H_SPELL_SHIVER +(3024, 56855, 60030, 0, 0), -- SPELL_CYCLONE_STRIKE / SPELL_CYCLONE_STRIKE_H +(3025, 55959, 59513, 0, 0), -- SPELL_EMBRACE_OF_THE_VAMPYR / H_SPELL_EMBRACE_OF_THE_VAMPYR +(3026, 55926, 59508, 0, 0), -- SPELL_FLAME_SPHERE_PERIODIC / H_SPELL_FLAME_SPHERE_PERIODIC +(3027, 53472, 59433, 0, 0), -- SPELL_POUND / H_SPELL_POUND +(3028, 53400, 59419, 0, 0), -- SPELL_ACID_CLOUD / H_SPELL_ACID_CLOUD +(3029, 53030, 59417, 0, 0), -- SPELL_LEECH_POISON / H_SPELL_LEECH_POISON +(3030, 57731, 59421, 0, 0), -- SPELL_WEB_GRAB / H_SPELL_WEB_GRAB +(3031, 52586, 59367, 0, 0), -- SPELL_MIND_FLAY / H_SPELL_MIND_FLAY +(3032, 52592, 59368, 0, 0), -- SPELL_CURSE_OF_FATIGUE / H_SPELL_CURSE_OF_FATIGUE +(3033, 52592, 59368, 0, 0), -- SPELL_CURSE_OF_FATIGUE / H_SPELL_CURSE_OF_FATIGUE +(3034, 59363, 52446, 0, 0), -- SPELL_ACID_SPLASH / H_SPELL_ACID_SPLASH +(3035, 52534, 59357, 0, 0), -- SPELL_SHADOW_BOLT / H_SPELL_SHADOW_BOLT +(3036, 52535, 59358, 0, 0), -- SPELL_SHADOW_NOVA / H_SPELL_SHADOW_NOVA +(3037, 52469, 59364, 0, 0), -- SPELL_INFECTED_BITE / H_SPELL_INFECTED_BITE +(3038, 52469, 59364, 0, 0), -- SPELL_INFECTED_BITE / H_SPELL_INFECTED_BITE +(3039, 52524, 59365, 0, 0), -- SPELL_BLINDING_WEBS / H_SPELL_BLINDING_WEBS +(3040, 52469, 59364, 0, 0), -- SPELL_INFECTED_BITE / H_SPELL_INFECTED_BITE +(3041, 52493, 59366, 0, 0), -- SPELL_POSION_SPRAY / H_SPELL_POSION_SPRAY +(3042, 66538, 67676, 0, 0), -- SPELL_HOLY_FIRE / SPELL_HOLY_FIRE_H +(3043, 66536, 67674, 0, 0), -- SPELL_SMITE / SPELL_SMITE_H +(3044, 66537, 67675, 0, 0), -- SPELL_RENEW / SPELL_RENEW_H +(3045, 66537, 67675, 0, 0), -- SPELL_RENEW / SPELL_RENEW_H +(3046, 66620, 67679, 0, 0), -- SPELL_OLD_WOUNDS / SPELL_OLD_WOUNDS_H +(3047, 66552, 67677, 0, 0), -- SPELL_WAKING_NIGHTMARE / SPELL_WAKING_NIGHTMARE_H +(3048, 66619, 67678, 0, 0), -- SPELL_SHADOWS_PAST / SPELL_SHADOWS_PAST_H +(3049, 67881, 67718, 0, 0), -- SPELL_ICY_TOUCH / SPELL_ICY_TOUCH_H +(3050, 67881, 67718, 0, 0), -- SPELL_ICY_TOUCH / SPELL_ICY_TOUCH_H +(3051, 67883, 67725, 0, 0), -- SPELL_OBLITERATE / SPELL_OBLITERATE_H +(3052, 67875, 67808, 0, 0), -- SPELL_DEATH_BITE / SPELL_DEATH_BITE_H +(3053, 67749, 67880, 0, 0), -- SPELL_LEAP / SPELL_LEAP_H +(3054, 68783, 68784, 0, 0), -- SPELL_MORTAL_STRIKE / SPELL_MORTAL_STRIKE_H +(3055, 66042, 68310, 0, 0), -- SPELL_FIREBALL / SPELL_FIREBALL_H +(3056, 66042, 68310, 0, 0), -- SPELL_FIREBALL / SPELL_FIREBALL_H +(3057, 66043, 68311, 0, 0), -- SPELL_POLYMORPH / SPELL_POLYMORPH_H +(3058, 66044, 68312, 0, 0), -- SPELL_BLAST_WAVE / SPELL_BLAST_WAVE_H +(3059, 67529, 68319, 0, 0), -- SPELL_CHAIN_LIGHTNING / SPELL_CHAIN_LIGHTNING_H +(3060, 67528, 68318, 0, 0), -- SPELL_HEALING_WAVE / SPELL_HEALING_WAVE_H +(3061, 67528, 68318, 0, 0), -- SPELL_HEALING_WAVE / SPELL_HEALING_WAVE_H +(3062, 65868, 67988, 0, 0), -- SPELL_SHOOT / SPELL_SHOOT_H +(3063, 67709, 68317, 0, 0), -- SPELL_EVISCERATE / SPELL_EVISCERATE_H +(3064, 48849, 59422, 0, 0), -- SPELL_FEARSOME_ROAR / H_SPELL_FEARSOME_ROAR +(3065, 49527, 59972, 0, 0), -- SPELL_CURSE_OF_LIFE / H_SPELL_CURSE_OF_LIFE +(3066, 49528, 59973, 0, 0), -- SPELL_SHADOW_VOLLEY / H_SPELL_SHADOW_VOLLEY +(3067, 49518, 59971, 0, 0), -- SPELL_RAIN_OF_FIRE / H_SPELL_RAIN_OF_FIRE +(3068, 49537, 59963, 0, 0), -- SPELL_LIGHTNING_BREATH / H_SPELL_LIGHTNING_BREATH +(3069, 49544, 59965, 0, 0), -- SPELL_EYE_BEAM / H_SPELL_EYE_BEAM +(3070, 49548, 59969, 0, 0), -- SPELL_POISON_CLOUD / H_SPELL_POISON_CLOUD +(3071, 59803, 49381, 0, 0), -- SPELL_CONSUME / H_SPELL_CONSUME +(3072, 49555, 59807, 0, 0), -- SPELL_CORPSE_EXPLODE / H_SPELL_CORPSE_EXPLODE +(3073, 68793, 69050, 0, 0), -- SPELL_MAGIC_S_BANE / H_SPELL_MAGIC_S_BANE +(3074, 68858, 69047, 0, 0), -- SPELL_CONSUME_SOUL / H_SPELL_CONSUME_SOUL +(3075, 68982, 70322, 0, 0), -- SPELL_PHANTOM_BLAST / H_SPELL_PHANTOM_BLAST +(3076, 68895, 70212, 0, 0), -- SPELL_SPITE / H_SPELL_SPITE +(3077, 69148, 70210, 0, 0), -- SPELL_WAIL_OF_SOULS / H_SPELL_WAIL_OF_SOULS +(3078, 69060, 70209, 0, 0), -- SPELL_FROST_NOVA / H_SPELL_FROST_NOVA +(3079, 69080, 70206, 0, 0), -- SPELL_BONE_VOLLEY / H_SPELL_BONE_VOLLEY +(3080, 69069, 70207, 0, 0), -- SPELL_SHIELD_OF_BONES / H_SPELL_SHIELD_OF_BONES +(3081, 69068, 70208, 0, 0), -- SPELL_SHADOW_BOLT / H_SPELL_SHADOW_BOLT +(3082, 69068, 70208, 0, 0), -- SPELL_SHADOW_BOLT / H_SPELL_SHADOW_BOLT +(3083, 69066, 70213, 0, 0), -- SPELL_DRAIN_LIFE / H_SPELL_DRAIN_LIFE +(3084, 69564, 70205, 0, 0), -- SPELL_SHADOW_MEND / H_SPELL_SHADOW_MEND +(3085, 69088, 70211, 0, 0), -- SPELL_SOUL_STRIKE / H_SPELL_SOUL_STRIKE +(3086, 68774, 70334, 0, 0), -- SPELL_FORGE_BLADE / H_SPELL_FORGE_BLADE +(3087, 68785, 70335, 0, 0), -- SPELL_FORGE_MACE / H_SPELL_FORGE_MACE +(3088, 70381, 72930, 0, 0), -- SPELL_DEEP_FREEZE / H_SPELL_DEEP_FREEZE +(3089, 68778, 70333, 0, 0), -- SPELL_CHILLING_WAVE / H_SPELL_CHILLING_WAVE +(3090, 68989, 70434, 0, 0), -- SPELL_POISON_NOVA / H_SPELL_POISON_NOVA +(3091, 69024, 70436, 0, 0), -- SPELL_TOXIC_WASTE / H_SPELL_TOXIC_WASTE +(3092, 69155, 69627, 0, 0), -- SPELL_FORCEFUL_SMASH / H_SPELL_FORCEFUL_SMASH +(3093, 69167, 69629, 0, 0), -- SPELL_DARK_MIGHT / H_SPELL_DARK_MIGHT +(3094, 69233, 69646, 0, 0), -- SPELL_ICY_BLAST / H_SPELL_ICY_BLAST +(3095, 69238, 69628, 0, 0), -- SPELL_ICY_BLAST_2 / H_SPELL_ICY_BLAST_2 +(3096, 55626, 58993, 0, 0), -- SPELL_MOJO_WAVE / H_SPELL_MOJO_WAVE +(3097, 55627, 58994, 0, 0), -- SPELL_MOJO_PUDDLE / H_SPELL_MOJO_PUDDLE +(3098, 55250, 59824, 0, 0), -- SPELL_WHIRLING_SLASH / H_SPELL_WHIRLING_SLASH +(3099, 55276, 59826, 0, 0), -- SPELL_PUNCTURE / H_SPELL_PUNCTURE +(3100, 55285, 59828, 0, 0), -- SPELL_ENRAGE / H_SPELL_ENRAGE +(3101, 55292, 59829, 0, 0), -- SPELL_STOMP / H_SPELL_STOMP +(3102, 54956, 59827, 0, 0), -- SPELL_IMPALING_CHARGE / H_SPELL_IMPALING_CHARGE +(3103, 55102, 59444, 0, 0), -- SPELL_DETERMINED_GORE / H_SPELL_DETERMINED_GORE +(3104, 55081, 59842, 0, 0), -- SPELL_POISON_NOVA / H_SPELL_POISON_NOVA +(3105, 48287, 59840, 0, 0), -- SPELL_POWERFULL_BITE / H_SPELL_POWERFULL_BITE +(3106, 54970, 59839, 0, 0), -- SPELL_VENOM_BOLT / H_SPELL_VENOM_BOLT +(3107, 54987, 58996, 0, 0), -- SPELL_VENOMOUS_BITE / H_SPELL_VENOMOUS_BITE +(3108, 47751, 57062, 0, 0), -- SPELL_SPARK / H_SPELL_SPARK +(3109, 48096, 57091, 0, 0), -- SPELL_CRYSTALFIRE_BREATH / H_SPELL_CRYSTALFIRE_BREATH +(3110, 48016, 57066, 0, 0), -- SPELL_TRAMPLE / H_SPELL_TRAMPLE +(3111, 47944, 57067, 0, 0), -- SPELL_CRYSTALL_SPIKE_DAMAGE / H_SPELL_CRYSTALL_SPIKE_DAMAGE +(3112, 50774, 59370, 0, 0), -- SPELL_THUNDERING_STOMP / SPELL_THUNDERING_STOMP_H +(3113, 52774, 59160, 0, 0), -- SPELL_RENEW_STEEL_N / SPELL_RENEW_STEEL_H +(3114, 52658, 59795, 0, 0), -- SPELL_STATIC_OVERLOAD / H_SPELL_STATIC_OVERLOAD +(3115, 52780, 59800, 0, 0), -- SPELL_BALL_LIGHTNING / H_SPELL_BALL_LIGHTNING +(3116, 52961, 59836, 0, 0), -- SPELL_PULSING_SHOCKWAVE_N / SPELL_PULSING_SHOCKWAVE_H +(3117, 52960, 59835, 0, 0), -- SPELL_LIGHTNING_NOVA_N / SPELL_LIGHTNING_NOVA_H +(3118, 52237, 59529, 0, 0), -- SPELL_SHATTERING_STOMP_N / SPELL_SHATTERING_STOMP_H +(3119, 52433, 59530, 0, 0), -- SPELL_IMMOLATION_STRIKE_N / SPELL_IMMOLATION_STRIKE_H +(3120, 50843, 59742, 0, 0), -- SPELL_BOULDER_TOSS / H_SPELL_BOULDER_TOSS +(3121, 48131, 59744, 0, 0), -- SPELL_STOMP / H_SPELL_STOMP +(3122, 50810, 61546, 0, 0), -- SPELL_SHATTER / H_SPELL_SHATTER +(3123, 50752, 59772, 0, 0), -- SPELL_STORM_OF_GRIEF_N / SPELL_STORM_OF_GRIEF_H +(3124, 50760, 59726, 0, 0), -- SPELL_SHOCK_OF_SORROW_N / SPELL_SHOCK_OF_SORROW_H +(3125, 50761, 59727, 0, 0), -- SPELL_PILLAR_OF_WOE_N / SPELL_PILLAR_OF_WOE_H +(3126, 50761, 59727, 0, 0), -- SPELL_PILLAR_OF_WOE_N / SPELL_PILLAR_OF_WOE_H +(3127, 50830, 59844, 0, 0), -- SPELL_CHAIN_LIGHTING / H_SPELL_CHAIN_LIGHTING +(3128, 50831, 59845, 0, 0), -- SPELL_LIGHTING_SHIELD / H_SPELL_LIGHTING_SHIELD +(3129, 50834, 59846, 0, 0), -- SPELL_STATIC_CHARGE / H_SPELL_STATIC_CHARGE +(3130, 51849, 59861, 0, 0), -- SPELL_LIGHTING_RING / H_SPELL_LIGHTING_RING +(3131, 42730, 59735, 0, 0), -- SPELL_WOE_STRIKE / H_SPELL_WOE_STRIKE +(3132, 42669, 59706, 0, 0), -- SPELL_SMASH / H_SPELL_SMASH +(3133, 42705, 59707, 0, 0), -- SPELL_ENRAGE / H_SPELL_ENRAGE +(3134, 42729, 59734, 0, 0), -- SPELL_DREADFUL_ROAR / H_SPELL_DREADFUL_ROAR +(3135, 42708, 59708, 0, 0), -- SPELL_STAGGERING_ROAR / H_SPELL_STAGGERING_ROAR +(3136, 42750, 59719, 0, 0), -- SPELL_SHADOW_AXE_DAMAGE / H_SPELL_SHADOW_AXE_DAMAGE +(3137, 43649, 59575, 0, 0), -- SPELL_SHADOW_BOLT / H_SPELL_SHADOW_BOLT +(3138, 48261, 59268, 0, 0), -- SPELL_IMPALE / H_SPELL_IMPALE +(3139, 48256, 59267, 0, 0), -- SPELL_WITHERING_ROAR / H_SPELL_WITHERING_ROAR +(3140, 48140, 59273, 0, 0), -- SPELL_CHAIN_LIGHTING / H_SPELL_CHAIN_LIGHTING +(3141, 48137, 59265, 0, 0), -- SPELL_MORTAL_WOUND / H_SPELL_MORTAL_WOUND +(3142, 48130, 59264, 0, 0), -- SPELL_GORE / H_SPELL_GORE +(3143, 48105, 59263, 0, 0), -- SPELL_GRIEVOUS_WOUND / H_SPELL_GRIEVOUS_WOUND +(3144, 48133, 59271, 0, 0), -- SPELL_POISON_BREATH / H_SPELL_POISON_BREATH +(3145, 48133, 59271, 0, 0), -- SPELL_POISON_BREATH / H_SPELL_POISON_BREATH +(3146, 50234, 59330, 0, 0), -- SPELL_CRUSH / H_SPELL_CRUSH +(3147, 50225, 59331, 0, 0), -- SPELL_POISONED_SPEAR / H_SPELL_POISONED_SPEAR +(3148, 15667, 59409, 0, 0), -- SPELL_SINSTER_STRIKE / H_SPELL_SINSTER_STRIKE +(3149, 48294, 59301, 0, 0), -- SPELL_BANE / H_SPELL_BANE +(3150, 48291, 59300, 0, 0), -- SPELL_FETID_ROT / H_SPELL_FETID_ROT +(3151, 48423, 59304, 0, 0), -- SPELL_SPIRIT_STRIKE / H_SPELL_SPIRIT_STRIKE +(3152, 48529, 59305, 0, 0), -- SPELL_SPIRIT_BURST / H_SPELL_SPIRIT_BURST +(3153, 58693, 59369, 0, 0), -- SPELL_BLIZZARD / H_SPELL_BLIZZARD +(3154, 58690, 59283, 0, 0), -- SPELL_TAIL_SWEEP / H_SPELL_TAIL_SWEEP +(3155, 58688, 59281, 0, 0), -- SPELL_UNCONTROLLABLE_ENERGY / H_SPELL_UNCONTROLLABLE_ENERGY +(3156, 54479, 59471, 0, 0), -- SPELL_EARTH_SHIELD / H_SPELL_EARTH_SHIELD +(3157, 54479, 59471, 0, 0), -- SPELL_EARTH_SHIELD / H_SPELL_EARTH_SHIELD +(3158, 54481, 59473, 0, 0), -- SPELL_CHAIN_HEAL / H_SPELL_CHAIN_HEAL +(3159, 54312, 59522, 0, 0), -- SPELL_FRENZY / SPELL_FRENZY_H +(3160, 54237, 59520, 0, 0), -- SPELL_WATER_BLAST / SPELL_WATER_BLAST_H +(3161, 54241, 59521, 0, 0), -- SPELL_WATER_BOLT_VOLLEY / SPELL_WATER_BOLT_VOLLEY_H +(3162, 54235, 59468, 0, 0), -- SPELL_FIREBOLT / H_SPELL_FIREBOLT +(3163, 54282, 59469, 0, 0), -- SPELL_FLAME_BREATH / H_SPELL_FLAME_BREATH +(3164, 54249, 59594, 0, 0), -- SPELL_LAVA_BURN / H_SPELL_LAVA_BURN +(3165, 54202, 59483, 0, 0), -- SPELL_ARCANE_BARRAGE_VOLLEY / SPELL_ARCANE_BARRAGE_VOLLEY_H +(3166, 54226, 59485, 0, 0), -- SPELL_ARCANE_BUFFET / SPELL_ARCANE_BUFFET_H +(3167, 54160, 59474, 0, 0), -- SPELL_ARCANE_POWER / H_SPELL_ARCANE_POWER +(3168, 54361, 59743, 0, 0), -- SPELL_VOID_SHIFT / H_SPELL_VOID_SHIFT +(3169, 54524, 59745, 0, 0), -- SPELL_SHROUD_OF_DARKNESS / H_SPELL_SHROUD_OF_DARKNESS +(3170, 54342, 59747, 0, 0), -- SPELL_ZURAMAT_ADD_2 / H_SPELL_ZURAMAT_ADD_2 +(3171, 32325, 38760, 0, 0), -- SPELL_VOID_BLAST / H_SPELL_VOID_BLAST +(3172, 32358, 38759, 0, 0), -- SPELL_DARK_SHELL / H_SPELL_DARK_SHELL +(3173, 38197, 40425, 0, 0), -- SPELL_ARCANE_EXPLOSION / H_SPELL_ARCANE_EXPLOSION +(3174, 35059, 40424, 0, 0), -- SPELL_ARCANE_VOLLEY / H_SPELL_ARCANE_VOLLEY +(3175, 38245, 43309, 0, 0), -- SPELL_POLYMORPH / H_SPELL_POLYMORPH +(3176, 33617, 39363, 0, 0), -- SPELL_RAIN_OF_FIRE / H_SPELL_RAIN_OF_FIRE +(3177, 34449, 37924, 0, 0), -- SPELL_WATER_BOLT_VOLLEY / H_SPELL_WATER_BOLT_VOLLEY +(3178, 31532, 37936, 0, 0), -- SPELL_REPAIR / H_SPELL_REPAIR +(3179, 33132, 37371, 0, 0), -- SPELL_FIRE_NOVA / H_SPELL_FIRE_NOVA +(3180, 28599, 40070, 0, 0), -- SPELL_SHADOW_BOLT_VOLLEY / H_SPELL_SHADOW_BOLT_VOLLEY +(3181, 49381, 59805, 0, 0), -- SPELL_CONSUME_AURA / H_SPELL_CONSUME_AURA +(3182, 30695, 37566, 0, 0), -- SPELL_TREACHEROUS_AURA / H_SPELL_BANE_OF_TREACHERY +(3183, 30686, 39297, 0, 0), -- SPELL_SHADOW_BOLT / H_SPELL_SHADOW_BOLT +(3184, 30641, 36814, 0, 0), -- SPELL_MORTAL_WOUND / H_SPELL_MORTAL_WOUND +(3185, 30495, 35953, 0, 0), -- SPELL_SHADOW_CLEAVE / H_SPELL_SHADOW_SLAM +(3186, 30598, 36056, 0, 0), -- SPELL_BURNING_MAUL / H_SPELL_BURNING_MAUL +(3187, 36924, 39017, 0, 0), -- SPELL_MIND_REND / H_SPELL_MIND_REND +(3188, 36924, 39017, 0, 0), -- SPELL_MIND_REND / H_SPELL_MIND_REND +(3189, 37162, 39019, 0, 0), -- SPELL_DOMINATION / H_SPELL_DOMINATION +(3190, 37162, 39019, 0, 0), -- SPELL_DOMINATION / H_SPELL_DOMINATION +(3191, 35322, 39193, 0, 0), -- SPELL_SHADOW_POWER / H_SPELL_SHADOW_POWER +(3192, 35327, 39194, 0, 0), -- SPELL_JACKHAMMER / H_SPELL_JACKHAMMER +(3193, 35275, 39084, 0, 0), -- SPELL_SUMMON_RAGIN_FLAMES / H_SPELL_SUMMON_RAGIN_FLAMES +(3194, 35268, 39346, 0, 0); -- SPELL_INFERNO / H_SPELL_INFERNO diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 4dd05fbaf87..66400709036 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -2211,18 +2211,6 @@ void Creature::GetRespawnCoord(float &x, float &y, float &z, float* ori, float* *dist = 0; } -uint32 Creature::GetSpellIdForDifficulty(uint32 spellId) -{ - //search for instance mode spell - if (GetMap() && GetMap()->IsDungeon()) - { - spellId = spellmgr.GetSpellIdForDifficultyFromSpellid(spellId, Difficulty(GetMap()->GetSpawnMode())); - } - else - sLog.outDebug("Unit::GetSpellIdForDifficulty called for non-instanced creature"); - return spellId; -} - void Creature::AllLootRemovedFromCorpse() { if (!HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE)) diff --git a/src/game/Creature.h b/src/game/Creature.h index 0866877a3f5..3ffaa5e401f 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -418,7 +418,6 @@ class Creature : public Unit, public GridObject<Creature> void Update(uint32 time); // overwrited Unit::Update void GetRespawnCoord(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const; uint32 GetEquipmentId() const { return GetCreatureInfo()->equipmentId; } - uint32 GetSpellIdForDifficulty(uint32 spellId); void SetCorpseDelay(uint32 delay) { m_corpseDelay = delay; } bool isRacialLeader() const { return GetCreatureInfo()->RacialLeader; } diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h index 2499c632ca8..d2f96ffcabc 100644 --- a/src/game/CreatureAIImpl.h +++ b/src/game/CreatureAIImpl.h @@ -593,15 +593,11 @@ inline bool CreatureAI::_EnterEvadeMode() return true; } -inline void UnitAI::DoCast(Unit* victim, uint32 spellId, bool triggered, bool useMode) +inline void UnitAI::DoCast(Unit* victim, uint32 spellId, bool triggered) { if (!victim || (me->hasUnitState(UNIT_STAT_CASTING) && !triggered)) return; - //search for instance mode spell - if(useMode && me->ToCreature()) - spellId = me->ToCreature()->GetSpellIdForDifficulty(spellId); - me->CastSpell(victim, spellId, triggered); } diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 29693d969e5..9e9c3e2f16d 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -371,7 +371,7 @@ void SpellCastTargets::write (WorldPacket * data) } Spell::Spell(Unit* Caster, SpellEntry const *info, bool triggered, uint64 originalCasterGUID, Spell** triggeringContainer, bool skipCheck) -: m_spellInfo(info), m_spellValue(new SpellValue(m_spellInfo)) +: m_spellInfo(spellmgr.GetSpellForDifficultyFromSpell(info, Caster)), m_spellValue(new SpellValue(m_spellInfo)) , m_caster(Caster) { m_customAttr = spellmgr.GetSpellCustomAttr(m_spellInfo->Id); diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index ab4eee6dd10..70f114057f0 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -1016,43 +1016,47 @@ class SpellMgr } // Spell Difficulty data - uint32 GetSpellIdForDifficultyFromSpellid(uint32 spellId, Difficulty mapDiff) + SpellEntry const* GetSpellForDifficultyFromSpell(SpellEntry const* spell, Unit* Caster) { - /*SpellEntry const* spell = sSpellStore.LookupEntry(spellId); - if (!spell) - return spellId;//CastSpell() will handle incorrect spells - */ - uint32 mode = uint32(mapDiff); + //spell never can be NULL in this case! + if(!Caster->ToCreature() || !Caster->ToCreature()->GetMap() || !Caster->ToCreature()->GetMap()->IsDungeon()) + return spell; + + uint32 mode = uint32(Caster->ToCreature()->GetMap()->GetSpawnMode()); if(mode >= MAX_DIFFICULTY) { - sLog.outError("GetSpellIdForDifficultyFromSpellid: Incorrect Difficulty for spell %u.", spellId); - return spellId;//return source spell + sLog.outError("GetSpellForDifficultyFromSpell: Incorrect Difficulty for spell %u.", spell->Id); + return spell;//return source spell } - uint32 SpellDiffId = GetSpellDifficultyId(spellId); + uint32 SpellDiffId = GetSpellDifficultyId(spell->Id); if(!SpellDiffId) - { - sLog.outDebug("GetSpellIdForDifficultyFromSpellid: Difficulty not found for spell %u.", spellId); - return spellId;//return source spell, it has only REGULAR_DIFFICULTY - } + return spell;//return source spell, it has only REGULAR_DIFFICULTY + SpellDifficultyEntry const *SpellDiff = sSpellDifficultyStore.LookupEntry(SpellDiffId); if (!SpellDiff) { - sLog.outDebug("GetSpellIdForDifficultyFromSpellid: SpellDifficultyEntry not found for spell %u. This Should never happen.", spellId); - return spellId;//return source spell + sLog.outDebug("GetSpellForDifficultyFromSpell: SpellDifficultyEntry not found for spell %u. This Should never happen.", spell->Id); + return spell;//return source spell } if(SpellDiff->SpellID[mode] <= 0 && mode > DUNGEON_DIFFICULTY_HEROIC) { uint8 baseMode = mode; mode -= 2; - sLog.outDebug("GetSpellForDifficultyFromSpellid: spell %u mode %u spell is NULL, using mode %u", spellId, baseMode, mode); + sLog.outDebug("GetSpellForDifficultyFromSpell: spell %u mode %u spell is NULL, using mode %u", spell->Id, baseMode, mode); } if(SpellDiff->SpellID[mode] <= 0) { - sLog.outErrorDb("GetSpellForDifficultyFromSpellid: spell %u mode %u spell is 0. Check spelldifficulty_dbc!", spellId, mode); - return spellId; + sLog.outErrorDb("GetSpellForDifficultyFromSpell: spell %u mode %u spell is 0. Check spelldifficulty_dbc!", spell->Id, mode); + return spell; + } + SpellEntry const* newSpell = sSpellStore.LookupEntry(SpellDiff->SpellID[mode]); + if (!newSpell) + { + sLog.outDebug("GetSpellForDifficultyFromSpell: spell %u not found in spell, this should never happen.", newSpell->Id);//alerady checked at startup + return spell; } - sLog.outDebug("GetSpellForDifficultyFromSpellid: spellid for spell %u in %u mode is %u ", spellId, mode, uint32(SpellDiff->SpellID[mode])); - return uint32(SpellDiff->SpellID[mode]); + sLog.outDebug("GetSpellForDifficultyFromSpell: spellid for spell %u in mode %u is %u ", spell->Id, mode, newSpell->Id); + return newSpell; } // Spell target coordinates diff --git a/src/game/UnitAI.cpp b/src/game/UnitAI.cpp index 4fd4693885e..0404a284b29 100644 --- a/src/game/UnitAI.cpp +++ b/src/game/UnitAI.cpp @@ -193,12 +193,8 @@ void UnitAI::DoCastToAllHostilePlayers(uint32 spellid, bool triggered) return; } -void UnitAI::DoCast(uint32 spellId, bool useMode) -{ - //search for instance mode spell - if(useMode && me->ToCreature()) - spellId = me->ToCreature()->GetSpellIdForDifficulty(spellId); - +void UnitAI::DoCast(uint32 spellId) +{ Unit *target = NULL; //sLog.outError("aggre %u %u", spellId, (uint32)AISpellInfo[spellId].target); switch(AISpellInfo[spellId].target) diff --git a/src/game/UnitAI.h b/src/game/UnitAI.h index f0e4c996c84..81f4442cfbd 100644 --- a/src/game/UnitAI.h +++ b/src/game/UnitAI.h @@ -126,8 +126,8 @@ class UnitAI void AttackStartCaster(Unit *victim, float dist); void DoAddAuraToAllHostilePlayers(uint32 spellid); - void DoCast(uint32 spellId, bool useMode = false); - void DoCast(Unit* victim, uint32 spellId, bool triggered = false, bool useMode = false); + void DoCast(uint32 spellId); + void DoCast(Unit* victim, uint32 spellId, bool triggered = false); void DoCastToAllHostilePlayers(uint32 spellid, bool triggered = false); void DoCastVictim(uint32 spellId, bool triggered = false); void DoCastAOE(uint32 spellId, bool triggered = false); diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp index 35a0dea71e5..eefc2b91355 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp @@ -283,7 +283,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI if (FireballTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_FIREBALL_NORMAL, SPELL_FIREBALL_HEROIC)); + DoCast(m_creature->getVictim(), SPELL_FIREBALL_NORMAL); FireballTimer = urand(2000,6000); } else FireballTimer -= diff; @@ -439,7 +439,7 @@ struct mob_felkael_flamestrikeAI : public ScriptedAI { if (FlameStrikeTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_FLAMESTRIKE1_NORMAL, SPELL_FLAMESTRIKE1_HEROIC), true); + DoCast(m_creature, SPELL_FLAMESTRIKE1_NORMAL, true); m_creature->Kill(m_creature); } else FlameStrikeTimer -= diff; } diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index 6caa11af714..fb78a7c7be6 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -267,7 +267,7 @@ struct boss_priestess_delrissaAI : public ScriptedAI if (pAdd->isAlive()) pTarget = pAdd; - DoCast(pTarget, DUNGEON_MODE(SPELL_RENEW_NORMAL, SPELL_RENEW_HEROIC)); + DoCast(pTarget, SPELL_RENEW_NORMAL); RenewTimer = 5000; } else RenewTimer -= diff; @@ -312,7 +312,7 @@ struct boss_priestess_delrissaAI : public ScriptedAI if (SWPainTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_SW_PAIN_NORMAL, SPELL_SW_PAIN_HEROIC)); + DoCast(pTarget, SPELL_SW_PAIN_NORMAL); SWPainTimer = 10000; } else SWPainTimer -= diff; diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp index 8a3cd78442c..f2fba569b5b 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp @@ -152,7 +152,7 @@ struct boss_vexallusAI : public ScriptedAI if (ChainLightningTimer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_CHAIN_LIGHTNING, SPELL_H_CHAIN_LIGHTNING)); + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); ChainLightningTimer = 8000; } else ChainLightningTimer -= diff; @@ -161,7 +161,7 @@ struct boss_vexallusAI : public ScriptedAI { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) if (pTarget) - DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_SHOCK, SPELL_H_ARCANE_SHOCK)); + DoCast(pTarget, SPELL_ARCANE_SHOCK); ArcaneShockTimer = 8000; } else ArcaneShockTimer -= diff; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp index 8e31a848287..f2e6233c10e 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp @@ -103,7 +103,7 @@ struct boss_epochAI : public ScriptedAI if (uiWoundingStrikeTimer < diff) { - DoCastVictim(DUNGEON_MODE(SPELL_WOUNDING_STRIKE, H_SPELL_WOUNDING_STRIKE)); + DoCastVictim(SPELL_WOUNDING_STRIKE); uiWoundingStrikeTimer = 5300; } else uiWoundingStrikeTimer -= diff; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp index c3c5f42fb32..fd87bfd5491 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp @@ -159,14 +159,14 @@ struct boss_mal_ganisAI : public ScriptedAI if (uiCarrionSwarmTimer < diff) { - DoCastVictim(DUNGEON_MODE(SPELL_CARRION_SWARM,H_SPELL_CARRION_SWARM)); + DoCastVictim(SPELL_CARRION_SWARM); uiCarrionSwarmTimer = 7000; } else uiCarrionSwarmTimer -= diff; if (uiMindBlastTimer < diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_MIND_BLAST, H_SPELL_MIND_BLAST)); + DoCast(pTarget, SPELL_MIND_BLAST); uiMindBlastTimer = 6000; } else uiMindBlastTimer -= diff; @@ -180,7 +180,7 @@ struct boss_mal_ganisAI : public ScriptedAI { DoScriptText(RAND(SAY_SLEEP_1,SAY_SLEEP_2), m_creature); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_SLEEP, H_SPELL_SLEEP)); + DoCast(pTarget, SPELL_SLEEP); uiSleepTimer = urand(15000,20000); } else uiSleepTimer -= diff; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp index cea444b26c2..0baba07416e 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp @@ -87,7 +87,7 @@ struct boss_meathookAI : public ScriptedAI if (uiDiseaseTimer <= diff) { - DoCastAOE(DUNGEON_MODE(SPELL_DISEASE_EXPULSION,H_SPELL_DISEASE_EXPULSION)); + DoCastAOE(SPELL_DISEASE_EXPULSION); uiDiseaseTimer = urand(1500,4000); } else uiDiseaseTimer -= diff; @@ -100,7 +100,7 @@ struct boss_meathookAI : public ScriptedAI if (uiChainTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_CONSTRICTING_CHAINS, H_SPELL_CONSTRICTING_CHAINS)); //anyone but the tank + DoCast(pTarget, SPELL_CONSTRICTING_CHAINS); //anyone but the tank uiChainTimer = urand(2000,4000); } else uiChainTimer -= diff; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp index fef8b1ce99e..6bb5d489c69 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp @@ -112,7 +112,7 @@ struct boss_salrammAI : public ScriptedAI if (uiShadowBoltTimer <= diff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCast(pTarget, SPELL_SHADOW_BOLT); uiShadowBoltTimer = urand(8000,12000); } else uiShadowBoltTimer -= diff; diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp index 0401fab5cd9..d26426166a6 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp @@ -1092,7 +1092,7 @@ struct npc_arthasAI : public npc_escortAI if (uiExorcismTimer < diff) { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, DUNGEON_MODE(SPELL_EXORCISM_N, SPELL_EXORCISM_H)); + DoCast(target, SPELL_EXORCISM_N); uiExorcismTimer = 7300; } else uiExorcismTimer -= diff; diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp index b918f4ed00f..60e34dd4402 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -106,7 +106,7 @@ struct boss_aeonusAI : public ScriptedAI //Sand Breath if (SandBreath_Timer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SAND_BREATH, H_SPELL_SAND_BREATH)); + DoCast(m_creature->getVictim(), SPELL_SAND_BREATH); SandBreath_Timer = 15000+rand()%10000; } else SandBreath_Timer -= diff; diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index 9fdca97475e..61e87b0e005 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -105,7 +105,7 @@ struct boss_chrono_lord_dejaAI : public ScriptedAI //Arcane Blast if (ArcaneBlast_Timer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_ARCANE_BLAST, H_SPELL_ARCANE_BLAST)); + DoCast(m_creature->getVictim(), SPELL_ARCANE_BLAST); ArcaneBlast_Timer = 15000+rand()%10000; } else ArcaneBlast_Timer -= diff; @@ -113,7 +113,7 @@ struct boss_chrono_lord_dejaAI : public ScriptedAI if (ArcaneDischarge_Timer <= diff) { Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_DISCHARGE, H_SPELL_ARCANE_DISCHARGE)); + DoCast(pTarget, SPELL_ARCANE_DISCHARGE); ArcaneDischarge_Timer = 20000+rand()%10000; } else ArcaneDischarge_Timer -= diff; diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp index 9ae361f394e..612fb17ebd4 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp @@ -119,7 +119,7 @@ struct boss_temporusAI : public ScriptedAI //Wing ruffet if (WingBuffet_Timer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_WING_BUFFET, H_SPELL_WING_BUFFET)); + DoCast(m_creature, SPELL_WING_BUFFET); WingBuffet_Timer = 20000+rand()%10000; } else WingBuffet_Timer -= diff; diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index af2030eac1a..6f373e8482d 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -123,7 +123,7 @@ struct boss_elder_nadoxAI : public ScriptedAI if (uiPlagueTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_BROOD_PLAGUE, H_SPELL_BROOD_PLAGUE)); + DoCast(m_creature->getVictim(), SPELL_BROOD_PLAGUE); uiPlagueTimer = 15*IN_MILISECONDS; } else uiPlagueTimer -= diff; diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index f29b2b75d69..c17061ab9ff 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -261,20 +261,20 @@ struct boss_volazjAI : public ScriptedAI if (uiMindFlayTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MIND_FLAY, H_SPELL_MIND_FLAY)); + DoCast(m_creature->getVictim(), SPELL_MIND_FLAY); uiMindFlayTimer = 20*IN_MILISECONDS; } else uiMindFlayTimer -= diff; if (uiShadowBoltVolleyTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SHADOW_BOLT_VOLLEY, H_SPELL_SHADOW_BOLT_VOLLEY)); + DoCast(m_creature->getVictim(), SPELL_SHADOW_BOLT_VOLLEY); uiShadowBoltVolleyTimer = 5*IN_MILISECONDS; } else uiShadowBoltVolleyTimer -= diff; if (uiShiverTimer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_SHIVER, H_SPELL_SHIVER)); + DoCast(pTarget, SPELL_SHIVER); uiShiverTimer = 15*IN_MILISECONDS; } else uiShiverTimer -= diff; diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 6f85b07ccd3..6149c3ecb3c 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -303,7 +303,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI if (uiCycloneTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_CYCLONE_STRIKE, SPELL_CYCLONE_STRIKE_H), false); + DoCast(m_creature, SPELL_CYCLONE_STRIKE, false); uiCycloneTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS); } else uiCycloneTimer -= diff; diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index 74561cd5865..c550566909f 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -176,7 +176,7 @@ struct boss_taldaramAI : public ScriptedAI break; case VANISHED: if (Unit *pEmbraceTarget = GetEmbraceTarget()) - DoCast(pEmbraceTarget, DUNGEON_MODE(SPELL_EMBRACE_OF_THE_VAMPYR, H_SPELL_EMBRACE_OF_THE_VAMPYR)); + DoCast(pEmbraceTarget, SPELL_EMBRACE_OF_THE_VAMPYR); m_creature->GetMotionMaster()->Clear(); m_creature->SetSpeed(MOVE_WALK, 1.0f, true); m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim()); @@ -338,7 +338,7 @@ struct mob_taldaram_flamesphereAI : public ScriptedAI m_creature->SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f); DoCast(m_creature, SPELL_FLAME_SPHERE_VISUAL); DoCast(m_creature, SPELL_FLAME_SPHERE_SPAWN_EFFECT); - DoCast(m_creature, DUNGEON_MODE(SPELL_FLAME_SPHERE_PERIODIC, H_SPELL_FLAME_SPHERE_PERIODIC)); + DoCast(m_creature, SPELL_FLAME_SPHERE_PERIODIC); uiDespawnTimer = 10*IN_MILISECONDS; } diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp index bd7430d6958..239acd5623a 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp @@ -216,7 +216,7 @@ struct boss_anub_arakAI : public ScriptedAI if (uiPoundTimer <= diff) { - DoCastVictim(DUNGEON_MODE(SPELL_POUND, H_SPELL_POUND)); + DoCastVictim(SPELL_POUND); uiPoundTimer = 16.5*IN_MILISECONDS; } else uiPoundTimer -= diff; } diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp index cc31d982e03..5956de009ec 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp @@ -159,7 +159,7 @@ struct boss_hadronoxAI : public ScriptedAI if (uiAcidTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_ACID_CLOUD, H_SPELL_ACID_CLOUD)); + DoCast(pTarget, SPELL_ACID_CLOUD); uiAcidTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); } else uiAcidTimer -= diff; @@ -167,7 +167,7 @@ struct boss_hadronoxAI : public ScriptedAI if (uiLeechTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)); + DoCast(pTarget, SPELL_LEECH_POISON); uiLeechTimer = urand(11*IN_MILISECONDS,14*IN_MILISECONDS); } else uiLeechTimer -= diff; @@ -175,7 +175,7 @@ struct boss_hadronoxAI : public ScriptedAI if (uiGrabTimer <= diff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. - DoCast(pTarget, DUNGEON_MODE(SPELL_WEB_GRAB, H_SPELL_WEB_GRAB)); + DoCast(pTarget, SPELL_WEB_GRAB); uiGrabTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS); } else uiGrabTimer -= diff; diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index f4d0e7df8e1..e2e324b122d 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -157,7 +157,7 @@ struct boss_krik_thirAI : public ScriptedAI if (uiMindFlayTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MIND_FLAY, H_SPELL_MIND_FLAY)); + DoCast(m_creature->getVictim(), SPELL_MIND_FLAY); uiMindFlayTimer = 15*IN_MILISECONDS; } else uiMindFlayTimer -= diff; @@ -167,8 +167,8 @@ struct boss_krik_thirAI : public ScriptedAI Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); Unit *pTarget_1 = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - DoCast(pTarget, DUNGEON_MODE(SPELL_CURSE_OF_FATIGUE, H_SPELL_CURSE_OF_FATIGUE)); - DoCast(pTarget_1, DUNGEON_MODE(SPELL_CURSE_OF_FATIGUE, H_SPELL_CURSE_OF_FATIGUE)); + DoCast(pTarget, SPELL_CURSE_OF_FATIGUE); + DoCast(pTarget_1, SPELL_CURSE_OF_FATIGUE); uiCurseFatigueTimer = 10*IN_MILISECONDS; } else uiCurseFatigueTimer -= diff; @@ -215,7 +215,7 @@ struct npc_skittering_infectorAI : public ScriptedAI void JustDied(Unit* killer) { //The spell is not working propperly - DoCast(m_creature->getVictim(),DUNGEON_MODE(SPELL_ACID_SPLASH, H_SPELL_ACID_SPLASH), true); + DoCast(m_creature->getVictim(),SPELL_ACID_SPLASH, true); } }; @@ -281,13 +281,13 @@ struct npc_anub_ar_shadowcasterAI : public ScriptedAI if (uiShadowBoltTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT), true); + DoCast(pTarget, SPELL_SHADOW_BOLT, true); uiShadowBoltTimer = 15*IN_MILISECONDS; } else uiShadowBoltTimer -= diff; if (uiShadowNovaTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SHADOW_NOVA, H_SPELL_SHADOW_NOVA), true); + DoCast(m_creature->getVictim(), SPELL_SHADOW_NOVA, true); uiShadowNovaTimer = 17*IN_MILISECONDS; } else uiShadowNovaTimer -= diff; @@ -363,7 +363,7 @@ struct npc_watcher_gashraAI : public ScriptedAI if (uiInfectedBiteTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_INFECTED_BITE, H_SPELL_INFECTED_BITE), true); + DoCast(m_creature->getVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 15*IN_MILISECONDS; } else uiInfectedBiteTimer -= diff; @@ -400,13 +400,13 @@ struct npc_watcher_narjilAI : public ScriptedAI if (uiInfectedBiteTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_INFECTED_BITE, H_SPELL_INFECTED_BITE), true); + DoCast(m_creature->getVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 11*IN_MILISECONDS; } else uiInfectedBiteTimer -= diff; if (uiBindingWebsTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_BLINDING_WEBS, H_SPELL_BLINDING_WEBS), true); + DoCast(m_creature->getVictim(), SPELL_BLINDING_WEBS, true); uiBindingWebsTimer = 17*IN_MILISECONDS; } else uiBindingWebsTimer -= diff; @@ -444,13 +444,13 @@ struct npc_watcher_silthikAI : public ScriptedAI if (uiInfectedBiteTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_INFECTED_BITE, H_SPELL_INFECTED_BITE), true); + DoCast(m_creature->getVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 15*IN_MILISECONDS; } else uiInfectedBiteTimer -= diff; if (uiPoisonSprayTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_POSION_SPRAY, H_SPELL_POSION_SPRAY), true); + DoCast(m_creature->getVictim(), SPELL_POSION_SPRAY, true); uiPoisonSprayTimer = 17*IN_MILISECONDS; } else uiPoisonSprayTimer -= diff; diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp index 934a148afc6..c7dc2e07c08 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp @@ -243,7 +243,7 @@ struct boss_paletressAI : public ScriptedAI if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,DUNGEON_MODE(SPELL_HOLY_FIRE,SPELL_HOLY_FIRE_H)); + DoCast(pTarget,SPELL_HOLY_FIRE); } if (m_creature->HasAura(SPELL_SHIELD)) uiHolyFireTimer = 13000; @@ -256,7 +256,7 @@ struct boss_paletressAI : public ScriptedAI if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,DUNGEON_MODE(SPELL_SMITE,SPELL_SMITE_H)); + DoCast(pTarget,SPELL_SMITE); } if (m_creature->HasAura(SPELL_SHIELD)) uiHolySmiteTimer = 9000; @@ -272,12 +272,12 @@ struct boss_paletressAI : public ScriptedAI switch(uiTarget) { case 0: - DoCast(m_creature,DUNGEON_MODE(SPELL_RENEW,SPELL_RENEW_H)); + DoCast(m_creature,SPELL_RENEW); break; case 1: if (Creature *pMemory = Unit::GetCreature(*m_creature, MemoryGUID)) if (pMemory->isAlive()) - DoCast(pMemory, DUNGEON_MODE(SPELL_RENEW,SPELL_RENEW_H)); + DoCast(pMemory, SPELL_RENEW); break; } uiRenewTimer = urand(15000,17000); @@ -334,14 +334,14 @@ struct npc_memoryAI : public ScriptedAI if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget, DUNGEON_MODE(SPELL_OLD_WOUNDS,SPELL_OLD_WOUNDS_H)); + DoCast(pTarget, SPELL_OLD_WOUNDS); } uiOldWoundsTimer = 12000; }else uiOldWoundsTimer -= uiDiff; if (uiWakingNightmare <= uiDiff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_WAKING_NIGHTMARE,SPELL_WAKING_NIGHTMARE_H)); + DoCast(m_creature, SPELL_WAKING_NIGHTMARE); uiWakingNightmare = 7000; }else uiWakingNightmare -= uiDiff; @@ -350,7 +350,7 @@ struct npc_memoryAI : public ScriptedAI if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,DUNGEON_MODE(SPELL_SHADOWS_PAST,SPELL_SHADOWS_PAST_H)); + DoCast(pTarget,SPELL_SHADOWS_PAST); } uiShadowPastTimer = 5000; }else uiShadowPastTimer -= uiDiff; diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp index ca882fc4607..87f54558f8d 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp @@ -170,17 +170,17 @@ struct boss_black_knightAI : public ScriptedAI { if (uiIcyTouchTimer <= uiDiff) { - DoCastVictim(DUNGEON_MODE(SPELL_ICY_TOUCH,SPELL_ICY_TOUCH_H)); + DoCastVictim(SPELL_ICY_TOUCH); uiIcyTouchTimer = urand(5000,7000); } else uiIcyTouchTimer -= uiDiff; if (uiPlagueStrikeTimer <= uiDiff) { - DoCastVictim(DUNGEON_MODE(SPELL_ICY_TOUCH,SPELL_ICY_TOUCH_H)); + DoCastVictim(SPELL_ICY_TOUCH); uiPlagueStrikeTimer = urand(12000,15000); } else uiPlagueStrikeTimer -= uiDiff; if (uiObliterateTimer <= uiDiff) { - DoCastVictim(DUNGEON_MODE(SPELL_OBLITERATE,SPELL_OBLITERATE_H)); + DoCastVictim(SPELL_OBLITERATE); uiObliterateTimer = urand(17000,19000); } else uiObliterateTimer -= uiDiff; switch(uiPhase) @@ -237,7 +237,7 @@ struct boss_black_knightAI : public ScriptedAI { if (uiDeathBiteTimer <= uiDiff) { - DoCastAOE(DUNGEON_MODE(SPELL_DEATH_BITE,SPELL_DEATH_BITE_H)); + DoCastAOE(SPELL_DEATH_BITE); uiDeathBiteTimer = urand (2000, 4000); } else uiDeathBiteTimer -= uiDiff; if (uiMarkedDeathTimer <= uiDiff) @@ -311,7 +311,7 @@ struct npc_risen_ghoulAI : public ScriptedAI if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget, (DUNGEON_MODE(SPELL_LEAP,SPELL_LEAP_H))); + DoCast(pTarget, (SPELL_LEAP)); } uiAttackTimer = 3500; } else uiAttackTimer -= uiDiff; diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp index 06d47789f57..a555b50cf8a 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp @@ -399,7 +399,7 @@ struct boss_warrior_toc5AI : public ScriptedAI if (uiMortalStrikeTimer <= uiDiff) { - DoCastVictim(DUNGEON_MODE(SPELL_MORTAL_STRIKE, SPELL_MORTAL_STRIKE_H)); + DoCastVictim(SPELL_MORTAL_STRIKE); uiMortalStrikeTimer = urand(8000,12000); } else uiMortalStrikeTimer -= uiDiff; @@ -502,7 +502,7 @@ struct boss_mage_toc5AI : public ScriptedAI if (uiFireBallTimer <= uiDiff) { if (m_creature->getVictim()) - DoCastVictim(DUNGEON_MODE(SPELL_FIREBALL,SPELL_FIREBALL_H)); + DoCastVictim(SPELL_FIREBALL); uiFireBallTimer = 5000; } else uiFireBallTimer -= uiDiff; @@ -512,20 +512,20 @@ struct boss_mage_toc5AI : public ScriptedAI if (uiFireBallTimer <= uiDiff) { - DoCastVictim(DUNGEON_MODE(SPELL_FIREBALL,SPELL_FIREBALL_H)); + DoCastVictim(SPELL_FIREBALL); uiFireBallTimer = 5000; } else uiFireBallTimer -= uiDiff; if (uiPolymorphTimer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_POLYMORPH,SPELL_POLYMORPH_H)); + DoCast(pTarget, SPELL_POLYMORPH); uiPolymorphTimer = 8000; } else uiPolymorphTimer -= uiDiff; if (uiBlastWaveTimer <= uiDiff) { - DoCastAOE(DUNGEON_MODE(SPELL_BLAST_WAVE,SPELL_BLAST_WAVE_H),false); + DoCastAOE(SPELL_BLAST_WAVE,false); uiBlastWaveTimer = 13000; } else uiBlastWaveTimer -= uiDiff; @@ -645,7 +645,7 @@ struct boss_shaman_toc5AI : public ScriptedAI if (uiChainLightningTimer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,DUNGEON_MODE(SPELL_CHAIN_LIGHTNING,SPELL_CHAIN_LIGHTNING_H)); + DoCast(pTarget,SPELL_CHAIN_LIGHTNING); uiChainLightningTimer = 16000; } else uiChainLightningTimer -= uiDiff; @@ -657,9 +657,9 @@ struct boss_shaman_toc5AI : public ScriptedAI if (!bChance) { if (Unit* pFriend = DoSelectLowestHpFriendly(40)) - DoCast(pFriend,DUNGEON_MODE(SPELL_HEALING_WAVE,SPELL_HEALING_WAVE_H)); + DoCast(pFriend,SPELL_HEALING_WAVE); } else - DoCast(m_creature,DUNGEON_MODE(SPELL_HEALING_WAVE,SPELL_HEALING_WAVE_H)); + DoCast(m_creature,SPELL_HEALING_WAVE); uiHealingWaveTimer = 12000; } else uiHealingWaveTimer -= uiDiff; @@ -793,7 +793,7 @@ struct boss_hunter_toc5AI : public ScriptedAI if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST,0,30.0f)) { uiTargetGUID = pTarget->GetGUID(); - DoCast(pTarget, DUNGEON_MODE(SPELL_SHOOT,SPELL_SHOOT_H)); + DoCast(pTarget, SPELL_SHOOT); } uiShootTimer = 12000; uiMultiShotTimer = 3000; @@ -925,7 +925,7 @@ struct boss_rouge_toc5AI : public ScriptedAI if (uiEviscerateTimer <= uiDiff) { - DoCast(m_creature->getVictim(),DUNGEON_MODE(SPELL_EVISCERATE,SPELL_EVISCERATE_H)); + DoCast(m_creature->getVictim(),SPELL_EVISCERATE); uiEviscerateTimer = 8000; } else uiEviscerateTimer -= uiDiff; diff --git a/src/scripts/northrend/draktharon_keep/boss_dred.cpp b/src/scripts/northrend/draktharon_keep/boss_dred.cpp index ac6dfd91842..fde83053869 100644 --- a/src/scripts/northrend/draktharon_keep/boss_dred.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_dred.cpp @@ -111,7 +111,7 @@ struct boss_dredAI : public ScriptedAI if (uiFearsomeRoarTimer < diff) { - DoCastAOE(DUNGEON_MODE(SPELL_FEARSOME_ROAR, H_SPELL_FEARSOME_ROAR),false); + DoCastAOE(SPELL_FEARSOME_ROAR,false); uiFearsomeRoarTimer = urand(16*IN_MILISECONDS,18*IN_MILISECONDS); } else uiFearsomeRoarTimer -=diff; diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index dc25ea7d44c..d86abdad43d 100644 --- a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -116,19 +116,19 @@ struct boss_tharon_jaAI : public ScriptedAI if (uiCurseOfLifeTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_CURSE_OF_LIFE, H_SPELL_CURSE_OF_LIFE)); + DoCast(pTarget, SPELL_CURSE_OF_LIFE); uiCurseOfLifeTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS); } else uiCurseOfLifeTimer -= diff; if (uiShadowVolleyTimer < diff) { - DoCastVictim(DUNGEON_MODE(SPELL_SHADOW_VOLLEY,H_SPELL_SHADOW_VOLLEY)); + DoCastVictim(SPELL_SHADOW_VOLLEY); uiShadowVolleyTimer = urand(8*IN_MILISECONDS,10*IN_MILISECONDS); } else uiShadowVolleyTimer -= diff; if (uiRainOfFireTimer < diff) { - DoCastAOE(DUNGEON_MODE(SPELL_RAIN_OF_FIRE,H_SPELL_RAIN_OF_FIRE)); + DoCastAOE(SPELL_RAIN_OF_FIRE); uiRainOfFireTimer = urand(14*IN_MILISECONDS,18*IN_MILISECONDS); } else uiRainOfFireTimer -= diff; @@ -167,20 +167,20 @@ struct boss_tharon_jaAI : public ScriptedAI if (uiLightningBreathTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_LIGHTNING_BREATH, H_SPELL_LIGHTNING_BREATH)); + DoCast(pTarget, SPELL_LIGHTNING_BREATH); uiLightningBreathTimer = urand(6*IN_MILISECONDS,7*IN_MILISECONDS); } else uiLightningBreathTimer -= diff; if (uiEyeBeamTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_EYE_BEAM, H_SPELL_EYE_BEAM)); + DoCast(pTarget, SPELL_EYE_BEAM); uiEyeBeamTimer = urand(4*IN_MILISECONDS,6*IN_MILISECONDS); } else uiEyeBeamTimer -= diff; if (uiPoisonCloudTimer < diff) { - DoCastAOE(DUNGEON_MODE(SPELL_POISON_CLOUD, H_SPELL_POISON_CLOUD)); + DoCastAOE(SPELL_POISON_CLOUD); uiPoisonCloudTimer = urand(10*IN_MILISECONDS,12*IN_MILISECONDS); } else uiPoisonCloudTimer -= diff; diff --git a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp index 4b396904dfb..0a75566c17b 100644 --- a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp @@ -119,7 +119,7 @@ struct boss_trollgoreAI : public ScriptedAI if (uiConsumeTimer <= diff) { DoScriptText(SAY_CONSUME, m_creature); - DoCast(DUNGEON_MODE(SPELL_CONSUME, H_SPELL_CONSUME)); + DoCast(SPELL_CONSUME); uiConsumeTimer = 15*IN_MILISECONDS; } else uiConsumeTimer -= diff; @@ -144,7 +144,7 @@ struct boss_trollgoreAI : public ScriptedAI if (uiExplodeCorpseTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_CORPSE_EXPLODE, H_SPELL_CORPSE_EXPLODE)); + DoCast(SPELL_CORPSE_EXPLODE); DoScriptText(SAY_EXPLODE, m_creature); uiExplodeCorpseTimer = urand(15*IN_MILISECONDS,19*IN_MILISECONDS); } else uiExplodeCorpseTimer -= diff; diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp b/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp index 08548399665..5af3582e0a3 100644 --- a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp +++ b/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp @@ -180,7 +180,7 @@ struct boss_bronjahmAI : public ScriptedAI events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); break; case EVENT_MAGIC_BANE: - DoCastVictim(DUNGEON_MODE(SPELL_MAGIC_S_BANE,H_SPELL_MAGIC_S_BANE)); + DoCastVictim(SPELL_MAGIC_S_BANE); events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000,15000)); break; } @@ -217,7 +217,7 @@ struct mob_corrupted_soul_fragmentAI : public ScriptedAI { if (pInstance) if (Creature* pBronjham = Unit::GetCreature(*m_creature,pInstance->GetData64(DATA_BRONJAHM))) - DoCast(pBronjham,DUNGEON_MODE(SPELL_CONSUME_SOUL,H_SPELL_CONSUME_SOUL)); + DoCast(pBronjham,SPELL_CONSUME_SOUL); } void UpdateAI(const uint32 diff) {} diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp b/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp index a1d2621b2ca..857be72f120 100644 --- a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp +++ b/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp @@ -247,7 +247,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI { case EVENT_PHANTOM_BLAST: if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_PHANTOM_BLAST,H_SPELL_PHANTOM_BLAST)); + DoCast(pTarget, SPELL_PHANTOM_BLAST); events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5000); break; case EVENT_MIRRORED_SOUL: diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp b/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp index 842e7498015..218270c6be4 100644 --- a/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp +++ b/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp @@ -411,7 +411,7 @@ struct mob_spiteful_apparitionAI: public ScriptedAI switch(eventId) { case EVENT_SPITE: - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SPITE,H_SPELL_SPITE)); + DoCast(m_creature->getVictim(), SPELL_SPITE); events.RescheduleEvent(EVENT_SPITE, 8000); return; } @@ -461,7 +461,7 @@ struct mob_spectral_wardenAI: public ScriptedAI return; case EVENT_WAIL_OF_SOULS: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_WAIL_OF_SOULS,H_SPELL_WAIL_OF_SOULS)); + DoCast(pTarget, SPELL_WAIL_OF_SOULS); events.RescheduleEvent(EVENT_WAIL_OF_SOULS, 5000); return; } @@ -553,7 +553,7 @@ struct mob_soulguard_reaperAI: public ScriptedAI switch(eventId) { case EVENT_FROST_NOVA: - DoCast(m_creature, DUNGEON_MODE(SPELL_FROST_NOVA,H_SPELL_FROST_NOVA)); + DoCast(m_creature, SPELL_FROST_NOVA); events.RescheduleEvent(EVENT_FROST_NOVA, 9600); return; case EVENT_SHADOW_LANCE: @@ -604,7 +604,7 @@ struct mob_soulguard_bonecasterAI: public ScriptedAI switch(eventId) { case EVENT_BONE_VOLLEY: - DoCastAOE(DUNGEON_MODE(SPELL_BONE_VOLLEY,H_SPELL_BONE_VOLLEY)); + DoCastAOE(SPELL_BONE_VOLLEY); events.RescheduleEvent(EVENT_BONE_VOLLEY, 7000); return; case EVENT_RAISE_DEAD: @@ -612,7 +612,7 @@ struct mob_soulguard_bonecasterAI: public ScriptedAI events.RescheduleEvent(EVENT_RAISE_DEAD, 25000); return; case EVENT_SHIELD_OF_BONES: - DoCast(m_creature, DUNGEON_MODE(SPELL_SHIELD_OF_BONES,H_SPELL_SHIELD_OF_BONES)); + DoCast(m_creature, SPELL_SHIELD_OF_BONES); events.RescheduleEvent(EVENT_SHIELD_OF_BONES, 8000); return; } @@ -664,7 +664,7 @@ struct mob_soulguard_animatorAI: public ScriptedAI return; case EVENT_SHADOW_BOLT: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_SHADOW_BOLT,H_SPELL_SHADOW_BOLT)); + DoCast(pTarget, SPELL_SHADOW_BOLT); events.RescheduleEvent(EVENT_SHADOW_BOLT, 5000); return; case EVENT_SOUL_SICKNESS: @@ -726,16 +726,16 @@ struct mob_soulguard_adeptAI: public ScriptedAI return; case EVENT_SHADOW_BOLT: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_SHADOW_BOLT,H_SPELL_SHADOW_BOLT)); + DoCast(pTarget, SPELL_SHADOW_BOLT); events.RescheduleEvent(EVENT_SHADOW_BOLT, 4000); return; case EVENT_DRAIN_LIFE: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_DRAIN_LIFE,H_SPELL_DRAIN_LIFE)); + DoCast(pTarget, SPELL_DRAIN_LIFE); events.RescheduleEvent(EVENT_DRAIN_LIFE, 9000); return; case EVENT_SHADOW_MEND: - DoCast(m_creature, DUNGEON_MODE(SPELL_SHADOW_MEND,H_SPELL_SHADOW_MEND)); + DoCast(m_creature, SPELL_SHADOW_MEND); events.RescheduleEvent(EVENT_SHADOW_MEND, 20000); return; } @@ -779,7 +779,7 @@ struct mob_soul_horrorAI: public ScriptedAI switch(eventId) { case EVENT_SOUL_STRIKE: - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SOUL_STRIKE,H_SPELL_SOUL_STRIKE)); + DoCast(m_creature->getVictim(), SPELL_SOUL_STRIKE); events.RescheduleEvent(EVENT_SOUL_STRIKE, 8000); return; } diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp index ed84bc92fd3..dd90d4006f8 100644 --- a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp +++ b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp @@ -105,7 +105,7 @@ struct boss_garfrostAI : public ScriptedAI phase2 = true; DoCast(m_creature, SPELL_THUNDERING_STOMP); // TODO: should go to a forge - DoCast(m_creature, DUNGEON_MODE(SPELL_FORGE_BLADE, H_SPELL_FORGE_BLADE)); + DoCast(m_creature, SPELL_FORGE_BLADE); // TODO: should equip when spell completes SetEquipmentSlots(false, EQUIP_ID_SWORD, -1, -1); m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); @@ -117,7 +117,7 @@ struct boss_garfrostAI : public ScriptedAI phase3 = true; DoCast(m_creature, SPELL_THUNDERING_STOMP); // TODO: should go to a forge - DoCast(m_creature, DUNGEON_MODE(SPELL_FORGE_MACE, H_SPELL_FORGE_MACE)); + DoCast(m_creature, SPELL_FORGE_MACE); // TODO: should equip when spell completes SetEquipmentSlots(false, EQUIP_ID_MACE, -1, -1); m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); @@ -180,11 +180,11 @@ struct boss_garfrostAI : public ScriptedAI return; case EVENT_DEEPFREEZE: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_DEEP_FREEZE, H_SPELL_DEEP_FREEZE)); + DoCast(pTarget, SPELL_DEEP_FREEZE); events.RescheduleEvent(EVENT_DEEPFREEZE, 35000); return; case EVENT_CHILLINGWAVE: - DoCastAOE(DUNGEON_MODE(SPELL_CHILLING_WAVE, H_SPELL_CHILLING_WAVE)); + DoCastAOE(SPELL_CHILLING_WAVE); events.RescheduleEvent(EVENT_CHILLINGWAVE, 40000); return; } diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp index c57c3e6f6f3..2604cd5152b 100644 --- a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp +++ b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp @@ -223,12 +223,12 @@ struct boss_ickAI : public ScriptedAI DoScriptText(SAY_KRICK_POISON_NOVA, pKrick); DoScriptText(SAY_ICK_POISON_NOVA, m_creature); - DoCastAOE(DUNGEON_MODE(SPELL_POISON_NOVA,H_SPELL_POISON_NOVA)); + DoCastAOE(SPELL_POISON_NOVA); events.ScheduleEvent(EVENT_POISON_NOVA, 30000, GCD_1); return; case EVENT_TOXIC_WASTE: - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_TOXIC_WASTE,H_SPELL_TOXIC_WASTE)); + DoCast(m_creature->getVictim(), SPELL_TOXIC_WASTE); events.ScheduleEvent(EVENT_TOXIC_WASTE, 5000); return; diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp index 23c35600a18..d753af7c5c1 100644 --- a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp +++ b/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp @@ -156,7 +156,7 @@ struct boss_tyrannusAI : public ScriptedAI switch(eventId) { case EVENT_FORCEFUL_SMASH: - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_FORCEFUL_SMASH, H_SPELL_FORCEFUL_SMASH)); + DoCast(m_creature->getVictim(), SPELL_FORCEFUL_SMASH); events.ScheduleEvent(EVENT_FORCEFUL_SMASH, 10000); return; case EVENT_OVERLORDS_BRAND: @@ -167,7 +167,7 @@ struct boss_tyrannusAI : public ScriptedAI case EVENT_DARK_MIGHT: DoScriptText(SAY_DARK_MIGHT_1, m_creature); DoScriptText(SAY_DARK_MIGHT_2, m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_DARK_MIGHT, H_SPELL_DARK_MIGHT)); + DoCast(m_creature, SPELL_DARK_MIGHT); events.ScheduleEvent(EVENT_DARK_MIGHT, 60000); return; } @@ -235,12 +235,12 @@ struct boss_rimefangAI : public ScriptedAI return; case EVENT_ICY_BLAST: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_ICY_BLAST, H_SPELL_ICY_BLAST)); + DoCast(pTarget, SPELL_ICY_BLAST); events.ScheduleEvent(EVENT_ICY_BLAST_2, 5000); return; case EVENT_ICY_BLAST_2: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget->getVictim(), DUNGEON_MODE(SPELL_ICY_BLAST_2, H_SPELL_ICY_BLAST_2)); + DoCast(pTarget->getVictim(), SPELL_ICY_BLAST_2); events.ScheduleEvent(EVENT_ICY_BLAST, 30000); return; } diff --git a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp index 80c91012db2..43b38561f1e 100644 --- a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp +++ b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp @@ -267,13 +267,13 @@ struct npc_living_mojoAI : public ScriptedAI if (uiMojoWaveTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MOJO_WAVE, H_SPELL_MOJO_WAVE)); + DoCast(m_creature->getVictim(), SPELL_MOJO_WAVE); uiMojoWaveTimer = 15*IN_MILISECONDS; } else uiMojoWaveTimer -= diff; if (uiMojoPuddleTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MOJO_PUDDLE, H_SPELL_MOJO_PUDDLE)); + DoCast(m_creature->getVictim(), SPELL_MOJO_PUDDLE); uiMojoPuddleTimer = 18*IN_MILISECONDS; } else uiMojoPuddleTimer -= diff; diff --git a/src/scripts/northrend/gundrak/boss_gal_darah.cpp b/src/scripts/northrend/gundrak/boss_gal_darah.cpp index 48a814f7212..dee1b2c6d1e 100644 --- a/src/scripts/northrend/gundrak/boss_gal_darah.cpp +++ b/src/scripts/northrend/gundrak/boss_gal_darah.cpp @@ -169,7 +169,7 @@ struct boss_gal_darahAI : public ScriptedAI if (uiWhirlingSlashTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_WHIRLING_SLASH, H_SPELL_WHIRLING_SLASH)); + DoCast(m_creature->getVictim(), SPELL_WHIRLING_SLASH); uiWhirlingSlashTimer = 21*IN_MILISECONDS; ++uiPhaseCounter; } else uiWhirlingSlashTimer -= diff; @@ -205,19 +205,19 @@ struct boss_gal_darahAI : public ScriptedAI { if (uiPunctureTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_PUNCTURE, H_SPELL_PUNCTURE)); + DoCast(m_creature->getVictim(), SPELL_PUNCTURE); uiPunctureTimer = 8*IN_MILISECONDS; } else uiPunctureTimer -= diff; if (uiEnrageTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_ENRAGE, H_SPELL_ENRAGE)); + DoCast(m_creature->getVictim(), SPELL_ENRAGE); uiEnrageTimer = 20*IN_MILISECONDS; } else uiEnrageTimer -= diff; if (uiStompTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_STOMP, H_SPELL_STOMP)); + DoCast(m_creature->getVictim(), SPELL_STOMP); uiStompTimer = 20*IN_MILISECONDS; } else uiStompTimer -= diff; @@ -225,7 +225,7 @@ struct boss_gal_darahAI : public ScriptedAI { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoCast(pTarget, DUNGEON_MODE(SPELL_IMPALING_CHARGE, H_SPELL_IMPALING_CHARGE)); + DoCast(pTarget, SPELL_IMPALING_CHARGE); lImpaledPlayers.insert(pTarget->GetGUID()); } uiImpalingChargeTimer = 31*IN_MILISECONDS; diff --git a/src/scripts/northrend/gundrak/boss_moorabi.cpp b/src/scripts/northrend/gundrak/boss_moorabi.cpp index f10fd2091f1..9e6899408eb 100644 --- a/src/scripts/northrend/gundrak/boss_moorabi.cpp +++ b/src/scripts/northrend/gundrak/boss_moorabi.cpp @@ -120,7 +120,7 @@ struct boss_moorabiAI : public ScriptedAI if (uiDeterminedStabTimer <= uiDiff) { if (bPhase) - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_DETERMINED_GORE, H_SPELL_DETERMINED_GORE)); + DoCast(m_creature->getVictim(), SPELL_DETERMINED_GORE); else DoCast(m_creature->getVictim(), SPELL_DETERMINED_STAB, true); uiDeterminedStabTimer = 8*IN_MILISECONDS; diff --git a/src/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/scripts/northrend/gundrak/boss_slad_ran.cpp index 143a5b76f96..8d8b0f84833 100644 --- a/src/scripts/northrend/gundrak/boss_slad_ran.cpp +++ b/src/scripts/northrend/gundrak/boss_slad_ran.cpp @@ -114,19 +114,19 @@ struct boss_slad_ranAI : public ScriptedAI if (uiPoisonNovaTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_POISON_NOVA, H_SPELL_POISON_NOVA)); + DoCast(m_creature->getVictim(), SPELL_POISON_NOVA); uiPoisonNovaTimer = 15*IN_MILISECONDS; } else uiPoisonNovaTimer -= diff; if (uiPowerfullBiteTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_POWERFULL_BITE, H_SPELL_POWERFULL_BITE)); + DoCast(m_creature->getVictim(), SPELL_POWERFULL_BITE); uiPowerfullBiteTimer = 10*IN_MILISECONDS; } else uiPowerfullBiteTimer -= diff; if (uiVenomBoltTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_VENOM_BOLT, H_SPELL_VENOM_BOLT)); + DoCast(m_creature->getVictim(), SPELL_VENOM_BOLT); uiVenomBoltTimer = 10*IN_MILISECONDS; } else uiVenomBoltTimer -= diff; @@ -224,7 +224,7 @@ struct mob_slad_ran_viperAI : public ScriptedAI if (uiVenomousBiteTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_VENOMOUS_BITE, H_SPELL_VENOMOUS_BITE)); + DoCast(m_creature->getVictim(), SPELL_VENOMOUS_BITE); uiVenomousBiteTimer = 10*IN_MILISECONDS; } else uiVenomousBiteTimer -= diff; } diff --git a/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp index c14df38aadf..837d0fde41b 100644 --- a/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp @@ -153,7 +153,7 @@ struct boss_anomalusAI : public ScriptedAI if (uiSparkTimer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_SPARK, H_SPELL_SPARK)); + DoCast(pTarget, SPELL_SPARK); uiSparkTimer = 5*IN_MILISECONDS; } else uiSparkTimer -= diff; diff --git a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index a3b48aff667..d907f8f8d6e 100644 --- a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -186,7 +186,7 @@ struct boss_keristraszaAI : public ScriptedAI if (uiCrystalfireBreathTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_CRYSTALFIRE_BREATH, H_SPELL_CRYSTALFIRE_BREATH)); + DoCast(m_creature->getVictim(), SPELL_CRYSTALFIRE_BREATH); uiCrystalfireBreathTimer = 14*IN_MILISECONDS; } else uiCrystalfireBreathTimer -= diff; diff --git a/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp b/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp index 2adecea35d0..661deb1d73d 100644 --- a/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp @@ -281,7 +281,7 @@ struct boss_magus_telestraAI : public ScriptedAI { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_ICE_NOVA, false, true); + DoCast(pTarget, SPELL_ICE_NOVA, false); uiCooldown = 1.5*IN_MILISECONDS; } uiIceNovaTimer = 15*IN_MILISECONDS; @@ -301,7 +301,7 @@ struct boss_magus_telestraAI : public ScriptedAI { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, SPELL_FIREBOMB, false, true); + DoCast(pTarget, SPELL_FIREBOMB, false); uiCooldown = 2*IN_MILISECONDS; } uiFireBombTimer = 2*IN_MILISECONDS; diff --git a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp index 894ae9d2a56..d62d9404886 100644 --- a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp @@ -139,7 +139,7 @@ struct boss_ormorokAI : public ScriptedAI if (uiTrampleTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_TRAMPLE, H_SPELL_TRAMPLE)); + DoCast(m_creature, SPELL_TRAMPLE); uiTrampleTimer = 10*IN_MILISECONDS; } else uiTrampleTimer -= diff; @@ -232,7 +232,7 @@ struct mob_crystal_spikeAI : public Scripted_NoMovementAI if (SpellCrystalSpikeDamageTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_CRYSTALL_SPIKE_DAMAGE, H_SPELL_CRYSTALL_SPIKE_DAMAGE)); + DoCast(m_creature, SPELL_CRYSTALL_SPIKE_DAMAGE); SpellCrystalSpikeDamageTimer = 10*IN_MILISECONDS; } else SpellCrystalSpikeDamageTimer -= diff; } diff --git a/src/scripts/northrend/nexus/oculus/boss_drakos.cpp b/src/scripts/northrend/nexus/oculus/boss_drakos.cpp index 7003bcc58d7..4521782a883 100644 --- a/src/scripts/northrend/nexus/oculus/boss_drakos.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_drakos.cpp @@ -138,7 +138,7 @@ struct boss_drakosAI : public ScriptedAI if (uiStompTimer < diff) { DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), m_creature); - DoCast(DUNGEON_MODE(SPELL_THUNDERING_STOMP, SPELL_THUNDERING_STOMP_H)); + DoCast(SPELL_THUNDERING_STOMP); uiStompTimer = urand(15*IN_MILISECONDS, 18*IN_MILISECONDS); } else uiStompTimer -= diff ; diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp index 55a2ca3009a..ef3e4af3865 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp @@ -394,7 +394,7 @@ struct mob_stormforged_lieutenantAI : public ScriptedAI if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM))) { if (pBjarngrim->isAlive()) - DoCast(pBjarngrim, DUNGEON_MODE(SPELL_RENEW_STEEL_N, SPELL_RENEW_STEEL_H)); + DoCast(pBjarngrim, SPELL_RENEW_STEEL_N); } } m_uiRenewSteel_Timer = 10000 + rand()%4000; diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index a534dbf0340..d2492abad09 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -231,7 +231,7 @@ struct boss_ionarAI : public ScriptedAI if (uiStaticOverloadTimer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, DUNGEON_MODE(SPELL_STATIC_OVERLOAD, H_SPELL_STATIC_OVERLOAD)); + DoCast(pTarget, SPELL_STATIC_OVERLOAD); uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS); } @@ -240,7 +240,7 @@ struct boss_ionarAI : public ScriptedAI if (uiBallLightningTimer <= uiDiff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_BALL_LIGHTNING, H_SPELL_BALL_LIGHTNING)); + DoCast(m_creature->getVictim(), SPELL_BALL_LIGHTNING); uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS); } else diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp index 3b5a3ecebd5..ed795076b61 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp @@ -175,7 +175,7 @@ struct boss_lokenAI : public ScriptedAI //breaks at movement, can we assume when it's time, this spell is casted and also must stop movement? DoCast(m_creature, SPELL_PULSING_SHOCKWAVE_AURA, true); - DoCast(m_creature, DUNGEON_MODE(SPELL_PULSING_SHOCKWAVE_N, SPELL_PULSING_SHOCKWAVE_H)); // need core support + DoCast(m_creature, SPELL_PULSING_SHOCKWAVE_N); // need core support m_bIsAura = true; m_uiResumePulsingShockwave_Timer = 0; } @@ -197,7 +197,7 @@ struct boss_lokenAI : public ScriptedAI { DoScriptText(RAND(SAY_NOVA_1,SAY_NOVA_2,SAY_NOVA_3), m_creature); DoScriptText(EMOTE_NOVA, m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_LIGHTNING_NOVA_N, SPELL_LIGHTNING_NOVA_H)); + DoCast(m_creature, SPELL_LIGHTNING_NOVA_N); m_bIsAura = false; m_uiResumePulsingShockwave_Timer = DUNGEON_MODE(5000, 4000); // Pause Pulsing Shockwave aura diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp index 7ca5ca16e71..2546d323a7f 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -255,7 +255,7 @@ struct boss_volkhanAI : public ScriptedAI DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2), m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_SHATTERING_STOMP_N, SPELL_SHATTERING_STOMP_H)); + DoCast(m_creature, SPELL_SHATTERING_STOMP_N); DoScriptText(EMOTE_SHATTER, m_creature); @@ -441,7 +441,7 @@ struct mob_molten_golemAI : public ScriptedAI if (m_uiImmolation_Timer <= uiDiff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_IMMOLATION_STRIKE_N, SPELL_IMMOLATION_STRIKE_H)); + DoCast(m_creature->getVictim(), SPELL_IMMOLATION_STRIKE_N); m_uiImmolation_Timer = 5000; } else diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp index 41074430317..a55c3a6038f 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp @@ -79,7 +79,7 @@ struct boss_krystallusAI : public ScriptedAI if (uiBoulderTossTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_BOULDER_TOSS, H_SPELL_BOULDER_TOSS)); + DoCast(pTarget, SPELL_BOULDER_TOSS); uiBoulderTossTimer = 9000 + rand()%6000; } else uiBoulderTossTimer -= diff; @@ -92,7 +92,7 @@ struct boss_krystallusAI : public ScriptedAI if (uiStompTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_STOMP, H_SPELL_STOMP)); + DoCast(m_creature, SPELL_STOMP); uiStompTimer = 20000 + rand()%9000; } else uiStompTimer -= diff; @@ -108,7 +108,7 @@ struct boss_krystallusAI : public ScriptedAI { if (uiShatterTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_SHATTER, H_SPELL_SHATTER)); + DoCast(m_creature, SPELL_SHATTER); bIsSlam = false; } else uiShatterTimer -= diff; } diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp index 4b098b5f288..2232059d576 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp @@ -109,7 +109,7 @@ struct boss_maiden_of_griefAI : public ScriptedAI if (StormOfGriefTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_STORM_OF_GRIEF_N, SPELL_STORM_OF_GRIEF_H), true); + DoCast(m_creature->getVictim(), SPELL_STORM_OF_GRIEF_N, true); StormOfGriefTimer = 15000 + rand()%5000; } else StormOfGriefTimer -= diff; @@ -117,7 +117,7 @@ struct boss_maiden_of_griefAI : public ScriptedAI { DoResetThreat(); DoScriptText(SAY_STUN, m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_SHOCK_OF_SORROW_N, SPELL_SHOCK_OF_SORROW_H)); + DoCast(m_creature, SPELL_SHOCK_OF_SORROW_N); ShockOfSorrowTimer = 20000 + rand()%10000; } else ShockOfSorrowTimer -= diff; @@ -126,9 +126,9 @@ struct boss_maiden_of_griefAI : public ScriptedAI Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); if (pTarget) - DoCast(pTarget, DUNGEON_MODE(SPELL_PILLAR_OF_WOE_N, SPELL_PILLAR_OF_WOE_H)); + DoCast(pTarget, SPELL_PILLAR_OF_WOE_N); else - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_PILLAR_OF_WOE_N, SPELL_PILLAR_OF_WOE_H)); + DoCast(m_creature->getVictim(), SPELL_PILLAR_OF_WOE_N); PillarOfWoeTimer = 5000 + rand()%20000; } else PillarOfWoeTimer -= diff; diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp index f45ddf1d007..fc711d97ae5 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp @@ -134,19 +134,19 @@ struct boss_sjonnirAI : public ScriptedAI if (uiChainLightningTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_CHAIN_LIGHTING, H_SPELL_CHAIN_LIGHTING)); + DoCast(pTarget, SPELL_CHAIN_LIGHTING); uiChainLightningTimer = 10000 + rand()%5000; } else uiChainLightningTimer -= diff; if (uiLightningShieldTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_LIGHTING_SHIELD, H_SPELL_LIGHTING_SHIELD)); + DoCast(m_creature, SPELL_LIGHTING_SHIELD); uiLightningShieldTimer -= diff; } if (uiStaticChargeTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_STATIC_CHARGE, H_SPELL_STATIC_CHARGE)); + DoCast(m_creature->getVictim(), SPELL_STATIC_CHARGE); uiStaticChargeTimer = 20000 + rand()%5000; } uiStaticChargeTimer -= diff; @@ -154,7 +154,7 @@ struct boss_sjonnirAI : public ScriptedAI { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature, DUNGEON_MODE(SPELL_LIGHTING_RING, H_SPELL_LIGHTING_RING)); + DoCast(m_creature, SPELL_LIGHTING_RING); uiLightningRingTimer = 30000 + rand()%5000; } else uiLightningRingTimer -= diff; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 4f4320fc5b0..57a39947477 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -198,7 +198,7 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI if (!m_creature->hasUnitState(UNIT_STAT_CASTING)) { if (bIsUndead) - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_WOE_STRIKE, H_SPELL_WOE_STRIKE)); + DoCast(m_creature->getVictim(), SPELL_WOE_STRIKE); else DoCast(m_creature->getVictim(), SPELL_CLEAVE); uiCleaveTimer = rand()%5000 + 2000; @@ -212,7 +212,7 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI if (bIsUndead) DoCast(m_creature->getVictim(), SPELL_DARK_SMASH); else - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SMASH, H_SPELL_SMASH)); + DoCast(m_creature->getVictim(), SPELL_SMASH); uiSmashTimer = 10000; } } else uiSmashTimer -= diff; @@ -221,7 +221,7 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI { if (uiEnrageTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_ENRAGE, H_SPELL_ENRAGE)); + DoCast(m_creature, SPELL_ENRAGE); uiEnrageTimer = 10000; } else uiEnrageTimer -= diff; } else // In Undead form used to summon weapon @@ -248,9 +248,9 @@ struct boss_ingvar_the_plundererAI : public ScriptedAI if (!m_creature->hasUnitState(UNIT_STAT_CASTING)) { if (bIsUndead) - DoCast(m_creature, DUNGEON_MODE(SPELL_DREADFUL_ROAR, H_SPELL_DREADFUL_ROAR)); + DoCast(m_creature, SPELL_DREADFUL_ROAR); else - DoCast(m_creature, DUNGEON_MODE(SPELL_STAGGERING_ROAR, H_SPELL_STAGGERING_ROAR)); + DoCast(m_creature, SPELL_STAGGERING_ROAR); uiRoarTimer = 10000; } } else uiRoarTimer -= diff; @@ -395,7 +395,7 @@ struct mob_ingvar_throw_dummyAI : public ScriptedAI Unit *pTarget = m_creature->FindNearestCreature(ENTRY_THROW_TARGET,50); if (pTarget) { - DoCast(m_creature, DUNGEON_MODE(SPELL_SHADOW_AXE_DAMAGE, H_SPELL_SHADOW_AXE_DAMAGE)); + DoCast(m_creature, SPELL_SHADOW_AXE_DAMAGE); float x,y,z; pTarget->GetPosition(x,y,z); m_creature->GetMotionMaster()->MovePoint(0,x,y,z); diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index f623a9ba4cc..ebbe8d576ee 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -340,7 +340,7 @@ struct boss_dalronn_the_controllerAI : public ScriptedAI { if (!m_creature->IsNonMeleeSpellCasted(false)) { - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), DUNGEON_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_SHADOW_BOLT); ShadowBolt_Timer = 2100;//give a 100ms pause to try cast other spells } } else ShadowBolt_Timer -= diff; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index d2c0c9cbb7b..7bc397f158d 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -164,13 +164,13 @@ struct boss_palehoofAI : public ScriptedAI if (uiImpaleTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_IMPALE, H_SPELL_IMPALE)); + DoCast(pTarget, SPELL_IMPALE); uiImpaleTimer = urand(8000,12000); } else uiImpaleTimer -= diff; if (uiWhiteringRoarTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_WITHERING_ROAR, H_SPELL_WITHERING_ROAR)); + DoCast(m_creature, SPELL_WITHERING_ROAR); uiWhiteringRoarTimer = urand(8000,12000); } else uiWhiteringRoarTimer -= diff; @@ -290,7 +290,7 @@ struct mob_ravenous_furbolgAI : public ScriptedAI if (uiChainLightingTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_CHAIN_LIGHTING, H_SPELL_CHAIN_LIGHTING)); + DoCast(m_creature->getVictim(), SPELL_CHAIN_LIGHTING); uiChainLightingTimer = 5000 + rand()%5000; } else uiChainLightingTimer -= diff; @@ -396,7 +396,7 @@ struct mob_frenzied_worgenAI : public ScriptedAI if (uiMortalWoundTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MORTAL_WOUND, H_SPELL_MORTAL_WOUND)); + DoCast(m_creature->getVictim(), SPELL_MORTAL_WOUND); uiMortalWoundTimer = 3000 + rand()%4000; } else uiMortalWoundTimer -= diff; @@ -511,14 +511,14 @@ struct mob_ferocious_rhinoAI : public ScriptedAI if (uiGoreTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_GORE, H_SPELL_GORE)); + DoCast(m_creature->getVictim(), SPELL_GORE); uiGoreTimer = 13000 + rand()%4000; } else uiGoreTimer -= diff; if (uiGrievousWoundTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_GRIEVOUS_WOUND, H_SPELL_GRIEVOUS_WOUND)); + DoCast(pTarget, SPELL_GRIEVOUS_WOUND); uiGrievousWoundTimer = 18000 + rand()%4000; } else uiGrievousWoundTimer -= diff; @@ -625,14 +625,14 @@ struct mob_massive_jormungarAI : public ScriptedAI if (uiAcidSplatterTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_POISON_BREATH, H_SPELL_POISON_BREATH)); + DoCast(m_creature, SPELL_POISON_BREATH); uiAcidSplatterTimer = 10000 + rand()%4000; } else uiAcidSplatterTimer -= diff; if (uiPoisonBreathTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_POISON_BREATH, H_SPELL_POISON_BREATH)); + DoCast(pTarget, SPELL_POISON_BREATH); uiPoisonBreathTimer = 8000 + rand()%4000; } else uiPoisonBreathTimer -= diff; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp index 766d0699c5d..71ed8412428 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp @@ -149,14 +149,14 @@ struct boss_skadiAI : public ScriptedAI if (uiCrushTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_CRUSH, H_SPELL_CRUSH)); + DoCast(m_creature->getVictim(), SPELL_CRUSH); uiCrushTimer = 8000; } else uiCrushTimer -= diff; if (uiPoisonedSpearTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_POISONED_SPEAR, H_SPELL_POISONED_SPEAR)); + DoCast(pTarget, SPELL_POISONED_SPEAR); uiPoisonedSpearTimer = 10000; } else uiPoisonedSpearTimer -= diff; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp index 204998ee3b7..40ae9c95ebc 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp @@ -292,7 +292,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI if (uiSinsterStrikeTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SINSTER_STRIKE, H_SPELL_SINSTER_STRIKE)); + DoCast(m_creature->getVictim(), SPELL_SINSTER_STRIKE); uiSinsterStrikeTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS); } else uiSinsterStrikeTimer -= diff; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp index 64e96b2a70e..9804a237fd2 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp @@ -218,13 +218,13 @@ struct boss_ymironAI : public ScriptedAI // Normal spells ------------------------------------------------------------------------ if (m_uiBane_Timer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_BANE, H_SPELL_BANE)); + DoCast(m_creature, SPELL_BANE); m_uiBane_Timer = urand(20000,25000); } else m_uiBane_Timer -= diff; if (m_uiFetidRot_Timer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_FETID_ROT, H_SPELL_FETID_ROT)); + DoCast(m_creature->getVictim(), SPELL_FETID_ROT); m_uiFetidRot_Timer = urand(10000,15000); } else m_uiFetidRot_Timer -= diff; @@ -259,13 +259,13 @@ struct boss_ymironAI : public ScriptedAI if (m_bIsActiveWithHALDOR && m_uiAbility_HALDOR_Timer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SPIRIT_STRIKE, H_SPELL_SPIRIT_STRIKE)); + DoCast(m_creature->getVictim(), SPELL_SPIRIT_STRIKE); m_uiAbility_HALDOR_Timer = 5000; // overtime } else m_uiAbility_HALDOR_Timer -= diff; if (m_bIsActiveWithRANULF && m_uiAbility_RANULF_Timer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_SPIRIT_BURST, H_SPELL_SPIRIT_BURST)); + DoCast(m_creature, SPELL_SPIRIT_BURST); m_uiAbility_RANULF_Timer = 10000; // overtime } else m_uiAbility_RANULF_Timer -= diff; diff --git a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp index 8f079b2a1aa..232f1874239 100644 --- a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp +++ b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp @@ -97,19 +97,19 @@ struct boss_cyanigosaAI : public ScriptedAI if (uiBlizzardTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(SPELL_BLIZZARD, H_SPELL_BLIZZARD)); + DoCast(pTarget, SPELL_BLIZZARD); uiBlizzardTimer = 15000; } else uiBlizzardTimer -= diff; if (uiTailSweepTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_TAIL_SWEEP, H_SPELL_TAIL_SWEEP)); + DoCast(SPELL_TAIL_SWEEP); uiTailSweepTimer = 20000; } else uiTailSweepTimer -= diff; if (uiUncontrollableEnergyTimer <= diff) { - DoCastVictim(DUNGEON_MODE(SPELL_UNCONTROLLABLE_ENERGY,H_SPELL_UNCONTROLLABLE_ENERGY)); + DoCastVictim(SPELL_UNCONTROLLABLE_ENERGY); uiUncontrollableEnergyTimer = 25000; } else uiUncontrollableEnergyTimer -= diff; diff --git a/src/scripts/northrend/violet_hold/boss_erekem.cpp b/src/scripts/northrend/violet_hold/boss_erekem.cpp index 67c7632b94b..d24091673a0 100644 --- a/src/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/scripts/northrend/violet_hold/boss_erekem.cpp @@ -109,7 +109,7 @@ struct boss_erekemAI : public ScriptedAI void EnterCombat(Unit* pWho) { DoScriptText(SAY_AGGRO, m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_EARTH_SHIELD, H_SPELL_EARTH_SHIELD)); + DoCast(m_creature, SPELL_EARTH_SHIELD); if (pInstance) { @@ -150,7 +150,7 @@ struct boss_erekemAI : public ScriptedAI if (uiEarthShieldTimer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_EARTH_SHIELD, H_SPELL_EARTH_SHIELD)); + DoCast(m_creature, SPELL_EARTH_SHIELD); uiEarthShieldTimer = 20000; } else uiEarthShieldTimer -= diff; @@ -159,7 +159,7 @@ struct boss_erekemAI : public ScriptedAI if (uint64 TargetGUID = GetChainHealTargetGUID()) { if (Creature *pTarget = Unit::GetCreature(*m_creature, TargetGUID)) - DoCast(pTarget, DUNGEON_MODE(SPELL_CHAIN_HEAL, H_SPELL_CHAIN_HEAL)); + DoCast(pTarget, SPELL_CHAIN_HEAL); //If one of the adds is dead spawn heals faster Creature *pGuard1 = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0); diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp index dac6743213b..2bb6d119ea1 100644 --- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -206,7 +206,7 @@ struct boss_ichoronAI : public ScriptedAI if (!bIsFrenzy && HealthBelowPct(25) && !bIsExploded) { DoScriptText(SAY_ENRAGE, m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_FRENZY, SPELL_FRENZY_H), true); + DoCast(m_creature, SPELL_FRENZY, true); bIsFrenzy = true; } @@ -219,7 +219,7 @@ struct boss_ichoronAI : public ScriptedAI if (!m_creature->HasAura(SPELL_PROTECTIVE_BUBBLE, 0)) { DoScriptText(SAY_SHATTER, m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_WATER_BLAST, SPELL_WATER_BLAST_H)); + DoCast(m_creature, SPELL_WATER_BLAST); DoCast(m_creature, SPELL_DRAINED); bIsExploded = true; m_creature->AttackStop(); @@ -257,7 +257,7 @@ struct boss_ichoronAI : public ScriptedAI { if (uiWaterBoltVolleyTimer <= uiDiff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_WATER_BOLT_VOLLEY, SPELL_WATER_BOLT_VOLLEY_H)); + DoCast(m_creature, SPELL_WATER_BOLT_VOLLEY); uiWaterBoltVolleyTimer = urand(10000, 15000); } else uiWaterBoltVolleyTimer -= uiDiff; diff --git a/src/scripts/northrend/violet_hold/boss_lavanthor.cpp b/src/scripts/northrend/violet_hold/boss_lavanthor.cpp index b70f0b00dda..81fb0834b7e 100644 --- a/src/scripts/northrend/violet_hold/boss_lavanthor.cpp +++ b/src/scripts/northrend/violet_hold/boss_lavanthor.cpp @@ -93,19 +93,19 @@ struct boss_lavanthorAI : public ScriptedAI if (uiFireboltTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_FIREBOLT, H_SPELL_FIREBOLT)); + DoCast(m_creature->getVictim(), SPELL_FIREBOLT); uiFireboltTimer = urand(5000,13000); } else uiFireboltTimer -= diff; if (uiFlameBreathTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_FLAME_BREATH, H_SPELL_FLAME_BREATH)); + DoCast(m_creature->getVictim(), SPELL_FLAME_BREATH); uiFlameBreathTimer = urand(10000,15000); } else uiFlameBreathTimer -= diff; if (uiLavaBurnTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_LAVA_BURN, H_SPELL_LAVA_BURN)); + DoCast(m_creature->getVictim(), SPELL_LAVA_BURN); uiLavaBurnTimer = urand(15000,23000); } diff --git a/src/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/scripts/northrend/violet_hold/boss_xevozz.cpp index 200acba96bc..99100760d12 100644 --- a/src/scripts/northrend/violet_hold/boss_xevozz.cpp +++ b/src/scripts/northrend/violet_hold/boss_xevozz.cpp @@ -159,7 +159,7 @@ struct boss_xevozzAI : public ScriptedAI if (uiArcaneBarrageVolley_Timer < uiDiff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_ARCANE_BARRAGE_VOLLEY, SPELL_ARCANE_BARRAGE_VOLLEY_H)); + DoCast(m_creature, SPELL_ARCANE_BARRAGE_VOLLEY); uiArcaneBarrageVolley_Timer = urand(20000, 22000); } else uiArcaneBarrageVolley_Timer -= uiDiff; @@ -167,7 +167,7 @@ struct boss_xevozzAI : public ScriptedAI if (uiArcaneBuffet_Timer) if (uiArcaneBuffet_Timer < uiDiff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_ARCANE_BUFFET, SPELL_ARCANE_BUFFET_H)); + DoCast(m_creature->getVictim(), SPELL_ARCANE_BUFFET); uiArcaneBuffet_Timer = 0; } else uiArcaneBuffet_Timer -= uiDiff; @@ -256,7 +256,7 @@ struct mob_ethereal_sphereAI : public ScriptedAI { float fDistance = m_creature->GetDistance2d(pXevozz); if (fDistance <= 3) - DoCast(pXevozz, DUNGEON_MODE(SPELL_ARCANE_POWER, H_SPELL_ARCANE_POWER)); + DoCast(pXevozz, SPELL_ARCANE_POWER); else DoCast(m_creature, 35845); //Is it blizzlike? } diff --git a/src/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/scripts/northrend/violet_hold/boss_zuramat.cpp index c9ee8f395d8..35732239ced 100644 --- a/src/scripts/northrend/violet_hold/boss_zuramat.cpp +++ b/src/scripts/northrend/violet_hold/boss_zuramat.cpp @@ -114,13 +114,13 @@ struct boss_zuramatAI : public ScriptedAI if (SpellVoidShiftTimer <= diff) { if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, DUNGEON_MODE(SPELL_VOID_SHIFT, H_SPELL_VOID_SHIFT)); + DoCast(pUnit, SPELL_VOID_SHIFT); SpellVoidShiftTimer = 20000; } else SpellVoidShiftTimer -=diff; if (SpellShroudOfDarknessTimer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SHROUD_OF_DARKNESS, H_SPELL_SHROUD_OF_DARKNESS)); + DoCast(m_creature->getVictim(), SPELL_SHROUD_OF_DARKNESS); SpellShroudOfDarknessTimer = 20000; } else SpellShroudOfDarknessTimer -=diff; @@ -157,7 +157,7 @@ struct boss_zuramatAI : public ScriptedAI void JustSummoned(Creature* summon) { summon->AI()->AttackStart(m_creature->getVictim()); - summon->AI()->DoCastAOE(DUNGEON_MODE(SPELL_ZURAMAT_ADD_2, H_SPELL_ZURAMAT_ADD_2)); + summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2); summon->SetPhaseMask(17,true); } }; diff --git a/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp b/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp index fe41f2fa404..4ef812deaab 100644 --- a/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp @@ -80,7 +80,7 @@ struct boss_pandemoniusAI : public ScriptedAI { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, DUNGEON_MODE(SPELL_VOID_BLAST, H_SPELL_VOID_BLAST)); + DoCast(pTarget, SPELL_VOID_BLAST); VoidBlast_Timer = 500; ++VoidBlast_Counter; } @@ -101,7 +101,7 @@ struct boss_pandemoniusAI : public ScriptedAI DoScriptText(EMOTE_DARK_SHELL, m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_DARK_SHELL, H_SPELL_DARK_SHELL)); + DoCast(m_creature, SPELL_DARK_SHELL); DarkShell_Timer = 20000; } else DarkShell_Timer -= diff; } diff --git a/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index 34a2e19d98c..1fa55df8837 100644 --- a/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -126,14 +126,14 @@ struct boss_talon_king_ikissAI : public ScriptedAI if (Blink) { - DoCast(m_creature, DUNGEON_MODE(SPELL_ARCANE_EXPLOSION, H_SPELL_ARCANE_EXPLOSION)); + DoCast(m_creature, SPELL_ARCANE_EXPLOSION); DoCast(m_creature, SPELL_ARCANE_BUBBLE, true); Blink = false; } if (ArcaneVolley_Timer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_ARCANE_VOLLEY, H_SPELL_ARCANE_VOLLEY)); + DoCast(m_creature, SPELL_ARCANE_VOLLEY); ArcaneVolley_Timer = 7000+rand()%5000; } else ArcaneVolley_Timer -= diff; @@ -148,7 +148,7 @@ struct boss_talon_king_ikissAI : public ScriptedAI pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1); if (pTarget) - DoCast(pTarget, DUNGEON_MODE(SPELL_POLYMORPH, H_SPELL_POLYMORPH)); + DoCast(pTarget, SPELL_POLYMORPH); Sheep_Timer = 15000+rand()%2500; } else Sheep_Timer -= diff; diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index 8ff0ee6aa78..98f2f3ffe96 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -274,7 +274,7 @@ struct boss_grandmaster_vorpilAI : public ScriptedAI m_creature->GetMap()->CreatureRelocation(m_creature, VorpilPosition[0],VorpilPosition[1],VorpilPosition[2],0.0f); DoCast(m_creature, SPELL_DRAW_SHADOWS, true); - DoCast(m_creature, DUNGEON_MODE(SPELL_RAIN_OF_FIRE, H_SPELL_RAIN_OF_FIRE)); + DoCast(m_creature, SPELL_RAIN_OF_FIRE); ShadowBoltVolley_Timer = 6000; DrawShadows_Timer = 30000; diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp index 1aedfbe1e5b..7fda5e69384 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp @@ -152,7 +152,7 @@ struct mob_coilfang_waterelementalAI : public ScriptedAI if (WaterBoltVolley_Timer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_WATER_BOLT_VOLLEY, H_SPELL_WATER_BOLT_VOLLEY)); + DoCast(m_creature, SPELL_WATER_BOLT_VOLLEY); WaterBoltVolley_Timer = 7000+rand()%5000; } else WaterBoltVolley_Timer -= diff; diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 62965fc0a35..eec25ee7d49 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -223,7 +223,7 @@ struct mob_steamrigger_mechanicAI : public ScriptedAI //m_creature->GetMotionMaster()->MovementExpired(); //m_creature->GetMotionMaster()->MoveIdle(); - DoCast(m_creature, DUNGEON_MODE(SPELL_REPAIR, H_SPELL_REPAIR), true); + DoCast(m_creature, SPELL_REPAIR, true); } Repair_Timer = 5000; } diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 78e409849c3..40ca316e2fd 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -201,7 +201,7 @@ struct boss_kelidan_the_breakerAI : public ScriptedAI { if (Firenova_Timer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_FIRE_NOVA, H_SPELL_FIRE_NOVA), true); + DoCast(m_creature, SPELL_FIRE_NOVA, true); Firenova = false; ShadowVolley_Timer = 2000; } else Firenova_Timer -=diff; @@ -211,7 +211,7 @@ struct boss_kelidan_the_breakerAI : public ScriptedAI if (ShadowVolley_Timer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_SHADOW_BOLT_VOLLEY, H_SPELL_SHADOW_BOLT_VOLLEY)); + DoCast(m_creature, SPELL_SHADOW_BOLT_VOLLEY); ShadowVolley_Timer = 5000+rand()%8000; } else ShadowVolley_Timer -=diff; @@ -326,7 +326,7 @@ struct mob_shadowmoon_channelerAI : public ScriptedAI if (ShadowBolt_Timer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCast(m_creature->getVictim(), SPELL_SHADOW_BOLT); ShadowBolt_Timer = 5000+rand()%1000; } else ShadowBolt_Timer -=diff; diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index 4d46c402afc..03e5757b918 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -168,7 +168,7 @@ struct boss_omor_the_unscarredAI : public ScriptedAI if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(pTarget, DUNGEON_MODE(SPELL_TREACHEROUS_AURA, H_SPELL_BANE_OF_TREACHERY)); + DoCast(pTarget, SPELL_TREACHEROUS_AURA); Aura_Timer = 8000+rand()%8000; } } else Aura_Timer -= diff; @@ -180,7 +180,7 @@ struct boss_omor_the_unscarredAI : public ScriptedAI if (pTarget) pTarget = m_creature->getVictim(); - DoCast(pTarget, DUNGEON_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCast(pTarget, SPELL_SHADOW_BOLT); Shadowbolt_Timer = 4000+rand()%2500; } } else Shadowbolt_Timer -= diff; diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index 9ef707d011d..8d7b607a709 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -104,7 +104,7 @@ struct boss_watchkeeper_gargolmarAI : public ScriptedAI if (MortalWound_Timer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MORTAL_WOUND, H_SPELL_MORTAL_WOUND)); + DoCast(m_creature->getVictim(), SPELL_MORTAL_WOUND); MortalWound_Timer = 5000+rand()%8000; } else MortalWound_Timer -= diff; diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index 52be2999952..3b41da6bfd9 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -253,7 +253,7 @@ struct boss_grand_warlock_nethekurseAI : public ScriptedAI if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_SHADOW_CLEAVE, H_SPELL_SHADOW_SLAM)); + DoCast(m_creature->getVictim(), SPELL_SHADOW_CLEAVE); Cleave_Timer = 6000+rand()%2500; } else Cleave_Timer -= diff; } diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index bed95b69d12..7417a9b46f6 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -344,7 +344,7 @@ struct boss_warbringer_omroggAI : public ScriptedAI if (BurningMaul_Timer <= diff) { DoScriptText(EMOTE_ENRAGE, m_creature); - DoCast(m_creature, DUNGEON_MODE(SPELL_BURNING_MAUL, H_SPELL_BURNING_MAUL)); + DoCast(m_creature, SPELL_BURNING_MAUL); BurningMaul_Timer = 40000; BlastWave_Timer = 16000; BlastCount = 1; diff --git a/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index 60e8c7c4430..4e828c67749 100644 --- a/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -197,9 +197,9 @@ struct boss_harbinger_skyrissAI : public ScriptedAI if (MindRend_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget, DUNGEON_MODE(SPELL_MIND_REND, H_SPELL_MIND_REND)); + DoCast(pTarget, SPELL_MIND_REND); else - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MIND_REND, H_SPELL_MIND_REND)); + DoCast(m_creature->getVictim(), SPELL_MIND_REND); MindRend_Timer = 8000; } else MindRend_Timer -=diff; @@ -227,9 +227,9 @@ struct boss_harbinger_skyrissAI : public ScriptedAI DoScriptText(RAND(SAY_MIND_1,SAY_MIND_2), m_creature); if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget, DUNGEON_MODE(SPELL_DOMINATION, H_SPELL_DOMINATION)); + DoCast(pTarget, SPELL_DOMINATION); else - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_DOMINATION, H_SPELL_DOMINATION)); + DoCast(m_creature->getVictim(), SPELL_DOMINATION); Domination_Timer = 16000+rand()%16000; } else Domination_Timer -=diff; diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index 0710c4ca1c3..7eca6355001 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -85,7 +85,7 @@ struct boss_gatewatcher_iron_handAI : public ScriptedAI //Shadow Power if (Shadow_Power_Timer <= diff) { - DoCast(m_creature, DUNGEON_MODE(SPELL_SHADOW_POWER, H_SPELL_SHADOW_POWER)); + DoCast(m_creature, SPELL_SHADOW_POWER); Shadow_Power_Timer = 20000 + rand()%8000; } else Shadow_Power_Timer -= diff; @@ -94,7 +94,7 @@ struct boss_gatewatcher_iron_handAI : public ScriptedAI { //TODO: expect cast this about 5 times in a row (?), announce it by emote only once DoScriptText(EMOTE_HAMMER, m_creature); - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_JACKHAMMER, H_SPELL_JACKHAMMER)); + DoCast(m_creature->getVictim(), SPELL_JACKHAMMER); //chance to yell, but not same time as emote (after spell in fact casted) if (rand()%2) diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index ee353c9d82b..22451829fc9 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -74,7 +74,7 @@ struct boss_nethermancer_sepethreaAI : public ScriptedAI pInstance->SetData(DATA_NETHERMANCER_EVENT, IN_PROGRESS); DoScriptText(SAY_AGGRO, m_creature); - DoCast(who, DUNGEON_MODE(SPELL_SUMMON_RAGIN_FLAMES, H_SPELL_SUMMON_RAGIN_FLAMES)); + DoCast(who, SPELL_SUMMON_RAGIN_FLAMES); DoScriptText(SAY_SUMMON, m_creature); } @@ -210,7 +210,7 @@ struct mob_ragin_flamesAI : public ScriptedAI if (inferno_Timer <= diff) { - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_INFERNO, H_SPELL_INFERNO)); + DoCast(m_creature->getVictim(), SPELL_INFERNO); m_creature->TauntApply(m_creature->getVictim()); inferno_Timer = 10000; } else inferno_Timer -= diff; |