diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-06 01:00:05 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-06 01:00:05 +0200 |
| commit | 6079f369afe2d527d2778eca6b5f6669bff597d4 (patch) | |
| tree | 8273b7209e4b6a5bfacfa4a4fa156034d6b42b41 /src | |
| parent | 447ddceabad28a3a4ed1ed3bdece632d2d072246 (diff) | |
Scripted/Misc: Some cleanup
Diffstat (limited to 'src')
198 files changed, 1715 insertions, 1151 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 9feb30ce3c6..f5d6932db00 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -387,7 +387,7 @@ void ScriptedAI::SetCombatMovement(bool allowMovement) _isCombatMovementAllowed = allowMovement; } -enum eNPCs +enum NPCs { NPC_BROODLORD = 12017, NPC_VOID_REAVER = 19516, diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 4fb7232711c..ef15ef27ec4 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -14,7 +14,7 @@ EndScriptData */ #include "Group.h" #include "Player.h" -enum ePoints +enum Points { POINT_LAST_POINT = 0xFFFFFF, POINT_HOME = 0xFFFFFE diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 1c76399aa5c..8f46896f6e8 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -16,7 +16,7 @@ EndScriptData */ const float MAX_PLAYER_DISTANCE = 100.0f; -enum ePoints +enum Points { POINT_COMBAT_START = 0xFFFFFF }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 8fe2778451b..867253f5b05 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -48,7 +48,7 @@ public: }; // npc_grimstone -enum eGrimstone +enum Grimstone { NPC_GRIMSTONE = 10096, NPC_THELDREN = 16059, @@ -680,7 +680,11 @@ public: #define SAY_WINDSOR_4_3 "Good work! We're almost there, $N. This way." #define SAY_WINDSOR_6 "This is it, $N. My stuff should be in that room. Cover me, I'm going in!" #define SAY_WINDSOR_9 "Ah, there it is!" -#define NPC_REGINALD_WINDSOR 9682 + +enum MarshalWindsor +{ + NPC_REGINALD_WINDSOR = 9682 +}; /* Player* playerStart; @@ -859,8 +863,12 @@ public: #define SAY_REGINALD_WINDSOR_14_2 "Excellent work, $N. Let's find the exit. I think I know the way. Follow me!" #define SAY_REGINALD_WINDSOR_20_1 "We made it!" #define SAY_REGINALD_WINDSOR_20_2 "Meet me at Maxwell's encampment. We'll go over the next stages of the plan there and figure out a way to decode my tablets without the decryption ring." -#define NPC_SHILL_DINGER 9678 -#define NPC_CREST_KILLER 9680 + +enum MarshalReginaldWindor +{ + NPC_SHILL_DINGER = 9678, + NPC_CREST_KILLER = 9680 +}; /* int wp = 0; @@ -1026,10 +1034,10 @@ public: { if (!instance->GetData(DATA_GATE_J) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED) { - instance->SetData(DATA_CREATURE_JAZ, 1); + instance->SetData(DATA_NPC_JAZ, 1); instance->SetData(DATA_JAZ, ENCOUNTER_STATE_IN_PROGRESS); } - if (instance->GetData(DATA_CREATURE_JAZ) && instance->GetData(DATA_CREATURE_OGRABISI) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_NPC_JAZ) && instance->GetData(DATA_NPC_OGRABISI) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); instance->SetData(DATA_JAZ, ENCOUNTER_STATE_ENDED); @@ -1039,10 +1047,10 @@ public: { if (!instance->GetData(DATA_GATE_S) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED) { - instance->SetData(DATA_CREATURE_SHILL, 1); + instance->SetData(DATA_NPC_SHILL, 1); instance->SetData(DATA_SHILL, ENCOUNTER_STATE_IN_PROGRESS); } - if (instance->GetData(DATA_CREATURE_SHILL) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_NPC_SHILL) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS) { instance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED); SetEscortPaused(false); @@ -1052,11 +1060,11 @@ public: { if (!instance->GetData(DATA_GATE_C) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED) { - instance->SetData(DATA_CREATURE_CREST, 1); + instance->SetData(DATA_NPC_CREST, 1); me->Say(SAY_REGINALD_WINDSOR_13_2, LANG_UNIVERSAL, PlayerGUID); instance->SetData(DATA_CREST, ENCOUNTER_STATE_IN_PROGRESS); } - if (instance->GetData(DATA_CREATURE_CREST) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS) + if (instance->GetData(DATA_NPC_CREST) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); instance->SetData(DATA_CREST, ENCOUNTER_STATE_ENDED); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h index dcce7d0c374..b279012bbf7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h @@ -19,11 +19,14 @@ #ifndef DEF_BRD_H #define DEF_BRD_H -#define FACTION_NEUTRAL 734 -#define FACTION_HOSTILE 754 -#define FACTION_FRIEND 35 +enum FactionIds +{ + FACTION_NEUTRAL = 734, + FACTION_HOSTILE = 754, + FACTION_FRIEND = 35 +}; -enum eTypes +enum DataTypes { TYPE_RING_OF_LAW = 1, TYPE_VAULT = 2, @@ -57,4 +60,5 @@ enum eTypes DATA_SF_BRAZIER_S = 26, DATA_MOIRA = 27, }; + #endif diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index edcb1b5ca42..c5461484aec 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -25,7 +25,7 @@ enum Spells SPELL_WARSTOMP = 24375 }; -enum eEnums +enum Misc { DATA_THRONE_DOOR = 24 // not id or guid of doors but number of enum in blackrock_depths.h }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 2718797aa34..0bb57545230 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -22,11 +22,10 @@ #include "blackrock_depths.h" #define TIMER_TOMBOFTHESEVEN 15000 +#define MAX_ENCOUNTER 6 -enum eEnums +enum Creatures { - MAX_ENCOUNTER = 6, - NPC_EMPEROR = 9019, NPC_PHALANX = 9502, NPC_ANGERREL = 9035, @@ -37,8 +36,11 @@ enum eEnums NPC_GLOOMREL = 9037, NPC_DOOMREL = 9039, NPC_MAGMUS = 9938, - NPC_MOIRA = 8929, + NPC_MOIRA = 8929 +}; +enum GameObjects +{ GO_ARENA1 = 161525, GO_ARENA2 = 161522, GO_ARENA3 = 161524, diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 04ae634eb55..c4b84996f7c 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -25,7 +25,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "deadmines.h" -enum eSpels +enum Spels { SPELL_TRASH = 3391, SPELL_SMITE_STOMP = 6432, diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h index 328f22656f6..c0d4f1d57cf 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h @@ -18,14 +18,14 @@ #ifndef DEF_GNOMEREGAN_H #define DEF_GNOMEREGAN_H -enum eGameObjects +enum GameObjectIds { GO_CAVE_IN_LEFT = 146085, GO_CAVE_IN_RIGHT = 146086, GO_RED_ROCKET = 103820 }; -enum eCreatures +enum CreatureIds { NPC_BLASTMASTER_EMI_SHORTFUSE = 7998, NPC_CAVERNDEEP_AMBUSHER = 6207, @@ -33,12 +33,12 @@ enum eCreatures NPC_CHOMPER = 6215 }; -enum eData +enum Data { TYPE_EVENT = 1 }; -enum eData64 +enum Data64 { DATA_GO_CAVE_IN_LEFT, DATA_GO_CAVE_IN_RIGHT, diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 69631ca90b9..0cd7b6d6744 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -27,20 +27,51 @@ EndScriptData */ #include "ScriptedCreature.h" #include "karazhan.h" -enum Moroes +enum Yells { SAY_AGGRO = 0, SAY_SPECIAL = 1, SAY_KILL = 2, - SAY_DEATH = 3, - - SPELL_VANISH = 29448, - SPELL_GARROTE = 37066, - SPELL_BLIND = 34694, - SPELL_GOUGE = 29425, - SPELL_FRENZY = 37023, + SAY_DEATH = 3 }; +enum Spells +{ + SPELL_VANISH = 29448, + SPELL_GARROTE = 37066, + SPELL_BLIND = 34694, + SPELL_GOUGE = 29425, + SPELL_FRENZY = 37023, + + // Adds + SPELL_MANABURN = 29405, + SPELL_MINDFLY = 29570, + SPELL_SWPAIN = 34441, + SPELL_SHADOWFORM = 29406, + + SPELL_HAMMEROFJUSTICE = 13005, + SPELL_JUDGEMENTOFCOMMAND = 29386, + SPELL_SEALOFCOMMAND = 29385, + + SPELL_DISPELMAGIC = 15090, + SPELL_GREATERHEAL = 29564, + SPELL_HOLYFIRE = 29563, + SPELL_PWSHIELD = 29408, + + SPELL_CLEANSE = 29380, + SPELL_GREATERBLESSOFMIGHT = 29381, + SPELL_HOLYLIGHT = 29562, + SPELL_DIVINESHIELD = 41367, + + SPELL_HAMSTRING = 9080, + SPELL_MORTALSTRIKE = 29572, + SPELL_WHIRLWIND = 29573, + + SPELL_DISARM = 8379, + SPELL_HEROICSTRIKE = 29567, + SPELL_SHIELDBASH = 11972, + SPELL_SHIELDWALL = 29390 +}; #define POS_Z 81.73f @@ -363,34 +394,6 @@ struct boss_moroes_guestAI : public ScriptedAI } }; -#define SPELL_MANABURN 29405 -#define SPELL_MINDFLY 29570 -#define SPELL_SWPAIN 34441 -#define SPELL_SHADOWFORM 29406 - -#define SPELL_HAMMEROFJUSTICE 13005 -#define SPELL_JUDGEMENTOFCOMMAND 29386 -#define SPELL_SEALOFCOMMAND 29385 - -#define SPELL_DISPELMAGIC 15090 //Self or other guest+Moroes -#define SPELL_GREATERHEAL 29564 //Self or other guest+Moroes -#define SPELL_HOLYFIRE 29563 -#define SPELL_PWSHIELD 29408 - -#define SPELL_CLEANSE 29380 //Self or other guest+Moroes -#define SPELL_GREATERBLESSOFMIGHT 29381 //Self or other guest+Moroes -#define SPELL_HOLYLIGHT 29562 //Self or other guest+Moroes -#define SPELL_DIVINESHIELD 41367 - -#define SPELL_HAMSTRING 9080 -#define SPELL_MORTALSTRIKE 29572 -#define SPELL_WHIRLWIND 29573 - -#define SPELL_DISARM 8379 -#define SPELL_HEROICSTRIKE 29567 -#define SPELL_SHIELDBASH 11972 -#define SPELL_SHIELDWALL 29390 - class boss_baroness_dorothea_millstipe : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index df291c161b2..b7f51d68ae5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -34,8 +34,11 @@ enum TerestianIllhoof SAY_DEATH = 2, SAY_AGGRO = 3, SAY_SACRIFICE = 4, - SAY_SUMMON = 5, + SAY_SUMMON = 5 +}; +enum Spells +{ SPELL_SUMMON_DEMONCHAINS = 30120, // Summons demonic chains that maintain the ritual of sacrifice. SPELL_DEMON_CHAINS = 30206, // Instant - Visual Effect SPELL_ENRAGE = 23537, // Increases the caster's attack speed by 50% and the Physical damage it deals by 219 to 281 for 10 min. @@ -51,11 +54,14 @@ enum TerestianIllhoof SPELL_FIREBOLT = 30050, // Blasts a target for 150 Fire damage. SPELL_BROKEN_PACT = 30065, // All damage taken increased by 25%. SPELL_AMPLIFY_FLAMES = 30053, // Increases the Fire damage taken by an enemy by 500 for 25 sec. +}; - CREATURE_DEMONCHAINS = 17248, - CREATURE_FIENDISHIMP = 17267, - CREATURE_PORTAL = 17265, - CREATURE_KILREK = 17229, +enum Creatures +{ + NPC_DEMONCHAINS = 17248, + NPC_FIENDISHIMP = 17267, + NPC_PORTAL = 17265, + NPC_KILREK = 17229 }; @@ -201,8 +207,6 @@ public: }; }; -#define SPELL_FIREBOLT 30050 // Blasts a target for 181-209 Fire damage. - class npc_fiendish_imp : public CreatureScript { public: @@ -325,7 +329,7 @@ public: void JustSummoned(Creature* summoned) { - if (summoned->GetEntry() == CREATURE_PORTAL) + if (summoned->GetEntry() == NPC_PORTAL) { PortalGUID[PortalsCount] = summoned->GetGUID(); ++PortalsCount; @@ -375,7 +379,7 @@ public: DoCast(target, SPELL_SACRIFICE, true); DoCast(target, SPELL_SUMMON_DEMONCHAINS, true); - if (Creature* Chains = me->FindNearestCreature(CREATURE_DEMONCHAINS, 5000)) + if (Creature* Chains = me->FindNearestCreature(NPC_DEMONCHAINS, 5000)) { CAST_AI(npc_demon_chain::npc_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID(); Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 3c78c2daa7c..14cb7e69d83 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -36,6 +36,28 @@ EndContentData */ #include "ScriptedEscortAI.h" #include "Player.h" +enum Spells +{ + // Barnes + SPELL_SPOTLIGHT = 25824, + SPELL_TUXEDO = 32616, + + // Berthold + SPELL_TELEPORT = 39567, + + // Image of Medivh + SPELL_FIRE_BALL = 30967, + SPELL_UBER_FIREBALL = 30971, + SPELL_CONFLAGRATION_BLAST = 30977, + SPELL_MANA_SHIELD = 31635 +}; + +enum Creatures +{ + NPC_ARCANAGOS = 17652, + NPC_SPOTLIGHT = 19525 +}; + /*###### # npc_barnesAI ######*/ @@ -96,11 +118,6 @@ float Spawns[6][2]= {17534, -10900}, // Julianne }; -#define CREATURE_SPOTLIGHT 19525 - -#define SPELL_SPOTLIGHT 25824 -#define SPELL_TUXEDO 32616 - #define SPAWN_Z 90.5f #define SPAWN_Y -1758 #define SPAWN_O 4.738f @@ -176,13 +193,13 @@ public: TalkCount = 0; SetEscortPaused(true); - if (Creature* pSpotlight = me->SummonCreature(CREATURE_SPOTLIGHT, + if (Creature* spotlight = me->SummonCreature(NPC_SPOTLIGHT, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) { - pSpotlight->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - pSpotlight->CastSpell(pSpotlight, SPELL_SPOTLIGHT, false); - m_uiSpotlightGUID = pSpotlight->GetGUID(); + spotlight->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + spotlight->CastSpell(spotlight, SPELL_SPOTLIGHT, false); + m_uiSpotlightGUID = spotlight->GetGUID(); } break; case 8: @@ -403,11 +420,6 @@ public: # npc_berthold ####*/ -enum eBerthold -{ - SPELL_TELEPORT = 39567 -}; - #define GOSSIP_ITEM_TELEPORT "Teleport me to the Guardian's Library" class npc_berthold : public CreatureScript @@ -453,11 +465,6 @@ public: #define SAY_DIALOG_ARCANAGOS_8 "What have you done, wizard? This cannot be! I'm burning from... within!" #define SAY_DIALOG_MEDIVH_9 "He should not have angered me. I must go... recover my strength now..." -#define NPC_ARCANAGOS 17652 -#define SPELL_FIRE_BALL 30967 -#define SPELL_UBER_FIREBALL 30971 -#define SPELL_CONFLAGRATION_BLAST 30977 -#define SPELL_MANA_SHIELD 31635 static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f}; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h index 208971f85dd..d50aac36bca 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h @@ -19,7 +19,7 @@ #ifndef DEF_KARAZHAN_H #define DEF_KARAZHAN_H -enum eEnums +enum DataTypes { TYPE_ATTUMEN = 1, TYPE_MOROES = 2, diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 687cc9d393c..7c5d36d662b 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -49,19 +49,34 @@ static Speech PlayerDeath[]= {9}, }; -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_DEATH = 10, +}; - SPELL_DISPEL_MAGIC = 27609, - SPELL_FLASH_HEAL = 17843, - SPELL_SW_PAIN_NORMAL = 14032, - SPELL_SW_PAIN_HEROIC = 15654, - SPELL_SHIELD = 44291, - SPELL_RENEW_NORMAL = 44174, - SPELL_RENEW_HEROIC = 46192, +enum Spells +{ + SPELL_DISPEL_MAGIC = 27609, + SPELL_FLASH_HEAL = 17843, + SPELL_SW_PAIN_NORMAL = 14032, + SPELL_SW_PAIN_HEROIC = 15654, + SPELL_SHIELD = 44291, + SPELL_RENEW_NORMAL = 44174, + SPELL_RENEW_HEROIC = 46192, + + // Apoko + SPELL_WINDFURY_TOTEM = 27621, + SPELL_WAR_STOMP = 46026, + SPELL_PURGE = 27626, + SPELL_LESSER_HEALING_WAVE = 44256, + SPELL_FROST_SHOCK = 21401, + SPELL_FIRE_NOVA_TOTEM = 44257, + SPELL_EARTHBIND_TOTEM = 15786 +}; +enum Misc +{ MAX_ACTIVE_LACKEY = 4 }; @@ -333,7 +348,7 @@ public: }; }; -enum eHealingPotion +enum HealingPotion { SPELL_HEALING_POTION = 15503 }; @@ -472,7 +487,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } }; -enum eRogueSpells +enum RogueSpells { SPELL_KIDNEY_SHOT = 27615, SPELL_GOUGE = 12540, @@ -575,7 +590,7 @@ public: }; }; -enum eWarlockSpells +enum WarlockSpells { SPELL_IMMOLATE = 44267, SPELL_SHADOW_BOLT = 12471, @@ -671,7 +686,7 @@ public: }; }; -enum eKickDown +enum KickDown { SPELL_KNOCKDOWN = 11428, SPELL_SNAP_KICK = 46182 @@ -727,7 +742,7 @@ public: }; }; -enum eMageSpells +enum MageSpells { SPELL_POLYMORPH = 13323, SPELL_ICE_BLOCK = 27619, @@ -857,7 +872,7 @@ public: }; }; -enum eWarriorSpells +enum WarriorSpells { SPELL_INTERCEPT_STUN = 27577, SPELL_DISARM = 27581, @@ -976,7 +991,7 @@ public: }; }; -enum eHunterSpells +enum HunterSpells { SPELL_AIMED_SHOT = 44271, SPELL_SHOOT = 15620, @@ -1099,17 +1114,6 @@ public: }; }; -enum Spells -{ - SPELL_WINDFURY_TOTEM = 27621, - SPELL_WAR_STOMP = 46026, - SPELL_PURGE = 27626, - SPELL_LESSER_HEALING_WAVE = 44256, - SPELL_FROST_SHOCK = 21401, - SPELL_FIRE_NOVA_TOTEM = 44257, - SPELL_EARTHBIND_TOTEM = 15786 -}; - class boss_apoko : public CreatureScript { public: @@ -1198,7 +1202,7 @@ public: }; }; -enum eEngineerSpells +enum EngineerSpells { SPELL_GOBLIN_DRAGON_GUN = 44272, SPELL_ROCKET_LAUNCH = 44137, diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index d9de112992b..22d127f3d22 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -27,35 +27,44 @@ EndScriptData */ #include "ScriptedCreature.h" #include "magisters_terrace.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_ENERGY = 1, SAY_OVERLOAD = 2, SAY_KILL = 3, - EMOTE_DISCHARGE_ENERGY = 4, + EMOTE_DISCHARGE_ENERGY = 4 //is this text for real? //#define SAY_DEATH "What...happen...ed." +}; - //Pure energy spell info +enum Spells +{ + // Pure energy spell info SPELL_ENERGY_BOLT = 46156, SPELL_ENERGY_FEEDBACK = 44335, - //Vexallus spell info + // Vexallus spell info SPELL_CHAIN_LIGHTNING = 44318, - SPELL_H_CHAIN_LIGHTNING = 46380, //heroic spell + SPELL_H_CHAIN_LIGHTNING = 46380, // heroic spell SPELL_OVERLOAD = 44353, SPELL_ARCANE_SHOCK = 44319, - SPELL_H_ARCANE_SHOCK = 46381, //heroic spell + SPELL_H_ARCANE_SHOCK = 46381, // heroic spell - SPELL_SUMMON_PURE_ENERGY = 44322, //mod scale -10 - H_SPELL_SUMMON_PURE_ENERGY1 = 46154, //mod scale -5 - H_SPELL_SUMMON_PURE_ENERGY2 = 46159, //mod scale -5 + SPELL_SUMMON_PURE_ENERGY = 44322, // mod scale -10 + H_SPELL_SUMMON_PURE_ENERGY1 = 46154, // mod scale -5 + H_SPELL_SUMMON_PURE_ENERGY2 = 46159 // mod scale -5 + +}; - //Creatures +enum Creatures +{ NPC_PURE_ENERGY = 24745, +}; +enum Misc +{ INTERVAL_MODIFIER = 15, INTERVAL_SWITCH = 6 }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 2eb9bc83178..ca06c29c4c8 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -37,11 +37,19 @@ EndContentData */ ## npc_kalecgos ######*/ -enum eEnums +enum Spells { SPELL_TRANSFORM_TO_KAEL = 44670, - SPELL_ORB_KILL_CREDIT = 46307, - NPC_KAEL = 24848, //human form entry + SPELL_ORB_KILL_CREDIT = 46307 +}; + +enum Creatures +{ + NPC_KAEL = 24848 //human form entry +}; + +enum Misc +{ POINT_ID_LAND = 1 }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 1e7ae1d16b7..91fa6b7df94 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -26,16 +26,19 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, - SAY_SPECIALAE = 1, + SAY_SPECIALAE = 1 +}; +enum Spells +{ SPELL_POLYMORPH = 13323, SPELL_AOESILENCE = 8988, SPELL_ARCANEEXPLOSION = 9433, SPELL_FIREAOE = 9435, - SPELL_ARCANEBUBBLE = 9438, + SPELL_ARCANEBUBBLE = 9438 }; class boss_arcanist_doan : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index cdd67645213..4b1633a80b6 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -26,12 +26,15 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_HEALTH = 1, - SAY_KILL = 2, + SAY_KILL = 2 +}; +enum Spells +{ SPELL_FLAMESHOCK = 8053, SPELL_SHADOWBOLT = 1106, SPELL_FLAMESPIKE = 8814, diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 8db98127f65..e27e78383f7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eSpells +enum Spells { SPELL_CURSEOFBLOOD = 8282, SPELL_DISPELMAGIC = 15090, diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 6bdf1a16b03..f0f5c3611ab 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -26,9 +26,13 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, +}; + +enum Spells +{ SPELL_SUMMONSCARLETHOUND = 17164, SPELL_BLOODLUST = 6742 }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h index 52710cd348e..fbbca46738c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h @@ -16,10 +16,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DEF_SCARLET_M -#define DEF_SCARLET_M +#ifndef SCARLET_M_ +#define SCARLET_M_ -enum eEnums +enum DataTypes { TYPE_MOGRAINE_AND_WHITE_EVENT = 1, @@ -32,4 +32,5 @@ enum eEnums DATA_VORREL = 7 }; -#endif + +#endif // SCARLET_M_ diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index d233b09bed2..d28b21992b5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -26,11 +26,14 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_CURSEOFBLOOD 24673 -//#define SPELL_ILLUSION 17773 +enum Spells +{ + SPELL_CURSEOFBLOOD = 24673, + //SPELL_ILLUSION = 17773, -//Spells of Illusion of Jandice Barov -#define SPELL_CLEAVE 15584 + // Spells of Illusion of Jandice Barov + SPELL_CLEAVE = 15584 +}; class boss_jandice_barov : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 3585debb1c2..5fc5c48e049 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -57,7 +57,7 @@ enum Events EVENT_KIRTONOS_TRANSFORM = 14 }; -enum eMisc +enum Misc { WEAPON_KIRTONOS_STAFF = 11365, POINT_KIRTONOS_LAND = 13, diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index b7556334691..cfc1376b3ae 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -26,8 +26,11 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_SHADOWBOLTVOLLEY 20741 -#define SPELL_BONESHIELD 27688 +enum Spells +{ + SPELL_SHADOWBOLTVOLLEY = 20741, + SPELL_BONESHIELD = 27688 +}; class boss_kormok : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index e606ff2229f..2551400ccc3 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -26,13 +26,17 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Emotes +{ + EMOTE_FRENZY_KILL = 0 +}; + +enum Spells { - EMOTE_FRENZY_KILL = 0, SPELL_FLAMESTRIKE = 18399, SPELL_BLAST_WAVE = 16046, SPELL_FIRESHIELD = 19626, - SPELL_FRENZY = 8269 //28371, + SPELL_FRENZY = 8269 // 28371 }; class boss_vectus : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 4afefa5a688..9e351360f3c 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -31,21 +31,30 @@ EndScriptData */ #define MAX_ENCOUNTER 4 -enum eEnums +enum Yells { SAY_BOSS_DIE_AD = 4, SAY_BOSS_DIE_AS = 3, - SAY_ARCHMAGE = 0, + SAY_ARCHMAGE = 0 +}; +enum Creatures +{ NPC_ASH = 3850, NPC_ADA = 3849, NPC_ARCHMAGE_ARUGAL = 4275, - NPC_ARUGAL_VOIDWALKER = 4627, + NPC_ARUGAL_VOIDWALKER = 4627 +}; - GO_COURTYARD_DOOR = 18895, //door to open when talking to NPC's - GO_SORCERER_DOOR = 18972, //door to open when Fenrus the Devourer - GO_ARUGAL_DOOR = 18971, //door to open when Wolf Master Nandos +enum GameObjects +{ + GO_COURTYARD_DOOR = 18895, //door to open when talking to NPC's + GO_SORCERER_DOOR = 18972, //door to open when Fenrus the Devourer + GO_ARUGAL_DOOR = 18971 //door to open when Wolf Master Nandos +}; +enum Spells +{ SPELL_ASHCROMBE_TELEPORT = 15742 }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 156d31c804f..0b0556fb3a8 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -40,7 +40,7 @@ EndContentData */ ## npc_shadowfang_prisoner ######*/ -enum eEnums +enum Yells { SAY_FREE_AS = 0, SAY_OPEN_DOOR_AS = 1, @@ -48,14 +48,21 @@ enum eEnums SAY_FREE_AD = 0, SAY_OPEN_DOOR_AD = 1, SAY_POST1_DOOR_AD = 2, - SAY_POST2_DOOR_AD = 3, + SAY_POST2_DOOR_AD = 3 +}; +enum Spells +{ SPELL_UNLOCK = 6421, - NPC_ASH = 3850, SPELL_DARK_OFFERING = 7154 }; +enum Creatures +{ + NPC_ASH = 3850 +}; + #define GOSSIP_ITEM_DOOR "Thanks, I'll follow you to the door." class npc_shadowfang_prisoner : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h index cee4e5ffc1e..1823d24ab2e 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h @@ -19,7 +19,7 @@ #ifndef DEF_SHADOWFANG_H #define DEF_SHADOWFANG_H -enum eData +enum DataTypes { TYPE_FREE_NPC = 1, TYPE_RETHILGORE = 2, diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 258bef64612..9d239af33c7 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -27,10 +27,13 @@ EndScriptData */ #include "ScriptedCreature.h" #include "stratholme.h" -#define SPELL_BANSHEEWAIL 16565 -#define SPELL_BANSHEECURSE 16867 -#define SPELL_SILENCE 18327 -//#define SPELL_POSSESS 17244 +enum Spells +{ + SPELL_BANSHEEWAIL = 16565, + SPELL_BANSHEECURSE = 16867, + SPELL_SILENCE = 18327 + //SPELL_POSSESS = 17244 +}; class boss_baroness_anastari : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 345f42d21c8..cdf76bba3ed 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -72,10 +72,13 @@ EndScriptData */ #define ADD_9Z 125.001015f #define ADD_9O 0.592007f -#define SPELL_KNOCKAWAY 10101 -#define SPELL_PUMMEL 15615 -#define SPELL_SHOOT 16496 -//#define SPELL_SUMMONCRIMSONRIFLEMAN 17279 +enum Spells +{ + SPELL_KNOCKAWAY = 10101, + SPELL_PUMMEL = 15615, + SPELL_SHOOT = 16496 + //SPELL_SUMMONCRIMSONRIFLEMAN = 17279 +}; class boss_cannon_master_willey : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 593b2fd53b1..783579f37a9 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eEnums +enum Spells { //Dathrohan spells SPELL_CRUSADERSHAMMER = 17286, //AOE stun @@ -41,8 +41,11 @@ enum eEnums SPELL_MINDBLAST = 17287, SPELL_PSYCHICSCREAM = 13704, SPELL_SLEEP = 12098, - SPELL_MINDCONTROL = 15690, + SPELL_MINDCONTROL = 15690 +}; +enum Creatures +{ NPC_DATHROHAN = 10812, NPC_BALNAZZAR = 10813, NPC_ZOMBIE = 10698 //probably incorrect diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index db5509662ef..525c7f48f1c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -27,13 +27,19 @@ EndScriptData */ #include "ScriptedCreature.h" #include "stratholme.h" -#define SPELL_DRAININGBLOW 16793 -#define SPELL_CROWDPUMMEL 10887 -#define SPELL_MIGHTYBLOW 14099 -#define SPELL_FURIOUS_ANGER 16791 +enum Spells +{ + SPELL_DRAININGBLOW = 16793, + SPELL_CROWDPUMMEL = 10887, + SPELL_MIGHTYBLOW = 14099, + SPELL_FURIOUS_ANGER = 16791 +}; -#define MODEL_NORMAL 10433 -#define MODEL_HUMAN 3637 +enum Models +{ + MODEL_NORMAL = 10433, + MODEL_HUMAN = 3637 +}; class boss_magistrate_barthilas : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 83fbcac20fd..82135d0cae9 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -27,10 +27,14 @@ EndScriptData */ #include "ScriptedCreature.h" #include "stratholme.h" -#define SPELL_FROSTBOLT 17503 -#define SPELL_DRAINLIFE 20743 -#define SPELL_DRAIN_MANA 17243 -#define SPELL_ICETOMB 16869 +enum Spells +{ + SPELL_FROSTBOLT = 17503, + SPELL_DRAINLIFE = 20743, + SPELL_DRAIN_MANA = 17243, + SPELL_ICETOMB = 16869 + +}; class boss_maleki_the_pallid : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index a8b981dc44f..9b6ef8fb214 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -116,11 +116,19 @@ public: ## npc_restless_soul ######*/ -#define SPELL_EGAN_BLASTER 17368 -#define SPELL_SOUL_FREED 17370 -#define QUEST_RESTLESS_SOUL 5282 -#define ENTRY_RESTLESS 11122 -#define ENTRY_FREED 11136 +enum RestlessSoul +{ + // Spells + SPELL_EGAN_BLASTER = 17368, + SPELL_SOUL_FREED = 17370, + + // Quest + QUEST_RESTLESS_SOUL = 5282, + + // Creatures + NPC_RESTLESS = 11122, + NPC_FREED = 11136 +}; class npc_restless_soul : public CreatureScript { @@ -170,7 +178,7 @@ public: void JustDied(Unit* /*killer*/) { if (Tagged) - me->SummonCreature(ENTRY_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000); + me->SummonCreature(NPC_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000); } void UpdateAI(uint32 diff) @@ -182,7 +190,7 @@ public: if (Unit* temp = Unit::GetUnit(*me, Tagger)) { if (Player* player = temp->ToPlayer()) - player->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID()); + player->KilledMonsterCredit(NPC_RESTLESS, me->GetGUID()); me->Kill(me); } } @@ -198,7 +206,7 @@ public: ## npc_spectral_ghostly_citizen ######*/ -enum eGhostlyCitizenSpells +enum GhostlyCitizenSpells { SPELL_HAUNTING_PHANTOM = 16336, SPELL_SLAP = 6754 @@ -243,7 +251,7 @@ public: { //100%, 50%, 33%, 25% chance to spawn if (urand(1, i) == 1) - DoSummon(ENTRY_RESTLESS, me, 20.0f, 600000); + DoSummon(NPC_RESTLESS, me, 20.0f, 600000); } } } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 016b0aad62d..b16893df157 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "InstanceScript.h" #include "uldaman.h" -enum eSpells +enum Spells { SPELL_ARCHAEDAS_AWAKEN = 10347, SPELL_AWAKEN_VAULT_WALKER = 10258, diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 5f9577e12fa..a58a292373f 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -38,7 +38,7 @@ EndContentData */ ## npc_jadespine_basilisk ######*/ -enum eSpells +enum Spells { SPELL_CRYSTALLINE_SLUMBER = 3636, }; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h index 86f3d3b6d1e..15583312f5a 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h @@ -19,16 +19,9 @@ #ifndef DEF_ULDAMAN_H #define DEF_ULDAMAN_H -enum eObjects -{ - GO_ARCHAEDAS_TEMPLE_DOOR = 141869, - GO_ALTAR_OF_THE_KEEPER_TEMPLE_DOOR = 124367, - GO_ANCIENT_VAULT_DOOR = 124369, - GO_IRONAYA_SEAL_DOOR = 124372, - GO_KEYSTONE = 124371, -}; +#define MAX_ENCOUNTER 3 -enum eData +enum DataTypes { DATA_ALTAR_DOORS = 1, DATA_ANCIENT_DOOR = 2, @@ -38,6 +31,13 @@ enum eData DATA_IRONAYA_SEAL = 6, }; -#define MAX_ENCOUNTER 3 +enum GameObjectIds +{ + GO_ARCHAEDAS_TEMPLE_DOOR = 141869, + GO_ALTAR_OF_THE_KEEPER_TEMPLE_DOOR = 124367, + GO_ANCIENT_VAULT_DOOR = 124369, + GO_IRONAYA_SEAL_DOOR = 124372, + GO_KEYSTONE = 124371, +}; #endif diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 5965cadf814..6851a39cdb6 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -42,16 +42,18 @@ EndScriptData */ #define YELL_DEATH "Dis not... da end of me..." #define SOUND_YELL_DEATH 12051 -#define SPELL_SPIRIT_BOLTS 43383 -#define SPELL_DRAIN_POWER 44131 -#define SPELL_SIPHON_SOUL 43501 -#define NPC_TEMP_TRIGGER 23920 - -//Defines for various powers he uses after using soul drain +enum Creatures +{ + NPC_TEMP_TRIGGER = 23920 +}; enum Spells { + SPELL_SPIRIT_BOLTS = 43383, + SPELL_DRAIN_POWER = 44131, + SPELL_SIPHON_SOUL = 43501, + // Druid SPELL_DR_THORNS = 43420, SPELL_DR_LIFEBLOOM = 43421, @@ -100,7 +102,36 @@ enum Spells // Warrior SPELL_WR_MORTAL_STRIKE = 43441, SPELL_WR_WHIRLWIND = 43442, - SPELL_WR_SPELL_REFLECT = 43443 + SPELL_WR_SPELL_REFLECT = 43443, + + // Thurg + SPELL_BLOODLUST = 43578, + SPELL_CLEAVE = 15496, + + // Gazakroth + SPELL_FIREBOLT = 43584, + + // Alyson Antille + SPELL_FLASH_HEAL = 43575, + SPELL_DISPEL_MAGIC = 43577, + + // Lord Raadan + SPELL_FLAME_BREATH = 43582, + SPELL_THUNDERCLAP = 43583, + + // Darkheart + SPELL_PSYCHIC_WAIL = 43590, + + // Slither + SPELL_VENOM_SPIT = 43579, + + // Fenstalker + SPELL_VOLATILE_INFECTION = 43586, + + // Koragg + SPELL_COLD_STARE = 43593, + SPELL_MIGHTY_BLOW = 43592 + }; #define ORIENT 1.5696f @@ -483,9 +514,6 @@ class boss_hexlord_malacrass : public CreatureScript } }; -#define SPELL_BLOODLUST 43578 -#define SPELL_CLEAVE 15496 - class boss_thurg : public CreatureScript { public: @@ -543,9 +571,6 @@ class boss_thurg : public CreatureScript } }; -#define SPELL_FLASH_HEAL 43575 -#define SPELL_DISPEL_MAGIC 43577 - class boss_alyson_antille : public CreatureScript { public: @@ -643,8 +668,6 @@ class boss_alyson_antille : public CreatureScript } }; -#define SPELL_FIREBOLT 43584 - struct boss_gazakrothAI : public boss_hexlord_addAI { boss_gazakrothAI(Creature* creature) : boss_hexlord_addAI(creature) {} @@ -687,9 +710,6 @@ struct boss_gazakrothAI : public boss_hexlord_addAI } }; -#define SPELL_FLAME_BREATH 43582 -#define SPELL_THUNDERCLAP 43583 - class boss_lord_raadan : public CreatureScript { public: @@ -741,8 +761,6 @@ class boss_lord_raadan : public CreatureScript } }; -#define SPELL_PSYCHIC_WAIL 43590 - class boss_darkheart : public CreatureScript { public: @@ -784,7 +802,6 @@ class boss_darkheart : public CreatureScript } }; -#define SPELL_VENOM_SPIT 43579 class boss_slither : public CreatureScript { @@ -844,8 +861,6 @@ class boss_slither : public CreatureScript } }; -//Fenstalker -#define SPELL_VOLATILE_INFECTION 43586 class boss_fenstalker : public CreatureScript { public: @@ -889,10 +904,6 @@ class boss_fenstalker : public CreatureScript } }; -//Koragg -#define SPELL_COLD_STARE 43593 -#define SPELL_MIGHTY_BLOW 43592 - class boss_koragg : public CreatureScript { public: diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 3b8e3d5fdb2..c69f0885164 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -29,7 +29,7 @@ EndScriptData */ #include "GridNotifiers.h" #include "CellImpl.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_FIRE_BOMBS = 1, @@ -39,9 +39,12 @@ enum eEnums SAY_SLAY = 5, SAY_DEATH = 6, SAY_EVENT_STRANGERS = 7, - SAY_EVENT_FRIENDS = 8, + SAY_EVENT_FRIENDS = 8 +}; -// Jan'alai +enum Spells +{ + // Jan'alai SPELL_FLAME_BREATH = 43140, SPELL_FIRE_WALL = 43113, SPELL_ENRAGE = 44779, @@ -50,26 +53,28 @@ enum eEnums SPELL_HATCH_ALL = 43144, SPELL_BERSERK = 45078, -// -- Fire Bob Spells + // Fire Bob Spells SPELL_FIRE_BOMB_CHANNEL = 42621, // last forever SPELL_FIRE_BOMB_THROW = 42628, // throw visual SPELL_FIRE_BOMB_DUMMY = 42629, // bomb visual SPELL_FIRE_BOMB_DAMAGE = 42630, -// --Summons - NPC_AMANI_HATCHER = 23818, - NPC_HATCHLING = 23598, // 42493 - NPC_EGG = 23817, - NPC_FIRE_BOMB = 23920, - -// -- Hatcher Spells + // Hatcher Spells SPELL_HATCH_EGG = 42471, // 43734 SPELL_SUMMON_HATCHLING = 42493, -// -- Hatchling Spells + // Hatchling Spells SPELL_FLAMEBUFFET = 43299 }; +enum Creatures +{ + NPC_AMANI_HATCHER = 23818, + NPC_HATCHLING = 23598, // 42493 + NPC_EGG = 23817, + NPC_FIRE_BOMB = 23920 +}; + const int area_dx = 44; const int area_dy = 51; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index d73612a7935..f8c04acac4f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -30,7 +30,24 @@ EndScriptData */ #include "GridNotifiersImpl.h" #include "CellImpl.h" -//Trash Waves +enum Spells +{ + SPELL_BERSERK = 45078, + + // Troll form + SPELL_BRUTALSWIPE = 42384, + SPELL_MANGLE = 42389, + SPELL_MANGLEEFFECT = 44955, + SPELL_SURGE = 42402, + SPELL_BEARFORM = 42377, + + // Bear form + SPELL_LACERATINGSLASH = 42395, + SPELL_RENDFLESH = 42397, + SPELL_DEAFENINGROAR = 42398 +}; + +// Trash Waves float NalorakkWay[8][3] = { { 18.569f, 1414.512f, 11.42f}, // waypoint 1 @@ -69,26 +86,12 @@ float NalorakkWay[8][3] = #define SOUND_YELL_DEATH 12077 #define YELL_BERSERK "You had your chance, now it be too late!" //Never seen this being used, so just guessing from what I hear. #define SOUND_YELL_BERSERK 12074 - -#define SPELL_BERSERK 45078 - -//Defines for Troll form -#define SPELL_BRUTALSWIPE 42384 -#define SPELL_MANGLE 42389 -#define SPELL_MANGLEEFFECT 44955 -#define SPELL_SURGE 42402 -#define SPELL_BEARFORM 42377 - #define YELL_SURGE "I bring da pain!" #define SOUND_YELL_SURGE 12071 #define YELL_SHIFTEDTOTROLL "Make way for Nalorakk!" #define SOUND_YELL_TOTROLL 12073 -//Defines for Bear form -#define SPELL_LACERATINGSLASH 42395 -#define SPELL_RENDFLESH 42397 -#define SPELL_DEAFENINGROAR 42398 #define YELL_SHIFTEDTOBEAR "You call on da beast, you gonna get more dan you bargain for!" #define SOUND_YELL_TOBEAR 12072 diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 0c2c9597cfe..f466773af13 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -39,9 +39,16 @@ EndContentData */ ## npc_forest_frog ######*/ -#define SPELL_REMOVE_AMANI_CURSE 43732 -#define SPELL_PUSH_MOJO 43923 -#define ENTRY_FOREST_FROG 24396 +enum ForestFrog +{ + // Spells + SPELL_REMOVE_AMANI_CURSE = 43732, + SPELL_PUSH_MOJO = 43923, + + // Creatures + NPC_FOREST_FROG = 24396 + +}; class npc_forest_frog : public CreatureScript { @@ -98,7 +105,7 @@ class npc_forest_frog : public CreatureScript void SpellHit(Unit* caster, const SpellInfo* spell) { - if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == ENTRY_FOREST_FROG) + if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == NPC_FOREST_FROG) { //increase or decrease chance of mojo? if (rand()%99 == 50) DoCast(caster, SPELL_PUSH_MOJO, true); diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 872ea60ddf0..3db48f747c7 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -36,8 +36,9 @@ EndContentData */ ## npc_professor_phizzlethorpe ######*/ -enum eEnums +enum ProfessorPhizzlethorpe { + // Yells SAY_PROGRESS_1 = 0, SAY_PROGRESS_2 = 1, SAY_PROGRESS_3 = 2, @@ -49,7 +50,10 @@ enum eEnums EMOTE_PROGRESS_8 = 8, SAY_PROGRESS_9 = 9, + // Quests QUEST_SUNKEN_TREASURE = 665, + + // Creatures NPC_VENGEFUL_SURGE = 2776 }; diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 4f76edf4406..9151c1c3a24 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -38,9 +38,12 @@ EndContentData */ #define GOSSIP_ITEM_USHER "I wish to to visit the Rise of the Defiler." -#define SPELL_TELEPORT_SINGLE 12885 -#define SPELL_TELEPORT_SINGLE_IN_GROUP 13142 -#define SPELL_TELEPORT_GROUP 27686 +enum DeathlyUsher +{ + SPELL_TELEPORT_SINGLE = 12885, + SPELL_TELEPORT_SINGLE_IN_GROUP = 13142, + SPELL_TELEPORT_GROUP = 27686 +}; class npc_deathly_usher : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index df9265e5621..97b3ea89cbb 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -68,9 +68,12 @@ public: # boss_twilight_corrupter ######*/ -#define SPELL_SOUL_CORRUPTION 25805 -#define SPELL_CREATURE_OF_NIGHTMARE 25806 -#define SPELL_LEVEL_UP 24312 +enum TwilightCorrupter +{ + SPELL_SOUL_CORRUPTION = 25805, + SPELL_CREATURE_OF_NIGHTMARE = 25806, + SPELL_LEVEL_UP = 24312 +}; class boss_twilight_corrupter : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 0a68ade7e6b..ce89b91ed5f 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -96,7 +96,10 @@ public: ## npc_darrowshire_spirit ######*/ -#define SPELL_SPIRIT_SPAWNIN 17321 +enum DarrowshireSpirit +{ + SPELL_SPIRIT_SPAWNIN = 17321 +}; class npc_darrowshire_spirit : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index 09bf6feaccd..d9496d53756 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -109,8 +109,9 @@ public: ## npc_ranger_lilatha ######*/ -enum eEnums +enum RangerLilatha { + // Yells SAY_START = 0, SAY_PROGRESS1 = 1, SAY_PROGRESS2 = 2, @@ -119,9 +120,16 @@ enum eEnums SAY_END2 = 5, SAY_CAPTAIN_ANSWER = 0, + // Quests QUEST_ESCAPE_FROM_THE_CATACOMBS = 9212, + + // Gameobjects GO_CAGE = 181152, + + // Creature NPC_CAPTAIN_HELIOS = 16220, + + // Factions FACTION_SMOON_E = 1603 }; diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index ffd31937677..653c9daec32 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -37,7 +37,7 @@ EndContentData */ ## npc_00x09hl ######*/ -enum eOOX +enum OOX { SAY_OOX_START = 0, SAY_OOX_AGGRO = 1, @@ -151,7 +151,7 @@ public: ## npc_rinji ######*/ -enum eRinji +enum Rinji { SAY_RIN_BY_OUTRUNNER = 0, diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp index 55e1294d9e7..3cf25d90077 100644 --- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp @@ -26,7 +26,7 @@ Script Data End */ #include "ScriptedEscortAI.h" #include "Player.h" -enum eCorporalKeeshan +enum CorporalKeeshan { QUEST_MISSING_IN_ACTION = 219, diff --git a/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp index 0e7472fc63b..edb147d7a7e 100644 --- a/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp @@ -35,7 +35,7 @@ EndContentData */ /*####### # npc_blood_knight_stillblade #######*/ -enum eStillbladeData +enum StillbladeData { SAY_HEAL = 0, diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index c7b35df41fd..d9f773b83a7 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -37,7 +37,7 @@ EndContentData */ ## npc_deathstalker_erland ######*/ -enum eErland +enum Erland { SAY_QUESTACCEPT = 0, SAY_START = 1, diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index a7074eea114..e3a9465ffd3 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -80,7 +80,7 @@ public: ## npc_bartleby ######*/ -enum eBartleby +enum Bartleby { FACTION_ENEMY = 168, QUEST_BEAT = 1640 @@ -204,7 +204,7 @@ public: ## npc_lord_gregor_lescovar ######*/ -enum eLordGregorLescovar +enum LordGregorLescovar { SAY_GUARD_2 = 0, SAY_LESCOVAR_2 = 0, @@ -462,7 +462,7 @@ public: ## npc_tyrion_spybot ######*/ -enum eTyrionSpybot +enum TyrionSpybot { SAY_QUEST_ACCEPT_ATTACK = 0, SAY_SPYBOT_1 = 1, @@ -610,7 +610,7 @@ public: ## npc_tyrion ######*/ -enum eTyrion +enum Tyrion { NPC_TYRION_SPYBOT = 8856 }; diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index 347dea98966..86507624a38 100644 --- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp @@ -159,7 +159,7 @@ public: ## go_mausoleum_trigger ######*/ -enum eMausoleum +enum Mausoleum { QUEST_ULAG = 1819, NPC_ULAG = 6390, diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 892402251dc..a1dc0cb653f 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -276,11 +276,14 @@ public: ## npc_parqual_fintallas ######*/ -#define SPELL_MARK_OF_SHAME 6767 +enum ParqualFintallas +{ + SPELL_MARK_OF_SHAME = 6767 +}; -#define GOSSIP_HPF1 "Gul'dan" -#define GOSSIP_HPF2 "Kel'Thuzad" -#define GOSSIP_HPF3 "Ner'zhul" +#define GOSSIP_HPF1 "Gul'dan" +#define GOSSIP_HPF2 "Kel'Thuzad" +#define GOSSIP_HPF3 "Ner'zhul" class npc_parqual_fintallas : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 1e099a07844..f37a54cdbeb 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -112,7 +112,7 @@ public: ## npc_myranda_the_hag ######*/ -enum eMyranda +enum Myranda { QUEST_SUBTERFUGE = 5862, QUEST_IN_DREAMS = 5944, @@ -240,7 +240,7 @@ public: ## npcs_andorhal_tower ######*/ -enum eAndorhalTower +enum AndorhalTower { GO_BEACON_TORCH = 176093 }; @@ -278,7 +278,7 @@ public: ## npc_anchorite_truuen ######*/ -enum eTruuen +enum Truuen { NPC_GHOST_UTHER = 17233, NPC_THEL_DANIS = 1854, diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index a0c1c01d3a2..76712d6c53e 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -37,17 +37,25 @@ EndContentData */ ## npc_daphne_stilwell ######*/ -enum eEnums +enum DaphneStilwell { + // Yells SAY_DS_START = 0, SAY_DS_DOWN_1 = 1, SAY_DS_DOWN_2 = 2, SAY_DS_DOWN_3 = 3, SAY_DS_PROLOGUE = 4, + // Spells SPELL_SHOOT = 6660, + + // Quests QUEST_TOME_VALOR = 1651, + + // Creatures NPC_DEFIAS_RAIDER = 6180, + + // Equips EQUIP_ID_RIFLE = 2511 }; diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index faaeeaea8bd..86acfcd9794 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -37,7 +37,7 @@ EndContentData */ ## npc_tapoke_slim_jahn ######*/ -enum eTapokeSlim +enum TapokeSlim { QUEST_MISSING_DIPLO_PT11 = 1249, FACTION_ENEMY = 168, diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 78c66750c5c..ae4980c2d75 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -72,7 +72,7 @@ enum Spells SPELL_BERSERK = 32965, }; -enum eEnums +enum Factions { // any other constants FACTION_WORGEN = 24 diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index f4cb5c24e18..5d0f2321402 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -30,14 +30,8 @@ EndScriptData */ #include "Player.h" #include "CreatureTextMgr.h" -enum eEnums +enum Yells { - NPC_FELBOAR = 21878, - - SPELL_DEATH_COIL = 33130, - SPELL_ELIXIR_OF_FORTITUDE = 3593, - SPELL_BLUE_FIREWORK = 11540, - SAY_AGGRO1 = 0, SAY_AGGRO2 = 1, SAY_WP_1 = 2, @@ -52,6 +46,18 @@ enum eEnums SAY_RAND_2 = 11 }; +enum Spells +{ + SPELL_DEATH_COIL = 33130, + SPELL_ELIXIR_OF_FORTITUDE = 3593, + SPELL_BLUE_FIREWORK = 11540 +}; + +enum Creatures +{ + NPC_FELBOAR = 21878 +}; + #define GOSSIP_ITEM_1 "Click to Test Escort(Attack, Run)" #define GOSSIP_ITEM_2 "Click to Test Escort(NoAttack, Walk)" #define GOSSIP_ITEM_3 "Click to Test Escort(NoAttack, Run)" diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp index 1cfc1ef23ae..432e7e74c35 100644 --- a/src/server/scripts/Examples/example_gossip_codebox.cpp +++ b/src/server/scripts/Examples/example_gossip_codebox.cpp @@ -29,17 +29,20 @@ EndScriptData */ #include "Player.h" #include <cstring> -enum eEnums +enum Yells { - SPELL_POLYMORPH = 12826, - SPELL_MARK_OF_THE_WILD = 26990, - - //These texts must be added to the creature texts of the npc for which the script is assigned. + // These texts must be added to the creature texts of the npc for which the script is assigned. SAY_NOT_INTERESTED = 0, // "Normal select, guess you're not interested." SAY_WRONG = 1, // "Wrong!" SAY_CORRECT = 2 // "You're right, you are allowed to see my inner secrets." }; +enum Spells +{ + SPELL_POLYMORPH = 12826, + SPELL_MARK_OF_THE_WILD = 26990 +}; + #define GOSSIP_ITEM_1 "A quiz: what's your name?" #define GOSSIP_ITEM_2 "I'm not interested" diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h index 0d926de79d8..46deda8e4c8 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h @@ -16,8 +16,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DEF_BFD_H -#define DEF_BFD_H +#ifndef BFD_H_ +#define BFD_H_ enum Data64 { @@ -41,7 +41,7 @@ enum Data DATA_EVENT }; -enum Creatures +enum CreatureIds { NPC_TWILIGHT_LORD_KELRIS = 4832, NPC_LORGUS_JETT = 12902, @@ -54,7 +54,7 @@ enum Creatures NPC_MORRIDUNE = 6729 }; -enum GameObjects +enum GameObjectIds { GO_SHRINE_OF_GELIHAST = 103015, GO_FIRE_OF_AKU_MAI_1 = 21118, @@ -64,4 +64,5 @@ enum GameObjects GO_AKU_MAI_DOOR = 21117, GO_ALTAR_OF_THE_DEEPS = 103016 }; -#endif + +#endif // BFD_H_ diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h index 056187d202e..7d8b06f1b02 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -19,15 +19,25 @@ #ifndef DEF_OLD_HILLSBRAD_H #define DEF_OLD_HILLSBRAD_H -#define TYPE_BARREL_DIVERSION 1 -#define TYPE_THRALL_EVENT 2 -#define TYPE_THRALL_PART1 3 -#define TYPE_THRALL_PART2 4 -#define TYPE_THRALL_PART3 5 -#define TYPE_THRALL_PART4 6 -#define DATA_THRALL 7 -#define DATA_TARETHA 8 -#define DATA_EPOCH 9 -#define WORLD_STATE_OH 2436 +enum DataTypes +{ + TYPE_BARREL_DIVERSION = 1, + TYPE_THRALL_EVENT = 2, + TYPE_THRALL_PART1 = 3, + TYPE_THRALL_PART2 = 4, + TYPE_THRALL_PART3 = 5, + TYPE_THRALL_PART4 = 6, + + DATA_THRALL = 7, + DATA_TARETHA = 8, + DATA_EPOCH = 9 + +}; + +enum WorldStateIds +{ + WORLD_STATE_OH = 2436 +}; + #endif diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index b7419d53db2..58c9731814d 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -145,15 +145,15 @@ public: switch (uiGongWaves) { case 1: - uiCreature = CREATURE_TOMB_FIEND; + uiCreature = NPC_TOMB_FIEND; uiSummonTimes = 7; break; case 10: - uiCreature = CREATURE_TOMB_REAVER; + uiCreature = NPC_TOMB_REAVER; uiSummonTimes = 3; break; case 16: - uiCreature = CREATURE_TUTEN_KASH; + uiCreature = NPC_TUTEN_KASH; break; default: break; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 6b63c98e7d8..7d7e050f010 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -37,12 +37,16 @@ EndContentData */ # npc_henry_stern ####*/ -enum eEnums +enum Spells { SPELL_GOLDTHORN_TEA = 13028, SPELL_TEACHING_GOLDTHORN_TEA = 13029, SPELL_MIGHT_TROLLS_BLOOD_POTION = 3451, SPELL_TEACHING_MIGHTY_TROLLS_BLOOD_POTION = 13030, +}; + +enum Gossips +{ GOSSIP_TEXT_TEA_ANSWER = 2114, GOSSIP_TEXT_POTION_ANSWER = 2115, }; @@ -111,7 +115,7 @@ public: }; -enum eTombCreature +enum TombCreature { SPELL_WEB = 745 }; @@ -148,7 +152,7 @@ public: return; //from acid - if (me->GetEntry() == CREATURE_TOMB_REAVER) + if (me->GetEntry() == NPC_TOMB_REAVER) { if (uiWebTimer <= uiDiff) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h index 3b132561deb..c0f63474f23 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h @@ -18,27 +18,27 @@ #ifndef DEF_RAZORFEN_DOWNS_H #define DEF_RAZORFEN_DOWNS_H -enum eData +enum Data { BOSS_TUTEN_KASH, DATA_GONG_WAVES }; -enum eData64 +enum Data64 { DATA_GONG }; -enum eGameObject +enum GameObjectIds { GO_GONG = 148917 }; -enum eCreature +enum CreatureId { - CREATURE_TOMB_FIEND = 7349, - CREATURE_TOMB_REAVER = 7351, - CREATURE_TUTEN_KASH = 7355 + NPC_TOMB_FIEND = 7349, + NPC_TOMB_REAVER = 7351, + NPC_TUTEN_KASH = 7355 }; #endif diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 9935248c39e..413214e4366 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -27,16 +27,19 @@ EndScriptData */ #include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" -#define SPELL_CLEAVE 26350 -#define SPELL_TOXIC_VOLLEY 25812 -#define SPELL_POISON_CLOUD 38718 //Only Spell with right dmg. -#define SPELL_ENRAGE 34624 //Changed cause 25790 is casted on gamers too. Same prob with old explosion of twin emperors. +enum Spells +{ + SPELL_CLEAVE = 26350, + SPELL_TOXIC_VOLLEY = 25812, + SPELL_POISON_CLOUD = 38718, //Only Spell with right dmg. + SPELL_ENRAGE = 34624, //Changed cause 25790 is casted on gamers too. Same prob with old explosion of twin emperors. -#define SPELL_CHARGE 26561 -#define SPELL_KNOCKBACK 26027 + SPELL_CHARGE = 26561, + SPELL_KNOCKBACK = 26027, -#define SPELL_HEAL 25807 -#define SPELL_FEAR 19408 + SPELL_HEAL = 25807, + SPELL_FEAR = 19408 +}; class boss_kri : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 7456d00ae90..eaea49327f1 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -92,7 +92,7 @@ enum Spells // ***** Main Phase 2 ****** //Body spells - //#define SPELL_CARAPACE_CTHUN 26156 //Was removed from client dbcs + //SPELL_CARAPACE_CTHUN = 26156 //Was removed from client dbcs SPELL_TRANSFORM = 26232, SPELL_PURPLE_COLORATION = 22581, //Probably not the right spell but looks similar diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 4b442604881..c267dd1a8e0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -32,11 +32,14 @@ EndScriptData */ #define SOUND_TRESPASS 8591 #define SOUND_WILL_BE 8592 -#define SPELL_MORTAL_WOUND 28467 -#define SPELL_ROOT 28858 +enum Spells +{ + SPELL_MORTAL_WOUND = 28467, + SPELL_ROOT = 28858, -// Enrage for his spawns -#define SPELL_ENRAGE 28798 + // Enrage for his spawns + SPELL_ENRAGE = 28798 +}; class boss_fankriss : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index f2e901458cd..6161f8bf552 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -36,25 +36,28 @@ EndScriptData */ #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#define SPELL_MENDING_BUFF 2147 +enum Spells +{ + SPELL_MENDING_BUFF = 2147, -#define SPELL_KNOCK_BUFF 21737 -#define SPELL_KNOCK 25778 -#define SPELL_MANAB_BUFF 812 -#define SPELL_MANAB 25779 + SPELL_KNOCK_BUFF = 21737, + SPELL_KNOCK = 25778, + SPELL_MANAB_BUFF = 812, + SPELL_MANAB = 25779, -#define SPELL_REFLECTAF_BUFF 13022 -#define SPELL_REFLECTSFr_BUFF 19595 -#define SPELL_THORNS_BUFF 25777 + SPELL_REFLECTAF_BUFF = 13022, + SPELL_REFLECTSFr_BUFF = 19595, + SPELL_THORNS_BUFF = 25777, -#define SPELL_THUNDER_BUFF 2834 -#define SPELL_THUNDER 8732 + SPELL_THUNDER_BUFF = 2834, + SPELL_THUNDER = 8732, -#define SPELL_MSTRIKE_BUFF 9347 -#define SPELL_MSTRIKE 24573 + SPELL_MSTRIKE_BUFF = 9347, + SPELL_MSTRIKE = 24573, -#define SPELL_STORM_BUFF 2148 -#define SPELL_STORM 26546 + SPELL_STORM_BUFF = 2148, + SPELL_STORM = 26546 +}; class npc_anubisath_sentinel : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h index c8a1d4b3159..0a1848acbf9 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h @@ -19,7 +19,7 @@ #ifndef DEF_WAILING_CAVERNS_H #define DEF_WAILING_CAVERNS_H -enum eTypes +enum DataTypes { TYPE_LORD_COBRAHN = 1, TYPE_LORD_PYTHAS = 2, diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 7d6d6bd003a..83a6cf4a17a 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -21,8 +21,14 @@ #include "Player.h" #include "TemporarySummon.h" -#define NPC_GAHZRILLA 7273 -#define PATH_ADDS 81553 +enum Misc +{ + // Creatures + NPC_GAHZRILLA = 7273, + + // Paths + PATH_ADDS = 81553 +}; int const pyramidSpawnTotal = 54; /* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h index 3a97117f520..8473ee1d39d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DEF_AHNKAHET_H -#define DEF_AHNKAHET_H +#ifndef AHNKAHET_H_ +#define AHNKAHET_H_ enum Data64 { @@ -47,4 +47,4 @@ enum Data DATA_ALL_INITIAND_DEAD }; -#endif +#endif // AHNKAHET_H_ diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 725dd88f137..c4613bf4005 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -40,7 +40,7 @@ enum Creatures NPC_TRIGGER = 19656 }; -enum event +enum Events { EVENT_SPAWN = 1, EVENT_MINI, diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index d6d079eac17..9b80ef9cfe4 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -57,8 +57,11 @@ const Position JedogaPosition[2] = {372.330994f, -705.278015f, -16.179716f, 5.427970f} }; -#define ACTION_INITIAND_KILLED 1 -#define DATA_VOLUNTEER_WORK 2 +enum Misc +{ + ACTION_INITIAND_KILLED = 1, + DATA_VOLUNTEER_WORK = 2 +}; class boss_jedoga_shadowseeker : public CreatureScript { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 72bae8c17d4..6ec2a416287 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -21,7 +21,7 @@ enum Spells { - SPELL_BLOODTHIRST = 55968, //Trigger Spell + add aura + SPELL_BLOODTHIRST = 55968, // Trigger Spell + add aura SPELL_CONJURE_FLAME_SPHERE = 55931, SPELL_FLAME_SPHERE_SUMMON_1 = 55895, // 1x 30106 H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511, // 1x 31686 @@ -40,14 +40,16 @@ enum Spells H_CREATURE_FLAME_SPHERE_2 = 31687, SPELL_HOVER_FALL = 60425 }; + enum Misc { DATA_EMBRACE_DMG = 20000, H_DATA_EMBRACE_DMG = 40000, - DATA_SPHERE_DISTANCE = 15 + DATA_SPHERE_DISTANCE = 15 }; -#define DATA_SPHERE_ANGLE_OFFSET 0.7f -#define DATA_GROUND_POSITION_Z 11.30809f + +#define DATA_SPHERE_ANGLE_OFFSET 0.7f +#define DATA_GROUND_POSITION_Z 11.30809f enum Yells { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 344b0dfe03a..5970a85cc38 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -27,6 +27,7 @@ enum Data64 DATA_WATCHER_SILTHIK, DATA_WATCHER_NARJIL }; + enum Data { DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 84fad199958..8de5baad0b8 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -124,7 +124,10 @@ enum Enums POINT_ID_LAND = 200, }; -#define DATA_CAN_LOOT 0 +enum Misc +{ + DATA_CAN_LOOT = 0 +}; struct Waypoint { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h index 7318e73dea1..7d2403be469 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h @@ -18,7 +18,7 @@ #ifndef DEF_OBSIDIAN_SANCTUM_H #define DEF_OBSIDIAN_SANCTUM_H -enum eTypes +enum DataTypes { TYPE_SARTHARION_EVENT = 1, TYPE_TENEBRON_PREKILLED = 2, @@ -28,12 +28,19 @@ enum eTypes DATA_SARTHARION = 10, DATA_TENEBRON = 11, DATA_SHADRON = 12, - DATA_VESPERON = 13, + DATA_VESPERON = 13 +}; +enum CreaturesIds +{ NPC_SARTHARION = 28860, NPC_TENEBRON = 30452, NPC_SHADRON = 30451, - NPC_VESPERON = 30449, + NPC_VESPERON = 30449 +}; + +enum GameObjectIds +{ GO_TWILIGHT_PORTAL = 193988 }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 38d417ff075..742333d07c4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -30,7 +30,7 @@ EndScriptData */ #include "trial_of_the_champion.h" #include "Player.h" -enum eSpells +enum Spells { //Vehicle SPELL_CHARGE = 63010, @@ -75,7 +75,7 @@ enum eSpells SPELL_POISON_BOTTLE = 67701 }; -enum eSeat +enum Seats { SEAT_ID_0 = 0 }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index bf1d354deb6..e0415b2652b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -37,7 +37,7 @@ enum AIs AI_PET = 3 }; -enum eSpells +enum Spells { // generic SPELL_ANTI_AOE = 68595, diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 179f248d316..c6f6e881b8f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -25,7 +25,7 @@ #include "trial_of_the_crusader.h" #include "Player.h" -enum eYells +enum Yells { // Highlord Tirion Fordring - 34996 SAY_STAGE_0_01 = 0, @@ -83,7 +83,7 @@ enum eYells struct _Messages { - eAnnouncerMessages msgnum; + AnnouncerMessages msgnum; uint32 id; bool state; uint32 encounter; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index f42c985d3e5..0d64655db77 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -140,13 +140,13 @@ const Position EndSpawnLoc[]= {644.6250f, 149.2743f, 140.6015f, 0} // 2 - Portal to Dalaran }; -enum euiWorldStates +enum WorldStateIds { UPDATE_STATE_UI_SHOW = 4390, UPDATE_STATE_UI_COUNT = 4389 }; -enum eNorthrendBeasts +enum NorthrendBeasts { GORMOK_IN_PROGRESS = 1000, GORMOK_DONE = 1001, @@ -159,7 +159,7 @@ enum eNorthrendBeasts ICEHOWL_DONE = 3001 }; -enum eAnnouncerMessages +enum AnnouncerMessages { MSG_BEASTS = 724001, MSG_JARAXXUS = 724002, @@ -169,7 +169,7 @@ enum eAnnouncerMessages MSG_ANUBARAK = 724006 }; -enum eCreature +enum CreatureIds { NPC_BARRENT = 34816, NPC_TIRION = 34996, @@ -234,7 +234,7 @@ enum eCreature NPC_ANUBARAK = 34564 }; -enum eGameObject +enum GameObjectIds { GO_CRUSADERS_CACHE_10 = 195631, GO_CRUSADERS_CACHE_25 = 195632, @@ -260,7 +260,7 @@ enum eGameObject GO_PORTAL_TO_DALARAN = 195682 }; -enum eAchievementData +enum AchievementData { // Northrend Beasts UPPER_BACK_PAIN_10_PLAYER = 11779, diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 923f8a23d6f..690750bf586 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -42,8 +42,11 @@ enum Creatures NPC_RAPTOR_2 = 26628 }; -#define ACTION_RAPTOR_KILLED 1 -#define DATA_KING_DRED 2 +enum Misc +{ + ACTION_RAPTOR_KILLED = 1, + DATA_KING_DRED = 2 +}; class boss_dred : public CreatureScript { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 48bf4c72d43..0a06c8a7d23 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -31,7 +31,7 @@ enum Spells SPELL_CORPSE_EXPLODE = 49555, SPELL_CONSUME = 49380, SPELL_CONSUME_AURA = 49381, - //Heroic spells + // Heroic spells H_SPELL_CORPSE_EXPLODE = 59807, H_SPELL_CONSUME = 59803, H_SPELL_CONSUME_AURA = 59805, @@ -52,7 +52,10 @@ enum Creatures NPC_DRAKKARI_INVADER_2 = 27709 }; -#define DATA_CONSUMPTION_JUNCTION 1 +enum Misc +{ + DATA_CONSUMPTION_JUNCTION = 1 +}; Position AddSpawnPoint = { -260.493011f, -622.968018f, 26.605301f, 3.036870f }; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 599e2b834a9..faaa0da3968 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -70,7 +70,7 @@ enum Events EVENT_FACE_ANGER = 7, }; -enum eEnum +enum Models { DISPLAY_ANGER = 30148, DISPLAY_SORROW = 30149, @@ -111,7 +111,10 @@ struct outroPosition Position const CrucibleSummonPos = {5672.294f, 2520.686f, 713.4386f, 0.9599311f}; -#define DATA_THREE_FACED 1 +enum Misc +{ + DATA_THREE_FACED = 1 +}; class boss_devourer_of_souls : public CreatureScript { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 1073c29b667..cdbf445cb10 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -59,7 +59,7 @@ enum Yells SAY_SYLVANAS_INTRO_6 = 5, }; -enum eSylvanas +enum Misc { GOSSIP_SPEECHINTRO = 13525, ACTION_INTRO, diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 60209f04c30..4648b967764 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -136,7 +136,7 @@ enum Events EVENT_CLOSE_FROSTWORN_DOOR, }; -enum eEnum +enum Misc { ACTION_START_INTRO, ACTION_SKIP_INTRO, diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 48498b4dbeb..0f56150326e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -22,7 +22,7 @@ #include "pit_of_saron.h" #include "Vehicle.h" -enum eSpells +enum Spells { SPELL_FIREBALL = 69583, //Ymirjar Flamebearer SPELL_HELLFIRE = 69586, @@ -31,7 +31,7 @@ enum eSpells SPELL_LEAPING_FACE_MAUL = 69504, // Geist Ambusher }; -enum eEvents +enum Events { // Ymirjar Flamebearer EVENT_FIREBALL = 1, diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 1d2398dbfb4..3e7b46c06d0 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -58,7 +58,10 @@ enum CombatPhase RHINO }; -#define DATA_SHARE_THE_LOVE 1 +enum Misc +{ + DATA_SHARE_THE_LOVE = 1 +}; class boss_gal_darah : public CreatureScript { diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index bfc1b9cfcb6..8577f0f2851 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -19,7 +19,7 @@ #include "ScriptedCreature.h" #include "gundrak.h" -enum eSpells +enum Spells { SPELL_DETERMINED_STAB = 55104, SPELL_GROUND_TREMOR = 55142, @@ -32,7 +32,7 @@ enum eSpells SPELL_TRANSFORMATION = 55098, //Periodic, The caster transforms into a powerful mammoth, increasing Physical damage done by 25% and granting immunity to Stun effects. }; -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SLAY = 1, @@ -42,7 +42,10 @@ enum eSays EMOTE_TRANSFORM = 5 }; -#define DATA_LESS_RABI 1 +enum Misc +{ + DATA_LESS_RABI = 1 +}; class boss_moorabi : public CreatureScript { diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 71c4c1b4f41..bd355514315 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -21,7 +21,6 @@ #include "gundrak.h" #include "Player.h" -//Spells enum Spells { SPELL_POISON_NOVA = 55081, @@ -32,7 +31,6 @@ enum Spells H_SPELL_VENOM_BOLT = 59839 }; -//Yell enum Yells { SAY_AGGRO = 0, @@ -43,14 +41,12 @@ enum Yells EMOTE_NOVA = 5 }; -//Creatures enum Creatures { CREATURE_SNAKE = 29680, CREATURE_CONSTRICTORS = 29713 }; -//Creatures' spells enum ConstrictorSpells { SPELL_GRIP_OF_SLAD_RAN = 55093, @@ -68,7 +64,10 @@ static Position SpawnLoc[]= {1716.76f, 635.159f, 129.282f, 0.191986f} }; -#define DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES 1 +enum Misc +{ + DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES = 1 +}; class boss_slad_ran : public CreatureScript { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 08a14c3d700..4c07f7a4ce7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -199,7 +199,10 @@ enum Actions ACTION_MARK_OF_THE_FALLEN_CHAMPION = -72293, }; -#define DATA_MADE_A_MESS 45374613 // 4537, 4613 are achievement IDs +enum Misc +{ + DATA_MADE_A_MESS = 45374613 // 4537, 4613 are achievement IDs +}; enum MovePoints { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 998e87ce015..92855d35fbd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -71,7 +71,10 @@ enum Events EVENT_MORTAL_WOUND = 7, }; -#define DATA_INOCULATED_STACK 69291 +enum Misc +{ + DATA_INOCULATED_STACK = 69291 +}; class boss_festergut : public CreatureScript { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 192ba06426d..a90767bbb77 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -348,8 +348,11 @@ enum MiscData MOVIE_FALL_OF_THE_LICH_KING = 16, }; -#define DATA_PLAGUE_STACK 70337 -#define DATA_VILE 45814622 +enum Misc +{ + DATA_PLAGUE_STACK = 70337, + DATA_VILE = 45814622 +}; class NecroticPlagueTargetCheck : public std::unary_function<Unit*, bool> { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 3283d2b32b2..3cb93f7ac14 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -49,7 +49,10 @@ enum Events EVENT_FRENZY = 3 }; -#define DATA_FRENZY_DISPELS 1 +enum Misc +{ + DATA_FRENZY_DISPELS = 1 +}; class boss_faerlina : public CreatureScript { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index bc489eff438..02b6d54f33d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -19,15 +19,21 @@ #include "ScriptedCreature.h" #include "naxxramas.h" -#define SPELL_MORTAL_WOUND 25646 -#define SPELL_ENRAGE RAID_MODE(28371, 54427) -#define SPELL_DECIMATE RAID_MODE(28374, 54426) -#define SPELL_BERSERK 26662 -#define SPELL_INFECTED_WOUND 29306 +enum Spells +{ + SPELL_MORTAL_WOUND = 25646, + SPELL_ENRAGE = 28371, + SPELL_DECIMATE = 28374, + SPELL_BERSERK = 26662, + SPELL_INFECTED_WOUND = 29306 +}; -#define NPC_ZOMBIE 16360 +enum Creatures +{ + NPC_ZOMBIE = 16360 +}; -const Position PosSummon[3] = +Position const PosSummon[3] = { {3267.9f, -3172.1f, 297.42f, 0.94f}, {3253.2f, -3132.3f, 297.42f, 0}, @@ -36,8 +42,7 @@ const Position PosSummon[3] = enum Events { - EVENT_NONE, - EVENT_WOUND, + EVENT_WOUND = 1, EVENT_ENRAGE, EVENT_DECIMATE, EVENT_BERSERK, diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 7515321a3f6..ac3755b1468 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -48,8 +48,11 @@ enum Phases PHASE_DANCE, }; -#define ACTION_SAFETY_DANCE_FAIL 1 -#define DATA_SAFETY_DANCE 19962139 +enum Misc +{ + ACTION_SAFETY_DANCE_FAIL = 1, + DATA_SAFETY_DANCE = 19962139 +}; class boss_heigan : public CreatureScript { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index abd3fb35a51..5f86c1beb40 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -39,10 +39,13 @@ #define SOUND_DEATH 8860 #define SOUND_AGGROMIX 8847 -#define SPELL_UNBALANCING_STRIKE 26613 -#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107, 55543) -#define SPELL_JAGGED_KNIFE 55550 -#define SPELL_HOPELESS 29125 +enum Spells +{ + SPELL_UNBALANCING_STRIKE = 26613, + SPELL_DISRUPTING_SHOUT = 29107, + SPELL_JAGGED_KNIFE = 55550, + SPELL_HOPELESS = 29125 +}; enum Events { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 2f79f138f42..0ad0dbc45db 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -61,7 +61,10 @@ Position const RiftLocation[6] = { 651.72f, -297.44f, -9.37f, 0.0f } }; -#define DATA_CHAOS_THEORY 1 +enum Misc +{ + DATA_CHAOS_THEORY = 1 +}; class boss_anomalus : public CreatureScript { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp index 7f32b2bc4a5..bbe50ee908b 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp @@ -26,11 +26,15 @@ Script Data End */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_BATTLE_SHOUT 31403 -#define SPELL_CHARGE 60067 -#define SPELL_FRIGHTENING_SHOUT 19134 -#define SPELL_WHIRLWIND_1 38619 -#define SPELL_WHIRLWIND_2 38618 +enum Spells +{ + SPELL_BATTLE_SHOUT = 31403, + SPELL_CHARGE = 60067, + SPELL_FRIGHTENING_SHOUT = 19134, + SPELL_WHIRLWIND_1 = 38619, + SPELL_WHIRLWIND_2 = 38618 + +}; //not used //Yell diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 248a039b228..947d17e446f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -50,8 +50,11 @@ enum Yells SAY_SPLIT = 4 }; -#define ACTION_MAGUS_DEAD 1 -#define DATA_SPLIT_PERSONALITY 2 +enum Misc +{ + ACTION_MAGUS_DEAD = 1, + DATA_SPLIT_PERSONALITY = 2 +}; const Position CenterOfRoom = {504.80f, 89.07f, -16.12f, 6.27f}; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h index 7f3c96bcb33..58abfb3b63e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -18,7 +18,7 @@ #ifndef DEF_NEXUS_H #define DEF_NEXUS_H -enum eTypes +enum DataTypes { DATA_MAGUS_TELESTRA_EVENT, DATA_ANOMALUS_EVENT, diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 1f1954cb00c..f1df85853ca 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -55,7 +55,7 @@ enum Yells SAY_PLAYER_KILL = 7 }; -enum eCreature +enum Creatures { NPC_PHANTASMAL_CLOUDSCRAPER = 27645, NPC_PHANTASMAL_MAMMOTH = 27642, diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 08072e7f7a3..a6f03866ae1 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -27,9 +27,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "halls_of_lightning.h" -enum eEnums +enum Yells { - //Yell SAY_AGGRO = 0, SAY_DEFENSIVE_STANCE = 1, SAY_BATTLE_STANCE = 2, @@ -38,8 +37,11 @@ enum eEnums SAY_DEATH = 5, EMOTE_DEFENSIVE_STANCE = 6, EMOTE_BATTLE_STANCE = 7, - EMOTE_BERSEKER_STANCE = 8, + EMOTE_BERSEKER_STANCE = 8 +}; +enum Spells +{ SPELL_DEFENSIVE_STANCE = 53790, //SPELL_DEFENSIVE_AURA = 41105, SPELL_SPELL_REFLECTION = 36096, @@ -62,15 +64,25 @@ enum eEnums //SPELL_CHARGE_UP = 52098, // only used when starting walk from one platform to the other SPELL_TEMPORARY_ELECTRICAL_CHARGE = 52092, // triggered part of above - NPC_STORMFORGED_LIEUTENANT = 29240, SPELL_ARC_WELD = 59085, SPELL_RENEW_STEEL_N = 52774, - SPELL_RENEW_STEEL_H = 59160, + SPELL_RENEW_STEEL_H = 59160 +}; +enum Creatures +{ + NPC_STORMFORGED_LIEUTENANT = 29240 +}; + +enum Equips +{ EQUIP_SWORD = 37871, EQUIP_SHIELD = 35642, - EQUIP_MACE = 43623, + EQUIP_MACE = 43623 +}; +enum Stanges +{ STANCE_DEFENSIVE = 0, STANCE_BERSERKER = 1, STANCE_BATTLE = 2 diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index fe6c1c27155..a6fe9d35d94 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -28,10 +28,8 @@ EndScriptData */ #include "SpellScript.h" #include "halls_of_lightning.h" -enum eEnums +enum Yells { - ACHIEV_TIMELY_DEATH_START_EVENT = 20384, - SAY_INTRO_1 = 0, SAY_INTRO_2 = 1, SAY_AGGRO = 2, @@ -41,8 +39,11 @@ enum eEnums SAY_50HEALTH = 6, SAY_25HEALTH = 7, SAY_DEATH = 8, - EMOTE_NOVA = 9, + EMOTE_NOVA = 9 +}; +enum Spells +{ SPELL_ARC_LIGHTNING = 52921, SPELL_LIGHTNING_NOVA_N = 52960, SPELL_LIGHTNING_NOVA_H = 59835, @@ -52,6 +53,11 @@ enum eEnums SPELL_PULSING_SHOCKWAVE_AURA = 59414 }; +enum Misc +{ + ACHIEV_TIMELY_DEATH_START_EVENT = 20384 +}; + /*###### ## Boss Loken ######*/ diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h index 9968a27da93..c45feab1e8a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -19,7 +19,7 @@ #ifndef DEF_HALLS_OF_LIGHTNING_H #define DEF_HALLS_OF_LIGHTNING_H -enum eTypes +enum Types { MAX_ENCOUNTER = 4, @@ -32,12 +32,18 @@ enum eTypes TYPE_IONAR = 11, TYPE_LOKEN = 12, TYPE_VOLKHAN = 13, +}; +enum CreaturesIds +{ NPC_BJARNGRIM = 28586, NPC_VOLKHAN = 28587, NPC_IONAR = 28546, - NPC_LOKEN = 28923, + NPC_LOKEN = 28923 +}; +enum GameObjectIds +{ GO_BJARNGRIM_DOOR = 191416, //_doors10 GO_VOLKHAN_DOOR = 191325, //_doors07 GO_IONAR_DOOR = 191326, //_doors05 diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 377a9363fad..ad8710fefcc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -59,7 +59,12 @@ enum SjonnirCreatures CREATURE_IRON_SLUDGE = 28165 }; -#define DATA_TIME_BEFORE_OOZE 150000 //2min 30 secs +enum Misc +{ + DATA_TIME_BEFORE_OOZE = 150000, // 2min 30 secs + ACTION_OOZE_DEAD = 1, + DATA_ABUSE_THE_OOZE = 2 +}; struct Locations { @@ -72,9 +77,6 @@ static Locations PipeLocations[] = {1297.7f, 595.6f, 199.9f} //right }; -#define ACTION_OOZE_DEAD 1 -#define DATA_ABUSE_THE_OOZE 2 - static Locations CenterPoint = {1295.21f, 667.157f, 189.691f}; class boss_sjonnir : public CreatureScript diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index ebc72f91938..6c5138da826 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -85,41 +85,46 @@ enum Texts TEXT_ID_PROGRESS = 13101 }; -enum BrannCreatures +enum Creatures { - CREATURE_TRIBUNAL_OF_THE_AGES = 28234, - CREATURE_BRANN_BRONZEBEARD = 28070, - CREATURE_DARK_MATTER_TARGET = 28237, - CREATURE_SEARING_GAZE_TARGET = 28265, - CREATURE_DARK_RUNE_PROTECTOR = 27983, - CREATURE_DARK_RUNE_STORMCALLER = 27984, - CREATURE_IRON_GOLEM_CUSTODIAN = 27985, + NPC_TRIBUNAL_OF_THE_AGES = 28234, + NPC_BRANN_BRONZEBEARD = 28070, + NPC_DARK_MATTER_TARGET = 28237, + NPC_SEARING_GAZE_TARGET = 28265, + NPC_DARK_RUNE_PROTECTOR = 27983, + NPC_DARK_RUNE_STORMCALLER = 27984, + NPC_IRON_GOLEM_CUSTODIAN = 27985, }; enum Spells { SPELL_STEALTH = 58506, - //Kadrak + + // Kadrak SPELL_GLARE_OF_THE_TRIBUNAL = 50988, H_SPELL_GLARE_OF_THE_TRIBUNAL = 59868, - //Marnak + + // Marnak SPELL_DARK_MATTER = 51012, H_SPELL_DARK_MATTER = 59868, - //Abedneum + + // Abedneum SPELL_SEARING_GAZE = 51136, H_SPELL_SEARING_GAZE = 59867, SPELL_REWARD_ACHIEVEMENT = 59046, }; -enum Quests +enum Misc { - QUEST_HALLS_OF_STONE = 13207 + QUEST_HALLS_OF_STONE = 13207, + + DATA_BRANN_SPARKLIN_NEWS = 1 + }; #define GOSSIP_ITEM_START "Brann, it would be our honor!" #define GOSSIP_ITEM_PROGRESS "Let's move Brann, enough of the history lessons!" -#define DATA_BRANN_SPARKLIN_NEWS 1 static Position SpawnLocations[]= { @@ -229,7 +234,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* summon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* summon = me->SummonCreature(NPC_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { summon->SetDisplayId(11686); summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -245,7 +250,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* summon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* summon = me->SummonCreature(NPC_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { summon->SetDisplayId(11686); summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -348,7 +353,7 @@ public: switch (waypointId) { case 7: - if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) + if (Creature* creature = GetClosestCreatureWithEntry(me, NPC_TRIBUNAL_OF_THE_AGES, 100.0f)) { if (!creature->IsAlive()) creature->Respawn(); @@ -383,16 +388,16 @@ public: { uint32 uiSpawnNumber = DUNGEON_MODE(2, 3); for (uint8 i = 0; i < uiSpawnNumber; ++i) - me->SummonCreature(CREATURE_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); - me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; } case 2: for (uint8 i = 0; i < 2; ++i) - me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; case 3: - me->SummonCreature(CREATURE_IRON_GOLEM_CUSTODIAN, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_IRON_GOLEM_CUSTODIAN, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h index d7c0b37b14e..d00649e409b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h @@ -24,6 +24,7 @@ enum Data DATA_SJONNIR_EVENT, DATA_BRANN_EVENT }; + enum Data64 { DATA_KRYSTALLUS, @@ -40,7 +41,8 @@ enum Data64 DATA_SJONNIR_DOOR, DATA_MAIDEN_DOOR }; -enum Creatures + +enum CreaturesIds { CREATURE_MAIDEN = 27975, CREATURE_KRYSTALLUS = 27977, @@ -50,7 +52,8 @@ enum Creatures CREATURE_ABEDNEUM = 30899, CREATURE_BRANN = 28070 }; -enum GameObjects + +enum GameObjectIds { GO_ABEDNEUM = 191669, GO_MARNAK = 192170, @@ -62,4 +65,5 @@ enum GameObjects GO_TRIBUNAL_CHEST = 190586, GO_TRIBUNAL_CHEST_HERO = 193996 }; + #endif diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index b2d6dbca7b1..a8c51534683 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -91,8 +91,12 @@ enum AuriayaActions }; #define SENTRY_NUMBER RAID_MODE<uint8>(2, 4) -#define DATA_NINE_LIVES 30763077 -#define DATA_CRAZY_CAT_LADY 30063007 + +enum Mis +{ + DATA_NINE_LIVES = 30763077, + DATA_CRAZY_CAT_LADY = 30063007 +}; class boss_auriaya : public CreatureScript { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index a0ce73a9a55..b57925cf2a8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -141,10 +141,14 @@ enum Vehicles VEHICLE_DEMOLISHER = 33109, }; -#define DATA_SHUTOUT 29112912 // 2911, 2912 are achievement IDs -#define DATA_ORBIT_ACHIEVEMENTS 1 -#define VEHICLE_SPAWNS 5 -#define FREYA_SPAWNS 4 +enum Misc +{ + DATA_SHUTOUT = 29112912, // 2911, 2912 are achievement IDs + DATA_ORBIT_ACHIEVEMENTS = 1, + VEHICLE_SPAWNS = 5, + FREYA_SPAWNS = 4 + +}; enum Yells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 5ee55febba3..36cdcbf9889 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -90,8 +90,11 @@ enum VezaxEvents EVENT_RANDOM_MOVE = 8, }; -#define DATA_SMELL_SARONITE 31813188 -#define DATA_SHADOWDODGER 29962997 +enum Misc +{ + DATA_SMELL_SARONITE = 31813188, + DATA_SHADOWDODGER = 29962997 +}; class boss_general_vezax : public CreatureScript { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 19c80fd7d0e..5954206c956 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -142,7 +142,11 @@ enum HodirActions #define ACHIEVEMENT_THIS_CACHE_WAS_RARE RAID_MODE<uint8>(3182, 3184) #define ACHIEVEMENT_COOLEST_FRIENDS RAID_MODE<uint8>(2963, 2965) #define FRIENDS_COUNT RAID_MODE<uint8>(4, 8) -#define DATA_GETTING_COLD_IN_HERE 29672968 // 2967, 2968 are achievement IDs + +enum Misc +{ + DATA_GETTING_COLD_IN_HERE = 29672968 // 2967, 2968 are achievement IDs +}; Position const SummonPositions[8] = { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 8f8f05a4018..3685e18f31c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -137,8 +137,12 @@ enum Events #define GROUND_Z 391.517f #define GOSSIP_ITEM_1 "Activate Harpoons!" -#define DATA_QUICK_SHAVE 29192921 // 2919, 2921 are achievement IDs -#define DATA_IRON_DWARF_MEDIUM_RARE 29232924 + +enum Misc +{ + DATA_QUICK_SHAVE = 29192921, // 2919, 2921 are achievement IDs + DATA_IRON_DWARF_MEDIUM_RARE = 29232924 +}; const Position PosEngRepair[4] = { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 6dcd915e4ee..cb363684dc1 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -28,7 +28,6 @@ EndScriptData */ enum Yells { - //Yells Ingvar YELL_AGGRO_1 = 0, YELL_KILL_1 = 1, YELL_DEAD_1 = 2, @@ -43,6 +42,7 @@ enum Creatures NPC_INGVAR_HUMAN = 23954, NPC_ANNHYLDE_THE_CALLER = 24068, NPC_INGVAR_UNDEAD = 23980, + NPC_THROW_TARGET = 23996, }; enum Events @@ -69,7 +69,7 @@ enum Phases enum Spells { - //Ingvar Spells human form + // Ingvar Spells human form SPELL_CLEAVE = 42724, SPELL_SMASH = 42669, SPELL_STAGGERING_ROAR = 42708, @@ -79,13 +79,18 @@ enum Spells SPELL_SUMMON_BANSHEE = 42912, SPELL_SCOURG_RESURRECTION = 42863, // Spawn resurrect effect around Ingvar - //Ingvar Spells undead form + // Ingvar Spells undead form SPELL_DARK_SMASH = 42723, SPELL_DREADFUL_ROAR = 42729, SPELL_WOE_STRIKE = 42730, - ENTRY_THROW_TARGET = 23996, - SPELL_SHADOW_AXE_SUMMON = 42748 + SPELL_SHADOW_AXE_SUMMON = 42748, + + // Spells for Annhylde + SPELL_SCOURG_RESURRECTION_HEAL = 42704, // Heal Max + DummyAura + SPELL_SCOURG_RESURRECTION_BEAM = 42857, // Channeling Beam of Annhylde + SPELL_SCOURG_RESURRECTION_DUMMY = 42862, // Some Emote Dummy? + SPELL_INGVAR_TRANSFORM = 42796 }; class boss_ingvar_the_plunderer : public CreatureScript @@ -274,17 +279,6 @@ public: }; -enum eSpells -{ -//we don't have that text in db so comment it until we get this text -// YELL_RESSURECT = -1574025, - -//Spells for Annhylde - SPELL_SCOURG_RESURRECTION_HEAL = 42704, //Heal Max + DummyAura - SPELL_SCOURG_RESURRECTION_BEAM = 42857, //Channeling Beam of Annhylde - SPELL_SCOURG_RESURRECTION_DUMMY = 42862, //Some Emote Dummy? - SPELL_INGVAR_TRANSFORM = 42796 -}; class npc_annhylde_the_caller : public CreatureScript { @@ -391,7 +385,7 @@ public: }; }; -enum eShadowAxe +enum ShadowAxe { SPELL_SHADOW_AXE_DAMAGE = 42750, H_SPELL_SHADOW_AXE_DAMAGE = 59719, @@ -416,7 +410,7 @@ public: void Reset() { - if (Creature* target = me->FindNearestCreature(ENTRY_THROW_TARGET, 50.0f)) + if (Creature* target = me->FindNearestCreature(NPC_THROW_TARGET, 50.0f)) { float x, y, z; target->GetPosition(x, y, z); @@ -424,9 +418,7 @@ public: target->DisappearAndDie(); } else - { me->DisappearAndDie(); - } } void MovementInform(uint32 type, uint32 id) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 77935949957..20d69ebf80d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -26,36 +26,43 @@ EndScriptData */ #include "ScriptedCreature.h" #include "utgarde_keep.h" -enum eEnums +enum Yells { - //signed for 24200, but used by 24200, 27390 + // signed for 24200, but used by 24200, 27390 YELL_SKARVALD_AGGRO = 0, YELL_SKARVALD_DAL_DIED = 1, YELL_SKARVALD_SKA_DIEDFIRST = 2, YELL_SKARVALD_KILL = 3, YELL_SKARVALD_DAL_DIEDFIRST = 4, - //signed for 24201, but used by 24201, 27389 + // signed for 24201, but used by 24201, 27389 YELL_DALRONN_AGGRO = 0, YELL_DALRONN_SKA_DIED = 1, YELL_DALRONN_DAL_DIEDFIRST = 2, YELL_DALRONN_KILL = 3, - YELL_DALRONN_SKA_DIEDFIRST = 4, + YELL_DALRONN_SKA_DIEDFIRST = 4 +}; -//Spells of Skarvald and his Ghost - NPC_SKARVALD_THE_CONSTRUCTOR = 24200, +enum Spells +{ + // Spells of Skarvald and his Ghost SPELL_CHARGE = 43651, SPELL_STONE_STRIKE = 48583, SPELL_SUMMON_SKARVALD_GHOST = 48613, SPELL_ENRAGE = 48193, - NPC_SKARVALD_GHOST = 27390, -//Spells of Dalronn and his Ghost - NPC_DALRONN_THE_CONTROLLER = 24201, + // Spells of Dalronn and his Ghost SPELL_SHADOW_BOLT = 43649, H_SPELL_SHADOW_BOLT = 59575, H_SPELL_SUMMON_SKELETONS = 52611, SPELL_DEBILITATE = 43650, SPELL_SUMMON_DALRONN_GHOST = 48612, +}; + +enum Creatures +{ + NPC_SKARVALD_THE_CONSTRUCTOR = 24200, + NPC_SKARVALD_GHOST = 27390, + NPC_DALRONN_THE_CONTROLLER = 24201, NPC_DALRONN_GHOST = 27389 }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index 73ff0075aba..b0d9d702db5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -18,17 +18,20 @@ #ifndef DEF_UTGARDE_KEEP_H #define DEF_UTGARDE_KEEP_H -#define DATA_PRINCEKELESETH 1 -#define DATA_SKARVALD 3 -#define DATA_DALRONN 4 -#define DATA_INGVAR 6 +enum DataTypes +{ + DATA_PRINCEKELESETH = 1, + DATA_SKARVALD = 3, + DATA_DALRONN = 4, + DATA_INGVAR = 6, -#define DATA_PRINCEKELESETH_EVENT 2 -#define DATA_SKARVALD_DALRONN_EVENT 5 -#define DATA_INGVAR_EVENT 7 + DATA_PRINCEKELESETH_EVENT = 2, + DATA_SKARVALD_DALRONN_EVENT = 5, + DATA_INGVAR_EVENT = 7, -#define EVENT_FORGE_1 8 -#define EVENT_FORGE_2 9 -#define EVENT_FORGE_3 10 + EVENT_FORGE_1 = 8, + EVENT_FORGE_2 = 9, + EVENT_FORGE_3 = 10 +}; #endif diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 3a74eebd947..bc385a67971 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -31,8 +31,7 @@ Script Data End */ #include "Player.h" #include "SpellInfo.h" -//Yell -enum eYells +enum Yells { SAY_AGGRO = 0, SAY_KILL = 1, @@ -124,15 +123,15 @@ static Position Location[]= {413.9327f, -540.9407f, 138.2614f, 0}, //71 }; -enum eCombatPhase +enum CombatPhase { FLYING, SKADI }; -enum eSpells +enum Spells { - //Skadi Spells + // Skadi Spells SPELL_CRUSH = 50234, SPELL_POISONED_SPEAR = 50225, //isn't being casted =/ SPELL_WHIRLWIND = 50228, //random target, but not the tank approx. every 20s @@ -141,17 +140,17 @@ enum eSpells SPELL_FREEZING_CLOUD = 47579, }; -enum eCreature +enum Creatures { - CREATURE_YMIRJAR_WARRIOR = 26690, - CREATURE_YMIRJAR_WITCH_DOCTOR = 26691, - CREATURE_YMIRJAR_HARPOONER = 26692, - CREATURE_GRAUF = 26893, - CREATURE_TRIGGER = 28351, + NPC_YMIRJAR_WARRIOR = 26690, + NPC_YMIRJAR_WITCH_DOCTOR = 26691, + NPC_YMIRJAR_HARPOONER = 26692, + NPC_GRAUF = 26893, + NPC_TRIGGER = 28351, DATA_MOUNT = 27043, }; -enum eAchievments +enum Achievments { ACHIEV_TIMED_START_EVENT = 17726, }; @@ -189,7 +188,7 @@ public: uint8 m_uiSpellHitCount; bool m_bSaidEmote; - eCombatPhase Phase; + CombatPhase Phase; void Reset() { @@ -208,7 +207,7 @@ public: Summons.DespawnAll(); me->SetSpeed(MOVE_FLIGHT, 3.0f); if ((Unit::GetCreature(*me, m_uiGraufGUID) == NULL) && !me->IsMounted()) - me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); + me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); if (instance) { instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED); @@ -222,7 +221,7 @@ public: me->Dismount(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); if (!Unit::GetCreature(*me, m_uiGraufGUID)) - me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); + me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); } void EnterCombat(Unit* /*who*/) @@ -243,7 +242,7 @@ public: me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f); me->SetWalk(false); m_uiMountTimer = 1000; - Summons.DespawnEntry(CREATURE_GRAUF); + Summons.DespawnEntry(NPC_GRAUF); } } @@ -251,18 +250,18 @@ public: { switch (summoned->GetEntry()) { - case CREATURE_GRAUF: + case NPC_GRAUF: m_uiGraufGUID = summoned->GetGUID(); break; - case CREATURE_YMIRJAR_WARRIOR: - case CREATURE_YMIRJAR_WITCH_DOCTOR: - case CREATURE_YMIRJAR_HARPOONER: + case NPC_YMIRJAR_WARRIOR: + case NPC_YMIRJAR_WITCH_DOCTOR: + case NPC_YMIRJAR_HARPOONER: summoned->setActive(true); summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); break; - case CREATURE_TRIGGER: + case NPC_TRIGGER: summoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true); summoned->DespawnOrUnsummon(10*IN_MILLISECONDS); break; @@ -272,7 +271,7 @@ public: void SummonedCreatureDespawn(Creature* summoned) { - if (summoned->GetEntry() == CREATURE_GRAUF) + if (summoned->GetEntry() == NPC_GRAUF) m_uiGraufGUID = 0; Summons.Despawn(summoned); } @@ -287,7 +286,7 @@ public: Phase = SKADI; me->SetCanFly(false); me->Dismount(); - if (Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) + if (Creature* pGrauf = me->SummonCreature(NPC_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) { pGrauf->GetMotionMaster()->MoveFall(); pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); @@ -428,15 +427,15 @@ public: switch (urand(0, 2)) { case 0: - me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: - me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 2: - me->SummonCreature(CREATURE_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; } } @@ -459,7 +458,7 @@ public: break; } for (uint32 i = iStart; i < iEnd; ++i) - me->SummonCreature(CREATURE_TRIGGER, Location[i]); + me->SummonCreature(NPC_TRIGGER, Location[i]); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index bd08a27d49d..1d45a032d90 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -73,19 +73,18 @@ enum Yells enum Creatures { - CREATURE_ARTHAS = 29280, // Image of Arthas - CREATURE_SVALA_SORROWGRAVE = 26668, // Svala after transformation - CREATURE_SVALA = 29281, // Svala before transformation - CREATURE_RITUAL_CHANNELER = 27281, - CREATURE_SPECTATOR = 26667, - CREATURE_RITUAL_TARGET = 27327, - CREATURE_FLAME_BRAZIER = 27273, - CREATURE_SCOURGE_HULK = 26555 + NPC_ARTHAS = 29280, // Image of Arthas + NPC_SVALA_SORROWGRAVE = 26668, // Svala after transformation + NPC_RITUAL_CHANNELER = 27281, + NPC_SPECTATOR = 26667, + NPC_RITUAL_TARGET = 27327, + NPC_FLAME_BRAZIER = 27273, + NPC_SCOURGE_HULK = 26555 }; -enum Objects +enum GameObjects { - OBJECT_UTGARDE_MIRROR = 191745 + GO_UTGARDE_MIRROR = 191745 }; enum SvalaPhase @@ -97,7 +96,10 @@ enum SvalaPhase SVALADEAD }; -#define DATA_INCREDIBLE_HULK 2043 +enum Misc +{ + DATA_INCREDIBLE_HULK = 2043 +}; static const float spectatorWP[2][3] = { @@ -185,7 +187,7 @@ public: void JustSummoned(Creature* summon) { - if (summon->GetEntry() == CREATURE_RITUAL_CHANNELER) + if (summon->GetEntry() == NPC_RITUAL_CHANNELER) summon->CastSpell(summon, SPELL_SUMMONED_VIS, true); summons.Summon(summon); @@ -206,10 +208,10 @@ public: Phase = INTRO; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (GameObject* mirror = GetClosestGameObjectWithEntry(me, OBJECT_UTGARDE_MIRROR, 100.0f)) + if (GameObject* mirror = GetClosestGameObjectWithEntry(me, GO_UTGARDE_MIRROR, 100.0f)) mirror->SetGoState(GO_STATE_READY); - if (Creature* arthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* arthas = me->SummonCreature(NPC_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) { arthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); arthasGUID = arthas->GetGUID(); @@ -284,7 +286,7 @@ public: if (instance) { std::list<Creature*> lspectatorList; - GetCreatureListWithEntryInGrid(lspectatorList, me, CREATURE_SPECTATOR, 100.0f); + GetCreatureListWithEntryInGrid(lspectatorList, me, NPC_SPECTATOR, 100.0f); for (std::list<Creature*>::iterator itr = lspectatorList.begin(); itr != lspectatorList.end(); ++itr) { if ((*itr)->IsAlive()) @@ -307,7 +309,7 @@ public: me->CastSpell(me, SPELL_SVALA_TRANSFORMING2, false); arthas->InterruptNonMeleeSpells(true); me->RemoveAllAuras(); - me->UpdateEntry(CREATURE_SVALA_SORROWGRAVE); + me->UpdateEntry(NPC_SVALA_SORROWGRAVE); me->SetFacingToObject(arthas); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); ++introPhase; @@ -342,7 +344,7 @@ public: introTimer = 3000; break; case 9: - if (GameObject* mirror = GetClosestGameObjectWithEntry(me, OBJECT_UTGARDE_MIRROR, 100.0f)) + if (GameObject* mirror = GetClosestGameObjectWithEntry(me, GO_UTGARDE_MIRROR, 100.0f)) mirror->SetGoState(GO_STATE_ACTIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); arthas->DespawnOrUnsummon(); @@ -596,7 +598,7 @@ class npc_scourge_hulk : public CreatureScript void DamageTaken(Unit* attacker, uint32 &damage) { - if (damage >= me->GetHealth() && attacker->GetEntry() == CREATURE_SVALA_SORROWGRAVE) + if (damage >= me->GetHealth() && attacker->GetEntry() == NPC_SVALA_SORROWGRAVE) killedByRitualStrike = true; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 6097e1ab84b..e1dcbb30c91 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -66,16 +66,16 @@ enum Yells enum Creatures { - CREATURE_BJORN = 27303, - CREATURE_BJORN_VISUAL = 27304, - CREATURE_HALDOR = 27307, - CREATURE_HALDOR_VISUAL = 27310, - CREATURE_RANULF = 27308, - CREATURE_RANULF_VISUAL = 27311, - CREATURE_TORGYN = 27309, - CREATURE_TORGYN_VISUAL = 27312, - CREATURE_SPIRIT_FOUNT = 27339, - CREATURE_AVENGING_SPIRIT = 27386 + NPC_BJORN = 27303, + NPC_BJORN_VISUAL = 27304, + NPC_HALDOR = 27307, + NPC_HALDOR_VISUAL = 27310, + NPC_RANULF = 27308, + NPC_RANULF_VISUAL = 27311, + NPC_TORGYN = 27309, + NPC_TORGYN_VISUAL = 27312, + NPC_SPIRIT_FOUNT = 27339, + NPC_AVENGING_SPIRIT = 27386 }; struct ActiveBoatStruct @@ -87,13 +87,16 @@ struct ActiveBoatStruct static ActiveBoatStruct ActiveBoat[4] = { - {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379f, -335.335f, 104.756f, 413.594f, -335.408f, 107.995f, 3.157f}, - {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813f, -335.069f, 104.756f, 369.994f, -334.771f, 107.995f, 6.232f}, - {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546f, -314.362f, 104.756f, 370.841f, -314.426f, 107.995f, 6.232f}, - {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310f, -314.761f, 104.756f, 413.992f, -314.703f, 107.995f, 3.157f} + {NPC_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379f, -335.335f, 104.756f, 413.594f, -335.408f, 107.995f, 3.157f}, + {NPC_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813f, -335.069f, 104.756f, 369.994f, -334.771f, 107.995f, 6.232f}, + {NPC_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546f, -314.362f, 104.756f, 370.841f, -314.426f, 107.995f, 6.232f}, + {NPC_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310f, -314.761f, 104.756f, 413.992f, -314.703f, 107.995f, 3.157f} }; -#define DATA_KINGS_BANE 2157 +enum Misc +{ + DATA_KINGS_BANE = 2157 +}; class boss_ymiron : public CreatureScript { @@ -286,7 +289,7 @@ public: if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) { //DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control - if (Creature* temp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) + if (Creature* temp = me->SummonCreature(NPC_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) { temp->SetSpeed(MOVE_RUN, 0.4f); temp->CastSpell(temp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); @@ -318,7 +321,7 @@ public: for (uint8 i = 0; i < 4; ++i) { //DoCast(me, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control - if (Creature* temp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) + if (Creature* temp = me->SummonCreature(NPC_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index 4331b4378be..6166b7c4891 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -25,6 +25,7 @@ enum Data DATA_SKADI_THE_RUTHLESS_EVENT, DATA_KING_YMIRON_EVENT }; + enum Data64 { DATA_SVALA, @@ -42,7 +43,7 @@ enum Data64 DATA_SACRIFICED_PLAYER }; -enum eCreatures +enum CreatureID { BOSS_SVALA_SORROWGRAVE = 26668, BOSS_GORTOK_PALEHOOF = 26687, diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 417b0bdd7fc..57ea9b980cb 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -19,25 +19,32 @@ #include "ScriptedCreature.h" #include "vault_of_archavon.h" -enum +enum Emotes { EMOTE_BERSERK = 0, EMOTE_LEAP = 1 // Not in use }; -//Spells Archavon -#define SPELL_ROCK_SHARDS 58678 -#define SPELL_CRUSHING_LEAP RAID_MODE(58960, 60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. -#define SPELL_STOMP RAID_MODE(58663, 60880) -#define SPELL_IMPALE RAID_MODE(58666, 60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. -#define SPELL_BERSERK 47008 -//Spells Archavon Warders -#define SPELL_ROCK_SHOWER RAID_MODE(60919, 60923) -#define SPELL_SHIELD_CRUSH RAID_MODE(60897, 60899) -#define SPELL_WHIRL RAID_MODE(60902, 60916) - -//4 Warders spawned -#define ARCHAVON_WARDER 32353 //npc 32353 +enum Spells +{ + + // Spells Archavon + SPELL_ROCK_SHARDS = 58678, + SPELL_CRUSHING_LEAP = 58960, + SPELL_STOMP = 58663, + SPELL_IMPALE = 58666, + SPELL_BERSERK = 47008, + + // Archavon Warders + SPELL_ROCK_SHOWER = 60919, + SPELL_SHIELD_CRUSH = 60897, + SPELL_WHIRL = 60902 +}; + +enum Creatures +{ + NPC_ARCHAVON_WARDER = 32353 +}; enum Events { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index ad8d4d6edf2..37eb335153c 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -20,7 +20,6 @@ #include "SpellAuras.h" #include "vault_of_archavon.h" -//Emalon spells enum Spells { SPELL_OVERCHARGE = 64218, // Cast every 45 sec on a random Tempest Minion @@ -29,32 +28,35 @@ enum Spells SPELL_SHOCK = 64363, SPELL_OVERCHARGED = 64217, SPELL_OVERCHARGED_BLAST = 64219, // Cast when Overcharged reaches 10 stacks. Mob dies after that + SPELL_CHAIN_LIGHTNING = 64213, + SPELL_LIGHTNING_NOVA = 64216 }; -// cannot let SpellDifficulty handle it, no entries for these -#define SPELL_CHAIN_LIGHTNING RAID_MODE(64213, 64215) -#define SPELL_LIGHTNING_NOVA RAID_MODE(64216, 65279) - -enum BossEmotes +enum Emotes { - EMOTE_OVERCHARGE = 0, - EMOTE_MINION_RESPAWN = 1, - EMOTE_BERSERK = 2 + EMOTE_OVERCHARGE = 0, + EMOTE_MINION_RESPAWN = 1, + EMOTE_BERSERK = 2 }; enum Events { - EVENT_CHAIN_LIGHTNING = 1, - EVENT_LIGHTNING_NOVA = 2, - EVENT_OVERCHARGE = 3, - EVENT_BERSERK = 4, - EVENT_SHOCK = 5, + EVENT_CHAIN_LIGHTNING = 1, + EVENT_LIGHTNING_NOVA = 2, + EVENT_OVERCHARGE = 3, + EVENT_BERSERK = 4, + EVENT_SHOCK = 5, }; -//Creatures -#define NPC_TEMPEST_MINION 33998 +enum Npcs +{ + NPC_TEMPEST_MINION = 33998 +}; -#define MAX_TEMPEST_MINIONS 4 +enum Misc +{ + MAX_TEMPEST_MINIONS = 4 +}; struct Position TempestMinions[MAX_TEMPEST_MINIONS] = { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 4309f188b10..feed6b05ee7 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -39,7 +39,6 @@ enum Spells SPELL_FROZEN_ORB_SUMMON = 72093, // summon orb }; -// Events boss enum Events { EVENT_FREEZING_GROUND = 1, @@ -49,8 +48,11 @@ enum Events EVENT_FROST_BLAST = 4, }; -// Mob Frozen Orb -#define NPC_FROZEN_ORB 38456 // 1 in 10 mode and 3 in 25 mode +enum Creatures +{ + NPC_FROZEN_ORB = 38456 // 1 in 10 mode and 3 in 25 mode + +}; class boss_toravon : public CreatureScript { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index 3534330e6f4..f89cf9a4466 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -35,26 +35,23 @@ class instance_archavon : public InstanceMapScript { instance_archavon_InstanceMapScript(Map* map) : InstanceScript(map) { - SetBossNumber(MAX_ENCOUNTER); - } + SetBossNumber(EncounterCount); - void Initialize() - { - EmalonGUID = 0; - ToravonGUID = 0; - ArchavonDeath = 0; - EmalonDeath = 0; - KoralonDeath = 0; + EmalonGUID = 0; + ToravonGUID = 0; + ArchavonDeath = 0; + EmalonDeath = 0; + KoralonDeath = 0; } void OnCreatureCreate(Creature* creature) { switch (creature->GetEntry()) { - case CREATURE_EMALON: + case NPC_EMALON: EmalonGUID = creature->GetGUID(); break; - case CREATURE_TORAVON: + case NPC_TORAVON: ToravonGUID = creature->GetGUID(); break; default: diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h index 03776525174..7b5258fc3fc 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h +++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h @@ -18,23 +18,23 @@ #ifndef DEF_ARCHAVON_H #define DEF_ARCHAVON_H -enum Creatures -{ - CREATURE_ARCHAVON = 31125, - CREATURE_EMALON = 33993, - CREATURE_KORALON = 35013, - CREATURE_TORAVON = 38433, -}; +uint32 const EncounterCount = 4; enum Data { - DATA_ARCHAVON = 0, - DATA_EMALON = 1, - DATA_KORALON = 2, - DATA_TORAVON = 3, + DATA_ARCHAVON = 0, + DATA_EMALON = 1, + DATA_KORALON = 2, + DATA_TORAVON = 3, }; -#define MAX_ENCOUNTER 4 +enum CreatureIds +{ + NPC_ARCHAVON = 31125, + NPC_EMALON = 33993, + NPC_KORALON = 35013, + NPC_TORAVON = 38433 +}; enum AchievementCriteriaIds { diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 8fc5dfcadc8..daf022c6da4 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -66,7 +66,10 @@ static Position SpawnLoc[MAX_SPAWN_LOC]= {1935.50f, 796.224f, 52.492f, 4.224f}, }; -#define DATA_DEHYDRATION 1 +enum Misc +{ + DATA_DEHYDRATION = 1 +}; class boss_ichoron : public CreatureScript { diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 7b8641b1b32..59f9a1d0e35 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -31,9 +31,9 @@ enum Spells H_SPELL_ZURAMAT_ADD_2 = 59747 }; -enum ZuramatCreatures +enum Creatures { - CREATURE_VOID_SENTRY = 29364 + NPC_VOID_SENTRY = 29364 }; enum Yells @@ -46,7 +46,10 @@ enum Yells SAY_WHISPER = 5 }; -#define DATA_VOID_DANCE 2153 +enum Misc +{ + DATA_VOID_DANCE = 2153 +}; class boss_zuramat : public CreatureScript { @@ -152,7 +155,7 @@ public: void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) { - if (summoned->GetEntry() == CREATURE_VOID_SENTRY) + if (summoned->GetEntry() == NPC_VOID_SENTRY) voidDance = false; } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index de0aee10bfe..0bd6a6ee670 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -123,7 +123,7 @@ enum Spells SPELL_CRYSTALL_ACTIVATION = 57804 }; -enum eSinclari +enum Sinclari { SAY_SINCLARI_1 = 0 }; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h index e6a7553e81b..014d3edff77 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.h +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h @@ -18,24 +18,6 @@ #ifndef DEF_VIOLET_HOLD_H #define DEF_VIOLET_HOLD_H -enum Creatures -{ - CREATURE_TELEPORTATION_PORTAL = 31011, - CREATURE_PORTAL_GUARDIAN = 30660, - CREATURE_PORTAL_KEEPER = 30695, - CREATURE_XEVOZZ = 29266, - CREATURE_LAVANTHOR = 29312, - CREATURE_ICHORON = 29313, - CREATURE_ZURAMAT = 29314, - CREATURE_EREKEM = 29315, - CREATURE_EREKEM_GUARD = 29395, - CREATURE_MORAGG = 29316, - CREATURE_CYANIGOSA = 31134, - CREATURE_SINCLARI = 30658, - CREATURE_SABOTEOUR = 31079, - NPC_VIOLET_HOLD_GUARD = 30659 -}; - enum Data { DATA_1ST_BOSS_EVENT, @@ -95,7 +77,25 @@ enum Bosses BOSS_CYANIGOSA }; -enum VHWorldStates +enum CreaturesIds +{ + CREATURE_TELEPORTATION_PORTAL = 31011, + CREATURE_PORTAL_GUARDIAN = 30660, + CREATURE_PORTAL_KEEPER = 30695, + CREATURE_XEVOZZ = 29266, + CREATURE_LAVANTHOR = 29312, + CREATURE_ICHORON = 29313, + CREATURE_ZURAMAT = 29314, + CREATURE_EREKEM = 29315, + CREATURE_EREKEM_GUARD = 29395, + CREATURE_MORAGG = 29316, + CREATURE_CYANIGOSA = 31134, + CREATURE_SINCLARI = 30658, + CREATURE_SABOTEOUR = 31079, + NPC_VIOLET_HOLD_GUARD = 30659 +}; + +enum WorldStateIds { WORLD_STATE_VH = 3816, WORLD_STATE_VH_PRISON_STATE = 3815, diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index acd241c8eaf..4430d8f5a8c 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -49,7 +49,7 @@ EndContentData */ ## npc_sinkhole_kill_credit ######*/ -enum eSinkhole +enum Sinkhole { SPELL_SET_CART = 46797, SPELL_EXPLODE_CART = 46799, @@ -207,7 +207,7 @@ public: ## npc_keristrasza ######*/ -enum eKeristrasza +enum Keristrasza { SPELL_TELEPORT_TO_SARAGOSA = 46772 }; @@ -251,7 +251,7 @@ public: #define GOSSIP_ITEM_C_1 "I... I think so..." -enum eCorastrasza +enum Corastrasza { SPELL_SUMMON_WYRMREST_SKYTALON = 61240, SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC = 61244, @@ -299,7 +299,7 @@ public: #define GOSSIP_ITEM_I "<Search corpse for Issliruk's Totem.>" -enum eIruk +enum Iruk { QUEST_SPIRITS_WATCH_OVER_US = 11961, SPELL_CREATURE_TOTEM_OF_ISSLIRUK = 46816, @@ -389,7 +389,7 @@ public: ## npc_jenny ######*/ -enum eJenny +enum Jenny { QUEST_LOADER_UP = 11881, @@ -501,7 +501,7 @@ public: ## npc_nesingwary_trapper ######*/ -enum eNesingwaryTrapper +enum NesingwaryTrapper { GO_HIGH_QUALITY_FUR = 187983, @@ -645,7 +645,7 @@ public: ## npc_lurgglbr ######*/ -enum eLurgglbr +enum Lurgglbr { QUEST_ESCAPE_WINTERFIN_CAVERNS = 11570, @@ -792,7 +792,7 @@ public: ## npc_nexus_drake_hatchling ######*/ -enum eNexusDrakeHatchling +enum NexusDrakeHatchling { SPELL_DRAKE_HARPOON = 46607, SPELL_RED_DRAGONBLOOD = 46620, @@ -904,7 +904,7 @@ public: ## npc_thassarian ######*/ -enum eThassarian +enum Thassarian { QUEST_LAST_RITES = 12019, @@ -1317,7 +1317,7 @@ public: ## npc_counselor_talbot ######*/ -enum eCounselorTalbot +enum CounselorTalbot { SPELL_DEFLECTION = 51009, SPELL_SOUL_BLAST = 50992, @@ -1564,7 +1564,7 @@ public: ## npc_beryl_sorcerer ######*/ -enum eBerylSorcerer +enum BerylSorcerer { NPC_CAPTURED_BERLY_SORCERER = 25474, NPC_LIBRARIAN_DONATHAN = 25262, @@ -1643,7 +1643,7 @@ public: /*###### ## npc_imprisoned_beryl_sorcerer ######*/ -enum eImprisionedBerylSorcerer +enum ImprisionedBerylSorcerer { SPELL_NEURAL_NEEDLE = 45634, @@ -1927,7 +1927,7 @@ public: ## Help Those That Cannot Help Themselves, Quest 11876 ######*/ -enum eHelpThemselves +enum HelpThemselves { QUEST_CANNOT_HELP_THEMSELVES = 11876, GO_MAMMOTH_TRAP_1 = 188022, @@ -2044,7 +2044,7 @@ public: ## Quest 11653: Hah... You're Not So Big Now! ######*/ -enum eNotSoBig +enum NotSoBig { QUEST_YOU_RE_NOT_SO_BIG_NOW = 11653, SPELL_AURA_NOTSOBIG_1 = 45672, @@ -2089,8 +2089,15 @@ public: ## Quest 11608: Bury Those Cockroaches! ######*/ -#define QUEST_BURY_THOSE_COCKROACHES 11608 -#define SPELL_SEAFORIUM_DEPTH_CHARGE_EXPLOSION 45502 +enum BuryThoseCockroaches +{ + // Quest + QUEST_BURY_THOSE_COCKROACHES = 11608, + + // Spells + SPELL_SEAFORIUM_DEPTH_CHARGE_EXPLOSION = 45502 + +}; class npc_seaforium_depth_charge : public CreatureScript { @@ -2141,7 +2148,7 @@ public: ## Help Those That Cannot Help Themselves, Quest 11876 ######*/ -enum eValiancekeepcannons +enum Valiancekeepcannons { GO_VALIANCE_KEEP_CANNON_1 = 187560, GO_VALIANCE_KEEP_CANNON_2 = 188692 @@ -2297,7 +2304,7 @@ public: ## npc_hidden_cultist ######*/ -enum eHiddenCultist +enum HiddenCultist { SPELL_SHROUD_OF_THE_DEATH_CULTIST = 46077, //not working SPELL_RIGHTEOUS_VISION = 46078, //player aura diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index d5181d68680..4670f1b6054 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -130,7 +130,7 @@ public: ## npc_hira_snowdawn ######*/ -enum eHiraSnowdawn +enum HiraSnowdawn { SPELL_COLD_WEATHER_FLYING = 54197 }; diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 44bb405cf59..a17abeba726 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -37,10 +37,13 @@ EndContentData */ #include "CombatAI.h" #include "Player.h" -enum eEnums +enum AlexstraszaWrGate { + // Quest QUEST_RETURN_TO_AG_A = 12499, QUEST_RETURN_TO_AG_H = 12500, + + // Movie MOVIE_ID_GATES = 14 }; diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 4cb52f6360f..c43074ff838 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -160,7 +160,7 @@ public: ## npc_plaguehound_tracker ######*/ -enum ePlaguehound +enum Plaguehound { QUEST_SNIFF_OUT_ENEMY = 11253 }; @@ -212,7 +212,7 @@ public: #define GOSSIP_RAZAEL_REPORT "High Executor Anselm wants a report on the situation." #define GOSSIP_LYANA_REPORT "High Executor Anselm requests your report." -enum eRazael +enum Razael { QUEST_REPORTS_FROM_THE_FIELD = 11221, NPC_RAZAEL = 23998, @@ -279,7 +279,7 @@ public: ## npc_daegarn ######*/ -enum eDaegarnn +enum Daegarnn { QUEST_DEFEAT_AT_RING = 11300, diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index f5f832bcb86..287dedc7970 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -47,7 +47,7 @@ EndContentData */ #define GOSSIP_ARETE_ITEM6 "Let's finish this!" #define GOSSIP_ARETE_ITEM7 "That's quite a tale, Lord-Commander." -enum eArete +enum Arete { GOSSIP_TEXTID_ARETE1 = 13525, GOSSIP_TEXTID_ARETE2 = 13526, @@ -124,7 +124,7 @@ public: ## npc_squire_david ######*/ -enum eSquireDavid +enum SquireDavid { QUEST_THE_ASPIRANT_S_CHALLENGE_H = 13680, QUEST_THE_ASPIRANT_S_CHALLENGE_A = 13679, @@ -171,7 +171,7 @@ public: ## npc_argent_valiant ######*/ -enum eArgentValiant +enum ArgentValiant { SPELL_CHARGE = 63010, SPELL_SHIELD_BREAKER = 65147, @@ -252,7 +252,7 @@ public: ## npc_guardian_pavilion ######*/ -enum eGuardianPavilion +enum GuardianPavilion { SPELL_TRESPASSER_H = 63987, AREA_SUNREAVER_PAVILION = 4676, @@ -302,7 +302,7 @@ public: ## npc_vereth_the_cunning ######*/ -enum eVerethTheCunning +enum VerethTheCunning { NPC_GEIST_RETURN_BUNNY_KC = 31049, NPC_LITHE_STALKER = 30894, diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 2c0a98ab0ad..5c3cd880e55 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -45,7 +45,7 @@ EndContentData */ #define GOSSIP_ITEM1 "I am ready to travel to your village now." -enum eRainspeaker +enum Rainspeaker { SAY_START_IRO = 0, SAY_QUEST_ACCEPT_IRO = 1, @@ -181,7 +181,7 @@ public: #define GOSSIP_VEKJIK_ITEM1 "Shaman Vekjik, I have spoken with the big-tongues and they desire peace. I have brought this offering on their behalf." #define GOSSIP_VEKJIK_ITEM2 "No no... I had no intentions of betraying your people. I was only defending myself. it was all a misunderstanding." -enum eVekjik +enum Vekjik { GOSSIP_TEXTID_VEKJIK1 = 13137, GOSSIP_TEXTID_VEKJIK2 = 13138, @@ -243,7 +243,7 @@ public: #define GOSSIP_ITEM_AOF2 "You can trust me. I am no friend of the Lich King." #define GOSSIP_ITEM_AOF3 "I will not fail." -enum eFreya +enum Freya { QUEST_FREYA_PACT = 12621, @@ -339,11 +339,13 @@ public: ## npc_engineer_helice ######*/ -enum eEnums +enum EngineerHelice { + // Spells SPELL_EXPLODE_CRYSTAL = 62487, SPELL_FLAMES = 64561, + // Yells SAY_WP_1 = 0, SAY_WP_2 = 1, SAY_WP_3 = 2, @@ -352,6 +354,7 @@ enum eEnums SAY_WP_6 = 5, SAY_WP_7 = 6, + // Quests QUEST_DISASTER = 12688 }; @@ -701,7 +704,7 @@ public: #define GOSSIP_OPTION_BANANAS "Have a spare bunch of bananas?" #define GOSSIP_OPTION_PAPAYA "I could really use a papaya." -enum eAdventurousDwarf +enum AdventurousDwarf { QUEST_12634 = 12634, diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index bf8a454f9e5..ef95ba2e5b1 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -113,8 +113,11 @@ public: ## npc_roxi_ramrocket ######*/ -#define SPELL_MECHANO_HOG 60866 -#define SPELL_MEKGINEERS_CHOPPER 60867 +enum RoxiRamrocket +{ + SPELL_MECHANO_HOG = 60866, + SPELL_MEKGINEERS_CHOPPER = 60867 +}; class npc_roxi_ramrocket : public CreatureScript { diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index ea7f4c668ab..8e6741ab9af 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -32,15 +32,22 @@ EndContentData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_MOONFIRE 37328 -#define SPELL_FIREBALL 37329 -#define SPELL_MIND_FLAY 37330 -#define SPELL_HEMORRHAGE 37331 -#define SPELL_FROSTSHOCK 37332 -#define SPELL_CURSE_OF_AGONY 37334 -#define SPELL_MORTAL_STRIKE 37335 -#define SPELL_FREEZING_TRAP 37368 -#define SPELL_HAMMER_OF_JUSTICE 37369 +enum Spells +{ + SPELL_MOONFIRE = 37328, + SPELL_FIREBALL = 37329, + SPELL_MIND_FLAY = 37330, + SPELL_HEMORRHAGE = 37331, + SPELL_FROSTSHOCK = 37332, + SPELL_CURSE_OF_AGONY = 37334, + SPELL_MORTAL_STRIKE = 37335, + SPELL_FREEZING_TRAP = 37368, + SPELL_HAMMER_OF_JUSTICE = 37369, + + // Avatar of Martyred + SPELL_AV_MORTAL_STRIKE = 16856, + SPELL_AV_SUNDER_ARMOR = 16145 +}; class npc_stolen_soul : public CreatureScript { @@ -294,9 +301,6 @@ public: }; -#define SPELL_AV_MORTAL_STRIKE 16856 -#define SPELL_AV_SUNDER_ARMOR 16145 - class npc_avatar_of_martyred : public CreatureScript { public: diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index a599bdf74cb..daa8d68a292 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -27,22 +27,25 @@ EndScriptData */ #include "ScriptedCreature.h" #include "Player.h" -#define SPELL_INHIBITMAGIC 32264 -#define SPELL_ATTRACTMAGIC 32265 -#define N_SPELL_CARNIVOROUSBITE 36383 -#define H_SPELL_CARNIVOROUSBITE 39382 -#define SPELL_CARNIVOROUSBITE DUNGEON_MODE(N_SPELL_CARNIVOROUSBITE, H_SPELL_CARNIVOROUSBITE) +enum Spells +{ + SPELL_INHIBITMAGIC = 32264, + SPELL_ATTRACTMAGIC = 32265, + SPELL_CARNIVOROUSBITE = 36383, -#define ENTRY_FOCUS_FIRE 18374 + SPELL_FIERY_BLAST = 32302, -#define N_SPELL_FIERY_BLAST 32302 -#define H_SPELL_FIERY_BLAST 38382 -#define SPELL_FIERY_BLAST DUNGEON_MODE(N_SPELL_FIERY_BLAST, H_SPELL_FIERY_BLAST) -#define SPELL_FOCUS_FIRE_VISUAL 42075 //need to find better visual + SPELL_FOCUS_FIRE_VISUAL = 42075 //need to find better visual +}; enum Say { - EMOTE_FOCUSED = 0 + EMOTE_FOCUSED = 0 +}; + +enum Creatures +{ + NPC_FOCUS_FIRE = 18374 }; class boss_shirrak_the_dead_watcher : public CreatureScript @@ -82,7 +85,7 @@ public: void JustSummoned(Creature* summoned) { - if (summoned && summoned->GetEntry() == ENTRY_FOCUS_FIRE) + if (summoned && summoned->GetEntry() == NPC_FOCUS_FIRE) { summoned->CastSpell(summoned, SPELL_FOCUS_FIRE_VISUAL, false); summoned->setFaction(me->getFaction()); @@ -145,7 +148,7 @@ public: if (target && target->GetTypeId() == TYPEID_PLAYER && target->IsAlive()) { FocusedTargetGUID = target->GetGUID(); - me->SummonCreature(ENTRY_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); + me->SummonCreature(NPC_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); Talk(EMOTE_FOCUSED, FocusedTargetGUID); } FocusFire_Timer = 15000+(rand()%5000); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 41a94c84888..5b603984ea4 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -31,14 +31,17 @@ EndContentData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum ePrince +enum Yells { SAY_INTRO = 0, SAY_AGGRO = 1, SAY_SLAY = 2, SAY_SUMMON = 3, SAY_DEAD = 4, +}; +enum Spells +{ SPELL_BLINK = 34605, SPELL_FROSTBOLT = 32364, SPELL_FIREBALL = 32363, @@ -47,9 +50,19 @@ enum ePrince SPELL_ETHEREAL_BEACON = 32371, // Summons NPC_BEACON SPELL_ETHEREAL_BEACON_VISUAL = 32368, + // Ethereal Beacon + SPELL_ARCANE_BOLT = 15254, + SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 +}; + +enum Creatures +{ NPC_BEACON = 18431, - NPC_SHAFFAR = 18344, + NPC_SHAFFAR = 18344 +}; +enum Misc +{ NR_INITIAL_BEACONS = 3 }; @@ -213,12 +226,6 @@ public: }; -enum eEnums -{ - SPELL_ARCANE_BOLT = 15254, - SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 -}; - class npc_ethereal_beacon : public CreatureScript { public: @@ -305,7 +312,7 @@ public: }; -enum eEthereal +enum Ethereal { SPELL_ETHEREAL_APPRENTICE_FIREBOLT = 32369, SPELL_ETHEREAL_APPRENTICE_FROSTBOLT = 32370 diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 22dcc7d996c..a70c3a1e7f4 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -43,13 +43,13 @@ enum DarkweaverSyth SPELL_SUMMON_SYTH_FIRE = 33537, // Spawns 19203 SPELL_SUMMON_SYTH_ARCANE = 33538, // Spawns 19205 SPELL_SUMMON_SYTH_FROST = 33539, // Spawns 19204 - SPELL_SUMMON_SYTH_SHADOW = 33540 // Spawns 19206 -}; + SPELL_SUMMON_SYTH_SHADOW = 33540, // Spawns 19206 -#define SPELL_FLAME_BUFFET DUNGEON_MODE(33526, 38141) -#define SPELL_ARCANE_BUFFET DUNGEON_MODE(33527, 38138) -#define SPELL_FROST_BUFFET DUNGEON_MODE(33528, 38142) -#define SPELL_SHADOW_BUFFET DUNGEON_MODE(33529, 38143) + SPELL_FLAME_BUFFET = 33526, + SPELL_ARCANE_BUFFET = 33527, + SPELL_FROST_BUFFET = 33528, + SPELL_SHADOW_BUFFET = 33529 +}; class boss_darkweaver_syth : public CreatureScript { diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 785ec185941..a9091075075 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -27,10 +27,14 @@ EndScriptData */ #include "InstanceScript.h" #include "sethekk_halls.h" -enum eEnums +enum Creatures { - NPC_ANZU = 23035, - IKISS_DOOR = 177203, + NPC_ANZU = 23035 +}; + +enum GameObjects +{ + GO_IKISS_DOOR = 177203 }; class instance_sethekk_halls : public InstanceMapScript @@ -69,7 +73,7 @@ public: void OnGameObjectCreate(GameObject* go) { - if (go->GetEntry() == IKISS_DOOR) + if (go->GetEntry() == GO_IKISS_DOOR) m_uiIkissDoorGUID = go->GetGUID(); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h index 58e6cc685ce..15ffda4ada9 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h @@ -19,7 +19,7 @@ #ifndef DEF_SETHEKK_HALLS_H #define DEF_SETHEKK_HALLS_H -enum eTypes +enum DataTypes { DATA_IKISSDOOREVENT = 1, TYPE_ANZU_ENCOUNTER = 2, diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index f16a629dd0c..c7477171710 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -28,14 +28,17 @@ EndScriptData */ #include "ScriptedEscortAI.h" #include "shadow_labyrinth.h" -enum eEnums +enum Yells { SAY_INTRO = 0, SAY_AGGRO = 1, SAY_HELP = 2, SAY_SLAY = 3, - SAY_DEATH = 4, + SAY_DEATH = 4 +}; +enum Spells +{ SPELL_BANISH = 30231, SPELL_CORROSIVE_ACID = 33551, SPELL_FEAR = 33547, diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h index 433624a7d55..2d26fe745c2 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.h +++ b/src/server/scripts/Outland/BlackTemple/black_temple.h @@ -16,10 +16,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DEF_BLACK_TEMPLE_H -#define DEF_BLACK_TEMPLE_H +#ifndef BLACK_TEMPLE_H_ +#define BLACK_TEMPLE_H_ -enum eTypes +enum DataTypes { DATA_AKAMA = 1, DATA_AKAMA_SHADE = 2, @@ -49,5 +49,4 @@ enum eTypes DATA_BLOOD_ELF_COUNCIL_VOICE = 26 }; -#endif - +#endif // BLACK_TEMPLE_H_ diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 0c1994d0c2e..a4779204571 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -97,21 +97,26 @@ static Location BrokenWP[]= #define AKAMA_Y 400.601013f #define AKAMA_Z 112.783997f -// Spells -#define SPELL_VERTEX_SHADE_BLACK 39833 -#define SPELL_SHADE_SOUL_CHANNEL 40401 -#define SPELL_DESTRUCTIVE_POISON 40874 -#define SPELL_LIGHTNING_BOLT 42024 -#define SPELL_AKAMA_SOUL_CHANNEL 40447 -#define SPELL_AKAMA_SOUL_RETRIEVE 40902 -#define AKAMA_SOUL_EXPEL 40855 -#define SPELL_SHADE_SOUL_CHANNEL_2 40520 - -// Channeler entry -#define CREATURE_CHANNELER 23421 -#define CREATURE_SORCERER 23215 -#define CREATURE_DEFENDER 23216 -#define CREATURE_BROKEN 23319 + +enum Spells +{ + SPELL_VERTEX_SHADE_BLACK = 39833, + SPELL_SHADE_SOUL_CHANNEL = 40401, + SPELL_DESTRUCTIVE_POISON = 40874, + SPELL_LIGHTNING_BOLT = 42024, + SPELL_AKAMA_SOUL_CHANNEL = 40447, + SPELL_AKAMA_SOUL_RETRIEVE = 40902, + SPELL_AKAMA_SOUL_EXPEL = 40855, + SPELL_SHADE_SOUL_CHANNEL_2 = 40520 +}; + +enum Creatures +{ + NPC_CHANNELER = 23421, + NPC_SORCERER = 23215, + NPC_DEFENDER = 23216, + NPC_BROKEN = 23319 +}; const uint32 spawnEntries[4]= { 23523, 23318, 23524 }; @@ -286,18 +291,21 @@ public: reseting = false; } + void JustDied(Unit* /*killer*/) { summons.DespawnAll(); } + void JustSummoned(Creature* summon) { - if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) + if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Summon(summon); } + void SummonedCreatureDespawn(Creature* summon) { - if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) + if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Despawn(summon); } @@ -326,7 +334,9 @@ public: GridSearcherSucceeded = true; } } - } else TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly"); + } + else + TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly"); } } @@ -363,7 +373,7 @@ public: // max of 6 sorcerers can be summoned if ((rand()%3 == 0) && (DeathCount > 0) && (SorcererCount < 7)) { - Creature* Sorcerer = me->SummonCreature(CREATURE_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0); + Creature* Sorcerer = me->SummonCreature(NPC_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0); if (Sorcerer) { CAST_AI(npc_ashtongue_sorcerer::npc_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID(); @@ -394,7 +404,7 @@ public: void FindChannelers() { std::list<Creature*> ChannelerList; - me->GetCreatureListWithEntryInGrid(ChannelerList, CREATURE_CHANNELER, 50.0f); + me->GetCreatureListWithEntryInGrid(ChannelerList, NPC_CHANNELER, 50.0f); if (!ChannelerList.empty()) { @@ -440,7 +450,7 @@ public: if (DefenderTimer <= diff) { uint32 ran = rand()%2; - Creature* Defender = me->SummonCreature(CREATURE_DEFENDER, SpawnLocations[ran].x, SpawnLocations[ran].y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000); + Creature* Defender = me->SummonCreature(NPC_DEFENDER, SpawnLocations[ran].x, SpawnLocations[ran].y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000); if (Defender) { Defender->SetWalk(false); @@ -643,12 +653,13 @@ public: void JustSummoned(Creature* summon) { - if (summon->GetEntry() == CREATURE_BROKEN) + if (summon->GetEntry() == NPC_BROKEN) summons.Summon(summon); } + void SummonedCreatureDespawn(Creature* summon) { - if (summon->GetEntry() == CREATURE_BROKEN) + if (summon->GetEntry() == NPC_BROKEN) summons.Despawn(summon); } @@ -799,7 +810,7 @@ public: float y = BrokenCoords[BrokenSummonIndex].y + (1*5); float z = BrokenCoords[BrokenSummonIndex].z; float o = BrokenCoords[BrokenSummonIndex].o; - Creature* Broken = me->SummonCreature(CREATURE_BROKEN, x, y, z, o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000); + Creature* Broken = me->SummonCreature(NPC_BROKEN, x, y, z, o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000); if (Broken) { float wx = BrokenWP[BrokenSummonIndex].x + (i*5); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index dbd7aa50899..2782892db5d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -29,32 +29,44 @@ EndScriptData */ #include "Player.h" #include "SpellInfo.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_NEEDLE = 1, SAY_SLAY = 2, SAY_SPECIAL = 3, SAY_ENRAGE = 4, - SAY_DEATH = 5, + SAY_DEATH = 5 +}; - //Spells +enum Spells +{ SPELL_NEEDLE_SPINE = 39992, SPELL_TIDAL_BURST = 39878, SPELL_TIDAL_SHIELD = 39872, SPELL_IMPALING_SPINE = 39837, SPELL_CREATE_NAJENTUS_SPINE = 39956, SPELL_HURL_SPINE = 39948, - SPELL_BERSERK = 26662, + SPELL_BERSERK = 26662 - GOBJECT_SPINE = 185584, +}; +enum GameObjects +{ + GOBJECT_SPINE = 185584 +}; + +enum Events +{ EVENT_BERSERK = 1, EVENT_YELL = 2, EVENT_NEEDLE = 3, EVENT_SPINE = 4, - EVENT_SHIELD = 5, + EVENT_SHIELD = 5 +}; +enum Misc +{ GCD_CAST = 1, GCD_YELL = 2 }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index da8e75e8f31..2cc306c5df1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -29,31 +29,37 @@ EndScriptData */ #include "Spell.h" #include "Player.h" -#define SPELL_SPOUT 37433 -#define SPELL_SPOUT_ANIM 42835 -#define SPELL_SPOUT_BREATH 37431 -#define SPELL_KNOCKBACK 19813 -#define SPELL_GEYSER 37478 -#define SPELL_WHIRL 37660 -#define SPELL_WATERBOLT 37138 -#define SPELL_SUBMERGE 37550 -#define SPELL_EMERGE 20568 +enum Spells +{ + SPELL_SPOUT = 37433, + SPELL_SPOUT_ANIM = 42835, + SPELL_SPOUT_BREATH = 37431, + SPELL_KNOCKBACK = 19813, + SPELL_GEYSER = 37478, + SPELL_WHIRL = 37660, + SPELL_WATERBOLT = 37138, + SPELL_SUBMERGE = 37550, + SPELL_EMERGE = 20568, + + + // Ambusher spells + SPELL_SPREAD_SHOT = 37790, + SPELL_SHOOT = 37770, + // Guardian spells + SPELL_ARCINGSMASH = 38761, // Wrong SpellId. Can't find the right one. + SPELL_HAMSTRING = 26211 +}; + +enum Creatures +{ + NPC_COILFANG_GUARDIAN = 21873, + NPC_COILFANG_AMBUSHER = 21865 +}; #define EMOTE_SPOUT "The Lurker Below takes a deep breath." #define SPOUT_DIST 100 -#define NPC_COILFANG_GUARDIAN 21873 -#define NPC_COILFANG_AMBUSHER 21865 - -//Ambusher spells -#define SPELL_SPREAD_SHOT 37790 -#define SPELL_SHOOT 37770 - -//Guardian spells -#define SPELL_ARCINGSMASH 38761 // Wrong SpellId. Can't find the right one. -#define SPELL_HAMSTRING 26211 - float AddPos[9][3] = { // MOVE_AMBUSHER_1 X, Y, Z diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index ec949345928..448492dd134 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "serpent_shrine.h" -enum eEnums +enum Yells { // Yell SAY_AGGRO = 0, @@ -38,8 +38,11 @@ enum eEnums // Emotes EMOTE_WATERY_GRAVE = 5, EMOTE_EARTHQUAKE = 6, - EMOTE_WATERY_GLOBULES = 7, - // Spells + EMOTE_WATERY_GLOBULES = 7 +}; + +enum Spells +{ SPELL_TIDAL_WAVE = 37730, SPELL_WATERY_GRAVE = 38049, SPELL_EARTHQUAKE = 37764, @@ -54,6 +57,13 @@ enum eEnums SPELL_SUMMON_WATER_GLOBULE_2 = 37858, SPELL_SUMMON_WATER_GLOBULE_3 = 37860, SPELL_SUMMON_WATER_GLOBULE_4 = 37861, + + // Water Globule + SPELL_GLOBULE_EXPLOSION = 37871 +}; + +enum Creatures +{ // Creatures NPC_WATER_GLOBULE = 21913, NPC_TIDEWALKER_LURKER = 21920 @@ -277,9 +287,6 @@ public: }; -//Water Globule AI -#define SPELL_GLOBULE_EXPLOSION 37871 - class npc_water_globule : public CreatureScript { public: diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index de12e35ec19..b45029eb2bd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -30,12 +30,21 @@ EndScriptData */ #include "TemporarySummon.h" #define MAX_ENCOUNTER 6 -#define SPELL_SCALDINGWATER 37284 -#define NPC_COILFANG_FRENZY 21508 -#define TRASHNPC_COILFANG_PRIESTESS 21220 //6*2 -#define TRASHNPC_COILFANG_SHATTERER 21301 //6*3 -#define MIN_KILLS 30 +enum Misc +{ + // Spells + SPELL_SCALDINGWATER = 37284, + + // Creatures + NPC_COILFANG_FRENZY = 21508, + NPC_COILFANG_PRIESTESS = 21220, + NPC_COILFANG_SHATTERER = 21301, + + // Misc + MIN_KILLS = 30 +}; + //NOTE: there are 6 platforms //there should be 3 shatterers and 2 priestess on all platforms, total of 30 elites, else it won't work! diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 31af3e5a8d8..feeac7d4a54 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -32,18 +32,28 @@ EndContentData */ #include "ScriptedCreature.h" #include "steam_vault.h" -enum MekgineerSteamrigger +enum Yells { SAY_MECHANICS = 0, SAY_AGGRO = 1, SAY_SLAY = 2, - SAY_DEATH = 3, + SAY_DEATH = 3 +}; +enum Spells +{ SPELL_SUPER_SHRINK_RAY = 31485, SPELL_SAW_BLADE = 31486, SPELL_ELECTRIFIED_NET = 35107, - ENTRY_STREAMRIGGER_MECHANIC = 17951 + SPELL_DISPEL_MAGIC = 17201, + SPELL_REPAIR = 31532, + H_SPELL_REPAIR = 37936 +}; + +enum Creatures +{ + NPC_STREAMRIGGER_MECHANIC = 17951 }; class boss_mekgineer_steamrigger : public CreatureScript @@ -112,14 +122,14 @@ public: { Talk(SAY_MECHANICS); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); } void UpdateAI(uint32 diff) @@ -183,10 +193,6 @@ public: }; -#define SPELL_DISPEL_MAGIC 17201 -#define SPELL_REPAIR 31532 -#define H_SPELL_REPAIR 37936 - #define MAX_REPAIR_RANGE (13.0f) //we should be at least at this range for repair #define MIN_REPAIR_RANGE (7.0f) //we can stop movement at this range to repair but not required diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h index ea89ac3c611..275a21f5757 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -19,13 +19,17 @@ #ifndef DEF_STEAM_VAULT_H #define DEF_STEAM_VAULT_H -#define TYPE_HYDROMANCER_THESPIA 1 -#define TYPE_MEKGINEER_STEAMRIGGER 2 -#define TYPE_WARLORD_KALITHRESH 3 -#define TYPE_DISTILLER 4 +enum DataTypes +{ + TYPE_HYDROMANCER_THESPIA = 1, + TYPE_MEKGINEER_STEAMRIGGER = 2, + TYPE_WARLORD_KALITHRESH = 3, + TYPE_DISTILLER = 4, + + DATA_MEKGINEERSTEAMRIGGER = 5, + DATA_KALITRESH = 6, + DATA_THESPIA = 7 +}; -#define DATA_MEKGINEERSTEAMRIGGER 5 -#define DATA_KALITRESH 6 -#define DATA_THESPIA 7 #endif diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index f1bb841fa85..1beffd1d45d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -29,7 +29,11 @@ EndScriptData */ enum Spells { SPELL_FOUL_SPORES = 31673, - SPELL_ACID_GEYSER = 38739 + SPELL_ACID_GEYSER = 38739, + + SPELL_SPORE_CLOUD = 34168, + SPELL_PUTRID_MUSHROOM = 31690, + SPELL_GROW = 31698 }; class boss_hungarfen : public CreatureScript @@ -100,10 +104,6 @@ public: }; -#define SPELL_SPORE_CLOUD 34168 -#define SPELL_PUTRID_MUSHROOM 31690 -#define SPELL_GROW 31698 - class npc_underbog_mushroom : public CreatureScript { public: diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 473630cc9af..22ddd76e9e8 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -28,7 +28,7 @@ EndScriptData */ #include "SpellScript.h" #include "gruuls_lair.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_SLAM = 1, @@ -36,8 +36,11 @@ enum eEnums SAY_SLAY = 3, SAY_DEATH = 4, - EMOTE_GROW = 5, + EMOTE_GROW = 5 +}; +enum Spells +{ SPELL_GROWTH = 36300, SPELL_CAVE_IN = 36240, SPELL_GROUND_SLAM = 33525, //AoE Ground Slam applying Ground Slam to everyone with a script effect (most likely the knock back, we can code it to a set knockback) diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h index 2e9715a7ffe..69ddba8c274 100644 --- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h +++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h @@ -19,16 +19,19 @@ #ifndef DEF_GRUULS_LAIR_H #define DEF_GRUULS_LAIR_H -#define DATA_BLINDEYETHESEER 1 -#define DATA_GRUULEVENT 2 -#define DATA_KIGGLERTHECRAZED 3 -#define DATA_KROSHFIREHAND 4 -#define DATA_MAULGAREVENT 5 -#define DATA_MAULGAREVENT_TANK 6 -#define DATA_OLMTHESUMMONER 7 -#define DATA_MAULGARDOOR 8 -#define DATA_GRUULDOOR 9 -#define DATA_MAULGAR 10 +enum DataTypes +{ + DATA_BLINDEYETHESEER = 1, + DATA_GRUULEVENT = 2, + DATA_KIGGLERTHECRAZED = 3, + DATA_KROSHFIREHAND = 4, + DATA_MAULGAREVENT = 5, + DATA_MAULGAREVENT_TANK = 6, + DATA_OLMTHESUMMONER = 7, + DATA_MAULGARDOOR = 8, + DATA_GRUULDOOR = 9, + DATA_MAULGAR = 10 +}; #define ERROR_INST_DATA "TSCR Error: Instance Data not set properly for Gruul's Lair instance (map 565). Encounters will be buggy." #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h index 01f7a2bca98..1303a80488e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -19,29 +19,37 @@ #ifndef DEF_BLOOD_FURNACE_H #define DEF_BLOOD_FURNACE_H -#define DATA_THE_MAKER 1 -#define DATA_BROGGOK 2 -#define DATA_KELIDAN_THE_MAKER 3 -#define TYPE_THE_MAKER_EVENT 4 -#define TYPE_BROGGOK_EVENT 5 -#define TYPE_KELIDAN_THE_BREAKER_EVENT 6 -#define DATA_DOOR1 7 -#define DATA_DOOR2 8 -#define DATA_DOOR3 9 -#define DATA_DOOR4 10 -#define DATA_DOOR5 11 -#define DATA_DOOR6 12 -#define DATA_PRISON_CELL1 13 -#define DATA_PRISON_CELL2 14 -#define DATA_PRISON_CELL3 15 -#define DATA_PRISON_CELL4 16 -#define DATA_PRISON_CELL5 17 -#define DATA_PRISON_CELL6 18 -#define DATA_PRISON_CELL7 19 -#define DATA_PRISON_CELL8 20 -#define DATA_BROGGOK_LEVER 21 -#define ACTION_ACTIVATE_BROGGOK 22 -#define ACTION_RESET_BROGGOK 23 -#define ACTION_PREPARE_BROGGOK 24 +enum DataTypes +{ + DATA_THE_MAKER = 1, + DATA_BROGGOK = 2, + DATA_KELIDAN_THE_MAKER = 3, + TYPE_THE_MAKER_EVENT = 4, + TYPE_BROGGOK_EVENT = 5, + TYPE_KELIDAN_THE_BREAKER_EVENT = 6, + DATA_DOOR1 = 7, + DATA_DOOR2 = 8, + DATA_DOOR3 = 9, + DATA_DOOR4 = 10, + DATA_DOOR5 = 11, + DATA_DOOR6 = 12, + DATA_PRISON_CELL1 = 13, + DATA_PRISON_CELL2 = 14, + DATA_PRISON_CELL3 = 15, + DATA_PRISON_CELL4 = 16, + DATA_PRISON_CELL5 = 17, + DATA_PRISON_CELL6 = 18, + DATA_PRISON_CELL7 = 19, + DATA_PRISON_CELL8 = 20, + DATA_BROGGOK_LEVER = 21 +}; + +enum ActionIds +{ + ACTION_ACTIVATE_BROGGOK = 1, + ACTION_RESET_BROGGOK = 2, + ACTION_PREPARE_BROGGOK = 3 +}; + #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index fdbd0b9dcc6..39da979dd68 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -27,10 +27,13 @@ EndScriptData */ #include "ScriptedCreature.h" #include "blood_furnace.h" -enum eEnums +enum Yells { - SAY_AGGRO = 0, + SAY_AGGRO = 0 +}; +enum Spells +{ SPELL_SLIME_SPRAY = 30913, SPELL_POISON_CLOUD = 30916, SPELL_POISON_BOLT = 30917, diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 31e66c380d2..931f83bf884 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -33,7 +33,7 @@ EndContentData */ #include "SpellAuras.h" #include "blood_furnace.h" -enum eKelidan +enum Kelidan { SAY_WAKE = 0, SAY_ADD_AGGRO = 1, @@ -283,7 +283,7 @@ class boss_kelidan_the_breaker : public CreatureScript ## npc_shadowmoon_channeler ######*/ -enum eShadowmoon +enum Shadowmoon { SPELL_SHADOW_BOLT = 12739, H_SPELL_SHADOW_BOLT = 15472, diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 134284acab5..f200d533ceb 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -27,12 +27,15 @@ EndScriptData */ #include "ScriptedCreature.h" #include "blood_furnace.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_KILL = 1, - SAY_DIE = 2, + SAY_DIE = 2 +}; +enum Spells +{ SPELL_ACID_SPRAY = 38153, SPELL_EXPLODING_BREAKER = 30925, SPELL_KNOCKDOWN = 20276, diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 872b05d8ed1..50b74cbc0c1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "Player.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SUMMON = 1, @@ -37,7 +37,7 @@ enum eSays SAY_WIPE = 5 }; -enum eSpells +enum Spells { SPELL_ORBITAL_STRIKE = 30637, SPELL_SHADOW_WHIP = 30638, diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index cee8a2e840e..b3d89d0cf03 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "SpellInfo.h" -enum eSpells +enum Spells { SPELL_FIREBALL = 34653, SPELL_FIREBALL_H = 36920, @@ -42,7 +42,7 @@ enum eSpells SPELL_FIRE_NOVA_VISUAL = 19823 }; -enum eUnits +enum Units { ENTRY_HELLFIRE_SENTRY = 17517, ENTRY_VAZRUDEN_HERALD = 17307, diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index afde225407d..044c22f7ac0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eSays +enum Says { SAY_TAUNT = 0, SAY_HEAL = 1, @@ -36,7 +36,7 @@ enum eSays SAY_DIE = 5 }; -enum eSpells +enum Spells { SPELL_MORTAL_WOUND = 30641, H_SPELL_MORTAL_WOUND = 36814, diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h index b67041e93f2..6009f6ca8e2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -21,7 +21,7 @@ #define MAX_ENCOUNTER 2 -enum eTypes +enum DataTypes { TYPE_VAZRUDEN = 1, TYPE_NAZAN = 2 diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 8ad34033e5c..d6d346e6603 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -29,7 +29,7 @@ EndScriptData */ #include "Player.h" #include "SpellInfo.h" -enum eSays +enum Yells { SAY_TAUNT = 0, SAY_FREED = 1, @@ -40,14 +40,14 @@ enum eSays SAY_DEATH = 6 }; -enum eEmotes +enum Emotes { EMOTE_BERSERK = 7, EMOTE_BLASTNOVA = 8, EMOTE_BEGIN = 9 }; -enum eCreatures +enum Creatures { NPC_MAGTHERIDON = 17257, NPC_ROOM = 17516, @@ -55,7 +55,7 @@ enum eCreatures NPC_ABYSSAL = 17454, }; -enum eSpells +enum Spells { SPELL_BLASTNOVA = 30616, SPELL_CLEAVE = 30619, diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 6d65e8ebc43..75030ebc381 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -28,7 +28,7 @@ EndScriptData */ #include "InstanceScript.h" #include "magtheridons_lair.h" -enum eSpells +enum Spells { SPELL_SOUL_TRANSFER = 30531, // core bug, does not support target 7 SPELL_BLAZE_TARGET = 30541, // core bug, does not support target 7 diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h index 9a4e4613d59..f67b8ff3256 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -19,10 +19,14 @@ #ifndef DEF_MAGTHERIDONS_LAIR_H #define DEF_MAGTHERIDONS_LAIR_H -#define DATA_MAGTHERIDON_EVENT 1 -#define DATA_MAGTHERIDON 3 -#define DATA_CHANNELER_EVENT 2 -#define DATA_COLLAPSE 6 -#define DATA_CHANNELER 9 +enum DataTypes +{ + DATA_MAGTHERIDON_EVENT = 1, + DATA_MAGTHERIDON = 3, + DATA_CHANNELER_EVENT = 2, + DATA_COLLAPSE = 6, + DATA_CHANNELER = 9 +}; + #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index b3408ed6c49..44632b36647 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -33,7 +33,7 @@ EndContentData */ #include "ScriptedCreature.h" #include "shattered_halls.h" -enum eSays +enum Says { SAY_INTRO = 0, SAY_PEON_ATTACKED = 1, @@ -44,7 +44,7 @@ enum eSays SAY_DIE = 6 }; -enum eSpells +enum Spells { SPELL_DEATH_COIL = 30500, SPELL_DARK_SPIN = 30502, // core bug spell attack caster :D diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 82ee361b657..1caf30dd831 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -32,19 +32,25 @@ EndContentData */ #include "ScriptedCreature.h" #include "shattered_halls.h" -enum eEnums +enum Yells { YELL_DIE_L = 0, YELL_DIE_R = 1, EMOTE_ENRAGE = 2, +}; +enum Spells +{ SPELL_BLAST_WAVE = 30600, SPELL_FEAR = 30584, SPELL_THUNDERCLAP = 30633, SPELL_BURNING_MAUL = 30598, H_SPELL_BURNING_MAUL = 36056, +}; +enum Creatures +{ NPC_LEFT_HEAD = 19523, NPC_RIGHT_HEAD = 19524 }; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 882cc3a0d3f..9e6eaf0b3d6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -30,20 +30,20 @@ EndContentData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SLAY = 1, SAY_DEATH = 2 }; -enum eSpells +enum Spells { SPELL_BLADE_DANCE = 30739, H_SPELL_CHARGE = 25821, }; -enum eCreatures +enum Creatures { NPC_SHATTERED_ASSASSIN = 17695, NPC_HEARTHEN_GUARD = 17621, diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index f56f844a49a..9d9fbf6aec0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -19,10 +19,12 @@ #ifndef DEF_SHATTERED_H #define DEF_SHATTERED_H -#define TYPE_NETHEKURSE 1 -#define DATA_NETHEKURSE 2 -#define DATA_NETHEKURSE_DOOR 3 +enum DataTypes +{ + TYPE_NETHEKURSE = 1, + DATA_NETHEKURSE = 2, + DATA_NETHEKURSE_DOOR = 3, -#define TYPE_OMROGG 4 + TYPE_OMROGG = 4 +}; #endif - diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 7de32c4bfbd..556b02606f7 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -28,7 +28,7 @@ EndScriptData */ #include "the_eye.h" #include "SpellInfo.h" -enum eSpells +enum Spells { SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1, 5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions SPELL_FLAME_QUILLS = 34229, // Randomly after changing position in phase after watching tons of movies, set probability 20% diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index a7f19aad871..18f72698beb 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -30,7 +30,7 @@ EndScriptData */ #include "the_eye.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_SUMMON1 = 1, @@ -38,8 +38,11 @@ enum eEnums SAY_KILL = 3, SAY_DEATH = 4, SAY_VOIDA = 5, - SAY_VOIDB = 6, + SAY_VOIDB = 6 +}; +enum Spells +{ SPELL_ARCANE_MISSILES = 33031, SPELL_WRATH_OF_THE_ASTROMANCER = 42783, SPELL_WRATH_OF_THE_ASTROMANCER_DOT = 42784, @@ -48,18 +51,28 @@ enum eEnums SPELL_VOID_BOLT = 39329, SPELL_SPOTLIGHT = 25824, + + SPELL_SOLARIUM_GREAT_HEAL = 33387, + SPELL_SOLARIUM_HOLY_SMITE = 25054, + SPELL_SOLARIUM_ARCANE_TORRENT = 33390 +}; + +enum Creatures +{ NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT = 18928, NPC_SOLARIUM_AGENT = 18925, - NPC_SOLARIUM_PRIEST = 18806, + NPC_SOLARIUM_PRIEST = 18806 +}; +enum Models +{ MODEL_HUMAN = 18239, - MODEL_VOIDWALKER = 18988, - - SPELL_SOLARIUM_GREAT_HEAL = 33387, - SPELL_SOLARIUM_HOLY_SMITE = 25054, - SPELL_SOLARIUM_ARCANE_TORRENT = 33390, + MODEL_VOIDWALKER = 18988 +}; +enum Misc +{ WV_ARMOR = 31000 }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index a5923d86ff8..d0d580c824b 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -29,9 +29,9 @@ EndScriptData */ #include "WorldPacket.h" #include "Opcodes.h" -enum eEnums +enum Yells { - //kael'thas Speech + // Kael'thas Speech SAY_INTRO = 0, SAY_INTRO_CAPERNIAN = 1, SAY_INTRO_TELONICUS = 2, @@ -47,7 +47,7 @@ enum eEnums SAY_SUMMON_PHOENIX = 12, SAY_DEATH = 13, - //Thaladred the Darkener speech + // Thaladred the Darkener speech SAY_THALADRED_AGGRO = 0, SAY_THALADRED_DEATH = 1, EMOTE_THALADRED_GAZE = 2, @@ -56,15 +56,18 @@ enum eEnums SAY_SANGUINAR_AGGRO = 0, SAY_SANGUINAR_DEATH = 1, - //Grand Astromancer Capernian speech + // Grand Astromancer Capernian speech SAY_CAPERNIAN_AGGRO = 0, SAY_CAPERNIAN_DEATH = 1, - //Master Engineer Telonicus speech + // Master Engineer Telonicus speech SAY_TELONICUS_AGGRO = 0, - SAY_TELONICUS_DEATH = 1, + SAY_TELONICUS_DEATH = 1 +}; - //Phase 2 spells +enum Spells +{ + // Phase 2 spells SPELL_SUMMON_WEAPONS = 36976, SPELL_SUMMON_WEAPONA = 36958, SPELL_SUMMON_WEAPONB = 36959, @@ -75,7 +78,7 @@ enum eEnums SPELL_SUMMON_WEAPONG = 36964, SPELL_RES_VISUAL = 24171, - //Phase 4 spells + // Phase 4 spells SPELL_FIREBALL = 22088, //wrong but works with CastCustomSpell SPELL_PYROBLAST = 36819, SPELL_FLAME_STRIKE = 36735, @@ -86,7 +89,7 @@ enum eEnums SPELL_PHOENIX_ANIMATION = 36723, SPELL_MIND_CONTROL = 32830, - //Phase 5 spells + // Phase 5 spells SPELL_EXPLODE = 36092, SPELL_FULLPOWER = 36187, SPELL_KNOCKBACK = 11027, @@ -94,12 +97,12 @@ enum eEnums SPELL_GRAVITY_LAPSE_AURA = 39432, SPELL_NETHER_BEAM = 35873, - //Thaladred the Darkener spells + // Thaladred the Darkener spells SPELL_PSYCHIC_BLOW = 10689, SPELL_SILENCE = 30225, - //Lord Sanguinar spells + // Lord Sanguinar spells SPELL_BELLOWING_ROAR = 40636, - //Grand Astromancer Capernian spells + // Grand Astromancer Capernian spells SPELL_CAPERNIAN_FIREBALL = 36971, SPELL_CONFLAGRATION = 37018, @@ -112,16 +115,24 @@ enum eEnums //Phoenix spell SPELL_BURN = 36720, SPELL_EMBER_BLAST = 34341, - SPELL_REBIRTH = 41587, + SPELL_REBIRTH = 41587 +}; - //Creature IDs +enum Creatures +{ NPC_PHOENIX = 21362, - NPC_PHOENIX_EGG = 21364, + NPC_PHOENIX_EGG = 21364 +}; +enum Models +{ //Phoenix egg and phoenix model MODEL_ID_PHOENIX = 19682, - MODEL_ID_PHOENIX_EGG = 20245, + MODEL_ID_PHOENIX_EGG = 20245 +}; +enum Misc +{ MAX_ADVISORS = 4 }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 26668a77742..63e3d8b42ea 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -27,13 +27,16 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_eye.h" -enum eEnums +enum Yells { SAY_AGGRO = 0, SAY_SLAY = 1, SAY_DEATH = 2, - SAY_POUNDING = 3, + SAY_POUNDING = 3 +}; +enum Spells +{ SPELL_POUNDING = 34162, SPELL_ARCANE_ORB = 34172, SPELL_KNOCK_AWAY = 25778, diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 3fb42ced19f..8ba7a4722bb 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -31,7 +31,7 @@ EndContentData */ #include "ScriptedCreature.h" #include "the_eye.h" -enum eSpells +enum Spells { SPELL_COUNTERCHARGE = 35035, SPELL_KNOCKAWAY = 22893, diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h index 20b920a95d2..b9e44aff0a9 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h @@ -19,16 +19,19 @@ #ifndef DEF_THE_EYE_H #define DEF_THE_EYE_H -#define DATA_ALAREVENT 1 -#define DATA_ASTROMANCER 2 -#define DATA_GRANDASTROMANCERCAPERNIAN 3 -#define DATA_HIGHASTROMANCERSOLARIANEVENT 4 -#define DATA_KAELTHAS 5 -#define DATA_KAELTHASEVENT 6 -#define DATA_LORDSANGUINAR 7 -#define DATA_MASTERENGINEERTELONICUS 8 -#define DATA_THALADREDTHEDARKENER 10 -#define DATA_VOIDREAVEREVENT 11 -#define DATA_ALAR 12 -#endif +enum DataTypes +{ + DATA_ALAREVENT = 1, + DATA_ASTROMANCER = 2, + DATA_GRANDASTROMANCERCAPERNIAN = 3, + DATA_HIGHASTROMANCERSOLARIANEVENT = 4, + DATA_KAELTHAS = 5, + DATA_KAELTHASEVENT = 6, + DATA_LORDSANGUINAR = 7, + DATA_MASTERENGINEERTELONICUS = 8, + DATA_THALADREDTHEDARKENER = 10, + DATA_VOIDREAVEREVENT = 11, + DATA_ALAR = 12 +}; +#endif diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index fbafe03fddb..f77c54c25e6 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "mechanar.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SUMMON = 1, diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 43af42b1e72..96dc4d06588 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -37,7 +37,7 @@ EndContentData */ # npc_millhouse_manastorm #####*/ -enum eMillhouseSays +enum MillhouseSays { SAY_INTRO_1 = 0, SAY_INTRO_2 = 1, @@ -53,7 +53,7 @@ enum eMillhouseSays SAY_COMPLETE = 11, }; -enum eMillhouseSpells +enum MillhouseSpells { SPELL_CONJURE_WATER = 36879, SPELL_ARCANE_INTELLECT = 36880, @@ -230,7 +230,7 @@ class npc_millhouse_manastorm : public CreatureScript # npc_warden_mellichar #####*/ -enum eWardenSays +enum WardenSays { YELL_INTRO1 = 0, YELL_INTRO2 = 1, @@ -242,7 +242,7 @@ enum eWardenSays YELL_WELCOME = 7, }; -enum eWardenUnits +enum WardenUnits { //phase 2(acid mobs) ENTRY_TRICKSTER = 20905, @@ -259,7 +259,7 @@ enum eWardenUnits ENTRY_SKYRISS = 20912, }; -enum eWardenSpells +enum WardenSpells { //TARGET_SCRIPT SPELL_TARGET_ALPHA = 36856, diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h index 9c852196616..37839d4794d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h @@ -16,20 +16,23 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DEF_ARCATRAZ_H -#define DEF_ARCATRAZ_H +#ifndef ARCATRAZ_H_ +#define ARCATRAZ_H_ -#define TYPE_ZEREKETH 1 -#define TYPE_DALLIAH 2 -#define TYPE_SOCCOTHRATES 3 -#define TYPE_HARBINGERSKYRISS 4 -#define TYPE_WARDEN_1 5 -#define TYPE_WARDEN_2 6 -#define TYPE_WARDEN_3 7 -#define TYPE_WARDEN_4 8 -#define TYPE_WARDEN_5 9 -#define DATA_MELLICHAR 10 -#define TYPE_SHIELD_OPEN 11 -#define DATA_SPHERE_SHIELD 12 -#endif +enum DataTypes +{ + TYPE_ZEREKETH = 1, + TYPE_DALLIAH = 2, + TYPE_SOCCOTHRATES = 3, + TYPE_HARBINGERSKYRISS = 4, + TYPE_WARDEN_1 = 5, + TYPE_WARDEN_2 = 6, + TYPE_WARDEN_3 = 7, + TYPE_WARDEN_4 = 8, + TYPE_WARDEN_5 = 9, + DATA_MELLICHAR = 10, + TYPE_SHIELD_OPEN = 11, + DATA_SPHERE_SHIELD = 12 +}; +#endif // ARCATRAZ_H_ diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 3cf9f01a601..c5261b48b78 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -32,7 +32,7 @@ EndContentData */ #include "ScriptedCreature.h" #include "arcatraz.h" -enum eSays +enum Says { SAY_INTRO = 0, SAY_AGGRO = 1, @@ -43,16 +43,19 @@ enum eSays SAY_DEATH = 6 }; -enum eSpells +enum Spells { - SPELL_FEAR = 39415, - SPELL_MIND_REND = 36924, - H_SPELL_MIND_REND = 39017, - SPELL_DOMINATION = 37162, - H_SPELL_DOMINATION = 39019, - H_SPELL_MANA_BURN = 39020, - SPELL_66_ILLUSION = 36931, //entry 21466 - SPELL_33_ILLUSION = 36932, //entry 21467 + SPELL_FEAR = 39415, + SPELL_MIND_REND = 36924, + H_SPELL_MIND_REND = 39017, + SPELL_DOMINATION = 37162, + H_SPELL_DOMINATION = 39019, + H_SPELL_MANA_BURN = 39020, + SPELL_66_ILLUSION = 36931, //entry 21466 + SPELL_33_ILLUSION = 36932, //entry 21467 + + SPELL_MIND_REND_IMAGE = 36929, + H_SPELL_MIND_REND_IMAGE = 39021 }; class boss_harbinger_skyriss : public CreatureScript @@ -275,9 +278,6 @@ class boss_harbinger_skyriss : public CreatureScript } }; -#define SPELL_MIND_REND_IMAGE 36929 -#define H_SPELL_MIND_REND_IMAGE 39021 - class boss_harbinger_skyriss_illusion : public CreatureScript { public: diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index a70b6fb35b4..c6fdda02d71 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define MAX_ENCOUNTER 9 -enum eUnits +enum Units { CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318, //door opened when Wrath-Scryer Soccothrates dies CONTAINMENT_CORE_SECURITY_FIELD_BETA = 184319, //door opened when Dalliah the Doomsayer dies diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index f883918db75..e17e2b460c5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_botanica.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_KILL = 1, @@ -37,7 +37,7 @@ enum eSays SAY_OOC_RANDOM = 5 }; -enum eSpells +enum Spells { SPELL_TRANQUILITY = 34550, SPELL_TREE_FORM = 34551, @@ -48,7 +48,10 @@ enum eSpells SPELL_PLANT_RED = 34763 }; -#define ENTRY_FRAYER 19953 +enum Creatures +{ + NPC_FRAYER = 19953 +}; class boss_high_botanist_freywinn : public CreatureScript { @@ -89,7 +92,7 @@ class boss_high_botanist_freywinn : public CreatureScript void JustSummoned(Creature* summoned) { - if (summoned->GetEntry() == ENTRY_FRAYER) + if (summoned->GetEntry() == NPC_FRAYER) Adds_List.push_back(summoned->GetGUID()); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 91bf42351b4..14126f539ff 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_botanica.h" -enum eSpells +enum Spells { SPELL_ALLERGIC_REACTION = 34697, SPELL_TELEPORT_SELF = 34673, @@ -41,7 +41,7 @@ enum eSpells SPELL_SUMMON_LASHER_4 = 34688, SPELL_SUMMON_FLAYER_3 = 34690 }; -enum eOthers +enum Misc { EMOTE_SUMMON = 0, MODEL_DEFAULT = 13109, diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 09ca90570b0..5bb91b384a1 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -27,7 +27,7 @@ EndScriptData */ #include "ScriptedCreature.h" #include "the_botanica.h" -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SLAY = 1, @@ -35,7 +35,7 @@ enum eSays SAY_DEATH = 3 }; -enum eSpells +enum Spells { WAR_STOMP = 34716, SUMMON_TREANTS = 34727, // DBC: 34727, 34731, 34733, 34734, 34736, 34739, 34741 (with Ancestral Life spell 34742) // won't work (guardian summon) @@ -44,7 +44,7 @@ enum eSpells SPELL_HEAL_FATHER = 6262 }; -enum eOthers +enum Misc { CREATURE_TREANT = 19949, TREANT_SPAWN_DIST = 50 //50 yards from Warp Splinter's spawn point diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 8ecf26b028a..c10f119f00f 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -85,7 +85,7 @@ public: ## npc_nether_drake ######*/ -enum eNetherdrake +enum Netherdrake { //Used by 20021, 21817, 21820, 21821, 21823 but not existing in database SAY_NIHIL_1 = 0, @@ -265,7 +265,7 @@ public: ## npc_daranelle ######*/ -enum eDaranelle +enum Daranelle { SAY_SPELL_INFLUENCE = 0, SPELL_LASHHAN_CHANNEL = 36904 @@ -431,7 +431,7 @@ public: ## npc_bloodmaul_brutebane ######*/ -enum eBloodmaul +enum Bloodmaul { NPC_OGRE_BRUTE = 19995, NPC_QUEST_CREDIT = 21241, diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index ea1fde3139f..7cbc48966ae 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -44,7 +44,7 @@ EndContentData */ ## npc_aeranas ######*/ -enum eAeranas +enum Aeranas { SAY_SUMMON = 0, SAY_FREE = 1, @@ -132,7 +132,7 @@ public: ## npc_ancestral_wolf ######*/ -enum eAncestralWolf +enum AncestralWolf { EMOTE_WOLF_LIFT_HEAD = 0, EMOTE_WOLF_HOWL = 1, @@ -208,7 +208,7 @@ public: #define GOSSIP_NALADU_ITEM1 "Why don't you escape?" -enum eNaladu +enum Naladu { GOSSIP_TEXTID_NALADU1 = 9788 }; @@ -246,7 +246,7 @@ public: #define GOSSIP_TRACY_PROUDWELL_ITEM1 "I heard that your dog Fei Fei took Klatu's prayer beads..." #define GOSSIP_TRACY_PROUDWELL_ITEM2 "<back>" -enum eTracy +enum Tracy { GOSSIP_TEXTID_TRACY_PROUDWELL1 = 10689, QUEST_DIGGING_FOR_PRAYER_BEADS = 10916 @@ -301,7 +301,7 @@ public: #define GOSSIP_TROLLBANE_ITEM2 "<more>" #define GOSSIP_TROLLBANE_ITEM3 "Tell me of your homeland." -enum eTrollbane +enum Trollbane { GOSSIP_TEXTID_TROLLBANE1 = 9932, GOSSIP_TEXTID_TROLLBANE2 = 9933, @@ -349,7 +349,7 @@ public: ## npc_wounded_blood_elf ######*/ -enum eWoundedBloodElf +enum WoundedBloodElf { SAY_ELF_START = 0, SAY_ELF_SUMMON1 = 1, @@ -442,7 +442,7 @@ public: ## npc_fel_guard_hound ######*/ -enum eFelGuard +enum FelGuard { SPELL_SUMMON_POO = 37688, diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 2bb688026d1..c4b651c22ce 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -147,7 +147,7 @@ public: ## npc_maghar_captive #####*/ -enum eMagharCaptive +enum MagharCaptive { SAY_MAG_START = 0, SAY_MAG_NO_ESCAPE = 0, diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index f8be2a43bf8..a3f959c58b6 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -43,7 +43,7 @@ EndContentData */ ######*/ //used by 20209, 20417, 20418, 20440, signed for 20209 -enum eManaforgeConsoleData +enum ManaforgeConsoleData { EMOTE_START = 0, EMOTE_60 = 1, @@ -360,7 +360,7 @@ public: ######*/ // The Speech of Dawnforge, Ardonis & Pathaleon -enum eCommanderDawnforgeData +enum CommanderDawnforgeData { SAY_COMMANDER_DAWNFORGE_1 = 0, SAY_COMMANDER_DAWNFORGE_2 = 1, @@ -666,7 +666,7 @@ public: /*###### ## npc_professor_dabiri ######*/ -enum eProfessorDabiriData +enum ProfessorDabiriData { SPELL_PHASE_DISTRUPTOR = 35780, @@ -717,7 +717,7 @@ public: ## npc_phase_hunter ######*/ -enum ePhaseHunterData +enum PhaseHunterData { QUEST_RECHARGING_THE_BATTERIES = 10190, @@ -850,7 +850,7 @@ public: /*###### ## npc_bessy ######*/ -enum eBessyData +enum BessyData { Q_ALMABTRIEB = 10337, N_THADELL = 20464, diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index a51940a9143..a8fdf3b9034 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -53,7 +53,7 @@ EndContentData */ # npc_mature_netherwing_drake #####*/ -enum eMatureNetherwing +enum MatureNetherwing { SAY_JUST_EATEN = 0, @@ -190,14 +190,21 @@ public: # npc_enslaved_netherwing_drake ####*/ -#define FACTION_DEFAULT 62 -#define FACTION_FRIENDLY 1840 // Not sure if this is correct, it was taken off of Mordenai. +enum EnshlavedNetherwingDrake +{ + // Factions + FACTION_DEFAULT = 62, + FACTION_FRIENDLY = 1840, // Not sure if this is correct, it was taken off of Mordenai. + + // Spells + SPELL_HIT_FORCE_OF_NELTHARAKU = 38762, + SPELL_FORCE_OF_NELTHARAKU = 38775, -#define SPELL_HIT_FORCE_OF_NELTHARAKU 38762 -#define SPELL_FORCE_OF_NELTHARAKU 38775 + // Creatures + NPC_DRAGONMAW_SUBJUGATOR = 21718, + NPC_ESCAPE_DUMMY = 22317 -#define CREATURE_DRAGONMAW_SUBJUGATOR 21718 -#define CREATURE_ESCAPE_DUMMY 22317 +}; class npc_enslaved_netherwing_drake : public CreatureScript { @@ -245,7 +252,7 @@ public: me->setFaction(FACTION_FRIENDLY); DoCast(caster, SPELL_FORCE_OF_NELTHARAKU, true); - Unit* Dragonmaw = me->FindNearestCreature(CREATURE_DRAGONMAW_SUBJUGATOR, 50); + Unit* Dragonmaw = me->FindNearestCreature(NPC_DRAGONMAW_SUBJUGATOR, 50); if (Dragonmaw) { me->AddThreat(Dragonmaw, 100000.0f); @@ -304,7 +311,7 @@ public: dz += 20; // so it's in the air, not ground*/ Position pos; - if (Unit* EscapeDummy = me->FindNearestCreature(CREATURE_ESCAPE_DUMMY, 30)) + if (Unit* EscapeDummy = me->FindNearestCreature(NPC_ESCAPE_DUMMY, 30)) EscapeDummy->GetPosition(&pos); else { @@ -663,7 +670,7 @@ class npc_karynaku : public CreatureScript # npc_overlord_morghor # this whole script is wrong and needs a rewrite.even the illidan npc used is the wrong one.npc id 23467 may be the correct one ####*/ -enum eOverlordData +enum OverlordData { QUEST_LORD_ILLIDAN_STORMRAGE = 11108, @@ -980,7 +987,7 @@ public: # npc_earthmender_wilda ####*/ -enum eEarthmender +enum Earthmender { SAY_WIL_START = 0, SAY_WIL_AGGRO = 1, @@ -1758,45 +1765,48 @@ public: # npc_enraged_spirits ####*/ -/* QUESTS */ -#define QUEST_ENRAGED_SPIRITS_FIRE_EARTH 10458 -#define QUEST_ENRAGED_SPIRITS_AIR 10481 -#define QUEST_ENRAGED_SPIRITS_WATER 10480 - -/* Totem */ -#define ENTRY_TOTEM_OF_SPIRITS 21071 -#define RADIUS_TOTEM_OF_SPIRITS 15 - -/* SPIRITS */ -#define ENTRY_ENRAGED_EARTH_SPIRIT 21050 -#define ENTRY_ENRAGED_FIRE_SPIRIT 21061 -#define ENTRY_ENRAGED_AIR_SPIRIT 21060 -#define ENTRY_ENRAGED_WATER_SPIRIT 21059 - -/* SOULS */ -#define ENTRY_EARTHEN_SOUL 21073 -#define ENTRY_FIERY_SOUL 21097 -#define ENTRY_ENRAGED_AIRY_SOUL 21116 -#define ENTRY_ENRAGED_WATERY_SOUL 21109 // wrong model - -/* SPELL KILLCREDIT - not working!?! - using KilledMonsterCredit */ -#define SPELL_EARTHEN_SOUL_CAPTURED_CREDIT 36108 -#define SPELL_FIERY_SOUL_CAPTURED_CREDIT 36117 -#define SPELL_AIRY_SOUL_CAPTURED_CREDIT 36182 -#define SPELL_WATERY_SOUL_CAPTURED_CREDIT 36171 - -/* KilledMonsterCredit Workaround */ -#define CREDIT_FIRE 21094 -#define CREDIT_WATER 21095 -#define CREDIT_AIR 21096 -#define CREDIT_EARTH 21092 - -/* Captured Spell/Buff */ -#define SPELL_SOUL_CAPTURED 36115 - -/* Factions */ -#define ENRAGED_SOUL_FRIENDLY 35 -#define ENRAGED_SOUL_HOSTILE 14 +enum Enraged_Dpirits +{ +// QUESTS + QUEST_ENRAGED_SPIRITS_FIRE_EARTH = 10458, + QUEST_ENRAGED_SPIRITS_AIR = 10481, + QUEST_ENRAGED_SPIRITS_WATER = 10480, + + // Totem + ENTRY_TOTEM_OF_SPIRITS = 21071, + RADIUS_TOTEM_OF_SPIRITS = 15, + + // SPIRITS + NPC_ENRAGED_EARTH_SPIRIT = 21050, + NPC_ENRAGED_FIRE_SPIRIT = 21061, + NPC_ENRAGED_AIR_SPIRIT = 21060, + NPC_ENRAGED_WATER_SPIRIT = 21059, + + // SOULS + NPC_EARTHEN_SOUL = 21073, + NPC_FIERY_SOUL = 21097, + NPC_ENRAGED_AIRY_SOUL = 21116, + NPC_ENRAGED_WATERY_SOUL = 21109, // wrong model + + // SPELL KILLCREDIT - not working!?! - using KilledMonsterCredit + SPELL_EARTHEN_SOUL_CAPTURED_CREDIT = 36108, + SPELL_FIERY_SOUL_CAPTURED_CREDIT = 36117, + SPELL_AIRY_SOUL_CAPTURED_CREDIT = 36182, + SPELL_WATERY_SOUL_CAPTURED_CREDIT = 36171, + + // KilledMonsterCredit Workaround + NPC_CREDIT_FIRE = 21094, + NPC_CREDIT_WATER = 21095, + NPC_CREDIT_AIR = 21096, + NPC_CREDIT_EARTH = 21092, + + // Captured Spell / Buff + SPELL_SOUL_CAPTURED = 36115, + + // Factions + FACTION_ENRAGED_SOUL_FRIENDLY = 35, + FACTION_ENRAGED_SOUL_HOSTILE = 14 +}; class npc_enraged_spirit : public CreatureScript { @@ -1826,26 +1836,28 @@ public: switch (me->GetEntry()) { - case ENTRY_ENRAGED_FIRE_SPIRIT: - entry = ENTRY_FIERY_SOUL; - //credit = SPELL_FIERY_SOUL_CAPTURED_CREDIT; - credit = CREDIT_FIRE; - break; - case ENTRY_ENRAGED_EARTH_SPIRIT: - entry = ENTRY_EARTHEN_SOUL; - //credit = SPELL_EARTHEN_SOUL_CAPTURED_CREDIT; - credit = CREDIT_EARTH; - break; - case ENTRY_ENRAGED_AIR_SPIRIT: - entry = ENTRY_ENRAGED_AIRY_SOUL; - //credit = SPELL_AIRY_SOUL_CAPTURED_CREDIT; - credit = CREDIT_AIR; - break; - case ENTRY_ENRAGED_WATER_SPIRIT: - entry = ENTRY_ENRAGED_WATERY_SOUL; - //credit = SPELL_WATERY_SOUL_CAPTURED_CREDIT; - credit = CREDIT_WATER; - break; + case NPC_ENRAGED_FIRE_SPIRIT: + entry = NPC_FIERY_SOUL; + //credit = SPELL_FIERY_SOUL_CAPTURED_CREDIT; + credit = NPC_CREDIT_FIRE; + break; + case NPC_ENRAGED_EARTH_SPIRIT: + entry = NPC_EARTHEN_SOUL; + //credit = SPELL_EARTHEN_SOUL_CAPTURED_CREDIT; + credit = NPC_CREDIT_EARTH; + break; + case NPC_ENRAGED_AIR_SPIRIT: + entry = NPC_ENRAGED_AIRY_SOUL; + //credit = SPELL_AIRY_SOUL_CAPTURED_CREDIT; + credit = NPC_CREDIT_AIR; + break; + case NPC_ENRAGED_WATER_SPIRIT: + entry = NPC_ENRAGED_WATERY_SOUL; + //credit = SPELL_WATERY_SOUL_CAPTURED_CREDIT; + credit = NPC_CREDIT_WATER; + break; + default: + break; } // Spawn Soul on Kill ALWAYS! @@ -1861,7 +1873,7 @@ public: totemOspirits = me->FindNearestCreature(ENTRY_TOTEM_OF_SPIRITS, RADIUS_TOTEM_OF_SPIRITS); if (totemOspirits) { - Summoned->setFaction(ENRAGED_SOUL_FRIENDLY); + Summoned->setFaction(FACTION_ENRAGED_SOUL_FRIENDLY); Summoned->GetMotionMaster()->MovePoint(0, totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ()); if (Unit* owner = totemOspirits->GetOwner()) diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 06b34a8f0e2..0241a5cb4ed 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -46,7 +46,7 @@ EndContentData */ #define GOSSIP_RALIQ "You owe Sim'salabim money. Hand them over or die!" -enum eRaliq +enum Raliq { SPELL_UPPERCUT = 10966, QUEST_CRACK_SKULLS = 10009, @@ -120,11 +120,19 @@ public: # npc_salsalabim ######*/ -#define FACTION_HOSTILE_SA 90 -#define FACTION_FRIENDLY_SA 35 -#define QUEST_10004 10004 +enum Salsalabim +{ + // Factions + FACTION_HOSTILE_SA = 90, + FACTION_FRIENDLY_SA = 35, + + // Quests + QUEST_10004 = 10004, -#define SPELL_MAGNETIC_PULL 31705 + // Spells + SPELL_MAGNETIC_PULL = 31705 + +}; class npc_salsalabim : public CreatureScript { diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index fc43dac2c5d..45ff3477307 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -281,13 +281,17 @@ public: ## npc_netherweb_victim ######*/ -#define QUEST_TARGET 22459 -//#define SPELL_FREE_WEBBED 38950 +enum NetherwebVictim +{ + QUEST_TARGET = 22459 + //SPELL_FREE_WEBBED = 38950 +}; const uint32 netherwebVictims[6] = { 18470, 16805, 21242, 18452, 22482, 21285 }; + class npc_netherweb_victim : public CreatureScript { public: @@ -338,7 +342,7 @@ public: #define GOSSIP_FLOON1 "You owe Sim'salabim money. Hand them over or die!" #define GOSSIP_FLOON2 "Hand over the money or die...again!" -enum eFloon +enum Floon { SAY_FLOON_ATTACK = 0, @@ -441,7 +445,7 @@ public: /*###### ## npc_isla_starmane ######*/ -enum eIslaStarmaneData +enum IslaStarmaneData { SAY_PROGRESS_1 = 0, SAY_PROGRESS_2 = 1, @@ -596,7 +600,7 @@ public: ## npc_slim ######*/ -enum eSlim +enum Slim { FACTION_CONSORTIUM = 933 }; @@ -633,7 +637,7 @@ public: ####npc_akuno #####*/ -enum eAkuno +enum Akuno { QUEST_ESCAPING_THE_TOMB = 10887, NPC_CABAL_SKRIMISHER = 21661 diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index 1f98d4aa337..9a70896f44b 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -161,7 +161,7 @@ public: #define GOSSIP_COOSH "You owe Sim'salabim money. Hand them over or die!" -enum eCooshhooosh +enum Cooshhooosh { SPELL_LIGHTNING_BOLT = 9532, QUEST_CRACK_SKULLS = 10009, @@ -323,7 +323,7 @@ public: ## npc_kayra_longmane ######*/ -enum eKayra +enum Kayra { SAY_START = 0, SAY_AMBUSH1 = 1, @@ -404,7 +404,7 @@ public: #define GOSSIP_TIMOTHY_DANIELS_ITEM1 "Specialist, eh? Just what kind of specialist are you, anyway?" #define GOSSIP_TEXT_BROWSE_POISONS "Let me browse your reagents and poison supplies." -enum eTimothy +enum Timothy { GOSSIP_TEXTID_TIMOTHY_DANIELS1 = 9239 }; diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 5b55b532566..b75c4995e65 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -1117,7 +1117,11 @@ class spell_q9452_cast_net: public SpellScriptLoader #define SAY_1 "Sons of Hodir! I humbly present to you..." #define SAY_2 "The Helm of Hodir!" -#define NPC_KILLCREDIT 30210 // Hodir's Helm KC Bunny + +enum HodirsHelm +{ + NPC_KILLCREDIT = 30210 // Hodir's Helm KC Bunny +}; class spell_q12987_read_pronouncement : public SpellScriptLoader { diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 391c7b75c89..388a4fbfcf2 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -43,7 +43,7 @@ EndContentData */ ## at_coilfang_waterfall ######*/ -enum eCoilfangGOs +enum CoilfangGOs { GO_COILFANG_WATERFALL = 184212 }; @@ -71,7 +71,7 @@ class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript ## at_legion_teleporter #####*/ -enum eLegionTeleporter +enum LegionTeleporter { SPELL_TELE_A_TO = 37387, QUEST_GAINING_ACCESS_A = 10589, @@ -115,7 +115,7 @@ class AreaTrigger_at_legion_teleporter : public AreaTriggerScript ## at_stormwright_shelf ######*/ -enum eStormwrightShelf +enum StormwrightShelf { QUEST_STRENGTH_OF_THE_TEMPEST = 12741, @@ -144,7 +144,7 @@ class AreaTrigger_at_stormwright_shelf : public AreaTriggerScript ## at_scent_larkorwi ######*/ -enum eScentLarkorwi +enum ScentLarkorwi { QUEST_SCENT_OF_LARKORWI = 4291, NPC_LARKORWI_MATE = 9683 @@ -175,7 +175,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript ## at_last_rites #####*/ -enum eAtLastRites +enum AtLastRites { QUEST_LAST_RITES = 12019, QUEST_BREAKING_THROUGH = 11898, @@ -226,7 +226,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript ## at_sholazar_waygate ######*/ -enum eWaygate +enum Waygate { SPELL_SHOLAZAR_TO_UNGORO_TELEPORT = 52056, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT = 52057, diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 393244c9ac5..57846aba9ff 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -396,7 +396,10 @@ public: ## go_sacred_fire_of_life ######*/ -#define NPC_ARIKARA 10882 +enum SacredFireOfLife +{ + NPC_ARIKARA = 10882 +}; class go_sacred_fire_of_life : public GameObjectScript { @@ -773,7 +776,11 @@ public: ## go_blood_filled_orb ######*/ -#define NPC_ZELEMAR 17830 +enum BloodFilledOrb +{ + NPC_ZELEMAR = 17830 + +}; class go_blood_filled_orb : public GameObjectScript { diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 67cf3b8d582..b4bc9720e74 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -39,7 +39,7 @@ EndContentData */ # item_only_for_flight #####*/ -enum eOnlyForFlight +enum OnlyForFlight { SPELL_ARCANE_CHARGES = 45072 }; @@ -189,7 +189,7 @@ public: # item_pile_fake_furs #####*/ -enum ePileFakeFur +enum PileFakeFur { GO_CARIBOU_TRAP_1 = 187982, GO_CARIBOU_TRAP_2 = 187995, @@ -256,7 +256,7 @@ public: # item_petrov_cluster_bombs #####*/ -enum ePetrovClusterBombs +enum PetrovClusterBombs { SPELL_PETROV_BOMB = 42406, AREA_ID_SHATTERED_STRAITS = 4064, @@ -291,7 +291,7 @@ public: # item_dehta_trap_smasher # For quest 11876, Help Those That Cannot Help Themselves ######*/ -enum eHelpThemselves +enum HelpThemselves { QUEST_CANNOT_HELP_THEMSELVES = 11876, NPC_TRAPPED_MAMMOTH_CALF = 25850, @@ -386,7 +386,7 @@ public: } }; -enum eCapturedFrog +enum CapturedFrog { QUEST_THE_PERFECT_SPIES = 25444, NPC_VANIRAS_SENTRY_TOTEM = 40187 diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 4d181880c99..358bf997508 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -30,9 +30,11 @@ EndScriptData */ #include "Player.h" #include "WorldSession.h" -#define HALLOWEEN_EVENTID 12 -#define SPELL_TRICK_OR_TREATED 24755 -#define SPELL_TREAT 24715 +enum Spells +{ + SPELL_TRICK_OR_TREATED = 24755, + SPELL_TREAT = 24715 +}; #define LOCALE_TRICK_OR_TREAT_0 "Trick or Treat!" #define LOCALE_TRICK_OR_TREAT_2 "Des bonbons ou des blagues!" @@ -49,7 +51,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICK_OR_TREATED)) + if (IsHolidayActive(HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) { const char* localizedEntry; switch (player->GetSession()->GetSessionDbcLocale()) @@ -59,7 +61,7 @@ public: case LOCALE_esES: localizedEntry = LOCALE_TRICK_OR_TREAT_6; break; case LOCALE_enUS: default: localizedEntry = LOCALE_TRICK_OR_TREAT_0; } - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); } if (creature->IsQuestGiver()) @@ -87,7 +89,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICK_OR_TREATED)) + if (action == GOSSIP_ACTION_INFO_DEF + 1 && IsHolidayActive(HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) { player->CastSpell(player, SPELL_TRICK_OR_TREATED, true); diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index ff37c88adae..4180005ff3d 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -767,7 +767,7 @@ public: # engineering trinkets ###*/ -enum eEngineeringTrinkets +enum EngineeringTrinkets { NPC_ZAP = 14742, NPC_JHORDY = 14743, diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 5301f8fa2c4..bf3f0fe3a8c 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -77,7 +77,7 @@ struct SpawnAssociation SpawnType spawnType; }; -enum eEnums +enum AirFoceBots { SPELL_GUARDS_MARK = 38067, AURA_DURATION_TIME_LEFT = 5000 @@ -412,9 +412,12 @@ public: ## npc_dancing_flames ######*/ -#define SPELL_BRAZIER 45423 -#define SPELL_SEDUCTION 47057 -#define SPELL_FIERY_AURA 45427 +enum DancingFlames +{ + SPELL_BRAZIER = 45423, + SPELL_SEDUCTION = 47057, + SPELL_FIERY_AURA = 45427 +}; class npc_dancing_flames : public CreatureScript { @@ -1109,7 +1112,10 @@ public: ## npc_guardian ######*/ -#define SPELL_DEATHTOUCH 5 +enum GuardianSpells +{ + SPELL_DEATHTOUCH = 5 +}; class npc_guardian : public CreatureScript { @@ -1327,17 +1333,20 @@ public: ## npc_sayge ######*/ -#define SPELL_DMG 23768 //dmg -#define SPELL_RES 23769 //res -#define SPELL_ARM 23767 //arm -#define SPELL_SPI 23738 //spi -#define SPELL_INT 23766 //int -#define SPELL_STM 23737 //stm -#define SPELL_STR 23735 //str -#define SPELL_AGI 23736 //agi -#define SPELL_FORTUNE 23765 //faire fortune - -#define GOSSIP_HELLO_SAYGE "Yes" +enum Sayge +{ + SPELL_DMG = 23768, // dmg + SPELL_RES = 23769, // res + SPELL_ARM = 23767, // arm + SPELL_SPI = 23738, // spi + SPELL_INT = 23766, // int + SPELL_STM = 23737, // stm + SPELL_STR = 23735, // str + SPELL_AGI = 23736, // agi + SPELL_FORTUNE = 23765 // faire fortune +}; + +#define GOSSIP_HELLO_SAYGE "Yes" #define GOSSIP_SENDACTION_SAYGE1 "Slay the Man" #define GOSSIP_SENDACTION_SAYGE2 "Turn him over to liege" #define GOSSIP_SENDACTION_SAYGE3 "Confiscate the corn" @@ -1516,7 +1525,10 @@ public: } }; -#define SPELL_TONK_MINE_DETONATE 25099 +enum TonkMine +{ + SPELL_TONK_MINE_DETONATE = 25099 +}; class npc_tonk_mine : public CreatureScript { @@ -1592,14 +1604,14 @@ public: ## npc_snake_trap_serpents ####*/ -#define SPELL_MIND_NUMBING_POISON 25810 //Viper -#define SPELL_DEADLY_POISON 34655 //Venomous Snake -#define SPELL_CRIPPLING_POISON 30981 //Viper - -#define VENOMOUS_SNAKE_TIMER 1500 -#define VIPER_TIMER 3000 +enum SnakeTrapSerpents +{ + SPELL_MIND_NUMBING_POISON = 25810, // Viper + SPELL_DEADLY_POISON = 34655, // Venomous Snake + SPELL_CRIPPLING_POISON = 30981, // Viper -#define C_VIPER 19921 + NPC_VIPER = 19921 +}; class npc_snake_trap : public CreatureScript { @@ -1621,7 +1633,7 @@ public: CreatureTemplate const* Info = me->GetCreatureTemplate(); - IsViper = Info->Entry == C_VIPER ? true : false; + IsViper = Info->Entry == NPC_VIPER ? true : false; me->SetMaxHealth(uint32(107 * (me->getLevel() - 40) * 0.025f)); //Add delta to make them not all hit the same time @@ -1683,13 +1695,13 @@ public: DoCastVictim(spell); } - SpellTimer = VIPER_TIMER; + SpellTimer = 3000; } else //Venomous Snake { if (urand(0, 2) == 0) //33% chance to cast DoCastVictim(SPELL_DEADLY_POISON); - SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() % 5) * 100; + SpellTimer = 1500 + (rand() % 5) * 100; } } else @@ -1972,7 +1984,7 @@ class npc_lightwell : public CreatureScript } }; -enum eTrainingDummy +enum TrainingDummy { NPC_ADVANCED_TARGET_DUMMY = 2674, NPC_TARGET_DUMMY = 2673 @@ -2087,9 +2099,13 @@ class npc_shadowfiend : public CreatureScript /*###### # npc_fire_elemental ######*/ -#define SPELL_FIRENOVA 12470 -#define SPELL_FIRESHIELD 13376 -#define SPELL_FIREBLAST 57984 + +enum FireElemental +{ + SPELL_FIRENOVA = 12470, + SPELL_FIRESHIELD = 13376, + SPELL_FIREBLAST = 57984 +}; class npc_fire_elemental : public CreatureScript { @@ -2157,7 +2173,11 @@ public: /*###### # npc_earth_elemental ######*/ -#define SPELL_ANGEREDEARTH 36213 + +enum EarthElemental +{ + SPELL_ANGEREDEARTH = 36213 +}; class npc_earth_elemental : public CreatureScript { @@ -2314,7 +2334,7 @@ class npc_wormhole : public CreatureScript ## npc_pet_trainer ######*/ -enum ePetTrainer +enum PetTrainer { TEXT_ISHUNTER = 5838, TEXT_NOTHUNTER = 5839, @@ -2378,7 +2398,7 @@ public: ## npc_locksmith ######*/ -enum eLockSmith +enum LockSmith { QUEST_HOW_TO_BRAKE_IN_TO_THE_ARCATRAZ = 10704, QUEST_DARK_IRON_LEGACY = 3802, |