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/server/scripts/Northrend | |
| parent | 447ddceabad28a3a4ed1ed3bdece632d2d072246 (diff) | |
Scripted/Misc: Some cleanup
Diffstat (limited to 'src/server/scripts/Northrend')
66 files changed, 497 insertions, 343 deletions
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 { |