aboutsummaryrefslogtreecommitdiff
path: root/src/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripts')
-rw-r--r--src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp6
-rw-r--r--src/scripts/examples/example_creature.cpp15
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp28
-rw-r--r--src/scripts/northrend/draktharon_keep/boss_trollgore.cpp16
-rw-r--r--src/scripts/northrend/naxxramas/boss_anubrekhan.cpp14
-rw-r--r--src/scripts/northrend/naxxramas/boss_faerlina.cpp16
-rw-r--r--src/scripts/northrend/naxxramas/boss_gothik.cpp18
-rw-r--r--src/scripts/northrend/naxxramas/boss_loatheb.cpp12
-rw-r--r--src/scripts/northrend/naxxramas/boss_maexxna.cpp18
-rw-r--r--src/scripts/northrend/naxxramas/boss_patchwerk.cpp10
-rw-r--r--src/scripts/northrend/naxxramas/boss_thaddius.cpp24
-rw-r--r--src/scripts/northrend/violet_hold/boss_cyanigosa.cpp18
-rw-r--r--src/scripts/northrend/violet_hold/boss_erekem.cpp18
-rw-r--r--src/scripts/northrend/violet_hold/boss_ichoron.cpp18
-rw-r--r--src/scripts/northrend/violet_hold/boss_zuramat.cpp16
-rw-r--r--src/scripts/world/go_scripts.cpp20
16 files changed, 133 insertions, 134 deletions
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
index 40aca9d9696..4cd94ab8578 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
@@ -387,7 +387,7 @@ struct npc_death_knight_initiateAI : public CombatAI
pDoneBy->AttackStop();
me->CastSpell(pDoneBy, SPELL_DUEL_VICTORY, true);
lose = true;
- me->CastSpell(me, SPELL_GROVEL_7267, true);
+ me->CastSpell(me, 7267, true);
me->RestoreFaction();
}
}
@@ -417,14 +417,14 @@ struct npc_death_knight_initiateAI : public CombatAI
{
if (lose)
{
- if (!me->HasAura(SPELL_GROVEL_7267))
+ if (!me->HasAura(7267))
EnterEvadeMode();
return;
}
else if (me->getVictim()->GetTypeId() == TYPEID_PLAYER
&& me->getVictim()->GetHealth() * 10 < me->getVictim()->GetMaxHealth())
{
- me->getVictim()->CastSpell(me->getVictim(), SPELL_GROVEL_7267, true); // beg
+ me->getVictim()->CastSpell(me->getVictim(), 7267, true); // beg
me->getVictim()->RemoveGameObject(SPELL_DUEL_FLAG, true);
EnterEvadeMode();
return;
diff --git a/src/scripts/examples/example_creature.cpp b/src/scripts/examples/example_creature.cpp
index 41cc0217132..549ab338401 100644
--- a/src/scripts/examples/example_creature.cpp
+++ b/src/scripts/examples/example_creature.cpp
@@ -22,7 +22,6 @@ SDCategory: Script Examples
EndScriptData */
#include "ScriptedPch.h"
-#include "SpellId.h"
// **** This script is designed as an example for others to build on ****
// **** Please modify whatever you'd like to as this script is only for developement ****
@@ -58,13 +57,13 @@ enum Spells
{
// List of spells.
// Not required to define them in this way, but will make it easier to maintain in case spellId change
- SPELL_BUFF = SPELL_INCREASED_STAMINA_25661,
- SPELL_ONE = SPELL_PUMMEL_12555,
- SPELL_ONE_ALT = SPELL_POISON_BOLT_VOLLEY_24099,
- SPELL_TWO = SPELL_FROST_HOLD_10017,
- SPELL_THREE = SPELL_KNOCKBACK_26027,
- SPELL_FRENZY = SPELL_FRENZY_23537,
- SPELL_BERSERK = SPELL_BERSERK_32965,
+ SPELL_BUFF = 25661,
+ SPELL_ONE = 12555,
+ SPELL_ONE_ALT = 24099,
+ SPELL_TWO = 10017,
+ SPELL_THREE = 26027,
+ SPELL_FRENZY = 23537,
+ SPELL_BERSERK = 32965,
};
enum eEnums
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
index 3b578e9395a..25fa866c833 100644
--- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
@@ -94,40 +94,40 @@ enum Spells
{
//***** Main Phase 1 ********
//Eye Spells
- SPELL_FREEZE_ANIM = SPELL_FREEZE_ANIM_16245,
- SPELL_GREEN_BEAM = SPELL_EYE_BEAM_26134,
- SPELL_DARK_GLARE = SPELL_DARK_GLARE_26029,
- SPELL_RED_COLORATION = SPELL_GLOWY_RED_22518, //Probably not the right spell but looks similar
+ SPELL_FREEZE_ANIM = 16245,
+ SPELL_GREEN_BEAM = 26134,
+ SPELL_DARK_GLARE = 26029,
+ SPELL_RED_COLORATION = 22518, //Probably not the right spell but looks similar
//Eye Tentacles Spells
- SPELL_MIND_FLAY = SPELL_MIND_FLAY_26143,
+ SPELL_MIND_FLAY = 26143,
//Claw Tentacles Spells
- SPELL_GROUND_RUPTURE = SPELL_GROUND_RUPTURE_26139,
- SPELL_HAMSTRING = SPELL_HAMSTRING_26141,
+ SPELL_GROUND_RUPTURE = 26139,
+ SPELL_HAMSTRING = 26141,
//***** Main Phase 2 ******
//Body spells
//#define SPELL_CARAPACE_CTHUN 26156 //Was removed from client dbcs
- SPELL_TRANSFORM = SPELL_TRANSFORM_CTHUN___PHASE_2_26232,
- SPELL_PURPLE_COLORATION = SPELL_GLOWY_PURPLE_22581, //Probably not the right spell but looks similar
+ SPELL_TRANSFORM = 26232,
+ SPELL_PURPLE_COLORATION = 22581, //Probably not the right spell but looks similar
//Eye Tentacles Spells
//SAME AS PHASE1
//Giant Claw Tentacles
- SPELL_MASSIVE_GROUND_RUPTURE = SPELL_GROUND_RUPTURE_26100,
+ SPELL_MASSIVE_GROUND_RUPTURE = 26100,
//Also casts Hamstring
- SPELL_THRASH = SPELL_THRASH_3391,
+ SPELL_THRASH = 3391,
//Giant Eye Tentacles
//CHAIN CASTS "SPELL_GREEN_BEAM"
//Stomach Spells
- SPELL_MOUTH_TENTACLE = SPELL_SUMMON_MOUTH_TENTACLE_26332,
- SPELL_EXIT_STOMACH_KNOCKBACK = SPELL_SPIT_OUT_25383,
- SPELL_DIGESTIVE_ACID = SPELL_DIGESTIVE_ACID_26476,
+ SPELL_MOUTH_TENTACLE = 26332,
+ SPELL_EXIT_STOMACH_KNOCKBACK = 25383,
+ SPELL_DIGESTIVE_ACID = 26476,
};
enum Actions
diff --git a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp
index 8bea8bda8dc..f39919e52f9 100644
--- a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp
+++ b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp
@@ -32,15 +32,15 @@ update creature_template set scriptname = 'boss_trollgore' where entry = '';
enum Spells
{
- SPELL_INFECTED_WOUND = SPELL_INFECTED_WOUND_49637,
- SPELL_CRUSH = SPELL_CRUSH_49639,
- SPELL_CORPSE_EXPLODE = SPELL_CORPSE_EXPLODE_49555,
- SPELL_CONSUME = SPELL_CONSUME_49380,
- SPELL_CONSUME_AURA = SPELL_CONSUME_49381,
+ SPELL_INFECTED_WOUND = 49637,
+ SPELL_CRUSH = 49639,
+ SPELL_CORPSE_EXPLODE = 49555,
+ SPELL_CONSUME = 49380,
+ SPELL_CONSUME_AURA = 49381,
//Heroic spells
- H_SPELL_CORPSE_EXPLODE = SPELL_CORPSE_EXPLODE_59807,
- H_SPELL_CONSUME = SPELL_CONSUME_59803,
- H_SPELL_CONSUME_AURA = SPELL_CONSUME_59805,
+ H_SPELL_CORPSE_EXPLODE = 59807,
+ H_SPELL_CONSUME = 59803,
+ H_SPELL_CONSUME_AURA = 59805,
};
enum Yells
{
diff --git a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp
index 161ce894b8f..c2aabf775ab 100644
--- a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp
+++ b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp
@@ -36,13 +36,13 @@ enum Events
enum Spells
{
- SPELL_IMPALE_10 = SPELL_IMPALE_28783,
- SPELL_IMPALE_25 = SPELL_IMPALE_56090,
- SPELL_LOCUST_SWARM_10 = SPELL_LOCUST_SWARM_28785,
- SPELL_LOCUST_SWARM_25 = SPELL_LOCUST_SWARM_54021,
- SPELL_SUMMON_CORPSE_SCARABS_PLR = SPELL_SUMMON_CORPSE_SCARABS_5_29105, // This spawns 5 corpse scarabs on top of player
- SPELL_SUMMON_CORPSE_SCARABS_MOB = SPELL_SUMMON_CORPSE_SCARABS_10_28864, // This spawns 10 corpse scarabs on top of dead guards
- SPELL_BERSERK = SPELL_BERSERK_27680,
+ SPELL_IMPALE_10 = 28783,
+ SPELL_IMPALE_25 = 56090,
+ SPELL_LOCUST_SWARM_10 = 28785,
+ SPELL_LOCUST_SWARM_25 = 54021,
+ SPELL_SUMMON_CORPSE_SCARABS_PLR = 29105, // This spawns 5 corpse scarabs on top of player
+ SPELL_SUMMON_CORPSE_SCARABS_MOB = 28864, // This spawns 10 corpse scarabs on top of dead guards
+ SPELL_BERSERK = 27680,
};
struct boss_anubrekhanAI : public BossAI
diff --git a/src/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/scripts/northrend/naxxramas/boss_faerlina.cpp
index 2e99c17f2e1..183e5bf1272 100644
--- a/src/scripts/northrend/naxxramas/boss_faerlina.cpp
+++ b/src/scripts/northrend/naxxramas/boss_faerlina.cpp
@@ -34,14 +34,14 @@ enum Yells
enum Spells
{
- SPELL_POISON_BOLT_VOLLEY = SPELL_POISON_BOLT_VOLLEY_28796,
- H_SPELL_POISON_BOLT_VOLLEY = SPELL_POISON_BOLT_VOLLEY_54098,
- SPELL_RAIN_OF_FIRE = SPELL_RAIN_OF_FIRE_28794,
- H_SPELL_RAIN_OF_FIRE = SPELL_RAIN_OF_FIRE_54099,
- SPELL_FRENZY = SPELL_FRENZY_28798,
- H_SPELL_FRENZY = SPELL_FRENZY_54100,
- SPELL_WIDOWS_EMBRACE = SPELL_WIDOWS_EMBRACE_28732,
- H_SPELL_WIDOWS_EMBRACE = SPELL_WIDOWS_EMBRACE_54097
+ SPELL_POISON_BOLT_VOLLEY = 28796,
+ H_SPELL_POISON_BOLT_VOLLEY = 54098,
+ SPELL_RAIN_OF_FIRE = 28794,
+ H_SPELL_RAIN_OF_FIRE = 54099,
+ SPELL_FRENZY = 28798,
+ H_SPELL_FRENZY = 54100,
+ SPELL_WIDOWS_EMBRACE = 28732,
+ H_SPELL_WIDOWS_EMBRACE = 54097
};
enum Events
diff --git a/src/scripts/northrend/naxxramas/boss_gothik.cpp b/src/scripts/northrend/naxxramas/boss_gothik.cpp
index 700ea0eb6b1..d489c7d64df 100644
--- a/src/scripts/northrend/naxxramas/boss_gothik.cpp
+++ b/src/scripts/northrend/naxxramas/boss_gothik.cpp
@@ -27,15 +27,15 @@ enum Yells
//Gothik
enum Spells
{
- SPELL_HARVEST_SOUL = SPELL_HARVEST_SOUL_28679,
- SPELL_SHADOW_BOLT = SPELL_SHADOW_BOLT_29317,
- H_SPELL_SHADOW_BOLT = SPELL_SHADOW_BOLT_56405,
- SPELL_INFORM_LIVE_TRAINEE = SPELL_TO_ANCHOR_1_27892,
- SPELL_INFORM_LIVE_KNIGHT = SPELL_TO_ANCHOR_1_27928,
- SPELL_INFORM_LIVE_RIDER = SPELL_TO_ANCHOR_1_27935,
- SPELL_INFORM_DEAD_TRAINEE = SPELL_ANCHOR_TO_SKULLS_27915,
- SPELL_INFORM_DEAD_KNIGHT = SPELL_ANCHOR_TO_SKULLS_27931,
- SPELL_INFORM_DEAD_RIDER = SPELL_ANCHOR_TO_SKULLS_27937
+ SPELL_HARVEST_SOUL = 28679,
+ SPELL_SHADOW_BOLT = 29317,
+ H_SPELL_SHADOW_BOLT = 56405,
+ SPELL_INFORM_LIVE_TRAINEE = 27892,
+ SPELL_INFORM_LIVE_KNIGHT = 27928,
+ SPELL_INFORM_LIVE_RIDER = 27935,
+ SPELL_INFORM_DEAD_TRAINEE = 27915,
+ SPELL_INFORM_DEAD_KNIGHT = 27931,
+ SPELL_INFORM_DEAD_RIDER = 27937
};
enum Creatures
{
diff --git a/src/scripts/northrend/naxxramas/boss_loatheb.cpp b/src/scripts/northrend/naxxramas/boss_loatheb.cpp
index 191055fb8cd..c79e077657b 100644
--- a/src/scripts/northrend/naxxramas/boss_loatheb.cpp
+++ b/src/scripts/northrend/naxxramas/boss_loatheb.cpp
@@ -21,12 +21,12 @@
enum Spells
{
- SPELL_NECROTIC_AURA = SPELL_NECROTIC_AURA_55593,
- SPELL_SUMMON_SPORE = SPELL_SUMMON_SPORE_29234,
- SPELL_DEATHBLOOM = SPELL_DEATHBLOOM_29865,
- H_SPELL_DEATHBLOOM = SPELL_DEATHBLOOM_55053,
- SPELL_INEVITABLE_DOOM = SPELL_INEVITABLE_DOOM_29204,
- H_SPELL_INEVITABLE_DOOM = SPELL_INEVITABLE_DOOM_55052
+ SPELL_NECROTIC_AURA = 55593,
+ SPELL_SUMMON_SPORE = 29234,
+ SPELL_DEATHBLOOM = 29865,
+ H_SPELL_DEATHBLOOM = 55053,
+ SPELL_INEVITABLE_DOOM = 29204,
+ H_SPELL_INEVITABLE_DOOM = 55052
};
enum Events
diff --git a/src/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/scripts/northrend/naxxramas/boss_maexxna.cpp
index f4b3145850a..3dd35a93181 100644
--- a/src/scripts/northrend/naxxramas/boss_maexxna.cpp
+++ b/src/scripts/northrend/naxxramas/boss_maexxna.cpp
@@ -21,15 +21,15 @@
enum Spells
{
- SPELL_WEB_WRAP = SPELL_WEB_WRAP_28622,
- SPELL_WEB_SPRAY_10 = SPELL_WEB_SPRAY_29484,
- SPELL_WEB_SPRAY_25 = SPELL_WEB_SPRAY_54125,
- SPELL_POISON_SHOCK_10 = SPELL_POISON_SHOCK_28741,
- SPELL_POISON_SHOCK_25 = SPELL_POISON_SHOCK_54122,
- SPELL_NECROTIC_POISON_10 = SPELL_NECROTIC_POISON_28776,
- SPELL_NECROTIC_POISON_25 = SPELL_NECROTIC_POISON_54121,
- SPELL_FRENZY_10 = SPELL_FRENZY_54123,
- SPELL_FRENZY_25 = SPELL_FRENZY_54124,
+ SPELL_WEB_WRAP = 28622,
+ SPELL_WEB_SPRAY_10 = 29484,
+ SPELL_WEB_SPRAY_25 = 54125,
+ SPELL_POISON_SHOCK_10 = 28741,
+ SPELL_POISON_SHOCK_25 = 54122,
+ SPELL_NECROTIC_POISON_10 = 28776,
+ SPELL_NECROTIC_POISON_25 = 54121,
+ SPELL_FRENZY_10 = 54123,
+ SPELL_FRENZY_25 = 54124,
};
enum Creatures
diff --git a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp
index 41206beef64..68e27f5f722 100644
--- a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp
+++ b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp
@@ -19,11 +19,11 @@
enum Spells
{
- SPELL_HATEFUL_STRIKE = SPELL_HATEFUL_STRIKE_41926,
- H_SPELL_HATEFUL_STRIKE = SPELL_HATEFUL_STRIKE_59192,
- SPELL_FRENZY = SPELL_FRENZY_28131,
- SPELL_BERSERK = SPELL_BERSERK_26662,
- SPELL_SLIME_BOLT = SPELL_SLIME_BOLT_32309,
+ SPELL_HATEFUL_STRIKE = 41926,
+ H_SPELL_HATEFUL_STRIKE = 59192,
+ SPELL_FRENZY = 28131,
+ SPELL_BERSERK = 26662,
+ SPELL_SLIME_BOLT = 32309,
};
enum Yells
diff --git a/src/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/scripts/northrend/naxxramas/boss_thaddius.cpp
index 37f52083815..a7ad8368d9f 100644
--- a/src/scripts/northrend/naxxramas/boss_thaddius.cpp
+++ b/src/scripts/northrend/naxxramas/boss_thaddius.cpp
@@ -29,10 +29,10 @@ enum StalaggYells
enum StalagSpells
{
- SPELL_POWERSURGE = SPELL_POWER_SURGE_28134,
- H_SPELL_POWERSURGE = SPELL_POWER_SURGE_54529,
- SPELL_MAGNETIC_PULL = SPELL_MAGNETIC_PULL_28338,
- SPELL_STALAGG_TESLA = SPELL_STALAGG_TESLA_PASSIVE_28097
+ SPELL_POWERSURGE = 28134,
+ H_SPELL_POWERSURGE = 54529,
+ SPELL_MAGNETIC_PULL = 28338,
+ SPELL_STALAGG_TESLA = 28097
};
//Feugen
@@ -45,9 +45,9 @@ enum FeugenYells
enum FeugenSpells
{
- SPELL_STATICFIELD = SPELL_STATIC_FIELD_28135,
- H_SPELL_STATICFIELD = SPELL_STATIC_FIELD_54528,
- SPELL_FEUGEN_TESLA = SPELL_FEUGEN_TESLA_PASSIVE_28109
+ SPELL_STATICFIELD = 28135,
+ H_SPELL_STATICFIELD = 54528,
+ SPELL_FEUGEN_TESLA = 28109
};
// Thaddius DoAction
@@ -80,11 +80,11 @@ enum ThaddiusYells
enum ThaddiusSpells
{
- SPELL_POLARITY_SHIFT = SPELL_POLARITY_SHIFT_28089,
- SPELL_BALL_LIGHTNING = SPELL_BALL_LIGHTNING_28299,
- SPELL_CHAIN_LIGHTNING = SPELL_CHAIN_LIGHTNING_28167,
- H_SPELL_CHAIN_LIGHTNING = SPELL_CHAIN_LIGHTNING_54531,
- SPELL_BERSERK = SPELL_BERSERK_27680
+ SPELL_POLARITY_SHIFT = 28089,
+ SPELL_BALL_LIGHTNING = 28299,
+ SPELL_CHAIN_LIGHTNING = 28167,
+ H_SPELL_CHAIN_LIGHTNING = 54531,
+ SPELL_BERSERK = 27680
};
enum Events
diff --git a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp
index c0ef4f03a56..8f079b2a1aa 100644
--- a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp
+++ b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp
@@ -14,15 +14,15 @@ update creature_template set scriptname = '' where entry = '';
enum Spells
{
- SPELL_ARCANE_VACUUM = SPELL_ARCANE_VACUUM_58694,
- SPELL_BLIZZARD = SPELL_BLIZZARD_58693,
- H_SPELL_BLIZZARD = SPELL_BLIZZARD_59369,
- SPELL_MANA_DESTRUCTION = SPELL_MANA_DESTRUCTION_59374,
- SPELL_TAIL_SWEEP = SPELL_TAIL_SWEEP_58690,
- H_SPELL_TAIL_SWEEP = SPELL_TAIL_SWEEP_59283,
- SPELL_UNCONTROLLABLE_ENERGY = SPELL_UNCONTROLLABLE_ENERGY_58688,
- H_SPELL_UNCONTROLLABLE_ENERGY = SPELL_UNCONTROLLABLE_ENERGY_59281,
- SPELL_TRANSFORM = SPELL_CYANIGOSA_TRANSFORM_58668
+ SPELL_ARCANE_VACUUM = 58694,
+ SPELL_BLIZZARD = 58693,
+ H_SPELL_BLIZZARD = 59369,
+ SPELL_MANA_DESTRUCTION = 59374,
+ SPELL_TAIL_SWEEP = 58690,
+ H_SPELL_TAIL_SWEEP = 59283,
+ SPELL_UNCONTROLLABLE_ENERGY = 58688,
+ H_SPELL_UNCONTROLLABLE_ENERGY = 59281,
+ SPELL_TRANSFORM = 58668
};
enum Yells
diff --git a/src/scripts/northrend/violet_hold/boss_erekem.cpp b/src/scripts/northrend/violet_hold/boss_erekem.cpp
index d094e7a8fa7..8cb0fcf2ed1 100644
--- a/src/scripts/northrend/violet_hold/boss_erekem.cpp
+++ b/src/scripts/northrend/violet_hold/boss_erekem.cpp
@@ -14,15 +14,15 @@ update creature_template set scriptname = '' where entry = '';
enum Spells
{
- SPELL_BLOODLUST = SPELL_BLOODLUST_54516,
- SPELL_BREAK_BONDS = SPELL_BREAK_BONDS_59463,
- SPELL_CHAIN_HEAL = SPELL_CHAIN_HEAL_54481,
- H_SPELL_CHAIN_HEAL = SPELL_CHAIN_HEAL_59473,
- SPELL_EARTH_SHIELD = SPELL_EARTH_SHIELD_54479,
- H_SPELL_EARTH_SHIELD = SPELL_EARTH_SHIELD_59471,
- SPELL_EARTH_SHOCK = SPELL_EARTH_SHOCK_54511,
- SPELL_LIGHTNING_BOLT = SPELL_LIGHTNING_BOLT_53044,
- SPELL_STORMSTRIKE = SPELL_STORMSTRIKE_51876
+ SPELL_BLOODLUST = 54516,
+ SPELL_BREAK_BONDS = 59463,
+ SPELL_CHAIN_HEAL = 54481,
+ H_SPELL_CHAIN_HEAL = 59473,
+ SPELL_EARTH_SHIELD = 54479,
+ H_SPELL_EARTH_SHIELD = 59471,
+ SPELL_EARTH_SHOCK = 54511,
+ SPELL_LIGHTNING_BOLT = 53044,
+ SPELL_STORMSTRIKE = 51876
};
enum Yells
diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp
index 38d7f3572ce..4d8e64576ea 100644
--- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp
+++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp
@@ -27,15 +27,15 @@ Script Data End */
enum Spells
{
- SPELL_DRAINED = SPELL_DRAINED_59820,
- SPELL_FRENZY = SPELL_FRENZY_54312,
- SPELL_FRENZY_H = SPELL_FRENZY_59522,
- SPELL_PROTECTIVE_BUBBLE = SPELL_PROTECTIVE_BUBBLE_54306,
- SPELL_WATER_BLAST = SPELL_WATER_BLAST_54237,
- SPELL_WATER_BLAST_H = SPELL_WATER_BLAST_59520,
- SPELL_WATER_BOLT_VOLLEY = SPELL_WATER_BOLT_VOLLEY_54241,
- SPELL_WATER_BOLT_VOLLEY_H = SPELL_WATER_BOLT_VOLLEY_59521,
- SPELL_SPLASH = SPELL_SPLASH_59516,
+ SPELL_DRAINED = 59820,
+ SPELL_FRENZY = 54312,
+ SPELL_FRENZY_H = 59522,
+ SPELL_PROTECTIVE_BUBBLE = 54306,
+ SPELL_WATER_BLAST = 54237,
+ SPELL_WATER_BLAST_H = 59520,
+ SPELL_WATER_BOLT_VOLLEY = 54241,
+ SPELL_WATER_BOLT_VOLLEY_H = 59521,
+ SPELL_SPLASH = 59516,
};
enum IchoronCreatures
diff --git a/src/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/scripts/northrend/violet_hold/boss_zuramat.cpp
index bda09b3c590..e60eed0820a 100644
--- a/src/scripts/northrend/violet_hold/boss_zuramat.cpp
+++ b/src/scripts/northrend/violet_hold/boss_zuramat.cpp
@@ -10,14 +10,14 @@ Script Data End */
enum Spells
{
- SPELL_SHROUD_OF_DARKNESS = SPELL_SHROUD_OF_DARKNESS_54524,
- H_SPELL_SHROUD_OF_DARKNESS = SPELL_SHROUD_OF_DARKNESS_59745,
- SPELL_SUMMON_VOID_SENTRY = SPELL_SUMMON_VOID_SENTRY_54369,
- SPELL_VOID_SHIFT = SPELL_VOID_SHIFT_54361,
- H_SPELL_VOID_SHIFT = SPELL_VOID_SHIFT_59743,
-
- SPELL_ZURAMAT_ADD_2 = SPELL_ZURAMAT_ADD_2_54342,
- H_SPELL_ZURAMAT_ADD_2 = SPELL_ZURAMAT_ADD_2_59747
+ SPELL_SHROUD_OF_DARKNESS = 54524,
+ H_SPELL_SHROUD_OF_DARKNESS = 59745,
+ SPELL_SUMMON_VOID_SENTRY = 54369,
+ SPELL_VOID_SHIFT = 54361,
+ H_SPELL_VOID_SHIFT = 59743,
+
+ SPELL_ZURAMAT_ADD_2 = 54342,
+ H_SPELL_ZURAMAT_ADD_2 = 59747
};
enum ZuramatCreatures
diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp
index b771e3cbcec..cd71124c4f5 100644
--- a/src/scripts/world/go_scripts.cpp
+++ b/src/scripts/world/go_scripts.cpp
@@ -716,19 +716,19 @@ bool GOHello_go_soulwell(Player *pPlayer, GameObject* pGO)
uint32 newSpell = 0;
if (pGO->GetEntry() == 193169) // Soulwell for rank 2
{
- if (caster->HasAura(SPELL_IMPROVED_HEALTHSTONE_18693)) // Improved Healthstone rank 2
- newSpell = SPELL_CREATE_FEL_HEALTHSTONE_58898;
- else if (caster->HasAura(SPELL_IMPROVED_HEALTHSTONE_18692)) // Improved Healthstone rank 1
- newSpell = SPELL_CREATE_FEL_HEALTHSTONE_58896;
- else newSpell = SPELL_CREATE_FEL_HEALTHSTONE_58890;
+ if (caster->HasAura(18693)) // Improved Healthstone rank 2
+ newSpell = 58898;
+ else if (caster->HasAura(18692)) // Improved Healthstone rank 1
+ newSpell = 58896;
+ else newSpell = 58890;
}
else if (pGO->GetEntry() == 181621) // Soulwell for rank 1
{
- if (caster->HasAura(SPELL_IMPROVED_HEALTHSTONE_18693)) // Improved Healthstone rank 2
- newSpell = SPELL_CREATE_MASTER_HEALTHSTONE_34150;
- else if (caster->HasAura(SPELL_IMPROVED_HEALTHSTONE_18692)) // Improved Healthstone rank 1
- newSpell = SPELL_CREATE_MASTER_HEALTHSTONE_34149;
- else newSpell = SPELL_CREATE_MASTER_HEALTHSTONE_34130;
+ if (caster->HasAura(18693)) // Improved Healthstone rank 2
+ newSpell = 34150;
+ else if (caster->HasAura(18692)) // Improved Healthstone rank 1
+ newSpell = 34149;
+ else newSpell = 34130;
}
pGO->AddUse();