Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

Browse Source
This commit is contained in:
Vincent_Michael
2013-01-15 23:34:50 +01:00
parent 65cd79dc77 ddd765359f
commit 11bd11badc
15 changed files with 567 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/2013_01_14_02_world_ip2nationcountries.sql Normal file
View File

@@ -0,0 +1,2 @@
RENAME TABLE ip2nationcountries TO ip2nationcountries_temp,
ip2nationcountries_temp TO ip2nationCountries;

55
sql/updates/world/2013_01_14_03_world_lefty_loosy_righty_tighty.sql Normal file
View File

@@ -0,0 +1,55 @@
-- Valves
UPDATE `gameobject` SET `spawntimesecs`=300,`animprogress`=100,`state`=1 WHERE `guid`=151895;
UPDATE `gameobject` SET `spawntimesecs`=300,`animprogress`=100 WHERE `guid`=221;
-- Max Blasto: Spawn point
UPDATE `event_scripts` SET `x`=4029.0,`y`=4883.078,`z`=-12.71482,`o`=1.310609 WHERE `id`=17207 AND `command`=10 AND `datalong`=25832;
-- Max Blasto: SAI
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=25832;
DELETE FROM `smart_scripts` WHERE `entryorguid`=25832 AND `source_type`=0;
INSERT INTO `smart_scripts`(`entryorguid`,`id`,`event_type`,`action_type`,`action_param1`,`target_type`,`target_param1`,`comment`) VALUE
(25832,0,54,49,0,21,20,'Max Blasto - Just summoned - Start attack'),
(25832,1,4,1,0,0,0,'Max Blasto - On aggro - Say');
-- Max Blasto: Texts
DELETE FROM `creature_text` WHERE `entry`=25832;
INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`text`,`type`,`probability`,`comment`) VALUE
(25832,0,0,'I am the herald of Mechazod. You will be decursed!',12,100,'Max Blasto - Just summoned'); -- Proofed from video: https://www.youtube.com/watch?v=-hi6a70U3gM
-- The Grinder: Spawn point
UPDATE `event_scripts` SET `x`=3781.2,`y`=4832.596,`z`=-13.04141,`o`=5.141372 WHERE `id`=17208 AND `command`=10 AND `datalong`=25833;
-- The Grinder: SAI
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=25833;
DELETE FROM `smart_scripts` WHERE `entryorguid`=25833 AND `source_type`=0;
INSERT INTO `smart_scripts`(`entryorguid`,`id`,`event_type`,`action_type`,`action_param1`,`target_type`,`target_param1`,`comment`) VALUE
(25833,0,54,49,0,21,20,'The Grinder - Just summoned - Start attack'),
(25833,1,4,1,0,0,0,'The Grinder - On aggro - Say');
-- The Grinder: Texts
DELETE FROM `creature_text` WHERE `entry`=25833;
INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`text`,`type`,`probability`,`comment`) VALUE
(25833,0,0,'Your meddling is at an end. Mechazod will relieve your curse once I am done with you.',12,100,'The Grinder - Just summoned');
-- ED-210: Spawn point
UPDATE `event_scripts` SET `x`=4208.38,`y`=4807.071,`z`=-12.7529,`o`=5.809316 WHERE `id`=16909 AND `command`=10 AND `datalong`=25831;
-- ED-210: SAI
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=25831;
DELETE FROM `smart_scripts` WHERE `entryorguid`=25831 AND `source_type`=0;
INSERT INTO `smart_scripts`(`entryorguid`,`id`,`event_type`,`action_type`,`action_param1`,`target_type`,`target_param1`,`comment`) VALUE
(25831,0,54,49,0,21,20,'ED-210 - Just summoned - Start attack'),
(25831,1,4,1,0,0,0,'ED-210 - On aggro - Say');
-- ED-210: Texts
DELETE FROM `creature_text` WHERE `entry`=25831;
INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`text`,`type`,`probability`,`comment`) VALUE
(25831,0,0,'ED-210 online!',12,100,'ED-210 - Just summoned');
-- Twonky: Spawn point
UPDATE `event_scripts` SET `x`=4118.113,`y`=5087.803,`z`=-1.433036,`o`=2.253069 WHERE `id`=16904 AND `command`=10 AND `datalong`=25830;
-- Twonky: SAI
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=25830;
DELETE FROM `smart_scripts` WHERE `entryorguid`=25830 AND `source_type`=0;
INSERT INTO `smart_scripts`(`entryorguid`,`id`,`event_type`,`action_type`,`action_param1`,`target_type`,`target_param1`,`comment`) VALUE
(25830,0,54,49,0,21,20,'Twonky - Just summoned - Start attack'),
(25830,1,4,1,0,0,0,'Twonky - On aggro - Say');
-- Twonky: Texts
DELETE FROM `creature_text` WHERE `entry`=25830;
INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`text`,`type`,`probability`,`comment`) VALUE
(25830,0,0,'Twonky!',12,100,'Twonky - On aggro');

12
sql/updates/world/2013_01_15_00_world_creature.sql Normal file
View File

@@ -0,0 +1,12 @@
SET @CGUID :=43501;
SET @ENTRY :=25233; -- Lunk-tusk
UPDATE `creature_template` SET `unit_flags`=33536 WHERE `entry`=@ENTRY;
DELETE FROM `creature` WHERE `id`=@ENTRY;
INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
(@CGUID, @ENTRY, 571, 1, 1, 1230.617, -3349.278, 203.7188, 3.385939, 120, 0, 0);
DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY;
INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
(@ENTRY, 0, 0x1, 0x1, '');

40
sql/updates/world/2013_01_15_01_world_misc.sql Normal file
View File

@@ -0,0 +1,40 @@
-- Vilebranch Speaker
UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'mob_vilebranch_speaker' WHERE `entry`=11391;
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=11391;
-- NPC talk text for Bloodlord Mandokir from sniff
DELETE FROM `creature_text` WHERE `entry`=11382 AND `groupid`=4;
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
(11382,4,0, '%s goes into a rage after seeing his raptor fall in battle!',16,0,100,0,0,0, 'Bloodlord Mandokir - Ohgan Dead');
-- Bloodlord Mandokir path from sniff
SET @PATH := 492861;
DELETE FROM `creature_template_addon` WHERE `entry`=11382;
INSERT INTO `creature_template_addon` (`entry`,`path_id`,`bytes2`,`auras`) VALUES (11382,@PATH,1, '');
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
(@PATH,1,-12312.66,-1889.255,131.5301,0,1,0,100,0),
(@PATH,2,-12368.16,-1861.005,131.5301,0,1,0,100,0),
(@PATH,3,-12352.66,-1875.505,131.5301,0,1,0,100,0),
(@PATH,4,-12351.41,-1876.505,130.7801,0,1,0,100,0),
(@PATH,5,-12347.41,-1877.505,131.0301,0,1,0,100,0),
(@PATH,6,-12343.16,-1877.505,131.2801,0,1,0,100,0),
(@PATH,7,-12334.91,-1879.755,131.5301,0,1,0,100,0),
(@PATH,8,-12329.91,-1889.505,131.0301,0,1,0,100,0),
(@PATH,9,-12328.66,-1892.255,131.0301,0,1,0,100,0),
(@PATH,10,-12326.41,-1894.255,131.2801,0,1,0,100,0),
(@PATH,11,-12318.16,-1896.255,131.2801,0,1,0,100,0),
(@PATH,12,-12301.41,-1896.255,131.5301,0,1,0,100,0),
(@PATH,13,-12293.16,-1899.005,131.7801,0,1,0,100,0),
(@PATH,14,-12292.16,-1899.005,131.7801,0,1,0,100,0),
(@PATH,15,-12291.16,-1899.005,131.7801,0,1,0,100,0),
(@PATH,16,-12289.41,-1900.505,131.7801,0,1,0,100,0),
(@PATH,17,-12287.41,-1902.505,131.7801,0,1,0,100,0),
(@PATH,18,-12285.41,-1904.755,131.7801,0,1,0,100,0),
(@PATH,19,-12280.66,-1906.755,131.7801,0,1,0,100,0),
(@PATH,20,-12276.41,-1907.755,131.7801,0,1,0,100,0),
(@PATH,21,-12275.41,-1908.755,131.7801,0,1,0,100,0),
(@PATH,22,-12272.41,-1917.255,131.7801,0,1,0,100,0),
(@PATH,23,-12268.16,-1921.255,131.5301,0,1,0,100,0),
(@PATH,24,-12259.91,-1919.255,131.0301,0,1,0,100,0),
(@PATH,25,-12255.66,-1919.255,130.5301,0,1,0,100,0);

1
sql/updates/world/2013_01_15_02_world_game_event.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `game_event` SET `start_time`='2013-10-18 01:00:00' WHERE `eventEntry`=12; -- Hallow's End

88
sql/updates/world/2013_01_15_03_world_misc.sql Normal file
View File

@@ -0,0 +1,88 @@
-- Reconnaissance Flight (12671)
SET @QUEST := 12671;
SET @PLANE := 28710; -- Vic's Flying Machine
SET @PILOT := 28646; -- Pilot Vic
SET @VIC := 28746; -- Pilot Vic
SET @SPELL_PLANE := 52256; -- Vic's Flying Machine Validate (must have condition to target player)
SET @SPELL_ROCKETS := 52254; -- Air-to-Air Rockets
SET @NPC_SCREECHER := 28170; -- Frosthowl Screecher
SET @TEMP_LANDING := 300215; -- TEMP Landing Pad
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@VIC;
UPDATE `creature_template` SET `spell1`='52254',`spell2`='52226',`ScriptName`='npc_vics_flying_machine' WHERE `entry`=@PLANE;
DELETE FROM `creature_template_addon` WHERE `entry`=@PLANE;
INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
(@PLANE,0,0,0,1,0,'52211 52260'); -- Flight -- Vic's Flying Machine Aggro Periodic
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@VIC,@PLANE) AND `source_type`=0;
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(@VIC,0,0,0,19,0,100,0,@QUEST,0,0,0,11,@SPELL_PLANE,0,0,0,0,0,7,0,0,0,0,0,0,0,"On quest accept - Cast spell - Invoker");
DELETE FROM `waypoint_data` WHERE `id`=@PLANE;
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
(@PLANE,1,5494.87,4747.031,-187.8783,0,0,0,0,100,0),
(@PLANE,2,5485.906,4740.681,-184.5172,0,0,0,0,100,0),
(@PLANE,3,5472.882,4732.441,-172.1562,0,0,0,0,100,0),
(@PLANE,4,5460.913,4712.542,-157.8784,0,0,0,0,100,0),
(@PLANE,5,5452.147,4673.518,-137.8906,0,0,0,0,100,0),
(@PLANE,6,5449.777,4630.711,-126.6684,0,0,0,0,100,0),
(@PLANE,7,5507.432,4506.089,-126.6684,0,0,0,0,100,0),
(@PLANE,8,5586.811,4465.319,-126.6684,0,0,0,0,100,0),
(@PLANE,9,5676.111,4437.874,-126.6684,0,0,0,0,100,0),
(@PLANE,10,5756.449,4391.051,-91.25155,0,0,0,0,100,0),
(@PLANE,11,5817.163,4269.269,-91.25155,0,0,0,0,100,0),
(@PLANE,12,5856.145,4202.824,-68.29334,0,0,0,0,100,0),
(@PLANE,13,5921.523,4105.534,-68.29334,0,0,0,0,100,0),
(@PLANE,14,5995.021,4029.883,-13.97897,0,0,0,0,100,0),
(@PLANE,15,6118.298,3883.733,94.11866,0,0,0,0,100,0),
(@PLANE,16,6132.932,3750.75,176.5123,0,0,0,0,100,0),
(@PLANE,17,6165.863,3748.196,198.9567,0,0,0,0,100,0),
(@PLANE,18,6208.277,3782.189,196.8455,0,0,0,0,100,0),
(@PLANE,19,6227.615,3836.871,191.6234,0,0,0,0,100,0),
(@PLANE,20,6218.483,3885.17,191.6234,0,0,0,0,100,0),
(@PLANE,21,6197.045,3890.053,191.6234,0,0,0,0,100,0),
(@PLANE,22,6168.752,3864.161,191.6234,0,0,0,0,100,0),
(@PLANE,23,6204.037,3807.239,191.6234,0,0,0,0,100,0),
(@PLANE,24,6232.975,3820.852,191.6234,0,0,0,0,100,0),
(@PLANE,25,6219.879,3854.341,166.6234,0,0,0,0,100,0),
(@PLANE,26,6210.428,3855.185,154.4848,0,0,0,0,100,0);
DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@PLANE;
INSERT INTO `npc_spellclick_spells` (`npc_entry`,`spell_id`,`cast_flags`,`user_type`) VALUES
(@PLANE,46598,1,1);
DELETE FROM `vehicle_template_accessory` WHERE `entry`=@PLANE;
INSERT INTO `vehicle_template_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`description`,`summontype`,`summontimer`) VALUES
(@PLANE,@PILOT,0,1,'Pilot Vic',7,0);
DELETE FROM `creature_text` WHERE `entry` IN (@PILOT,@PLANE);
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
(@PILOT,0,0,'We''re off! Watch out for those vines!',12,0,100,0,0,0,'Pilot Vic to Vic''s Flying Machine'),
(@PILOT,1,0,'Looks like the Scourge have hit the area ahead pretty bad...',12,0,100,0,0,0,'Pilot Vic to Vic''s Flying Machine'),
(@PILOT,2,0,'You see that? She''s... huge!',12,0,100,0,0,0,'Pilot Vic to Vic''s Flying Machine'),
(@PILOT,3,0,'Here we go! Hold on tight -- there''s rough wind ahead!',12,0,100,0,0,0,'Pilot Vic to Vic''s Flying Machine'),
(@PILOT,4,0,'The glacier is seeping in from Icecrown... and undead everywhere! Wait ''til the professor gets a hold of this!',12,0,100,0,0,0,'Pilot Vic to Vic''s Flying Machine'),
(@PILOT,5,0,'They''re coming at us! Be quick with those rockets!',12,0,100,0,0,0,'Pilot Vic to Vic''s Flying Machine'),
(@PILOT,6,0,'Aggggh! I''m hit! You''re going to have to get us back! Quick, before the plane explodes!',12,0,100,0,0,0,'Pilot Vic to Vic''s Flying Machine'),
(@PLANE,0,0,'The engine''s blown! Fly Vic''s Flying Machine back to Lakeside Landing!',41,0,100,0,0,0,'Vic''s Flying Machine to Pilot Vic');
DELETE FROM `conditions` WHERE `SourceEntry`=@SPELL_ROCKETS AND `SourceTypeOrReferenceId`=13;
DELETE FROM `conditions` WHERE `SourceEntry`=52226 AND `SourceTypeOrReferenceId`=17;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
(13,1,@SPELL_ROCKETS,0,0,31,0,3,28170,0,0,0,0,'','Air-to-Air Rockets can target Frosthowl Screecher'),
-- because vehicles ignore spell focus we add an extra condition to fill in for this
(17,0,52226,0,0,30,0,300215,10,0,0,0,0,'','Requires TEMP Landing Pad near to cast Land Flying Machine');
-- guessed position
DELETE FROM `gameobject` WHERE `id`=@TEMP_LANDING;
INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
(3552,@TEMP_LANDING,571,1,1,5505.58,4748.35,-194.434,0,0,0,0,0,300,0,1);
-- Frosthowl Screecher
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@NPC_SCREECHER;
DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@NPC_SCREECHER;
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@NPC_SCREECHER;
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(@NPC_SCREECHER,0,0,0,0,0,100,0,3000,4000,3000,4000,11,52257,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Shadow Bolt');

1
sql/updates/world/2013_01_15_04_world_game_event.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `game_event` SET `start_time`='2013-09-13 00:01:00' WHERE `eventEntry`=11; -- Harvest Festival

4
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
View File

@@ -214,9 +214,9 @@ class go_gong_of_bethekk : public GameObjectScript
{
if (InstanceScript* instance = go->GetInstanceScript())
{
if (instance->GetData(DATA_ARLOKK) == DONE || instance->GetData(DATA_ARLOKK) == IN_PROGRESS)
if (instance->GetData(DATA_ARLOKK) == DONE || instance->GetBossState(DATA_ARLOKK) == IN_PROGRESS)
return true;
instance->SetData(DATA_ARLOKK, IN_PROGRESS);
instance->SetBossState(DATA_ARLOKK, IN_PROGRESS);
return true;
}

2
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
View File

@@ -271,7 +271,7 @@ class mob_batrider : public CreatureScript
{
if (instance)
{
if (instance->GetData(DATA_JEKLIK) == DONE)
if (instance->GetBossState(DATA_JEKLIK) == DONE)
{
me->setDeathState(JUST_DIED);
me->RemoveCorpse();

435
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
View File

@@ -32,23 +32,64 @@ enum Says
SAY_AGGRO = 0,
SAY_DING_KILL = 1,
SAY_WATCH = 2,
SAY_WATCH_WHISPER = 3, // is this text for real? easter egg?
SAY_WATCH_WHISPER = 3,
SAY_OHGAN_DEAD = 4,
SAY_GRATS_JINDO = 0,
};
enum Spells
{
SPELL_CHARGE = 24408,
SPELL_CLEAVE = 7160,
SPELL_CHARGE = 24408, // seen
SPELL_OVERPOWER = 24407, // Seen
SPELL_FEAR = 29321,
SPELL_WHIRLWIND = 15589,
SPELL_MORTAL_STRIKE = 16856,
SPELL_ENRAGE = 24318,
SPELL_WATCH = 24314,
SPELL_LEVEL_UP = 24312,
SPELL_SWIFT_ORANGE_RAPTOR = 23243,
// Ohgans Spell
SPELL_SUNDERARMOR = 24317
SPELL_WHIRLWIND = 13736, // Triggers 15589
SPELL_MORTAL_STRIKE = 16856, // Seen
SPELL_FRENZY = 24318, // seen
SPELL_WATCH = 24314, // seen 24315, 24316
SPELL_WATCH_CHARGE = 24315, // Triggers 24316
SPELL_LEVEL_UP = 24312 //
};
enum Events
{
EVENT_CHECK_START = 1,
EVENT_STARTED = 2,
EVENT_OVERPOWER = 3,
EVENT_MORTAL_STRIKE = 4,
EVENT_WHIRLWIND = 5,
EVENT_CHECK_OHGAN = 6,
EVENT_WATCH_PLAYER = 7
};
enum Misc
{
MODEL_OHGAN_MOUNT = 15271,
PATH_MANDOKIR = 492861,
CHAINED_SPIRT_COUNT = 20
};
Position const PosSummonChainedSpirits[CHAINED_SPIRT_COUNT] =
{
{ -12167.17f, -1979.330f, 133.0992f, 2.268928f },
{ -12262.74f, -1953.394f, 133.5496f, 0.593412f },
{ -12176.89f, -1983.068f, 133.7841f, 2.129302f },
{ -12226.45f, -1977.933f, 132.7982f, 1.466077f },
{ -12204.74f, -1890.431f, 135.7569f, 4.415683f },
{ -12216.70f, -1891.806f, 136.3496f, 4.677482f },
{ -12236.19f, -1892.034f, 134.1041f, 5.044002f },
{ -12248.24f, -1893.424f, 134.1182f, 5.270895f },
{ -12257.36f, -1897.663f, 133.1484f, 5.462881f },
{ -12265.84f, -1903.077f, 133.1649f, 5.654867f },
{ -12158.69f, -1972.707f, 133.8751f, 2.408554f },
{ -12178.82f, -1891.974f, 134.1786f, 3.944444f },
{ -12193.36f, -1890.039f, 135.1441f, 4.188790f },
{ -12275.59f, -1932.845f, 134.9017f, 0.174533f },
{ -12273.51f, -1941.539f, 136.1262f, 0.314159f },
{ -12247.02f, -1963.497f, 133.9476f, 0.872665f },
{ -12238.68f, -1969.574f, 133.6273f, 1.134464f },
{ -12192.78f, -1982.116f, 132.6966f, 1.919862f },
{ -12210.81f, -1979.316f, 133.8700f, 1.797689f },
{ -12283.51f, -1924.839f, 133.5170f, 0.069813f }
};
class boss_mandokir : public CreatureScript
@@ -59,52 +100,15 @@ class boss_mandokir : public CreatureScript
{
boss_mandokirAI(Creature* creature) : BossAI(creature, DATA_MANDOKIR) {}
uint32 KillCount;
uint32 Watch_Timer;
uint32 TargetInRange;
uint32 Cleave_Timer;
uint32 Whirlwind_Timer;
uint32 Fear_Timer;
uint32 MortalStrike_Timer;
uint32 Check_Timer;
float targetX;
float targetY;
float targetZ;
InstanceScript* instance;
bool endWatch;
bool someWatched;
bool RaptorDead;
bool CombatStart;
bool SpeakerDead;
uint64 WatchTarget;
uint8 killCount;
void Reset()
{
KillCount = 0;
Watch_Timer = 33000;
Cleave_Timer = 7000;
Whirlwind_Timer = 20000;
Fear_Timer = 1000;
MortalStrike_Timer = 1000;
Check_Timer = 1000;
targetX = 0.0f;
targetY = 0.0f;
targetZ = 0.0f;
TargetInRange = 0;
WatchTarget = 0;
someWatched = false;
endWatch = false;
RaptorDead = false;
CombatStart = false;
SpeakerDead = false;
DoCast(me, 23243);
_Reset();
killCount = 0;
me->Mount(MODEL_OHGAN_MOUNT);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
events.ScheduleEvent(EVENT_CHECK_START, 1000);
}
void JustDied(Unit* /*killer*/)
@@ -112,186 +116,126 @@ class boss_mandokir : public CreatureScript
_JustDied();
}
void KilledUnit(Unit* victim)
void Evade(Unit* /*killer*/)
{
if (victim->GetTypeId() == TYPEID_PLAYER)
{
++KillCount;
if (KillCount == 3)
{
Talk(SAY_DING_KILL);
if (instance)
{
uint64 JindoGUID = instance->GetData64(DATA_JINDO);
if (JindoGUID)
{
if (Creature* jTemp = Creature::GetCreature(*me, JindoGUID))
{
if (jTemp->isAlive())
jTemp->AI()->Talk(SAY_GRATS_JINDO);
}
}
}
DoCast(me, SPELL_LEVEL_UP, true);
KillCount = 0;
}
}
}
void EnterCombat(Unit* /*who*/)
{
_EnterCombat();
events.ScheduleEvent(EVENT_OVERPOWER, urand(7000, 9000));
events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(12000, 18000));
events.ScheduleEvent(EVENT_WHIRLWIND, urand(24000, 30000));
events.ScheduleEvent(EVENT_CHECK_OHGAN, 1000);
events.ScheduleEvent(EVENT_WATCH_PLAYER, urand(13000, 15000));
me->SetSpeed(MOVE_RUN, false);
me->GetMotionMaster()->Clear(true);
Talk(SAY_AGGRO);
me->Dismount();
// Summon Ohgan (Spell missing) TEMP HACK
me->SummonCreature(NPC_OHGAN, me->getVictim()->GetPositionX(), me->getVictim()->GetPositionY(), me->getVictim()->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 35000);
for (int i = 0; i < CHAINED_SPIRT_COUNT; ++i)
me->SummonCreature(NPC_CHAINED_SPIRT, PosSummonChainedSpirits[i], TEMPSUMMON_CORPSE_DESPAWN);
}
void UpdateAI(const uint32 diff)
void KilledUnit(Unit* victim)
{
if (!SpeakerDead)
if (victim->GetTypeId() == TYPEID_PLAYER)
{
if (!me->FindNearestCreature(NPC_SPEAKER, 100.0f, true))
if (++killCount == 3 && instance)
{
me->GetMotionMaster()->MovePoint(0, -12196.3f, -1948.37f, 130.36f);
SpeakerDead = true;
Talk(SAY_DING_KILL);
if (uint64 JindoGUID = instance->GetData64(DATA_JINDO))
if (Creature* jTemp = Creature::GetCreature(*me, JindoGUID))
if (jTemp->isAlive())
jTemp->AI()->Talk(SAY_GRATS_JINDO);
DoCast(me, SPELL_LEVEL_UP, true);
killCount = 0;
}
}
}
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE && SpeakerDead)
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
void UpdateAI(uint32 const diff)
{
events.Update(diff);
if (!UpdateVictim())
if (instance->GetBossState(DATA_MANDOKIR) == NOT_STARTED || instance->GetBossState(DATA_MANDOKIR) == SPECIAL)
{
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)
{
case EVENT_CHECK_START:
if(instance)
if (instance->GetBossState(DATA_MANDOKIR) == SPECIAL)
{
me->SetSpeed(MOVE_RUN, true);
me->GetMotionMaster()->MovePoint(0, -12197.86f, -1949.392f, 130.2745f);
events.ScheduleEvent(EVENT_STARTED, 3000);
}
else
events.ScheduleEvent(EVENT_CHECK_START, 1000);
break;
case EVENT_STARTED:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
me->SetReactState(REACT_AGGRESSIVE);
me->GetMotionMaster()->MovePath(PATH_MANDOKIR,false);
break;
default:
break;
}
}
}
return;
if (me->getVictim() && me->isAlive())
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventId = events.ExecuteEvent())
{
if (!CombatStart)
switch (eventId)
{
//At combat Start Mandokir is mounted so we must unmount it first
me->Dismount();
//And summon his raptor
me->SummonCreature(14988, me->getVictim()->GetPositionX(), me->getVictim()->GetPositionY(), me->getVictim()->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 35000);
CombatStart = true;
}
if (Watch_Timer <= diff) //Every 20 Sec Mandokir will check this
{
if (WatchTarget) //If someone is watched and If the Position of the watched target is different from the one stored, or are attacking, mandokir will charge him
{
Unit* unit = Unit::GetUnit(*me, WatchTarget);
if (unit && (
targetX != unit->GetPositionX() ||
targetY != unit->GetPositionY() ||
targetZ != unit->GetPositionZ() ||
unit->isInCombat()))
{
if (me->IsWithinMeleeRange(unit))
case EVENT_OVERPOWER:
DoCastVictim(SPELL_OVERPOWER, true);
events.ScheduleEvent(EVENT_OVERPOWER, urand(6000, 12000));
break;
case EVENT_MORTAL_STRIKE:
if (me->getVictim() && me->getVictim()->HealthBelowPct(50))
DoCastVictim(SPELL_MORTAL_STRIKE, true);
events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(12000, 18000));
break;
case EVENT_WHIRLWIND:
DoCast(me, SPELL_WHIRLWIND);
events.ScheduleEvent(EVENT_WHIRLWIND, urand(22000, 26000));
break;
case EVENT_CHECK_OHGAN:
if (instance)
if (instance->GetBossState(DATA_OHGAN) == DONE)
{
DoCast(unit, 24316);
DoCast(me, SPELL_FRENZY);
Talk(SAY_OHGAN_DEAD);
}
else
{
DoCast(unit, SPELL_CHARGE);
//me->SendMonsterMove(unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ(), 0, true, 1);
AttackStart(unit);
}
}
}
someWatched = false;
Watch_Timer = 20000;
} else Watch_Timer -= diff;
if ((Watch_Timer < 8000) && !someWatched) //8 sec(cast time + expire time) before the check for the watch effect mandokir will cast watch debuff on a random target
{
if (Unit* p = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
Talk(SAY_WATCH, p->GetGUID());
DoCast(p, SPELL_WATCH);
WatchTarget = p->GetGUID();
someWatched = true;
endWatch = true;
}
}
if ((Watch_Timer < 1000) && endWatch) //1 sec before the debuf expire, store the target position
{
Unit* unit = Unit::GetUnit(*me, WatchTarget);
if (unit)
{
targetX = unit->GetPositionX();
targetY = unit->GetPositionY();
targetZ = unit->GetPositionZ();
}
endWatch = false;
}
if (!someWatched)
{
//Cleave
if (Cleave_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_CLEAVE);
Cleave_Timer = 7000;
} else Cleave_Timer -= diff;
//Whirlwind
if (Whirlwind_Timer <= diff)
{
DoCast(me, SPELL_WHIRLWIND);
Whirlwind_Timer = 18000;
} else Whirlwind_Timer -= diff;
//If more then 3 targets in melee range mandokir will cast fear
if (Fear_Timer <= diff)
{
TargetInRange = 0;
std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin();
for (; i != me->getThreatManager().getThreatList().end(); ++i)
events.ScheduleEvent(EVENT_CHECK_OHGAN, 1000);
break;
case EVENT_WATCH_PLAYER:
if (Unit* player = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true))
{
Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && me->IsWithinMeleeRange(unit))
++TargetInRange;
DoCast(player, SPELL_WATCH);
Talk(SAY_WATCH, player->GetGUID());
// Not complete
}
if (TargetInRange > 3)
DoCast(me->getVictim(), SPELL_FEAR);
Fear_Timer = 4000;
} else Fear_Timer -=diff;
//Mortal Strike if target below 50% hp
if (me->getVictim() && me->getVictim()->HealthBelowPct(50))
{
if (MortalStrike_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_MORTAL_STRIKE);
MortalStrike_Timer = 15000;
} else MortalStrike_Timer -= diff;
}
events.ScheduleEvent(EVENT_WATCH_PLAYER, urand(12000, 15000));
break;
default:
break;
}
//Checking if Ohgan is dead. If yes Mandokir will enrage.
if (Check_Timer <= diff)
{
if (instance)
{
if (instance->GetData(DATA_OHGAN) == DONE)
{
if (!RaptorDead)
{
DoCast(me, SPELL_ENRAGE);
RaptorDead = true;
}
}
}
Check_Timer = 1000;
} else Check_Timer -= diff;
DoMeleeAttackIfReady();
}
DoMeleeAttackIfReady();
}
};
@@ -302,6 +246,12 @@ class boss_mandokir : public CreatureScript
};
// Ohgan
enum O_Spells
{
SPELL_SUNDERARMOR = 24317
};
class mob_ohgan : public CreatureScript
{
public: mob_ohgan() : CreatureScript("mob_ohgan") {}
@@ -310,7 +260,7 @@ class mob_ohgan : public CreatureScript
{
mob_ohganAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
instance = me->GetInstanceScript();
}
uint32 SunderArmor_Timer;
@@ -326,7 +276,7 @@ class mob_ohgan : public CreatureScript
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(DATA_OHGAN, DONE);
instance->SetBossState(DATA_OHGAN, DONE);
}
void UpdateAI (const uint32 diff)
@@ -338,7 +288,7 @@ class mob_ohgan : public CreatureScript
//SunderArmor_Timer
if (SunderArmor_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_SUNDERARMOR);
DoCastVictim(SPELL_SUNDERARMOR, true);
SunderArmor_Timer = urand(10000, 15000);
} else SunderArmor_Timer -= diff;
@@ -352,9 +302,76 @@ class mob_ohgan : public CreatureScript
}
};
// Vilebranch Speaker
enum VS_Spells
{
SPELL_DEMORALIZING_SHOUT = 13730,
SPELL_CLEAVE = 15284
};
class mob_vilebranch_speaker : public CreatureScript
{
public: mob_vilebranch_speaker() : CreatureScript("mob_vilebranch_speaker") {}
struct mob_vilebranch_speakerAI : public ScriptedAI
{
mob_vilebranch_speakerAI(Creature* creature) : ScriptedAI(creature)
{
instance = me->GetInstanceScript();
}
uint32 demoralizing_Shout_Timer;
uint32 cleave_Timer;
InstanceScript* instance;
void Reset()
{
demoralizing_Shout_Timer = urand (2000, 4000);
cleave_Timer = urand (5000, 8000);
}
void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetBossState(DATA_MANDOKIR, SPECIAL);
}
void UpdateAI (const uint32 diff)
{
// Return since we have no target
if (!UpdateVictim())
return;
// demoralizing_Shout_Timer
if (demoralizing_Shout_Timer <= diff)
{
DoCast(me, SPELL_DEMORALIZING_SHOUT);
demoralizing_Shout_Timer = urand(22000, 30000);
} else demoralizing_Shout_Timer -= diff;
// cleave_Timer
if (cleave_Timer <= diff)
{
DoCastVictim(SPELL_CLEAVE, true);
cleave_Timer = urand(6000, 9000);
} else cleave_Timer -= diff;
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI(Creature* creature) const
{
return new mob_vilebranch_speakerAI(creature);
}
};
void AddSC_boss_mandokir()
{
new boss_mandokir();
new mob_ohgan();
new mob_vilebranch_speaker();
}

26
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
View File

@@ -113,7 +113,7 @@ class boss_thekal : public CreatureScript
void JustReachedHome()
{
if (instance)
instance->SetData(DATA_THEKAL, NOT_STARTED);
instance->SetBossState(DATA_THEKAL, NOT_STARTED);
}
void UpdateAI(uint32 const diff)
@@ -167,7 +167,7 @@ class boss_thekal : public CreatureScript
{
if (instance)
{
if (instance->GetData(DATA_LORKHAN) == SPECIAL)
if (instance->GetBossState(DATA_LORKHAN) == SPECIAL)
{
//Resurrect LorKhan
if (Unit* pLorKhan = Unit::GetUnit(*me, instance->GetData64(DATA_LORKHAN)))
@@ -180,7 +180,7 @@ class boss_thekal : public CreatureScript
}
}
if (instance->GetData(DATA_ZATH) == SPECIAL)
if (instance->GetBossState(DATA_ZATH) == SPECIAL)
{
//Resurrect Zath
if (Unit* pZath = Unit::GetUnit(*me, instance->GetData64(DATA_ZATH)))
@@ -189,7 +189,7 @@ class boss_thekal : public CreatureScript
pZath->setFaction(14);
pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pZath->SetFullHealth();
instance->SetData(DATA_ZATH, DONE);
instance->SetBossState(DATA_ZATH, DONE);
}
}
}
@@ -241,7 +241,7 @@ class boss_thekal : public CreatureScript
me->SetStandState(UNIT_STAND_STATE_SLEEP);
me->AttackStop();
if (instance)
instance->SetData(DATA_THEKAL, SPECIAL);
instance->SetBossState(DATA_THEKAL, SPECIAL);
WasDead=true;
}
}
@@ -288,7 +288,7 @@ class mob_zealot_lorkhan : public CreatureScript
FakeDeath = false;
if (instance)
instance->SetData(DATA_LORKHAN, NOT_STARTED);
instance->SetBossState(DATA_LORKHAN, NOT_STARTED);
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -356,7 +356,7 @@ class mob_zealot_lorkhan : public CreatureScript
{
if (instance)
{
if (instance->GetData(DATA_THEKAL) == SPECIAL)
if (instance->GetBossState(DATA_THEKAL) == SPECIAL)
{
//Resurrect Thekal
if (Unit* pThekal = Unit::GetUnit(*me, instance->GetData64(DATA_THEKAL)))
@@ -368,7 +368,7 @@ class mob_zealot_lorkhan : public CreatureScript
}
}
if (instance->GetData(DATA_ZATH) == SPECIAL)
if (instance->GetBossState(DATA_ZATH) == SPECIAL)
{
//Resurrect Zath
if (Unit* pZath = Unit::GetUnit(*me, instance->GetData64(DATA_ZATH)))
@@ -395,7 +395,7 @@ class mob_zealot_lorkhan : public CreatureScript
me->AttackStop();
if (instance)
instance->SetData(DATA_LORKHAN, SPECIAL);
instance->SetBossState(DATA_LORKHAN, SPECIAL);
FakeDeath = true;
}
@@ -450,7 +450,7 @@ class mob_zealot_zath : public CreatureScript
FakeDeath = false;
if (instance)
instance->SetData(DATA_ZATH, NOT_STARTED);
instance->SetBossState(DATA_ZATH, NOT_STARTED);
me->SetStandState(UNIT_STAND_STATE_STAND);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -509,7 +509,7 @@ class mob_zealot_zath : public CreatureScript
{
if (instance)
{
if (instance->GetData(DATA_LORKHAN) == SPECIAL)
if (instance->GetBossState(DATA_LORKHAN) == SPECIAL)
{
//Resurrect LorKhan
if (Unit* pLorKhan = Unit::GetUnit(*me, instance->GetData64(DATA_LORKHAN)))
@@ -521,7 +521,7 @@ class mob_zealot_zath : public CreatureScript
}
}
if (instance->GetData(DATA_THEKAL) == SPECIAL)
if (instance->GetBossState(DATA_THEKAL) == SPECIAL)
{
//Resurrect Thekal
if (Unit* pThekal = Unit::GetUnit(*me, instance->GetData64(DATA_THEKAL)))
@@ -548,7 +548,7 @@ class mob_zealot_zath : public CreatureScript
me->AttackStop();
if (instance)
instance->SetData(DATA_ZATH, SPECIAL);
instance->SetBossState(DATA_ZATH, SPECIAL);
FakeDeath = true;
}

90
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
View File

@@ -40,17 +40,18 @@ class instance_zulgurub : public InstanceMapScript
//If all High Priest bosses were killed. Lorkhan, Zath and Ohgan are added too.
//Storing Lorkhan, Zath and Thekal because we need to cast on them later. Jindo is needed for healfunction too.
uint64 LorKhanGUID;
uint64 ZathGUID;
uint64 ThekalGUID;
uint64 JindoGUID;
uint64 lorKhanGUID;
uint64 zathGUID;
uint64 thekalGUID;
uint64 jindoGUID;
void Initialize()
{
LorKhanGUID = 0;
ZathGUID = 0;
ThekalGUID = 0;
JindoGUID = 0;
lorKhanGUID = 0;
zathGUID = 0;
thekalGUID = 0;
jindoGUID = 0;
}
bool IsEncounterInProgress() const
@@ -63,78 +64,21 @@ class instance_zulgurub : public InstanceMapScript
{
switch (creature->GetEntry())
{
case NPC_ZEALOT_LORKHAN: LorKhanGUID = creature->GetGUID(); break;
case NPC_ZEALOT_ZATH: ZathGUID = creature->GetGUID(); break;
case NPC_HIGH_PRIEST_THEKAL: ThekalGUID = creature->GetGUID(); break;
case NPC_JINDO_THE_HEXXER: JindoGUID = creature->GetGUID(); break;
case NPC_ZEALOT_LORKHAN: lorKhanGUID = creature->GetGUID(); break;
case NPC_ZEALOT_ZATH: zathGUID = creature->GetGUID(); break;
case NPC_HIGH_PRIEST_THEKAL: thekalGUID = creature->GetGUID(); break;
case NPC_JINDO_THE_HEXXER: jindoGUID = creature->GetGUID(); break;
}
}
bool SetBossState(uint32 type, EncounterState state)
{
if (!InstanceScript::SetBossState(type, state))
return false;
switch (type)
{
case DATA_JEKLIK:
case DATA_VENOXIS:
case DATA_MARLI:
case DATA_ARLOKK:
case DATA_HAKKAR:
case DATA_MANDOKIR:
case DATA_JINDO:
case DATA_GAHZRANKA:
case DATA_EDGE_OF_MADNESS:
case DATA_THEKAL:
case DATA_LORKHAN:
case DATA_ZATH:
case DATA_OHGAN:
break;
default:
break;
}
return true;
}
uint32 GetData(uint32 type) const
{
switch (type)
{
case DATA_JEKLIK: return GetBossState(DATA_JEKLIK);
case DATA_VENOXIS: return GetBossState(DATA_VENOXIS);
case DATA_MARLI: return GetBossState(DATA_MARLI);
case DATA_ARLOKK: return GetBossState(DATA_ARLOKK);
case DATA_HAKKAR: return GetBossState(DATA_HAKKAR);
case DATA_MANDOKIR: return GetBossState(DATA_MANDOKIR);
case DATA_JINDO: return GetBossState(DATA_JINDO);
case DATA_GAHZRANKA: return GetBossState(DATA_GAHZRANKA);
case DATA_EDGE_OF_MADNESS: return GetBossState(DATA_EDGE_OF_MADNESS);
case DATA_THEKAL: return GetBossState(DATA_THEKAL);
case DATA_LORKHAN: return GetBossState(DATA_LORKHAN);
case DATA_ZATH: return GetBossState(DATA_ZATH);
case DATA_OHGAN: return GetBossState(DATA_OHGAN);
break;
default:
break;
}
return 0;
}
uint64 GetData64(uint32 uiData) const
{
switch (uiData)
{
case DATA_LORKHAN:
return LorKhanGUID;
case DATA_ZATH:
return ZathGUID;
case DATA_THEKAL:
return ThekalGUID;
case DATA_JINDO:
return JindoGUID;
case DATA_LORKHAN: return lorKhanGUID;
case DATA_ZATH: return zathGUID;
case DATA_THEKAL: return thekalGUID;
case DATA_JINDO: return jindoGUID;
}
return 0;
}

4
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
View File

@@ -47,7 +47,9 @@ enum CreatureIds
NPC_ZULIAN_PROWLER = 15101,
NPC_SPEAKER = 11391,
NPC_SHADE_OF_JINDO = 14986,
NPC_SACRIFICED_TROLL = 14826
NPC_SACRIFICED_TROLL = 14826,
NPC_OHGAN = 14988,
NPC_CHAINED_SPIRT = 15117
};
#endif

97
src/server/scripts/Northrend/zone_sholazar_basin.cpp
View File

@@ -1033,6 +1033,102 @@ public:
}
};
/*######
## Quest: Reconnaissance Flight (12671)
######*/
enum ReconnaissanceFlight
{
NPC_PLANE = 28710, // Vic's Flying Machine
NPC_PILOT = 28646,
VIC_SAY_0 = 0,
VIC_SAY_1 = 1,
VIC_SAY_2 = 2,
VIC_SAY_3 = 3,
VIC_SAY_4 = 4,
VIC_SAY_5 = 5,
VIC_SAY_6 = 6,
PLANE_EMOTE = 0,
AURA_ENGINE = 52255, // Engine on Fire
SPELL_LAND = 52226, // Land Flying Machine
SPELL_CREDIT = 53328 // Land Flying Machine Credit
};
class npc_vics_flying_machine : public CreatureScript
{
public:
npc_vics_flying_machine() : CreatureScript("npc_vics_flying_machine") { }
struct npc_vics_flying_machineAI : public VehicleAI
{
npc_vics_flying_machineAI(Creature* creature) : VehicleAI(creature) {}
void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply)
{
if (apply && passenger->GetTypeId() == TYPEID_PLAYER)
me->GetMotionMaster()->MovePath(NPC_PLANE, false);
}
void MovementInform(uint32 type, uint32 id)
{
if (type != WAYPOINT_MOTION_TYPE)
return;
if (Creature* pilot = GetClosestCreatureWithEntry(me, NPC_PILOT, 10))
switch (id)
{
case 5:
pilot->AI()->Talk(VIC_SAY_0);
break;
case 11:
pilot->AI()->Talk(VIC_SAY_1);
break;
case 12:
pilot->AI()->Talk(VIC_SAY_2);
break;
case 14:
pilot->AI()->Talk(VIC_SAY_3);
break;
case 15:
pilot->AI()->Talk(VIC_SAY_4);
break;
case 17:
pilot->AI()->Talk(VIC_SAY_5);
break;
case 21:
pilot->AI()->Talk(VIC_SAY_6);
break;
case 25:
me->AI()->Talk(PLANE_EMOTE);
me->AI()->DoCast(AURA_ENGINE);
break;
}
}
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_LAND)
{
Unit* passenger = me->GetVehicleKit()->GetPassenger(1); // player should be on seat 1
if (passenger && passenger->GetTypeId() == TYPEID_PLAYER)
{
passenger->CastSpell(passenger, SPELL_CREDIT, true);
passenger->ExitVehicle();
}
}
}
void UpdateAI(const uint32 /*diff*/) {}
};
CreatureAI* GetAI(Creature* creature) const
{
return new npc_vics_flying_machineAI(creature);
}
};
void AddSC_sholazar_basin()
{
new npc_injured_rainspeaker_oracle();
@@ -1045,4 +1141,5 @@ void AddSC_sholazar_basin()
new spell_q12620_the_lifewarden_wrath();
new spell_q12589_shoot_rjr();
new npc_haiphoon();
new npc_vics_flying_machine();
}

13
src/server/worldserver/RemoteAccess/RASocket.cpp
View File

@@ -65,7 +65,13 @@ int RASocket::handle_close(ACE_HANDLE, ACE_Reactor_Mask)
int RASocket::send(const std::string& line)
{
return size_t(peer().send(line.c_str(), line.length())) == line.length() ? 0 : -1;
#ifdef MSG_NOSIGNAL
ssize_t n = peer().send(line.c_str(), line.length(), MSG_NOSIGNAL);
#else
ssize_t n = peer().send(line.c_str(), line.length());
#endif // MSG_NOSIGNAL
return n == line.length() ? 0 : -1;
}
int RASocket::recv_line(ACE_Message_Block& buffer)
@@ -160,7 +166,7 @@ int RASocket::process_command(const std::string& command)
break;
}
if (size_t(peer().send(mb->rd_ptr(), mb->length())) != mb->length())
if (send(std::string(mb->rd_ptr(), mb->length())) == -1)
{
mb->release();
return -1;
@@ -356,8 +362,7 @@ int RASocket::svc(void)
for (;;)
{
// show prompt
const char* tc_prompt = "TC> ";
if (size_t(peer().send(tc_prompt, strlen(tc_prompt))) != strlen(tc_prompt))
if (send("TC> ") == -1)
return -1;
std::string line;