diff options
| -rw-r--r-- | sql/updates/1307_world.sql | 1 | ||||
| -rw-r--r-- | sql/updates/2.4.3_updates/1018_world.sql (renamed from sql/updates/2.4.3_updates/1018_wrold.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp | 29 |
4 files changed, 31 insertions, 0 deletions
diff --git a/sql/updates/1307_world.sql b/sql/updates/1307_world.sql new file mode 100644 index 00000000000..ddb0b9732c9 --- /dev/null +++ b/sql/updates/1307_world.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName`='npc_stormwindharbor_taxi' WHERE `entry`='29154';
\ No newline at end of file diff --git a/sql/updates/2.4.3_updates/1018_wrold.sql b/sql/updates/2.4.3_updates/1018_world.sql index ca298faa8f3..ca298faa8f3 100644 --- a/sql/updates/2.4.3_updates/1018_wrold.sql +++ b/sql/updates/2.4.3_updates/1018_world.sql diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 3a90daa799c..751629ef23c 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -27,4 +27,5 @@ INSTALL(FILES 1018_world.sql 1026_world.sql 1028_world_scripts.sql +1307_world.sql DESTINATION share/trinity/sql/updates)
\ No newline at end of file diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index 6a11c455f67..b09cdce5c20 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -27,6 +27,7 @@ npc_bartleby npc_dashel_stonefist npc_general_marcus_jonathan npc_lady_katrana_prestor +npc_harbor_taxi EndContentData */ #include "precompiled.h" @@ -236,6 +237,28 @@ bool GossipSelect_npc_lady_katrana_prestor(Player *player, Creature *_Creature, return true; } +/*###### +## npc_harbor_taxi +######*/ + +#define GOSSIP_STORMWIND "I'd like to take a flight around Stormwind Harbor." + +bool GossipHello_npc_stormwind_harbor_taxi(Player *player, Creature *_Creature) +{ + player->ADD_GOSSIP_ITEM(0, GOSSIP_STORMWIND, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); + player->SEND_GOSSIP_MENU(13454,_Creature->GetGUID()); + return true; +} + +bool GossipSelect_npc_stormwind_harbor_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + if (action == GOSSIP_ACTION_INFO_DEF + 10) + { + player->GetSession()->SendDoFlight(1149, 1041); + } + return true; +} + void AddSC_stormwind_city() { Script *newscript; @@ -268,4 +291,10 @@ void AddSC_stormwind_city() newscript->pGossipHello = &GossipHello_npc_lady_katrana_prestor; newscript->pGossipSelect = &GossipSelect_npc_lady_katrana_prestor; newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="npc_stormwind_harbor_taxi"; + newscript->pGossipHello = &GossipHello_npc_stormwind_harbor_taxi; + newscript->pGossipSelect = &GossipSelect_npc_stormwind_harbor_taxi; + newscript->RegisterSelf(); } |