diff options
| author | Kudlaty <none@none> | 2009-08-21 15:26:57 +0200 |
|---|---|---|
| committer | Kudlaty <none@none> | 2009-08-21 15:26:57 +0200 |
| commit | 378a9e9385a6c863b9c8e5dbb49b093608c8db3c (patch) | |
| tree | 849b92856d90b2b8376d8b7842cf532b07ebed8f | |
| parent | 457f7971de361f05ff02ee2f9552be55867e6bf3 (diff) | |
Merge [SD2]
r1358 Add gossip and taxi related to quest 11692. Patch by hoshie
--HG--
branch : trunk
| -rw-r--r-- | sql/FULL/world_scripts_full.sql | 2 | ||||
| -rw-r--r-- | sql/updates/5254_world_scripts.sql | 1 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/npc_taxi.cpp | 13 |
3 files changed, 15 insertions, 1 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index 84c55f9f36c..9c4392265c1 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -96,7 +96,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_snake_trap_serpents' WHERE `ent UPDATE `creature_template` SET `ScriptName`='npc_unworthy_initiate' WHERE `entry` IN (29519,29520,29565,29566,29567); UPDATE `creature_template` SET `ScriptName`='npc_unworthy_initiate_anchor' WHERE `entry`=29521; UPDATE `creature_template` SET `ScriptName`='npc_kingdom_of_dalaran_quests' WHERE `entry` IN (29169,23729,26673,27158,29158,29161,26471,29155,29159,29160,29162); -UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry` IN (17435,23413,18725,19401,19409,20235,25059,25236,20903,20162,29154,23415,27575,26443,26949,23816,23704); +UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry` IN (17435,23413,18725,19401,19409,20235,25059,25236,20903,20162,29154,23415,27575,26443,26949,23816,23704,26602); UPDATE `creature_template` SET `ScriptName`='npc_death_knight_initiate' WHERE `entry`=28406; UPDATE `creature_template` SET `ScriptName`='npc_salanar_the_horseman' WHERE `entry` IN (28653,28788); UPDATE `creature_template` SET `ScriptName`='npc_dark_rider_of_acherus' WHERE `entry` =28654; diff --git a/sql/updates/5254_world_scripts.sql b/sql/updates/5254_world_scripts.sql new file mode 100644 index 00000000000..9129ba315cc --- /dev/null +++ b/sql/updates/5254_world_scripts.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry` = 26602;
\ No newline at end of file diff --git a/src/bindings/scripts/scripts/world/npc_taxi.cpp b/src/bindings/scripts/scripts/world/npc_taxi.cpp index ce526e7e088..da05ab3f9bb 100644 --- a/src/bindings/scripts/scripts/world/npc_taxi.cpp +++ b/src/bindings/scripts/scripts/world/npc_taxi.cpp @@ -127,6 +127,12 @@ bool GossipHello_npc_taxi(Player* pPlayer, Creature* pCreature) if (pPlayer->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"<Ride the gryphons to Survey Alcaz Island>",GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+25); break; + case 26602: + if (pCreature->isTaxi()) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TAXI, "Do you think I could take a ride on one of those flying machines?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26); + if (pPlayer->GetQuestStatus(11692) == QUEST_STATUS_COMPLETE) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Kara, I need to be flown out the Dens of Dying to find Bixie.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 27); + break; } pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); @@ -246,6 +252,13 @@ bool GossipSelect_npc_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->CastSpell(pPlayer,42295,true); break; + case GOSSIP_ACTION_INFO_DEF + 26: + pPlayer->GetSession()->SendTaxiMenu(pCreature); + break; + case GOSSIP_ACTION_INFO_DEF + 27: + pPlayer->CLOSE_GOSSIP_MENU(); + pPlayer->CastSpell(pPlayer, 51446, false); + break; } return true; |