From 8305f6d3bc2088d78e8067e344e6df3fde978d1f Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Wed, 20 May 2009 07:13:19 +0200 Subject: Merge & move taxi scripts into one file as npc_taxi --HG-- branch : trunk --- sql/world_scripts_full.sql | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'sql/world_scripts_full.sql') diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql index d1e975e5b96..2723a8dcf9e 100644 --- a/sql/world_scripts_full.sql +++ b/sql/world_scripts_full.sql @@ -99,6 +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); /* */ /* ZONE */ @@ -163,7 +164,6 @@ UPDATE `creature_template` SET `ScriptName`='mob_depth_charge' WHERE `entry`=230 /* AZUREMYST ISLE */ UPDATE `creature_template` SET `ScriptName`='npc_engineer_spark_overgrind' WHERE `entry`=17243; UPDATE `creature_template` SET `ScriptName`='npc_injured_draenei' WHERE `entry`=16971; -UPDATE `creature_template` SET `ScriptName`='npc_susurrus' WHERE `entry`=17435; UPDATE `creature_template` SET `ScriptName`='npc_magwin' WHERE `entry`=17312; UPDATE `creature_template` SET `ScriptName`='npc_geezle' WHERE `entry`=17318; UPDATE `creature_template` SET `ScriptName`='mob_nestlewood_owlkin' WHERE `entry`=16518; @@ -280,7 +280,6 @@ UPDATE `creature_template` SET `ScriptName`='mobs_nether_drake' WHERE `entry` IN UPDATE `creature_template` SET `ScriptName`='npc_daranelle' WHERE `entry`=21469; UPDATE `creature_template` SET `ScriptName`='npc_overseer_nuaar' WHERE `entry`=21981; UPDATE `creature_template` SET `ScriptName`='npc_saikkal_the_elder' WHERE `entry`=22932; -UPDATE `creature_template` SET `ScriptName`='npc_skyguard_handler_deesak' WHERE `entry`=23415; /* BLASTED LANDS */ UPDATE `creature_template` SET `ScriptName`='npc_deathly_usher' WHERE `entry`=8816; @@ -332,7 +331,6 @@ UPDATE `instance_template` SET `script`='instance_old_hillsbrad' WHERE `map`=560 UPDATE `creature_template` SET `ScriptName`='boss_lieutenant_drake' WHERE `entry`=17848; UPDATE `creature_template` SET `ScriptName`='boss_epoch_hunter' WHERE `entry`=18096; UPDATE `creature_template` SET `ScriptName`='boss_captain_skarloc' WHERE `entry`=17862; -UPDATE `creature_template` SET `ScriptName`='npc_brazen' WHERE `entry`=18725; UPDATE `creature_template` SET `ScriptName`='npc_erozion' WHERE `entry`=18723; UPDATE `creature_template` SET `ScriptName`='npc_taretha' WHERE `entry`=18887; UPDATE `creature_template` SET `ScriptName`='npc_thrall_old_hillsbrad' WHERE `entry`=17876; @@ -508,9 +506,6 @@ UPDATE `creature_template` SET `ScriptName`='mob_abyssal' WHERE `entry`=17454; /* HELLFIRE PENINSULA */ UPDATE `creature_template` SET `ScriptName`='boss_doomlord_kazzak' WHERE `entry`=18728; -UPDATE `creature_template` SET `ScriptName`='npc_wing_commander_brack' WHERE `entry`=19401; -UPDATE `creature_template` SET `ScriptName`='npc_wing_commander_dabiree' WHERE `entry`=19409; -UPDATE `creature_template` SET `ScriptName`='npc_gryphoneer_windbellow' WHERE `entry`=20235; UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry`=16993; UPDATE `creature_template` SET `ScriptName`='npc_aeranas' WHERE `entry`=17085; UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`=181606; @@ -523,9 +518,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`= UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHERE `entry`=8879; /* ISLE OF QUEL'DANAS */ -UPDATE `creature_template` SET `ScriptName`='npc_ayren_cloudbreaker' WHERE `entry`=25059; UPDATE `creature_template` SET `ScriptName`='npc_converted_sentry' WHERE `entry`=24981; -UPDATE `creature_template` SET `ScriptName`='npc_unrestrained_dragonhawk' WHERE `entry`=25236; UPDATE `creature_template` SET `ScriptName`='npc_greengill_slave' WHERE `entry`=25084; /* KARAZHAN */ @@ -668,8 +661,6 @@ UPDATE `creature_template` SET `ScriptName`='mob_webwrap' WHERE `entry`=16486; /* NETHERSTORM */ UPDATE `gameobject_template` SET `ScriptName`='go_manaforge_control_console' WHERE `entry` IN (183770,183956,184311,184312); UPDATE `creature_template` SET `ScriptName`='npc_manaforge_control_console' WHERE `entry` IN (20209,20417,20418,20440); -UPDATE `creature_template` SET `ScriptName`='npc_protectorate_nether_drake' WHERE `entry`=20903; -UPDATE `creature_template` SET `ScriptName`='npc_veronia' WHERE `entry`=20162; UPDATE `creature_template` SET `ScriptName`='mob_phase_hunter' WHERE `entry`=18879; UPDATE `creature_template` SET `ScriptName`='npc_professor_dabiri' WHERE `entry`=20907; UPDATE `creature_template` SET `ScriptName`='npc_bessy' WHERE `entry`=20415; @@ -795,7 +786,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_bartleby' WHERE `entry`=6090; UPDATE `creature_template` SET `ScriptName`='npc_dashel_stonefist' WHERE `entry`=4961; UPDATE `creature_template` SET `ScriptName`='npc_general_marcus_jonathan' WHERE `entry`=466; UPDATE `creature_template` SET `ScriptName`='npc_lady_katrana_prestor' WHERE `entry`=1749; -UPDATE `creature_template` SET `ScriptName`='npc_stormwind_harbor_taxi' WHERE `entry`=29154; /* STRANGLETHORN VALE */ UPDATE `creature_template` SET `ScriptName`='mob_yenniku' WHERE `entry`=2530; @@ -941,7 +931,6 @@ UPDATE `creature_template` SET `ScriptName`='mob_infested_root_walker' WHERE `en UPDATE `creature_template` SET `ScriptName`='mob_netherweb_victim' WHERE `entry`=22355; UPDATE `creature_template` SET `ScriptName`='mob_rotting_forest_rager' WHERE `entry`=22307; UPDATE `creature_template` SET `ScriptName`='npc_floon' WHERE `entry`=18588; -UPDATE `creature_template` SET `ScriptName`='npc_skyguard_handler_irena' WHERE `entry`=23413; UPDATE `creature_template` SET `ScriptName`='npc_isla_starmane' WHERE `entry`=18760; UPDATE `creature_template` SET `ScriptName`='mob_unkor_the_ruthless' WHERE `entry`=18262; -- cgit v1.2.3 From 5ebeb2bc8ac35ad3f8c6d68481c47342df5cdb66 Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Wed, 20 May 2009 14:57:29 +0200 Subject: [SD2] 1075 Added 6 new taxi paths (wyrmrest temple) --HG-- branch : trunk --- sql/updates/3423_world_scripts.sql | 1 + sql/world_scripts_full.sql | 2 +- src/bindings/scripts/scripts/npc/npc_taxi.cpp | 42 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 sql/updates/3423_world_scripts.sql (limited to 'sql/world_scripts_full.sql') 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; -- cgit v1.2.3 From f55161579c6340f7c9ee167ec0306396b66e0ee8 Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Wed, 20 May 2009 15:16:37 +0200 Subject: Add taxi scripts for npc Bat Handler Camille --HG-- branch : trunk --- sql/updates/3424_world_scripts.sql | 1 + sql/world_scripts_full.sql | 2 +- src/bindings/scripts/scripts/npc/npc_taxi.cpp | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 sql/updates/3424_world_scripts.sql (limited to 'sql/world_scripts_full.sql') 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; -- cgit v1.2.3