diff options
Diffstat (limited to 'src')
9 files changed, 42 insertions, 17 deletions
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp index a7861e11ccc..eb6e72452c0 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp @@ -41,6 +41,8 @@ EndContentData */ #define GOSSIP_ITEM_TYRANDE "Aid us in defending Nordrassil" #define ITEM_TEAR_OF_GODDESS 24494 +#define GOSSIP_ITEM_GM1 "[GM] Toggle Debug Timers" + CreatureAI* GetAI_npc_jaina_proudmoore(Creature* pCreature) { @@ -80,7 +82,7 @@ bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); if (pPlayer->isGameMaster()) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; @@ -149,7 +151,7 @@ bool GossipHello_npc_thrall(Player* pPlayer, Creature* pCreature) } if (pPlayer->isGameMaster()) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp index cb7ac1fdfd7..e8bf7d8ceeb 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp @@ -32,6 +32,9 @@ EndScriptData */ #define SPAWN_GARG_GATE 0 #define SPAWN_WYRM_GATE 1 #define SPAWN_NEAR_TOWER 2 + +#define YELL_HURRY "Hurry, we don't have much time" + // Locations for summoning gargoyls and frost wyrms in special cases float SpawnPointSpecial[3][3]= { @@ -975,7 +978,7 @@ void hyjalAI::WaypointReached(uint32 i) { if (i == 1 || (i == 0 && m_creature->GetEntry() == THRALL)) { - m_creature->MonsterYell("Hurry, we don't have much time",0,0); + m_creature->MonsterYell(YELL_HURRY,0,0); WaitForTeleport = true; TeleportTimer = 20000; if (m_creature->GetEntry() == JAINA) diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp index 83fbbc67b73..d030fdf66ed 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp @@ -68,6 +68,9 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance uint32 RaidDamage; + #define YELL_EFFORTS "All of your efforts have been in vain, for the draining of the World Tree has already begun. Soon the heart of your world will beat no more." + #define YELL_EFFORTS_NAME "Archimonde" + void Initialize() { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -192,7 +195,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance if (i->getSource()) { WorldPacket data(SMSG_MESSAGECHAT, 200); - pUnit->BuildMonsterChat(&data,CHAT_MSG_MONSTER_YELL,"All of your efforts have been in vain, for the draining of the World Tree has already begun. Soon the heart of your world will beat no more.",0,"Archimonde",i->getSource()->GetGUID()); + pUnit->BuildMonsterChat(&data,CHAT_MSG_MONSTER_YELL,YELL_EFFORTS,0,YELL_EFFORTS_NAME,i->getSource()->GetGUID()); i->getSource()->GetSession()->SendPacket(&data); WorldPacket data2(SMSG_PLAY_SOUND, 4); diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index a38263d000f..af41f926e87 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -37,6 +37,9 @@ EndContentData */ #define QUEST_ENTRY_RETURN 10285 #define ITEM_ENTRY_BOMBS 25853 +#define GOSSIP_HELLO_EROZION1 "I need a pack of Incendiary Bombs." +#define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." + /*###### ## npc_erozion ######*/ @@ -48,10 +51,10 @@ bool GossipHello_npc_erozion(Player* pPlayer, Creature* pCreature) ScriptedInstance* pInstance = pCreature->GetInstanceData(); if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1)) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need a pack of Incendiary Bombs.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (!pPlayer->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Teleport please, i'm tired.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(9778, pCreature->GetGUID()); @@ -173,6 +176,8 @@ bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 uiSen #define GOSSIP_ID_COMPLETE 9578 //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her +#define GOSSIP_ITEM_WALKING "[PH] Start walking." + struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI { npc_thrall_old_hillsbradAI(Creature *c) : npc_escortAI(c) @@ -496,7 +501,7 @@ bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature) { if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT)) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Start walking.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WALKING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, pCreature->GetGUID()); } diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index 27ea9e33c05..d42f0e90f22 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -50,6 +50,8 @@ bool DeadAhnkaharGuardian; // needed for achievement: Respect Your Elders(2038) #define SPELL_SUMMON_SWARM_GUARD 56120//1x 30176 -- every 25secs #define SPELL_GUARDIAN_AURA 56151 +#define EMOTE_HATCHES "An Ahn'kahar Guardian hatches!" + struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI { boss_elder_nadoxAI(Creature *c) : ScriptedAI(c) @@ -168,7 +170,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI if (guard_spawn_Timer < diff) { - m_creature->MonsterTextEmote("An Ahn'kahar Guardian hatches!",m_creature->GetGUID(),true); + m_creature->MonsterTextEmote(EMOTE_HATCHES,m_creature->GetGUID(),true); DoCast(m_creature,SPELL_SUMMON_SWARM_GUARD); guard_spawn_Timer = 25000; }else guard_spawn_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index 4dfdd407731..ec98f4276c4 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -36,6 +36,8 @@ EndScriptData */ #define SPELL_FIERY_BLAST (HeroicMode?H_SPELL_FIERY_BLAST:N_SPELL_FIERY_BLAST) #define SPELL_FOCUS_FIRE_VISUAL 42075 //need to find better visual +#define EMOTE_FOCUSES_ON "focuses on " + struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI { boss_shirrak_the_dead_watcherAI(Creature *c) : ScriptedAI(c) @@ -131,7 +133,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI // TODO: Find better way to handle emote // Emote - std::string *emote = new std::string("focuses on "); + std::string *emote = new std::string(EMOTE_FOCUSES_ON); emote->append(target->GetName()); emote->append("!"); const char* text = emote->c_str(); diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp index a35c0723181..17cd778ad08 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp @@ -359,6 +359,9 @@ static Animation DemonTransformation[]= {0, SPELL_DEMON_TRANSFORM_3, 0, 0, 0, 8, true} }; +#define EMOTE_SETS_GAZE_ON "sets its gaze on $N!" +#define EMOTE_UNABLE_TO_SUMMON "is unable to summon Maiev Shadowsong and enter Phase 4. Resetting Encounter." + /************************************** Illidan's AI ***************************************/ @@ -909,7 +912,7 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI m_creature->AddThreat(target, 5000000.0f); AttackStart(target); DoCast(target, SPELL_CHARGE); - m_creature->MonsterTextEmote("sets its gaze on $N!", target->GetGUID()); + m_creature->MonsterTextEmote(EMOTE_SETS_GAZE_ON, target->GetGUID()); } } @@ -1070,7 +1073,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI { if (!pInstance) return; - + pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, IN_PROGRESS); for(uint8 i = 0; i < 2; ++i) @@ -2027,7 +2030,7 @@ void boss_illidan_stormrageAI::SummonMaiev() if (!MaievGUID) // If Maiev cannot be summoned, reset the encounter and post some errors to the console. { EnterEvadeMode(); - m_creature->MonsterTextEmote("is unable to summon Maiev Shadowsong and enter Phase 4. Resetting Encounter.", 0); + m_creature->MonsterTextEmote(EMOTE_UNABLE_TO_SUMMON, 0); error_log("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)"); } } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 24e72c656e1..3e5fe5b17f6 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -69,6 +69,9 @@ EndScriptData */ #define TOXIC_SPOREBAT 22140 #define TOXIC_SPORES_TRIGGER 22207 +#define TEXT_NOT_INITIALIZED "Instance script not initialized" +#define TEXT_ALREADY_DEACTIVATED "Already deactivated" + float ElementPos[8][4] = { {8.3, -835.3, 21.9, 5}, @@ -263,7 +266,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI StartEvent();//this is EnterCombat(), so were are 100% in combat, start the event if (Phase != 2) - AttackStart(who); + AttackStart(who); } void MoveInLineOfSight(Unit *who) @@ -290,7 +293,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI StartEvent(); if (Phase != 2) - AttackStart(who); + AttackStart(who); } } } @@ -928,7 +931,7 @@ bool ItemUse_item_tainted_core(Player* pPlayer, Item* _Item, SpellCastTargets co if (!pInstance) { - pPlayer->GetSession()->SendNotification("Instance script not initialized"); + pPlayer->GetSession()->SendNotification(TEXT_NOT_INITIALIZED); return true; } @@ -964,7 +967,7 @@ bool ItemUse_item_tainted_core(Player* pPlayer, Item* _Item, SpellCastTargets co if (pInstance->GetData(identifier)) { - pPlayer->GetSession()->SendNotification("Already deactivated"); + pPlayer->GetSession()->SendNotification(TEXT_ALREADY_DEACTIVATED); return true; } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index eb8e9b1a961..33946926976 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -33,6 +33,8 @@ EndScriptData */ #define MAX_ENCOUNTER 2 +#define EMOTE_BONDS_WEAKEN "'s bonds begin to weaken!" + struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance { instance_magtheridons_lair(Map* pMap) : ScriptedInstance(pMap) @@ -161,7 +163,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance Creature *Magtheridon = instance->GetCreature(MagtheridonGUID); if (Magtheridon && Magtheridon->isAlive()) { - Magtheridon->MonsterTextEmote("'s bonds begin to weaken!", 0); + Magtheridon->MonsterTextEmote(EMOTE_BONDS_WEAKEN, 0); CageTimer = 120000; } HandleGameObject(DoorGUID, false); |