aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond B. Krokli <38162891+illfated@users.noreply.github.com>2019-03-17 20:02:05 +0100
committerGiacomo Pozzoni <giacomopoz@gmail.com>2019-03-17 20:02:05 +0100
commit7cb31aa4820d02fa5779483bec9455a00954902c (patch)
treeee6c42e51a3d916f907802d72b797d1d1ef7470c
parent62f621fcd7e03df62a2af1dc295dc7ec1fc28d77 (diff)
Scripts/Borean Tundra: link gossip content for NPC Iruk from DB (#23118)
- remove hardcoded text (deprecated method) - add already existing DB gossip content to enum - correct spell enum from spell_creature_ to spell_create_ - replace case switch with if statement (only one boolean case) Extra script file update: - remove SD comment line 22 (outdated info, replaced by SAI)
-rw-r--r--src/server/scripts/Northrend/zone_borean_tundra.cpp27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 965d6e75f69..8777394e2f7 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -19,7 +19,6 @@
/* ScriptData
SDName: Borean_Tundra
SD%Complete: 100
-SDComment: Quest support: 11708. Taxi vendors.
SDCategory: Borean Tundra
EndScriptData */
@@ -300,13 +299,15 @@ public:
## npc_iruk
######*/
-#define GOSSIP_ITEM_I "<Search corpse for Issliruk's Totem.>"
-
enum Iruk
{
- QUEST_SPIRITS_WATCH_OVER_US = 11961,
- SPELL_CREATURE_TOTEM_OF_ISSLIRUK = 46816,
- GOSSIP_TEXT_I = 12585
+ GOSSIP_MENU_ID_NPC_IRUK = 9280,
+ GOSSIP_OPTION_SEARCH_CORPSE = 0,
+ NPC_TEXT_THIS_YOUNG_TUSKARR = 12585,
+
+ QUEST_SPIRITS_WATCH_OVER_US = 11961,
+
+ SPELL_CREATE_TOTEM_OF_ISSLIRUK = 46816
};
class npc_iruk : public CreatureScript
@@ -321,9 +322,9 @@ public:
bool GossipHello(Player* player) override
{
if (player->GetQuestStatus(QUEST_SPIRITS_WATCH_OVER_US) == QUEST_STATUS_INCOMPLETE)
- AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_I, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+ AddGossipItemFor(player, GOSSIP_MENU_ID_NPC_IRUK, GOSSIP_OPTION_SEARCH_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
- player->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXT_I, me->GetGUID());
+ SendGossipMenuFor(player, NPC_TEXT_THIS_YOUNG_TUSKARR, me->GetGUID());
return true;
}
@@ -331,13 +332,11 @@ public:
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
ClearGossipMenuFor(player);
- switch (action)
- {
- case GOSSIP_ACTION_INFO_DEF + 1:
- player->CastSpell(player, SPELL_CREATURE_TOTEM_OF_ISSLIRUK, true);
- CloseGossipMenuFor(player);
- break;
+ if (action == GOSSIP_ACTION_INFO_DEF + 1)
+ {
+ player->CastSpell(player, SPELL_CREATE_TOTEM_OF_ISSLIRUK, true);
+ CloseGossipMenuFor(player);
}
return true;
}