From 56b88502fe63915cff088d853dbc3b7aa6f54fd9 Mon Sep 17 00:00:00 2001 From: gengarshadowball <60325009+gengarshadowball@users.noreply.github.com> Date: Thu, 30 Jul 2020 22:18:42 +0100 Subject: [PATCH] fix(Core/Creature): Lady Katrana hardcoded text (#3110) --- .../rev_1591203444048329000.sql | 2 + .../EasternKingdoms/zone_stormwind_city.cpp | 55 ------------------- 2 files changed, 2 insertions(+), 55 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1591203444048329000.sql diff --git a/data/sql/updates/pending_db_world/rev_1591203444048329000.sql b/data/sql/updates/pending_db_world/rev_1591203444048329000.sql new file mode 100644 index 000000000..f762c2ef1 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1591203444048329000.sql @@ -0,0 +1,2 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1591203444048329000'); +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=1749; diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index 9cfb502ac..684b78a8f 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -14,7 +14,6 @@ EndScriptData */ /* ContentData npc_archmage_malin npc_bartleby -npc_lady_katrana_prestor npc_tyrion npc_tyrion_spybot npc_marzon_silent_blade @@ -98,59 +97,6 @@ public: }; }; -/*###### -## npc_lady_katrana_prestor -######*/ - -#define GOSSIP_ITEM_KAT_1 "Pardon the intrusion, Lady Prestor, but Highlord Bolvar suggested that I seek your advice." -#define GOSSIP_ITEM_KAT_2 "My apologies, Lady Prestor." -#define GOSSIP_ITEM_KAT_3 "Begging your pardon, Lady Prestor. That was not my intent." -#define GOSSIP_ITEM_KAT_4 "Thank you for your time, Lady Prestor." - -class npc_lady_katrana_prestor : public CreatureScript -{ -public: - npc_lady_katrana_prestor() : CreatureScript("npc_lady_katrana_prestor") { } - - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override - { - ClearGossipMenuFor(player); - switch (action) - { - case GOSSIP_ACTION_INFO_DEF: - AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - SendGossipMenuFor(player, 2694, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+1: - AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - SendGossipMenuFor(player, 2695, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+2: - AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - SendGossipMenuFor(player, 2696, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+3: - CloseGossipMenuFor(player); - player->AreaExploredOrEventHappens(4185); - break; - } - return true; - } - - bool OnGossipHello(Player* player, Creature* creature) override - { - if (creature->IsQuestGiver()) - player->PrepareQuestMenu(creature->GetGUID()); - - if (player->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE) - AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - - SendGossipMenuFor(player, 2693, creature->GetGUID()); - - return true; - } -}; - /*###### ## npc_lord_gregor_lescovar ######*/ @@ -586,7 +532,6 @@ public: void AddSC_stormwind_city() { new npc_bartleby(); - new npc_lady_katrana_prestor(); new npc_tyrion(); new npc_tyrion_spybot(); new npc_lord_gregor_lescovar();