josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-20 11:46:43 -05:00
parent 6473e94358 338594e9e3
commit 6d4f39e479
33 changed files with 292 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/3358_world_spell_bonus_data.sql
+1 -1
View File
@@ -1 +1 @@
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.6453' WHERE `spell_bonus_data`.`entry` =33763;
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.6453' WHERE `spell_bonus_data`.`entry` =33763;
sql/updates/3373_world_spell.sql
+1 -1
View File
@@ -1,2 +1,2 @@
DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (38528);
DELETE FROM spell_proc_event WHERE `entry` IN (31785, 33776);
DELETE FROM spell_proc_event WHERE `entry` IN (31785, 33776);
sql/updates/7839_01_mangos_mangos_string.sql → sql/updates/3375_mangos_7839_01_world_trinity_string.sql
+1 -3
View File
@@ -1,6 +1,4 @@
DELETE FROM trinity_string WHERE entry IN(283);
UPDATE trinity_string SET entry = 5011 WHERE entry = 171;
INSERT INTO trinity_string VALUES
(171,'You can\'t teleport self to self!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
(171,'You can\'t teleport self to self!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
sql/updates/7839_02_mangos_command.sql → sql/updates/3375_mangos_7839_02_world_command.sql
+2 -2
View File
@@ -1,4 +1,4 @@
-- ALTER TABLE db_version CHANGE COLUMN required_7839_01_mangos_mangos_string required_7839_02_mangos_command bit;
/* ALTER TABLE db_version CHANGE COLUMN required_7839_01_mangos_mangos_string required_7839_02_mangos_command bit;*/
DELETE FROM `command` WHERE `name` IN (
'baninfo account','baninfo character','baninfo ip','goname','groupgo',
@@ -19,4 +19,4 @@ INSERT INTO `command` VALUES
('mute',1,'Syntax: .mute [$playerName] $timeInMinutes\r\n\r\nDisible chat messaging for any character from account of character $playerName (or currently selected) at $timeInMinutes minutes. Player can be offline.'),
('namego',1,'Syntax: .namego [$charactername]\r\n\r\nTeleport the given character to you. Character can be offline.'),
('tele name',1,'Syntax: .tele name [#playername] #location\r\n\r\nTeleport the given character to a given location. Character can be offline.'),
('unmute',1,'Syntax: .unmute [$playerName]\r\n\r\nRestore chat messaging for any character from account of character $playerName (or selected). Character can be ofline.');
('unmute',1,'Syntax: .unmute [$playerName]\r\n\r\nRestore chat messaging for any character from account of character $playerName (or selected). Character can be ofline.');
sql/updates/3392_world_spell_proc_event.sql
+1 -1
View File
@@ -17,4 +17,4 @@ VALUES
(60529, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
(60717, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 100.000000, 0),
(62147, 0x00, 15, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
(57907, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
(57907, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
sql/updates/3394_world_spell_bonus_data.sql
+1 -1
View File
@@ -7,4 +7,4 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`
(53194, 0.05, 0, 0, 'Druid - Starfall rank 3'),
(53189, 0.012, 0, 0, 'Druid - Starfall AOE rank 3'),
(53195, 0.05, 0, 0, 'Druid - Starfall rank 4'),
(53190, 0.012, 0, 0, 'Druid - Starfall AOE rank 4');
(53190, 0.012, 0, 0, 'Druid - Starfall AOE rank 4');
sql/updates/3409_world_spell_proc_event.sql
+1 -2
View File
@@ -1,9 +1,8 @@
DELETE FROM `spell_proc_event` WHERE `entry` IN (31878, 31877, 31876, 46913, 46914, 46915);
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
(31876, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
(31877, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
(31878, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
(46913, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0),
(46914, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0),
(46915, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0);
(46915, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0);
sql/updates/3410_world.sql → sql/updates/3410_world_SD2_scripts.sql
+1 -1
View File
@@ -28,4 +28,4 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `langua
(-1000403, 'We showed that one!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_1'),
(-1000404, 'One more down!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_2'),
(-1000405, 'We\'ve done it! We won!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_3'),
(-1000406, 'Meet me down by the orchard--I just need to put my gun away.', 0, 0, 7, 0, 'stilwell SAY_DS_PROLOGUE');
(-1000406, 'Meet me down by the orchard--I just need to put my gun away.', 0, 0, 7, 0, 'stilwell SAY_DS_PROLOGUE');
sql/updates/7850_01_mangos_command.sql → sql/updates/3414_mangos_7850_01_world_command.sql
+2 -3
View File
@@ -1,7 +1,6 @@
ALTER TABLE db_version CHANGE COLUMN required_7839_02_mangos_command required_7850_01_mangos_command bit;
/*ALTER TABLE db_version CHANGE COLUMN required_7839_02_mangos_command required_7850_01_mangos_command bit;*/
DELETE FROM `command` WHERE `name` IN ('character reputation','pinfo');
INSERT INTO `command` VALUES
('pinfo',2,'Syntax: .pinfo [$player_name]\r\n\r\nOutput account information for selected player or player find by $player_name.'),
('character reputation',2,'Syntax: .character reputation [$player_name]\r\n\r\nShow reputation information for selected player or player find by $player_name.');
('character reputation',2,'Syntax: .character reputation [$player_name]\r\n\r\nShow reputation information for selected player or player find by $player_name.');
sql/updates/7855_01_mangos_pools.sql → sql/updates/3416_mangos_7855_01_world_pools.sql
+2 -2
View File
@@ -1,4 +1,4 @@
ALTER TABLE db_version CHANGE COLUMN required_7850_01_mangos_command required_7855_01_mangos_pools bit;
/*ALTER TABLE db_version CHANGE COLUMN required_7850_01_mangos_command required_7855_01_mangos_pools bit;*/
ALTER TABLE pool_creature
ADD COLUMN description varchar(255) NOT NULL AFTER chance;
@@ -10,4 +10,4 @@ ALTER TABLE pool_pool
ADD COLUMN description varchar(255) NOT NULL AFTER chance;
ALTER TABLE pool_template
ADD COLUMN description varchar(255) NOT NULL AFTER max_limit;
ADD COLUMN description varchar(255) NOT NULL AFTER max_limit;
sql/updates/3419_world.sql → sql/updates/3419_world_SD2_scripts.sql
+1 -1
View File
@@ -48,4 +48,4 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
(-1060003, 'CLUCK! Sensors detect spatial anomaly -- danger imminent! CLUCK', NULL, NULL, 'GLUCK! Sensoren haben räumliche Anomalie entdeckt - Gefahr im Verzug! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AMBUSH'),
(-1060002, 'Threat analyzed! Activating combat plan beta! CLUCK!', NULL, NULL, 'Bedrohung analysiert! Gefechtsplan Beta wird aktiviert! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AGGRO2'),
(-1060001, 'Physical threat detected! Evasive action! CLUCK!', NULL, NULL, 'Körperliche Bedrohung entdeckt! Ausweichmanöver! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AGGRO1'),
(-1060000, 'Emergency power activated! Initializing ambulatory motor! CLUCK!', NULL, NULL, 'Notfallenergie aktiviert! Ambulatorenantrieb wird gestartet! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_START');
(-1060000, 'Emergency power activated! Initializing ambulatory motor! CLUCK!', NULL, NULL, 'Notfallenergie aktiviert! Ambulatorenantrieb wird gestartet! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_START');
sql/updates/3421_world_scripts.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry` IN (17435, 23413, 18725, 19401, 19409, 20235, 25059, 25236, 20903, 20162, 29154, 23415);
sql/updates/3422_world_scripts.sql
+1
View File
@@ -0,0 +1 @@
UPDATE creature_template SET ScriptName='npc_karynaku' WHERE entry=22112;
sql/updates/3423_world_scripts.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry` IN (27575, 26443, 26949);
sql/updates/3424_world_scripts.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry`=23816;
sql/world_scripts_full.sql
+1 -12
View File
@@ -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, 27575, 26443, 26949, 23816);
/* */
/* 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 */
@@ -665,8 +658,6 @@ UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=16062;
/* 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;
@@ -792,7 +783,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;
@@ -938,7 +928,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;
src/bindings/scripts/CMakeLists.txt
+1
View File
@@ -32,6 +32,7 @@ SET(trinityscript_LIB_SRCS
scripts/npc/npc_innkeeper.cpp
scripts/npc/npc_professions.cpp
scripts/npc/npcs_special.cpp
scripts/npc/npc_taxi.cpp
scripts/zone/arathi_highlands/arathi_highlands.cpp
scripts/zone/alterac_mountains/alterac_mountains.cpp
scripts/zone/ashenvale_forest/ashenvale.cpp
src/bindings/scripts/ScriptMgr.cpp
+2
View File
@@ -77,6 +77,7 @@ extern void AddSC_item_scripts();
// -- NPC --
extern void AddSC_npc_professions();
extern void AddSC_npcs_special();
extern void AddSC_npc_taxi();
// -- Servers --
@@ -953,6 +954,7 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
// -- NPC --
AddSC_npc_professions();
AddSC_npcs_special();
AddSC_npc_taxi();
// -- Servers --
src/bindings/scripts/VC71/71ScriptDev2.vcproj
+4
View File
@@ -293,6 +293,10 @@
RelativePath="..\scripts\npc\npcs_special.cpp"
>
</File>
<File
RelativePath="..\scripts\npc\npc_taxi.cpp"
>
</File>
</Filter>
<Filter
Name="servers"
src/bindings/scripts/VC80/80ScriptDev2.vcproj
+4
View File
@@ -462,6 +462,10 @@
RelativePath="..\scripts\npc\npcs_special.cpp"
>
</File>
<File
RelativePath="..\scripts\npc\npc_taxi.cpp"
>
</File>
</Filter>
<Filter
Name="servers"
src/bindings/scripts/VC90/90ScriptDev2.vcproj
+4
View File
@@ -461,6 +461,10 @@
RelativePath="..\scripts\npc\npcs_special.cpp"
>
</File>
<File
RelativePath="..\scripts\npc\npc_taxi.cpp"
>
</File>
</Filter>
<Filter
Name="servers"
src/bindings/scripts/scripts/npc/npc_taxi.cpp
+254
View File
@@ -0,0 +1,254 @@
/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* ScriptData
SDName: Npc_Taxi
SD%Complete: 0%
SDComment: To be used for taxi NPCs that are located globally.
SDCategory: NPCs
EndScriptData
*/
#include "precompiled.h"
bool GossipHello_npc_taxi(Player *player, Creature *_Creature)
{
if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() );
switch(_Creature->GetEntry()) {
case 17435: // Azuremyst Isle - Susurrus
if (player->HasItemCount(23843,1,true))
player->ADD_GOSSIP_ITEM(0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
break;
case 20903: // Netherstorm - Protectorate Nether Drake
if(player->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(29778,1))
player->ADD_GOSSIP_ITEM(0, "I'm ready to fly! Take me up, dragon!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
break;
case 18725: // Old Hillsbrad Foothills - Brazen
player->ADD_GOSSIP_ITEM(0, "I am ready to go to Durnholde Keep.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
break;
case 29154: // Stormwind City - Thargold Ironwing
player->ADD_GOSSIP_ITEM(0, "I'd like to take a flight around Stormwind Harbor.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
break;
case 19409: // Hellfire Peninsula - Wing Commander Dabir'ee
//Mission: The Murketh and Shaadraz Gateways
if (player->GetQuestStatus(10146) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
//Shatter Point
if (!player->GetQuestRewardStatus(10340))
player->ADD_GOSSIP_ITEM(0, "Fly me to Shatter Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
break;
case 20235: // Hellfire Peninsula - Gryphoneer Windbellow
//Mission: The Abyssal Shelf || Return to the Abyssal Shelf
if (player->GetQuestStatus(10163) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10346) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
//Go to the Front
if (player->GetQuestStatus(10382) != QUEST_STATUS_NONE && !player->GetQuestRewardStatus(10382))
player->ADD_GOSSIP_ITEM(0, "Fly me to Honor Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
break;
case 19401: // Hellfire Peninsula - Wing Commander Brack
//Mission: The Murketh and Shaadraz Gateways
if (player->GetQuestStatus(10129) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
//Mission: The Abyssal Shelf || Return to the Abyssal Shelf
if (player->GetQuestStatus(10162) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10347) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
//Spinebreaker Post
if (player->GetQuestStatus(10242) == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(10242))
player->ADD_GOSSIP_ITEM(0, "Fly me to Spinebreaker Post", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
break;
case 23413: // Blade's Edge Mountains - Skyguard Handler Irena
if (player->GetReputationRank(1031) >= REP_HONORED)
player->ADD_GOSSIP_ITEM(0, "Fly me to Skettis please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
break;
case 25059: // Isle of Quel'Danas - Ayren Cloudbreaker
if (player->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, "Speaking of action, I've been ordered to undertake an air strike.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
if (player->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, "I need to intercept the Dawnblade reinforcements.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
break;
case 25236: // Isle of Quel'Danas - Unrestrained Dragonhawk
if (player->GetQuestStatus(11542) == QUEST_STATUS_COMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_COMPLETE)
player->ADD_GOSSIP_ITEM(0, "<Ride the dragonhawk to Sun's Reach>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
break;
case 20162: // Netherstorm - Veronia
//Behind Enemy Lines
if (player->GetQuestStatus(10652) && !player->GetQuestRewardStatus(10652))
player->ADD_GOSSIP_ITEM(0, "Fly me to Manaforge Coruu please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
break;
case 23415: // Terokkar Forest - Skyguard Handler Deesak
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;
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());
return true;
}
bool GossipSelect_npc_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
switch(action) {
case GOSSIP_ACTION_INFO_DEF:
//spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506.
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,32474,true);
break;
case GOSSIP_ACTION_INFO_DEF + 1:
player->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155) )
break;
case GOSSIP_ACTION_INFO_DEF + 2:
if( !player->HasItemCount(25853,1) ) {
player->SEND_GOSSIP_MENU(9780, _Creature->GetGUID());
} else {
player->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(534); //TaxiPath 534
}
break;
case GOSSIP_ACTION_INFO_DEF + 3:
player->CLOSE_GOSSIP_MENU();
player->GetSession()->SendDoFlight(1149, 1041);
break;
case GOSSIP_ACTION_INFO_DEF + 4:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33768,true); //TaxiPath 585 (Gateways Murket and Shaadraz)
break;
case GOSSIP_ACTION_INFO_DEF + 5:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,35069,true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
break;
case GOSSIP_ACTION_INFO_DEF + 6:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33899,true); //TaxiPath 589 (Aerial Assault Flight (Alliance))
break;
case GOSSIP_ACTION_INFO_DEF + 7:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,35065,true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
break;
case GOSSIP_ACTION_INFO_DEF + 8:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33659,true); //TaxiPath 584 (Gateways Murket and Shaadraz)
break;
case GOSSIP_ACTION_INFO_DEF + 9:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33825,true); //TaxiPath 587 (Aerial Assault Flight (Horde))
break;
case GOSSIP_ACTION_INFO_DEF + 10:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,34578,true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
break;
case GOSSIP_ACTION_INFO_DEF + 11:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,41278,true); //TaxiPath 706
break;
case GOSSIP_ACTION_INFO_DEF + 12:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45071,true); //TaxiPath 779
break;
case GOSSIP_ACTION_INFO_DEF + 13:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45113,true); //TaxiPath 784
break;
case GOSSIP_ACTION_INFO_DEF + 14:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45353,true); //TaxiPath 788
break;
case GOSSIP_ACTION_INFO_DEF + 15:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,34905,true); //TaxiPath 606
break;
case GOSSIP_ACTION_INFO_DEF + 16:
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;
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;
}
void AddSC_npc_taxi()
{
Script *newscript;
newscript = new Script;
newscript->Name="npc_taxi";
newscript->pGossipHello = &GossipHello_npc_taxi;
newscript->pGossipSelect = &GossipSelect_npc_taxi;
newscript->RegisterSelf();
}
src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
-42
View File
@@ -26,7 +26,6 @@ npc_draenei_survivor
npc_engineer_spark_overgrind
npc_injured_draenei
npc_magwin
npc_susurrus
npc_geezle
mob_nestlewood_owlkin
EndContentData */
@@ -387,41 +386,6 @@ CreatureAI* GetAI_npc_magwinAI(Creature* pCreature)
return (CreatureAI*)magwinAI;
}
/*######
## npc_susurrus
######*/
bool GossipHello_npc_susurrus(Player *player, Creature *_Creature)
{
if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() );
if (player->HasItemCount(23843,1,true))
player->ADD_GOSSIP_ITEM(0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_susurrus(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,32474,true); //apparently correct spell, possible not correct place to cast, or correct caster
std::vector<uint32> nodes;
nodes.resize(2);
nodes[0] = 92; //from susurrus
nodes[1] = 91; //end at exodar
// player->ActivateTaxiPathTo(nodes,11686); //TaxiPath 506. Using invisible model, possible Trinity must allow 0(from dbc) for cases like this.
player->ActivateTaxiPathTo(nodes);
}
return true;
}
/*######
## npc_geezle
######*/
@@ -645,12 +609,6 @@ void AddSC_azuremyst_isle()
newscript->pQuestAccept = &QuestAccept_npc_magwin;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_susurrus";
newscript->pGossipHello = &GossipHello_npc_susurrus;
newscript->pGossipSelect = &GossipSelect_npc_susurrus;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_geezle";
newscript->GetAI = &GetAI_npc_geezleAI;
src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
-36
View File
@@ -27,7 +27,6 @@ mobs_nether_drake
npc_daranelle
npc_overseer_nuaar
npc_saikkal_the_elder
npc_skyguard_handler_irena
go_legion_obelisk
EndContentData */
@@ -330,35 +329,6 @@ bool GossipSelect_npc_saikkal_the_elder(Player *player, Creature *_Creature, uin
return true;
}
/*######
## npc_skyguard_handler_irena
######*/
#define GOSSIP_SKYGUARD "Fly me to Skettis please"
bool GossipHello_npc_skyguard_handler_irena(Player *player, Creature *_Creature )
{
if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() );
if (player->GetReputationRank(1031) >= REP_HONORED)
player->ADD_GOSSIP_ITEM( 2, GOSSIP_SKYGUARD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_skyguard_handler_irena(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,41278,true); //TaxiPath 706
}
return true;
}
/*######
## go_legion_obelisk
######*/
@@ -440,11 +410,5 @@ void AddSC_blades_edge_mountains()
newscript->Name="go_legion_obelisk";
newscript->pGOHello = &GOHello_go_legion_obelisk;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_skyguard_handler_irena";
newscript->pGossipHello = &GossipHello_npc_skyguard_handler_irena;
newscript->pGossipSelect = &GossipSelect_npc_skyguard_handler_irena;
newscript->RegisterSelf();
}
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
-39
View File
@@ -22,7 +22,6 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
EndScriptData */
/* ContentData
npc_brazen
npc_erozion
npc_thrall_old_hillsbrad
npc_taretha
@@ -38,38 +37,6 @@ EndContentData */
#define QUEST_ENTRY_RETURN 10285
#define ITEM_ENTRY_BOMBS 25853
/*######
## npc_brazen
######*/
bool GossipHello_npc_brazen(Player *player, Creature *_Creature)
{
player->ADD_GOSSIP_ITEM(0, "I am ready to go to Durnholde Keep.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_brazen(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
if( !player->HasItemCount(ITEM_ENTRY_BOMBS,1) )
player->SEND_GOSSIP_MENU(9780, _Creature->GetGUID());
else
{
player->CLOSE_GOSSIP_MENU();
std::vector<uint32> nodes;
nodes.resize(2);
nodes[0] = 115; //from brazen
nodes[1] = 116; //end outside durnholde
player->ActivateTaxiPathTo(nodes); //TaxiPath 534
}
}
return true;
}
/*######
## npc_erozion
######*/
@@ -697,12 +664,6 @@ void AddSC_old_hillsbrad()
{
Script *newscript;
newscript = new Script;
newscript->Name="npc_brazen";
newscript->pGossipHello = &GossipHello_npc_brazen;
newscript->pGossipSelect = &GossipSelect_npc_brazen;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_erozion";
newscript->pGossipHello = &GossipHello_npc_erozion;
src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp
-151
View File
@@ -24,9 +24,6 @@ EndScriptData */
/* ContentData
npc_aeranas
go_haaleshi_altar
npc_wing_commander_dabiree
npc_gryphoneer_windbellow
npc_wing_commander_brack
npc_wounded_blood_elf
EndContentData */
@@ -126,136 +123,6 @@ bool GOHello_go_haaleshi_altar(Player *player, GameObject* _GO)
return false;
}
/*######
## npc_wing_commander_dabiree
######*/
#define GOSSIP_ITEM1_DAB "Fly me to Murketh and Shaadraz Gateways"
#define GOSSIP_ITEM2_DAB "Fly me to Shatter Point"
bool GossipHello_npc_wing_commander_dabiree(Player *player, Creature *_Creature)
{
if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() );
//Mission: The Murketh and Shaadraz Gateways
if (player->GetQuestStatus(10146) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(2, GOSSIP_ITEM1_DAB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
//Shatter Point
if (!player->GetQuestRewardStatus(10340))
player->ADD_GOSSIP_ITEM(2, GOSSIP_ITEM2_DAB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_wing_commander_dabiree(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33768,true); //TaxiPath 585 (Gateways Murket and Shaadraz)
}
if (action == GOSSIP_ACTION_INFO_DEF + 2)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,35069,true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
}
return true;
}
/*######
## npc_gryphoneer_windbellow
######*/
#define GOSSIP_ITEM1_WIN "Fly me to The Abyssal Shelf"
#define GOSSIP_ITEM2_WIN "Fly me to Honor Point"
bool GossipHello_npc_gryphoneer_windbellow(Player *player, Creature *_Creature)
{
if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() );
//Mission: The Abyssal Shelf || Return to the Abyssal Shelf
if (player->GetQuestStatus(10163) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10346) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(2, GOSSIP_ITEM1_WIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
//Go to the Front
if (player->GetQuestStatus(10382) != QUEST_STATUS_NONE && !player->GetQuestRewardStatus(10382))
player->ADD_GOSSIP_ITEM(2, GOSSIP_ITEM2_WIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_gryphoneer_windbellow(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF + 1)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33899,true); //TaxiPath 589 (Aerial Assault Flight (Alliance))
}
if (action == GOSSIP_ACTION_INFO_DEF + 2)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,35065,true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
}
return true;
}
/*######
## npc_wing_commander_brack
######*/
#define GOSSIP_ITEM1_BRA "Fly me to Murketh and Shaadraz Gateways"
#define GOSSIP_ITEM2_BRA "Fly me to The Abyssal Shelf"
#define GOSSIP_ITEM3_BRA "Fly me to Spinebreaker Post"
bool GossipHello_npc_wing_commander_brack(Player *player, Creature *_Creature)
{
if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() );
//Mission: The Murketh and Shaadraz Gateways
if (player->GetQuestStatus(10129) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(2, GOSSIP_ITEM1_BRA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
//Mission: The Abyssal Shelf || Return to the Abyssal Shelf
if (player->GetQuestStatus(10162) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10347) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(2, GOSSIP_ITEM2_BRA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
//Spinebreaker Post
if (player->GetQuestStatus(10242) == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(10242))
player->ADD_GOSSIP_ITEM(2, GOSSIP_ITEM3_BRA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_wing_commander_brack(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
switch(action)
{
case GOSSIP_ACTION_INFO_DEF + 1:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33659,true); //TaxiPath 584 (Gateways Murket and Shaadraz)
break;
case GOSSIP_ACTION_INFO_DEF + 2:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33825,true); //TaxiPath 587 (Aerial Assault Flight (Horde))
break;
case GOSSIP_ACTION_INFO_DEF + 3:
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,34578,true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
break;
}
return true;
}
/*######
## npc_wounded_blood_elf
######*/
@@ -386,24 +253,6 @@ void AddSC_hellfire_peninsula()
newscript->pGOHello = &GOHello_go_haaleshi_altar;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_wing_commander_dabiree";
newscript->pGossipHello = &GossipHello_npc_wing_commander_dabiree;
newscript->pGossipSelect = &GossipSelect_npc_wing_commander_dabiree;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_gryphoneer_windbellow";
newscript->pGossipHello = &GossipHello_npc_gryphoneer_windbellow;
newscript->pGossipSelect = &GossipSelect_npc_gryphoneer_windbellow;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_wing_commander_brack";
newscript->pGossipHello = &GossipHello_npc_wing_commander_brack;
newscript->pGossipSelect = &GossipSelect_npc_wing_commander_brack;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_wounded_blood_elf";
newscript->GetAI = &GetAI_npc_wounded_blood_elf;
src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp
-72
View File
@@ -22,47 +22,12 @@ SDCategory: Isle Of Quel'Danas
EndScriptData */
/* ContentData
npc_ayren_cloudbreaker
npc_converted_sentry
npc_unrestrained_dragonhawk
npc_greengill_slave
EndContentData */
#include "precompiled.h"
/*######
## npc_ayren_cloudbreaker
######*/
#define GOSSIP_FLY1 "Speaking of action, I've been ordered to undertake an air strike."
#define GOSSIP_FLY2 "I need to intercept the Dawnblade reinforcements."
bool GossipHello_npc_ayren_cloudbreaker(Player *player, Creature *_Creature)
{
if( player->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, GOSSIP_FLY1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if( player->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(0, GOSSIP_FLY2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
return true;
}
bool GossipSelect_npc_ayren_cloudbreaker(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45071,true); //TaxiPath 779
}
if (action == GOSSIP_ACTION_INFO_DEF+2)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45113,true); //TaxiPath 784
}
return true;
}
/*######
## npc_converted_sentry
######*/
@@ -113,31 +78,6 @@ CreatureAI* GetAI_npc_converted_sentry(Creature *_Creature)
return new npc_converted_sentryAI (_Creature);
}
/*######
## npc_unrestrained_dragonhawk
######*/
#define GOSSIP_UD "<Ride the dragonhawk to Sun's Reach>"
bool GossipHello_npc_unrestrained_dragonhawk(Player *player, Creature *_Creature)
{
if( player->GetQuestStatus(11542) == QUEST_STATUS_COMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_COMPLETE )
player->ADD_GOSSIP_ITEM(0, GOSSIP_UD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
return true;
}
bool GossipSelect_npc_unrestrained_dragonhawk(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45353,true); //TaxiPath 788
}
return true;
}
/*######
## npc_greengill_slave
######*/
@@ -199,23 +139,11 @@ void AddSC_isle_of_queldanas()
{
Script *newscript;
newscript = new Script;
newscript->Name="npc_ayren_cloudbreaker";
newscript->pGossipHello = &GossipHello_npc_ayren_cloudbreaker;
newscript->pGossipSelect = &GossipSelect_npc_ayren_cloudbreaker;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_converted_sentry";
newscript->GetAI = &GetAI_npc_converted_sentry;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_unrestrained_dragonhawk";
newscript->pGossipHello = &GossipHello_npc_unrestrained_dragonhawk;
newscript->pGossipSelect = &GossipSelect_npc_unrestrained_dragonhawk;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_greengill_slave";
newscript->GetAI = &GetAI_npc_greengill_slaveAI;
src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp
+2 -14
View File
@@ -71,12 +71,7 @@ bool GossipSelect_npc_bunthen_plainswind(Player *player, Creature *_Creature, ui
player->CLOSE_GOSSIP_MENU();
if (player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE)
{
std::vector<uint32> nodes;
nodes.resize(2);
nodes[0] = 63; // Nighthaven, Moonglade
nodes[1] = 22; // Thunder Bluff, Mulgore
player->ActivateTaxiPathTo(nodes);
player->ActivateTaxiPathTo(316);
}
break;
}
@@ -177,14 +172,7 @@ bool GossipSelect_npc_silva_filnaveth(Player *player, Creature *_Creature, uint3
{
player->CLOSE_GOSSIP_MENU();
if (player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE)
{
std::vector<uint32> nodes;
nodes.resize(2);
nodes[0] = 62; // Nighthaven, Moonglade
nodes[1] = 27; // Rut'theran Village, Teldrassil
player->ActivateTaxiPathTo(nodes);
}
player->ActivateTaxiPathTo(315);
break;
}
case GOSSIP_ACTION_INFO_DEF + 2:
src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
+1 -7
View File
@@ -333,13 +333,7 @@ bool QuestAccept_npc_altruis_the_sufferer(Player *player, Creature *creature, Qu
if ( !player->GetQuestRewardStatus(9991) ) //Survey the Land, q-id 9991
{
player->CLOSE_GOSSIP_MENU();
std::vector<uint32> nodes;
nodes.resize(2);
nodes[0] = 113; //from
nodes[1] = 114; //end at
player->ActivateTaxiPathTo(nodes); //TaxiPath 532
player->ActivateTaxiPathTo(532); //TaxiPath 532
}
return true;
}
src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
-77
View File
@@ -25,8 +25,6 @@ EndScriptData */
npc_manaforge_control_console
go_manaforge_control_console
npc_commander_dawnforge
npc_protectorate_nether_drake
npc_veronia
npc_bessy
EndContentData */
@@ -668,39 +666,6 @@ bool AreaTrigger_at_commander_dawnforge(Player *player, AreaTriggerEntry *at)
return false;
}
/*######
## npc_protectorate_nether_drake
######*/
#define GOSSIP_ITEM "I'm ready to fly! Take me up, dragon!"
bool GossipHello_npc_protectorate_nether_drake(Player *player, Creature *_Creature)
{
//On Nethery Wings
if (player->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(29778,1) )
player->ADD_GOSSIP_ITEM(0, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_protectorate_nether_drake(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
player->CLOSE_GOSSIP_MENU();
std::vector<uint32> nodes;
nodes.resize(2);
nodes[0] = 152; //from drake
nodes[1] = 153; //end at drake
player->ActivateTaxiPathTo(nodes); //TaxiPath 627 (possibly 627+628(152->153->154->155) )
}
return true;
}
/*######
## npc_professor_dabiri
######*/
@@ -744,36 +709,6 @@ bool QuestAccept_npc_professor_dabiri(Player *player, Creature *creature, Quest
return true;
}
/*######
## npc_veronia
######*/
#define GOSSIP_HV "Fly me to Manaforge Coruu please"
bool GossipHello_npc_veronia(Player *player, Creature *_Creature)
{
if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() );
//Behind Enemy Lines
if (player->GetQuestStatus(10652) && !player->GetQuestRewardStatus(10652))
player->ADD_GOSSIP_ITEM(0, GOSSIP_HV, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_veronia(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,34905,true); //TaxiPath 606
}
return true;
}
/*######
## mob_phase_hunter
######*/
@@ -1037,12 +972,6 @@ void AddSC_netherstorm()
newscript->pAreaTrigger = &AreaTrigger_at_commander_dawnforge;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_protectorate_nether_drake";
newscript->pGossipHello = &GossipHello_npc_protectorate_nether_drake;
newscript->pGossipSelect = &GossipSelect_npc_protectorate_nether_drake;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "npc_professor_dabiri";
newscript->pGossipHello = &GossipHello_npc_professor_dabiri;
@@ -1050,12 +979,6 @@ void AddSC_netherstorm()
newscript->pQuestAccept = &QuestAccept_npc_professor_dabiri;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_veronia";
newscript->pGossipHello = &GossipHello_npc_veronia;
newscript->pGossipSelect = &GossipSelect_npc_veronia;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "mob_phase_hunter";
newscript->GetAI = &GetAI_mob_phase_hunter;
src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
+1 -9
View File
@@ -622,15 +622,7 @@ bool GossipSelect_npc_oronok_tornheart(Player *player, Creature *_Creature, uint
bool QuestAccept_npc_karynaku(Player* player, Creature* creature, Quest const* quest)
{
if(quest->GetQuestId() == 10870) // Ally of the Netherwing
{
std::vector<uint32> nodes;
nodes.resize(2);
nodes[0] = 161; // From Karynaku
nodes[1] = 162; // To Mordenai
error_log("TSCR: Player %s started quest 10870 which has disabled taxi node, need to be fixed in core", player->GetName());
//player->ActivateTaxiPathTo(nodes, 20811);
}
player->ActivateTaxiPathTo(649);
return true;
}
src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp
-29
View File
@@ -27,7 +27,6 @@ npc_bartleby
npc_dashel_stonefist
npc_general_marcus_jonathan
npc_lady_katrana_prestor
npc_harbor_taxi
EndContentData */
#include "precompiled.h"
@@ -239,28 +238,6 @@ 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;
@@ -293,11 +270,5 @@ 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();
}
src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
-36
View File
@@ -27,7 +27,6 @@ mob_infested_root_walker
mob_rotting_forest_rager
mob_netherweb_victim
npc_floon
npc_skyguard_handler_deesak
npc_isla_starmane
EndContentData */
@@ -328,35 +327,6 @@ bool GossipSelect_npc_floon(Player *player, Creature *_Creature, uint32 sender,
return true;
}
/*######
## npc_skyguard_handler_deesak
######*/
#define GOSSIP_SKYGUARD "Fly me to Ogri'la please"
bool GossipHello_npc_skyguard_handler_deesak(Player *player, Creature *_Creature )
{
if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() );
if (player->GetReputationRank(1031) >= REP_HONORED)
player->ADD_GOSSIP_ITEM( 2, GOSSIP_SKYGUARD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true;
}
bool GossipSelect_npc_skyguard_handler_deesak(Player *player, Creature *_Creature, uint32 sender, uint32 action )
{
if (action == GOSSIP_ACTION_INFO_DEF+1)
{
player->CLOSE_GOSSIP_MENU();
player->CastSpell(player,41279,true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
}
return true;
}
/*######
## npc_isla_starmane
######*/
@@ -572,12 +542,6 @@ void AddSC_terokkar_forest()
newscript->pGossipSelect = &GossipSelect_npc_floon;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="npc_skyguard_handler_deesak";
newscript->pGossipHello = &GossipHello_npc_skyguard_handler_deesak;
newscript->pGossipSelect = &GossipSelect_npc_skyguard_handler_deesak;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name= "npc_isla_starmane";
newscript->GetAI = &GetAI_npc_isla_starmaneAI;