diff options
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
17 files changed, 61 insertions, 71 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h index d8e3ec41e25..9944300d7f1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h @@ -21,14 +21,14 @@ #define DataHeader "BRD" -enum FactionIds +enum BRDFactionIds { FACTION_NEUTRAL = 734, FACTION_HOSTILE = 754, FACTION_FRIEND = 35 }; -enum DataTypes +enum BRDDataTypes { TYPE_RING_OF_LAW = 1, TYPE_VAULT = 2, diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h index b269171080e..8251d96dc58 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 23; #define BRSScriptName "instance_blackrock_spire" #define DataHeader "BRS" -enum DataTypes +enum BRSDataTypes { DATA_HIGHLORD_OMOKK = 0, DATA_SHADOW_HUNTER_VOSHGAJIN = 1, @@ -52,7 +52,7 @@ enum DataTypes DATA_SCARSHIELD_INFILTRATOR = 23 }; -enum CreaturesIds +enum BRSCreaturesIds { NPC_HIGHLORD_OMOKK = 9196, NPC_SHADOW_HUNTER_VOSHGAJIN = 9236, @@ -76,7 +76,7 @@ enum CreaturesIds NPC_SCARSHIELD_INFILTRATOR = 10299 }; -enum AdditionalData +enum BRSAdditionalData { SPELL_SUMMON_ROOKERY_WHELP = 15745, EVENT_UROK_DOOMHOWL = 4845, @@ -86,7 +86,7 @@ enum AdditionalData AREATRIGGER_BLACKROCK_STADIUM = 2026 }; -enum GameObjectsIds +enum BRSGameObjectsIds { GO_WHELP_SPAWNER = 175622, // trap spawned by go id 175124 // Doors diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h index ad3ad924066..79f47eeb412 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h @@ -39,7 +39,7 @@ enum BWLEncounter DATA_LORD_VICTOR_NEFARIUS = 8 }; -enum CreatureIds +enum BWLCreatureIds { NPC_RAZORGORE = 12435, NPC_BLACKWING_DRAGON = 12422, @@ -56,7 +56,7 @@ enum CreatureIds NPC_NEFARIAN = 11583 }; -enum GameObjectIds +enum BWLGameObjectIds { GO_BLACK_DRAGON_EGG = 177807, GO_PORTCULLIS = 176965, diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h index 27eea30abb2..45037170b7e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h @@ -21,7 +21,7 @@ #define DataHeader "MC" -enum Encounters +enum MCEncounters { BOSS_LUCIFRON = 0, BOSS_MAGMADAR = 1, @@ -36,7 +36,7 @@ enum Encounters MAX_ENCOUNTER, }; -enum Actions +enum MCActions { ACTION_START_RAGNAROS = 0, ACTION_START_RAGNAROS_ALT = 1, @@ -45,7 +45,7 @@ enum Actions Position const RagnarosTelePos = {829.159f, -815.773f, -228.972f, 5.30500f}; Position const RagnarosSummonPos = {838.510f, -829.840f, -232.000f, 2.00000f}; -enum Creatures +enum MCCreatures { NPC_LUCIFRON = 12118, NPC_MAGMADAR = 11982, @@ -61,12 +61,12 @@ enum Creatures NPC_FLAMEWAKER_ELITE = 11664, }; -enum GameObjects +enum MCGameObjects { GO_CACHE_OF_THE_FIRELORD = 179703, }; -enum Data +enum MCData { DATA_RAGNAROS_ADDS = 0, }; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h index e0e029648aa..33abf4b8eee 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h @@ -20,7 +20,7 @@ #define DataHeader "DM" -enum CannonState +enum DMCannonState { CANNON_NOT_USED, CANNON_GUNPOWDER_USED, @@ -30,18 +30,18 @@ enum CannonState EVENT_DONE }; -enum Data +enum DMData { EVENT_STATE, EVENT_RHAHKZOR }; -enum Data64 +enum DMData64 { DATA_SMITE_CHEST }; -enum GameObjects +enum DMGameObjects { GO_FACTORY_DOOR = 13965, GO_IRONCLAD_DOOR = 16397, @@ -50,12 +50,12 @@ enum GameObjects GO_MR_SMITE_CHEST = 144111 }; -enum CreaturesIds +enum DMCreaturesIds { NPC_MR_SMITE = 646 }; -enum InstanceTexts +enum DMInstanceTexts { SAY_ALARM1 = 0, SAY_ALARM2 = 1 diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h index aa98d642500..4cf4fcd0a1d 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h @@ -20,14 +20,14 @@ #define DataHeader "GNO" -enum GameObjectIds +enum GNOGameObjectIds { GO_CAVE_IN_LEFT = 146085, GO_CAVE_IN_RIGHT = 146086, GO_RED_ROCKET = 103820 }; -enum CreatureIds +enum GNOCreatureIds { NPC_BLASTMASTER_EMI_SHORTFUSE = 7998, NPC_CAVERNDEEP_AMBUSHER = 6207, @@ -35,12 +35,12 @@ enum CreatureIds NPC_CHOMPER = 6215 }; -enum Data +enum GNOData { TYPE_EVENT = 1 }; -enum Data64 +enum GNOData64 { DATA_GO_CAVE_IN_LEFT, DATA_GO_CAVE_IN_RIGHT, diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h index b27a9834db8..c36b99e6e49 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h @@ -24,7 +24,7 @@ uint32 const EncounterCount = 12; -enum DataTypes +enum KZDataTypes { DATA_ATTUMEN = 0, DATA_MOROES = 1, @@ -58,14 +58,14 @@ enum DataTypes DATA_GO_BLACKENED_URN = 30 }; -enum OperaEvents +enum KZOperaEvents { EVENT_OZ = 1, EVENT_HOOD = 2, EVENT_RAJ = 3 }; -enum MiscCreatures +enum KZMiscCreatures { NPC_HYAKISS_THE_LURKER = 16179, NPC_ROKAD_THE_RAVAGER = 16181, @@ -89,7 +89,7 @@ enum MiscCreatures NPC_KILREK = 17229 }; -enum GameObjectIds +enum KZGameObjectIds { GO_STAGE_CURTAIN = 183932, GO_STAGE_DOOR_LEFT = 184278, @@ -106,7 +106,7 @@ enum GameObjectIds GO_BLACKENED_URN = 194092 }; -enum Misc +enum KZMisc { OPTIONAL_BOSS_REQUIRED_DEATH_COUNT = 50 }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index 135f5c598a4..cfdee423ef1 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 4; -enum DataTypes +enum MTDataTypes { DATA_SELIN, DATA_VEXALLUS, @@ -38,7 +38,7 @@ enum DataTypes DATA_ESCAPE_ORB }; -enum CreatureIds +enum MTCreatureIds { NPC_SELIN = 24723, NPC_DELRISSA = 24560, @@ -47,7 +47,7 @@ enum CreatureIds NPC_HUMAN_KALECGOS = 24848 }; -enum GameObjectIds +enum MTGameObjectIds { GO_VEXALLUS_DOOR = 187896, GO_SELIN_DOOR = 187979, @@ -59,17 +59,17 @@ enum GameObjectIds GO_ESCAPE_ORB = 188173 }; -enum InstanceEventIds +enum MTInstanceEventIds { EVENT_SPAWN_KALECGOS = 16547 }; -enum InstanceText +enum MTInstanceText { SAY_KALECGOS_SPAWN = 0 }; -enum MovementData +enum MTMovementData { PATH_KALECGOS_FLIGHT = 248440 }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h index 2552bafd6bb..fede79df5d3 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 10; -enum DataTypes +enum SMDataTypes { DATA_MOGRAINE_AND_WHITE_EVENT = 1, DATA_MOGRAINE = 2, @@ -43,7 +43,7 @@ enum DataTypes DATA_SCORN = 14 }; -enum CreatureIds +enum SMCreatureIds { NPC_MOGRAINE = 3976, NPC_WHITEMANE = 3977, @@ -54,7 +54,7 @@ enum CreatureIds NPC_PUMPKIN = 23694 }; -enum GameObjectIds +enum SMGameObjectIds { GO_HIGH_INQUISITORS_DOOR = 104600, GO_PUMPKIN_SHRINE = 186267 diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h index af64bd38dca..abe6a7b415a 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h +++ b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h @@ -22,7 +22,7 @@ uint32 const EncounterCount = 8; -enum DataTypes +enum SCDataTypes { DATA_DOCTORTHEOLENKRASTINOV = 0, DATA_INSTRUCTORMALICIA = 1, @@ -34,13 +34,13 @@ enum DataTypes DATA_KIRTONOS = 7 }; -enum CreatureIds +enum SCCreatureIds { NPC_DARKMASTER_GANDLING = 1853, NPC_BONE_MINION = 16119 }; -enum GameobjectIds +enum SCGameobjectIds { GO_GATE_KIRTONOS = 175570, GO_GATE_GANDLING = 177374, diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h index c4ccf0b947e..7571f6f8fe3 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h @@ -21,7 +21,7 @@ #define DataHeader "SK" -enum DataTypes +enum SKDataTypes { TYPE_FREE_NPC = 1, TYPE_RETHILGORE = 2, diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h index 22d6425cd88..dd98843e6b5 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h @@ -21,7 +21,7 @@ #define DataHeader "STR" -enum DataTypes +enum STRDataTypes { TYPE_BARON_RUN = 1, TYPE_BARONESS = 2, @@ -43,7 +43,7 @@ enum DataTypes TYPE_SH_AELMAR = 25 }; -enum CreatureIds +enum STRCreatureIds { NPC_CRYSTAL = 10415, // ziggurat crystal NPC_BARON = 10440, // ziggurat crystal @@ -56,7 +56,7 @@ enum CreatureIds NPC_YSIDA = 16031, }; -enum GameobjectIds +enum STRGameobjectIds { GO_DOOR_HALAZZI = 186303, GO_SERVICE_ENTRANCE = 175368, @@ -71,15 +71,14 @@ enum GameobjectIds GO_PORT_ELDERS = 175377 // port at elders square }; -enum QuestIds +enum STRQuestIds { QUEST_DEAD_MAN_PLEA = 8945 }; -enum SpellIds +enum STRSpellIds { SPELL_BARON_ULTIMATUM = 27861 }; #endif - diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h index a3dc2862c29..c6c2f087850 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h @@ -21,18 +21,9 @@ #define DataHeader "ST" -#define TROLLBOSS1_DEATH 1 -#define TROLLBOSS2_DEATH 2 -#define TROLLBOSS3_DEATH 3 -#define TROLLBOSS4_DEATH 4 -#define TROLLBOSS5_DEATH 5 -#define TROLLBOSS6_DEATH 6 -#define JAMMALAN_DEATH 7 -#define MORPHAZ_DEATH 8 -#define HAZZAS_DEATH 9 -#define ERANIKUS_DEATH 10 -#define ATALALARION_DEATH 11 //optional +enum STEvents +{ + EVENT_STATE = 1 +}; -#define EVENT_STATE 1 #endif - diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h index 2bbb5cf320d..eb99ba3ebae 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 6; -enum DataTypes +enum SWPDataTypes { // Encounter States/Boss GUIDs DATA_KALECGOS = 0, @@ -53,7 +53,7 @@ enum DataTypes DATA_PLAYER_GUID }; -enum CreatureIds +enum SWPCreatureIds { NPC_MURU = 25741, NPC_ENTROPIUS = 25840, @@ -101,7 +101,7 @@ enum CreatureIds NPC_MURU_PORTAL_TARGET = 25770 }; -enum GameObjectIds +enum SWPGameObjectIds { GO_ORB_OF_THE_BLUE_DRAGONFLIGHT = 188415, GO_FORCE_FIELD = 188421, diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h index b1c0079003e..0578da35895 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h @@ -23,7 +23,7 @@ #define MAX_ENCOUNTER 3 -enum DataTypes +enum UDDataTypes { DATA_ALTAR_DOORS = 1, DATA_ANCIENT_DOOR = 2, @@ -33,7 +33,7 @@ enum DataTypes DATA_IRONAYA_SEAL = 6, }; -enum GameObjectIds +enum UDGameObjectIds { GO_ARCHAEDAS_TEMPLE_DOOR = 141869, GO_ALTAR_OF_THE_KEEPER_TEMPLE_DOOR = 124367, diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h index 919c5653279..99988310544 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h @@ -22,7 +22,7 @@ #define ZulamanScriptName "instance_zulaman" #define DataHeader "ZA" -enum DataTypes +enum ZADataTypes { BOSS_NALORAKK = 0, BOSS_AKILZON = 1, @@ -38,7 +38,7 @@ enum DataTypes TYPE_RAND_VENDOR_2 }; -enum CreatureIds +enum ZACreatureIds { NPC_HARRISON_JONES = 24358, NPC_NALORAKK = 23576, @@ -49,7 +49,7 @@ enum CreatureIds NPC_ZULJIN = 23863 }; -enum GameobjectIds +enum ZAGameObjectIds { GO_LYNX_TEMPLE_EXIT = 186303, GO_LYNX_TEMPLE_ENTRANCE = 186304, diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h index ee33c4eeee7..9359f37206a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h +++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h @@ -24,7 +24,7 @@ uint32 const EncounterCount = 13; #define ZGScriptName "instance_zulgurub" -enum DataTypes +enum ZGDataTypes { DATA_JEKLIK = 0, // Main boss DATA_VENOXIS = 1, // Main boss @@ -42,7 +42,7 @@ enum DataTypes TYPE_EDGE_OF_MADNESS = 13 // Boss storage }; -enum CreatureIds +enum ZGCreatureIds { NPC_ARLOKK = 14515, // Arlokk Event NPC_PANTHER_TRIGGER = 15091, // Arlokk Event @@ -61,7 +61,7 @@ enum CreatureIds }; -enum GameobjectIds +enum ZGGameObjectIds { GO_FORCEFIELD = 180497, // Arlokk Event GO_GONG_OF_BETHEKK = 180526 // Arlokk Event |