[SD2] 1075

Added 6 new taxi paths (wyrmrest temple)

--HG--
branch : trunk

3 files changed, 44 insertions, 1 deletions

diff --git a/sql/updates/3423_world_scripts.sql b/sql/updates/3423_world_scripts.sql
new file mode 100644
index 00000000000..16b07bd57a3
--- /dev/null
+++ b/sql/updates/3423_world_scripts.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry` IN (27575, 26443, 26949);
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index 2723a8dcf9e..9f5b335f1ed 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);
+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);
 
 /*  */
 /* ZONE */
diff --git a/src/bindings/scripts/scripts/npc/npc_taxi.cpp b/src/bindings/scripts/scripts/npc/npc_taxi.cpp
index 7667108683e..252dc33f0b6 100644
--- a/src/bindings/scripts/scripts/npc/npc_taxi.cpp
+++ b/src/bindings/scripts/scripts/npc/npc_taxi.cpp
@@ -99,6 +99,24 @@ bool GossipHello_npc_taxi(Player *player, Creature *_Creature)
         if (player->GetReputationRank(1031) >= REP_HONORED)
             player->ADD_GOSSIP_ITEM(0, "Fly me to Ogri'la please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 16);
         break;
+    case 27575: // Dragonblight - Lord Afrasastrasz
+        // middle -> ground
+        player->ADD_GOSSIP_ITEM(0, "I would like to take a flight to the ground, Lord Of Afrasastrasz.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 17);
+        // middle -> top
+        player->ADD_GOSSIP_ITEM(0, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 18);
+        break;
+    case 26443: // Dragonblight - Tariolstrasz //need to check if quests are required before gossip available (12123, 12124)
+        // ground -> top
+        player->ADD_GOSSIP_ITEM(0, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 19);
+        // ground -> middle
+        player->ADD_GOSSIP_ITEM(0, "Can you spare a drake to travel to Lord Of Afrasastrasz, in the middle of the temple?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20);
+        break;
+    case 26949: // Dragonblight - Torastrasza
+        // top -> middle
+        player->ADD_GOSSIP_ITEM(0, "I would like to see Lord Of Afrasastrasz, in the middle of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+        // 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;
     }
 
     player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
@@ -181,6 +199,30 @@ bool GossipSelect_npc_taxi(Player *player, Creature *_Creature, uint32 sender, u
         player->CLOSE_GOSSIP_MENU();
         player->CastSpell(player,41279,true);               //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
         break;
+    case GOSSIP_ACTION_INFO_DEF + 17:
+        player->CLOSE_GOSSIP_MENU();
+        player->ActivateTaxiPathTo(882);
+        break;
+    case GOSSIP_ACTION_INFO_DEF + 18:
+        player->CLOSE_GOSSIP_MENU();
+        player->ActivateTaxiPathTo(881);
+        break;
+    case GOSSIP_ACTION_INFO_DEF + 19:
+        player->CLOSE_GOSSIP_MENU();
+        player->ActivateTaxiPathTo(878);
+        break;
+    case GOSSIP_ACTION_INFO_DEF + 20:
+        player->CLOSE_GOSSIP_MENU();
+        player->ActivateTaxiPathTo(883);
+        break;
+    case GOSSIP_ACTION_INFO_DEF + 21:
+        player->CLOSE_GOSSIP_MENU();
+        player->ActivateTaxiPathTo(880);
+        break;
+    case GOSSIP_ACTION_INFO_DEF + 22:
+        player->CLOSE_GOSSIP_MENU();
+        player->ActivateTaxiPathTo(879);
+        break;
     }
 
     return true;