From f1eb6da06a5ba147ddf037255a2d6e09ab4d6ee9 Mon Sep 17 00:00:00 2001 From: Grz3s Date: Sun, 15 Sep 2024 23:59:26 +0200 Subject: [PATCH] SD2: Stone Watcher of Norgannon 7918 Gossip moved to DB Part of: https://github.com/cmangos/wotlk-db/commit/51f6682b899e43b50a6eef07d9541ffaccc3f82d --- sql/scriptdev2/scriptdev2.sql | 1 - .../ScriptDevAI/scripts/kalimdor/tanaris.cpp | 63 ------------------- 2 files changed, 64 deletions(-) diff --git a/sql/scriptdev2/scriptdev2.sql b/sql/scriptdev2/scriptdev2.sql index c38706b503f..03aa60a4288 100644 --- a/sql/scriptdev2/scriptdev2.sql +++ b/sql/scriptdev2/scriptdev2.sql @@ -1574,7 +1574,6 @@ UPDATE creature_template SET ScriptName='npc_galen_goodward' WHERE entry=5391; UPDATE creature_template SET ScriptName='mob_aquementas' WHERE entry=9453; UPDATE creature_template SET ScriptName='npc_custodian_of_time' WHERE entry=20129; UPDATE creature_template SET ScriptName='npc_oox17tn' WHERE entry=7784; -UPDATE creature_template SET ScriptName='npc_stone_watcher_of_norgannon' WHERE entry=7918; UPDATE creature_template SET ScriptName='npc_tooga' WHERE entry=5955; /* TELDRASSIL */ diff --git a/src/game/AI/ScriptDevAI/scripts/kalimdor/tanaris.cpp b/src/game/AI/ScriptDevAI/scripts/kalimdor/tanaris.cpp index 547722a323a..0292a050167 100644 --- a/src/game/AI/ScriptDevAI/scripts/kalimdor/tanaris.cpp +++ b/src/game/AI/ScriptDevAI/scripts/kalimdor/tanaris.cpp @@ -25,7 +25,6 @@ EndScriptData */ mob_aquementas npc_custodian_of_time npc_oox17tn -npc_stone_watcher_of_norgannon npc_tooga EndContentData */ @@ -336,62 +335,6 @@ bool QuestAccept_npc_oox17tn(Player* pPlayer, Creature* pCreature, const Quest* return true; } -/*###### -## npc_stone_watcher_of_norgannon -######*/ - -#define GOSSIP_ITEM_NORGANNON_1 "What function do you serve?" -#define GOSSIP_ITEM_NORGANNON_2 "What are the Plates of Uldum?" -#define GOSSIP_ITEM_NORGANNON_3 "Where are the Plates of Uldum?" -#define GOSSIP_ITEM_NORGANNON_4 "Excuse me? We've been \"reschedueled for visitations\"? What does that mean?!" -#define GOSSIP_ITEM_NORGANNON_5 "So, what's inside Uldum?" -#define GOSSIP_ITEM_NORGANNON_6 "I will return when i have the Plates of Uldum." - -bool GossipHello_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid()); - - if (pPlayer->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - - pPlayer->SEND_GOSSIP_MENU(1674, pCreature->GetObjectGuid()); - - return true; -} - -bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - switch (uiAction) - { - case GOSSIP_ACTION_INFO_DEF: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(1675, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->SEND_GOSSIP_MENU(1676, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(1677, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); - pPlayer->SEND_GOSSIP_MENU(1678, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+4: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); - pPlayer->SEND_GOSSIP_MENU(1679, pCreature->GetObjectGuid()); - break; - case GOSSIP_ACTION_INFO_DEF+5: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->AreaExploredOrEventHappens(2954); - break; - } - return true; -} - /*#### # npc_tooga ####*/ @@ -569,12 +512,6 @@ void AddSC_tanaris() pNewScript->pQuestAcceptNPC = &QuestAccept_npc_oox17tn; pNewScript->RegisterSelf(); - pNewScript = new Script; - pNewScript->Name = "npc_stone_watcher_of_norgannon"; - pNewScript->pGossipHello = &GossipHello_npc_stone_watcher_of_norgannon; - pNewScript->pGossipSelect = &GossipSelect_npc_stone_watcher_of_norgannon; - pNewScript->RegisterSelf(); - pNewScript = new Script; pNewScript->Name = "npc_tooga"; pNewScript->GetAI = &GetAI_npc_tooga;