diff options
author | Trond B. Krokli <38162891+illfated@users.noreply.github.com> | 2019-01-13 16:48:55 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-11-21 15:27:39 +0100 |
commit | 159e6521cc8059d498d9d2de37d19ba3600d3592 (patch) | |
tree | a9d0a0a786550b5711e1fc920c97b78921ecae06 /src | |
parent | 0bbe8bf28a2cb280480ba07ca9fbd0f03ebbfe18 (diff) |
Scripts/Borean Tundra: Corastrasza gossip menu improvements (#22942)
- split the quest status check, the quest gossips are different
- remove old hardcoded text (deprecated method)
- enumerate already existing DB gossip menu option items
(cherry picked from commit a8558c4361a7e3560c094886ef3072d46c64de44)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/Northrend/zone_borean_tundra.cpp | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 67f48218d67..ba461022848 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -229,15 +229,21 @@ public: ## npc_corastrasza ######*/ -#define GOSSIP_ITEM_C_1 "I... I think so..." - enum Corastrasza { - SPELL_SUMMON_WYRMREST_SKYTALON = 61240, - SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC = 61244, + GOSSIP_MENU_ID_CORASTRASZA = 10204, + GOSSIP_MENU_ITEM_ID_I_I_THINK_SO = 0, + GOSSIP_MENU_ITEM_ID_I_AM_READY = 1, + + NPC_TEXT_MOST_DRAGONS_WOULD_FEAR_TO = 14168, + NPC_TEXT_DO_YOU_POSSESS_THE_COURAGE = 14169, + NPC_TEXT_EAGERLY_AWAITING_YOUR_RETURN = 14170, + + QUEST_ACES_HIGH = 13413, + QUEST_ACES_HIGH_DAILY = 13414, - QUEST_ACES_HIGH_DAILY = 13414, - QUEST_ACES_HIGH = 13413 + SPELL_SUMMON_WYRMREST_SKYTALON = 61240, + SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC = 61244 }; class npc_corastrasza : public CreatureScript @@ -254,10 +260,19 @@ public: if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); - if (player->GetQuestStatus(QUEST_ACES_HIGH) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_ACES_HIGH_DAILY) == QUEST_STATUS_INCOMPLETE) //It's the same dragon for both quests. - AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_C_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + if (player->GetQuestStatus(QUEST_ACES_HIGH) == QUEST_STATUS_INCOMPLETE) + { + AddGossipItemFor(player, GOSSIP_MENU_ID_CORASTRASZA, GOSSIP_MENU_ITEM_ID_I_I_THINK_SO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + SendGossipMenuFor(player, NPC_TEXT_DO_YOU_POSSESS_THE_COURAGE, me->GetGUID()); + } + else if (player->GetQuestStatus(QUEST_ACES_HIGH_DAILY) == QUEST_STATUS_INCOMPLETE) + { + AddGossipItemFor(player, GOSSIP_MENU_ID_CORASTRASZA, GOSSIP_MENU_ITEM_ID_I_AM_READY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + SendGossipMenuFor(player, NPC_TEXT_EAGERLY_AWAITING_YOUR_RETURN, me->GetGUID()); + } + else + SendGossipMenuFor(player, NPC_TEXT_MOST_DRAGONS_WOULD_FEAR_TO, me->GetGUID()); - SendGossipMenuFor(player, player->GetGossipTextId(me), me->GetGUID()); return true; } @@ -268,10 +283,10 @@ public: if (action == GOSSIP_ACTION_INFO_DEF + 1) { CloseGossipMenuFor(player); - player->CastSpell(player, SPELL_SUMMON_WYRMREST_SKYTALON, true); player->CastSpell(player, SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC, true); } + return true; } }; |