diff options
Diffstat (limited to 'src')
11 files changed, 145 insertions, 70 deletions
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp index b0cbbe28835..64855ca9109 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp @@ -62,11 +62,11 @@ bool GOHello_go_shadowforge_brazier(Player* pPlayer, GameObject* pGo) enum eGrimstone { - NPC_GRIMSTONE = 10096, - NPC_THELDREN = 16059, + NPC_GRIMSTONE = 10096, + NPC_THELDREN = 16059, //4 or 6 in total? 1+2+1 / 2+2+2 / 3+3. Depending on this, code should be changed. - MAX_MOB_AMOUNT = 4 + MAX_MOB_AMOUNT = 4 }; uint32 RingMob[]= @@ -108,12 +108,15 @@ bool AreaTrigger_at_ring_of_law(Player* pPlayer, AreaTriggerEntry *at) ## npc_grimstone ######*/ -#define SCRIPT_TEXT1 -1000000 -#define SCRIPT_TEXT2 -1000000 -#define SCRIPT_TEXT3 -1000000 -#define SCRIPT_TEXT4 -1000000 -#define SCRIPT_TEXT5 -1000000 -#define SCRIPT_TEXT6 -1000000 +enum GrimstoneTexts +{ + SCRIPT_TEXT1 = -1000000, + SCRIPT_TEXT2 = -1000001, + SCRIPT_TEXT3 = -1000002, + SCRIPT_TEXT4 = -1000003, + SCRIPT_TEXT5 = -1000004, + SCRIPT_TEXT6 = -1000005 +}; //TODO: implement quest part of event (different end boss) struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI @@ -342,9 +345,12 @@ CreatureAI* GetAI_npc_grimstone(Creature* pCreature) ## mob_phalanx ######*/ -#define SPELL_THUNDERCLAP 8732 -#define SPELL_FIREBALLVOLLEY 22425 -#define SPELL_MIGHTYBLOW 14099 +enum PhalanxSpells +{ + SPELL_THUNDERCLAP = 8732, + SPELL_FIREBALLVOLLEY = 22425, + SPELL_MIGHTYBLOW = 14099 +}; struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI { @@ -403,8 +409,11 @@ CreatureAI* GetAI_mob_phalanx(Creature* pCreature) ## npc_kharan_mighthammer ######*/ -#define QUEST_4001 4001 -#define QUEST_4342 4342 +enum KharamQuests +{ + QUEST_4001 = 4001, + QUEST_4342 = 4342 +}; #define GOSSIP_ITEM_KHARAN_1 "I need to know where the princess are, Kharan!" #define GOSSIP_ITEM_KHARAN_2 "All is not lost, Kharan!" @@ -489,10 +498,21 @@ bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature, u ## npc_lokhtos_darkbargainer ######*/ -#define ITEM_THRORIUM_BROTHERHOOD_CONTRACT 18628 -#define ITEM_SULFURON_INGOT 17203 -#define QUEST_A_BINDING_CONTRACT 7604 -#define SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND 23059 +enum LokhtosItems +{ + ITEM_THRORIUM_BROTHERHOOD_CONTRACT = 18628, + ITEM_SULFURON_INGOT = 17203 +}; + +enum LokhtosQuests +{ + QUEST_A_BINDING_CONTRACT = 7604 +}; + +enum LokhtosSpells +{ + SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND = 23059 +}; #define GOSSIP_ITEM_SHOW_ACCESS "Show me what I have access to, Lothos." #define GOSSIP_ITEM_GET_CONTRACT "Get Thorium Brotherhood Contract" @@ -537,7 +557,11 @@ bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature ## npc_dughal_stormwing ######*/ -#define QUEST_JAIL_BREAK 4322 +enum DughalQuests +{ + QUEST_JAIL_BREAK = 4322 +}; + #define SAY_DUGHAL_FREE "Thank you, $N! I'm free!!!" #define GOSSIP_DUGHAL "You're free, Dughal! Get out of here!" @@ -1095,9 +1119,20 @@ bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature* pCreature, uint3 ## npc_rocknot ######*/ -#define SAY_GOT_BEER -1230000 -#define SPELL_DRUNKEN_RAGE 14872 -#define QUEST_ALE 4295 +enum RocknotSays +{ + SAY_GOT_BEER = -1230000 +}; + +enum RocknotSpells +{ + SPELL_DRUNKEN_RAGE = 14872 +}; + +enum RocknotQuests +{ + QUEST_ALE = 4295 +}; struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI { @@ -1243,10 +1278,10 @@ void AddSC_blackrock_depths() newscript->pAreaTrigger = &AreaTrigger_at_ring_of_law; newscript->RegisterSelf(); - newscript = new Script; - newscript->Name = "npc_grimstone"; - newscript->GetAI = &GetAI_npc_grimstone; - newscript->RegisterSelf(); + newscript = new Script; + newscript->Name = "npc_grimstone"; + newscript->GetAI = &GetAI_npc_grimstone; + newscript->RegisterSelf(); newscript = new Script; newscript->Name = "mob_phalanx"; @@ -1290,7 +1325,6 @@ void AddSC_blackrock_depths() newscript->GetAI = &GetAI_npc_marshal_reginald_windsor; newscript->RegisterSelf(); */ - newscript = new Script; newscript->Name = "npc_rocknot"; newscript->GetAI = &GetAI_npc_rocknot; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp index ba10c873b23..6edb9ec6058 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp @@ -23,7 +23,10 @@ EndScriptData */ #include "precompiled.h" -#define SPELL_FIREBLAST 15573 +enum Spells +{ + SPELL_FIREBLAST = 15573 +}; struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp index d5589967cac..558a7d4f568 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp @@ -23,11 +23,14 @@ EndScriptData */ #include "precompiled.h" -#define SPELL_SHADOWBOLT 17228 -#define SPELL_CURSEOFTONGUES 15470 -#define SPELL_CURSEOFWEAKNESS 17227 -#define SPELL_DEMONARMOR 11735 -#define SPELL_ENVELOPINGWEB 15471 +enum Spells +{ + SPELL_SHADOWBOLT = 17228, + SPELL_CURSEOFTONGUES = 15470, + SPELL_CURSEOFWEAKNESS = 17227, + SPELL_DEMONARMOR = 11735, + SPELL_ENVELOPINGWEB = 15471 +}; struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index 83a3839b44f..904fe924738 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -23,11 +23,17 @@ EndScriptData */ #include "precompiled.h" -#define SAY_AGGRO -1230001 -#define SAY_SLAY -1230002 +enum Yells +{ + SAY_AGGRO = -1230001, + SAY_SLAY = -1230002 +}; -#define SPELL_HANDOFTHAURISSAN 17492 -#define SPELL_AVATAROFFLAME 15636 +enum Spells +{ + SPELL_HANDOFTHAURISSAN = 17492, + SPELL_AVATAROFFLAME = 15636 +}; struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp index 4c02c438347..6ce995e4153 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp @@ -23,9 +23,12 @@ EndScriptData */ #include "precompiled.h" -#define SPELL_MIGHTYBLOW 14099 -#define SPELL_HAMSTRING 9080 -#define SPELL_CLEAVE 20691 +enum Spells +{ + SPELL_MIGHTYBLOW = 14099, + SPELL_HAMSTRING = 9080, + SPELL_CLEAVE = 20691 +}; struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp index 5fcb18295f0..14b81d0c69c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -23,8 +23,11 @@ EndScriptData */ #include "precompiled.h" -#define SPELL_WHIRLWIND 15589 -#define SPELL_MORTALSTRIKE 24573 +enum Spells +{ + SPELL_WHIRLWIND = 15589, + SPELL_MORTALSTRIKE = 24573 +}; struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp index 5950e92612f..4ed0d2b5bc1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp @@ -23,10 +23,16 @@ EndScriptData */ #include "precompiled.h" -#define EMOTE_GENERIC_FRENZY_KILL -1000001 +enum Yells +{ + EMOTE_GENERIC_FRENZY_KILL = -1000001 +}; -#define SPELL_GROUNDTREMOR 6524 -#define SPELL_FRENZY 28371 +enum Spells +{ + SPELL_GROUNDTREMOR = 6524, + SPELL_FRENZY = 28371 +}; struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp index 94e8b8281e1..e5e31a184c3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -23,10 +23,13 @@ EndScriptData */ #include "precompiled.h" -#define SPELL_SHADOWWORDPAIN 10894 -#define SPELL_MANABURN 10876 -#define SPELL_PSYCHICSCREAM 8122 -#define SPELL_SHADOWSHIELD 22417 +enum Spells +{ + SPELL_SHADOWWORDPAIN = 10894, + SPELL_MANABURN = 10876, + SPELL_PSYCHICSCREAM = 8122, + SPELL_SHADOWSHIELD = 22417 +}; struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp index 773271d7e5e..56bf63dc1cd 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp @@ -23,8 +23,11 @@ EndScriptData */ #include "precompiled.h" -#define SPELL_FIERYBURST 13900 -#define SPELL_WARSTOMP 24375 +enum Spells +{ + SPELL_FIERYBURST = 13900, + SPELL_WARSTOMP = 24375 +}; struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp index 63395dd5016..2fcc768ab0a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp @@ -23,12 +23,15 @@ EndScriptData */ #include "precompiled.h" -#define SPELL_HEAL 10917 -#define SPELL_RENEW 10929 -#define SPELL_SHIELD 10901 -#define SPELL_MINDBLAST 10947 -#define SPELL_SHADOWWORDPAIN 10894 -#define SPELL_SMITE 10934 +enum Spells +{ + SPELL_HEAL = 10917, + SPELL_RENEW = 10929, + SPELL_SHIELD = 10901, + SPELL_MINDBLAST = 10947, + SPELL_SHADOWWORDPAIN = 10894, + SPELL_SMITE = 10934 +}; struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp index 80e85220187..fd10427172b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp @@ -24,12 +24,20 @@ EndScriptData */ #include "precompiled.h" #include "blackrock_depths.h" -enum eEnums +enum Spells { - SPELL_SMELT_DARK_IRON = 14891, - SPELL_LEARN_SMELT = 14894, - QUEST_SPECTRAL_CHALICE = 4083, - SKILLPOINT_MIN = 230 + SPELL_SMELT_DARK_IRON = 14891, + SPELL_LEARN_SMELT = 14894, +}; + +enum Quests +{ + QUEST_SPECTRAL_CHALICE = 4083 +}; + +enum Misc +{ + DATA_SKILLPOINT_MIN = 230 }; #define GOSSIP_ITEM_TEACH_1 "Teach me the art of smelting dark iron" @@ -39,10 +47,10 @@ enum eEnums bool GossipHello_boss_gloomrel(Player* pPlayer, Creature* pCreature) { - if (pPlayer->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 1 && pPlayer->GetSkillValue(SKILL_MINING) >= SKILLPOINT_MIN && !pPlayer->HasSpell(SPELL_SMELT_DARK_IRON)) + if (pPlayer->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 1 && pPlayer->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN && !pPlayer->HasSpell(SPELL_SMELT_DARK_IRON)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - if (pPlayer->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 0 && pPlayer->GetSkillValue(SKILL_MINING) >= SKILLPOINT_MIN) + if (pPlayer->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 0 && pPlayer->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); @@ -77,13 +85,13 @@ bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 uiS return true; } -enum eSpells +enum DoomrelSpells { - SPELL_SHADOWBOLTVOLLEY = 15245, - SPELL_IMMOLATE = 12742, - SPELL_CURSEOFWEAKNESS = 12493, - SPELL_DEMONARMOR = 13787, - SPELL_SUMMON_VOIDWALKERS = 15092 + SPELL_SHADOWBOLTVOLLEY = 15245, + SPELL_IMMOLATE = 12742, + SPELL_CURSEOFWEAKNESS = 12493, + SPELL_DEMONARMOR = 13787, + SPELL_SUMMON_VOIDWALKERS = 15092 }; struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI |