diff options
| -rw-r--r-- | sql/updates/3424_world_scripts.sql | 1 | ||||
| -rw-r--r-- | sql/world_scripts_full.sql | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/npc/npc_taxi.cpp | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/sql/updates/3424_world_scripts.sql b/sql/updates/3424_world_scripts.sql new file mode 100644 index 00000000000..bd15ac0b299 --- /dev/null +++ b/sql/updates/3424_world_scripts.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry`=23816; diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql index 9f5b335f1ed..4026eee9b2c 100644 --- a/sql/world_scripts_full.sql +++ b/sql/world_scripts_full.sql @@ -99,7 +99,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); +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); /* */ /* ZONE */ diff --git a/src/bindings/scripts/scripts/npc/npc_taxi.cpp b/src/bindings/scripts/scripts/npc/npc_taxi.cpp index 252dc33f0b6..b92f5cf2a61 100644 --- a/src/bindings/scripts/scripts/npc/npc_taxi.cpp +++ b/src/bindings/scripts/scripts/npc/npc_taxi.cpp @@ -117,6 +117,12 @@ bool GossipHello_npc_taxi(Player *player, Creature *_Creature) // top -> ground player->ADD_GOSSIP_ITEM(0, "Yes, Please. I would like to return to the ground floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); break; + case 23816: // Howling Fjord - Bat Handler Camille + if (!player->GetQuestRewardStatus(11229)) + player->ADD_GOSSIP_ITEM(0, "I need to fly to the Windrunner Official business!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); + if (player->GetQuestStatus(11170) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(0, "I need to commandeer a riding bat for special assignment for us.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); + break; } player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -223,6 +229,14 @@ bool GossipSelect_npc_taxi(Player *player, Creature *_Creature, uint32 sender, u player->CLOSE_GOSSIP_MENU(); player->ActivateTaxiPathTo(879); break; + case GOSSIP_ACTION_INFO_DEF + 23: + player->CLOSE_GOSSIP_MENU(); + player->CastSpell(player,43074,true); //TaxiPath 736 + break; + case GOSSIP_ACTION_INFO_DEF + 24: + player->CLOSE_GOSSIP_MENU(); + player->ActivateTaxiPathTo(738); + break; } return true; |