diff options
205 files changed, 10706 insertions, 4848 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index eb7a7b9f503..9cfdb993ef6 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -998,6 +998,30 @@ LOCK TABLES `character_queststatus_seasonal` WRITE; UNLOCK TABLES; -- +-- Table structure for table `character_queststatus_monthly` +-- + +DROP TABLE IF EXISTS `character_queststatus_monthly`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `character_queststatus_monthly` ( + `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier', + `quest` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier', + PRIMARY KEY (`guid`,`quest`), + KEY `idx_guid` (`guid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `character_queststatus_monthly` +-- + +LOCK TABLES `character_queststatus_monthly` WRITE; +/*!40000 ALTER TABLE `character_queststatus_monthly` DISABLE KEYS */; +/*!40000 ALTER TABLE `character_queststatus_monthly` ENABLE KEYS */; +UNLOCK TABLES; + +-- -- Table structure for table `character_queststatus_weekly` -- diff --git a/sql/updates/characters/2012_12_03_00_character_character_queststatus_monthly.sql b/sql/updates/characters/2012_12_03_00_character_character_queststatus_monthly.sql new file mode 100644 index 00000000000..256bb1f7ad6 --- /dev/null +++ b/sql/updates/characters/2012_12_03_00_character_character_queststatus_monthly.sql @@ -0,0 +1,8 @@ +DROP TABLE IF EXISTS `character_queststatus_monthly`; + +CREATE TABLE IF NOT EXISTS `character_queststatus_monthly` ( + `guid` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier', + `quest` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Quest Identifier', + PRIMARY KEY (`guid`,`quest`), + KEY `idx_guid` (`guid`) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Player System'; diff --git a/sql/updates/world/2012_11_27_00_world_misc.sql b/sql/updates/world/2012_11_27_00_world_misc.sql new file mode 100644 index 00000000000..8c815a856fd --- /dev/null +++ b/sql/updates/world/2012_11_27_00_world_misc.sql @@ -0,0 +1,24 @@ +DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (7567,7568); + +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (7567,7568); +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES +(7567,11,0,0,'achievement_the_hundred_club'), +(7567,12,0,0,''), +(7568,11,0,0,'achievement_the_hundred_club'), +(7568,12,1,0,''); + +DELETE FROM `script_texts` WHERE `entry` IN (-1533082,-1533083); + +DELETE FROM `creature_text` WHERE `entry`=15989; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(15989,0,0,'Sapphiron lifts off into the air!',41,0,100,254,0,0,'Sapphiron'), +(15989,1,0,'Sapphiron resumes his attacks!',41,0,100,0,0,0,'Sapphiron'), +(15989,2,0,'%s takes a deep breath.',41,7,100,0,0,0,'Sapphiron'), +(15989,3,0,'%s enrages!',41,0,100,0,0,0,'Sapphiron'); + +DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (28531,55697,28542,28547) OR `spellid0` IN (28531,55697,28542,28547); +INSERT INTO `spelldifficulty_dbc`(`id`,`spellid0`,`spellid1`) VALUES +(28531,28531,55799), -- Frost Aura +(55697,55697,55696), -- Tail Sweep +(28542,28542,55665), -- Life Drain +(28547,28547,55699); -- Chill diff --git a/sql/updates/world/2012_11_27_01_world_achievement_criteria_data.sql b/sql/updates/world/2012_11_27_01_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..65cfced17f3 --- /dev/null +++ b/sql/updates/world/2012_11_27_01_world_achievement_criteria_data.sql @@ -0,0 +1,6 @@ +DELETE FROM `disables` WHERE `sourceType`=4 AND `entry`=7321; + +DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=7321; +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES +(7321,11,0,0,'achievement_shatter_resistant'), +(7321,12,1,0,''); diff --git a/sql/updates/world/2012_11_30_00_world_spell_script_names.sql b/sql/updates/world/2012_11_30_00_world_spell_script_names.sql new file mode 100644 index 00000000000..cedee2fe51d --- /dev/null +++ b/sql/updates/world/2012_11_30_00_world_spell_script_names.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (57669,61782); +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(57669,'spell_gen_replenishment'), +(61782,'spell_gen_replenishment'); diff --git a/sql/updates/world/2012_12_01_00_world_assembly_of_iron.sql b/sql/updates/world/2012_12_01_00_world_assembly_of_iron.sql new file mode 100644 index 00000000000..090780d2bd4 --- /dev/null +++ b/sql/updates/world/2012_12_01_00_world_assembly_of_iron.sql @@ -0,0 +1,44 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1603047 AND -1603020; +DELETE FROM `creature_text` WHERE `entry` IN (32867,32927,32857); +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(32867,0,0,'You will not defeat the Assembly of Iron so easily, invaders!',14,0,100,0,0,15674,'Steelbreaker - Aggro'), +(32867,1,0,'So fragile and weak!',14,0,100,0,0,15675,'Steelbreaker - Slay 1'), +(32867,1,1,'Flesh... such a hindrance.',14,0,100,0,0,15676,'Steelbreaker - Slay 2'), +(32867,2,0,'You seek the secrets of Ulduar? Then take them!',14,0,100,0,0,15677,'Steelbreaker - Power'), +(32867,3,0,'My death only serves to hasten your demise.',14,0,100,0,0,15678,'Steelbreaker - Death'), +(32867,4,0,'Impossible...',14,0,100,0,0,15679,'Steelbreaker - Encounter defeated'), +(32867,5,0,'This meeting of the Assembly of Iron is adjourned!',14,0,100,0,0,15680,'Steelbreaker - Berserk'), + +(32927,0,0,'Nothing short of total decimation will suffice.',14,0,100,0,0,15657,'Runemaster Molgeim - Aggro'), +(32927,1,0,'The world suffers yet another insignificant loss.',14,0,100,0,0,15658,'Runemaster Molgeim - Slay 1'), +(32927,1,1,'Death is the price of your arrogance.',14,0,100,0,0,15659,'Runemaster Molgeim - Slay 2'), +(32927,2,0,'Decipher this!',14,0,100,0,0,15660,'Runemaster Molgeim - Rune of Death'), +(32927,3,0,'Face the lightning surge!',14,0,100,0,0,15661,'Runemaster Molgeim - Rune of Summon'), +(32927,4,0,'The legacy of storms shall not be undone.',14,0,100,0,0,15662,'Runemaster Molgeim - Death'), +(32927,5,0,'What have you gained from my defeat? You are no less doomed, mortals!',14,0,100,0,0,15663,'Runemaster Molgeim - Encounter defeated'), +(32927,6,0,'This meeting of the Assembly of Iron is adjourned!',14,0,100,0,0,15664,'Runemaster Molgeim - Berserk'), + +(32857,0,0,'Whether the world''s greatest gnats or the world''s greatest heroes, you''re still only mortal!',14,0,100,0,0,15684,'Brundir - Aggro'), +(32857,1,0,'A merciful kill!',14,0,100,0,0,15685,'Brundir Slay 1'), +(32857,1,1,'HAH!',14,0,100,0,0,15686,'Brundir - Slay 2'), +(32857,2,0,'Stand still and stare into the light!',14,0,100,0,0,15687,'Brundir - Special'), +(32857,3,0,'Let the storm clouds rise and rain down death from above!',14,0,100,0,0,15688,'Brundir - Flight'), +(32857,4,0,'The power of the storm lives on...',14,0,100,0,0,15689,'Brundir - Death'), +(32857,5,0,'You rush headlong into the maw of madness!',14,0,100,0,0,15690,'Brundir - Encounter defeated'), +(32857,6,0,'This meeting of the Assembly of Iron is adjourned!',14,0,100,0,0,15691,'Brundir - Berserk'), +(32857,7,0,'%s begins to Overload!',41,0,100,0,0,0,'Brundir - Overload'); + +UPDATE `creature_template` SET `flags_extra`=128, `ScriptName`='' WHERE `entry`=33705; -- Rune of Power +UPDATE `creature_template` SET `flags_extra`=128, `ScriptName`='' WHERE `entry`=33051; -- Rune of Summoning +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=32958; -- Lightning Elemental + +DELETE FROM `creature_template_addon` WHERE `entry` IN (33051,32958,33689,33705); +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(33051,0,0,0,0,0,'62019'), -- Rune of Summoning +(32958,0,0,0,0,0,'62052'), -- Lightning Elemental +(33689,0,0,0,0,0,'62052'), -- Lightning Elemental +(33705,0,0,0,0,0,'61974'); -- Rune of Power + +DELETE FROM `spell_script_names` WHERE `spell_id`=62019; -- Rune of Summoning +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(62019 ,'spell_assembly_rune_of_summoning'); diff --git a/sql/updates/world/2012_12_01_01_world_misc.sql b/sql/updates/world/2012_12_01_01_world_misc.sql new file mode 100644 index 00000000000..7523484d179 --- /dev/null +++ b/sql/updates/world/2012_12_01_01_world_misc.sql @@ -0,0 +1,74 @@ +-- The Sons of Hodir +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=23 AND `SourceEntry` IN (44133,50335,44134,50336,44136,50337,44135,50338); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(23,32540,44133,0,0,5,0,1119,128,0,0,0,0,'','Greater Inscription of the Axe - when The Sons of Hodir exalted'), +(23,32540,50335,0,0,5,0,1119,127,0,0,0,0,'','Greater Inscription of the Axe - when The Sons of Hodir not exalted'), +(23,32540,44134,0,0,5,0,1119,128,0,0,0,0,'','Greater Inscription of the Crag - when The Sons of Hodir exalted'), +(23,32540,50336,0,0,5,0,1119,127,0,0,0,0,'','Greater Inscription of the Crag - when The Sons of Hodir not exalted'), +(23,32540,44136,0,0,5,0,1119,128,0,0,0,0,'','Greater Inscription of the Pinnacle - when The Sons of Hodir exalted'), +(23,32540,50337,0,0,5,0,1119,127,0,0,0,0,'','Greater Inscription of the Pinnacle - when The Sons of Hodir not exalted'), +(23,32540,44135,0,0,5,0,1119,128,0,0,0,0,'','Greater Inscription of the Storm - when The Sons of Hodir exalted'), +(23,32540,50338,0,0,5,0,1119,127,0,0,0,0,'','Greater Inscription of the Storm - when The Sons of Hodir not exalted'); + +DELETE FROM `npc_vendor` WHERE `entry`=32540 AND `item` IN (50335,50336,50337,50338); +INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES +(32540,0,50335,0,0,0), -- Greater Inscription of the Axe +(32540,0,50336,0,0,0), -- Greater Inscription of the Crag +(32540,0,50337,0,0,0), -- Greater Inscription of the Pinnacle +(32540,0,50338,0,0,0); -- Greater Inscription of the Storm + +-- Knights of the Ebon Blade +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=23 AND `SourceEntry` IN (44149,50367); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(23,32538,44149,0,0,5,0,1098,192,0,0,0,0,'','Arcanum of Torment - when Knights of the Ebon Blade revered/exalted'), +(23,32538,50367,0,0,5,0,1098,63,0,0,0,0,'','Arcanum of Torment - when Knights of the Ebon Blade not revered/exalted'); + +DELETE FROM `npc_vendor` WHERE `entry`=32538 AND `item`=50367; +INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES +(32538,0,50367,0,0,0); -- Arcanum of Torment + +-- Kirin Tor +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=23 AND `SourceEntry` IN (44159,50368); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(23,32287,44159,0,0,5,0,1090,192,0,0,0,0,'','Arcanum of Burning Mysteries - when Kirin Tor revered/exalted'), +(23,32287,50368,0,0,5,0,1090,63,0,0,0,0,'','Arcanum of Burning Mysteries - when Kirin Tor not revered/exalted'); + +DELETE FROM `npc_vendor` WHERE `entry`=32287 AND `item`=50368; +INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES +(32287,0,50368,0,0,0); -- Arcanum of Burning Mysteries + +-- The Wyrmrest Accord +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=23 AND `SourceEntry` IN (44152,50370); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(23,32533,44152,0,0,5,0,1091,192,0,0,0,0,'','Arcanum of Blissful Mending - when The Wyrmrest Accord revered/exalted'), +(23,32533,50370,0,0,5,0,1091,63,0,0,0,0,'','Arcanum of Blissful Mending - when The Wyrmrest Accord not revered/exalted'); + +DELETE FROM `npc_vendor` WHERE `entry`=32533 AND `item`=50370; +INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES +(32533,0,50370,0,0,0); -- Arcanum of Blissful Mending + +-- Horde Expedition +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=23 AND `SourceEntry` IN (44702,50373); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(23,32774,44702,0,0,5,0,1052,128,0,0,0,0,'','Arcanum of the Savage Gladiator - when Horde Expedition exalted'), +(23,32774,50373,0,0,5,0,1052,127,0,0,0,0,'','Arcanum of the Savage Gladiator - when Horde Expedition not exalted'), +(23,32565,44702,0,0,5,0,1052,128,0,0,0,0,'','Arcanum of the Savage Gladiator - when Horde Expeditione exalted'), +(23,32565,50373,0,0,5,0,1052,127,0,0,0,0,'','Arcanum of the Savage Gladiator - when Horde Expedition not exalted'); + +DELETE FROM `npc_vendor` WHERE `entry` IN (32565,32774) AND `item`=50373; +INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES +(32565,0,50373,0,0,0), -- Arcanum of the Savage Gladiator +(32774,0,50373,0,0,0); -- Arcanum of the Savage Gladiator + +-- Alliance Vanguard +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=23 AND `SourceEntry` IN (44701,50372); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(23,32564,44701,0,0,5,0,1037,128,0,0,0,0,'','Arcanum of the Savage Gladiator - when Alliance Vanguard rexalted'), +(23,32564,50372,0,0,5,0,1037,127,0,0,0,0,'','Arcanum of the Savage Gladiator - when Alliance Vanguard not exalted'), +(23,32773,44701,0,0,5,0,1037,128,0,0,0,0,'','Arcanum of the Savage Gladiator - when Alliance Vanguard exalted'), +(23,32773,50372,0,0,5,0,1037,127,0,0,0,0,'','Arcanum of the Savage Gladiator - when Alliance Vanguard not exalted'); + +DELETE FROM `npc_vendor` WHERE `entry` IN (32773,32564) AND `item`=50372; +INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES +(32564,0,50372,0,0,0), -- Arcanum of the Savage Gladiator +(32773,0,50372,0,0,0); -- Arcanum of the Savage Gladiator diff --git a/sql/updates/world/2012_12_01_02_world_creature_text.sql b/sql/updates/world/2012_12_01_02_world_creature_text.sql new file mode 100644 index 00000000000..6d4b50b9e88 --- /dev/null +++ b/sql/updates/world/2012_12_01_02_world_creature_text.sql @@ -0,0 +1,413 @@ +-- ------------------------------- -- +-- Creature text conversion part 4 -- +-- ------------------------------- -- + +-- kodo round +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000350 AND -1000348; +DELETE FROM `creature_text` WHERE `entry`=11596; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(11596,0,0,12,0,100,"kodo round SAY_SMEED_HOME_1","Ah...the wondrous sound of kodos. I love the way they make the ground shake... inspect the beast for me."), +(11596,0,1,12,0,100,"kodo round SAY_SMEED_HOME_2","Hey, look out with that kodo! You had better inspect that beast before I give you credit!"), +(11596,0,2,12,0,100,"kodo round SAY_SMEED_HOME_3","That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me."); + +-- lazy peon +DELETE FROM `script_texts` WHERE `entry`=-1000600; +DELETE FROM `creature_text` WHERE `entry`=10556; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(10556,0,0,12,0,100,"lazy peon SAY_WP_0","Ow! OK, I'll get back to work, $N!"); + +-- amnennar +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1129004 AND -1129000; +DELETE FROM `creature_text` WHERE `entry`=7358; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(7358,0,0,14,5825,100,"amnennar SAY_AGGRO","You'll never leave this place... alive."), +(7358,1,0,14,5828,100,"amnennar SAY_SUMMON60","To me, my servants!"), +(7358,2,0,14,5829,100,"amnennar SAY_SUMMON30","Come, spirits, attend your master!"), +(7358,3,0,14,5827,100,"amnennar SAY_HP","I am the hand of the Lich King!"), +(7358,4,0,14,5826,100,"amnennar SAY_KILL","Too...easy!"); + +-- clintar +DELETE FROM `script_texts` WHERE `entry`=-1000286; +DELETE FROM `creature_text` WHERE `entry`=22916; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(22916,0,0,12,0,100,"clintar SAY_END","Lurosa, I am entrusting the Relics of Aviana to $N, who will take them to Morthis Whisperwing. I must return completely to the Emerald Dream now. Do not let $N fail!"); + +-- gilthares +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000380 AND -1000370; +DELETE FROM `creature_text` WHERE `entry`=3465; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(3465,0,0,12,0,100,"gilthares SAY_GIL_START","Stay close, $n. I'll need all the help I can get to break out of here. Let's go!"), +(3465,1,0,12,0,100,"gilthares SAY_GIL_AT_LAST","At last! Free from Northwatch Hold! I need a moment to catch my breath..."), +(3465,2,0,12,0,100,"gilthares SAY_GIL_PROCEED","Now I feel better. Let's get back to Ratchet. Come on, $n."), +(3465,3,0,12,0,100,"gilthares SAY_GIL_FREEBOOTERS","Looks like the Southsea Freeboters are heavily entrenched on the coast. This could get rough."), +(3465,4,0,12,0,100,"gilthares SAY_GIL_AGGRO_1","Help! $C attacking!"), +(3465,4,1,12,0,100,"gilthares SAY_GIL_AGGRO_2","$C heading this way fast! Time for revenge!"), +(3465,4,2,12,0,100,"gilthares SAY_GIL_AGGRO_3","$C coming right at us!"), +(3465,4,3,12,0,100,"gilthares SAY_GIL_AGGRO_4","Get this $C off of me!"), +(3465,5,0,12,0,100,"gilthares SAY_GIL_ALMOST","Almost back to Ratchet! Let's keep up the pace..."), +(3465,6,0,12,0,100,"gilthares SAY_GIL_SWEET","Ah, the sweet salt air of Ratchet."), +(3465,7,0,12,0,100,"gilthares SAY_GIL_FREED","Captain Brightsun, $N here has freed me! $N, I am certain the Captain will reward your bravery."); + +-- twiggy +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000380 AND -1000370; +DELETE FROM `creature_text` WHERE `entry` IN (6238,6248); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(6238,0,0,12,0,100,"big will SAY_BIG_WILL_READY","Ready when you are, $c."), +(6248,0,0,12,0,100,"twiggy SAY_TWIGGY_BEGIN","The Affray has begun. $n, get ready to fight!"), +(6248,1,0,12,0,100,"twiggy SAY_TWIGGY_FRAY","You! Enter the fray!"), +(6248,2,0,12,0,100,"twiggy SAY_TWIGGY_DOWN","Challenger is down!"), +(6248,3,0,12,0,100,"twiggy SAY_TWIGGY_OVER","The Affray is over."); + +-- wizzlecrank +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000305 AND -1000298; +DELETE FROM `creature_text` WHERE `entry` IN (3282,3439); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(3439,0,0,12,0,100,"wizzlecrank SAY_START","Alright, alright I think I can figure out how to operate this thing..."), +(3439,1,0,12,0,100,"wizzlecrank SAY_STARTUP1","Arrrgh! This isn't right!"), +(3439,2,0,12,0,100,"wizzlecrank SAY_STARTUP2","Okay, I think I've got it, now. Follow me, $n!"), +(3282,0,0,14,0,100,"wizzlecrank SAY_MERCENARY","There's the stolen shredder! Stop it or Lugwizzle will have our hides!"), +(3439,3,0,12,0,100,"wizzlecrank SAY_PROGRESS_1","Looks like we're out of woods, eh? Wonder what this does..."), +(3439,4,0,12,0,100,"wizzlecrank SAY_PROGRESS_2","Come on, don't break down on me now!"), +(3439,5,0,12,0,100,"wizzlecrank SAY_PROGRESS_3","That was a close one! Well, let's get going, it's still a ways to Ratchet!"), +(3439,6,0,12,0,100,"wizzlecrank SAY_END","Hmm... I don't think this blinking red light is a good thing..."); + +-- muglash +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800063 AND -1800054; +DELETE FROM `creature_text` WHERE `entry`=12717; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(12717,0,0,12,0,100,"muglash SAY_MUG_START1","Are you sure that you are ready? If we do not have a group of your allies to aid us, we will surely fail."), +(12717,1,0,12,0,100,"muglash SAY_MUG_START2","This will be a though fight, $N. Follow me closely."), +(12717,2,0,12,0,100,"muglash SAY_MUG_BRAZIER","This is the brazier, $N. Put it out. Vorsha is a beast, worthy of praise from no one!"), +(12717,3,0,12,0,100,"muglash SAY_MUG_BRAZIER_WAIT","Now we must wait. It won't be long before the naga realize what we have done."), +(12717,4,0,12,0,100,"muglash SAY_MUG_ON_GUARD","Be on your guard, $N!"), +(12717,5,0,12,0,100,"muglash SAY_MUG_REST","Perhaps we will get a moment to rest. But I will not give up until we have faced off against Vorsha!"), +(12717,6,0,12,0,100,"muglash SAY_MUG_DONE","We have done it!"), +(12717,7,0,12,0,100,"muglash SAY_MUG_GRATITUDE","You have my deepest gratitude. I thank you."), +(12717,8,0,12,0,100,"muglash SAY_MUG_PATROL","I am going to patrol the area for a while longer and ensure that things are truly safe."), +(12717,9,0,12,0,100,"muglash SAY_MUG_RETURN","Please return to Zoram'gar and report our success to the Warsong runner."); + +-- jaina hyjal +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1534008 AND -1534000; +DELETE FROM `creature_text` WHERE `entry`=17772; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17772,0,0,14,11007,100,"jaina hyjal ATTACKED 1","I'm in jeopardy, help me if you can!"), +(17772,0,1,14,11049,100,"jaina hyjal ATTACKED 2","They've broken through!"), +(17772,1,0,14,11006,100,"jaina hyjal BEGIN","Don't give up! We must prevail!"), +(17772,2,0,14,11008,100,"jaina hyjal INCOMING","Stay alert! Another wave approaches."), +(17772,3,0,14,11050,100,"jaina hyjal RALLY 1","Hold them back as long as possible."), +(17772,3,1,14,11051,100,"jaina hyjal RALLY 2","We must hold strong!"), +(17772,4,0,14,11009,100,"jaina hyjal FAILURE","We are lost. Fall back!"), +(17772,5,0,14,11011,100,"jaina hyjal SUCCESS","We have won valuable time. Now we must pull back!"), +(17772,6,0,14,11010,100,"jaina hyjal DEATH","I did... my best."); + +-- thrall hyjal +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1534017 AND -1534009; +DELETE FROM `creature_text` WHERE `entry`=17852; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17852,0,0,14,11031,100,"thrall hyjal ATTACKED 1","I will lie down for no one!"), +(17852,0,1,14,11061,100,"thrall hyjal ATTACKED 2","Bring the fight to me and pay with your lives!"), +(17852,1,0,14,11030,100,"thrall hyjal BEGIN","Hold them back! Do not falter!"), +(17852,2,0,14,11032,100,"thrall hyjal INCOMING","Make ready for another wave! LOK-TAR OGAR!"), +(17852,3,0,14,11059,100,"thrall hyjal RALLY 1","Victory or death!"), +(17852,3,1,14,11060,100,"thrall hyjal RALLY 2","Do not give an inch of ground!"), +(17852,4,0,14,11033,100,"thrall hyjal FAILURE","It is over. Withdraw! We have failed."), +(17852,5,0,14,11035,100,"thrall hyjal SUCCESS","We have played our part and done well. It is up to the others now."), +(17852,6,0,14,11034,100,"thrall hyjal DEATH","Uraaa..."); + +-- lieutenant drake +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1560012 AND -1560006; +DELETE FROM `creature_text` WHERE `entry`=17848; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17848,0,0,14,10428,100,"lieutenant drake SAY_ENTER","You there, fetch water quickly! Get these flames out before they spread to the rest of the keep! Hurry, damn you!"), +(17848,1,0,14,10429,100,"lieutenant drake SAY_AGGRO","I know what you're up to, and I mean to put an end to it, permanently!"), +(17848,2,0,14,10432,100,"lieutenant drake SAY_SLAY1","No more middling for you."), +(17848,2,1,14,10433,100,"lieutenant drake SAY_SLAY2","You will not interfere!"), +(17848,3,0,14,10430,100,"lieutenant drake SAY_MORTAL","Time to bleed!"), +(17848,4,0,14,10431,100,"lieutenant drake SAY_SHOUT","Run, you blasted cowards!"), +(17848,5,0,14,10434,100,"lieutenant drake SAY_DEATH","Thrall... must not... go free."); + +-- thrall hillsbrad +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1560049 AND -1560023; +DELETE FROM `creature_text` WHERE `entry` IN (17876,18887); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17876,0,0,14,10465,100,"thrall hillsbrad SAY_TH_START_EVENT_PART1","Very well then. Let's go!"), +(17876,1,0,12,0,100,"thrall hillsbrad SAY_TH_ARMORY","As long as we're going with a new plan, I may aswell pick up a weapon and some armor."), +(17876,2,0,12,10466,100,"thrall hillsbrad SAY_TH_SKARLOC_MEET","A rider approaches!"), +(17876,3,0,14,10467,100,"thrall hillsbrad SAY_TH_SKARLOC_TAUNT","I'll never be chained again!"), +(17876,4,0,14,10468,100,"thrall hillsbrad SAY_TH_START_EVENT_PART2","Very well. Tarren Mill lies just west of here. Since time is of the essence..."), +(17876,5,0,12,10469,100,"thrall hillsbrad SAY_TH_MOUNTS_UP","Let's ride!"), +(17876,6,0,12,0,100,"thrall hillsbrad SAY_TH_CHURCH_END","Taretha must be in the inn. Let's go."), +(17876,7,0,12,0,100,"thrall hillsbrad SAY_TH_MEET_TARETHA","Taretha! What foul magic is this?"), +(17876,8,0,14,10470,100,"thrall hillsbrad SAY_TH_EPOCH_WONDER","Who or what was that?"), +(17876,9,0,14,10471,100,"thrall hillsbrad SAY_TH_EPOCH_KILL_TARETHA","No!"), +(17876,10,0,14,10472,100,"thrall hillsbrad SAY_TH_EVENT_COMPLETE","Goodbye, Taretha. I will never forget your kindness."), +(17876,11,0,14,10458,100,"thrall hillsbrad SAY_TH_RANDOM_LOW_HP1","Things are looking grim..."), +(17876,11,1,14,10459,100,"thrall hillsbrad SAY_TH_RANDOM_LOW_HP2","I will fight to the last!"), +(17876,12,0,14,10460,100,"thrall hillsbrad SAY_TH_RANDOM_DIE1","Taretha..."), +(17876,12,1,14,10461,100,"thrall hillsbrad SAY_TH_RANDOM_DIE2","A good day...to die..."), +(17876,13,0,14,10448,100,"thrall hillsbrad SAY_TH_RANDOM_AGGRO1","I have earned my freedom!"), +(17876,13,1,14,10449,100,"thrall hillsbrad SAY_TH_RANDOM_AGGRO2","This day is long overdue. Out of my way!"), +(17876,13,2,14,10450,100,"thrall hillsbrad SAY_TH_RANDOM_AGGRO3","I am a slave no longer!"), +(17876,13,3,14,10451,100,"thrall hillsbrad SAY_TH_RANDOM_AGGRO4","Blackmoore has much to answer for!"), +(17876,14,0,14,10452,100,"thrall hillsbrad SAY_TH_RANDOM_KILL1","You have forced my hand!"), +(17876,14,1,14,10453,100,"thrall hillsbrad SAY_TH_RANDOM_KILL2","It should not have come to this!"), +(17876,14,2,14,10454,100,"thrall hillsbrad SAY_TH_RANDOM_KILL3","I did not ask for this!"), +(17876,15,0,14,10455,100,"thrall hillsbrad SAY_TH_LEAVE_COMBAT1","I am truly in your debt, strangers."), +(17876,15,1,14,10456,100,"thrall hillsbrad SAY_TH_LEAVE_COMBAT2","Thank you, strangers. You have given me hope."), +(17876,15,2,14,10457,100,"thrall hillsbrad SAY_TH_LEAVE_COMBAT3","I will not waste this chance. I will seek out my destiny."), +(18887,0,0,12,0,100,"taretha SAY_TA_FREE","I'm free! Thank you all!"), +(18887,1,0,12,0,100,"taretha SAY_TA_ESCAPED","Thrall, you escaped!"); + +-- skarloc +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1560005 AND -1560000; +DELETE FROM `creature_text` WHERE `entry`=17862; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17862,0,0,14,10406,100,"skarloc SAY_ENTER","Thrall! You didn't really think you would escape did you? You and your allies shall answer to Blackmoore - after I've had my fun!"), +(17862,1,0,14,10407,100,"skarloc SAY_TAUNT1","You're a slave. That's all you'll ever be."), +(17862,2,0,14,10408,100,"skarloc SAY_TAUNT2","I don't know what Blackmoore sees in you. For my money, you're just another ignorant savage!"), +(17862,3,0,14,10409,100,"skarloc SAY_SLAY1","Thrall will never be free!"), +(17862,3,1,14,10410,100,"skarloc SAY_SLAY2","Did you really think you would leave here alive?"), +(17862,4,0,14,10411,100,"skarloc SAY_DEATH","Guards! Urgh..Guards..!"); + +-- epoch hunter +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1560022 AND -1560013; +DELETE FROM `creature_text` WHERE `entry`=18096; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18096,0,0,14,10418,100,"epoch hunter SAY_ENTER1","Thrall! Come outside and face your fate!"), +(18096,0,1,14,10419,100,"epoch hunter SAY_ENTER2","Taretha's life hangs in the balance. Surely you care for her. Surely you wish to save her..."), +(18096,0,2,14,10420,100,"epoch hunter SAY_ENTER3","Ah, there you are. I had hoped to accomplish this with a bit of subtlety, but I suppose direct confrontation was inevitable. Your future, Thrall, must not come to pass and so...you and your troublesome friends must die!"), +(18096,1,0,14,10421,100,"epoch hunter SAY_AGGRO1","Enough! I will erase your very existence!"), +(18096,1,1,14,10422,100,"epoch hunter SAY_AGGRO2","You cannot fight fate!"), +(18096,2,0,14,10425,100,"epoch hunter SAY_SLAY1","You are...irrelevant."), +(18096,2,1,14,10426,100,"epoch hunter SAY_SLAY2","Thrall will remain a slave. Taretha will die. You have failed."), +(18096,3,0,14,10423,100,"epoch hunter SAY_BREATH1","Not so fast!"), +(18096,3,1,14,10424,100,"epoch hunter SAY_BREATH2","Struggle as much as you like!"), +(18096,4,0,14,10427,100,"epoch hunter SAY_DEATH","No!...The master... will not... be pleased."); + +-- meathook +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1595031 AND -1595026; +DELETE FROM `creature_text` WHERE `entry`=26529; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26529,0,0,14,13428,100,"meathook SAY_AGGRO","Play time!"), +(26529,1,0,14,13430,100,"meathook SAY_SLAY_1","Boring..."), +(26529,1,1,14,13431,100,"meathook SAY_SLAY_2","Why you stop moving?"), +(26529,1,2,14,13432,100,"meathook SAY_SLAY_3","Get up! Me not done!"), +(26529,2,0,14,13429,100,"meathook SAY_SPAWN","New toys!"), +(26529,3,0,14,13433,100,"meathook SAY_DEATH","This... not fun..."); + +-- epoch +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1595008 AND -1595000; +DELETE FROM `creature_text` WHERE `entry`=26532; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26532,0,0,14,13408,100,"epoch SAY_INTRO | culling SAY_PHASE314","Prince Arthas Menethil, on this day, a powerful darkness has taken hold of your soul. The death you are destined to visit upon others will this day be your own."), +(26532,1,0,14,13409,100,"epoch SAY_AGGRO","We'll see about that, young prince."), +(26532,2,0,14,13410,100,"epoch SAY_TIME_WARP_1","Tick tock, tick tock..."), +(26532,2,1,14,13411,100,"epoch SAY_TIME_WARP_2","Not quick enough!"), +(26532,2,2,14,13412,100,"epoch SAY_TIME_WARP_3","Let's get this over with. "), +(26532,3,0,14,13413,100,"epoch SAY_SLAY_1","There is no future for you."), +(26532,3,1,14,13414,100,"epoch SAY_SLAY_2","This is the hour of our greatest triumph!"), +(26532,3,2,14,13415,100,"epoch SAY_SLAY_3","You were destined to fail."), +(26532,4,0,12,13416,100,"epoch SAY_DEATH",""); + +-- salramm +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1595044 AND -1595032; +DELETE FROM `creature_text` WHERE `entry`=26530; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26530,0,0,14,13472,100,"salramm SAY_AGGRO","Ah, the entertainment has arrived!"), +(26530,1,0,14,13471,100,"salramm SAY_SPAWN","You are too late, champion of Lordaeron. The dead shall have their day."), +(26530,2,0,14,13473,100,"salramm SAY_SLAY_1","The fun is just beginning!"), +(26530,2,1,14,13474,100,"salramm SAY_SLAY_2","Aah, quality materials!"), +(26530,2,2,14,13475,100,"salramm SAY_SLAY_3","Don't worry, I'll make good use of you."), +(26530,3,0,14,13483,100,"salramm SAY_DEATH","You only advance... the master's plan..."), +(26530,4,0,14,13478,100,"salramm SAY_EXPLODE_GHOUL_1","BOOM! Hahahahah..."), +(26530,4,1,14,13479,100,"salramm SAY_EXPLODE_GHOUL_2","Blood... destruction... EXHILARATING!"), +(26530,5,0,14,13480,100,"salramm SAY_STEAL_FLESH_1","I want a sample..."), +(26530,5,1,14,13481,100,"salramm SAY_STEAL_FLESH_2","Such strength... it must be mine!"), +(26530,5,2,14,13482,100,"salramm SAY_STEAL_FLESH_3","Your flesh betrays you."), +(26530,6,0,14,13476,100,"salramm SAY_SUMMON_GHOULS_1","Say hello to some friends of mine."), +(26530,6,1,14,13477,100,"salramm SAY_SUMMON_GHOULS_2","Come, citizen of Stratholme! Meet your saviors."); + +-- culling of stratholme +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1595120 AND -1595070; +DELETE FROM `creature_text` WHERE `entry` IN (26499,26528,31126,28169,28167,26497); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +-- 26499 +(26499,0,0,12,12828,100,"culling SAY_PHASE101","Glad you could make it, Uther."), +(26499,1,0,12,12829,100,"culling SAY_PHASE103","As if I could forget. Listen, Uther, there's something about the plague you should know..."), +(26499,2,0,12,12830,100,"culling SAY_PHASE104","Oh, no. We're too late. These people have all been infected! They may look fine now, but it's just a matter of time before they turn into the undead!"), +(26499,3,0,12,12831,100,"culling SAY_PHASE106","This entire city must be purged."), +(26499,4,0,12,12832,100,"culling SAY_PHASE108","Damn it, Uther! As your future king, I order you to purge this city!"), +(26499,5,0,12,12833,100,"culling SAY_PHASE110","Then I must consider this an act of treason."), +(26499,6,0,12,12834,100,"culling SAY_PHASE112","Have I? Lord Uther, by my right of succession and the sovereignty of my crown, I hereby relieve you of your command and suspend your paladins from service."), +(26499,7,0,12,12835,100,"culling SAY_PHASE114","It's done! Those of you who have the will to save this land, follow me! The rest of you... get out of my sight!"), +(26499,8,0,12,12836,100,"culling SAY_PHASE116","Jaina?"), +(26499,9,0,14,14327,100,"culling SAY_PHASE118","Take position here, and I will lead a small force inside Stratholme to begin the culling. We must contain and purge the infected for the sake of all of Lordaeron!"), +(26499,10,0,12,14293,100,"culling SAY_PHASE201","Everyone looks ready. Remember, these people are all infected with the plague and will die soon. We must purge Stratholme to protect the remainder of Lordaeron from the Scourge. Let's go."), +(26499,11,0,12,14294,100,"culling SAY_PHASE203","I can only help you with a clean death."), +(26499,12,0,12,14295,100,"culling SAY_PHASE205","That was just the beginning."), +(26499,13,0,14,14296,100,"culling SAY_PHASE208","I won't allow it, Mal'Ganis! Better that these people die by my hand than serve as your slaves in death!"), +(26499,14,0,14,14885,100,"culling SAY_PHASE209","Mal'ganis will send out some of his Scourge minions to interfere with us. Those of you with the strongest steel and magic shall go forth and destroy them. I will lead the rest of my forces in purging Stratholme of the infected."), +(26499,15,0,14,14297,100,"culling SAY_PHASE210","Champions, meet me at the Town Hall at once. We must take the fight to Mal'Ganis."), +(26499,16,0,12,14298,100,"culling SAY_PHASE301","Follow me, I know the way through."), +(26499,17,0,12,14299,100,"culling SAY_PHASE303","Yes, I'm glad I could get to you before the plague."), +(26499,18,0,12,14300,100,"culling SAY_PHASE304","What is this sorcery?"), +(26499,19,0,12,14301,100,"culling SAY_PHASE306. NEEDS VERIFICATION","Mal'Ganis appears to have more than scourge in his arsenal. We should make haste."), +(26499,20,0,12,14302,100,"culling SAY_PHASE307","More vile sorcery! Be ready for anything!"), +(26499,21,0,12,14303,100,"culling SAY_PHASE308","Let's move on."), +(26499,22,0,12,14304,100,"culling SAY_PHASE309","Watch your backs: they have us surrounded in this hall."), +(26499,23,0,12,0,100,"culling SAY_PHASE310. NEEDS VERIFICATION","One less obstacle to deal with."), +(26499,24,0,12,14305,100,"culling SAY_PHASE311","Mal'Ganis is not making this easy."), +(26499,25,0,12,14306,100,"culling SAY_PHASE312","They're very persistent."), +(26499,26,0,12,14307,100,"culling SAY_PHASE313","What else can he put in my way?"), +(26499,27,0,12,14309,100,"culling SAY_PHASE315","I do what I must for Lordaeron, and neither your words nor your actions will stop me."), +(26499,28,0,12,14308,100,"culling SAY_PHASE401","The quickest path to Mal'Ganis lies behind that bookshelf ahead."), +(26499,29,0,12,14310,100,"culling SAY_PHASE402","This will only take a moment."), +(26499,30,0,12,14311,100,"culling SAY_PHASE403","I'm relieved this secret passage still works."), +(26499,31,0,12,14312,100,"culling SAY_PHASE404","Let's move through here as quickly as possible. If the undead don't kill us, the fires might."), +(26499,32,0,12,14313,100,"culling SAY_PHASE405","Rest a moment and clear your lungs, but we must move again soon."), +(26499,33,0,12,14314,100,"culling SAY_PHASE406","That's enough; we must move again. Mal'Ganis awaits."), +(26499,34,0,12,14315,100,"culling SAY_PHASE407","At last some good luck. Market Row has not caught fire yet. Mal'Ganis is supposed to be in Crusaders' Square, which is just ahead. Tell me when you're ready to move forward."), +(26499,35,0,12,14316,100,"culling SAY_PHASE501","Justice will be done."), +(26499,36,0,12,14317,100,"culling SAY_PHASE502","We're going to finish this right now, Mal'Ganis. Just you... and me."), +(26499,37,0,12,14318,100,"culling SAY_PHASE503","I'll hunt you to the ends of the earth if I have to! Do you hear me? To the ends of the earth!"), +(26499,38,0,12,14319,100,"culling SAY_PHASE504","You performed well this day. Anything that Mal'Ganis has left behind is yours. Take it as your reward. I must now begin plans for an expedition to Northrend."), +-- 26528 +(26528,0,0,12,12839,100,"culling SAY_PHASE102","Watch your tone with me, boy. You may be the prince, but I'm still your superior as a paladin!"), +(26528,1,0,12,12840,100,"culling SAY_PHASE105","What?"), +(26528,2,0,12,12841,100,"culling SAY_PHASE107","How can you even consider that? There's got to be some other way."), +(26528,3,0,12,12842,100,"culling SAY_PHASE109","You are not my king yet, boy! Nor would I obey that command even if you were!"), +(26528,4,0,12,12843,100,"culling SAY_PHASE111","Treason? Have you lost your mind, Arthas?"), +(26528,5,0,12,12844,100,"culling SAY_PHASE115","You've just crossed a terrible threshold, Arthas."), +-- 26497 +(26497,0,0,12,12837,100,"culling SAY_PHASE113","Arthas! You can't just--"), +(26497,1,0,12,12838,100,"culling SAY_PHASE117","I'm sorry, Arthas. I can't watch you do this."), +-- 28167 +(28167,0,0,12,0,100,"culling SAY_PHASE202","Prince Arthas, may the light be praised! Many people in the town have begun to fall seriously ill, can you help us?"), +-- 28169 +(28169,0,0,12,0,100,"culling SAY_PHASE204","What? This can't be!"), +-- 31126 +(31126,0,0,12,0,100,"culling SAY_PHASE302","Ah, you've finally arrived Prince Arthas. You're here just in the nick of time."), +(31126,1,0,12,0,100,"culling SAY_PHASE305","There's no need for you to understand, Arthas. All you need to do is die."); + +-- malganis +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1595025 AND -1595009; +DELETE FROM `creature_text` WHERE `entry`=26533; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26533,0,0,14,14410,100,"malganis SAY_INTRO_1 | culling SAY_PHASE206","Yes, this is the beginning. I've been waiting for you, young prince. I am Mal'Ganis."), +(26533,1,0,14,14411,100,"malganis SAY_INTRO_2 | culling SAY_PHASE207","As you can see, your people are now mine. I will now turn this city household by household, until the flame of life has been snuffed out... forever."), +(26533,2,0,14,14413,100,"malganis SAY_AGGRO","This will be a fine test...Prince Arthas..."), +(26533,3,0,14,14416,100,"malganis SAY_KILL_1","All too easy..."), +(26533,3,1,14,14417,100,"malganis SAY_KILL_2","The dark lord is displeased with your interference..."), +(26533,3,2,14,14418,100,"malganis SAY_KILL_3","It is Prince Arthas I want... not you..."), +(26533,4,0,14,14422,100,"malganis SAY_SLAY_1","Anak'Keri..."), +(26533,4,1,14,14423,100,"malganis SAY_SLAY_2","My onslaught will wash over the Lich King's forces..."), +(26533,4,2,14,14424,100,"malganis SAY_SLAY_3","Your death is in vain, tiny mortal..."), +(26533,4,3,14,14425,100,"malganis SAY_SLAY_4","Your time has come to an end!"), +(26533,5,0,14,14414,100,"malganis SAY_SLEEP_1","Time out..."), +(26533,5,1,14,14415,100,"malganis SAY_SLEEP_2","You seem...tired..."), +(26533,6,0,14,14426,100,"malganis SAY_30HEALTH","I spent too much time in that weak little shell..."), +(26533,7,0,14,14427,100,"malganis SAY_15HEALTH","(Eredun) I AM MAL'GANIS! I AM ETERNAL!"), +(26533,8,0,14,14428,100,"malganis SAY_ESCAPE_SPEECH_1","ENOUGH! I waste my time here...I must gather my strength on the home world..."), +(26533,9,0,14,14429,100,"malganis SAY_ESCAPE_SPEECH_2","You'll never defeat the Lich King without my forces! I'll have my revenge...on him, AND you..."), +(26533,10,0,14,14412,100,"malganis SAY_OUTRO","Your journey has just begun, young prince. Gather your forces and meet me in the artic land of Northrend. It is there that we shall settle the score between us. It is there that your true destiny will unfold."); + +-- chrono lord deja +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1269011 AND -1269006; +DELETE FROM `creature_text` WHERE `entry`=17879; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17879,0,0,14,10412,100,"chrono lord deja SAY_ENTER","Why do you aid the Magus? Just think of how many lives could be saved if the portal is never opened, if the resulting wars could be erased ..."), +(17879,1,0,14,10414,100,"chrono lord deja SAY_AGGRO","If you will not cease this foolish quest, then you will die!"), +(17879,2,0,14,10413,100,"chrono lord deja SAY_BANISH","You have outstayed your welcome, Timekeeper. Begone!"), +(17879,3,0,14,10415,100,"chrono lord deja SAY_SLAY1","I told you it was a fool's quest!"), +(17879,3,1,14,10416,100,"chrono lord deja SAY_SLAY2","Leaving so soon?"), +(17879,4,0,14,10417,100,"chrono lord deja SAY_DEATH","Time ... is on our side."); + +-- aeonus +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1269018 AND -1269012; +DELETE FROM `creature_text` WHERE `entry`=17881; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17881,0,0,14,10400,100,"aeonus SAY_ENTER","The time has come to shatter this clockwork universe forever! Let us no longer be slaves of the hourglass! I warn you: those who do not embrace the greater path shall become victims of its passing!"), +(17881,1,0,14,10402,100,"aeonus SAY_AGGRO","Let us see what fate lays in store..."), +(17881,2,0,14,10401,100,"aeonus SAY_BANISH","Your time is up, slave of the past!"), +(17881,3,0,14,10403,100,"aeonus SAY_SLAY1","One less obstacle in our way!"), +(17881,3,1,14,10404,100,"aeonus SAY_SLAY2","No one can stop us! No one!"), +(17881,4,0,14,10405,100,"aeonus SAY_DEATH","It is only a matter...of time."), +(17881,5,0,16,0,100,"aeonus EMOTE_FRENZY","goes into a frenzy!"); + +-- medivh +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1269028 AND -1269020; +DELETE FROM `creature_text` WHERE `entry`=15608; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15608,0,0,14,10435,100,"medivh SAY_ENTER","The time has come! Gul'dan, order your warlocks to double their efforts! Moments from now the gateway will open, and your Horde will be released upon this ripe, unsuspecting world!"), +(15608,1,0,14,10436,100,"medivh SAY_INTRO","What is this? Champions, coming to my aid? I sense the hand of the dark one in this. Truly this sacred event bears his blessing?"), +(15608,2,0,14,10437,100,"medivh SAY_WEAK75","Champions, my shield grows weak!"), +(15608,3,0,14,10438,100,"medivh SAY_WEAK50","My powers must be concentrated on the portal! I do not have time to hold the shield!"), +(15608,4,0,14,10439,100,"medivh SAY_WEAK25","The shield is nearly gone! All that I have worked for is in danger!"), +(15608,5,0,14,10441,100,"medivh SAY_DEATH","No... damn this feeble mortal coil..."), +(15608,6,0,14,10440,100,"medivh SAY_WIN","I am grateful for your aid, champions. Now, Gul'dan's Horde will sweep across this world, like a locust swarm, and all my designs, all my carefully laid plans will at last fall into place."), +(15608,7,0,14,0,100,"medivh SAY_ORCS_ENTER","Orcs of the Horde! This portalis the gateway to your new destiny! Azeroth lies before you, ripe for the taking!"), +(15608,8,0,14,0,100,"medivh SAY_ORCS_ANSWER","Gul'dan speaks the truth! We should return at once to tell our brothers of the news! Retreat back trought the portal!"); + +-- temporus +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1269005 AND -1269000; +DELETE FROM `creature_text` WHERE `entry`=17880; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17880,0,0,14,10442,100,"temporus SAY_ENTER","Why do you persist? Surely you can see the futility of it all. It is not too late! You may still leave with your lives ..."), +(17880,1,0,14,10444,100,"temporus SAY_AGGRO","So be it ... you have been warned."), +(17880,2,0,14,10443,100,"temporus SAY_BANISH","Time... sands of time is run out for you."), +(17880,3,0,14,10445,100,"temporus SAY_SLAY1","You should have left when you had the chance."), +(17880,3,1,14,10446,100,"temporus SAY_SLAY2","Your days are done."), +(17880,4,0,14,10447,100,"temporus SAY_DEATH","My death means ... little."); + +-- sprysprocket +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000356 AND -1000351; +DELETE FROM `creature_text` WHERE `entry`=23002; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(23002,0,0,14,0,100,"sprysprocket SAY_START","You, there! Hand over that moonstone and nobody gets hurt!"), +(23002,1,0,15,0,100,"sprysprocket SAY_WHISPER_CHILL","Just chill!"), +(23002,2,0,14,0,100,"sprysprocket SAY_END","All right, you win! I surrender! Just don't hurt me!"), +(23002,3,0,41,0,100,"sprysprocket EMOTE_START","%s takes the Southfury moonstone and escapes into the river. Follow her!"); + + +-- mist +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000324 AND -1000323; +DELETE FROM `creature_text` WHERE `entry`=3568; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(3568,0,0,12,0,100,"mist SAY_AT_HOME","Mist! I feared I would never see you again! Yes, I am well, do not worry for me. You must rest and recover your health."), +(3568,1,0,16,0,100,"mist EMOTE_AT_HOME","%s growls in acknowledgement before straightening and making her way off into the forest."); + +-- anachronos the ancient +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1350030 AND -1350000; +DELETE FROM `creature_text` WHERE `entry` IN (15381,15382,15379,15380,15378); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15381,0,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_1","We must act quickly or all shall be lost!"), +(15381,1,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_2","NOW, STAGHELM! WE GO NOW! Prepare your magic!"), +(15381,2,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_3","Stay close..."), +(15381,3,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_4","The sands of time will halt, but only for a moment! I will now conjure the barrier."), +(15381,4,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_5","FINISH THE SPELL STAGHELM! I CANNOT HOLD THE GLYPHS OF WARDING IN PLACE MUCH LONGER! CALL FORTH THE ROOTS!"), +(15381,5,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_6","It... It is over, Lord Staghelm. We are victorious. Albeit the cost for this victory was great."), +(15381,6,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_7","There is but one duty that remains..."), +(15381,7,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_8","Before I leave this place, I make one final offreing to you, Lord Staghelm. Should a time arise in which you must gain entry to this accursed fortress, use the Scepter of the Shifting Sands on the sacred gong. The magic holding the barrier together will dissipate and the horrors of Ahn'Qiraj will be unleashed upon the world once more."), +(15381,8,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_9","Lord Staghelm, where are you going? You would shatter our bond for the sake of pride?"), +(15381,9,0,12,0,100,"anachronos the ancient ANACHRONOS_SAY_10","And now you know all that there is to know, mortal..."), +(15381,10,0,16,0,100,"anachronos the ancient ANACHRONOS_EMOTE_1","hands the Scepter of the Shifting Sands to Fandral Staghelm."), +(15381,11,0,16,0,100,"anachronos the ancient ANACHRONOS_EMOTE_2","shakes his head in dissapointment."), +(15381,12,0,16,0,100,"anachronos the ancient ANACHRONOS_EMOTE_3","kneels down to pick up the fragments of the shattered scepter."), +(15382,0,0,12,0,100,"anachronos the ancient FANDRAL_SAY_1","My forces cannot overcome the Qiraji defenses. We will not be able to get close enough to place your precious barrier, dragon."), +(15382,1,0,12,0,100,"anachronos the ancient FANDRAL_SAY_2","It is done dragon. Lead the way..."), +(15382,2,0,12,0,100,"anachronos the ancient FANDRAL_SAY_3","Ancient ones guide my hand... Wake from your slumber! WAKE AND SEAL THIS CURSED PLACE!"), +(15382,3,0,12,0,100,"anachronos the ancient FANDRAL_SAY_4","After the savagery that my people have witnessed and felt, you expect me to accept another burden, dragon? Surely you are mad."), +(15382,4,0,12,0,100,"anachronos the ancient FANDRAL_SAY_5","I want nothing to do with Silithus, the Qiraji and least of all, any damned dragons!"), +(15382,5,0,12,0,100,"anachronos the ancient FANDRAL_SAY_6","My son's soul will find no comfort in this hollow victory, dragon. I will have him back.Thought it takes a millennia, I WILL have my son back!"), +(15382,6,0,16,0,100,"anachronos the ancient FANDRAL_EMOTE_1","falls to one knee - exhausted."), +(15382,7,0,16,0,100,"anachronos the ancient FANDRAL_EMOTE_2","hurls the Scepter of the Shifting Sands into the barrier, shattering it."), +(15379,0,0,12,0,100,"anachronos the ancient CAELESTRASZ_SAY_1","Aye, Fandral, remember these words: Let not your grief guide your faith. These thoughts you hold... dark places you go, night elf. Absolution cannot be had through misguided vengeance."), +(15379,1,0,12,0,100,"anachronos the ancient CAELESTRASZ_SAY_2","Do not forget the sacrifices made on this day, night elf. We have all suffered immensely at the hands of these beasts."), +(15379,2,0,14,0,100,"anachronos the ancient CAELESTRASZ_YELL_1","Alexstrasza grant me the resolve to drive our enemies back!"), +(15380,0,0,12,0,100,"anachronos the ancient ARYGOS_SAY_1","This distraction will give you and the young druid time enough to seal the gate. Do not falter. Now, let us see how they deal with chaotic magic."), +(15380,1,0,14,0,100,"anachronos the ancient ARYGOS_YELL_1","Let them feel the wrath of the Blue Flight! May Malygos protect me!"), +(15380,2,0,16,0,100,"anachronos the ancient ARYGOS_EMOTE_1","nods knowingly."), +(15378,0,0,12,0,100,"anachronos the ancient MERITHRA_SAY_1","There is a way..."), +(15378,1,0,12,0,100,"anachronos the ancient MERITHRA_SAY_2","We will push them back, Anachronos. This I vow. Uphold the end of this task. Let not your hands falter as you seal our fates behind the barrier."), +(15378,2,0,14,0,100,"anachronos the ancient MERITHRA_YELL_1","Succumb to the endless dream, little ones. Let it consume you!"), +(15378,3,0,16,0,100,"anachronos the ancient MERITHRA_EMOTE_1","glances at her compatriots."); diff --git a/sql/updates/world/2012_12_01_03_world_ulduar_creature_text.sql b/sql/updates/world/2012_12_01_03_world_ulduar_creature_text.sql new file mode 100644 index 00000000000..82d93d7b7ae --- /dev/null +++ b/sql/updates/world/2012_12_01_03_world_ulduar_creature_text.sql @@ -0,0 +1,174 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1603341 AND -1603050; +DELETE FROM `creature_text` WHERE `entry`=33350 AND `groupid`=15; +DELETE FROM `creature_text` WHERE `entry` IN ( +33515, -- Auriaya +33113, -- Flame Leviathan +32906, -- Freya +32913, -- Elder Ironbranch +32914, -- Elder Stonebark +32915, -- Elder Brightleaf +32845, -- Hodir +33118, -- Ignis +32930, -- Kologarn +33210, -- Expedition Commander +33287, -- Expedition Engineer +33186, -- Razorscale +33233, -- Razorscale Controller +33271, -- General Vezax +33488, -- Saronite Vapor +33293, -- XT-002 Deconstructor +32865 -- Thorim +); +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +-- Auriaya +(33515,0,0,'Some things are better left alone!',14,0,100,0,0,15473,'Auriaya SAY_AGGRO'), +(33515,1,1,'The secret dies with you!',14,0,100,0,0,15474,'Auriaya SAY_SLAY_1'), +(33515,1,2,'There is no escape!',14,0,100,0,0,15475,'Auriaya SAY_SLAY_2'), +(33515,2,0,'Auriaya screams in agony.',16,0,100,0,0,15476,'Auriaya SAY_DEATH'), +(33515,3,0,'You waste my time!',14,0,100,0,0,15477,'Auriaya SAY_BERSERK'), +(33515,4,0,'%s begins to cast Terrifying Screech.',41,0,100,0,0,0,'Auriaya EMOTE_FEAR'), +(33515,5,0,'%s begins to activate the Feral Defender!',41,0,100,0,0,0,'Auriaya EMOTE_DEFENDER'), +-- Flame Leviathan +(33113, 0,0,'Hostile entities detected. Threat assessment protocol active. Primary target engaged. Time minus 30 seconds to re-evaluation.',14,0,100,0,0,15506,'Flame Leviathan SAY_AGGRO'), +(33113, 1,0,'Threat assessment routine modified. Current target threat level: 0. Acquiring new target.',14,0,100,0,0,15521,'Flame Leviathan SAY_SLAY'), +(33113, 2,0,'Total systems failure. Defense protocols breached. Leviathan unit shutting down.',14,0,100,0,0,15520,'Flame Leviathan SAY_DEATH'), +(33113, 3,0,'Threat re-evaluated. Target assessment complete. Changing course.',14,0,100,0,0,15507,'Flame Leviathan SAY_TARGET_1'), +(33113, 3,1,'Pursuit objective modified. Changing course.',14,0,100,0,0,15508,'Flame Leviathan SAY_TARGET_2'), +(33113, 3,2,'Hostile entity stratagem predicted. Rerouting battle function. Changing course.',14,0,100,0,0,15509,'Flame Leviathan SAY_TARGET_3'), +(33113, 4,0,'Orbital countermeasures enabled.',14,0,100,0,0,15510,'Flame Leviathan SAY_HARDMODE'), +(33113, 5,0,'Alert! Static defense system failure. Orbital countermeasures disabled.',14,0,100,0,0,15511,'Flame Leviathan SAY_TOWER_NONE'), +(33113, 6,0,'Hodir''s Fury online. Acquiring target.',14,0,100,0,0,15512,'Flame Leviathan SAY_TOWER_FROST'), +(33113, 7,0,'Mimiron''s Inferno online. Acquiring target.',14,0,100,0,0,15513,'Flame Leviathan SAY_TOWER_FLAME'), +(33113, 8,0,'Freya''s Ward online. Acquiring target.',14,0,100,0,0,15514,'Flame Leviathan SAY_TOWER_NATURE'), +(33113, 9,0,'Thorim''s Hammer online. Acquiring target.',14,0,100,0,0,15515,'Flame Leviathan SAY_TOWER_STORM'), +(33113,10,0,'Unauthorized entity attempting circuit overload. Activating anti-personnel countermeasures.',14,0,100,0,0,15516,'Flame Leviathan SAY_PLAYER_RIDING'), +(33113,11,0,'System malfunction. Diverting power to support systems.',14,0,100,0,0,15517,'Flame Leviathan SAY_OVERLOAD_1'), +(33113,11,1,'Combat matrix overload. Powering do-o-o-own...',14,0,100,0,0,15518,'Flame Leviathan SAY_OVERLOAD_2'), +(33113,11,2,'System restart required. Deactivating weapon systems.',14,0,100,0,0,15519,'Flame Leviathan SAY_OVERLOAD_3'), +(33113,12,0,'%s pursues $n.',41,0,100,0,0,0,'Flame Leviathan EMOTE_PURSUE'), +(33113,13,0,'%s''s circuits overloaded.',41,0,100,0,0,0,'Flame Leviathan EMOTE_OVERLOAD'), +(33113,14,0,'Automatic repair sequence initiated.',41,0,100,0,0,0,'Flame Leviathan EMOTE_REPAIR'), +-- Freya +(32906, 0,0,'The Conservatory must be protected!',14,0,100,0,0,15526,'Freya SAY_AGGRO'), +(32906, 1,0,'Elders grant me your strength!',14,0,100,0,0,15527,'Freya SAY_AGGRO_WITH_ELDER'), +(32906, 2,0,'Forgive me.',14,0,100,0,0,15529,'Freya SAY_SLAY_1'), +(32906, 2,1,'From your death springs life anew!',14,0,100,0,0,15530,'Freya SAY_SLAY_2'), +(32906, 3,0,'His hold on me dissipates. I can see clearly once more. Thank you, heroes.',14,0,100,0,0,15531,'Freya SAY_DEATH'), +(32906, 4,0,'You have strayed too far, wasted too much time!',14,0,100,0,0,15532,'Freya SAY_BERSERK'), +(32906, 5,0,'Eonar, your servant requires aid!',14,0,100,0,0,15528,'Freya SAY_SUMMON_CONSERVATOR'), +(32906, 6,0,'Children, assist me!',14,0,100,0,0,15533,'Freya SAY_SUMMON_TRIO'), +(32906, 7,0,'The swarm of the elements shall overtake you!',14,0,100,0,0,15534,'Freya SAY_SUMMON_LASHERS'), +(32906, 8,0,'A |cFF00FFFFLifebinder''s Gift|r begins to grow!',41,0,100,0,0,0,'Freya EMOTE_LIFEBINDERS_GIFT'), +(32906, 9,0,'Allies of Nature have appeared!',41,0,100,0,0,0,'Freya EMOTE_ALLIES_OF_NATURE'), +(32906,10,0,'Freya begins to cast |cFFFF0000Ground Tremor!|r',41,0,100,0,0,0,'Freya EMOTE_GROUND_TREMOR'), +(32906,11,0,'Freya casts |cFF00FF00Strengthened Iron Roots!|r',41,0,100,0,0,0,'Freya EMOTE_IRON_ROOTS'), +-- Elder Ironbranch +(32913,0,0,'Mortals have no place here!',14,0,100,0,0,15493,'Elder Ironbranch SAY_AGGRO'), +(32913,1,0,'I return you whence you came!',14,0,100,0,0,15494,'Elder Ironbranch SAY_SLAY_1'), +(32913,1,1,'BEGONE!',14,0,100,0,0,15495,'Elder Ironbranch SAY_SLAY_2'), +(32913,2,0,'Freya! They come for you.',14,0,100,0,0,15496,'Elder Ironbranch SAY_DEATH'), +-- Elder Stonebark +(32914,0,0,'This place will serve as your graveyard.',14,0,100,0,0,15500,'Elder Stonebark SAY_AGGRO'), +(32914,1,0,'<Angry roar>',14,0,100,0,0,15501,'Elder Stonebark SAY_SLAY_1'), +(32914,1,1,'Such a waste.',14,0,100,0,0,15502,'Elder Stonebark SAY_SLAY_2'), +(32914,2,0,'Matron, flee! They are ruthless....',14,0,100,0,0,15503,'Elder Stonebark SAY_DEATH'), +-- Elder Brightleaf +(32915,0,0,'Matron, the Conservatory has been breached!',14,0,100,0,0,15483,'Elder Brightleaf SAY_AGGRO'), +(32915,1,0,'Fertilizer.',14,0,100,0,0,15485,'Elder Brightleaf SAY_SLAY_1'), +(32915,1,1,'Your corpse will nourish the soil!',14,0,100,0,0,15486,'Elder Brightleaf SAY_SLAY_2'), +(32915,2,0,'Matron, one has fallen!',14,0,100,0,0,15487,'Elder Brightleaf SAY_DEATH'), +-- Hodir +(32845,0,0,'You will suffer for this trespass!',14,0,100,0,0,15552,'Hodir SAY_AGGRO'), +(32845,1,0,'Tragic. To come so far, only to fail.',14,0,100,0,0,15553,'Hodir SAY_SLAY_1'), +(32845,1,1,'Welcome to the endless winter.',14,0,100,0,0,15554,'Hodir SAY_SLAY_2'), +(32845,2,0,'Winds of the north consume you!',14,0,100,0,0,15555,'Hodir SAY_FLASH_FREEZE'), +(32845,3,0,'%s roars furious.',16,0,100,0,0,15556,'Hodir SAY_STALACTITE'), +(32845,4,0,'I... I am released from his grasp... at last.',14,0,100,0,0,15557,'Hodir SAY_DEATH'), +(32845,5,0,'ENOUGH! This ends now!',14,0,100,0,0,15558,'Hodir SAY_BERSERK'), +(32845,6,0,'%s shatters the Rare Cache of Hodir!',16,0,100,0,0,0,'Hodir SAY_HARD_MODE_MISSED'), +(32845,7,0,'%s begins to cast Flash Freeze!',41,0,100,0,0,0,'Hodir - EMOTE_FREEZE'), +(32845,8,0,'%s gains Frozen Blows!',41,0,100,0,0,0,'Hodir - EMOTE_BLOW'), +-- Ignis +(33118,0,0,'Insolent whelps! Your blood will temper the weapons used to reclaim this world!',14,0,100,0,0,15564,'Ignis SAY_AGGRO'), +(33118,1,0,'Arise, soldiers of the iron crucible! The Makers'' will be done!',14,0,100,0,0,15565,'Ignis SAY_SUMMON'), +(33118,2,0,'I will burn away your impurities!',14,0,100,0,0,15566,'Ignis SAY_SLAG_POT'), +(33118,3,0,'Let the inferno consume you!',14,0,100,0,0,15567,'Ignis SAY_SCORCH_1'), +(33118,3,1,'BURN! Burn in the Maker''s fire!',14,0,100,0,0,15568,'Ignis SAY_SCORCH_2'), +(33118,4,0,'More scraps for the scrapheap!',14,0,100,0,0,15569,'Ignis SAY_SLAY_1'), +(33118,4,1,'Your bones will serve as kindling!',14,0,100,0,0,15570,'Ignis SAY_SLAY_2'), +(33118,5,0,'Let it be finished!',14,0,100,0,0,15571,'Ignis SAY_BERSERK'), +(33118,6,0,'I. Have. Failed.',14,0,100,0,0,15572,'Ignis SAY_DEATH'), +(33118,7,0,'%s begins to cast Flame Jets!',41,0,100,0,0,0,'Ignis EMOTE_JETS'), +-- Kologarn +(32930,0,0,'None shall pass!',14,0,100,0,0,15586,'Kologarn SAY_AGGRO'), +(32930,1,0,'KOL-THARISH!',14,0,100,0,0,15587,'Kologarn SAY_SLAY_1'), +(32930,1,1,'YOU FAIL!',14,0,100,0,0,15588,'Kologarn SAY_SLAY_2'), +(32930,2,0,'Just a scratch!',14,0,100,0,0,15589,'Kologarn SAY_LEFT_ARM_GONE'), +(32930,3,0,'Only a flesh wound!',14,0,100,0,0,15590,'Kologarn SAY_RIGHT_ARM_GONE'), +(32930,4,0,'OBLIVION!',14,0,100,0,0,15591,'Kologarn SAY_SHOCKWAVE'), +(32930,5,0,'I will squeeze the life from you!',14,0,100,0,0,15592,'Kologarn SAY_GRAB_PLAYER'), +(32930,6,0,'Master, they come....',14,0,100,0,0,15593,'Kologarn SAY_DEATH'), +(32930,7,0,'I am invincible!',14,0,100,0,0,15594,'Kologarn SAY_BERSERK'), +(32930,8,0,'Kologarn casts Stone Grip!',41,0,100,0,0,15592,'Kologarn EMOTE_STONE_GRIP'), +-- Expedition Commander +(33210,0,0,'Welcome, champions! All of our attempts at grounding her have failed. We could use a hand in bring her down with these harpoon guns.',12,0,100,0,0,15647,'Expedition Commander SAY_INTRO'), +(33210,1,0,'Move quickly! She won''t remain grounded for long!',14,0,100,0,0,15648,'Expedition Commander SAY_GROUND_PHASE'), +(33210,2,0,'Be on the lookout! Mole machines will be surfacing soon with those nasty Iron dwarves aboard!',14,0,100,0,0,0,'Expedition Commander SAY_AGGRO_2'), +-- Expedition Engineer +(33287,0,0,'Give us a moment to prepare to build the turrets.',14,0,100,0,0,0,'Expedition Engineer SAY_AGGRO_1'), +(33287,1,0,'Ready to move out, keep those dwarves off of our backs!',14,0,100,0,0,0,'Expedition Engineer SAY_AGGRO_3'), +(33287,2,0,'Fires out! Let''s rebuild those turrets!',14,0,100,0,0,0,'SAY_TURRETS'), +-- Razorscale +(33186,0,0,'%s is grounded permanently!',41,0,100,0,0,0,'Razorscale EMOTE_PERMA'), +(33186,1,0,'%s takes a deep breath...',41,0,100,0,0,0,'Razorscale EMOTE_BREATH'), +-- Razorscale Controller +(33233,0,0,'Harpoon Turret is ready for use!',41,0,100,0,0,0,'Razorscale Controller EMOTE_HARPOON'), +-- General Vezax +(33271,0,0,'Your destruction will herald a new age of suffering!',14,0,100,0,0,15542,'General Vezax SAY_AGGRO'), +(33271,1,0,'You thought to stand before the legions of death... and survive?',14,0,100,0,0,15543,'General Vezax SAY_SLAY_1'), +(33271,1,1,'Defiance... a flaw of mortality.',14,0,100,0,0,15544,'General Vezax SAY_SLAY_2'), +(33271,2,0,'The black blood of Yogg-Saron courses through me! I. AM. UNSTOPPABLE!',14,0,100,0,0,15545,'General Vezax SAY_SURGE_OF_DARKNESS'), +(33271,3,0,'Oh, what horrors await....',14,0,100,0,0,15546,'General Vezax SAY_DEATH'), +(33271,4,0,'Your defeat was inevitable!',14,0,100,0,0,15547,'General Vezax SAY_BERSERK'), +(33271,5,0,'Behold, now! Terror, absolute!',14,0,100,0,0,15548,'General Vezax SAY_HARDMODE'), +(33271,6,0,'The saronite vapors mass and swirl violently, merging into a monstrous form!',41,0,100,0,0,0,'General Vezax - EMOTE_ANIMUS'), +(33271,7,0,'A saronite barrier appears around General Vezax!',41,0,100,0,0,0,'General Vezax - EMOTE_BARRIER'), +(33271,8,0,'%s roars and surges with dark might!',41,0,100,0,0,0,'General Vezax - EMOTE_SURGE_OF_DARKNESS'), +-- Saronite Vapor +(33488,0,0,'A cloud of saronite vapors coalesces nearby!',41,0,100,0,0,0,'Saronite Vapor - EMOTE_VAPORS'), +-- XT-002 Deconstructor +(33293, 0,0,'New toys? For me? I promise I won''t break them this time!',14,0,100,0,0,15724,'XT-002 Deconstructor SAY_AGGRO'), +(33293, 1,0,'So tired. I will rest for just a moment!',14,0,100,0,0,15725,'XT-002 Deconstructor SAY_HEART_OPENED'), +(33293, 2,0,'I''m ready to play!',14,0,100,0,0,15726,'XT-002 Deconstructor SAY_HEART_CLOSED'), +(33293, 3,0,'NO! NO! NO! NO! NO!',14,0,100,0,0,15727,'XT-002 Deconstructor SAY_TYMPANIC_TANTRUM'), +(33293, 4,0,'I... I think I broke it.',14,0,100,0,0,15728,'XT-002 Deconstructor SAY_SLAY_1'), +(33293, 4,1,'I guess it doesn''t bend that way.',14,0,100,0,0,15729,'XT-002 Deconstructor SAY_SLAY_2'), +(33293, 5,0,'I''m tired of these toys. I don''t want to play anymore!',14,0,100,0,0,15730,'XT-002 Deconstructor SAY_BERSERK'), +(33293, 6,0, 'You are bad... Toys... Very... Baaaaad ',14,0,100,0,0,15731,'XT-002 Deconstructor SAY_DEATH'), +(33293, 7,0,'Time for a new game! My old toys will fight my new toys!',14,0,100,0,0,15732,'XT-002 Deconstructor SAY_SUMMON'), +(33293, 8,0,'%s''s heart is exposed and leaking energy.',41,0,100,0,0,0,'XT-002 Deconstructor EMOTE_HEART_OPENED'), +(33293, 9,0,'%s''s heart is severed from his body.',41,0,100,0,0,0,'XT-002 Deconstructor EMOTE_HEART_CLOSED'), +(33293,10,0,'%s begins to cause the earth to quake.',41,0,100,0,0,0,'XT-002 Deconstructor EMOTE_TYMPANIC_TANTRUM'), +(33293,11,0,'%s consumes a scrap bot to repair himself!',41,0,100,0,0,0,'XT-002 Deconstructor EMOTE_SCRAPBOT'), +-- Thorim +(32865, 0,0,'Interlopers! You mortals who dare to interfere with my sport will pay... Wait--you...',14,0,100,0,0,15733,'Thorim SAY_AGGRO_1'), +(32865, 0,1,'I remember you... In the mountains... But you... what is this? Where am--',14,0,100,0,0,15734,'Thorim SAY_AGGRO_2'), +(32865, 1,0,'Behold the power of the storms and despair!',14,0,100,0,0,15735,'Thorim SAY_SPECIAL_1'), +(32865, 2,0,'Do not hold back! Destroy them!',14,0,100,0,0,15736,'Thorim SAY_SPECIAL_2'), +(32865, 3,0,'Have you begun to regret your intrusion?',14,0,100,0,0,15737,'Thorim SAY_SPECIAL_3'), +(32865, 4,0,'Impertinent whelps, you dare challenge me atop my pedestal? I will crush you myself!',14,0,100,0,0,15738,'Thorim SAY_JUMPDOWN'), +(32865, 5,0,'Can''t you at least put up a fight!?',14,0,100,0,0,15739,'Thorim SAY_SLAY_1'), +(32865, 5,1,'Pathetic.',14,0,100,0,0,15740,'Thorim SAY_SLAY_2'), +(32865, 6,0,'My patience has reached its limit!',14,0,100,0,0,15741,'Thorim SAY_BERSERK'), +(32865, 7,0,'Failures! Weaklings!',14,0,100,0,0,15742,'Thorim SAY_WIPE'), +(32865, 8,0,'Stay your arms! I yield!',14,0,100,0,0,15743,'Thorim SAY_DEATH'), +(32865, 9,0,'I feel as though I am awakening from a nightmare, but the shadows in this place yet linger.',14,0,100,0,0,15744,'Thorim SAY_END_NORMAL_1'), +(32865,10,0,'Sif... was Sif here? Impossible--she died by my brother''s hand. A dark nightmare indeed....',14,0,100,0,0,15745,'Thorim SAY_END_NORMAL_2'), +(32865,11,0,'I need time to reflect.... I will aid your cause if you should require it. I owe you at least that much. Farewell.',14,0,100,0,0,15746,'Thorim SAY_END_NORMAL_3'), +(32865,12,0,'You! Fiend! You are not my beloved! Be gone!',14,0,100,0,0,15747,'Thorim SAY_END_HARD_1'), +(32865,13,0,'Behold the hand behind all the evil that has befallen Ulduar, left my kingdom in ruins, corrupted my brother, and slain my wife.',14,0,100,0,0,15748,'Thorim SAY_END_HARD_2'), +(32865,14,0,'And now it falls to you, champions, to avenge us all. The task before you is great, but I will lend you my aid as I am able. You must prevail.',14,0,100,0,0,15749,'Thorim SAY_END_HARD_3'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=64604; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13,1,64604,0,0,31,0,4,0,0,0,0,0,'','Freya - Nature Bomb'); diff --git a/sql/updates/world/2012_12_01_04_world_spelldifficulty_dbc.sql b/sql/updates/world/2012_12_01_04_world_spelldifficulty_dbc.sql new file mode 100644 index 00000000000..fe5df812c71 --- /dev/null +++ b/sql/updates/world/2012_12_01_04_world_spelldifficulty_dbc.sql @@ -0,0 +1,8 @@ +DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (63573,63766,63716,62030,62166,63347) OR `spellid0` IN (63573,63766,63716,62030,62166,63347); +INSERT INTO `spelldifficulty_dbc`(`id`,`spellid0`,`spellid1`) VALUES +(63573,63573,64006), -- One-Armed Overhead Smash +(63766,63766,63983), -- Arm Sweep +(63716,63716,64005), -- Stone Shout +(62030,62030,63980), -- Petrifying Breath +(62166,62166,64005), -- Stone Grip +(63347,63347,63977); -- Focused Eyebeam Periodic diff --git a/sql/updates/world/2012_12_01_05_world_creature_template.sql b/sql/updates/world/2012_12_01_05_world_creature_template.sql new file mode 100644 index 00000000000..aa2c6ebb898 --- /dev/null +++ b/sql/updates/world/2012_12_01_05_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `faction_A`=1885,`faction_H`=1885 WHERE `entry`=30884; -- Iskalder <The Ancient Hero> diff --git a/sql/updates/world/2012_12_02_00_world_game_object.sql b/sql/updates/world/2012_12_02_00_world_game_object.sql new file mode 100644 index 00000000000..3205159a703 --- /dev/null +++ b/sql/updates/world/2012_12_02_00_world_game_object.sql @@ -0,0 +1,24 @@ +-- Some Spell focus corrections +-- Signal Fire +SET @GUID :=99716; +DELETE FROM `gameobject` WHERE `guid`=@GUID; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID,194151,571,1,1,4061.978,7109.135,170.0001,0,0,0,0,1,120,255,1); + +DELETE FROM `gameobject_template` WHERE `entry`=300242; + +-- Shrine Of Remulos +UPDATE `gameobject` SET `id`=15885 WHERE `id`=300142; +DELETE FROM `gameobject_template` WHERE `entry`=300142; + +-- Witherbark Village +UPDATE `gameobject` SET `id`=142698 WHERE `id`=300016; +DELETE FROM `gameobject_template` WHERE `entry`=300016; + +-- Maraudon Portal +UPDATE `gameobject` SET `id`=178400 WHERE `id`=300037; +DELETE FROM `gameobject_template` WHERE `entry`=300037; + +-- Scorched Grove Runeston +UPDATE `gameobject` SET `id`=181260 WHERE `id`=300086; +DELETE FROM `gameobject_template` WHERE `entry`=300086; diff --git a/sql/updates/world/2012_12_02_01_world_creature_text.sql b/sql/updates/world/2012_12_02_01_world_creature_text.sql new file mode 100644 index 00000000000..bd98fc8527c --- /dev/null +++ b/sql/updates/world/2012_12_02_01_world_creature_text.sql @@ -0,0 +1,777 @@ +-- ------------------------------- -- +-- Creature text conversion part 5 -- +-- ------------------------------- -- + +-- draenei survivor +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000183 AND -1000176; +DELETE FROM `creature_text` WHERE `entry`=16483; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(16483,0,0,12,0,100,"draenei survivor SAY_HEAL1","The last thing I remember is the ship falling and us getting into the pods. I'll go see how I can help. Thank you!"), +(16483,0,1,12,0,100,"draenei survivor SAY_HEAL2","$C, Where am I? Who are you? Oh no! What happened to the ship?"), +(16483,0,2,12,0,100,"draenei survivor SAY_HEAL3","$C You saved me! I owe you a debt that I can never repay. I'll go see if I can help the others."), +(16483,0,3,12,0,100,"draenei survivor SAY_HEAL4","Ugh... what is this place? Is that all that's left of the ship over there?"), +(16483,1,0,12,0,100,"draenei survivor SAY_HELP1","Oh, the pain..."), +(16483,1,1,12,0,100,"draenei survivor SAY_HELP2","Everything hurts, Please make it stop..."), +(16483,1,2,12,0,100,"draenei survivor SAY_HELP3","Ughhh... I hurt. Can you help me?"), +(16483,1,3,12,0,100,"draenei survivor SAY_HELP4","I don't know if I can make it, please help me..."); + +-- engineer spark +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000186 AND -1000184; +DELETE FROM `creature_text` WHERE `entry`=17243; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17243,0,0,12,0,100,"engineer spark SAY_TEXT","Yes Master, all goes along as planned."), +(17243,1,0,16,0,100,"engineer spark EMOTE_SHELL","%s puts the shell to his ear."), +(17243,2,0,14,0,100,"engineer spark SAY_ATTACK","Now I cut you!"); + +-- magwin +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000116 AND -1000111; +DELETE FROM `creature_text` WHERE `entry`=17312; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17312,0,0,12,0,100,"magwin SAY_START","Our house is this way, through the thicket."), +(17312,1,0,12,0,100,"magwin SAY_AGGRO","Help me!"), +(17312,2,0,12,0,100,"magwin SAY_PROGRESS","My poor family. Everything has been destroyed."), +(17312,3,0,12,0,100,"magwin SAY_END1","Father! Father! You're alive!"), +(17312,4,0,12,0,100,"magwin SAY_END2","You can thank $N for getting me back here safely, father."), +(17312,5,0,16,0,100,"magwin EMOTE_HUG","%s hugs her father."); + +-- geezle +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000636 AND -1000629; +DELETE FROM `creature_text` WHERE `entry` IN (17243,17318); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17318,0,0,12,0,100,"geezle GEEZLE_SAY_1","What's the big idea, Spark?"), +(17243,0,0,12,0,100,"geezle SPARK_SAY_2","What's the big idea? You nearly blew my cover, idiot! I told you to put the compass and navigation maps somewhere safe - not out in the open for any fool to discover."), +(17243,1,0,12,0,100,"geezle SPARK_SAY_3","The Master has gone to great lengths to secure information about the whereabouts of the Exodar. You could have blown the entire operation, including the cover of our spy on the inside."), +(17318,1,0,12,0,100,"geezle GEEZLE_SAY_4","Relax, Spark! I have it all under control. We'll strip mine the Exodar right out from under 'em - making both you and I very, very rich in the process."), +(17243,2,0,12,0,100,"geezle SPARK_SAY_5","Relax? Do you know what Kael'thas does to those that fail him, Geezle? Eternal suffering and pain... Do NOT screw this up, fool."), +(17243,3,0,12,0,100,"geezle SPARK_SAY_6","Our Bloodmyst scouts have located our contact. The fool, Velen, will soon leave himself open and defenseless -- long enough for us to strike! Now get out of my sight before I vaporize you..."), +(17318,2,0,12,0,100,"geezle GEEZLE_SAY_7","Yes, sir. It won't happen again..."), +(17243,4,0,16,0,100,"geezle EMOTE_SPARK","picks up the naga flag."); + +-- stillpine capitive +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000476 AND -1000474; +DELETE FROM `creature_text` WHERE `entry`=17375; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17375,0,0,12,0,100,"stillpine capitive CAPITIVE_SAY_1","[Fulborg] The Stillpine furbolgs will not soon forget your bravery!"), +(17375,0,1,12,0,100,"stillpine capitive CAPITIVE_SAY_2","[Fulborg] Thank you, $N"), +(17375,0,2,12,0,100,"stillpine capitive CAPITIVE_SAY_3","[Fulborg] Those remaining at Stillpine Hold will welcome you as a hero!"); + +-- morridune +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1048004 AND -1048003; +DELETE FROM `creature_text` WHERE `entry`=6729; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(6729,0,0,14,0,100,"morridune SAY_MORRIDUNE_1","Aku'mai is dead! At last,I can leave this wretched place."), +(6729,1,0,12,0,100,"morridune SAY_MORRIDUNE_2","Speak with me to hear my tale"); + +-- princess stillpine +DELETE FROM `script_texts` WHERE `entry`=1800074; +DELETE FROM `creature_text` WHERE `entry`=17682; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17682,0,0,12,0,100,"princess stillpine SAY_DIRECTION","Go to the west"); + +-- kerlonian +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000444 AND -1000434; +DELETE FROM `creature_text` WHERE `entry`=11218; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(11218,0,0,12,0,100,"kerlonian SAY_KER_START","Liladris has been waiting for me at Maestra's Post, so we should make haste, $N."), +(11218,1,0,16,0,100,"kerlonian EMOTE_KER_SLEEP_1","%s looks very sleepy..."), +(11218,1,1,16,0,100,"kerlonian EMOTE_KER_SLEEP_2","%s suddenly falls asleep"), +(11218,1,2,16,0,100,"kerlonian EMOTE_KER_SLEEP_3","%s begins to drift off..."), +(11218,2,0,12,0,100,"kerlonian SAY_KER_SLEEP_1","This looks like the perfect place for a nap..."), +(11218,2,1,12,0,100,"kerlonian SAY_KER_SLEEP_2","Yaaaaawwwwwnnnn..."), +(11218,2,2,12,0,100,"kerlonian SAY_KER_SLEEP_3","Oh, I am so tired..."), +(11218,2,3,12,0,100,"kerlonian SAY_KER_SLEEP_4","You don't mind if I stop here for a moment, do you?"), +(11218,3,0,12,0,100,"kerlonian SAY_KER_ALERT_1","Be on the alert! The Blackwood furbolgs are numerous in the area..."), +(11218,3,1,12,0,100,"kerlonian SAY_KER_ALERT_2","It's quiet... Too quiet..."), +(11218,4,0,12,0,100,"kerlonian SAY_KER_END","Oh, I can see Liladris from here... Tell her I'm here, won't you?"), +(11218,5,0,16,0,100,"kerlonian EMOTE_KER_AWAKEN","%s wakes up!"); + +-- remtravel +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000339 AND -1000327; +DELETE FROM `creature_text` WHERE `entry`=2917; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(2917,0,0,12,0,100,"remtravel SAY_REM_START","Ok, $n, let's go find where I left that mysterious fossil. Follow me!"), +(2917,1,0,12,0,100,"remtravel SAY_REM_RAMP1_1","Now where did I put that mysterious fossil? Ah, maybe up there..."), +(2917,2,0,12,0,100,"remtravel SAY_REM_RAMP1_2","Hrm, nothing up here."), +(2917,3,0,12,0,100,"remtravel SAY_REM_BOOK","No mysterious fossil here... Ah, but my copy of Green Hills of Stranglethorn. What a good book!"), +(2917,4,0,12,0,100,"remtravel SAY_REM_TENT1_1","I bet you I left it in the tent!"), +(2917,5,0,12,0,100,"remtravel SAY_REM_TENT1_2","Oh wait, that's Hollee's tent... and it's empty."), +(2917,6,0,12,0,100,"remtravel SAY_REM_MOSS","Interesting... I hadn't noticed this earlier..."), +(2917,7,0,16,0,100,"remtravel EMOTE_REM_MOSS","%s inspects the ancient, mossy stone."), +(2917,8,0,12,0,100,"remtravel SAY_REM_MOSS_PROGRESS","Oh wait! I'm supposed to be looking for that mysterious fossil!"), +(2917,9,0,12,0,100,"remtravel SAY_REM_PROGRESS","Nope. didn't leave the fossil back here!"), +(2917,10,0,12,0,100,"remtravel SAY_REM_REMEMBER","Ah. I remember now! I gave the mysterious fossil to Hollee! Check with her."), +(2917,11,0,16,0,100,"remtravel EMOTE_REM_END","%s goes back to work, oblivious to everything around him."), +(2917,12,0,12,0,100,"remtravel SAY_REM_AGGRO","Something tells me this $r wants the mysterious fossil too. Help!"); + +-- hendel +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000415 AND -1000411; +DELETE FROM `creature_text` WHERE `entry`=4966; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(4966,0,0,12,0,100,"hendel SAY_PROGRESS_1_TER","Why don't we deal with you now, Hendel? Lady Proudmoore will speak for you back in the tower."), +(4966,1,0,12,0,100,"hendel SAY_PROGRESS_2_HEN","Please... please... Miss Proudmore. I didn't mean to..."), +(4966,2,0,12,0,100,"hendel SAY_PROGRESS_3_TER","I apologize for taking so long to get here. I wanted Lady Proudmoore to be present also."), +(4966,3,0,12,0,100,"hendel SAY_PROGRESS_4_TER","We can only stay a few moments before returning to the tower. If you wish to speak to us more you may find us there."), +(4966,4,0,16,0,100,"hendel EMOTE_SURRENDER","%s, too injured, gives up the chase."); + +-- zelfrax +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000473 AND -1000472; +DELETE FROM `creature_text` WHERE `entry`=23864; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(23864,0,0,14,0,100,"zelfrax SAY_ZELFRAX1","This land was mine long before your wretched kind set foot here."), +(23864,1,0,14,0,100,"zelfrax SAY_ZELFRAX2","All who venture here belong to me,including you!"); + +-- oox +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000292 AND -1000287; +DELETE FROM `creature_text` WHERE `entry`=7807; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(7807,0,0,12,0,100,"oox SAY_OOX_START","Emergency power activated! Initializing ambulanory motor! CLUCK!"), +(7807,1,0,12,0,100,"oox SAY_OOX_AGGRO1","Physical threat detected! Evasive action! CLUCK!"), +(7807,1,1,12,0,100,"oox SAY_OOX_AGGRO2","Thread analyzed! Activating combat plan beta! CLUCK!"), +(7807,2,0,12,0,100,"oox SAY_OOX_AMBUSH","CLUCK! Sensors detect spatial anomaly - danger imminent! CLUCK!"), +(7807,3,0,12,0,100,"oox SAY_OOX_END","Cloaking systems online! CLUCK! Engaging cloak for transport to Booty Bay!"); + +-- kyle +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000342 AND -1000340; +DELETE FROM `creature_text` WHERE `entry`=23616; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(23616,0,0,16,0,100,"kyle EMOTE_SEE_LUNCH","%s howls in delight at the sight of his lunch!"), +(23616,1,0,16,0,100,"kyle EMOTE_EAT_LUNCH","%s eats his lunch."), +(23616,2,0,16,0,100,"kyle EMOTE_DANCE","%s thanks you with a special dance."); + +-- willix +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1047010 AND -1047000; +DELETE FROM `creature_text` WHERE `entry`=4508; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(4508,0,0,12,0,100,"willix SAY_READY","Phew! Finally, out here. However, it will not become easy. Detain your eyes after annoyance."), +(4508,1,0,12,0,100,"willix SAY_POINT","There on top resides Charlga Razorflank. The damned old Crone."), +(4508,2,0,12,0,100,"willix SAY_AGGRO1","Help! Get this Raging Agam'ar from me!"), +(4508,3,0,12,0,100,"willix SAY_BLUELEAF","In this ditch there are Blueleaf Tuber! As if the gold waited only to be dug out, I say it you!"), +(4508,4,0,12,0,100,"willix SAY_DANGER","Danger is behind every corner."), +(4508,5,0,12,0,100,"willix SAY_BAD","I do not understand how these disgusting animals can live at such a place.... puh as this stinks!"), +(4508,6,0,12,0,100,"willix SAY_THINK","I think, I see a way how we come out of this damned thorn tangle."), +(4508,7,0,12,0,100,"willix SAY_SOON","I am glad that we are out again from this damned ditch. However, up here it is not much better!"), +(4508,8,0,12,0,100,"willix SAY_FINALY","Finally! I am glad that I come, finally out here."), +(4508,9,0,12,0,100,"willix SAY_WIN","I will rather rest a moment and come again to breath, before I return to Ratchet."), +(4508,10,0,12,0,100,"willix SAY_END","Many thanks for your help."); + +-- threshwackonator +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000326 AND -1000325; +DELETE FROM `creature_text` WHERE `entry`=6669; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(6669,0,0,16,0,100,"threshwackonator EMOTE_START","\"Threshwackonator First Mate unit prepared to follow\""), +(6669,1,0,12,0,100,"threshwackonator SAY_AT_CLOSE","YARRR! Swabie, what have ye done?! He's gone mad! Baton him down the hatches! Hoist the mast! ARRRR! Every man for hi'self!"); + +-- kodo round +DELETE FROM `script_texts` WHERE `entry`=-1000350; +DELETE FROM `creature_text` WHERE `entry`=9453; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(9453,0,0,12,0,100,"kodo round SAY_SMEED_HOME_3","That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me."); + +-- oox +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000292 AND -1000287; +DELETE FROM `creature_text` WHERE `entry` IN (7784,7805); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(7784,0,0,12,0,100,"oox SAY_OOX_START","Emergency power activated! Initializing ambulanory motor! CLUCK!"), +(7784,1,0,12,0,100,"oox SAY_OOX_AGGRO1","Physical threat detected! Evasive action! CLUCK!"), +(7784,1,1,12,0,100,"oox SAY_OOX_AGGRO2","Thread analyzed! Activating combat plan beta! CLUCK!"), +(7784,2,0,12,0,100,"oox SAY_OOX_AMBUSH","CLUCK! Sensors detect spatial anomaly - danger imminent! CLUCK!"), +(7805,0,0,12,0,100,"oox SAY_OOX17_AMBUSH_REPLY","No one challanges the Wastewander nomads - not even robotic chickens! ATTACK!"), +(7784,3,0,12,0,100,"oox SAY_OOX_END","Cloaking systems online! CLUCK! Engaging cloak for transport to Booty Bay!"); + +-- tooga +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000398 AND -1000391; +DELETE FROM `creature_text` WHERE `entry` IN (5955,6015); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(5955,0,0,12,0,100,"tooga SAY_TOOG_THIRST","I'm Thirsty."), +(5955,0,1,12,0,100,"tooga SAY_TOOG_WORRIED","Torta must be so worried."), +(5955,1,0,12,0,100,"tooga SAY_TOOG_POST_1","Torta, my love! I have returned at long last."), +(6015,0,0,12,0,100,"tooga SAY_TORT_POST_2","You have any idea how long I've been waiting here? And where's dinner? All that time gone and nothing to show for it?"), +(5955,2,0,12,0,100,"tooga SAY_TOOG_POST_3","My dearest Torta. I have been gone for so long. Finally we are reunited. At long last our love can blossom again."), +(6015,1,0,12,0,100,"tooga SAY_TORT_POST_4","Enough with the rambling. I am starving! Now, get your dusty shell into that ocean and bring momma some grub."), +(5955,3,0,12,0,100,"tooga SAY_TOOG_POST_5","Yes Torta. Whatever your heart desires..."), +(6015,2,0,12,0,100,"tooga SAY_TORT_POST_6","And try not to get lost this time..."); + +-- cthun +DELETE FROM `script_texts` WHERE `entry`=-1531011; +DELETE FROM `creature_text` WHERE `entry`=15727; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15727,0,0,16,0,100,"cthun EMOTE_WEAKENED","%s is weakened!"); + +-- huhuran +DELETE FROM `creature_text` WHERE `entry`=15509; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15509,0,0,16,0,100,"huhuran EMOTE_FRENZY_KILL","%s goes into a killing frenzy!"), +(15509,1,0,16,0,100,"huhuran EMOTE_BERSERK","%s goes into a berserker rage!"); + +-- sartura +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1531010 AND -1531008; +DELETE FROM `creature_text` WHERE `entry`=15516; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15516,0,0,14,8646,100,"sartura SAY_AGGRO","You will be judged for defiling these sacred grounds! The laws of the Ancients will not be challenged! Trespassers will be annihilated!"), +(15516,1,0,14,8647,100,"sartura SAY_SLAY","I sentence you to death!"), +(15516,2,0,14,8648,100,"sartura SAY_DEATH","I serve to the last!"); + +-- skeram +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1531007 AND -1531000; +DELETE FROM `creature_text` WHERE `entry`=15263; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15263,0,0,14,8615,100,"skeram SAY_AGGRO1","Are you so eager to die? I would be happy to accomodate you."), +(15263,0,1,14,8616,100,"skeram SAY_AGGRO2","Cower mortals! The age of darkness is at hand."), +(15263,0,2,14,8621,100,"skeram SAY_AGGRO3","Tremble! The end is upon you."), +(15263,1,0,14,8617,100,"skeram SAY_SLAY1","Let your death serve as an example!"), +(15263,1,1,14,8619,100,"skeram SAY_SLAY2","Spineless wretches! You will drown in rivers of blood!"), +(15263,1,2,14,8620,100,"skeram SAY_SLAY3","The screams of the dying will fill the air. A symphony of terror is about to begin!"), +(15263,2,0,14,8618,100,"skeram SAY_SPLIT","Prepare for the return of the ancient ones!"), +(15263,3,0,14,8622,100,"skeram SAY_DEATH","You only delay... the inevetable."); + +-- kanati +DELETE FROM `script_texts` WHERE `entry`=-1000410; +DELETE FROM `creature_text` WHERE `entry`=10638; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(10638,0,0,12,0,100,"kanati SAY_KAN_START","Here they come! Defend yourself!"); + +-- lakota +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000369 AND -1000365; +DELETE FROM `creature_text` WHERE `entry`=10646; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(10646,0,0,12,0,100,"lakota SAY_LAKO_START","Be on guard... Arnak has some strange power over the Grimtotem... they will not be happy to see me escape."), +(10646,1,0,12,0,100,"lakota SAY_LAKO_LOOK_OUT","Look out, the Grimtotem are upon us!"), +(10646,2,0,12,0,100,"lakota SAY_LAKO_HERE_COME","Here they come."), +(10646,3,0,12,0,100,"lakota SAY_LAKO_MORE","More Grimtotems are coming this way!"), +(10646,4,0,12,0,100,"lakota SAY_LAKO_END","Finally, free at last... I must be going now, thanks for helping me escape. I can get back to Freewind Post by myself."); + +-- paoka +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000364 AND -1000362; +DELETE FROM `creature_text` WHERE `entry`=10427; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(10427,0,0,12,0,100,"paoka SAY_START","Let's go $N. I am ready to reach Whitereach Post."), +(10427,1,0,12,0,100,"paoka SAY_WYVERN","Now this looks familiar. If we keep heading east, I think we can... Ahh, Wyvern on the attack!"), +(10427,2,0,12,0,100,"paoka SAY_COMPLETE","Thanks a bunch... I can find my way back to Whitereach Post from here. Be sure to talk with Motega Firemane; perhaps you can keep him from sending me home."); + +-- disciple +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1043017 AND -1043000; +DELETE FROM `creature_text` WHERE `entry` IN (3679,3678); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(3678,0,0,14,0,100,"disciple SAY_AT_LAST","At last! Naralex can be awakened! Come aid me, brave adventurers!"), +(3678,1,0,12,0,100,"disciple SAY_MAKE_PREPARATIONS","I must make the necessary preparations before the awakening ritual can begin. You must protect me!"), +(3678,2,0,12,0,100,"disciple SAY_TEMPLE_OF_PROMISE","These caverns were once a temple of promise for regrowth in the Barrens. Now, they are the halls of nightmares."), +(3678,3,0,12,0,100,"disciple SAY_MUST_CONTINUE","Come. We must continue. There is much to be done before we can pull Naralex from his nightmare."), +(3678,4,0,12,0,100,"disciple SAY_BANISH_THE_SPIRITS","Within this circle of fire I must cast the spell to banish the spirits of the slain Fanglords."), +(3678,5,0,12,0,100,"disciple SAY_CAVERNS_PURIFIED","The caverns have been purified. To Naralex's chamber we go!"), +(3678,6,0,12,0,100,"disciple SAY_BEYOND_THIS_CORRIDOR","Beyond this corridor, Naralex lies in fitful sleep. Let us go awaken him before it is too late."), +(3678,7,0,12,0,100,"disciple SAY_EMERALD_DREAM","Protect me brave souls as I delve into this Emerald Dream to rescue Naralex and put an end to this corruption!"), +(3678,8,0,16,0,100,"disciple EMOTE_AWAKENING_RITUAL","%s begins to perform the awakening ritual on Naralex."), +(3679,0,0,16,0,100,"naralex EMOTE_TROUBLED_SLEEP","%s tosses fitfully in troubled sleep."), +(3679,1,0,16,0,100,"naralex EMOTE_WRITHE_IN_AGONY","%s writhes in agony. The Disciple seems to be breaking through."), +(3679,2,0,16,0,100,"naralex EMOTE_HORRENDOUS_VISION","%s dreams up a horrendous vision. Something stirs beneath the murky waters."), +(3678,9,0,12,0,100,"disciple SAY_MUTANUS_THE_DEVOURER","This Mutanus the Devourer is a minion from Naralex's nightmare no doubt!"), +(3679,3,0,14,0,100,"naralex SAY_I_AM_AWAKE","I AM AWAKE, AT LAST!"), +(3678,10,0,12,0,100,"disciple SAY_NARALEX_AWAKES","At last! Naralex awakes from the nightmare."), +(3679,4,0,12,0,100,"naralex SAY_THANK_YOU","Ah, to be pulled from the dreaded nightmare! I thank you, my loyal Disciple, along with your brave companions."), +(3679,5,0,12,0,100,"naralex SAY_FAREWELL","We must go and gather with the other Disciples. There is much work to be done before I can make another attempt to restore the Barrens. Farewell, brave souls!"), +(3678,11,0,12,0,100,"disciple SAY_ATTACKED","Attacked! Help get this $N off of me!"); + +-- weegli blastfuse +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1209001 AND -1209000; +DELETE FROM `creature_text` WHERE `entry`=7607; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(7607,0,0,12,0,100,"weegli blastfuse SAY_WEEGLI_OHNO","Oh no! Here they come!"), +(7607,1,0,12,0,100,"weegli blastfuse SAY_WEEGLI_OK_I_GO","OK. Here I go."); + +-- anub arak +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1601010 AND -1601000; +DELETE FROM `creature_text` WHERE `entry`=29120; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29120,0,0,14,14054,100,"anub arak SAY_AGGRO","Eternal aggony awaits you!"), +(29120,1,0,14,14057,100,"anub arak SAY_SLAY_1","Soon, the Master's voice will call to you."), +(29120,1,1,14,14056,100,"anub arak SAY_SLAY_2","You have made your choice."), +(29120,1,2,14,14055,100,"anub arak SAY_SLAY_3","You shall experience my torment, first-hand!"), +(29120,2,0,14,14069,100,"anub arak SAY_DEATH","Ahhh... RAAAAAGH! Never thought... I would be free of him..."), +(29120,3,0,14,14060,100,"anub arak SAY_LOCUST_1","Your armor is useless againts my locusts."), +(29120,3,1,14,14067,100,"anub arak SAY_LOCUST_2","Uunak-hissss tik-k-k-k-k!"), +(29120,3,2,14,14068,100,"anub arak SAY_LOCUST_3","The pestilence upon you!"), +(29120,4,0,14,14058,100,"anub arak SAY_SUBMERGE_1","Auum na-l ak-k-k-k, isshhh."), +(29120,4,1,14,14059,100,"anub arak SAY_SUBMERGE_2","Come forth my brethren! Feast on their flesh."), +(29120,5,0,14,14053,100,"anub arak SAY_INTRO","I was king of this empire once, long ago. In life I stood as champion. In death I returned as conqueror. Now I protect the kingdom once more. Ironic, yes? "); + +-- krik thir +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1601022 AND -1601011; +DELETE FROM `creature_text` WHERE `entry`=28684; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(28684,0,0,14,14075,100,"krik thir SAY_AGGRO","This kingdom belongs to the Scourge! Only the dead may enter."), +(28684,1,0,14,14077,100,"krik thir SAY_SLAY_1","You were foolish to come."), +(28684,1,1,14,14078,100,"krik thir SAY_SLAY_2","As Anub'Arak commands!"), +(28684,2,0,14,14087,100,"krik thir SAY_DEATH","I should be grateful. But I long ago lost the capacity."), +(28684,3,0,14,14085,100,"krik thir SAY_SWARM_1","They hunger."), +(28684,3,1,14,14086,100,"krik thir SAY_SWARM_2","Dinner time, my pets."), +(28684,4,0,14,14082,100,"krik thir SAY_PREFIGHT_1","Keep an eye on the tunnel. We must not let anyone through!"), +(28684,4,1,14,14083,100,"krik thir SAY_PREFIGHT_2","I hear footsteps. Be on your guard."), +(28684,4,2,14,14084,100,"krik thir SAY_PREFIGHT_3","I sense the living. Be ready."), +(28684,5,0,14,14079,100,"krik thir SAY_SEND_GROUP_1","We are besieged. Strike out and bring back their corpses!"), +(28684,5,1,14,14080,100,"krik thir SAY_SEND_GROUP_2","We must hold the gate. Attack! Tear them limb from limb!"), +(28684,5,2,14,14081,100,"krik thir SAY_SEND_GROUP_3","The gate must be protected at all costs. Rip them to shreds!"); + +-- thassarian +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1571023 AND -1571004; +DELETE FROM `creature_text` WHERE `entry` IN (25301,26203,26170,25250,25251); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +-- talbot +(25301,0,0,12,0,100,"thassarian SAY_TALBOT_1","My liege, the infiltration and control of the Alliance power structure by our cultists is well underway."), +(25301,1,0,12,0,100,"thassarian SAY_TALBOT_2","The power you've bestowed upon me has allowed me great mental influence over human minds. I bear these offerings as proof of my progress."), +(25301,2,0,12,0,100,"thassarian SAY_TALBOT_3","Allow me to take care of the intruders, lord. I will feed their entrails to the maggots."), +(25301,3,0,12,0,100,"thassarian SAY_TALBOT_4","Yes, my lord!"), +-- arthas +(26203,0,0,12,0,100,"thassarian SAY_LICH_1","Your progress in this region has been impressive, Blood Prince. I am pleased..."), +(26203,1,0,12,0,100,"thassarian SAY_LICH_2","Now this is a surprise, Thassarian. I hadn't heard from Mograine or the other death knights for months. You've come to rejoin the Scourge, I take it?"), +(26203,2,0,12,0,100,"thassarian SAY_LICH_3","Do not fail me, San'layn. Return to Icecrown with this fool's head or do not bother to return."), +-- thassarian +(26170,0,0,14,0,100,"thassarian SAY_THASSARIAN_1","Leryssa!"), +(26170,1,0,14,0,100,"thassarian SAY_THASSARIAN_2","What have you done to my sister, you motherless elf scum!?"), +(26170,2,0,12,0,100,"thassarian SAY_THASSARIAN_3","I would sooner slit my own throat. You will pay for what you did to your own men, Arthas... for what you did to me! I swear it."), +(26170,3,0,12,0,100,"thassarian SAY_THASSARIAN_4","Leryssa... you... you're all right!"), +(26170,4,0,12,0,100,"thassarian SAY_THASSARIAN_5","I cannot return home with you just yet, Leryssa. I am not quite done with the Scourge."), +(26170,5,0,12,0,100,"thassarian SAY_THASSARIAN_6","You might be right, sister. My obligations to my land and King have been fulfilled. But there is still something that I owe to myself."), +(26170,6,0,12,0,100,"thassarian SAY_THASSARIAN_7","Do not worry, Leryssa. I will come back to you when I'm done. Nothing in the world will stop me from coming home to the only family that I have left."), +-- arlos +(25250,0,0,12,0,100,"thassarian SAY_ARLOS_1","What... what happened to me?"), +(25250,1,0,12,0,100,"thassarian SAY_ARLOS_2","Ugh! My head won't stop spinning..."), +-- leryssa +(25251,0,0,14,0,100,"thassarian SAY_LERYSSA_1","Thassarian, you're alive!"), +(25251,1,0,12,0,100,"thassarian SAY_LERYSSA_2","I thought... I thought you were... dead."), +(25251,2,0,12,0,100,"thassarian SAY_LERYSSA_3","Don't leave me again! You want to fight for your country, but they don't even want you! They sent you here to die!"), +(25251,3,0,12,0,100,"thassarian SAY_LERYSSA_4","I know that look in your eye... I'm not going to be able to talk you out of this. If you die on me again..."); + +-- mootoo the younger +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1750044 AND -1750040; +DELETE FROM `creature_text` WHERE `entry`=25504; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(25504,0,0,12,0,100,"mootoo the younger SAY_1","My father's aura is quite strong,he cannot be far. Could you be a doll and fight off the monsters wandering throught the mist?"), +(25504,1,0,12,0,100,"mootoo the younger SAY_2","Watch out for the monsters!Which way should we go first? Let's try this way..."), +(25504,2,0,12,0,100,"mootoo the younger SAY_3","What could this be?"), +(25504,3,0,12,0,100,"mootoo the younger SAY_4","There's no sign of it ending! Where could my father be?"), +(25504,4,0,12,0,100,"mootoo the younger SAY_5","Father! You're safe!"); + +-- imprisoned beryl sorcerer +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1571030 AND -1571024; +DELETE FROM `creature_text` WHERE `entry`=25478; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(25478,0,0,12,0,100,"imprisoned beryl sorcerer SAY_IMPRISIONED_BERYL_1","Pathetic fool! A servant of Malygos would sooner die than aid an enemy..."), +(25478,1,0,12,0,100,"imprisoned beryl sorcerer SAY_IMPRISIONED_BERYL_2","Aargh! Do your worst, $C ! I'll tell you NOTHING!"), +(25478,2,0,12,0,100,"imprisoned beryl sorcerer SAY_IMPRISIONED_BERYL_3","Aahhhh! Release me! I am of no use to you. I swear it!"), +(25478,3,0,12,0,100,"imprisoned beryl sorcerer SAY_IMPRISIONED_BERYL_4","Stop! I beg you, please stop. Please..."), +(25478,4,0,12,0,100,"imprisoned beryl sorcerer SAY_IMPRISIONED_BERYL_5","Alright! I am beaten. Your previous archmage is held in a prison, elevated and sealed. Even if you manage to reach her, Salrand herself holds the key. Your mission is folly!"), +(25478,5,0,12,0,100,"imprisoned beryl sorcerer SAY_IMPRISIONED_BERYL_6","I've given you the information, $C ! You're wasting your time...."), +(25478,6,0,12,0,100,"imprisoned beryl sorcerer SAY_IMPRISIONED_BERYL_7","Noooo! This torture is inhumane! You have what you want... why don't you just kill me?"); + +-- bonker togglevolt +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1700003 AND -1700002; +DELETE FROM `creature_text` WHERE `entry`=25589; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(25589,0,0,12,0,100,"bonker togglevolt","I AM NOT AN APPETIZER!"), +(25589,1,0,12,0,100,"bonker togglevolt","I'll make you a deal: If you get me out of here alive,you'll get a reward larger than you can imagine!"); + +-- hidden cultist +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1571047 AND -1571044; +DELETE FROM `creature_text` WHERE `entry` IN (25827,25248,25828); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(25827,0,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_1","Well..."), +(25827,1,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_2","Finally! This charade is over... Arthas give me strength!"), +(25827,2,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_3","You don't know who you're messing with! Death beckons!"), +(25827,3,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_4","I suppose this is it, then? I won't go down quietly!"), +(25248,0,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_1","Well..."), +(25248,1,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_2","Finally! This charade is over... Arthas give me strength!"), +(25248,2,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_3","You don't know who you're messing with! Death beckons!"), +(25248,3,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_4","I suppose this is it, then? I won't go down quietly!"), +(25828,0,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_1","Well..."), +(25828,1,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_2","Finally! This charade is over... Arthas give me strength!"), +(25828,2,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_3","You don't know who you're messing with! Death beckons!"), +(25828,3,0,12,0,100,"hidden cultist SAY_HIDDEN_CULTIST_4","I suppose this is it, then? I won't go down quietly!"); + +-- lord kelriss +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1048002 AND -1048000; +DELETE FROM `creature_text` WHERE `entry`=4832; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(4832,0,0,14,5803,100,"lord kelriss SAY_AGRRO","Just...Dust..."), +(4832,1,0,14,5804,100,"lord kelriss SAY_SLEEP","Sleep..."), +(4832,2,0,14,5802,100,"lord kelriss SAY_DEATH","Who dares disturb my meditation!"); + +-- theramore guard +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000649 AND -1000641; +DELETE FROM `creature_text` WHERE `entry`=4979; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(4979,0,0,12,0,100,"theramore guard SAY_QUEST1","Hey, thanks."), +(4979,1,0,12,0,100,"theramore guard SAY_QUEST2","...receive 50 percent off deserter undergarments? What is this garbage?"), +(4979,1,1,12,0,100,"theramore guard SAY_QUEST2","...to establish a fund for the purchase of hair gel? I like my hair the way it is, thanks!"), +(4979,1,2,12,0,100,"theramore guard SAY_QUEST2","...the deserters seek a Theramore where citizens will be free to juggle at all hours of the day? What is this nonsense?"), +(4979,1,3,12,0,100,"theramore guard SAY_QUEST2","...to establish the chicken as the official symbol of Theramore?! These guys are nuts!"), +(4979,1,4,12,0,100,"theramore guard SAY_QUEST2","...as a deserter, you'll enjoy activities like tethered swimming and dog grooming? How ridiculous!"), +(4979,2,0,12,0,100,"theramore guard SAY_QUEST3","This... this is a joke, right?"), +(4979,2,1,12,0,100,"theramore guard SAY_QUEST3","I'd never join anything like this. Better keep this, though. It'll come in handy in the privy..."), +(4979,2,2,12,0,100,"theramore guard SAY_QUEST3","What a bunch of lunatics! You actually believe this stuff?"); + +-- sartharion +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1615031 AND -1615018; +DELETE FROM `creature_text` WHERE `entry`=28860; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(28860,0,0,14,14093,100,"sartharion SAY_SARTHARION_AGGRO","It is my charge to watch over these eggs. I will see you burn before any harm comes to them!"), +(28860,1,0,14,14103,100,"sartharion SAY_SARTHARION_BERSERK","This pathetic siege ends NOW!"), +(28860,2,0,14,14098,100,"sartharion SAY_SARTHARION_BREATH","Burn, you miserable wretches!"), +(28860,3,0,14,14105,100,"sartharion SAY_SARTHARION_CALL_SHADRON","Shadron! Come to me, all is at risk!"), +(28860,4,0,14,14106,100,"sartharion SAY_SARTHARION_CALL_TENEBRON","Tenebron! The eggs are yours to protect as well!"), +(28860,5,0,14,14104,100,"sartharion SAY_SARTHARION_CALL_VESPERON","Vesperon! The clutch is in danger! Assist me!"), +(28860,6,0,14,14107,100,"sartharion SAY_SARTHARION_DEATH","Such is the price... of failure..."), +(28860,7,0,14,14099,100,"sartharion SAY_SARTHARION_SPECIAL_1","Such flammable little insects...."), +(28860,7,1,14,14100,100,"sartharion SAY_SARTHARION_SPECIAL_2","Your charred bones will litter the floor!"), +(28860,7,2,14,14101,100,"sartharion SAY_SARTHARION_SPECIAL_3","How much heat can you take?"), +(28860,7,3,14,14102,100,"sartharion SAY_SARTHARION_SPECIAL_4","All will be reduced to ash!"), +(28860,8,0,14,14094,100,"sartharion SAY_SARTHARION_SLAY_1","You will make a fine meal for the hatchlings."), +(28860,8,1,14,14096,100,"sartharion SAY_SARTHARION_SLAY_2","You are the grave disadvantage."), +(28860,8,2,14,14097,100,"sartharion SAY_SARTHARION_SLAY_3","This is why we call you lesser beeings."), +(28860,9,0,42,0,100,"sartharion WHISPER_LAVA_CHURN","The lava surrounding %s churns!"); + +-- tenebron +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1615016 AND -1615009; +DELETE FROM `creature_text` WHERE `entry`=30452; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(30452,0,0,14,14122,100,"tenebron SAY_TENEBRON_AGGRO","You have no place here. Your place is among the departed."), +(30452,1,0,14,14123,100,"tenebron SAY_TENEBRON_SLAY_1","No contest."), +(30452,1,1,14,14124,100,"tenebron SAY_TENEBRON_SLAY_2","Typical... Just as I was having fun."), +(30452,2,0,14,14129,100,"tenebron SAY_TENEBRON_DEATH","I should not... have held back..."), +(30452,3,0,14,14125,100,"tenebron SAY_TENEBRON_BREATH","To darkness I condemn you..."), +(30452,4,0,14,14128,100,"tenebron SAY_TENEBRON_RESPOND","It is amusing to watch you struggle. Very well, witness how it is done."), +(30452,5,0,14,14126,100,"tenebron SAY_TENEBRON_SPECIAL_1","Arrogant little creatures! To challenge powers you do not yet understand..."), +(30452,5,1,14,14127,100,"tenebron SAY_TENEBRON_SPECIAL_2","I am no mere dragon! You will find I am much, much, more..."), +(30452,6,0,42,0,100,"tenebron WHISPER_HATCH_EGGS","%s begins to hatch eggs in the twilight!"); + +-- shadron +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1615007 AND -1615000; +DELETE FROM `creature_text` WHERE `entry`=30451; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(30451,0,0,14,14111,100,"shadron SAY_SHADRON_AGGRO","I fear nothing! Least of all you!"), +(30451,1,0,14,14112,100,"shadron SAY_SHADRON_SLAY_1","You are insignificant!"), +(30451,1,1,14,14113,100,"shadron SAY_SHADRON_SLAY_2","Such mediocre resistance!"), +(30451,2,0,14,14118,100,"shadron SAY_SHADRON_DEATH","We...are superior! How could this...be..."), +(30451,3,0,14,14114,100,"shadron SAY_SHADRON_BREATH","You are easily bested! "), +(30451,4,0,14,14117,100,"shadron SAY_SHADRON_RESPOND","I will take pity on you Sartharion, just this once."), +(30451,5,0,14,14115,100,"shadron SAY_SHADRON_SPECIAL_1","Father tought me well!"), +(30451,5,1,14,14116,100,"shadron SAY_SHADRON_SPECIAL_2","On your knees!"), +(30451,6,0,42,0,100,"shadron WHISPER_OPEN_PORTAL","%s begins to open a Twilight Portal!"); + +-- vesperon +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1615040 AND -1615033; +DELETE FROM `creature_text` WHERE `entry`=30449; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(30449,0,0,14,14133,100,"vesperon SAY_VESPERON_AGGRO","You pose no threat, lesser beings...give me your worst!"), +(30449,1,0,14,14134,100,"vesperon SAY_VESPERON_SLAY_1","The least you could do is put up a fight..."), +(30449,1,1,14,14135,100,"vesperon SAY_VESPERON_SLAY_2","Was that the best you can do?"), +(30449,2,0,14,14140,100,"vesperon SAY_VESPERON_DEATH","I still have some...fight..in...me..."), +(30449,3,0,14,14136,100,"vesperon SAY_VESPERON_BREATH","I will pick my teeth with your bones!"), +(30449,4,0,14,14139,100,"vesperon SAY_VESPERON_RESPOND","Father was right about you, Sartharion...You are a weakling!"), +(30449,5,0,14,14137,100,"vesperon SAY_VESPERON_SPECIAL_1","Aren't you tricky...I have a few tricks of my own..."), +(30449,5,1,14,14138,100,"vesperon SAY_VESPERON_SPECIAL_2","Unlike, I have many talents."), +(30449,6,0,42,0,100,"vesperon WHISPER_OPEN_PORTAL","%s begins to open a Twilight Portal!"); + +-- novos +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1600005 AND -1600000; +DELETE FROM `creature_text` WHERE `entry`=26631; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26631,0,0,14,13173,100,"novos SAY_AGGRO","The chill that you feel is the herald of your doom!"), +(26631,1,0,14,13175,100,"novos SAY_KILL","Such is the fate of all who oppose the Lich King."), +(26631,2,0,14,13174,100,"novos SAY_DEATH","Your efforts... are in vain."), +(26631,3,0,14,13176,100,"novos SAY_NECRO_ADD","Bolster my defenses! Hurry, curse you!"), +(26631,4,0,14,13177,100,"novos SAY_REUBBLE_1","Surely you can see the futility of it all!"), +(26631,4,1,14,13178,100,"novos SAY_REUBBLE_2","Just give up and die already!"); + +-- tharon ja +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1600018 AND -1600011; +DELETE FROM `creature_text` WHERE `entry`=26632; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26632,0,0,14,13862,100,"tharon ja SAY_AGGRO","Tharon'ja sees all! The work of mortals shall not end the eternal dynasty!"), +(26632,1,0,14,13863,100,"tharon ja SAY_KILL_1","As Tharon'ja predicted."), +(26632,1,1,14,13864,100,"tharon ja SAY_KILL_2","As it was written."), +(26632,2,0,14,13865,100,"tharon ja SAY_FLESH_1","Your flesh serves Tharon'ja now!"), +(26632,2,1,14,13866,100,"tharon ja SAY_FLESH_2","Tharon'ja has a use for your mortal shell!"), +(26632,3,0,14,13867,100,"tharon ja SAY_SKELETON_1","No! A taste... all too brief!"), +(26632,3,1,14,13868,100,"tharon ja SAY_SKELETON_2","Tharon'ja will have more!"), +(26632,4,0,14,13869,100,"tharon ja SAY_DEATH","I'm... impossible! Tharon'ja is eternal! Tharon'ja... is..."); + +-- trollgore +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1600010 AND -1600006; +DELETE FROM `creature_text` WHERE `entry`=26630; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26630,0,0,14,13181,100,"trollgore SAY_AGGRO","More grunts, more glands, more FOOD!"), +(26630,1,0,14,13185,100,"trollgore SAY_KILL","You have gone, me gonna eat you!"), +(26630,2,0,14,13182,100,"trollgore SAY_CONSUME","So hungry! Must feed!"), +(26630,3,0,14,13184,100,"trollgore SAY_EXPLODE","Corpse go boom!"), +(26630,4,0,14,13183,100,"trollgore SAY_DEATH","Aaaargh..."); + +-- bronjham +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1632006 AND -1632001; +DELETE FROM `creature_text` WHERE `entry`=36497; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(36497,0,0,14,16595,100,"bronjham SAY_AGGRO","Finally...a captive audience!"), +(36497,1,0,14,16596,100,"bronjham SAY_SLAY_1","Fodder for the engine!"), +(36497,1,1,14,16597,100,"bronjham SAY_SLAY_2","Another soul to strengthen the host!"), +(36497,2,0,14,16598,100,"bronjham SAY_DEATH",""), +(36497,3,0,14,16599,100,"bronjham SAY_SOUL_STORM","The vortex of the harvested calls to you!"), +(36497,4,0,14,16600,100,"bronjham SAY_CORRUPT_SOUL","I will sever the soul from your body!"); + +-- devoureur +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1632030 AND -1632010; +DELETE FROM `creature_text` WHERE `entry` IN (36502,38160,38161); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(36502,0,0,14,16884,100,"devoureur SAY_FACE_ANGER_AGGRO","You dare look upon the host of souls? I SHALL DEVOUR YOU WHOLE!"), +(36502,0,1,14,16890,100,"devoureur SAY_FACE_DESIRE_AGGRO","You dare look upon the host of souls? I SHALL DEVOUR YOU WHOLE!"), +(36502,1,0,14,16885,100,"devoureur SAY_FACE_ANGER_SLAY_1","Damnation!"), +(36502,1,1,14,16886,100,"devoureur SAY_FACE_ANGER_SLAY_2","Doomed for eternity!"), +(36502,2,0,14,16896,100,"devoureur SAY_FACE_SORROW_SLAY_1","Damnation!"), +(36502,2,1,14,16897,100,"devoureur SAY_FACE_SORROW_SLAY_2","Doomed for eternity!"), +(36502,3,0,14,16891,100,"devoureur SAY_FACE_DESIRE_SLAY_1","Damnation!"), +(36502,3,1,14,16892,100,"devoureur SAY_FACE_DESIRE_SLAY_2","Doomed for eternity!"), +(36502,4,0,14,16887,100,"devoureur SAY_FACE_ANGER_DEATH","The swell of souls will not be abated! You only delay the inevitable!"), +(36502,4,1,14,16898,100,"devoureur SAY_FACE_SORROW_DEATH","The swell of souls will not be abated! You only delay the inevitable!"), +(36502,4,2,14,16893,100,"devoureur SAY_FACE_DESIRE_DEATH","The swell of souls will not be abated! You only delay the inevitable!"), +(36502,5,0,41,0,100,"devoureur EMOTE_MIRRORED_SOUL","Devourer of Souls begins to cast Mirrored Soul!"), +(36502,6,0,41,0,100,"devoureur EMOTE_UNLEASH_SOUL","Devourer of Souls begins to Unleash Souls!"), +(36502,7,0,14,16888,100,"devoureur SAY_FACE_ANGER_UNLEASH_SOUL","SUFFERING! ANGUISH! CHAOS! RISE AND FEED!"), +(36502,7,1,14,16899,100,"devoureur SAY_FACE_SORROW_UNLEASH_SOUL","SUFFERING! ANGUISH! CHAOS! RISE AND FEED!"), +(36502,7,2,14,16894,100,"devoureur SAY_FACE_DESIRE_UNLEASH_SOUL","SUFFERING! ANGUISH! CHAOS! RISE AND FEED!"), +(36502,8,0,41,0,100,"devoureur EMOTE_WAILING_SOUL","Devourer of Souls begins to cast Wailing Souls!"), +(36502,9,0,14,16889,100,"devoureur SAY_FACE_ANGER_WAILING_SOUL","Stare into the abyss, and see your end!"), +(36502,9,1,14,16895,100,"devoureur SAY_FACE_DESIRE_WAILING_SOUL","Stare into the abyss, and see your end!"), +(38160,0,0,14,16625,100,"jaina SAY_JAINA_OUTRO","Excellent work, champions! We shall set up our base camp in these chambers. My mages will get the Scourge transport device working shortly. Step inside it when you're ready for your next mission. I will meet you on the other side."), +(38161,0,0,14,17044,100,"sylvanas SAY_SYLVANAS_OUTRO","Excellent work, champions! We shall set up our base camp in these chambers. My mages will get the Scourge transport device working shortly. Step inside when you are ready for your next mission. I will meet you on the other side."); + +-- lurgglbr +DELETE FROM `creature_text` WHERE `entry`=25208; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(25208,0,0,12,0,100,"lurgglbr SAY_START_1","Together we will fight our way out of here. Are you ready?"), +(25208,1,0,12,0,100,"lurgglbr SAY_START_2","Then we leave."), +(25208,2,0,12,0,100,"lurgglbr SAY_END_1","This is far enough. I can make it on my own from here."), +(25208,3,0,12,0,100,"lurgglbr SAY_END_2","Thank you for helping me $r. Please tell the king I am back."); + +-- jaina +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1632047 AND -1632040; +DELETE FROM `creature_text` WHERE `entry`=37597; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(37597,0,0,12,16617,100,"jaina SAY_INTRO_1","Thank the light for seeing you here safely. We have much work to do if we are to defeat the Lich King and put an end to the Scourge."), +(37597,1,0,12,16618,100,"jaina SAY_INTRO_2","Our allies within the Argent Crusade and the Knights of the Ebon Blade have broken through the front gate of Icecrown and are attempting to establish a foothold within the Citadel."), +(37597,2,0,12,16619,100,"jaina SAY_INTRO_3","Their success hinges upon what we discover in these cursed halls. Although our mission is a wrought with peril, we must persevere!"), +(37597,3,0,12,16620,100,"jaina SAY_INTRO_4","With the attention of the Lich King drawn toward the front gate, we will be working our way through the side in search of information that will enable us to defeat the Scourge - once and for all."), +(37597,4,0,12,16621,100,"jaina SAY_INTRO_5","King Varian's SI7 agents have gathered information about a private sanctum of the Lich King's deep within a place called the Halls of Reflection."), +(37597,5,0,12,16622,100,"jaina SAY_INTRO_6","We will carve a path through this wretched place and find a way to enter the Halls of Reflection. I sense powerful magic hidden away within those walls... Magic that could be the key to destroy the Scourge."), +(37597,6,0,12,16623,100,"jaina SAY_INTRO_7","Your first mission is to destroy the machines of death within this malevolent engine of souls, and clear a path for our soldiers."), +(37597,7,0,12,16624,100,"jaina SAY_INTRO_8","Make haste, champions! I will prepare the troops to fall in behind you."); + +-- sylvanas +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1632055 AND -1632050; +DELETE FROM `creature_text` WHERE `entry`=37596; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(37596,0,0,12,17038,100,"sylvanas SAY_INTRO_1","The Argent Crusade and the Knights of the Ebon Blade have assaulted the gates of Icecrown Citadel and are preparing for a massive attack upon the Scourge. Our missition is a bit more subtle, but equally as important."), +(37596,1,0,12,17039,100,"sylvanas SAY_INTRO_2","With the attention of the Lich King turned towards the front gate, we'll be working our way through the side in search of information that will enable us to defeat the Lich King - once and for all."), +(37596,2,0,12,17040,100,"sylvanas SAY_INTRO_3","Our scouts have reported that the Lich King has a private chamber, outside of the Frozen Throne, deep within a place called the Halls of Reflection. That is our target, champions."), +(37596,3,0,12,17041,100,"sylvanas SAY_INTRO_4","We will cut a swath of destruction through this cursed place and find a way to enter the Halls of Reflection. If there is anything of value to be found here, it will be found in the Halls."), +(37596,4,0,12,17042,100,"sylvanas SAY_INTRO_5","Your first mission is to destroy the machines of death within this wretched engine of souls, and clear a path for our soldiers."), +(37596,5,0,12,17043,100,"sylvanas SAY_INTRO_6","The Dark Lady watches over you. Make haste!"); + +-- falric +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1668055 AND -1668050; +DELETE FROM `creature_text` WHERE `entry`=38112; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(38112,0,0,14,16710,100,"falric SAY_AGGRO","Men, women and children... None were spared the master's wrath. Your death will be no different."), +(38112,1,0,14,16711,100,"falric SAY_SLAY_1","Sniveling maggot!"), +(38112,1,1,14,16712,100,"falric SAY_SLAY_2","The children of Stratholme fought with more ferocity!"), +(38112,2,0,14,16713,100,"falric SAY_DEATH","Marwyn, finish them..."), +(38112,3,0,14,16715,100,"falric SAY_IMPENDING_DESPAIR","Despair... so delicious..."), +(38112,4,0,14,16716,100,"falric SAY_DEFILING_HORROR","Fear... so exhilarating..."); + +-- marwyn +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1668065 AND -1668060; +DELETE FROM `creature_text` WHERE `entry`=38113; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(38113,0,0,14,16734,100,"marwyn SAY_AGGRO","Death is all that you will find here!"), +(38113,1,0,14,16735,100,"marwyn SAY_SLAY_1","I saw the same look in his eyes when he died. Terenas could hardly believe it. Hahahaha!"), +(38113,1,1,14,16736,100,"marwyn SAY_SLAY_2","Choke on your suffering!"), +(38113,2,0,14,16737,100,"marwyn SAY_DEATH","Yes... Run... Run to meet your destiny... Its bitter, cold embrace, awaits you."), +(38113,3,0,14,16739,100,"marwyn SAY_CORRUPTED_FLESH_1","Your flesh has decayed before your very eyes!"), +(38113,3,1,14,16740,100,"marwyn SAY_CORRUPTED_FLESH_2","Waste away into nothingness!"); + +-- jaina or sylvanas halls of reflection +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1668043 AND -1668001; +DELETE FROM `creature_text` WHERE `entry` IN (37221,37225,37223,37226,38113) OR (`entry`=38112 AND `groupid` IN (5,6)); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +-- Jaina +(37221,0,0,14,16631,100,"Jaina SAY_JAINA_INTRO_1","The chill of this place... Brr... I can feel my blood freezing."), +(37221,1,0,14,16632,100,"Jaina SAY_JAINA_INTRO_2","What is that? Up ahead! Could it be... ? Heroes at my side!"), +(37221,2,0,14,16633,100,"Jaina SAY_JAINA_INTRO_3","Frostmourne! The blade that destroyed our kingdom..."), +(37221,3,0,14,16634,100,"Jaina SAY_JAINA_INTRO_4","Stand back! Touch that blade and your soul will be scarred for all eternity! I must attempt to commune with the spirits locked away within Frostmourne. Give me space, back up please!"), +(37221,4,0,12,16635,100,"Jaina SAY_JAINA_INTRO_5","Uther! Dear Uther! ... I... I'm so sorry."), +(37221,5,0,12,16636,100,"Jaina SAY_JAINA_INTRO_6","Arthas is here? Maybe I..."), +(37221,6,0,12,16637,100,"Jaina SAY_JAINA_INTRO_7","But Uther, if there's any hope of reaching Arthas. I... I must try."), +(37221,7,0,12,16638,100,"Jaina SAY_JAINA_INTRO_8","Tell me how, Uther? How do I destroy my prince? My..."), +(37221,8,0,12,16639,100,"Jaina SAY_JAINA_INTRO_9","You're right, Uther. Forgive me. I... I don't know what got a hold of me. We will deliver this information to the King and the knights that battle the Scourge within Icecrown Citadel."), +(37221,9,0,12,16640,100,"Jaina SAY_JAINA_INTRO_10","Who could bear such a burden?"), +(37221,10,0,12,16641,100,"Jaina SAY_JAINA_INTRO_11","Then maybe there is still hope..."), +(37221,11,0,14,16642,100,"Jaina SAY_JAINA_INTRO_END","You won't deny me this Arthas! I must know! I must find out!"), +-- Lich King +(37226,0,0,14,17225,100,"Lich King SAY_LK_INTRO_1","SILENCE, PALADIN!"), +(37226,1,0,14,17226,100,"Lich King SAY_LK_INTRO_2","So you wish to commune with the dead? You shall have your wish."), +(37226,2,0,14,17227,100,"Lich King SAY_LK_INTRO_3","Falric. Marwyn. Bring their corpses to my chamber when you are through."), +-- Marwyn +(38113,0,0,14,16741,100,"Marwyn SAY_MARWYN_INTRO_1","As you wish, my lord."), +-- Falric +(38112,5,0,14,16717,100,"Falric SAY_FALRIC_INTRO_1","As you wish, my lord."), +(38112,6,0,14,16714,100,"Falric SAY_FALRIC_INTRO_2","Soldiers of Lordaeron, rise to meet your master's call!"), +-- Sylvanas +(37223,0,0,14,17049,100,"Sylvanas SAY_SYLVANAS_INTRO_1","I... I don't believe it! Frostmourne stands before us, unguarded! Just as the Gnome claimed. Come, heroes!"), +(37223,1,0,14,17050,100,"Sylvanas SAY_SYLVANAS_INTRO_2","Standing this close to the blade that ended my life... The pain... It is renewed."), +(37223,2,0,14,17051,100,"Sylvanas SAY_SYLVANAS_INTRO_3","I dare not touch it. Stand back! Stand back as I attempt to commune with the blade! Perhaps our salvation lies within..."), +(37223,3,0,12,17052,100,"Sylvanas SAY_SYLVANAS_INTRO_4","Uther...Uther the Lightbringer. How..."), +(37223,4,0,12,17053,100,"Sylvanas SAY_SYLVANAS_INTRO_5","The Lich King is here? Then my destiny shall be fulfilled today!"), +(37223,5,0,12,17054,100,"Sylvanas SAY_SYLVANAS_INTRO_6","There must be a way... "), +(37223,6,0,12,17055,100,"Sylvanas SAY_SYLVANAS_INTRO_7","Who could bear such a burden?"), +(37223,7,0,12,17056,100,"Sylvanas SAY_SYLVANAS_INTRO_8","The Frozen Throne..."), +(37223,8,0,14,17057,100,"Sylvanas SAY_SYLVANAS_INTRO_END","You will not escape me that easily, Arthas! I will have my vengeance!"), +-- Uther +(37225,0,0,14,16666,100,"Uther SAY_UTHER_INTRO_A2_1","Jaina! Could it truly be you?"), +(37225,1,0,12,16667,100,"Uther SAY_UTHER_INTRO_A2_2","Jaina you haven't much time. The Lich King sees what the sword sees. He will be here shortly!"), +(37225,2,0,12,16668,100,"Uther SAY_UTHER_INTRO_A2_3","No, girl. Arthas is not here. Arthas is merely a presence within the Lich King's mind. A dwindling presence..."), +(37225,3,0,12,16669,100,"Uther SAY_UTHER_INTRO_A2_4","Jaina, listen to me. You must destroy the Lich King. You cannot reason with him. He will kill you and your allies and raise you all as powerful soldiers of the Scourge."), +(37225,4,0,12,16670,100,"Uther SAY_UTHER_INTRO_A2_5","Snap out of it, girl. You must destroy the Lich King at the place where he merged with Ner'zhul - atop the spire, at the Frozen Throne. It is the only way."), +(37225,5,0,12,16671,100,"Uther SAY_UTHER_INTRO_A2_6","There is... something else that you should know about the Lich King. Control over the Scourge must never be lost. Even if you were to strike down the Lich King, another would have to take his place. For without the control of its master, the Scourge would run rampant across the world - destroying all living things."), +(37225,6,0,12,16672,100,"Uther SAY_UTHER_INTRO_A2_7","A grand sacrifice by a noble soul..."), +(37225,7,0,12,16673,100,"Uther SAY_UTHER_INTRO_A2_8","I do not know, Jaina. I suspect that the piece of Arthas that might be left inside the Lich King is all that holds the Scourge from annihilating Azeroth."), +(37225,8,0,12,16674,100,"Uther SAY_UTHER_INTRO_A2_9","No, Jaina! Aargh! He... He is coming! You... You must..."), +(37225,9,0,12,16659,100,"Uther SAY_UTHER_INTRO_H2_1","Careful, girl. I've heard talk of that cursed blade saving us before. Look around you and see what has been born of Frostmourne."), +(37225,10,0,12,16660,100,"Uther SAY_UTHER_INTRO_H2_2","You haven't much time. The Lich King sees what the sword sees. He will be here shortly."), +(37225,11,0,12,16661,100,"Uther SAY_UTHER_INTRO_H2_3","You cannot defeat the Lich King. Not here. You would be a fool to try. He will kill those who follow you and raise them as powerful servants of the Scourge. But for you, Sylvanas, his reward for you would be worse than the last."), +(37225,12,0,12,16662,100,"Uther SAY_UTHER_INTRO_H2_4","Perhaps, but know this: there must always be a Lich King. Even if you were to strike down Arthas, another would have to take his place, for without the control of the Lich King, the Scourge would wash over this world like locusts, destroying all that they touched."), +(37225,13,0,12,16663,100,"Uther SAY_UTHER_INTRO_H2_5","I do not know, Banshee Queen. I suspect that the piece of Arthas that might be left inside the Lich King is all that holds the Scourge from annihilating Azeroth."), +(37225,14,0,12,16664,100,"Uther SAY_UTHER_INTRO_H2_6","Alas, the only way to defeat the Lich King is to destroy him at the place he was created."), +(37225,15,0,12,16665,100,"Uther SAY_UTHER_INTRO_H2_7","I... Aargh... He... He is coming... You... You must..."); + +-- Some deletions for halls of reflection +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1658041 AND -1658030; +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1658018 AND -1658010; +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1658021 AND -1658020; +DELETE FROM `script_texts` WHERE `entry`=-1658007; + +-- Krick +DELETE FROM `creature_text` WHERE `entry`=36477; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(36477,0,0,14,16926,100,"Krick SAY_AGGRO","Our work must not be interrupted! Ick! Take care of them!"), +(36477,1,0,14,16927,100,"Krick SAY_SLAY_1","Ooh...We could probably use these parts!"), +(36477,1,1,14,16928,100,"Krick SAY_SLAY_2","Arms and legs are in short supply...Thanks for your contribution!"), +(36477,2,0,14,16929,100,"Krick SAY_BARRAGE_1","Enough moving around! Hold still while I blow them all up!"), +(36477,3,0,41,0,100,"Krick SAY_BARRAGE_2","Krick begins rapidly conjuring explosive mines!"), +(36477,4,0,14,16930,100,"Krick SAY_POISON_NOVA","Quickly! Poison them all while they're still close!"), +(36477,5,0,14,16931,100,"Krick SAY_CHASE_1","No! That one! That one! Get that one!"), +(36477,5,1,14,16932,100,"Krick SAY_CHASE_2","I've changed my mind...go get that one instead!"), +(36477,5,2,14,16933,100,"Krick SAY_CHASE_3","What are you attacking him for? The dangerous one is over there,fool!"), +(36477,6,0,14,16934,100,"Krick SAY_KRICK_OUTRO_1","Wait! Stop! Don't kill me, please! I'll tell you everything!"), +(36477,7,0,14,16935,100,"Krick SAY_KRICK_OUTRO_3","What you seek is in the master's lair, but you must destroy Tyrannus to gain entry. Within the Halls of Reflection you will find Frostmourne. It... it holds the truth."), +(36477,8,0,14,16936,100,"Krick SAY_KRICK_OUTRO_5","I swear it is true! Please, don't kill me!!"), +(36477,9,0,14,16937,100,"Krick SAY_KRICK_OUTRO_8","Urg... no!!"); + +-- Ick +DELETE FROM `creature_text` WHERE `entry`=36476; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(36476,0,0,41,0,100,"Ick SAY_ICK_POISON_NOVA","Ick begins to unleash a toxic poison cloud!"), +(36476,1,0,41,0,100,"Ick SAY_ICK_CHASE_1","Ick is chasing you!"); + +-- Tyrannus +DELETE FROM `creature_text` WHERE `entry`=36658; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(36658,0,0,14,16752,100,"Tyrannus SAY_TYRANNUS_DEATH","Another shall take his place. You waste your time."), +(36658,1,0,14,16753,100,"Tyrannus SAY_TYRANNUS_OUTRO_7","Worthless gnat! Death is all that awaits you!"), +(36658,2,0,14,16754,100,"Tyrannus SAY_TYRANNUS_OUTRO_9","Do not think that I shall permit you entry into my master's sanctum so easily. Pursue me if you dare."), +(36658,3,0,14,16755,100,"Tyrannus SAY_AMBUSH_1","Your pursuit shall be in vain, adventurers, for the Lich King has placed an army of undead at my command! Behold!"), +(36658,4,0,14,16756,100,"Tyrannus SAY_AMBUSH_2","Persistent whelps! You will not reach the entrance of my lord's lair! Soldiers, destroy them!"), +(36658,5,0,14,16757,100,"Tyrannus SAY_GAUNTLET_START","Rimefang! Trap them within the tunnel! Bury them alive!"), +(36658,6,0,14,16758,100,"Tyrannus SAY_TYRANNUS_INTRO_1","Alas, brave, brave adventurers, your meddling has reached its end. Do you hear the clatter of bone and steel coming up the tunnel behind you? That is the sound of your impending demise."), +(36658,7,0,14,16759,100,"Tyrannus SAY_TYRANNUS_INTRO_3","Ha, such an amusing gesture from the rabble. When I have finished with you, my master's blade will feast upon your souls. Die!"), +(36658,8,0,14,16760,100,"Tyrannus SAY_AGGRO","I shall not fail The Lich King! Come and meet your end!"), +(36658,9,0,14,16761,100,"Tyrannus SAY_SLAY_1","Such a shameful display... You are better off dead!"), +(36658,9,1,14,16762,100,"Tyrannus SAY_SLAY_2","Perhaps you should have stayed in the mountains!"), +(36658,10,0,14,16763,100,"Tyrannus SAY_DEATH","Impossible! Rimefang... Warn..."), +(36658,11,0,14,16764,100,"Tyrannus SAY_MARK_RIMEFANG_1","Rimefang, destroy this fool!"), +(36658,12,0,41,0,100,"Tyrannus SAY_MARK_RIMEFANG_2","The frostwyrm Rimefang gazes at $N and readies an icy attack!"), +(36658,13,0,14,16765,100,"Tyrannus SAY_DARK_MIGHT_1","Power... overwhelming!"), +(36658,14,0,41,0,100,"Tyrannus SAY_DARK_MIGHT_2","Scourgelord Tyrannus roars and swells with dark might!"); + +-- Gorkun +DELETE FROM `creature_text` WHERE `entry`=37592; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(37592,0,0,14,17150,100,"Gorkun SAY_GORKUN_INTRO_2","Heroes! We will hold off the undead as long as we can, even to our dying breath. Deal with the Scourgelord!"), +(37592,1,0,14,0,100,"Gorkun SAY_GORKUN_OUTRO_1","Brave champions, we owe you our lives, our freedom... Though it be a tiny gesture in the face of this enormous debt, I pledge that from this day forth, all will know of your deeds, and the blazing path of light you cut through the shadow of this dark citadel."), +(37592,2,0,14,0,100,"Gorkun SAY_GORKUN_OUTRO_2","This day will stand as a testament not only to your valor, but to the fact that no foe, not even the Lich King himself, can stand when Alliance and Horde set aside their differences and ---"); + +-- Jaina +DELETE FROM `creature_text` WHERE `entry`=36993; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(36993,0,0,14,16611,100,"Jaina SAY_JAINA_OUTRO_2","I'm not so naive as to believe your appeal for clemency, but I will listen."), +(36993,1,0,14,16612,100,"Jaina SAY_JAINA_OUTRO_4","Frostmourne lies unguarded? Impossible!"), +(36993,2,0,14,16613,100,"Jaina SAY_JAINA_OUTRO_10","What a cruel end. Come, heroes. We must see if the gnome's story is true. If we can separate Arthas from Frostmourne, we might have a chance at stopping him."), +(36993,3,0,14,16614,100,"Jaina SAY_JAYNA_OUTRO_3","Heroes, to me!"), +(36993,4,0,12,16615,100,"Jaina SAY_JAYNA_OUTRO_4","The Frost Queen is gone. We must keep moving - our objective is near."), +(36993,5,0,12,16616,100,"Jaina SAY_JAYNA_OUTRO_5","I... I could not save them... Damn you, Arthas! DAMN YOU!"); + +-- Sylvanas +DELETE FROM `creature_text` WHERE `entry`=36990; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(36990,0,0,14,17033,100,"Sylvanas SAY_SYLVANAS_OUTRO_2","Why should the Banshee Queen spare your miserable life?"), +(36990,1,0,14,17034,100,"Sylvanas SAY_SYLVANAS_OUTRO_4","Frostmourne? The Lich King is never without his blade! If you are lying to me..."), +(36990,2,0,14,17035,100,"Sylvanas SAY_SYLVANAS_OUTRO_10","A fitting end for a traitor. Come, we must free the slaves and see what is within the Lich King's chamber for ourselves."), +(36990,3,0,14,17037,100,"Sylvanas SAY_SYLVANAS_OUTRO_3","Take cover behind me! Quickly!"), +(36990,4,0,12,17036,100,"Sylvanas SAY_SYLVANAS_OUTRO_4","I thought he'd never shut up. At last, Sindragosa silenced that long-winded fool. To the Halls of Reflection, champions! Our objective is near... I can sense it."); + +-- emily +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800013 AND -1800001; +DELETE FROM `creature_text` WHERE `entry`=26588; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26588,0,0,12,0,100,"emily SAY_WORGHAGGRO1","Um... I think one of those wolves is back..."), +(26588,1,0,12,0,100,"emily SAY_WORGHAGGRO2","He's going for Mr. Floppy! "), +(26588,2,0,12,0,100,"emily SAY_WORGRAGGRO3","Oh, no! Look, it's another wolf, and it's a biiiiiig one!"), +(26588,3,0,12,0,100,"emily SAY_WORGRAGGRO4","He's gonna eat Mr. Floppy! You gotta help Mr. Floppy! You just gotta!"), +(26588,4,0,12,0,100,"emily SAY_RANDOMAGGRO","There's a big meanie attacking Mr. Floppy! Help! "), +(26588,5,0,12,0,100,"emily SAY_VICTORY1","Let's get out of here before more wolves find us!"), +(26588,6,0,12,0,100,"emily SAY_VICTORY2","Don't go toward the light, Mr. Floppy!"), +(26588,7,0,12,0,100,"emily SAY_VICTORY3","Mr. Floppy, you're ok! Thank you so much for saving Mr. Floppy!"), +(26588,8,0,12,0,100,"emily SAY_VICTORY4","I think I see the camp! We're almost home, Mr. Floppy! Let's go!"), +(26588,9,0,15,0,100,"emily TEXT_EMOTE_WP1","Mr. Floppy revives"), +(26588,10,0,15,0,100,"emily TEXT_EMOTE_AGGRO","The Ravenous Worg chomps down on Mr. Floppy"), +(26588,11,0,12,0,100,"emily SAY_QUEST_ACCEPT","Are you ready, Mr. Floppy? Stay close to me and watch out for those wolves!"), +(26588,12,0,12,0,100,"emily SAY_QUEST_COMPLETE","Thank you for helping me get back to the camp. Go tell Walter that I'm safe now!"); + +-- venture co straggler +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1603539 AND -1603535; +DELETE FROM `creature_text` WHERE `entry`=27570; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(27570,0,0,12,0,100,"venture co straggler SAY1","We're all gonna die!"), +(27570,0,1,12,0,100,"venture co straggler SAY2","Gotta get out of here!"), +(27570,0,2,12,0,100,"venture co straggler SAY3","No way I'm stickin' around!"), +(27570,0,3,12,0,100,"venture co straggler SAY4","Forget this! I'm going home!"), +(27570,0,4,12,0,100,"venture co straggler SAY5","I didn't sign up for this!"); + +-- wounded skirmisher +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800046 AND -1800044; +DELETE FROM `creature_text` WHERE `entry`=27463; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(27463,0,0,12,0,100,"wounded skirmisher RANDOM_SAY_1","Ahh..better.."), +(27463,0,1,12,0,100,"wounded skirmisher RANDOM_SAY_2","Whoa.. i nearly died there. Thank you, $Race!"), +(27463,0,2,12,0,100,"wounded skirmisher RANDOM_SAY_3","Thank you. $Class!"); + +-- Gal'darah +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1604009 AND -1604000; +DELETE FROM `creature_text` WHERE `entry`=29306; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29306,0,0,12,0,100,"Gal'darah SAY_AGGRO","I'm gonna spill your guts, mon!"), +(29306,1,0,12,0,100,"Gal'darah SAY_SLAY_1","What a rush!"), +(29306,1,1,12,0,100,"Gal'darah SAY_SLAY_2","Who needs gods, when WE ARE GODS!"), +(29306,1,2,12,0,100,"Gal'darah SAY_SLAY_3","I told ya so!"), +(29306,2,0,12,0,100,"Gal'darah SAY_DEATH","Even the mighty... can fall."), +(29306,3,0,12,0,100,"Gal'darah SAY_SUMMON_RHINO_1","Gut them! Impale them!"), +(29306,3,1,12,0,100,"Gal'darah SAY_SUMMON_RHINO_2","KILL THEM ALL!"), +(29306,3,2,12,0,100,"Gal'darah SAY_SUMMON_RHINO_3","Say hello to my BIG friend!"), +(29306,4,0,12,0,100,"Gal'darah SAY_TRANSFORM_1","Ain't gonna be nottin' left after this!"), +(29306,5,0,12,0,100,"Gal'darah SAY_TRANSFORM_2","You wanna see power? I'm gonna show you power!"); diff --git a/sql/updates/world/2012_12_02_02_world_waypoint_data.sql b/sql/updates/world/2012_12_02_02_world_waypoint_data.sql new file mode 100644 index 00000000000..6413ad00b62 --- /dev/null +++ b/sql/updates/world/2012_12_02_02_world_waypoint_data.sql @@ -0,0 +1,461 @@ +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Issue 8528: Path for Gnarl Leafbrother in Feralas +UPDATE `creature` SET `MovementType`=2,`position_x`=-5022.191895,`position_y`=629.696777,`position_z`=33.835888,`currentwaypoint`=1 WHERE `guid`=51842; +DELETE FROM `creature_addon` WHERE `guid`=51842; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (51842,518420); +DELETE FROM `waypoint_data` WHERE `id`=518420; +-- waypoint data +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(518420,1,-5022.191895,629.696777,33.835888,0,0,0,0,100,0), +(518420,2,-5043.059082,619.917847,31.750885,0,0,0,0,100,0), +(518420,3,-5054.034668,613.626709,30.798603,0,0,0,0,100,0), +(518420,4,-5071.428223,601.871948,32.057613,0,0,0,0,100,0), +(518420,5,-5089.617676,591.378662,28.951130,0,0,0,0,100,0), +(518420,6,-5105.091309,579.887695,30.504873,0,0,0,0,100,0), +(518420,7,-5116.354980,576.741211,32.764660,0,0,0,0,100,0), +(518420,8,-5136.212891,566.893005,31.577913,0,0,0,0,100,0), +(518420,9,-5150.280273,553.107849,30.944555,0,0,0,0,100,0), +(518420,10,-5158.920410,542.095581,35.801292,0,0,0,0,100,0), +(518420,11,-5167.158203,522.274170,38.600380,0,0,0,0,100,0), +(518420,12,-5166.315430,510.923157,38.586903,0,0,0,0,100,0), +(518420,13,-5158.101074,492.401123,33.991638,0,0,0,0,100,0), +(518420,14,-5147.333984,474.398682,30.235893,0,0,0,0,100,0), +(518420,15,-5134.918945,457.462006,26.081539,0,0,0,0,100,0), +(518420,16,-5122.419434,440.587341,21.583317,0,0,0,0,100,0), +(518420,17,-5109.219727,424.297028,16.553629,0,0,0,0,100,0), +(518420,18,-5094.229004,409.595154,11.296940,0,0,0,0,100,0), +(518420,19,-5080.246582,393.952423,10.345637,0,0,0,0,100,0), +(518420,20,-5070.758789,379.525574,13.711313,0,0,0,0,100,0), +(518420,21,-5063.307617,359.270874,18.122873,0,0,0,0,100,0), +(518420,22,-5063.429688,338.487732,24.411358,0,0,0,0,100,0), +(518420,23,-5059.106445,312.620605,24.147429,0,0,0,0,100,0), +(518420,24,-5054.877441,292.802917,29.383863,0,0,0,0,100,0), +(518420,25,-5054.420898,273.845673,34.572777,0,0,0,0,100,0), +(518420,26,-5070.981445,257.048950,38.070614,0,0,0,0,100,0), +(518420,27,-5087.886230,264.231934,40.363678,0,0,0,0,100,0), +(518420,28,-5090.106934,281.698639,35.716690,0,0,0,0,100,0), +(518420,29,-5081.804688,296.339905,31.364048,0,0,0,0,100,0), +(518420,30,-5068.381836,313.534424,24.323677,0,0,0,0,100,0), +(518420,31,-5063.646484,332.752380,25.158432,0,0,0,0,100,0), +(518420,32,-5060.014648,353.435455,20.394775,0,0,0,0,100,0), +(518420,33,-5056.827148,373.164917,13.297603,0,0,0,0,100,0), +(518420,34,-5051.156250,389.049103,12.191339,0,0,0,0,100,0), +(518420,35,-5053.750977,410.560486,11.438949,0,0,0,0,100,0), +(518420,36,-5053.371582,435.000610,12.668456,0,0,0,0,100,0), +(518420,37,-5047.556152,449.830597,12.962356,0,0,0,0,100,0), +(518420,38,-5041.587891,465.987549,9.927107,0,0,0,0,100,0), +(518420,39,-5031.068848,492.358582,14.380741,0,0,0,0,100,0), +(518420,40,-5017.889648,502.309723,13.949232,0,0,0,0,100,0), +(518420,41,-5016.621094,521.594666,14.870961,0,0,0,0,100,0), +(518420,42,-5014.022949,548.411804,22.151962,0,0,0,0,100,0), +(518420,43,-5006.894043,566.593445,27.215111,0,0,0,0,100,0), +(518420,44,-5005.978516,584.286316,27.214222,0,0,0,0,100,0), +(518420,45,-5006.477539,605.231934,30.056322,0,0,0,0,100,0); +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Issue 8525: Path for Antilus the Soarer in Feralas +UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=5347; +UPDATE `creature` SET `MovementType`=2,`position_x`=-5750.381348,`position_y`=1687.031372,`position_z`=102.642807,`currentwaypoint`=1 WHERE `guid`=51840; +DELETE FROM `creature_addon` WHERE `guid`=51840; +INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES (51840,518400); +-- waypoint data +DELETE FROM `waypoint_data` WHERE `id`=518400; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(518400,1,-5750.381348,1687.031372,102.642807,0,0,0,0,100,0), +(518400,2,-5763.852539,1659.998779,100.206543,0,0,0,0,100,0), +(518400,3,-5769.635742,1631.257935,97.278107,0,0,0,0,100,0), +(518400,4,-5769.966797,1586.222778,95.639244,0,0,0,0,100,0), +(518400,5,-5747.220215,1555.375977,91.316254,0,0,0,0,100,0), +(518400,6,-5711.871582,1560.672729,92.667946,0,0,0,0,100,0), +(518400,7,-5683.442871,1576.397583,93.477570,0,0,0,0,100,0), +(518400,8,-5661.568359,1610.616699,95.784607,0,0,0,0,100,0), +(518400,9,-5667.140137,1638.335815,99.210922,0,0,0,0,100,0), +(518400,10,-5687.900879,1671.338013,102.927925,0,0,0,0,100,0); +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Issue 8524: GUARDS and PATH for Achellios the Banished +-- he paths around 1K Needles with 3 Hyena guards. All the guids exist on the TDB,but are not moving or joined in a formation +DELETE FROM `creature_formations` where `memberGUID` in (21388,21677,21678,21679); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(21388,21388,0,0,2), +(21388,21677,3,90,2), +(21388,21678,6,0,2), +(21388,21679,3,270,2); +-- initial position for achellious and guards +UPDATE `creature` SET `MovementType`=2,`position_x`=-5065.414551,`position_y`=-1433.431885,`position_z`=-52.054058,`currentwaypoint`=1 WHERE `guid`=21388; +UPDATE `creature` SET `MovementType`=0,`position_x`=-5065.414551,`position_y`=-1433.431885,`position_z`=-52.054058 WHERE `guid` IN (21677,21678,21679); +UPDATE `creature_addon` SET `path_id`=213880 WHERE `guid`=21388; +-- waypoint data +DELETE FROM `waypoint_data` WHERE `id`=213880; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(213880,1,-5065.414551,-1433.431885,-52.054058,0,0,0,0,100,0), +(213880,2,-5080.285156,-1409.718994,-52.203053,0,0,0,0,100,0), +(213880,3,-5096.495605,-1378.726807,-51.724346,0,0,0,0,100,0), +(213880,4,-5104.196289,-1358.002808,-50.824722,0,0,0,0,100,0), +(213880,5,-5112.802734,-1324.146851,-50.094719,0,0,0,0,100,0), +(213880,6,-5111.580078,-1301.388672,-49.267933,0,0,0,0,100,0), +(213880,7,-5107.584473,-1280.802734,-48.943916,0,0,0,0,100,0), +(213880,8,-5096.659180,-1257.089233,-48.471100,0,0,0,0,100,0), +(213880,9,-5082.086914,-1233.186279,-50.992100,0,0,0,0,100,0), +(213880,10,-5065.160156,-1214.561768,-54.094868,0,0,0,0,100,0), +(213880,11,-5048.077148,-1208.920410,-54.393391,0,0,0,0,100,0), +(213880,12,-5025.265625,-1212.702515,-53.574635,0,0,0,0,100,0), +(213880,13,-5007.475098,-1223.781250,-50.797726,0,0,0,0,100,0), +(213880,14,-4988.770508,-1237.379517,-47.942184,0,0,0,0,100,0), +(213880,15,-4965.532227,-1252.931885,-46.213470,0,0,0,0,100,0), +(213880,16,-4945.341309,-1262.725708,-48.321907,0,0,0,0,100,0), +(213880,17,-4957.100098,-1257.528564,-47.172382,0,0,0,0,100,0), +(213880,18,-4974.348145,-1245.551147,-46.548256,0,0,0,0,100,0), +(213880,19,-4997.272949,-1229.474365,-49.777657,0,0,0,0,100,0), +(213880,20,-5014.469727,-1217.421753,-52.319622,0,0,0,0,100,0), +(213880,21,-5032.637695,-1209.560913,-54.186928,0,0,0,0,100,0), +(213880,22,-5056.286133,-1214.395996,-54.073860,0,0,0,0,100,0), +(213880,23,-5073.804199,-1225.945801,-52.395935,0,0,0,0,100,0), +(213880,24,-5089.777344,-1243.745728,-49.314560,0,0,0,0,100,0), +(213880,25,-5098.031250,-1259.230591,-48.500839,0,0,0,0,100,0), +(213880,26,-5106.213379,-1282.815308,-48.529831,0,0,0,0,100,0), +(213880,27,-5109.097656,-1303.605347,-48.834938,0,0,0,0,100,0), +(213880,28,-5108.130859,-1322.882935,-49.570202,0,0,0,0,100,0), +(213880,29,-5104.601074,-1343.582642,-50.142941,0,0,0,0,100,0), +(213880,30,-5101.294922,-1364.320801,-50.986908,0,0,0,0,100,0), +(213880,31,-5092.989258,-1385.642334,-52.071144,0,0,0,0,100,0), +(213880,32,-5081.424316,-1403.168579,-52.366920,0,0,0,0,100,0); +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Issue 8513: PATH for Galak Messenger +UPDATE `creature` SET `MovementType`=2,`position_x`=-5128.149902,`position_y`=-2080.696045,`position_z`=-37.428406,`currentwaypoint`=1 WHERE `guid`=21580; +UPDATE `creature_addon` SET `path_id`=215800 WHERE `guid`=21580; +DELETE FROM `waypoint_data` WHERE `id`=215800; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(215800,1,-5128.149902,-2080.696045,-37.428406,0,0,1,0,100,0), +(215800,2,-5144.749512,-2055.663330,-46.166458,0,0,1,0,100,0), +(215800,3,-5160.793457,-2041.713501,-54.724445,0,0,1,0,100,0), +(215800,4,-5184.251465,-2033.325317,-58.405655,0,0,1,0,100,0), +(215800,5,-5201.125488,-2008.868042,-59.341610,0,0,1,0,100,0), +(215800,6,-5213.592285,-1976.838135,-62.579338,0,0,1,0,100,0), +(215800,7,-5217.537598,-1953.069336,-63.412289,0,0,1,0,100,0), +(215800,8,-5222.407227,-1918.432617,-64.084473,0,0,1,0,100,0), +(215800,9,-5227.438965,-1890.931396,-64.298187,0,0,1,0,100,0), +(215800,10,-5237.295410,-1857.382202,-63.312351,0,0,1,0,100,0), +(215800,11,-5240.198242,-1831.000977,-62.605770,0,0,1,0,100,0), +(215800,12,-5232.751953,-1803.313843,-61.801113,0,0,1,0,100,0), +(215800,13,-5220.500488,-1781.184692,-61.136387,0,0,1,0,100,0), +(215800,14,-5207.737793,-1765.522705,-61.406212,0,0,1,0,100,0), +(215800,15,-5183.208984,-1749.964600,-63.147694,0,0,1,0,100,0), +(215800,16,-5155.251465,-1748.128174,-64.991013,0,0,1,0,100,0), +(215800,17,-5127.433105,-1751.266235,-66.970360,0,0,1,0,100,0), +(215800,18,-5099.635254,-1754.598633,-66.299957,0,0,1,0,100,0), +(215800,19,-5077.771973,-1756.719604,-66.374535,0,0,1,0,100,0), +(215800,20,-5035.874023,-1759.257813,-65.924889,0,0,1,0,100,0), +(215800,21,-5003.504395,-1755.737061,-64.941254,0,0,1,0,100,0), +(215800,22,-4983.328613,-1736.512451,-63.698681,0,0,1,0,100,0), +(215800,23,-4964.090820,-1716.174316,-61.579193,0,0,1,0,100,0), +(215800,24,-4951.019043,-1689.857910,-57.429195,0,0,1,0,100,0), +(215800,25,-4951.841797,-1666.268433,-51.589535,0,0,1,0,100,0), +(215800,26,-4960.942871,-1639.823608,-46.855881,0,0,1,0,100,0), +(215800,27,-4966.779297,-1612.737427,-43.381424,0,0,1,0,100,0), +(215800,28,-4969.742676,-1589.195190,-43.398708,0,0,1,0,100,0), +(215800,29,-4970.269043,-1554.236694,-46.741776,0,0,1,0,100,0), +(215800,30,-4965.645996,-1536.527954,-47.020432,0,0,1,0,100,0), +(215800,31,-4947.948242,-1518.798950,-48.846462,0,0,1,0,100,0), +(215800,32,-4921.585938,-1495.780884,-48.689701,0,0,1,0,100,0), +(215800,33,-4903.989746,-1476.149902,-49.428204,0,0,1,0,100,0), +(215800,34,-4890.350098,-1454.333618,-51.238930,0,0,1,0,100,0), +(215800,35,-4879.882324,-1428.382568,-50.201576,0,0,1,0,100,0), +(215800,36,-4861.081055,-1406.409302,-52.779129,0,0,1,0,100,0), +(215800,37,-4840.355957,-1387.582764,-53.201244,0,0,1,0,100,0), +(215800,38,-4816.097168,-1368.694336,-54.406181,0,0,1,0,100,0), +(215800,39,-4803.630371,-1359.654663,-54.182922,0,0,1,0,100,0), +(215800,40,-4785.889648,-1338.234375,-52.060898,0,0,1,0,100,0), +(215800,41,-4773.799316,-1313.738037,-49.219383,0,0,1,0,100,0), +(215800,42,-4758.390137,-1290.399536,-48.736355,0,0,1,0,100,0), +(215800,43,-4737.998047,-1266.390625,-53.017822,0,0,1,0,100,0), +(215800,44,-4711.256836,-1256.681030,-52.615559,0,0,1,0,100,0), +(215800,45,-4679.181152,-1252.814209,-51.463142,0,0,1,0,100,0), +(215800,46,-4651.669922,-1247.886230,-52.659782,0,0,1,0,100,0), +(215800,47,-4623.778320,-1245.656006,-52.973877,0,0,0,0,100,0), +(215800,48,-4607.115234,-1243.643433,-53.064377,0,0,0,0,100,0), +(215800,49,-4587.437500,-1247.870361,-53.855892,0,0,0,0,100,0), +(215800,50,-4585.422852,-1249.448975,-53.857651,0,0,0,0,100,0), +(215800,51,-4598.802246,-1245.325928,-53.565094,0,0,0,0,100,0), +(215800,52,-4614.470703,-1243.162109,-52.968750,0,0,1,0,100,0), +(215800,53,-4628.971680,-1251.457642,-52.753529,0,0,1,0,100,0), +(215800,54,-4645.428223,-1247.659546,-52.638180,0,0,1,0,100,0), +(215800,55,-4661.278320,-1248.203979,-52.803345,0,0,1,0,100,0), +(215800,56,-4681.649902,-1253.290405,-51.342243,0,0,1,0,100,0), +(215800,57,-4715.111816,-1257.436401,-52.791569,0,0,1,0,100,0), +(215800,58,-4747.491211,-1264.123169,-53.191650,0,0,1,0,100,0), +(215800,59,-4759.030273,-1286.646851,-49.020157,0,0,1,0,100,0), +(215800,60,-4774.152344,-1310.650635,-48.968861,0,0,1,0,100,0), +(215800,61,-4784.423340,-1342.359375,-53.125374,0,0,1,0,100,0), +(215800,62,-4809.395508,-1362.980469,-54.185860,0,0,1,0,100,0), +(215800,63,-4837.885254,-1383.289795,-53.668198,0,0,1,0,100,0), +(215800,64,-4867.006836,-1404.410400,-53.336357,0,0,1,0,100,0), +(215800,65,-4887.808105,-1414.729858,-52.435139,0,0,1,0,100,0), +(215800,66,-4895.424316,-1429.204102,-50.844917,0,0,1,0,100,0), +(215800,67,-4896.184570,-1457.176392,-50.691010,0,0,1,0,100,0), +(215800,68,-4904.700684,-1480.074097,-49.529816,0,0,1,0,100,0), +(215800,69,-4919.068359,-1495.049683,-48.906162,0,0,1,0,100,0), +(215800,70,-4966.222168,-1533.183350,-47.460865,0,0,1,0,100,0), +(215800,71,-4976.059570,-1543.898804,-47.982384,0,0,1,0,100,0), +(215800,72,-4977.478027,-1556.967163,-47.390457,0,0,1,0,100,0), +(215800,73,-4969.218262,-1596.886963,-42.604176,0,0,1,0,100,0), +(215800,74,-4965.557617,-1625.019775,-44.356102,0,0,1,0,100,0), +(215800,75,-4960.265137,-1644.879883,-47.910450,0,0,1,0,100,0), +(215800,76,-4949.774902,-1671.032593,-52.508038,0,0,1,0,100,0), +(215800,77,-4947.920410,-1689.247437,-57.222298,0,0,1,0,100,0), +(215800,78,-4956.675293,-1709.576660,-60.879921,0,0,1,0,100,0), +(215800,79,-4963.580078,-1727.992676,-61.527287,0,0,1,0,100,0), +(215800,80,-4951.212891,-1744.922241,-58.623901,0,0,1,0,100,0), +(215800,81,-4937.354492,-1760.683716,-54.702461,0,0,1,0,100,0), +(215800,82,-4914.461426,-1782.888306,-39.879925,0,0,1,0,100,0), +(215800,83,-4896.937500,-1794.455566,-35.221378,0,0,1,0,100,0), +(215800,84,-4880.451172,-1807.454590,-40.863453,0,0,1,0,100,0), +(215800,85,-4863.387207,-1822.359985,-50.164097,0,0,1,0,100,0), +(215800,86,-4862.391113,-1836.323608,-50.317734,0,0,1,0,100,0), +(215800,87,-4861.693848,-1862.064575,-52.851486,0,0,1,0,100,0), +(215800,88,-4872.836426,-1883.313110,-52.659794,0,0,1,0,100,0), +(215800,89,-4870.795898,-1892.231201,-52.494869,0,0,1,0,100,0), +(215800,90,-4849.780762,-1918.967407,-48.753052,0,0,1,0,100,0), +(215800,91,-4830.531738,-1939.242310,-45.041187,0,0,1,0,100,0), +(215800,92,-4811.462402,-1962.676147,-50.805752,0,0,1,0,100,0), +(215800,93,-4803.708984,-1987.761475,-57.812279,0,0,1,0,100,0), +(215800,94,-4807.741211,-2007.688599,-56.595051,0,0,1,0,100,0), +(215800,95,-4818.894531,-2033.343628,-46.855431,0,0,1,0,100,0), +(215800,96,-4830.502930,-2059.523926,-39.165230,0,0,1,0,100,0), +(215800,97,-4830.697754,-2073.522705,-35.956047,0,0,1,0,100,0), +(215800,98,-4836.328613,-2090.582764,-31.344126,0,0,1,0,100,0), +(215800,99,-4849.243652,-2105.089600,-32.308865,0,0,1,0,100,0), +(215800,100,-4860.978516,-2112.724609,-36.231457,0,0,1,0,100,0), +(215800,101,-4887.553711,-2130.225098,-46.567883,0,0,1,0,100,0), +(215800,102,-4903.914551,-2142.859863,-52.826328,0,0,1,0,100,0), +(215800,103,-4925.906250,-2157.612549,-56.605095,0,0,1,0,100,0), +(215800,104,-4951.915527,-2172.731934,-54.968418,0,0,1,0,100,0), +(215800,105,-4968.645996,-2184.287109,-53.815079,0,0,1,0,100,0), +(215800,106,-4986.170898,-2202.175049,-53.769779,0,0,1,0,100,0), +(215800,107,-5006.877441,-2230.390625,-53.176605,0,0,1,0,100,0), +(215800,108,-5027.830566,-2247.915283,-52.767597,0,0,1,0,100,0), +(215800,109,-5042.617676,-2243.480469,-53.246635,0,0,1,0,100,0), +(215800,110,-5049.044434,-2230.145020,-53.927814,0,0,0,0,100,0), +(215800,111,-5047.357910,-2223.671631,-54.098183,0,0,0,0,100,0), +(215800,112,-5039.557129,-2203.820313,-54.500809,0,0,0,0,100,0), +(215800,113,-5042.728027,-2213.820068,-54.411404,0,0,0,0,100,0), +(215800,114,-5049.869629,-2229.956055,-53.964584,0,0,0,0,100,0), +(215800,115,-5062.334961,-2216.283447,-54.635983,0,0,1,0,100,0), +(215800,116,-5065.966309,-2193.272949,-55.662319,0,0,1,0,100,0), +(215800,117,-5068.202148,-2158.396240,-53.611042,0,0,1,0,100,0), +(215800,118,-5074.131836,-2135.689697,-47.028843,0,0,1,0,100,0); +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Issue 8512: PATH for XT-9 in Stonetalon Mountains +UPDATE `creature` SET `MovementType`=2,`position_x`=1222.276978,`position_y`=199.114410,`position_z`=5.525987,`currentwaypoint`=1 WHERE `guid`=32296; +UPDATE `creature_addon` SET `path_id`=322960 WHERE `guid`=32296; +DELETE FROM `waypoint_data` WHERE `id`=322960; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(322960,1,1222.276978,199.114410,5.525987,0,0,0,0,100,0), +(322960,2,1209.336914,203.459274,5.948678,0,0,0,0,100,0), +(322960,3,1192.071899,209.217392,5.244399,0,0,0,0,100,0), +(322960,4,1179.189941,213.726425,5.674247,0,0,0,0,100,0), +(322960,5,1164.158936,220.785812,4.382747,0,0,0,0,100,0), +(322960,6,1147.991821,229.042755,3.532074,0,0,0,0,100,0), +(322960,7,1132.148071,231.524780,7.357968,0,0,0,0,100,0), +(322960,8,1118.510132,231.104340,9.255224,0,0,0,0,100,0), +(322960,9,1100.385498,229.453033,11.308514,0,0,0,0,100,0), +(322960,10,1087.943970,226.725204,10.917646,0,0,0,0,100,0), +(322960,11,1080.088501,214.416534,10.396996,0,0,0,0,100,0), +(322960,12,1080.622314,198.052307,9.542740,0,0,0,0,100,0), +(322960,13,1084.607544,185.012192,8.583089,0,0,0,0,100,0), +(322960,14,1093.251343,171.689758,4.980580,0,0,0,0,100,0), +(322960,15,1092.938721,164.037949,4.320332,0,0,0,0,100,0), +(322960,16,1088.528442,156.011032,4.629877,0,0,0,0,100,0), +(322960,17,1080.081177,140.358978,4.004388,0,0,0,0,100,0), +(322960,18,1085.399170,127.790977,1.792864,0,0,0,0,100,0), +(322960,19,1096.183960,118.597023,0.878709,0,0,0,0,100,0), +(322960,20,1099.510010,109.012466,0.827630,0,0,0,0,100,0), +(322960,21,1098.441162,95.011284,-0.082417,0,0,0,0,100,0), +(322960,22,1098.891724,82.300453,-1.118887,0,0,0,0,100,0), +(322960,23,1102.501099,69.463821,-2.654820,0,0,0,0,100,0), +(322960,24,1096.981812,57.157135,-0.905613,0,0,0,0,100,0), +(322960,25,1091.626831,44.614517,1.431422,0,0,0,0,100,0), +(322960,26,1086.331299,32.963169,3.482675,0,0,0,0,100,0), +(322960,27,1085.050171,20.679634,4.132904,0,0,0,0,100,0), +(322960,28,1092.919678,7.784930,3.964831,0,0,0,0,100,0), +(322960,29,1103.300659,1.748433,3.811355,0,0,0,0,100,0), +(322960,30,1108.904541,6.663838,1.965487,0,0,0,0,100,0), +(322960,31,1119.753784,17.255640,2.577073,0,0,0,0,100,0), +(322960,32,1126.567993,33.555817,4.283827,0,0,0,0,100,0), +(322960,33,1125.516357,48.321960,2.388851,0,0,0,0,100,0), +(322960,34,1129.901855,61.247665,0.658247,0,0,0,0,100,0), +(322960,35,1132.704956,73.019661,-0.850287,0,0,0,0,100,0), +(322960,36,1136.619019,88.970215,-5.982680,0,0,0,0,100,0), +(322960,37,1137.549072,99.014374,-5.729230,0,0,0,0,100,0), +(322960,38,1134.350220,114.686874,-1.268749,0,0,0,0,100,0), +(322960,39,1130.803467,132.522125,0.171318,0,0,0,0,100,0), +(322960,40,1128.713135,146.011124,1.776255,0,0,0,0,100,0), +(322960,41,1126.625732,159.500565,-0.202374,0,0,0,0,100,0), +(322960,42,1128.083984,177.528091,1.144017,0,0,0,0,100,0), +(322960,43,1132.362427,188.766861,2.936989,0,0,0,0,100,0), +(322960,44,1141.536377,204.471161,2.415991,0,0,0,0,100,0), +(322960,45,1149.883301,215.242752,2.582333,0,0,0,0,100,0), +(322960,46,1161.778809,225.302536,3.651462,0,0,0,0,100,0), +(322960,47,1172.943726,233.153442,5.679798,0,0,0,0,100,0), +(322960,48,1189.031982,229.718399,8.996441,0,0,0,0,100,0), +(322960,49,1196.270386,219.675781,6.686813,0,0,0,0,100,0), +(322960,50,1207.258911,211.584717,6.367443,0,0,0,0,100,0), +(322960,51,1218.403931,203.703522,6.202962,0,0,0,0,100,0), +(322960,52,1229.438110,193.180573,4.627266,0,0,0,0,100,0); +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Issue 8502: PATHING FOR URUSON +UPDATE `creature` SET `MovementType`=2,`position_x`=9816.841797,`position_y`=355.442474,`position_z`=1308.459351,`currentwaypoint`=1 WHERE `guid`=46350; +UPDATE `creature_addon` SET `path_id`=463500 WHERE `guid`=46350; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(463500,1,9816.841797,355.442474,1308.459351,0,0,0,0,100,0), +(463500,2,9812.415039,362.828094,1308.752197,0,0,0,0,100,0), +(463500,3,9813.471680,371.201080,1307.603882,0,0,0,0,100,0), +(463500,4,9817.410156,378.589417,1307.885742,0,0,0,0,100,0), +(463500,5,9825.732422,384.063232,1307.750610,0,0,0,0,100,0), +(463500,6,9834.477539,389.443268,1307.568115,0,0,0,0,100,0), +(463500,7,9841.236328,395.250305,1307.572998,0,0,0,0,100,0), +(463500,8,9848.033203,401.213165,1306.638672,0,0,0,0,100,0), +(463500,9,9859.214844,406.416229,1305.993896,0,0,0,0,100,0), +(463500,10,9869.071289,406.038055,1306.539917,0,0,0,0,100,0), +(463500,11,9878.757813,405.102966,1307.240845,0,0,0,0,100,0), +(463500,12,9885.528320,403.787720,1307.657715,0,0,0,0,100,0), +(463500,13,9889.619141,397.835724,1308.962280,0,0,0,0,100,0), +(463500,14,9893.748047,390.061859,1309.997925,0,0,0,0,100,0), +(463500,15,9896.480469,384.763855,1309.682861,0,0,0,0,100,0), +(463500,16,9893.901367,389.335175,1309.996948,0,0,0,0,100,0), +(463500,17,9891.625977,394.618530,1309.802979,0,0,0,0,100,0), +(463500,18,9889.411133,401.266754,1308.383423,0,0,0,0,100,0), +(463500,19,9889.074219,410.169098,1306.578735,0,0,0,0,100,0), +(463500,20,9889.352539,418.270325,1305.849609,0,0,0,0,100,0), +(463500,21,9889.537109,426.961700,1305.150146,0,0,0,0,100,0), +(463500,22,9886.551758,436.957245,1304.242920,0,0,0,0,100,0), +(463500,23,9880.396484,443.821472,1303.310303,0,0,0,0,100,0), +(463500,24,9870.833008,446.340790,1303.197144,0,0,0,0,100,0), +(463500,25,9862.344727,445.663116,1305.028198,0,0,0,0,100,0), +(463500,26,9853.178711,443.624847,1306.194458,0,0,0,0,100,0), +(463500,27,9846.104492,441.481476,1307.793701,0,0,0,0,100,0), +(463500,28,9837.686523,438.918671,1307.793701,0,0,0,0,100,0), +(463500,29,9844.111328,440.791779,1307.793701,0,0,0,0,100,0), +(463500,30,9851.247070,442.721130,1306.898926,0,0,0,0,100,0), +(463500,31,9859.722656,444.624786,1305.261841,0,0,0,0,100,0), +(463500,32,9868.759766,446.034027,1303.592163,0,0,0,0,100,0), +(463500,33,9876.381836,446.370392,1302.643555,0,0,0,0,100,0), +(463500,34,9882.995117,443.218323,1303.420654,0,0,0,0,100,0), +(463500,35,9886.392578,436.599731,1304.326904,0,0,0,0,100,0), +(463500,36,9888.699219,427.984589,1305.102173,0,0,0,0,100,0), +(463500,37,9888.677734,420.184723,1305.806763,0,0,0,0,100,0), +(463500,38,9886.924805,411.696075,1306.650635,0,0,0,0,100,0), +(463500,39,9881.045898,406.513794,1307.236572,0,0,0,0,100,0), +(463500,40,9872.117188,405.889221,1306.774536,0,0,0,0,100,0), +(463500,41,9863.948242,407.544800,1306.226685,0,0,0,0,100,0), +(463500,42,9857.266602,406.285339,1306.106934,0,0,0,0,100,0), +(463500,43,9850.121094,401.789185,1306.542236,0,0,0,0,100,0), +(463500,44,9843.356445,396.552856,1307.546021,0,0,0,0,100,0), +(463500,45,9836.401367,390.980865,1307.567749,0,0,0,0,100,0), +(463500,46,9828.750977,386.198456,1307.593384,0,0,0,0,100,0), +(463500,47,9820.420898,380.808014,1307.936279,0,0,0,0,100,0), +(463500,48,9814.184570,374.616272,1307.687866,0,0,0,0,100,0), +(463500,49,9812.975586,367.559235,1307.733276,0,0,0,0,100,0), +(463500,50,9812.920898,362.307007,1308.749512,0,0,0,0,100,0); +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Issue 8501: SET up path and formation for snake pet vendor +DELETE FROM `creature_formations` WHERE `leaderGUID`=3476; +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(3476,3476,0,0,2), +(3476,3477,3,45,0), +(3476,3560,3,0,0), +(3476,3571,3,315,0); +UPDATE `creature` SET `MovementType`=2,`position_x`=1527.534058,`position_y`=-4154.753418,`position_z`=40.633469,`currentwaypoint`=1 WHERE `guid` IN (3476,3477,3560,3571); +-- point to new waypoint +UPDATE `creature_addon` SET `path_id`=34760 WHERE `guid` IN(3476,3477,3560,3571); +-- create waypoint data +DELETE FROM `waypoint_data` WHERE `id`=34760; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(34760,1,1527.534058,-4154.753418,40.633469,0,0,0,0,100,0), +(34760,1,1538.660889,-4155.732910,40.592560,0,0,0,0,100,0), +(34760,1,1544.449585,-4165.091797,40.235329,0,0,0,0,100,0), +(34760,1,1549.555054,-4182.306152,40.612457,0,0,0,0,100,0), +(34760,1,1546.198364,-4195.886719,41.639046,0,0,0,0,100,0), +(34760,1,1546.507202,-4208.074219,42.972824,0,0,0,0,100,0), +(34760,1,1563.277588,-4208.397949,43.588390,0,0,0,0,100,0), +(34760,1,1580.304932,-4204.166992,42.040199,0,0,0,0,100,0), +(34760,1,1579.333008,-4190.097656,40.364456,0,0,0,0,100,0), +(34760,1,1578.215454,-4169.156250,36.905151,0,0,0,0,100,0), +(34760,1,1583.998901,-4151.174316,34.014111,0,0,0,0,100,0), +(34760,1,1598.492920,-4127.300293,30.541750,0,0,0,0,100,0), +(34760,1,1617.180908,-4113.645508,29.638874,0,0,0,0,100,0), +(34760,1,1636.737183,-4106.015625,30.359407,0,0,0,0,100,0), +(34760,1,1656.451660,-4098.783691,33.361252,0,0,0,0,100,0), +(34760,1,1682.917603,-4089.642822,37.421402,0,0,0,0,100,0), +(34760,1,1703.152954,-4084.039551,40.476315,0,0,0,0,100,0), +(34760,1,1726.875488,-4072.490234,43.763309,0,0,0,0,100,0), +(34760,1,1731.973511,-4067.927002,44.831135,0,0,0,0,100,0), +(34760,1,1741.482544,-4049.207031,44.283241,0,0,0,0,100,0), +(34760,1,1745.628418,-4030.451172,45.169521,0,0,0,0,100,0), +(34760,1,1745.231323,-4016.597412,45.969612,0,0,0,0,100,0), +(34760,1,1740.649658,-3996.140625,46.610088,0,0,0,0,100,0), +(34760,1,1729.449951,-3971.255615,48.347816,0,0,0,0,100,0), +(34760,1,1723.011841,-3958.823730,49.068924,0,0,0,0,100,0), +(34760,1,1708.968994,-3932.853760,50.349556,0,0,0,0,100,0), +(34760,1,1721.805054,-3957.727295,49.226501,0,0,0,0,100,0), +(34760,1,1734.530396,-3982.660156,47.613869,0,0,0,0,100,0), +(34760,1,1740.518555,-4002.613770,46.854977,0,0,0,0,100,0), +(34760,1,1743.422241,-4023.412109,46.146847,0,0,0,0,100,0), +(34760,1,1742.478638,-4043.433350,44.345577,0,0,0,0,100,0), +(34760,1,1735.912354,-4059.685303,44.504650,0,0,0,0,100,0), +(34760,1,1729.070313,-4071.194092,44.119446,0,0,0,0,100,0), +(34760,1,1714.267700,-4082.427490,40.937172,0,0,0,0,100,0), +(34760,1,1696.915161,-4087.865967,38.582226,0,0,0,0,100,0), +(34760,1,1676.688477,-4093.507080,36.173759,0,0,0,0,100,0), +(34760,1,1656.776611,-4100.146484,33.436935,0,0,0,0,100,0), +(34760,1,1637.123169,-4107.544922,30.447823,0,0,0,0,100,0), +(34760,1,1617.755859,-4115.625000,29.678862,0,0,0,0,100,0), +(34760,1,1597.177124,-4130.714844,31.122652,0,0,0,0,100,0), +(34760,1,1590.612183,-4140.921875,32.565376,0,0,0,0,100,0), +(34760,1,1578.348389,-4166.501953,36.404202,0,0,0,0,100,0), +(34760,1,1578.059326,-4183.750488,39.244587,0,0,0,0,100,0), +(34760,1,1578.675171,-4204.605957,42.405655,0,0,0,0,100,0), +(34760,1,1569.681030,-4206.293457,43.517696,0,0,0,0,100,0), +(34760,1,1548.253662,-4208.393555,43.110550,0,0,0,0,100,0), +(34760,1,1544.526123,-4201.686035,42.132000,0,0,0,0,100,0), +(34760,1,1549.644531,-4176.722656,40.245403,0,0,0,0,100,0), +(34760,1,1547.767822,-4167.392578,39.779228,0,0,0,0,100,0), +(34760,1,1541.973145,-4159.893555,40.252274,0,0,0,0,100,0); +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Issue 8497: Proper pathing for Threggil (rare in Teldrassil - Fel Rock) +UPDATE `creature` SET `MovementType`=2,`position_x`=10115.946289,`position_y`=1167.518799,`position_z`=1314.169800,`currentwaypoint`=1 WHERE `guid`=46354; +UPDATE `creature_addon` SET `path_id`=463540 WHERE `guid`=46354; +DELETE FROM `waypoint_data` WHERE `id`=463540; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) values +(463540,1,10115.946289,1167.518799,1314.169800,0,0,0,0,100,0), +(463540,2,10116.369141,1180.527344,1314.797729,0,0,0,0,100,0), +(463540,3,10115.022461,1189.806763,1313.652832,0,0,0,0,100,0), +(463540,4,10110.606445,1199.469116,1311.572510,0,0,0,0,100,0), +(463540,5,10103.337891,1203.544067,1311.799561,0,0,0,0,100,0), +(463540,6,10096.462891,1201.196289,1312.748047,0,0,0,0,100,0), +(463540,7,10088.860352,1196.343018,1315.411377,0,0,0,0,100,0), +(463540,8,10082.796875,1189.643555,1316.328369,0,0,0,0,100,0), +(463540,9,10076.649414,1182.240234,1316.167480,0,0,0,0,100,0), +(463540,10,10072.209961,1176.473511,1316.686768,0,0,0,0,100,0), +(463540,11,10068.778320,1169.667603,1318.986328,0,0,0,0,100,0), +(463540,12,10063.398438,1163.494019,1319.416260,0,0,0,0,100,0), +(463540,13,10057.836914,1157.816895,1319.428955,0,0,0,0,100,0), +(463540,14,10055.192383,1151.090576,1320.125732,0,0,0,0,100,0), +(463540,15,10057.836914,1157.816895,1319.428955,0,0,0,0,100,0), +(463540,16,10063.398438,1163.494019,1319.416260,0,0,0,0,100,0), +(463540,17,10068.778320,1169.667603,1318.986328,0,0,0,0,100,0), +(463540,18,10072.209961,1176.473511,1316.686768,0,0,0,0,100,0), +(463540,19,10076.649414,1182.240234,1316.167480,0,0,0,0,100,0), +(463540,20,10082.796875,1189.643555,1316.328369,0,0,0,0,100,0), +(463540,21,10088.860352,1196.343018,1315.411377,0,0,0,0,100,0), +(463540,22,10096.462891,1201.196289,1312.748047,0,0,0,0,100,0), +(463540,23,10103.337891,1203.544067,1311.799561,0,0,0,0,100,0), +(463540,24,10110.606445,1199.469116,1311.572510,0,0,0,0,100,0), +(463540,25,10115.022461,1189.806763,1313.652832,0,0,0,0,100,0), +(463540,26,10116.369141,1180.527344,1314.797729,0,0,0,0,100,0); +-- ------------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- Steelsnap's (guid 21698) guards (guids 21660,21661) should be in formation rather than set up with identical waypoints. This corrects pathing problems +UPDATE `creature` SET `MovementType`=0 WHERE guid IN (21661, 21660); +DELETE FROM `creature_formations` WHERE `memberGUID` IN (21698,21661,21660); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES +(21698,21698,0,0,2), +(21698,21661,6,0,2), +(21698,21660,12,0,2); diff --git a/sql/updates/world/2012_12_04_00_world_creature_text.sql b/sql/updates/world/2012_12_04_00_world_creature_text.sql new file mode 100644 index 00000000000..654ed11de4f --- /dev/null +++ b/sql/updates/world/2012_12_04_00_world_creature_text.sql @@ -0,0 +1,388 @@ +-- ------------------------------- -- +-- Creature text conversion part 6 -- +-- ------------------------------- -- +-- moorabi +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1604017 AND -1604010; +DELETE FROM `creature_text` WHERE `entry`=29305; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29305,0,0,14,0,100,"moorabi SAY_AGGRO","We fought back da Scourge. What chance joo be thinkin' JOO got?"), +(29305,1,0,14,0,100,"moorabi SAY_SLAY_1","Who gonna stop me; you? "), +(29305,1,1,14,0,100,"moorabi SAY_SLAY_2","Not so tough now."), +(29305,2,0,14,0,100,"moorabi SAY_DEATH","If our gods can die... den so can we... "), +(29305,3,0,14,0,100,"moorabi SAY_TRANSFORM","Get ready for somethin'... much... BIGGAH! "), +(29305,4,0,14,0,100,"moorabi SAY_QUAKE","Da ground gonna swallow you up"), +(29305,5,0,41,0,100,"moorabi EMOTE_TRANSFORM","%s begins to transform!"); + +-- Slad'ran +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1604023 AND -1604017; +DELETE FROM `creature_text` WHERE `entry`=29304; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29304,0,0,41,0,100,"Slad'ran EMOTE_TRANSFORM","%s begins to transform!"), +(29304,1,0,12,0,100,"Slad'ran SAY_SLAY_1","Ye not breathin'! Good."), +(29304,1,1,12,0,100,"Slad'ran SAY_SLAY_2","You ssscared now?"), +(29304,1,2,12,0,100,"Slad'ran SAY_SLAY_3","I'll eat you next, mon!"), +(29304,2,0,12,0,100,"Slad'ran SAY_DEATH","I sssee now... Ssscourge wasss not... our greatessst enemy..."), +(29304,3,0,12,0,100,"Slad'ran SAY_SUMMON_SNAKES","Minionsss of the scale, heed my call!"), +(29304,4,0,12,0,100,"Slad'ran SAY_SUMMON_CONSTRICTORS","A thousssand fangs gonna rend your flesh!"); + +-- blood queen lana thel +DELETE FROM `creature_text` WHERE `entry`=37955 AND `groupid`=12; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(37955,12,0,41,0,100,"blood queen lana thel EMOTE_BERSERK_RAID","%s goes into a berserker rage!"); + +-- sindragosa +DELETE FROM `creature_text` WHERE `entry`=36853 AND `groupid`=11; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(36853,11,0,41,0,100,"sindragosa EMOTE_BERSERK_RAID","%s goes into a berserker rage!"); + +-- anubrekhan +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533008 AND -1533000; +DELETE FROM `creature_text` WHERE `entry`=15956; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15956,0,0,14,8785,100,"anubrekhan SAY_AGGRO1","Just a little taste..."), +(15956,0,1,14,8786,100,"anubrekhan SAY_AGGRO2","There is no way out."), +(15956,0,2,14,8787,100,"anubrekhan SAY_AGGRO3","Yes, Run! It makes the blood pump faster!"), +(15956,1,0,14,8788,100,"anubrekhan SAY_GREET1","Ahh... welcome to my parlor."), +(15956,1,1,14,8790,100,"anubrekhan SAY_GREET2","I hear little hearts beating. Yesss... beating faster now. Soon the beating will stop."), +(15956,1,2,14,8791,100,"anubrekhan SAY_GREET3","Where to go? What to do? So many choices that all end in pain, end in death."), +(15956,1,3,14,8792,100,"anubrekhan SAY_GREET4","Which one shall I eat first? So difficult to choose... the all smell so delicious."), +(15956,1,4,14,8793,100,"anubrekhan SAY_GREET5","Closer now... tasty morsels. I've been too long without food. Without blood to drink."), +(15956,2,0,14,8789,100,"anubrekhan SAY_SLAY","Shh... it will all be over soon."); + +-- faerlina +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533016 AND -1533009; +DELETE FROM `creature_text` WHERE `entry`=15953; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15953,0,0,14,8799,100,"faerlina SAY_GREET","Your old lives, your mortal desires, mean nothing. You are acolytes of the master now, and you will serve the cause without question! The greatest glory is to die in the master's service!"), +(15953,1,0,14,8794,100,"faerlina SAY_AGGRO1","Slay them in the master's name!"), +(15953,1,1,14,8795,100,"faerlina SAY_AGGRO2","You cannot hide from me!"), +(15953,1,2,14,8796,100,"faerlina SAY_AGGRO3","Kneel before me, worm!"), +(15953,1,3,14,8797,100,"faerlina SAY_AGGRO4","Run while you still can!"), +(15953,2,0,14,8800,100,"faerlina SAY_SLAY1","You have failed!"), +(15953,2,1,14,8801,100,"faerlina SAY_SLAY2","Pathetic wretch!"), +(15953,3,0,14,8798,100,"faerlina SAY_DEATH","The master... will avenge me!"); + +-- korthazz +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533057 AND -1533051; +DELETE FROM `creature_text` WHERE `entry`=16064; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(16064,0,0,14,8899,100,"korthazz SAY_KORT_AGGRO","Come out and fight, ye wee ninny!"), +(16064,1,0,14,8903,100,"korthazz SAY_KORT_TAUNT1","To arms, ye roustabouts! We've got company!"), +(16064,1,1,14,8904,100,"korthazz SAY_KORT_TAUNT2","I heard about enough of yer sniveling. Shut yer fly trap 'afore I shut it for ye!"), +(16064,1,2,14,8905,100,"korthazz SAY_KORT_TAUNT3","I'm gonna enjoy killin' these slack-jawed daffodils!"), +(16064,2,0,14,8902,100,"korthazz SAY_KORT_SPECIAl","I like my meat extra crispy!"), +(16064,3,0,14,8901,100,"korthazz SAY_KORT_SLAY","Next time, bring more friends!"), +(16064,4,0,14,8900,100,"korthazz SAY_KORT_DEATH","What a bloody waste this is!"); + +-- blaumeux +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533050 AND -1533044; +DELETE FROM `creature_text` WHERE `entry`=16065; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(16065,0,0,14,8892,100,"blaumeux SAY_BLAU_AGGRO","Defend youself!"), +(16065,1,0,14,8896,100,"blaumeux SAY_BLAU_TAUNT1","Come, Zeliek, do not drive them out. Not before we've had our fun."), +(16065,1,1,14,8897,100,"blaumeux SAY_BLAU_TAUNT2","I do hope they stay alive long enough for me to... introduce myself."), +(16065,1,2,14,8898,100,"blaumeux SAY_BLAU_TAUNT3","The first kill goes to me! Anyone care to wager?"), +(16065,2,0,14,8895,100,"blaumeux SAY_BLAU_SPECIAL","Your life is mine!"), +(16065,3,0,14,8894,100,"blaumeux SAY_BLAU_SLAY","Who's next?"), +(16065,4,0,14,8893,100,"blaumeux SAY_BLAU_DEATH","Tou... che!"); + +-- rivendare +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533074 AND -1533065; +DELETE FROM `creature_text` WHERE `entry`=30549; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(30549,0,0,14,14571,100,"rivendare SAY_RIVE_AGGRO1","You seek death?"), +(30549,0,1,14,14572,100,"rivendare SAY_RIVE_AGGRO2","None shall pass!"), +(30549,0,2,14,14573,100,"rivendare SAY_RIVE_AGGRO3","Be still!"), +(30549,1,0,14,14577,100,"rivendare SAY_RIVE_TAUNT1","Enough prattling. Let them come! We shall grind their bones to dust."), +(30549,1,1,14,14578,100,"rivendare SAY_RIVE_TAUNT2","Conserve your anger! Harness your rage! You will all have outlets for your frustration soon enough."), +(30549,1,2,14,14579,100,"rivendare SAY_RIVE_TAUNT3","Life is meaningless. It is in death that we are truly tested."), +(30549,2,0,14,14576,100,"rivendare SAY_RIVE_SPECIAL","Bow to the might of the scourge!"), +(30549,3,0,14,14574,100,"rivendare SAY_RIVE_SLAY1","You will find no peace in death."), +(30549,3,1,14,14575,100,"rivendare SAY_RIVE_SLAY2","The master's will is done."), +(30549,4,0,14,14580,100,"rivendare SAY_RIVE_DEATH","Death... will not stop me..."); + +-- zeliek +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533064 AND -1533058; +DELETE FROM `creature_text` WHERE `entry`=16063; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(16063,0,0,14,8913,100,"zeliek SAY_ZELI_AGGRO","Flee, before it's too late!"), +(16063,1,0,14,8917,100,"zeliek SAY_ZELI_TAUNT1","Invaders, cease this foolish venture at once! Turn away while you still can!"), +(16063,1,1,14,8918,100,"zeliek SAY_ZELI_TAUNT2","Perhaps they will come to their senses, and run away as fast as they can!"), +(16063,1,2,14,8919,100,"zeliek SAY_ZELI_TAUNT3","Do not continue! Turn back while there's still time!"), +(16063,2,0,14,8916,100,"zeliek SAY_ZELI_SPECIAL","I- I have no choice but to obey!"), +(16063,3,0,14,8915,100,"zeliek SAY_ZELI_SLAY","Forgive me!"), +(16063,4,0,14,8914,100,"zeliek SAY_ZELI_DEATH","It is... as it should be."); + +-- gothik +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533043 AND -1533040; +DELETE FROM `creature_text` WHERE `entry`=16060; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(16060,0,0,14,8807,100,"gothik SAY_SPEECH","Foolishly you have sought your own demise. Brazenly you have disregarded powers beyond your understanding. You have fought hard to invade the realm of the harvester. Now there is only one way out - to walk the lonely path of the damned."), +(16060,1,0,14,8806,100,"gothik SAY_KILL","Death is the only escape."), +(16060,2,0,14,8805,100,"gothik SAY_DEATH","I... am... undone!"), +(16060,3,0,14,8808,100,"gothik SAY_TELEPORT","I have waited long enough! Now, you face the harvester of souls!"); + +-- heigan +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533118 AND -1533109; +DELETE FROM `creature_text` WHERE `entry`=15936; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15936,0,0,14,8825,100,"heigan SAY_AGGRO1","You are mine now!"), +(15936,0,1,14,8826,100,"heigan SAY_AGGRO2","I see you!"), +(15936,0,2,14,8827,100,"heigan SAY_AGGRO3","You...are next!"), +(15936,1,0,14,8829,100,"heigan SAY_SLAY","Close your eyes... sleep!"), +(15936,2,0,14,8830,100,"heigan SAY_TAUNT1","The races of the world will perish. It is only a matter of time."), +(15936,2,1,14,8831,100,"heigan SAY_TAUNT2","I see endless suffering, I see torment, I see rage. I see... everything!"), +(15936,2,2,14,8832,100,"heigan SAY_TAUNT3","Soon... the world will tremble!"), +(15936,2,3,14,8833,100,"heigan SAY_TAUNT4","The end is upon you."), +(15936,2,4,14,8834,100,"heigan SAY_TAUNT5","Hungry worms will feast on your rotten flesh!"), +(15936,3,0,14,8828,100,"heigan SAY_DEATH","Noo... o..."); + +-- noth +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533081 AND -1533075; +DELETE FROM `creature_text` WHERE `entry`=15954; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15954,0,0,14,8845,100,"noth SAY_AGGRO1","Glory to the master!"), +(15954,0,1,14,8846,100,"noth SAY_AGGRO2","Your life is forfeit!"), +(15954,0,2,14,8847,100,"noth SAY_AGGRO3","Die, trespasser!"), +(15954,1,0,14,8851,100,"noth SAY_SUMMON","Rise, my soldiers! Rise and fight once more!"), +(15954,2,0,14,8849,100,"noth SAY_SLAY1","My task is done!"), +(15954,2,1,14,8850,100,"noth SAY_SLAY2","Breathe no more!"), +(15954,3,0,14,8848,100,"noth SAY_DEATH","I will serve the master... in... death!"); + +-- patchwerk +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533022 AND -1533017; +DELETE FROM `creature_text` WHERE `entry`=16028; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(16028,0,0,14,8909,100,"patchwerk SAY_AGGRO1","Patchwerk want to play!"), +(16028,0,1,14,8910,100,"patchwerk SAY_AGGRO2","Kel'Thuzad make Patchwerk his Avatar of War!"), +(16028,1,0,14,8912,100,"patchwerk SAY_SLAY","No more play?"), +(16028,2,0,14,8911,100,"patchwerk SAY_DEATH","What happened to... Patch..."), +(16028,3,0,16,0,100,"patchwerk EMOTE_BERSERK","goes into a berserker rage!"), +(16028,4,0,16,0,100,"patchwerk EMOTE_ENRAGE","%s becomes enraged!"); + +-- stalagg +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533025 AND -1533023; +DELETE FROM `creature_text` WHERE `entry`=15929; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15929,0,0,14,8864,100,"stalagg SAY_STAL_AGGRO","Stalagg crush you!"), +(15929,1,0,14,8866,100,"stalagg SAY_STAL_SLAY","Stalagg kill!"), +(15929,2,0,14,8865,100,"stalagg SAY_STAL_DEATH","Master save me..."); + +-- feugen +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533028 AND -1533026; +DELETE FROM `creature_text` WHERE `entry`=15930; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15930,0,0,14,8802,100,"feugen SAY_FEUG_AGGRO","Feed you to master!"), +(15930,1,0,14,8804,100,"feugen SAY_FEUG_SLAY","Feugen make master happy!"), +(15930,2,0,14,8803,100,"feugen SAY_FEUG_DEATH","No... more... Feugen..."); + +-- thaddius +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533039 AND -1533029; +DELETE FROM `creature_text` WHERE `entry`=15928; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15928,0,0,14,8872,100,"thaddius SAY_GREET","You are too late... I... must... OBEY!"), +(15928,1,0,14,8867,100,"thaddius SAY_AGGRO1","KILL!"), +(15928,1,1,14,8868,100,"thaddius SAY_AGGRO2","EAT YOUR BONES!"), +(15928,1,2,14,8869,100,"thaddius SAY_AGGRO3","BREAK YOU!"), +(15928,2,0,14,8877,100,"thaddius SAY_SLAY","You die now!"), +(15928,3,0,14,8871,100,"thaddius SAY_ELECT","Now YOU feel pain!"), +(15928,4,0,14,8870,100,"thaddius SAY_DEATH","Thank... you..."), +(15928,5,0,14,8873,100,"thaddius SAY_SCREAM1","Pleeease!"), +(15928,5,1,14,8874,100,"thaddius SAY_SCREAM2","Stop, make it stop!"), +(15928,5,2,14,8875,100,"thaddius SAY_SCREAM3","Help me! Save me!"), +(15928,5,3,14,8876,100,"thaddius SAY_SCREAM4","Please, nooo!"); + +-- anomalus +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576013 AND -1576010; +DELETE FROM `creature_text` WHERE `entry`=26763; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26763,0,0,14,13186,100,"anomalus SAY_AGGRO","Chaos beckons."), +(26763,1,0,14,13187,100,"anomalus SAY_DEATH","Of course."), +(26763,2,0,14,13188,100,"anomalus SAY_RIFT","Reality... unwoven."), +(26763,3,0,14,13189,100,"anomalus SAY_SHIELD","Indestructible."); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576044 AND -1576040; +DELETE FROM `creature_text` WHERE `entry`=26723; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26723,0,0,14,13450,100,"keristrasza SAY_AGGRO","Preserve? Why? There's no truth in it. No no no... only in the taking! I see that now!"), +(26723,1,0,14,13453,100,"keristrasza SAY_SLAY","Now we've come to the truth!"), +(26723,2,0,14,13452,100,"keristrasza SAY_ENRAGE","Finish it! FINISH IT! Kill me, or I swear by the Dragonqueen you'll never see daylight again!"), +(26723,3,0,14,13454,100,"keristrasza SAY_DEATH","Dragonqueen... Life-Binder... preserve... me."), +(26723,4,0,14,13451,100,"keristrasza SAY_CRYSTAL_NOVA","Stay. Enjoy your final moments."); + +-- grand magus telestra +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576005 AND -1576000; +DELETE FROM `creature_text` WHERE `entry`=26731; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26731,0,0,14,13319,100,"grand magus telestra SAY_AGGRO","You know what they say about curiosity."), +(26731,1,0,14,13324,100,"grand magus telestra SAY_KILL","Death becomes you!"), +(26731,2,0,14,13320,100,"grand magus telestra SAY_DEATH","Damn the... luck."), +(26731,3,0,14,13323,100,"grand magus telestra SAY_MERGE","Now to finish the job!"), +(26731,4,0,14,13321,100,"grand magus telestra SAY_SPLIT_1","There's plenty of me to go around."), +(26731,4,1,14,13322,100,"grand magus telestra SAY_SPLIT_2","I'll give you more than you can handle."); + +-- drakos +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1578016 AND -1578005; +DELETE FROM `creature_text` WHERE `entry`=27654; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(27654,0,0,14,13594,100,"drakos SAY_AGGRO","The prisoners shall not go free! The word of Malygos is law!"), +(27654,1,0,14,13602,100,"drakos SAY_KILL_1","A fitting punishment!"), +(27654,1,1,14,13603,100,"drakos SAY_KILL_2","Sentence: executed!"), +(27654,1,2,14,13604,100,"drakos SAY_KILL_3","Another casualty of war!"), +(27654,2,0,14,13605,100,"drakos SAY_DEATH","The war... goes on."), +(27654,3,0,14,13598,100,"drakos SAY_PULL_1","It is too late to run!"), +(27654,3,1,14,13599,100,"drakos SAY_PULL_2","Gather 'round...."), +(27654,3,2,14,13600,100,"drakos SAY_PULL_3","None shall escape!"), +(27654,3,3,14,13601,100,"drakos SAY_PULL_4","I condemn you to death!"), +(27654,4,0,14,13595,100,"drakos SAY_STOMP_1","Tremble, worms!"), +(27654,4,1,14,13596,100,"drakos SAY_STOMP_2","I will crush you!"), +(27654,4,2,14,13597,100,"drakos SAY_STOMP_3","Can you fly?"); + +-- urom +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1578004 AND -1578000; +DELETE FROM `creature_text` WHERE `entry`=27655; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(27655,0,0,14,0,100,"urom SAY_AGGRO_1","What do we have here... those that would defy the Spell-Weaver? Those without foresight our understanding. How can i make you see? Malygos is saving the world from itself! Bah! You are hardly worth my time!"), +(27655,1,0,14,0,100,"urom SAY_AGGRO_2","Clearly my pets failed. Perhaps another demonstration is in order."), +(27655,2,0,14,0,100,"urom SAY_AGGRO_3","Still you fight. Still you cling to misguided principles. If you survive, you'll find me in the center ring."), +(27655,3,0,14,0,100,"urom SAY_AGGRO_4","Poor blind fools!"), +(27655,4,0,14,0,100,"urom SAY_TELEPORT","A taste... just a small taste... of the Spell-Weaver's power!"); + +-- injured rainspeaker oracle +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1571002 AND -1571000; +DELETE FROM `creature_text` WHERE `entry`=28217; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(28217,0,0,12,0,100,"injured rainspeaker oracle SAY_END_IRO","You save me! We thank you. We going to go back to village now. You come too... you can stay with us! Puppy-men kind of mean anyway. "), +(28217,1,0,12,0,100,"injured rainspeaker oracle SAY_QUEST_ACCEPT_IRO ","Let me know when you ready to go, okay?"), +(28217,2,0,12,0,100,"injured rainspeaker oracle SAY_START_IRO","Home time!"); + +-- vekjik +DELETE FROM `script_texts` WHERE `entry`=-1000208; +DELETE FROM `creature_text` WHERE `entry`=28315; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(28315,0,0,12,0,100,"vekjik SAY_TEXTID_VEKJIK1","Frenzyheart kill you if you come back. You no welcome here no more!"); + +-- engineer helice +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800053 AND -1800047; +DELETE FROM `creature_text` WHERE `entry`=28787; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(28787,0,0,12,0,100,"engineer helice SAY_WP_1","We made it! Thank you for getting me out of that hell hole. Tell Hemet to expect me!"), +(28787,1,0,12,0,100,"engineer helice SAY_WP_2","You really shouldn't play with this stuff. Someone could get hurt."), +(28787,2,0,12,0,100,"engineer helice SAY_WP_3","Oh, look, it's another cartload of explosives! Let's help them dispose of it."), +(28787,3,0,12,0,100,"engineer helice SAY_WP_4","It's getting a little hot over here. Shall we move on?"), +(28787,4,0,12,0,100,"engineer helice SAY_WP_5","Or THIS is what you get."), +(28787,5,0,12,0,100,"engineer helice SAY_WP_6","Listen up, Venture Company goons! Rule #1: Never keep the prisoner near the explosives."), +(28787,6,0,12,0,100,"engineer helice SAY_WP_7","Let's get the hell out of here"); + +-- adventurous dwarf +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1571043 AND -1571042; +DELETE FROM `creature_text` WHERE `entry`=28604; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(28604,0,0,12,0,100,"adventurous dwarf SAY_DWARF_OUCH","Ouch! Watch where you're tugging!"), +(28604,1,0,12,0,100,"adventurous dwarf SAY_DWARF_HELP","Glad I could help!"); + +-- agnetta +DELETE FROM `script_texts` WHERE `entry`=-1571003; +DELETE FROM `creature_text` WHERE `entry`=30154; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(30154,0,0,12,0,100,"agnetta SAY_AGGRO","I'm not afraid of anything -- bring it on!"); + +-- injured goblin +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800043 AND -1800042; +DELETE FROM `creature_text` WHERE `entry`=29434; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29434,0,0,12,0,100,"injured goblin SAY_QUEST_START","Let me know when you're ready. I'd prefer sooner than later... what with the slowly dying from poison and all."), +(29434,1,0,12,0,100,"injured goblin SAY_END_WP_REACHED","I'm going to bring the venom sack to Ricket... and then... you know... collapse. Thank you for helping me!"); + +-- krystallus +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1599010 AND -1599007; +DELETE FROM `creature_text` WHERE `entry`=27977; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(27977,0,0,14,14176,100,"krystallus SAY_AGGRO","Crush...."), +(27977,1,0,14,14177,100,"krystallus SAY_KILL","Ha...ha...ha...ha..."), +(27977,2,0,14,14179,100,"krystallus SAY_DEATH","Uuuuhhhhhhhhhh......"), +(27977,3,0,14,14178,100,"krystallus SAY_SHATTER","Break.... you...."); + +-- maiden of grief +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1599006 AND -1599000; +DELETE FROM `creature_text` WHERE `entry`=27975; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(27975,0,0,14,13487,100,"maiden of grief SAY_AGGRO","You shouldn't have come...now you will die!"), +(27975,1,0,14,13488,100,"maiden of grief SAY_SLAY_1","Why must it be this way?"), +(27975,1,1,14,13489,100,"maiden of grief SAY_SLAY_2","You had it coming!"), +(27975,1,2,14,13490,100,"maiden of grief SAY_SLAY_3","My burden grows heavier."), +(27975,1,3,14,13491,100,"maiden of grief SAY_SLAY_4","This is your own fault!"), +(27975,2,0,14,13493,100,"maiden of grief SAY_DEATH","I hope you all rot! I never...wanted...this."), +(27975,3,0,14,13492,100,"maiden of grief SAY_STUN","So much lost time... that you'll never get back!"); + +-- Sjonnir +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1599006 AND -1599000; +DELETE FROM `creature_text` WHERE `entry`=27978; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(27978,0,0,14,14180,100,"Sjonnir SAY_AGGRO","Soft, vulnerable shells. Brief, fragile lives. You can not escape the curse of flesh!"), +(27978,1,0,14,14182,100,"Sjonnir SAY_SLAY_1","Flesh is no match for iron!"), +(27978,1,1,14,14183,100,"Sjonnir SAY_SLAY_2","Armies of iron will smother the world!"), +(27978,1,2,12,0,100,"Sjonnir SAY_SLAY_3","Folvynn buul hrom onn!"), +(27978,2,0,14,14184,100,"Sjonnir SAY_DEATH","Loken will not rest, until the forge is retaken. You changed nothing!"); + +-- halls of stone +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1599068 AND -1599016; +DELETE FROM `creature_text` WHERE `entry` IN (30898,30899,30897,28070); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +-- brann +(28070,0,0,14,14244,100,"brann SAY_KILL_1","Now that's owning your supper!"), +(28070,0,1,14,14245,100,"brann SAY_KILL_2","Press on, that's the way!"), +(28070,0,2,14,14246,100,"brann SAY_KILL_3","Keep it up now. Plenty of death-dealing for everyone!"), +(28070,1,0,14,14257,100,"brann SAY_LOW_HEALTH","I'm all kinds of busted up. Might not... make it..."), +(28070,2,0,14,14258,100,"brann SAY_DEATH","Not yet, not... yet-"), +(28070,3,0,14,14260,100,"brann SAY_PLAYER_DEATH_1","I'm doing everything I can!"), +(28070,3,1,14,14261,100,"brann SAY_PLAYER_DEATH_2","Light preserve you!"), +(28070,3,2,14,14262,100,"brann SAY_PLAYER_DEATH_3","I hope this is all worth it!"), +(28070,4,0,14,14259,100,"brann SAY_ESCORT_START","Time to get some answers! Let's get this show on the road!"), +(28070,5,0,14,14274,100,"brann SAY_SPAWN_DWARF","Don't worry. Old Brann has got your back. Keep that metal monstrosity busy and I'll see if I can sweet talk this machine into helping you."), +(28070,6,0,14,14275,100,"brann SAY_SPAWN_TROGG","This is a wee bit trickier that before... Oh, bloody--incomin'!"), +(28070,7,0,14,14276,100,"brann SAY_SPAWN_OOZE","What in the name o' Madoran did THAT do? Oh! Wait: I just about got it..."), +(28070,8,0,14,14277,100,"brann SAY_SPAWN_EARTHEN","Ha, that did it. Help's a-coming. Take this you glow-eying brute!"), +(28070,9,0,14,14247,100,"brann SAY_EVENT_INTRO_1","Take a moment and relish this with me! Soon all will be revealed! Okay then, let's do this!"), +(28070,10,0,14,14248,100,"brann SAY_EVENT_INTRO_2","Now keep an eye out! I'll have this licked in two shakes of a--"), +(28070,11,0,14,14249,100,"brann SAY_EVENT_A_1","Oh, that doesn't sound good. We might have a complication or two..."), +(28070,12,0,14,14250,100,"brann SAY_EVENT_A_3","Ah, you want to play hardball, eh? That's just my game!"), +(28070,13,0,14,14251,100,"brann SAY_EVENT_B_1","Couple more minutes and I'll--"), +(28070,14,0,14,14252,100,"brann SAY_EVENT_B_3","Heightened? What's the good news?"), +(28070,15,0,14,14253,100,"brann SAY_EVENT_C_1","So that was the problem? Now I'm makin' progress..."), +(28070,16,0,14,14254,100,"brann SAY_EVENT_C_3","Hang on! Nobody's gonna' be sanitized as long as I have a say in it!"), +(28070,17,0,14,14255,100,"brann SAY_EVENT_D_1","Ha! The old magic fingers finally won through! Now let's get down to-"), +(28070,18,0,14,14256,100,"brann SAY_EVENT_D_3","Purge? No no no no no! Where did I-- Aha, this should do the trick..."), +(28070,19,0,14,14263,100,"brann SAY_EVENT_END_01","Query? What do you think I'm here for? Tea and biscuits? Spill the beans already!"), +(28070,20,0,14,14264,100,"brann SAY_EVENT_END_02","Tell me how that dwarfs came to be! And start at the beginning!"), +(28070,21,0,14,14265,100,"brann SAY_EVENT_END_04","Right, right! I know that the Earthen were made of stone to shape the deep reaches of the world but what about the anomalies? Matrix non-stabilizing and whatnot."), +(28070,22,0,14,14266,100,"brann SAY_EVENT_END_06","Necro-what? Speak bloody common will ya?"), +(28070,23,0,14,14267,100,"brann SAY_EVENT_END_08","Old Gods eh? So they zapped the Earthen with this Curse of Flesh. And then what?"), +(28070,24,0,14,14268,100,"brann SAY_EVENT_END_10","If they killed the Old Gods Azeroth would have been destroyed."), +(28070,25,0,14,14269,100,"brann SAY_EVENT_END_12","What protectors?"), +(28070,26,0,14,14270,100,"brann SAY_EVENT_END_14","Aesir and Vanir. Okay. So the Forge of Wills started to make new Earthen. But what happened to the old ones?"), +(28070,27,0,14,14271,100,"brann SAY_EVENT_END_16","Hold everything! The Aesir and Vanir went to war? Why?"), +(28070,28,0,14,14272,100,"brann SAY_EVENT_END_18","This Loken sounds like a nasty character. Glad we don't have to worry about the likes of him anymore. So if I'm understanding you lads the original Earthen eventually woke up from this statis. And by that time this destabily-whatever had turned them into our brother dwarfs. Or at least dwarf ancestors. Hm?"), +(28070,29,0,14,14273,100,"brann SAY_EVENT_END_20","Well now. That's a lot to digest. I'm gonna need some time to take all of this in. Thank you!"), +(28070,30,0,14,14278,100,"brann SAY_VICTORY_SJONNIR_1","Loken?! That's downright bothersome... We might've neutralized the iron dwarves, but I'd lay odds there's another machine somewhere else churnin' out a whole mess o' these iron vrykul!"), +(28070,31,0,14,14279,100,"brann SAY_VICTORY_SJONNIR_2","I'll use the forge to make badtches o' earthen to stand guard... But our greatest challenge still remains: find and stop Loken!"), +(28070,32,0,14,0,100,"brann SAY_ENTRANCE_MEET","I think it's time to see what's behind the door near the entrance. I'm going to sneak over there, nice and quiet. Meet me at the door and I'll get us in."), +-- marnak +(30897,0,0,14,13761,100,"brann SAY_EVENT_B_2_MARN","Threat index threshold exceeded. Celestial archive aborted. Security level heightened."), +(30897,1,0,14,13762,100,"brann SAY_EVENT_END_15_MARN","Additional background is relevant to your query. Following global combat between-"), +(30897,2,0,14,13763,100,"brann SAY_EVENT_END_17_MARN","Unknown. Data suggests that impetus for global combat originated with prime designate Loken who neutralized all remaining Aesir and Vanir affecting termination of conflict. Prime designate Loken then initiated stasis of several seed races including Earthen, Giant and Vrykul at designated holding facilities."), +(30897,3,0,14,13764,100,"brann SAY_EVENT_END_19_MARN","Essentially that is correct."), +-- kaddrak +(30898,0,0,14,13756,100,"brann SAY_EVENT_A_2_KADD","Security breach in progress. Analysis of historical archives transferred to lower priority queue. Countermeasures engaged."), +(30898,1,0,14,13757,100,"brann SAY_EVENT_END_09_KADD","Accessing. Creators arrived to extirpate symbiotic infection. Assessment revealed that Old God infestation had grown malignant. Excising parasites would result in loss of host."), +(30898,2,0,14,13758,100,"brann SAY_EVENT_END_11_KADD","Correct. Creators neutralized parasitic threat and contained it within the host. Forge of Wills and other systems were instituted to create new Earthen. Safeguards were implemented and protectors were appointed."), +(30898,3,0,14,13759,100,"brann SAY_EVENT_END_13_KADD","Designations: Aesir and Vanir or in common nomenclator Storm and Earth Giants. Sentinel Loken designated supreme. Dragon Aspects appointed to monitor evolution of Azeroth."), +-- abedneum +(30899,0,0,14,13765,100,"brann SAY_EVENT_INTRO_3_ABED","Warning! Life form pattern not recognized. Archival processing terminated. Continued interference will result in targeted response."), +(30899,1,0,14,13767,100,"brann SAY_EVENT_C_2_ABED","Critical threat index. Void analysis diverted. Initiating sanitization protocol."), +(30899,2,0,14,13768,100,"brann SAY_EVENT_D_2_ABED","Alert! Security fail safes deactivated. Beginning memory purge..."), +(30899,3,0,14,13769,100,"brann SAY_EVENT_D_4_ABED","System online. Life form pattern recognized. Welcome Branbronzan. Query?"), +(30899,4,0,14,13770,100,"brann SAY_EVENT_END_03_ABED","Accessing prehistoric data. Retrieved. In the beginning Earthen were created to-"), +(30899,5,0,14,13771,100,"brann SAY_EVENT_END_05_ABED","Accessing. In the early stages of its development cycle Azeroth suffered infection by parasitic, necrophotic symbiotes."), +(30899,6,0,14,13772,100,"brann SAY_EVENT_END_07_ABED","Designation: Old Gods. Old Gods rendered all systems, including Earthen defenseless in order to facilitate assimilation. This matrix destabilization has been termed the Curse of Flesh. Effects of destabilization increased over time."), +(30899,7,0,14,13773,100,"brann SAY_EVENT_END_21_ABED","Acknowledged Branbronzan. Session terminated."); diff --git a/sql/updates/world/2012_12_04_01_world_quest_start_scripts.sql b/sql/updates/world/2012_12_04_01_world_quest_start_scripts.sql new file mode 100644 index 00000000000..f2ac40c7880 --- /dev/null +++ b/sql/updates/world/2012_12_04_01_world_quest_start_scripts.sql @@ -0,0 +1,4 @@ +ALTER TABLE `quest_template` DROP `StartScript`; +DROP TABLE quest_start_scripts; + +DELETE FROM `command` WHERE `name`='reload quest_start_scripts'; diff --git a/sql/updates/world/2012_12_04_02_world_reputation_reward_rate.sql b/sql/updates/world/2012_12_04_02_world_reputation_reward_rate.sql new file mode 100644 index 00000000000..a6b58583532 --- /dev/null +++ b/sql/updates/world/2012_12_04_02_world_reputation_reward_rate.sql @@ -0,0 +1,2 @@ +ALTER TABLE `reputation_reward_rate` ADD `quest_daily_rate` FLOAT NOT NULL DEFAULT '1' AFTER `quest_rate`; +ALTER TABLE `reputation_reward_rate` ADD `quest_weekly_rate` FLOAT NOT NULL DEFAULT '1' AFTER `quest_daily_rate`; diff --git a/sql/updates/world/2012_12_04_03_world_reputation_reward_rate.sql b/sql/updates/world/2012_12_04_03_world_reputation_reward_rate.sql new file mode 100644 index 00000000000..9f8341ea464 --- /dev/null +++ b/sql/updates/world/2012_12_04_03_world_reputation_reward_rate.sql @@ -0,0 +1 @@ +ALTER TABLE `reputation_reward_rate` ADD `quest_monthly_rate` FLOAT NOT NULL DEFAULT '1' AFTER `quest_weekly_rate`; diff --git a/sql/updates/world/2012_12_04_04_world_creature_text.sql b/sql/updates/world/2012_12_04_04_world_creature_text.sql new file mode 100644 index 00000000000..1cf52a1417f --- /dev/null +++ b/sql/updates/world/2012_12_04_04_world_creature_text.sql @@ -0,0 +1,25 @@ +-- Slad'ran +DELETE FROM `creature_text` WHERE `entry`=29304 AND `groupid`=5; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(29304, 5, 0, '%s begins to cast Poison Nova!', 41, 0, 100, 0, 0, 0, 'Slad''ran - EMOTE_NOVA'); + +-- Mage-Lord Urom +DELETE FROM `creature_text` WHERE `entry`=27655; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(27655, 0, 0, 'What do we have here... those that would defy the Spell-Weaver? Those without foresight or understanding. How can I make you see? Malygos is saving the world from itself! Bah! You are hardly worth my time!', 14, 0, 100, 1, 0, 13635, 'Mage-Lord Urom - SAY_SUMMON_1'), +(27655, 1, 0, 'Clearly my pets failed. Perhaps another demonstration is in order.', 14, 0, 100, 1, 0, 13636, 'Mage-Lord Urom - SAY_SUMMON_2'), +(27655, 2, 0, 'Still you fight. Still you cling to misguided principles. If you survive, you''ll find me in the center ring.', 14, 0, 100, 1, 0, 13637, 'Mage-Lord Urom - SAY_SUMMON_3'), +(27655, 3, 0, 'Poor blind fools!', 14, 0, 100, 0, 0, 13638, 'Mage-Lord Urom - SAY_AGGRO'), +(27655, 4, 0, '%s begins to cast Empowered Arcane Explosion!', 41, 0, 100, 0, 0, 0, 'Mage-Lord Urom - EMOTE_ARCANE_EXPLOSION'), +(27655, 5, 0, 'A taste... just a small taste... of the Spell-Weaver''s power!', 14, 0, 100, 0, 0, 13639, 'Mage-Lord Urom - SAY_ARCANE_EXPLOSION'), +(27655, 5, 1, 'So much unstable energy... but worth the risk to destroy you!', 14, 0, 100, 0, 0, 13640, 'Mage-Lord Urom - SAY_ARCANE_EXPLOSION'), +(27655, 6, 0, 'Everything I have done... has been for Azeroth....', 14, 0, 100, 0, 0, 13644, 'Mage-Lord Urom - SAY_DEATH'), +(27655, 7, 0, 'If only you understood!', 14, 0, 100, 0, 0, 13641, 'Mage-Lord Urom - SAY_PLAYER_KILL'), +(27655, 7, 1, 'Now do you see? Do you?!', 14, 0, 100, 0, 0, 13642, 'Mage-Lord Urom - SAY_PLAYER_KILL'), +(27655, 7, 2, 'Everything I\'ve done... has been for Azeroth...', 14, 0, 100, 0, 0, 13643, 'Mage-Lord Urom - SAY_PLAYER_KILL'); + +-- Shadron / Vesperon +DELETE FROM `creature_text` WHERE `entry`IN (30451,30449) AND `groupid`=7; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES +(30451, 7, 0, 'A Shadron Disciple appears in the Twilight!', 41, 0, 100, 0, 0, 0, 'Shadron - WHISPER_SHADRON_DICIPLE'), +(30449, 7, 0, 'A Vesperon Disciple appears in the Twilight!', 41, 0, 100, 0, 0, 0, 'Vesperon - WHISPER_SHADRON_DICIPLE'); diff --git a/sql/updates/world/2012_12_04_05_world_spell_script_names.sql b/sql/updates/world/2012_12_04_05_world_spell_script_names.sql new file mode 100644 index 00000000000..f325ac731d4 --- /dev/null +++ b/sql/updates/world/2012_12_04_05_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=-24604; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(-24604,'spell_hun_furious_howl'); diff --git a/sql/updates/world/2012_12_04_06_world_spell_creature_text.sql b/sql/updates/world/2012_12_04_06_world_spell_creature_text.sql new file mode 100644 index 00000000000..04f10fa494f --- /dev/null +++ b/sql/updates/world/2012_12_04_06_world_spell_creature_text.sql @@ -0,0 +1,28 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533108 AND -1533084; +DELETE FROM `creature_text` WHERE `entry`=15990; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(15990,0,0,14,14467,100,"kelthuzad SAY_SAPP_DIALOG1","Our preparations continue as planned, master."), +(15990,1,0,14,8881,100,"kelthuzad SAY_SAPP_DIALOG2_LICH","It is good that you serve me so faithfully. Soon, all will serve the Lich King and in the end, you shall be rewarded...so long as you do not falter."), +(15990,2,0,14,14468,100,"kelthuzad SAY_SAPP_DIALOG3","I see no complications... Wait... What is this?"), +(15990,3,0,14,8882,100,"kelthuzad SAY_SAPP_DIALOG4_LICH","Your security measures have failed! See to this interruption immediately!"), +(15990,4,0,14,14469,100,"kelthuzad SAY_SAPP_DIALOG5","Yes, master!"), +(15990,5,0,14,14484,100,"kelthuzad SAY_CAT_DIED","No!!! A curse upon you, interlopers! The armies of the Lich King will hunt you down. You will not escape your fate..."), +(15990,6,0,14,14463,100,"kelthuzad SAY_TAUNT1","Who dares violate the sanctity of my domain? Be warned, all who trespass here are doomed."), +(15990,6,1,14,14464,100,"kelthuzad SAY_TAUNT2","Fools, you think yourselves triumphant? You have only taken one step closer to the abyss! "), +(15990,6,2,14,14465,100,"kelthuzad SAY_TAUNT3","I grow tired of these games. Proceed, and I will banish your souls to oblivion!"), +(15990,6,3,14,14466,100,"kelthuzad SAY_TAUNT4","You have no idea what horrors lie ahead. You have seen nothing! The frozen heart of Naxxramas awaits you!"), +(15990,7,0,14,14475,100,"kelthuzad SAY_AGGRO1","Pray for mercy!"), +(15990,7,1,14,14476,100,"kelthuzad SAY_AGGRO2","Scream your dying breath!"), +(15990,7,2,14,14477,100,"kelthuzad SAY_AGGRO3","The end is upon you!"), +(15990,8,0,14,14478,100,"kelthuzad SAY_SLAY1","The dark void awaits you!"), +(15990,8,1,14,14479,100,"kelthuzad SAY_SLAY2","<Kel'Thuzad cackles maniacally!>"), +(15990,9,0,14,14480,100,"kelthuzad SAY_DEATH","AAAAGHHH!... Do not rejoice... your victory is a hollow one... for I shall return with powers beyond your imagining!"), +(15990,10,0,14,14472,100,"kelthuzad SAY_CHAIN1","Your soul, is bound to me now!"), +(15990,10,1,14,14473,100,"kelthuzad SAY_CHAIN2","There will be no escape!"), +(15990,11,0,14,14474,100,"kelthuzad SAY_FROST_BLAST","I will freeze the blood in your veins!"), +(15990,12,0,14,14470,100,"kelthuzad SAY_REQUEST_AID","Master! I require aid! "), +(15990,13,0,14,0,100,"kelthuzad SAY_ANSWER_REQUEST","Very well... warriors of the frozen wastes, rise up! I command you to fight, kill, and die for your master. Let none survive..."), +(15990,14,0,14,14471,100,"kelthuzad SAY_SUMMON_MINIONS","Minions, servants, soldiers of the cold dark, obey the call of Kel'Thuzad!"), +(15990,15,0,14,14481,100,"kelthuzad SAY_SPECIAL1_MANA_DET","Your petty magics are no challenge to the might of the Scourge! "), +(15990,15,1,14,14483,100,"kelthuzad SAY_SPECIAL3_MANA_DET","Enough! I grow tired of these distractions! "), +(15990,15,2,14,14482,100,"kelthuzad SAY_SPECIAL2_DISPELL","Fools, you have spread your powers too thin. Be free, my minions!"); diff --git a/sql/updates/world/2012_12_05_00_world_creature_text.sql b/sql/updates/world/2012_12_05_00_world_creature_text.sql new file mode 100644 index 00000000000..b3b382e46e2 --- /dev/null +++ b/sql/updates/world/2012_12_05_00_world_creature_text.sql @@ -0,0 +1 @@ +UPDATE `creature_text` SET `text`='Unfortunate, but necessary.' WHERE `entry`=27655 AND `groupid`=7 AND `id`=2; diff --git a/sql/updates/world/2012_12_06_00_world_creature_text.sql b/sql/updates/world/2012_12_06_00_world_creature_text.sql new file mode 100644 index 00000000000..c0fec8e041e --- /dev/null +++ b/sql/updates/world/2012_12_06_00_world_creature_text.sql @@ -0,0 +1,697 @@ +-- ------------------------------- -- +-- Creature text conversion part 7 -- +-- ------------------------------- -- +-- ingvar +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1574010 AND -1574005; +DELETE FROM `creature_text` WHERE `entry`=23954; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(23954,0,0,14,13207,100,"ingvar SAY_AGGRO_FIRST","I'll paint my face with your blood!"), +(23954,1,0,14,13209,100,"ingvar SAY_AGGRO_SECOND","I return! A second chance to carve out your skull!"), +(23954,2,0,14,13213,100,"ingvar SAY_DEATH_FIRST","My life for the... death god!"), +(23954,3,0,14,13211,100,"ingvar SAY_DEATH_SECOND","No! I can do... better! I can..."), +(23954,4,0,14,13212,100,"ingvar SAY_KILL_FIRST","Mjul orm agn gjor!"), +(23954,5,0,14,13214,100,"ingvar SAY_KILL_SECOND","I am a warrior born!"); + +-- skarvald and dalronn +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1574020 AND -1574011; +DELETE FROM `creature_text` WHERE `entry` IN (24200,27390,24201,27389); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(24200,0,0,14,13229,100,"skarvald YELL_SKARVALD_AGGRO","Dalronn! See if you can muster the nerve to join my attack!"), +(24200,1,0,14,13230,100,"skarvald YELL_SKARVALD_DAL_DIED","Not... over... yet."), +(24200,2,0,14,13231,100,"skarvald YELL_SKARVALD_SKA_DIEDFIRST","A warrior's death."), +(24200,3,0,14,13232,100,"skarvald YELL_SKARVALD_KILL","???"), +(24200,4,0,14,13233,100,"skarvald YELL_SKARVALD_DAL_DIEDFIRST","Pagh! What sort of necromancer lets death stop him? I knew you were worthless!"), +(27390,0,0,14,13229,100,"skarvald YELL_SKARVALD_AGGRO","Dalronn! See if you can muster the nerve to join my attack!"), +(27390,1,0,14,13230,100,"skarvald YELL_SKARVALD_DAL_DIED","Not... over... yet."), +(27390,2,0,14,13231,100,"skarvald YELL_SKARVALD_SKA_DIEDFIRST","A warrior's death."), +(27390,3,0,14,13232,100,"skarvald YELL_SKARVALD_KILL","???"), +(27390,4,0,14,13233,100,"skarvald YELL_SKARVALD_DAL_DIEDFIRST","Pagh! What sort of necromancer lets death stop him? I knew you were worthless!"), +(24201,0,0,14,13199,100,"dalronn YELL_DALRONN_AGGRO","By all means, don't assess the situation, you halfwit! Just jump into the fray!"), +(24201,1,0,14,13200,100,"dalronn YELL_DALRONN_SKA_DIED","See... you... soon."), +(24201,2,0,14,13201,100,"dalronn YELL_DALRONN_DAL_DIEDFIRST","There's no... greater... glory."), +(24201,3,0,14,13202,100,"dalronn YELL_DALRONN_KILL","You may serve me yet."), +(24201,4,0,14,13203,100,"dalronn YELL_DALRONN_SKA_DIEDFIRST","Skarvald, you incompetent slug! Return and make yourself useful!"), +(27389,0,0,14,13199,100,"dalronn YELL_DALRONN_AGGRO","By all means, don't assess the situation, you halfwit! Just jump into the fray!"), +(27389,1,0,14,13200,100,"dalronn YELL_DALRONN_SKA_DIED","See... you... soon."), +(27389,2,0,14,13201,100,"dalronn YELL_DALRONN_DAL_DIEDFIRST","There's no... greater... glory."), +(27389,3,0,14,13202,100,"dalronn YELL_DALRONN_KILL","You may serve me yet."), +(27389,4,0,14,13203,100,"dalronn YELL_DALRONN_SKA_DIEDFIRST","Skarvald, you incompetent slug! Return and make yourself useful!"); + +-- Gortok Palehoof +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1575003 AND -1575000; +DELETE FROM `creature_text` WHERE `entry`=26687; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26687,0,0,12,0,100,"Gortok Palehoof SAY_AGGRO","What this place? I will destroy you!"), +(26687,1,0,12,0,100,"Gortok Palehoof SAY_SLAY_1","You die! That what master wants!"), +(26687,1,1,12,0,100,"Gortok Palehoof SAY_SLAY_2","An easy task!"); + +-- skadi +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1575013 AND -1575004; +DELETE FROM `creature_text` WHERE `entry`=26693; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26693,0,0,14,13497,100,"skadi SAY_AGGRO","What mongrels dare intrude here? Look alive, my brothers! A feast for the one that brings me their heads!"), +(26693,1,0,14,13504,100,"skadi SAY_KILL_1","Not so brash now, are you?"), +(26693,1,1,14,13505,100,"skadi SAY_KILL_2","I'll mount your skull from the highest tower!"), +(26693,2,0,41,0,100,"skadi EMOTE_RANGE","%s in within range of the harpoon launchers!"), +(26693,3,0,14,13506,100,"skadi SAY_DEATH","ARGH! You call that... an attack? I'll... show... aghhhh..."), +(26693,4,0,41,0,100,"skadi EMOTE_RANGE","%s in within range of the harpoon launchers!"), +(26693,5,0,14,13507,100,"skadi SAY_DRAKE_DEATH","You motherless knaves! Your corpses will make fine morsels for my new drake!"), +(26693,6,0,14,13498,100,"skadi SAY_DRAKE_BREATH_1","Sear them to the bone!"), +(26693,6,1,14,13499,100,"skadi SAY_DRAKE_BREATH_2","Go now! Leave nothing but ash in your wake!"), +(26693,6,2,14,13500,100,"skadi SAY_DRAKE_BREATH_3","Cleanse our sacred halls with flame!"); + +-- King Ymirom +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1575037 AND -1575028; +DELETE FROM `creature_text` WHERE `entry`=26861; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(26861,0,0,14,13609,100,"King Ymirom SAY_AGGRO","You invade my home and then dare to challenge me? I will tear the hearts from your chests and offer them as gifts to the death god! Rualg nja gaborr!"), +(26861,1,0,14,13614,100,"King Ymirom SAY_SLAY_1","Your death is only the beginning!"), +(26861,1,1,14,13615,100,"King Ymirom SAY_SLAY_2","You have failed your people!"), +(26861,1,2,14,13616,100,"King Ymirom SAY_SLAY_3","There is a reason I am king!"), +(26861,1,3,14,13617,100,"King Ymirom SAY_SLAY_4","Bleed no more!"), +(26861,2,0,14,13618,100,"King Ymirom SAY_DEATH","What... awaits me... now?"), +(26861,3,0,14,13610,100,"King Ymirom SAY_SUMMON_BJORN","Bjorn of the Black Storm! Honor me now with your presence!"), +(26861,4,0,14,13611,100,"King Ymirom SAY_SUMMON_HALDOR","Haldor of the Rocky Cliffs, grant me your strength!"), +(26861,5,0,14,13612,100,"King Ymirom SAY_SUMMON_RANULF","Ranulf of the Screaming Abyss, snuff these maggots with darkest night! "), +(26861,6,0,14,13613,100,"King Ymirom SAY_SUMMON_TORGYN","Tor of the Brutal Siege! Bestow your might upon me!"); + +-- archavon +DELETE FROM `script_texts` WHERE `entry`=-1590002; +DELETE FROM `creature_text` WHERE `entry`=31125; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(31125,0,0,16,0,100,"archavon EMOTE_BERSERK","Archavon the Stone Watcher goes into a berserker rage!"); + +-- emalon +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1590002 AND -1590000; +DELETE FROM `creature_text` WHERE `entry`=33993; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(33993,0,0,41,0,100,"emalon EMOTE_OVERCHARGE_TEMPEST_MINION","Emalon the Storm Watcher overcharges a Tempest Minion!"), +(33993,1,0,41,0,100,"emalon EMOTE_MINION_RESPAWN","A Tempest Minion appears to defend Emalon!"), +(33993,2,0,16,0,100,"emalon EMOTE_BERSERK","Emalon the Storm Watcher goes into a berserker rage!"); + +-- cyanigosa +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1608009 AND -1608000; +DELETE FROM `creature_text` WHERE `entry`=31134; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(31134,0,0,14,13947,100,"cyanigosa SAY_AGGRO","We finish this now, champions of Kirin Tor!"), +(31134,1,0,14,13952,100,"cyanigosa SAY_SLAY_1","I will end the Kirin Tor!"), +(31134,1,1,14,13953,100,"cyanigosa SAY_SLAY_2","Dalaran will fall!"), +(31134,1,2,14,13954,100,"cyanigosa SAY_SLAY_3","So ends your defiance of the Spell-Weaver!"), +(31134,2,0,14,13955,100,"cyanigosa SAY_DEATH","Perhaps... we have... underestimated... you."), +(31134,3,0,14,13946,100,"cyanigosa SAY_SPAWN","A valiant defense, but this city must be razed. I will fulfill Malygos's wishes myself!"), +(31134,4,0,14,13951,100,"cyanigosa SAY_DISRUPTION","Am I interrupting?"), +(31134,5,0,14,13948,100,"cyanigosa SAY_BREATH_ATTACK","Shiver and die!"), +(31134,6,0,14,13949,100,"cyanigosa SAY_SPECIAL_ATTACK_1","The world has forgotten what true magic is! Let this be a reminder!"), +(31134,6,1,14,13950,100,"cyanigosa SAY_SPECIAL_ATTACK_2","Who among you can withstand my power?"); + +-- erekem +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1608017 AND -1608010; +DELETE FROM `creature_text` WHERE `entry`=29315; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29315,0,0,14,14219,100,"erekem SAY_AGGRO","Not--caww--get in way of--rrak-rrak--flee!"), +(29315,1,0,14,14222,100,"erekem SAY_SLAY_1","Ya ya ya yaaaa"), +(29315,1,1,14,14223,100,"erekem SAY_SLAY_2","Preeciouuss life---Ra-aak---Wasted!"), +(29315,1,2,14,14224,100,"erekem SAY_SLAY_3","Only the strong---Ra-aak---Survive!"), +(29315,2,0,14,14225,100,"erekem SAY_DEATH","No--kaw, kaw--flee..."), +(29315,3,0,14,14218,100,"erekem SAY_SPAWN","Free to--mm--fly now. Ra-aak... Not find us--ekh-ekh! Escape!"), +(29315,4,0,14,14220,100,"erekem SAY_ADD_KILLED","My---raaak--favorite! Awk awk awk! Raa-kaa!"), +(29315,5,0,14,14221,100,"erekem SAY_BOTH_ADDS_KILLED","Nasty little...A-ak, kaw! Kill! Yes, kill you!"); + +-- ichoron +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1608026 AND -1608018; +DELETE FROM `creature_text` WHERE `entry`=29313; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29313,0,0,14,14230,100,"ichoron SAY_AGGRO","Stand aside, mortals!"), +(29313,1,0,14,14234,100,"ichoron SAY_SLAY_1","I am a force of nature!"), +(29313,1,1,14,14235,100,"ichoron SAY_SLAY_2","I shall pass!"), +(29313,1,2,14,14236,100,"ichoron SAY_SLAY_3","You can not stop the tide!"), +(29313,2,0,14,14237,100,"ichoron SAY_DEATH","I... recede."), +(29313,3,0,14,14229,100,"ichoron SAY_SPAWN","I... am fury... unrestrained!"), +(29313,4,0,14,14231,100,"ichoron SAY_ENRAGE","I shall consume, decimate, devastate, and destroy! Yield now to the wrath of the pounding sea!"), +(29313,5,0,14,14233,100,"ichoron SAY_SHATTER","I will not be contained! Ngyah!!"), +(29313,6,0,14,14232,100,"ichoron SAY_BUBBLE","Water can hold any form, take any shape... overcome any obstacle."); + +-- Xevozz +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1608036 AND -1608027; +DELETE FROM `creature_text` WHERE `entry`=29266; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29266,0,0,14,14498,100,"Xevozz SAY_AGGRO","It seems my freedom must be bought with blood..."), +(29266,1,0,14,14504,100,"Xevozz SAY_SLAY_1","Nothing personal."), +(29266,1,1,14,14505,100,"Xevozz SAY_SLAY_2","Business concluded."), +(29266,1,2,14,14506,100,"Xevozz SAY_SLAY_3","Profit!"), +(29266,2,0,14,14507,100,"Xevozz SAY_DEATH","This is an... unrecoverable... loss."), +(29266,3,0,14,14498,100,"Xevozz SAY_SPAWN","Back in business! Now to execute an exit strategy."), +(29266,4,0,14,14503,100,"Xevozz SAY_CHARGED","It would seem that a renegotiation is in order."), +(29266,5,0,14,14501,100,"Xevozz SAY_REPEAT_SUMMON_1","The air teems with latent energy... quite the harvest!"), +(29266,5,1,14,14502,100,"Xevozz SAY_REPEAT_SUMMON_2","Plentiful, exploitable resources... primed for acquisition!"), +(29266,6,0,14,14500,100,"Xevozz SAY_SUMMON_ENERGY","Intriguing... a high quantity of arcane energy is near. Time for some prospecting..."); + +-- zuramat +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1608044 AND -1608037; +DELETE FROM `creature_text` WHERE `entry`=29314; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29314,0,0,14,13996,100,"zuramat SAY_AGGRO","Eradicate."), +(29314,1,0,14,13999,100,"zuramat SAY_SLAY_1","More... energy."), +(29314,1,1,14,14000,100,"zuramat SAY_SLAY_2","Relinquish."), +(29314,1,2,14,14001,100,"zuramat SAY_SLAY_3","Fall... to shadow."), +(29314,2,0,14,14002,100,"zuramat SAY_DEATH","Disperse."), +(29314,3,0,14,13995,100,"zuramat SAY_SPAWN","I am... renewed."), +(29314,4,0,14,13997,100,"zuramat SAY_SHIELD","Know... my... pain."), +(29314,5,0,14,13998,100,"zuramat SAY_WHISPER","Gaze... into the void."); + +-- cyanigosa +DELETE FROM `script_texts` WHERE `entry`=-1608005; +DELETE FROM `creature_text` WHERE `entry`=31134; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(31134,0,0,14,13946,100,"cyanigosa SAY_SPAWN","A valiant defense, but this city must be razed. I will fulfill Malygos's wishes myself!"); + +-- sinclari +DELETE FROM `script_texts` WHERE `entry`=-1608045; +DELETE FROM `creature_text` WHERE `entry`=30658; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(30658,0,0,14,0,100,"sinclari SAY_SINCLARI_1","Prison guards, we are leaving! These adventurers are taking over! Go go go"); + +-- orinoko, gurgthock, crusade recruit, stinkbeard +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1571041 AND -1571031; +DELETE FROM `creature_text` WHERE `entry` IN (30020,30007,28090,30017); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(30020,0,0,14,0,100,"orinoko SAY_CALL_FOR_HELP","Whisker! Where are you? Assist me!"), +(30007,0,0,14,13363,100,"gurgthock SAY_QUEST_ACCEPT_TUSKARRMAGEDON","This battle must be seen to be believed! Once a mild-mannered tuskarr fisherman, our next fighter turned to the life of a soulless mercenary when his entire family was wiped out by a vicious pack of lion seals and III-tempered penguins! Now he's just In It for the gold! Ladies and gentlemen, ORINOKO TUSKBREAKER!!"), +(30007,1,0,12,0,100,"gurgthock SAY_QUEST_ACCEPT_KORRAK_1","The champion of the Winterax trolls has challenged you, Treeofdoom! I hope you're ready!"), +(30007,2,0,14,13363,100,"gurgthock SAY_QUEST_ACCEPT_KORRAK_2","Hailling from the distant mountains of Alterac, one of the fiercest competitors this arena has ever seen: KORRAK THE BLOODRAGER!!!"), +(30007,3,0,14,13363,100,"gurgthock SAY_QUEST_ACCEPT_MAGNATAUR","The battle is about to begin! Am I reading this card right It... It's the nefarious magnataur lord, STINKBEARD! Yes, folks, STINKBEARD! Chitchat dosen't stand a chance!"), +(30007,4,0,41,0,100,"gurgthock EMOTE_YGGDRAS_SPAWN","Yggdras emerges!"), +(30017,5,0,14,0,100,"gurgthock SAY_STINKBEARD_SPAWN","Stinkbeard comin' for you, little ones!"), +(30007,6,0,14,0,100,"gurgthock SAY_GURGTHOCK_ELEMENTAL_SPAWN","Do you fell that folks? The air is cracking with energy! Than can only mean one thing..."), +(28090,0,0,12,0,100,"crusade recruit SAY_RECRUIT_1","We'll cleanse this place! Arthas beware!"), +(28090,0,1,12,0,100,"crusade recruit SAY_RECRUIT_2","Your're right! We can do this!"), +(28090,0,2,12,0,100,"crusade recruit SAY_RECRUIT_3","Your're right! What was I thinking? Bring on the Scourge!"); + +-- maladaar +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1558009 AND -1558000; +DELETE FROM `creature_text` WHERE `entry`=18373; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18373,0,0,14,10509,100,"maladaar SAY_INTRO","You have defiled the resting place of our ancestors. For this offense, there can be but one punishment. It is fitting that you have come to a place of the dead... for you will soon be joining them."), +(18373,1,0,14,10512,100,"maladaar SAY_SUMMON","Rise my fallen brothers. Take form and fight!"), +(18373,2,0,14,10513,100,"maladaar SAY_AGGRO_1","You will pay with your life!"), +(18373,2,1,14,10514,100,"maladaar SAY_AGGRO_2","There's no turning back now!"), +(18373,2,2,14,10515,100,"maladaar SAY_AGGRO_3","Serve your penitence!"), +(18373,3,0,14,10510,100,"maladaar SAY_ROAR","Let your mind be clouded."), +(18373,3,1,14,10511,100,"maladaar SAY_SOUL_CLEAVE","Stare into the darkness of your soul."), +(18373,4,0,14,10516,100,"maladaar SAY_SLAY_1","These walls will be your doom."), +(18373,4,1,14,10517,100,"maladaar SAY_SLAY_2","<laugh> Now, you'll stay for eternity!"), +(18373,5,0,14,10518,100,"maladaar SAY_DEATH","This is... where.. I belong..."); + +-- shaffar +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1557007 AND -1557000; +DELETE FROM `creature_text` WHERE `entry`=18344; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18344,0,0,14,10539,100,"shaffar SAY_INTRO","What is this? You must forgive me, but I was not expecting company. As you can see, we are somewhat preoccupied right now. But no matter. As I am a gracious host, I will tend to you... personally."), +(18344,1,0,14,10541,100,"shaffar SAY_AGGRO_1","We have not yet been properly introduced."), +(18344,1,1,14,10542,100,"shaffar SAY_AGGRO_2","An epic battle. How exciting!"), +(18344,1,2,14,10543,100,"shaffar SAY_AGGRO_3","I have longed for a good adventure."), +(18344,2,0,14,10544,100,"shaffar SAY_SLAY_1","It has been... entertaining."), +(18344,2,1,14,10545,100,"shaffar SAY_SLAY_2","And now we part company."), +(18344,3,0,14,10540,100,"shaffar SAY_SUMMON","I have such fascinating things to show you."), +(18344,4,0,14,10546,100,"shaffar SAY_DEAD","I must bid you... farewell."); + +-- pandemonius +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1557014 AND -1557008; +DELETE FROM `creature_text` WHERE `entry`=18341; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18341,0,0,14,10561,100,"pandemonius SAY_AGGRO_1","I will feed on your soul."), +(18341,0,1,14,10562,100,"pandemonius SAY_AGGRO_2","So... full of life!"), +(18341,0,2,14,10563,100,"pandemonius SAY_AGGRO_3","Do not... resist."), +(18341,1,0,14,10564,100,"pandemonius SAY_KILL_1","Yes! I am... empowered!"), +(18341,1,1,14,10565,100,"pandemonius SAY_KILL_2","More... I must have more!"), +(18341,2,0,14,10566,100,"pandemonius SAY_DEATH","To the void... once... more.."), +(18341,3,0,41,0,100,"pandemonius EMOTE_DARK_SHELL","shifts into the void..."); + +-- syth +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1556006 AND -1556000; +DELETE FROM `creature_text` WHERE `entry`=18472; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18472,0,0,14,10502,100,"syth SAY_SUMMON","I have pets..<squawk>..of my own!"), +(18472,1,0,14,10503,100,"syth SAY_AGGRO_1","Hrrmm.. Time to.. hrrm.. make my move."), +(18472,1,1,14,10504,100,"syth SAY_AGGRO_2","Nice pets..hrm.. Yes! <squawking>"), +(18472,1,2,14,10505,100,"syth SAY_AGGRO_3","Nice pets have.. weapons. Not so..<squawk>..nice."), +(18472,2,0,14,10506,100,"syth SAY_SLAY_1","Death.. meeting life is.. <squawking>"), +(18472,2,1,14,10507,100,"syth SAY_SLAY_2","Uhn.. Be free..<squawk>"), +(18472,3,0,14,10508,100,"syth SAY_DEATH","No more life..hrm. No more pain. <squawks weakly>"); + +-- ikiss +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1556015 AND -1556007; +DELETE FROM `creature_text` WHERE `entry`=18473; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18473,0,0,14,10557,100,"ikiss SAY_INTRO","<squawk>..Trinkets yes pretty Trinkets..<squawk>..power, great power. <squawk>..power in Trinkets..<squawk>"), +(18473,1,0,14,10554,100,"ikiss SAY_AGGRO_1","You make war on Ikiss?..<squawk>"), +(18473,1,1,14,10555,100,"ikiss SAY_AGGRO_2","Ikiss cut you pretty..<squawk>..slice you. Yes!"), +(18473,1,2,14,10556,100,"ikiss SAY_AGGRO_3","No escape for..<squawk>..for you"), +(18473,2,0,14,10558,100,"ikiss SAY_SLAY_1","You die..<squawk>..stay away from Trinkets"), +(18473,2,1,14,10559,100,"ikiss SAY_SLAY_2","<squawk>"), +(18473,3,0,14,10560,100,"ikiss SAY_DEATH","Ikiss will not..<squawk>..die"), +(18473,4,0,41,0,100,"ikiss EMOTE_ARCANE_EXP","begins to channel arcane energy..."); + +-- hellmaw +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1555007 AND -1555000; +DELETE FROM `creature_text` WHERE `entry`=18731; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18731,0,0,14,10473,100,"hellmaw SAY_INTRO","Infidels have invaded the sanctuary! Sniveling pests...You have yet to learn the true meaning of agony!"), +(18731,1,0,14,10475,100,"hellmaw SAY_AGGRO1","Pathetic mortals! You will pay dearly!"), +(18731,1,1,14,10476,100,"hellmaw SAY_AGGRO2","I will break you!"), +(18731,1,2,14,10477,100,"hellmaw SAY_AGGRO3","Finally! Something to relieve the tedium!"), +(18731,2,0,14,10474,100,"hellmaw SAY_HELP","Aid me, you fools, before it's too late!"), +(18731,3,0,14,10478,100,"hellmaw SAY_SLAY1","Do you fear death?"), +(18731,3,1,14,10479,100,"hellmaw SAY_SLAY2","This is the part I enjoy most."), +(18731,4,0,14,10480,100,"hellmaw SAY_DEATH","Do not...grow...overconfident, mortal."); + +-- blackhearth +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1555027 AND -1555008; +DELETE FROM `creature_text` WHERE `entry`=18667; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18667,0,0,14,10482,100,"blackhearth SAY_INTRO1","All flesh must burn."), +(18667,0,1,14,10483,100,"blackhearth SAY_INTRO2","All creation must be unmade!"), +(18667,0,2,14,10484,100,"blackhearth SAY_INTRO3","Power will be yours!"), +(18667,1,0,14,10486,100,"blackhearth SAY_AGGRO1","You'll be sorry!"), +(18667,1,1,14,10487,100,"blackhearth SAY_AGGRO2","Time for fun!"), +(18667,1,2,14,10488,100,"blackhearth SAY_AGGRO3","I see dead people!"), +(18667,2,0,14,10489,100,"blackhearth SAY_SLAY1","No comin' back for you!"), +(18667,2,1,14,10490,100,"blackhearth SAY_SLAY2","Nice try!"), +(18667,3,0,14,10485,100,"blackhearth SAY_HELP","Help us, hurry!"), +(18667,4,0,14,10491,100,"blackhearth SAY_DEATH","This... no... good..."), +(18667,5,0,14,10492,100,"blackhearth SAY2_INTRO1","Be ready for Dark One's return."), +(18667,5,1,14,10493,100,"blackhearth SAY2_INTRO2","So we have place in new universe."), +(18667,5,2,14,10494,100,"blackhearth SAY2_INTRO3","Dark one promise!"), +(18667,6,0,14,10496,100,"blackhearth SAY2_AGGRO1","You'll be sorry!"), +(18667,6,1,14,10497,100,"blackhearth SAY2_AGGRO2","Time to kill!"), +(18667,6,2,14,10498,100,"blackhearth SAY2_AGGRO3","You be dead people!"), +(18667,7,0,14,10499,100,"blackhearth SAY2_SLAY1","Now you gone for good."), +(18667,7,1,14,10500,100,"blackhearth SAY2_SLAY2","You failed, haha haha"), +(18667,8,0,14,10495,100,"blackhearth SAY2_HELP","Help us, hurry!"), +(18667,9,0,14,10501,100,"blackhearth SAY2_DEATH","Arrgh, aah...ahhh"); + +-- vorpil +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1555035 AND -1555028; +DELETE FROM `creature_text` WHERE `entry`=18732; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18732,0,0,14,10522,100,"vorpil SAY_INTRO","Keep your minds focused for the days of reckoning are close at hand. Soon, the destroyer of worlds will return to make good on his promise. Soon the destruction of all that is will begin!"), +(18732,1,0,14,10524,100,"vorpil SAY_AGGRO1","I'll make an offering of your blood!"), +(18732,1,1,14,10525,100,"vorpil SAY_AGGRO2","You'll be a fine example, for the others."), +(18732,1,2,14,10526,100,"vorpil SAY_AGGRO3","Good, a worthy sacrifice."), +(18732,2,0,14,10523,100,"vorpil SAY_HELP","Come to my aid, heed your master now!"), +(18732,3,0,14,10527,100,"vorpil SAY_SLAY1","I serve with pride."), +(18732,3,1,14,10528,100,"vorpil SAY_SLAY2","Your death is for the greater cause!"), +(18732,4,0,14,10529,100,"vorpil SAY_DEATH","I give my life... Gladly."); + +-- murmur +DELETE FROM `script_texts` WHERE `entry`=-1555036; +DELETE FROM `creature_text` WHERE `entry`=18708; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18708,0,0,16,0,100,"murmur EMOTE_SONIC_BOOM","draws energy from the air."); + +-- bloodboil +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564036 AND -1564029; +DELETE FROM `creature_text` WHERE `entry`=22948; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(22948,0,0,14,11432,100,"bloodboil SOUND_AGGRO","Horde will... crush you."), +(22948,1,0,14,11433,100,"bloodboil SAY_SLAY1","Time to feast!"), +(22948,1,1,14,11434,100,"bloodboil SAY_SLAY2","More! I want more!"), +(22948,2,0,14,11435,100,"bloodboil SAY_SPECIAL1","Drink your blood! Eat your flesh!"), +(22948,2,1,14,11436,100,"bloodboil SAY_SPECIAL2","I hunger!"), +(22948,3,0,14,11437,100,"bloodboil SAY_ENRAGE1","<babbling>"), +(22948,3,1,14,11438,100,"bloodboil SAY_ENRAGE2","I'll rip the meat from your bones!"), +(22948,4,0,14,11439,100,"bloodboil SAY_DEATH","Aaaahrg..."); + +-- shahraz +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564028 AND -1564018; +DELETE FROM `creature_text` WHERE `entry`=22947; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(22947,0,0,14,11501,100,"shahraz SAY_TAUNT1","You play, you pay."), +(22947,0,1,14,11502,100,"shahraz SAY_TAUNT2","I'm not impressed."), +(22947,0,2,14,11503,100,"shahraz SAY_TAUNT3","Enjoying yourselves?"), +(22947,1,0,14,11504,100,"shahraz SAY_AGGRO","So... business or pleasure?"), +(22947,2,0,14,11505,100,"shahraz SAY_SPELL1","You seem a little tense."), +(22947,2,1,14,11506,100,"shahraz SAY_SPELL2","Don't be shy."), +(22947,2,2,14,11507,100,"shahraz SAY_SPELL3","I'm all... yours."), +(22947,3,0,14,11508,100,"shahraz SAY_SLAY1","Easy come, easy go."), +(22947,3,1,14,11509,100,"shahraz SAY_SLAY2","So much for a happy ending."), +(22947,4,0,14,11510,100,"shahraz SAY_ENRAGE","Stop toying with my emotions!"), +(22947,5,0,14,11511,100,"shahraz SAY_DEATH","I wasn't... finished."); + +-- essence +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564068 AND -1564047; +DELETE FROM `creature_text` WHERE `entry` IN (23418,23419,23420); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(23418,0,0,14,11415,100,"essence SUFF_SAY_FREED","Pain and suffering are all that await you!"), +(23418,1,0,14,11416,100,"essence SUFF_SAY_AGGRO","Don't leave me alone!"), +(23418,2,0,14,11417,100,"essence SUFF_SAY_SLAY1","Look at what you make me do!"), +(23418,2,1,14,11418,100,"essence SUFF_SAY_SLAY2","I didn't ask for this!"), +(23418,2,2,14,11419,100,"essence SUFF_SAY_SLAY3","The pain is only beginning!"), +(23418,3,0,14,11420,100,"essence SUFF_SAY_RECAP","I don't want to go back!"), +(23418,4,0,14,11421,100,"essence SUFF_SAY_AFTER","Now what do I do?"), +(23418,5,0,41,0,100,"essence SUFF_EMOTE_ENRAGE","%s becomes enraged!"), +(23419,0,0,14,11408,100,"essence DESI_SAY_FREED","You can have anything you desire... for a price."), +(23419,1,0,14,11409,100,"essence DESI_SAY_SLAY1","Fulfilment is at hand!"), +(23419,1,1,14,11410,100,"essence DESI_SAY_SLAY2","Yes... you'll stay with us now..."), +(23419,1,2,14,11412,100,"essence DESI_SAY_SLAY3","Your reach exceeds your grasp."), +(23419,2,0,14,11411,100,"essence DESI_SAY_SPEC","Be careful what you wish for..."), +(23419,3,0,14,11413,100,"essence DESI_SAY_RECAP","I'll be waiting..."), +(23419,4,0,14,11414,100,"essence DESI_SAY_AFTER","I won't be far..."), +(23420,0,0,14,11399,100,"essence ANGER_SAY_FREED","Beware: I live!"), +(23420,0,1,14,11400,100,"essence ANGER_SAY_FREED2","So... foolish."), +(23420,1,0,14,11401,100,"essence ANGER_SAY_SLAY1","<maniacal cackle>"), +(23420,1,1,14,11402,100,"essence ANGER_SAY_SLAY2","Enough. No more."), +(23420,2,0,14,11403,100,"essence ANGER_SAY_SPEC","On your knees!"), +(23420,3,0,14,11405,100,"essence ANGER_SAY_BEFORE","Beware, coward."), +(23420,4,0,14,11404,100,"essence ANGER_SAY_DEATH","I won't... be... ignored."); + +-- akama shade +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564017 AND -1564013; +DELETE FROM `creature_text` WHERE `entry` IN (22990,23319); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(22990,0,0,14,11385,100,"akama shade SAY_LOW_HEALTH","No! Not yet..."), +(22990,1,0,14,11386,100,"akama shade SAY_DEATH","I will not last much longer..."), +(22990,2,0,14,0,100,"akama shade SAY_FREE","Come out from the shadows! I've returned to lead you against our true enemy! Shed your chains and raise your weapons against your Illidari masters!"), +(23319,0,0,14,0,100,"akama shade broken SAY_BROKEN_FREE_01","Hail our leader! Hail Akama!"), +(23319,1,0,14,0,100,"akama shade broken SAY_BROKEN_FREE_02","Hail Akama!"); + +-- supremus +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564012 AND -1564010; +DELETE FROM `creature_text` WHERE `entry`=22898; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(22898,0,0,41,0,100,"supremus EMOTE_NEW_TARGET","%s acquires a new target!"), +(22898,1,0,41,0,100,"supremus EMOTE_PUNCH_GROUND","%s punches the ground in anger!"), +(22898,2,0,41,0,100,"supremus EMOTE_GROUND_CRACK","The ground begins to crack open!"); + +-- teron +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564046 AND -1564037; +DELETE FROM `creature_text` WHERE `entry`=22871; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(22871,0,0,14,11512,100,"teron SAY_INTRO","I was the first, you know. For me, the wheel of death has spun many times. <laughs> So much time has passed. I have a lot of catching up to do..."), +(22871,1,0,14,11513,100,"teron SAY_AGGRO","Vengeance is mine!"), +(22871,2,0,14,11514,100,"teron SAY_SLAY1","I have use for you!"), +(22871,2,1,14,11515,100,"teron SAY_SLAY2","It gets worse..."), +(22871,3,0,14,11517,100,"teron SAY_SPELL1","What are you afraid of?"), +(22871,3,1,14,11516,100,"teron SAY_SPELL2","Death... really isn't so bad."), +(22871,4,0,14,11518,100,"teron SAY_SPECIAL1","Give in!"), +(22871,4,1,14,11519,100,"teron SAY_SPECIAL2","I have something for you..."), +(22871,5,0,14,11520,100,"teron SAY_ENRAGE","YOU WILL SHOW THE PROPER RESPECT!"), +(22871,6,0,14,11521,100,"teron SAY_DEATH","The wheel...spins...again...."); + +-- najentus +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564009 AND -1564000; +DELETE FROM `creature_text` WHERE `entry`=22887; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(22887,0,0,14,11450,100,"najentus SAY_AGGRO","You will die in the name of Lady Vashj!"), +(22887,1,0,14,11451,100,"najentus SAY_NEEDLE1","Stick around!"), +(22887,1,1,14,11452,100,"najentus SAY_NEEDLE2","I'll deal with you later!"), +(22887,2,0,14,11455,100,"najentus SAY_SLAY1","Your success was short lived!"), +(22887,2,1,14,11456,100,"najentus SAY_SLAY2","Time for you to go!"), +(22887,3,0,14,11453,100,"najentus SAY_SPECIAL1","Bel'anen dal'lorei!"), +(22887,3,1,14,11454,100,"najentus SAY_SPECIAL2","Blood will flow!"), +(22887,4,0,14,11457,100,"najentus SAY_ENRAGE1","Bal'amer ch'itah!"), +(22887,5,0,14,11458,100,"najentus SAY_ENRAGE2","My patience has ran out! Die, DIE!"), +(22887,6,0,14,11459,100,"najentus SAY_DEATH","Lord Illidan will... crush you."); + +-- illidari council +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564096 AND -1564069; +DELETE FROM `creature_text` WHERE `entry` IN (22952,22949,22951,22950); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(22952,0,0,14,11524,100,"council vera AGGRO","You wish to test me?"), +(22952,1,0,14,11530,100,"council vera ENRAGE","You wish to kill me? Hahaha, you first!"), +(22952,2,0,14,11528,100,"council vera SPECIAL1","You're not caught up for this!"), +(22952,3,0,14,11529,100,"council vera SPECIAL2","Anar'alah belore!"), +(22952,4,0,14,11525,100,"council vera SLAY","Valiant effort!"), +(22952,5,0,14,11526,100,"council vera SLAY_COMT","A glorious kill!"), +(22952,6,0,14,11527,100,"council vera DEATH","You got lucky!"), +(22949,0,0,14,11422,100,"council gath AGGRO","I have better things to do..."), +(22949,1,0,14,11428,100,"council gath ENRAGE","Enough games!"), +(22949,2,0,14,11426,100,"council gath SPECIAL1","Enjoy your final moments!"), +(22949,3,0,14,11427,100,"council gath SPECIAL2","You are mine!"), +(22949,4,0,14,11423,100,"council gath SLAY","Selama am'oronor!"), +(22949,5,0,14,11424,100,"council gath SLAY_COMT","Well done!"), +(22949,6,0,14,11425,100,"council gath DEATH","Lord Illidan... I..."), +(22951,0,0,14,11482,100,"council mala AGGRO","Flee or die!"), +(22951,1,0,14,11488,100,"council mala ENRAGE","For Quel'Thalas! For the Sunwell!"), +(22951,2,0,14,11486,100,"council mala SPECIAL1","No second chances!"), +(22951,3,0,14,11487,100,"council mala SPECIAL2","I'm full of surprises!"), +(22951,4,0,14,11483,100,"council mala SLAY","My work is done."), +(22951,5,0,14,11484,100,"council mala SLAY_COMT","As it should be!"), +(22951,6,0,14,11485,100,"council mala DEATH","Destiny... awaits."), +(22950,0,0,14,11440,100,"council zere AGGRO","Common... such a crude language. Bandal!"), +(22950,1,0,14,11446,100,"council zere ENRAGE","Sha'amoor sine menoor!"), +(22950,2,0,14,11444,100,"council zere SPECIAL1","Diel fin'al"), +(22950,3,0,14,11445,100,"council zere SPECIAL2","Sha'amoor ara mashal?"), +(22950,4,0,14,11441,100,"council zere SLAY","Shorel'aran."), +(22950,5,0,14,11442,100,"council zere SLAY_COMT","Belesa menoor!"), +(22950,6,0,14,11443,100,"council zere DEATH","Diel ma'ahn... oreindel'o"); + +-- daranelle +DELETE FROM `script_texts` WHERE `entry`=-1000174; +DELETE FROM `creature_text` WHERE `entry`=21469; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(21469,0,0,12,0,100,"daranelle SAY_SPELL_INFLUENCE","Good $N, you are under the spell's influence. I must analyze it quickly, then we can talk."); + +-- karathress +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1548029 AND -1548021; +DELETE FROM `creature_text` WHERE `entry`=21214; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(21214,0,0,14,11277,100,"karathress SAY_AGGRO","Guards, attention! We have visitors..."), +(21214,1,0,14,11278,100,"karathress SAY_GAIN_BLESSING","Your overconfidence will be your undoing! Guards, lend me your strength!"), +(21214,2,0,14,11279,100,"karathress SAY_GAIN_ABILITY1","Go on, kill them! I'll be the better for it!"), +(21214,2,1,14,11280,100,"karathress SAY_GAIN_ABILITY2","I am more powerful than ever!"), +(21214,2,2,14,11281,100,"karathress SAY_GAIN_ABILITY3","More knowledge, more power!"), +(21214,3,0,14,11282,100,"karathress SAY_SLAY1","Land-dwelling scum!"), +(21214,3,1,14,11283,100,"karathress SAY_SLAY2","Alana be'lendor!"), +(21214,3,2,14,11284,100,"karathress SAY_SLAY3","I am rid of you."), +(21214,4,0,14,11285,100,"karathress SAY_DEATH","Her ... excellency ... awaits!"); + +-- hydross +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1548008 AND -1548000; +DELETE FROM `creature_text` WHERE `entry`=21216; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(21216,0,0,14,11289,100,"hydross SAY_AGGRO","I cannot allow you to interfere!"), +(21216,1,0,14,11290,100,"hydross SAY_SWITCH_TO_CLEAN","Better, much better."), +(21216,2,0,14,11291,100,"hydross SAY_CLEAN_SLAY1","They have forced me to this..."), +(21216,2,1,14,11292,100,"hydross SAY_CLEAN_SLAY2","I have no choice."), +(21216,3,0,14,11293,100,"hydross SAY_CLEAN_DEATH","I am... released..."), +(21216,4,0,14,11297,100,"hydross SAY_SWITCH_TO_CORRUPT","Aaghh, the poison..."), +(21216,5,0,14,11298,100,"hydross SAY_CORRUPT_SLAY1","I will purge you from this place."), +(21216,5,1,14,11299,100,"hydross SAY_CORRUPT_SLAY2","You are no better than they!"), +(21216,6,0,14,11300,100,"hydross SAY_CORRUPT_DEATH","You are the disease, not I"); + +-- vashj +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1548055 AND -1548042; +DELETE FROM `creature_text` WHERE `entry`=21212; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(21212,0,0,14,11531,100,"vashj SAY_INTRO","Water is life. It has become a rare commodity here in Outland. A commodity that we alone shall control. We are the Highborne, and the time has come at last for us to retake our rightful place in the world!"), +(21212,1,0,14,11532,100,"vashj SAY_AGGRO1","I'll split you from stem to stern!"), +(21212,1,1,14,11533,100,"vashj SAY_AGGRO2","Victory to Lord Illidan!"), +(21212,1,2,14,11534,100,"vashj SAY_AGGRO3","I spit on you, surface filth!"), +(21212,1,3,14,11535,100,"vashj SAY_AGGRO4","Death to the outsiders!"), +(21212,2,0,14,11538,100,"vashj SAY_PHASE1","I did not wish to lower myself by engaging your kind, but you leave me little choice!"), +(21212,3,0,14,11539,100,"vashj SAY_PHASE2","The time is now! Leave none standing!"), +(21212,4,0,14,11540,100,"vashj SAY_PHASE3","You may want to take cover."), +(21212,5,0,14,11536,100,"vashj SAY_BOWSHOT1","Straight to the heart!"), +(21212,5,1,14,11537,100,"vashj SAY_BOWSHOT2","Seek your mark!"), +(21212,6,0,14,11541,100,"vashj SAY_SLAY1","Your time ends now!"), +(21212,6,1,14,11542,100,"vashj SAY_SLAY2","You have failed!"), +(21212,6,2,14,11543,100,"vashj SAY_SLAY3","Be'lamere an'delay"), +(21212,7,0,14,11544,100,"vashj SAY_DEATH","Lord Illidan, I... I am... sorry."); + +-- leotheras +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1548020 AND -1548009; +DELETE FROM `creature_text` WHERE `entry`=21215; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(21215,0,0,14,11312,100,"leotheras SAY_AGGRO","Finally, my banishment ends!"), +(21215,1,0,14,11304,100,"leotheras SAY_SWITCH_TO_DEMON","Be gone, trifling elf. I am in control now!"), +(21215,2,0,14,11305,100,"leotheras SAY_INNER_DEMONS","We all have our demons..."), +(21215,3,0,14,11306,100,"leotheras SAY_DEMON_SLAY1","I have no equal."), +(21215,3,1,14,11307,100,"leotheras SAY_DEMON_SLAY2","Perish, mortal."), +(21215,3,2,14,11308,100,"leotheras SAY_DEMON_SLAY3","Yes, YES! Ahahah!"), +(21215,4,0,14,11314,100,"leotheras SAY_NIGHTELF_SLAY1","Kill! KILL!"), +(21215,4,1,14,11315,100,"leotheras SAY_NIGHTELF_SLAY2","That's right! Yes!"), +(21215,4,2,14,11316,100,"leotheras SAY_NIGHTELF_SLAY3","Who's the master now?"), +(21215,5,0,14,11313,100,"leotheras SAY_FINAL_FORM","No... no! What have you done? I am the master! Do you hear me? I am... aaggh! Can't... contain him..."), +(21215,6,0,14,11309,100,"leotheras SAY_FREE","At last I am liberated. It has been too long since I have tasted true freedom!"), +(21215,7,0,14,11317,100,"leotheras SAY_DEATH","You cannot kill me! Fools, I'll be back! I'll... aarghh..."); + +-- morogrim +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1548041 AND -1548030; +DELETE FROM `creature_text` WHERE `entry`=21213; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(21213,0,0,14,11321,100,"morogrim SAY_AGGRO","Flood of the deep, take you!"), +(21213,1,0,14,11322,100,"morogrim SAY_SUMMON1","By the Tides, kill them at once!"), +(21213,1,1,14,11323,100,"morogrim SAY_SUMMON2","Destroy them my subjects!"), +(21213,2,0,14,11324,100,"morogrim SAY_SUMMON_BUBL1","There is nowhere to hide!"), +(21213,2,1,14,11325,100,"morogrim SAY_SUMMON_BUBL2","Soon it will be finished!"), +(21213,3,0,14,11326,100,"morogrim SAY_SLAY1","It is done!"), +(21213,3,1,14,11327,100,"morogrim SAY_SLAY2","Strugging only makes it worse."), +(21213,3,2,14,11328,100,"morogrim SAY_SLAY3","Only the strong survive."), +(21213,4,0,14,11329,100,"morogrim SAY_DEATH","Great... currents of... Ageon."), +(21213,5,0,16,0,100,"morogrim EMOTE_WATERY_GRAVE","sends his enemies to their watery graves!"), +(21213,6,0,41,0,100,"morogrim EMOTE_EARTHQUAKE","The violent earthquake has alerted nearby murlocs!"), +(21213,7,0,16,0,100,"morogrim EMOTE_WATERY_GLOBULES","summons Watery Globules!"); + +-- thespia +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1545006 AND -1545000; +DELETE FROM `creature_text` WHERE `entry`=17797; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17797,0,0,14,10360,100,"thespia SAY_SUMMON","Surge forth my pets!"), +(17797,1,0,14,10361,100,"thespia SAY_AGGRO_1","The depths will consume you!"), +(17797,1,1,14,10362,100,"thespia SAY_AGGRO_2","Meet your doom, surface dwellers!"), +(17797,1,2,14,10363,100,"thespia SAY_AGGRO_3","You will drown in blood!"), +(17797,2,0,14,10364,100,"thespia SAY_SLAY_1","To the depths of oblivion with you!"), +(17797,2,1,14,10365,100,"thespia SAY_SLAY_2","For my lady and master!"), +(17797,3,0,14,10366,100,"thespia SAY_DEAD","Our matron will be.. the end of.. you.."); + +-- mekgineer +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1545015 AND -1545007; +DELETE FROM `creature_text` WHERE `entry`=17796; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17796,0,0,14,10367,100,"mekgineer SAY_MECHANICS","I'm bringin' the pain!"), +(17796,1,0,14,10368,100,"mekgineer SAY_AGGRO_1","You're in for a world of hurt!"), +(17796,1,1,14,10369,100,"mekgineer SAY_AGGRO_2","Eat hot metal, scumbag!"), +(17796,1,2,14,10370,100,"mekgineer SAY_AGGRO_3","I'll come over there!"), +(17796,1,3,14,10371,100,"mekgineer SAY_AGGRO_4","I'm bringin' the pain!"), +(17796,2,0,14,10372,100,"mekgineer SOUND_SLAY_1","You just got served, punk!"), +(17796,2,1,14,10373,100,"mekgineer SOUND_SLAY_2","I own you!"), +(17796,2,2,14,10374,100,"mekgineer SOUND_SLAY_3","Have fun dyin', cupcake!"), +(17796,3,0,14,10375,100,"mekgineer SAY_DEATH","Mommy!"); + +-- kalithresh +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1545023 AND -1545016; +DELETE FROM `creature_text` WHERE `entry`=17798; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17798,0,0,14,10390,100,"kalithresh SAY_INTRO","You deem yourselves worthy simply because you bested my guards? Our work here will not be compromised!"), +(17798,1,0,14,10391,100,"kalithresh SAY_REGEN","This is not nearly over..."), +(17798,2,0,14,10392,100,"kalithresh SAY_AGGRO1","Your head will roll!"), +(17798,2,1,14,10393,100,"kalithresh SAY_AGGRO2","I despise all of your kind!"), +(17798,2,2,14,10394,100,"kalithresh SAY_AGGRO3","Ba'ahntha sol'dorei!"), +(17798,3,0,14,10395,100,"kalithresh SAY_SLAY1","Scram, surface filth!"), +(17798,3,1,14,10396,100,"kalithresh SAY_SLAY2","Ah ha ha ha ha ha ha!"), +(17798,4,0,14,10397,100,"kalithresh SAY_DEATH","For her Excellency... for... Vashj!"); + +-- gruul +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1565019 AND -1565010; +DELETE FROM `creature_text` WHERE `entry`=19044; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(19044,0,0,14,11355,100,"gruul SAY_AGGRO","Come... and die."), +(19044,1,0,14,11356,100,"gruul SAY_SLAM1","Scurry"), +(19044,1,1,14,11357,100,"gruul SAY_SLAM2","No escape"), +(19044,2,0,14,11358,100,"gruul SAY_SHATTER1","Stay"), +(19044,2,1,14,11359,100,"gruul SAY_SHATTER2","Beg... for life"), +(19044,3,0,14,11360,100,"gruul SAY_SLAY1","No more"), +(19044,3,1,14,11361,100,"gruul SAY_SLAY2","Unworthy"), +(19044,3,2,14,11362,100,"gruul SAY_SLAY3","Die"), +(19044,4,0,14,11363,100,"gruul SAY_DEATH","Aaargh..."), +(19044,5,0,16,0,100,"gruul EMOTE_GROW","%s grows in size!"); + +-- maulgar +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1565009 AND -1565000; +DELETE FROM `creature_text` WHERE `entry`=18831; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(18831,0,0,14,11367,100,"maulgar SAY_AGGRO","Gronn are the real power in outland."), +(18831,1,0,14,11368,100,"maulgar SAY_ENRAGE","You will not defeat the hand of Gruul!"), +(18831,2,0,14,11369,100,"maulgar SAY_OGRE_DEATH1","You won't kill next one so easy!"), +(18831,2,1,14,11370,100,"maulgar SAY_OGRE_DEATH2","Pah! Does not prove anything!"), +(18831,2,2,14,11371,100,"maulgar SAY_OGRE_DEATH3","I'm not afraid of you."), +(18831,2,3,14,11372,100,"maulgar SAY_OGRE_DEATH4","Good, now you fight me!"), +(18831,3,0,14,11373,100,"maulgar SAY_SLAY1","You not so tough afterall!"), +(18831,3,1,14,11374,100,"maulgar SAY_SLAY2","Aha-ha ha ha!"), +(18831,3,2,14,11375,100,"maulgar SAY_SLAY3","Mulgar is king!"), +(18831,4,0,14,11376,100,"maulgar SAY_DEATH","Gruul... will crush you..."); + +-- broggok +DELETE FROM `script_texts` WHERE `entry`=-1542008; +DELETE FROM `creature_text` WHERE `entry`=17380; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17380,0,0,14,0,100,"broggok SAY_AGGRO","Come intruders...."); + +-- kelidan +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1542007 AND -1542000; +DELETE FROM `creature_text` WHERE `entry`=17377; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17377,0,0,14,10164,100,"kelidan SAY_WAKE","Who dares interrupt... What is this? What have you done? You ruin everything!"), +(17377,1,0,14,10166,100,"kelidan SAY_ADD_AGGRO_1","You mustn't let him loose!"), +(17377,1,1,14,10167,100,"kelidan SAY_ADD_AGGRO_2","Ignorant whelps!"), +(17377,1,2,14,10168,100,"kelidan SAY_ADD_AGGRO_3","You fools! He'll kill us all!"), +(17377,2,0,14,10169,100,"kelidan SAY_KILL_1","Just as you deserve!"), +(17377,2,1,14,10170,100,"kelidan SAY_KILL_2","Your friends will soon be joining you."), +(17377,3,0,14,10165,100,"kelidan SAY_NOVA","Closer... Come closer.. and burn!"), +(17377,4,0,14,10171,100,"kelidan SAY_DIE","Good luck... you'll need it.."); + +-- the maker +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1542014 AND -1542009; +DELETE FROM `creature_text` WHERE `entry`=17381; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17381,0,0,14,10286,100,"the maker SAY_AGGRO_1","My work must not be interrupted."), +(17381,0,1,14,10287,100,"the maker SAY_AGGRO_2","Perhaps I can find a use for you."), +(17381,0,2,14,10288,100,"the maker SAY_AGGRO_3","Anger... Hate... These are tools I can use."), +(17381,1,0,14,10289,100,"the maker SAY_KILL_1","Let's see what I can make of you."), +(17381,1,1,14,10290,100,"the maker SAY_KILL_2","It is pointless to resist."), +(17381,2,0,14,10291,100,"the maker SAY_DIE","Stay away from... me."); + +-- omor +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1543016 AND -1543009; +DELETE FROM `creature_text` WHERE `entry`=17308; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17308,0,0,14,10280,100,"omor SAY_AGGRO_1","You dare stand against me?!"), +(17308,0,1,14,10279,100,"omor SAY_AGGRO_2","I will not be defeated!"), +(17308,0,2,14,10281,100,"omor SAY_AGGRO_3","Your insolence will be your death."), +(17308,1,0,14,10277,100,"omor SAY_SUMMON","Achor-she-ki! Feast my pet! Eat your fill!"), +(17308,2,0,14,10278,100,"omor SAY_CURSE","A-Kreesh!"), +(17308,3,0,14,10282,100,"omor SAY_KILL_1","Die, weakling!"), +(17308,4,0,14,10284,100,"omor SAY_DIE","It is... not over."), +(17308,5,0,14,10283,100,"omor SAY_WIPE","I am victorious!"); + +-- vazruden +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1543025 AND -1543017; +DELETE FROM `creature_text` WHERE `entry`=17537; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17537,0,0,14,10292,100,"vazruden SAY_INTRO","You have faced many challenges, pity they were all in vain. Soon your people will kneel to my lord!"), +(17537,1,0,14,10293,100,"vazruden SAY_WIPE","Is there no one left to test me?"), +(17537,2,0,14,10294,100,"vazruden SAY_AGGRO_1","Your time is running out!"), +(17537,2,1,14,10295,100,"vazruden SAY_AGGRO_2","You are nothing, I answer a higher call!"), +(17537,2,2,14,10296,100,"vazruden SAY_AGGRO_3","The Dark Lord laughs at you!"), +(17537,3,0,14,10297,100,"vazruden SAY_KILL_1","It is over. Finished!"), +(17537,3,1,14,10298,100,"vazruden SAY_KILL_2","Your days are done!"), +(17537,4,0,14,10299,100,"vazruden SAY_DIE","My lord will be the end you all..."), +(17537,5,0,41,0,100,"vazruden EMOTE","descends from the sky"); + +-- gargolmar +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1543008 AND -1543000; +DELETE FROM `creature_text` WHERE `entry`=17306; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17306,0,0,14,0,100,"gargolmar SAY_TAUNT","Do you smell that? Fresh meat has somehow breached our citadel. Be wary of any intruders."), +(17306,1,0,14,10329,100,"gargolmar SAY_HEAL","Heal me! QUICKLY!"), +(17306,2,0,14,10330,100,"gargolmar SAY_SURGE","Back off, pup!"), +(17306,3,0,14,10331,100,"gargolmar SAY_AGGRO_1","What have we here...?"), +(17306,3,1,14,10332,100,"gargolmar SAY_AGGRO_2","Heh... this may hurt a little."), +(17306,3,2,14,10333,100,"gargolmar SAY_AGGRO_3","I'm gonna enjoy this."), +(17306,4,0,14,10334,100,"gargolmar SAY_KILL_1","Say farewell!"), +(17306,4,1,14,10335,100,"gargolmar SAY_KILL_2","Much too easy..."), +(17306,5,0,14,10336,100,"gargolmar SAY_DIE","Hahah.. <cough> ..argh!"); + +-- nethekurse +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1540017 AND -1540000; +DELETE FROM `creature_text` WHERE `entry`=16807; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(16807,0,0,14,10262,100,"nethekurse SAY_INTRO","You wish to fight us all at once? This should be amusing!"), +(16807,1,0,14,10263,100,"nethekurse PEON_ATTACK_1","You can have that one. I no longer need him."), +(16807,1,1,14,10264,100,"nethekurse PEON_ATTACK_2","Yes, beat him mercilessly. His skull is a thick as an ogres."), +(16807,1,2,14,10265,100,"nethekurse PEON_ATTACK_3","Don't waste your time on that one. He's weak!"), +(16807,1,3,14,10266,100,"nethekurse PEON_ATTACK_4","You want him? Very well, take him!"), +(16807,2,0,14,10267,100,"nethekurse PEON_DIE_1","One pitiful wretch down. Go on, take another one."), +(16807,2,1,14,10268,100,"nethekurse PEON_DIE_2","Ahh, what a waste... Next!"), +(16807,2,2,14,10269,100,"nethekurse PEON_DIE_3","I was going to kill him anyway!"), +(16807,2,3,14,10270,100,"nethekurse PEON_DIE_4","Thank you for saving me the trouble! Now it's my turn to have some fun..."), +(16807,3,0,14,10259,100,"nethekurse SAY_TAUNT_1","Beg for your pittyfull life!"), +(16807,3,1,14,10260,100,"nethekurse SAY_TAUNT_2","Run covad, ruun!"), +(16807,3,2,14,10261,100,"nethekurse SAY_TAUNT_3","Your pain amuses me."), +(16807,4,0,14,10271,100,"nethekurse SAY_AGGRO_1","I'm already bored."), +(16807,4,1,14,10272,100,"nethekurse SAY_AGGRO_2","Come on! ... Show me a real fight."), +(16807,4,2,14,10273,100,"nethekurse SAY_AGGRO_3","I had more fun torturing the peons."), +(16807,5,0,14,10274,100,"nethekurse SAY_SLAY_1","You Loose."), +(16807,5,1,14,10275,100,"nethekurse SAY_SLAY_2","Ohh! Just die."), +(16807,6,0,14,10276,100,"nethekurse SAY_DIE","What a ... a shame."); diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 6aebcbb2d8a..bd528edc432 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -677,7 +677,7 @@ void SmartAI::CorpseRemoved(uint32& respawnDelay) void SmartAI::PassengerBoarded(Unit* who, int8 seatId, bool apply) { - GetScript()->ProcessEventsFor(SMART_EVENT_PASSENGER_BOARDED, who, (uint32)seatId, 0, apply); + GetScript()->ProcessEventsFor(apply ? SMART_EVENT_PASSENGER_BOARDED : SMART_EVENT_PASSENGER_REMOVED, who, uint32(seatId), 0, apply); } void SmartAI::InitializeAI() diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 4fd13a111c9..34e48c62771 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -472,6 +472,7 @@ uint32 Condition::GetMaxAvailableConditionTargets() case CONDITION_SOURCE_TYPE_GOSSIP_MENU: case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION: case CONDITION_SOURCE_TYPE_SMART_EVENT: + case CONDITION_SOURCE_TYPE_NPC_VENDOR: return 2; default: return 1; @@ -623,7 +624,8 @@ bool ConditionMgr::CanHaveSourceGroupSet(ConditionSourceType sourceType) const sourceType == CONDITION_SOURCE_TYPE_SPELL_IMPLICIT_TARGET || sourceType == CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT || sourceType == CONDITION_SOURCE_TYPE_SMART_EVENT || - sourceType == CONDITION_SOURCE_TYPE_PHASE_DEFINITION); + sourceType == CONDITION_SOURCE_TYPE_PHASE_DEFINITION || + sourceType == CONDITION_SOURCE_TYPE_NPC_VENDOR); } bool ConditionMgr::CanHaveSourceIdSet(ConditionSourceType sourceType) const @@ -650,7 +652,6 @@ ConditionList ConditionMgr::GetConditionsForNotGroupedEntry(ConditionSourceType return spellCond; } - ConditionList ConditionMgr::GetConditionsForSpellClickEvent(uint32 creatureId, uint32 spellId) { ConditionList cond; @@ -712,7 +713,22 @@ ConditionList ConditionMgr::GetConditionsForPhaseDefinition(uint32 zone, uint32 sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForPhaseDefinition: found conditions for zone %u entry %u", zone, entry); } } + return cond; +} +ConditionList ConditionMgr::GetConditionsForNpcVendorEvent(uint32 creatureId, uint32 itemId) +{ + ConditionList cond; + NpcVendorConditionContainer::const_iterator itr = NpcVendorConditionContainerStore.find(creatureId); + if (itr != NpcVendorConditionContainerStore.end()) + { + ConditionTypeContainer::const_iterator i = (*itr).second.find(itemId); + if (i != (*itr).second.end()) + { + cond = (*i).second; + sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForNpcVendorEvent: found conditions for creature entry %u item %u", creatureId, itemId); + } + } return cond; } @@ -946,6 +962,13 @@ void ConditionMgr::LoadConditions(bool isReload) ++count; continue; } + case CONDITION_SOURCE_TYPE_NPC_VENDOR: + { + NpcVendorConditionContainerStore[cond->SourceGroup][cond->SourceEntry].push_back(cond); + valid = true; + ++count; + continue; + } default: break; } @@ -1444,6 +1467,21 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) return false; } break; + case CONDITION_SOURCE_TYPE_NPC_VENDOR: + { + if (!sObjectMgr->GetCreatureTemplate(cond->SourceGroup)) + { + sLog->outError(LOG_FILTER_SQL, "SourceEntry %u in `condition` table, does not exist in `creature_template`, ignoring.", cond->SourceGroup); + return false; + } + ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(cond->SourceEntry); + if (!itemTemplate) + { + sLog->outError(LOG_FILTER_SQL, "SourceEntry %u in `condition` table, does not exist in `item_template`, ignoring.", cond->SourceEntry); + return false; + } + break; + } case CONDITION_SOURCE_TYPE_GOSSIP_MENU: case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION: case CONDITION_SOURCE_TYPE_SMART_EVENT: @@ -2020,6 +2058,19 @@ void ConditionMgr::Clean() PhaseDefinitionsConditionStore.clear(); + for (NpcVendorConditionContainer::iterator itr = NpcVendorConditionContainerStore.begin(); itr != NpcVendorConditionContainerStore.end(); ++itr) + { + for (ConditionTypeContainer::iterator it = itr->second.begin(); it != itr->second.end(); ++it) + { + for (ConditionList::const_iterator i = it->second.begin(); i != it->second.end(); ++i) + delete *i; + it->second.clear(); + } + itr->second.clear(); + } + + NpcVendorConditionContainerStore.clear(); + // this is a BIG hack, feel free to fix it if you can figure out the ConditionMgr ;) for (std::list<Condition*>::const_iterator itr = AllocatedMemoryStore.begin(); itr != AllocatedMemoryStore.end(); ++itr) delete *itr; diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 96547accdb9..95b564dc0ee 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -127,8 +127,9 @@ enum ConditionSourceType CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20, CONDITION_SOURCE_TYPE_VEHICLE_SPELL = 21, CONDITION_SOURCE_TYPE_SMART_EVENT = 22, - CONDITION_SOURCE_TYPE_PHASE_DEFINITION = 23, - CONDITION_SOURCE_TYPE_MAX = 24 //MAX + CONDITION_SOURCE_TYPE_NPC_VENDOR = 23, + CONDITION_SOURCE_TYPE_PHASE_DEFINITION = 24, + CONDITION_SOURCE_TYPE_MAX = 25 // MAX }; enum ComparisionType @@ -216,6 +217,7 @@ typedef std::list<Condition*> ConditionList; typedef std::map<uint32, ConditionList> ConditionTypeContainer; typedef std::map<ConditionSourceType, ConditionTypeContainer> ConditionContainer; typedef std::map<uint32, ConditionTypeContainer> CreatureSpellConditionContainer; +typedef std::map<uint32, ConditionTypeContainer> NpcVendorConditionContainer; typedef std::map<std::pair<int32, uint32 /*SAI source_type*/>, ConditionTypeContainer> SmartEventConditionContainer; typedef std::map<int32 /*zoneId*/, ConditionTypeContainer> PhaseDefinitionConditionContainer; @@ -245,6 +247,7 @@ class ConditionMgr ConditionList GetConditionsForSmartEvent(int32 entryOrGuid, uint32 eventId, uint32 sourceType); ConditionList GetConditionsForVehicleSpell(uint32 creatureId, uint32 spellId); ConditionList GetConditionsForPhaseDefinition(uint32 zone, uint32 entry); + ConditionList GetConditionsForNpcVendorEvent(uint32 creatureId, uint32 itemId); private: bool isSourceTypeValid(Condition* cond); @@ -261,6 +264,7 @@ class ConditionMgr ConditionReferenceContainer ConditionReferenceStore; CreatureSpellConditionContainer VehicleSpellConditionStore; CreatureSpellConditionContainer SpellClickEventConditionStore; + NpcVendorConditionContainer NpcVendorConditionContainerStore; SmartEventConditionContainer SmartEventConditionStore; PhaseDefinitionConditionContainer PhaseDefinitionsConditionStore; }; diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index f8aea2d10f3..668b1622738 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -809,18 +809,12 @@ void LFGMgr::LeaveLfg(uint64 guid) RemoveProposal(it, LFG_UPDATETYPE_PROPOSAL_DECLINED); break; } - case LFG_STATE_BOOT: - if (guid != gguid) // Player - { - UpdateBoot(guid); // Forcing LFG_ANSWER_PENDING (Removal of player) - SetState(guid, LFG_STATE_NONE); - } - break; case LFG_STATE_NONE: case LFG_STATE_RAIDBROWSER: break; case LFG_STATE_DUNGEON: case LFG_STATE_FINISHED_DUNGEON: + case LFG_STATE_BOOT: if (guid != gguid) // Player SetState(guid, LFG_STATE_NONE); break; @@ -1342,7 +1336,7 @@ void LFGMgr::InitBoot(uint64 gguid, uint64 kicker, uint64 victim, std::string co @param[in] guid Player who has answered @param[in] player answer */ -void LFGMgr::UpdateBoot(uint64 guid, LfgAnswer answer) +void LFGMgr::UpdateBoot(uint64 guid, bool accept) { uint64 gguid = GetGroup(guid); if (!gguid) @@ -1354,42 +1348,26 @@ void LFGMgr::UpdateBoot(uint64 guid, LfgAnswer answer) LfgPlayerBoot& boot = itBoot->second; + if (boot.votes[guid] != LFG_ANSWER_PENDING) // Cheat check: Player can't vote twice + return; + + boot.votes[guid] = LfgAnswer(accept); + uint8 votesNum = 0; uint8 agreeNum = 0; - - if (guid == boot.victim) - agreeNum = LFG_GROUP_KICK_VOTES_NEEDED + 1; // +1 on purpose to skip kick code - else if (answer == LFG_ANSWER_PENDING) + for (LfgAnswerContainer::const_iterator itVotes = boot.votes.begin(); itVotes != boot.votes.end(); ++itVotes) { - boot.votes.erase(guid); - // If we don't have enough members - force boot fail - if (boot.votes.size() <= LFG_GROUP_KICK_VOTES_NEEDED) + if (itVotes->second != LFG_ANSWER_PENDING) { - agreeNum = 0; - votesNum = boot.votes.size(); + ++votesNum; + if (itVotes->second == LFG_ANSWER_AGREE) + ++agreeNum; } } - else - { - if (boot.votes[guid] != LFG_ANSWER_PENDING) // Cheat check: Player can't vote twice - return; - - boot.votes[guid] = answer; - - for (LfgAnswerContainer::const_iterator itVotes = boot.votes.begin(); itVotes != boot.votes.end(); ++itVotes) - { - if (itVotes->second != LFG_ANSWER_PENDING) - { - ++votesNum; - if (itVotes->second == LFG_ANSWER_AGREE) - ++agreeNum; - } - } - // if we don't have enough votes (agree or deny) do nothing - if (agreeNum < LFG_GROUP_KICK_VOTES_NEEDED && (votesNum - agreeNum) < LFG_GROUP_KICK_VOTES_NEEDED) - return; - } + // if we don't have enough votes (agree or deny) do nothing + if (agreeNum < LFG_GROUP_KICK_VOTES_NEEDED && (votesNum - agreeNum) < LFG_GROUP_KICK_VOTES_NEEDED) + return; // Send update info to all players boot.inProgress = false; diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index c989dc1ce08..31c092ae7c2 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -322,7 +322,7 @@ class LFGMgr // Vote kick void InitBoot(uint64 gguid, uint64 kguid, uint64 vguid, std::string const& reason); - void UpdateBoot(uint64 guid, LfgAnswer accept = LFG_ANSWER_PENDING); + void UpdateBoot(uint64 guid, bool accept); void InitializeLockedDungeons(Player* player, uint8 level = 0); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ee9b63eb364..bb5659eeb25 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -6898,37 +6898,80 @@ ReputationRank Player::GetReputationRank(uint32 faction) const return GetReputationMgr().GetRank(factionEntry); } -//Calculate total reputation percent player gain with quest/creature level -int32 Player::CalculateReputationGain(uint32 creatureOrQuestLevel, int32 rep, int32 faction, bool for_quest, bool noQuestBonus) +// Calculate total reputation percent player gain with quest/creature level +int32 Player::CalculateReputationGain(ReputationSource source, uint32 creatureOrQuestLevel, int32 rep, int32 faction, bool noQuestBonus) { float percent = 100.0f; - // Get the generic rate first - if (RepRewardRate const* repData = sObjectMgr->GetRepRewardRate(faction)) + float repMod = noQuestBonus ? 0.0f : float(GetTotalAuraModifier(SPELL_AURA_MOD_REPUTATION_GAIN)); + + // faction specific auras only seem to apply to kills + if (source == REPUTATION_SOURCE_KILL) + repMod += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_FACTION_REPUTATION_GAIN, faction); + + percent += rep > 0 ? repMod : -repMod; + + float rate; + switch (source) { - float repRate = for_quest ? repData->quest_rate : repData->creature_rate; - percent *= repRate; + case REPUTATION_SOURCE_KILL: + rate = sWorld->getRate(RATE_REPUTATION_LOWLEVEL_KILL); + break; + case REPUTATION_SOURCE_QUEST: + case REPUTATION_SOURCE_DAILY_QUEST: + case REPUTATION_SOURCE_WEEKLY_QUEST: + case REPUTATION_SOURCE_MONTHLY_QUEST: + rate = sWorld->getRate(RATE_REPUTATION_LOWLEVEL_QUEST); + break; + case REPUTATION_SOURCE_SPELL: + default: + rate = 1.0f; + break; } - float rate = for_quest ? sWorld->getRate(RATE_REPUTATION_LOWLEVEL_QUEST) : sWorld->getRate(RATE_REPUTATION_LOWLEVEL_KILL); - if (rate != 1.0f && creatureOrQuestLevel <= Trinity::XP::GetGrayLevel(getLevel())) percent *= rate; - float repMod = noQuestBonus ? 0.0f : (float)GetTotalAuraModifier(SPELL_AURA_MOD_REPUTATION_GAIN); + if (percent <= 0.0f) + return 0; - if (!for_quest) - repMod += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_FACTION_REPUTATION_GAIN, faction); + // Multiply result with the faction specific rate + if (RepRewardRate const* repData = sObjectMgr->GetRepRewardRate(faction)) + { + float repRate = 0.0f; + switch (source) + { + case REPUTATION_SOURCE_KILL: + repRate = repData->creatureRate; + break; + case REPUTATION_SOURCE_QUEST: + repRate = repData->questRate; + break; + case REPUTATION_SOURCE_DAILY_QUEST: + repRate = repData->questDailyRate; + break; + case REPUTATION_SOURCE_WEEKLY_QUEST: + repRate = repData->questWeeklyRate; + break; + case REPUTATION_SOURCE_MONTHLY_QUEST: + repRate = repData->questMonthlyRate; + break; + case REPUTATION_SOURCE_SPELL: + repRate = repData->spellRate; + break; + } - percent += rep > 0 ? repMod : -repMod; + // for custom, a rate of 0.0 will totally disable reputation gain for this faction/type + if (repRate <= 0.0f) + return 0; - if (percent <= 0.0f) - return 0; + percent *= repRate; + } - return int32(rep*percent/100); + return int32(rep * percent / 100.0f); } -//Calculates how many reputation points player gains in victim's enemy factions +// Calculates how many reputation points player gains in victim's enemy factions void Player::RewardReputation(Unit* victim, float rate) { if (!victim || victim->GetTypeId() == TYPEID_PLAYER) @@ -6938,7 +6981,6 @@ void Player::RewardReputation(Unit* victim, float rate) return; ReputationOnKillEntry const* Rep = sObjectMgr->GetReputationOnKilEntry(victim->ToCreature()->GetCreatureTemplate()->Entry); - if (!Rep) return; @@ -6969,8 +7011,10 @@ void Player::RewardReputation(Unit* victim, float rate) uint32 team = GetTeam(); float favored_rep_mult = 0; - if ((HasAura(32096) || HasAura(32098)) && (zone == 3483 || zone == 3562 || zone == 3836 || zone == 3713 || zone == 3714)) favored_rep_mult = 0.25; // Thrallmar's Favor and Honor Hold's Favor - else if (HasAura(30754) && (Rep->RepFaction1 == 609 || Rep->RepFaction2 == 609) && !ChampioningFaction) favored_rep_mult = 0.25; // Cenarion Favor + if ((HasAura(32096) || HasAura(32098)) && (zone == 3483 || zone == 3562 || zone == 3836 || zone == 3713 || zone == 3714)) + favored_rep_mult = 0.25; // Thrallmar's Favor and Honor Hold's Favor + else if (HasAura(30754) && (Rep->RepFaction1 == 609 || Rep->RepFaction2 == 609) && !ChampioningFaction) + favored_rep_mult = 0.25; // Cenarion Favor if (favored_rep_mult > 0) favored_rep_mult *= 2; // Multiplied by 2 because the reputation is divided by 2 for some reason (See "donerep1 / 2" and "donerep2 / 2") -- if you know why this is done, please update/explain :) // Favored reputation increase END @@ -6979,7 +7023,7 @@ void Player::RewardReputation(Unit* victim, float rate) if (Rep->RepFaction1 && (!Rep->TeamDependent || team == ALLIANCE)) { - int32 donerep1 = CalculateReputationGain(victim->getLevel(), Rep->RepValue1, ChampioningFaction ? ChampioningFaction : Rep->RepFaction1, false); + int32 donerep1 = CalculateReputationGain(REPUTATION_SOURCE_KILL, victim->getLevel(), Rep->RepValue1, ChampioningFaction ? ChampioningFaction : Rep->RepFaction1, false); donerep1 = int32(donerep1*(rate + favored_rep_mult)); if (recruitAFriend) @@ -6993,7 +7037,7 @@ void Player::RewardReputation(Unit* victim, float rate) if (Rep->RepFaction2 && (!Rep->TeamDependent || team == HORDE)) { - int32 donerep2 = CalculateReputationGain(victim->getLevel(), Rep->RepValue2, ChampioningFaction ? ChampioningFaction : Rep->RepFaction2, false); + int32 donerep2 = CalculateReputationGain(REPUTATION_SOURCE_KILL, victim->getLevel(), Rep->RepValue2, ChampioningFaction ? ChampioningFaction : Rep->RepFaction2, false); donerep2 = int32(donerep2*(rate + favored_rep_mult)); if (recruitAFriend) @@ -7006,7 +7050,7 @@ void Player::RewardReputation(Unit* victim, float rate) } } -//Calculate how many reputation points player gain with the quest +// Calculate how many reputation points player gain with the quest void Player::RewardReputation(Quest const* quest) { bool recruitAFriend = GetsRecruitAFriendBonus(false); @@ -7018,7 +7062,16 @@ void Player::RewardReputation(Quest const* quest) continue; if (quest->RewardFactionValueIdOverride[i]) { - int32 rep = CalculateReputationGain(GetQuestLevel(quest), quest->RewardFactionValueIdOverride[i]/100, quest->RewardFactionId[i], true, true); + int32 rep = 0; + + if (quest->IsDaily()) + rep = CalculateReputationGain(REPUTATION_SOURCE_DAILY_QUEST, GetQuestLevel(quest), quest->RewardFactionValueIdOverride[i]/100, quest->RewardFactionId[i], true); + else if (quest->IsWeekly()) + rep = CalculateReputationGain(REPUTATION_SOURCE_WEEKLY_QUEST, GetQuestLevel(quest), quest->RewardFactionValueIdOverride[i]/100, quest->RewardFactionId[i], true); + else if (quest->IsMonthly()) + rep = CalculateReputationGain(REPUTATION_SOURCE_MONTHLY_QUEST, GetQuestLevel(quest), quest->RewardFactionValueIdOverride[i]/100, quest->RewardFactionId[i], true); + else + rep = CalculateReputationGain(REPUTATION_SOURCE_QUEST, GetQuestLevel(quest), quest->RewardFactionValueIdOverride[i]/100, quest->RewardFactionId[i], true); if (recruitAFriend) rep = int32(rep * (1 + sWorld->getRate(RATE_REPUTATION_RECRUIT_A_FRIEND_BONUS))); @@ -7034,11 +7087,17 @@ void Player::RewardReputation(Quest const* quest) if (const QuestFactionRewEntry* pRow = sQuestFactionRewardStore.LookupEntry(row)) { int32 repPoints = pRow->QuestRewFactionValue[field]; - if (!repPoints) continue; - repPoints = CalculateReputationGain(GetQuestLevel(quest), repPoints, quest->RewardFactionId[i], true); + if (quest->IsDaily()) + repPoints = CalculateReputationGain(REPUTATION_SOURCE_DAILY_QUEST, GetQuestLevel(quest), repPoints, quest->RewardFactionId[i], true); + else if (quest->IsWeekly()) + repPoints = CalculateReputationGain(REPUTATION_SOURCE_WEEKLY_QUEST, GetQuestLevel(quest), repPoints, quest->RewardFactionId[i], true); + else if (quest->IsMonthly()) + repPoints = CalculateReputationGain(REPUTATION_SOURCE_MONTHLY_QUEST, GetQuestLevel(quest), repPoints, quest->RewardFactionId[i], true); + else + repPoints = CalculateReputationGain(REPUTATION_SOURCE_QUEST, GetQuestLevel(quest), repPoints, quest->RewardFactionId[i], true); if (recruitAFriend) repPoints = int32(repPoints * (1 + sWorld->getRate(RATE_REPUTATION_RECRUIT_A_FRIEND_BONUS))); @@ -14774,11 +14833,11 @@ Quest const* Player::GetNextQuest(uint64 guid, Quest const* quest) bool Player::CanSeeStartQuest(Quest const* quest) { - if (SatisfyQuestClass(quest, false) && SatisfyQuestRace(quest, false) && SatisfyQuestSkill(quest, false) && - SatisfyQuestExclusiveGroup(quest, false) && SatisfyQuestReputation(quest, false) && + if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, quest->GetQuestId(), this) && SatisfyQuestClass(quest, false) && SatisfyQuestRace(quest, false) && + SatisfyQuestSkill(quest, false) && SatisfyQuestExclusiveGroup(quest, false) && SatisfyQuestReputation(quest, false) && SatisfyQuestPreviousQuest(quest, false) && SatisfyQuestNextChain(quest, false) && SatisfyQuestPrevChain(quest, false) && SatisfyQuestDay(quest, false) && SatisfyQuestWeek(quest, false) && - SatisfyQuestSeasonal(quest, false) && !DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, quest->GetQuestId(), this)) + SatisfyQuestMonth(quest, false) && SatisfyQuestSeasonal(quest, false)) { return getLevel() + sWorld->getIntConfig(CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF) >= quest->GetMinLevel(); } @@ -14795,7 +14854,7 @@ bool Player::CanTakeQuest(Quest const* quest, bool msg) && SatisfyQuestPreviousQuest(quest, msg) && SatisfyQuestTimed(quest, msg) && SatisfyQuestNextChain(quest, msg) && SatisfyQuestPrevChain(quest, msg) && SatisfyQuestDay(quest, msg) && SatisfyQuestWeek(quest, msg) - && SatisfyQuestSeasonal(quest,msg) + && SatisfyQuestMonth(quest, msg) && SatisfyQuestSeasonal(quest, msg) && SatisfyQuestConditions(quest, msg); } @@ -14919,7 +14978,7 @@ bool Player::CanRewardQuest(Quest const* quest, bool msg) return false; // daily quest can't be rewarded (25 daily quest already completed) - if (!SatisfyQuestDay(quest, true) || !SatisfyQuestWeek(quest, true) || !SatisfyQuestSeasonal(quest,true)) + if (!SatisfyQuestDay(quest, true) || !SatisfyQuestWeek(quest, true) || !SatisfyQuestMonth(quest, true) || !SatisfyQuestSeasonal(quest, true)) return false; // rewarded and not repeatable quest (only cheating case, then ignore without message) @@ -15052,10 +15111,6 @@ void Player::AddQuest(Quest const* quest, Object* questGiver) StartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_QUEST, quest_id); - //starting initial quest script - if (questGiver && quest->GetQuestStartScript() != 0) - GetMap()->ScriptsStart(sQuestStartScripts, quest->GetQuestStartScript(), questGiver, this); - UpdateForQuestWorldObjects(); } @@ -15217,6 +15272,8 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, } else if (quest->IsWeekly()) SetWeeklyQuestStatus(quest_id); + else if (quest->IsMonthly()) + SetMonthlyQuestStatus(quest_id); else if (quest->IsSeasonal()) SetSeasonalQuestStatus(quest_id); @@ -15670,6 +15727,15 @@ bool Player::SatisfyQuestSeasonal(Quest const* qInfo, bool /*msg*/) return m_seasonalquests[eventId].find(qInfo->GetQuestId()) == m_seasonalquests[eventId].end(); } +bool Player::SatisfyQuestMonth(Quest const* qInfo, bool /*msg*/) +{ + if (!qInfo->IsMonthly() || m_monthlyquests.empty()) + return true; + + // if not found in cooldown list + return m_monthlyquests.find(qInfo->GetQuestId()) == m_monthlyquests.end(); +} + bool Player::GiveQuestSourceItem(Quest const* quest) { uint32 srcitem = quest->GetSrcItemId(); @@ -16753,8 +16819,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) //"health, power1, power2, power3, power4, power5, instance_id, speccount, activespec, exploredZones, equipmentCache, " // 57 58 59 //"knownTitles, actionBars, grantableLevels FROM characters WHERE guid = '%u'", guid); - PreparedQueryResult result = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADFROM); - + PreparedQueryResult result = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_FROM); if (!result) { sLog->outError(LOG_FILTER_PLAYER, "Player (GUID: %u) not found in table `characters`, can't load. ", guid); @@ -16773,7 +16838,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) return false; } - if (holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADBANNED)) + if (holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_BANNED)) { sLog->outError(LOG_FILTER_PLAYER, "Player (GUID: %u) is banned, can't load.", guid); return false; @@ -16788,12 +16853,9 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) (AccountMgr::IsPlayerAccount(GetSession()->GetSecurity()) && sObjectMgr->IsReservedName(m_name))) { PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ADD_AT_LOGIN_FLAG); - stmt->setUInt16(0, uint16(AT_LOGIN_RENAME)); stmt->setUInt32(1, guid); - CharacterDatabase.Execute(stmt); - return false; } @@ -16825,7 +16887,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 1.0f); // load achievements before anything else to prevent multiple gains for the same achievement/criteria on every loading (as loading does call UpdateAchievementCriteria) - m_achievementMgr->LoadFromDB(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS), holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS)); + m_achievementMgr->LoadFromDB(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ACHIEVEMENTS), holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_CRITERIA_PROGRESS)); uint64 money = fields[8].GetUInt64(); if (money > MAX_MONEY_AMOUNT) @@ -16862,7 +16924,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) setFactionForRace(getRace()); // load home bind and check in same time class/race pair, it used later for restore broken positions - if (!_LoadHomeBind(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADHOMEBIND))) + if (!_LoadHomeBind(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_HOME_BIND))) return false; InitPrimaryProfessions(); // to max set before any spell loaded @@ -16888,9 +16950,9 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) #define RelocateToHomebind(){ mapId = m_homebindMapId; instanceId = 0; Relocate(m_homebindX, m_homebindY, m_homebindZ); } - _LoadGroup(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADGROUP)); + _LoadGroup(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GROUP)); - _LoadArenaTeamInfo(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADARENAINFO)); + _LoadArenaTeamInfo(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ARENA_INFO)); // check arena teams integrity for (uint32 arena_slot = 0; arena_slot < MAX_ARENA_SLOT; ++arena_slot) @@ -16908,14 +16970,14 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) SetArenaTeamInfoField(arena_slot, ArenaTeamInfoType(j), 0); } - _LoadCurrency(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADCURRENCY)); + _LoadCurrency(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_CURRENCY)); SetUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, fields[40].GetUInt32()); SetUInt16Value(PLAYER_FIELD_KILLS, 0, fields[41].GetUInt16()); SetUInt16Value(PLAYER_FIELD_KILLS, 1, fields[42].GetUInt16()); - _LoadBoundInstances(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES)); - _LoadInstanceTimeRestrictions(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADINSTANCELOCKTIMES)); - _LoadBGData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADBGDATA)); + _LoadBoundInstances(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_BOUND_INSTANCES)); + _LoadInstanceTimeRestrictions(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_INSTANCE_LOCK_TIMES)); + _LoadBGData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_BG_DATA)); GetSession()->SetPlayer(this); MapEntry const* mapEntry = sMapStore.LookupEntry(mapId); @@ -17224,7 +17286,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) } // load skills after InitStatsForLevel because it triggering aura apply also - _LoadSkills(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADSKILLS)); + _LoadSkills(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_SKILLS)); UpdateSkillsForLevel(); //update skills after load, to make sure they are correctly update at player load // apply original stats mods before spell loading or item equipment that call before equip _RemoveStatsMods() @@ -17242,45 +17304,46 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) sLog->outError(LOG_FILTER_PLAYER, "Player %s(GUID: %u) has SpecCount = %u and ActiveSpec = %u.", GetName().c_str(), GetGUIDLow(), GetSpecsCount(), GetActiveSpec()); } - _LoadTalents(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADTALENTS)); - _LoadSpells(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADSPELLS)); + _LoadTalents(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_TALENTS)); + _LoadSpells(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_SPELLS)); - _LoadGlyphs(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADGLYPHS)); - _LoadAuras(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADAURAS), time_diff); + _LoadGlyphs(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GLYPHS)); + _LoadAuras(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_AURAS), time_diff); _LoadGlyphAuras(); // add ghost flag (must be after aura load: PLAYER_FLAGS_GHOST set in aura) if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) m_deathState = DEAD; // after spell load, learn rewarded spell if need also - _LoadQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADQUESTSTATUS)); - _LoadQuestStatusRewarded(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADQUESTSTATUSREW)); - _LoadDailyQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADDAILYQUESTSTATUS)); - _LoadWeeklyQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADWEEKLYQUESTSTATUS)); - _LoadSeasonalQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADSEASONALQUESTSTATUS)); - _LoadRandomBGStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADRANDOMBG)); + _LoadQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_QUEST_STATUS)); + _LoadQuestStatusRewarded(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_QUEST_STATUS_REW)); + _LoadDailyQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_DAILY_QUEST_STATUS)); + _LoadWeeklyQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_WEEKLY_QUEST_STATUS)); + _LoadSeasonalQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_SEASONAL_QUEST_STATUS)); + _LoadMonthlyQuestStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_MONTHLY_QUEST_STATUS)); + _LoadRandomBGStatus(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_RANDOM_BG)); // after spell and quest load InitTalentForLevel(); learnDefaultSpells(); // must be before inventory (some items required reputation check) - m_reputationMgr->LoadFromDB(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADREPUTATION)); + m_reputationMgr->LoadFromDB(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_REPUTATION)); - _LoadInventory(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADINVENTORY), time_diff); + _LoadInventory(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_INVENTORY), time_diff); if (IsVoidStorageUnlocked()) - _LoadVoidStorage(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADVOIDSTORAGE)); + _LoadVoidStorage(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_VOID_STORAGE)); // update items with duration and realtime UpdateItemDuration(time_diff, true); - _LoadActions(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADACTIONS)); + _LoadActions(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ACTIONS)); // unread mails and next delivery time, actual mails not loaded - _LoadMailInit(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADMAILCOUNT), holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADMAILDATE)); + _LoadMailInit(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_MAIL_COUNT), holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_MAIL_DATE)); - m_social = sSocialMgr->LoadFromDB(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADSOCIALLIST), GetGUIDLow()); + m_social = sSocialMgr->LoadFromDB(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_SOCIAL_LIST), GetGUIDLow()); // check PLAYER_CHOSEN_TITLE compatibility with PLAYER__FIELD_KNOWN_TITLES // note: PLAYER__FIELD_KNOWN_TITLES updated at quest status loaded @@ -17293,7 +17356,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) // has to be called after last Relocate() in Player::LoadFromDB SetFallInformation(0, GetPositionZ()); - _LoadSpellCooldowns(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADSPELLCOOLDOWNS)); + _LoadSpellCooldowns(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_SPELL_COOLDOWNS)); // Spell code allow apply any auras to dead character in load time in aura/spell/item loading // Do now before stats re-calculation cleanup for ghost state unexpected auras @@ -17400,11 +17463,11 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) if (m_grantableLevels > 0) SetByteValue(PLAYER_FIELD_BYTES, 1, 0x01); - _LoadDeclinedNames(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES)); + _LoadDeclinedNames(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_DECLINED_NAMES)); m_achievementMgr->CheckAllAchievementCriteria(this); - _LoadEquipmentSets(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS)); + _LoadEquipmentSets(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_EQUIPMENT_SETS)); _LoadCUFProfiles(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_CUF_PROFILES)); @@ -18297,6 +18360,29 @@ void Player::_LoadSeasonalQuestStatus(PreparedQueryResult result) m_SeasonalQuestChanged = false; } +void Player::_LoadMonthlyQuestStatus(PreparedQueryResult result) +{ + m_monthlyquests.clear(); + + if (result) + { + do + { + Field* fields = result->Fetch(); + uint32 quest_id = fields[0].GetUInt32(); + Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); + if (!quest) + continue; + + m_monthlyquests.insert(quest_id); + sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "Monthly quest {%u} cooldown for player (GUID: %u)", quest_id, GetGUIDLow()); + } + while (result->NextRow()); + } + + m_MonthlyQuestChanged = false; +} + void Player::_LoadSpells(PreparedQueryResult result) { //QueryResult* result = CharacterDatabase.PQuery("SELECT spell, active, disabled FROM character_spell WHERE guid = '%u'", GetGUIDLow()); @@ -19067,6 +19153,7 @@ void Player::SaveToDB(bool create /*=false*/) _SaveDailyQuestStatus(trans); _SaveWeeklyQuestStatus(trans); _SaveSeasonalQuestStatus(trans); + _SaveMonthlyQuestStatus(trans); _SaveTalents(trans); _SaveSpells(trans); _SaveSpellCooldowns(trans); @@ -19642,6 +19729,28 @@ void Player::_SaveSeasonalQuestStatus(SQLTransaction& trans) m_SeasonalQuestChanged = false; } +void Player::_SaveMonthlyQuestStatus(SQLTransaction& trans) +{ + if (!m_MonthlyQuestChanged || m_monthlyquests.empty()) + return; + + // we don't need transactions here. + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_QUEST_STATUS_MONTHLY_CHAR); + stmt->setUInt32(0, GetGUIDLow()); + trans->Append(stmt); + + for (QuestSet::const_iterator iter = m_monthlyquests.begin(); iter != m_monthlyquests.end(); ++iter) + { + uint32 quest_id = *iter; + stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHARACTER_MONTHLYQUESTSTATUS); + stmt->setUInt32(0, GetGUIDLow()); + stmt->setUInt32(1, quest_id); + trans->Append(stmt); + } + + m_MonthlyQuestChanged = false; +} + void Player::_SaveSkills(SQLTransaction& trans) { PreparedStatement* stmt = NULL; @@ -21428,7 +21537,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 if (count < 1) count = 1; // cheating attempt - if (slot > MAX_BAG_SIZE && slot !=NULL_SLOT) + if (slot > MAX_BAG_SIZE && slot != NULL_SLOT) return false; if (!isAlive()) @@ -22944,6 +23053,12 @@ void Player::SetSeasonalQuestStatus(uint32 quest_id) m_SeasonalQuestChanged = true; } +void Player::SetMonthlyQuestStatus(uint32 quest_id) +{ + m_monthlyquests.insert(quest_id); + m_MonthlyQuestChanged = true; +} + void Player::ResetDailyQuestStatus() { for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx) @@ -22977,6 +23092,16 @@ void Player::ResetSeasonalQuestStatus(uint16 event_id) m_SeasonalQuestChanged = false; } +void Player::ResetMonthlyQuestStatus() +{ + if (m_monthlyquests.empty()) + return; + + m_monthlyquests.clear(); + // DB data deleted in caller + m_MonthlyQuestChanged = false; +} + Battleground* Player::GetBattleground() const { if (GetBattlegroundId() == 0) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 7d2c057dd5a..cdeeb3aa9df 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -308,6 +308,16 @@ enum ActionButtonType ACTION_BUTTON_ITEM = 0x80 }; +enum ReputationSource +{ + REPUTATION_SOURCE_KILL, + REPUTATION_SOURCE_QUEST, + REPUTATION_SOURCE_DAILY_QUEST, + REPUTATION_SOURCE_WEEKLY_QUEST, + REPUTATION_SOURCE_MONTHLY_QUEST, + REPUTATION_SOURCE_SPELL +}; + #define ACTION_BUTTON_ACTION(X) (uint32(X) & 0x00FFFFFF) #define ACTION_BUTTON_TYPE(X) ((uint32(X) & 0xFF000000) >> 24) #define MAX_ACTION_BUTTON_ACTION_VALUE (0x00FFFFFF+1) @@ -876,41 +886,42 @@ enum PlayedTimeIndex // used at player loading query list preparing, and later result selection enum PlayerLoginQueryIndex { - PLAYER_LOGIN_QUERY_LOADFROM = 0, - PLAYER_LOGIN_QUERY_LOADGROUP = 1, - PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES = 2, - PLAYER_LOGIN_QUERY_LOADAURAS = 3, - PLAYER_LOGIN_QUERY_LOADSPELLS = 4, - PLAYER_LOGIN_QUERY_LOADQUESTSTATUS = 5, - PLAYER_LOGIN_QUERY_LOADDAILYQUESTSTATUS = 6, - PLAYER_LOGIN_QUERY_LOADREPUTATION = 7, - PLAYER_LOGIN_QUERY_LOADINVENTORY = 8, - PLAYER_LOGIN_QUERY_LOADACTIONS = 9, - PLAYER_LOGIN_QUERY_LOADMAILCOUNT = 10, - PLAYER_LOGIN_QUERY_LOADMAILDATE = 11, - PLAYER_LOGIN_QUERY_LOADSOCIALLIST = 12, - PLAYER_LOGIN_QUERY_LOADHOMEBIND = 13, - PLAYER_LOGIN_QUERY_LOADSPELLCOOLDOWNS = 14, - PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES = 15, - PLAYER_LOGIN_QUERY_LOADGUILD = 16, - PLAYER_LOGIN_QUERY_LOADARENAINFO = 17, - PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS = 18, - PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS = 19, - PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS = 20, - PLAYER_LOGIN_QUERY_LOADBGDATA = 21, - PLAYER_LOGIN_QUERY_LOADGLYPHS = 22, - PLAYER_LOGIN_QUERY_LOADTALENTS = 23, - PLAYER_LOGIN_QUERY_LOADACCOUNTDATA = 24, - PLAYER_LOGIN_QUERY_LOADSKILLS = 25, - PLAYER_LOGIN_QUERY_LOADWEEKLYQUESTSTATUS = 26, - PLAYER_LOGIN_QUERY_LOADRANDOMBG = 27, - PLAYER_LOGIN_QUERY_LOADBANNED = 28, - PLAYER_LOGIN_QUERY_LOADQUESTSTATUSREW = 29, - PLAYER_LOGIN_QUERY_LOADINSTANCELOCKTIMES = 30, - PLAYER_LOGIN_QUERY_LOADSEASONALQUESTSTATUS = 31, - PLAYER_LOGIN_QUERY_LOADVOIDSTORAGE = 32, - PLAYER_LOGIN_QUERY_LOADCURRENCY = 33, - PLAYER_LOGIN_QUERY_LOAD_CUF_PROFILES = 34, + PLAYER_LOGIN_QUERY_LOAD_FROM = 0, + PLAYER_LOGIN_QUERY_LOAD_GROUP = 1, + PLAYER_LOGIN_QUERY_LOAD_BOUND_INSTANCES = 2, + PLAYER_LOGIN_QUERY_LOAD_AURAS = 3, + PLAYER_LOGIN_QUERY_LOAD_SPELLS = 4, + PLAYER_LOGIN_QUERY_LOAD_QUEST_STATUS = 5, + PLAYER_LOGIN_QUERY_LOAD_DAILY_QUEST_STATUS = 6, + PLAYER_LOGIN_QUERY_LOAD_REPUTATION = 7, + PLAYER_LOGIN_QUERY_LOAD_INVENTORY = 8, + PLAYER_LOGIN_QUERY_LOAD_ACTIONS = 9, + PLAYER_LOGIN_QUERY_LOAD_MAIL_COUNT = 10, + PLAYER_LOGIN_QUERY_LOAD_MAIL_DATE = 11, + PLAYER_LOGIN_QUERY_LOAD_SOCIAL_LIST = 12, + PLAYER_LOGIN_QUERY_LOAD_HOME_BIND = 13, + PLAYER_LOGIN_QUERY_LOAD_SPELL_COOLDOWNS = 14, + PLAYER_LOGIN_QUERY_LOAD_DECLINED_NAMES = 15, + PLAYER_LOGIN_QUERY_LOAD_GUILD = 16, + PLAYER_LOGIN_QUERY_LOAD_ARENA_INFO = 17, + PLAYER_LOGIN_QUERY_LOAD_ACHIEVEMENTS = 18, + PLAYER_LOGIN_QUERY_LOAD_CRITERIA_PROGRESS = 19, + PLAYER_LOGIN_QUERY_LOAD_EQUIPMENT_SETS = 20, + PLAYER_LOGIN_QUERY_LOAD_BG_DATA = 21, + PLAYER_LOGIN_QUERY_LOAD_GLYPHS = 22, + PLAYER_LOGIN_QUERY_LOAD_TALENTS = 23, + PLAYER_LOGIN_QUERY_LOAD_ACCOUNT_DATA = 24, + PLAYER_LOGIN_QUERY_LOAD_SKILLS = 25, + PLAYER_LOGIN_QUERY_LOAD_WEEKLY_QUEST_STATUS = 26, + PLAYER_LOGIN_QUERY_LOAD_RANDOM_BG = 27, + PLAYER_LOGIN_QUERY_LOAD_BANNED = 28, + PLAYER_LOGIN_QUERY_LOAD_QUEST_STATUS_REW = 29, + PLAYER_LOGIN_QUERY_LOAD_INSTANCE_LOCK_TIMES = 30, + PLAYER_LOGIN_QUERY_LOAD_SEASONAL_QUEST_STATUS = 31, + PLAYER_LOGIN_QUERY_LOAD_MONTHLY_QUEST_STATUS = 32, + PLAYER_LOGIN_QUERY_LOAD_VOID_STORAGE = 33, + PLAYER_LOGIN_QUERY_LOAD_CURRENCY = 34, + PLAYER_LOGIN_QUERY_LOAD_CUF_PROFILES = 35, MAX_PLAYER_LOGIN_QUERY }; @@ -1606,6 +1617,7 @@ class Player : public Unit, public GridObject<Player> bool SatisfyQuestPrevChain(Quest const* qInfo, bool msg); bool SatisfyQuestDay(Quest const* qInfo, bool msg); bool SatisfyQuestWeek(Quest const* qInfo, bool msg); + bool SatisfyQuestMonth(Quest const* qInfo, bool msg); bool SatisfyQuestSeasonal(Quest const* qInfo, bool msg); bool GiveQuestSourceItem(Quest const* quest); bool TakeQuestSourceItem(uint32 questId, bool msg); @@ -1617,9 +1629,11 @@ class Player : public Unit, public GridObject<Player> void SetDailyQuestStatus(uint32 quest_id); void SetWeeklyQuestStatus(uint32 quest_id); + void SetMonthlyQuestStatus(uint32 quest_id); void SetSeasonalQuestStatus(uint32 quest_id); void ResetDailyQuestStatus(); void ResetWeeklyQuestStatus(); + void ResetMonthlyQuestStatus(); void ResetSeasonalQuestStatus(uint16 event_id); uint16 FindQuestSlot(uint32 quest_id) const; @@ -2246,6 +2260,8 @@ class Player : public Unit, public GridObject<Player> void RewardReputation(Unit* victim, float rate); void RewardReputation(Quest const* quest); + int32 CalculateReputationGain(ReputationSource source, uint32 creatureOrQuestLevel, int32 rep, int32 faction, bool noQuestBonus = false); + void UpdateSkillsForLevel(); void UpdateSkillsToMaxSkillsForLevel(); // for .levelup void ModifySkillBonus(uint32 skillid, int32 val, bool talent); @@ -2799,6 +2815,7 @@ class Player : public Unit, public GridObject<Player> typedef UNORDERED_MAP<uint32,SeasonalQuestSet> SeasonalEventQuestMap; QuestSet m_timedquests; QuestSet m_weeklyquests; + QuestSet m_monthlyquests; SeasonalEventQuestMap m_seasonalquests; uint64 m_divider; @@ -2821,6 +2838,7 @@ class Player : public Unit, public GridObject<Player> void _LoadQuestStatusRewarded(PreparedQueryResult result); void _LoadDailyQuestStatus(PreparedQueryResult result); void _LoadWeeklyQuestStatus(PreparedQueryResult result); + void _LoadMonthlyQuestStatus(PreparedQueryResult result); void _LoadSeasonalQuestStatus(PreparedQueryResult result); void _LoadRandomBGStatus(PreparedQueryResult result); void _LoadGroup(PreparedQueryResult result); @@ -2850,6 +2868,7 @@ class Player : public Unit, public GridObject<Player> void _SaveQuestStatus(SQLTransaction& trans); void _SaveDailyQuestStatus(SQLTransaction& trans); void _SaveWeeklyQuestStatus(SQLTransaction& trans); + void _SaveMonthlyQuestStatus(SQLTransaction& trans); void _SaveSeasonalQuestStatus(SQLTransaction& trans); void _SaveSkills(SQLTransaction& trans); void _SaveSpells(SQLTransaction& trans); @@ -2968,6 +2987,7 @@ class Player : public Unit, public GridObject<Player> bool m_DailyQuestChanged; bool m_WeeklyQuestChanged; + bool m_MonthlyQuestChanged; bool m_SeasonalQuestChanged; time_t m_lastDailyQuestTime; @@ -3049,7 +3069,6 @@ class Player : public Unit, public GridObject<Player> // know currencies are not removed at any point (0 displayed) void AddKnownCurrency(uint32 itemId); - int32 CalculateReputationGain(uint32 creatureOrQuestLevel, int32 rep, int32 faction, bool for_quest, bool noQuestBonus = false); void AdjustQuestReqItemCount(Quest const* quest, QuestStatusData& questStatusData); bool IsCanDelayTeleport() const { return m_bCanDelayTeleport; } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index e9d7338f8b9..f470862c890 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6990,7 +6990,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere //Glyph of Unholy Blight if (AuraEffect* glyph=GetAuraEffect(63332, 0)) AddPct(basepoints0, glyph->GetAmount()); - + basepoints0 = basepoints0 / (unholyBlight->GetMaxDuration() / unholyBlight->Effects[0].Amplitude); basepoints0 += victim->GetRemainingPeriodicAmount(GetGUID(), triggered_spell_id, SPELL_AURA_PERIODIC_DAMAGE); break; @@ -7509,7 +7509,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg case 40336: { // On successful melee or ranged attack gain $29471s1 mana and if possible drain $27526s1 mana from the target. - if (this && isAlive()) + if (isAlive()) CastSpell(this, 29471, true, castItem, triggeredByAura); if (victim && victim->isAlive()) CastSpell(victim, 27526, true, castItem, triggeredByAura); @@ -7520,7 +7520,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg { // Remove a Evasive Charge Aura* charge = GetAura(50241); - if (charge->ModStackAmount(-1, AURA_REMOVE_BY_ENEMY_SPELL)) + if (charge && charge->ModStackAmount(-1, AURA_REMOVE_BY_ENEMY_SPELL)) RemoveAurasDueToSpell(50240); } // Warrior - Vigilance, SPELLFAMILY_GENERIC diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 7ca6602eace..5cc304223e6 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -52,7 +52,6 @@ #include "World.h" ScriptMapMap sQuestEndScripts; -ScriptMapMap sQuestStartScripts; ScriptMapMap sSpellScripts; ScriptMapMap sGameObjectScripts; ScriptMapMap sEventScripts; @@ -64,7 +63,6 @@ std::string GetScriptsTableNameByType(ScriptsType type) switch (type) { case SCRIPTS_QUEST_END: res = "quest_end_scripts"; break; - case SCRIPTS_QUEST_START: res = "quest_start_scripts";break; case SCRIPTS_SPELL: res = "spell_scripts"; break; case SCRIPTS_GAMEOBJECT: res = "gameobject_scripts"; break; case SCRIPTS_EVENT: res = "event_scripts"; break; @@ -80,7 +78,6 @@ ScriptMapMap* GetScriptsMapByType(ScriptsType type) switch (type) { case SCRIPTS_QUEST_END: res = &sQuestEndScripts; break; - case SCRIPTS_QUEST_START: res = &sQuestStartScripts; break; case SCRIPTS_SPELL: res = &sSpellScripts; break; case SCRIPTS_GAMEOBJECT: res = &sGameObjectScripts; break; case SCRIPTS_EVENT: res = &sEventScripts; break; @@ -3470,8 +3467,8 @@ void ObjectMgr::LoadQuests() "DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4, DetailsEmoteDelay1, DetailsEmoteDelay2, DetailsEmoteDelay3, DetailsEmoteDelay4, EmoteOnIncomplete, EmoteOnComplete, " // 164 165 166 167 168 169 170 171 "OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4, OfferRewardEmoteDelay1, OfferRewardEmoteDelay2, OfferRewardEmoteDelay3, OfferRewardEmoteDelay4, " - // 172 173 174 - "StartScript, CompleteScript, WDBVerified" + // 173 174 + "CompleteScript, WDBVerified" " FROM quest_template"); if (!result) { @@ -3538,6 +3535,15 @@ void ObjectMgr::LoadQuests() } } + if (qinfo->Flags & QUEST_SPECIAL_FLAGS_MONTHLY) + { + if (!(qinfo->Flags & QUEST_SPECIAL_FLAGS_REPEATABLE)) + { + sLog->outError(LOG_FILTER_SQL, "Monthly quest %u not marked as repeatable in `SpecialFlags`, added.", qinfo->GetQuestId()); + qinfo->Flags |= QUEST_SPECIAL_FLAGS_REPEATABLE; + } + } + if (qinfo->Flags & QUEST_FLAGS_AUTO_REWARDED) { // at auto-reward can be rewarded only RewardChoiceItemId[0] @@ -4632,18 +4638,6 @@ void ObjectMgr::LoadQuestEndScripts() } } -void ObjectMgr::LoadQuestStartScripts() -{ - LoadScripts(SCRIPTS_QUEST_START); - - // check ids - for (ScriptMapMap::const_iterator itr = sQuestStartScripts.begin(); itr != sQuestStartScripts.end(); ++itr) - { - if (!GetQuestTemplate(itr->first)) - sLog->outError(LOG_FILTER_SQL, "Table `quest_start_scripts` has not existing quest (Id: %u) as script id", itr->first); - } -} - void ObjectMgr::LoadSpellScripts() { LoadScripts(SCRIPTS_SPELL); @@ -6607,13 +6601,11 @@ void ObjectMgr::LoadReputationRewardRate() _repRewardRateStore.clear(); // for reload case - uint32 count = 0; // 0 1 2 3 - QueryResult result = WorldDatabase.Query("SELECT faction, quest_rate, creature_rate, spell_rate FROM reputation_reward_rate"); - + uint32 count = 0; // 0 1 2 3 4 5 6 + QueryResult result = WorldDatabase.Query("SELECT faction, quest_rate, quest_daily_rate, quest_weekly_rate, quest_monthly_rate, creature_rate, spell_rate FROM reputation_reward_rate"); if (!result) { sLog->outError(LOG_FILTER_SQL, ">> Loaded `reputation_reward_rate`, table is empty!"); - return; } @@ -6621,13 +6613,16 @@ void ObjectMgr::LoadReputationRewardRate() { Field* fields = result->Fetch(); - uint32 factionId = fields[0].GetUInt32(); + uint32 factionId = fields[0].GetUInt32(); RepRewardRate repRate; - repRate.quest_rate = fields[1].GetFloat(); - repRate.creature_rate = fields[2].GetFloat(); - repRate.spell_rate = fields[3].GetFloat(); + repRate.questRate = fields[1].GetFloat(); + repRate.questDailyRate = fields[2].GetFloat(); + repRate.questWeeklyRate = fields[3].GetFloat(); + repRate.questMonthlyRate = fields[4].GetFloat(); + repRate.creatureRate = fields[5].GetFloat(); + repRate.spellRate = fields[6].GetFloat(); FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionId); if (!factionEntry) @@ -6636,21 +6631,39 @@ void ObjectMgr::LoadReputationRewardRate() continue; } - if (repRate.quest_rate < 0.0f) + if (repRate.questRate < 0.0f) + { + sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has quest_rate with invalid rate %f, skipping data for faction %u", repRate.questRate, factionId); + continue; + } + + if (repRate.questDailyRate < 0.0f) + { + sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has quest_daily_rate with invalid rate %f, skipping data for faction %u", repRate.questDailyRate, factionId); + continue; + } + + if (repRate.questWeeklyRate < 0.0f) + { + sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has quest_weekly_rate with invalid rate %f, skipping data for faction %u", repRate.questWeeklyRate, factionId); + continue; + } + + if (repRate.questMonthlyRate < 0.0f) { - sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has quest_rate with invalid rate %f, skipping data for faction %u", repRate.quest_rate, factionId); + sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has quest_monthly_rate with invalid rate %f, skipping data for faction %u", repRate.questMonthlyRate, factionId); continue; } - if (repRate.creature_rate < 0.0f) + if (repRate.creatureRate < 0.0f) { - sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has creature_rate with invalid rate %f, skipping data for faction %u", repRate.creature_rate, factionId); + sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has creature_rate with invalid rate %f, skipping data for faction %u", repRate.creatureRate, factionId); continue; } - if (repRate.spell_rate < 0.0f) + if (repRate.spellRate < 0.0f) { - sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has spell_rate with invalid rate %f, skipping data for faction %u", repRate.spell_rate, factionId); + sLog->outError(LOG_FILTER_SQL, "Table reputation_reward_rate has spell_rate with invalid rate %f, skipping data for faction %u", repRate.spellRate, factionId); continue; } diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index ae1c8449275..a822ac7752c 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -128,7 +128,6 @@ enum ScriptsType SCRIPTS_FIRST = 1, SCRIPTS_QUEST_END = SCRIPTS_FIRST, - SCRIPTS_QUEST_START, SCRIPTS_SPELL, SCRIPTS_GAMEOBJECT, SCRIPTS_EVENT, @@ -363,7 +362,6 @@ typedef std::map<uint32, ScriptMap > ScriptMapMap; typedef std::multimap<uint32, uint32> SpellScriptsContainer; typedef std::pair<SpellScriptsContainer::iterator, SpellScriptsContainer::iterator> SpellScriptsBounds; extern ScriptMapMap sQuestEndScripts; -extern ScriptMapMap sQuestStartScripts; extern ScriptMapMap sSpellScripts; extern ScriptMapMap sGameObjectScripts; extern ScriptMapMap sEventScripts; @@ -464,9 +462,12 @@ typedef UNORDERED_MAP<uint8, MailLevelRewardList> MailLevelRewardContainer; // We assume the rate is in general the same for all three types below, but chose to keep three for scalability and customization struct RepRewardRate { - float quest_rate; // We allow rate = 0.0 in database. For this case, it means that - float creature_rate; // no reputation are given at all for this faction/rate type. - float spell_rate; + float questRate; // We allow rate = 0.0 in database. For this case, it means that + float questDailyRate; + float questWeeklyRate; + float questMonthlyRate; + float creatureRate; // no reputation are given at all for this faction/rate type. + float spellRate; }; struct ReputationOnKillEntry @@ -858,7 +859,6 @@ class ObjectMgr void LoadGameObjectScripts(); void LoadQuestEndScripts(); - void LoadQuestStartScripts(); void LoadEventScripts(); void LoadSpellScripts(); void LoadWaypointScripts(); diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index d1a93b552c6..06368f6924e 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -71,103 +71,107 @@ bool LoginQueryHolder::Initialize() stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADFROM, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_FROM, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GROUP_MEMBER); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADGROUP, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_GROUP, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_INSTANCE); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_BOUND_INSTANCES, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_AURAS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADAURAS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_AURAS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_SPELL); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADSPELLS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_SPELLS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_QUESTSTATUS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADQUESTSTATUS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_QUEST_STATUS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_DAILYQUESTSTATUS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADDAILYQUESTSTATUS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_DAILY_QUEST_STATUS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_WEEKLYQUESTSTATUS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADWEEKLYQUESTSTATUS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_WEEKLY_QUEST_STATUS, stmt); + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_MONTHLYQUESTSTATUS); + stmt->setUInt32(0, lowGuid); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_MONTHLY_QUEST_STATUS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_SEASONALQUESTSTATUS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADSEASONALQUESTSTATUS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_SEASONAL_QUEST_STATUS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_REPUTATION); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADREPUTATION, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_REPUTATION, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_INVENTORY); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADINVENTORY, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_INVENTORY, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_VOID_STORAGE); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADVOIDSTORAGE, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_VOID_STORAGE, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_ACTIONS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADACTIONS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_ACTIONS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_MAILCOUNT); stmt->setUInt32(0, lowGuid); stmt->setUInt64(1, uint64(time(NULL))); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADMAILCOUNT, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_MAIL_COUNT, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_MAILDATE); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADMAILDATE, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_MAIL_DATE, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_SOCIALLIST); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADSOCIALLIST, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_SOCIAL_LIST, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_HOMEBIND); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADHOMEBIND, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_HOME_BIND, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_SPELLCOOLDOWNS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADSPELLCOOLDOWNS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_SPELL_COOLDOWNS, stmt); if (sWorld->getBoolConfig(CONFIG_DECLINED_NAMES_USED)) { stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_DECLINEDNAMES); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_DECLINED_NAMES, stmt); } stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUILD_MEMBER); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADGUILD, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_GUILD, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_ARENAINFO); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADARENAINFO, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_ARENA_INFO, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_ACHIEVEMENTS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_ACHIEVEMENTS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_CRITERIAPROGRESS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_CRITERIA_PROGRESS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_EQUIPMENTSETS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_EQUIPMENT_SETS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_CUF_PROFILES); stmt->setUInt32(0, lowGuid); @@ -175,43 +179,43 @@ bool LoginQueryHolder::Initialize() stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_BGDATA); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADBGDATA, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_BG_DATA, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_GLYPHS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADGLYPHS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_GLYPHS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_TALENTS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADTALENTS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_TALENTS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PLAYER_ACCOUNT_DATA); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADACCOUNTDATA, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_ACCOUNT_DATA, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_SKILLS); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADSKILLS, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_SKILLS, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_RANDOMBG); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADRANDOMBG, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_RANDOM_BG, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_BANNED); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADBANNED, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_BANNED, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_QUESTSTATUSREW); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADQUESTSTATUSREW, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_QUEST_STATUS_REW, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_ACCOUNT_INSTANCELOCKTIMES); stmt->setUInt32(0, m_accountId); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADINSTANCELOCKTIMES, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_INSTANCE_LOCK_TIMES, stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PLAYER_CURRENCY); stmt->setUInt32(0, lowGuid); - res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOADCURRENCY, stmt); + res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_CURRENCY, stmt); return res; } @@ -708,6 +712,7 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData) return; uint32 accountId = 0; + uint8 level = 0; std::string name; // is guild leader @@ -728,14 +733,15 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData) return; } - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_ACCOUNT_NAME_BY_GUID); + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_DATA_BY_GUID); stmt->setUInt32(0, GUID_LOPART(guid)); if (PreparedQueryResult result = CharacterDatabase.Query(stmt)) { Field* fields = result->Fetch(); - accountId = fields[0].GetUInt32(); - name = fields[1].GetString(); + accountId = fields[0].GetUInt32(); + name = fields[1].GetString(); + level = fields[2].GetUInt8(); } // prevent deleting other players' characters using cheating tools @@ -743,7 +749,7 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData) return; std::string IP_str = GetRemoteAddress(); - sLog->outInfo(LOG_FILTER_CHARACTER, "Account: %d (IP: %s) Delete Character:[%s] (GUID: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), GUID_LOPART(guid)); + sLog->outInfo(LOG_FILTER_CHARACTER, "Account: %d, IP: %s deleted character: %s, GUID: %u, Level: %u", accountId, IP_str.c_str(), name.c_str(), GUID_LOPART(guid), level); sScriptMgr->OnPlayerDelete(guid); sWorld->DeleteCharacterNameData(GUID_LOPART(guid)); @@ -751,12 +757,12 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData) { std::string dump; if (PlayerDumpWriter().GetDump(GUID_LOPART(guid), dump)) - sLog->outCharDump(dump.c_str(), GetAccountId(), GUID_LOPART(guid), name.c_str()); + sLog->outCharDump(dump.c_str(), accountId, GUID_LOPART(guid), name.c_str()); } sGuildFinderMgr->RemoveAllMembershipRequestsFromPlayer(guid); sCalendarMgr->RemoveAllPlayerEventsAndInvites(guid); - Player::DeleteFromDB(guid, GetAccountId()); + Player::DeleteFromDB(guid, accountId); WorldPacket data(SMSG_CHAR_DELETE, 1); data << uint8(CHAR_DELETE_SUCCESS); @@ -855,7 +861,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) SendPacket(&data); // load player specific part before send times - LoadAccountData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADACCOUNTDATA), PER_CHARACTER_CACHE_MASK); + LoadAccountData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ACCOUNT_DATA), PER_CHARACTER_CACHE_MASK); SendAccountDataTimes(PER_CHARACTER_CACHE_MASK); bool featureBit4 = true; @@ -927,7 +933,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) } //QueryResult* result = CharacterDatabase.PQuery("SELECT guildid, rank FROM guild_member WHERE guid = '%u'", pCurrChar->GetGUIDLow()); - if (PreparedQueryResult resultGuild = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADGUILD)) + if (PreparedQueryResult resultGuild = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GUILD)) { Field* fields = resultGuild->Fetch(); pCurrChar->SetInGuild(fields[0].GetUInt32()); diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index bffad4b84c2..1f017d77163 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -528,9 +528,7 @@ void WorldSession::HandleSellItemOpcode(WorldPacket& recvData) // special case at auto sell (sell all) if (count == 0) - { count = pItem->GetCount(); - } else { // prevent sell more items that exist in stack (possible only not from client) @@ -776,6 +774,13 @@ void WorldSession::SendListInventory(uint64 vendorGuid) continue; } + ConditionList conditions = sConditionMgr->GetConditionsForNpcVendorEvent(vendor->GetEntry(), vendorItem->item); + if (!sConditionMgr->IsObjectMeetToConditions(_player, vendor, conditions)) + { + sLog->outDebug(LOG_FILTER_CONDITIONSYS, "SendListInventory: conditions not met for creature entry %u item %u", vendor->GetEntry(), vendorItem->item); + continue; + } + int32 price = vendorItem->IsGoldRequired(itemTemplate) ? uint32(floor(itemTemplate->BuyPrice * discountMod)) : 0; if (int32 priceMod = _player->GetTotalAuraModifier(SPELL_AURA_MOD_VENDOR_ITEMS_PRICES)) diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 5fa219dd2a4..c413fdaa4fc 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -148,7 +148,7 @@ void WorldSession::HandleLfgSetBootVoteOpcode(WorldPacket& recvData) uint64 guid = GetPlayer()->GetGUID(); sLog->outDebug(LOG_FILTER_LFG, "CMSG_LFG_SET_BOOT_VOTE %s agree: %u", GetPlayerInfo().c_str(), agree ? 1 : 0); - sLFGMgr->UpdateBoot(guid, agree ? LFG_ANSWER_AGREE : LFG_ANSWER_DENY); + sLFGMgr->UpdateBoot(guid, agree); } void WorldSession::HandleLfgTeleportOpcode(WorldPacket& recvData) diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 320712c074e..3e84ab5151c 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -655,7 +655,7 @@ void WorldSession::HandleGetMailList(WorldPacket& recvData) data << uint32((*itr)->stationery); // stationery (Stationery.dbc) data << uint64((*itr)->money); // Gold data << uint32((*itr)->checked); // flags - data << float(((*itr)->expire_time-time(NULL))/DAY); // Time + data << float(float((*itr)->expire_time-time(NULL))/DAY); // Time data << uint32((*itr)->mailTemplateId); // mail template (MailTemplate.dbc) data << (*itr)->subject; // Subject string - once 00, when mail type = 3, max 256 data << (*itr)->body; // message? max 8000 diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 1f6b3e42428..9e149903199 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1098,7 +1098,7 @@ bool GridMap::loadData(char *filename) return false; } // loadup height data - if (header.heightMapOffset && !loadHeihgtData(in, header.heightMapOffset, header.heightMapSize)) + if (header.heightMapOffset && !loadHeightData(in, header.heightMapOffset, header.heightMapSize)) { sLog->outError(LOG_FILTER_MAPS, "Error loading map height data\n"); fclose(in); @@ -1154,7 +1154,7 @@ bool GridMap::loadAreaData(FILE* in, uint32 offset, uint32 /*size*/) return true; } -bool GridMap::loadHeihgtData(FILE* in, uint32 offset, uint32 /*size*/) +bool GridMap::loadHeightData(FILE* in, uint32 offset, uint32 /*size*/) { map_heightHeader header; fseek(in, offset, SEEK_SET); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index e3fa1ac6ae4..141dffb0a5c 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -176,7 +176,7 @@ class GridMap bool loadAreaData(FILE* in, uint32 offset, uint32 size); - bool loadHeihgtData(FILE* in, uint32 offset, uint32 size); + bool loadHeightData(FILE* in, uint32 offset, uint32 size); bool loadLiquidData(FILE* in, uint32 offset, uint32 size); // Get height functions and pointers diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 6aa9500b998..d9c8b480c6f 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -166,10 +166,9 @@ Quest::Quest(Field* questRecord) for (int i = 0; i < QUEST_EMOTE_COUNT; ++i) OfferRewardEmoteDelay[i] = questRecord[168+i].GetInt32(); - StartScript = questRecord[172].GetUInt32(); - CompleteScript = questRecord[173].GetUInt32(); + CompleteScript = questRecord[172].GetUInt32(); - // int32 WDBVerified = questRecord[174].GetInt32(); + // int32 WDBVerified = questRecord[173].GetInt32(); if (SpecialFlags & QUEST_SPECIAL_FLAGS_AUTO_ACCEPT) Flags |= QUEST_FLAGS_AUTO_ACCEPT; diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index c540e4a669d..086dab4a284 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -124,7 +124,7 @@ enum __QuestGiverStatus DIALOG_STATUS_REWARD = 0x400 // yellow dot on minimap }; -enum __QuestFlags +enum QuestFlags { // Flags used at server and sent to client QUEST_FLAGS_NONE = 0x00000000, @@ -165,7 +165,7 @@ enum __QuestSpecialFlags QUEST_SPECIAL_FLAGS_EXPLORATION_OR_EVENT = 0x002, // if required area explore, spell SPELL_EFFECT_QUEST_COMPLETE casting, table `*_script` command SCRIPT_COMMAND_QUEST_EXPLORED use, set from script) QUEST_SPECIAL_FLAGS_AUTO_ACCEPT = 0x004, // quest is to be auto-accepted. QUEST_SPECIAL_FLAGS_DF_QUEST = 0x008, // quest is used by Dungeon Finder. - + QUEST_SPECIAL_FLAGS_MONTHLY = 0x010, // quest is reset at the begining of the month // room for more custom flags QUEST_SPECIAL_FLAGS_DB_ALLOWED = QUEST_SPECIAL_FLAGS_REPEATABLE | QUEST_SPECIAL_FLAGS_EXPLORATION_OR_EVENT | QUEST_SPECIAL_FLAGS_AUTO_ACCEPT | QUEST_SPECIAL_FLAGS_DF_QUEST, @@ -274,7 +274,6 @@ class Quest uint32 GetSoundTurnIn() const { return SoundTurnIn; } uint32 GetIncompleteEmote() const { return EmoteOnIncomplete; } uint32 GetCompleteEmote() const { return EmoteOnComplete; } - uint32 GetQuestStartScript() const { return StartScript; } uint32 GetQuestCompleteScript() const { return CompleteScript; } bool IsRepeatable() const { return SpecialFlags & QUEST_SPECIAL_FLAGS_REPEATABLE; } bool IsAutoAccept() const; @@ -289,6 +288,7 @@ class Quest uint32 GetQuestTurnInPortrait() const { return QuestTurnInPortrait; } bool IsDaily() const { return Flags & QUEST_FLAGS_DAILY; } bool IsWeekly() const { return Flags & QUEST_FLAGS_WEEKLY; } + bool IsMonthly() const { return Flags & QUEST_SPECIAL_FLAGS_MONTHLY; } bool IsSeasonal() const { return (ZoneOrSort == -QUEST_SORT_SEASONAL || ZoneOrSort == -QUEST_SORT_SPECIAL || ZoneOrSort == -QUEST_SORT_LUNAR_FESTIVAL || ZoneOrSort == -QUEST_SORT_MIDSUMMER || ZoneOrSort == -QUEST_SORT_BREWFEST || ZoneOrSort == -QUEST_SORT_LOVE_IS_IN_THE_AIR || ZoneOrSort == -QUEST_SORT_NOBLEGARDEN) && !IsRepeatable(); } bool IsDailyOrWeekly() const { return Flags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); } bool IsRaidQuest() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; } @@ -402,7 +402,6 @@ class Quest uint32 PointOption; uint32 EmoteOnIncomplete; uint32 EmoteOnComplete; - uint32 StartScript; uint32 CompleteScript; // new in 4.x uint32 MinimapTargetMark; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index f1ab2df2be6..6efeb061448 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -3548,6 +3548,26 @@ void AuraEffect::HandleModMechanicImmunity(AuraApplication const* aurApp, uint8 switch (GetId()) { + case 34471: // The Beast Within + case 19574: // Bestial Wrath + mechanic = IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK; + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_CHARM, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_DISORIENTED, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_FEAR, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_ROOT, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_SLEEP, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_SNARE, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_STUN, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_FREEZE, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_KNOCKOUT, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_POLYMORPH, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_BANISH, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_SHACKLE, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_TURN, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_HORROR, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_DAZE, apply); + target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_SAPPED, apply); + break; case 42292: // PvP trinket case 59752: // Every Man for Himself mechanic = IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK; @@ -3559,28 +3579,6 @@ void AuraEffect::HandleModMechanicImmunity(AuraApplication const* aurApp, uint8 target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_ROOT, apply); target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_STUN, apply); break; - case 34471: // The Beast Within - case 19574: // Bestial Wrath - mechanic = (1 << MECHANIC_SNARE) | (1 << MECHANIC_ROOT) - | (1 << MECHANIC_FEAR) | (1 << MECHANIC_STUN) - | (1 << MECHANIC_SLEEP) | (1 << MECHANIC_CHARM) - | (1 << MECHANIC_SAPPED) | (1 << MECHANIC_HORROR) - | (1 << MECHANIC_POLYMORPH) | (1 << MECHANIC_DISORIENTED) - | (1 << MECHANIC_FREEZE) | (1 << MECHANIC_TURN); - - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_SNARE, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_ROOT, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_FEAR, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_STUN, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_SLEEP, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_CHARM, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_SAPPED, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_HORROR, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_POLYMORPH, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_DISORIENTED, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_FREEZE, apply); - target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, MECHANIC_TURN, apply); - break; default: if (GetMiscValue() < 1) return; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index b38d5f085b6..63198fd39aa 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5631,7 +5631,7 @@ SpellCastResult Spell::CheckCasterAuras() const dispel_immune |= SpellInfo::GetDispelMask(DispelType(m_spellInfo->Effects[i].MiscValue)); } // immune movement impairment and loss of control - if (m_spellInfo->Id == 42292 || m_spellInfo->Id == 59752) + if (m_spellInfo->Id == 42292 || m_spellInfo->Id == 59752 || m_spellInfo->Id == 19574) mechanic_immune = IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK; } diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 94cd924681e..57993ecdc08 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4704,25 +4704,17 @@ void Spell::EffectReputation(SpellEffIndex effIndex) Player* player = unitTarget->ToPlayer(); - int32 rep_change = damage; + int32 repChange = damage; - uint32 faction_id = m_spellInfo->Effects[effIndex].MiscValue; - - FactionEntry const* factionEntry = sFactionStore.LookupEntry(faction_id); + uint32 factionId = m_spellInfo->Effects[effIndex].MiscValue; + FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionId); if (!factionEntry) return; - if (RepRewardRate const* repData = sObjectMgr->GetRepRewardRate(faction_id)) - { - rep_change = int32((float)rep_change * repData->spell_rate); - } - - // Bonus from spells that increase reputation gain - float bonus = rep_change * player->GetTotalAuraModifier(SPELL_AURA_MOD_REPUTATION_GAIN) / 100.0f; // 10% - rep_change += (int32)bonus; + repChange = player->CalculateReputationGain(REPUTATION_SOURCE_SPELL, 0, repChange, factionId); - player->GetReputationMgr().ModifyReputation(factionEntry, rep_change); + player->GetReputationMgr().ModifyReputation(factionEntry, repChange); } void Spell::EffectQuestComplete(SpellEffIndex effIndex) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 38e2155ba4a..76fc8c18e79 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2440,7 +2440,6 @@ void SpellMgr::LoadSpellAreas() // 0 1 2 3 4 5 6 7 8 9 QueryResult result = WorldDatabase.Query("SELECT spell, area, quest_start, quest_start_status, quest_end_status, quest_end, aura_spell, racemask, gender, autocast FROM spell_area"); - if (!result) { sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 spell area requirements. DB table `spell_area` is empty."); @@ -3342,6 +3341,13 @@ void SpellMgr::LoadDbcDataCorrections() case 70650: // Death Knight T10 Tank 2P Bonus spellInfo->EffectApplyAuraName[0] = SPELL_AURA_ADD_PCT_MODIFIER; break; + case 71838: // Drain Life - Bryntroll Normal + case 71839: // Drain Life - Bryntroll Heroic + spellInfo->AttributesEx2 |= SPELL_ATTR2_CANT_CRIT; + break; + case 34471: // The Beast Within + spellInfo->AttributesEx5 |= SPELL_ATTR5_USABLE_WHILE_CONFUSED | SPELL_ATTR5_USABLE_WHILE_FEARED | SPELL_ATTR5_USABLE_WHILE_STUNNED; + break; // ULDUAR SPELLS // case 62374: // Pursued (Flame Leviathan) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index fa813f454e5..1ee10399398 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1698,7 +1698,6 @@ void World::SetInitialWorldSettings() LoadAutobroadcasts(); ///- Load and initialize scripts - sObjectMgr->LoadQuestStartScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate sObjectMgr->LoadQuestEndScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate sObjectMgr->LoadSpellScripts(); // must be after load Creature/Gameobject(Template/Data) sObjectMgr->LoadGameObjectScripts(); // must be after load Creature/Gameobject(Template/Data) @@ -1818,6 +1817,9 @@ void World::SetInitialWorldSettings() sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Calculate next weekly quest reset time..."); InitWeeklyQuestResetTime(); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Calculate next monthly quest reset time..."); + InitMonthlyQuestResetTime(); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Calculate random battleground reset time..."); InitRandomBGResetTime(); @@ -1978,9 +1980,14 @@ void World::Update(uint32 diff) m_NextDailyQuestReset += DAY; } + /// Handle weekly quests reset time if (m_gameTime > m_NextWeeklyQuestReset) ResetWeeklyQuests(); + /// Handle monthly quests reset time + if (m_gameTime > m_NextMonthlyQuestReset) + ResetMonthlyQuests(); + if (m_gameTime > m_NextRandomBGReset) ResetRandomBG(); @@ -2783,6 +2790,13 @@ void World::InitDailyQuestResetTime() m_NextDailyQuestReset = (curTime >= curDayResetTime) ? curDayResetTime + DAY : curDayResetTime; } +void World::InitMonthlyQuestResetTime() +{ + time_t wstime = uint64(sWorld->getWorldState(WS_MONTHLY_QUEST_RESET_TIME)); + time_t curtime = time(NULL); + m_NextMonthlyQuestReset = wstime < curtime ? curtime : time_t(wstime); +} + void World::InitRandomBGResetTime() { time_t bgtime = uint64(sWorld->getWorldState(WS_BG_DAILY_RESET_TIME)); @@ -2914,6 +2928,8 @@ void World::SetPlayerSecurityLimit(AccountTypes _sec) void World::ResetWeeklyQuests() { + sLog->outInfo(LOG_FILTER_GENERAL, "Weekly quests reset for all characters."); + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_QUEST_STATUS_WEEKLY); CharacterDatabase.Execute(stmt); @@ -2928,6 +2944,57 @@ void World::ResetWeeklyQuests() sPoolMgr->ChangeWeeklyQuests(); } +void World::ResetMonthlyQuests() +{ + sLog->outInfo(LOG_FILTER_GENERAL, "Monthly quests reset for all characters."); + + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_QUEST_STATUS_MONTHLY); + CharacterDatabase.Execute(stmt); + + for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr) + if (itr->second->GetPlayer()) + itr->second->GetPlayer()->ResetMonthlyQuestStatus(); + + time_t mostRecentQuestTime = 0; + + // generate time + time_t curTime = time(NULL); + tm localTm = *localtime(&curTime); + + int month = localTm.tm_mon; + int year = localTm.tm_year; + + ++month; + + // month 11 is december, next is january (0) + if (month > 11) + { + month = 0; + year += 1; + } + + // reset time for next month + localTm.tm_year = year; + localTm.tm_mon = month; + localTm.tm_mday = 1; // don't know if we really need config option for day / hour + localTm.tm_hour = 0; + localTm.tm_min = 0; + localTm.tm_sec = 0; + + time_t nextMonthResetTime = mktime(&localTm); + + // last reset time before current moment + time_t resetTime = (curTime < nextMonthResetTime) ? nextMonthResetTime - MONTH : nextMonthResetTime; + + // need reset (if we have quest time before last reset time (not processed by some reason) + if (mostRecentQuestTime && mostRecentQuestTime <= resetTime) + m_NextMonthlyQuestReset = mostRecentQuestTime; + else // plan next reset time + m_NextMonthlyQuestReset = (curTime >= nextMonthResetTime) ? nextMonthResetTime + MONTH : nextMonthResetTime; + + sWorld->setWorldState(WS_MONTHLY_QUEST_RESET_TIME, uint64(m_NextMonthlyQuestReset)); +} + void World::ResetEventSeasonalQuests(uint16 event_id) { PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_QUEST_STATUS_SEASONAL); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index f187f302bea..505ccd939c6 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -489,6 +489,7 @@ enum WorldStates { WS_WEEKLY_QUEST_RESET_TIME = 20002, // Next weekly reset time WS_BG_DAILY_RESET_TIME = 20003, // Next daily BG reset time + WS_MONTHLY_QUEST_RESET_TIME = 20004, // Next monthly reset time WS_GUILD_DAILY_RESET_TIME = 20006, // Next guild cap reset time WS_GUILD_WEEKLY_RESET_TIME = 20007, // Next guild week reset time }; @@ -764,11 +765,13 @@ class World void InitDailyQuestResetTime(); void InitWeeklyQuestResetTime(); + void InitMonthlyQuestResetTime(); void InitRandomBGResetTime(); void InitGuildResetTime(); void InitCurrencyResetTime(); void ResetDailyQuests(); void ResetWeeklyQuests(); + void ResetMonthlyQuests(); void ResetRandomBG(); void ResetGuildCap(); void ResetCurrencyWeekCap(); @@ -831,6 +834,7 @@ class World // scheduled reset times time_t m_NextDailyQuestReset; time_t m_NextWeeklyQuestReset; + time_t m_NextMonthlyQuestReset; time_t m_NextRandomBGReset; time_t m_NextGuildReset; time_t m_NextCurrencyReset; diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index aa03fb217e1..e8998e8db30 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -123,7 +123,6 @@ public: { "prospecting_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesProspectingCommand, "", NULL }, { "quest_end_scripts", SEC_ADMINISTRATOR, true, &HandleReloadQuestEndScriptsCommand, "", NULL }, { "quest_poi", SEC_ADMINISTRATOR, true, &HandleReloadQuestPOICommand, "", NULL }, - { "quest_start_scripts", SEC_ADMINISTRATOR, true, &HandleReloadQuestStartScriptsCommand, "", NULL }, { "quest_template", SEC_ADMINISTRATOR, true, &HandleReloadQuestTemplateCommand, "", NULL }, { "reference_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesReferenceCommand, "", NULL }, { "reserved_name", SEC_ADMINISTRATOR, true, &HandleReloadReservedNameCommand, "", NULL }, @@ -259,7 +258,6 @@ public: HandleReloadGameObjectScriptsCommand(handler, "a"); HandleReloadEventScriptsCommand(handler, "a"); HandleReloadQuestEndScriptsCommand(handler, "a"); - HandleReloadQuestStartScriptsCommand(handler, "a"); HandleReloadSpellScriptsCommand(handler, "a"); handler->SendGlobalGMSysMessage("DB tables `*_scripts` reloaded."); HandleReloadDbScriptStringCommand(handler, "a"); @@ -1028,26 +1026,6 @@ public: return true; } - static bool HandleReloadQuestStartScriptsCommand(ChatHandler* handler, const char* args) - { - if (sScriptMgr->IsScriptScheduled()) - { - handler->SendSysMessage("DB scripts used currently, please attempt reload later."); - handler->SetSentErrorMessage(true); - return false; - } - - if (*args != 'a') - sLog->outInfo(LOG_FILTER_GENERAL, "Re-Loading Scripts from `quest_start_scripts`..."); - - sObjectMgr->LoadQuestStartScripts(); - - if (*args != 'a') - handler->SendGlobalGMSysMessage("DB table `quest_start_scripts` reloaded."); - - return true; - } - static bool HandleReloadSpellScriptsCommand(ChatHandler* handler, const char* args) { if (sScriptMgr->IsScriptScheduled()) diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index 577516383b2..f4a9fcb5060 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -78,7 +78,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 9cc515c1b0d..959f8a3f690 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -192,8 +192,8 @@ public: enum Morridune { - SAY_MORRIDUNE_1 = -1048003, - SAY_MORRIDUNE_2 = -1048004 + SAY_MORRIDUNE_1 = 0, + SAY_MORRIDUNE_2 = 1 }; class npc_morridune : public CreatureScript @@ -231,7 +231,7 @@ public: { npc_morriduneAI(Creature* creature) : npc_escortAI(creature) { - DoScriptText(SAY_MORRIDUNE_1, creature); + creature->AI()->Talk(SAY_MORRIDUNE_1); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); Start(false, false, 0); } @@ -245,7 +245,7 @@ public: me->SetOrientation(1.775791f); me->SendMovementFlagUpdate(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - DoScriptText(SAY_MORRIDUNE_2, me); + Talk(SAY_MORRIDUNE_2); break; } } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 1c754b78672..0a4779508e9 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -21,16 +21,12 @@ enum Spells { - SPELL_MIND_BLAST = 15587, - SPELL_SLEEP = 8399, -}; + SPELL_MIND_BLAST = 15587, + SPELL_SLEEP = 8399, -//Id's from ACID -enum Yells -{ - SAY_AGGRO = -1048002, - SAY_SLEEP = -1048001, - SAY_DEATH = -1048000 + SAY_AGGRO = 0, + SAY_SLEEP = 1, + SAY_DEATH = 2 }; class boss_kelris : public CreatureScript @@ -65,14 +61,14 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_KELRIS, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_KELRIS, DONE); } @@ -92,7 +88,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoScriptText(SAY_SLEEP, me); + Talk(SAY_SLEEP); DoCast(target, SPELL_SLEEP); } sleepTimer = urand(15000, 20000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index aa41fa992dc..70c5bc8b986 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -619,42 +619,6 @@ uint32 hyjalAI::GetInstanceData(uint32 Event) return 0; } -void hyjalAI::Talk(uint32 id) -{ - std::list<uint8> index; - for (uint8 i = 0; i < 9; ++i) - { - if (Faction == 0) // Alliance - { - if (JainaQuotes[i].id == id) - index.push_back(i); - } - else if (Faction == 1) // Horde - { - if (ThrallQuotes[i].id == id) - index.push_back(i); - } - } - - if (index.empty()) - return; // No quotes found, no use to continue - - uint8 ind = *(index.begin()) + rand()%index.size(); - - int32 YellId = 0; - if (Faction == 0) // Alliance - { - YellId = JainaQuotes[ind].textid; - } - else if (Faction == 1) // Horde - { - YellId = ThrallQuotes[ind].textid; - } - - if (YellId) - DoScriptText(YellId, me); -} - void hyjalAI::Retreat() { if (instance) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index 68efa94d98b..5fe724c7845 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -132,12 +132,6 @@ enum TargetType // Used in the spell TARGETTYPE_VICTIM = 2, }; -struct Yells -{ - uint32 id; // Used to determine the type of yell (attack, rally, etc) - int32 textid; // The text id to be yelled -}; - enum YellId { ATTACKED = 0, // Used when attacked and set in combat @@ -149,32 +143,6 @@ enum YellId DEATH = 6, // Used on death }; -const Yells JainaQuotes[]= -{ - {ATTACKED, -1534000}, - {ATTACKED, -1534001}, - {INCOMING, -1534002}, - {BEGIN, -1534003}, - {RALLY, -1534004}, - {RALLY, -1534005}, - {FAILURE, -1534006}, - {SUCCESS, -1534007}, - {DEATH, -1534008}, -}; - -const Yells ThrallQuotes[]= -{ - {ATTACKED, -1534009}, - {ATTACKED, -1534010}, - {INCOMING, -1534011}, - {BEGIN, -1534012}, - {RALLY, -1534013}, - {RALLY, -1534014}, - {FAILURE, -1534015}, - {SUCCESS, -1534016}, - {DEATH, -1534017}, -}; - struct hyjalAI : public npc_escortAI { hyjalAI(Creature* creature); @@ -215,8 +183,6 @@ struct hyjalAI : public npc_escortAI uint32 GetInstanceData(uint32 Event); // Gets instance data for this instance, used to check if raid has gotten past a certain point and can access the next phase - void Talk(uint32 id); // Searches for the appropriate yell and sound and uses it to inform the raid of various things - public: InstanceScript* instance; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 7b468cb7fe5..17cae714b58 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -38,15 +38,11 @@ enum Spells enum Yells { - SAY_INTRO = -1595000, //"Prince Arthas Menethil, on this day, a powerful darkness has taken hold of your soul. The death you are destined to visit upon others will this day be your own." - SAY_AGGRO = -1595001, //"We'll see about that, young prince." - SAY_TIME_WARP_1 = -1595002, //"Tick tock, tick tock..." - SAY_TIME_WARP_2 = -1595003, //"Not quick enough!" - SAY_TIME_WARP_3 = -1595004, //"Let's get this over with. " - SAY_SLAY_1 = -1595005, //"There is no future for you." - SAY_SLAY_2 = -1595006, //"This is the hour of our greatest triumph!" - SAY_SLAY_3 = -1595007, //"You were destined to fail. " - SAY_DEATH = -1595008 //"*gurgles*" + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_TIME_WARP = 2, + SAY_SLAY = 3, + SAY_DEATH = 4 }; class boss_epoch : public CreatureScript @@ -91,7 +87,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); @@ -124,7 +120,7 @@ public: if (uiTimeWarpTimer < diff) { - DoScriptText(RAND(SAY_TIME_WARP_1, SAY_TIME_WARP_2, SAY_TIME_WARP_3), me); + Talk(SAY_TIME_WARP); DoCastAOE(SPELL_TIME_WARP); uiTimeWarpTimer = 25300; } else uiTimeWarpTimer -= diff; @@ -134,7 +130,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_EPOCH_EVENT, DONE); @@ -145,7 +141,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 88b2a766671..b07f4120e97 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -42,23 +42,15 @@ enum Spells enum Yells { - SAY_INTRO_1 = -1595009, - SAY_INTRO_2 = -1595010, - SAY_AGGRO = -1595011, - SAY_KILL_1 = -1595012, - SAY_KILL_2 = -1595013, - SAY_KILL_3 = -1595014, - SAY_SLAY_1 = -1595015, - SAY_SLAY_2 = -1595016, - SAY_SLAY_3 = -1595017, - SAY_SLAY_4 = -1595018, - SAY_SLEEP_1 = -1595019, - SAY_SLEEP_2 = -1595020, - SAY_30HEALTH = -1595021, - SAY_15HEALTH = -1595022, - SAY_ESCAPE_SPEECH_1 = -1595023, - SAY_ESCAPE_SPEECH_2 = -1595024, - SAY_OUTRO = -1595025, + SAY_AGGRO = 2, + SAY_KILL = 3, + SAY_SLAY = 4, + SAY_SLEEP = 5, + SAY_30HEALTH = 6, + SAY_15HEALTH = 7, + SAY_ESCAPE_SPEECH_1 = 8, + SAY_ESCAPE_SPEECH_2 = 9, + SAY_OUTRO = 10 }; enum CombatPhases @@ -116,7 +108,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); } @@ -138,13 +130,13 @@ public: if (!bYelled && HealthBelowPct(30)) { - DoScriptText(SAY_30HEALTH, me); + Talk(SAY_30HEALTH); bYelled = true; } if (!bYelled2 && HealthBelowPct(15)) { - DoScriptText(SAY_15HEALTH, me); + Talk(SAY_15HEALTH); bYelled2 = true; } @@ -187,7 +179,7 @@ public: if (uiSleepTimer < diff) { - DoScriptText(RAND(SAY_SLEEP_1, SAY_SLEEP_2), me); + Talk(SAY_SLEEP); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(target, SPELL_SLEEP); uiSleepTimer = urand(15000, 20000); @@ -201,7 +193,7 @@ public: switch (uiOutroStep) { case 1: - DoScriptText(SAY_ESCAPE_SPEECH_1, me); + Talk(SAY_ESCAPE_SPEECH_1); me->GetMotionMaster()->MoveTargetedHome(); ++uiOutroStep; uiOutroTimer = 8000; @@ -209,12 +201,12 @@ public: case 2: me->SetTarget(instance ? instance->GetData64(DATA_ARTHAS) : 0); me->HandleEmoteCommand(29); - DoScriptText(SAY_ESCAPE_SPEECH_2, me); + Talk(SAY_ESCAPE_SPEECH_2); ++uiOutroStep; uiOutroTimer = 9000; break; case 3: - DoScriptText(SAY_OUTRO, me); + Talk(SAY_OUTRO); ++uiOutroStep; uiOutroTimer = 16000; break; @@ -250,7 +242,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 8e80af66379..05d9fe8b5e4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -38,12 +38,10 @@ enum Spells enum Yells { - SAY_AGGRO = -1595026, - SAY_SLAY_1 = -1595027, - SAY_SLAY_2 = -1595028, - SAY_SLAY_3 = -1595029, - SAY_SPAWN = -1595030, - SAY_DEATH = -1595031 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_SPAWN = 2, + SAY_DEATH = 3 }; class boss_meathook : public CreatureScript @@ -62,7 +60,7 @@ public: { instance = creature->GetInstanceScript(); if (instance) - DoScriptText(SAY_SPAWN, me); + Talk(SAY_SPAWN); } uint32 uiChainTimer; @@ -83,7 +81,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); @@ -119,7 +117,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MEATHOOK_EVENT, DONE); @@ -130,7 +128,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index d23957ddf81..3a490301e47 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -40,19 +40,13 @@ enum Spells enum Yells { - SAY_AGGRO = -1595032, - SAY_SPAWN = -1595033, - SAY_SLAY_1 = -1595034, - SAY_SLAY_2 = -1595035, - SAY_SLAY_3 = -1595036, - SAY_DEATH = -1595037, - SAY_EXPLODE_GHOUL_1 = -1595038, - SAY_EXPLODE_GHOUL_2 = -1595039, - SAY_STEAL_FLESH_1 = -1595040, - SAY_STEAL_FLESH_2 = -1595041, - SAY_STEAL_FLESH_3 = -1595042, - SAY_SUMMON_GHOULS_1 = -1595043, - SAY_SUMMON_GHOULS_2 = -1595044 + SAY_AGGRO = 0, + SAY_SPAWN = 1, + SAY_SLAY = 2, + SAY_DEATH = 3, + SAY_EXPLODE_GHOUL = 4, + SAY_STEAL_FLESH = 5, + SAY_SUMMON_GHOULS = 6 }; class boss_salramm : public CreatureScript @@ -71,7 +65,7 @@ public: { instance = creature->GetInstanceScript(); if (instance) - DoScriptText(SAY_SPAWN, me); + Talk(SAY_SPAWN); } uint32 uiCurseFleshTimer; @@ -96,7 +90,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); @@ -126,7 +120,7 @@ public: //Steal Flesh timer if (uiStealFleshTimer <= diff) { - DoScriptText(RAND(SAY_STEAL_FLESH_1, SAY_STEAL_FLESH_2, SAY_STEAL_FLESH_3), me); + Talk(SAY_STEAL_FLESH); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_STEAL_FLESH); uiStealFleshTimer = 10000; @@ -135,7 +129,7 @@ public: //Summon ghouls timer if (uiSummonGhoulsTimer <= diff) { - DoScriptText(RAND(SAY_SUMMON_GHOULS_1, SAY_SUMMON_GHOULS_2), me); + Talk(SAY_SUMMON_GHOULS); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_SUMMON_GHOULS); uiSummonGhoulsTimer = 10000; @@ -146,7 +140,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_SALRAMM_EVENT, DONE); @@ -157,7 +151,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 365c5dd7300..3329ecf88d2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -26,65 +26,84 @@ enum Says { - //First Act - Uther and Jaina Dialog - SAY_PHASE101 = -1595070, //Arthas - SAY_PHASE102 = -1595071, //Uther - SAY_PHASE103 = -1595072, //Arthas - SAY_PHASE104 = -1595073, //Arthas - SAY_PHASE105 = -1595074, //Uther - SAY_PHASE106 = -1595075, //Arthas - SAY_PHASE107 = -1595076, //Uther - SAY_PHASE108 = -1595077, //Arthas - SAY_PHASE109 = -1595078, //Arthas - SAY_PHASE110 = -1595079, //Uther - SAY_PHASE111 = -1595080, //Arthas - SAY_PHASE112 = -1595081, //Uther - SAY_PHASE113 = -1595082, //Jaina - SAY_PHASE114 = -1595083, //Arthas - SAY_PHASE115 = -1595084, //Uther - SAY_PHASE116 = -1595085, //Arthas - SAY_PHASE117 = -1595086, //Jaina - SAY_PHASE118 = -1595087, //Arthas + //Arthas + //First Act + SAY_PHASE101 = 0, + SAY_PHASE103 = 1, + SAY_PHASE104 = 2, + SAY_PHASE106 = 3, + SAY_PHASE108 = 4, + SAY_PHASE110 = 5, + SAY_PHASE112 = 6, + SAY_PHASE114 = 7, + SAY_PHASE116 = 8, + SAY_PHASE118 = 9, + //Second Act - City Streets - SAY_PHASE201 = -1595088, //Arthas - SAY_PHASE202 = -1595089, //Cityman - SAY_PHASE203 = -1595090, //Arthas - SAY_PHASE204 = -1595091, //Crazyman - SAY_PHASE205 = -1595092, //Arthas - SAY_PHASE206 = -1595009, //Malganis - SAY_PHASE207 = -1595010, //Malganis - SAY_PHASE208 = -1595093, //Arthas - SAY_PHASE209 = -1595094, //Arthas - SAY_PHASE210 = -1595095, //Arthas + SAY_PHASE201 = 10, + SAY_PHASE203 = 11, + SAY_PHASE205 = 12, + SAY_PHASE208 = 13, + SAY_PHASE209 = 14, + SAY_PHASE210 = 15, + //Third Act - Town Hall - SAY_PHASE301 = -1595096, //Arthas - SAY_PHASE302 = -1595097, //Drakonian - SAY_PHASE303 = -1595098, //Arthas - SAY_PHASE304 = -1595099, //Arthas - SAY_PHASE305 = -1595100, //Drakonian - SAY_PHASE306 = -1595101, //Arthas - SAY_PHASE307 = -1595102, //Arthas - SAY_PHASE308 = -1595103, //Arthas - SAY_PHASE309 = -1595104, //Arthas - SAY_PHASE310 = -1595105, //Arthas - SAY_PHASE311 = -1595106, //Arthas - SAY_PHASE312 = -1595107, //Arthas - SAY_PHASE313 = -1595108, //Arthas - SAY_PHASE314 = -1595000, //Epoch - SAY_PHASE315 = -1595109, //Arthas + SAY_PHASE301 = 16, + SAY_PHASE303 = 17, + SAY_PHASE304 = 18, + SAY_PHASE306 = 19, + SAY_PHASE307 = 20, + SAY_PHASE308 = 21, + SAY_PHASE309 = 22, + SAY_PHASE310 = 23, + SAY_PHASE311 = 24, + SAY_PHASE312 = 25, + SAY_PHASE313 = 26, + SAY_PHASE315 = 27, + //Fourth Act - Fire Corridor - SAY_PHASE401 = -1595110, //Arthas - SAY_PHASE402 = -1595111, //Arthas - SAY_PHASE403 = -1595112, //Arthas - SAY_PHASE404 = -1595113, //Arthas - SAY_PHASE405 = -1595114, //Arthas - SAY_PHASE406 = -1595115, //Arthas - SAY_PHASE407 = -1595116, //Arthas + SAY_PHASE401 = 28, + SAY_PHASE402 = 29, + SAY_PHASE403 = 30, + SAY_PHASE404 = 31, + SAY_PHASE405 = 32, + SAY_PHASE406 = 33, + SAY_PHASE407 = 34, + //Fifth Act - Mal'Ganis Fight - SAY_PHASE501 = -1595117, //Arthas - SAY_PHASE502 = -1595118, //Arthas - SAY_PHASE503 = -1595119, //Arthas - SAY_PHASE504 = -1595120, //Arthas + SAY_PHASE501 = 35, + SAY_PHASE502 = 36, + SAY_PHASE503 = 37, + SAY_PHASE504 = 38, + + //Malganis + SAY_PHASE206 = 0, + SAY_PHASE207 = 1, + + //Epoch + SAY_PHASE314 = 0, + + //Uther + SAY_PHASE102 = 0, + SAY_PHASE105 = 1, + SAY_PHASE107 = 2, + SAY_PHASE109 = 3, + SAY_PHASE111 = 4, + SAY_PHASE115 = 5, + + //Jaina + SAY_PHASE113 = 0, + SAY_PHASE117 = 1, + + //Cityman + SAY_PHASE202 = 0, + + //Crazyman + SAY_PHASE204 = 0, + + //Drakonian + SAY_PHASE302 = 0, + SAY_PHASE305 = 1, }; enum NPCs @@ -250,27 +269,27 @@ public: ai->Start(true, true, player->GetGUID(), 0, false, false); ai->SetDespawnAtEnd(false); ai->bStepping = false; - ai->uiStep = 1; + ai->step = 1; break; case GOSSIP_ACTION_INFO_DEF+1: ai->bStepping = true; - ai->uiStep = 24; + ai->step = 24; break; case GOSSIP_ACTION_INFO_DEF+2: ai->SetHoldState(false); ai->bStepping = false; - ai->uiStep = 61; + ai->step = 61; break; case GOSSIP_ACTION_INFO_DEF+3: ai->SetHoldState(false); break; case GOSSIP_ACTION_INFO_DEF+4: ai->bStepping = true; - ai->uiStep = 84; + ai->step = 84; break; case GOSSIP_ACTION_INFO_DEF+5: ai->bStepping = true; - ai->uiStep = 85; + ai->step = 85; break; } player->CLOSE_GOSSIP_MENU(); @@ -285,7 +304,7 @@ public: if (ai && ai->bStepping == false) { - switch (ai->uiGossipStep) + switch (ai->gossipStep) { case 0: //This one is a workaround since the very beggining of the script is wrong. { @@ -339,46 +358,46 @@ public: InstanceScript* instance; bool bStepping; - uint32 uiStep; - uint32 uiPhaseTimer; - uint32 uiGossipStep; - uint32 uiPlayerFaction; - uint32 uiBossEvent; - uint32 uiWave; - - uint64 uiUtherGUID; - uint64 uiJainaGUID; - uint64 uiCitymenGUID[2]; - uint64 uiWaveGUID[ENCOUNTER_WAVES_MAX_SPAWNS]; - uint64 uiInfiniteDraconianGUID[ENCOUNTER_DRACONIAN_NUMBER]; - uint64 uiStalkerGUID; - - uint64 uiBossGUID; //uiMeathookGUID || uiSalrammGUID - uint64 uiEpochGUID; - uint64 uiMalganisGUID; - uint64 uiInfiniteGUID; - - uint32 uiExorcismTimer; + uint32 step; + uint32 phaseTimer; + uint32 gossipStep; + uint32 playerFaction; + uint32 bossEvent; + uint32 wave; + + uint64 utherGUID; + uint64 jainaGUID; + uint64 citymenGUID[2]; + uint64 waveGUID[ENCOUNTER_WAVES_MAX_SPAWNS]; + uint64 infiniteDraconianGUID[ENCOUNTER_DRACONIAN_NUMBER]; + uint64 stalkerGUID; + + uint64 bossGUID; + uint64 epochGUID; + uint64 malganisGUID; + uint64 infiniteGUID; + + uint32 exorcismTimer; void Reset() { - uiUtherGUID = 0; - uiJainaGUID = 0; + utherGUID = 0; + jainaGUID = 0; for (uint8 i = 0; i < 2; ++i) - uiCitymenGUID[i] = 0; + citymenGUID[i] = 0; for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) - uiWaveGUID[i] = 0; + waveGUID[i] = 0; for (uint8 i = 0; i < ENCOUNTER_DRACONIAN_NUMBER; ++i) - uiInfiniteDraconianGUID[i] = 0; + infiniteDraconianGUID[i] = 0; - uiStalkerGUID = 0; - uiBossGUID = 0; - uiEpochGUID = 0; - uiMalganisGUID = 0; - uiInfiniteGUID = 0; + stalkerGUID = 0; + bossGUID = 0; + epochGUID = 0; + malganisGUID = 0; + infiniteGUID = 0; if (instance) { instance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED); @@ -386,15 +405,15 @@ public: { case NOT_STARTED: bStepping = true; - uiStep = 0; + step = 0; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - uiBossEvent = DATA_MEATHOOK_EVENT; - uiGossipStep = 0; + bossEvent = DATA_MEATHOOK_EVENT; + gossipStep = 0; break; } - uiPhaseTimer = 1000; - uiExorcismTimer = 7300; - uiWave = 0; + phaseTimer = 1000; + exorcismTimer = 7300; + wave = 0; } } @@ -423,7 +442,7 @@ public: temp->SetReactState(REACT_PASSIVE); temp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1], RiftAndSpawnsLocations[i][2], RiftAndSpawnsLocations[i][3]); if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_EPOCH) - uiEpochGUID = temp->GetGUID(); + epochGUID = temp->GetGUID(); } } } @@ -447,8 +466,8 @@ public: void JumpToNextStep(uint32 uiTimer) { - uiPhaseTimer = uiTimer; - ++uiStep; + phaseTimer = uiTimer; + ++step; } void WaypointReached(uint32 waypointId) @@ -470,74 +489,74 @@ public: bStepping = true; break; case 7: - if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN, 2091.977f, 1275.021f, 140.757f, 0.558f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) - uiCitymenGUID[0] = pCityman0->GetGUID(); - if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2, 2093.514f, 1275.842f, 140.408f, 3.801f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) - uiCitymenGUID[1] = pCityman1->GetGUID(); + if (Unit* cityman0 = me->SummonCreature(NPC_CITY_MAN, 2091.977f, 1275.021f, 140.757f, 0.558f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) + citymenGUID[0] = cityman0->GetGUID(); + if (Unit* cityman1 = me->SummonCreature(NPC_CITY_MAN2, 2093.514f, 1275.842f, 140.408f, 3.801f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) + citymenGUID[1] = cityman1->GetGUID(); break; case 8: - uiGossipStep = 1; + gossipStep = 1; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetHoldState(true); break; case 12: SetRun(true); - DoScriptText(SAY_PHASE210, me); - if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3, 2398.14f, 1207.81f, 134.04f, 5.155249f, TEMPSUMMON_DEAD_DESPAWN, 180000)) + Talk(SAY_PHASE210); + if (Unit* disguised0 = me->SummonCreature(NPC_CITY_MAN3, 2398.14f, 1207.81f, 134.04f, 5.155249f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { - uiInfiniteDraconianGUID[0] = pDisguised0->GetGUID(); - if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4, 2403.22f, 1205.54f, 134.04f, 3.311264f, TEMPSUMMON_DEAD_DESPAWN, 180000)) + infiniteDraconianGUID[0] = disguised0->GetGUID(); + if (Unit* disguised1 = me->SummonCreature(NPC_CITY_MAN4, 2403.22f, 1205.54f, 134.04f, 3.311264f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { - uiInfiniteDraconianGUID[1] = pDisguised1->GetGUID(); + infiniteDraconianGUID[1] = disguised1->GetGUID(); - if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN, 2400.82f, 1201.69f, 134.01f, 1.534082f, TEMPSUMMON_DEAD_DESPAWN, 180000)) + if (Unit* disguised2 = me->SummonCreature(NPC_CITY_MAN, 2400.82f, 1201.69f, 134.01f, 1.534082f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { - uiInfiniteDraconianGUID[2] = pDisguised2->GetGUID(); - pDisguised0->SetTarget(uiInfiniteDraconianGUID[1]); - pDisguised1->SetTarget(uiInfiniteDraconianGUID[0]); - pDisguised2->SetTarget(uiInfiniteDraconianGUID[1]); + infiniteDraconianGUID[2] = disguised2->GetGUID(); + disguised0->SetTarget(infiniteDraconianGUID[1]); + disguised1->SetTarget(infiniteDraconianGUID[0]); + disguised2->SetTarget(infiniteDraconianGUID[1]); } } } break; case 20: - uiGossipStep = 2; + gossipStep = 2; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetRun(false); SetHoldState(true); break; case 21: - DoScriptText(SAY_PHASE301, me); + Talk(SAY_PHASE301); break; case 25: SetRun(false); - SpawnTimeRift(0, &uiInfiniteDraconianGUID[0]); - DoScriptText(SAY_PHASE307, me); + SpawnTimeRift(0, &infiniteDraconianGUID[0]); + Talk(SAY_PHASE307); break; case 29: SetRun(false); - SpawnTimeRift(5, &uiInfiniteDraconianGUID[0]); - SpawnTimeRift(8, &uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE309, me); + SpawnTimeRift(5, &infiniteDraconianGUID[0]); + SpawnTimeRift(8, &infiniteDraconianGUID[2]); + Talk(SAY_PHASE309); SetHoldState(true); bStepping = true; break; case 31: SetRun(false); - SpawnTimeRift(11, &uiInfiniteDraconianGUID[0]); - SpawnTimeRift(14, &uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE311, me); + SpawnTimeRift(11, &infiniteDraconianGUID[0]); + SpawnTimeRift(14, &infiniteDraconianGUID[2]); + Talk(SAY_PHASE311); SetHoldState(true); bStepping = true; break; case 32: - DoScriptText(SAY_PHASE401, me); + Talk(SAY_PHASE401); break; case 34: - DoScriptText(SAY_PHASE402, me); + Talk(SAY_PHASE402); break; case 35: - DoScriptText(SAY_PHASE403, me); + Talk(SAY_PHASE403); break; case 36: if (instance) @@ -547,23 +566,23 @@ public: case 45: SetRun(true); SetDespawnAtFar(false); - uiGossipStep = 4; + gossipStep = 4; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetHoldState(true); break; case 47: SetRun(false); - DoScriptText(SAY_PHASE405, me); + Talk(SAY_PHASE405); break; case 48: SetRun(true); - DoScriptText(SAY_PHASE406, me); + Talk(SAY_PHASE406); break; case 53: - DoScriptText(SAY_PHASE407, me); + Talk(SAY_PHASE407); break; case 54: - uiGossipStep = 5; + gossipStep = 5; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetHoldState(true); break; @@ -578,18 +597,18 @@ public: if (bStepping) { - if (uiPhaseTimer <= diff) + if (phaseTimer <= diff) { - switch (uiStep) + switch (step) { //After reset case 0: { - Unit* pJaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f); - if (!pJaina) - pJaina = me->SummonCreature(NPC_JAINA, 1895.48f, 1292.66f, 143.706f, 0.023475f, TEMPSUMMON_DEAD_DESPAWN, 180000); - if (pJaina) - uiJainaGUID = pJaina->GetGUID(); + Unit* jaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f); + if (!jaina) + jaina = me->SummonCreature(NPC_JAINA, 1895.48f, 1292.66f, 143.706f, 0.023475f, TEMPSUMMON_DEAD_DESPAWN, 180000); + if (jaina) + jainaGUID = jaina->GetGUID(); bStepping = false; JumpToNextStep(0); break; @@ -597,24 +616,24 @@ public: //After waypoint 0 case 1: me->SetWalk(false); - if (Unit* pUther = me->SummonCreature(NPC_UTHER, 1794.357f, 1272.183f, 140.558f, 1.37f, TEMPSUMMON_DEAD_DESPAWN, 180000)) + if (Unit* uther = me->SummonCreature(NPC_UTHER, 1794.357f, 1272.183f, 140.558f, 1.37f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { - uiUtherGUID = pUther->GetGUID(); - pUther->SetWalk(false); - pUther->GetMotionMaster()->MovePoint(0, 1897.018f, 1287.487f, 143.481f); - pUther->SetTarget(me->GetGUID()); - me->SetTarget(uiUtherGUID); + utherGUID = uther->GetGUID(); + uther->SetWalk(false); + uther->GetMotionMaster()->MovePoint(0, 1897.018f, 1287.487f, 143.481f); + uther->SetTarget(me->GetGUID()); + me->SetTarget(utherGUID); } JumpToNextStep(17000); break; case 2: - DoScriptText(SAY_PHASE101, me); + Talk(SAY_PHASE101); JumpToNextStep(2000); break; case 3: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) { - DoScriptText(SAY_PHASE102, pUther); + uther->AI()->Talk(SAY_PHASE102); } JumpToNextStep(8000); break; @@ -622,90 +641,90 @@ public: SetEscortPaused(false); bStepping = false; SetRun(false); - DoScriptText(SAY_PHASE103, me); + Talk(SAY_PHASE103); JumpToNextStep(0); break; //After waypoint 1 case 5: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - pJaina->SetTarget(me->GetGUID()); - DoScriptText(SAY_PHASE104, me); + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) + jaina->SetTarget(me->GetGUID()); + Talk(SAY_PHASE104); JumpToNextStep(10000); break; case 6: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE105, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE105); JumpToNextStep(1000); break; case 7: - DoScriptText(SAY_PHASE106, me); + Talk(SAY_PHASE106); JumpToNextStep(4000); break; case 8: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE107, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE107); JumpToNextStep(6000); break; case 9: - DoScriptText(SAY_PHASE108, me); + Talk(SAY_PHASE108); JumpToNextStep(4000); break; case 10: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE109, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE109); JumpToNextStep(8000); break; case 11: - DoScriptText(SAY_PHASE110, me); + Talk(SAY_PHASE110); JumpToNextStep(4000); break; case 12: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE111, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE111); JumpToNextStep(4000); break; case 13: - DoScriptText(SAY_PHASE112, me); + Talk(SAY_PHASE112); JumpToNextStep(11000); break; case 14: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - DoScriptText(SAY_PHASE113, pJaina); + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) + jaina->AI()->Talk(SAY_PHASE113); JumpToNextStep(3000); break; case 15: - DoScriptText(SAY_PHASE114, me); + Talk(SAY_PHASE114); JumpToNextStep(9000); break; case 16: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE115, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE115); JumpToNextStep(4000); break; case 17: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) { - pUther->SetWalk(true); - pUther->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); + uther->SetWalk(true); + uther->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; case 18: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) { - me->SetTarget(uiJainaGUID); - pJaina->SetWalk(true); - pJaina->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); + me->SetTarget(jainaGUID); + jaina->SetWalk(true); + jaina->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; case 19: - DoScriptText(SAY_PHASE116, me); + Talk(SAY_PHASE116); JumpToNextStep(1000); break; case 20: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - DoScriptText(SAY_PHASE117, pJaina); + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) + jaina->AI()->Talk(SAY_PHASE117); JumpToNextStep(3000); break; case 21: @@ -716,8 +735,8 @@ public: break; //After waypoint 3 case 22: - DoScriptText(SAY_PHASE118, me); - me->SetTarget(uiJainaGUID); + Talk(SAY_PHASE118); + me->SetTarget(jainaGUID); JumpToNextStep(10000); break; case 23: @@ -725,11 +744,11 @@ public: bStepping = false; SetRun(true); - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - pJaina->DisappearAndDie(); + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) + jaina->DisappearAndDie(); - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - pUther->DisappearAndDie(); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->DisappearAndDie(); me->SetTarget(0); JumpToNextStep(0); @@ -738,13 +757,13 @@ public: case 24: if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2026.469f, 1287.088f, 143.596f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 14000)) { - uiStalkerGUID = pStalker->GetGUID(); - me->SetTarget(uiStalkerGUID); + stalkerGUID = pStalker->GetGUID(); + me->SetTarget(stalkerGUID); } JumpToNextStep(1000); break; case 25: - DoScriptText(SAY_PHASE201, me); + Talk(SAY_PHASE201); JumpToNextStep(12000); break; case 26: @@ -756,24 +775,24 @@ public: break; //After waypoint 9 case 27: - me->SetTarget(uiCitymenGUID[0]); - if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0])) + me->SetTarget(citymenGUID[0]); + if (Creature* cityman = Unit::GetCreature(*me, citymenGUID[0])) { - pCityman->SetTarget(me->GetGUID()); - pCityman->SetWalk(true); - pCityman->GetMotionMaster()->MovePoint(0, 2088.625f, 1279.191f, 140.743f); + cityman->SetTarget(me->GetGUID()); + cityman->SetWalk(true); + cityman->GetMotionMaster()->MovePoint(0, 2088.625f, 1279.191f, 140.743f); } JumpToNextStep(2000); break; case 28: - if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0])) - DoScriptText(SAY_PHASE202, pCityman); + if (Creature* cityman = Unit::GetCreature(*me, citymenGUID[0])) + cityman->AI()->Talk(SAY_PHASE202); JumpToNextStep(4000); break; case 29: SetEscortPaused(false); bStepping = false; - DoScriptText(SAY_PHASE203, me); + Talk(SAY_PHASE203); JumpToNextStep(0); break; //After waypoint 10 @@ -784,13 +803,13 @@ public: case 31: SetEscortPaused(false); bStepping = false; - if (Creature* pCityman1 = Unit::GetCreature(*me, uiCitymenGUID[1])) + if (Creature* cityman1 = Unit::GetCreature(*me, citymenGUID[1])) { - DoScriptText(SAY_PHASE204, pCityman1); - pCityman1->SetTarget(me->GetGUID()); - if (Creature* pCityman0 = Unit::GetCreature(*me, uiCitymenGUID[0])) - pCityman0->Kill(pCityman0); - me->SetTarget(uiCitymenGUID[1]); + cityman1->AI()->Talk(SAY_PHASE204); + cityman1->SetTarget(me->GetGUID()); + if (Creature* cityman0 = Unit::GetCreature(*me, citymenGUID[0])) + cityman0->Kill(cityman0); + me->SetTarget(citymenGUID[1]); } JumpToNextStep(0); break; @@ -800,75 +819,75 @@ public: JumpToNextStep(1000); break; case 33: - if (Creature* pCityman1 = Unit::GetCreature(*me, uiCitymenGUID[1])) - pCityman1->Kill(pCityman1); + if (Creature* cityman1 = Unit::GetCreature(*me, citymenGUID[1])) + cityman1->Kill(cityman1); JumpToNextStep(1000); break; case 34: if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { - uiStalkerGUID = pStalker->GetGUID(); - me->SetTarget(uiStalkerGUID); + stalkerGUID = pStalker->GetGUID(); + me->SetTarget(stalkerGUID); } - DoScriptText(SAY_PHASE205, me); + Talk(SAY_PHASE205); JumpToNextStep(3000); break; case 35: if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { - uiStalkerGUID = pStalkerM->GetGUID(); - me->SetTarget(uiStalkerGUID); + stalkerGUID = pStalkerM->GetGUID(); + me->SetTarget(stalkerGUID); } JumpToNextStep(1000); break; case 36: - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* malganis = me->SummonCreature(NPC_MAL_GANIS, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { - if (Creature* pStalkerM = Unit::GetCreature(*me, uiStalkerGUID)) - pMalganis->CastSpell(pStalkerM, 63793, false); + if (Creature* pStalkerM = Unit::GetCreature(*me, stalkerGUID)) + malganis->CastSpell(pStalkerM, 63793, false); - uiMalganisGUID = pMalganis->GetGUID(); - DoScriptText(SAY_PHASE206, pMalganis); - pMalganis->SetTarget(me->GetGUID()); - pMalganis->SetReactState(REACT_PASSIVE); + malganisGUID = malganis->GetGUID(); + malganis->AI()->Talk(SAY_PHASE206); + malganis->SetTarget(me->GetGUID()); + malganis->SetReactState(REACT_PASSIVE); } JumpToNextStep(11000); break; case 37: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) + if (Creature* malganis = Unit::GetCreature(*me, malganisGUID)) { - Creature* pZombie = GetClosestCreatureWithEntry(pMalganis, NPC_CITY_MAN, 100.0f); + Creature* pZombie = GetClosestCreatureWithEntry(malganis, NPC_CITY_MAN, 100.0f); if (!pZombie) - pZombie = GetClosestCreatureWithEntry(pMalganis, NPC_CITY_MAN2, 100.0f); + pZombie = GetClosestCreatureWithEntry(malganis, NPC_CITY_MAN2, 100.0f); if (pZombie) pZombie->UpdateEntry(NPC_ZOMBIE, 0); else //There's no one else to transform - uiStep++; + step++; } else - uiStep++; - uiPhaseTimer = 500; + step++; + phaseTimer = 500; break; case 38: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) - DoScriptText(SAY_PHASE207, pMalganis); + if (Creature* malganis = Unit::GetCreature(*me, malganisGUID)) + malganis->AI()->Talk(SAY_PHASE207); JumpToNextStep(17000); break; case 39: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) - pMalganis->SetVisible(false); - DoScriptText(SAY_PHASE208, me); + if (Creature* malganis = Unit::GetCreature(*me, malganisGUID)) + malganis->SetVisible(false); + Talk(SAY_PHASE208); JumpToNextStep(7000); break; case 40: if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { - uiStalkerGUID = pStalker->GetGUID(); - me->SetTarget(uiStalkerGUID); + stalkerGUID = pStalker->GetGUID(); + me->SetTarget(stalkerGUID); } - DoScriptText(SAY_PHASE209, me); + Talk(SAY_PHASE209); - uiBossEvent = DATA_MEATHOOK_EVENT; + bossEvent = DATA_MEATHOOK_EVENT; if (instance) instance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS); @@ -884,10 +903,10 @@ public: case 53: case 55: case 57: - if (instance->GetData(uiBossEvent) != DONE) + if (instance->GetData(bossEvent) != DONE) { - SpawnWaveGroup(uiWave, uiWaveGUID); - uiWave++; + SpawnWaveGroup(wave, waveGUID); + wave++; } JumpToNextStep(500); break; @@ -899,16 +918,16 @@ public: case 54: case 56: case 58: - if (instance->GetData(uiBossEvent) != DONE) + if (instance->GetData(bossEvent) != DONE) { uint32 mobCounter = 0; uint32 deadCounter = 0; for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) { - if (uiWaveGUID[i] == 0) + if (waveGUID[i] == 0) break; ++mobCounter; - Unit* temp = Unit::GetCreature(*me, uiWaveGUID[i]); + Unit* temp = Unit::GetCreature(*me, waveGUID[i]); if (!temp || temp->isDead()) ++deadCounter; } @@ -916,24 +935,24 @@ public: if (mobCounter <= deadCounter) //If group is dead JumpToNextStep(1000); else - uiPhaseTimer = 1000; + phaseTimer = 1000; } else JumpToNextStep(500); break; case 49: //Summon Boss case 59: - if (instance->GetData(uiBossEvent) != DONE) + if (instance->GetData(bossEvent) != DONE) { uint32 uiBossID = 0; - if (uiBossEvent == DATA_MEATHOOK_EVENT) + if (bossEvent == DATA_MEATHOOK_EVENT) uiBossID = NPC_MEATHOOK; - else if (uiBossEvent == DATA_SALRAMM_EVENT) + else if (bossEvent == DATA_SALRAMM_EVENT) uiBossID = NPC_SALRAMM; if (Unit* pBoss = me->SummonCreature(uiBossID, 2232.19f, 1331.933f, 126.662f, 3.15f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { - uiBossGUID = pBoss->GetGUID(); + bossGUID = pBoss->GetGUID(); pBoss->SetWalk(true); pBoss->GetMotionMaster()->MovePoint(0, 2194.110f, 1332.00f, 130.00f); } @@ -944,42 +963,42 @@ public: case 60: if (instance) { - if (instance->GetData(uiBossEvent) == DONE) + if (instance->GetData(bossEvent) == DONE) { JumpToNextStep(1000); - if (uiBossEvent == DATA_MEATHOOK_EVENT) - uiBossEvent = DATA_SALRAMM_EVENT; - else if (uiBossEvent == DATA_SALRAMM_EVENT) + if (bossEvent == DATA_MEATHOOK_EVENT) + bossEvent = DATA_SALRAMM_EVENT; + else if (bossEvent == DATA_SALRAMM_EVENT) { SetHoldState(false); bStepping = false; - uiBossEvent = DATA_EPOCH_EVENT; + bossEvent = DATA_EPOCH_EVENT; } } - else if (instance->GetData(uiBossEvent) == FAIL) + else if (instance->GetData(bossEvent) == FAIL) npc_escortAI::EnterEvadeMode(); else - uiPhaseTimer = 10000; + phaseTimer = 10000; } break; //After Gossip 2 (waypoint 22) case 61: me->SetReactState(REACT_AGGRESSIVE); - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - pDisguised0->SetTarget(me->GetGUID()); - if (Creature* pDisguised1 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[1])) - pDisguised1->SetTarget(me->GetGUID()); - if (Creature* pDisguised2 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[2])) - pDisguised2->SetTarget(me->GetGUID()); + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) + disguised0->SetTarget(me->GetGUID()); + if (Creature* disguised1 = Unit::GetCreature(*me, infiniteDraconianGUID[1])) + disguised1->SetTarget(me->GetGUID()); + if (Creature* disguised2 = Unit::GetCreature(*me, infiniteDraconianGUID[2])) + disguised2->SetTarget(me->GetGUID()); JumpToNextStep(1000); break; case 62: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE302, pDisguised0); + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) + disguised0->AI()->Talk(SAY_PHASE302); JumpToNextStep(7000); break; case 63: - DoScriptText(SAY_PHASE303, me); + Talk(SAY_PHASE303); SetHoldState(false); bStepping = false; JumpToNextStep(0); @@ -990,46 +1009,46 @@ public: JumpToNextStep(1000); break; case 65: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - pDisguised0->HandleEmoteCommand(11); + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) + disguised0->HandleEmoteCommand(11); JumpToNextStep(1000); break; case 66: - DoScriptText(SAY_PHASE304, me); + Talk(SAY_PHASE304); JumpToNextStep(2000); break; case 67: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE305, pDisguised0); + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) + disguised0->AI()->Talk(SAY_PHASE305); JumpToNextStep(1000); break; case 68: - if (Creature* pDisguised2 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[2])) + if (Creature* disguised2 = Unit::GetCreature(*me, infiniteDraconianGUID[2])) { - pDisguised2->UpdateEntry(NPC_INFINITE_HUNTER, 0); + disguised2->UpdateEntry(NPC_INFINITE_HUNTER, 0); //Make them unattackable - pDisguised2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - pDisguised2->SetReactState(REACT_PASSIVE); + disguised2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); + disguised2->SetReactState(REACT_PASSIVE); } JumpToNextStep(2000); break; case 69: - if (Creature* pDisguised1 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[1])) + if (Creature* disguised1 = Unit::GetCreature(*me, infiniteDraconianGUID[1])) { - pDisguised1->UpdateEntry(NPC_INFINITE_AGENT, 0); + disguised1->UpdateEntry(NPC_INFINITE_AGENT, 0); //Make them unattackable - pDisguised1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - pDisguised1->SetReactState(REACT_PASSIVE); + disguised1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); + disguised1->SetReactState(REACT_PASSIVE); } JumpToNextStep(2000); break; case 70: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) { - pDisguised0->UpdateEntry(NPC_INFINITE_ADVERSARY, 0); + disguised0->UpdateEntry(NPC_INFINITE_ADVERSARY, 0); //Make them unattackable - pDisguised0->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - pDisguised0->SetReactState(REACT_PASSIVE); + disguised0->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); + disguised0->SetReactState(REACT_PASSIVE); } JumpToNextStep(2000); break; @@ -1040,7 +1059,7 @@ public: case 77: //Make cratures attackable for (uint32 i = 0; i< ENCOUNTER_DRACONIAN_NUMBER; ++i) - if (Creature* temp = Unit::GetCreature(*me, uiInfiniteDraconianGUID[i])) + if (Creature* temp = Unit::GetCreature(*me, infiniteDraconianGUID[i])) { temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); temp->SetReactState(REACT_AGGRESSIVE); @@ -1051,12 +1070,12 @@ public: case 74: case 76: if (me->isInCombat()) - uiPhaseTimer = 1000; + phaseTimer = 1000; else { - if (uiStep == 72) DoScriptText(SAY_PHASE308, me); - if (uiStep == 74) DoScriptText(SAY_PHASE308, me); - if (uiStep == 76) DoScriptText(SAY_PHASE310, me); + if (step == 72) Talk(SAY_PHASE308); + if (step == 74) Talk(SAY_PHASE308); + if (step == 76) Talk(SAY_PHASE310); SetHoldState(false); bStepping = false; SetRun(true); @@ -1065,44 +1084,44 @@ public: break; case 78: if (me->isInCombat()) - uiPhaseTimer = 1000; + phaseTimer = 1000; else { - DoScriptText(SAY_PHASE312, me); + Talk(SAY_PHASE312); JumpToNextStep(5000); } break; case 79: - DoScriptText(SAY_PHASE313, me); + Talk(SAY_PHASE313); JumpToNextStep(1000); break; case 80: if (instance) if (instance->GetData(DATA_EPOCH_EVENT) != DONE) { - SpawnTimeRift(17, &uiEpochGUID); - if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) - DoScriptText(SAY_PHASE314, pEpoch); - me->SetTarget(uiEpochGUID); + SpawnTimeRift(17, &epochGUID); + if (Creature* epoch = Unit::GetCreature(*me, epochGUID)) + epoch->AI()->Talk(SAY_PHASE314); + me->SetTarget(epochGUID); } JumpToNextStep(18000); break; case 81: if (instance) if (instance->GetData(DATA_EPOCH_EVENT) != DONE) - DoScriptText(SAY_PHASE315, me); + Talk(SAY_PHASE315); JumpToNextStep(6000); break; case 82: if (instance) if (instance->GetData(DATA_EPOCH_EVENT) != DONE) { - if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) + if (Creature* epoch = Unit::GetCreature(*me, epochGUID)) { //Make Epoch attackable - pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pEpoch->SetReactState(REACT_AGGRESSIVE); + epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); + epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + epoch->SetReactState(REACT_AGGRESSIVE); } } @@ -1113,31 +1132,31 @@ public: { if (instance->GetData(DATA_EPOCH_EVENT) == DONE) { - uiGossipStep = 3; + gossipStep = 3; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); bStepping = false; - uiBossEvent = DATA_MAL_GANIS_EVENT; + bossEvent = DATA_MAL_GANIS_EVENT; JumpToNextStep(15000); } else if (instance->GetData(DATA_EPOCH_EVENT) == FAIL) npc_escortAI::EnterEvadeMode(); else - uiPhaseTimer = 10000; + phaseTimer = 10000; } break; //After Gossip 4 case 84: - DoScriptText(SAY_PHASE404, me); + Talk(SAY_PHASE404); SetHoldState(false); bStepping = false; break; //After Gossip 5 case 85: - DoScriptText(SAY_PHASE501, me); - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2296.665f, 1502.362f, 128.362f, 4.961f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) + Talk(SAY_PHASE501); + if (Creature* malganis = me->SummonCreature(NPC_MAL_GANIS, 2296.665f, 1502.362f, 128.362f, 4.961f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { - uiMalganisGUID = pMalganis->GetGUID(); - pMalganis->SetReactState(REACT_PASSIVE); + malganisGUID = malganis->GetGUID(); + malganis->SetReactState(REACT_PASSIVE); } if (instance) if (GameObject* pGate = instance->instance->GetGameObject(instance->GetData64(DATA_MAL_GANIS_GATE_1))) @@ -1148,15 +1167,15 @@ public: break; //After waypoint 55 case 86: - DoScriptText(SAY_PHASE502, me); + Talk(SAY_PHASE502); JumpToNextStep(6000); - me->SetTarget(uiMalganisGUID); + me->SetTarget(malganisGUID); break; case 87: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) + if (Creature* malganis = Unit::GetCreature(*me, malganisGUID)) { - pMalganis->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_UNK_6 | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_UNK_15); - pMalganis->SetReactState(REACT_AGGRESSIVE); + malganis->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_UNK_6 | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_UNK_15); + malganis->SetReactState(REACT_AGGRESSIVE); } JumpToNextStep(1000); break; @@ -1171,14 +1190,14 @@ public: else if (instance->GetData(DATA_MAL_GANIS_EVENT) == FAIL) npc_escortAI::EnterEvadeMode(); else - uiPhaseTimer = 10000; + phaseTimer = 10000; } break; //After waypoint 56 case 89: SetRun(true); - me->SetTarget(uiMalganisGUID); - DoScriptText(SAY_PHASE503, me); + me->SetTarget(malganisGUID); + Talk(SAY_PHASE503); JumpToNextStep(7000); break; case 90: @@ -1187,23 +1206,23 @@ public: instance->SetData(DATA_ARTHAS_EVENT, DONE); //Rewards: Achiev & Chest ;D me->SetTarget(instance->GetData64(DATA_MAL_GANIS_GATE_2)); //Look behind } - DoScriptText(SAY_PHASE504, me); + Talk(SAY_PHASE504); bStepping = false; break; } - } else uiPhaseTimer -= diff; + } else phaseTimer -= diff; } //Battling skills if (!me->getVictim()) return; - if (uiExorcismTimer < diff) + if (exorcismTimer < diff) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_EXORCISM_N); - uiExorcismTimer = 7300; - } else uiExorcismTimer -= diff; + exorcismTimer = 7300; + } else exorcismTimer -= diff; if (HealthBelowPct(40)) DoCast(me, SPELL_HOLY_LIGHT); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 161ea4ba8b7..bcf48ccd7be 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -29,13 +29,12 @@ EndScriptData */ enum eEnums { - SAY_ENTER = -1269012, - SAY_AGGRO = -1269013, - SAY_BANISH = -1269014, - SAY_SLAY1 = -1269015, - SAY_SLAY2 = -1269016, - SAY_DEATH = -1269017, - EMOTE_FRENZY = -1269018, + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_BANISH = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + EMOTE_FRENZY = 5, SPELL_CLEAVE = 40504, SPELL_TIME_STOP = 31422, @@ -76,7 +75,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void MoveInLineOfSight(Unit* who) @@ -86,7 +85,7 @@ public: { if (me->IsWithinDistInMap(who, 20.0f)) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } } @@ -96,7 +95,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) { @@ -107,7 +106,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 diff) @@ -133,7 +132,7 @@ public: //Frenzy if (Frenzy_Timer <= diff) { - DoScriptText(EMOTE_FRENZY, me); + Talk(EMOTE_FRENZY); DoCast(me, SPELL_ENRAGE); Frenzy_Timer = 20000+rand()%15000; } else Frenzy_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 8fc7f31e766..244e22149fc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -29,12 +29,11 @@ EndScriptData */ enum eEnums { - SAY_ENTER = -1269006, - SAY_AGGRO = -1269007, - SAY_BANISH = -1269008, - SAY_SLAY1 = -1269009, - SAY_SLAY2 = -1269010, - SAY_DEATH = -1269011, + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_BANISH = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, SPELL_ARCANE_BLAST = 31457, H_SPELL_ARCANE_BLAST = 38538, @@ -78,7 +77,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void MoveInLineOfSight(Unit* who) @@ -88,7 +87,7 @@ public: { if (me->IsWithinDistInMap(who, 20.0f)) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } } @@ -98,12 +97,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_RIFT, SPECIAL); @@ -133,7 +132,7 @@ public: //Time Lapse if (TimeLapse_Timer <= diff) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); DoCast(me, SPELL_TIME_LAPSE); TimeLapse_Timer = 15000+rand()%10000; } else TimeLapse_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 0256a099580..02a9f4742b3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -29,12 +29,11 @@ EndScriptData */ enum eEnums { - SAY_ENTER = -1269000, - SAY_AGGRO = -1269001, - SAY_BANISH = -1269002, - SAY_SLAY1 = -1269003, - SAY_SLAY2 = -1269004, - SAY_DEATH = -1269005, + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_BANISH = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, SPELL_HASTE = 31458, SPELL_MORTAL_WOUND = 31464, @@ -77,17 +76,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_RIFT, SPECIAL); @@ -100,7 +99,7 @@ public: { if (me->IsWithinDistInMap(who, 20.0f)) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index 8ca14d72b94..03bebe35fd9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -36,29 +36,32 @@ EndContentData */ #include "Player.h" #include "SpellInfo.h" -#define SAY_ENTER -1269020 //where does this belong? -#define SAY_INTRO -1269021 -#define SAY_WEAK75 -1269022 -#define SAY_WEAK50 -1269023 -#define SAY_WEAK25 -1269024 -#define SAY_DEATH -1269025 -#define SAY_WIN -1269026 -#define SAY_ORCS_ENTER -1269027 -#define SAY_ORCS_ANSWER -1269028 - -#define SPELL_CHANNEL 31556 -#define SPELL_PORTAL_RUNE 32570 //aura(portal on ground effect) - -#define SPELL_BLACK_CRYSTAL 32563 //aura -#define SPELL_PORTAL_CRYSTAL 32564 //summon - -#define SPELL_BANISH_PURPLE 32566 //aura -#define SPELL_BANISH_GREEN 32567 //aura - -#define SPELL_CORRUPT 31326 -#define SPELL_CORRUPT_AEONUS 37853 - -#define C_COUNCIL_ENFORCER 17023 +enum MedivhBm +{ + SAY_ENTER = 0, //where does this belong? + SAY_INTRO = 1, + SAY_WEAK75 = 2, + SAY_WEAK50 = 3, + SAY_WEAK25 = 4, + SAY_DEATH = 5, + SAY_WIN = 6, + SAY_ORCS_ENTER = 7, + SAY_ORCS_ANSWER = 8, + + SPELL_CHANNEL = 31556, + SPELL_PORTAL_RUNE = 32570, //aura(portal on ground effect) + + SPELL_BLACK_CRYSTAL = 32563, //aura + SPELL_PORTAL_CRYSTAL = 32564, //summon + + SPELL_BANISH_PURPLE = 32566, //aura + SPELL_BANISH_GREEN = 32567, //aura + + SPELL_CORRUPT = 31326, + SPELL_CORRUPT_AEONUS = 37853, + + C_COUNCIL_ENFORCER = 17023 +}; class npc_medivh_bm : public CreatureScript { @@ -111,7 +114,7 @@ public: if (instance->GetData(TYPE_MEDIVH) == IN_PROGRESS || instance->GetData(TYPE_MEDIVH) == DONE) return; - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); instance->SetData(TYPE_MEDIVH, IN_PROGRESS); DoCast(me, SPELL_CHANNEL, false); Check_Timer = 5000; @@ -162,7 +165,7 @@ public: if (killer->GetEntry() == me->GetEntry()) return; - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void UpdateAI(const uint32 diff) @@ -195,17 +198,17 @@ public: if (Life25 && pct <= 25) { - DoScriptText(SAY_WEAK25, me); + Talk(SAY_WEAK25); Life25 = false; } else if (Life50 && pct <= 50) { - DoScriptText(SAY_WEAK50, me); + Talk(SAY_WEAK50); Life50 = false; } else if (Life75 && pct <= 75) { - DoScriptText(SAY_WEAK75, me); + Talk(SAY_WEAK75); Life75 = false; } @@ -220,7 +223,7 @@ public: if (instance->GetData(TYPE_RIFT) == DONE) { - DoScriptText(SAY_WIN, me); + Talk(SAY_WIN); Check_Timer = 0; if (me->HasAura(SPELL_CHANNEL)) @@ -363,11 +366,13 @@ public: }; -#define SAY_SAAT_WELCOME -1269019 +enum Saat +{ + SPELL_CHRONO_BEACON = 34975, + ITEM_CHRONO_BEACON = 24289 +}; #define GOSSIP_ITEM_OBTAIN "[PH] Obtain Chrono-Beacon" -#define SPELL_CHRONO_BEACON 34975 -#define ITEM_CHRONO_BEACON 24289 class npc_saat : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 96cfba0007b..3398395aca6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -27,19 +27,25 @@ EndScriptData */ #include "ScriptedCreature.h" #include "old_hillsbrad.h" -#define SAY_ENTER -1560000 -#define SAY_TAUNT1 -1560001 -#define SAY_TAUNT2 -1560002 -#define SAY_SLAY1 -1560003 -#define SAY_SLAY2 -1560004 -#define SAY_DEATH -1560005 - -#define SPELL_HOLY_LIGHT 29427 -#define SPELL_CLEANSE 29380 -#define SPELL_HAMMER_OF_JUSTICE 13005 -#define SPELL_HOLY_SHIELD 31904 -#define SPELL_DEVOTION_AURA 8258 -#define SPELL_CONSECRATION 38385 +/*###################### +# boss_captain_skarloc # +#######################*/ + +enum CaptainSkarloc +{ + SAY_ENTER = 0, + SAY_TAUNT1 = 1, + SAY_TAUNT2 = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + + SPELL_HOLY_LIGHT = 29427, + SPELL_CLEANSE = 29380, + SPELL_HAMMER_OF_JUSTICE = 13005, + SPELL_HOLY_SHIELD = 31904, + SPELL_DEVOTION_AURA = 8258, + SPELL_CONSECRATION = 38385 +}; class boss_captain_skarloc : public CreatureScript { @@ -80,18 +86,18 @@ public: void EnterCombat(Unit* /*who*/) { //This is not correct. Should taunt Thrall before engage in combat - DoScriptText(SAY_TAUNT1, me); - DoScriptText(SAY_TAUNT2, me); + Talk(SAY_TAUNT1); + Talk(SAY_TAUNT2); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance && instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) instance->SetData(TYPE_THRALL_PART1, DONE); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index ab0f10bdfe0..00204300a51 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -27,21 +27,23 @@ EndScriptData */ #include "ScriptedCreature.h" #include "old_hillsbrad.h" -#define SAY_ENTER1 -1560013 -#define SAY_ENTER2 -1560014 -#define SAY_ENTER3 -1560015 -#define SAY_AGGRO1 -1560016 -#define SAY_AGGRO2 -1560017 -#define SAY_SLAY1 -1560018 -#define SAY_SLAY2 -1560019 -#define SAY_BREATH1 -1560020 -#define SAY_BREATH2 -1560021 -#define SAY_DEATH -1560022 - -#define SPELL_SAND_BREATH 31914 -#define SPELL_IMPENDING_DEATH 31916 -#define SPELL_MAGIC_DISRUPTION_AURA 33834 -#define SPELL_WING_BUFFET 31475 +/*################### +# boss_epoch_hunter # +####################*/ + +enum EpochHunter +{ + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_BREATH = 3, + SAY_DEATH = 4, + + SPELL_SAND_BREATH = 31914, + SPELL_IMPENDING_DEATH = 31916, + SPELL_MAGIC_DISRUPTION_AURA = 33834, + SPELL_WING_BUFFET = 31475 +}; class boss_epoch_hunter : public CreatureScript { @@ -77,17 +79,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance && instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) instance->SetData(TYPE_THRALL_PART4, DONE); @@ -107,7 +109,7 @@ public: DoCast(me->getVictim(), SPELL_SAND_BREATH); - DoScriptText(RAND(SAY_BREATH1, SAY_BREATH2), me); + Talk(SAY_BREATH); SandBreath_Timer = urand(10000, 20000); } else SandBreath_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 534c831814e..22036899d64 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -56,18 +56,20 @@ public: ## boss_lieutenant_drake ######*/ -#define SAY_ENTER -1560006 -#define SAY_AGGRO -1560007 -#define SAY_SLAY1 -1560008 -#define SAY_SLAY2 -1560009 -#define SAY_MORTAL -1560010 -#define SAY_SHOUT -1560011 -#define SAY_DEATH -1560012 - -#define SPELL_WHIRLWIND 31909 -#define SPELL_HAMSTRING 9080 -#define SPELL_MORTAL_STRIKE 31911 -#define SPELL_FRIGHTENING_SHOUT 33789 +enum LieutenantDrake +{ + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_MORTAL = 3, + SAY_SHOUT = 4, + SAY_DEATH = 5, + + SPELL_WHIRLWIND = 31909, + SPELL_HAMSTRING = 9080, + SPELL_MORTAL_STRIKE = 31911, + SPELL_FRIGHTENING_SHOUT = 33789 +}; struct Location { @@ -135,17 +137,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void UpdateAI(const uint32 diff) @@ -171,7 +173,7 @@ public: //Fear if (Fear_Timer <= diff) { - DoScriptText(SAY_SHOUT, me); + Talk(SAY_SHOUT); DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); Fear_Timer = 25000+rand()%10000; } else Fear_Timer -= diff; @@ -179,7 +181,7 @@ public: //Mortal Strike if (MortalStrike_Timer <= diff) { - DoScriptText(SAY_MORTAL, me); + Talk(SAY_MORTAL); DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); MortalStrike_Timer = 20000+rand()%10000; } else MortalStrike_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 2000d8a52f8..fe41ff521d8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -36,12 +36,14 @@ EndContentData */ #include "old_hillsbrad.h" #include "Player.h" -#define QUEST_ENTRY_HILLSBRAD 10282 -#define QUEST_ENTRY_DIVERSION 10283 -#define QUEST_ENTRY_ESCAPE 10284 -#define QUEST_ENTRY_RETURN 10285 -#define ITEM_ENTRY_BOMBS 25853 - +enum Erozion +{ + QUEST_ENTRY_HILLSBRAD = 10282, + QUEST_ENTRY_DIVERSION = 10283, + QUEST_ENTRY_ESCAPE = 10284, + QUEST_ENTRY_RETURN = 10285, + ITEM_ENTRY_BOMBS = 25853 +}; #define GOSSIP_HELLO_EROZION1 "I need a pack of Incendiary Bombs." #define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." @@ -98,97 +100,85 @@ public: ######*/ //Thrall texts -#define SAY_TH_START_EVENT_PART1 -1560023 -#define SAY_TH_ARMORY -1560024 -#define SAY_TH_SKARLOC_MEET -1560025 -#define SAY_TH_SKARLOC_TAUNT -1560026 -#define SAY_TH_START_EVENT_PART2 -1560027 -#define SAY_TH_MOUNTS_UP -1560028 -#define SAY_TH_CHURCH_END -1560029 -#define SAY_TH_MEET_TARETHA -1560030 -#define SAY_TH_EPOCH_WONDER -1560031 -#define SAY_TH_EPOCH_KILL_TARETHA -1560032 -#define SAY_TH_EVENT_COMPLETE -1560033 - -#define SAY_TH_RANDOM_LOW_HP1 -1560034 -#define SAY_TH_RANDOM_LOW_HP2 -1560035 - -#define SAY_TH_RANDOM_DIE1 -1560036 -#define SAY_TH_RANDOM_DIE2 -1560037 - -#define SAY_TH_RANDOM_AGGRO1 -1560038 -#define SAY_TH_RANDOM_AGGRO2 -1560039 -#define SAY_TH_RANDOM_AGGRO3 -1560040 -#define SAY_TH_RANDOM_AGGRO4 -1560041 - -#define SAY_TH_RANDOM_KILL1 -1560042 -#define SAY_TH_RANDOM_KILL2 -1560043 -#define SAY_TH_RANDOM_KILL3 -1560044 - -#define SAY_TH_LEAVE_COMBAT1 -1560045 -#define SAY_TH_LEAVE_COMBAT2 -1560046 -#define SAY_TH_LEAVE_COMBAT3 -1560047 - -//Taretha texts -#define SAY_TA_FREE -1560048 -#define SAY_TA_ESCAPED -1560049 - -//Misc for Thrall -#define SPELL_STRIKE 14516 -#define SPELL_SHIELD_BLOCK 12169 -#define SPELL_SUMMON_EROZION_IMAGE 33954 //if thrall dies during escort? +enum ThrallOldHillsbrad +{ + SAY_TH_START_EVENT_PART1 = 0, + SAY_TH_ARMORY = 1, + SAY_TH_SKARLOC_MEET = 2, + SAY_TH_SKARLOC_TAUNT = 3, + SAY_TH_START_EVENT_PART2 = 4, + SAY_TH_MOUNTS_UP = 5, + SAY_TH_CHURCH_END = 6, + SAY_TH_MEET_TARETHA = 7, + SAY_TH_EPOCH_WONDER = 8, + SAY_TH_EPOCH_KILL_TARETHA = 9, + SAY_TH_EVENT_COMPLETE = 10, + + SAY_TH_RANDOM_LOW_HP = 11, + SAY_TH_RANDOM_DIE = 12, + SAY_TH_RANDOM_AGGRO = 13, + SAY_TH_RANDOM_KILL = 14, + SAY_TH_LEAVE_COMBAT = 15, + + //Taretha texts + SAY_TA_FREE = 0, + SAY_TA_ESCAPED = 1, + + //Misc for Thrall + SPELL_STRIKE = 14516, + SPELL_SHIELD_BLOCK = 12169, + SPELL_SUMMON_EROZION_IMAGE = 33954, //if thrall dies during escort? + + THRALL_WEAPON_ITEM = 927, + THRALL_WEAPON_INFO = 218169346, + THRALL_SHIELD_ITEM = 2129, + THRALL_SHIELD_INFO = 234948100, + THRALL_MODEL_UNEQUIPPED = 17292, + THRALL_MODEL_EQUIPPED = 18165, + + //Misc Creature entries + ENTRY_ARMORER = 18764, + ENTRY_SCARLOC = 17862, + + MOB_ENTRY_RIFLE = 17820, + MOB_ENTRY_WARDEN = 17833, + MOB_ENTRY_VETERAN = 17860, + MOB_ENTRY_WATCHMAN = 17814, + MOB_ENTRY_SENTRY = 17815, + + MOB_ENTRY_BARN_GUARDSMAN = 18092, + MOB_ENTRY_BARN_PROTECTOR = 18093, + MOB_ENTRY_BARN_LOOKOUT = 18094, + + MOB_ENTRY_CHURCH_GUARDSMAN = 23175, + MOB_ENTRY_CHURCH_PROTECTOR = 23179, + MOB_ENTRY_CHURCH_LOOKOUT = 23177, + + MOB_ENTRY_INN_GUARDSMAN = 23176, + MOB_ENTRY_INN_PROTECTOR = 23180, + MOB_ENTRY_INN_LOOKOUT = 23178, + + SKARLOC_MOUNT = 18798, + SKARLOC_MOUNT_MODEL = 18223, + EROZION_ENTRY = 18723, + ENTRY_EPOCH = 18096, + + GOSSIP_ID_START = 9568, + GOSSIP_ID_SKARLOC1 = 9614, //I'm glad Taretha is alive. We now must find a way to free her... + GOSSIP_ID_SKARLOC2 = 9579, //What do you mean by this? Is Taretha in danger? + GOSSIP_ID_SKARLOC3 = 9580, + GOSSIP_ID_TARREN = 9597, //tarren mill is beyond these trees + GOSSIP_ID_COMPLETE = 9578 //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her +}; #define SPEED_WALK (0.5f) #define SPEED_RUN (1.0f) #define SPEED_MOUNT (1.6f) -#define THRALL_WEAPON_ITEM 927 -#define THRALL_WEAPON_INFO 218169346 -#define THRALL_SHIELD_ITEM 2129 -#define THRALL_SHIELD_INFO 234948100 -#define THRALL_MODEL_UNEQUIPPED 17292 -#define THRALL_MODEL_EQUIPPED 18165 - -//Misc Creature entries -#define ENTRY_ARMORER 18764 -#define ENTRY_SCARLOC 17862 - -#define MOB_ENTRY_RIFLE 17820 -#define MOB_ENTRY_WARDEN 17833 -#define MOB_ENTRY_VETERAN 17860 -#define MOB_ENTRY_WATCHMAN 17814 -#define MOB_ENTRY_SENTRY 17815 - -#define MOB_ENTRY_BARN_GUARDSMAN 18092 -#define MOB_ENTRY_BARN_PROTECTOR 18093 -#define MOB_ENTRY_BARN_LOOKOUT 18094 - -#define MOB_ENTRY_CHURCH_GUARDSMAN 23175 -#define MOB_ENTRY_CHURCH_PROTECTOR 23179 -#define MOB_ENTRY_CHURCH_LOOKOUT 23177 - -#define MOB_ENTRY_INN_GUARDSMAN 23176 -#define MOB_ENTRY_INN_PROTECTOR 23180 -#define MOB_ENTRY_INN_LOOKOUT 23178 - -#define SKARLOC_MOUNT 18798 -#define SKARLOC_MOUNT_MODEL 18223 -#define EROZION_ENTRY 18723 -#define ENTRY_EPOCH 18096 - //gossip items -#define GOSSIP_ID_START 9568 -#define GOSSIP_ID_SKARLOC1 9614 //I'm glad Taretha is alive. We now must find a way to free her... #define GOSSIP_ITEM_SKARLOC1 "Taretha cannot see you, Thrall." -#define GOSSIP_ID_SKARLOC2 9579 //What do you mean by this? Is Taretha in danger? #define GOSSIP_ITEM_SKARLOC2 "The situation is rather complicated, Thrall. It would be best for you to head into the mountains now, before more of Blackmoore's men show up. We'll make sure Taretha is safe." -#define GOSSIP_ID_SKARLOC3 9580 - -#define GOSSIP_ID_TARREN 9597 //tarren mill is beyond these trees #define GOSSIP_ITEM_TARREN "We're ready, Thrall." - -#define GOSSIP_ID_COMPLETE 9578 //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her - #define GOSSIP_ITEM_WALKING "[PH] Start walking." class npc_thrall_old_hillsbrad : public CreatureScript @@ -215,7 +205,7 @@ public: instance->SetData(TYPE_THRALL_PART1, IN_PROGRESS); } - DoScriptText(SAY_TH_START_EVENT_PART1, creature); + creature->AI()->Talk(SAY_TH_START_EVENT_PART1); if (npc_escortAI* pEscortAI = CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())) pEscortAI->Start(true, true, player->GetGUID()); @@ -236,7 +226,7 @@ public: if (instance) instance->SetData(TYPE_THRALL_PART2, IN_PROGRESS); - DoScriptText(SAY_TH_START_EVENT_PART2, creature); + creature->AI()->Talk(SAY_TH_START_EVENT_PART2); CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())->StartWP(); break; @@ -311,7 +301,7 @@ public: me->SummonCreature(18764, 2181.87f, 112.46f, 89.45f, 0.26f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 9: - DoScriptText(SAY_TH_ARMORY, me); + Talk(SAY_TH_ARMORY); me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, THRALL_WEAPON_ITEM); //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO, THRALL_WEAPON_INFO); //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+1, 781); @@ -344,7 +334,7 @@ public: me->SummonCreature(MOB_ENTRY_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 29: - DoScriptText(SAY_TH_SKARLOC_MEET, me); + Talk(SAY_TH_SKARLOC_MEET); me->SummonCreature(ENTRY_SCARLOC, 2036.48f, 271.22f, 63.43f, 5.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); //temporary, skarloc should rather be triggered to walk up to thrall break; @@ -354,7 +344,7 @@ public: SetRun(false); break; case 31: - DoScriptText(SAY_TH_MOUNTS_UP, me); + Talk(SAY_TH_MOUNTS_UP); DoMount(); SetRun(); break; @@ -400,7 +390,7 @@ public: me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); break; case 84: - DoScriptText(SAY_TH_CHURCH_END, me); + Talk(SAY_TH_CHURCH_END); SetRun(); break; case 91: @@ -416,20 +406,20 @@ public: case 94: if (uint64 TarethaGUID = instance->GetData64(DATA_TARETHA)) { - if (Unit* Taretha = Unit::GetUnit(*me, TarethaGUID)) - DoScriptText(SAY_TA_ESCAPED, Taretha, me); + if (Creature* Taretha = Creature::GetCreature(*me, TarethaGUID)) + Taretha->AI()->Talk(SAY_TA_ESCAPED, me->GetGUID()); } break; case 95: - DoScriptText(SAY_TH_MEET_TARETHA, me); + Talk(SAY_TH_MEET_TARETHA); instance->SetData(TYPE_THRALL_PART3, DONE); SetEscortPaused(true); break; case 96: - DoScriptText(SAY_TH_EPOCH_WONDER, me); + Talk(SAY_TH_EPOCH_WONDER); break; case 97: - DoScriptText(SAY_TH_EPOCH_KILL_TARETHA, me); + Talk(SAY_TH_EPOCH_KILL_TARETHA); SetRun(); break; case 98: @@ -485,7 +475,7 @@ public: } if (HasEscortState(STATE_ESCORT_ESCORTING)) { - DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1, SAY_TH_LEAVE_COMBAT2, SAY_TH_LEAVE_COMBAT3), me); + Talk(SAY_TH_LEAVE_COMBAT); } } void StartWP() @@ -505,7 +495,7 @@ public: } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1, SAY_TH_RANDOM_AGGRO2, SAY_TH_RANDOM_AGGRO3, SAY_TH_RANDOM_AGGRO4), me); + Talk(SAY_TH_RANDOM_AGGRO); if (me->IsMounted()) { DoUnmount(); @@ -532,7 +522,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_TH_RANDOM_KILL1, SAY_TH_RANDOM_KILL2, SAY_TH_RANDOM_KILL3), me); + Talk(SAY_TH_RANDOM_KILL); } void JustDied(Unit* slayer) { @@ -543,7 +533,7 @@ public: if (slayer == me) return; - DoScriptText(RAND(SAY_TH_RANDOM_DIE1, SAY_TH_RANDOM_DIE2), me); + Talk(SAY_TH_RANDOM_DIE); } void UpdateAI(const uint32 diff) @@ -556,7 +546,7 @@ public: //TODO: add his abilities'n-crap here if (!LowHp && HealthBelowPct(20)) { - DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1, SAY_TH_RANDOM_LOW_HP2), me); + Talk(SAY_TH_RANDOM_LOW_HP); LowHp = true; } } @@ -567,10 +557,13 @@ public: /*###### ## npc_taretha ######*/ +enum Taretha +{ + GOSSIP_ID_EPOCH1 = 9610, //Thank you for helping Thrall escape, friends. Now I only hope + GOSSIP_ID_EPOCH2 = 9613 //Yes, friends. This man was no wizard of +}; -#define GOSSIP_ID_EPOCH1 9610 //Thank you for helping Thrall escape, friends. Now I only hope #define GOSSIP_ITEM_EPOCH1 "Strange wizard?" -#define GOSSIP_ID_EPOCH2 9613 //Yes, friends. This man was no wizard of #define GOSSIP_ITEM_EPOCH2 "We'll get you out. Taretha. Don't worry. I doubt the wizard would wander too far away." class npc_taretha : public CreatureScript @@ -638,7 +631,7 @@ public: switch (waypointId) { case 6: - DoScriptText(SAY_TA_FREE, me); + Talk(SAY_TA_FREE); break; case 7: me->HandleEmoteCommand(EMOTE_ONESHOT_CHEER); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 44f9aa1184a..b3690ab14c7 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -26,16 +26,19 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SAY_AGGRO -1129000 -#define SAY_SUMMON60 -1129001 -#define SAY_SUMMON30 -1129002 -#define SAY_HP -1129003 -#define SAY_KILL -1129004 - -#define SPELL_AMNENNARSWRATH 13009 -#define SPELL_FROSTBOLT 15530 -#define SPELL_FROST_NOVA 15531 -#define SPELL_FROST_SPECTRES 12642 +enum AmnennarTheColdbringer +{ + SAY_AGGRO = 0, + SAY_SUMMON60 = 1, + SAY_SUMMON30 = 2, + SAY_HP = 3, + SAY_KILL = 4, + + SPELL_AMNENNARSWRATH = 13009, + SPELL_FROSTBOLT = 15530, + SPELL_FROST_NOVA = 15531, + SPELL_FROST_SPECTRES = 12642 +}; class boss_amnennar_the_coldbringer : public CreatureScript { @@ -70,12 +73,12 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void UpdateAI(const uint32 diff) @@ -105,20 +108,20 @@ public: if (!Spectrals60 && HealthBelowPct(60)) { - DoScriptText(SAY_SUMMON60, me); + Talk(SAY_SUMMON60); DoCast(me->getVictim(), SPELL_FROST_SPECTRES); Spectrals60 = true; } if (!Hp && HealthBelowPct(50)) { - DoScriptText(SAY_HP, me); + Talk(SAY_HP); Hp = true; } if (!Spectrals30 && HealthBelowPct(30)) { - DoScriptText(SAY_SUMMON30, me); + Talk(SAY_SUMMON30); DoCast(me->getVictim(), SPELL_FROST_SPECTRES); Spectrals30 = true; } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 7b3cd9f9900..b0953c73e57 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -33,20 +33,23 @@ EndContentData */ #include "razorfen_kraul.h" #include "Player.h" -#define SAY_READY -1047000 -#define SAY_POINT -1047001 -#define SAY_AGGRO1 -1047002 -#define SAY_BLUELEAF -1047003 -#define SAY_DANGER -1047004 -#define SAY_BAD -1047005 -#define SAY_THINK -1047006 -#define SAY_SOON -1047007 -#define SAY_FINALY -1047008 -#define SAY_WIN -1047009 -#define SAY_END -1047010 - -#define QUEST_WILLIX_THE_IMPORTER 1144 -#define ENTRY_BOAR 4514 +enum Willix +{ + SAY_READY = 0, + SAY_POINT = 1, + SAY_AGGRO1 = 2, + SAY_BLUELEAF = 3, + SAY_DANGER = 4, + SAY_BAD = 5, + SAY_THINK = 6, + SAY_SOON = 7, + SAY_FINALY = 8, + SAY_WIN = 9, + SAY_END = 10, + + QUEST_WILLIX_THE_IMPORTER = 1144, + ENTRY_BOAR = 4514 +}; class npc_willix : public CreatureScript { @@ -58,7 +61,7 @@ public: if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) { CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); - DoScriptText(SAY_READY, creature, player); + creature->AI()->Talk(SAY_READY, player->GetGUID()); creature->setFaction(113); } @@ -84,43 +87,43 @@ public: { case 3: me->HandleEmoteCommand(EMOTE_STATE_POINT); - DoScriptText(SAY_POINT, me, player); + Talk(SAY_POINT, player->GetGUID()); break; case 4: me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 8: - DoScriptText(SAY_BLUELEAF, me, player); + Talk(SAY_BLUELEAF, player->GetGUID()); break; case 9: - DoScriptText(SAY_DANGER, me, player); + Talk(SAY_DANGER, player->GetGUID()); break; case 13: - DoScriptText(SAY_BAD, me, player); + Talk(SAY_BAD, player->GetGUID()); break; case 14: me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 25: - DoScriptText(SAY_THINK, me, player); + Talk(SAY_THINK, player->GetGUID()); break; case 31: - DoScriptText(SAY_SOON, me, player); + Talk(SAY_SOON, player->GetGUID()); break; case 42: - DoScriptText(SAY_FINALY, me, player); + Talk(SAY_FINALY, player->GetGUID()); break; case 43: me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 45: - DoScriptText(SAY_WIN, me, player); + Talk(SAY_WIN, player->GetGUID()); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); if (player->GetTypeId() == TYPEID_PLAYER) CAST_PLR(player)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me); break; case 46: - DoScriptText(SAY_END, me, player); + Talk(SAY_END, player->GetGUID()); break; } } @@ -129,7 +132,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO1, me, NULL); + Talk(SAY_AGGRO1); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 6b569bbd3e5..1cb69689b67 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -142,7 +142,7 @@ enum Actions enum Yells { //Text emote - EMOTE_WEAKENED = -1531011, + EMOTE_WEAKENED = 0, // ****** Out of Combat ****** // Random Wispers - No txt only sound @@ -712,7 +712,7 @@ public: { instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_WEAK); - DoScriptText(EMOTE_WEAKENED, me); + Talk(EMOTE_WEAKENED); PhaseTimer = 45000; DoCast(me, SPELL_PURPLE_COLORATION, true); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 83af40c57f2..ab4968e3bf7 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -26,15 +26,18 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define EMOTE_GENERIC_FRENZY_KILL -1000001 -#define EMOTE_GENERIC_BERSERK -1000004 - -#define SPELL_FRENZY 26051 -#define SPELL_BERSERK 26068 -#define SPELL_POISONBOLT 26052 -#define SPELL_NOXIOUSPOISON 26053 -#define SPELL_WYVERNSTING 26180 -#define SPELL_ACIDSPIT 26050 +enum Huhuran +{ + EMOTE_FRENZY_KILL = 0, + EMOTE_BERSERK = 1, + + SPELL_FRENZY = 26051, + SPELL_BERSERK = 26068, + SPELL_POISONBOLT = 26052, + SPELL_NOXIOUSPOISON = 26053, + SPELL_WYVERNSTING = 26180, + SPELL_ACIDSPIT = 26050 +}; class boss_huhuran : public CreatureScript { @@ -87,7 +90,7 @@ public: if (!Frenzy && Frenzy_Timer <= diff) { DoCast(me, SPELL_FRENZY); - DoScriptText(EMOTE_GENERIC_FRENZY_KILL, me); + Talk(EMOTE_FRENZY_KILL); Frenzy = true; PoisonBolt_Timer = 3000; Frenzy_Timer = urand(25000, 35000); @@ -136,7 +139,7 @@ public: if (!Berserk && HealthBelowPct(31)) { me->InterruptNonMeleeSpells(false); - DoScriptText(EMOTE_GENERIC_BERSERK, me); + Talk(EMOTE_BERSERK); DoCast(me, SPELL_BERSERK); Berserk = true; } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 02554bbe6b3..2ac9358b976 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -26,17 +26,20 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SAY_AGGRO -1531008 -#define SAY_SLAY -1531009 -#define SAY_DEATH -1531010 +enum Sartura +{ + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, -#define SPELL_WHIRLWIND 26083 -#define SPELL_ENRAGE 28747 //Not sure if right ID. -#define SPELL_ENRAGEHARD 28798 + SPELL_WHIRLWIND = 26083, + SPELL_ENRAGE = 28747, //Not sure if right ID. + SPELL_ENRAGEHARD = 28798, //Guard Spell -#define SPELL_WHIRLWINDADD 26038 -#define SPELL_KNOCKBACK 26027 + SPELL_WHIRLWINDADD = 26038, + SPELL_KNOCKBACK = 26027 +}; class boss_sartura : public CreatureScript { @@ -82,17 +85,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 917c790f42b..4ebdc408963 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -29,19 +29,18 @@ EndScriptData */ #include "Group.h" #include "Player.h" -#define SAY_AGGRO1 -1531000 -#define SAY_AGGRO2 -1531001 -#define SAY_AGGRO3 -1531002 -#define SAY_SLAY1 -1531003 -#define SAY_SLAY2 -1531004 -#define SAY_SLAY3 -1531005 -#define SAY_SPLIT -1531006 -#define SAY_DEATH -1531007 - -#define SPELL_ARCANE_EXPLOSION 25679 -#define SPELL_EARTH_SHOCK 26194 -#define SPELL_TRUE_FULFILLMENT 785 -#define SPELL_BLINK 28391 +enum Skeram +{ + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_SPLIT = 2, + SAY_DEATH = 3, + + SPELL_ARCANE_EXPLOSION = 25679, + SPELL_EARTH_SHOCK = 26194, + SPELL_TRUE_FULFILLMENT = 785, + SPELL_BLINK = 28391 +}; class ov_mycoordinates { @@ -104,20 +103,20 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { if (!IsImage) - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { if (IsImage || Images75) return; - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) @@ -209,7 +208,7 @@ public: void DoSplit(int atPercent /* 75 50 25 */) { - DoScriptText(SAY_SPLIT, me); + Talk(SAY_SPLIT); ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f, 2083.814453f, 125.648788f, 0); ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f, 2118.504639f, 133.058151f, 0); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index a4d28498816..6cc8d5931d3 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -26,7 +26,6 @@ EndScriptData */ /* ContentData EndContentData */ -#include "AchievementMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" @@ -38,35 +37,32 @@ EndContentData */ ## npc_disciple_of_naralex ######*/ -enum eEnums +enum Enums { - //say - SAY_MAKE_PREPARATIONS = -1043001, - SAY_TEMPLE_OF_PROMISE = -1043002, - SAY_MUST_CONTINUE = -1043003, - SAY_BANISH_THE_SPIRITS = -1043004, - SAY_CAVERNS_PURIFIED = -1043005, - SAY_BEYOND_THIS_CORRIDOR = -1043006, - SAY_EMERALD_DREAM = -1043007, - SAY_MUTANUS_THE_DEVOURER = -1043012, - SAY_NARALEX_AWAKES = -1043014, - SAY_THANK_YOU = -1043015, - SAY_FAREWELL = -1043016, - SAY_ATTACKED = -1043017, - //yell - SAY_AT_LAST = -1043000, - SAY_I_AM_AWAKE = -1043013, - //emote - EMOTE_AWAKENING_RITUAL = -1043008, - EMOTE_TROUBLED_SLEEP = -1043009, - EMOTE_WRITHE_IN_AGONY = -1043010, - EMOTE_HORRENDOUS_VISION = -1043011, - //spell + SAY_AT_LAST = 0, + SAY_MAKE_PREPARATIONS = 1, + SAY_TEMPLE_OF_PROMISE = 2, + SAY_MUST_CONTINUE = 3, + SAY_BANISH_THE_SPIRITS = 4, + SAY_CAVERNS_PURIFIED = 5, + SAY_BEYOND_THIS_CORRIDOR = 6, + SAY_EMERALD_DREAM = 7, + EMOTE_AWAKENING_RITUAL = 8, + EMOTE_TROUBLED_SLEEP = 0, + EMOTE_WRITHE_IN_AGONY = 1, + EMOTE_HORRENDOUS_VISION = 2, + SAY_MUTANUS_THE_DEVOURER = 9, + SAY_I_AM_AWAKE = 3, + SAY_NARALEX_AWAKES = 10, + SAY_THANK_YOU = 4, + SAY_FAREWELL = 5, + SAY_ATTACKED = 11, + SPELL_MARK_OF_THE_WILD_RANK_2 = 5232, SPELL_SERPENTINE_CLEANSING = 6270, SPELL_NARALEXS_AWAKENING = 6271, SPELL_FLIGHT_FORM = 33943, - //npc entry + NPC_DEVIATE_RAVAGER = 3636, NPC_DEVIATE_VIPER = 5755, NPC_DEVIATE_MOCCASIN = 5762, @@ -77,7 +73,6 @@ enum eEnums #define GOSSIP_ID_START_1 698 //Naralex sleeps again! #define GOSSIP_ID_START_2 699 //The fanglords are dead! #define GOSSIP_ITEM_NARALEX "Let the event begin!" -#define ACHIEVEMENT_WAILING_CAVERNS 630 class npc_disciple_of_naralex : public CreatureScript { @@ -99,7 +94,7 @@ public: if (instance) instance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS); - DoScriptText(SAY_MAKE_PREPARATIONS, creature); + creature->AI()->Talk(SAY_MAKE_PREPARATIONS); creature->setFaction(250); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); @@ -126,7 +121,7 @@ public: if (!instance->GetData(TYPE_NARALEX_YELLED)) { - DoScriptText(SAY_AT_LAST, creature); + creature->AI()->Talk(SAY_AT_LAST); instance->SetData(TYPE_NARALEX_YELLED, 1); } } @@ -168,7 +163,7 @@ public: instance->SetData(TYPE_NARALEX_PART1, IN_PROGRESS); break; case 5: - DoScriptText(SAY_MUST_CONTINUE, me); + Talk(SAY_MUST_CONTINUE); instance->SetData(TYPE_NARALEX_PART1, DONE); break; case 11: @@ -177,7 +172,7 @@ public: instance->SetData(TYPE_NARALEX_PART2, IN_PROGRESS); break; case 19: - DoScriptText(SAY_BEYOND_THIS_CORRIDOR, me); + Talk(SAY_BEYOND_THIS_CORRIDOR); break; case 24: eventProgress = 1; @@ -194,7 +189,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(SAY_ATTACKED, me, who); + Talk(SAY_ATTACKED, who->GetGUID()); } void JustDied(Unit* /*slayer*/) @@ -231,7 +226,7 @@ public: if (eventProgress == 1) { ++eventProgress; - DoScriptText(SAY_TEMPLE_OF_PROMISE, me); + Talk(SAY_TEMPLE_OF_PROMISE); me->SummonCreature(NPC_DEVIATE_RAVAGER, -82.1763f, 227.874f, -93.3233f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); me->SummonCreature(NPC_DEVIATE_RAVAGER, -72.9506f, 216.645f, -93.6756f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); } @@ -240,7 +235,7 @@ public: if (eventProgress == 1) { ++eventProgress; - DoScriptText(SAY_BANISH_THE_SPIRITS, me); + Talk(SAY_BANISH_THE_SPIRITS); DoCast(me, SPELL_SERPENTINE_CLEANSING); //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); eventTimer = 30000; @@ -252,7 +247,7 @@ public: if (eventProgress == 2) { //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(true); - DoScriptText(SAY_CAVERNS_PURIFIED, me); + Talk(SAY_CAVERNS_PURIFIED); instance->SetData(TYPE_NARALEX_PART2, DONE); if (me->HasAura(SPELL_SERPENTINE_CLEANSING)) me->RemoveAura(SPELL_SERPENTINE_CLEANSING); @@ -264,7 +259,7 @@ public: ++eventProgress; eventTimer = 4000; me->SetStandState(UNIT_STAND_STATE_KNEEL); - DoScriptText(SAY_EMERALD_DREAM, me); + Talk(SAY_EMERALD_DREAM); } else if (eventProgress == 2) @@ -274,7 +269,7 @@ public: //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) DoCast(naralex, SPELL_NARALEXS_AWAKENING, true); - DoScriptText(EMOTE_AWAKENING_RITUAL, me); + Talk(EMOTE_AWAKENING_RITUAL); } else if (eventProgress == 3) @@ -282,7 +277,7 @@ public: ++eventProgress; eventTimer = 15000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_TROUBLED_SLEEP, naralex); + naralex->AI()->Talk(EMOTE_TROUBLED_SLEEP); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 135.943f, 199.701f, -103.529f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 151.08f, 221.13f, -103.609f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 128.007f, 227.428f, -97.421f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); @@ -293,7 +288,7 @@ public: ++eventProgress; eventTimer = 30000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_WRITHE_IN_AGONY, naralex); + naralex->AI()->Talk(EMOTE_WRITHE_IN_AGONY); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 133.413f, 207.188f, -102.469f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 142.857f, 218.645f, -102.905f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 105.102f, 227.211f, -102.752f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); @@ -307,9 +302,9 @@ public: { ++eventProgress; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_HORRENDOUS_VISION, naralex); + naralex->AI()->Talk(EMOTE_HORRENDOUS_VISION); me->SummonCreature(NPC_MUTANUS_THE_DEVOURER, 150.872f, 262.905f, -103.503f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - DoScriptText(SAY_MUTANUS_THE_DEVOURER, me); + Talk(SAY_MUTANUS_THE_DEVOURER); instance->SetData(TYPE_MUTANUS_THE_DEVOURER, IN_PROGRESS); } else @@ -319,23 +314,12 @@ public: eventTimer = 3000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { - AchievementEntry const* AchievWC = sAchievementMgr->GetAchievement(ACHIEVEMENT_WAILING_CAVERNS); - if (AchievWC) - { - Map* map = me->GetMap(); - if (map && map->IsDungeon()) - { - Map::PlayerList const &players = map->GetPlayers(); - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - itr->getSource()->CompletedAchievement(AchievWC); - } - } if (me->HasAura(SPELL_NARALEXS_AWAKENING)) me->RemoveAura(SPELL_NARALEXS_AWAKENING); naralex->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_I_AM_AWAKE, naralex); + naralex->AI()->Talk(SAY_I_AM_AWAKE); } - DoScriptText(SAY_NARALEX_AWAKES, me); + Talk(SAY_NARALEX_AWAKES); } else if (eventProgress == 7) @@ -343,7 +327,7 @@ public: ++eventProgress; eventTimer = 6000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(SAY_THANK_YOU, naralex); + naralex->AI()->Talk(SAY_THANK_YOU); } else if (eventProgress == 8) @@ -352,7 +336,7 @@ public: eventTimer = 8000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { - DoScriptText(SAY_FAREWELL, naralex); + naralex->AI()->Talk(SAY_FAREWELL); naralex->AddAura(SPELL_FLIGHT_FORM, naralex); } SetRun(); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index f288db920f4..0a948e4a5f0 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -242,16 +242,16 @@ private: enum weegliSpells { - SPELL_BOMB = 8858, - SPELL_GOBLIN_LAND_MINE = 21688, - SPELL_SHOOT = 6660, - SPELL_WEEGLIS_BARREL = 10772 + SPELL_BOMB = 8858, + SPELL_GOBLIN_LAND_MINE = 21688, + SPELL_SHOOT = 6660, + SPELL_WEEGLIS_BARREL = 10772 }; enum weegliSays { - SAY_WEEGLI_OHNO = -1209000, - SAY_WEEGLI_OK_I_GO = -1209001 + SAY_WEEGLI_OHNO = 0, + SAY_WEEGLI_OK_I_GO = 1 }; #define GOSSIP_WEEGLI "[PH] Please blow up the door." @@ -363,7 +363,7 @@ public: if (instance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) { instance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR); - DoScriptText(SAY_WEEGLI_OHNO, me); + Talk(SAY_WEEGLI_OHNO); me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0); } else @@ -388,7 +388,7 @@ public: me->setFaction(FACTION_FRIENDLY); me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f); me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f); // in case he gets interrupted - DoScriptText(SAY_WEEGLI_OK_I_GO, me); + Talk(SAY_WEEGLI_OK_I_GO); destroyingDoor=true; } } diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 0e44da371d6..40ac1609fee 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -97,7 +97,7 @@ class npc_torek : public CreatureScript me->SummonCreature(ENTRY_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 20: - DoScriptText(SAY_WIN, me, player); + Talk(SAY_WIN, player->GetGUID()); Completed = true; player->GroupEventHappens(QUEST_TOREK_ASSULT, me); break; @@ -269,16 +269,16 @@ class npc_ruul_snowhoof : public CreatureScript enum Muglash { - SAY_MUG_START1 = -1800054, - SAY_MUG_START2 = -1800055, - SAY_MUG_BRAZIER = -1800056, - SAY_MUG_BRAZIER_WAIT = -1800057, - SAY_MUG_ON_GUARD = -1800058, - SAY_MUG_REST = -1800059, - SAY_MUG_DONE = -1800060, - SAY_MUG_GRATITUDE = -1800061, - SAY_MUG_PATROL = -1800062, - SAY_MUG_RETURN = -1800063, + SAY_MUG_START1 = 0, + SAY_MUG_START2 = 1, + SAY_MUG_BRAZIER = 2, + SAY_MUG_BRAZIER_WAIT = 3, + SAY_MUG_ON_GUARD = 4, + SAY_MUG_REST = 5, + SAY_MUG_DONE = 6, + SAY_MUG_GRATITUDE = 7, + SAY_MUG_PATROL = 8, + SAY_MUG_RETURN = 9, QUEST_VORSHA = 6641, @@ -337,10 +337,10 @@ class npc_muglash : public CreatureScript switch (waypointId) { case 0: - DoScriptText(SAY_MUG_START2, me, player); + Talk(SAY_MUG_START2, player->GetGUID()); break; case 24: - DoScriptText(SAY_MUG_BRAZIER, me, player); + Talk(SAY_MUG_BRAZIER, player->GetGUID()); if (GameObject* go = GetClosestGameObjectWithEntry(me, GO_NAGA_BRAZIER, INTERACTION_DISTANCE*2)) { @@ -349,14 +349,14 @@ class npc_muglash : public CreatureScript } break; case 25: - DoScriptText(SAY_MUG_GRATITUDE, me); + Talk(SAY_MUG_GRATITUDE); player->GroupEventHappens(QUEST_VORSHA, me); break; case 26: - DoScriptText(SAY_MUG_PATROL, me); + Talk(SAY_MUG_PATROL); break; case 27: - DoScriptText(SAY_MUG_RETURN, me); + Talk(SAY_MUG_RETURN); break; } } @@ -368,7 +368,7 @@ class npc_muglash : public CreatureScript if (HasEscortState(STATE_ESCORT_PAUSED)) { if (urand(0, 1)) - DoScriptText(SAY_MUG_ON_GUARD, me, player); + Talk(SAY_MUG_ON_GUARD, player->GetGUID()); return; } } @@ -406,7 +406,7 @@ class npc_muglash : public CreatureScript break; case 4: SetEscortPaused(false); - DoScriptText(SAY_MUG_DONE, me); + Talk(SAY_MUG_DONE); break; } } @@ -445,7 +445,7 @@ class npc_muglash : public CreatureScript { if (npc_muglashAI* pEscortAI = CAST_AI(npc_muglashAI, creature->AI())) { - DoScriptText(SAY_MUG_START1, creature); + creature->AI()->Talk(SAY_MUG_START1); creature->setFaction(113); pEscortAI->Start(true, false, player->GetGUID()); @@ -466,7 +466,7 @@ class go_naga_brazier : public GameObjectScript { if (npc_muglash::npc_muglashAI* pEscortAI = CAST_AI(npc_muglash::npc_muglashAI, creature->AI())) { - DoScriptText(SAY_MUG_BRAZIER_WAIT, creature); + creature->AI()->Talk(SAY_MUG_BRAZIER_WAIT); pEscortAI->IsBrazierExtinguished = true; return false; diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 6a109cded3b..ae0199e5dee 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -46,15 +46,9 @@ EndContentData */ enum draeneiSurvivor { - SAY_HEAL1 = -1000176, - SAY_HEAL2 = -1000177, - SAY_HEAL3 = -1000178, - SAY_HEAL4 = -1000179, + SAY_HEAL = 0, - SAY_HELP1 = -1000180, - SAY_HELP2 = -1000181, - SAY_HELP3 = -1000182, - SAY_HELP4 = -1000183, + SAY_HELP = 1, SPELL_IRRIDATION = 35046, SPELL_STUNNED = 28630 @@ -107,7 +101,7 @@ public: if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) { //Random switch between 4 texts - DoScriptText(RAND(SAY_HELP1, SAY_HELP2, SAY_HELP3, SAY_HELP4), me, who); + Talk(SAY_HELP, who->GetGUID()); SayHelpTimer = 20000; CanSayHelp = false; @@ -139,7 +133,7 @@ public: if (Player* player = Unit::GetPlayer(*me, pCaster)) { - DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, player); + Talk(SAY_HEAL, player->GetGUID()); player->TalkedToCreature(me->GetEntry(), me->GetGUID()); } @@ -180,9 +174,9 @@ public: enum Overgrind { - SAY_TEXT = -1000184, - SAY_EMOTE = -1000185, - ATTACK_YELL = -1000186, + SAY_TEXT = 0, + SAY_EMOTE = 1, + ATTACK_YELL = 2, AREA_COVE = 3579, AREA_ISLE = 3639, @@ -256,7 +250,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(ATTACK_YELL, me, who); + Talk(ATTACK_YELL, who->GetGUID()); } void UpdateAI(const uint32 diff) @@ -265,8 +259,8 @@ public: { if (EmoteTimer <= diff) { - DoScriptText(SAY_TEXT, me); - DoScriptText(SAY_EMOTE, me); + Talk(SAY_TEXT); + Talk(SAY_EMOTE); EmoteTimer = urand(120000, 150000); } else EmoteTimer -= diff; } @@ -337,12 +331,12 @@ public: enum Magwin { - SAY_START = -1000111, - SAY_AGGRO = -1000112, - SAY_PROGRESS = -1000113, - SAY_END1 = -1000114, - SAY_END2 = -1000115, - EMOTE_HUG = -1000116, + SAY_START = 0, + SAY_AGGRO = 1, + SAY_PROGRESS = 2, + SAY_END1 = 3, + SAY_END2 = 4, + EMOTE_HUG = 5, QUEST_A_CRY_FOR_SAY_HELP = 9528 }; @@ -379,17 +373,17 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_START, me, player); + Talk(SAY_START, player->GetGUID()); break; case 17: - DoScriptText(SAY_PROGRESS, me, player); + Talk(SAY_PROGRESS, player->GetGUID()); break; case 28: - DoScriptText(SAY_END1, me, player); + Talk(SAY_END1, player->GetGUID()); break; case 29: - DoScriptText(EMOTE_HUG, me, player); - DoScriptText(SAY_END2, me, player); + Talk(EMOTE_HUG, player->GetGUID()); + Talk(SAY_END2, player->GetGUID()); player->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me); break; } @@ -398,7 +392,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(SAY_AGGRO, me, who); + Talk(SAY_AGGRO, who->GetGUID()); } void Reset() {} @@ -406,6 +400,174 @@ public: }; +/*###### +## npc_geezle +######*/ + +enum Geezle +{ + QUEST_TREES_COMPANY = 9531, + + SPELL_TREE_DISGUISE = 30298, + + GEEZLE_SAY_1 = 0, + SPARK_SAY_2 = 0, + SPARK_SAY_3 = 1, + GEEZLE_SAY_4 = 1, + SPARK_SAY_5 = 2, + SPARK_SAY_6 = 3, + GEEZLE_SAY_7 = 2, + + EMOTE_SPARK = 4, + + MOB_SPARK = 17243, + GO_NAGA_FLAG = 181694 +}; + +Position const SparkPos = {-5029.91f, -11291.79f, 8.096f, 0.0f}; + +class npc_geezle : public CreatureScript +{ +public: + npc_geezle() : CreatureScript("npc_geezle") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_geezleAI(creature); + } + + struct npc_geezleAI : public ScriptedAI + { + npc_geezleAI(Creature* creature) : ScriptedAI(creature) {} + + uint64 SparkGUID; + + uint8 Step; + uint32 SayTimer; + + bool EventStarted; + + void Reset() + { + SparkGUID = 0; + Step = 0; + StartEvent(); + } + + void EnterCombat(Unit* /*who*/){} + + void StartEvent() + { + Step = 0; + EventStarted = true; + if (Creature* Spark = me->SummonCreature(MOB_SPARK, SparkPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + { + SparkGUID = Spark->GetGUID(); + Spark->setActive(true); + Spark->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + SayTimer = 8000; + } + + uint32 NextStep(uint8 Step) + { + Creature* Spark = Unit::GetCreature(*me, SparkGUID); + if (!Spark) + return 99999999; + + switch (Step) + { + case 0: + Spark->GetMotionMaster()->MovePoint(0, -5080.70f, -11253.61f, 0.56f); + me->GetMotionMaster()->MovePoint(0, -5092.26f, -11252, 0.71f); + return 9000; + case 1: + DespawnNagaFlag(true); + Spark->AI()->Talk(EMOTE_SPARK); + return 1000; + case 2: + Talk(GEEZLE_SAY_1, SparkGUID); + Spark->SetInFront(me); + me->SetInFront(Spark); + return 5000; + case 3: + Spark->AI()->Talk(SPARK_SAY_2); + return 7000; + case 4: + Spark->AI()->Talk(SPARK_SAY_3); + return 8000; + case 5: + Talk(GEEZLE_SAY_4, SparkGUID); + return 8000; + case 6: + Spark->AI()->Talk(SPARK_SAY_5); + return 9000; + case 7: + Spark->AI()->Talk(SPARK_SAY_6); + return 8000; + case 8: + Talk(GEEZLE_SAY_7, SparkGUID); + return 2000; + case 9: + me->GetMotionMaster()->MoveTargetedHome(); + Spark->GetMotionMaster()->MovePoint(0, SparkPos); + CompleteQuest(); + return 9000; + case 10: + Spark->DisappearAndDie(); + DespawnNagaFlag(false); + me->DisappearAndDie(); + default: return 99999999; + } + } + + // will complete Tree's company quest for all nearby players that are disguised as trees + void CompleteQuest() + { + float radius = 50.0f; + std::list<Player*> players; + Trinity::AnyPlayerInObjectRangeCheck checker(me, radius); + Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, players, checker); + me->VisitNearbyWorldObject(radius, searcher); + + for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr) + if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE && (*itr)->HasAura(SPELL_TREE_DISGUISE)) + (*itr)->KilledMonsterCredit(MOB_SPARK, 0); + } + + void DespawnNagaFlag(bool despawn) + { + std::list<GameObject*> FlagList; + me->GetGameObjectListWithEntryInGrid(FlagList, GO_NAGA_FLAG, 100.0f); + + if (!FlagList.empty()) + { + for (std::list<GameObject*>::const_iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr) + { + if (despawn) + (*itr)->SetLootState(GO_JUST_DEACTIVATED); + else + (*itr)->Respawn(); + } + } + else + sLog->outError(LOG_FILTER_TSCR, "SD2 ERROR: FlagList is empty!"); + } + + void UpdateAI(const uint32 diff) + { + if (SayTimer <= diff) + { + if (EventStarted) + SayTimer = NextStep(Step++); + } + else + SayTimer -= diff; + } + }; + +}; + enum RavegerCage { NPC_DEATH_RAVAGER = 17556, @@ -497,9 +659,7 @@ enum BristlelimbCage NPC_STILLPINE_CAPITIVE = 17375, GO_BRISTELIMB_CAGE = 181714, - CAPITIVE_SAY_1 = -1000474, - CAPITIVE_SAY_2 = -1000475, - CAPITIVE_SAY_3 = -1000476, + CAPITIVE_SAY = 0, POINT_INIT = 1, EVENT_DESPAWN = 1, @@ -512,9 +672,7 @@ class npc_stillpine_capitive : public CreatureScript struct npc_stillpine_capitiveAI : public ScriptedAI { - npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) - { - } + npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { @@ -532,7 +690,7 @@ class npc_stillpine_capitive : public CreatureScript { if (owner) { - DoScriptText(RAND(CAPITIVE_SAY_1, CAPITIVE_SAY_2, CAPITIVE_SAY_3), me, owner); + Talk(CAPITIVE_SAY, owner->GetGUID()); _player = owner; } Position pos; diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp index 339cd02c2e3..3b77ee34275 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp @@ -158,7 +158,7 @@ enum Stillpine NPC_PRINCESS_STILLPINE = 17682, GO_PRINCESS_STILLPINES_CAGE = 181928, SPELL_OPENING_PRINCESS_STILLPINE_CREDIT = 31003, - SAY_DIRECTION = -1800074 + SAY_DIRECTION = 0 }; class go_princess_stillpines_cage : public GameObjectScript @@ -191,7 +191,7 @@ public: { if (type == POINT_MOTION_TYPE && id == 1) { - DoScriptText(SAY_DIRECTION, me); + Talk(SAY_DIRECTION); me->DespawnOrUnsummon(); } } diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index c1bbb05e27f..f1fe56b5c10 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -16,24 +16,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* ScriptData -SDName: Darkshore -SD%Complete: 0 -SDComment: Quest support: -SDCategory: Darkshore -EndScriptData */ - -/* ContentData -EndContentData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "ScriptedFollowerAI.h" -#include "Player.h" -#include "SpellInfo.h" - void AddSC_darkshore() { } diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index b48945fdb46..b30b73a3e8f 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -38,9 +38,7 @@ EndContentData */ enum DyingKodo { // signed for 9999 - SAY_SMEED_HOME_1 = -1000348, - SAY_SMEED_HOME_2 = -1000349, - SAY_SMEED_HOME_3 = -1000350, + SAY_SMEED_HOME = 0, QUEST_KODO = 5561, @@ -132,7 +130,8 @@ public: if (me->IsWithinDistInMap(who, 10.0f)) { - DoScriptText(RAND(SAY_SMEED_HOME_1, SAY_SMEED_HOME_2, SAY_SMEED_HOME_3), who); + if (Creature* talker = who->ToCreature()) + talker->AI()->Talk(SAY_SMEED_HOME); //spell have no implemented effect (dummy), so useful to notify spellHit DoCast(me, SPELL_KODO_KOMBO_GOSSIP, true); diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index 126651facc6..0d769f62426 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -27,7 +27,7 @@ enum LazyPeonYells { - SAY_SPELL_HIT = -1000600 // Ow! OK, I''ll get back to work, $N!' + SAY_SPELL_HIT = 0 }; enum LazyPeon @@ -76,7 +76,7 @@ public: && CAST_PLR(caster)->GetQuestStatus(QUEST_LAZY_PEONS) == QUEST_STATUS_INCOMPLETE) { caster->ToPlayer()->KilledMonsterCredit(me->GetEntry(), me->GetGUID()); - DoScriptText(SAY_SPELL_HIT, me, caster); + Talk(SAY_SPELL_HIT, caster->GetGUID()); me->RemoveAllAuras(); if (GameObject* Lumberpile = me->FindNearestGameObject(GO_LUMBERPILE, 20)) me->GetMotionMaster()->MovePoint(1, Lumberpile->GetPositionX()-1, Lumberpile->GetPositionY(), Lumberpile->GetPositionZ()); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index d2ce38693d1..f5876824da4 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -37,6 +37,436 @@ EndContentData */ #include "WorldSession.h" /*###### +## mobs_risen_husk_spirit +######*/ + +enum HauntingWitchHill +{ + // Quest + QUEST_WHATS_HAUNTING_WITCH_HILL = 11180, + + // General spells + SPELL_SUMMON_RESTLESS_APPARITION = 42511, + SPELL_WITCH_HILL_INFORMATION_CREDIT = 42512, + + // Risen Husk specific + SPELL_CONSUME_FLESH = 37933, + NPC_RISEN_HUSK = 23555, + + // Risen Spirit specific + SPELL_INTANGIBLE_PRESENCE = 43127, + NPC_RISEN_SPIRIT = 23554, + + // Events + EVENT_CONSUME_FLESH = 0, + EVENT_INTANGIBLE_PRESENCE = 1, +}; + +class mobs_risen_husk_spirit : public CreatureScript +{ + public: + mobs_risen_husk_spirit() : CreatureScript("mobs_risen_husk_spirit") { } + + struct mobs_risen_husk_spiritAI : public ScriptedAI + { + mobs_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { } + + void Reset() + { + events.Reset(); + if (me->GetEntry() == NPC_RISEN_HUSK) + events.ScheduleEvent(EVENT_CONSUME_FLESH, 5000); + else if (me->GetEntry() == NPC_RISEN_SPIRIT) + events.ScheduleEvent(EVENT_INTANGIBLE_PRESENCE, 5000); + } + + void JustDied(Unit* killer) + { + if (killer->GetTypeId() == TYPEID_PLAYER) + { + if (killer->ToPlayer()->GetQuestStatus(QUEST_WHATS_HAUNTING_WITCH_HILL) == QUEST_STATUS_INCOMPLETE) + { + DoCast(me, SPELL_SUMMON_RESTLESS_APPARITION, true); + DoCast(killer, SPELL_WITCH_HILL_INFORMATION_CREDIT, true); + } + } + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_CONSUME_FLESH: + DoCastVictim(SPELL_CONSUME_FLESH); + events.ScheduleEvent(EVENT_CONSUME_FLESH, 15000); + break; + case EVENT_INTANGIBLE_PRESENCE: + DoCastVictim(SPELL_INTANGIBLE_PRESENCE); + events.ScheduleEvent(EVENT_INTANGIBLE_PRESENCE, 15000); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap events; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return new mobs_risen_husk_spiritAI (creature); + } +}; + +/*###### +## npc_theramor_guard +######*/ + +enum TheramoreGuard +{ + QUEST_DISCREDITING_THE_DESERTERS = 11133, + + NPC_THERAMORE_GUARD = 4979, + + SPELL_DOCTORED_LEAFLET = 42725, + SPELL_PROPAGANDIZED = 42246, + + SAY_QUEST1 = 0, + SAY_QUEST2 = 1, + SAY_QUEST3 = 2 +}; + +#define GOSSIP_ITEM_THERAMORE_GUARD "You look like an intelligent person. Why don't you read one of these leaflets and give it some thought?" + +class npc_theramore_guard : public CreatureScript +{ +public: + npc_theramore_guard() : CreatureScript("npc_theramore_guard") { } + + bool OnGossipHello(Player* player, Creature* creature) + { + if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); + + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); + + return true; + } + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + { + player->PlayerTalkClass->ClearMenus(); + + if (action == GOSSIP_SENDER_INFO) + { + player->CLOSE_GOSSIP_MENU(); + player->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0); + creature->AI()->Talk(SAY_QUEST1); + creature->CastSpell(creature, SPELL_DOCTORED_LEAFLET, false); + creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + CAST_AI(npc_theramore_guard::npc_theramore_guardAI, creature->AI())->YellTimer = 4000; + CAST_AI(npc_theramore_guard::npc_theramore_guardAI, creature->AI())->bYellTimer = true; + } + + return true; + } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_theramore_guardAI(creature); + } + + struct npc_theramore_guardAI : public ScriptedAI + { + npc_theramore_guardAI(Creature* creature) : ScriptedAI(creature) { } + + uint32 YellTimer; + uint32 Step; + bool bYellTimer; + + void Reset() + { + bYellTimer = false; + Step = 0; + } + + void UpdateAI(const uint32 Diff) + { + if (!me->HasAura(SPELL_PROPAGANDIZED)) + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + + if (bYellTimer && YellTimer <= Diff) + { + switch (Step) + { + case 0: + Talk(SAY_QUEST2); + YellTimer = 3000; + ++Step; + break; + case 1: + Talk(SAY_QUEST3); + me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); + Step = 0; + bYellTimer = false; + break; + } + } + else + YellTimer -= Diff; + } + }; +}; + +/*###### +## npc_lady_jaina_proudmoore +######*/ + +enum LadyJaina +{ + QUEST_JAINAS_AUTOGRAPH = 558, + SPELL_JAINAS_AUTOGRAPH = 23122 +}; + +#define GOSSIP_ITEM_JAINA "I know this is rather silly but i have a young ward who is a bit shy and would like your autograph." + +class npc_lady_jaina_proudmoore : public CreatureScript +{ +public: + npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { } + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + { + player->PlayerTalkClass->ClearMenus(); + if (action == GOSSIP_SENDER_INFO) + { + player->SEND_GOSSIP_MENU(7012, creature->GetGUID()); + player->CastSpell(player, SPELL_JAINAS_AUTOGRAPH, false); + } + return true; + } + + bool OnGossipHello(Player* player, Creature* creature) + { + if (creature->isQuestGiver()) + player->PrepareQuestMenu(creature->GetGUID()); + + if (player->GetQuestStatus(QUEST_JAINAS_AUTOGRAPH) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); + + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); + + return true; + } + +}; + +/*###### +## npc_nat_pagle +######*/ + +enum NatPagle +{ + QUEST_NATS_MEASURING_TAPE = 8227 +}; + +class npc_nat_pagle : public CreatureScript +{ +public: + npc_nat_pagle() : CreatureScript("npc_nat_pagle") { } + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + { + player->PlayerTalkClass->ClearMenus(); + if (action == GOSSIP_ACTION_TRADE) + player->GetSession()->SendListInventory(creature->GetGUID()); + + return true; + } + + bool OnGossipHello(Player* player, Creature* creature) + { + if (creature->isQuestGiver()) + player->PrepareQuestMenu(creature->GetGUID()); + + if (creature->isVendor() && player->GetQuestRewardStatus(QUEST_NATS_MEASURING_TAPE)) + { + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + player->SEND_GOSSIP_MENU(7640, creature->GetGUID()); + } + else + player->SEND_GOSSIP_MENU(7638, creature->GetGUID()); + + return true; + } + +}; + +/*###### +## npc_private_hendel +######*/ + +enum Hendel +{ + SAY_PROGRESS_1_TER = 0, + SAY_PROGRESS_2_HEN = 1, + SAY_PROGRESS_3_TER = 2, + SAY_PROGRESS_4_TER = 3, + EMOTE_SURRENDER = 4, + + QUEST_MISSING_DIPLO_PT16 = 1324, + FACTION_HOSTILE = 168, //guessed, may be different + + NPC_SENTRY = 5184, //helps hendel + NPC_JAINA = 4968, //appears once hendel gives up + NPC_TERVOSH = 4967 +}; + +//TODO: develop this further, end event not created +class npc_private_hendel : public CreatureScript +{ +public: + npc_private_hendel() : CreatureScript("npc_private_hendel") { } + + bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) + { + if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) + creature->setFaction(FACTION_HOSTILE); + + return true; + } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_private_hendelAI(creature); + } + + struct npc_private_hendelAI : public ScriptedAI + { + npc_private_hendelAI(Creature* creature) : ScriptedAI(creature) { } + + void Reset() + { + me->RestoreFaction(); + } + + void AttackedBy(Unit* pAttacker) + { + if (me->getVictim()) + return; + + if (me->IsFriendlyTo(pAttacker)) + return; + + AttackStart(pAttacker); + } + + void DamageTaken(Unit* pDoneBy, uint32 &Damage) + { + if (Damage > me->GetHealth() || me->HealthBelowPctDamaged(20, Damage)) + { + Damage = 0; + + if (Player* player = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself()) + player->GroupEventHappens(QUEST_MISSING_DIPLO_PT16, me); + + Talk(EMOTE_SURRENDER); + EnterEvadeMode(); + } + } + }; + +}; + +/*###### +## npc_zelfrax +######*/ + +Position const MovePosition = {-2967.030f, -3872.1799f, 35.620f, 0.0f}; + +enum Zelfrax +{ + SAY_ZELFRAX1 = 0, + SAY_ZELFRAX2 = 1 +}; + +class npc_zelfrax : public CreatureScript +{ +public: + npc_zelfrax() : CreatureScript("npc_zelfrax") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_zelfraxAI(creature); + } + + struct npc_zelfraxAI : public ScriptedAI + { + npc_zelfraxAI(Creature* creature) : ScriptedAI(creature) + { + MoveToDock(); + } + + void AttackStart(Unit* who) + { + if (!who) + return; + + if (me->Attack(who, true)) + { + me->SetInCombatWith(who); + who->SetInCombatWith(me); + + if (IsCombatMovementAllowed()) + me->GetMotionMaster()->MoveChase(who); + } + } + + void MovementInform(uint32 Type, uint32 /*Id*/) + { + if (Type != POINT_MOTION_TYPE) + return; + + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); + SetCombatMovement(true); + + if (me->isInCombat()) + if (Unit* unit = me->getVictim()) + me->GetMotionMaster()->MoveChase(unit); + } + + void MoveToDock() + { + SetCombatMovement(false); + me->GetMotionMaster()->MovePoint(0, MovePosition); + Talk(SAY_ZELFRAX1); + Talk(SAY_ZELFRAX2); + } + + void UpdateAI(uint32 const /*Diff*/) + { + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + }; + +}; + +/*###### ## npc_stinky ######*/ @@ -44,16 +474,16 @@ enum Stinky { QUEST_STINKYS_ESCAPE_H = 1270, QUEST_STINKYS_ESCAPE_A = 1222, - SAY_QUEST_ACCEPTED = -1000507, - SAY_STAY_1 = -1000508, - SAY_STAY_2 = -1000509, - SAY_STAY_3 = -1000510, - SAY_STAY_4 = -1000511, - SAY_STAY_5 = -1000512, - SAY_STAY_6 = -1000513, - SAY_QUEST_COMPLETE = -1000514, - SAY_ATTACKED_1 = -1000515, - EMOTE_DISAPPEAR = -1000516 + SAY_QUEST_ACCEPTED = 0, + SAY_STAY_1 = 1, + SAY_STAY_2 = 2, + SAY_STAY_3 = 3, + SAY_STAY_4 = 4, + SAY_STAY_5 = 5, + SAY_STAY_6 = 6, + SAY_QUEST_COMPLETE = 7, + SAY_ATTACKED_1 = 8, + EMOTE_DISAPPEAR = 9 }; class npc_stinky : public CreatureScript @@ -74,7 +504,7 @@ public: { creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE); creature->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_QUEST_ACCEPTED, creature); + creature->AI()->Talk(SAY_QUEST_ACCEPTED); pEscortAI->Start(false, false, player->GetGUID()); } } @@ -94,29 +524,29 @@ public: switch (waypointId) { case 7: - DoScriptText(SAY_STAY_1, me, player); + Talk(SAY_STAY_1, player->GetGUID()); break; case 11: - DoScriptText(SAY_STAY_2, me, player); + Talk(SAY_STAY_2, player->GetGUID()); break; case 25: - DoScriptText(SAY_STAY_3, me, player); + Talk(SAY_STAY_3, player->GetGUID()); break; case 26: - DoScriptText(SAY_STAY_4, me, player); + Talk(SAY_STAY_4, player->GetGUID()); break; case 27: - DoScriptText(SAY_STAY_5, me, player); + Talk(SAY_STAY_5, player->GetGUID()); break; case 28: - DoScriptText(SAY_STAY_6, me, player); + Talk(SAY_STAY_6, player->GetGUID()); me->SetStandState(UNIT_STAND_STATE_KNEEL); break; case 29: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 37: - DoScriptText(SAY_QUEST_COMPLETE, me, player); + Talk(SAY_QUEST_COMPLETE, player->GetGUID()); me->SetSpeed(MOVE_RUN, 1.2f, true); me->SetWalk(false); if (player->GetQuestStatus(QUEST_STINKYS_ESCAPE_H)) @@ -125,14 +555,14 @@ public: player->GroupEventHappens(QUEST_STINKYS_ESCAPE_A, me); break; case 39: - DoScriptText(EMOTE_DISAPPEAR, me); + Talk(EMOTE_DISAPPEAR); break; } } void EnterCombat(Unit* who) { - DoScriptText(SAY_ATTACKED_1, me, who); + Talk(SAY_ATTACKED_1, who->GetGUID()); } void Reset() {} diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index b5ed3baaf65..850321133b4 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -16,21 +16,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* ScriptData -SDName: Feralas -SD%Complete: 0 -SDComment: Quest support: -SDCategory: Feralas -EndScriptData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedEscortAI.h" -#include "ScriptedGossip.h" -#include "SpellScript.h" -#include "Player.h" -#include "WorldSession.h" - void AddSC_feralas() { diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index edb40107961..f0a1a61a5fd 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -34,6 +34,524 @@ EndContentData */ #include "Player.h" #include "SpellInfo.h" +/*###### +## npc_bunthen_plainswind +######*/ + +enum Bunthen +{ + QUEST_SEA_LION_HORDE = 30, + QUEST_SEA_LION_ALLY = 272, + TAXI_PATH_ID_ALLY = 315, + TAXI_PATH_ID_HORDE = 316 +}; + +#define GOSSIP_ITEM_THUNDER "I'd like to fly to Thunder Bluff." +#define GOSSIP_ITEM_AQ_END "Do you know where I can find Half Pendant of Aquatic Endurance?" + +class npc_bunthen_plainswind : public CreatureScript +{ +public: + npc_bunthen_plainswind() : CreatureScript("npc_bunthen_plainswind") { } + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + { + player->PlayerTalkClass->ClearMenus(); + switch (action) + { + case GOSSIP_ACTION_INFO_DEF + 1: + player->CLOSE_GOSSIP_MENU(); + if (player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE) + player->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE); + break; + case GOSSIP_ACTION_INFO_DEF + 2: + player->SEND_GOSSIP_MENU(5373, creature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF + 3: + player->SEND_GOSSIP_MENU(5376, creature->GetGUID()); + break; + } + return true; + } + + bool OnGossipHello(Player* player, Creature* creature) + { + if (player->getClass() != CLASS_DRUID) + player->SEND_GOSSIP_MENU(4916, creature->GetGUID()); + else if (player->GetTeam() != HORDE) + { + if (player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + + player->SEND_GOSSIP_MENU(4917, creature->GetGUID()); + } + else if (player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE) + { + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THUNDER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + + if (player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + + player->SEND_GOSSIP_MENU(4918, creature->GetGUID()); + } + return true; + } + +}; + +/*###### +## npc_great_bear_spirit +######*/ + +#define GOSSIP_BEAR1 "What do you represent, spirit?" +#define GOSSIP_BEAR2 "I seek to understand the importance of strength of the body." +#define GOSSIP_BEAR3 "I seek to understand the importance of strength of the heart." +#define GOSSIP_BEAR4 "I have heard your words, Great Bear Spirit, and I understand. I now seek your blessings to fully learn the way of the Claw." + +class npc_great_bear_spirit : public CreatureScript +{ +public: + npc_great_bear_spirit() : CreatureScript("npc_great_bear_spirit") { } + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + { + player->PlayerTalkClass->ClearMenus(); + switch (action) + { + case GOSSIP_ACTION_INFO_DEF: + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(4721, creature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF + 1: + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->SEND_GOSSIP_MENU(4733, creature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF + 2: + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + player->SEND_GOSSIP_MENU(4734, creature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF + 3: + player->SEND_GOSSIP_MENU(4735, creature->GetGUID()); + if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE) + player->AreaExploredOrEventHappens(5929); + if (player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE) + player->AreaExploredOrEventHappens(5930); + break; + } + return true; + } + + bool OnGossipHello(Player* player, Creature* creature) + { + //ally or horde quest + if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE) + { + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + player->SEND_GOSSIP_MENU(4719, creature->GetGUID()); + } + else + player->SEND_GOSSIP_MENU(4718, creature->GetGUID()); + + return true; + } + +}; + +/*###### +## npc_silva_filnaveth +######*/ + +#define GOSSIP_ITEM_RUTHERAN "I'd like to fly to Rut'theran Village." +#define GOSSIP_ITEM_AQ_AGI "Do you know where I can find Half Pendant of Aquatic Agility?" + +class npc_silva_filnaveth : public CreatureScript +{ +public: + npc_silva_filnaveth() : CreatureScript("npc_silva_filnaveth") { } + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + { + player->PlayerTalkClass->ClearMenus(); + switch (action) + { + case GOSSIP_ACTION_INFO_DEF + 1: + player->CLOSE_GOSSIP_MENU(); + if (player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE) + player->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY); + break; + case GOSSIP_ACTION_INFO_DEF + 2: + player->SEND_GOSSIP_MENU(5374, creature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF + 3: + player->SEND_GOSSIP_MENU(5375, creature->GetGUID()); + break; + } + return true; + } + + bool OnGossipHello(Player* player, Creature* creature) + { + if (player->getClass() != CLASS_DRUID) + player->SEND_GOSSIP_MENU(4913, creature->GetGUID()); + else if (player->GetTeam() != ALLIANCE) + { + if (player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + + player->SEND_GOSSIP_MENU(4915, creature->GetGUID()); + } + else if (player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE) + { + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RUTHERAN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + + if (player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + + player->SEND_GOSSIP_MENU(4914, creature->GetGUID()); + } + return true; + } + +}; + +/*###### +## npc_clintar_spirit +######*/ + +float const Clintar_spirit_WP[41][5] = +{ + //pos_x pos_y pos_z orien waitTime + {7465.28f, -3115.46f, 439.327f, 0.83f, 4000}, + {7476.49f, -3101, 443.457f, 0.89f, 0}, + {7486.57f, -3085.59f, 439.478f, 1.07f, 0}, + {7472.19f, -3085.06f, 443.142f, 3.07f, 0}, + {7456.92f, -3085.91f, 438.862f, 3.24f, 0}, + {7446.68f, -3083.43f, 438.245f, 2.40f, 0}, + {7446.17f, -3080.21f, 439.826f, 1.10f, 6000}, + {7452.41f, -3085.8f, 438.984f, 5.78f, 0}, + {7469.11f, -3084.94f, 443.048f, 6.25f, 0}, + {7483.79f, -3085.44f, 439.607f, 6.25f, 0}, + {7491.14f, -3090.96f, 439.983f, 5.44f, 0}, + {7497.62f, -3098.22f, 436.854f, 5.44f, 0}, + {7498.72f, -3113.41f, 434.596f, 4.84f, 0}, + {7500.06f, -3122.51f, 434.749f, 5.17f, 0}, + {7504.96f, -3131.53f, 434.475f, 4.74f, 0}, + {7504.31f, -3133.53f, 435.693f, 3.84f, 6000}, + {7504.55f, -3133.27f, 435.476f, 0.68f, 15000}, + {7501.99f, -3126.01f, 434.93f, 1.83f, 0}, + {7490.76f, -3114.97f, 434.431f, 2.51f, 0}, + {7479.64f, -3105.51f, 431.123f, 1.83f, 0}, + {7474.63f, -3086.59f, 428.994f, 1.83f, 2000}, + {7472.96f, -3074.18f, 427.566f, 1.57f, 0}, + {7472.25f, -3063, 428.268f, 1.55f, 0}, + {7473.46f, -3054.22f, 427.588f, 0.36f, 0}, + {7475.08f, -3053.6f, 428.653f, 0.36f, 6000}, + {7474.66f, -3053.56f, 428.433f, 3.19f, 4000}, + {7471.81f, -3058.84f, 427.073f, 4.29f, 0}, + {7472.16f, -3064.91f, 427.772f, 4.95f, 0}, + {7471.56f, -3085.36f, 428.924f, 4.72f, 0}, + {7473.56f, -3093.48f, 429.294f, 5.04f, 0}, + {7478.94f, -3104.29f, 430.638f, 5.23f, 0}, + {7484.46f, -3109.61f, 432.769f, 5.79f, 0}, + {7490.23f, -3111.08f, 434.431f, 0.02f, 0}, + {7496.29f, -3108, 434.783f, 1.15f, 0}, + {7497.46f, -3100.66f, 436.191f, 1.50f, 0}, + {7495.64f, -3093.39f, 438.349f, 2.10f, 0}, + {7492.44f, -3086.01f, 440.267f, 1.38f, 0}, + {7498.26f, -3076.44f, 440.808f, 0.71f, 0}, + {7506.4f, -3067.35f, 443.64f, 0.77f, 0}, + {7518.37f, -3057.42f, 445.584f, 0.74f, 0}, + {7517.51f, -3056.3f, 444.568f, 2.49f, 4500} +}; + +Position const AspectRavenSummon = {7472.96f, -3074.18f, 427.566f, 0.0f}; +Position const ClintarSpiritSummon = {7459.2275f, -3122.5632f, 438.9842f, 0.8594f}; + +enum ClintarSpirit +{ + ASPECT_RAVEN = 22915, + + // Texts for EnterCombat, the event and the end of the event are missing + CLINTAR_SPIRIT_SAY_START = 0, +}; + +class npc_clintar_spirit : public CreatureScript +{ +public: + npc_clintar_spirit() : CreatureScript("npc_clintar_spirit") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_clintar_spiritAI (creature); + } + + struct npc_clintar_spiritAI : public npc_escortAI + { + public: + npc_clintar_spiritAI(Creature* creature) : npc_escortAI(creature) + { + PlayerGUID = 0; + } + + uint8 Step; + uint32 CurrWP; + uint32 EventTimer; + uint32 checkPlayerTimer; + + uint64 PlayerGUID; + + bool EventOnWait; + + void Reset() + { + if (!PlayerGUID) + { + Step = 0; + CurrWP = 0; + EventTimer = 0; + PlayerGUID = 0; + checkPlayerTimer = 1000; + EventOnWait = false; + } + } + + void JustDied(Unit* /*killer*/) + { + if (!PlayerGUID) + return; + + Player* player = Unit::GetPlayer(*me, PlayerGUID); + if (player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE) + { + player->FailQuest(10965); + PlayerGUID = 0; + Reset(); + } + } + + void EnterEvadeMode() + { + Player* player = Unit::GetPlayer(*me, PlayerGUID); + if (player && player->isInCombat() && player->getAttackerForHelper()) + { + AttackStart(player->getAttackerForHelper()); + return; + } + npc_escortAI::EnterEvadeMode(); + } + + void StartEvent(Player* player) + { + if (player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE) + { + for (uint8 i = 0; i < 41; ++i) + { + AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]); + } + PlayerGUID = player->GetGUID(); + Start(true, false, PlayerGUID); + } + return; + } + + void UpdateAI(const uint32 diff) + { + npc_escortAI::UpdateAI(diff); + + if (!PlayerGUID) + { + me->setDeathState(JUST_DIED); + return; + } + + if (!me->isInCombat() && !EventOnWait) + { + if (checkPlayerTimer <= diff) + { + Player* player = Unit::GetPlayer(*me, PlayerGUID); + if (player && player->isInCombat() && player->getAttackerForHelper()) + AttackStart(player->getAttackerForHelper()); + checkPlayerTimer = 1000; + } else checkPlayerTimer -= diff; + } + + if (EventOnWait && EventTimer <= diff) + { + + Player* player = Unit::GetPlayer(*me, PlayerGUID); + if (!player || (player && player->GetQuestStatus(10965) == QUEST_STATUS_NONE)) + { + me->setDeathState(JUST_DIED); + return; + } + + switch (CurrWP) + { + case 0: + switch (Step) + { + case 0: + Talk(CLINTAR_SPIRIT_SAY_START, PlayerGUID); + EventTimer = 8000; + Step = 1; + break; + case 1: + EventOnWait = false; + break; + } + break; + case 6: + switch (Step) + { + case 0: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); + EventTimer = 5000; + Step = 1; + break; + case 1: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + // Needs text + EventOnWait = false; + break; + } + break; + case 15: + switch (Step) + { + case 0: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); + EventTimer = 5000; + Step = 1; + break; + case 1: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + EventOnWait = false; + break; + } + break; + case 16: + switch (Step) + { + case 0: + // Needs text + EventTimer = 15000; + Step = 1; + break; + case 1: + EventOnWait = false; + break; + } + break; + case 20: + switch (Step) + { + case 0: + if (Creature* mob = me->SummonCreature(ASPECT_RAVEN, AspectRavenSummon, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000)) + { + mob->AddThreat(me, 10000.0f); + mob->AI()->AttackStart(me); + } + EventTimer = 2000; + Step = 1; + break; + case 1: + EventOnWait = false; + break; + } + break; + case 24: + switch (Step) + { + case 0: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); + EventTimer = 5000; + Step = 1; + break; + case 1: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + EventOnWait = false; + break; + } + break; + case 25: + switch (Step) + { + case 0: + // Needs text + EventTimer = 4000; + Step = 1; + break; + case 1: + EventOnWait = false; + break; + } + break; + case 40: + switch (Step) + { + case 0: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2); + // Needs text + player->CompleteQuest(10965); + EventTimer = 1500; + Step = 1; + break; + case 1: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + EventTimer = 3000; + Step = 2; + break; + case 2: + player->TalkedToCreature(me->GetEntry(), me->GetGUID()); + PlayerGUID = 0; + Reset(); + me->setDeathState(JUST_DIED); + break; + } + break; + default: + EventOnWait = false; + break; + } + + } else if (EventOnWait) EventTimer -= diff; + } + + void WaypointReached(uint32 waypointId) + { + CurrWP = waypointId; + EventTimer = 0; + Step = 0; + EventOnWait = true; + } + }; + +}; + +/*#### +# npc_clintar_dreamwalker +####*/ + +enum Clintar +{ + CLINTAR_SPIRIT = 22916 +}; + +class npc_clintar_dreamwalker : public CreatureScript +{ +public: + npc_clintar_dreamwalker() : CreatureScript("npc_clintar_dreamwalker") { } + + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + { + if (quest->GetQuestId() == 10965) + if (Creature* clintar_spirit = creature->SummonCreature(CLINTAR_SPIRIT, ClintarSpiritSummon, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000)) + CAST_AI(npc_clintar_spirit::npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(player); + return true; + } + +}; + /*#### # npc_omen ####*/ diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index 68e80096bed..72e1e87bdf4 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -75,10 +75,9 @@ public: enum KyleFrenzied { - //emote signed for 7780 but propably thats wrong id. - EMOTE_SEE_LUNCH = -1000340, - EMOTE_EAT_LUNCH = -1000341, - EMOTE_DANCE = -1000342, + EMOTE_SEE_LUNCH = 0, + EMOTE_EAT_LUNCH = 1, + EMOTE_DANCE = 2, SPELL_LUNCH = 42222, NPC_KYLE_FRENZIED = 23616, @@ -133,7 +132,7 @@ public: } EventActive = true; - DoScriptText(EMOTE_SEE_LUNCH, me); + Talk(EMOTE_SEE_LUNCH); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_CREATURE_SPECIAL); } } @@ -172,7 +171,7 @@ public: } break; case 2: - DoScriptText(EMOTE_EAT_LUNCH, me); + Talk(EMOTE_EAT_LUNCH); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); break; case 3: @@ -183,7 +182,7 @@ public: break; case 4: EventTimer = 30000; - DoScriptText(EMOTE_DANCE, me); + Talk(EMOTE_DANCE); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_DANCESPECIAL); break; case 5: diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index dc06f6f96f3..d88a6a79543 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -225,6 +225,929 @@ public: }; +/*#### +# quest_a_pawn_on_the_eternal_board (Defines) +####*/ +enum EternalBoard +{ + QUEST_A_PAWN_ON_THE_ETERNAL_BOARD = 8519, + + FACTION_HOSTILE = 14, + FACTION_FRIENDLY = 35, + + C_ANACHRONOS = 15381, + C_FANDRAL_STAGHELM = 15382, + C_ARYGOS = 15380, + C_MERITHRA = 15378, + C_CAELESTRASZ = 15379, + + ANACHRONOS_SAY_1 = 0, + ANACHRONOS_SAY_2 = 1, + ANACHRONOS_SAY_3 = 2, + ANACHRONOS_SAY_4 = 3, + ANACHRONOS_SAY_5 = 4, + ANACHRONOS_SAY_6 = 5, + ANACHRONOS_SAY_7 = 6, + ANACHRONOS_SAY_8 = 7, + ANACHRONOS_SAY_9 = 8, + ANACHRONOS_SAY_10 = 9, + ANACHRONOS_EMOTE_1 = 10, + ANACHRONOS_EMOTE_2 = 11, + ANACHRONOS_EMOTE_3 = 12, + + FANDRAL_SAY_1 = 0, + FANDRAL_SAY_2 = 1, + FANDRAL_SAY_3 = 2, + FANDRAL_SAY_4 = 3, + FANDRAL_SAY_5 = 4, + FANDRAL_SAY_6 = 5, + FANDRAL_EMOTE_1 = 6, + FANDRAL_EMOTE_2 = 7, + + CAELESTRASZ_SAY_1 = 0, + CAELESTRASZ_SAY_2 = 1, + CAELESTRASZ_YELL_1 = 2, + + ARYGOS_SAY_1 = 0, + ARYGOS_YELL_1 = 1, + ARYGOS_EMOTE_1 = 2, + + MERITHRA_SAY_1 = 0, + MERITHRA_SAY_2 = 1, + MERITHRA_YELL_1 = 2, + MERITHRA_EMOTE_1 = 3, + + GO_GATE_OF_AHN_QIRAJ = 176146, + GO_GLYPH_OF_AHN_QIRAJ = 176148, + GO_ROOTS_OF_AHN_QIRAJ = 176147 +}; +/*##### +# Quest: A Pawn on the Eternal Board +#####*/ + +/* ContentData +A Pawn on the Eternal Board - creatures, gameobjects and defines +mob_qiraj_war_spawn : Adds that are summoned in the Qiraj gates battle. +npc_anachronos_the_ancient : Creature that controls the event. +npc_anachronos_quest_trigger: controls the spawning of the BG War mobs. +go_crystalline_tear : GameObject that begins the event and hands out quest +TO DO: get correct spell IDs and timings for spells cast upon dragon transformations +TO DO: Dragons should use the HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF) after transformation, but for some unknown reason it doesnt work. +EndContentData */ + +#define EVENT_AREA_RADIUS 65 //65yds +#define EVENT_COOLDOWN 500000 //in ms. appear after event completed or failed (should be = Adds despawn time) + +struct QuestCinematic +{ + int32 TextId; + uint32 Creature, Timer; +}; + +// Creature 0 - Anachronos, 1 - Fandral, 2 - Arygos, 3 - Merithra, 4 - Caelestrasz +static QuestCinematic EventAnim[]= +{ + {ANACHRONOS_SAY_1, 0, 2000}, + {FANDRAL_SAY_1, 1, 4000}, + {MERITHRA_EMOTE_1, 3, 500}, + {MERITHRA_SAY_1, 3, 500}, + {ARYGOS_EMOTE_1, 2, 2000}, + {CAELESTRASZ_SAY_1, 4, 8000}, + {MERITHRA_SAY_2, 3, 6000}, + {0, 3, 2000}, + {MERITHRA_YELL_1, 3, 2500}, + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 4000}, // spell + {0, 3, 1250}, //fly + {0, 3, 250}, //remove flags + {ARYGOS_SAY_1, 2, 3000}, + {0, 3, 2000}, + {ARYGOS_YELL_1, 2, 3000}, + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 4000}, // spell + {0, 3, 1000}, //fly + {0, 3, 1000}, //remove flags + {CAELESTRASZ_SAY_2, 4, 5000}, + {0, 3, 3000}, + {CAELESTRASZ_YELL_1, 4, 3000}, + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 2500}, // spell + {ANACHRONOS_SAY_2, 0, 2000}, + {0, 3, 250}, //fly + {0, 3, 25}, //remove flags + {FANDRAL_SAY_2, 1, 3000}, + {ANACHRONOS_SAY_3, 0, 10000}, //Both run through the armies + {0, 3, 2000}, // Sands will stop + {0, 3, 8000}, // Summon Gate + {ANACHRONOS_SAY_4, 0, 4000}, + {0, 0, 2000}, //spell 1-> Arcane cosmetic (Mobs freeze) + {0, 0, 5000}, //Spell 2-> Arcane long cosmetic (barrier appears) (Barrier -> Glyphs) + {0, 0, 7000}, //BarrieR + {0, 0, 4000}, //Glyphs + {ANACHRONOS_SAY_5, 0, 2000}, + {0, 0, 4000}, // Roots + {FANDRAL_SAY_3, 1, 3000}, //Root Text + {FANDRAL_EMOTE_1, 1, 3000}, //falls knee + {ANACHRONOS_SAY_6, 0, 3000}, + {ANACHRONOS_SAY_7, 0, 3000}, + {ANACHRONOS_SAY_8, 0, 8000}, + {ANACHRONOS_EMOTE_1, 0, 1000}, //Give Scepter + {FANDRAL_SAY_4, 1, 3000}, + {FANDRAL_SAY_5, 1, 3000}, //->Equip hammer~Scepter, throw it at door + {FANDRAL_EMOTE_2, 1, 3000}, //Throw hammer at door. + {ANACHRONOS_SAY_9, 0, 3000}, + {FANDRAL_SAY_6, 1, 3000}, //fandral goes away + {ANACHRONOS_EMOTE_2, 0, 3000}, + {ANACHRONOS_EMOTE_3, 0, 3000}, + {0, 0, 2000}, + {0, 0, 2000}, + {0, 0, 4000}, + {ANACHRONOS_SAY_10, 0, 3000}, + {0, 0, 2000}, + {0, 0, 3000}, + {0, 0, 15000}, + {0, 0, 5000}, + {0, 0, 3500}, + {0, 0, 5000}, + {0, 0, 3500}, + {0, 0, 5000}, + {0, 0, 0} +}; + +//Cordinates for Spawns +Position const SpawnLocation[] = +{ + {-8085.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8085.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8085.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1424.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1422.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + // 2 waves of warriors + {-8082.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1525.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1527.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1523.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1521.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1519.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8088.0f, 1510.0f, 2.61f, 0.0f}, //Anubisath Conqueror + {-8084.0f, 1520.0f, 2.61f, 0.0f}, //Anubisath Conqueror + {-8088.0f, 1530.0f, 2.61f, 0.0f}, //Anubisath Conqueror + + {-8080.0f, 1513.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1523.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8085.0f, 1518.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1516.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8085.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1528.0f, 2.61f, 0.0f}, //Qiraj Wasp + + {-8082.0f, 1513.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8079.0f, 1523.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1531.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8079.0f, 1516.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1518.0f, 2.61f, 0.0f}, //Qiraj Wasp + + {-8081.0f, 1514.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1526.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1512.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8082.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1528.0f, 2.61f, 0.0f}, //Qiraj Tank + + {-8082.0f, 1513.0f, 2.61f, 3.141592f}, //Anubisath Conqueror + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Anubisath Conqueror + {-8082.0f, 1527.0f, 2.61f, 3.141592f}, //Anubisath Conqueror +}; + +struct WaveData +{ + uint8 SpawnCount, UsedSpawnPoint; + uint32 CreatureId, SpawnTimer, YellTimer, DespTimer; + int32 WaveTextId; +}; + +static WaveData WavesInfo[5] = +{ + {30, 0, 15423, 0, 0, 24000, 0}, // Kaldorei Soldier + { 3, 35, 15424, 0, 0, 24000, 0}, // Anubisath Conqueror + {12, 38, 15414, 0, 0, 24000, 0}, // Qiraji Wasps + { 6, 50, 15422, 0, 0, 24000, 0}, // Qiraji Tanks + {15, 15, 15423, 0, 0, 24000, 0} // Kaldorei Soldier + +}; + +struct SpawnSpells +{ + uint32 Timer1, Timer2, SpellId; +}; + +static SpawnSpells SpawnCast[4] = +{ + {100000, 2000, 33652}, // Stop Time + {38500, 300000, 28528}, // Poison Cloud + {58000, 300000, 35871}, // Frost Debuff (need correct spell) + {80950, 300000, 42075}, // Fire Explosion (need correct spell however this one looks cool) +}; +/*##### +# npc_anachronos_the_ancient +######*/ +class npc_anachronos_the_ancient : public CreatureScript +{ +public: + npc_anachronos_the_ancient() : CreatureScript("npc_anachronos_the_ancient") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_anachronos_the_ancientAI(creature); + } + + struct npc_anachronos_the_ancientAI : public ScriptedAI + { + npc_anachronos_the_ancientAI(Creature* creature) : ScriptedAI(creature) {} + + uint32 AnimationTimer; + uint8 AnimationCount; + + uint64 AnachronosQuestTriggerGUID; + uint64 MerithraGUID; + uint64 ArygosGUID; + uint64 CaelestraszGUID; + uint64 FandralGUID; + uint64 PlayerGUID; + bool eventEnd; + + void Reset() + { + AnimationTimer = 1500; + AnimationCount = 0; + AnachronosQuestTriggerGUID = 0; + MerithraGUID = 0; + ArygosGUID = 0; + CaelestraszGUID = 0; + FandralGUID = 0; + PlayerGUID = 0; + eventEnd = false; + + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + } + + void HandleAnimation() + { + Player* player = Unit::GetPlayer(*me, PlayerGUID); + if (!player) + return; + + Creature* Fandral = player->FindNearestCreature(C_FANDRAL_STAGHELM, 100.0f, me); + Creature* Arygos = player->FindNearestCreature(C_ARYGOS, 100.0f, me); + Creature* Caelestrasz = player->FindNearestCreature(C_CAELESTRASZ, 100.0f, me); + Creature* Merithra = player->FindNearestCreature(C_MERITHRA, 100.0f, me); + + if (!Fandral || !Arygos || !Caelestrasz || !Merithra) + return; + + AnimationTimer = EventAnim[AnimationCount].Timer; + if (eventEnd == false) + { + switch (AnimationCount) + { + case 0: + Talk(ANACHRONOS_SAY_1,Fandral->GetGUID()); + break; + case 1: + Fandral->SetTarget(me->GetGUID()); + Fandral->AI()->Talk(FANDRAL_SAY_1, me->GetGUID()); + break; + case 2: + Fandral->SetTarget(0); + Merithra->AI()->Talk(MERITHRA_EMOTE_1); + break; + case 3: + Merithra->AI()->Talk(MERITHRA_SAY_1); + break; + case 4: + Arygos->AI()->Talk(ARYGOS_EMOTE_1); + break; + case 5: + Caelestrasz->SetTarget(Fandral->GetGUID()); + Caelestrasz->AI()->Talk(CAELESTRASZ_SAY_1); + break; + case 6: + Merithra->AI()->Talk(MERITHRA_SAY_2); + break; + case 7: + Caelestrasz->SetTarget(0); + Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); + break; + case 8: + Merithra->AI()->Talk(MERITHRA_YELL_1); + break; + case 9: + Merithra->CastSpell(Merithra, 25105, true); + break; + case 10: + Merithra->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); + Merithra->SetDisableGravity(true); + Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 3); + break; + case 11: + Merithra->CastSpell(Merithra, 24818, false); + break; + case 12: + Merithra->GetMotionMaster()->MoveCharge(-8100, 1530, 50, 42); + break; + case 13: + break; + case 14: + Arygos->AI()->Talk(ARYGOS_SAY_1); + Merithra->SetVisible(false); + break; + case 15: + Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); + Merithra->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); + break; + case 16: + Arygos->AI()->Talk(ARYGOS_YELL_1); + break; + case 17: + Arygos->CastSpell(Arygos, 25107, true); + break; + case 18: + Arygos->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); + Arygos->SetDisableGravity(true); + Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 42); + break; + case 19: + Arygos->CastSpell(Arygos, 50505, false); + break; + case 20: + Arygos->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); + break; + case 21: + break; + case 22: + Caelestrasz->AI()->Talk(CAELESTRASZ_SAY_2, Fandral->GetGUID()); + break; + case 23: + Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); + Arygos->SetVisible(false); + Arygos->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 10); + break; + case 24: + Caelestrasz->AI()->Talk(CAELESTRASZ_YELL_1); + break; + case 25: + Caelestrasz->CastSpell(Caelestrasz, 25106, true); + break; + case 26: + Caelestrasz->HandleEmoteCommand(254); + Caelestrasz->SetDisableGravity(true); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 7.61f, 4); + break; + case 27: + Caelestrasz->CastSpell(Caelestrasz, 54293, false); + break; + case 28: + Talk(ANACHRONOS_SAY_2, Fandral->GetGUID()); + break; + case 29: + Caelestrasz->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); + Fandral->AI()->Talk(FANDRAL_SAY_2); + break; + case 30: + break; + case 31: + Talk(ANACHRONOS_SAY_3, Fandral->GetGUID()); + break; + case 32: + Caelestrasz->SetVisible(false); + Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); + Fandral->GetMotionMaster()->MoveCharge(-8108, 1529, 2.77f, 8); + me->GetMotionMaster()->MoveCharge(-8113, 1525, 2.77f, 8); + break;//both run to the gate + case 33: + Talk(ANACHRONOS_SAY_4); + Caelestrasz->GetMotionMaster()->MoveCharge(-8050, 1473, 65, 15); + break; //Text: sands will stop + case 34: + DoCast(player, 23017, true);//Arcane Channeling + break; + case 35: + me->CastSpell(-8088, 1520.43f, 2.67f, 25158, true); + break; + case 36: + DoCast(player, 25159, true); + break; + case 37: + me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); + break; + case 38: + DoCast(player, 25166, true); + me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); + break; + case 39: + Talk(ANACHRONOS_SAY_5, Fandral->GetGUID()); + break; + case 40: + Fandral->CastSpell(me, 25167, true); + break; + case 41: + Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); + Fandral->AI()->Talk(FANDRAL_SAY_3); + break; + case 42: + me->CastStop(); + Fandral->AI()->Talk(FANDRAL_EMOTE_1); + break; + case 43: + Fandral->CastStop(); + break; + case 44: + Talk(ANACHRONOS_SAY_6); + break; + case 45: + Talk(ANACHRONOS_SAY_7); + break; + case 46: + Talk(ANACHRONOS_SAY_8); + me->GetMotionMaster()->MoveCharge(-8110, 1527, 2.77f, 4); + break; + case 47: + Talk(ANACHRONOS_EMOTE_1); + break; + case 48: + Fandral->AI()->Talk(FANDRAL_SAY_4, me->GetGUID()); + break; + case 49: + Fandral->AI()->Talk(FANDRAL_SAY_5, me->GetGUID()); + break; + case 50: + Fandral->AI()->Talk(FANDRAL_EMOTE_2); + Fandral->CastSpell(-8127, 1525, 17.5f, 33806, true); + break; + case 51: + { + uint32 entries[4] = { 15423, 15424, 15414, 15422 }; + Unit* mob = NULL; + for (uint8 i = 0; i < 4; ++i) + { + mob = player->FindNearestCreature(entries[i], 50, me); + while (mob) + { + mob->RemoveFromWorld(); + mob = player->FindNearestCreature(15423, 50, me); + } + } + break; + } + case 52: + Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f, 4); + Fandral->AI()->Talk(ANACHRONOS_SAY_9, me->GetGUID()); + break; + case 53: + Fandral->AI()->Talk(FANDRAL_SAY_6); + break; + case 54: + Talk(ANACHRONOS_EMOTE_2); + break; + case 55: + Fandral->SetVisible(false); + break; + case 56: + Talk(ANACHRONOS_EMOTE_3); + me->GetMotionMaster()->MoveCharge(-8116, 1522, 3.65f, 4); + break; + case 57: + me->GetMotionMaster()->MoveCharge(-8116.7f, 1527, 3.7f, 4); + break; + case 58: + me->GetMotionMaster()->MoveCharge(-8112.67f, 1529.9f, 2.86f, 4); + break; + case 59: + me->GetMotionMaster()->MoveCharge(-8117.99f, 1532.24f, 3.94f, 4); + break; + case 60: + if (player) + Talk(ANACHRONOS_SAY_10, player->GetGUID()); + me->GetMotionMaster()->MoveCharge(-8113.46f, 1524.16f, 2.89f, 4); + break; + case 61: + me->GetMotionMaster()->MoveCharge(-8057.1f, 1470.32f, 2.61f, 6); + if (player->IsInRange(me, 0, 15)) + player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD, me); + break; + case 62: + me->SetDisplayId(15500); + break; + case 63: + me->HandleEmoteCommand(254); + me->SetDisableGravity(true); + break; + case 64: + me->GetMotionMaster()->MoveCharge(-8000, 1400, 150, 9); + break; + case 65: + me->SetVisible(false); + if (Creature* AnachronosQuestTrigger = (Unit::GetCreature(*me, AnachronosQuestTriggerGUID))) + { + Talk(ARYGOS_YELL_1); + AnachronosQuestTrigger->AI()->EnterEvadeMode(); + eventEnd=true; + } + break; + } + } + ++AnimationCount; + } + void UpdateAI(const uint32 diff) + { + if (AnimationTimer) + { + if (AnimationTimer <= diff) + HandleAnimation(); + else AnimationTimer -= diff; + } + if (AnimationCount < 65) + me->CombatStop(); + if (AnimationCount == 65 || eventEnd) + me->AI()->EnterEvadeMode(); + } + }; + +}; + +/*###### +# mob_qiraj_war_spawn +######*/ + +class mob_qiraj_war_spawn : public CreatureScript +{ +public: + mob_qiraj_war_spawn() : CreatureScript("mob_qiraj_war_spawn") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new mob_qiraj_war_spawnAI(creature); + } + + struct mob_qiraj_war_spawnAI : public ScriptedAI + { + mob_qiraj_war_spawnAI(Creature* creature) : ScriptedAI(creature) {} + + uint64 MobGUID; + uint64 PlayerGUID; + uint32 SpellTimer1, SpellTimer2, SpellTimer3, SpellTimer4; + bool Timers; + bool hasTarget; + + void Reset() + { + MobGUID = 0; + PlayerGUID = 0; + Timers = false; + hasTarget = false; + } + + void EnterCombat(Unit* /*who*/) {} + void JustDied(Unit* /*slayer*/); + + void UpdateAI(const uint32 diff) + { + if (!Timers) + { + if (me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) //all but Kaldorei Soldiers + { + SpellTimer1 = SpawnCast[1].Timer1; + SpellTimer2 = SpawnCast[2].Timer1; + SpellTimer3 = SpawnCast[3].Timer1; + } + if (me->GetEntry() == 15423 || me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) + SpellTimer4 = SpawnCast[0].Timer1; + Timers = true; + } + if (me->GetEntry() == 15424 || me->GetEntry() == 15422|| me->GetEntry() == 15414) + { + if (SpellTimer1 <= diff) + { + DoCast(me, SpawnCast[1].SpellId); + DoCast(me, 24319); + SpellTimer1 = SpawnCast[1].Timer2; + } else SpellTimer1 -= diff; + if (SpellTimer2 <= diff) + { + DoCast(me, SpawnCast[2].SpellId); + SpellTimer2 = SpawnCast[2].Timer2; + } else SpellTimer2 -= diff; + if (SpellTimer3 <= diff) + { + DoCast(me, SpawnCast[3].SpellId); + SpellTimer3 = SpawnCast[3].Timer2; + } else SpellTimer3 -= diff; + } + if (me->GetEntry() == 15423 || me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) + { + if (SpellTimer4 <= diff) + { + me->RemoveAllAttackers(); + me->AttackStop(); + DoCast(me, 15533); + SpellTimer4 = SpawnCast[0].Timer2; + } else SpellTimer4 -= diff; + } + if (!hasTarget) + { + Unit* target = NULL; + if (me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) + target = me->FindNearestCreature(15423, 20, true); + if (me->GetEntry() == 15423) + { + uint8 tar = urand(0, 2); + + if (tar == 0) + target = me->FindNearestCreature(15422, 20, true); + else if (tar == 1) + target = me->FindNearestCreature(15424, 20, true); + else if (tar == 2) + target = me->FindNearestCreature(15414, 20, true); + } + hasTarget = true; + if (target) + me->AI()->AttackStart(target); + } + if (!(me->FindNearestCreature(15379, 60))) + DoCast(me, 33652); + + if (!UpdateVictim()) + { + hasTarget = false; + return; + } + + DoMeleeAttackIfReady(); + } + }; + +}; + +/*##### +# npc_anachronos_quest_trigger +#####*/ + +class npc_anachronos_quest_trigger : public CreatureScript +{ +public: + npc_anachronos_quest_trigger() : CreatureScript("npc_anachronos_quest_trigger") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_anachronos_quest_triggerAI(creature); + } + + struct npc_anachronos_quest_triggerAI : public ScriptedAI + { + npc_anachronos_quest_triggerAI(Creature* creature) : ScriptedAI(creature) {} + + uint64 PlayerGUID; + + uint32 WaveTimer; + uint32 AnnounceTimer; + + int8 LiveCount; + uint8 WaveCount; + + bool EventStarted; + bool Announced; + bool Failed; + + void Reset() + { + PlayerGUID = 0; + + WaveTimer = 2000; + AnnounceTimer = 1000; + LiveCount = 0; + WaveCount = 0; + + EventStarted = false; + Announced = false; + Failed = false; + + me->SetVisible(false); + } + + void SummonNextWave() + { + uint8 locIndex = WavesInfo[WaveCount].UsedSpawnPoint; + uint8 count = locIndex + WavesInfo[WaveCount].SpawnCount; + + for (uint8 i = locIndex; i <= count; ++i) + { + uint32 desptimer = WavesInfo[WaveCount].DespTimer; + + if (Creature* spawn = me->SummonCreature(WavesInfo[WaveCount].CreatureId, SpawnLocation[i], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, desptimer)) + { + if (spawn->GetEntry() == 15423) + spawn->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15427+rand()%4); + if (i >= 30) WaveCount = 1; + if (i >= 33) WaveCount = 2; + if (i >= 45) WaveCount = 3; + if (i >= 51) WaveCount = 4; + + if (WaveCount < 5) //1-4 Wave + { + if (mob_qiraj_war_spawn::mob_qiraj_war_spawnAI* spawnAI = CAST_AI(mob_qiraj_war_spawn::mob_qiraj_war_spawnAI, spawn->AI())) + { + spawnAI->MobGUID = me->GetGUID(); + spawnAI->PlayerGUID = PlayerGUID; + } + } + } + } + + WaveTimer = WavesInfo[WaveCount].SpawnTimer; + AnnounceTimer = WavesInfo[WaveCount].YellTimer; + } + + void CheckEventFail() + { + Player* player = Unit::GetPlayer(*me, PlayerGUID); + + if (!player) + return; + + if (Group* EventGroup = player->GetGroup()) + { + Player* groupMember; + + uint8 GroupMemberCount = 0; + uint8 DeadMemberCount = 0; + uint8 FailedMemberCount = 0; + + Group::MemberSlotList const members = EventGroup->GetMemberSlots(); + + for (Group::member_citerator itr = members.begin(); itr!= members.end(); ++itr) + { + groupMember = (Unit::GetPlayer(*me, itr->guid)); + if (!groupMember) + continue; + if (!groupMember->IsWithinDistInMap(me, EVENT_AREA_RADIUS) && groupMember->GetQuestStatus(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD) == QUEST_STATUS_INCOMPLETE) + { + groupMember->FailQuest(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD); + ++FailedMemberCount; + } + ++GroupMemberCount; + + if (groupMember->isDead()) + ++DeadMemberCount; + } + + if (GroupMemberCount == FailedMemberCount || !player->IsWithinDistInMap(me, EVENT_AREA_RADIUS)) + Failed = true; //only so event can restart + } + } + + void LiveCounter() + { + --LiveCount; + if (!LiveCount) + Announced = false; + } + + void UpdateAI(const uint32 diff) + { + if (!PlayerGUID || !EventStarted) + return; + + if (WaveCount < 4) + { + if (!Announced && AnnounceTimer <= diff) + { + Talk(WavesInfo[WaveCount].WaveTextId); + Announced = true; + } else AnnounceTimer -= diff; + + if (WaveTimer <= diff) + SummonNextWave(); + else WaveTimer -= diff; + } + CheckEventFail(); + if (WaveCount == 4 || Failed) + EnterEvadeMode(); + }; + }; + +}; + +void mob_qiraj_war_spawn::mob_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/) +{ + me->RemoveCorpse(); + + if (!MobGUID) + return; + + if (Creature* mob = Unit::GetCreature(*me, MobGUID)) + if (npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI* triggerAI = CAST_AI(npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI, mob->AI())) + triggerAI->LiveCounter(); + +}; + +/*##### +# go_crystalline_tear +######*/ + +class go_crystalline_tear : public GameObjectScript +{ +public: + go_crystalline_tear() : GameObjectScript("go_crystalline_tear") { } + + bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) + { + if (quest->GetQuestId() == QUEST_A_PAWN_ON_THE_ETERNAL_BOARD) + { + if (Creature* trigger = go->FindNearestCreature(15454, 100, player)) + { + Unit* Merithra = trigger->SummonCreature(15378, -8034.535f, 1535.14f, 2.61f, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit* Caelestrasz = trigger->SummonCreature(15379, -8032.767f, 1533.148f, 2.61f, 1.5f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit* Arygos = trigger->SummonCreature(15380, -8034.52f, 1537.843f, 2.61f, 5.7f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + /* Unit* Fandral = */ trigger->SummonCreature(15382, -8028.462f, 1535.843f, 2.61f, 3.141592f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Creature* Anachronos = trigger->SummonCreature(15381, -8028.75f, 1538.795f, 2.61f, 4, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + + if (Merithra) + { + Merithra->SetUInt32Value(UNIT_NPC_FLAGS, 0); + Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15420); + Merithra->setFaction(35); + } + + if (Caelestrasz) + { + Caelestrasz->SetUInt32Value(UNIT_NPC_FLAGS, 0); + Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15419); + Caelestrasz->setFaction(35); + } + + if (Arygos) + { + Arygos->SetUInt32Value(UNIT_NPC_FLAGS, 0); + Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15418); + Arygos->setFaction(35); + } + + if (Anachronos) + { + if (npc_anachronos_the_ancient::npc_anachronos_the_ancientAI* anachronosAI = CAST_AI(npc_anachronos_the_ancient::npc_anachronos_the_ancientAI, Anachronos->AI())) + anachronosAI->PlayerGUID = player->GetGUID(); + + if (npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI* triggerAI = CAST_AI(npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI, trigger->AI())) + { + triggerAI->Failed = false; + triggerAI->PlayerGUID = player->GetGUID(); + triggerAI->EventStarted = true; + triggerAI->Announced = true; + } + } + } + } + return true; + } + +}; + /*### ## go_wind_stone ###*/ diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 3f0361bb0b4..f734fd0e518 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -16,22 +16,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* ScriptData -SDName: Stonetalon_Mountains -SD%Complete: 0 -SDComment: Quest support: -SDCategory: Stonetalon Mountains -EndScriptData */ - -/* ContentData -EndContentData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "Player.h" - void AddSC_stonetalon_mountains() { } diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 4ac3d747a74..5571280f247 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -38,6 +38,111 @@ EndContentData */ #include "WorldSession.h" /*###### +## mob_aquementas +######*/ + +enum Aquementas +{ + AGGRO_YELL_AQUE = 0, + + SPELL_AQUA_JET = 13586, + SPELL_FROST_SHOCK = 15089 +}; + +class mob_aquementas : public CreatureScript +{ +public: + mob_aquementas() : CreatureScript("mob_aquementas") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new mob_aquementasAI (creature); + } + + struct mob_aquementasAI : public ScriptedAI + { + mob_aquementasAI(Creature* creature) : ScriptedAI(creature) {} + + uint32 SendItemTimer; + uint32 SwitchFactionTimer; + bool isFriendly; + + uint32 FrostShockTimer; + uint32 AquaJetTimer; + + void Reset() + { + SendItemTimer = 0; + SwitchFactionTimer = 10000; + me->setFaction(35); + isFriendly = true; + + AquaJetTimer = 5000; + FrostShockTimer = 1000; + } + + void SendItem(Unit* receiver) + { + if (CAST_PLR(receiver)->HasItemCount(11169, 1, false) && + CAST_PLR(receiver)->HasItemCount(11172, 11, false) && + CAST_PLR(receiver)->HasItemCount(11173, 1, false) && + !CAST_PLR(receiver)->HasItemCount(11522, 1, true)) + { + ItemPosCountVec dest; + uint8 msg = CAST_PLR(receiver)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 11522, 1, NULL); + if (msg == EQUIP_ERR_OK) + CAST_PLR(receiver)->StoreNewItem(dest, 11522, 1, true); + } + } + + void EnterCombat(Unit* who) + { + Talk(AGGRO_YELL_AQUE, who->GetGUID()); + } + + void UpdateAI(const uint32 diff) + { + if (isFriendly) + { + if (SwitchFactionTimer <= diff) + { + me->setFaction(91); + isFriendly = false; + } else SwitchFactionTimer -= diff; + } + + if (!UpdateVictim()) + return; + + if (!isFriendly) + { + if (SendItemTimer <= diff) + { + if (me->getVictim()->GetTypeId() == TYPEID_PLAYER) + SendItem(me->getVictim()); + SendItemTimer = 5000; + } else SendItemTimer -= diff; + } + + if (FrostShockTimer <= diff) + { + DoCast(me->getVictim(), SPELL_FROST_SHOCK); + FrostShockTimer = 15000; + } else FrostShockTimer -= diff; + + if (AquaJetTimer <= diff) + { + DoCast(me, SPELL_AQUA_JET); + AquaJetTimer = 15000; + } else AquaJetTimer -= diff; + + DoMeleeAttackIfReady(); + } + }; + +}; + +/*###### ## npc_custodian_of_time ######*/ @@ -221,13 +326,11 @@ public: enum Npc00X17 { - //texts are signed for 7806 - SAY_OOX_START = -1000287, - SAY_OOX_AGGRO1 = -1000288, - SAY_OOX_AGGRO2 = -1000289, - SAY_OOX_AMBUSH = -1000290, - SAY_OOX17_AMBUSH_REPLY = -1000291, - SAY_OOX_END = -1000292, + SAY_OOX_START = 0, + SAY_OOX_AGGRO = 1, + SAY_OOX_AMBUSH = 2, + SAY_OOX17_AMBUSH_REPLY = 0, + SAY_OOX_END = 3, Q_OOX17 = 648, SPAWN_FIRST = 7803, @@ -248,7 +351,7 @@ public: creature->SetFullHealth(); creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - DoScriptText(SAY_OOX_START, creature); + creature->AI()->Talk(SAY_OOX_START); if (npc_escortAI* pEscortAI = CAST_AI(npc_OOX17::npc_OOX17AI, creature->AI())) pEscortAI->Start(true, false, player->GetGUID()); @@ -275,18 +378,18 @@ public: me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8353.96f, -4442.79f, 10.10f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); break; case 56: me->SummonCreature(SPAWN_SECOND_1, -7510.07f, -4795.50f, 9.35f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_SECOND_2, -7515.07f, -4797.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_SECOND_2, -7518.07f, -4792.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_OOX_AMBUSH, me); - if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30)) - DoScriptText(SAY_OOX17_AMBUSH_REPLY, scoff); + Talk(SAY_OOX_AMBUSH); + if (Creature* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30)) + scoff->AI()->Talk(SAY_OOX17_AMBUSH_REPLY); break; case 86: - DoScriptText(SAY_OOX_END, me); + Talk(SAY_OOX_END); player->GroupEventHappens(Q_OOX17, me); break; } @@ -297,7 +400,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); + Talk(SAY_OOX_AGGRO); } void JustSummoned(Creature* summoned) @@ -307,6 +410,168 @@ public: }; }; +/*#### +# npc_tooga +####*/ + +enum Tooga +{ + SAY_TOOG_WORRIED = 0, + SAY_TOOG_POST_1 = 1, + SAY_TORT_POST_2 = 0, + SAY_TOOG_POST_3 = 2, + SAY_TORT_POST_4 = 1, + SAY_TOOG_POST_5 = 3, + SAY_TORT_POST_6 = 2, + + QUEST_TOOGA = 1560, + NPC_TORTA = 6015, + + POINT_ID_TO_WATER = 1, + FACTION_TOOG_ESCORTEE = 113 +}; + +Position const ToWaterLoc = {-7032.664551f, -4906.199219f, -1.606446f, 0.0f}; + +class npc_tooga : public CreatureScript +{ +public: + npc_tooga() : CreatureScript("npc_tooga") { } + + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + { + if (quest->GetQuestId() == QUEST_TOOGA) + { + if (npc_toogaAI* pToogaAI = CAST_AI(npc_tooga::npc_toogaAI, creature->AI())) + pToogaAI->StartFollow(player, FACTION_TOOG_ESCORTEE, quest); + } + + return true; + } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_toogaAI(creature); + } + + struct npc_toogaAI : public FollowerAI + { + npc_toogaAI(Creature* creature) : FollowerAI(creature) { } + + uint32 CheckSpeechTimer; + uint32 PostEventTimer; + uint32 PhasePostEvent; + + uint64 TortaGUID; + + void Reset() + { + CheckSpeechTimer = 2500; + PostEventTimer = 1000; + PhasePostEvent = 0; + + TortaGUID = 0; + } + + void MoveInLineOfSight(Unit* who) + { + FollowerAI::MoveInLineOfSight(who); + + if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE | STATE_FOLLOW_POSTEVENT) && who->GetEntry() == NPC_TORTA) + { + if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE)) + { + Player* player = GetLeaderForFollower(); + if (player && player->GetQuestStatus(QUEST_TOOGA) == QUEST_STATUS_INCOMPLETE) + player->GroupEventHappens(QUEST_TOOGA, me); + + TortaGUID = who->GetGUID(); + SetFollowComplete(true); + } + } + } + + void MovementInform(uint32 MotionType, uint32 PointId) + { + FollowerAI::MovementInform(MotionType, PointId); + + if (MotionType != POINT_MOTION_TYPE) + return; + + if (PointId == POINT_ID_TO_WATER) + SetFollowComplete(); + } + + void UpdateFollowerAI(const uint32 Diff) + { + if (!UpdateVictim()) + { + //we are doing the post-event, or... + if (HasFollowState(STATE_FOLLOW_POSTEVENT)) + { + if (PostEventTimer <= Diff) + { + PostEventTimer = 5000; + + Creature* torta = Creature::GetCreature(*me, TortaGUID); + if (!torta || !torta->isAlive()) + { + //something happened, so just complete + SetFollowComplete(); + return; + } + + switch (PhasePostEvent) + { + case 1: + Talk(SAY_TOOG_POST_1); + break; + case 2: + torta->AI()->Talk(SAY_TORT_POST_2); + break; + case 3: + Talk(SAY_TOOG_POST_3); + break; + case 4: + torta->AI()->Talk(SAY_TORT_POST_4); + break; + case 5: + Talk(SAY_TOOG_POST_5); + break; + case 6: + torta->AI()->Talk(SAY_TORT_POST_6); + me->GetMotionMaster()->MovePoint(POINT_ID_TO_WATER, ToWaterLoc); + break; + } + + ++PhasePostEvent; + } + else + PostEventTimer -= Diff; + } + //...we are doing regular speech check + else if (HasFollowState(STATE_FOLLOW_INPROGRESS)) + { + if (CheckSpeechTimer <= Diff) + { + CheckSpeechTimer = 5000; + + if (urand(0, 9) > 8) + Talk(SAY_TOOG_WORRIED); + } + else + CheckSpeechTimer -= Diff; + } + + return; + } + + DoMeleeAttackIfReady(); + } + }; + +}; + void AddSC_tanaris() { new npc_custodian_of_time(); diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp index 6c1993d6447..dfd42d132d8 100644 --- a/src/server/scripts/Kalimdor/teldrassil.cpp +++ b/src/server/scripts/Kalimdor/teldrassil.cpp @@ -38,8 +38,8 @@ EndContentData */ enum Mist { - SAY_AT_HOME = -1000323, - EMOTE_AT_HOME = -1000324, + SAY_AT_HOME = 0, + EMOTE_AT_HOME = 1, QUEST_MIST = 938, NPC_ARYNIA = 3519, FACTION_DARNASSUS = 79 @@ -78,7 +78,7 @@ public: { if (me->IsWithinDistInMap(who, 10.0f)) { - DoScriptText(SAY_AT_HOME, who); + Talk(SAY_AT_HOME, who->GetGUID()); DoComplete(); } } @@ -86,7 +86,7 @@ public: void DoComplete() { - DoScriptText(EMOTE_AT_HOME, me); + Talk(EMOTE_AT_HOME); Player* player = GetLeaderForFollower(); if (player && player->GetQuestStatus(QUEST_MIST) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 811c6bb4dd1..05a3074f209 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -34,20 +34,502 @@ EndContentData */ #include "Player.h" #include "SpellInfo.h" +/*###### +## npc_beaten_corpse +######*/ + +#define GOSSIP_CORPSE "Examine corpse in detail..." + +enum BeatenCorpse +{ + QUEST_LOST_IN_BATTLE = 4921 +}; + +class npc_beaten_corpse : public CreatureScript +{ +public: + npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { } + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + { + player->PlayerTalkClass->ClearMenus(); + if (action == GOSSIP_ACTION_INFO_DEF +1) + { + player->SEND_GOSSIP_MENU(3558, creature->GetGUID()); + player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); + } + return true; + } + + bool OnGossipHello(Player* player, Creature* creature) + { + if (player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + + player->SEND_GOSSIP_MENU(3557, creature->GetGUID()); + return true; + } + +}; + +/*###### +# npc_gilthares +######*/ + +enum Gilthares +{ + SAY_GIL_START = 0, + SAY_GIL_AT_LAST = 1, + SAY_GIL_PROCEED = 2, + SAY_GIL_FREEBOOTERS = 3, + SAY_GIL_AGGRO = 4, + SAY_GIL_ALMOST = 5, + SAY_GIL_SWEET = 6, + SAY_GIL_FREED = 7, + + QUEST_FREE_FROM_HOLD = 898, + AREA_MERCHANT_COAST = 391, + FACTION_ESCORTEE = 232 //guessed, possible not needed for this quest +}; + +class npc_gilthares : public CreatureScript +{ +public: + npc_gilthares() : CreatureScript("npc_gilthares") { } + + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + { + if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD) + { + creature->setFaction(FACTION_ESCORTEE); + creature->SetStandState(UNIT_STAND_STATE_STAND); + + creature->AI()->Talk(SAY_GIL_START, player->GetGUID()); + + if (npc_giltharesAI* pEscortAI = CAST_AI(npc_gilthares::npc_giltharesAI, creature->AI())) + pEscortAI->Start(false, false, player->GetGUID(), quest); + } + return true; + } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_giltharesAI(creature); + } + + struct npc_giltharesAI : public npc_escortAI + { + npc_giltharesAI(Creature* creature) : npc_escortAI(creature) { } + + void Reset() { } + + void WaypointReached(uint32 waypointId) + { + Player* player = GetPlayerForEscort(); + if (!player) + return; + + switch (waypointId) + { + case 16: + Talk(SAY_GIL_AT_LAST, player->GetGUID()); + break; + case 17: + Talk(SAY_GIL_PROCEED, player->GetGUID()); + break; + case 18: + Talk(SAY_GIL_FREEBOOTERS, player->GetGUID()); + break; + case 37: + Talk(SAY_GIL_ALMOST,player->GetGUID()); + break; + case 47: + Talk(SAY_GIL_SWEET, player->GetGUID()); + break; + case 53: + Talk(SAY_GIL_FREED, player->GetGUID()); + player->GroupEventHappens(QUEST_FREE_FROM_HOLD, me); + break; + } + } + + void EnterCombat(Unit* who) + { + //not always use + if (rand()%4) + return; + + //only aggro text if not player and only in this area + if (who->GetTypeId() != TYPEID_PLAYER && me->GetAreaId() == AREA_MERCHANT_COAST) + { + //appears to be pretty much random (possible only if escorter not in combat with who yet?) + Talk(SAY_GIL_AGGRO, who->GetGUID()); + } + } + }; + +}; + +/*###### +## npc_sputtervalve +######*/ + +#define GOSSIP_SPUTTERVALVE "Can you tell me about this shard?" + +class npc_sputtervalve : public CreatureScript +{ +public: + npc_sputtervalve() : CreatureScript("npc_sputtervalve") { } + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + { + player->PlayerTalkClass->ClearMenus(); + if (action == GOSSIP_ACTION_INFO_DEF) + { + player->SEND_GOSSIP_MENU(2013, creature->GetGUID()); + player->AreaExploredOrEventHappens(6981); + } + return true; + } + + bool OnGossipHello(Player* player, Creature* creature) + { + if (creature->isQuestGiver()) + player->PrepareQuestMenu(creature->GetGUID()); + + if (player->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + + player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); + return true; + } + +}; + +/*###### +## npc_taskmaster_fizzule +######*/ + +enum TaskmasterFizzule +{ + FACTION_FRIENDLY_F = 35, + SPELL_FLARE = 10113, + SPELL_FOLLY = 10137, +}; + +class npc_taskmaster_fizzule : public CreatureScript +{ +public: + npc_taskmaster_fizzule() : CreatureScript("npc_taskmaster_fizzule") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_taskmaster_fizzuleAI(creature); + } + + struct npc_taskmaster_fizzuleAI : public ScriptedAI + { + npc_taskmaster_fizzuleAI(Creature* creature) : ScriptedAI(creature) + { + factionNorm = creature->getFaction(); + } + + uint32 factionNorm; + bool IsFriend; + uint32 ResetTimer; + uint8 FlareCount; + + void Reset() + { + IsFriend = false; + ResetTimer = 120000; + FlareCount = 0; + me->setFaction(factionNorm); + } + + void DoFriend() + { + me->RemoveAllAuras(); + me->DeleteThreatList(); + me->CombatStop(true); + + me->StopMoving(); + me->GetMotionMaster()->MoveIdle(); + + me->setFaction(FACTION_FRIENDLY_F); + me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); + } + + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + { + if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) + { + ++FlareCount; + + if (FlareCount >= 2) + IsFriend = true; + } + } + + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + if (IsFriend) + { + if (ResetTimer <= diff) + { + EnterEvadeMode(); + return; + } else ResetTimer -= diff; + } + + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + + void ReceiveEmote(Player* /*player*/, uint32 emote) + { + if (emote == TEXT_EMOTE_SALUTE) + { + if (FlareCount >= 2) + { + if (me->getFaction() == FACTION_FRIENDLY_F) + return; + + DoFriend(); + } + } + } + }; + +}; + +/*##### +## npc_twiggy_flathead +#####*/ + +enum TwiggyFlathead +{ + NPC_BIG_WILL = 6238, + NPC_AFFRAY_CHALLENGER = 6240, + + SAY_BIG_WILL_READY = 0, + SAY_TWIGGY_FLATHEAD_BEGIN = 0, + SAY_TWIGGY_FLATHEAD_FRAY = 1, + SAY_TWIGGY_FLATHEAD_DOWN = 2, + SAY_TWIGGY_FLATHEAD_OVER = 3 +}; + +Position const AffrayChallengerLoc[6] = +{ + {-1683.0f, -4326.0f, 2.79f, 0.0f}, + {-1682.0f, -4329.0f, 2.79f, 0.0f}, + {-1683.0f, -4330.0f, 2.79f, 0.0f}, + {-1680.0f, -4334.0f, 2.79f, 1.49f}, + {-1674.0f, -4326.0f, 2.79f, 3.49f}, + {-1677.0f, -4334.0f, 2.79f, 1.66f} +}; + +class npc_twiggy_flathead : public CreatureScript +{ +public: + npc_twiggy_flathead() : CreatureScript("npc_twiggy_flathead") { } + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_twiggy_flatheadAI (creature); + } + + struct npc_twiggy_flatheadAI : public ScriptedAI + { + npc_twiggy_flatheadAI(Creature* creature) : ScriptedAI(creature) {} + + bool EventInProgress; + bool EventGrate; + bool EventBigWill; + bool ChallengerDown[6]; + uint8 Wave; + uint32 WaveTimer; + uint32 ChallengerChecker; + uint64 PlayerGUID; + uint64 AffrayChallenger[6]; + uint64 BigWill; + + void Reset() + { + EventInProgress = false; + EventGrate = false; + EventBigWill = false; + WaveTimer = 600000; + ChallengerChecker = 0; + Wave = 0; + PlayerGUID = 0; + + for (uint8 i = 0; i < 6; ++i) + { + AffrayChallenger[i] = 0; + ChallengerDown[i] = false; + } + BigWill = 0; + } + + void EnterCombat(Unit* /*who*/) { } + + void MoveInLineOfSight(Unit* who) + { + if (!who || (!who->isAlive())) + return; + + if (me->IsWithinDistInMap(who, 10.0f) && (who->GetTypeId() == TYPEID_PLAYER) && CAST_PLR(who)->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE && !EventInProgress) + { + PlayerGUID = who->GetGUID(); + EventInProgress = true; + } + } + + void KilledUnit(Unit* /*victim*/) { } + + void UpdateAI(const uint32 diff) + { + if (EventInProgress) { + Player* pWarrior = NULL; + + if (PlayerGUID) + pWarrior = Unit::GetPlayer(*me, PlayerGUID); + + if (!pWarrior) + return; + + if (!pWarrior->isAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) { + Talk(SAY_TWIGGY_FLATHEAD_DOWN); + pWarrior->FailQuest(1719); + + for (uint8 i = 0; i < 6; ++i) // unsummon challengers + { + if (AffrayChallenger[i]) + { + Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]); + if (creature && creature->isAlive()) + creature->DisappearAndDie(); + } + } + + if (BigWill) // unsummon bigWill + { + Creature* creature = Unit::GetCreature((*me), BigWill); + if (creature && creature->isAlive()) + creature->DisappearAndDie(); + } + Reset(); + } + + if (!EventGrate && EventInProgress) + { + float x, y, z; + pWarrior->GetPosition(x, y, z); + + if (x >= -1684 && x <= -1674 && y >= -4334 && y <= -4324) { + pWarrior->AreaExploredOrEventHappens(1719); + Talk(SAY_TWIGGY_FLATHEAD_BEGIN, pWarrior->GetGUID()); + + for (uint8 i = 0; i < 6; ++i) + { + Creature* creature = me->SummonCreature(NPC_AFFRAY_CHALLENGER, AffrayChallengerLoc[i], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + if (!creature) + continue; + creature->setFaction(35); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); + AffrayChallenger[i] = creature->GetGUID(); + } + WaveTimer = 5000; + ChallengerChecker = 1000; + EventGrate = true; + } + } + else if (EventInProgress) + { + if (ChallengerChecker <= diff) + { + for (uint8 i = 0; i < 6; ++i) + { + if (AffrayChallenger[i]) + { + Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]); + if ((!creature || (!creature->isAlive())) && !ChallengerDown[i]) + { + Talk(SAY_TWIGGY_FLATHEAD_DOWN); + ChallengerDown[i] = true; + } + } + } + ChallengerChecker = 1000; + } else ChallengerChecker -= diff; + + if (WaveTimer <= diff) + { + if (Wave < 6 && AffrayChallenger[Wave] && !EventBigWill) + { + Talk(SAY_TWIGGY_FLATHEAD_FRAY); + Creature* creature = Unit::GetCreature((*me), AffrayChallenger[Wave]); + if (creature && (creature->isAlive())) + { + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); + creature->setFaction(14); + creature->AI()->AttackStart(pWarrior); + ++Wave; + WaveTimer = 20000; + } + } + else if (Wave >= 6 && !EventBigWill) { + if (Creature* creature = me->SummonCreature(NPC_BIG_WILL, -1722, -4341, 6.12f, 6.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000)) + { + BigWill = creature->GetGUID(); + //creature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32f); + //creature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78f); + creature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79f); + creature->HandleEmoteCommand(EMOTE_STATE_READY_UNARMED); + EventBigWill = true; + WaveTimer = 1000; + } + } + else if (Wave >= 6 && EventBigWill && BigWill) + { + Creature* creature = Unit::GetCreature((*me), BigWill); + if (!creature || !creature->isAlive()) + { + Talk(SAY_TWIGGY_FLATHEAD_OVER); + Reset(); + } + } + } else WaveTimer -= diff; + } + } + } + }; + +}; + /*##### ## npc_wizzlecrank_shredder #####*/ enum Wizzlecrank { - SAY_START = -1000298, - SAY_STARTUP1 = -1000299, - SAY_STARTUP2 = -1000300, - SAY_MERCENARY = -1000301, - SAY_PROGRESS_1 = -1000302, - SAY_PROGRESS_2 = -1000303, - SAY_PROGRESS_3 = -1000304, - SAY_END = -1000305, + SAY_MERCENARY = 0, + SAY_START = 0, + SAY_STARTUP1 = 1, + SAY_STARTUP2 = 2, + SAY_PROGRESS_1 = 3, + SAY_PROGRESS_2 = 4, + SAY_PROGRESS_3 = 5, + SAY_END = 6, QUEST_ESCAPE = 863, FACTION_RATCHET = 637, @@ -91,7 +573,7 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_STARTUP1, me); + Talk(SAY_STARTUP1); break; case 9: SetRun(false); @@ -99,7 +581,7 @@ public: case 17: if (Creature* temp = me->SummonCreature(NPC_MERCENARY, 1128.489f, -3037.611f, 92.701f, 1.472f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000)) { - DoScriptText(SAY_MERCENARY, temp); + temp->AI()->Talk(SAY_MERCENARY); me->SummonCreature(NPC_MERCENARY, 1160.172f, -2980.168f, 97.313f, 3.690f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); } break; @@ -119,10 +601,10 @@ public: switch (PointId) { case 9: - DoScriptText(SAY_STARTUP2, me, player); + Talk(SAY_STARTUP2, player->GetGUID()); break; case 18: - DoScriptText(SAY_PROGRESS_1, me, player); + Talk(SAY_PROGRESS_1, player->GetGUID()); SetRun(); break; } @@ -148,13 +630,13 @@ public: switch (PostEventCount) { case 0: - DoScriptText(SAY_PROGRESS_2, me); + Talk(SAY_PROGRESS_2); break; case 1: - DoScriptText(SAY_PROGRESS_3, me); + Talk(SAY_PROGRESS_3); break; case 2: - DoScriptText(SAY_END, me); + Talk(SAY_END); break; case 3: if (Player* player = GetPlayerForEscort()) diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 7db37ff2f5b..a7c81e64810 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -16,23 +16,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* ScriptData -SDName: Thousand Needles -SD%Complete: 0 -SDComment: Support for Quest: -SDCategory: Thousand Needles -EndScriptData */ - -/* ContentData -EndContentData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "Player.h" - - void AddSC_thousand_needles() { } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 3bc91855d36..11ef00775d0 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -44,17 +44,12 @@ enum Creatures // not in db enum Yells { - SAY_INTRO = -1601010, - SAY_AGGRO = -1601000, - SAY_SLAY_1 = -1601001, - SAY_SLAY_2 = -1601002, - SAY_SLAY_3 = -1601003, - SAY_LOCUST_1 = -1601005, - SAY_LOCUST_2 = -1601006, - SAY_LOCUST_3 = -1601007, - SAY_SUBMERGE_1 = -1601008, - SAY_SUBMERGE_2 = -1601009, - SAY_DEATH = -1601004 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_LOCUST = 3, + SAY_SUBMERGE = 4, + SAY_INTRO = 5 }; enum @@ -161,7 +156,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DelayTimer = 0; if (instance) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); @@ -338,7 +333,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); Summons.DespawnAll(); if (instance) instance->SetData(DATA_ANUBARAK_EVENT, DONE); @@ -348,7 +343,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void JustSummoned(Creature* summon) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 1acc3b77a61..4c817fa9465 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -61,19 +61,12 @@ enum Mobs enum Yells { - SAY_AGGRO = -1601011, - SAY_SLAY_1 = -1601012, - SAY_SLAY_2 = -1601013, - SAY_DEATH = -1601014, - //Not in db - SAY_SEND_GROUP_1 = -1601020, - SAY_SEND_GROUP_2 = -1601021, - SAY_SEND_GROUP_3 = -1601022, - SAY_SWARM_1 = -1601015, - SAY_SWARM_2 = -1601016, - SAY_PREFIGHT_1 = -1601017, - SAY_PREFIGHT_2 = -1601018, - SAY_PREFIGHT_3 = -1601019 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SWARM = 3, + SAY_PREFIGHT = 4, + SAY_SEND_GROUP = 5 }; const Position SpawnPoint[] = @@ -117,7 +110,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); Summon(); uiSummonTimer = 15*IN_MILLISECONDS; @@ -180,7 +173,7 @@ public: } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE); @@ -191,7 +184,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index e20b08c515e..6d4b4bc9379 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -23,30 +23,25 @@ #include "CellImpl.h" #include "obsidian_sanctum.h" -enum eEnums +enum Enums { //Sartharion Yell - SAY_SARTHARION_AGGRO = -1615018, - SAY_SARTHARION_BERSERK = -1615019, - SAY_SARTHARION_BREATH = -1615020, - SAY_SARTHARION_CALL_SHADRON = -1615021, - SAY_SARTHARION_CALL_TENEBRON = -1615022, - SAY_SARTHARION_CALL_VESPERON = -1615023, - SAY_SARTHARION_DEATH = -1615024, - SAY_SARTHARION_SPECIAL_1 = -1615025, - SAY_SARTHARION_SPECIAL_2 = -1615026, - SAY_SARTHARION_SPECIAL_3 = -1615027, - SAY_SARTHARION_SPECIAL_4 = -1615028, - SAY_SARTHARION_SLAY_1 = -1615029, - SAY_SARTHARION_SLAY_2 = -1615030, - SAY_SARTHARION_SLAY_3 = -1615031, - - WHISPER_LAVA_CHURN = -1615032, - - WHISPER_SHADRON_DICIPLE = -1615008, - WHISPER_VESPERON_DICIPLE = -1615041, - WHISPER_HATCH_EGGS = -1615017, - WHISPER_OPEN_PORTAL = -1615042, // whisper, shared by two dragons + SAY_SARTHARION_AGGRO = 0, + SAY_SARTHARION_BERSERK = 1, + SAY_SARTHARION_BREATH = 2, + SAY_SARTHARION_CALL_SHADRON = 3, + SAY_SARTHARION_CALL_TENEBRON = 4, + SAY_SARTHARION_CALL_VESPERON = 5, + SAY_SARTHARION_DEATH = 6, + SAY_SARTHARION_SPECIAL = 7, + SAY_SARTHARION_SLAY = 8, + WHISPER_LAVA_CHURN = 9, + + WHISPER_HATCH_EGGS = 6, + WHISPER_OPEN_PORTAL = 6, // whisper, shared by two dragons + + WHISPER_SHADRON_DICIPLE = 7, + WHISPER_VESPERON_DICIPLE = 7, //Sartharion Spells SPELL_BERSERK = 61632, // Increases the caster's attack speed by 150% and all damage it deals by 500% for 5 min. @@ -357,7 +352,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_SARTHARION_AGGRO, me); + Talk(SAY_SARTHARION_AGGRO); DoZoneInCombat(); if (instance) @@ -369,7 +364,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_SARTHARION_DEATH, me); + Talk(SAY_SARTHARION_DEATH); if (instance) { @@ -389,7 +384,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SARTHARION_SLAY_1, SAY_SARTHARION_SLAY_2, SAY_SARTHARION_SLAY_3), me); + Talk(SAY_SARTHARION_SLAY); } // me->ResetLootMode() is called from Reset() @@ -511,7 +506,7 @@ public: break; } - DoScriptText(iTextId, me); + Talk(iTextId); } } } @@ -527,7 +522,7 @@ public: if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (i->getSource() && i->getSource()->isAlive()) - DoScriptText(WHISPER_LAVA_CHURN, me, i->getSource()); + Talk(WHISPER_LAVA_CHURN, i->getSource()->GetGUID()); } } @@ -566,7 +561,7 @@ public: if (!m_bIsBerserk && !HealthAbovePct(35) && ((pTene && pTene->isAlive()) || (pShad && pShad->isAlive()) || (pVesp && pVesp->isAlive()))) { - DoScriptText(SAY_SARTHARION_BERSERK, me); + Talk(SAY_SARTHARION_BERSERK); DoCast(me, SPELL_BERSERK); m_bIsBerserk = true; } @@ -624,7 +619,7 @@ public: // flame breath if (m_uiFlameBreathTimer <= uiDiff) { - DoScriptText(SAY_SARTHARION_BREATH, me); + Talk(SAY_SARTHARION_BREATH); DoCast(me->getVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); m_uiFlameBreathTimer = urand(25000, 35000); } @@ -657,7 +652,7 @@ public: CastLavaStrikeOnTarget(target); if (urand(0, 5) == 0) - DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1, SAY_SARTHARION_SPECIAL_2, SAY_SARTHARION_SPECIAL_3), me); + Talk(SAY_SARTHARION_SPECIAL); } m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000, 20000)); } @@ -701,38 +696,32 @@ public: enum TeneText { - SAY_TENEBRON_AGGRO = -1615009, - SAY_TENEBRON_SLAY_1 = -1615010, - SAY_TENEBRON_SLAY_2 = -1615011, - SAY_TENEBRON_DEATH = -1615012, - SAY_TENEBRON_BREATH = -1615013, - SAY_TENEBRON_RESPOND = -1615014, - SAY_TENEBRON_SPECIAL_1 = -1615015, - SAY_TENEBRON_SPECIAL_2 = -1615016 + SAY_TENEBRON_AGGRO = 0, + SAY_TENEBRON_SLAY = 1, + SAY_TENEBRON_DEATH = 2, + SAY_TENEBRON_BREATH = 3, + SAY_TENEBRON_RESPOND = 4, + SAY_TENEBRON_SPECIAL = 5 }; enum ShadText { - SAY_SHADRON_AGGRO = -1615000, - SAY_SHADRON_SLAY_1 = -1615001, - SAY_SHADRON_SLAY_2 = -1615002, - SAY_SHADRON_DEATH = -1615003, - SAY_SHADRON_BREATH = -1615004, - SAY_SHADRON_RESPOND = -1615005, - SAY_SHADRON_SPECIAL_1 = -1615006, - SAY_SHADRON_SPECIAL_2 = -1615007 + SAY_SHADRON_AGGRO = 0, + SAY_SHADRON_SLAY = 1, + SAY_SHADRON_DEATH = 2, + SAY_SHADRON_BREATH = 3, + SAY_SHADRON_RESPOND = 4, + SAY_SHADRON_SPECIAL = 5 }; enum VespText { - SAY_VESPERON_AGGRO = -1615033, - SAY_VESPERON_SLAY_1 = -1615034, - SAY_VESPERON_SLAY_2 = -1615035, - SAY_VESPERON_DEATH = -1615036, - SAY_VESPERON_BREATH = -1615037, - SAY_VESPERON_RESPOND = -1615038, - SAY_VESPERON_SPECIAL_1 = -1615039, - SAY_VESPERON_SPECIAL_2 = -1615040 + SAY_VESPERON_AGGRO = 0, + SAY_VESPERON_SLAY = 1, + SAY_VESPERON_DEATH = 2, + SAY_VESPERON_BREATH = 3, + SAY_VESPERON_RESPOND = 4, + SAY_VESPERON_SPECIAL = 5, }; //to control each dragons common abilities @@ -829,7 +818,7 @@ struct dummy_dragonAI : public ScriptedAI if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - DoScriptText(iTextId, me, i->getSource()); + Talk(iTextId, i->getSource()->GetGUID()); } } } @@ -943,7 +932,7 @@ struct dummy_dragonAI : public ScriptedAI break; } - DoScriptText(iTextId, me); + Talk(iTextId); me->RemoveAurasDueToSpell(uiSpellId); @@ -1019,13 +1008,13 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_TENEBRON_AGGRO, me); + Talk(SAY_TENEBRON_AGGRO); DoZoneInCombat(); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_TENEBRON_SLAY_1, SAY_TENEBRON_SLAY_2), me); + Talk(SAY_TENEBRON_SLAY); } void UpdateAI(const uint32 uiDiff) @@ -1060,7 +1049,7 @@ public: // shadow breath if (m_uiShadowBreathTimer <= uiDiff) { - DoScriptText(SAY_TENEBRON_BREATH, me); + Talk(SAY_TENEBRON_BREATH); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } @@ -1114,13 +1103,13 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_SHADRON_AGGRO, me); + Talk(SAY_SHADRON_AGGRO); DoZoneInCombat(); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SHADRON_SLAY_1, SAY_SHADRON_SLAY_2), me); + Talk(SAY_SHADRON_SLAY); } void UpdateAI(const uint32 uiDiff) @@ -1164,7 +1153,7 @@ public: // shadow breath if (m_uiShadowBreathTimer <= uiDiff) { - DoScriptText(SAY_SHADRON_BREATH, me); + Talk(SAY_SHADRON_BREATH); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } @@ -1212,13 +1201,13 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_VESPERON_AGGRO, me); + Talk(SAY_VESPERON_AGGRO); DoZoneInCombat(); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_VESPERON_SLAY_1, SAY_VESPERON_SLAY_2), me); + Talk(SAY_VESPERON_SLAY); } void UpdateAI(const uint32 uiDiff) @@ -1259,7 +1248,7 @@ public: // shadow breath if (m_uiShadowBreathTimer <= uiDiff) { - DoScriptText(SAY_VESPERON_BREATH, me); + Talk(SAY_VESPERON_BREATH); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 6ce56958d60..1ad776a0b46 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -36,12 +36,11 @@ enum Spells //not in db enum Yells { - SAY_AGGRO = -1600000, - SAY_KILL = -1600001, - SAY_DEATH = -1600002, - SAY_NECRO_ADD = -1600003, - SAY_REUBBLE_1 = -1600004, - SAY_REUBBLE_2 = -1600005 + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_NECRO_ADD = 3, + SAY_REUBBLE = 4 }; enum Creatures @@ -123,7 +122,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); Phase = PHASE_1; uiCrystalHandlerTimer = 30*IN_MILLISECONDS; uiTimer = 1*IN_MILLISECONDS; @@ -159,7 +158,7 @@ public: { if (uiCrystalHandlerTimer <= diff) { - DoScriptText(SAY_NECRO_ADD, me); + Talk(SAY_NECRO_ADD); Creature* pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint); uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); @@ -181,7 +180,7 @@ public: } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_NOVOS_EVENT, DONE); lSummons.DespawnAll(); @@ -191,7 +190,7 @@ public: { if (victim == me) return; - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void JustSummoned(Creature* summon) diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 79739280055..4cbabe2449a 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -44,14 +44,11 @@ enum Spells enum Yells { - SAY_AGGRO = -1600011, - SAY_KILL_1 = -1600012, - SAY_KILL_2 = -1600013, - SAY_FLESH_1 = -1600014, - SAY_FLESH_2 = -1600015, - SAY_SKELETON_1 = -1600016, - SAY_SKELETON_2 = -1600017, - SAY_DEATH = -1600018 + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_FLESH = 2, + SAY_SKELETON = 3, + SAY_DEATH = 4 }; enum Models { @@ -104,7 +101,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_THARON_JA_EVENT, IN_PROGRESS); @@ -150,7 +147,7 @@ public: case GOING_FLESH: if (uiPhaseTimer < diff) { - DoScriptText(RAND(SAY_FLESH_1, SAY_FLESH_2), me); + Talk(SAY_FLESH); me->SetDisplayId(MODEL_FLESH); std::list<Unit*> playerList; @@ -200,7 +197,7 @@ public: case GOING_SKELETAL: if (uiPhaseTimer < diff) { - DoScriptText(RAND(SAY_SKELETON_1, SAY_SKELETON_2), me); + Talk(SAY_SKELETON); me->DeMorph(); Phase = SKELETAL; uiPhaseTimer = 20*IN_MILLISECONDS; @@ -224,12 +221,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); + Talk(SAY_KILL); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index d8c720b6f95..60001e048a3 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -39,11 +39,11 @@ enum Spells enum Yells { - SAY_AGGRO = -1600006, - SAY_KILL = -1600007, - SAY_CONSUME = -1600008, - SAY_EXPLODE = -1600009, - SAY_DEATH = -1600010 + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_CONSUME = 2, + SAY_EXPLODE = 3, + SAY_DEATH = 4 }; enum Creatures @@ -102,7 +102,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_TROLLGORE_EVENT, IN_PROGRESS); @@ -124,7 +124,7 @@ public: if (uiConsumeTimer <= diff) { - DoScriptText(SAY_CONSUME, me); + Talk(SAY_CONSUME); DoCast(SPELL_CONSUME); uiConsumeTimer = 15*IN_MILLISECONDS; } else uiConsumeTimer -= diff; @@ -151,7 +151,7 @@ public: if (uiExplodeCorpseTimer <= diff) { DoCast(SPELL_CORPSE_EXPLODE); - DoScriptText(SAY_EXPLODE, me); + Talk(SAY_EXPLODE); uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS, 19*IN_MILLISECONDS); } else uiExplodeCorpseTimer -= diff; @@ -160,7 +160,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); lSummons.DespawnAll(); @@ -180,7 +180,7 @@ public: { if (victim == me) return; - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void JustSummoned(Creature* summon) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index b790ed518d5..1940ff4e2af 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -23,12 +23,11 @@ enum Yells { - SAY_AGGRO = -1632001, - SAY_SLAY_1 = -1632002, - SAY_SLAY_2 = -1632003, - SAY_DEATH = -1632004, - SAY_SOUL_STORM = -1632005, - SAY_CORRUPT_SOUL = -1632006, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SOUL_STORM = 3, + SAY_CORRUPT_SOUL = 4, }; enum Spells @@ -98,7 +97,7 @@ class boss_bronjahm : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL); instance->SetBossState(DATA_BRONJAHM, IN_PROGRESS); @@ -106,7 +105,7 @@ class boss_bronjahm : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); instance->SetBossState(DATA_BRONJAHM, DONE); } @@ -114,7 +113,7 @@ class boss_bronjahm : public CreatureScript void KilledUnit(Unit* who) { if (who->GetTypeId() == TYPEID_PLAYER) - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) @@ -163,13 +162,13 @@ class boss_bronjahm : public CreatureScript case EVENT_CORRUPT_SOUL: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) { - DoScriptText(SAY_CORRUPT_SOUL, me); + Talk(SAY_CORRUPT_SOUL); DoCast(target, SPELL_CORRUPT_SOUL); } events.ScheduleEvent(EVENT_CORRUPT_SOUL, urand(25000, 35000), 0, PHASE_1); break; case EVENT_SOULSTORM: - DoScriptText(SAY_SOUL_STORM, me); + Talk(SAY_SOUL_STORM); me->CastSpell(me, SPELL_SOULSTORM_VISUAL, true); me->CastSpell(me, SPELL_SOULSTORM, false); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 714e5df6444..248fe3c6eb0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -29,40 +29,32 @@ enum Yells { - SAY_FACE_ANGER_AGGRO = -1632010, - SAY_FACE_DESIRE_AGGRO = -1632011, - SAY_FACE_ANGER_SLAY_1 = -1632012, - SAY_FACE_SORROW_SLAY_1 = -1632013, - SAY_FACE_DESIRE_SLAY_1 = -1632014, - SAY_FACE_ANGER_SLAY_2 = -1632015, - SAY_FACE_SORROW_SLAY_2 = -1632016, - SAY_FACE_DESIRE_SLAY_2 = -1632017, - SAY_FACE_SORROW_DEATH = -1632019, - SAY_FACE_DESIRE_DEATH = -1632020, - EMOTE_MIRRORED_SOUL = -1632021, - EMOTE_UNLEASH_SOUL = -1632022, - SAY_FACE_ANGER_UNLEASH_SOUL = -1632023, - SAY_FACE_SORROW_UNLEASH_SOUL = -1632024, - SAY_FACE_DESIRE_UNLEASH_SOUL = -1632025, - EMOTE_WAILING_SOUL = -1632026, - SAY_FACE_ANGER_WAILING_SOUL = -1632027, - SAY_FACE_DESIRE_WAILING_SOUL = -1632028, - - SAY_JAINA_OUTRO = -1632029, - SAY_SYLVANAS_OUTRO = -1632030, + SAY_FACE_AGGRO = 0, + SAY_FACE_ANGER_SLAY = 1, + SAY_FACE_SORROW_SLAY = 2, + SAY_FACE_DESIRE_SLAY = 3, + SAY_FACE_DEATH = 4, + EMOTE_MIRRORED_SOUL = 5, + EMOTE_UNLEASH_SOUL = 6, + SAY_FACE_UNLEASH_SOUL = 7, + EMOTE_WAILING_SOUL = 8, + SAY_FACE_WAILING_SOUL = 9, + + SAY_JAINA_OUTRO = 0, + SAY_SYLVANAS_OUTRO = 0 }; enum Spells { - SPELL_PHANTOM_BLAST = 68982, - H_SPELL_PHANTOM_BLAST = 70322, - SPELL_MIRRORED_SOUL = 69051, - SPELL_WELL_OF_SOULS = 68820, - SPELL_UNLEASHED_SOULS = 68939, - SPELL_WAILING_SOULS_STARTING = 68912, // Initial spell cast at begining of wailing souls phase - SPELL_WAILING_SOULS_BEAM = 68875, // the beam visual - SPELL_WAILING_SOULS = 68873, // the actual spell - H_SPELL_WAILING_SOULS = 70324, + SPELL_PHANTOM_BLAST = 68982, + H_SPELL_PHANTOM_BLAST = 70322, + SPELL_MIRRORED_SOUL = 69051, + SPELL_WELL_OF_SOULS = 68820, + SPELL_UNLEASHED_SOULS = 68939, + SPELL_WAILING_SOULS_STARTING = 68912, // Initial spell cast at begining of wailing souls phase + SPELL_WAILING_SOULS_BEAM = 68875, // the beam visual + SPELL_WAILING_SOULS = 68873, // the actual spell + H_SPELL_WAILING_SOULS = 70324, // 68871, 68873, 68875, 68876, 68899, 68912, 70324, // 68899 trigger 68871 }; @@ -157,7 +149,7 @@ class boss_devourer_of_souls : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_FACE_ANGER_AGGRO, SAY_FACE_DESIRE_AGGRO), me); + Talk(SAY_FACE_AGGRO); if (!me->FindNearestCreature(NPC_CRUCIBLE_OF_SOULS, 60)) // Prevent double spawn instance->instance->SummonCreature(NPC_CRUCIBLE_OF_SOULS, CrucibleSummonPos); @@ -196,20 +188,20 @@ class boss_devourer_of_souls : public CreatureScript switch (me->GetDisplayId()) { case DISPLAY_ANGER: - textId = RAND(SAY_FACE_ANGER_SLAY_1, SAY_FACE_ANGER_SLAY_2); + textId = SAY_FACE_ANGER_SLAY; break; case DISPLAY_SORROW: - textId = RAND(SAY_FACE_SORROW_SLAY_1, SAY_FACE_SORROW_SLAY_2); + textId = SAY_FACE_SORROW_SLAY; break; case DISPLAY_DESIRE: - textId = RAND(SAY_FACE_DESIRE_SLAY_1, SAY_FACE_DESIRE_SLAY_2); + textId = SAY_FACE_DESIRE_SLAY; break; default: break; } if (textId) - DoScriptText(textId, me); + Talk(textId); } void JustDied(Unit* /*killer*/) @@ -218,7 +210,7 @@ class boss_devourer_of_souls : public CreatureScript Position spawnPoint = {5618.139f, 2451.873f, 705.854f, 0}; - DoScriptText(RAND(SAY_FACE_SORROW_DEATH, SAY_FACE_DESIRE_DEATH), me); + Talk(SAY_FACE_DEATH); instance->SetData(DATA_DEVOURER_EVENT, DONE); @@ -234,9 +226,9 @@ class boss_devourer_of_souls : public CreatureScript { summon->GetMotionMaster()->MovePoint(0, outroPositions[i].movePosition); if (summon->GetEntry() == NPC_JAINA_PART2) - DoScriptText(SAY_JAINA_OUTRO, summon); + summon->AI()->Talk(SAY_JAINA_OUTRO); else if (summon->GetEntry() == NPC_SYLVANAS_PART2) - DoScriptText(SAY_SYLVANAS_OUTRO, summon); + summon->AI()->Talk(SAY_SYLVANAS_OUTRO); } } } @@ -279,7 +271,7 @@ class boss_devourer_of_souls : public CreatureScript { mirroredSoulTarget = target->GetGUID(); DoCast(target, SPELL_MIRRORED_SOUL); - DoScriptText(EMOTE_MIRRORED_SOUL, me); + Talk(EMOTE_MIRRORED_SOUL); } events.ScheduleEvent(EVENT_MIRRORED_SOUL, urand(15000, 30000)); break; @@ -292,8 +284,8 @@ class boss_devourer_of_souls : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_UNLEASHED_SOULS); me->SetDisplayId(DISPLAY_SORROW); - DoScriptText(RAND(SAY_FACE_ANGER_UNLEASH_SOUL, SAY_FACE_SORROW_UNLEASH_SOUL, SAY_FACE_DESIRE_UNLEASH_SOUL), me); - DoScriptText(EMOTE_UNLEASH_SOUL, me); + Talk(SAY_FACE_UNLEASH_SOUL); + Talk(EMOTE_UNLEASH_SOUL); events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 30000); events.ScheduleEvent(EVENT_FACE_ANGER, 5000); break; @@ -303,8 +295,8 @@ class boss_devourer_of_souls : public CreatureScript case EVENT_WAILING_SOULS: me->SetDisplayId(DISPLAY_DESIRE); - DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL, SAY_FACE_DESIRE_WAILING_SOUL), me); - DoScriptText(EMOTE_WAILING_SOUL, me); + Talk(SAY_FACE_WAILING_SOUL); + Talk(EMOTE_WAILING_SOUL); DoCast(me, SPELL_WAILING_SOULS_STARTING); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 2f89d3bd503..895efd84580 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -42,21 +42,21 @@ enum Events enum Yells { - SAY_JAINA_INTRO_1 = -1632040, - SAY_JAINA_INTRO_2 = -1632041, - SAY_JAINA_INTRO_3 = -1632042, - SAY_JAINA_INTRO_4 = -1632043, - SAY_JAINA_INTRO_5 = -1632044, - SAY_JAINA_INTRO_6 = -1632045, - SAY_JAINA_INTRO_7 = -1632046, - SAY_JAINA_INTRO_8 = -1632047, - - SAY_SYLVANAS_INTRO_1 = -1632050, - SAY_SYLVANAS_INTRO_2 = -1632051, - SAY_SYLVANAS_INTRO_3 = -1632052, - SAY_SYLVANAS_INTRO_4 = -1632053, - SAY_SYLVANAS_INTRO_5 = -1632054, - SAY_SYLVANAS_INTRO_6 = -1632055, + SAY_JAINA_INTRO_1 = 0, + SAY_JAINA_INTRO_2 = 1, + SAY_JAINA_INTRO_3 = 2, + SAY_JAINA_INTRO_4 = 3, + SAY_JAINA_INTRO_5 = 4, + SAY_JAINA_INTRO_6 = 5, + SAY_JAINA_INTRO_7 = 6, + SAY_JAINA_INTRO_8 = 7, + + SAY_SYLVANAS_INTRO_1 = 0, + SAY_SYLVANAS_INTRO_2 = 1, + SAY_SYLVANAS_INTRO_3 = 2, + SAY_SYLVANAS_INTRO_4 = 3, + SAY_SYLVANAS_INTRO_5 = 4, + SAY_SYLVANAS_INTRO_6 = 5, }; enum eSylvanas @@ -120,32 +120,32 @@ public: switch (events.ExecuteEvent()) { case EVENT_INTRO_1: - DoScriptText(SAY_SYLVANAS_INTRO_1, me); + Talk(SAY_SYLVANAS_INTRO_1); events.ScheduleEvent(EVENT_INTRO_2, 11500); break; case EVENT_INTRO_2: - DoScriptText(SAY_SYLVANAS_INTRO_2, me); + Talk(SAY_SYLVANAS_INTRO_2); events.ScheduleEvent(EVENT_INTRO_3, 10500); break; case EVENT_INTRO_3: - DoScriptText(SAY_SYLVANAS_INTRO_3, me); + Talk(SAY_SYLVANAS_INTRO_3); events.ScheduleEvent(EVENT_INTRO_4, 9500); break; case EVENT_INTRO_4: - DoScriptText(SAY_SYLVANAS_INTRO_4, me); + Talk(SAY_SYLVANAS_INTRO_4); events.ScheduleEvent(EVENT_INTRO_5, 10500); break; case EVENT_INTRO_5: - DoScriptText(SAY_SYLVANAS_INTRO_5, me); + Talk(SAY_SYLVANAS_INTRO_5); events.ScheduleEvent(EVENT_INTRO_6, 9500); break; case EVENT_INTRO_6: - DoScriptText(SAY_SYLVANAS_INTRO_6, me); + Talk(SAY_SYLVANAS_INTRO_6); // End of Intro phase = PHASE_NORMAL; break; @@ -246,42 +246,42 @@ public: switch (events.ExecuteEvent()) { case EVENT_INTRO_1: - DoScriptText(SAY_JAINA_INTRO_1, me); + Talk(SAY_JAINA_INTRO_1); events.ScheduleEvent(EVENT_INTRO_2, 8000); break; case EVENT_INTRO_2: - DoScriptText(SAY_JAINA_INTRO_2, me); + Talk(SAY_JAINA_INTRO_2); events.ScheduleEvent(EVENT_INTRO_3, 8500); break; case EVENT_INTRO_3: - DoScriptText(SAY_JAINA_INTRO_3, me); + Talk(SAY_JAINA_INTRO_3); events.ScheduleEvent(EVENT_INTRO_4, 8000); break; case EVENT_INTRO_4: - DoScriptText(SAY_JAINA_INTRO_4, me); + Talk(SAY_JAINA_INTRO_4); events.ScheduleEvent(EVENT_INTRO_5, 10000); break; case EVENT_INTRO_5: - DoScriptText(SAY_JAINA_INTRO_5, me); + Talk(SAY_JAINA_INTRO_5); events.ScheduleEvent(EVENT_INTRO_6, 8000); break; case EVENT_INTRO_6: - DoScriptText(SAY_JAINA_INTRO_6, me); + Talk(SAY_JAINA_INTRO_6); events.ScheduleEvent(EVENT_INTRO_7, 12000); break; case EVENT_INTRO_7: - DoScriptText(SAY_JAINA_INTRO_7, me); + Talk(SAY_JAINA_INTRO_7); events.ScheduleEvent(EVENT_INTRO_8, 8000); break; case EVENT_INTRO_8: - DoScriptText(SAY_JAINA_INTRO_8, me); + Talk(SAY_JAINA_INTRO_8); // End of Intro phase = PHASE_NORMAL; break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 4df13d32bf8..bb3028518ec 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -21,12 +21,11 @@ enum Yells { - SAY_AGGRO = -1668050, - SAY_SLAY_1 = -1668051, - SAY_SLAY_2 = -1668052, - SAY_DEATH = -1668053, - SAY_IMPENDING_DESPAIR = -1668054, - SAY_DEFILING_HORROR = -1668055, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_IMPENDING_DESPAIR = 3, + SAY_DEFILING_HORROR = 4, }; enum Spells @@ -74,7 +73,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_FALRIC_EVENT, IN_PROGRESS); @@ -85,7 +84,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_FALRIC_EVENT, DONE); @@ -93,7 +92,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 diff) @@ -116,7 +115,7 @@ public: case EVENT_IMPENDING_DESPAIR: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) { - DoScriptText(SAY_IMPENDING_DESPAIR, me); + Talk(SAY_IMPENDING_DESPAIR); DoCast(target, SPELL_IMPENDING_DESPAIR); } events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 13000); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 8334a199791..697e8cfb664 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -21,12 +21,10 @@ enum Yells { - SAY_AGGRO = -1668060, - SAY_SLAY_1 = -1668061, - SAY_SLAY_2 = -1668062, - SAY_DEATH = -1668063, - SAY_CORRUPTED_FLESH_1 = -1668064, - SAY_CORRUPTED_FLESH_2 = -1668065, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_CORRUPTED_FLESH = 3 }; enum Spells @@ -70,7 +68,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MARWYN_EVENT, IN_PROGRESS); @@ -82,7 +80,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MARWYN_EVENT, DONE); @@ -90,7 +88,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 diff) @@ -115,7 +113,7 @@ public: events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); break; case EVENT_CORRUPTED_FLESH: - DoScriptText(RAND(SAY_CORRUPTED_FLESH_1, SAY_CORRUPTED_FLESH_2), me); + Talk(SAY_CORRUPTED_FLESH); DoCast(SPELL_CORRUPTED_FLESH); events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 4f80fd746ee..d4e3a9e677d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -23,52 +23,54 @@ enum Yells { - SAY_JAINA_INTRO_1 = -1668001, - SAY_JAINA_INTRO_2 = -1668002, - SAY_JAINA_INTRO_3 = -1668003, - SAY_JAINA_INTRO_4 = -1668004, - SAY_UTHER_INTRO_A2_1 = -1668005, - SAY_JAINA_INTRO_5 = -1668006, - SAY_UTHER_INTRO_A2_2 = -1668007, - SAY_JAINA_INTRO_6 = -1668008, - SAY_UTHER_INTRO_A2_3 = -1668009, - SAY_JAINA_INTRO_7 = -1668010, - SAY_UTHER_INTRO_A2_4 = -1668011, - SAY_JAINA_INTRO_8 = -1668012, - SAY_UTHER_INTRO_A2_5 = -1668013, - SAY_JAINA_INTRO_9 = -1668014, - SAY_UTHER_INTRO_A2_6 = -1668015, - SAY_UTHER_INTRO_A2_7 = -1668016, - SAY_JAINA_INTRO_10 = -1668017, - SAY_UTHER_INTRO_A2_8 = -1668018, - SAY_JAINA_INTRO_11 = -1668019, - SAY_UTHER_INTRO_A2_9 = -1668020, - - SAY_SYLVANAS_INTRO_1 = -1668021, - SAY_SYLVANAS_INTRO_2 = -1668022, - SAY_SYLVANAS_INTRO_3 = -1668023, - SAY_UTHER_INTRO_H2_1 = -1668024, - SAY_SYLVANAS_INTRO_4 = -1668025, - SAY_UTHER_INTRO_H2_2 = -1668026, - SAY_SYLVANAS_INTRO_5 = -1668027, - SAY_UTHER_INTRO_H2_3 = -1668028, - SAY_SYLVANAS_INTRO_6 = -1668029, - SAY_UTHER_INTRO_H2_4 = -1668030, - SAY_SYLVANAS_INTRO_7 = -1668031, - SAY_UTHER_INTRO_H2_5 = -1668032, - SAY_UTHER_INTRO_H2_6 = -1668033, - SAY_SYLVANAS_INTRO_8 = -1668034, - SAY_UTHER_INTRO_H2_7 = -1668035, - - SAY_LK_INTRO_1 = -1668036, - SAY_LK_INTRO_2 = -1668037, - SAY_LK_INTRO_3 = -1668038, - SAY_FALRIC_INTRO_1 = -1668039, - SAY_MARWYN_INTRO_1 = -1668040, - SAY_FALRIC_INTRO_2 = -1668041, - - SAY_JAINA_INTRO_END = -1668042, - SAY_SYLVANAS_INTRO_END = -1668043, + SAY_JAINA_INTRO_1 = 0, + SAY_JAINA_INTRO_2 = 1, + SAY_JAINA_INTRO_3 = 2, + SAY_JAINA_INTRO_4 = 3, + SAY_JAINA_INTRO_5 = 4, + SAY_JAINA_INTRO_6 = 5, + SAY_JAINA_INTRO_7 = 6, + SAY_JAINA_INTRO_8 = 7, + SAY_JAINA_INTRO_9 = 8, + SAY_JAINA_INTRO_10 = 9, + SAY_JAINA_INTRO_11 = 10, + SAY_JAINA_INTRO_END = 11, + + SAY_SYLVANAS_INTRO_1 = 0, + SAY_SYLVANAS_INTRO_2 = 1, + SAY_SYLVANAS_INTRO_3 = 2, + SAY_SYLVANAS_INTRO_4 = 3, + SAY_SYLVANAS_INTRO_5 = 4, + SAY_SYLVANAS_INTRO_6 = 5, + SAY_SYLVANAS_INTRO_7 = 6, + SAY_SYLVANAS_INTRO_8 = 7, + SAY_SYLVANAS_INTRO_END = 8, + + SAY_UTHER_INTRO_A2_1 = 0, + SAY_UTHER_INTRO_A2_2 = 1, + SAY_UTHER_INTRO_A2_3 = 2, + SAY_UTHER_INTRO_A2_4 = 3, + SAY_UTHER_INTRO_A2_5 = 4, + SAY_UTHER_INTRO_A2_6 = 5, + SAY_UTHER_INTRO_A2_7 = 6, + SAY_UTHER_INTRO_A2_8 = 7, + SAY_UTHER_INTRO_A2_9 = 8, + SAY_UTHER_INTRO_H2_1 = 9, + SAY_UTHER_INTRO_H2_2 = 10, + SAY_UTHER_INTRO_H2_3 = 11, + SAY_UTHER_INTRO_H2_4 = 12, + SAY_UTHER_INTRO_H2_5 = 13, + SAY_UTHER_INTRO_H2_6 = 14, + SAY_UTHER_INTRO_H2_7 = 15, + + SAY_LK_INTRO_1 = 0, + SAY_LK_INTRO_2 = 1, + SAY_LK_INTRO_3 = 2, + + SAY_FALRIC_INTRO_1 = 5, + SAY_FALRIC_INTRO_2 = 6, + + SAY_MARWYN_INTRO_1 = 0 }; enum Events @@ -214,8 +216,8 @@ public: } InstanceScript* instance; - uint64 uiUther; - uint64 uiLichKing; + uint64 utherGUID; + uint64 lichkingGUID; EventMap events; @@ -223,8 +225,8 @@ public: { events.Reset(); - uiUther = 0; - uiLichKing = 0; + utherGUID = 0; + lichkingGUID = 0; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -260,11 +262,11 @@ public: // A2 Intro Events case EVENT_INTRO_A2_1: - DoScriptText(SAY_JAINA_INTRO_3, me); + Talk(SAY_JAINA_INTRO_3); events.ScheduleEvent(EVENT_INTRO_A2_2, 5000); break; case EVENT_INTRO_A2_2: - DoScriptText(SAY_JAINA_INTRO_4, me); + Talk(SAY_JAINA_INTRO_4); events.ScheduleEvent(EVENT_INTRO_A2_3, 10000); break; case EVENT_INTRO_A2_3: @@ -274,197 +276,197 @@ public: break; case EVENT_INTRO_A2_4: // spawn UTHER during speach 2 - if (Creature* pUther = me->SummonCreature(NPC_UTHER, UtherSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* uther = me->SummonCreature(NPC_UTHER, UtherSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) { - pUther->GetMotionMaster()->MoveIdle(); - pUther->SetReactState(REACT_PASSIVE); // be sure he will not aggro arthas - uiUther = pUther->GetGUID(); + uther->GetMotionMaster()->MoveIdle(); + uther->SetReactState(REACT_PASSIVE); // be sure he will not aggro arthas + utherGUID = uther->GetGUID(); } events.ScheduleEvent(EVENT_INTRO_A2_5, 2000); break; case EVENT_INTRO_A2_5: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_1, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_A2_1); events.ScheduleEvent(EVENT_INTRO_A2_6, 3000); break; case EVENT_INTRO_A2_6: - DoScriptText(SAY_JAINA_INTRO_5, me); + Talk(SAY_JAINA_INTRO_5); events.ScheduleEvent(EVENT_INTRO_A2_7, 6000); break; case EVENT_INTRO_A2_7: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_2, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_A2_2); events.ScheduleEvent(EVENT_INTRO_A2_8, 6500); break; case EVENT_INTRO_A2_8: - DoScriptText(SAY_JAINA_INTRO_6, me); + Talk(SAY_JAINA_INTRO_6); events.ScheduleEvent(EVENT_INTRO_A2_9, 2000); break; case EVENT_INTRO_A2_9: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_3, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_A2_3); events.ScheduleEvent(EVENT_INTRO_A2_10, 9000); break; case EVENT_INTRO_A2_10: - DoScriptText(SAY_JAINA_INTRO_7, me); + Talk(SAY_JAINA_INTRO_7); events.ScheduleEvent(EVENT_INTRO_A2_11, 5000); break; case EVENT_INTRO_A2_11: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_4, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_A2_4); events.ScheduleEvent(EVENT_INTRO_A2_12, 11000); break; case EVENT_INTRO_A2_12: - DoScriptText(SAY_JAINA_INTRO_8, me); + Talk(SAY_JAINA_INTRO_8); events.ScheduleEvent(EVENT_INTRO_A2_13, 4000); break; case EVENT_INTRO_A2_13: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_5, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_A2_5); events.ScheduleEvent(EVENT_INTRO_A2_14, 12500); break; case EVENT_INTRO_A2_14: - DoScriptText(SAY_JAINA_INTRO_9, me); + Talk(SAY_JAINA_INTRO_9); events.ScheduleEvent(EVENT_INTRO_A2_15, 10000); break; case EVENT_INTRO_A2_15: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_6, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_A2_6); events.ScheduleEvent(EVENT_INTRO_A2_16, 22000); break; case EVENT_INTRO_A2_16: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_7, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_A2_7); events.ScheduleEvent(EVENT_INTRO_A2_17, 4000); break; case EVENT_INTRO_A2_17: - DoScriptText(SAY_JAINA_INTRO_10, me); + Talk(SAY_JAINA_INTRO_10); events.ScheduleEvent(EVENT_INTRO_A2_18, 2000); break; case EVENT_INTRO_A2_18: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* uther = me->GetCreature(*me, utherGUID)) { - pUther->HandleEmoteCommand(EMOTE_ONESHOT_NO); - DoScriptText(SAY_UTHER_INTRO_A2_8, pUther); + uther->HandleEmoteCommand(EMOTE_ONESHOT_NO); + uther->AI()->Talk(SAY_UTHER_INTRO_A2_8); } events.ScheduleEvent(EVENT_INTRO_A2_19, 11000); break; case EVENT_INTRO_A2_19: - DoScriptText(SAY_JAINA_INTRO_11, me); + Talk(SAY_JAINA_INTRO_11); events.ScheduleEvent(EVENT_INTRO_LK_1, 2000); break; // H2 Intro Events case EVENT_INTRO_H2_1: - DoScriptText(SAY_SYLVANAS_INTRO_1, me); + Talk(SAY_SYLVANAS_INTRO_1); events.ScheduleEvent(EVENT_INTRO_H2_2, 8000); break; case EVENT_INTRO_H2_2: - DoScriptText(SAY_SYLVANAS_INTRO_2, me); + Talk(SAY_SYLVANAS_INTRO_2); events.ScheduleEvent(EVENT_INTRO_H2_3, 6000); break; case EVENT_INTRO_H2_3: - DoScriptText(SAY_SYLVANAS_INTRO_3, me); + Talk(SAY_SYLVANAS_INTRO_3); // TODO: she's doing some kind of spell casting emote events.ScheduleEvent(EVENT_INTRO_H2_4, 6000); break; case EVENT_INTRO_H2_4: // spawn UTHER during speach 2 - if (Creature* pUther = me->SummonCreature(NPC_UTHER, UtherSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* uther = me->SummonCreature(NPC_UTHER, UtherSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) { - pUther->GetMotionMaster()->MoveIdle(); - pUther->SetReactState(REACT_PASSIVE); // be sure he will not aggro arthas - uiUther = pUther->GetGUID(); + uther->GetMotionMaster()->MoveIdle(); + uther->SetReactState(REACT_PASSIVE); // be sure he will not aggro arthas + utherGUID = uther->GetGUID(); } events.ScheduleEvent(EVENT_INTRO_H2_5, 2000); break; case EVENT_INTRO_H2_5: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_1, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_H2_1); events.ScheduleEvent(EVENT_INTRO_H2_6, 11000); break; case EVENT_INTRO_H2_6: - DoScriptText(SAY_SYLVANAS_INTRO_4, me); + Talk(SAY_SYLVANAS_INTRO_4); events.ScheduleEvent(EVENT_INTRO_H2_7, 3000); break; case EVENT_INTRO_H2_7: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_2, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_H2_2); events.ScheduleEvent(EVENT_INTRO_H2_8, 6000); break; case EVENT_INTRO_H2_8: - DoScriptText(SAY_SYLVANAS_INTRO_5, me); + Talk(SAY_SYLVANAS_INTRO_5); events.ScheduleEvent(EVENT_INTRO_H2_9, 5000); break; case EVENT_INTRO_H2_9: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_3, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_H2_3); events.ScheduleEvent(EVENT_INTRO_H2_10, 19000); break; case EVENT_INTRO_H2_10: - DoScriptText(SAY_SYLVANAS_INTRO_6, me); + Talk(SAY_SYLVANAS_INTRO_6); events.ScheduleEvent(EVENT_INTRO_H2_11, 1500); break; case EVENT_INTRO_H2_11: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_4, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_H2_4); events.ScheduleEvent(EVENT_INTRO_H2_12, 19500); break; case EVENT_INTRO_H2_12: - DoScriptText(SAY_SYLVANAS_INTRO_7, me); + Talk(SAY_SYLVANAS_INTRO_7); events.ScheduleEvent(EVENT_INTRO_H2_13, 2000); break; case EVENT_INTRO_H2_13: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* uther = me->GetCreature(*me, utherGUID)) { - pUther->HandleEmoteCommand(EMOTE_ONESHOT_NO); - DoScriptText(SAY_UTHER_INTRO_H2_5, pUther); + uther->HandleEmoteCommand(EMOTE_ONESHOT_NO); + uther->AI()->Talk(SAY_UTHER_INTRO_H2_5); } events.ScheduleEvent(EVENT_INTRO_H2_14, 12000); break; case EVENT_INTRO_H2_14: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_6, pUther); + if (Creature* uther = me->GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_UTHER_INTRO_H2_6); events.ScheduleEvent(EVENT_INTRO_H2_15, 8000); break; case EVENT_INTRO_H2_15: - DoScriptText(SAY_SYLVANAS_INTRO_8, me); + Talk(SAY_SYLVANAS_INTRO_8); events.ScheduleEvent(EVENT_INTRO_LK_1, 2000); break; // Remaining Intro Events common for both faction case EVENT_INTRO_LK_1: // Spawn LK in front of door, and make him move to the sword. - if (Creature* pLichKing = me->SummonCreature(NPC_LICH_KING_EVENT, LichKingSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* lichking = me->SummonCreature(NPC_LICH_KING_EVENT, LichKingSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) { - pLichKing->GetMotionMaster()->MovePoint(0, LichKingMoveThronePos); - pLichKing->SetReactState(REACT_PASSIVE); - uiLichKing = pLichKing->GetGUID(); + lichking->GetMotionMaster()->MovePoint(0, LichKingMoveThronePos); + lichking->SetReactState(REACT_PASSIVE); + lichkingGUID = lichking->GetGUID(); } - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* uther = me->GetCreature(*me, utherGUID)) { if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) - DoScriptText(SAY_UTHER_INTRO_A2_9, pUther); + uther->AI()->Talk(SAY_UTHER_INTRO_A2_9); else - DoScriptText(SAY_UTHER_INTRO_H2_7, pUther); + uther->AI()->Talk(SAY_UTHER_INTRO_H2_7); } events.ScheduleEvent(EVENT_INTRO_LK_2, 11000); break; case EVENT_INTRO_LK_2: - if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) - DoScriptText(SAY_LK_INTRO_1, pLichKing); + if (Creature* lichking = me->GetCreature(*me, lichkingGUID)) + lichking->AI()->Talk(SAY_LK_INTRO_1); events.ScheduleEvent(EVENT_INTRO_LK_3, 2000); break; case EVENT_INTRO_LK_3: // The Lich King banishes Uther to the abyss. - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* uther = me->GetCreature(*me, utherGUID)) { - pUther->DisappearAndDie(); - uiUther = 0; + uther->DisappearAndDie(); + utherGUID = 0; } // He steps forward and removes the runeblade from the heap of skulls. @@ -473,8 +475,8 @@ public: break; case EVENT_INTRO_LK_4: - if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) - DoScriptText(SAY_LK_INTRO_2, pLichKing); + if (Creature* lichking = me->GetCreature(*me, lichkingGUID)) + lichking->AI()->Talk(SAY_LK_INTRO_2); events.ScheduleEvent(EVENT_INTRO_LK_5, 10000); break; @@ -485,41 +487,41 @@ public: if (Creature* pMarwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN))) pMarwyn->SetVisible(true); - if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) + if (Creature* lichking = me->GetCreature(*me, lichkingGUID)) { - pLichKing->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); - DoScriptText(SAY_LK_INTRO_3, pLichKing); + lichking->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); + lichking->AI()->Talk(SAY_LK_INTRO_3); } events.ScheduleEvent(EVENT_INTRO_LK_6, 8000); break; case EVENT_INTRO_LK_6: - if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC))) - DoScriptText(SAY_FALRIC_INTRO_1, pFalric); + if (Creature* falric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC))) + falric->AI()->Talk(SAY_FALRIC_INTRO_1); events.ScheduleEvent(EVENT_INTRO_LK_7, 2000); break; case EVENT_INTRO_LK_7: - if (Creature* pMarwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN))) - DoScriptText(SAY_MARWYN_INTRO_1, pMarwyn); + if (Creature* marwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN))) + marwyn->AI()->Talk(SAY_MARWYN_INTRO_1); events.ScheduleEvent(EVENT_INTRO_LK_8, 2000); break; case EVENT_INTRO_LK_8: - if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC))) - DoScriptText(SAY_FALRIC_INTRO_2, pFalric); + if (Creature* falric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC))) + falric->AI()->Talk(SAY_FALRIC_INTRO_2); events.ScheduleEvent(EVENT_INTRO_LK_9, 5000); break; case EVENT_INTRO_LK_9: if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) - DoScriptText(SAY_JAINA_INTRO_END, me); + Talk(SAY_JAINA_INTRO_END); else - DoScriptText(SAY_SYLVANAS_INTRO_END, me); + Talk(SAY_SYLVANAS_INTRO_END); me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); // TODO: Loralen/Koreln shall run also diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 8d9269aa70f..e8557482420 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -23,15 +23,15 @@ enum Yells { - SAY_AGGRO = 0, - SAY_PHASE2 = 1, - SAY_PHASE3 = 2, - SAY_DEATH = 3, - SAY_SLAY = 4, - SAY_THROW_SARONITE = 5, - SAY_CAST_DEEP_FREEZE = 6, - - SAY_TYRANNUS_DEATH = -1658007, // todo + SAY_AGGRO = 0, + SAY_PHASE2 = 1, + SAY_PHASE3 = 2, + SAY_DEATH = 3, + SAY_SLAY = 4, + SAY_THROW_SARONITE = 5, + SAY_CAST_DEEP_FREEZE = 6, + + SAY_TYRANNUS_DEATH = 0 }; enum Spells @@ -129,7 +129,7 @@ enum Events Talk(SAY_DEATH); if (Creature* tyrannus = me->GetCreature(*me, instance->GetData64(DATA_TYRANNUS))) - DoScriptText(SAY_TYRANNUS_DEATH, tyrannus); + tyrannus->AI()->Talk(SAY_TYRANNUS_DEATH); instance->SetBossState(DATA_GARFROST, DONE); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 41cfc300958..ed196d2cd0c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -48,33 +48,30 @@ enum Spells enum Yells { // Krick - SAY_KRICK_AGGRO = -1658010, - SAY_KRICK_SLAY_1 = -1658011, - SAY_KRICK_SLAY_2 = -1658012, - SAY_KRICK_BARRAGE_1 = -1658013, - SAY_KRICK_BARRAGE_2 = -1658014, - SAY_KRICK_POISON_NOVA = -1658015, - SAY_KRICK_CHASE_1 = -1658016, - SAY_KRICK_CHASE_2 = -1658017, - SAY_KRICK_CHASE_3 = -1658018, + SAY_KRICK_AGGRO = 0, + SAY_KRICK_SLAY = 1, + SAY_KRICK_BARRAGE_1 = 2, + SAY_KRICK_BARRAGE_2 = 3, + SAY_KRICK_POISON_NOVA = 4, + SAY_KRICK_CHASE = 5, + SAY_KRICK_OUTRO_1 = 6, + SAY_KRICK_OUTRO_3 = 7, + SAY_KRICK_OUTRO_5 = 8, + SAY_KRICK_OUTRO_8 = 9, // Ick - SAY_ICK_POISON_NOVA = -1658020, - SAY_ICK_CHASE_1 = -1658021, + SAY_ICK_POISON_NOVA = 0, + SAY_ICK_CHASE_1 = 1, // OUTRO - SAY_KRICK_OUTRO_1 = -1658030, - SAY_JAYNA_OUTRO_2 = -1658031, - SAY_SYLVANAS_OUTRO_2 = -1658032, - SAY_KRICK_OUTRO_3 = -1658033, - SAY_JAYNA_OUTRO_4 = -1658034, - SAY_SYLVANAS_OUTRO_4 = -1658035, - SAY_KRICK_OUTRO_5 = -1658036, - SAY_TYRANNUS_OUTRO_7 = -1658037, - SAY_KRICK_OUTRO_8 = -1658038, - SAY_TYRANNUS_OUTRO_9 = -1658039, - SAY_JAYNA_OUTRO_10 = -1658040, - SAY_SYLVANAS_OUTRO_10 = -1658041, + SAY_JAYNA_OUTRO_2 = 0, + SAY_JAYNA_OUTRO_4 = 1, + SAY_JAYNA_OUTRO_10 = 2, + SAY_SYLVANAS_OUTRO_2 = 0, + SAY_SYLVANAS_OUTRO_4 = 1, + SAY_SYLVANAS_OUTRO_10 = 2, + SAY_TYRANNUS_OUTRO_7 = 1, + SAY_TYRANNUS_OUTRO_9 = 2, }; enum Events @@ -167,7 +164,7 @@ class boss_ick : public CreatureScript void EnterCombat(Unit* /*who*/) { if (Creature* krick = GetKrick()) - DoScriptText(SAY_KRICK_AGGRO, krick); + krick->AI()->Talk(SAY_KRICK_AGGRO); events.ScheduleEvent(EVENT_MIGHTY_KICK, 20000); events.ScheduleEvent(EVENT_TOXIC_WASTE, 5000); @@ -250,8 +247,8 @@ class boss_ick : public CreatureScript case EVENT_EXPLOSIVE_BARRAGE: if (Creature* krick = GetKrick()) { - DoScriptText(SAY_KRICK_BARRAGE_1, krick); - DoScriptText(SAY_KRICK_BARRAGE_2, krick); + krick->AI()->Talk(SAY_KRICK_BARRAGE_1); + krick->AI()->Talk(SAY_KRICK_BARRAGE_2); krick->CastSpell(krick, SPELL_EXPLOSIVE_BARRAGE_KRICK, true); DoCast(me, SPELL_EXPLOSIVE_BARRAGE_ICK); } @@ -259,14 +256,14 @@ class boss_ick : public CreatureScript break; case EVENT_POISON_NOVA: if (Creature* krick = GetKrick()) - DoScriptText(SAY_KRICK_POISON_NOVA, krick); + krick->AI()->Talk(SAY_KRICK_POISON_NOVA); - DoScriptText(SAY_ICK_POISON_NOVA, me); + Talk(SAY_ICK_POISON_NOVA); DoCast(me, SPELL_POISON_NOVA); break; case EVENT_PURSUIT: if (Creature* krick = GetKrick()) - DoScriptText(RAND(SAY_KRICK_CHASE_1, SAY_KRICK_CHASE_2, SAY_KRICK_CHASE_3), krick); + krick->AI()->Talk(SAY_KRICK_CHASE); DoCast(me, SPELL_PURSUIT); break; default: @@ -328,7 +325,7 @@ class boss_krick : public CreatureScript if (victim == me) return; - DoScriptText(RAND(SAY_KRICK_SLAY_1, SAY_KRICK_SLAY_2), me); + Talk(SAY_KRICK_SLAY); } void JustSummoned(Creature* summon) @@ -362,7 +359,7 @@ class boss_krick : public CreatureScript if (type != POINT_MOTION_TYPE || id != POINT_KRICK_INTRO) return; - DoScriptText(SAY_KRICK_OUTRO_1, me); + Talk(SAY_KRICK_OUTRO_1); _phase = PHASE_OUTRO; _events.Reset(); _events.ScheduleEvent(EVENT_OUTRO_1, 1000); @@ -404,28 +401,28 @@ class boss_krick : public CreatureScript jainaOrSylvanas->SetFacingToObject(me); me->SetFacingToObject(jainaOrSylvanas); if (_instanceScript->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) - DoScriptText(SAY_JAYNA_OUTRO_2, jainaOrSylvanas); + jainaOrSylvanas->AI()->Talk(SAY_JAYNA_OUTRO_2); else - DoScriptText(SAY_SYLVANAS_OUTRO_2, jainaOrSylvanas); + jainaOrSylvanas->AI()->Talk(SAY_SYLVANAS_OUTRO_2); } _events.ScheduleEvent(EVENT_OUTRO_3, 5000); break; case EVENT_OUTRO_3: - DoScriptText(SAY_KRICK_OUTRO_3, me); + Talk(SAY_KRICK_OUTRO_3); _events.ScheduleEvent(EVENT_OUTRO_4, 18000); break; case EVENT_OUTRO_4: if (Creature* jainaOrSylvanas = ObjectAccessor::GetCreature(*me, _outroNpcGUID)) { if (_instanceScript->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) - DoScriptText(SAY_JAYNA_OUTRO_4, jainaOrSylvanas); + jainaOrSylvanas->AI()->Talk(SAY_JAYNA_OUTRO_4); else - DoScriptText(SAY_SYLVANAS_OUTRO_4, jainaOrSylvanas); + jainaOrSylvanas->AI()->Talk(SAY_SYLVANAS_OUTRO_4); } _events.ScheduleEvent(EVENT_OUTRO_5, 5000); break; case EVENT_OUTRO_5: - DoScriptText(SAY_KRICK_OUTRO_5, me); + Talk(SAY_KRICK_OUTRO_5); _events.ScheduleEvent(EVENT_OUTRO_6, 1000); break; case EVENT_OUTRO_6: @@ -439,7 +436,7 @@ class boss_krick : public CreatureScript break; case EVENT_OUTRO_7: if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannusGUID)) - DoScriptText(SAY_TYRANNUS_OUTRO_7, tyrannus); + tyrannus->AI()->Talk(SAY_TYRANNUS_OUTRO_7); _events.ScheduleEvent(EVENT_OUTRO_8, 5000); break; case EVENT_OUTRO_8: @@ -450,7 +447,7 @@ class boss_krick : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_9, 2000); break; case EVENT_OUTRO_9: - DoScriptText(SAY_KRICK_OUTRO_8, me); + Talk(SAY_KRICK_OUTRO_8); // TODO: Tyrannus starts killing Krick. // there shall be some visual spell effect if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannusGUID)) @@ -472,16 +469,16 @@ class boss_krick : public CreatureScript break; case EVENT_OUTRO_12: if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannusGUID)) - DoScriptText(SAY_TYRANNUS_OUTRO_9, tyrannus); + tyrannus->AI()->Talk(SAY_TYRANNUS_OUTRO_9); _events.ScheduleEvent(EVENT_OUTRO_13, 2000); break; case EVENT_OUTRO_13: if (Creature* jainaOrSylvanas = ObjectAccessor::GetCreature(*me, _outroNpcGUID)) { if (_instanceScript->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) - DoScriptText(SAY_JAYNA_OUTRO_10, jainaOrSylvanas); + jainaOrSylvanas->AI()->Talk(SAY_JAYNA_OUTRO_10); else - DoScriptText(SAY_SYLVANAS_OUTRO_10, jainaOrSylvanas); + jainaOrSylvanas->AI()->Talk(SAY_SYLVANAS_OUTRO_10); } // End of OUTRO. for now... _events.ScheduleEvent(EVENT_OUTRO_END, 3000); @@ -636,19 +633,18 @@ class spell_krick_pursuit : public SpellScriptLoader void HandleScriptEffect(SpellEffIndex /*effIndex*/) { - if (GetCaster()->GetTypeId() != TYPEID_UNIT) - return; - - Unit* caster = GetCaster(); - CreatureAI* ickAI = caster->ToCreature()->AI(); - if (Unit* target = ickAI->SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true)) - { - DoScriptText(SAY_ICK_CHASE_1, caster, target); - caster->AddAura(GetSpellInfo()->Id, target); - CAST_AI(boss_ick::boss_ickAI, ickAI)->SetTempThreat(caster->getThreatManager().getThreat(target)); - caster->AddThreat(target, float(GetEffectValue())); - target->AddThreat(caster, float(GetEffectValue())); - } + if (GetCaster()) + if (Creature* ick = GetCaster()->ToCreature()) + { + if (Unit* target = ick->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true)) + { + ick->AI()->Talk(SAY_ICK_CHASE_1, target->GetGUID()); + ick->AddAura(GetSpellInfo()->Id, target); + CAST_AI(boss_ick::boss_ickAI, ick->AI())->SetTempThreat(ick->getThreatManager().getThreat(target)); + ick->AddThreat(target, float(GetEffectValue())); + target->AddThreat(ick, float(GetEffectValue())); + } + } } void Register() diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 44d9230a8d2..969a3621e8e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -25,32 +25,36 @@ enum Yells { - SAY_AMBUSH_1 = -1658050, - SAY_AMBUSH_2 = -1658051, - SAY_GAUNTLET_START = -1658052, - SAY_TYRANNUS_INTRO_1 = -1658053, - SAY_GORKUN_INTRO_2 = -1658054, - SAY_TYRANNUS_INTRO_3 = -1658055, - - SAY_AGGRO = -1658056, - SAY_SLAY_1 = -1658057, - SAY_SLAY_2 = -1658058, - SAY_DEATH = -1658059, - SAY_MARK_RIMEFANG_1 = -1658060, - SAY_MARK_RIMEFANG_2 = -1658061, - SAY_DARK_MIGHT_1 = -1658062, - SAY_DARK_MIGHT_2 = -1658063, - - SAY_GORKUN_OUTRO_1 = -1658064, - SAY_GORKUN_OUTRO_2 = -1658065, - SAY_JAYNA_OUTRO_3 = -1658066, - SAY_SYLVANAS_OUTRO_3 = -1658067, - SAY_JAYNA_OUTRO_4 = -1658068, - SAY_SYLVANAS_OUTRO_4 = -1658069, - SAY_JAYNA_OUTRO_5 = -1658070, + //Gorkun + SAY_GORKUN_INTRO_2 = 0, + SAY_GORKUN_OUTRO_1 = 1, + SAY_GORKUN_OUTRO_2 = 2, + + //Tyrannus + SAY_AMBUSH_1 = 3, + SAY_AMBUSH_2 = 4, + SAY_GAUNTLET_START = 5, + SAY_TYRANNUS_INTRO_1 = 6, + SAY_TYRANNUS_INTRO_3 = 7, + SAY_AGGRO = 8, + SAY_SLAY = 9, + SAY_DEATH = 10, + SAY_MARK_RIMEFANG_1 = 11, + SAY_MARK_RIMEFANG_2 = 12, + SAY_DARK_MIGHT_1 = 13, + SAY_DARK_MIGHT_2 = 14, + + //Jaina + SAY_JAYNA_OUTRO_3 = 3, + SAY_JAYNA_OUTRO_4 = 4, + SAY_JAYNA_OUTRO_5 = 5, + + //Sylvanas + SAY_SYLVANAS_OUTRO_3 = 3, + SAY_SYLVANAS_OUTRO_4 = 4 }; -enum Spells +enum Spelsl { SPELL_OVERLORD_BRAND = 69172, SPELL_OVERLORD_BRAND_HEAL = 69190, @@ -156,7 +160,7 @@ class boss_tyrannus : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void AttackStart(Unit* victim) @@ -180,12 +184,12 @@ class boss_tyrannus : public CreatureScript void KilledUnit(Unit* victim) { if (victim->GetTypeId() == TYPEID_PLAYER) - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); instance->SetBossState(DATA_TYRANNUS, DONE); // Prevent corpse despawning @@ -201,7 +205,7 @@ class boss_tyrannus : public CreatureScript { if (actionId == ACTION_START_INTRO) { - DoScriptText(SAY_TYRANNUS_INTRO_1, me); + Talk(SAY_TYRANNUS_INTRO_1); events.SetPhase(PHASE_INTRO); events.ScheduleEvent(EVENT_INTRO_1, 14000, 0, PHASE_INTRO); events.ScheduleEvent(EVENT_INTRO_2, 22000, 0, PHASE_INTRO); @@ -223,10 +227,10 @@ class boss_tyrannus : public CreatureScript switch (eventId) { case EVENT_INTRO_1: - //DoScriptText(SAY_GORKUN_INTRO_2, pGorkunOrVictus); + //Talk(SAY_GORKUN_INTRO_2, pGorkunOrVictus); break; case EVENT_INTRO_2: - DoScriptText(SAY_TYRANNUS_INTRO_3, me); + Talk(SAY_TYRANNUS_INTRO_3); break; case EVENT_INTRO_3: me->ExitVehicle(); @@ -254,16 +258,16 @@ class boss_tyrannus : public CreatureScript events.ScheduleEvent(EVENT_UNHOLY_POWER, 1000); break; case EVENT_UNHOLY_POWER: - DoScriptText(SAY_DARK_MIGHT_1, me); - DoScriptText(SAY_DARK_MIGHT_2, me); + Talk(SAY_DARK_MIGHT_1); + Talk(SAY_DARK_MIGHT_2); DoCast(me, SPELL_UNHOLY_POWER); events.ScheduleEvent(EVENT_FORCEFUL_SMASH, urand(40000, 48000)); break; case EVENT_MARK_OF_RIMEFANG: - DoScriptText(SAY_MARK_RIMEFANG_1, me); + Talk(SAY_MARK_RIMEFANG_1); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) { - DoScriptText(SAY_MARK_RIMEFANG_2, me, target); + Talk(SAY_MARK_RIMEFANG_2, target->GetGUID()); DoCast(target, SPELL_MARK_OF_RIMEFANG); } events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, urand(24000, 26000)); diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 595331d99d7..a7933fed046 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -38,16 +38,12 @@ enum Spells //Yells enum Yells { - SAY_AGGRO = -1604000, - SAY_SLAY_1 = -1604001, - SAY_SLAY_2 = -1604002, - SAY_SLAY_3 = -1604003, - SAY_DEATH = -1604004, - SAY_SUMMON_RHINO_1 = -1604005, - SAY_SUMMON_RHINO_2 = -1604006, - SAY_SUMMON_RHINO_3 = -1604007, - SAY_TRANSFORM_1 = -1604008, //Phase change - SAY_TRANSFORM_2 = -1604009 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SUMMON_RHINO = 3, + SAY_TRANSFORM_1 = 4, + SAY_TRANSFORM_2 = 5 }; enum Displays @@ -125,7 +121,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS); @@ -146,7 +142,7 @@ public: me->SetDisplayId(DISPLAY_RHINO); Phase = RHINO; uiPhaseCounter = 0; - DoScriptText(SAY_TRANSFORM_1, me); + Talk(SAY_TRANSFORM_1); uiTransformationTimer = 5*IN_MILLISECONDS; bStartOfTransformation = true; me->ClearUnitState(UNIT_STATE_STUNNED|UNIT_STATE_ROOT); @@ -169,7 +165,7 @@ public: if (uiStampedeTimer <= diff) { DoCast(me, SPELL_STAMPEDE); - DoScriptText(RAND(SAY_SUMMON_RHINO_1, SAY_SUMMON_RHINO_2, SAY_SUMMON_RHINO_3), me); + Talk(SAY_SUMMON_RHINO); uiStampedeTimer = 15*IN_MILLISECONDS; } else uiStampedeTimer -= diff; @@ -189,7 +185,7 @@ public: me->SetDisplayId(DISPLAY_TROLL); Phase = TROLL; uiPhaseCounter = 0; - DoScriptText(SAY_TRANSFORM_2, me); + Talk(SAY_TRANSFORM_2); uiTransformationTimer = 9*IN_MILLISECONDS; bStartOfTransformation = true; me->ClearUnitState(UNIT_STATE_STUNNED|UNIT_STATE_ROOT); @@ -268,7 +264,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_GAL_DARAH_EVENT, DONE); @@ -279,7 +275,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 45c55f7ec9b..d5e10aedd70 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -34,14 +34,12 @@ enum eSpells enum eSays { - SAY_AGGRO = -1604010, - //SAY_SLAY_1 = -1604011, // not in db - SAY_SLAY_2 = -1604012, - SAY_SLAY_3 = -1604013, - SAY_DEATH = -1604014, - SAY_TRANSFORM = -1604015, - SAY_QUAKE = -1604016, - EMOTE_TRANSFORM = -1604017 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_TRANSFORM = 3, + SAY_QUAKE = 4, + EMOTE_TRANSFORM = 5 }; #define DATA_LESS_RABI 1 @@ -86,7 +84,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCast(me, SPELL_MOJO_FRENZY, true); if (instance) @@ -107,7 +105,7 @@ public: if (uiGroundTremorTimer <= uiDiff) { - DoScriptText(SAY_QUAKE, me); + Talk(SAY_QUAKE); if (bPhase) DoCast(me->getVictim(), SPELL_QUAKE, true); else @@ -135,8 +133,8 @@ public: if (!bPhase && uiTransformationTImer <= uiDiff) { - DoScriptText(EMOTE_TRANSFORM, me); - DoScriptText(SAY_TRANSFORM, me); + Talk(EMOTE_TRANSFORM); + Talk(SAY_TRANSFORM); DoCast(me, SPELL_TRANSFORMATION, false); uiTransformationTImer = 10*IN_MILLISECONDS; } else uiTransformationTImer -= uiDiff; @@ -154,7 +152,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MOORABI_EVENT, DONE); @@ -165,7 +163,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index f35228d44d9..cdbce68e337 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -35,13 +35,12 @@ enum Spells //Yell enum Yells { - SAY_AGGRO = -1604017, - SAY_SLAY_1 = -1604018, - SAY_SLAY_2 = -1604019, - SAY_SLAY_3 = -1604020, - SAY_DEATH = -1604021, - SAY_SUMMON_SNAKES = -1604022, - SAY_SUMMON_CONSTRICTORS = -1604023 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SUMMON_SNAKES = 3, + SAY_SUMMON_CONSTRICTORS = 4, + EMOTE_NOVA = 5 }; //Creatures @@ -117,7 +116,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS); @@ -132,6 +131,7 @@ public: if (uiPoisonNovaTimer <= diff) { DoCast(me->getVictim(), SPELL_POISON_NOVA); + Talk(EMOTE_NOVA); uiPoisonNovaTimer = 15*IN_MILLISECONDS; } else uiPoisonNovaTimer -= diff; @@ -163,13 +163,13 @@ public: if (uiPhase == 0 && HealthBelowPct(30)) { - DoScriptText(SAY_SUMMON_SNAKES, me); + Talk(SAY_SUMMON_SNAKES); uiPhase = 1; } if (uiPhase == 1 && HealthBelowPct(25)) { - DoScriptText(SAY_SUMMON_CONSTRICTORS, me); + Talk(SAY_SUMMON_CONSTRICTORS); uiPhase = 2; } @@ -178,7 +178,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); lSummons.DespawnAll(); if (instance) @@ -187,7 +187,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 0d092ec86b2..2b240bc93d8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -37,6 +37,7 @@ enum Texts SAY_WIPE = 9, SAY_BERSERK = 10, SAY_DEATH = 11, + EMOTE_BERSERK_RAID = 12 }; enum Spells @@ -336,7 +337,7 @@ class boss_blood_queen_lana_thel : public CreatureScript switch (eventId) { case EVENT_BERSERK: - DoScriptText(EMOTE_GENERIC_BERSERK_RAID, me); + Talk(EMOTE_BERSERK_RAID); Talk(SAY_BERSERK); DoCast(me, SPELL_BERSERK); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index a12a38b2f62..96cabfed918 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -36,6 +36,7 @@ enum Texts // A flaw of mortality... SAY_BERSERK = 9, // Enough! I tire of these games! SAY_DEATH = 10, // Free...at last... + EMOTE_BERSERK_RAID = 11 }; enum Spells @@ -440,7 +441,7 @@ class boss_sindragosa : public CreatureScript switch (eventId) { case EVENT_BERSERK: - DoScriptText(EMOTE_GENERIC_BERSERK_RAID, me); + Talk(EMOTE_BERSERK_RAID); Talk(SAY_BERSERK); DoCast(me, SPELL_BERSERK); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 8901a61e79d..61ce8817b17 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -19,11 +19,14 @@ #include "ScriptedCreature.h" #include "naxxramas.h" -#define SAY_GREET RAND(-1533000, -1533004, -1533005, -1533006, -1533007) -#define SAY_AGGRO RAND(-1533001, -1533002, -1533003) -#define SAY_SLAY -1533008 +enum Anubrekhan +{ + SAY_AGGRO = 0, + SAY_GREET = 1, + SAY_SLAY = 2, -#define MOB_CRYPT_GUARD 16573 + MOB_CRYPT_GUARD = 16573 +}; const Position GuardSummonPos = {3333.72f, -3476.30f, 287.1f, 6.2801f}; @@ -97,7 +100,7 @@ public: if (victim->GetTypeId() == TYPEID_PLAYER) victim->CastSpell(victim, SPELL_SUMMON_CORPSE_SCARABS_PLR, true, NULL, NULL, me->GetGUID()); - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) @@ -111,7 +114,7 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000)); events.ScheduleEvent(EVENT_LOCUST, 90000); events.ScheduleEvent(EVENT_BERSERK, 600000); @@ -124,7 +127,7 @@ public: { if (!hasTaunted && me->IsWithinDistInMap(who, 60.0f) && who->GetTypeId() == TYPEID_PLAYER) { - DoScriptText(SAY_GREET, me); + Talk(SAY_GREET); hasTaunted = true; } ScriptedAI::MoveInLineOfSight(who); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index a75f87e91af..58db1d9caea 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -22,14 +22,10 @@ enum Yells { - SAY_GREET = -1533009, - SAY_AGGRO_1 = -1533010, - SAY_AGGRO_2 = -1533011, - SAY_AGGRO_3 = -1533012, - SAY_AGGRO_4 = -1533013, - SAY_SLAY_1 = -1533014, - SAY_SLAY_2 = -1533015, - SAY_DEATH = -1533016 + SAY_GREET = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_DEATH = 3 }; enum Spells @@ -71,7 +67,7 @@ class boss_faerlina : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4), me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_POISON, urand(10000, 15000)); events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000)); events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); @@ -88,7 +84,7 @@ class boss_faerlina : public CreatureScript { if (!_introDone && who->GetTypeId() == TYPEID_PLAYER) { - DoScriptText(SAY_GREET, me); + Talk(SAY_GREET); _introDone = true; } @@ -98,13 +94,13 @@ class boss_faerlina : public CreatureScript void KilledUnit(Unit* /*victim*/) { if (!urand(0, 2)) - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void SpellHit(Unit* caster, SpellInfo const* spell) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 29a0a11af9b..7785044e7d1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -73,17 +73,14 @@ const uint32 SPELL_SECONDARY_H[]= {0, 57464, 0, 57465}; const uint32 SPELL_PUNISH[] = {0, 57381, 0, 57377}; #define SPELL_BERSERK 26662 -// used by 16063, 16064, 16065, 30549, but signed for 16063 -const int32 SAY_AGGRO[] = {-1533051, -1533044, -1533065, -1533058}; -const int32 SAY_TAUNT[3][4] ={ {-1533052, -1533045, -1533071, -1533059}, - {-1533053, -1533046, -1533072, -1533060}, - {-1533054, -1533047, -1533073, -1533061}, }; -const int32 SAY_SPECIAL[] = {-1533055, -1533048, -1533070, -1533062}; -const int32 SAY_SLAY[] = {-1533056, -1533049, -1533068, -1533063}; -const int32 SAY_DEATH[] = {-1533057, -1533050, -1533074, -1533064}; - -#define SAY_BARON_AGGRO RAND(-1533065, -1533066, -1533067) -#define SAY_BARON_SLAY RAND(-1533068, -1533069) +enum FourHorsemen +{ + SAY_AGGRO = 0, + SAY_TAUNT = 1, + SAY_SPECIAL = 2, + SAY_SLAY = 3, + SAY_DEATH = 4 +}; class boss_four_horsemen : public CreatureScript { @@ -295,12 +292,7 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) - { - if (id == HORSEMEN_BARON) - DoScriptText(SAY_BARON_SLAY, me); - else - DoScriptText(SAY_SLAY[id], me); - } + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) @@ -321,17 +313,13 @@ public: instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 59450); } - DoScriptText(SAY_DEATH[id], me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { _EnterCombat(); - - if (id == HORSEMEN_BARON) - DoScriptText(SAY_BARON_AGGRO, me); - else - DoScriptText(SAY_AGGRO[id], me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MARK, 15000); events.ScheduleEvent(EVENT_CAST, 20000+rand()%5000); @@ -360,13 +348,13 @@ public: { case EVENT_MARK: if (!(rand()%5)) - DoScriptText(SAY_SPECIAL[id], me); + Talk(SAY_SPECIAL); DoCastAOE(SPELL_MARK[id]); events.ScheduleEvent(EVENT_MARK, 15000); break; case EVENT_CAST: if (!(rand()%5)) - DoScriptText(SAY_TAUNT[rand()%3][id], me); + Talk(SAY_TAUNT); if (caster) { @@ -379,7 +367,7 @@ public: events.ScheduleEvent(EVENT_CAST, 15000); break; case EVENT_BERSERK: - DoScriptText(SAY_SPECIAL[id], me); + Talk(SAY_SPECIAL); DoCast(me, EVENT_BERSERK); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index d335d36e112..14043f00939 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -24,10 +24,10 @@ enum Yells { - SAY_SPEECH = -1533040, - SAY_KILL = -1533041, - SAY_DEATH = -1533042, - SAY_TELEPORT = -1533043 + SAY_SPEECH = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_TELEPORT = 3 }; //Gothik @@ -209,7 +209,7 @@ class boss_gothik : public CreatureScript waveCount = 0; events.ScheduleEvent(EVENT_SUMMON, 30000); DoTeleportTo(PosPlatform); - DoScriptText(SAY_SPEECH, me); + Talk(SAY_SPEECH); if (instance) instance->SetData(DATA_GOTHIK_GATE, GO_STATE_READY); } @@ -239,7 +239,7 @@ class boss_gothik : public CreatureScript void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void JustDied(Unit* /*killer*/) @@ -247,7 +247,7 @@ class boss_gothik : public CreatureScript LiveTriggerGUID.clear(); DeadTriggerGUID.clear(); _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_GOTHIK_GATE, GO_STATE_ACTIVE); } @@ -452,7 +452,7 @@ class boss_gothik : public CreatureScript else { phaseTwo = true; - DoScriptText(SAY_TELEPORT, me); + Talk(SAY_TELEPORT); DoTeleportTo(PosGroundLiveSide); me->SetReactState(REACT_AGGRESSIVE); DummyEntryCheckPredicate pred; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index e7126ba7e33..0018c58f4cb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -21,14 +21,17 @@ #include "naxxramas.h" #include "Player.h" -#define SAY_AGGRO RAND(-1533109, -1533110, -1533111) -#define SAY_SLAY -1533112 -#define SAY_TAUNT RAND(-1533113, -1533114, -1533115, -1533116, -1533117) -#define SAY_DEATH -1533118 - -#define SPELL_SPELL_DISRUPTION 29310 -#define SPELL_DECREPIT_FEVER RAID_MODE(29998, 55011) -#define SPELL_PLAGUE_CLOUD 29350 +enum Heigan +{ + SPELL_DECREPIT_FEVER = 29998, // 25-man: 55011 + SPELL_SPELL_DISRUPTION = 29310, + SPELL_PLAGUE_CLOUD = 29350, + + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_TAUNT = 2, + SAY_DEATH = 3 +}; enum Events { @@ -70,7 +73,7 @@ public: void KilledUnit(Unit* who) { if (!(rand()%5)) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); if (who->GetTypeId() == TYPEID_PLAYER) safetyDance = false; } @@ -92,13 +95,13 @@ public: void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); EnterPhase(PHASE_FIGHT); safetyDance = true; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 9167db45d20..183fb40e5a0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -33,32 +33,23 @@ EndScriptData */ enum Yells { //when shappiron dies. dialog between kel and lich king (in this order) - SAY_SAPP_DIALOG1 = -1533084, //not used - SAY_SAPP_DIALOG2_LICH = -1533085, //not used - SAY_SAPP_DIALOG3 = -1533086, //not used - SAY_SAPP_DIALOG4_LICH = -1533087, //not used - SAY_SAPP_DIALOG5 = -1533088, //not used - SAY_CAT_DIED = -1533089, //when cat dies, not used + SAY_SAPP_DIALOG1 = 0, //not used + SAY_SAPP_DIALOG2_LICH = 1, //not used + SAY_SAPP_DIALOG3 = 2, //not used + SAY_SAPP_DIALOG4_LICH = 3, //not used + SAY_SAPP_DIALOG5 = 4, //not used + SAY_CAT_DIED = 5, //when cat dies, not used //when each of the 4 wing bosses dies - SAY_TAUNT1 = -1533090, //not used - SAY_TAUNT2 = -1533091, //not used - SAY_TAUNT3 = -1533092, //not used - SAY_TAUNT4 = -1533093, //not used - SAY_SUMMON_MINIONS = -1533105, //start of phase 1 - SAY_AGGRO_1 = -1533094, //start of phase 2 - SAY_AGGRO_2 = -1533095, - SAY_AGGRO_3 = -1533096, - SAY_SLAY_1 = -1533097, - SAY_SLAY_2 = -1533098, - SAY_DEATH = -1533099, - SAY_CHAIN_1 = -1533100, - SAY_CHAIN_2 = -1533101, - SAY_FROST_BLAST = -1533102, - SAY_SPECIAL_1 = -1533106, - SAY_SPECIAL_2 = -1533107, - SAY_SPECIAL_3 = -1533108, - SAY_REQUEST_AID = -1533103, //start of phase 3 - SAY_ANSWER_REQUEST = -1533104 //lich king answer + SAY_TAUNT = 6, + SAY_AGGRO = 7, + SAY_SLAY = 8, + SAY_DEATH = 9, + SAY_CHAIN = 10, + SAY_FROST_BLAST = 11, + SAY_REQUEST_AID = 12, //start of phase 3 + SAY_ANSWER_REQUEST = 13, //lich king answer + SAY_SUMMON_MINIONS = 14, //start of phase 1 + SAY_SPECIAL = 15 }; enum Events @@ -341,13 +332,13 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); std::map<uint64, float>::const_iterator itr; for (itr = chained.begin(); itr != chained.end(); ++itr) @@ -370,7 +361,7 @@ public: pPortal->ResetDoorOrButton(); } DoCast(me, SPELL_KELTHUZAD_CHANNEL, false); - DoScriptText(SAY_SUMMON_MINIONS, me); + Talk(SAY_SUMMON_MINIONS); Phase = 1; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 4); @@ -435,7 +426,7 @@ public: break; case EVENT_PHASE: events.Reset(); - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); spawns.DespawnAll(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->CastStop(); @@ -464,10 +455,10 @@ public: if (HealthBelowPct(45)) { Phase = 3; - DoScriptText(SAY_REQUEST_AID, me); + Talk(SAY_REQUEST_AID); //here Lich King should respond to KelThuzad but I don't know which Creature to make talk //so for now just make Kelthuzad says it. - DoScriptText(SAY_ANSWER_REQUEST, me); + Talk(SAY_ANSWER_REQUEST); for (uint8 i = 0; i <= 3; ++i) { @@ -523,7 +514,7 @@ public: } } if (!chained.empty()) - DoScriptText(RAND(SAY_CHAIN_1, SAY_CHAIN_2), me); + Talk(SAY_CHAIN); events.RepeatEvent(urand(100000, 180000)); break; } @@ -627,7 +618,7 @@ public: std::vector<Unit*>::const_iterator itr = unitList.begin(); advance(itr, rand()%unitList.size()); DoCast(*itr, SPELL_MANA_DETONATION); - DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2, SAY_SPECIAL_3), me); + Talk(SAY_SPECIAL); } events.RepeatEvent(urand(20000, 50000)); @@ -642,7 +633,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) DoCast(target, SPELL_FROST_BLAST); if (rand()%2) - DoScriptText(SAY_FROST_BLAST, me); + Talk(SAY_FROST_BLAST); events.RepeatEvent(urand(30000, 90000)); break; default: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index d106b99ace0..b670e36fa96 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -19,21 +19,25 @@ #include "ScriptedCreature.h" #include "naxxramas.h" -#define SAY_AGGRO RAND(-1533075, -1533076, -1533077) -#define SAY_SUMMON -1533078 -#define SAY_SLAY RAND(-1533079, -1533080) -#define SAY_DEATH -1533081 +enum Noth +{ + SAY_AGGRO = 0, + SAY_SUMMON = 1, + SAY_SLAY = 2, + SAY_DEATH = 3, -#define SOUND_DEATH 8848 + SOUND_DEATH = 8848, -#define SPELL_CURSE_PLAGUEBRINGER RAID_MODE(29213, 54835) -#define SPELL_BLINK RAND(29208, 29209, 29210, 29211) -#define SPELL_CRIPPLE RAID_MODE(29212, 54814) -#define SPELL_TELEPORT 29216 + SPELL_CURSE_PLAGUEBRINGER = 29213, // 25-man: 54835 + SPELL_CRIPPLE = 29212, // 25-man: 54814 + SPELL_TELEPORT = 29216, -#define MOB_WARRIOR 16984 -#define MOB_CHAMPION 16983 -#define MOB_GUARDIAN 16981 + MOB_WARRIOR = 16984, + MOB_CHAMPION = 16983, + MOB_GUARDIAN = 16981 +}; + +#define SPELL_BLINK RAND(29208, 29209, 29210, 29211) // Teleport position of Noth on his balcony #define TELE_X 2631.370f @@ -90,7 +94,7 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); balconyCount = 0; EnterPhaseGround(); } @@ -115,7 +119,7 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void JustSummoned(Creature* summon) @@ -128,7 +132,7 @@ public: void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void SummonUndead(uint32 entry, uint32 num) @@ -157,7 +161,7 @@ public: events.ScheduleEvent(EVENT_CURSE, urand(50000, 60000)); return; case EVENT_WARRIOR: - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); SummonUndead(MOB_WARRIOR, RAID_MODE(2, 3)); events.ScheduleEvent(EVENT_WARRIOR, 30000); return; @@ -178,7 +182,7 @@ public: waveCount = 0; return; case EVENT_WAVE: - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); switch (balconyCount) { case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index b1b57836a89..d4b3f5ddce0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -30,12 +30,11 @@ enum Spells enum Yells { - SAY_AGGRO_1 = -1533017, - SAY_AGGRO_2 = -1533018, - SAY_SLAY = -1533019, - SAY_DEATH = -1533020, - EMOTE_BERSERK = -1533021, - EMOTE_ENRAGE = -1533022, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + EMOTE_BERSERK = 3, + EMOTE_ENRAGE = 4 }; enum Events @@ -78,20 +77,20 @@ public: void KilledUnit(Unit* /*Victim*/) { if (!(rand()%5)) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { _EnterCombat(); Enraged = false; - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_HATEFUL, 1000); events.ScheduleEvent(EVENT_BERSERK, 360000); @@ -137,7 +136,7 @@ public: } case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); - DoScriptText(EMOTE_BERSERK, me); + Talk(EMOTE_BERSERK); events.ScheduleEvent(EVENT_SLIME, 2000); break; case EVENT_SLIME: @@ -150,7 +149,7 @@ public: if (!Enraged && HealthBelowPct(5)) { DoCast(me, SPELL_FRENZY, true); - DoScriptText(EMOTE_ENRAGE, me); + Talk(EMOTE_ENRAGE); Enraged = true; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index c027dd3a97d..aebd7fdc19c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -15,48 +15,47 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "AchievementMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "naxxramas.h" #include "Player.h" #include "SpellInfo.h" +#include "naxxramas.h" -#define EMOTE_BREATH -1533082 -#define EMOTE_ENRAGE -1533083 - -#define SPELL_FROST_AURA RAID_MODE(28531, 55799) -#define SPELL_CLEAVE 19983 -#define SPELL_TAIL_SWEEP RAID_MODE(55697, 55696) -#define SPELL_SUMMON_BLIZZARD 28560 -#define SPELL_LIFE_DRAIN RAID_MODE(28542, 55665) -#define SPELL_ICEBOLT 28522 -#define SPELL_FROST_BREATH 29318 -#define SPELL_FROST_EXPLOSION 28524 -#define SPELL_FROST_MISSILE 30101 -#define SPELL_BERSERK 26662 -#define SPELL_DIES 29357 - -#define SPELL_CHILL RAID_MODE(28547, 55699) - -#define MOB_BLIZZARD 16474 -#define GO_ICEBLOCK 181247 +enum Yells +{ + EMOTE_AIR_PHASE = 0, + EMOTE_GROUND_PHASE = 1, + EMOTE_BREATH = 2, + EMOTE_ENRAGE = 3 +}; -#define ACHIEVEMENT_THE_HUNDRED_CLUB RAID_MODE(2146, 2147) -#define MAX_FROST_RESISTANCE 100 +enum Spells +{ + SPELL_FROST_AURA = 28531, + SPELL_CLEAVE = 19983, + SPELL_TAIL_SWEEP = 55697, + SPELL_SUMMON_BLIZZARD = 28560, + SPELL_LIFE_DRAIN = 28542, + SPELL_ICEBOLT = 28522, + SPELL_FROST_BREATH = 29318, + SPELL_FROST_EXPLOSION = 28524, + SPELL_FROST_MISSILE = 30101, + SPELL_BERSERK = 26662, + SPELL_DIES = 29357, + SPELL_CHILL = 28547, +}; enum Phases { - PHASE_NULL = 0, + PHASE_NULL = 0, PHASE_BIRTH, PHASE_GROUND, - PHASE_FLIGHT, + PHASE_FLIGHT }; enum Events { - EVENT_NONE, - EVENT_BERSERK, + EVENT_BERSERK = 1, EVENT_CLEAVE, EVENT_TAIL, EVENT_DRAIN, @@ -68,342 +67,362 @@ enum Events EVENT_EXPLOSION, EVENT_LAND, EVENT_GROUND, - EVENT_BIRTH, + EVENT_BIRTH +}; + +enum Misc +{ + NPC_BLIZZARD = 16474, + GO_ICEBLOCK = 181247, + + // The Hundred Club + DATA_THE_HUNDRED_CLUB = 21462147, + MAX_FROST_RESISTANCE = 100 }; typedef std::map<uint64, uint64> IceBlockMap; class boss_sapphiron : public CreatureScript { -public: - boss_sapphiron() : CreatureScript("boss_sapphiron") { } - - CreatureAI* GetAI(Creature* creature) const - { - return new boss_sapphironAI (creature); - } - - struct boss_sapphironAI : public BossAI - { - boss_sapphironAI(Creature* creature) : BossAI(creature, BOSS_SAPPHIRON) - , phase(PHASE_NULL) + public: + boss_sapphiron() : CreatureScript("boss_sapphiron") { } + + struct boss_sapphironAI : public BossAI { - map = me->GetMap(); - } + boss_sapphironAI(Creature* creature) : BossAI(creature, BOSS_SAPPHIRON) + , _phase(PHASE_NULL) + { + _map = me->GetMap(); + } - Phases phase; - uint32 iceboltCount; - IceBlockMap iceblocks; + void InitializeAI() + { + float x, y, z; + me->GetPosition(x, y, z); + me->SummonGameObject(GO_BIRTH, x, y, z, 0, 0, 0, 0, 0, 0); + me->SetVisible(false); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetReactState(REACT_PASSIVE); + + BossAI::InitializeAI(); + } - bool CanTheHundredClub; // needed for achievement: The Hundred Club(2146, 2147) - uint32 CheckFrostResistTimer; - Map* map; + void Reset() + { + _Reset(); - void InitializeAI() - { - float x, y, z; - me->GetPosition(x, y, z); - me->SummonGameObject(GO_BIRTH, x, y, z, 0, 0, 0, 0, 0, 0); - me->SetVisible(false); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetReactState(REACT_PASSIVE); - - ScriptedAI::InitializeAI(); - } + if (_phase == PHASE_FLIGHT) + ClearIceBlock(); - void Reset() - { - _Reset(); + _phase = PHASE_NULL; - if (phase == PHASE_FLIGHT) - ClearIceBlock(); + _canTheHundredClub = true; + _checkFrostResistTimer = 5 * IN_MILLISECONDS; + } - phase = PHASE_NULL; + void EnterCombat(Unit* /*who*/) + { + _EnterCombat(); - CanTheHundredClub = true; - CheckFrostResistTimer = 5000; - } + me->CastSpell(me, SPELL_FROST_AURA, true); - void EnterCombat(Unit* /*who*/) - { - _EnterCombat(); + events.ScheduleEvent(EVENT_BERSERK, 15 * MINUTE * IN_MILLISECONDS); + EnterPhaseGround(); - me->CastSpell(me, SPELL_FROST_AURA, true); + CheckPlayersFrostResist(); + } - events.ScheduleEvent(EVENT_BERSERK, 15*60000); - EnterPhaseGround(); + void SpellHitTarget(Unit* target, SpellInfo const* spell) + { + if (spell->Id == SPELL_ICEBOLT) + { + IceBlockMap::iterator itr = _iceblocks.find(target->GetGUID()); + if (itr != _iceblocks.end() && !itr->second) + { + if (GameObject* iceblock = me->SummonGameObject(GO_ICEBLOCK, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) + itr->second = iceblock->GetGUID(); + } + } + } - CheckPlayersFrostResist(); - } + void JustDied(Unit* /*killer*/) + { + _JustDied(); + me->CastSpell(me, SPELL_DIES, true); - void SpellHitTarget(Unit* target, const SpellInfo* spell) - { - if (spell->Id == SPELL_ICEBOLT) + CheckPlayersFrostResist(); + } + + void MovementInform(uint32 /*type*/, uint32 id) + { + if (id == 1) + events.ScheduleEvent(EVENT_LIFTOFF, 0); + } + + void DoAction(int32 const param) { - IceBlockMap::iterator itr = iceblocks.find(target->GetGUID()); - if (itr != iceblocks.end() && !itr->second) + if (param == DATA_SAPPHIRON_BIRTH) { - if (GameObject* iceblock = me->SummonGameObject(GO_ICEBLOCK, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) - itr->second = iceblock->GetGUID(); + _phase = PHASE_BIRTH; + events.ScheduleEvent(EVENT_BIRTH, 23 * IN_MILLISECONDS); } } - } - - void JustDied(Unit* /*killer*/) - { - _JustDied(); - me->CastSpell(me, SPELL_DIES, true); - CheckPlayersFrostResist(); - if (CanTheHundredClub) + void CheckPlayersFrostResist() { - AchievementEntry const* AchievTheHundredClub = sAchievementMgr->GetAchievement(ACHIEVEMENT_THE_HUNDRED_CLUB); - if (AchievTheHundredClub) + if (_canTheHundredClub && _map && _map->IsRaid()) { - if (map && map->IsDungeon()) + Map::PlayerList const &players = _map->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Map::PlayerList const &players = map->GetPlayers(); - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - itr->getSource()->CompletedAchievement(AchievTheHundredClub); + if (itr->getSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) + { + _canTheHundredClub = false; + break; + } } } } - } - - void MovementInform(uint32, uint32 id) - { - if (id == 1) - events.ScheduleEvent(EVENT_LIFTOFF, 0); - } - void DoAction(const int32 param) - { - if (param == DATA_SAPPHIRON_BIRTH) + void EnterPhaseGround() { - phase = PHASE_BIRTH; - events.ScheduleEvent(EVENT_BIRTH, 23000); + _phase = PHASE_GROUND; + me->SetReactState(REACT_AGGRESSIVE); + events.SetPhase(PHASE_GROUND); + events.ScheduleEvent(EVENT_CLEAVE, urand(5, 15) * IN_MILLISECONDS, 0, PHASE_GROUND); + events.ScheduleEvent(EVENT_TAIL, urand(5, 15) * IN_MILLISECONDS, 0, PHASE_GROUND); + events.ScheduleEvent(EVENT_DRAIN, 24 * IN_MILLISECONDS, 0, PHASE_GROUND); + events.ScheduleEvent(EVENT_BLIZZARD, urand(5, 10) * IN_MILLISECONDS, 0, PHASE_GROUND); + events.ScheduleEvent(EVENT_FLIGHT, 45 * IN_MILLISECONDS); } - } - void CheckPlayersFrostResist() - { - if (CanTheHundredClub && map && map->IsDungeon()) + void ClearIceBlock() { - Map::PlayerList const &players = map->GetPlayers(); - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + for (IceBlockMap::const_iterator itr = _iceblocks.begin(); itr != _iceblocks.end(); ++itr) { - if (itr->getSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) - { - CanTheHundredClub = false; - break; - } + if (Player* player = ObjectAccessor::GetPlayer(*me, itr->first)) + player->RemoveAura(SPELL_ICEBOLT); + + if (GameObject* go = ObjectAccessor::GetGameObject(*me, itr->second)) + go->Delete(); } + _iceblocks.clear(); } - } - void EnterPhaseGround() - { - phase = PHASE_GROUND; - me->SetReactState(REACT_AGGRESSIVE); - events.SetPhase(PHASE_GROUND); - events.ScheduleEvent(EVENT_CLEAVE, 5000+rand()%10000, 0, PHASE_GROUND); - events.ScheduleEvent(EVENT_TAIL, 5000+rand()%10000, 0, PHASE_GROUND); - events.ScheduleEvent(EVENT_DRAIN, 24000, 0, PHASE_GROUND); - events.ScheduleEvent(EVENT_BLIZZARD, 5000+rand()%5000, 0, PHASE_GROUND); - events.ScheduleEvent(EVENT_FLIGHT, 45000); - } - - void ClearIceBlock() - { - for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) + uint32 GetData(uint32 data) const { - if (Player* player = Unit::GetPlayer(*me, itr->first)) - player->RemoveAura(SPELL_ICEBOLT); - if (GameObject* go = GameObject::GetGameObject(*me, itr->second)) - go->Delete(); + if (data == DATA_THE_HUNDRED_CLUB) + return _canTheHundredClub; + + return 0; } - iceblocks.clear(); - } - void UpdateAI(const uint32 diff) - { - if (!phase) - return; + void UpdateAI(uint32 const diff) + { + if (!_phase) + return; - events.Update(diff); + events.Update(diff); - if ((phase != PHASE_BIRTH && !UpdateVictim()) || !CheckInRoom()) - return; + if ((_phase != PHASE_BIRTH && !UpdateVictim()) || !CheckInRoom()) + return; - if (CanTheHundredClub) - { - if (CheckFrostResistTimer <= diff) + if (_canTheHundredClub) { - CheckPlayersFrostResist(); - CheckFrostResistTimer = (rand() % 5 + 5) * 1000; - } else CheckFrostResistTimer -= diff; - } + if (_checkFrostResistTimer <= diff) + { + CheckPlayersFrostResist(); + _checkFrostResistTimer = 5 * IN_MILLISECONDS; + } + else + _checkFrostResistTimer -= diff; + } - if (phase == PHASE_GROUND) - { - while (uint32 eventId = events.ExecuteEvent()) + if (_phase == PHASE_GROUND) { - switch (eventId) + while (uint32 eventId = events.ExecuteEvent()) { - case EVENT_BERSERK: - DoScriptText(EMOTE_ENRAGE, me); - DoCast(me, SPELL_BERSERK); - return; - case EVENT_CLEAVE: - DoCast(me->getVictim(), SPELL_CLEAVE); - events.ScheduleEvent(EVENT_CLEAVE, 5000+rand()%10000, 0, PHASE_GROUND); - return; - case EVENT_TAIL: - DoCastAOE(SPELL_TAIL_SWEEP); - events.ScheduleEvent(EVENT_TAIL, 5000+rand()%10000, 0, PHASE_GROUND); - return; - case EVENT_DRAIN: - DoCastAOE(SPELL_LIFE_DRAIN); - events.ScheduleEvent(EVENT_DRAIN, 24000, 0, PHASE_GROUND); - return; - case EVENT_BLIZZARD: + switch (eventId) { - //DoCastAOE(SPELL_SUMMON_BLIZZARD); - if (Creature* summon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) - summon->GetMotionMaster()->MoveRandom(40); - events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000, 7000), 0, PHASE_GROUND); - break; - } - case EVENT_FLIGHT: - if (HealthAbovePct(10)) - { - phase = PHASE_FLIGHT; - events.SetPhase(PHASE_FLIGHT); - me->SetReactState(REACT_PASSIVE); - me->AttackStop(); - float x, y, z, o; - me->GetHomePosition(x, y, z, o); - me->GetMotionMaster()->MovePoint(1, x, y, z); + case EVENT_BERSERK: + Talk(EMOTE_ENRAGE); + DoCast(me, SPELL_BERSERK); + return; + case EVENT_CLEAVE: + DoCastVictim(SPELL_CLEAVE); + events.ScheduleEvent(EVENT_CLEAVE, urand(5, 15) * IN_MILLISECONDS, 0, PHASE_GROUND); + return; + case EVENT_TAIL: + DoCastAOE(SPELL_TAIL_SWEEP); + events.ScheduleEvent(EVENT_TAIL, urand(5, 15) * IN_MILLISECONDS, 0, PHASE_GROUND); + return; + case EVENT_DRAIN: + DoCastAOE(SPELL_LIFE_DRAIN); + events.ScheduleEvent(EVENT_DRAIN, 24 * IN_MILLISECONDS, 0, PHASE_GROUND); return; + case EVENT_BLIZZARD: + { + //DoCastAOE(SPELL_SUMMON_BLIZZARD); + if (Creature* summon = DoSummon(NPC_BLIZZARD, me, 0.0f, urand(25, 30) * IN_MILLISECONDS, TEMPSUMMON_TIMED_DESPAWN)) + summon->GetMotionMaster()->MoveRandom(40); + events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20, 7) * IN_MILLISECONDS, 0, PHASE_GROUND); + break; } - break; + case EVENT_FLIGHT: + if (HealthAbovePct(10)) + { + _phase = PHASE_FLIGHT; + events.SetPhase(PHASE_FLIGHT); + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + float x, y, z, o; + me->GetHomePosition(x, y, z, o); + me->GetMotionMaster()->MovePoint(1, x, y, z); + return; + } + break; + } } - } - DoMeleeAttackIfReady(); - } - else - { - if (uint32 eventId = events.ExecuteEvent()) + DoMeleeAttackIfReady(); + } + else { - switch (eventId) + if (uint32 eventId = events.ExecuteEvent()) { - case EVENT_LIFTOFF: - me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - me->SetDisableGravity(true); - me->SendMovementFlagUpdate(); - events.ScheduleEvent(EVENT_ICEBOLT, 1500); - iceboltCount = RAID_MODE(2, 3); - return; - case EVENT_ICEBOLT: + switch (eventId) { - std::vector<Unit*> targets; - std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); - for (; i != me->getThreatManager().getThreatList().end(); ++i) - if ((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER && !(*i)->getTarget()->HasAura(SPELL_ICEBOLT)) - targets.push_back((*i)->getTarget()); - - if (targets.empty()) - iceboltCount = 0; - else + case EVENT_LIFTOFF: + Talk(EMOTE_AIR_PHASE); + me->SetDisableGravity(true); + me->SendMovementFlagUpdate(); + events.ScheduleEvent(EVENT_ICEBOLT, 1500); + _iceboltCount = RAID_MODE(2, 3); + return; + case EVENT_ICEBOLT: { - std::vector<Unit*>::const_iterator itr = targets.begin(); - advance(itr, rand()%targets.size()); - iceblocks.insert(std::make_pair((*itr)->GetGUID(), 0)); - DoCast(*itr, SPELL_ICEBOLT); - --iceboltCount; + std::vector<Unit*> targets; + std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); + for (; i != me->getThreatManager().getThreatList().end(); ++i) + if ((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER && !(*i)->getTarget()->HasAura(SPELL_ICEBOLT)) + targets.push_back((*i)->getTarget()); + + if (targets.empty()) + _iceboltCount = 0; + else + { + std::vector<Unit*>::const_iterator itr = targets.begin(); + advance(itr, rand()%targets.size()); + _iceblocks.insert(std::make_pair((*itr)->GetGUID(), 0)); + DoCast(*itr, SPELL_ICEBOLT); + --_iceboltCount; + } + + if (_iceboltCount) + events.ScheduleEvent(EVENT_ICEBOLT, 1 * IN_MILLISECONDS); + else + events.ScheduleEvent(EVENT_BREATH, 1 * IN_MILLISECONDS); + return; } - - if (iceboltCount) - events.ScheduleEvent(EVENT_ICEBOLT, 1000); - else - events.ScheduleEvent(EVENT_BREATH, 1000); - return; - } - case EVENT_BREATH: - { - DoScriptText(EMOTE_BREATH, me); - DoCastAOE(SPELL_FROST_MISSILE); - events.ScheduleEvent(EVENT_EXPLOSION, 8000); - return; + case EVENT_BREATH: + { + Talk(EMOTE_BREATH); + DoCastAOE(SPELL_FROST_MISSILE); + events.ScheduleEvent(EVENT_EXPLOSION, 8 * IN_MILLISECONDS); + return; + } + case EVENT_EXPLOSION: + CastExplosion(); + ClearIceBlock(); + events.ScheduleEvent(EVENT_LAND, 3 * IN_MILLISECONDS); + return; + case EVENT_LAND: + me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); + Talk(EMOTE_GROUND_PHASE); + me->SetDisableGravity(false); + me->SendMovementFlagUpdate(); + events.ScheduleEvent(EVENT_GROUND, 1500); + return; + case EVENT_GROUND: + EnterPhaseGround(); + return; + case EVENT_BIRTH: + me->SetVisible(true); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetReactState(REACT_AGGRESSIVE); + return; } - case EVENT_EXPLOSION: - CastExplosion(); - ClearIceBlock(); - events.ScheduleEvent(EVENT_LAND, 3000); - return; - case EVENT_LAND: - me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); - me->SetDisableGravity(false); - me->SendMovementFlagUpdate(); - events.ScheduleEvent(EVENT_GROUND, 1500); - return; - case EVENT_GROUND: - EnterPhaseGround(); - return; - case EVENT_BIRTH: - me->SetVisible(true); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetReactState(REACT_AGGRESSIVE); - return; } - }//if (uint32 eventId = events.ExecuteEvent()) - }//if (phase == PHASE_GROUND) - } + } + } - void CastExplosion() - { - DoZoneInCombat(); // make sure everyone is in threatlist - std::vector<Unit*> targets; - std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); - for (; i != me->getThreatManager().getThreatList().end(); ++i) + void CastExplosion() { - Unit* target = (*i)->getTarget(); - if (target->GetTypeId() != TYPEID_PLAYER) - continue; - - if (target->HasAura(SPELL_ICEBOLT)) + DoZoneInCombat(); // make sure everyone is in threatlist + std::vector<Unit*> targets; + std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); + for (; i != me->getThreatManager().getThreatList().end(); ++i) { - target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); - targets.push_back(target); - continue; - } + Unit* target = (*i)->getTarget(); + if (target->GetTypeId() != TYPEID_PLAYER) + continue; - for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) - { - if (GameObject* go = GameObject::GetGameObject(*me, itr->second)) + if (target->HasAura(SPELL_ICEBOLT)) { - if (go->IsInBetween(me, target, 2.0f) - && me->GetExactDist2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDist2d(go->GetPositionX(), go->GetPositionY()) < 5.0f) + target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); + targets.push_back(target); + continue; + } + + for (IceBlockMap::const_iterator itr = _iceblocks.begin(); itr != _iceblocks.end(); ++itr) + { + if (GameObject* go = GameObject::GetGameObject(*me, itr->second)) { - target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); - targets.push_back(target); - break; + if (go->IsInBetween(me, target, 2.0f) + && me->GetExactDist2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDist2d(go->GetPositionX(), go->GetPositionY()) < 5.0f) + { + target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); + targets.push_back(target); + break; + } } } } + + me->CastSpell(me, SPELL_FROST_EXPLOSION, true); + + for (std::vector<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) + (*itr)->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, false); } - me->CastSpell(me, SPELL_FROST_EXPLOSION, true); + private: + Phases _phase; + uint32 _iceboltCount; + IceBlockMap _iceblocks; + bool _canTheHundredClub; + uint32 _checkFrostResistTimer; + Map* _map; + }; - for (std::vector<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) - (*itr)->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, false); + CreatureAI* GetAI(Creature* creature) const + { + return new boss_sapphironAI (creature); } - }; +}; +class achievement_the_hundred_club : public AchievementCriteriaScript +{ + public: + achievement_the_hundred_club() : AchievementCriteriaScript("achievement_the_hundred_club") { } + + bool OnCheck(Player* /*source*/, Unit* target) + { + return target && target->GetAI()->GetData(DATA_THE_HUNDRED_CLUB); + } }; void AddSC_boss_sapphiron() { new boss_sapphiron(); + new achievement_the_hundred_club(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 482f8a1200d..c86cf1e9f28 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -24,9 +24,9 @@ //Stalagg enum StalaggYells { - SAY_STAL_AGGRO = -1533023, //not used - SAY_STAL_SLAY = -1533024, //not used - SAY_STAL_DEATH = -1533025 //not used + SAY_STAL_AGGRO = 0, + SAY_STAL_SLAY = 1, + SAY_STAL_DEATH = 2 }; enum StalagSpells @@ -40,9 +40,9 @@ enum StalagSpells //Feugen enum FeugenYells { - SAY_FEUG_AGGRO = -1533026, //not used - SAY_FEUG_SLAY = -1533027, //not used - SAY_FEUG_DEATH = -1533028 //not used + SAY_FEUG_AGGRO = 0, + SAY_FEUG_SLAY = 1, + SAY_FEUG_DEATH = 2 }; enum FeugenSpells @@ -67,17 +67,12 @@ enum ThaddiusActions //Thaddius enum ThaddiusYells { - SAY_GREET = -1533029, //not used - SAY_AGGRO_1 = -1533030, - SAY_AGGRO_2 = -1533031, - SAY_AGGRO_3 = -1533032, - SAY_SLAY = -1533033, - SAY_ELECT = -1533034, //not used - SAY_DEATH = -1533035, - SAY_SCREAM1 = -1533036, //not used - SAY_SCREAM2 = -1533037, //not used - SAY_SCREAM3 = -1533038, //not used - SAY_SCREAM4 = -1533039 //not used + SAY_GREET = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_ELECT = 3, + SAY_DEATH = 4, + SAY_SCREAM = 5 }; enum ThaddiusSpells @@ -155,13 +150,13 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%5)) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void DoAction(const int32 action) @@ -198,7 +193,7 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SHIFT, 30000); events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); events.ScheduleEvent(EVENT_BERSERK, 360000); @@ -315,13 +310,21 @@ public: magneticPullTimer = 20000; } + void KilledUnit(Unit* /*victim*/) + { + if (!(rand()%5)) + Talk(SAY_STAL_SLAY); + } + void EnterCombat(Unit* /*who*/) { + Talk(SAY_STAL_AGGRO); DoCast(SPELL_STALAGG_TESLA); } void JustDied(Unit* /*killer*/) { + Talk(SAY_STAL_DEATH); if (instance) if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) @@ -399,13 +402,21 @@ public: staticFieldTimer = 5000; } + void KilledUnit(Unit* /*victim*/) + { + if (!(rand()%5)) + Talk(SAY_FEUG_SLAY); + } + void EnterCombat(Unit* /*who*/) { + Talk(SAY_FEUG_AGGRO); DoCast(SPELL_FEUGEN_TESLA); } void JustDied(Unit* /*killer*/) { + Talk(SAY_FEUG_DEATH); if (instance) if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 80a5336a30c..2d89e5db0f0 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -38,10 +38,10 @@ enum Adds enum Yells { - SAY_AGGRO = -1576010, - SAY_DEATH = -1576011, - SAY_RIFT = -1576012, - SAY_SHIELD = -1576013 + SAY_AGGRO = 0, + SAY_DEATH = 1, + SAY_RIFT = 2, + SAY_SHIELD = 3 }; enum RiftSpells @@ -96,7 +96,7 @@ class boss_anomalus : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS); @@ -104,7 +104,7 @@ class boss_anomalus : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_ANOMALUS_EVENT, DONE); @@ -155,7 +155,7 @@ class boss_anomalus : public CreatureScript if ((Phase == 0) && HealthBelowPct(50)) { Phase = 1; - DoScriptText(SAY_SHIELD, me); + Talk(SAY_SHIELD); DoCast(me, SPELL_RIFT_SHIELD); if (Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) { @@ -163,7 +163,7 @@ class boss_anomalus : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) Rift->AI()->AttackStart(target); uiChaoticRiftGUID = Rift->GetGUID(); - DoScriptText(SAY_RIFT, me); + Talk(SAY_RIFT); } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index bbd86ec6a9f..c110a4a3e85 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -40,11 +40,11 @@ enum Spells enum Yells { //Yell - SAY_AGGRO = -1576040, - SAY_SLAY = -1576041, - SAY_ENRAGE = -1576042, - SAY_DEATH = -1576043, - SAY_CRYSTAL_NOVA = -1576044 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_ENRAGE = 2, + SAY_DEATH = 3, + SAY_CRYSTAL_NOVA = 4 }; enum Misc @@ -100,7 +100,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCastAOE(SPELL_INTENSE_COLD); if (instance) @@ -109,7 +109,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_KERISTRASZA_EVENT, DONE); @@ -117,7 +117,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } bool CheckContainmentSpheres(bool remove_prison = false) @@ -174,7 +174,7 @@ public: if (!bEnrage && HealthBelowPct(25)) { - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); DoCast(me, SPELL_ENRAGE); bEnrage = true; } @@ -193,7 +193,7 @@ public: if (uiCrystalChainsCrystalizeTimer <= diff) { - DoScriptText(SAY_CRYSTAL_NOVA, me); + Talk(SAY_CRYSTAL_NOVA); if (IsHeroic()) DoCast(me, SPELL_CRYSTALIZE); else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 317a9845e87..c8d3cc6416c 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -43,12 +43,11 @@ enum Creatures enum Yells { - SAY_AGGRO = -1576000, - SAY_KILL = -1576001, - SAY_DEATH = -1576002, - SAY_MERGE = -1576003, - SAY_SPLIT_1 = -1576004, - SAY_SPLIT_2 = -1576005, + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_MERGE = 3, + SAY_SPLIT = 4 }; #define ACTION_MAGUS_DEAD 1 @@ -122,7 +121,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); @@ -130,7 +129,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE); @@ -138,7 +137,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void DoAction(int32 const action) @@ -251,7 +250,7 @@ public: uiArcaneMagusGUID = 0; bIsWaitingToAppear = true; uiIsWaitingToAppearTimer = 4*IN_MILLISECONDS; - DoScriptText(SAY_MERGE, me); + Talk(SAY_MERGE); } else return; @@ -270,7 +269,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); + Talk(SAY_SPLIT); return; } @@ -287,7 +286,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); + Talk(SAY_SPLIT); return; } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp index 38808bc718d..1af1edcdf71 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp @@ -26,17 +26,15 @@ Script Data End */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_BATTLE_SHOUT 31403 -#define SPELL_CHARGE 60067 -#define SPELL_FRIGHTENING_SHOUT 19134 -#define SPELL_WHIRLWIND_1 38619 -#define SPELL_WHIRLWIND_2 38618 +enum CommanderStoutbeard +{ + SPELL_BATTLE_SHOUT = 31403, + SPELL_CHARGE = 60067, + SPELL_FRIGHTENING_SHOUT = 19134, + SPELL_WHIRLWIND_1 = 38619, + SPELL_WHIRLWIND_2 = 38618 +}; -//not used -//Yell -#define SAY_AGGRO -1576021 -#define SAY_KILL -1576022 -#define SAY_DEATH -1576023 class boss_commander_stoutbeard : public CreatureScript { @@ -53,10 +51,6 @@ public: boss_commander_stoutbeardAI(Creature* creature) : ScriptedAI(creature) {} void Reset() {} - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 /*diff*/) @@ -67,10 +61,6 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - } }; }; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 035e1a9a6df..60f9a3ddc9a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -31,18 +31,11 @@ enum Spells enum Yells { - SAY_AGGRO = -1578005, - SAY_KILL_1 = -1578006, - SAY_KILL_2 = -1578007, - SAY_KILL_3 = -1578008, - SAY_DEATH = -1578009, - SAY_PULL_1 = -1578010, - SAY_PULL_2 = -1578011, - SAY_PULL_3 = -1578012, - SAY_PULL_4 = -1578013, - SAY_STOMP_1 = -1578014, - SAY_STOMP_2 = -1578015, - SAY_STOMP_3 = -1578016 + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_PULL = 3, + SAY_STOMP = 4 }; enum DrakosAchievement @@ -85,7 +78,7 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) @@ -122,7 +115,7 @@ public: events.ScheduleEvent(EVENT_MAGIC_PULL, 15000); break; case EVENT_STOMP: - DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2, SAY_STOMP_3), me); + Talk(SAY_STOMP); DoCast(SPELL_THUNDERING_STOMP); events.ScheduleEvent(EVENT_STOMP, 17000); break; @@ -136,7 +129,7 @@ public: { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); // start achievement timer (kill Eregos within 20 min) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); @@ -144,7 +137,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me); + Talk(SAY_KILL); } private: bool postPull; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 51e476785ff..ffd5e53e787 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -45,11 +45,14 @@ enum Spells enum Yells { - SAY_AGGRO_1 = -1578000, - SAY_AGGRO_2 = -1578001, - SAY_AGGRO_3 = -1578002, - SAY_AGGRO_4 = -1578003, - SAY_TELEPORT = -1578004, + SAY_SUMMON_1 = 0, + SAY_SUMMON_2 = 1, + SAY_SUMMON_3 = 2, + SAY_AGGRO = 3, + EMOTE_ARCANE_EXPLOSION = 4, + SAY_ARCANE_EXPLOSION = 5, + SAY_DEATH = 6, + SAY_PLAYER_KILL = 7 }; enum eCreature @@ -84,11 +87,6 @@ static uint32 TeleportSpells[]= SPELL_SUMMON_MENAGERIE, SPELL_SUMMON_MENAGERIE_2, SPELL_SUMMON_MENAGERIE_3 }; -static int32 SayAggro[]= -{ - SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4 -}; - class boss_urom : public CreatureScript { public: @@ -153,7 +151,7 @@ public: { if (me->Attack(who, true)) { - DoScriptText(SayAggro[3], me); + Talk(SAY_AGGRO); me->SetInCombatWith(who); who->SetInCombatWith(me); @@ -209,6 +207,22 @@ public: { SetPosition(i); me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i], x, y, me->GetPositionZ(), me->GetOrientation()); + + // teleport to next platform and spawn adds + switch (instance->GetData(DATA_UROM_PLATAFORM)) + { + case 1: + Talk(SAY_SUMMON_1); + break; + case 2: + Talk(SAY_SUMMON_2); + break; + case 3: + Talk(SAY_SUMMON_3); + break; + default: + break; + } } } @@ -217,13 +231,17 @@ public: if (!instance || instance->GetData(DATA_UROM_PLATAFORM) > 2) return; - DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)], me); + Talk(instance->GetData(DATA_UROM_PLATAFORM) < 5 ? instance->GetData(DATA_UROM_PLATAFORM) : 0); DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]); } + void KilledUnit(Unit* /*victim*/) + { + Talk(SAY_PLAYER_KILL); + } + void UpdateAI(const uint32 uiDiff) { - //Return since we have no target if (!UpdateVictim()) return; @@ -233,7 +251,6 @@ public: if (teleportTimer <= uiDiff) { me->InterruptNonMeleeSpells(false); - DoScriptText(SAY_TELEPORT, me); me->GetMotionMaster()->MoveIdle(); DoCast(SPELL_TELEPORT); teleportTimer = urand(30000, 35000); @@ -262,6 +279,9 @@ public: me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); + Talk(EMOTE_ARCANE_EXPLOSION); + Talk(SAY_ARCANE_EXPLOSION); + canCast = false; canGoBack = false; arcaneExplosionTimer = 9000; @@ -291,6 +311,7 @@ public: void JustDied(Unit* /*killer*/) { _JustDied(); + Talk(SAY_DEATH); DoCast(me, SPELL_DEATH_SPELL, true); // we cast the spell as triggered or the summon effect does not occur } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index fc6de6b2faf..a7dae9aba78 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -23,14 +23,13 @@ SDComment: Event should be pretty close minus a few visual flaws SDCategory: Halls of Lightning EndScriptData */ -#include "AchievementMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "halls_of_lightning.h" #include "Player.h" #include "SpellInfo.h" -enum eEnums +enum Enums { SAY_AGGRO = 0, SAY_FORGE = 1, @@ -63,7 +62,7 @@ enum eEnums MAX_GOLEM = 2, - ACHIEVEMENT_SHATTER_RESISTANT = 2042 + DATA_SHATTER_RESISTANT = 2042 }; /*###### @@ -153,21 +152,6 @@ public: if (instance) instance->SetData(TYPE_VOLKHAN, DONE); - - if (IsHeroic() && GolemsShattered < 5) - { - AchievementEntry const* AchievShatterResistant = sAchievementMgr->GetAchievement(ACHIEVEMENT_SHATTER_RESISTANT); - if (AchievShatterResistant) - { - Map* map = me->GetMap(); - if (map && map->IsDungeon()) - { - Map::PlayerList const &players = map->GetPlayers(); - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - itr->getSource()->CompletedAchievement(AchievShatterResistant); - } - } - } } void KilledUnit(Unit* /*victim*/) @@ -234,6 +218,14 @@ public: } } + uint32 GetData(uint32 data) const + { + if (data == DATA_SHATTER_RESISTANT) + return GolemsShattered; + + return 0; + } + void UpdateAI(const uint32 uiDiff) { if (!UpdateVictim()) @@ -462,8 +454,20 @@ public: }; }; +class achievement_shatter_resistant : public AchievementCriteriaScript +{ + public: + achievement_shatter_resistant() : AchievementCriteriaScript("achievement_shatter_resistant") { } + + bool OnCheck(Player* /*source*/, Unit* target) + { + return target && target->GetAI()->GetData(DATA_SHATTER_RESISTANT) < 5; + } +}; + void AddSC_boss_volkhan() { new boss_volkhan(); new mob_molten_golem(); + new achievement_shatter_resistant(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 93bea92503c..747bd699c81 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -45,10 +45,10 @@ enum Spells enum Yells { - SAY_AGGRO = -1599007, - SAY_KILL = -1599008, - SAY_DEATH = -1599009, - SAY_SHATTER = -1599010 + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + SAY_SHATTER = 3 }; class boss_krystallus : public CreatureScript @@ -93,7 +93,7 @@ public: } void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); @@ -146,7 +146,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_KRYSTALLUS_EVENT, DONE); @@ -156,7 +156,7 @@ public: { if (victim == me) return; - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 8d113bce226..4511b8b0f1e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -40,13 +40,10 @@ enum Spells enum Yells { - SAY_AGGRO = -1599000, - SAY_SLAY_1 = -1599001, - SAY_SLAY_2 = -1599002, - SAY_SLAY_3 = -1599003, - SAY_SLAY_4 = -1599004, - SAY_DEATH = -1599005, - SAY_STUN = -1599006 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_STUN = 3 }; enum Achievements @@ -94,7 +91,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) { @@ -138,7 +135,7 @@ public: if (ShockOfSorrowTimer <= diff) { DoResetThreat(); - DoScriptText(SAY_STUN, me); + Talk(SAY_STUN); DoCast(me, SPELL_SHOCK_OF_SORROW_N); ShockOfSorrowTimer = urand(20000, 30000); } else ShockOfSorrowTimer -= diff; @@ -160,7 +157,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); @@ -171,7 +168,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index c3e815f57dd..326779661cc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -44,11 +44,9 @@ enum Spells enum Yells { - SAY_AGGRO = -1599011, - SAY_SLAY_1 = -1599012, - SAY_SLAY_2 = -1599013, - SAY_SLAY_3 = -1599014, - SAY_DEATH = -1599015 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2 }; #define EMOTE_GENERIC_FRENZY -1000002 @@ -132,7 +130,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); uiEncounterTimer = 0; @@ -217,7 +215,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); lSummons.DespawnAll(); if (instance) @@ -227,7 +225,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void DoAction(int32 const action) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 3c03508a14c..6b51d923517 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -24,68 +24,62 @@ enum Texts { - SAY_KILL_1 = -1599016, - SAY_KILL_2 = -1599017, - SAY_KILL_3 = -1599018, - SAY_LOW_HEALTH = -1599019, - SAY_DEATH = -1599020, - SAY_PLAYER_DEATH_1 = -1599021, - SAY_PLAYER_DEATH_2 = -1599022, - SAY_PLAYER_DEATH_3 = -1599023, - SAY_ESCORT_START = -1599024, - - SAY_SPAWN_DWARF = -1599025, - SAY_SPAWN_TROGG = -1599026, - SAY_SPAWN_OOZE = -1599027, - SAY_SPAWN_EARTHEN = -1599028, - - SAY_EVENT_INTRO_1 = -1599029, - SAY_EVENT_INTRO_2 = -1599030, - SAY_EVENT_INTRO_3_ABED = -1599031, - - SAY_EVENT_A_1 = -1599032, - SAY_EVENT_A_2_KADD = -1599033, - SAY_EVENT_A_3 = -1599034, - - SAY_EVENT_B_1 = -1599035, - SAY_EVENT_B_2_MARN = -1599036, - SAY_EVENT_B_3 = -1599037, - - SAY_EVENT_C_1 = -1599038, - SAY_EVENT_C_2_ABED = -1599039, - SAY_EVENT_C_3 = -1599040, - - SAY_EVENT_D_1 = -1599041, - SAY_EVENT_D_2_ABED = -1599042, - SAY_EVENT_D_3 = -1599043, - SAY_EVENT_D_4_ABED = -1599044, - - SAY_EVENT_END_01 = -1599045, - SAY_EVENT_END_02 = -1599046, - SAY_EVENT_END_03_ABED = -1599047, - SAY_EVENT_END_04 = -1599048, - SAY_EVENT_END_05_ABED = -1599049, - SAY_EVENT_END_06 = -1599050, - SAY_EVENT_END_07_ABED = -1599051, - SAY_EVENT_END_08 = -1599052, - SAY_EVENT_END_09_KADD = -1599053, - SAY_EVENT_END_10 = -1599054, - SAY_EVENT_END_11_KADD = -1599055, - SAY_EVENT_END_12 = -1599056, - SAY_EVENT_END_13_KADD = -1599057, - SAY_EVENT_END_14 = -1599058, - SAY_EVENT_END_15_MARN = -1599059, - SAY_EVENT_END_16 = -1599060, - SAY_EVENT_END_17_MARN = -1599061, - SAY_EVENT_END_18 = -1599062, - SAY_EVENT_END_19_MARN = -1599063, - SAY_EVENT_END_20 = -1599064, - SAY_EVENT_END_21_ABED = -1599065, - - SAY_VICTORY_SJONNIR_1 = -1599066, - SAY_VICTORY_SJONNIR_2 = -1599067, - - SAY_ENTRANCE_MEET = -1599068, + SAY_KILL = 0, + SAY_LOW_HEALTH = 1, + SAY_DEATH = 2, + SAY_PLAYER_DEATH = 3, + SAY_ESCORT_START = 4, + + SAY_SPAWN_DWARF = 5, + SAY_SPAWN_TROGG = 6, + SAY_SPAWN_OOZE = 7, + SAY_SPAWN_EARTHEN = 8, + + SAY_EVENT_INTRO_1 = 9, + SAY_EVENT_INTRO_2 = 10, + SAY_EVENT_A_1 = 11, + SAY_EVENT_A_3 = 12, + SAY_EVENT_B_1 = 13, + SAY_EVENT_B_3 = 14, + SAY_EVENT_C_1 = 15, + SAY_EVENT_C_3 = 16, + SAY_EVENT_D_1 = 17, + SAY_EVENT_D_3 = 18, + + SAY_EVENT_END_01 = 19, + SAY_EVENT_END_02 = 20, + SAY_EVENT_END_04 = 21, + SAY_EVENT_END_06 = 22, + SAY_EVENT_END_08 = 23, + SAY_EVENT_END_10 = 24, + SAY_EVENT_END_12 = 25, + SAY_EVENT_END_14 = 26, + SAY_EVENT_END_16 = 27, + SAY_EVENT_END_18 = 28, + SAY_EVENT_END_20 = 29, + + SAY_VICTORY_SJONNIR_1 = 30, + SAY_VICTORY_SJONNIR_2 = 31, + SAY_ENTRANCE_MEET = 32, + + SAY_EVENT_INTRO_3_ABED = 0, + SAY_EVENT_C_2_ABED = 1, + SAY_EVENT_D_2_ABED = 2, + SAY_EVENT_D_4_ABED = 3, + SAY_EVENT_END_03_ABED = 4, + SAY_EVENT_END_05_ABED = 5, + SAY_EVENT_END_07_ABED = 6, + SAY_EVENT_END_21_ABED = 7, + + SAY_EVENT_A_2_KADD = 0, + SAY_EVENT_END_09_KADD = 1, + SAY_EVENT_END_11_KADD = 2, + SAY_EVENT_END_13_KADD = 3, + + SAY_EVENT_B_2_MARN = 0, + SAY_EVENT_END_15_MARN = 1, + SAY_EVENT_END_17_MARN = 2, + SAY_EVENT_END_19_MARN = 3, TEXT_ID_START = 13100, TEXT_ID_PROGRESS = 13101 @@ -363,12 +357,12 @@ public: } break; case 13: - DoScriptText(SAY_EVENT_INTRO_1, me); + Talk(SAY_EVENT_INTRO_1); SetEscortPaused(true); JumpToNextStep(20000); break; case 17: - DoScriptText(SAY_EVENT_INTRO_2, me); + Talk(SAY_EVENT_INTRO_2); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true); me->SetStandState(UNIT_STAND_STATE_KNEEL); @@ -452,7 +446,7 @@ public: instance->SetData(DATA_BRANN_EVENT, IN_PROGRESS); } bIsBattle = false; - DoScriptText(SAY_ESCORT_START, me); + Talk(SAY_ESCORT_START); SetRun(true); JumpToNextStep(0); break; @@ -463,21 +457,21 @@ public: case 5: if (instance) if (Creature* temp = (Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))) - DoScriptText(SAY_EVENT_INTRO_3_ABED, temp); + temp->AI()->Talk(SAY_EVENT_INTRO_3_ABED); JumpToNextStep(8500); break; case 6: - DoScriptText(SAY_EVENT_A_1, me); + Talk(SAY_EVENT_A_1); JumpToNextStep(6500); break; case 7: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_A_2_KADD, temp); + temp->AI()->Talk(SAY_EVENT_A_2_KADD); JumpToNextStep(12500); break; case 8: - DoScriptText(SAY_EVENT_A_3, me); + Talk(SAY_EVENT_A_3); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) @@ -490,18 +484,18 @@ public: JumpToNextStep(20000); break; case 10: - DoScriptText(SAY_EVENT_B_1, me); + Talk(SAY_EVENT_B_1); JumpToNextStep(6000); break; case 11: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_B_2_MARN, temp); + temp->AI()->Talk(SAY_EVENT_B_2_MARN); SpawnDwarf(1); JumpToNextStep(20000); break; case 12: - DoScriptText(SAY_EVENT_B_3, me); + Talk(SAY_EVENT_B_3); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) @@ -517,7 +511,7 @@ public: JumpToNextStep(20000); break; case 15: - DoScriptText(SAY_EVENT_C_1, me); + Talk(SAY_EVENT_C_1); SpawnDwarf(1); JumpToNextStep(10000); break; @@ -528,12 +522,12 @@ public: case 17: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_C_2_ABED, temp); + temp->AI()->Talk(SAY_EVENT_C_2_ABED); SpawnDwarf(1); JumpToNextStep(20000); break; case 18: - DoScriptText(SAY_EVENT_C_3, me); + Talk(SAY_EVENT_C_3); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), true); if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID)) @@ -549,14 +543,14 @@ public: JumpToNextStep(15000); break; case 21: - DoScriptText(SAY_EVENT_D_1, me); + Talk(SAY_EVENT_D_1); SpawnDwarf(3); JumpToNextStep(20000); break; case 22: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_D_2_ABED, temp); + temp->AI()->Talk(SAY_EVENT_D_2_ABED); SpawnDwarf(1); JumpToNextStep(5000); break; @@ -565,7 +559,7 @@ public: JumpToNextStep(15000); break; case 24: - DoScriptText(SAY_EVENT_D_3, me); + Talk(SAY_EVENT_D_3); SpawnDwarf(3); JumpToNextStep(5000); break; @@ -580,13 +574,13 @@ public: case 27: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_D_4_ABED, temp); + temp->AI()->Talk(SAY_EVENT_D_4_ABED); SpawnDwarf(1); JumpToNextStep(10000); break; case 28: me->SetReactState(REACT_DEFENSIVE); - DoScriptText(SAY_EVENT_END_01, me); + Talk(SAY_EVENT_END_01); me->SetStandState(UNIT_STAND_STATE_STAND); if (instance) instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), true); @@ -597,7 +591,7 @@ public: JumpToNextStep(6500); break; case 29: - DoScriptText(SAY_EVENT_END_02, me); + Talk(SAY_EVENT_END_02); if (instance) instance->SetData(DATA_BRANN_EVENT, DONE); me->CastSpell(me, SPELL_REWARD_ACHIEVEMENT, true); @@ -606,97 +600,97 @@ public: case 30: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_03_ABED, temp); + temp->AI()->Talk(SAY_EVENT_END_03_ABED); JumpToNextStep(8500); break; case 31: - DoScriptText(SAY_EVENT_END_04, me); + Talk(SAY_EVENT_END_04); JumpToNextStep(11500); break; case 32: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_05_ABED, temp); + temp->AI()->Talk(SAY_EVENT_END_05_ABED); JumpToNextStep(11500); break; case 33: - DoScriptText(SAY_EVENT_END_06, me); + Talk(SAY_EVENT_END_06); JumpToNextStep(4500); break; case 34: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_07_ABED, temp); + temp->AI()->Talk(SAY_EVENT_END_07_ABED); JumpToNextStep(22500); break; case 35: - DoScriptText(SAY_EVENT_END_08, me); + Talk(SAY_EVENT_END_08); JumpToNextStep(7500); break; case 36: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_09_KADD, temp); + temp->AI()->Talk(SAY_EVENT_END_09_KADD); JumpToNextStep(18500); break; case 37: - DoScriptText(SAY_EVENT_END_10, me); + Talk(SAY_EVENT_END_10); JumpToNextStep(5500); break; case 38: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_11_KADD, temp); + temp->AI()->Talk(SAY_EVENT_END_11_KADD); JumpToNextStep(20500); break; case 39: - DoScriptText(SAY_EVENT_END_12, me); + Talk(SAY_EVENT_END_12); JumpToNextStep(2500); break; case 40: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_13_KADD, temp); + temp->AI()->Talk(SAY_EVENT_END_13_KADD); JumpToNextStep(19500); break; case 41: - DoScriptText(SAY_EVENT_END_14, me); + Talk(SAY_EVENT_END_14); JumpToNextStep(10500); break; case 42: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_15_MARN, temp); + temp->AI()->Talk(SAY_EVENT_END_15_MARN); JumpToNextStep(6500); break; case 43: - DoScriptText(SAY_EVENT_END_16, me); + Talk(SAY_EVENT_END_16); JumpToNextStep(6500); break; case 44: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_17_MARN, temp); + temp->AI()->Talk(SAY_EVENT_END_17_MARN); JumpToNextStep(25500); break; case 45: - DoScriptText(SAY_EVENT_END_18, me); + Talk(SAY_EVENT_END_18); JumpToNextStep(23500); break; case 46: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_19_MARN, temp); + temp->AI()->Talk(SAY_EVENT_END_19_MARN); JumpToNextStep(3500); break; case 47: - DoScriptText(SAY_EVENT_END_20, me); + Talk(SAY_EVENT_END_20); JumpToNextStep(8500); break; case 48: if (instance) if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_21_ABED, temp); + temp->AI()->Talk(SAY_EVENT_END_21_ABED); JumpToNextStep(5500); break; case 49: @@ -723,7 +717,7 @@ public: if (!bIsLowHP && HealthBelowPct(30)) { - DoScriptText(SAY_LOW_HEALTH, me); + Talk(SAY_LOW_HEALTH); bIsLowHP = true; } else if (bIsLowHP && !HealthBelowPct(30)) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 92e56d4dd9a..db8c7f38ef7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -18,7 +18,7 @@ /* ScriptData SDName: Assembly of Iron encounter SD%Complete: 60% -SDComment: Runes need DB support, chain lightning won't cast, supercharge won't cast (target error?) - it worked before during debugging. +SDComment: chain lightning won't cast, supercharge don't work (auras don't stack from different casters) SDCategory: Ulduar - Ulduar EndScriptData */ @@ -33,6 +33,7 @@ enum AssemblySpells // General SPELL_SUPERCHARGE = 61920, SPELL_BERSERK = 47008, // Hard enrage, don't know the correct ID. + SPELL_KILL_CREDIT = 65195, // spell_dbc // Steelbreaker SPELL_HIGH_VOLTAGE = 61890, @@ -45,12 +46,9 @@ enum AssemblySpells SPELL_SHIELD_OF_RUNES = 62274, SPELL_SHIELD_OF_RUNES_BUFF = 62277, SPELL_SUMMON_RUNE_OF_POWER = 63513, - SPELL_RUNE_OF_POWER = 61974, SPELL_RUNE_OF_DEATH = 62269, SPELL_RUNE_OF_SUMMONING = 62273, // This is the spell that summons the rune - SPELL_RUNE_OF_SUMMONING_VIS = 62019, // Visual SPELL_RUNE_OF_SUMMONING_SUMMON = 62020, // Spell that summons - SPELL_LIGHTNING_ELEMENTAL_PASSIVE = 62052, // Stormcaller Brundir SPELL_CHAIN_LIGHTNING = 61879, @@ -59,7 +57,7 @@ enum AssemblySpells SPELL_LIGHTNING_TENDRILS_10M = 61887, SPELL_LIGHTNING_TENDRILS_25M = 63486, SPELL_LIGHTNING_TENDRILS_VISUAL = 61883, - SPELL_STORMSHIELD = 64187, + SPELL_STORMSHIELD = 64187 }; enum AssemblyEvents @@ -88,115 +86,50 @@ enum AssemblyEvents EVENT_ENDFLIGHT = 15, EVENT_GROUND = 16, EVENT_LAND = 17, - EVENT_MOVE_POSITION = 18, + EVENT_MOVE_POSITION = 18 }; enum AssemblyActions { - ACTION_STEELBREAKER = 0, - ACTION_MOLGEIM = 1, - ACTION_BRUNDIR = 2, - ACTION_ADD_CHARGE = 3, + ACTION_SUPERCHARGE = 1, + ACTION_ADD_CHARGE = 2 }; enum AssemblyYells { - SAY_STEELBREAKER_AGGRO = -1603020, - SAY_STEELBREAKER_SLAY_1 = -1603021, - SAY_STEELBREAKER_SLAY_2 = -1603022, - SAY_STEELBREAKER_POWER = -1603023, - SAY_STEELBREAKER_DEATH_1 = -1603024, - SAY_STEELBREAKER_DEATH_2 = -1603025, - SAY_STEELBREAKER_BERSERK = -1603026, - - SAY_MOLGEIM_AGGRO = -1603030, - SAY_MOLGEIM_SLAY_1 = -1603031, - SAY_MOLGEIM_SLAY_2 = -1603032, - SAY_MOLGEIM_RUNE_DEATH = -1603033, - SAY_MOLGEIM_SUMMON = -1603034, - SAY_MOLGEIM_DEATH_1 = -1603035, - SAY_MOLGEIM_DEATH_2 = -1603036, - SAY_MOLGEIM_BERSERK = -1603037, - - SAY_BRUNDIR_AGGRO = -1603040, - SAY_BRUNDIR_SLAY_1 = -1603041, - SAY_BRUNDIR_SLAY_2 = -1603042, - SAY_BRUNDIR_SPECIAL = -1603043, - SAY_BRUNDIR_FLIGHT = -1603044, - SAY_BRUNDIR_DEATH_1 = -1603045, - SAY_BRUNDIR_DEATH_2 = -1603046, - SAY_BRUNDIR_BERSERK = -1603047, + SAY_STEELBREAKER_AGGRO = 0, + SAY_STEELBREAKER_SLAY = 1, + SAY_STEELBREAKER_POWER = 2, + SAY_STEELBREAKER_DEATH = 3, + SAY_STEELBREAKER_ENCOUNTER_DEFEATED = 4, + SAY_STEELBREAKER_BERSERK = 5, + + SAY_MOLGEIM_AGGRO = 0, + SAY_MOLGEIM_SLAY = 1, + SAY_MOLGEIM_RUNE_DEATH = 2, + SAY_MOLGEIM_SUMMON = 3, + SAY_MOLGEIM_DEATH = 4, + SAY_MOLGEIM_ENCOUNTER_DEFEATED = 5, + SAY_MOLGEIM_BERSERK = 6, + + SAY_BRUNDIR_AGGRO = 0, + SAY_BRUNDIR_SLAY = 1, + SAY_BRUNDIR_SPECIAL = 2, + SAY_BRUNDIR_FLIGHT = 3, + SAY_BRUNDIR_DEATH = 4, + SAY_BRUNDIR_ENCOUNTER_DEFEATED = 5, + SAY_BRUNDIR_BERSERK = 6, + EMOTE_BRUNDIR_OVERLOAD = 7 }; enum AssemblyNPCs { - NPC_WORLD_TRIGGER = 22515, + NPC_WORLD_TRIGGER = 22515 }; -#define EMOTE_OVERLOAD "Stormcaller Brundir begins to Overload!" // Move it to DB #define FLOOR_Z 427.28f #define FINAL_FLIGHT_Z 435.0f -bool IsEncounterComplete(InstanceScript* instance, Creature* me) -{ - if (!instance || !me) - return false; - - for (uint8 i = 0; i < 3; ++i) - { - uint64 guid = instance->GetData64(BOSS_STEELBREAKER + i); - if (!guid) - return false; - - if (Creature* boss = ObjectAccessor::GetCreature(*me, guid)) - { - if (boss->isAlive()) - return false; - } - else - return false; - } - - return true; -} - -void RespawnEncounter(InstanceScript* instance, Creature* me) -{ - for (uint8 i = 0; i < 3; ++i) - { - uint64 guid = instance->GetData64(BOSS_STEELBREAKER + i); - if (!guid) - continue; - - if (Creature* boss = ObjectAccessor::GetCreature(*me, guid)) - { - if (!boss->isAlive()) - { - boss->Respawn(); - boss->GetMotionMaster()->MoveTargetedHome(); - } - } - } -} - -void StartEncounter(InstanceScript* instance, Creature* me, Unit* /*target*/) -{ - if (instance->GetBossState(BOSS_ASSEMBLY_OF_IRON) == IN_PROGRESS) - return; // Prevent recursive calls - - instance->SetBossState(BOSS_ASSEMBLY_OF_IRON, IN_PROGRESS); - - for (uint8 i = 0; i < 3; ++i) - { - uint64 guid = instance->GetData64(BOSS_STEELBREAKER + i); - if (!guid) - continue; - - if (Creature* boss = ObjectAccessor::GetCreature(*me, guid)) - boss->SetInCombatWithZone(); - } -} - class boss_steelbreaker : public CreatureScript { public: @@ -204,12 +137,8 @@ class boss_steelbreaker : public CreatureScript struct boss_steelbreakerAI : public BossAI { - boss_steelbreakerAI(Creature* creature) : BossAI(creature, BOSS_ASSEMBLY_OF_IRON) - { - instance = me->GetInstanceScript(); - } + boss_steelbreakerAI(Creature* creature) : BossAI(creature, BOSS_ASSEMBLY_OF_IRON) { } - InstanceScript* instance; uint32 phase; void Reset() @@ -217,14 +146,12 @@ class boss_steelbreaker : public CreatureScript _Reset(); phase = 0; me->RemoveAllAuras(); - RespawnEncounter(instance, me); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { - StartEncounter(instance, me, who); - DoScriptText(SAY_STEELBREAKER_AGGRO, me); - DoZoneInCombat(); + _EnterCombat(); + Talk(SAY_STEELBREAKER_AGGRO); DoCast(me, SPELL_HIGH_VOLTAGE); events.SetPhase(++phase); events.ScheduleEvent(EVENT_BERSERK, 900000); @@ -235,8 +162,8 @@ class boss_steelbreaker : public CreatureScript { switch (action) { - case ACTION_STEELBREAKER: - me->SetHealth(me->GetMaxHealth()); + case ACTION_SUPERCHARGE: + me->SetFullHealth(); me->AddAura(SPELL_SUPERCHARGE, me); events.SetPhase(++phase); events.RescheduleEvent(EVENT_FUSION_PUNCH, 15000); @@ -253,29 +180,33 @@ class boss_steelbreaker : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1, SAY_STEELBREAKER_DEATH_2), me); - if (IsEncounterComplete(instance, me)) + _JustDied(); + + if (instance->GetBossState(BOSS_ASSEMBLY_OF_IRON) == DONE) { - instance->SetBossState(BOSS_ASSEMBLY_OF_IRON, DONE); - instance->SetBossState(BOSS_STEELBREAKER, DONE); - instance->SetBossState(BOSS_MOLGEIM, DONE); - instance->SetBossState(BOSS_BRUNDIR, DONE); + DoCastAOE(SPELL_KILL_CREDIT); + Talk(SAY_STEELBREAKER_ENCOUNTER_DEFEATED); } else + { me->SetLootRecipient(NULL); + Talk(SAY_STEELBREAKER_DEATH); + //DoCastAOE(SPELL_SUPERCHARGE, true); - if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRUNDIR))) - if (Brundir->isAlive()) - Brundir->AI()->DoAction(ACTION_BRUNDIR); + if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BRUNDIR))) + if (Brundir->isAlive()) + Brundir->AI()->DoAction(ACTION_SUPERCHARGE); - if (Creature* Molgeim = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_MOLGEIM))) - if (Molgeim->isAlive()) - Molgeim->AI()->DoAction(ACTION_MOLGEIM); + if (Creature* Molgeim = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOLGEIM))) + if (Molgeim->isAlive()) + Molgeim->AI()->DoAction(ACTION_SUPERCHARGE); + } } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1, SAY_STEELBREAKER_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_STEELBREAKER_SLAY); if (phase == 3) DoCast(me, SPELL_ELECTRICAL_CHARGE); @@ -296,7 +227,7 @@ class boss_steelbreaker : public CreatureScript switch (eventId) { case EVENT_BERSERK: - DoScriptText(SAY_STEELBREAKER_BERSERK, me); + Talk(SAY_STEELBREAKER_BERSERK); DoCast(SPELL_BERSERK); events.CancelEvent(EVENT_BERSERK); break; @@ -311,7 +242,7 @@ class boss_steelbreaker : public CreatureScript events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(20000, 40000)); break; case EVENT_OVERWHELMING_POWER: - DoScriptText(SAY_STEELBREAKER_POWER, me); + Talk(SAY_STEELBREAKER_POWER); DoCastVictim(SPELL_OVERWHELMING_POWER); events.ScheduleEvent(EVENT_OVERWHELMING_POWER, RAID_MODE(60000, 35000)); break; @@ -335,12 +266,8 @@ class boss_runemaster_molgeim : public CreatureScript struct boss_runemaster_molgeimAI : public BossAI { - boss_runemaster_molgeimAI(Creature* creature) : BossAI(creature, BOSS_ASSEMBLY_OF_IRON) - { - instance = me->GetInstanceScript(); - } + boss_runemaster_molgeimAI(Creature* creature) : BossAI(creature, BOSS_ASSEMBLY_OF_IRON) { } - InstanceScript* instance; uint32 phase; void Reset() @@ -348,14 +275,12 @@ class boss_runemaster_molgeim : public CreatureScript _Reset(); phase = 0; me->RemoveAllAuras(); - RespawnEncounter(instance, me); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { - StartEncounter(instance, me, who); - DoScriptText(SAY_MOLGEIM_AGGRO, me); - DoZoneInCombat(); + _EnterCombat(); + Talk(SAY_MOLGEIM_AGGRO); events.SetPhase(++phase); events.ScheduleEvent(EVENT_BERSERK, 900000); events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, 30000); @@ -366,8 +291,9 @@ class boss_runemaster_molgeim : public CreatureScript { switch (action) { - case ACTION_MOLGEIM: - me->SetHealth(me->GetMaxHealth()); + case ACTION_SUPERCHARGE: + { + me->SetFullHealth(); me->AddAura(SPELL_SUPERCHARGE, me); events.SetPhase(++phase); events.RescheduleEvent(EVENT_SHIELD_OF_RUNES, 27000); @@ -376,35 +302,40 @@ class boss_runemaster_molgeim : public CreatureScript events.RescheduleEvent(EVENT_RUNE_OF_DEATH, 30000); if (phase >= 3) events.RescheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000, 30000)); - break; + break; + } } } void JustDied(Unit* /*killer*/) { - DoScriptText(RAND(SAY_MOLGEIM_DEATH_1, SAY_MOLGEIM_DEATH_2), me); - if (IsEncounterComplete(instance, me)) + _JustDied(); + + if (instance->GetBossState(BOSS_ASSEMBLY_OF_IRON) == DONE) { - instance->SetBossState(BOSS_ASSEMBLY_OF_IRON, DONE); - instance->SetBossState(BOSS_STEELBREAKER, DONE); - instance->SetBossState(BOSS_MOLGEIM, DONE); - instance->SetBossState(BOSS_BRUNDIR, DONE); + DoCastAOE(SPELL_KILL_CREDIT); + Talk(SAY_MOLGEIM_ENCOUNTER_DEFEATED); } else + { me->SetLootRecipient(NULL); + Talk(SAY_MOLGEIM_DEATH); + //DoCastAOE(SPELL_SUPERCHARGE, true); - if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRUNDIR))) - if (Brundir->isAlive()) - Brundir->AI()->DoAction(ACTION_BRUNDIR); + if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BRUNDIR))) + if (Brundir->isAlive()) + Brundir->AI()->DoAction(ACTION_SUPERCHARGE); - if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_STEELBREAKER))) - if (Steelbreaker->isAlive()) - Steelbreaker->AI()->DoAction(ACTION_STEELBREAKER); + if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) + if (Steelbreaker->isAlive()) + Steelbreaker->AI()->DoAction(ACTION_SUPERCHARGE); + } } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_MOLGEIM_SLAY_1, SAY_MOLGEIM_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_MOLGEIM_SLAY); } void UpdateAI(uint32 const diff) @@ -422,28 +353,27 @@ class boss_runemaster_molgeim : public CreatureScript switch (eventId) { case EVENT_BERSERK: - DoScriptText(SAY_MOLGEIM_BERSERK, me); + Talk(SAY_MOLGEIM_BERSERK); DoCast(SPELL_BERSERK); events.CancelEvent(EVENT_BERSERK); break; case EVENT_RUNE_OF_POWER: { - Unit* target = NULL; + Unit* target = me; switch (urand(0, 2)) { - case 0: - target = me; - break; case 1: - if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_STEELBREAKER))) + if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) if (Steelbreaker->isAlive()) target = Steelbreaker; break; case 2: - if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_STEELBREAKER))) + if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) if (Brundir->isAlive()) target = Brundir; break; + default: + break; } DoCast(target, SPELL_SUMMON_RUNE_OF_POWER); events.ScheduleEvent(EVENT_RUNE_OF_POWER, 60000); @@ -454,13 +384,13 @@ class boss_runemaster_molgeim : public CreatureScript events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000, 34000)); break; case EVENT_RUNE_OF_DEATH: - DoScriptText(SAY_MOLGEIM_RUNE_DEATH, me); + Talk(SAY_MOLGEIM_RUNE_DEATH); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_RUNE_OF_DEATH); events.ScheduleEvent(EVENT_RUNE_OF_DEATH, urand(30000, 40000)); break; case EVENT_RUNE_OF_SUMMONING: - DoScriptText(SAY_MOLGEIM_SUMMON, me); + Talk(SAY_MOLGEIM_SUMMON); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_RUNE_OF_SUMMONING); events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(30000, 45000)); @@ -478,93 +408,6 @@ class boss_runemaster_molgeim : public CreatureScript } }; -class mob_rune_of_power : public CreatureScript -{ - public: - mob_rune_of_power() : CreatureScript("mob_rune_of_power") { } - - struct mob_rune_of_powerAI : public ScriptedAI - { - mob_rune_of_powerAI(Creature* creature) : ScriptedAI(creature) - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->setFaction(16); // Same faction as bosses - DoCast(SPELL_RUNE_OF_POWER); - - me->DespawnOrUnsummon(60000); - } - }; - - CreatureAI* GetAI(Creature* creature) const - { - return new mob_rune_of_powerAI(creature); - } -}; - -class mob_lightning_elemental : public CreatureScript -{ - public: - mob_lightning_elemental() : CreatureScript("mob_lightning_elemental") { } - - struct mob_lightning_elementalAI : public ScriptedAI - { - mob_lightning_elementalAI(Creature* creature) : ScriptedAI(creature) - { - me->SetInCombatWithZone(); - me->AddAura(SPELL_LIGHTNING_ELEMENTAL_PASSIVE, me); - } - - // Nothing to do here, just let the creature chase players and procflags == 2 on the applied aura will trigger explosion - }; - - CreatureAI* GetAI(Creature* creature) const - { - return new mob_lightning_elementalAI(creature); - } -}; - -class mob_rune_of_summoning : public CreatureScript -{ - public: - mob_rune_of_summoning() : CreatureScript("mob_rune_of_summoning") { } - - struct mob_rune_of_summoningAI : public ScriptedAI - { - mob_rune_of_summoningAI(Creature* creature) : ScriptedAI(creature) - { - me->AddAura(SPELL_RUNE_OF_SUMMONING_VIS, me); - summonCount = 0; - summonTimer = 2000; - } - - uint32 summonCount; - uint32 summonTimer; - - void UpdateAI(uint32 const diff) - { - if (summonTimer <= diff) - SummonLightningElemental(); - else - summonTimer -= diff; - } - - void SummonLightningElemental() - { - me->CastSpell(me, SPELL_RUNE_OF_SUMMONING_SUMMON, false); - if (++summonCount == 10) // TODO: Find out if this amount is right - me->DespawnOrUnsummon(); - else - summonTimer = 2000; // TODO: Find out of timer is right - } - }; - - CreatureAI* GetAI(Creature* creature) const - { - return new mob_rune_of_summoningAI(creature); - } -}; - class boss_stormcaller_brundir : public CreatureScript { public: @@ -572,12 +415,8 @@ class boss_stormcaller_brundir : public CreatureScript struct boss_stormcaller_brundirAI : public BossAI { - boss_stormcaller_brundirAI(Creature* creature) : BossAI(creature, BOSS_ASSEMBLY_OF_IRON) - { - instance = me->GetInstanceScript(); - } + boss_stormcaller_brundirAI(Creature* creature) : BossAI(creature, BOSS_ASSEMBLY_OF_IRON) { } - InstanceScript* instance; uint32 phase; void Reset() @@ -587,15 +426,13 @@ class boss_stormcaller_brundir : public CreatureScript me->RemoveAllAuras(); me->SetDisableGravity(false); me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_INTERRUPT, false); // Should be interruptable unless overridden by spell (Overload) - me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_STUN, false); // Reset immumity, Brundir should be stunnable by default - RespawnEncounter(instance, me); + me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_STUN, false); // Reset immumity, Brundir should be stunnable by default } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { - StartEncounter(instance, me, who); - DoScriptText(SAY_BRUNDIR_AGGRO, me); - DoZoneInCombat(); + _EnterCombat(); + Talk(SAY_BRUNDIR_AGGRO); events.SetPhase(++phase); events.ScheduleEvent(EVENT_MOVE_POSITION, 1000); events.ScheduleEvent(EVENT_BERSERK, 900000); @@ -607,8 +444,9 @@ class boss_stormcaller_brundir : public CreatureScript { switch (action) { - case ACTION_BRUNDIR: - me->SetHealth(me->GetMaxHealth()); + case ACTION_SUPERCHARGE: + { + me->SetFullHealth(); me->AddAura(SPELL_SUPERCHARGE, me); events.SetPhase(++phase); events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, urand(7000, 12000)); @@ -619,42 +457,46 @@ class boss_stormcaller_brundir : public CreatureScript { DoCast(me, SPELL_STORMSHIELD); events.RescheduleEvent(EVENT_LIGHTNING_TENDRILS, urand(50000, 60000)); - me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_STUN, true); // Apply immumity to stuns + me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_STUN, true); // Apply immumity to stuns } - break; - + break; + } } } void JustDied(Unit* /*killer*/) { - DoScriptText(RAND(SAY_BRUNDIR_DEATH_1, SAY_BRUNDIR_DEATH_2), me); - if (IsEncounterComplete(instance, me)) + _JustDied(); + + if (instance->GetBossState(BOSS_ASSEMBLY_OF_IRON) == DONE) { - instance->SetBossState(BOSS_ASSEMBLY_OF_IRON, DONE); - instance->SetBossState(BOSS_STEELBREAKER, DONE); - instance->SetBossState(BOSS_MOLGEIM, DONE); - instance->SetBossState(BOSS_BRUNDIR, DONE); + DoCastAOE(SPELL_KILL_CREDIT); + Talk(SAY_BRUNDIR_ENCOUNTER_DEFEATED); } else + { me->SetLootRecipient(NULL); + Talk(SAY_BRUNDIR_DEATH); + //DoCastAOE(SPELL_SUPERCHARGE, true); - if (Creature* Molgeim = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_MOLGEIM))) - if (Molgeim->isAlive()) - Molgeim->AI()->DoAction(ACTION_MOLGEIM); + if (Creature* Molgeim = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOLGEIM))) + if (Molgeim->isAlive()) + Molgeim->AI()->DoAction(ACTION_SUPERCHARGE); - if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_STEELBREAKER))) - if (Steelbreaker->isAlive()) - Steelbreaker->AI()->DoAction(ACTION_STEELBREAKER); + if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) + if (Steelbreaker->isAlive()) + Steelbreaker->AI()->DoAction(ACTION_SUPERCHARGE); + } // Prevent to have Brundir somewhere in the air when he die in Air phase if (me->GetPositionZ() > FLOOR_Z) me->GetMotionMaster()->MoveFall(); } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_BRUNDIR_SLAY_1, SAY_BRUNDIR_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_BRUNDIR_SLAY); } void UpdateAI(uint32 const diff) @@ -672,7 +514,7 @@ class boss_stormcaller_brundir : public CreatureScript switch (eventId) { case EVENT_BERSERK: - DoScriptText(SAY_BRUNDIR_BERSERK, me); + Talk(SAY_BRUNDIR_BERSERK); DoCast(SPELL_BERSERK); events.CancelEvent(EVENT_BERSERK); break; @@ -682,8 +524,8 @@ class boss_stormcaller_brundir : public CreatureScript events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(7000, 10000)); break; case EVENT_OVERLOAD: - me->MonsterTextEmote(EMOTE_OVERLOAD, 0, true); - DoScriptText(SAY_BRUNDIR_SPECIAL, me); + Talk(EMOTE_BRUNDIR_OVERLOAD); + Talk(SAY_BRUNDIR_SPECIAL); DoCast(SPELL_OVERLOAD); events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 120000)); break; @@ -692,7 +534,7 @@ class boss_stormcaller_brundir : public CreatureScript events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, urand(15000, 20000)); break; case EVENT_LIGHTNING_TENDRILS: - DoScriptText(SAY_BRUNDIR_FLIGHT, me); + Talk(SAY_BRUNDIR_FLIGHT); DoCast(RAID_MODE(SPELL_LIGHTNING_TENDRILS_10M, SPELL_LIGHTNING_TENDRILS_25M)); DoCast(SPELL_LIGHTNING_TENDRILS_VISUAL); me->AttackStop(); @@ -798,7 +640,7 @@ class spell_assembly_meltdown : public SpellScriptLoader void HandleInstaKill(SpellEffIndex /*effIndex*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) - if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(BOSS_STEELBREAKER))) + if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(DATA_STEELBREAKER))) Steelbreaker->AI()->DoAction(ACTION_ADD_CHARGE); } @@ -814,14 +656,53 @@ class spell_assembly_meltdown : public SpellScriptLoader } }; +class spell_assembly_rune_of_summoning : public SpellScriptLoader +{ + public: + spell_assembly_rune_of_summoning() : SpellScriptLoader("spell_assembly_rune_of_summoning") { } + + class spell_assembly_rune_of_summoning_AuraScript : public AuraScript + { + PrepareAuraScript(spell_assembly_rune_of_summoning_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_RUNE_OF_SUMMONING_SUMMON)) + return false; + return true; + } + + void HandlePeriodic(AuraEffect const* aurEff) + { + PreventDefaultAction(); + GetTarget()->CastSpell(GetTarget(), SPELL_RUNE_OF_SUMMONING_SUMMON, true, NULL, aurEff, GetTarget()->isSummon() ? GetTarget()->ToTempSummon()->GetSummonerGUID() : 0); + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (TempSummon* summ = GetTarget()->ToTempSummon()) + summ->DespawnOrUnsummon(1); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_assembly_rune_of_summoning_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectRemove += AuraEffectRemoveFn(spell_assembly_rune_of_summoning_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_assembly_rune_of_summoning_AuraScript(); + } +}; + void AddSC_boss_assembly_of_iron() { new boss_steelbreaker(); new boss_runemaster_molgeim(); new boss_stormcaller_brundir(); - new mob_lightning_elemental(); - new mob_rune_of_summoning(); - new mob_rune_of_power(); new spell_shield_of_runes(); new spell_assembly_meltdown(); + new spell_assembly_rune_of_summoning(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index bfe158051b1..bd063877d39 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -76,16 +76,12 @@ enum AuriayaEvents enum AuriayaYells { - // Yells - SAY_AGGRO = -1603050, - SAY_SLAY_1 = -1603051, - SAY_SLAY_2 = -1603052, - SAY_DEATH = -1603053, - SAY_BERSERK = -1603054, - - // Emotes - EMOTE_FEAR = -1603055, - EMOTE_DEFENDER = -1603056, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_BERSERK = 3, + EMOTE_FEAR = 4, + EMOTE_DEFENDER = 5 }; enum AuriayaActions @@ -121,7 +117,7 @@ class boss_auriaya : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SCREECH, urand(45000, 65000)); events.ScheduleEvent(EVENT_BLAST, urand(20000, 25000)); @@ -131,9 +127,10 @@ class boss_auriaya : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_SLAY); } void JustSummoned(Creature* summoned) @@ -206,8 +203,8 @@ class boss_auriaya : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); _JustDied(); + Talk(SAY_DEATH); } void UpdateAI(uint32 const diff) @@ -229,7 +226,7 @@ class boss_auriaya : public CreatureScript events.ScheduleEvent(EVENT_SCREECH, urand(40000, 60000)); break; case EVENT_TERRIFYING: - DoScriptText(EMOTE_FEAR, me); + Talk(EMOTE_FEAR); DoCast(SPELL_TERRIFYING_SCREECH); events.ScheduleEvent(EVENT_TERRIFYING, urand(20000, 30000)); break; @@ -238,7 +235,7 @@ class boss_auriaya : public CreatureScript events.ScheduleEvent(EVENT_BLAST, urand(25000, 35000)); break; case EVENT_DEFENDER: - DoScriptText(EMOTE_DEFENDER, me); + Talk(EMOTE_DEFENDER); DoCast(SPELL_DEFENDER_TRIGGER); if (Creature* trigger = me->FindNearestCreature(NPC_FERAL_DEFENDER_TRIGGER, 15.0f, true)) DoCast(trigger, SPELL_ACTIVATE_DEFENDER, true); @@ -262,7 +259,7 @@ class boss_auriaya : public CreatureScript break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); - DoScriptText(SAY_BERSERK, me); + Talk(SAY_BERSERK); events.CancelEvent(EVENT_BERSERK); break; } @@ -296,17 +293,17 @@ class npc_auriaya_seeping_trigger : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() - { - me->DespawnOrUnsummon(600000); - DoCast(me, SPELL_SEEPING_ESSENCE); - } + void Reset() + { + me->DespawnOrUnsummon(600000); + DoCast(me, SPELL_SEEPING_ESSENCE); + } - void UpdateAI(uint32 const /*diff*/) - { - if (instance->GetBossState(BOSS_AURIAYA) != IN_PROGRESS) - me->DespawnOrUnsummon(); - } + void UpdateAI(uint32 const /*diff*/) + { + if (instance->GetBossState(BOSS_AURIAYA) != IN_PROGRESS) + me->DespawnOrUnsummon(); + } private: InstanceScript* instance; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index a26f5763472..921d67d6d65 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -141,9 +141,6 @@ enum Vehicles VEHICLE_DEMOLISHER = 33109, }; -#define EMOTE_PURSUE "Flame Leviathan pursues $N." -#define EMOTE_OVERLOAD "Flame Leviathan's circuits overloaded." -#define EMOTE_REPAIR "Automatic repair sequence initiated." #define DATA_SHUTOUT 29112912 // 2911, 2912 are achievement IDs #define DATA_ORBIT_ACHIEVEMENTS 1 #define VEHICLE_SPAWNS 5 @@ -151,22 +148,21 @@ enum Vehicles enum Yells { - SAY_AGGRO = -1603060, - SAY_SLAY = -1603061, - SAY_DEATH = -1603062, - SAY_TARGET_1 = -1603063, - SAY_TARGET_2 = -1603064, - SAY_TARGET_3 = -1603065, - SAY_HARDMODE = -1603066, - SAY_TOWER_NONE = -1603067, - SAY_TOWER_FROST = -1603068, - SAY_TOWER_FLAME = -1603069, - SAY_TOWER_NATURE = -1603070, - SAY_TOWER_STORM = -1603071, - SAY_PLAYER_RIDING = -1603072, - SAY_OVERLOAD_1 = -1603073, - SAY_OVERLOAD_2 = -1603074, - SAY_OVERLOAD_3 = -1603075, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_TARGET = 3, + SAY_HARDMODE = 4, + SAY_TOWER_NONE = 5, + SAY_TOWER_FROST = 6, + SAY_TOWER_FLAME = 7, + SAY_TOWER_NATURE = 8, + SAY_TOWER_STORM = 9, + SAY_PLAYER_RIDING = 10, + SAY_OVERLOAD = 11, + EMOTE_PURSUE = 12, + EMOTE_OVERLOAD = 13, + EMOTE_REPAIR = 14 }; enum MiscellanousData @@ -179,15 +175,8 @@ enum MiscellanousData FOUR_SEATS = 4, }; -Position const Center[]= -{ - {354.8771f, -12.90240f, 409.803650f, 0.0f}, -}; - -Position const InfernoStart[]= -{ - {390.93f, -13.91f, 409.81f, 0.0f}, -}; +Position const Center = { 354.8771f, -12.90240f, 409.803650f, 0.0f }; +Position const InfernoStart = { 390.93f, -13.91f, 409.81f, 0.0f }; Position const PosSiege[VEHICLE_SPAWNS] = { @@ -320,12 +309,12 @@ class boss_flame_leviathan : public CreatureScript } if (!towerOfLife && !towerOfFrost && !towerOfFlames && !towerOfStorms) - DoScriptText(SAY_TOWER_NONE, me); + Talk(SAY_TOWER_NONE); else - DoScriptText(SAY_HARDMODE, me); + Talk(SAY_HARDMODE); } else - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void JustDied(Unit* /*killer*/) @@ -334,7 +323,7 @@ class boss_flame_leviathan : public CreatureScript // Set Field Flags 67108928 = 64 | 67108864 = UNIT_FLAG_UNK_6 | UNIT_FLAG_SKINNABLE // Set DynFlags 12 // Set NPCFlags 0 - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void SpellHit(Unit* /*caster*/, SpellInfo const* spell) @@ -397,7 +386,7 @@ class boss_flame_leviathan : public CreatureScript switch (eventId) { case EVENT_PURSUE: - DoScriptText(RAND(SAY_TARGET_1, SAY_TARGET_2, SAY_TARGET_3), me); + Talk(SAY_TARGET); DoCast(SPELL_PURSUED); // Will select target in spellscript events.ScheduleEvent(EVENT_PURSUE, 35*IN_MILLISECONDS); break; @@ -420,8 +409,8 @@ class boss_flame_leviathan : public CreatureScript events.ScheduleEvent(EVENT_SUMMON, 2*IN_MILLISECONDS); break; case EVENT_SHUTDOWN: - DoScriptText(RAND(SAY_OVERLOAD_1, SAY_OVERLOAD_2, SAY_OVERLOAD_3), me); - me->MonsterTextEmote(EMOTE_OVERLOAD, 0, true); + Talk(SAY_OVERLOAD); + Talk(EMOTE_OVERLOAD); me->CastSpell(me, SPELL_SYSTEMS_SHUTDOWN, true); if (Shutout) Shutout = false; @@ -429,7 +418,7 @@ class boss_flame_leviathan : public CreatureScript events.DelayEvents(20 * IN_MILLISECONDS, 0); break; case EVENT_REPAIR: - me->MonsterTextEmote(EMOTE_REPAIR, 0, true); + Talk(EMOTE_REPAIR); me->ClearUnitState(UNIT_STATE_STUNNED | UNIT_STATE_ROOT); events.ScheduleEvent(EVENT_SHUTDOWN, 150*IN_MILLISECONDS); events.CancelEvent(EVENT_REPAIR); @@ -440,12 +429,12 @@ class boss_flame_leviathan : public CreatureScript if (Creature* thorim = DoSummon(NPC_THORIM_BEACON, me, float(urand(20, 60)), 20000, TEMPSUMMON_TIMED_DESPAWN)) thorim->GetMotionMaster()->MoveRandom(100); } - DoScriptText(SAY_TOWER_STORM, me); + Talk(SAY_TOWER_STORM); events.CancelEvent(EVENT_THORIM_S_HAMMER); break; case EVENT_MIMIRON_S_INFERNO: // Tower of Flames - me->SummonCreature(NPC_MIMIRON_BEACON, InfernoStart->GetPositionX(), InfernoStart->GetPositionY(), InfernoStart->GetPositionZ()); - DoScriptText(SAY_TOWER_FLAME, me); + me->SummonCreature(NPC_MIMIRON_BEACON, InfernoStart); + Talk(SAY_TOWER_FLAME); events.CancelEvent(EVENT_MIMIRON_S_INFERNO); break; case EVENT_HODIR_S_FURY: // Tower of Frost @@ -454,11 +443,11 @@ class boss_flame_leviathan : public CreatureScript if (Creature* hodir = DoSummon(NPC_HODIR_BEACON, me, 50, 0)) hodir->GetMotionMaster()->MoveRandom(100); } - DoScriptText(SAY_TOWER_FROST, me); + Talk(SAY_TOWER_FROST); events.CancelEvent(EVENT_HODIR_S_FURY); break; case EVENT_FREYA_S_WARD: // Tower of Nature - DoScriptText(SAY_TOWER_NATURE, me); + Talk(SAY_TOWER_NATURE); for (int32 i = 0; i < 4; ++i) me->SummonCreature(NPC_FREYA_BEACON, FreyaBeacons[i]); @@ -529,8 +518,8 @@ class boss_flame_leviathan : public CreatureScript case ACTION_MOVE_TO_CENTER_POSITION: // Triggered by 2 Collossus near door if (!me->isDead()) { - me->SetHomePosition(Center->GetPositionX(), Center->GetPositionY(), Center->GetPositionZ(), 0); - me->GetMotionMaster()->MoveCharge(Center->GetPositionX(), Center->GetPositionY(), Center->GetPositionZ()); //position center + me->SetHomePosition(Center); + me->GetMotionMaster()->MoveCharge(Center.GetPositionX(), Center.GetPositionY(), Center.GetPositionZ()); // position center me->SetReactState(REACT_AGGRESSIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED); return; @@ -593,8 +582,8 @@ class boss_flame_leviathan_seat : public CreatureScript { if (!apply) return; - else - DoScriptText(SAY_PLAYER_RIDING, me); + else if (Creature* leviathan = me->GetVehicleCreatureBase()) + leviathan->AI()->Talk(SAY_PLAYER_RIDING); if (Creature* turret = me->GetVehicleKit()->GetPassenger(SEAT_TURRET)->ToCreature()) { @@ -887,7 +876,7 @@ class npc_colossus : public CreatureScript void JustDied(Unit* /*killer*/) { - if (me->GetHomePosition().IsInDist(Center, 50.f)) + if (me->GetHomePosition().IsInDist(&Center, 50.f)) instance->SetData(DATA_COLOSSUS, instance->GetData(DATA_COLOSSUS)+1); } @@ -1187,7 +1176,7 @@ class npc_lorekeeper : public CreatureScript if (Creature* Branz = creature->FindNearestCreature(NPC_BRANZ_BRONZBEARD, 1000, true)) { Delorah->GetMotionMaster()->MovePoint(0, Branz->GetPositionX()-4, Branz->GetPositionY(), Branz->GetPositionZ()); - //TODO DoScriptText(xxxx, Delorah, Branz); when reached at branz + //TODO Delorah->AI()->Talk(xxxx, Branz->GetGUID()); when reached at branz } } } @@ -1700,7 +1689,7 @@ class spell_pursue : public SpellScriptLoader { if (IS_PLAYER_GUID(itr->second.Passenger)) { - caster->MonsterTextEmote(EMOTE_PURSUE, itr->second.Passenger, true); + caster->AI()->Talk(EMOTE_PURSUE, itr->second.Passenger); return; } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index f60922c426c..b894706e0bf 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -27,34 +27,23 @@ enum FreyaYells { // Freya - SAY_AGGRO = -1603180, - SAY_AGGRO_WITH_ELDER = -1603181, - SAY_SLAY_1 = -1603182, - SAY_SLAY_2 = -1603183, - SAY_DEATH = -1603184, - SAY_BERSERK = -1603185, - SAY_SUMMON_CONSERVATOR = -1603186, - SAY_SUMMON_TRIO = -1603187, - SAY_SUMMON_LASHERS = -1603188, - SAY_YS_HELP = -1603189, - - // Elder Brightleaf - SAY_BRIGHTLEAF_AGGRO = -1603190, - SAY_BRIGHTLEAF_SLAY_1 = -1603191, - SAY_BRIGHTLEAF_SLAY_2 = -1603192, - SAY_BRIGHTLEAF_DEATH = -1603193, - - // Elder Ironbranch - SAY_IRONBRANCH_AGGRO = -1603194, - SAY_IRONBRANCH_SLAY_1 = -1603195, - SAY_IRONBRANCH_SLAY_2 = -1603196, - SAY_IRONBRANCH_DEATH = -1603197, - - // Elder Stonebark - SAY_STONEBARK_AGGRO = -1603198, - SAY_STONEBARK_SLAY_1 = -1603199, - SAY_STONEBARK_SLAY_2 = -1603200, - SAY_STONEBARK_DEATH = -1603201, + SAY_AGGRO = 0, + SAY_AGGRO_WITH_ELDER = 1, + SAY_SLAY = 2, + SAY_DEATH = 3, + SAY_BERSERK = 4, + SAY_SUMMON_CONSERVATOR = 5, + SAY_SUMMON_TRIO = 6, + SAY_SUMMON_LASHERS = 7, + EMOTE_LIFEBINDERS_GIFT = 8, + EMOTE_ALLIES_OF_NATURE = 9, + EMOTE_GROUND_TREMOR = 10, + EMOTE_IRON_ROOTS = 11, + + // Elder Brightleaf / Elder Ironbranch / Elder Stonebark + SAY_ELDER_AGGRO = 0, + SAY_ELDER_SLAY = 1, + SAY_ELDER_DEATH = 2 }; enum FreyaSpells @@ -143,7 +132,7 @@ enum FreyaSpells // Nature Bomb SPELL_NATURE_BOMB = 64587, SPELL_OBJECT_BOMB = 64600, - SPELL_SUMMON_NATURE_BOMB = 64606, + SPELL_SUMMON_NATURE_BOMB = 64604, // Unstable Sun Beam SPELL_UNSTABLE_SUN_BEAM = 62211, @@ -159,7 +148,7 @@ enum FreyaSpells // Attuned To Nature spells SPELL_ATTUNED_TO_NATURE_2_DOSE_REDUCTION = 62524, SPELL_ATTUNED_TO_NATURE_10_DOSE_REDUCTION = 62525, - SPELL_ATTUNED_TO_NATURE_25_DOSE_REDUCTION = 62521, + SPELL_ATTUNED_TO_NATURE_25_DOSE_REDUCTION = 62521 }; enum FreyaNpcs @@ -177,13 +166,13 @@ enum FreyaNpcs NPC_IRON_ROOTS = 33088, NPC_STRENGTHENED_IRON_ROOTS = 33168, - OBJECT_NATURE_BOMB = 194902, + OBJECT_NATURE_BOMB = 194902 }; enum FreyaActions { ACTION_ELDER_DEATH = 1, - ACTION_ELDER_FREYA_KILLED = 2, + ACTION_ELDER_FREYA_KILLED = 2 }; enum FreyaEvents @@ -211,13 +200,16 @@ enum FreyaEvents // Elder Brightleaf EVENT_SOLAR_FLARE = 15, EVENT_UNSTABLE_SUN_BEAM = 16, - EVENT_FLUX = 17, + EVENT_FLUX = 17 }; -#define WAVE_TIME 60000 // Normal wave is one minute -#define TIME_DIFFERENCE 10000 // If difference between waveTime and WAVE_TIME is bigger then TIME_DIFFERENCE, schedule EVENT_WAVE in 10 seconds -#define DATA_GETTING_BACK_TO_NATURE 1 -#define DATA_KNOCK_ON_WOOD 2 +enum Misc +{ + WAVE_TIME = 60000, // Normal wave is one minute + TIME_DIFFERENCE = 10000, // If difference between waveTime and WAVE_TIME is bigger then TIME_DIFFERENCE, schedule EVENT_WAVE in 10 seconds + DATA_GETTING_BACK_TO_NATURE = 1, + DATA_KNOCK_ON_WOOD = 2 +}; class npc_iron_roots : public CreatureScript { @@ -273,9 +265,7 @@ class boss_freya : public CreatureScript struct boss_freyaAI : public BossAI { - boss_freyaAI(Creature* creature) : BossAI(creature, BOSS_FREYA) - { - } + boss_freyaAI(Creature* creature) : BossAI(creature, BOSS_FREYA) { } uint64 ElementalGUID[3][2]; @@ -316,9 +306,10 @@ class boss_freya : public CreatureScript random[n] = false; } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_SLAY); } void DamageTaken(Unit* who, uint32& damage) @@ -369,9 +360,9 @@ class boss_freya : public CreatureScript } if (elderCount == 0) - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); else - DoScriptText(SAY_AGGRO_WITH_ELDER, me); + Talk(SAY_AGGRO_WITH_ELDER); me->CastCustomSpell(SPELL_ATTUNED_TO_NATURE, SPELLVALUE_AURA_STACK, 150, me, true); @@ -409,7 +400,7 @@ class boss_freya : public CreatureScript switch (eventId) { case EVENT_ENRAGE: - DoScriptText(SAY_BERSERK, me); + Talk(SAY_BERSERK); DoCast(me, SPELL_ENRAGE); break; case EVENT_SUNBEAM: @@ -418,17 +409,9 @@ class boss_freya : public CreatureScript events.ScheduleEvent(EVENT_SUNBEAM, urand(10000, 15000)); break; case EVENT_NATURE_BOMB: - { - // On every player - std::list<Player*> PlayerList; - Trinity::AnyPlayerInObjectRangeCheck checker(me, 50.0f); - Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, PlayerList, checker); - me->VisitNearbyWorldObject(50.0f, searcher); - for (std::list<Player*>::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) - (*itr)->CastSpell(*itr, SPELL_SUMMON_NATURE_BOMB, true); + DoCastAOE(SPELL_SUMMON_NATURE_BOMB, true); events.ScheduleEvent(EVENT_NATURE_BOMB, urand(10000, 12000)); break; - } case EVENT_UNSTABLE_ENERGY: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) DoCast(target, SPELL_FREYA_UNSTABLE_SUNBEAM, true); @@ -442,15 +425,18 @@ class boss_freya : public CreatureScript events.ScheduleEvent(EVENT_NATURE_BOMB, urand(10000, 20000)); break; case EVENT_EONAR_GIFT: + Talk(EMOTE_LIFEBINDERS_GIFT); DoCast(me, SPELL_SUMMON_EONAR_GIFT); events.ScheduleEvent(EVENT_EONAR_GIFT, urand(40000, 50000)); break; case EVENT_STRENGTHENED_IRON_ROOTS: + Talk(EMOTE_IRON_ROOTS); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, -SPELL_ROOTS_FREYA)) target->CastSpell(target, SPELL_ROOTS_FREYA, true); // This must be casted by Target self events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, urand(12000, 20000)); break; case EVENT_GROUND_TREMOR: + Talk(EMOTE_GROUND_TREMOR); DoCastAOE(SPELL_FREYA_GROUND_TREMOR); events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(25000, 28000)); break; @@ -573,20 +559,21 @@ class boss_freya : public CreatureScript switch (GetWaveId()) { case 0: - DoScriptText(SAY_SUMMON_LASHERS, me); + Talk(SAY_SUMMON_LASHERS); for (uint8 n = 0; n < 10; ++n) DoCast(SPELL_SUMMON_LASHERS); break; case 1: - DoScriptText(SAY_SUMMON_TRIO, me); + Talk(SAY_SUMMON_TRIO); DoCast(SPELL_SUMMON_TRIO); trioWaveCount++; break; case 2: - DoScriptText(SAY_SUMMON_CONSERVATOR, me); + Talk(SAY_SUMMON_CONSERVATOR); DoCast(SPELL_SUMMON_ANCIENT_CONSERVATOR); break; } + Talk(EMOTE_ALLIES_OF_NATURE); waveCount++; } @@ -602,7 +589,7 @@ class boss_freya : public CreatureScript me->CastSpell((Unit*)NULL, summonSpell[me->GetMap()->GetDifficulty()][elderCount], true); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); me->SetReactState(REACT_PASSIVE); _JustDied(); me->RemoveAllAuras(); @@ -705,17 +692,18 @@ class boss_elder_brightleaf : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_BRIGHTLEAF_SLAY_1, SAY_BRIGHTLEAF_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_ELDER_SLAY); } void JustDied(Unit* killer) { _JustDied(); - DoScriptText(SAY_BRIGHTLEAF_DEATH, me); + Talk(SAY_ELDER_DEATH); - if (killer && killer->GetTypeId() == TYPEID_PLAYER) + if (killer->GetTypeId() == TYPEID_PLAYER) { if (Creature* Ironbranch = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_IRONBRANCH))) Ironbranch->AI()->DoAction(ACTION_ELDER_DEATH); @@ -729,7 +717,7 @@ class boss_elder_brightleaf : public CreatureScript { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) - DoScriptText(SAY_BRIGHTLEAF_AGGRO, me); + Talk(SAY_ELDER_AGGRO); } void UpdateAI(uint32 const diff) @@ -825,17 +813,18 @@ class boss_elder_stonebark : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_STONEBARK_SLAY_1, SAY_STONEBARK_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_ELDER_SLAY); } void JustDied(Unit* killer) { _JustDied(); - DoScriptText(SAY_STONEBARK_DEATH, me); + Talk(SAY_ELDER_DEATH); - if (killer && killer->GetTypeId() == TYPEID_PLAYER) + if (killer->GetTypeId() == TYPEID_PLAYER) { if (Creature* Ironbranch = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_IRONBRANCH))) Ironbranch->AI()->DoAction(ACTION_ELDER_DEATH); @@ -849,7 +838,7 @@ class boss_elder_stonebark : public CreatureScript { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) - DoScriptText(SAY_STONEBARK_AGGRO, me); + Talk(SAY_ELDER_AGGRO); } void DamageTaken(Unit* who, uint32& damage) @@ -951,17 +940,18 @@ class boss_elder_ironbranch : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_IRONBRANCH_SLAY_1, SAY_IRONBRANCH_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_ELDER_SLAY); } void JustDied(Unit* killer) { _JustDied(); - DoScriptText(SAY_IRONBRANCH_DEATH, me); + Talk(SAY_ELDER_DEATH); - if (killer && killer->GetTypeId() == TYPEID_PLAYER) + if (killer->GetTypeId() == TYPEID_PLAYER) { if (Creature* Brightleaf = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRIGHTLEAF))) Brightleaf->AI()->DoAction(ACTION_ELDER_DEATH); @@ -975,7 +965,7 @@ class boss_elder_ironbranch : public CreatureScript { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) - DoScriptText(SAY_IRONBRANCH_AGGRO, me); + Talk(SAY_ELDER_AGGRO); } void UpdateAI(uint32 const diff) @@ -1530,19 +1520,17 @@ class npc_unstable_sun_beam : public CreatureScript class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader { public: - spell_freya_attuned_to_nature_dose_reduction() : SpellScriptLoader("spell_freya_attuned_to_nature_dose_reduction") - { - } + spell_freya_attuned_to_nature_dose_reduction() : SpellScriptLoader("spell_freya_attuned_to_nature_dose_reduction") { } class spell_freya_attuned_to_nature_dose_reduction_SpellScript : public SpellScript { - PrepareSpellScript(spell_freya_attuned_to_nature_dose_reduction_SpellScript) + PrepareSpellScript(spell_freya_attuned_to_nature_dose_reduction_SpellScript); void HandleScript(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); - SpellInfo const* spellInfo = GetSpellInfo(); - switch (spellInfo->Id) + + switch (GetSpellInfo()->Id) { case SPELL_ATTUNED_TO_NATURE_2_DOSE_REDUCTION: if (target->HasAura(GetEffectValue())) @@ -1579,9 +1567,7 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader class spell_freya_iron_roots : public SpellScriptLoader { public: - spell_freya_iron_roots() : SpellScriptLoader("spell_freya_iron_roots") - { - } + spell_freya_iron_roots() : SpellScriptLoader("spell_freya_iron_roots") { } class spell_freya_iron_roots_SpellScript : public SpellScript { @@ -1614,80 +1600,44 @@ class spell_freya_iron_roots : public SpellScriptLoader class achievement_getting_back_to_nature : public AchievementCriteriaScript { public: - achievement_getting_back_to_nature() : AchievementCriteriaScript("achievement_getting_back_to_nature") - { - } + achievement_getting_back_to_nature() : AchievementCriteriaScript("achievement_getting_back_to_nature") { } bool OnCheck(Player* /*player*/, Unit* target) { - if (!target) - return false; - - if (Creature* Freya = target->ToCreature()) - if (Freya->AI()->GetData(DATA_GETTING_BACK_TO_NATURE) >= 25) - return true; - - return false; + return target && target->GetAI()->GetData(DATA_GETTING_BACK_TO_NATURE) >= 25; } }; class achievement_knock_on_wood : public AchievementCriteriaScript { public: - achievement_knock_on_wood() : AchievementCriteriaScript("achievement_knock_on_wood") - { - } + achievement_knock_on_wood() : AchievementCriteriaScript("achievement_knock_on_wood") { } bool OnCheck(Player* /*player*/, Unit* target) { - if (!target) - return false; - - if (Creature* Freya = target->ToCreature()) - if (Freya->AI()->GetData(DATA_KNOCK_ON_WOOD) >= 1) - return true; - - return false; + return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) >= 1; } }; class achievement_knock_knock_on_wood : public AchievementCriteriaScript { public: - achievement_knock_knock_on_wood() : AchievementCriteriaScript("achievement_knock_knock_on_wood") - { - } + achievement_knock_knock_on_wood() : AchievementCriteriaScript("achievement_knock_knock_on_wood") { } bool OnCheck(Player* /*player*/, Unit* target) { - if (!target) - return false; - - if (Creature* Freya = target->ToCreature()) - if (Freya->AI()->GetData(DATA_KNOCK_ON_WOOD) >= 2) - return true; - - return false; + return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) >= 2; } }; class achievement_knock_knock_knock_on_wood : public AchievementCriteriaScript { public: - achievement_knock_knock_knock_on_wood() : AchievementCriteriaScript("achievement_knock_knock_knock_on_wood") - { - } + achievement_knock_knock_knock_on_wood() : AchievementCriteriaScript("achievement_knock_knock_knock_on_wood") { } bool OnCheck(Player* /*player*/, Unit* target) { - if (!target) - return false; - - if (Creature* Freya = target->ToCreature()) - if (Freya->AI()->GetData(DATA_KNOCK_ON_WOOD) == 3) - return true; - - return false; + return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) == 3; } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 1232c1b9051..43d203daedf 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -24,21 +24,22 @@ enum VezaxYells { - SAY_AGGRO = -1603290, - SAY_SLAY_1 = -1603291, - SAY_SLAY_2 = -1603292, - SAY_SURGE_OF_DARKNESS = -1603293, - SAY_DEATH = -1603294, - SAY_BERSERK = -1603295, - SAY_HARDMODE = -1603296, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_SURGE_OF_DARKNESS = 2, + SAY_DEATH = 3, + SAY_BERSERK = 4, + SAY_HARDMODE = 5, }; enum VezaxEmotes { - EMOTE_VAPORS = -1603289, - EMOTE_ANIMUS = -1603297, - EMOTE_BARRIER = -1603298, - EMOTE_SURGE_OF_DARKNESS = -1603299, + EMOTE_ANIMUS = 6, + EMOTE_BARRIER = 7, + EMOTE_SURGE_OF_DARKNESS = 8, + + // Saronite Vapor + EMOTE_VAPORS = 9 }; enum VezaxSpells @@ -122,7 +123,7 @@ class boss_general_vezax : public CreatureScript { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCast(me, SPELL_AURA_OF_DESPAIR); CheckShamanisticRage(); @@ -173,8 +174,8 @@ class boss_general_vezax : public CreatureScript break; } case EVENT_SURGE_OF_DARKNESS: - DoScriptText(EMOTE_SURGE_OF_DARKNESS, me); - DoScriptText(SAY_SURGE_OF_DARKNESS, me); + Talk(EMOTE_SURGE_OF_DARKNESS); + Talk(SAY_SURGE_OF_DARKNESS); DoCast(me, SPELL_SURGE_OF_DARKNESS); events.ScheduleEvent(EVENT_SURGE_OF_DARKNESS, urand(50000, 70000)); break; @@ -183,8 +184,8 @@ class boss_general_vezax : public CreatureScript events.ScheduleEvent(EVENT_SARONITE_VAPORS, urand(30000, 35000)); if (++vaporCount == 6 && smellSaronite) { - DoScriptText(SAY_HARDMODE, me); - DoScriptText(EMOTE_BARRIER, me); + Talk(SAY_HARDMODE); + Talk(EMOTE_BARRIER); summons.DespawnAll(); DoCast(me, SPELL_SARONITE_BARRIER); DoCast(SPELL_SUMMON_SARONITE_ANIMUS); @@ -194,7 +195,7 @@ class boss_general_vezax : public CreatureScript } break; case EVENT_BERSERK: - DoScriptText(SAY_BERSERK, me); + Talk(SAY_BERSERK); DoCast(me, SPELL_BERSERK); break; } @@ -209,15 +210,16 @@ class boss_general_vezax : public CreatureScript shadowDodger = false; } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_AURA_OF_DESPAIR); } @@ -316,7 +318,6 @@ class boss_saronite_animus : public CreatureScript boss_saronite_animusAI(Creature* creature) : ScriptedAI(creature) { instance = me->GetInstanceScript(); - DoScriptText(EMOTE_BARRIER, me); } void Reset() @@ -378,7 +379,7 @@ class npc_saronite_vapors : public CreatureScript { npc_saronite_vaporsAI(Creature* creature) : ScriptedAI(creature) { - DoScriptText(EMOTE_VAPORS, me); + Talk(EMOTE_VAPORS); instance = me->GetInstanceScript(); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true); me->ApplySpellImmune(0, IMMUNITY_ID, 49560, true); // Death Grip jump effect diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index c9fe1c5b707..8247236016c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -32,18 +32,15 @@ enum HodirYells { - SAY_AGGRO = -1603210, - SAY_SLAY_1 = -1603211, - SAY_SLAY_2 = -1603212, - SAY_FLASH_FREEZE = -1603213, - SAY_STALACTITE = -1603214, - SAY_DEATH = -1603215, - SAY_BERSERK = -1603216, - SAY_YS_HELP = -1603217, - SAY_HARD_MODE_FAILED = -1603218, - - EMOTE_FREEZE = -1603209, - EMOTE_BLOWS = -1603219, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_FLASH_FREEZE = 2, + SAY_STALACTITE = 3, + SAY_DEATH = 4, + SAY_BERSERK = 5, + SAY_HARD_MODE_FAILED = 6, + EMOTE_FREEZE = 7, + EMOTE_BLOWS = 8 }; enum HodirSpells @@ -70,6 +67,8 @@ enum HodirSpells SPELL_ICE_SHARD = 62457, SPELL_ICE_SHARD_HIT = 65370, + SPELL_KILL_CREDIT = 64899, + // Druids SPELL_WRATH = 62793, SPELL_STARLIGHT = 62807, @@ -329,7 +328,7 @@ class boss_hodir : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCast(me, SPELL_BITING_COLD, true); gettingColdInHereTimer = 1000; @@ -346,10 +345,10 @@ class boss_hodir : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 480000); } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - if (!urand(0, 3)) - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_SLAY); } void DamageTaken(Unit* /*who*/, uint32& damage) @@ -357,7 +356,7 @@ class boss_hodir : public CreatureScript if (damage >= me->GetHealth()) { damage = 0; - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (iCouldSayThatThisCacheWasRare) instance->SetData(DATA_HODIR_RARE_CACHE, 1); @@ -376,6 +375,8 @@ class boss_hodir : public CreatureScript me->setFaction(35); me->DespawnOrUnsummon(10000); + DoCastAOE(SPELL_KILL_CREDIT); + _JustDied(); } } @@ -404,8 +405,8 @@ class boss_hodir : public CreatureScript events.ScheduleEvent(EVENT_ICICLE, RAID_MODE(5500, 3500)); break; case EVENT_FLASH_FREEZE: - DoScriptText(SAY_FLASH_FREEZE, me); - DoScriptText(EMOTE_FREEZE, me); + Talk(SAY_FLASH_FREEZE); + Talk(EMOTE_FREEZE); for (uint8 n = 0; n < RAID_MODE(2, 3); ++n) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) target->CastSpell(target, SPELL_ICICLE_SNOWDRIFT, true); @@ -424,19 +425,19 @@ class boss_hodir : public CreatureScript break; } case EVENT_BLOWS: - DoScriptText(SAY_STALACTITE, me); - DoScriptText(EMOTE_BLOWS, me); + Talk(SAY_STALACTITE); + Talk(EMOTE_BLOWS); DoCast(me, SPELL_FROZEN_BLOWS); events.ScheduleEvent(EVENT_BLOWS, urand(60000, 65000)); break; case EVENT_RARE_CACHE: - DoScriptText(SAY_HARD_MODE_FAILED, me); + Talk(SAY_HARD_MODE_FAILED); iCouldSayThatThisCacheWasRare = false; instance->SetData(DATA_HODIR_RARE_CACHE, 0); events.CancelEvent(EVENT_RARE_CACHE); break; case EVENT_BERSERK: - DoScriptText(SAY_BERSERK, me); + Talk(SAY_BERSERK); DoCast(me, SPELL_BERSERK, true); events.CancelEvent(EVENT_BERSERK); break; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index c0fb4e3ecc8..8f68542d462 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -24,16 +24,14 @@ enum Yells { - SAY_AGGRO = -1603220, - SAY_SLAY_1 = -1603221, - SAY_SLAY_2 = -1603222, - SAY_DEATH = -1603223, - SAY_SUMMON = -1603224, - SAY_SLAG_POT = -1603225, - SAY_SCORCH_1 = -1603226, - SAY_SCORCH_2 = -1603227, - SAY_BERSERK = -1603228, - EMOTE_JETS = -1603229, + SAY_AGGRO = 0, + SAY_SUMMON = 1, + SAY_SLAG_POT = 2, + SAY_SCORCH = 3, + SAY_SLAY = 4, + SAY_BERSERK = 5, + SAY_DEATH = 6, + EMOTE_JETS = 7 }; enum Spells @@ -135,7 +133,7 @@ class boss_ignis : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_JET, 30000); events.ScheduleEvent(EVENT_SCORCH, 25000); events.ScheduleEvent(EVENT_SLAG_POT, 35000); @@ -151,7 +149,7 @@ class boss_ignis : public CreatureScript void JustDied(Unit* /*killer*/) { _JustDied(); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } uint32 GetData(uint32 type) const @@ -162,10 +160,10 @@ class boss_ignis : public CreatureScript return 0; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* who) { - if (!urand(0, 4)) - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_SLAY); } void JustSummoned(Creature* summon) @@ -217,7 +215,7 @@ class boss_ignis : public CreatureScript case EVENT_SLAG_POT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoScriptText(SAY_SLAG_POT, me); + Talk(SAY_SLAG_POT); _slagPotGUID = target->GetGUID(); DoCast(target, SPELL_GRAB); events.DelayEvents(3000); @@ -252,14 +250,14 @@ class boss_ignis : public CreatureScript } break; case EVENT_SCORCH: - DoScriptText(RAND(SAY_SCORCH_1, SAY_SCORCH_2), me); + Talk(SAY_SCORCH); if (Unit* target = me->getVictim()) me->SummonCreature(NPC_GROUND_SCORCH, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 45000); DoCast(SPELL_SCORCH); events.ScheduleEvent(EVENT_SCORCH, 25000); break; case EVENT_CONSTRUCT: - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); DoSummon(NPC_IRON_CONSTRUCT, ConstructSpawnPosition[urand(0, CONSTRUCT_SPAWN_POINTS - 1)], 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); DoCast(SPELL_STRENGHT); DoCast(me, SPELL_ACTIVATE_CONSTRUCT); @@ -267,7 +265,7 @@ class boss_ignis : public CreatureScript break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); - DoScriptText(SAY_BERSERK, me); + Talk(SAY_BERSERK); break; } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 9c77bb298a5..c1fc0a81989 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -30,34 +30,40 @@ SDComment: TODO: Achievements SDCategory: Ulduar EndScriptData */ -#define SPELL_ARM_DEAD_DAMAGE RAID_MODE(63629, 63979) -#define SPELL_TWO_ARM_SMASH RAID_MODE(63356, 64003) -#define SPELL_ONE_ARM_SMASH RAID_MODE(63573, 64006) -#define SPELL_ARM_SWEEP RAID_MODE(63766, 63983) -#define SPELL_STONE_SHOUT RAID_MODE(63716, 64005) -#define SPELL_PETRIFY_BREATH RAID_MODE(62030, 63980) -#define SPELL_STONE_GRIP RAID_MODE(62166, 63981) -#define SPELL_STONE_GRIP_CANCEL 65594 -#define SPELL_SUMMON_RUBBLE 63633 -#define SPELL_FALLING_RUBBLE 63821 -#define SPELL_ARM_ENTER_VEHICLE 65343 -#define SPELL_ARM_ENTER_VISUAL 64753 - -#define SPELL_SUMMON_FOCUSED_EYEBEAM 63342 -#define SPELL_FOCUSED_EYEBEAM_PERIODIC RAID_MODE(63347, 63977) -#define SPELL_FOCUSED_EYEBEAM_VISUAL 63369 -#define SPELL_FOCUSED_EYEBEAM_VISUAL_LEFT 63676 -#define SPELL_FOCUSED_EYEBEAM_VISUAL_RIGHT 63702 - -// Passive -#define SPELL_KOLOGARN_REDUCE_PARRY 64651 -#define SPELL_KOLOGARN_PACIFY 63726 -#define SPELL_KOLOGARN_UNK_0 65219 // Not found in DBC - -#define SPELL_BERSERK 47008 // guess - -#define NPC_RUBBLE_STALKER 33809 -#define NPC_ARM_SWEEP_STALKER 33661 +enum Spells +{ + SPELL_ARM_DEAD_DAMAGE = 63629, + SPELL_TWO_ARM_SMASH = 63356, + SPELL_ONE_ARM_SMASH = 63573, + SPELL_ARM_SWEEP = 63766, + SPELL_STONE_SHOUT = 63716, + SPELL_PETRIFY_BREATH = 62030, + SPELL_STONE_GRIP = 62166, + SPELL_STONE_GRIP_CANCEL = 65594, + SPELL_SUMMON_RUBBLE = 63633, + SPELL_FALLING_RUBBLE = 63821, + SPELL_ARM_ENTER_VEHICLE = 65343, + SPELL_ARM_ENTER_VISUAL = 64753, + + SPELL_SUMMON_FOCUSED_EYEBEAM = 63342, + SPELL_FOCUSED_EYEBEAM_PERIODIC = 63347, + SPELL_FOCUSED_EYEBEAM_VISUAL = 63369, + SPELL_FOCUSED_EYEBEAM_VISUAL_LEFT = 63676, + SPELL_FOCUSED_EYEBEAM_VISUAL_RIGHT = 63702, + + // Passive + SPELL_KOLOGARN_REDUCE_PARRY = 64651, + SPELL_KOLOGARN_PACIFY = 63726, + SPELL_KOLOGARN_UNK_0 = 65219, // Not found in DBC + + SPELL_BERSERK = 47008 // guess +}; + +enum NPCs +{ + NPC_RUBBLE_STALKER = 33809, + NPC_ARM_SWEEP_STALKER = 33661 +}; enum Events { @@ -76,15 +82,15 @@ enum Events enum Yells { - SAY_AGGRO = -1603230, - SAY_SLAY_1 = -1603231, - SAY_SLAY_2 = -1603232, - SAY_LEFT_ARM_GONE = -1603233, - SAY_RIGHT_ARM_GONE = -1603234, - SAY_SHOCKWAVE = -1603235, - SAY_GRAB_PLAYER = -1603236, - SAY_DEATH = -1603237, - SAY_BERSERK = -1603238, + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_LEFT_ARM_GONE = 2, + SAY_RIGHT_ARM_GONE = 3, + SAY_SHOCKWAVE = 4, + SAY_GRAB_PLAYER = 5, + SAY_DEATH = 6, + SAY_BERSERK = 7, + EMOTE_STONE_GRIP = 8 }; class boss_kologarn : public CreatureScript @@ -113,7 +119,7 @@ class boss_kologarn : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MELEE_CHECK, 6000); events.ScheduleEvent(EVENT_SMASH, 5000); @@ -138,7 +144,7 @@ class boss_kologarn : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); DoCast(SPELL_KOLOGARN_PACIFY); me->GetMotionMaster()->MoveTargetedHome(); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -146,9 +152,10 @@ class boss_kologarn : public CreatureScript _JustDied(); } - void KilledUnit(Unit* /*who*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_SLAY); } void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) @@ -160,7 +167,7 @@ class boss_kologarn : public CreatureScript if (!apply && isEncounterInProgress) { who->ToCreature()->DisappearAndDie(); - DoScriptText(SAY_LEFT_ARM_GONE, me); + Talk(SAY_LEFT_ARM_GONE); events.ScheduleEvent(EVENT_RESPAWN_LEFT_ARM, 40000); } } @@ -171,7 +178,7 @@ class boss_kologarn : public CreatureScript if (!apply && isEncounterInProgress) { who->ToCreature()->DisappearAndDie(); - DoScriptText(SAY_RIGHT_ARM_GONE, me); + Talk(SAY_RIGHT_ARM_GONE); events.ScheduleEvent(EVENT_RESPAWN_RIGHT_ARM, 40000); } } @@ -272,7 +279,7 @@ class boss_kologarn : public CreatureScript break; case EVENT_ENRAGE: DoCast(SPELL_BERSERK); - DoScriptText(SAY_BERSERK, me); + Talk(SAY_BERSERK); break; case EVENT_RESPAWN_LEFT_ARM: case EVENT_RESPAWN_RIGHT_ARM: @@ -290,11 +297,12 @@ class boss_kologarn : public CreatureScript if (right) { DoCast(SPELL_STONE_GRIP); - DoScriptText(SAY_GRAB_PLAYER, me); + Talk(SAY_GRAB_PLAYER); + Talk(EMOTE_STONE_GRIP); } events.ScheduleEvent(EVENT_STONE_GRIP, 25 * IN_MILLISECONDS); + break; } - break; case EVENT_FOCUSED_EYEBEAM: if (Unit* eyebeamTargetUnit = SelectTarget(SELECT_TARGET_FARTHEST, 0, 0, true)) { @@ -404,12 +412,12 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader } // For subsequent effects - m_unitList = unitList; + _unitList = unitList; } void FillTargetsSubsequential(std::list<WorldObject*>& unitList) { - unitList = m_unitList; + unitList = _unitList; } void Register() @@ -419,8 +427,9 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); } + private: // Shared between effects - std::list<WorldObject*> m_unitList; + std::list<WorldObject*> _unitList; }; SpellScript* GetSpellScript() const @@ -625,10 +634,10 @@ class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader { PrepareSpellScript(spell_kologarn_summon_focused_eyebeam_SpellScript); - void HandleForceCast(SpellEffIndex eff) + void HandleForceCast(SpellEffIndex effIndex) { - PreventHitDefaultEffect(eff); - GetCaster()->CastSpell(GetCaster(), GetSpellInfo()->Effects[eff].TriggerSpell, true); + PreventHitDefaultEffect(effIndex); + GetCaster()->CastSpell(GetCaster(), GetSpellInfo()->Effects[effIndex].TriggerSpell, true); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 6a4a5255293..b5c907af7f0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -35,8 +35,7 @@ enum Yells SAY_V07TRON_ACTIVATE = 11, SAY_V07TRON_SLAY = 12, SAY_V07TRON_DEATH = 13, - SAY_BERSERK = 14, - SAY_YS_HELP = 15 + SAY_BERSERK = 14 }; enum Spells diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 5ea2678adfe..9643b2ec9ab 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -27,15 +27,22 @@ enum Says { - SAY_GREET = -1603260, - SAY_GROUND_PHASE = -1603261, - SAY_AGGRO_1 = -1603262, - SAY_AGGRO_2 = -1603263, - SAY_AGGRO_3 = -1603264, - SAY_TURRETS = -1603265, - EMOTE_HARPOON = -1603266, - EMOTE_BREATH = -1603267, - EMOTE_PERMA = -1603268, + // Expedition Commander + SAY_INTRO = 0, + SAY_GROUND_PHASE = 1, + SAY_AGGRO_2 = 2, + + // Expedition Engineer + SAY_AGGRO_1 = 0, + SAY_AGGRO_3 = 1, + SAY_TURRETS = 2, // unused + + // Razorscale Controller + EMOTE_HARPOON = 0, + + // Razorscale + EMOTE_PERMA = 0, + EMOTE_BREATH = 1 }; enum Spells @@ -245,7 +252,7 @@ class boss_razorscale_controller : public CreatureScript switch (eventId) { case EVENT_BUILD_HARPOON_1: - DoScriptText(EMOTE_HARPOON, me); + Talk(EMOTE_HARPOON); if (GameObject* Harpoon = me->SummonGameObject(GO_RAZOR_HARPOON_1, PosHarpoon[0].GetPositionX(), PosHarpoon[0].GetPositionY(), PosHarpoon[0].GetPositionZ(), 4.790f, 0.0f, 0.0f, 0.0f, 0.0f, uint32(me->GetRespawnTime()))) { if (GameObject* BrokenHarpoon = Harpoon->FindNearestGameObject(GO_RAZOR_BROKEN_HARPOON, 5.0f)) //only nearest broken harpoon @@ -255,7 +262,7 @@ class boss_razorscale_controller : public CreatureScript } return; case EVENT_BUILD_HARPOON_2: - DoScriptText(EMOTE_HARPOON, me); + Talk(EMOTE_HARPOON); if (GameObject* Harpoon = me->SummonGameObject(GO_RAZOR_HARPOON_2, PosHarpoon[1].GetPositionX(), PosHarpoon[1].GetPositionY(), PosHarpoon[1].GetPositionZ(), 4.659f, 0, 0, 0, 0, uint32(me->GetRespawnTime()))) { if (GameObject* BrokenHarpoon = Harpoon->FindNearestGameObject(GO_RAZOR_BROKEN_HARPOON, 5.0f)) @@ -264,7 +271,7 @@ class boss_razorscale_controller : public CreatureScript } return; case EVENT_BUILD_HARPOON_3: - DoScriptText(EMOTE_HARPOON, me); + Talk(EMOTE_HARPOON); if (GameObject* Harpoon = me->SummonGameObject(GO_RAZOR_HARPOON_3, PosHarpoon[2].GetPositionX(), PosHarpoon[2].GetPositionY(), PosHarpoon[2].GetPositionZ(), 5.382f, 0, 0, 0, 0, uint32(me->GetRespawnTime()))) { if (GameObject* BrokenHarpoon = Harpoon->FindNearestGameObject(GO_RAZOR_BROKEN_HARPOON, 5.0f)) @@ -274,7 +281,7 @@ class boss_razorscale_controller : public CreatureScript } return; case EVENT_BUILD_HARPOON_4: - DoScriptText(EMOTE_HARPOON, me); + Talk(EMOTE_HARPOON); if (GameObject* Harpoon = me->SummonGameObject(GO_RAZOR_HARPOON_4, PosHarpoon[3].GetPositionX(), PosHarpoon[3].GetPositionY(), PosHarpoon[3].GetPositionZ(), 4.266f, 0, 0, 0, 0, uint32(me->GetRespawnTime()))) { if (GameObject* BrokenHarpoon = Harpoon->FindNearestGameObject(GO_RAZOR_BROKEN_HARPOON, 5.0f)) @@ -444,7 +451,7 @@ class boss_razorscale : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED); me->RemoveAllAuras(); me->SetReactState(REACT_AGGRESSIVE); - DoScriptText(EMOTE_BREATH, me, 0); + Talk(EMOTE_BREATH); DoCastAOE(SPELL_FLAMEBREATH); events.CancelEvent(EVENT_BREATH); return; @@ -468,7 +475,7 @@ class boss_razorscale : public CreatureScript events.ScheduleEvent(EVENT_FLAME, 10000, 0, PHASE_PERMAGROUND); return; case EVENT_BREATH: - me->MonsterTextEmote(EMOTE_BREATH, 0, true); + Talk(EMOTE_BREATH); DoCastVictim(SPELL_FLAMEBREATH); events.ScheduleEvent(EVENT_BREATH, 20000, 0, PHASE_PERMAGROUND); return; @@ -522,7 +529,7 @@ class boss_razorscale : public CreatureScript void EnterPermaGround() { - me->MonsterTextEmote(EMOTE_PERMA, 0, true); + Talk(EMOTE_PERMA); phase = PHASE_PERMAGROUND; events.SetPhase(PHASE_PERMAGROUND); me->SetCanFly(false); @@ -608,7 +615,7 @@ class npc_expedition_commander : public CreatureScript { if (!Greet && me->IsWithinDistInMap(who, 10.0f) && who->GetTypeId() == TYPEID_PLAYER) { - DoScriptText(SAY_GREET, me); + Talk(SAY_INTRO); Greet = true; } } @@ -623,7 +630,7 @@ class npc_expedition_commander : public CreatureScript switch (action) { case ACTION_GROUND_PHASE: - DoScriptText(SAY_GROUND_PHASE, me); + Talk(SAY_GROUND_PHASE); break; case ACTION_COMMANDER_RESET: summons.clear(); @@ -653,7 +660,7 @@ class npc_expedition_commander : public CreatureScript Engineer[n]->SetHomePosition(PosEngRepair[n]); Engineer[n]->GetMotionMaster()->MoveTargetedHome(); } - Engineer[0]->MonsterYell(SAY_AGGRO_3, LANG_UNIVERSAL, 0); + Engineer[0]->AI()->Talk(SAY_AGGRO_3); Phase = 3; AttackStartTimer = 14000; break; @@ -672,7 +679,7 @@ class npc_expedition_commander : public CreatureScript Engineer[n]->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); for (uint8 n = 0; n < 4; ++n) Defender[n]->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); - me->MonsterYell(SAY_AGGRO_2, LANG_UNIVERSAL, 0); + Talk(SAY_AGGRO_2); AttackStartTimer = 16000; Phase = 5; break; @@ -682,7 +689,7 @@ class npc_expedition_commander : public CreatureScript Razorscale->AI()->DoAction(ACTION_EVENT_START); me->SetInCombatWith(Razorscale); } - Engineer[0]->MonsterYell(SAY_AGGRO_1, LANG_UNIVERSAL, 0); + Engineer[0]->AI()->Talk(SAY_AGGRO_1); Phase = 6; break; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 084cd3e0f86..82845d10b8c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -21,83 +21,80 @@ enum Yells { - SAY_AGGRO_1 = -1603270, - SAY_AGGRO_2 = -1603271, - SAY_SPECIAL_1 = -1603272, - SAY_SPECIAL_2 = -1603273, - SAY_SPECIAL_3 = -1603274, - SAY_JUMPDOWN = -1603275, - SAY_SLAY_1 = -1603276, - SAY_SLAY_2 = -1603277, - SAY_BERSERK = -1603278, - SAY_WIPE = -1603279, - SAY_DEATH = -1603280, - SAY_END_NORMAL_1 = -1603281, - SAY_END_NORMAL_2 = -1603282, - SAY_END_NORMAL_3 = -1603283, - SAY_END_HARD_1 = -1603284, - SAY_END_HARD_2 = -1603285, - SAY_END_HARD_3 = -1603286, - SAY_YS_HELP = -1603287, + SAY_AGGRO = 0, + SAY_SPECIAL_1 = 1, + SAY_SPECIAL_2 = 2, + SAY_SPECIAL_3 = 3, + SAY_JUMPDOWN = 4, + SAY_SLAY = 5, + SAY_BERSERK = 6, + SAY_WIPE = 7, + SAY_DEATH = 8, + SAY_END_NORMAL_1 = 9, + SAY_END_NORMAL_2 = 10, + SAY_END_NORMAL_3 = 11, + SAY_END_HARD_1 = 12, + SAY_END_HARD_2 = 13, + SAY_END_HARD_3 = 14 }; class boss_thorim : public CreatureScript { -public: - boss_thorim() : CreatureScript("boss_thorim") { } + public: + boss_thorim() : CreatureScript("boss_thorim") { } - CreatureAI* GetAI(Creature* creature) const - { - return GetUlduarAI<boss_thorimAI>(creature); - } - - struct boss_thorimAI : public BossAI - { - boss_thorimAI(Creature* creature) : BossAI(creature, BOSS_THORIM) + struct boss_thorimAI : public BossAI { - } + boss_thorimAI(Creature* creature) : BossAI(creature, BOSS_THORIM) + { + } - void Reset() - { - _Reset(); - } + void Reset() + { + _Reset(); + } - void EnterEvadeMode() - { - DoScriptText(SAY_WIPE, me); - _EnterEvadeMode(); - } + void EnterEvadeMode() + { + Talk(SAY_WIPE); + _EnterEvadeMode(); + } - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); - } + void KilledUnit(Unit* who) + { + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_SLAY); + } - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - _JustDied(); - } + void JustDied(Unit* /*killer*/) + { + Talk(SAY_DEATH); + _JustDied(); + } - void EnterCombat(Unit* /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); - _EnterCombat(); - } + void EnterCombat(Unit* /*who*/) + { + Talk(SAY_AGGRO); + _EnterCombat(); + } - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - //SPELLS TODO: + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + //SPELLS TODO: - // - DoMeleeAttackIfReady(); + // + DoMeleeAttackIfReady(); - EnterEvadeIfOutOfCombatArea(diff); - } - }; + EnterEvadeIfOutOfCombatArea(diff); + } + }; + CreatureAI* GetAI(Creature* creature) const + { + return GetUlduarAI<boss_thorimAI>(creature); + } }; void AddSC_boss_thorim() diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 30f60da178a..09ab35d6589 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -157,15 +157,18 @@ enum XT002Data enum Yells { - SAY_AGGRO = -1603300, - SAY_HEART_OPENED = -1603301, - SAY_HEART_CLOSED = -1603302, - SAY_TYMPANIC_TANTRUM = -1603303, - SAY_SLAY_1 = -1603304, - SAY_SLAY_2 = -1603305, - SAY_BERSERK = -1603306, - SAY_DEATH = -1603307, - SAY_SUMMON = -1603308, + SAY_AGGRO = 0, + SAY_HEART_OPENED = 1, + SAY_HEART_CLOSED = 2, + SAY_TYMPANIC_TANTRUM = 3, + SAY_SLAY = 4, + SAY_BERSERK = 5, + SAY_DEATH = 6, + SAY_SUMMON = 7, + EMOTE_HEART_OPENED = 8, + EMOTE_HEART_CLOSED = 9, + EMOTE_TYMPANIC_TANTRUM = 10, + EMOTE_SCRAPBOT = 11 }; enum AchievementCredits @@ -223,7 +226,7 @@ class boss_xt002 : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); _EnterCombat(); events.ScheduleEvent(EVENT_ENRAGE, TIMER_ENRAGE); @@ -248,14 +251,15 @@ class boss_xt002 : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* who) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + if (who->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); _JustDied(); } @@ -292,7 +296,8 @@ class boss_xt002 : public CreatureScript events.ScheduleEvent(EVENT_GRAVITY_BOMB, TIMER_GRAVITY_BOMB); break; case EVENT_TYMPANIC_TANTRUM: - DoScriptText(SAY_TYMPANIC_TANTRUM, me); + Talk(SAY_TYMPANIC_TANTRUM); + Talk(EMOTE_TYMPANIC_TANTRUM); DoCast(SPELL_TYMPANIC_TANTRUM); events.ScheduleEvent(EVENT_TYMPANIC_TANTRUM, urand(TIMER_TYMPANIC_TANTRUM_MIN, TIMER_TYMPANIC_TANTRUM_MAX)); break; @@ -300,7 +305,7 @@ class boss_xt002 : public CreatureScript SetPhaseOne(); break; case EVENT_ENRAGE: - DoScriptText(SAY_BERSERK, me); + Talk(SAY_BERSERK); DoCast(me, SPELL_ENRAGE); break; case EVENT_ENTER_HARD_MODE: @@ -325,6 +330,7 @@ class boss_xt002 : public CreatureScript if (me->GetHealthPct() > (25 * (4 - _heartExposed))) ++_heartExposed; + Talk(EMOTE_SCRAPBOT); _healthRecovered = true; } } @@ -359,7 +365,8 @@ class boss_xt002 : public CreatureScript void ExposeHeart() { - DoScriptText(SAY_HEART_OPENED, me); + Talk(SAY_HEART_OPENED); + Talk(EMOTE_HEART_OPENED); DoCast(me, SPELL_SUBMERGE); // WIll make creature untargetable me->AttackStop(); @@ -391,7 +398,8 @@ class boss_xt002 : public CreatureScript void SetPhaseOne() { - DoScriptText(SAY_HEART_CLOSED, me); + Talk(SAY_HEART_CLOSED); + Talk(EMOTE_HEART_CLOSED); DoCast(me, SPELL_STAND); me->SetReactState(REACT_AGGRESSIVE); @@ -928,7 +936,8 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader } } - DoScriptText(SAY_SUMMON, caster->GetVehicleBase()); + if (Creature* base = caster->GetVehicleCreatureBase()) + base->AI()->Talk(SAY_SUMMON); } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index 58ba125b994..20d6a7a40da 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -43,18 +43,6 @@ enum Sara enum YoggSaron_Yells { - SAY_PHASE2_1 = -1603330, - SAY_PHASE2_2 = -1603331, - SAY_PHASE2_3 = -1603332, - SAY_PHASE2_4 = -1603333, - SAY_PHASE2_5 = -1603334, - SAY_PHASE3 = -1603335, - SAY_VISION = -1603336, - SAY_SLAY_1 = -1603337, - SAY_SLAY_2 = -1603338, - WHISP_INSANITY_1 = -1603339, - WHISP_INSANITY_2 = -1603340, - SAY_DEATH = -1603341, }; enum diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 7d3b943f7b0..b334b8dcbed 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -34,6 +34,14 @@ static DoorData const doorData[] = {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }, }; +MinionData const minionData[] = +{ + { NPC_STEELBREAKER, BOSS_ASSEMBLY_OF_IRON }, + { NPC_MOLGEIM, BOSS_ASSEMBLY_OF_IRON }, + { NPC_BRUNDIR, BOSS_ASSEMBLY_OF_IRON }, + { 0, 0, } +}; + class instance_ulduar : public InstanceMapScript { public: @@ -43,8 +51,6 @@ class instance_ulduar : public InstanceMapScript { instance_ulduar_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { } - std::string m_strInstData; - // Creatures uint64 LeviathanGUID; uint64 IgnisGUID; @@ -99,6 +105,7 @@ class instance_ulduar : public InstanceMapScript { SetBossNumber(MAX_ENCOUNTER); LoadDoorData(doorData); + LoadMinionData(minionData); IgnisGUID = 0; RazorscaleGUID = 0; RazorscaleController = 0; @@ -202,18 +209,24 @@ class instance_ulduar : public InstanceMapScript case NPC_XT_TOY_PILE: for (uint8 i = 0; i < 4; ++i) if (!XTToyPileGUIDs[i]) + { XTToyPileGUIDs[i] = creature->GetGUID(); + break; + } break; // Assembly of Iron case NPC_STEELBREAKER: AssemblyGUIDs[0] = creature->GetGUID(); + AddMinion(creature, true); break; case NPC_MOLGEIM: AssemblyGUIDs[1] = creature->GetGUID(); + AddMinion(creature, true); break; case NPC_BRUNDIR: AssemblyGUIDs[2] = creature->GetGUID(); + AddMinion(creature, true); break; // Freya's Keeper @@ -314,10 +327,25 @@ class instance_ulduar : public InstanceMapScript { switch (creature->GetEntry()) { + case NPC_XT_TOY_PILE: + for (uint8 i = 0; i < 4; ++i) + if (XTToyPileGUIDs[i] == creature->GetGUID()) + { + XTToyPileGUIDs[i] = 0; + break; + } + break; + case NPC_STEELBREAKER: + case NPC_MOLGEIM: + case NPC_BRUNDIR: + AddMinion(creature, false); + break; case NPC_BRANN_BRONZBEARD_ALG: if (BrannBronzebeardAlgGUID == creature->GetGUID()) BrannBronzebeardAlgGUID = 0; break; + default: + break; } } @@ -707,11 +735,11 @@ class instance_ulduar : public InstanceMapScript return RazorHarpoonGUIDs[3]; // Assembly of Iron - case BOSS_STEELBREAKER: + case DATA_STEELBREAKER: return AssemblyGUIDs[0]; - case BOSS_MOLGEIM: + case DATA_MOLGEIM: return AssemblyGUIDs[1]; - case BOSS_BRUNDIR: + case DATA_BRUNDIR: return AssemblyGUIDs[2]; // Freya's Keepers diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 858a82bbe57..4dff89f7b2c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -25,28 +25,25 @@ extern Position const AlgalonLandPos; enum UlduarBosses { - MAX_ENCOUNTER = 20, + MAX_ENCOUNTER = 17, BOSS_LEVIATHAN = 0, BOSS_IGNIS = 1, BOSS_RAZORSCALE = 2, BOSS_XT002 = 3, BOSS_ASSEMBLY_OF_IRON = 4, - BOSS_STEELBREAKER = 5, - BOSS_MOLGEIM = 6, - BOSS_BRUNDIR = 7, - BOSS_KOLOGARN = 8, - BOSS_AURIAYA = 9, - BOSS_MIMIRON = 10, - BOSS_HODIR = 11, - BOSS_THORIM = 12, - BOSS_FREYA = 13, - BOSS_BRIGHTLEAF = 14, - BOSS_IRONBRANCH = 15, - BOSS_STONEBARK = 16, - BOSS_VEZAX = 17, - BOSS_YOGGSARON = 18, - BOSS_ALGALON = 19, + BOSS_KOLOGARN = 5, + BOSS_AURIAYA = 6, + BOSS_MIMIRON = 7, + BOSS_HODIR = 8, + BOSS_THORIM = 9, + BOSS_FREYA = 10, + BOSS_BRIGHTLEAF = 11, + BOSS_IRONBRANCH = 12, + BOSS_STONEBARK = 13, + BOSS_VEZAX = 14, + BOSS_YOGGSARON = 15, + BOSS_ALGALON = 16, }; enum UlduarNPCs @@ -207,6 +204,11 @@ enum UlduarData DATA_TOY_PILE_2, DATA_TOY_PILE_3, + // Assembly of Iron + DATA_STEELBREAKER, + DATA_MOLGEIM, + DATA_BRUNDIR, + // Hodir DATA_HODIR_RARE_CACHE, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index aaa95631792..4fe56b346b2 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -29,14 +29,14 @@ EndScriptData */ enum Yells { //Yells Ingvar - YELL_AGGRO_1 = -1574005, - YELL_AGGRO_2 = -1574006, + YELL_AGGRO_1 = 0, + YELL_AGGRO_2 = 1, - YELL_DEAD_1 = -1574007, - YELL_DEAD_2 = -1574008, + YELL_DEAD_1 = 2, + YELL_DEAD_2 = 3, - YELL_KILL_1 = -1574009, - YELL_KILL_2 = -1574010, + YELL_KILL_1 = 4, + YELL_KILL_2 = 5, }; enum Creatures @@ -151,7 +151,7 @@ public: events.SetPhase(PHASE_EVENT); events.ScheduleEvent(EVENT_SUMMON_BANSHEE, 3 * IN_MILLISECONDS, 0, PHASE_EVENT); - DoScriptText(YELL_DEAD_1, me); + Talk(YELL_DEAD_1); } if (events.GetPhaseMask() & (1 << PHASE_EVENT)) @@ -164,13 +164,13 @@ public: me->UpdateEntry(MOB_INGVAR_UNDEAD); events.ScheduleEvent(EVENT_JUST_TRANSFORMED, 2 * IN_MILLISECONDS, 0, PHASE_EVENT); - DoScriptText(YELL_AGGRO_2, me); + Talk(YELL_AGGRO_2); } void EnterCombat(Unit* /*who*/) { if (!bIsUndead) - DoScriptText(YELL_AGGRO_1, me); + Talk(YELL_AGGRO_1); if (instance) instance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); @@ -180,7 +180,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(YELL_DEAD_2, me); + Talk(YELL_DEAD_2); if (instance) { @@ -201,10 +201,7 @@ public: void KilledUnit(Unit* /*victim*/) { - if (bIsUndead) - DoScriptText(YELL_KILL_1, me); - else - DoScriptText(YELL_KILL_2, me); + Talk(bIsUndead ? YELL_KILL_1 : YELL_KILL_2); } void UpdateAI(const uint32 diff) @@ -329,7 +326,7 @@ public: { me->GetMotionMaster()->MovePoint(1, x, y, z+15); - // DoScriptText(YELL_RESSURECT, me); + // Talk(YELL_RESSURECT); } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 7c977250e79..aad4c9989c1 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -29,18 +29,18 @@ EndScriptData */ enum eEnums { //signed for 24200, but used by 24200, 27390 - YELL_SKARVALD_AGGRO = -1574011, - YELL_SKARVALD_DAL_DIED = -1574012, - YELL_SKARVALD_SKA_DIEDFIRST = -1574013, - YELL_SKARVALD_KILL = -1574014, - YELL_SKARVALD_DAL_DIEDFIRST = -1574015, + YELL_SKARVALD_AGGRO = 0, + YELL_SKARVALD_DAL_DIED = 1, + YELL_SKARVALD_SKA_DIEDFIRST = 2, + YELL_SKARVALD_KILL = 3, + YELL_SKARVALD_DAL_DIEDFIRST = 4, //signed for 24201, but used by 24201, 27389 - YELL_DALRONN_AGGRO = -1574016, - YELL_DALRONN_SKA_DIED = -1574017, - YELL_DALRONN_DAL_DIEDFIRST = -1574018, - YELL_DALRONN_KILL = -1574019, - YELL_DALRONN_SKA_DIEDFIRST = -1574020, + YELL_DALRONN_AGGRO = 0, + YELL_DALRONN_SKA_DIED = 1, + YELL_DALRONN_DAL_DIEDFIRST = 2, + YELL_DALRONN_KILL = 3, + YELL_DALRONN_SKA_DIEDFIRST = 4, //Spells of Skarvald and his Ghost MOB_SKARVALD_THE_CONSTRUCTOR = 24200, @@ -123,7 +123,7 @@ public: { if (!ghost && instance) { - DoScriptText(YELL_SKARVALD_AGGRO, me); + Talk(YELL_SKARVALD_AGGRO); Unit* dalronn = Unit::GetUnit(*me, instance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) @@ -151,13 +151,13 @@ public: { if (dalronn->isDead()) { - DoScriptText(YELL_SKARVALD_DAL_DIED, me); + Talk(YELL_SKARVALD_DAL_DIED); instance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST, me); + Talk(YELL_SKARVALD_SKA_DIEDFIRST); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_SKARVALD_GHOST, true); @@ -176,7 +176,7 @@ public: { if (!ghost) { - DoScriptText(YELL_SKARVALD_KILL, me); + Talk(YELL_SKARVALD_KILL); } } @@ -211,7 +211,7 @@ public: { if (Response_Timer <= diff) { - DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST, me); + Talk(YELL_SKARVALD_DAL_DIEDFIRST); Response_Timer = 0; } else Response_Timer -= diff; @@ -310,14 +310,14 @@ public: { if (skarvald->isDead()) { - DoScriptText(YELL_DALRONN_SKA_DIED, me); + Talk(YELL_DALRONN_SKA_DIED); if (instance) instance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoScriptText(YELL_DALRONN_DAL_DIEDFIRST, me); + Talk(YELL_DALRONN_DAL_DIEDFIRST); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_DALRONN_GHOST, true); @@ -336,7 +336,7 @@ public: { if (!ghost) { - DoScriptText(YELL_DALRONN_KILL, me); + Talk(YELL_DALRONN_KILL); } } @@ -355,7 +355,7 @@ public: { if (AggroYell_Timer <= diff) { - DoScriptText(YELL_DALRONN_AGGRO, me); + Talk(YELL_DALRONN_AGGRO); AggroYell_Timer = 0; } else AggroYell_Timer -= diff; @@ -382,7 +382,7 @@ public: { if (Response_Timer <= diff) { - DoScriptText(YELL_DALRONN_SKA_DIEDFIRST, me); + Talk(YELL_DALRONN_SKA_DIEDFIRST); Response_Timer = 0; } else Response_Timer -= diff; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 8cbfe4bafb4..d2772514edf 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -47,10 +47,9 @@ enum OrbSpells //not in db enum Yells { - SAY_AGGRO = -1575000, - SAY_SLAY_1 = -1575001, - SAY_SLAY_2 = -1575002, - SAY_DEATH = -1575003 + SAY_AGGRO = 0, + SAY_SLAY = 1 + //SAY_DEATH = 2 Missing in database }; enum Creatures @@ -155,7 +154,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void AttackStart(Unit* who) @@ -212,7 +211,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + //Talk(SAY_DEATH); if (instance) instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE); Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); @@ -222,7 +221,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void NextPhase() diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 63898e57c08..45bab11c46a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -34,16 +34,13 @@ Script Data End */ //Yell enum eYells { - SAY_AGGRO = -1575004, - SAY_KILL_1 = -1575005, - SAY_KILL_2 = -1575006, - EMOTE_RANGE = -1575007, //Skadi - SAY_DEATH = -1575008, - SAY_DRAKE_DEATH = -1575009, - EMOTE_BREATH = -1575010, //Grauf - SAY_DRAKE_BREATH_1 = -1575011, - SAY_DRAKE_BREATH_2 = -1575012, - SAY_DRAKE_BREATH_3 = -1575013, + SAY_AGGRO = 0, + SAY_KILL = 1, + EMOTE_RANGE = 2, + SAY_DEATH = 3, + SAY_DRAKE_DEATH = 4, + EMOTE_BREATH = 5, + SAY_DRAKE_BREATH = 6 }; static Position SpawnLoc = {468.931f, -513.555f, 104.723f, 0}; @@ -230,7 +227,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); @@ -297,7 +294,7 @@ public: } me->GetMotionMaster()->MoveJump(Location[4].GetPositionX(), Location[4].GetPositionY(), Location[4].GetPositionZ(), 5.0f, 10.0f); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); - DoScriptText(SAY_DRAKE_DEATH, me); + Talk(SAY_DRAKE_DEATH); m_uiCrushTimer = 8000; m_uiPoisonedSpearTimer = 10000; m_uiWhirlwindTimer = 20000; @@ -319,7 +316,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); if (!m_bSaidEmote) { - DoScriptText(EMOTE_RANGE, me); + Talk(EMOTE_RANGE); m_bSaidEmote = true; } } @@ -360,8 +357,8 @@ public: break; case 3: me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); - DoScriptText(RAND(SAY_DRAKE_BREATH_1, SAY_DRAKE_BREATH_2), me); - DoScriptText(EMOTE_BREATH, me); + Talk(SAY_DRAKE_BREATH); + Talk(EMOTE_BREATH); m_uiMovementTimer = 2500; break; case 4: @@ -413,7 +410,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); Summons.DespawnAll(); if (instance) instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); @@ -421,7 +418,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); + Talk(SAY_KILL); } void SpawnMobs() diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 0278125deb3..96cfee7c2b8 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -55,16 +55,13 @@ enum Spells //not in db enum Yells { - SAY_AGGRO = -1575028, - SAY_SLAY_1 = -1575029, - SAY_SLAY_2 = -1575030, - SAY_SLAY_3 = -1575031, - SAY_SLAY_4 = -1575032, - SAY_DEATH = -1575033, - SAY_SUMMON_BJORN = -1575034, - SAY_SUMMON_HALDOR = -1575035, - SAY_SUMMON_RANULF = -1575036, - SAY_SUMMON_TORGYN = -1575037 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SUMMON_BJORN = 3, + SAY_SUMMON_HALDOR = 4, + SAY_SUMMON_RANULF = 5, + SAY_SUMMON_TORGYN = 6 }; enum Creatures @@ -190,7 +187,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS); @@ -216,7 +213,7 @@ public: { if (m_uiPause_Timer <= diff) { - DoScriptText(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].say, me); + Talk(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].say); DoCast(me, SPELL_CHANNEL_YMIRON_TO_SPIRIT); // should be on spirit if (Creature* temp = me->SummonCreature(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].npc, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnX, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnY, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnZ, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnO, TEMPSUMMON_CORPSE_DESPAWN, 0)) { @@ -370,7 +367,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); DespawnBoatGhosts(m_uiActivedCreatureGUID); DespawnBoatGhosts(m_uiOrbGUID); @@ -381,7 +378,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); + Talk(SAY_SLAY); } void DespawnBoatGhosts(uint64 m_uiCreatureGUID) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 96e0bc66bd1..8a5e25e4487 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -19,7 +19,10 @@ #include "ScriptedCreature.h" #include "vault_of_archavon.h" -#define EMOTE_BERSERK -1590002 +enum +{ + EMOTE_BERSERK = 0 +}; //Spells Archavon #define SPELL_ROCK_SHARDS 58678 @@ -109,7 +112,7 @@ class boss_archavon : public CreatureScript break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK); - DoScriptText(EMOTE_BERSERK, me); + Talk(EMOTE_BERSERK); break; default: break; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 903280d317a..b61bb20389d 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -37,9 +37,9 @@ enum Spells enum BossEmotes { - EMOTE_OVERCHARGE = -1590000, - EMOTE_MINION_RESPAWN = -1590001, - EMOTE_BERSERK = -1590002, + EMOTE_OVERCHARGE = 0, + EMOTE_MINION_RESPAWN = 1, + EMOTE_BERSERK = 2 }; enum Events @@ -146,14 +146,14 @@ class boss_emalon : public CreatureScript { minion->CastSpell(me, SPELL_OVERCHARGED, true); minion->SetFullHealth(); - DoScriptText(EMOTE_OVERCHARGE, me); + Talk(EMOTE_OVERCHARGE); events.ScheduleEvent(EVENT_OVERCHARGE, 45000); } } break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK); - DoScriptText(EMOTE_BERSERK, me); + Talk(EMOTE_BERSERK); break; default: break; @@ -198,7 +198,7 @@ class mob_tempest_minion : public CreatureScript if (emalon->isAlive()) { emalon->SummonCreature(MOB_TEMPEST_MINION, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - DoScriptText(EMOTE_MINION_RESPAWN, me); + Talk(EMOTE_MINION_RESPAWN); } } } @@ -244,7 +244,7 @@ class mob_tempest_minion : public CreatureScript { DoCast(me, SPELL_OVERCHARGED_BLAST); me->DespawnOrUnsummon(); - DoScriptText(EMOTE_MINION_RESPAWN, me); + Talk(EMOTE_MINION_RESPAWN); } } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index b4ce402e7de..7b1b9e96baf 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -34,16 +34,13 @@ enum Spells enum Yells { - SAY_AGGRO = -1608000, - SAY_SLAY_1 = -1608001, - SAY_SLAY_2 = -1608002, - SAY_SLAY_3 = -1608003, - SAY_DEATH = -1608004, - SAY_SPAWN = -1608005, - SAY_DISRUPTION = -1608006, - SAY_BREATH_ATTACK = -1608007, - SAY_SPECIAL_ATTACK_1 = -1608008, - SAY_SPECIAL_ATTACK_2 = -1608009 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SPAWN = 3, + SAY_DISRUPTION = 4, + SAY_BREATH_ATTACK = 5, + SAY_SPECIAL_ATTACK = 6 }; class boss_cyanigosa : public CreatureScript @@ -84,7 +81,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS); @@ -144,7 +141,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_CYANIGOSA_EVENT, DONE); @@ -154,7 +151,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index bd59b731c3c..15cd12140cf 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -34,14 +34,12 @@ enum Spells enum Yells { - SAY_AGGRO = -1608010, - SAY_SLAY_1 = -1608011, - SAY_SLAY_2 = -1608012, - SAY_SLAY_3 = -1608013, - SAY_DEATH = -1608014, - SAY_SPAWN = -1608015, - SAY_ADD_KILLED = -1608016, - SAY_BOTH_ADDS_KILLED = -1608017 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SPAWN = 3, + SAY_ADD_KILLED = 4, + SAY_BOTH_ADDS_KILLED = 5 }; class boss_erekem : public CreatureScript @@ -125,7 +123,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCast(me, SPELL_EARTH_SHIELD); if (instance) @@ -209,7 +207,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) { @@ -230,7 +228,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } uint64 GetChainHealTargetGUID() diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index cea00417233..fba7efe43ab 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -40,15 +40,13 @@ enum IchoronCreatures enum Yells { - SAY_AGGRO = -1608018, - SAY_SLAY_1 = -1608019, - SAY_SLAY_2 = -1608020, - SAY_SLAY_3 = -1608021, - SAY_DEATH = -1608022, - SAY_SPAWN = -1608023, - SAY_ENRAGE = -1608024, - SAY_SHATTER = -1608025, - SAY_BUBBLE = -1608026 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SPAWN = 3, + SAY_ENRAGE = 4, + SAY_SHATTER = 5, + SAY_BUBBLE = 6 }; enum Actions @@ -120,7 +118,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCast(me, SPELL_PROTECTIVE_BUBBLE); @@ -189,7 +187,7 @@ public: if (!HealthBelowPct(25)) { - DoScriptText(SAY_BUBBLE, me); + Talk(SAY_BUBBLE); DoCast(me, SPELL_PROTECTIVE_BUBBLE, true); } @@ -214,7 +212,7 @@ public: if (!bIsFrenzy && HealthBelowPct(25) && !bIsExploded) { - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); DoCast(me, SPELL_FRENZY, true); bIsFrenzy = true; } @@ -227,7 +225,7 @@ public: { if (!me->HasAura(SPELL_PROTECTIVE_BUBBLE, 0)) { - DoScriptText(SAY_SHATTER, me); + Talk(SAY_SHATTER); DoCast(me, SPELL_WATER_BLAST); DoCast(me, SPELL_DRAINED); bIsExploded = true; @@ -277,7 +275,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (bIsExploded) { @@ -326,7 +324,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 58d7b59c7dd..429b2ac32ea 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -22,41 +22,38 @@ enum Spells { - SPELL_ARCANE_BARRAGE_VOLLEY = 54202, - SPELL_ARCANE_BARRAGE_VOLLEY_H = 59483, - SPELL_ARCANE_BUFFET = 54226, - SPELL_ARCANE_BUFFET_H = 59485, - SPELL_SUMMON_ETHEREAL_SPHERE_1 = 54102, - SPELL_SUMMON_ETHEREAL_SPHERE_2 = 54137, - SPELL_SUMMON_ETHEREAL_SPHERE_3 = 54138, + SPELL_ARCANE_BARRAGE_VOLLEY = 54202, + SPELL_ARCANE_BARRAGE_VOLLEY_H = 59483, + SPELL_ARCANE_BUFFET = 54226, + SPELL_ARCANE_BUFFET_H = 59485, + SPELL_SUMMON_ETHEREAL_SPHERE_1 = 54102, + SPELL_SUMMON_ETHEREAL_SPHERE_2 = 54137, + SPELL_SUMMON_ETHEREAL_SPHERE_3 = 54138, }; enum NPCs { - NPC_ETHEREAL_SPHERE = 29271, - //NPC_ETHEREAL_SPHERE2 = 32582, // heroic only? + NPC_ETHEREAL_SPHERE = 29271, + //NPC_ETHEREAL_SPHERE2 = 32582, // heroic only? }; enum CreatureSpells { - SPELL_ARCANE_POWER = 54160, - H_SPELL_ARCANE_POWER = 59474, - SPELL_SUMMON_PLAYERS = 54164, - SPELL_POWER_BALL_VISUAL = 54141, + SPELL_ARCANE_POWER = 54160, + H_SPELL_ARCANE_POWER = 59474, + SPELL_SUMMON_PLAYERS = 54164, + SPELL_POWER_BALL_VISUAL = 54141, }; enum Yells { - SAY_AGGRO = -1608027, - SAY_SLAY_1 = -1608028, - SAY_SLAY_2 = -1608029, - SAY_SLAY_3 = -1608030, - SAY_DEATH = -1608031, - SAY_SPAWN = -1608032, - SAY_CHARGED = -1608033, - SAY_REPEAT_SUMMON_1 = -1608034, - SAY_REPEAT_SUMMON_2 = -1608035, - SAY_SUMMON_ENERGY = -1608036 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SPAWN = 3, + SAY_CHARGED = 4, + SAY_REPEAT_SUMMON = 5, + SAY_SUMMON_ENERGY = 6 }; class boss_xevozz : public CreatureScript @@ -139,7 +136,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) { if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_XEVOZZ_CELL))) @@ -182,7 +179,7 @@ public: if (uiSummonEtherealSphere_Timer < uiDiff) { - DoScriptText(SAY_SPAWN, me); + Talk(SAY_SPAWN); DoCast(me, SPELL_SUMMON_ETHEREAL_SPHERE_1); if (IsHeroic()) // extra one for heroic me->SummonCreature(NPC_ETHEREAL_SPHERE, me->GetPositionX()-5+rand()%10, me->GetPositionY()-5+rand()%10, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 40000); @@ -197,7 +194,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); DespawnSphere(); @@ -220,7 +217,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 408a7083383..5216ae9f08d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -38,14 +38,12 @@ enum ZuramatCreatures enum Yells { - SAY_AGGRO = -1608037, - SAY_SLAY_1 = -1608038, - SAY_SLAY_2 = -1608039, - SAY_SLAY_3 = -1608040, - SAY_DEATH = -1608041, - SAY_SPAWN = -1608042, - SAY_SHIELD = -1608043, - SAY_WHISPER = -1608044 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, + SAY_SPAWN = 3, + SAY_SHIELD = 4, + SAY_WHISPER = 5 }; #define DATA_VOID_DANCE 2153 @@ -106,7 +104,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) { if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_ZURAMAT_CELL))) @@ -168,7 +166,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) { @@ -190,7 +188,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void JustSummoned(Creature* summon) diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 5e3bbc01025..c1c93c789de 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -16,6 +16,7 @@ */ #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "InstanceScript.h" #include "violet_hold.h" #include "Player.h" @@ -94,7 +95,7 @@ const Position MiddleRoomPortalSaboLocation = {1896.622925f, 804.854126f, 38.504 //Cyanigosa's prefight event data enum Yells { - CYANIGOSA_SAY_SPAWN = -1608005 + CYANIGOSA_SAY_SPAWN = 0 }; enum Spells @@ -742,7 +743,7 @@ public: { case 1: pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false); - DoScriptText(CYANIGOSA_SAY_SPAWN, pCyanigosa); + pCyanigosa->AI()->Talk(CYANIGOSA_SAY_SPAWN); uiCyanigosaEventTimer = 7*IN_MILLISECONDS; ++uiCyanigosaEventPhase; break; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index c73cb97f2d1..5e326af9891 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -125,7 +125,7 @@ enum Spells enum eSinclari { - SAY_SINCLARI_1 = -1608045 + SAY_SINCLARI_1 = 0 }; float FirstPortalWPs [6][3] = @@ -353,7 +353,7 @@ public: switch (uiPhase) { case 1: - DoScriptText(SAY_SINCLARI_1, me); + Talk(SAY_SINCLARI_1); uiTimer = 4000; uiPhase = 2; break; diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index bbc26de85eb..628de0238e0 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -66,26 +66,26 @@ public: { npc_sinkhole_kill_creditAI(Creature* creature) : ScriptedAI(creature){} - uint32 uiPhaseTimer; - uint8 Phase; + uint32 phaseTimer; + uint8 phase; uint64 casterGuid; void Reset() { - uiPhaseTimer = 500; - Phase = 0; + phaseTimer = 500; + phase = 0; casterGuid = 0; } void SpellHit(Unit* caster, const SpellInfo* spell) { - if (Phase) + if (phase) return; if (spell->Id == SPELL_SET_CART && caster->GetTypeId() == TYPEID_PLAYER && CAST_PLR(caster)->GetQuestStatus(11897) == QUEST_STATUS_INCOMPLETE) { - Phase = 1; + phase = 1; casterGuid = caster->GetGUID(); } } @@ -94,32 +94,32 @@ public: void UpdateAI(const uint32 diff) { - if (!Phase) + if (!phase) return; - if (uiPhaseTimer <= diff) + if (phaseTimer <= diff) { - switch (Phase) + switch (phase) { case 1: DoCast(me, SPELL_EXPLODE_CART, true); DoCast(me, SPELL_SUMMON_CART, true); if (GameObject* cart = me->FindNearestGameObject(188160, 3)) cart->SetUInt32Value(GAMEOBJECT_FACTION, 14); - uiPhaseTimer = 3000; - Phase = 2; + phaseTimer = 3000; + phase = 2; break; case 2: if (GameObject* cart = me->FindNearestGameObject(188160, 3)) cart->UseDoorOrButton(); DoCast(me, SPELL_EXPLODE_CART, true); - uiPhaseTimer = 3000; - Phase = 3; + phaseTimer = 3000; + phase = 3; break; case 3: DoCast(me, SPELL_EXPLODE_CART, true); - uiPhaseTimer = 2000; - Phase = 4; + phaseTimer = 2000; + phase = 4; case 5: DoCast(me, SPELL_SUMMON_WORM, true); if (Unit* worm = me->FindNearestCreature(26250, 3)) @@ -127,8 +127,8 @@ public: worm->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); worm->HandleEmoteCommand(EMOTE_ONESHOT_EMERGE); } - uiPhaseTimer = 1000; - Phase = 6; + phaseTimer = 1000; + phase = 6; break; case 6: DoCast(me, SPELL_EXPLODE_CART, true); @@ -137,21 +137,21 @@ public: me->Kill(worm); worm->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - uiPhaseTimer = 2000; - Phase = 7; + phaseTimer = 2000; + phase = 7; break; case 7: DoCast(me, SPELL_EXPLODE_CART, true); if (Player* caster = Unit::GetPlayer(*me, casterGuid)) caster->KilledMonster(me->GetCreatureTemplate(), me->GetGUID()); - uiPhaseTimer = 5000; - Phase = 8; + phaseTimer = 5000; + phase = 8; break; case 8: EnterEvadeMode(); break; } - } else uiPhaseTimer -= diff; + } else phaseTimer -= diff; } @@ -547,14 +547,14 @@ public: npc_nesingwary_trapperAI(Creature* creature) : ScriptedAI(creature) { creature->SetVisible(false); } uint64 go_caribouGUID; - uint8 Phase; - uint32 uiPhaseTimer; + uint8 phase; + uint32 phaseTimer; void Reset() { me->SetVisible(false); - uiPhaseTimer = 2500; - Phase = 1; + phaseTimer = 2500; + phase = 1; go_caribouGUID = 0; } @@ -578,41 +578,41 @@ public: void UpdateAI(const uint32 diff) { - if (uiPhaseTimer <= diff) + if (phaseTimer <= diff) { - switch (Phase) + switch (phase) { case 1: me->SetVisible(true); - uiPhaseTimer = 2000; - Phase = 2; + phaseTimer = 2000; + phase = 2; break; case 2: if (GameObject* go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) me->GetMotionMaster()->MovePoint(0, go_fur->GetPositionX(), go_fur->GetPositionY(), go_fur->GetPositionZ()); - uiPhaseTimer = 1500; - Phase = 3; + phaseTimer = 1500; + phase = 3; break; case 3: - //DoScriptText(SAY_NESINGWARY_1, me); - uiPhaseTimer = 2000; - Phase = 4; + //Talk(SAY_NESINGWARY_1); + phaseTimer = 2000; + phase = 4; break; case 4: me->HandleEmoteCommand(EMOTE_ONESHOT_LOOT); - uiPhaseTimer = 1000; - Phase = 5; + phaseTimer = 1000; + phase = 5; break; case 5: me->HandleEmoteCommand(EMOTE_ONESHOT_NONE); - uiPhaseTimer = 500; - Phase = 6; + phaseTimer = 500; + phase = 6; break; case 6: if (GameObject* go_fur = me->FindNearestGameObject(GO_HIGH_QUALITY_FUR, 11.0f)) go_fur->Delete(); - uiPhaseTimer = 500; - Phase = 7; + phaseTimer = 500; + phase = 7; break; case 7: { @@ -627,16 +627,16 @@ public: break; } } - Phase = 8; - uiPhaseTimer = 1000; + phase = 8; + phaseTimer = 1000; } break; case 8: DoCast(me, SPELL_TRAPPED, true); - Phase = 0; + phase = 0; break; } - } else uiPhaseTimer -= diff; + } else phaseTimer -= diff; } }; @@ -658,12 +658,12 @@ enum eLurgglbr FACTION_ESCORTEE_A = 774, FACTION_ESCORTEE_H = 775, -}; -/*#define SAY_WP_1_LUR_START -1571004 -#define SAY_WP_1_LUR_END -1571005 -#define SAY_WP_41_LUR_START -1571006 -#define SAY_WP_41_LUR_END -1571007*/ + SAY_START_1 = 0, + SAY_START_2 = 1, + SAY_END_1 = 2, + SAY_END_2 = 3 +}; class npc_lurgglbr : public CreatureScript { @@ -710,12 +710,12 @@ public: switch (IntroPhase) { case 1: - //DoScriptText(SAY_WP_1_LUR_START, me); + Talk(SAY_START_1); IntroPhase = 2; IntroTimer = 7500; break; case 2: - //DoScriptText(SAY_WP_1_LUR_END, me); + Talk(SAY_END_1); IntroPhase = 3; IntroTimer = 7500; break; @@ -725,12 +725,12 @@ public: IntroTimer = 0; break; case 4: - //DoScriptText(SAY_WP_41_LUR_START, me); + Talk(SAY_START_2); IntroPhase = 5; IntroTimer = 8000; break; case 5: - //DoScriptText(SAY_WP_41_LUR_END, me); + Talk(SAY_END_2); IntroPhase = 6; IntroTimer = 2500; break; @@ -915,26 +915,30 @@ enum eThassarian NPC_GENERAL_ARLOS = 25250, NPC_LERYSSA = 25251, - SAY_TALBOT_1 = -1571004, - SAY_LICH_1 = -1571005, - SAY_TALBOT_2 = -1571006, - SAY_THASSARIAN_1 = -1571007, - SAY_THASSARIAN_2 = -1571008, - SAY_LICH_2 = -1571009, - SAY_THASSARIAN_3 = -1571010, - SAY_TALBOT_3 = -1571011, - SAY_LICH_3 = -1571012, - SAY_TALBOT_4 = -1571013, - SAY_ARLOS_1 = -1571014, - SAY_ARLOS_2 = -1571015, - SAY_LERYSSA_1 = -1571016, - SAY_THASSARIAN_4 = -1571017, - SAY_LERYSSA_2 = -1571018, - SAY_THASSARIAN_5 = -1571019, - SAY_LERYSSA_3 = -1571020, - SAY_THASSARIAN_6 = -1571021, - SAY_LERYSSA_4 = -1571022, - SAY_THASSARIAN_7 = -1571023, + SAY_THASSARIAN_1 = 0, + SAY_THASSARIAN_2 = 1, + SAY_THASSARIAN_3 = 2, + SAY_THASSARIAN_4 = 3, + SAY_THASSARIAN_5 = 4, + SAY_THASSARIAN_6 = 5, + SAY_THASSARIAN_7 = 6, + + SAY_TALBOT_1 = 0, + SAY_TALBOT_2 = 1, + SAY_TALBOT_3 = 2, + SAY_TALBOT_4 = 3, + + SAY_LICH_1 = 0, + SAY_LICH_2 = 1, + SAY_LICH_3 = 2, + + SAY_ARLOS_1 = 0, + SAY_ARLOS_2 = 1, + + SAY_LERYSSA_1 = 0, + SAY_LERYSSA_2 = 1, + SAY_LERYSSA_3 = 2, + SAY_LERYSSA_4 = 3 }; #define GOSSIP_ITEM_T "Let's do this, Thassarian. It's now or never." @@ -946,40 +950,38 @@ public: struct npc_thassarianAI : public npc_escortAI { - npc_thassarianAI(Creature* creature) : npc_escortAI(creature) - { - } + npc_thassarianAI(Creature* creature) : npc_escortAI(creature) {} - uint64 uiArthas; - uint64 uiTalbot; - uint64 uiLeryssa; - uint64 uiArlos; + uint64 arthasGUID; + uint64 talbotGUID; + uint64 leryssaGUID; + uint64 arlosGUID; - bool bArthasInPosition; - bool bArlosInPosition; - bool bLeryssaInPosition; - bool bTalbotInPosition; + bool arthasInPosition; + bool arlosInPosition; + bool leryssaInPosition; + bool talbotInPosition; - uint32 uiPhase; - uint32 uiPhaseTimer; + uint32 phase; + uint32 phaseTimer; void Reset() { me->RestoreFaction(); me->RemoveStandFlags(UNIT_STAND_STATE_SIT); - uiArthas = 0; - uiTalbot = 0; - uiLeryssa = 0; - uiArlos = 0; + arthasGUID = 0; + talbotGUID = 0; + leryssaGUID = 0; + arlosGUID = 0; - bArthasInPosition = false; - bArlosInPosition = false; - bLeryssaInPosition = false; - bTalbotInPosition = false; + arthasInPosition = false; + arlosInPosition = false; + leryssaInPosition = false; + talbotInPosition = false; - uiPhase = 0; - uiPhaseTimer = 0; + phase = 0; + phaseTimer = 0; } void WaypointReached(uint32 waypointId) @@ -992,25 +994,25 @@ public: { case 3: SetEscortPaused(true); - if (Creature* pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* arthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { - uiArthas = pArthas->GetGUID(); - pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pArthas->SetReactState(REACT_PASSIVE); - pArthas->SetWalk(true); - pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f, 3564.841309f, 477.433014f); + arthasGUID = arthas->GetGUID(); + arthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + arthas->SetReactState(REACT_PASSIVE); + arthas->SetWalk(true); + arthas->GetMotionMaster()->MovePoint(0, 3737.374756f, 3564.841309f, 477.433014f); } - if (Creature* pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* talbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { - uiTalbot = pTalbot->GetGUID(); - pTalbot->SetWalk(true); - pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f, 3568.882080f, 477.433014f); + talbotGUID = talbot->GetGUID(); + talbot->SetWalk(true); + talbot->GetMotionMaster()->MovePoint(0, 3738.000977f, 3568.882080f, 477.433014f); } me->SetWalk(false); break; case 4: SetEscortPaused(true); - uiPhase = 7; + phase = 7; break; } } @@ -1019,173 +1021,173 @@ public: { npc_escortAI::UpdateAI(uiDiff); - if (bArthasInPosition && bTalbotInPosition) + if (arthasInPosition && talbotInPosition) { - uiPhase = 1; - bArthasInPosition = false; - bTalbotInPosition = false; + phase = 1; + arthasInPosition = false; + talbotInPosition = false; } - if (bArlosInPosition && bLeryssaInPosition) + if (arlosInPosition && leryssaInPosition) { - bArlosInPosition = false; - bLeryssaInPosition = false; - DoScriptText(SAY_THASSARIAN_1, me); + arlosInPosition = false; + leryssaInPosition = false; + Talk(SAY_THASSARIAN_1); SetEscortPaused(false); } - if (uiPhaseTimer <= uiDiff) + if (phaseTimer <= uiDiff) { - Creature* pTalbot = me->GetCreature(*me, uiTalbot); - Creature* pArthas = me->GetCreature(*me, uiArthas); - switch (uiPhase) + Creature* talbot = me->GetCreature(*me, talbotGUID); + Creature* arthas = me->GetCreature(*me, arthasGUID); + switch (phase) { case 1: - if (pTalbot) - pTalbot->SetStandState(UNIT_STAND_STATE_KNEEL); - uiPhaseTimer = 3000; - ++uiPhase; + if (talbot) + talbot->SetStandState(UNIT_STAND_STATE_KNEEL); + phaseTimer = 3000; + ++phase; break; case 2: - if (pTalbot) + if (talbot) { - pTalbot->UpdateEntry(NPC_PRINCE_VALANAR, ALLIANCE); - pTalbot->setFaction(14); - pTalbot->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTalbot->SetReactState(REACT_PASSIVE); + talbot->UpdateEntry(NPC_PRINCE_VALANAR, ALLIANCE); + talbot->setFaction(14); + talbot->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + talbot->SetReactState(REACT_PASSIVE); } - uiPhaseTimer = 5000; - ++uiPhase; + phaseTimer = 5000; + ++phase; break; case 3: - if (pTalbot) - DoScriptText(SAY_TALBOT_1, pTalbot); - uiPhaseTimer = 5000; - ++uiPhase; + if (talbot) + talbot->AI()->Talk(SAY_TALBOT_1); + phaseTimer = 5000; + ++phase; break; case 4: - if (pArthas) - DoScriptText(SAY_LICH_1, pArthas); - uiPhaseTimer = 5000; - ++uiPhase; + if (arthas) + arthas->AI()->Talk(SAY_LICH_1); + phaseTimer = 5000; + ++phase; break; case 5: - if (pTalbot) - DoScriptText(SAY_TALBOT_2, pTalbot); - uiPhaseTimer = 5000; - ++uiPhase; + if (talbot) + talbot->AI()->Talk(SAY_TALBOT_2); + phaseTimer = 5000; + ++phase; break; case 6: - if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* arlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { - uiArlos = pArlos->GetGUID(); - pArlos->SetWalk(true); - pArlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); + arlosGUID = arlos->GetGUID(); + arlos->SetWalk(true); + arlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); } - if (Creature* pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature* leryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { - uiLeryssa = pLeryssa->GetGUID(); - pLeryssa->SetWalk(false); - pLeryssa->SetReactState(REACT_PASSIVE); - pLeryssa->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pLeryssa->GetMotionMaster()->MovePoint(0, 3741.969971f, 3571.439941f, 477.441010f); + leryssaGUID = leryssa->GetGUID(); + leryssa->SetWalk(false); + leryssa->SetReactState(REACT_PASSIVE); + leryssa->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + leryssa->GetMotionMaster()->MovePoint(0, 3741.969971f, 3571.439941f, 477.441010f); } - uiPhaseTimer = 2000; - uiPhase = 0; + phaseTimer = 2000; + phase = 0; break; case 7: - DoScriptText(SAY_THASSARIAN_2, me); - uiPhaseTimer = 5000; - ++uiPhase; + Talk(SAY_THASSARIAN_2); + phaseTimer = 5000; + ++phase; break; case 8: - if (pArthas && pTalbot) + if (arthas && talbot) { - pArthas->SetInFront(me); //The client doesen't update with the new orientation :l - pTalbot->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_LICH_2, pArthas); + arthas->SetInFront(me); //The client doesen't update with the new orientation :l + talbot->SetStandState(UNIT_STAND_STATE_STAND); + arthas->AI()->Talk(SAY_LICH_2); } - uiPhaseTimer = 5000; - uiPhase = 9; + phaseTimer = 5000; + phase = 9; break; case 9: - DoScriptText(SAY_THASSARIAN_3, me); - uiPhaseTimer = 5000; - uiPhase = 10; + Talk(SAY_THASSARIAN_3); + phaseTimer = 5000; + phase = 10; break; case 10: - if (pTalbot) - DoScriptText(SAY_TALBOT_3, pTalbot); - uiPhaseTimer = 5000; - uiPhase = 11; + if (talbot) + talbot->AI()->Talk(SAY_TALBOT_3); + phaseTimer = 5000; + phase = 11; break; case 11: - if (pArthas) - DoScriptText(SAY_LICH_3, pArthas); - uiPhaseTimer = 5000; - uiPhase = 12; + if (arthas) + arthas->AI()->Talk(SAY_LICH_3); + phaseTimer = 5000; + phase = 12; break; case 12: - if (pTalbot) - DoScriptText(SAY_TALBOT_4, pTalbot); - uiPhaseTimer = 2000; - uiPhase = 13; + if (talbot) + talbot->AI()->Talk(SAY_TALBOT_4); + phaseTimer = 2000; + phase = 13; break; case 13: - if (pArthas) - pArthas->RemoveFromWorld(); - ++uiPhase; + if (arthas) + arthas->RemoveFromWorld(); + ++phase; break; case 14: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (pTalbot) + if (talbot) { - pTalbot->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTalbot->SetReactState(REACT_AGGRESSIVE); - pTalbot->CastSpell(me, SPELL_SHADOW_BOLT, false); + talbot->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + talbot->SetReactState(REACT_AGGRESSIVE); + talbot->CastSpell(me, SPELL_SHADOW_BOLT, false); } - uiPhaseTimer = 1500; - ++uiPhase; + phaseTimer = 1500; + ++phase; break; case 15: me->SetReactState(REACT_AGGRESSIVE); - AttackStart(pTalbot); - uiPhase = 0; + AttackStart(talbot); + phase = 0; break; case 16: me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); - uiPhaseTimer = 20000; - ++uiPhase; + phaseTimer = 20000; + ++phase; break; case 17: - if (Creature* pLeryssa = me->GetCreature(*me, uiLeryssa)) - pLeryssa->RemoveFromWorld(); - if (Creature* pArlos= me->GetCreature(*me, uiArlos)) - pArlos->RemoveFromWorld(); - if (pTalbot) - pTalbot->RemoveFromWorld(); + if (Creature* leryssa = me->GetCreature(*me, leryssaGUID)) + leryssa->RemoveFromWorld(); + if (Creature* arlos= me->GetCreature(*me, arlosGUID)) + arlos->RemoveFromWorld(); + if (talbot) + talbot->RemoveFromWorld(); me->RemoveStandFlags(UNIT_STAND_STATE_SIT); SetEscortPaused(false); - uiPhaseTimer = 0; - uiPhase = 0; + phaseTimer = 0; + phase = 0; } - } else uiPhaseTimer -= uiDiff; + } else phaseTimer -= uiDiff; if (!UpdateVictim()) return; @@ -1195,17 +1197,17 @@ public: void JustDied(Unit* /*killer*/) { - if (Creature* pTalbot = me->GetCreature(*me, uiTalbot)) - pTalbot->RemoveFromWorld(); + if (Creature* talbot = me->GetCreature(*me, talbotGUID)) + talbot->RemoveFromWorld(); - if (Creature* pLeryssa = me->GetCreature(*me, uiLeryssa)) - pLeryssa->RemoveFromWorld(); + if (Creature* leryssa = me->GetCreature(*me, leryssaGUID)) + leryssa->RemoveFromWorld(); - if (Creature* pArlos = me->GetCreature(*me, uiArlos)) - pArlos->RemoveFromWorld(); + if (Creature* arlos = me->GetCreature(*me, arlosGUID)) + arlos->RemoveFromWorld(); - if (Creature* pArthas = me->GetCreature(*me, uiArthas)) - pArthas->RemoveFromWorld(); + if (Creature* arthas = me->GetCreature(*me, arthasGUID)) + arthas->RemoveFromWorld(); } }; @@ -1266,7 +1268,7 @@ public: if (me->isSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->bArthasInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->arthasInPosition = true; } }; @@ -1298,7 +1300,7 @@ public: me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->bArlosInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->arlosInPosition = true; } }; @@ -1330,23 +1332,23 @@ public: creature->RestoreFaction(); } - uint64 LeryssaGUID; - uint64 ArlosGUID; + uint64 leryssaGUID; + uint64 arlosGUID; bool bCheck; - uint32 uiShadowBoltTimer; - uint32 uiDeflectionTimer; - uint32 uiSoulBlastTimer; + uint32 shadowBoltTimer; + uint32 deflectionTimer; + uint32 soulBlastTimer; void Reset() { - LeryssaGUID = 0; - ArlosGUID = 0; + leryssaGUID = 0; + arlosGUID = 0; bCheck = false; - uiShadowBoltTimer = urand(5000, 12000); - uiDeflectionTimer = urand(20000, 25000); - uiSoulBlastTimer = urand (12000, 18000); + shadowBoltTimer = urand(5000, 12000); + deflectionTimer = urand(20000, 25000); + soulBlastTimer = urand (12000, 18000); } void MovementInform(uint32 uiType, uint32 /*uiId*/) { @@ -1355,17 +1357,17 @@ public: if (me->isSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->bTalbotInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->talbotInPosition = true; } void UpdateAI(const uint32 uiDiff) { if (bCheck) { - if (Creature* pLeryssa = me->FindNearestCreature(NPC_LERYSSA, 50.0f, true)) - LeryssaGUID = pLeryssa->GetGUID(); - if (Creature* pArlos = me->FindNearestCreature(NPC_GENERAL_ARLOS, 50.0f, true)) - ArlosGUID = pArlos->GetGUID(); + if (Creature* leryssa = me->FindNearestCreature(NPC_LERYSSA, 50.0f, true)) + leryssaGUID = leryssa->GetGUID(); + if (Creature* arlos = me->FindNearestCreature(NPC_GENERAL_ARLOS, 50.0f, true)) + arlosGUID = arlos->GetGUID(); bCheck = false; } @@ -1374,23 +1376,23 @@ public: if (me->GetAreaId() == 4125) { - if (uiShadowBoltTimer <= uiDiff) + if (shadowBoltTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_SHADOW_BOLT); - uiShadowBoltTimer = urand(5000, 12000); - } else uiShadowBoltTimer -= uiDiff; + shadowBoltTimer = urand(5000, 12000); + } else shadowBoltTimer -= uiDiff; - if (uiDeflectionTimer <= uiDiff) + if (deflectionTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_DEFLECTION); - uiDeflectionTimer = urand(20000, 25000); - } else uiDeflectionTimer -= uiDiff; + deflectionTimer = urand(20000, 25000); + } else deflectionTimer -= uiDiff; - if (uiSoulBlastTimer <= uiDiff) + if (soulBlastTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_SOUL_BLAST); - uiSoulBlastTimer = urand (12000, 18000); - } else uiSoulBlastTimer -= uiDiff; + soulBlastTimer = urand (12000, 18000); + } else soulBlastTimer -= uiDiff; } DoMeleeAttackIfReady(); @@ -1398,22 +1400,22 @@ public: void JustDied(Unit* killer) { - if (!LeryssaGUID || !ArlosGUID) + if (!leryssaGUID || !arlosGUID) return; - Creature* pLeryssa = Unit::GetCreature(*me, LeryssaGUID); - Creature* pArlos = Unit::GetCreature(*me, ArlosGUID); - if (!pLeryssa || !pArlos) + Creature* leryssa = Unit::GetCreature(*me, leryssaGUID); + Creature* arlos = Unit::GetCreature(*me, arlosGUID); + if (!leryssa || !arlos) return; - DoScriptText(SAY_ARLOS_1, pArlos); - DoScriptText(SAY_ARLOS_2, pArlos); - DoScriptText(SAY_LERYSSA_1, pLeryssa); - pArlos->Kill(pArlos, false); - pLeryssa->RemoveAura(SPELL_STUN); - pLeryssa->ClearUnitState(UNIT_STATE_STUNNED); - pLeryssa->SetWalk(false); - pLeryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f); + arlos->AI()->Talk(SAY_ARLOS_1); + arlos->AI()->Talk(SAY_ARLOS_2); + leryssa->AI()->Talk(SAY_LERYSSA_1); + arlos->Kill(arlos, false); + leryssa->RemoveAura(SPELL_STUN); + leryssa->ClearUnitState(UNIT_STATE_STUNNED); + leryssa->SetWalk(false); + leryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f); if (Player* player = killer->ToPlayer()) player->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); @@ -1440,33 +1442,33 @@ public: npc_leryssaAI(Creature* creature) : ScriptedAI(creature) { bDone = false; - Phase = 0; - uiPhaseTimer = 0; + phase = 0; + phaseTimer = 0; creature->RemoveStandFlags(UNIT_STAND_STATE_SIT); } bool bDone; - uint32 Phase; - uint32 uiPhaseTimer; + uint32 phase; + uint32 phaseTimer; - void MovementInform(uint32 uiType, uint32 /*uiId*/) + void MovementInform(uint32 type, uint32 /*uiId*/) { - if (uiType != POINT_MOTION_TYPE) + if (type != POINT_MOTION_TYPE) return; if (!bDone) { - if (Creature* pTalbot = me->FindNearestCreature(NPC_PRINCE_VALANAR, 50.0f, true)) - CAST_AI(npc_counselor_talbot::npc_counselor_talbotAI, pTalbot->GetAI())->bCheck = true; + if (Creature* talbot = me->FindNearestCreature(NPC_PRINCE_VALANAR, 50.0f, true)) + CAST_AI(npc_counselor_talbot::npc_counselor_talbotAI, talbot->GetAI())->bCheck = true; me->AddUnitState(UNIT_STATE_STUNNED); me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI, summoner->GetAI())->bLeryssaInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, summoner->GetAI())->leryssaInPosition = true; bDone = true; } else @@ -1475,8 +1477,8 @@ public: if (me->isSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) summoner->SetStandState(UNIT_STAND_STATE_SIT); - uiPhaseTimer = 1500; - Phase = 1; + phaseTimer = 1500; + phase = 1; } } @@ -1484,59 +1486,63 @@ public: { ScriptedAI::UpdateAI(uiDiff); - if (uiPhaseTimer <= uiDiff) + if (phaseTimer <= uiDiff) { - switch (Phase) + switch (phase) { case 1: if (me->isSummon()) - if (Unit* pThassarian = me->ToTempSummon()->GetSummoner()) - DoScriptText(SAY_THASSARIAN_4, pThassarian); - uiPhaseTimer = 5000; - ++Phase; + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + if (Creature* thassarian = summoner->ToCreature()) + thassarian->AI()->Talk(SAY_THASSARIAN_4); + phaseTimer = 5000; + ++phase; break; case 2: - DoScriptText(SAY_LERYSSA_2, me); - uiPhaseTimer = 5000; - ++Phase; + Talk(SAY_LERYSSA_2); + phaseTimer = 5000; + ++phase; break; case 3: if (me->isSummon()) - if (Unit* pThassarian = me->ToTempSummon()->GetSummoner()) - DoScriptText(SAY_THASSARIAN_5, pThassarian); - uiPhaseTimer = 5000; - ++Phase; + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + if (Creature* thassarian = summoner->ToCreature()) + thassarian->AI()->Talk(SAY_THASSARIAN_5); + phaseTimer = 5000; + ++phase; break; case 4: - DoScriptText(SAY_LERYSSA_3, me); - uiPhaseTimer = 5000; - ++Phase; + Talk(SAY_LERYSSA_3); + phaseTimer = 5000; + ++phase; break; case 5: if (me->isSummon()) - if (Unit* pThassarian = me->ToTempSummon()->GetSummoner()) - DoScriptText(SAY_THASSARIAN_6, pThassarian); - uiPhaseTimer = 5000; - ++Phase; + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + if (Creature* thassarian = summoner->ToCreature()) + thassarian->AI()->Talk(SAY_THASSARIAN_6); + phaseTimer = 5000; + ++phase; break; case 6: - DoScriptText(SAY_LERYSSA_4, me); - uiPhaseTimer = 5000; - ++Phase; + Talk(SAY_LERYSSA_4); + phaseTimer = 5000; + ++phase; break; case 7: if (me->isSummon()) - if (Unit* pThassarian = me->ToTempSummon()->GetSummoner()) - { - DoScriptText(SAY_THASSARIAN_7, pThassarian); - CAST_AI(npc_thassarian::npc_thassarianAI, pThassarian->GetAI())->uiPhase = 16; - } - uiPhaseTimer = 5000; - Phase = 0; + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + if (Creature* thassarian = summoner->ToCreature()) + { + thassarian->AI()->Talk(SAY_THASSARIAN_7); + CAST_AI(npc_thassarian::npc_thassarianAI, thassarian->GetAI())->phase = 16; + } + phaseTimer = 5000; + phase = 0; break; } - } else uiPhaseTimer -= uiDiff; + } else phaseTimer -= uiDiff; if (!UpdateVictim()) return; @@ -1640,13 +1646,13 @@ enum eImprisionedBerylSorcerer NPC_IMPRISONED_BERYL_SORCERER = 25478, - SAY_IMPRISIONED_BERYL_1 = -1571024, - SAY_IMPRISIONED_BERYL_2 = -1571025, - SAY_IMPRISIONED_BERYL_3 = -1571026, - SAY_IMPRISIONED_BERYL_4 = -1571027, - SAY_IMPRISIONED_BERYL_5 = -1571028, - SAY_IMPRISIONED_BERYL_6 = -1571029, - SAY_IMPRISIONED_BERYL_7 = -1571030, + SAY_IMPRISIONED_BERYL_1 = 0, + SAY_IMPRISIONED_BERYL_2 = 1, + SAY_IMPRISIONED_BERYL_3 = 2, + SAY_IMPRISIONED_BERYL_4 = 3, + SAY_IMPRISIONED_BERYL_5 = 4, + SAY_IMPRISIONED_BERYL_6 = 5, + SAY_IMPRISIONED_BERYL_7 = 6 }; class npc_imprisoned_beryl_sorcerer : public CreatureScript @@ -1709,25 +1715,25 @@ public: switch (step) { case 1: - DoScriptText(SAY_IMPRISIONED_BERYL_1, me); + Talk(SAY_IMPRISIONED_BERYL_1); break; case 2: - DoScriptText(SAY_IMPRISIONED_BERYL_2, me, caster); + Talk(SAY_IMPRISIONED_BERYL_2, caster->GetGUID()); break; case 3: - DoScriptText(SAY_IMPRISIONED_BERYL_3, me); + Talk(SAY_IMPRISIONED_BERYL_3); break; case 4: - DoScriptText(SAY_IMPRISIONED_BERYL_4, me); + Talk(SAY_IMPRISIONED_BERYL_4); break; case 5: - DoScriptText(SAY_IMPRISIONED_BERYL_5, me); + Talk(SAY_IMPRISIONED_BERYL_5); break; case 6: - DoScriptText(SAY_IMPRISIONED_BERYL_6, me, caster); + Talk(SAY_IMPRISIONED_BERYL_6, caster->GetGUID()); break; case 7: - DoScriptText(SAY_IMPRISIONED_BERYL_7, me); + Talk(SAY_IMPRISIONED_BERYL_7); caster->KilledMonsterCredit(NPC_IMPRISONED_BERYL_SORCERER, 0); break; } @@ -1744,18 +1750,16 @@ public: /*###### ## npc_mootoo_the_younger ######*/ -enum Script_Texts_Mootoo_the_Younger -{ - SAY_1 =-1750040, - SAY_2 =-1750041, - SAY_3 =-1750042, - SAY_4 =-1750043, - SAY_5 =-1750044 -}; -enum Mootoo_the_Younger_Entries +enum MootooTheYounger { - NPC_MOOTOO_THE_YOUNGER =25504, - QUEST_ESCAPING_THE_MIST =11664 + SAY_1 = 0, + SAY_2 = 1, + SAY_3 = 2, + SAY_4 = 3, + SAY_5 = 4, + + NPC_MOOTOO_THE_YOUNGER = 25504, + QUEST_ESCAPING_THE_MIST = 11664 }; class npc_mootoo_the_younger : public CreatureScript @@ -1777,7 +1781,7 @@ public: break; } creature->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_1, creature); + creature->AI()->Talk(SAY_1); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); } return true; @@ -1808,19 +1812,19 @@ public: { case 10: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); - DoScriptText(SAY_2, me); + Talk(SAY_2); break; case 12: - DoScriptText(SAY_3, me); + Talk(SAY_3); me->HandleEmoteCommand(EMOTE_ONESHOT_LOOT); break; case 16: - DoScriptText(SAY_4, me); + Talk(SAY_4); me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); break; case 20: me->SetPhaseMask(1, true); - DoScriptText(SAY_5, me); + Talk(SAY_5); me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); player->GroupEventHappens(QUEST_ESCAPING_THE_MIST, me); SetRun(true); @@ -1839,15 +1843,13 @@ public: ## npc_bonker_togglevolt ######*/ -enum Bonker_Togglevolt_Entries +enum BonkerTogglevolt { - NPC_BONKER_TOGGLEVOLT = 25589, - QUEST_GET_ME_OUTA_HERE = 11673 -}; -enum Script_Texts_Bonker_Togglevolt -{ - SAY_bonker_1 = -1700002, - SAY_bonker_2 = -1700003 + NPC_BONKER_TOGGLEVOLT = 25589, + QUEST_GET_ME_OUTA_HERE = 11673, + + SAY_BONKER_1 = 0, + SAY_BONKER_2 = 1 }; class npc_bonker_togglevolt : public CreatureScript @@ -1860,7 +1862,7 @@ public: if (quest->GetQuestId() == QUEST_GET_ME_OUTA_HERE) { creature->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_bonker_2, creature, player); + creature->AI()->Talk(SAY_BONKER_2, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, true, player->GetGUID()); } return true; @@ -1889,7 +1891,7 @@ public: { if (Bonker_agro == 0) { - DoScriptText(SAY_bonker_1, me); + Talk(SAY_BONKER_1); Bonker_agro++; } DoMeleeAttackIfReady(); @@ -2307,10 +2309,10 @@ enum eHiddenCultist NPC_SALTY_JOHN_THORPE = 25248, NPC_GUARD_MITCHELLS = 25828, - SAY_HIDDEN_CULTIST_1 = -1571044, - SAY_HIDDEN_CULTIST_2 = -1571045, - SAY_HIDDEN_CULTIST_3 = -1571046, - SAY_HIDDEN_CULTIST_4 = -1571047 + SAY_HIDDEN_CULTIST_1 = 0, + SAY_HIDDEN_CULTIST_2 = 1, + SAY_HIDDEN_CULTIST_3 = 2, + SAY_HIDDEN_CULTIST_4 = 3 }; const char* GOSSIP_ITEM_TOM_HEGGER = "What do you know about the Cult of the Damned?"; @@ -2392,17 +2394,17 @@ public: { case NPC_SALTY_JOHN_THORPE: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); - DoScriptText(SAY_HIDDEN_CULTIST_1, me); + Talk(SAY_HIDDEN_CULTIST_1); uiEventTimer = 5000; uiEventPhase = 2; break; case NPC_GUARD_MITCHELLS: - DoScriptText(SAY_HIDDEN_CULTIST_2, me); + Talk(SAY_HIDDEN_CULTIST_2); uiEventTimer = 5000; uiEventPhase = 2; break; case NPC_TOM_HEGGER: - DoScriptText(SAY_HIDDEN_CULTIST_3, me); + Talk(SAY_HIDDEN_CULTIST_3); uiEventTimer = 5000; uiEventPhase = 2; break; @@ -2412,7 +2414,7 @@ public: switch (me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: - DoScriptText(SAY_HIDDEN_CULTIST_4, me); + Talk(SAY_HIDDEN_CULTIST_4); if (Player* player = me->GetPlayer(*me, uiPlayerGUID)) { me->SetInFront(player); diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 0363e0c892d..8bcc255b343 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -21,6 +21,7 @@ #include "ScriptedEscortAI.h" #include "Player.h" #include "SpellInfo.h" +#include "CreatureTextMgr.h" /*###### ## Quest 12027: Mr. Floppy's Perilous Adventure @@ -37,19 +38,19 @@ enum eFloppy SPELL_MRFLOPPY = 47184, //vehicle aura - SAY_WORGHAGGRO1 = -1800001, //Um... I think one of those wolves is back... - SAY_WORGHAGGRO2 = -1800002, //He's going for Mr. Floppy! - SAY_WORGRAGGRO3 = -1800003, //Oh, no! Look, it's another wolf, and it's a biiiiiig one! - SAY_WORGRAGGRO4 = -1800004, //He's gonna eat Mr. Floppy! You gotta help Mr. Floppy! You just gotta! - SAY_RANDOMAGGRO = -1800005, //There's a big meanie attacking Mr. Floppy! Help! - SAY_VICTORY1 = -1800006, //Let's get out of here before more wolves find us! - SAY_VICTORY2 = -1800007, //Don't go toward the light, Mr. Floppy! - SAY_VICTORY3 = -1800008, //Mr. Floppy, you're ok! Thank you so much for saving Mr. Floppy! - SAY_VICTORY4 = -1800009, //I think I see the camp! We're almost home, Mr. Floppy! Let's go! - TEXT_EMOTE_WP1 = -1800010, //Mr. Floppy revives - TEXT_EMOTE_AGGRO = -1800011, //The Ravenous Worg chomps down on Mr. Floppy - SAY_QUEST_ACCEPT = -1800012, //Are you ready, Mr. Floppy? Stay close to me and watch out for those wolves! - SAY_QUEST_COMPLETE = -1800013 //Thank you for helping me get back to the camp. Go tell Walter that I'm safe now! + SAY_WORGHAGGRO1 = 0, //Um... I think one of those wolves is back... + SAY_WORGHAGGRO2 = 1, //He's going for Mr. Floppy! + SAY_WORGRAGGRO3 = 2, //Oh, no! Look, it's another wolf, and it's a biiiiiig one! + SAY_WORGRAGGRO4 = 3, //He's gonna eat Mr. Floppy! You gotta help Mr. Floppy! You just gotta! + SAY_RANDOMAGGRO = 4, //There's a big meanie attacking Mr. Floppy! Help! + SAY_VICTORY1 = 5, //Let's get out of here before more wolves find us! + SAY_VICTORY2 = 6, //Don't go toward the light, Mr. Floppy! + SAY_VICTORY3 = 7, //Mr. Floppy, you're ok! Thank you so much for saving Mr. Floppy! + SAY_VICTORY4 = 8, //I think I see the camp! We're almost home, Mr. Floppy! Let's go! + TEXT_EMOTE_WP1 = 9, //Mr. Floppy revives + TEXT_EMOTE_AGGRO = 10, //The Ravenous Worg chomps down on Mr. Floppy + SAY_QUEST_ACCEPT = 11, //Are you ready, Mr. Floppy? Stay close to me and watch out for those wolves! + SAY_QUEST_COMPLETE = 12 //Thank you for helping me get back to the camp. Go tell Walter that I'm safe now! }; //emily @@ -92,7 +93,7 @@ public: case 10: if (Unit::GetCreature(*me, MrfloppyGUID)) { - DoScriptText(SAY_WORGHAGGRO1, me); + Talk(SAY_WORGHAGGRO1); me->SummonCreature(NPC_HUNGRY_WORG, me->GetPositionX()+5, me->GetPositionY()+2, me->GetPositionZ()+1, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; @@ -103,7 +104,7 @@ public: case 17: if (Creature* Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); - DoScriptText(SAY_WORGRAGGRO3, me); + Talk(SAY_WORGRAGGRO3); if (Creature* RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000)) { RWORG->setFaction(35); @@ -141,7 +142,7 @@ public: Mrfloppy->ExitVehicle(); RWORG->setFaction(14); RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10, RWORG->GetPositionY()+80, RWORG->GetPositionZ()); - DoScriptText(SAY_VICTORY2, me); + Talk(SAY_VICTORY2); } } break; @@ -155,7 +156,7 @@ public: me->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); Mrfloppy->setDeathState(ALIVE); Mrfloppy->GetMotionMaster()->MoveFollow(me, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); - DoScriptText(SAY_VICTORY3, me); + Talk(SAY_VICTORY3); } } break; @@ -164,12 +165,12 @@ public: { Completed = true; player->GroupEventHappens(QUEST_PERILOUS_ADVENTURE, me); - DoScriptText(SAY_QUEST_COMPLETE, me, player); + Talk(SAY_QUEST_COMPLETE, player->GetGUID()); } me->SetWalk(false); break; case 25: - DoScriptText(SAY_VICTORY4, me); + Talk(SAY_VICTORY4); break; case 27: me->DisappearAndDie(); @@ -181,7 +182,7 @@ public: void EnterCombat(Unit* /*Who*/) { - DoScriptText(SAY_RANDOMAGGRO, me); + Talk(SAY_RANDOMAGGRO); } void Reset() @@ -209,7 +210,7 @@ public: { if (quest->GetQuestId() == QUEST_PERILOUS_ADVENTURE) { - DoScriptText(SAY_QUEST_ACCEPT, creature); + creature->AI()->Talk(SAY_QUEST_ACCEPT); if (Creature* Mrfloppy = GetClosestCreatureWithEntry(creature, NPC_MRFLOPPY, 180.0f)) Mrfloppy->GetMotionMaster()->MoveFollow(creature, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); @@ -248,13 +249,13 @@ public: switch (Who->GetEntry()) { case NPC_HUNGRY_WORG: - DoScriptText(SAY_WORGHAGGRO2, Emily); + Emily->AI()->Talk(SAY_WORGHAGGRO2); break; case NPC_RAVENOUS_WORG: - DoScriptText(SAY_WORGRAGGRO4, Emily); + Emily->AI()->Talk(SAY_WORGRAGGRO4); break; default: - DoScriptText(SAY_RANDOMAGGRO, Emily); + Emily->AI()->Talk(SAY_RANDOMAGGRO); } } } @@ -461,12 +462,10 @@ public: enum eSkirmisher { - SPELL_RENEW_SKIRMISHER = 48812, - CREDIT_NPC = 27466, + SPELL_RENEW_SKIRMISHER = 48812, + CREDIT_NPC = 27466, - RANDOM_SAY_1 = -1800044, //Ahh..better.. - RANDOM_SAY_2 = -1800045, //Whoa.. i nearly died there. Thank you, $Race! - RANDOM_SAY_3 = -1800046 //Thank you. $Class! + RANDOM_SAY = 0, }; class npc_wounded_skirmisher : public CreatureScript @@ -500,7 +499,7 @@ public: && caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE) { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); - DoScriptText(RAND(RANDOM_SAY_1, RANDOM_SAY_2, RANDOM_SAY_3), caster); + sCreatureTextMgr->SendChat(me, RANDOM_SAY, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, caster->ToPlayer()); if (me->IsStandState()) me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else @@ -593,16 +592,12 @@ public: /*Venture co. Straggler - when you cast Smoke Bomb, he will yell and run away*/ enum eSmokeEmOut { - SAY_SEO1 = -1603535, - SAY_SEO2 = -1603536, - SAY_SEO3 = -1603537, - SAY_SEO4 = -1603538, - SAY_SEO5 = -1603539, - QUEST_SMOKE_EM_OUT_A = 12323, - QUEST_SMOKE_EM_OUT_H = 12324, - SPELL_SMOKE_BOMB = 49075, - SPELL_CHOP = 43410, - SPELL_VENTURE_STRAGGLER_CREDIT = 49093, + SAY_SEO = 0, + QUEST_SMOKE_EM_OUT_A = 12323, + QUEST_SMOKE_EM_OUT_H = 12324, + SPELL_SMOKE_BOMB = 49075, + SPELL_CHOP = 43410, + SPELL_VENTURE_STRAGGLER_CREDIT = 49093, }; class npc_venture_co_straggler : public CreatureScript @@ -644,7 +639,7 @@ class npc_venture_co_straggler : public CreatureScript ++uiTimer; break; case 1: - DoScriptText(RAND(SAY_SEO1, SAY_SEO2, SAY_SEO3, SAY_SEO4, SAY_SEO5), me); + Talk(SAY_SEO); me->GetMotionMaster()->MovePoint(0, me->GetPositionX()-7, me->GetPositionY()-5, me->GetPositionZ()); uiRunAwayTimer = 2500; ++uiTimer; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 8404413ad9d..a6d6cda11b1 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -44,9 +44,9 @@ EndContentData */ enum eRainspeaker { - SAY_START_IRO = -1571000, - SAY_QUEST_ACCEPT_IRO = -1571001, - SAY_END_IRO = -1571002, + SAY_START_IRO = 0, + SAY_QUEST_ACCEPT_IRO = 1, + SAY_END_IRO = 2, QUEST_FORTUNATE_MISUNDERSTANDINGS = 12570, FACTION_ESCORTEE_A = 774, @@ -106,7 +106,7 @@ public: case 28: player->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, me); // me->RestoreFaction(); - DoScriptText(SAY_END_IRO, me); + Talk(SAY_END_IRO); SetRun(false); break; } @@ -146,7 +146,7 @@ public: CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->SetMaxPlayerDistance(35.0f); creature->SetUnitMovementFlags(MOVEMENTFLAG_FALLING); - DoScriptText(SAY_START_IRO, creature); + creature->AI()->Talk(SAY_START_IRO); switch (player->GetTeam()){ case ALLIANCE: @@ -162,7 +162,7 @@ public: bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* /*_Quest*/) { - DoScriptText(SAY_QUEST_ACCEPT_IRO, creature); + creature->AI()->Talk(SAY_QUEST_ACCEPT_IRO); return false; } @@ -184,7 +184,7 @@ enum eVekjik GOSSIP_TEXTID_VEKJIK1 = 13137, GOSSIP_TEXTID_VEKJIK2 = 13138, - SAY_TEXTID_VEKJIK1 = -1000208, + SAY_TEXTID_VEKJIK1 = 0, SPELL_FREANZYHEARTS_FURY = 51469, @@ -223,7 +223,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF+2: player->CLOSE_GOSSIP_MENU(); - DoScriptText(SAY_TEXTID_VEKJIK1, creature, player); + creature->AI()->Talk(SAY_TEXTID_VEKJIK1, player->GetGUID()); player->AreaExploredOrEventHappens(QUEST_MAKING_PEACE); creature->CastSpell(player, SPELL_FREANZYHEARTS_FURY, false); break; @@ -342,13 +342,13 @@ enum eEnums SPELL_EXPLODE_CRYSTAL = 62487, SPELL_FLAMES = 64561, - SAY_WP_7 = -1800047, - SAY_WP_6 = -1800048, - SAY_WP_5 = -1800049, - SAY_WP_4 = -1800050, - SAY_WP_3 = -1800051, - SAY_WP_2 = -1800052, - SAY_WP_1 = -1800053, + SAY_WP_1 = 0, + SAY_WP_2 = 1, + SAY_WP_3 = 2, + SAY_WP_4 = 3, + SAY_WP_5 = 4, + SAY_WP_6 = 5, + SAY_WP_7 = 6, QUEST_DISASTER = 12688 }; @@ -371,19 +371,19 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_WP_2, me); + Talk(SAY_WP_2); break; case 1: - DoScriptText(SAY_WP_3, me); + Talk(SAY_WP_3); me->CastSpell(5918.33f, 5372.91f, -98.770f, SPELL_EXPLODE_CRYSTAL, true); me->SummonGameObject(184743, 5918.33f, 5372.91f, -98.770f, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case 2: - DoScriptText(SAY_WP_4, me); + Talk(SAY_WP_4); break; case 7: - DoScriptText(SAY_WP_5, me); + Talk(SAY_WP_5); break; case 8: me->CastSpell(5887.37f, 5379.39f, -91.289f, SPELL_EXPLODE_CRYSTAL, true); @@ -391,13 +391,13 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case 9: - DoScriptText(SAY_WP_6, me); + Talk(SAY_WP_6); break; case 13: if (player) { player->GroupEventHappens(QUEST_DISASTER, me); - DoScriptText(SAY_WP_7, me); + Talk(SAY_WP_7); } break; } @@ -448,7 +448,7 @@ public: creature->setFaction(113); pEscortAI->Start(false, false, player->GetGUID()); - DoScriptText(SAY_WP_1, creature); + creature->AI()->Talk(SAY_WP_1); } } return true; @@ -713,8 +713,8 @@ enum eAdventurousDwarf GOSSIP_MENU_DWARF = 13307, - SAY_DWARF_OUCH = -1571042, - SAY_DWARF_HELP = -1571043 + SAY_DWARF_OUCH = 0, + SAY_DWARF_HELP = 1 }; class npc_adventurous_dwarf : public CreatureScript @@ -724,7 +724,7 @@ public: CreatureAI* GetAI(Creature* creature) const { - DoScriptText(SAY_DWARF_OUCH, creature); + creature->AI()->Talk(SAY_DWARF_OUCH); return NULL; } @@ -758,7 +758,7 @@ public: } if (spellId) player->CastSpell(player, spellId, true); - DoScriptText(SAY_DWARF_HELP, creature); + creature->AI()->Talk(SAY_DWARF_HELP); creature->DespawnOrUnsummon(); return true; } diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index b3a379d903d..f87b24ce639 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -30,13 +30,13 @@ ## npc_agnetta_tyrsdottar ######*/ -#define SAY_AGGRO -1571003 #define GOSSIP_AGNETTA "Skip the warmup, sister... or are you too scared to face soemeone your own size?" enum eAgnetta { QUEST_ITS_THAT_YOUR_GOBLIN = 12969, - FACTION_HOSTILE_AT1 = 45 + FACTION_HOSTILE_AT1 = 45, + SAY_AGGRO = 0 }; class npc_agnetta_tyrsdottar : public CreatureScript @@ -73,7 +73,7 @@ public: player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) { - DoScriptText(SAY_AGGRO, creature); + creature->AI()->Talk(SAY_AGGRO); player->CLOSE_GOSSIP_MENU(); creature->setFaction(FACTION_HOSTILE_AT1); creature->AI()->AttackStart(player); @@ -143,8 +143,8 @@ public: enum eInjuredGoblin { QUEST_BITTER_DEPARTURE = 12832, - SAY_QUEST_ACCEPT = -1800042, - SAY_END_WP_REACHED = -1800043 + SAY_QUEST_ACCEPT = 0, + SAY_END_WP_REACHED = 1 }; #define GOSSIP_ITEM_1 "I am ready, lets get you out of here" @@ -167,7 +167,7 @@ public: switch (waypointId) { case 26: - DoScriptText(SAY_END_WP_REACHED, me, player); + Talk(SAY_END_WP_REACHED, player->GetGUID()); break; case 27: player->GroupEventHappens(QUEST_BITTER_DEPARTURE, me); @@ -218,7 +218,7 @@ public: bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_BITTER_DEPARTURE) - DoScriptText(SAY_QUEST_ACCEPT, creature); + creature->AI()->Talk(SAY_QUEST_ACCEPT); return false; } diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index e5763e5baf6..506c34d40fb 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -121,9 +121,9 @@ enum eRageclaw SPELL_KNEEL = 39656 }; -const char * SAY_RAGECLAW_1 = "I poop on you, trollses!"; -const char * SAY_RAGECLAW_2 = "ARRRROOOOGGGGAAAA!"; -const char * SAY_RAGECLAW_3 = "No more mister nice wolvar!"; +const char* SAY_RAGECLAW_1 = "I poop on you, trollses!"; +const char* SAY_RAGECLAW_2 = "ARRRROOOOGGGGAAAA!"; +const char* SAY_RAGECLAW_3 = "No more mister nice wolvar!"; #define SAY_RAGECLAW RAND(SAY_RAGECLAW_1, SAY_RAGECLAW_2, SAY_RAGECLAW_3) @@ -265,14 +265,16 @@ enum eGurgthock NPC_FIEND_FIRE = 30042, NPC_FIEND_EARTH = 30043, - SAY_QUEST_ACCEPT_TUSKARRMAGEDON = -1571031, - SAY_QUEST_ACCEPT_KORRAK_1 = -1571033, - SAY_QUEST_ACCEPT_KORRAK_2 = -1571034, - SAY_QUEST_ACCEPT_MAGNATAUR = -1571035, + SAY_QUEST_ACCEPT_TUSKARRMAGEDON = 0, + SAY_QUEST_ACCEPT_KORRAK_1 = 1, + SAY_QUEST_ACCEPT_KORRAK_2 = 2, + SAY_QUEST_ACCEPT_MAGNATAUR = 3, + EMOTE_YGGDRAS_SPAWN = 4, + SAY_STINKBEARD_SPAWN = 5, + SAY_GURGTHOCK_ELEMENTAL_SPAWN = 6, - EMOTE_YGGDRAS_SPAWN = -1571039, - SAY_STINKBEARD_SPAWN = -1571040, - SAY_GURGTHOCK_ELEMENTAL_SPAWN = -1571041, + SAY_CALL_FOR_HELP = 0, + SAY_RECRUIT = 0, SPELL_CRASHING_WAVE = 55909, // water SPELL_SHOCKWAVE = 55918, // earth @@ -380,12 +382,12 @@ public: switch (uiValue) { case QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON: - DoScriptText(SAY_QUEST_ACCEPT_TUSKARRMAGEDON, me); + Talk(SAY_QUEST_ACCEPT_TUSKARRMAGEDON); uiPhase = 1; uiTimer = 4000; break; case QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER: - DoScriptText(SAY_QUEST_ACCEPT_KORRAK_1, me); + Talk(SAY_QUEST_ACCEPT_KORRAK_1); uiPhase = 3; uiTimer = 3000; break; @@ -443,7 +445,7 @@ public: SummonGUID = 0; break; case 3: - DoScriptText(SAY_QUEST_ACCEPT_KORRAK_2, me); + Talk(SAY_QUEST_ACCEPT_KORRAK_2); uiTimer = 3000; uiPhase = 4; break; @@ -477,7 +479,7 @@ public: } break; case 8: - DoScriptText(SAY_QUEST_ACCEPT_MAGNATAUR, me); + Talk(SAY_QUEST_ACCEPT_MAGNATAUR); uiTimer = 5000; uiPhase = 11; break; @@ -494,12 +496,12 @@ public: break; case 10: me->SummonCreature(NPC_YGGDRAS, SpawnPosition[1], TEMPSUMMON_CORPSE_DESPAWN, 1000); - DoScriptText(EMOTE_YGGDRAS_SPAWN, me); + Talk(EMOTE_YGGDRAS_SPAWN); uiPhase = 0; break; case 11: if (Creature* creature = me->SummonCreature(NPC_STINKBEARD, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) - DoScriptText(SAY_STINKBEARD_SPAWN, creature); + creature->AI()->Talk(SAY_STINKBEARD_SPAWN); uiPhase = 0; break; case 12: @@ -514,7 +516,7 @@ public: } break; case 13: - DoScriptText(SAY_GURGTHOCK_ELEMENTAL_SPAWN, me); + Talk(SAY_GURGTHOCK_ELEMENTAL_SPAWN); uiTimer = 3000; uiPhase = 14; break; @@ -575,9 +577,7 @@ enum eOrinokoTuskbreaker SPELL_SUMMON_WHISKER = 55946, NPC_WHISKER = 30113, - NPC_HUNGRY_PENGUIN = 30110, - - SAY_CALL_FOR_HELP = -1571032 + NPC_HUNGRY_PENGUIN = 30110 }; class npc_orinoko_tuskbreaker : public CreatureScript @@ -659,7 +659,7 @@ public: if (!bSummoned && !HealthAbovePct(50)) { - DoScriptText(SAY_CALL_FOR_HELP, me); + Talk(SAY_CALL_FOR_HELP); //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? if (Creature* pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) @@ -1282,11 +1282,7 @@ enum eCrusade_recruit QUEST_TROLL_PATROL_INTESTINAL_FORTITUDE = 12509, - GOSSIP_CRUSADE_TEXT = 13069, - - SAY_RECRUIT_1 = -1571036, - SAY_RECRUIT_2 = -1571037, - SAY_RECRUIT_3 = -1571038 + GOSSIP_CRUSADE_TEXT = 13069 }; #define GOSSIP_ITEM_1 "Get out there and make those Scourge wish they were never reborn!" @@ -1325,7 +1321,7 @@ public: // say random text me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - DoScriptText(RAND(SAY_RECRUIT_1, SAY_RECRUIT_2, SAY_RECRUIT_3), me); + Talk(SAY_RECRUIT); m_uiTimer = 3000; m_uiPhase = 2; break; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index a8b4b1797cb..5739aa49549 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -126,30 +126,23 @@ public: }; -#define SAY_INTRO -1558000 -#define SAY_SUMMON -1558001 - -#define SAY_AGGRO_1 -1558002 -#define SAY_AGGRO_2 -1558003 -#define SAY_AGGRO_3 -1558004 - -#define SAY_ROAR -1558005 -#define SAY_SOUL_CLEAVE -1558006 - -#define SAY_SLAY_1 -1558007 -#define SAY_SLAY_2 -1558008 - -#define SAY_DEATH -1558009 - -#define SPELL_RIBBON_OF_SOULS 32422 -#define SPELL_SOUL_SCREAM 32421 - -#define SPELL_STOLEN_SOUL 32346 -#define SPELL_STOLEN_SOUL_VISUAL 32395 - -#define SPELL_SUMMON_AVATAR 32424 - -#define ENTRY_STOLEN_SOUL 18441 +enum ExarchMaladaar +{ + SAY_INTRO = 0, + SAY_SUMMON = 1, + SAY_AGGRO = 2, + SAY_ROAR = 3, + SAY_SLAY = 4, + SAY_DEATH = 5, + + SPELL_RIBBON_OF_SOULS = 32422, + SPELL_SOUL_SCREAM = 32421, + SPELL_STOLEN_SOUL = 32346, + SPELL_STOLEN_SOUL_VISUAL = 32395, + SPELL_SUMMON_AVATAR = 32424, + + ENTRY_STOLEN_SOUL = 18441 +}; class boss_exarch_maladaar : public CreatureScript { @@ -196,7 +189,7 @@ public: { if (!HasTaunted && me->IsWithinDistInMap(who, 150.0f)) { - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); HasTaunted = true; } @@ -205,7 +198,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); } void JustSummoned(Creature* summoned) @@ -231,12 +224,12 @@ public: if (rand()%2) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); //When Exarch Maladar is defeated D'ore appear. me->SummonCreature(19412, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 600000); } @@ -251,7 +244,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); DoCast(me, SPELL_SUMMON_AVATAR); Avatar_summoned = true; @@ -267,11 +260,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); - uint32 i = urand(1, 2); - if (i == 1) - DoScriptText(SAY_ROAR, me); - else - DoScriptText(SAY_SOUL_CLEAVE, me); + Talk(SAY_ROAR); soulmodel = target->GetDisplayId(); soulholder = target->GetGUID(); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 351f30c926f..f7a2eb87d67 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -33,14 +33,11 @@ EndContentData */ enum ePrince { - SAY_INTRO = -1557000, - SAY_AGGRO_1 = -1557001, - SAY_AGGRO_2 = -1557002, - SAY_AGGRO_3 = -1557003, - SAY_SLAY_1 = -1557004, - SAY_SLAY_2 = -1557005, - SAY_SUMMON = -1557006, - SAY_DEAD = -1557007, + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_SUMMON = 3, + SAY_DEAD = 4, SPELL_BLINK = 34605, SPELL_FROSTBOLT = 32364, @@ -110,14 +107,14 @@ public: { if (!HasTaunted && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) { - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); HasTaunted = true; } } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); DoZoneInCombat(); summons.DoZoneInCombat(); @@ -143,12 +140,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEAD, me); + Talk(SAY_DEAD); summons.DespawnAll(); } @@ -203,7 +200,7 @@ public: me->InterruptNonMeleeSpells(true); if (!urand(0, 3)) - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); DoCast(me, SPELL_ETHEREAL_BEACON, true); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 459ba3a8f86..f174091311b 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -26,21 +26,19 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SAY_AGGRO_1 -1557008 -#define SAY_AGGRO_2 -1557009 -#define SAY_AGGRO_3 -1557010 - -#define SAY_KILL_1 -1557011 -#define SAY_KILL_2 -1557012 - -#define SAY_DEATH -1557013 - -#define EMOTE_DARK_SHELL -1557014 +enum Pandemonius +{ + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DEATH = 2, + EMOTE_DARK_SHELL = 3, + + SPELL_VOID_BLAST = 32325, + H_SPELL_VOID_BLAST = 38760, + SPELL_DARK_SHELL = 32358, + H_SPELL_DARK_SHELL = 38759 +}; -#define SPELL_VOID_BLAST 32325 -#define H_SPELL_VOID_BLAST 38760 -#define SPELL_DARK_SHELL 32358 -#define H_SPELL_DARK_SHELL 38759 class boss_pandemonius : public CreatureScript { @@ -71,17 +69,17 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); + Talk(SAY_KILL); } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) @@ -112,7 +110,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); - DoScriptText(EMOTE_DARK_SHELL, me); + Talk(EMOTE_DARK_SHELL); DoCast(me, SPELL_DARK_SHELL); DarkShell_Timer = 20000; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 0a85cf1dc5b..5bb396965a6 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -26,28 +26,25 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SAY_SUMMON -1556000 - -#define SAY_AGGRO_1 -1556001 -#define SAY_AGGRO_2 -1556002 -#define SAY_AGGRO_3 -1556003 - -#define SAY_SLAY_1 -1556004 -#define SAY_SLAY_2 -1556005 - -#define SAY_DEATH -1556006 - -#define SPELL_FROST_SHOCK 21401 //37865 -#define SPELL_FLAME_SHOCK 34354 -#define SPELL_SHADOW_SHOCK 30138 -#define SPELL_ARCANE_SHOCK 37132 - -#define SPELL_CHAIN_LIGHTNING 15659 //15305 - -#define SPELL_SUMMON_SYTH_FIRE 33537 // Spawns 19203 -#define SPELL_SUMMON_SYTH_ARCANE 33538 // Spawns 19205 -#define SPELL_SUMMON_SYTH_FROST 33539 // Spawns 19204 -#define SPELL_SUMMON_SYTH_SHADOW 33540 // Spawns 19206 +enum DarkweaverSyth +{ + SAY_SUMMON = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_DEATH = 3, + + SPELL_FROST_SHOCK = 21401, //37865 + SPELL_FLAME_SHOCK = 34354, + SPELL_SHADOW_SHOCK = 30138, + SPELL_ARCANE_SHOCK = 37132, + + SPELL_CHAIN_LIGHTNING = 15659, //15305 + + SPELL_SUMMON_SYTH_FIRE = 33537, // Spawns 19203 + SPELL_SUMMON_SYTH_ARCANE = 33538, // Spawns 19205 + SPELL_SUMMON_SYTH_FROST = 33539, // Spawns 19204 + SPELL_SUMMON_SYTH_SHADOW = 33540 // Spawns 19206 +}; #define SPELL_FLAME_BUFFET DUNGEON_MODE(33526, 38141) #define SPELL_ARCANE_BUFFET DUNGEON_MODE(33527, 38138) @@ -95,12 +92,12 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void KilledUnit(Unit* /*victim*/) @@ -108,7 +105,7 @@ public: if (rand()%2) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustSummoned(Creature* summoned) @@ -119,7 +116,7 @@ public: void SythSummoning() { - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index ec35d6c80b3..07169f031ab 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -27,31 +27,26 @@ EndScriptData */ #include "ScriptedCreature.h" #include "sethekk_halls.h" -#define SAY_INTRO -1556007 - -#define SAY_AGGRO_1 -1556008 -#define SAY_AGGRO_2 -1556009 -#define SAY_AGGRO_3 -1556010 - -#define SAY_SLAY_1 -1556011 -#define SAY_SLAY_2 -1556012 -#define SAY_DEATH -1556013 -#define EMOTE_ARCANE_EXP -1556015 - -#define SPELL_BLINK 38194 -#define SPELL_BLINK_TELEPORT 38203 -#define SPELL_MANA_SHIELD 38151 -#define SPELL_ARCANE_BUBBLE 9438 -#define H_SPELL_SLOW 35032 - -#define SPELL_POLYMORPH 38245 -#define H_SPELL_POLYMORPH 43309 - -#define SPELL_ARCANE_VOLLEY 35059 -#define H_SPELL_ARCANE_VOLLEY 40424 - -#define SPELL_ARCANE_EXPLOSION 38197 -#define H_SPELL_ARCANE_EXPLOSION 40425 +enum TailonkingIkiss +{ + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_DEATH = 3, + EMOTE_ARCANE_EXP = 4, + + SPELL_BLINK = 38194, + SPELL_BLINK_TELEPORT = 38203, + SPELL_MANA_SHIELD = 38151, + SPELL_ARCANE_BUBBLE = 9438, + H_SPELL_SLOW = 35032, + SPELL_POLYMORPH = 38245, + H_SPELL_POLYMORPH = 43309, + SPELL_ARCANE_VOLLEY = 35059, + H_SPELL_ARCANE_VOLLEY = 40424, + SPELL_ARCANE_EXPLOSION = 38197, + H_SPELL_ARCANE_EXPLOSION = 40425 +}; class boss_talon_king_ikiss : public CreatureScript { @@ -99,7 +94,7 @@ public: if (!Intro && me->IsWithinDistInMap(who, 100)) { Intro = true; - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); } if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) @@ -116,12 +111,12 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_IKISSDOOREVENT, DONE); @@ -129,7 +124,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 diff) @@ -183,7 +178,7 @@ public: if (Blink_Timer <= diff) { - DoScriptText(EMOTE_ARCANE_EXP, me); + Talk(EMOTE_ARCANE_EXP); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index a109e3738b1..c93143c1c5c 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -30,14 +30,11 @@ EndScriptData */ enum eEnums { - SAY_INTRO = -1555000, - SAY_AGGRO1 = -1555001, - SAY_AGGRO2 = -1555002, - SAY_AGGRO3 = -1555003, - SAY_HELP = -1555004, - SAY_SLAY1 = -1555005, - SAY_SLAY2 = -1555006, - SAY_DEATH = -1555007, + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_HELP = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, SPELL_BANISH = 30231, SPELL_CORROSIVE_ACID = 33551, @@ -119,7 +116,7 @@ public: { if (instance->GetData(TYPE_HELLMAW) != FAIL) { - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); Start(true, false, 0, NULL, false, true); } @@ -129,17 +126,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_HELLMAW, DONE); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index e7063e479ee..eb06cce87fc 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -27,33 +27,26 @@ EndScriptData */ #include "ScriptedCreature.h" #include "shadow_labyrinth.h" -#define SPELL_INCITE_CHAOS 33676 -#define SPELL_INCITE_CHAOS_B 33684 //debuff applied to each member of party -#define SPELL_CHARGE 33709 -#define SPELL_WAR_STOMP 33707 - -#define SAY_INTRO1 -1555008 //not used -#define SAY_INTRO2 -1555009 //not used -#define SAY_INTRO3 -1555010 //not used -#define SAY_AGGRO1 -1555011 -#define SAY_AGGRO2 -1555012 -#define SAY_AGGRO3 -1555013 -#define SAY_SLAY1 -1555014 -#define SAY_SLAY2 -1555015 -#define SAY_HELP -1555016 //not used -#define SAY_DEATH -1555017 - -//below, not used -#define SAY2_INTRO1 -1555018 -#define SAY2_INTRO2 -1555019 -#define SAY2_INTRO3 -1555020 -#define SAY2_AGGRO1 -1555021 -#define SAY2_AGGRO2 -1555022 -#define SAY2_AGGRO3 -1555023 -#define SAY2_SLAY1 -1555024 -#define SAY2_SLAY2 -1555025 -#define SAY2_HELP -1555026 -#define SAY2_DEATH -1555027 +enum BlackheartTheInciter +{ + SPELL_INCITE_CHAOS = 33676, + SPELL_INCITE_CHAOS_B = 33684, //debuff applied to each member of party + SPELL_CHARGE = 33709, + SPELL_WAR_STOMP = 33707, + + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_HELP = 3, + SAY_DEATH = 4, + + //below, not used + SAY2_INTRO = 5, + SAY2_AGGRO = 6, + SAY2_SLAY = 7, + SAY2_HELP = 8, + SAY2_DEATH = 9 +}; class boss_blackheart_the_inciter : public CreatureScript { @@ -94,12 +87,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); @@ -107,7 +100,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 303a30bea8f..d7dbb8ef722 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -28,30 +28,30 @@ EndScriptData */ #include "shadow_labyrinth.h" #include "Player.h" -#define SAY_INTRO -1555028 -#define SAY_AGGRO1 -1555029 -#define SAY_AGGRO2 -1555030 -#define SAY_AGGRO3 -1555031 -#define SAY_HELP -1555032 -#define SAY_SLAY1 -1555033 -#define SAY_SLAY2 -1555034 -#define SAY_DEATH -1555035 - -#define SPELL_RAIN_OF_FIRE 33617 -#define H_SPELL_RAIN_OF_FIRE 39363 - -#define SPELL_DRAW_SHADOWS 33563 -#define SPELL_SHADOWBOLT_VOLLEY 33841 -#define SPELL_BANISH 38791 - -#define MOB_VOID_TRAVELER 19226 -#define SPELL_SACRIFICE 33587 -#define SPELL_SHADOW_NOVA 33846 -#define SPELL_EMPOWERING_SHADOWS 33783 -#define H_SPELL_EMPOWERING_SHADOWS 39364 - -#define MOB_VOID_PORTAL 19224 -#define SPELL_VOID_PORTAL_VISUAL 33569 +enum GrandmasterVorpil +{ + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_HELP = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + + SPELL_RAIN_OF_FIRE = 33617, + H_SPELL_RAIN_OF_FIRE = 39363, + + SPELL_DRAW_SHADOWS = 33563, + SPELL_SHADOWBOLT_VOLLEY = 33841, + SPELL_BANISH = 38791, + + MOB_VOID_TRAVELER = 19226, + SPELL_SACRIFICE = 33587, + SPELL_SHADOW_NOVA = 33846, + SPELL_EMPOWERING_SHADOWS = 33783, + H_SPELL_EMPOWERING_SHADOWS = 39364, + + MOB_VOID_PORTAL = 19224, + SPELL_VOID_PORTAL_VISUAL = 33569 +}; float VorpilPosition[3] = {-252.8820f, -264.3030f, 17.1f}; @@ -219,7 +219,7 @@ public: me->SummonCreature(MOB_VOID_TRAVELER, VoidPortalCoords[pos][0], VoidPortalCoords[pos][1], VoidPortalCoords[pos][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); if (!HelpYell) { - DoScriptText(SAY_HELP, me); + Talk(SAY_HELP); HelpYell = true; } } @@ -232,12 +232,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); destroyPortals(); if (instance) @@ -246,7 +246,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); + Talk(SAY_AGGRO); summonPortals(); if (instance) @@ -259,7 +259,7 @@ public: if (!Intro && me->IsWithinLOSInMap(who)&& me->IsWithinDistInMap(who, 100) && me->IsValidAttackTarget(who)) { - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); Intro = true; } } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 1503c9f7234..9ca9f7d089c 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -28,15 +28,20 @@ EndScriptData */ #include "shadow_labyrinth.h" #include "SpellInfo.h" -#define EMOTE_SONIC_BOOM -1555036 +enum Murmur +{ + SPELL_RESONANCE = 33657, + SPELL_MAGNETIC_PULL = 33689, + SPELL_SONIC_SHOCK = 38797, + SPELL_THUNDERING_STORM = 39365, + EMOTE_SONIC_BOOM = 0 +}; #define SPELL_SONIC_BOOM_CAST DUNGEON_MODE(33923, 38796) #define SPELL_SONIC_BOOM_EFFECT DUNGEON_MODE(33666, 38795) -#define SPELL_RESONANCE 33657 + #define SPELL_MURMURS_TOUCH DUNGEON_MODE(33711, 38794) -#define SPELL_MAGNETIC_PULL 33689 -#define SPELL_SONIC_SHOCK 38797 -#define SPELL_THUNDERING_STORM 39365 + class boss_murmur : public CreatureScript { @@ -123,7 +128,7 @@ public: } if (SonicBoom_Timer <= diff) { - DoScriptText(EMOTE_SONIC_BOOM, me); + Talk(EMOTE_SONIC_BOOM); DoCast(me, SPELL_SONIC_BOOM_CAST); SonicBoom_Timer = 30000; SonicBoom = true; diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index fd775df3392..427c23bafa6 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -27,32 +27,33 @@ EndScriptData */ #include "ScriptedCreature.h" #include "black_temple.h" -//Speech'n'Sound -#define SAY_AGGRO -1564029 -#define SAY_SLAY1 -1564030 -#define SAY_SLAY2 -1564031 -#define SAY_SPECIAL1 -1564032 -#define SAY_SPECIAL2 -1564033 -#define SAY_ENRAGE1 -1564034 -#define SAY_ENRAGE2 -1564035 -#define SAY_DEATH -1564036 - -//Spells -#define SPELL_ACID_GEYSER 40630 -#define SPELL_ACIDIC_WOUND 40481 -#define SPELL_ARCING_SMASH 40599 -#define SPELL_BLOODBOIL 42005 // This spell is AoE whereas it shouldn't be -#define SPELL_FEL_ACID 40508 -#define SPELL_FEL_RAGE_SELF 40594 -#define SPELL_FEL_RAGE_TARGET 40604 -#define SPELL_FEL_RAGE_2 40616 -#define SPELL_FEL_RAGE_3 41625 -#define SPELL_BEWILDERING_STRIKE 40491 -#define SPELL_EJECT1 40486 // 1000 Physical damage + knockback + script effect (should handle threat reduction I think) -#define SPELL_EJECT2 40597 // 1000 Physical damage + Stun (used in phase 2?) -#define SPELL_TAUNT_GURTOGG 40603 -#define SPELL_INSIGNIFIGANCE 40618 -#define SPELL_BERSERK 45078 +enum Bloodboil +{ + //Speech'n'Sound + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_SPECIAL = 2, + SAY_ENRAGE = 3, + SAY_DEATH = 4, + + //Spells + SPELL_ACID_GEYSER = 40630, + SPELL_ACIDIC_WOUND = 40481, + SPELL_ARCING_SMASH = 40599, + SPELL_BLOODBOIL = 42005, // This spell is AoE whereas it shouldn't be + SPELL_FEL_ACID = 40508, + SPELL_FEL_RAGE_SELF = 40594, + SPELL_FEL_RAGE_TARGET = 40604, + SPELL_FEL_RAGE_2 = 40616, + SPELL_FEL_RAGE_3 = 41625, + SPELL_BEWILDERING_STRIKE = 40491, + SPELL_EJECT1 = 40486, // 1000 Physical damage + knockback + script effect (should handle threat reduction I think) + SPELL_EJECT2 = 40597, // 1000 Physical damage + Stun (used in phase 2?) + SPELL_TAUNT_GURTOGG = 40603, + SPELL_INSIGNIFIGANCE = 40618, + SPELL_BERSERK = 45078 +}; + //This is used to sort the players by distance in preparation for the Bloodboil cast. @@ -121,14 +122,14 @@ public: void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) @@ -136,7 +137,7 @@ public: if (instance) instance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } // Note: This seems like a very complicated fix. The fix needs to be handled by the core, as implementation of limited-target AoE spells are still not limited. @@ -219,7 +220,7 @@ public: if (EnrageTimer <= diff) { DoCast(me, SPELL_BERSERK); - DoScriptText(RAND(SAY_ENRAGE1, SAY_ENRAGE2), me); + Talk(SAY_ENRAGE); } else EnrageTimer -= diff; } @@ -302,7 +303,7 @@ public: //Cast this without triggered so that it appears in combat logs and shows visual. DoCast(me, SPELL_FEL_RAGE_SELF); - DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); + Talk(SAY_SPECIAL); AcidGeyserTimer = 1000; PhaseChangeTimer = 30000; diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index ec25a8f9f60..88e7c063c69 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -27,31 +27,29 @@ EndScriptData */ #include "ScriptedCreature.h" #include "black_temple.h" -//Speech'n'Sounds -#define SAY_TAUNT1 -1564018 -#define SAY_TAUNT2 -1564019 -#define SAY_TAUNT3 -1564020 -#define SAY_AGGRO -1564021 -#define SAY_SPELL1 -1564022 -#define SAY_SPELL2 -1564023 -#define SAY_SPELL3 -1564024 -#define SAY_SLAY1 -1564025 -#define SAY_SLAY2 -1564026 -#define SAY_ENRAGE -1564027 -#define SAY_DEATH -1564028 - -//Spells -#define SPELL_BEAM_SINISTER 40859 -#define SPELL_BEAM_VILE 40860 -#define SPELL_BEAM_WICKED 40861 -#define SPELL_BEAM_SINFUL 40827 -#define SPELL_ATTRACTION 40871 -#define SPELL_SILENCING_SHRIEK 40823 -#define SPELL_ENRAGE 23537 -#define SPELL_SABER_LASH 40810//43267 -#define SPELL_SABER_LASH_IMM 43690 -#define SPELL_TELEPORT_VISUAL 40869 -#define SPELL_BERSERK 45078 +enum MotherShahraz +{ + //Speech'n'Sounds + SAY_TAUNT = 0, + SAY_AGGRO = 1, + SAY_SPELL = 2, + SAY_SLAY = 3, + SAY_ENRAGE = 4, + SAY_DEATH = 5, + + //Spells + SPELL_BEAM_SINISTER = 40859, + SPELL_BEAM_VILE = 40860, + SPELL_BEAM_WICKED = 40861, + SPELL_BEAM_SINFUL = 40827, + SPELL_ATTRACTION = 40871, + SPELL_SILENCING_SHRIEK = 40823, + SPELL_ENRAGE = 23537, + SPELL_SABER_LASH = 40810,//43267 + SPELL_SABER_LASH_IMM = 43690, + SPELL_TELEPORT_VISUAL = 40869, + SPELL_BERSERK = 45078 +}; uint32 PrismaticAuras[]= { @@ -142,12 +140,12 @@ public: instance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS); DoZoneInCombat(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) @@ -155,7 +153,7 @@ public: if (instance) instance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void TeleportPlayers() @@ -185,7 +183,7 @@ public: { Enraged = true; DoCast(me, SPELL_ENRAGE, true); - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); } //Randomly cast one beam. @@ -236,7 +234,7 @@ public: TeleportPlayers(); - DoScriptText(RAND(SAY_SPELL2, SAY_SPELL3), me); + Talk(SAY_SPELL); FatalAttractionExplodeTimer = 2000; FatalAttractionTimer = urand(40, 71) * 1000; } else FatalAttractionTimer -= diff; @@ -284,14 +282,14 @@ public: if (EnrageTimer <= diff) { DoCast(me, SPELL_BERSERK); - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); } else EnrageTimer -= diff; } //Random taunts if (RandomYellTimer <= diff) { - DoScriptText(RAND(SAY_TAUNT1, SAY_TAUNT2, SAY_TAUNT3), me); + Talk(SAY_TAUNT); RandomYellTimer = urand(60, 151) * 1000; } else RandomYellTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 5ab9dcab667..00ea405e109 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -28,64 +28,61 @@ EndScriptData */ #include "black_temple.h" #include "Spell.h" -//Sound'n'speech -//Suffering -#define SUFF_SAY_FREED -1564047 -#define SUFF_SAY_AGGRO -1564048 -#define SUFF_SAY_SLAY1 -1564049 -#define SUFF_SAY_SLAY2 -1564050 -#define SUFF_SAY_SLAY3 -1564051 -#define SUFF_SAY_RECAP -1564052 -#define SUFF_SAY_AFTER -1564053 -#define SUFF_EMOTE_ENRAGE -1564054 - -//Desire -#define DESI_SAY_FREED -1564055 -#define DESI_SAY_SLAY1 -1564056 -#define DESI_SAY_SLAY2 -1564057 -#define DESI_SAY_SLAY3 -1564058 -#define DESI_SAY_SPEC -1564059 -#define DESI_SAY_RECAP -1564060 -#define DESI_SAY_AFTER -1564061 - -//Anger -#define ANGER_SAY_FREED -1564062 -#define ANGER_SAY_FREED2 -1564063 -#define ANGER_SAY_SLAY1 -1564064 -#define ANGER_SAY_SLAY2 -1564065 -#define ANGER_SAY_SPEC -1564066 -#define ANGER_SAY_BEFORE -1564067 -#define ANGER_SAY_DEATH -1564068 - -//Spells -#define AURA_OF_SUFFERING 41292 -#define AURA_OF_SUFFERING_ARMOR 42017 // linked aura, need core support -#define ESSENCE_OF_SUFFERING_PASSIVE 41296 // periodic trigger 41294 -#define ESSENCE_OF_SUFFERING_PASSIVE2 41623 -#define SPELL_FIXATE_TARGET 41294 // dummy, select target -#define SPELL_FIXATE_TAUNT 41295 // force taunt -#define SPELL_ENRAGE 41305 -#define SPELL_SOUL_DRAIN 41303 - -#define AURA_OF_DESIRE 41350 -#define AURA_OF_DESIRE_DAMAGE 41352 -#define SPELL_RUNE_SHIELD 41431 -#define SPELL_DEADEN 41410 -#define SPELL_SOUL_SHOCK 41426 - -#define AURA_OF_ANGER 41337 -#define SPELL_SELF_SEETHE 41364 // force cast 41520 -#define SPELL_ENEMY_SEETHE 41520 -#define SPELL_SOUL_SCREAM 41545 -#define SPELL_SPITE_TARGET 41376 // cast 41377 after 6 sec -#define SPELL_SPITE_DAMAGE 41377 - -#define ENSLAVED_SOUL_PASSIVE 41535 -#define SPELL_SOUL_RELEASE 41542 -#define SPELL_SUBMERGE 37550 //dropout 'head' - -#define CREATURE_ENSLAVED_SOUL 23469 -#define NUMBER_ENSLAVED_SOUL 8 +enum ReliquaryOfSouls +{ + //Sound'n'speech + //Suffering + SUFF_SAY_FREED = 0, + SUFF_SAY_AGGRO = 1, + SUFF_SAY_SLAY = 2, + SUFF_SAY_RECAP = 3, + SUFF_SAY_AFTER = 4, + SUFF_EMOTE_ENRAGE = 5, + + //Desire + DESI_SAY_FREED = 0, + DESI_SAY_SLAY = 1, + DESI_SAY_SPEC = 2, + DESI_SAY_RECAP = 3, + DESI_SAY_AFTER = 4, + + //Anger + ANGER_SAY_FREED = 0, + ANGER_SAY_SLAY = 1, + ANGER_SAY_SPEC = 2, + ANGER_SAY_BEFORE = 3, + ANGER_SAY_DEATH = 4, + + //Spells + AURA_OF_SUFFERING = 41292, + AURA_OF_SUFFERING_ARMOR = 42017, // linked aura, need core support + ESSENCE_OF_SUFFERING_PASSIVE = 41296, // periodic trigger 41294 + ESSENCE_OF_SUFFERING_PASSIVE2 = 41623, + SPELL_FIXATE_TARGET = 41294, // dummy, select target + SPELL_FIXATE_TAUNT = 41295, // force taunt + SPELL_ENRAGE = 41305, + SPELL_SOUL_DRAIN = 41303, + + AURA_OF_DESIRE = 41350, + AURA_OF_DESIRE_DAMAGE = 41352, + SPELL_RUNE_SHIELD = 41431, + SPELL_DEADEN = 41410, + SPELL_SOUL_SHOCK = 41426, + + AURA_OF_ANGER = 41337, + SPELL_SELF_SEETHE = 41364, // force cast 41520 + SPELL_ENEMY_SEETHE = 41520, + SPELL_SOUL_SCREAM = 41545, + SPELL_SPITE_TARGET = 41376, // cast 41377 after 6 sec + SPELL_SPITE_DAMAGE = 41377, + + ENSLAVED_SOUL_PASSIVE = 41535, + SPELL_SOUL_RELEASE = 41542, + SPELL_SUBMERGE = 37550, //dropout 'head' + + CREATURE_ENSLAVED_SOUL = 23469, + NUMBER_ENSLAVED_SOUL = 8 +}; struct Position2d { @@ -337,11 +334,11 @@ public: case 5: if (Phase == 1) { - DoScriptText(SUFF_SAY_AFTER, Essence); + Essence->AI()->Talk(SUFF_SAY_AFTER); } else { - DoScriptText(DESI_SAY_AFTER, Essence); + Essence->AI()->Talk(DESI_SAY_AFTER); } Essence->DespawnOrUnsummon(); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); @@ -425,7 +422,7 @@ public: damage = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->Yell(SUFF_SAY_RECAP, LANG_UNIVERSAL, 0); - DoScriptText(SUFF_SAY_RECAP, me); + Talk(SUFF_SAY_RECAP); me->SetReactState(REACT_PASSIVE); } } @@ -434,7 +431,7 @@ public: { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { - DoScriptText(SUFF_SAY_FREED, me); + Talk(SUFF_SAY_FREED); DoZoneInCombat(); DoCast(me, AURA_OF_SUFFERING, true); // linked aura need core support DoCast(me, ESSENCE_OF_SUFFERING_PASSIVE, true); @@ -445,7 +442,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SUFF_SAY_SLAY1, SUFF_SAY_SLAY2, SUFF_SAY_SLAY3), me); + Talk(SUFF_SAY_SLAY); } void CastFixate() @@ -483,7 +480,7 @@ public: FixateTimer = 5000; if (!(rand()%16)) { - DoScriptText(SUFF_SAY_AGGRO, me); + Talk(SUFF_SAY_AGGRO); } } else FixateTimer -= diff; } @@ -496,7 +493,7 @@ public: { DoCast(me, SPELL_ENRAGE); EnrageTimer = 60000; - DoScriptText(SUFF_EMOTE_ENRAGE, me); + Talk(SUFF_EMOTE_ENRAGE); } else EnrageTimer -= diff; if (SoulDrainTimer <= diff) @@ -545,7 +542,7 @@ public: { damage = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - DoScriptText(SUFF_SAY_RECAP, me); + Talk(SUFF_SAY_RECAP); me->SetReactState(REACT_PASSIVE); } else @@ -567,14 +564,14 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(DESI_SAY_FREED, me); + Talk(DESI_SAY_FREED); DoZoneInCombat(); DoCast(me, AURA_OF_DESIRE, true); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(DESI_SAY_SLAY1, DESI_SAY_SLAY2, DESI_SAY_SLAY3), me); + Talk(DESI_SAY_SLAY); } void UpdateAI(const uint32 diff) @@ -604,7 +601,7 @@ public: DeadenTimer = urand(25000, 35000); if (!(rand()%2)) { - DoScriptText(DESI_SAY_SPEC, me); + Talk(DESI_SAY_SPEC); } } else DeadenTimer -= diff; @@ -652,7 +649,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(ANGER_SAY_FREED, ANGER_SAY_FREED2), me); + Talk(ANGER_SAY_FREED); DoZoneInCombat(); DoCast(me, AURA_OF_ANGER, true); @@ -660,12 +657,12 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(ANGER_SAY_DEATH, me); + Talk(ANGER_SAY_DEATH); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(ANGER_SAY_SLAY1, ANGER_SAY_SLAY2), me); + Talk(ANGER_SAY_SLAY); } void UpdateAI(const uint32 diff) @@ -684,7 +681,7 @@ public: { if (me->getVictim()->GetGUID() != AggroTargetGUID) { - DoScriptText(ANGER_SAY_BEFORE, me); + Talk(ANGER_SAY_BEFORE); DoCast(me, SPELL_SELF_SEETHE, true); AggroTargetGUID = me->getVictim()->GetGUID(); } @@ -697,7 +694,7 @@ public: SoulScreamTimer = urand(9000, 11000); if (!(rand()%3)) { - DoScriptText(ANGER_SAY_SPEC, me); + Talk(ANGER_SAY_SPEC); } } else SoulScreamTimer -= diff; @@ -705,7 +702,7 @@ public: { DoCast(me, SPELL_SPITE_TARGET); SpiteTimer = 30000; - DoScriptText(ANGER_SAY_SPEC, me); + Talk(ANGER_SAY_SPEC); } else SpiteTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 6e770249cf0..0180281cde3 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -29,12 +29,15 @@ EndScriptData */ #include "black_temple.h" #include "Player.h" -#define SAY_DEATH -1564013 -#define SAY_LOW_HEALTH -1564014 -// Ending cinematic text -#define SAY_FREE -1564015 -#define SAY_BROKEN_FREE_01 -1564016 -#define SAY_BROKEN_FREE_02 -1564017 +enum ShadeOfAkama +{ + SAY_DEATH = 0, + SAY_LOW_HEALTH = 1, + // Ending cinematic text + SAY_FREE = 2, + SAY_BROKEN_FREE_01 = 0, + SAY_BROKEN_FREE_02 = 1 +}; #define GOSSIP_ITEM "We are ready to fight alongside you, Akama" @@ -704,7 +707,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); EventBegun = false; ShadeHasDied = false; StartCombat = false; @@ -729,7 +732,7 @@ public: if (HealthBelowPct(15) && !HasYelledOnce) { - DoScriptText(SAY_LOW_HEALTH, me); + Talk(SAY_LOW_HEALTH); HasYelledOnce = true; } @@ -825,7 +828,7 @@ public: SummonBrokenTimer = 1; break; case 1: - DoScriptText(SAY_FREE, me); + Talk(SAY_FREE); ++EndingTalkCount; SoulRetrieveTimer = 25000; break; @@ -838,7 +841,7 @@ public: { if (!Yelled) { - DoScriptText(SAY_BROKEN_FREE_01, unit); + unit->AI()->Talk(SAY_BROKEN_FREE_01); Yelled = true; } unit->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); @@ -863,7 +866,7 @@ public: { for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) if (Creature* unit = Unit::GetCreature((*me), *itr)) - unit->MonsterYell(SAY_BROKEN_FREE_02, LANG_UNIVERSAL, 0); + unit->AI()->Talk(SAY_BROKEN_FREE_02); } SoulRetrieveTimer = 0; break; diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 77d1c86951b..388052f0a5e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -28,32 +28,35 @@ EndScriptData */ #include "PassiveAI.h" #include "black_temple.h" -#define EMOTE_NEW_TARGET -1564010 -#define EMOTE_PUNCH_GROUND -1564011 //DoScriptText(EMOTE_PUNCH_GROUND, me); -#define EMOTE_GROUND_CRACK -1564012 - -//Spells -#define SPELL_MOLTEN_PUNCH 40126 -#define SPELL_HATEFUL_STRIKE 41926 -#define SPELL_MOLTEN_FLAME 40980 -#define SPELL_VOLCANIC_ERUPTION 40117 -#define SPELL_VOLCANIC_SUMMON 40276 -#define SPELL_BERSERK 45078 - -#define CREATURE_VOLCANO 23085 -#define CREATURE_STALKER 23095 - -#define PHASE_STRIKE 1 -#define PHASE_CHASE 2 - -#define EVENT_BERSERK 1 -#define EVENT_SWITCH_PHASE 2 -#define EVENT_FLAME 3 -#define EVENT_VOLCANO 4 -#define EVENT_SWITCH_TARGET 5 -#define EVENT_HATEFUL_STRIKE 6 - -#define GCD_CAST 1 +enum Supremus +{ + EMOTE_NEW_TARGET = 0, + EMOTE_PUNCH_GROUND = 1, //Talk(EMOTE_PUNCH_GROUND); + EMOTE_GROUND_CRACK = 2, + + //Spells + SPELL_MOLTEN_PUNCH = 40126, + SPELL_HATEFUL_STRIKE = 41926, + SPELL_MOLTEN_FLAME = 40980, + SPELL_VOLCANIC_ERUPTION = 40117, + SPELL_VOLCANIC_SUMMON = 40276, + SPELL_BERSERK = 45078, + + CREATURE_VOLCANO = 23085, + CREATURE_STALKER = 23095, + + PHASE_STRIKE = 1, + PHASE_CHASE = 2, + + EVENT_BERSERK = 1, + EVENT_SWITCH_PHASE = 2, + EVENT_FLAME = 3, + EVENT_VOLCANO = 4, + EVENT_SWITCH_TARGET = 5, + EVENT_HATEFUL_STRIKE = 6, + + GCD_CAST = 1 +}; class molten_flame : public CreatureScript { @@ -230,7 +233,7 @@ public: { DoResetThreat(); me->AddThreat(target, 5000000.0f); - DoScriptText(EMOTE_NEW_TARGET, me); + Talk(EMOTE_NEW_TARGET); } events.ScheduleEvent(EVENT_SWITCH_TARGET, 10000, 0, PHASE_CHASE); break; @@ -242,7 +245,7 @@ public: { //DoCast(target, SPELL_VOLCANIC_SUMMON);//movement bugged me->SummonCreature(CREATURE_VOLCANO, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); - DoScriptText(EMOTE_GROUND_CRACK, me); + Talk(EMOTE_GROUND_CRACK); events.DelayEvents(1500, GCD_CAST); } events.ScheduleEvent(EVENT_VOLCANO, 10000, GCD_CAST, PHASE_CHASE); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 9a200d07d2b..ce17ac48cf5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -27,30 +27,29 @@ EndScriptData */ #include "ScriptedCreature.h" #include "black_temple.h" - //Speech'n'sound -#define SAY_INTRO -1564037 -#define SAY_AGGRO -1564038 -#define SAY_SLAY1 -1564039 -#define SAY_SLAY2 -1564040 -#define SAY_SPELL1 -1564041 -#define SAY_SPELL2 -1564042 -#define SAY_SPECIAL1 -1564043 -#define SAY_SPECIAL2 -1564044 -#define SAY_ENRAGE -1564045 -#define SAY_DEATH -1564046 - -//Spells -#define SPELL_INCINERATE 40239 -#define SPELL_CRUSHING_SHADOWS 40243 -#define SPELL_SHADOWBOLT 40185 -#define SPELL_PASSIVE_SHADOWFORM 40326 -#define SPELL_SHADOW_OF_DEATH 40251 -#define SPELL_BERSERK 45078 - -#define SPELL_ATROPHY 40327 // Shadowy Constructs use this when they get within melee range of a player - -#define CREATURE_DOOM_BLOSSOM 23123 -#define CREATURE_SHADOWY_CONSTRUCT 23111 +enum DoomBlossom +{ + //Speech'n'sound + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_SPELL = 3, + SAY_SPECIAL = 4, + SAY_ENRAGE = 5, + SAY_DEATH = 6, + + //Spells + SPELL_INCINERATE = 40239, + SPELL_CRUSHING_SHADOWS = 40243, + SPELL_SHADOWBOLT = 40185, + SPELL_PASSIVE_SHADOWFORM = 40326, + SPELL_SHADOW_OF_DEATH = 40251, + SPELL_BERSERK = 45078, + SPELL_ATROPHY = 40327, // Shadowy Constructs use this when they get within melee range of a player + + CREATURE_DOOM_BLOSSOM = 23123, + CREATURE_SHADOWY_CONSTRUCT = 23111 +}; class mob_doom_blossom : public CreatureScript { @@ -278,7 +277,7 @@ public: me->GetMotionMaster()->Clear(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_TALK); AggroTargetGUID = who->GetGUID(); Intro = true; @@ -290,7 +289,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) @@ -298,7 +297,7 @@ public: if (instance) instance->SetData(DATA_TERONGOREFIENDEVENT, DONE); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } float CalculateRandomLocation(float Loc, uint32 radius) @@ -387,7 +386,7 @@ public: { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); Done = true; if (AggroTargetGUID) @@ -461,7 +460,7 @@ public: if (target) { - DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); + Talk(SAY_SPECIAL); DoCast(target, SPELL_INCINERATE); IncinerateTimer = urand(20, 51) * 1000; } @@ -494,7 +493,7 @@ public: if (RandomYellTimer <= diff) { - DoScriptText(RAND(SAY_SPELL1, SAY_SPELL2), me); + Talk(SAY_SPELL); RandomYellTimer = urand(50, 101) * 1000; } else RandomYellTimer -= diff; @@ -503,7 +502,7 @@ public: if (EnrageTimer <= diff) { DoCast(me, SPELL_BERSERK); - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); } else EnrageTimer -= diff; } diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 9924bf1ffab..f56d55c36e3 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -31,16 +31,12 @@ EndScriptData */ enum eEnums { - SAY_AGGRO = -1564000, - SAY_NEEDLE1 = -1564001, - SAY_NEEDLE2 = -1564002, - SAY_SLAY1 = -1564003, - SAY_SLAY2 = -1564004, - SAY_SPECIAL1 = -1564005, - SAY_SPECIAL2 = -1564006, - SAY_ENRAGE1 = -1564007, //is this text actually in use? - SAY_ENRAGE2 = -1564008, - SAY_DEATH = -1564009, + SAY_AGGRO = 0, + SAY_NEEDLE = 1, + SAY_SLAY = 2, + SAY_SPECIAL = 3, + SAY_ENRAGE = 4, + SAY_DEATH = 5, //Spells SPELL_NEEDLE_SPINE = 39992, @@ -97,7 +93,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, me); + Talk(SAY_SLAY); events.DelayEvents(5000, GCD_YELL); } @@ -106,7 +102,7 @@ public: if (instance) instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void SpellHit(Unit* /*caster*/, const SpellInfo* spell) @@ -124,7 +120,7 @@ public: if (instance) instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoZoneInCombat(); events.ScheduleEvent(EVENT_BERSERK, 480000, GCD_CAST); events.ScheduleEvent(EVENT_YELL, 45000 + (rand()%76)*1000, GCD_YELL); @@ -166,7 +162,7 @@ public: ResetTimer(45000); break; case EVENT_BERSERK: - DoScriptText(SAY_ENRAGE2, me); + Talk(SAY_ENRAGE); DoCast(me, SPELL_BERSERK, true); events.DelayEvents(15000, GCD_YELL); break; @@ -180,7 +176,7 @@ public: SpineTargetGUID = target->GetGUID(); //must let target summon, otherwise you cannot click the spine target->SummonGameObject(GOBJECT_SPINE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), me->GetOrientation(), 0, 0, 0, 0, 30); - DoScriptText(urand(0, 1) ? SAY_NEEDLE1 : SAY_NEEDLE2, me); + Talk(SAY_NEEDLE); events.DelayEvents(1500, GCD_CAST); events.DelayEvents(15000, GCD_YELL); } @@ -199,7 +195,7 @@ public: return; } case EVENT_YELL: - DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); + Talk(SAY_SPECIAL); events.ScheduleEvent(EVENT_YELL, urand(25000, 100000), GCD_YELL); events.DelayEvents(15000, GCD_YELL); break; diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 673d4bcc96f..5a9b6e5a94e 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -29,35 +29,69 @@ EndScriptData */ #include "SpellAuraEffects.h" #include "black_temple.h" -//Speech'n'Sounds -#define SAY_GATH_SLAY -1564085 -#define SAY_GATH_SLAY_COMNT -1564089 -#define SAY_GATH_DEATH -1564093 -#define SAY_GATH_SPECIAL1 -1564077 -#define SAY_GATH_SPECIAL2 -1564081 - -#define SAY_VERA_SLAY -1564086 -#define SAY_VERA_COMNT -1564089 //signed for 22949 -#define SAY_VERA_DEATH -1564094 -#define SAY_VERA_SPECIAL1 -1564078 -#define SAY_VERA_SPECIAL2 -1564082 - -#define SAY_MALA_SLAY -1564087 -#define SAY_MALA_COMNT -1564090 -#define SAY_MALA_DEATH -1564095 -#define SAY_MALA_SPECIAL1 -1564079 -#define SAY_MALA_SPECIAL2 -1564083 - -#define SAY_ZERE_SLAY -1564088 -#define SAY_ZERE_COMNT -1564091 -#define SAY_ZERE_DEATH -1564096 -#define SAY_ZERE_SPECIAL1 -1564080 -#define SAY_ZERE_SPECIAL2 -1564084 +enum IllidariCouncil +{ + //Speech'n'Sounds + SAY_GATH_SPECIAL1 = 2, + SAY_GATH_SPECIAL2 = 3, + SAY_GATH_SLAY = 4, + SAY_GATH_COMNT = 5, + SAY_GATH_DEATH = 6, + + SAY_MALA_SPECIAL1 = 2, + SAY_MALA_SPECIAL2 = 3, + SAY_MALA_SLAY = 4, + SAY_MALA_COMNT = 5, + SAY_MALA_DEATH = 6, + + SAY_ZERE_SPECIAL1 = 2, + SAY_ZERE_SPECIAL2 = 3, + SAY_ZERE_SLAY = 4, + SAY_ZERE_COMNT = 5, + SAY_ZERE_DEATH = 6, + + SAY_VERA_SPECIAL1 = 2, + SAY_VERA_SPECIAL2 = 3, + SAY_VERA_SLAY = 4, + SAY_VERA_COMNT = 5, + SAY_VERA_DEATH = 6, + + AKAMAID = 23089, + + // High Nethermancer Zerevor's spells + SPELL_FLAMESTRIKE = 41481, + SPELL_BLIZZARD = 41482, + SPELL_ARCANE_BOLT = 41483, + SPELL_ARCANE_EXPLOSION = 41524, + SPELL_DAMPEN_MAGIC = 41478, + + // Lady Malande's spells + SPELL_EMPOWERED_SMITE = 41471, + SPELL_CIRCLE_OF_HEALING = 41455, + SPELL_REFLECTIVE_SHIELD = 41475, + SPELL_REFLECTIVE_SHIELD_T = 33619, + SPELL_DIVINE_WRATH = 41472, + SPELL_HEAL_VISUAL = 24171, + + // Gathios the Shatterer's spells + SPELL_BLESS_PROTECTION = 41450, + SPELL_BLESS_SPELLWARD = 41451, + SPELL_CONSECRATION = 41541, + SPELL_HAMMER_OF_JUSTICE = 41468, + SPELL_SEAL_OF_COMMAND = 41469, + SPELL_SEAL_OF_BLOOD = 41459, + SPELL_CHROMATIC_AURA = 41453, + SPELL_DEVOTION_AURA = 41452, + + // Veras Darkshadow's spells + SPELL_DEADLY_POISON = 41485, + SPELL_ENVENOM = 41487, + SPELL_VANISH = 41479, + SPELL_BERSERK = 45078 +}; #define ERROR_INST_DATA "SD2 ERROR: Instance Data for Black Temple not set properly; Illidari Council event will not function properly." -#define AKAMAID 23089 - struct CouncilYells { int32 entry; @@ -66,53 +100,21 @@ struct CouncilYells static CouncilYells CouncilAggro[]= { - {-1564069, 5000}, // Gathios - {-1564070, 5500}, // Veras - {-1564071, 5000}, // Malande - {-1564072, 0}, // Zerevor + {0, 5000}, // Gathios + {0, 5500}, // Veras + {0, 5000}, // Malande + {0, 0}, // Zerevor }; // Need to get proper timers for this later static CouncilYells CouncilEnrage[]= { - {-1564073, 2000}, // Gathios - {-1564074, 6000}, // Veras - {-1564075, 5000}, // Malande - {-1564076, 0}, // Zerevor + {1, 2000}, // Gathios + {1, 6000}, // Veras + {1, 5000}, // Malande + {1, 0}, // Zerevor }; -// High Nethermancer Zerevor's spells -#define SPELL_FLAMESTRIKE 41481 -#define SPELL_BLIZZARD 41482 -#define SPELL_ARCANE_BOLT 41483 -#define SPELL_ARCANE_EXPLOSION 41524 -#define SPELL_DAMPEN_MAGIC 41478 - -// Lady Malande's spells -#define SPELL_EMPOWERED_SMITE 41471 -#define SPELL_CIRCLE_OF_HEALING 41455 -#define SPELL_REFLECTIVE_SHIELD 41475 -#define SPELL_REFLECTIVE_SHIELD_T 33619 -#define SPELL_DIVINE_WRATH 41472 -#define SPELL_HEAL_VISUAL 24171 - -// Gathios the Shatterer's spells -#define SPELL_BLESS_PROTECTION 41450 -#define SPELL_BLESS_SPELLWARD 41451 -#define SPELL_CONSECRATION 41541 -#define SPELL_HAMMER_OF_JUSTICE 41468 -#define SPELL_SEAL_OF_COMMAND 41469 -#define SPELL_SEAL_OF_BLOOD 41459 -#define SPELL_CHROMATIC_AURA 41453 -#define SPELL_DEVOTION_AURA 41452 - -// Veras Darkshadow's spells -#define SPELL_DEADLY_POISON 41485 -#define SPELL_ENVENOM 41487 -#define SPELL_VANISH 41479 - -#define SPELL_BERSERK 45078 - class mob_blood_elf_council_voice_trigger : public CreatureScript { public: @@ -179,9 +181,9 @@ public: { if (AggroYellTimer <= diff) { - if (Unit* pMember = Unit::GetUnit(*me, Council[YellCounter])) + if (Creature* pMember = Creature::GetCreature(*me, Council[YellCounter])) { - DoScriptText(CouncilAggro[YellCounter].entry, pMember); + pMember->AI()->Talk(CouncilAggro[YellCounter].entry); AggroYellTimer = CouncilAggro[YellCounter].timer; } ++YellCounter; @@ -194,10 +196,10 @@ public: { if (EnrageTimer <= diff) { - if (Unit* pMember = Unit::GetUnit(*me, Council[YellCounter])) + if (Creature* pMember = Creature::GetCreature(*me, Council[YellCounter])) { pMember->CastSpell(pMember, SPELL_BERSERK, true); - DoScriptText(CouncilEnrage[YellCounter].entry, pMember); + pMember->AI()->Talk(CouncilEnrage[YellCounter].entry); EnrageTimer = CouncilEnrage[YellCounter].timer; } ++YellCounter; @@ -497,12 +499,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_GATH_SLAY, me); + Talk(SAY_GATH_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_GATH_DEATH, me); + Talk(SAY_GATH_DEATH); } Unit* SelectCouncilMember() @@ -631,12 +633,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_ZERE_SLAY, me); + Talk(SAY_ZERE_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_ZERE_DEATH, me); + Talk(SAY_ZERE_DEATH); } void UpdateAI(const uint32 diff) @@ -731,12 +733,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_MALA_SLAY, me); + Talk(SAY_MALA_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_MALA_DEATH, me); + Talk(SAY_MALA_DEATH); } void UpdateAI(const uint32 diff) @@ -817,12 +819,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_VERA_SLAY, me); + Talk(SAY_VERA_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_VERA_DEATH, me); + Talk(SAY_VERA_DEATH); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index a5737714e71..5a26ffd9acd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -28,64 +28,62 @@ EndScriptData */ #include "serpent_shrine.h" #include "ScriptedEscortAI.h" -#define SAY_AGGRO -1548021 -#define SAY_GAIN_BLESSING -1548022 -#define SAY_GAIN_ABILITY1 -1548023 -#define SAY_GAIN_ABILITY2 -1548024 -#define SAY_GAIN_ABILITY3 -1548025 -#define SAY_SLAY1 -1548026 -#define SAY_SLAY2 -1548027 -#define SAY_SLAY3 -1548028 -#define SAY_DEATH -1548029 - -//Karathress spells -#define SPELL_CATACLYSMIC_BOLT 38441 -#define SPELL_POWER_OF_SHARKKIS 38455 -#define SPELL_POWER_OF_TIDALVESS 38452 -#define SPELL_POWER_OF_CARIBDIS 38451 -#define SPELL_ENRAGE 24318 -#define SPELL_SEAR_NOVA 38445 -#define SPELL_BLESSING_OF_THE_TIDES 38449 - -//Sharkkis spells -#define SPELL_LEECHING_THROW 29436 -#define SPELL_THE_BEAST_WITHIN 38373 -#define SPELL_MULTISHOT 38366 -#define SPELL_SUMMON_FATHOM_LURKER 38433 -#define SPELL_SUMMON_FATHOM_SPOREBAT 38431 -#define SPELL_PET_ENRAGE 19574 - -//Tidalvess spells -#define SPELL_FROST_SHOCK 38234 -#define SPELL_SPITFIRE_TOTEM 38236 -#define SPELL_POISON_CLEANSING_TOTEM 38306 -// Spell obsolete -// #define SPELL_POISON_CLEANSING_EFFECT 8167 -#define SPELL_EARTHBIND_TOTEM 38304 -#define SPELL_EARTHBIND_TOTEM_EFFECT 6474 -#define SPELL_WINDFURY_WEAPON 38184 - -//Caribdis Spells -#define SPELL_WATER_BOLT_VOLLEY 38335 -#define SPELL_TIDAL_SURGE 38358 -#define SPELL_TIDAL_SURGE_FREEZE 38357 -#define SPELL_HEAL 38330 -#define SPELL_SUMMON_CYCLONE 38337 -#define SPELL_CYCLONE_CYCLONE 29538 - -//Yells and Quotes -#define SAY_GAIN_BLESSING_OF_TIDES "Your overconfidence will be your undoing! Guards, lend me your strength!" -#define SOUND_GAIN_BLESSING_OF_TIDES 11278 -#define SAY_MISC "Alana be'lendor!" //don't know what use this -#define SOUND_MISC 11283 - -//Summoned Unit GUIDs -#define CREATURE_CYCLONE 22104 -#define CREATURE_FATHOM_SPOREBAT 22120 -#define CREATURE_FATHOM_LURKER 22119 -#define CREATURE_SPITFIRE_TOTEM 22091 -#define CREATURE_EARTHBIND_TOTEM 22486 -#define CREATURE_POISON_CLEANSING_TOTEM 22487 +enum FathomlordKarathress +{ + SAY_AGGRO = 0, + SAY_GAIN_BLESSING = 1, + SAY_GAIN_ABILITY1 = 2, + SAY_GAIN_ABILITY2 = 3, + SAY_GAIN_ABILITY3 = 4, + SAY_SLAY = 5, + SAY_DEATH = 6, + + //Karathress spells + SPELL_CATACLYSMIC_BOLT = 38441, + SPELL_POWER_OF_SHARKKIS = 38455, + SPELL_POWER_OF_TIDALVESS = 38452, + SPELL_POWER_OF_CARIBDIS = 38451, + SPELL_ENRAGE = 24318, + SPELL_SEAR_NOVA = 38445, + SPELL_BLESSING_OF_THE_TIDES = 38449, + + //Sharkkis spells + SPELL_LEECHING_THROW = 29436, + SPELL_THE_BEAST_WITHIN = 38373, + SPELL_MULTISHOT = 38366, + SPELL_SUMMON_FATHOM_LURKER = 38433, + SPELL_SUMMON_FATHOM_SPOREBAT = 38431, + SPELL_PET_ENRAGE = 19574, + + //Tidalvess spells + SPELL_FROST_SHOCK = 38234, + SPELL_SPITFIRE_TOTEM = 38236, + SPELL_POISON_CLEANSING_TOTEM = 38306, + // Spell obsolete + SPELL_EARTHBIND_TOTEM = 38304, + SPELL_EARTHBIND_TOTEM_EFFECT = 6474, + SPELL_WINDFURY_WEAPON = 38184, + + //Caribdis Spells + SPELL_WATER_BOLT_VOLLEY = 38335, + SPELL_TIDAL_SURGE = 38358, + SPELL_TIDAL_SURGE_FREEZE = 38357, + SPELL_HEAL = 38330, + SPELL_SUMMON_CYCLONE = 38337, + SPELL_CYCLONE_CYCLONE = 29538, + + //Yells and Quotes + SOUND_GAIN_BLESSING_OF_TIDES = 11278, + SOUND_MISC = 11283, + + //Summoned Unit GUIDs + CREATURE_CYCLONE = 22104, + CREATURE_FATHOM_SPOREBAT = 22120, + CREATURE_FATHOM_LURKER = 22119, + CREATURE_SPITFIRE_TOTEM = 22091, + CREATURE_EARTHBIND_TOTEM = 22486, + CREATURE_POISON_CLEANSING_TOTEM = 22487, +}; //entry and position for Seer Olum #define SEER_OLUM 22820 @@ -94,6 +92,9 @@ EndScriptData */ #define OLUM_Z -7.54773f #define OLUM_O 0.401581f +#define SAY_GAIN_BLESSING_OF_TIDES "Your overconfidence will be your undoing! Guards, lend me your strength!" +#define SAY_MISC "Alana be'lendor!" //don't know what use this + #define MAX_ADVISORS 3 //Fathom-Lord Karathress AI class boss_fathomlord_karathress : public CreatureScript @@ -160,19 +161,19 @@ public: void EventSharkkisDeath() { - DoScriptText(SAY_GAIN_ABILITY1, me); + Talk(SAY_GAIN_ABILITY1); DoCast(me, SPELL_POWER_OF_SHARKKIS); } void EventTidalvessDeath() { - DoScriptText(SAY_GAIN_ABILITY2, me); + Talk(SAY_GAIN_ABILITY2); DoCast(me, SPELL_POWER_OF_TIDALVESS); } void EventCaribdisDeath() { - DoScriptText(SAY_GAIN_ABILITY3, me); + Talk(SAY_GAIN_ABILITY3); DoCast(me, SPELL_POWER_OF_CARIBDIS); } @@ -193,7 +194,7 @@ public: GetAdvisors(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoZoneInCombat(); instance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); @@ -202,12 +203,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_FATHOMLORDKARATHRESSEVENT, DONE); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index bad10752db3..c8589cc05d8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -27,43 +27,45 @@ EndScriptData */ #include "ScriptedCreature.h" #include "serpent_shrine.h" -#define SAY_AGGRO -1548000 -#define SAY_SWITCH_TO_CLEAN -1548001 -#define SAY_CLEAN_SLAY1 -1548002 -#define SAY_CLEAN_SLAY2 -1548003 -#define SAY_CLEAN_DEATH -1548004 -#define SAY_SWITCH_TO_CORRUPT -1548005 -#define SAY_CORRUPT_SLAY1 -1548006 -#define SAY_CORRUPT_SLAY2 -1548007 -#define SAY_CORRUPT_DEATH -1548008 - -#define SWITCH_RADIUS 18 - -#define MODEL_CORRUPT 20609 -#define MODEL_CLEAN 20162 - -#define SPELL_WATER_TOMB 38235 -#define SPELL_MARK_OF_HYDROSS1 38215 -#define SPELL_MARK_OF_HYDROSS2 38216 -#define SPELL_MARK_OF_HYDROSS3 38217 -#define SPELL_MARK_OF_HYDROSS4 38218 -#define SPELL_MARK_OF_HYDROSS5 38231 -#define SPELL_MARK_OF_HYDROSS6 40584 -#define SPELL_MARK_OF_CORRUPTION1 38219 -#define SPELL_MARK_OF_CORRUPTION2 38220 -#define SPELL_MARK_OF_CORRUPTION3 38221 -#define SPELL_MARK_OF_CORRUPTION4 38222 -#define SPELL_MARK_OF_CORRUPTION5 38230 -#define SPELL_MARK_OF_CORRUPTION6 40583 -#define SPELL_VILE_SLUDGE 38246 -#define SPELL_ENRAGE 27680 //this spell need verification -#define SPELL_SUMMON_WATER_ELEMENT 36459 //not in use yet(in use ever?) -#define SPELL_ELEMENTAL_SPAWNIN 25035 -#define SPELL_BLUE_BEAM 40227 //channeled Hydross Beam Helper (not in use yet) - -#define ENTRY_PURE_SPAWN 22035 -#define ENTRY_TAINTED_SPAWN 22036 -#define ENTRY_BEAM_DUMMY 21934 +enum HydrossTheUnstable +{ + SAY_AGGRO = 0, + SAY_SWITCH_TO_CLEAN = 1, + SAY_CLEAN_SLAY = 2, + SAY_CLEAN_DEATH = 3, + SAY_SWITCH_TO_CORRUPT = 4, + SAY_CORRUPT_SLAY = 5, + SAY_CORRUPT_DEATH = 6, + + SWITCH_RADIUS = 18, + + MODEL_CORRUPT = 20609, + MODEL_CLEAN = 20162, + + SPELL_WATER_TOMB = 38235, + SPELL_MARK_OF_HYDROSS1 = 38215, + SPELL_MARK_OF_HYDROSS2 = 38216, + SPELL_MARK_OF_HYDROSS3 = 38217, + SPELL_MARK_OF_HYDROSS4 = 38218, + SPELL_MARK_OF_HYDROSS5 = 38231, + SPELL_MARK_OF_HYDROSS6 = 40584, + SPELL_MARK_OF_CORRUPTION1 = 38219, + SPELL_MARK_OF_CORRUPTION2 = 38220, + SPELL_MARK_OF_CORRUPTION3 = 38221, + SPELL_MARK_OF_CORRUPTION4 = 38222, + SPELL_MARK_OF_CORRUPTION5 = 38230, + SPELL_MARK_OF_CORRUPTION6 = 40583, + SPELL_VILE_SLUDGE = 38246, + SPELL_ENRAGE = 27680, //this spell need verification + SPELL_SUMMON_WATER_ELEMENT = 36459, //not in use yet(in use ever?) + SPELL_ELEMENTAL_SPAWNIN = 25035, + SPELL_BLUE_BEAM = 40227, //channeled Hydross Beam Helper (not in use yet) + + ENTRY_PURE_SPAWN = 22035, + ENTRY_TAINTED_SPAWN = 22036, + ENTRY_BEAM_DUMMY = 21934 +}; + #define HYDROSS_X -239.439f #define HYDROSS_Y -363.481f @@ -169,7 +171,7 @@ public: } void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); @@ -177,10 +179,7 @@ public: void KilledUnit(Unit* /*victim*/) { - if (CorruptedForm) - DoScriptText(RAND(SAY_CORRUPT_SLAY1, SAY_CORRUPT_SLAY2), me); - else - DoScriptText(RAND(SAY_CLEAN_SLAY1, SAY_CLEAN_SLAY2), me); + Talk(CorruptedForm ? SAY_CORRUPT_SLAY : SAY_CLEAN_SLAY); } void JustSummoned(Creature* summoned) @@ -206,10 +205,7 @@ public: void JustDied(Unit* /*killer*/) { - if (CorruptedForm) - DoScriptText(SAY_CORRUPT_DEATH, me); - else - DoScriptText(SAY_CLEAN_DEATH, me); + Talk(CorruptedForm ? SAY_CORRUPT_DEATH : SAY_CLEAN_DEATH); if (instance) instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, DONE); @@ -293,7 +289,7 @@ public: CorruptedForm = false; MarkOfHydross_Count = 0; - DoScriptText(SAY_SWITCH_TO_CLEAN, me); + Talk(SAY_SWITCH_TO_CLEAN); DoResetThreat(); SummonBeams(); @@ -377,7 +373,7 @@ public: MarkOfCorruption_Count = 0; CorruptedForm = true; - DoScriptText(SAY_SWITCH_TO_CORRUPT, me); + Talk(SAY_SWITCH_TO_CORRUPT); DoResetThreat(); DeSummonBeams(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index a934d03349c..6c4c51b03fe 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -30,48 +30,47 @@ EndScriptData */ #include "Player.h" #include "WorldSession.h" -#define SAY_INTRO -1548042 -#define SAY_AGGRO1 -1548043 -#define SAY_AGGRO2 -1548044 -#define SAY_AGGRO3 -1548045 -#define SAY_AGGRO4 -1548046 -#define SAY_PHASE1 -1548047 -#define SAY_PHASE2 -1548048 -#define SAY_PHASE3 -1548049 -#define SAY_BOWSHOT1 -1548050 -#define SAY_BOWSHOT2 -1548051 -#define SAY_SLAY1 -1548052 -#define SAY_SLAY2 -1548053 -#define SAY_SLAY3 -1548054 -#define SAY_DEATH -1548055 - -#define SPELL_SURGE 38044 -#define SPELL_MULTI_SHOT 38310 -#define SPELL_SHOCK_BLAST 38509 -#define SPELL_ENTANGLE 38316 -#define SPELL_STATIC_CHARGE_TRIGGER 38280 -#define SPELL_FORKED_LIGHTNING 40088 -#define SPELL_SHOOT 40873 -#define SPELL_POISON_BOLT 40095 -#define SPELL_TOXIC_SPORES 38575 -#define SPELL_MAGIC_BARRIER 38112 - -#define MIDDLE_X 30.134f -#define MIDDLE_Y -923.65f -#define MIDDLE_Z 42.9f - -#define SPOREBAT_X 30.977156f +enum LadyVashj +{ + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_PHASE1 = 2, + SAY_PHASE2 = 3, + SAY_PHASE3 = 4, + SAY_BOWSHOT = 5, + SAY_SLAY = 6, + SAY_DEATH = 7, + + SPELL_SURGE = 38044, + SPELL_MULTI_SHOT = 38310, + SPELL_SHOCK_BLAST = 38509, + SPELL_ENTANGLE = 38316, + SPELL_STATIC_CHARGE_TRIGGER = 38280, + SPELL_FORKED_LIGHTNING = 40088, + SPELL_SHOOT = 40873, + SPELL_POISON_BOLT = 40095, + SPELL_TOXIC_SPORES = 38575, + SPELL_MAGIC_BARRIER = 38112, + + SHIED_GENERATOR_CHANNEL = 19870, + ENCHANTED_ELEMENTAL = 21958, + TAINTED_ELEMENTAL = 22009, + COILFANG_STRIDER = 22056, + COILFANG_ELITE = 22055, + TOXIC_SPOREBAT = 22140, + TOXIC_SPORES_TRIGGER = 22207 +}; + +#define MIDDLE_X 30.134f +#define MIDDLE_Y -923.65f +#define MIDDLE_Z 42.9f + +#define SPOREBAT_X 30.977156f #define SPOREBAT_Y -925.297761f #define SPOREBAT_Z 77.176567f #define SPOREBAT_O 5.223932f -#define SHIED_GENERATOR_CHANNEL 19870 -#define ENCHANTED_ELEMENTAL 21958 -#define TAINTED_ELEMENTAL 22009 -#define COILFANG_STRIDER 22056 -#define COILFANG_ELITE 22055 -#define TOXIC_SPOREBAT 22140 -#define TOXIC_SPORES_TRIGGER 22207 + #define TEXT_NOT_INITIALIZED "Instance script not initialized" #define TEXT_ALREADY_DEACTIVATED "Already deactivated" @@ -226,12 +225,12 @@ public: } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_LADYVASHJEVENT, DONE); @@ -239,7 +238,7 @@ public: void StartEvent() { - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3, SAY_AGGRO4), me); + Talk(SAY_AGGRO); Phase = 1; @@ -269,7 +268,7 @@ public: if (!Intro) { Intro = true; - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); } if (!CanAttack) return; @@ -307,7 +306,7 @@ public: } if (rand()%3) { - DoScriptText(RAND(SAY_BOWSHOT1, SAY_BOWSHOT2), me); + Talk(SAY_BOWSHOT); } } @@ -397,7 +396,7 @@ public: if (Creature* creature = me->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0)) ShieldGeneratorChannel[i] = creature->GetGUID(); - DoScriptText(SAY_PHASE2, me); + Talk(SAY_PHASE2); } } // Phase 3 @@ -527,7 +526,7 @@ public: me->RemoveAurasDueToSpell(SPELL_MAGIC_BARRIER); - DoScriptText(SAY_PHASE3, me); + Talk(SAY_PHASE3); Phase = 3; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 1221e59b96e..6fe1e86551a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -28,47 +28,46 @@ EndScriptData */ #include "serpent_shrine.h" #include "Player.h" -// --- Spells used by Leotheras The Blind -#define SPELL_WHIRLWIND 37640 -#define SPELL_CHAOS_BLAST 37674 -#define SPELL_BERSERK 26662 -#define SPELL_INSIDIOUS_WHISPER 37676 -#define SPELL_DUAL_WIELD 42459 - -// --- Spells used in banish phase --- -#define BANISH_BEAM 38909 -#define AURA_BANISH 37833 - -// --- Spells used by Greyheart Spellbinders -#define SPELL_EARTHSHOCK 39076 -#define SPELL_MINDBLAST 37531 - -// --- Spells used by Inner Demons and Creature ID -#define INNER_DEMON_ID 21857 -#define AURA_DEMONIC_ALIGNMENT 37713 -#define SPELL_SHADOWBOLT 39309 -#define SPELL_SOUL_LINK 38007 -#define SPELL_CONSUMING_MADNESS 37749 //not supported by core yet - -//Misc. -#define MODEL_DEMON 20125 -#define MODEL_NIGHTELF 20514 -#define DEMON_FORM 21875 -#define MOB_SPELLBINDER 21806 -#define INNER_DEMON_VICTIM 1 - -#define SAY_AGGRO -1548009 -#define SAY_SWITCH_TO_DEMON -1548010 -#define SAY_INNER_DEMONS -1548011 -#define SAY_DEMON_SLAY1 -1548012 -#define SAY_DEMON_SLAY2 -1548013 -#define SAY_DEMON_SLAY3 -1548014 -#define SAY_NIGHTELF_SLAY1 -1548015 -#define SAY_NIGHTELF_SLAY2 -1548016 -#define SAY_NIGHTELF_SLAY3 -1548017 -#define SAY_FINAL_FORM -1548018 -#define SAY_FREE -1548019 -#define SAY_DEATH -1548020 +enum LeotherasTheBlind +{ + // Spells used by Leotheras The Blind + SPELL_WHIRLWIND = 37640, + SPELL_CHAOS_BLAST = 37674, + SPELL_BERSERK = 26662, + SPELL_INSIDIOUS_WHISPER = 37676, + SPELL_DUAL_WIELD = 42459, + + // Spells used in banish phase + BANISH_BEAM = 38909, + AURA_BANISH = 37833, + + // Spells used by Greyheart Spellbinders + SPELL_EARTHSHOCK = 39076, + SPELL_MINDBLAST = 37531, + + // Spells used by Inner Demons and Creature ID + INNER_DEMON_ID = 21857, + AURA_DEMONIC_ALIGNMENT = 37713, + SPELL_SHADOWBOLT = 39309, + SPELL_SOUL_LINK = 38007, + SPELL_CONSUMING_MADNESS = 37749, + + //Misc. + MODEL_DEMON = 20125, + MODEL_NIGHTELF = 20514, + DEMON_FORM = 21875, + MOB_SPELLBINDER = 21806, + INNER_DEMON_VICTIM = 1, + + SAY_AGGRO = 0, + SAY_SWITCH_TO_DEMON = 1, + SAY_INNER_DEMONS = 2, + SAY_DEMON_SLAY = 3, + SAY_NIGHTELF_SLAY = 4, + SAY_FINAL_FORM = 5, + SAY_FREE = 6, + SAY_DEATH = 7 +}; class mob_inner_demon : public CreatureScript { @@ -289,7 +288,7 @@ public: void StartEvent() { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, IN_PROGRESS); } @@ -388,20 +387,13 @@ public: { if (victim->GetTypeId() != TYPEID_PLAYER) return; - - if (DemonForm) - { - DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me); - } - else - { - DoScriptText(RAND(SAY_NIGHTELF_SLAY1, SAY_NIGHTELF_SLAY2, SAY_NIGHTELF_SLAY3), me); - } + + Talk(DemonForm ? SAY_DEMON_SLAY : SAY_NIGHTELF_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); //despawn copy if (Demon) @@ -493,7 +485,7 @@ public: //switch to demon form me->RemoveAurasDueToSpell(SPELL_WHIRLWIND, 0); me->SetDisplayId(MODEL_DEMON); - DoScriptText(SAY_SWITCH_TO_DEMON, me); + Talk(SAY_SWITCH_TO_DEMON); me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); DemonForm = true; @@ -556,7 +548,7 @@ public: } } } - DoScriptText(SAY_INNER_DEMONS, me); + Talk(SAY_INNER_DEMONS); InnerDemons_Timer = 999999; } else InnerDemons_Timer -= diff; @@ -595,7 +587,7 @@ public: IsFinalForm = true; DemonForm = false; - DoScriptText(SAY_FINAL_FORM, me); + Talk(SAY_FINAL_FORM); me->SetDisplayId(MODEL_NIGHTELF); me->LoadEquipment(me->GetEquipmentId()); } @@ -629,7 +621,7 @@ public: void StartEvent() { - DoScriptText(SAY_FREE, me); + Talk(SAY_FREE); } void KilledUnit(Unit* victim) @@ -637,7 +629,7 @@ public: if (victim->GetTypeId() != TYPEID_PLAYER) return; - DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me); + Talk(SAY_DEMON_SLAY); } void JustDied(Unit* /*killer*/) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 32f03d4d1f9..9c7fdadc18a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -30,37 +30,33 @@ EndScriptData */ enum eEnums { // Yell - SAY_AGGRO = -1548030, - SAY_SUMMON1 = -1548031, - SAY_SUMMON2 = -1548032, - SAY_SUMMON_BUBL1 = -1548033, - SAY_SUMMON_BUBL2 = -1548034, - SAY_SLAY1 = -1548035, - SAY_SLAY2 = -1548036, - SAY_SLAY3 = -1548037, - SAY_DEATH = -1548038, + SAY_AGGRO = 0, + SAY_SUMMON = 1, + SAY_SUMMON_BUBL = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, // Emotes - EMOTE_WATERY_GRAVE = -1548039, - EMOTE_EARTHQUAKE = -1548040, - EMOTE_WATERY_GLOBULES = -1548041, + EMOTE_WATERY_GRAVE = 5, + EMOTE_EARTHQUAKE = 6, + EMOTE_WATERY_GLOBULES = 7, // Spells - SPELL_TIDAL_WAVE = 37730, - SPELL_WATERY_GRAVE = 38049, - SPELL_EARTHQUAKE = 37764, - SPELL_WATERY_GRAVE_EXPLOSION = 37852, - - SPELL_WATERY_GRAVE_1 = 38023, - SPELL_WATERY_GRAVE_2 = 38024, - SPELL_WATERY_GRAVE_3 = 38025, - SPELL_WATERY_GRAVE_4 = 37850, - - SPELL_SUMMON_WATER_GLOBULE_1 = 37854, - SPELL_SUMMON_WATER_GLOBULE_2 = 37858, - SPELL_SUMMON_WATER_GLOBULE_3 = 37860, - SPELL_SUMMON_WATER_GLOBULE_4 = 37861, + SPELL_TIDAL_WAVE = 37730, + SPELL_WATERY_GRAVE = 38049, + SPELL_EARTHQUAKE = 37764, + SPELL_WATERY_GRAVE_EXPLOSION = 37852, + + SPELL_WATERY_GRAVE_1 = 38023, + SPELL_WATERY_GRAVE_2 = 38024, + SPELL_WATERY_GRAVE_3 = 38025, + SPELL_WATERY_GRAVE_4 = 37850, + + SPELL_SUMMON_WATER_GLOBULE_1 = 37854, + SPELL_SUMMON_WATER_GLOBULE_2 = 37858, + SPELL_SUMMON_WATER_GLOBULE_3 = 37860, + SPELL_SUMMON_WATER_GLOBULE_4 = 37861, // Creatures - NPC_WATER_GLOBULE = 21913, - NPC_TIDEWALKER_LURKER = 21920, + NPC_WATER_GLOBULE = 21913, + NPC_TIDEWALKER_LURKER = 21920 }; float MurlocCords[10][4] = @@ -130,7 +126,7 @@ public: void StartEvent() { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); @@ -138,12 +134,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); @@ -184,7 +180,7 @@ public: } else { - DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); + Talk(SAY_SUMMON); for (uint8 i = 0; i < 10; ++i) { @@ -193,7 +189,7 @@ public: if (target && Murloc) Murloc->AI()->AttackStart(target); } - DoScriptText(EMOTE_EARTHQUAKE, me); + Talk(EMOTE_EARTHQUAKE); Earthquake = false; Earthquake_Timer = 40000+rand()%5000; } @@ -235,9 +231,9 @@ public: } } - DoScriptText(RAND(SAY_SUMMON_BUBL1, SAY_SUMMON_BUBL2), me); + Talk(SAY_SUMMON_BUBL); - DoScriptText(EMOTE_WATERY_GRAVE, me); + Talk(EMOTE_WATERY_GRAVE); WateryGrave_Timer = 30000; } else WateryGrave_Timer -= diff; @@ -271,7 +267,7 @@ public: pGlobuleTarget->CastSpell(pGlobuleTarget, globulespell[g], true); } } - DoScriptText(EMOTE_WATERY_GLOBULES, me); + Talk(EMOTE_WATERY_GLOBULES); WateryGlobules_Timer = 25000; } else WateryGlobules_Timer -= diff; } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 038300213a4..e2d581128fd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -32,20 +32,20 @@ EndContentData */ #include "ScriptedCreature.h" #include "steam_vault.h" -#define SAY_SUMMON -1545000 -#define SAY_AGGRO_1 -1545001 -#define SAY_AGGRO_2 -1545002 -#define SAY_AGGRO_3 -1545003 -#define SAY_SLAY_1 -1545004 -#define SAY_SLAY_2 -1545005 -#define SAY_DEAD -1545006 +enum HydromancerThespia +{ + SAY_SUMMON = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_DEAD = 3, -#define SPELL_LIGHTNING_CLOUD 25033 -#define SPELL_LUNG_BURST 31481 -#define SPELL_ENVELOPING_WINDS 31718 + SPELL_LIGHTNING_CLOUD = 25033, + SPELL_LUNG_BURST = 31481, + SPELL_ENVELOPING_WINDS = 31718, -#define SPELL_WATER_BOLT_VOLLEY 34449 -#define H_SPELL_WATER_BOLT_VOLLEY 37924 + SPELL_WATER_BOLT_VOLLEY = 34449, + H_SPELL_WATER_BOLT_VOLLEY = 37924 +}; class boss_hydromancer_thespia : public CreatureScript { @@ -82,7 +82,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEAD, me); + Talk(SAY_DEAD); if (instance) instance->SetData(TYPE_HYDROMANCER_THESPIA, DONE); @@ -90,12 +90,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 50cc913c669..6a70cb97759 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -32,22 +32,19 @@ EndContentData */ #include "ScriptedCreature.h" #include "steam_vault.h" -#define SAY_MECHANICS -1545007 -#define SAY_AGGRO_1 -1545008 -#define SAY_AGGRO_2 -1545009 -#define SAY_AGGRO_3 -1545010 -#define SAY_AGGRO_4 -1545011 -#define SAY_SLAY_1 -1545012 -#define SAY_SLAY_2 -1545013 -#define SAY_SLAY_3 -1545014 -#define SAY_DEATH -1545015 - -#define SPELL_SUPER_SHRINK_RAY 31485 -#define SPELL_SAW_BLADE 31486 -#define SPELL_ELECTRIFIED_NET 35107 -#define H_SPELL_ENRAGE 1 //corrent enrage spell not known - -#define ENTRY_STREAMRIGGER_MECHANIC 17951 +enum MekgineerSteamrigger +{ + SAY_MECHANICS = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_DEATH = 3, + + SPELL_SUPER_SHRINK_RAY = 31485, + SPELL_SAW_BLADE = 31486, + SPELL_ELECTRIFIED_NET = 35107, + + ENTRY_STREAMRIGGER_MECHANIC = 17951 +}; class boss_mekgineer_steamrigger : public CreatureScript { @@ -91,7 +88,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE); @@ -99,12 +96,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS); @@ -113,7 +110,7 @@ public: //no known summon spells exist void SummonMechanichs() { - DoScriptText(SAY_MECHANICS, me); + Talk(SAY_MECHANICS); DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index ac730292545..51c477365a3 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -28,21 +28,21 @@ EndScriptData */ #include "steam_vault.h" #include "SpellInfo.h" -#define SAY_INTRO -1545016 -#define SAY_REGEN -1545017 -#define SAY_AGGRO1 -1545018 -#define SAY_AGGRO2 -1545019 -#define SAY_AGGRO3 -1545020 -#define SAY_SLAY1 -1545021 -#define SAY_SLAY2 -1545022 -#define SAY_DEATH -1545023 - -#define SPELL_SPELL_REFLECTION 31534 -#define SPELL_IMPALE 39061 -#define SPELL_WARLORDS_RAGE 37081 -#define SPELL_WARLORDS_RAGE_NAGA 31543 - -#define SPELL_WARLORDS_RAGE_PROC 36453 +enum NagaDistiller +{ + SAY_INTRO = 0, + SAY_REGEN = 1, + SAY_AGGRO = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + + SPELL_SPELL_REFLECTION = 31534, + SPELL_IMPALE = 39061, + SPELL_WARLORDS_RAGE = 37081, + SPELL_WARLORDS_RAGE_NAGA = 31543, + + SPELL_WARLORDS_RAGE_PROC = 36453 +}; class mob_naga_distiller : public CreatureScript { @@ -139,7 +139,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); + Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); @@ -147,7 +147,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void SpellHit(Unit* /*caster*/, const SpellInfo* spell) @@ -161,7 +161,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_WARLORD_KALITHRESH, DONE); @@ -176,7 +176,7 @@ public: { if (Creature* distiller = me->FindNearestCreature(17954, 100.0f)) { - DoScriptText(SAY_REGEN, me); + Talk(SAY_REGEN); DoCast(me, SPELL_WARLORDS_RAGE); CAST_AI(mob_naga_distiller::mob_naga_distillerAI, distiller->AI())->StartRageGen(me); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 3443103fa70..797d0f0d799 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -30,17 +30,13 @@ EndScriptData */ enum eEnums { - SAY_AGGRO = -1565010, - SAY_SLAM1 = -1565011, - SAY_SLAM2 = -1565012, - SAY_SHATTER1 = -1565013, - SAY_SHATTER2 = -1565014, - SAY_SLAY1 = -1565015, - SAY_SLAY2 = -1565016, - SAY_SLAY3 = -1565017, - SAY_DEATH = -1565018, - - EMOTE_GROW = -1565019, + SAY_AGGRO = 0, + SAY_SLAM = 1, + SAY_SHATTER = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + + EMOTE_GROW = 5, SPELL_GROWTH = 36300, SPELL_CAVE_IN = 36240, @@ -100,7 +96,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_GRUULEVENT, IN_PROGRESS); @@ -108,12 +104,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) { @@ -172,7 +168,7 @@ public: // Gruul can cast this spell up to 30 times if (m_uiGrowth_Timer <= uiDiff) { - DoScriptText(EMOTE_GROW, me); + Talk(EMOTE_GROW); DoCast(me, SPELL_GROWTH); m_uiGrowth_Timer = 30000; } diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 03089d646f9..2d2c36104a2 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -27,46 +27,44 @@ EndScriptData */ #include "ScriptedCreature.h" #include "gruuls_lair.h" -#define SAY_AGGRO -1565000 -#define SAY_ENRAGE -1565001 -#define SAY_OGRE_DEATH1 -1565002 -#define SAY_OGRE_DEATH2 -1565003 -#define SAY_OGRE_DEATH3 -1565004 -#define SAY_OGRE_DEATH4 -1565005 -#define SAY_SLAY1 -1565006 -#define SAY_SLAY2 -1565007 -#define SAY_SLAY3 -1565008 -#define SAY_DEATH -1565009 - -// High King Maulgar -#define SPELL_ARCING_SMASH 39144 -#define SPELL_MIGHTY_BLOW 33230 -#define SPELL_WHIRLWIND 33238 -#define SPELL_BERSERKER_C 26561 -#define SPELL_ROAR 16508 -#define SPELL_FLURRY 33232 -#define SPELL_DUAL_WIELD 29651 //used in phase - -// Olm the Summoner -#define SPELL_DARK_DECAY 33129 -#define SPELL_DEATH_COIL 33130 -#define SPELL_SUMMON_WFH 33131 - -//Kiggler the Craed -#define SPELL_GREATER_POLYMORPH 33173 -#define SPELL_LIGHTNING_BOLT 36152 -#define SPELL_ARCANE_SHOCK 33175 -#define SPELL_ARCANE_EXPLOSION 33237 - -//Blindeye the Seer -#define SPELL_GREATER_PW_SHIELD 33147 -#define SPELL_HEAL 33144 -#define SPELL_PRAYER_OH 33152 - -//Krosh Firehand -#define SPELL_GREATER_FIREBALL 33051 -#define SPELL_SPELLSHIELD 33054 -#define SPELL_BLAST_WAVE 33061 +enum HighKingMaulgar +{ + SAY_AGGRO = 0, + SAY_ENRAGE = 1, + SAY_OGRE_DEATH = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + + // High King Maulgar + SPELL_ARCING_SMASH = 39144, + SPELL_MIGHTY_BLOW = 33230, + SPELL_WHIRLWIND = 33238, + SPELL_BERSERKER_C = 26561, + SPELL_ROAR = 16508, + SPELL_FLURRY = 33232, + SPELL_DUAL_WIELD = 29651, + + // Olm the Summoner + SPELL_DARK_DECAY = 33129, + SPELL_DEATH_COIL = 33130, + SPELL_SUMMON_WFH = 33131, + + //Kiggler the Craed + SPELL_GREATER_POLYMORPH = 33173, + SPELL_LIGHTNING_BOLT = 36152, + SPELL_ARCANE_SHOCK = 33175, + SPELL_ARCANE_EXPLOSION = 33237, + + //Blindeye the Seer + SPELL_GREATER_PW_SHIELD = 33147, + SPELL_HEAL = 33144, + SPELL_PRAYER_OH = 33152, + + //Krosh Firehand + SPELL_GREATER_FIREBALL = 33051, + SPELL_SPELLSHIELD = 33054, + SPELL_BLAST_WAVE = 33061 +}; bool CheckAllBossDied(InstanceScript* instance, Creature* me) { @@ -171,12 +169,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (CheckAllBossDied(instance, me)) instance->SetData(DATA_MAULGAREVENT, DONE); @@ -184,7 +182,7 @@ public: void AddDeath() { - DoScriptText(RAND(SAY_OGRE_DEATH1, SAY_OGRE_DEATH2, SAY_OGRE_DEATH3, SAY_OGRE_DEATH4), me); + Talk(SAY_OGRE_DEATH); } void EnterCombat(Unit* who) @@ -211,7 +209,7 @@ public: GetCouncil(); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); instance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); instance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); @@ -269,7 +267,7 @@ public: if (!Phase2 && HealthBelowPct(50)) { Phase2 = true; - DoScriptText(SAY_ENRAGE, me); + Talk(SAY_ENRAGE); DoCast(me, SPELL_DUAL_WIELD, true); me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index b42641c5171..4b364d1c0a8 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -29,7 +29,7 @@ EndScriptData */ enum eEnums { - SAY_AGGRO = -1542008, + SAY_AGGRO = 0, SPELL_SLIME_SPRAY = 30913, SPELL_POISON_CLOUD = 30916, @@ -73,7 +73,7 @@ class boss_broggok : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 3c07862e0f6..2fe95e1bf4d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -35,14 +35,11 @@ EndContentData */ enum eKelidan { - SAY_WAKE = -1542000, - SAY_ADD_AGGRO_1 = -1542001, - SAY_ADD_AGGRO_2 = -1542002, - SAY_ADD_AGGRO_3 = -1542003, - SAY_KILL_1 = -1542004, - SAY_KILL_2 = -1542005, - SAY_NOVA = -1542006, - SAY_DIE = -1542007, + SAY_WAKE = 0, + SAY_ADD_AGGRO = 1, + SAY_KILL = 2, + SAY_NOVA = 3, + SAY_DIE = 4, SPELL_CORRUPTION = 30938, SPELL_EVOCATION = 30935, @@ -117,7 +114,7 @@ class boss_kelidan_the_breaker : public CreatureScript void EnterCombat(Unit* who) { - DoScriptText(SAY_WAKE, me); + Talk(SAY_WAKE); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); DoStartMovement(who); @@ -130,7 +127,7 @@ class boss_kelidan_the_breaker : public CreatureScript if (rand()%2) return; - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); + Talk(SAY_KILL); } void ChannelerEngaged(Unit* who) @@ -138,7 +135,7 @@ class boss_kelidan_the_breaker : public CreatureScript if (who && !addYell) { addYell = true; - DoScriptText(RAND(SAY_ADD_AGGRO_1, SAY_ADD_AGGRO_2, SAY_ADD_AGGRO_3), me); + Talk(SAY_ADD_AGGRO); } for (uint8 i=0; i<5; ++i) { @@ -194,7 +191,7 @@ class boss_kelidan_the_breaker : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DIE, me); + Talk(SAY_DIE); if (!instance) return; @@ -254,7 +251,7 @@ class boss_kelidan_the_breaker : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); - DoScriptText(SAY_NOVA, me); + Talk(SAY_NOVA); if (SpellInfo const* nova = sSpellMgr->GetSpellInfo(SPELL_BURNING_NOVA)) { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index df9aefabe15..4dfd7e8a8e8 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -29,17 +29,14 @@ EndScriptData */ enum eEnums { - SAY_AGGRO_1 = -1542009, - SAY_AGGRO_2 = -1542010, - SAY_AGGRO_3 = -1542011, - SAY_KILL_1 = -1542012, - SAY_KILL_2 = -1542013, - SAY_DIE = -1542014, - - SPELL_ACID_SPRAY = 38153, // heroic 38973 ??? 38153 + SAY_AGGRO = 0, + SAY_KILL = 1, + SAY_DIE = 2, + + SPELL_ACID_SPRAY = 38153, SPELL_EXPLODING_BREAKER = 30925, SPELL_KNOCKDOWN = 20276, - SPELL_DOMINATION = 25772 // ??? + SPELL_DOMINATION = 25772 }; class boss_the_maker : public CreatureScript @@ -81,7 +78,7 @@ class boss_the_maker : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); if (!instance) return; @@ -92,12 +89,12 @@ class boss_the_maker : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); + Talk(SAY_KILL); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DIE, me); + Talk(SAY_DIE); if (!instance) return; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 56365216be5..a40c2e480bd 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -29,14 +29,12 @@ EndScriptData */ enum eSays { - SAY_AGGRO_1 = -1543009, - SAY_AGGRO_2 = -1543010, - SAY_AGGRO_3 = -1543011, - SAY_SUMMON = -1543012, - SAY_CURSE = -1543013, - SAY_KILL_1 = -1543014, - SAY_DIE = -1543015, - SAY_WIPE = -1543016, + SAY_AGGRO = 0, + SAY_SUMMON = 1, + SAY_CURSE = 2, + SAY_KILL_1 = 3, + SAY_DIE = 4, + SAY_WIPE = 5, }; enum eSpells @@ -79,7 +77,7 @@ class boss_omor_the_unscarred : public CreatureScript void Reset() { - DoScriptText(SAY_WIPE, me); + Talk(SAY_WIPE); OrbitalStrike_Timer = 25000; ShadowWhip_Timer = 2000; @@ -94,7 +92,7 @@ class boss_omor_the_unscarred : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) @@ -102,12 +100,12 @@ class boss_omor_the_unscarred : public CreatureScript if (rand()%2) return; - DoScriptText(SAY_KILL_1, me); + Talk(SAY_KILL_1); } void JustSummoned(Creature* summoned) { - DoScriptText(SAY_SUMMON, me); + Talk(SAY_SUMMON); if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(random); @@ -117,7 +115,7 @@ class boss_omor_the_unscarred : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DIE, me); + Talk(SAY_DIE); } void UpdateAI(const uint32 diff) @@ -192,7 +190,7 @@ class boss_omor_the_unscarred : public CreatureScript if (Aura_Timer <= diff) { - DoScriptText(SAY_CURSE, me); + Talk(SAY_CURSE); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index f0c4330c9a3..7fa476100d5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -39,7 +39,7 @@ enum eSpells SPELL_REVENGE = 19130, SPELL_REVENGE_H = 40392, SPELL_KIDNEY_SHOT = 30621, - SPELL_FIRE_NOVA_VISUAL = 19823, + SPELL_FIRE_NOVA_VISUAL = 19823 }; enum eUnits @@ -50,20 +50,17 @@ enum eUnits ENTRY_NAZAN = 17536, ENTRY_LIQUID_FIRE = 22515, ENTRY_REINFORCED_FEL_IRON_CHEST = 185168, - ENTRY_REINFORCED_FEL_IRON_CHEST_H = 185169, + ENTRY_REINFORCED_FEL_IRON_CHEST_H = 185169 }; enum eSays { - SAY_INTRO = -1543017, - SAY_WIPE = -1543018, - SAY_AGGRO_1 = -1543019, - SAY_AGGRO_2 = -1543020, - SAY_AGGRO_3 = -1543021, - SAY_KILL_1 = -1543022, - SAY_KILL_2 = -1543023, - SAY_DIE = -1543024, - EMOTE = -1543025, + SAY_INTRO = 0, + SAY_WIPE = 1, + SAY_AGGRO = 2, + SAY_KILL = 3, + SAY_DIE = 4, + EMOTE = 5 }; const float VazrudenMiddle[3] = {-1406.5f, 1746.5f, 81.2f}; @@ -153,7 +150,7 @@ class boss_nazan : public CreatureScript if (Unit* victim = SelectTarget(SELECT_TARGET_NEAREST, 0)) me->AI()->AttackStart(victim); DoStartMovement(me->getVictim()); - DoScriptText(EMOTE, me); + Talk(EMOTE); return; } else @@ -229,19 +226,19 @@ class boss_vazruden : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* who) { if (who && who->GetEntry() != ENTRY_VAZRUDEN) - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); + Talk(SAY_KILL); } void JustDied(Unit* killer) { if (killer && killer != me) - DoScriptText(SAY_DIE, me); + Talk(SAY_DIE); } void UpdateAI(const uint32 diff) @@ -252,7 +249,7 @@ class boss_vazruden : public CreatureScript { if (!WipeSaid) { - DoScriptText(SAY_WIPE, me); + Talk(SAY_WIPE); WipeSaid = true; } me->DisappearAndDie(); @@ -364,7 +361,7 @@ class boss_vazruden_the_herald : public CreatureScript { phase = 1; check = 0; - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); } } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 1d2ecccf3c7..156d5cbae2c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -28,15 +28,12 @@ EndScriptData */ enum eSays { - SAY_TAUNT = -1543000, - SAY_HEAL = -1543001, - SAY_SURGE = -1543002, - SAY_AGGRO_1 = -1543003, - SAY_AGGRO_2 = -1543004, - SAY_AGGRO_3 = -1543005, - SAY_KILL_1 = -1543006, - SAY_KILL_2 = -1543007, - SAY_DIE = -1543008, + SAY_TAUNT = 0, + SAY_HEAL = 1, + SAY_SURGE = 2, + SAY_AGGRO = 3, + SAY_KILL = 4, + SAY_DIE = 5 }; enum eSpells @@ -81,7 +78,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); } void MoveInLineOfSight(Unit* who) @@ -99,7 +96,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript } else if (!HasTaunted && me->IsWithinDistInMap(who, 60.0f)) { - DoScriptText(SAY_TAUNT, me); + Talk(SAY_TAUNT); HasTaunted = true; } } @@ -107,12 +104,12 @@ class boss_watchkeeper_gargolmar : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); + Talk(SAY_KILL); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DIE, me); + Talk(SAY_DIE); } void UpdateAI(const uint32 diff) @@ -130,7 +127,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript if (Surge_Timer <= diff) { - DoScriptText(SAY_SURGE, me); + Talk(SAY_SURGE); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_SURGE); @@ -155,7 +152,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript { if (HealthBelowPct(40)) { - DoScriptText(SAY_HEAL, me); + Talk(SAY_HEAL); YelledForHeal = true; } } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 94272e4a50f..c5f79a2babd 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -29,36 +29,22 @@ EndScriptData */ #include "Player.h" #include "SpellInfo.h" -struct Yell -{ - int32 id; -}; - -static Yell RandomTaunt[]= -{ - {-1544000}, - {-1544001}, - {-1544002}, - {-1544003}, - {-1544004}, - {-1544005}, -}; - enum eSays { - SAY_FREED = -1544006, - SAY_AGGRO = -1544007, - SAY_BANISH = -1544008, - SAY_CHAMBER_DESTROY = -1544009, - SAY_PLAYER_KILLED = -1544010, - SAY_DEATH = -1544011, + SAY_TAUNT = 0, + SAY_FREED = 1, + SAY_AGGRO = 2, + SAY_BANISH = 3, + SAY_CHAMBER_DESTROY = 4, + SAY_PLAYER_KILLED = 5, + SAY_DEATH = 6 }; enum eEmotes { - EMOTE_BERSERK = -1544012, - EMOTE_BLASTNOVA = -1544013, - EMOTE_BEGIN = -1544014, + EMOTE_BERSERK = 7, + EMOTE_BLASTNOVA = 8, + EMOTE_BEGIN = 9 }; enum eCreatures @@ -309,7 +295,7 @@ class boss_magtheridon : public CreatureScript // if 5 clickers from other cubes apply shadow cage if (ClickerNum >= CLICKERS_COUNT && !me->HasAura(SPELL_SHADOW_CAGE)) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); DoCast(me, SPELL_SHADOW_CAGE, true); } else @@ -322,7 +308,7 @@ class boss_magtheridon : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_PLAYER_KILLED, me); + Talk(SAY_PLAYER_KILLED); } void JustDied(Unit* /*killer*/) @@ -330,7 +316,7 @@ class boss_magtheridon : public CreatureScript if (instance) instance->SetData(DATA_MAGTHERIDON_EVENT, DONE); - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void MoveInLineOfSight(Unit* /*who*/) {} @@ -350,7 +336,7 @@ class boss_magtheridon : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE_C); - DoScriptText(SAY_FREED, me); + Talk(SAY_FREED); } void UpdateAI(const uint32 diff) @@ -359,7 +345,7 @@ class boss_magtheridon : public CreatureScript { if (RandChat_Timer <= diff) { - DoScriptText(RandomTaunt[rand()%6].id, me); + Talk(SAY_TAUNT); RandChat_Timer = 90000; } else @@ -374,7 +360,7 @@ class boss_magtheridon : public CreatureScript if (Berserk_Timer <= diff) { DoCast(me, SPELL_BERSERK, true); - DoScriptText(EMOTE_BERSERK, me); + Talk(EMOTE_BERSERK); Berserk_Timer = 60000; } else @@ -393,7 +379,7 @@ class boss_magtheridon : public CreatureScript // to avoid earthquake interruption if (!me->HasUnitState(UNIT_STATE_STUNNED)) { - DoScriptText(EMOTE_BLASTNOVA, me); + Talk(EMOTE_BLASTNOVA); DoCast(me, SPELL_BLASTNOVA); BlastNova_Timer = 60000; } @@ -437,7 +423,7 @@ class boss_magtheridon : public CreatureScript && !me->HasUnitState(UNIT_STATE_STUNNED)) // shadow cage and earthquake { Phase3 = true; - DoScriptText(SAY_CHAMBER_DESTROY, me); + Talk(SAY_CHAMBER_DESTROY); DoCast(me, SPELL_CAMERA_SHAKE, true); DoCast(me, SPELL_DEBRIS_KNOCKDOWN, true); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index c6434d9a989..e5b6ea71eb0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -33,38 +33,15 @@ EndContentData */ #include "ScriptedCreature.h" #include "shattered_halls.h" -struct Say -{ - int32 id; -}; - -static Say PeonAttacked[]= -{ - {-1540001}, - {-1540002}, - {-1540003}, - {-1540004}, -}; -static Say PeonDies[]= -{ - {-1540005}, - {-1540006}, - {-1540007}, - {-1540008}, -}; - enum eSays { - SAY_INTRO = -1540000, - SAY_TAUNT_1 = -1540009, - SAY_TAUNT_2 = -1540010, - SAY_TAUNT_3 = -1540011, - SAY_AGGRO_1 = -1540012, - SAY_AGGRO_2 = -1540013, - SAY_AGGRO_3 = -1540014, - SAY_SLAY_1 = -1540015, - SAY_SLAY_2 = -1540016, - SAY_DIE = -1540017, + SAY_INTRO = 0, + SAY_PEON_ATTACKED = 1, + SAY_PEON_DIES = 2, + SAY_TAUNT = 3, + SAY_AGGRO = 4, + SAY_SLAY = 5, + SAY_DIE = 6 }; enum eSpells @@ -137,7 +114,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (PeonEngagedCount >= 4) return; - DoScriptText(PeonAttacked[PeonEngagedCount].id, me); + Talk(SAY_PEON_ATTACKED); ++PeonEngagedCount; } @@ -146,7 +123,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (PeonKilledCount >= 4) return; - DoScriptText(PeonDies[PeonKilledCount].id, me); + Talk(SAY_PEON_DIES); ++PeonKilledCount; if (PeonKilledCount == 4) @@ -159,7 +136,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript void DoTauntPeons() { - DoScriptText(RAND(SAY_TAUNT_1, SAY_TAUNT_2, SAY_TAUNT_3), me); + Talk(SAY_TAUNT); //TODO: kill the peons first IsIntroEvent = false; @@ -190,7 +167,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (who->GetTypeId() != TYPEID_PLAYER) return; - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); IntroOnce = true; IsIntroEvent = true; @@ -206,7 +183,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); + Talk(SAY_AGGRO); } void JustSummoned(Creature* summoned) @@ -222,12 +199,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DIE, me); + Talk(SAY_DIE); if (!instance) return; diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index c263ac85ef5..3932b96ad07 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -87,11 +87,12 @@ public: enum eNetherdrake { - SAY_NIHIL_1 = -1000169, //signed for 5955 - SAY_NIHIL_2 = -1000170, //signed for 5955 - SAY_NIHIL_3 = -1000171, //signed for 5955 - SAY_NIHIL_4 = -1000172, //signed for 20021, used by 20021, 21817, 21820, 21821, 21823 - SAY_NIHIL_INTERRUPT = -1000173, //signed for 20021, used by 20021, 21817, 21820, 21821, 21823 + //Used by 20021, 21817, 21820, 21821, 21823 but not existing in database + SAY_NIHIL_1 = 0, + SAY_NIHIL_2 = 1, + SAY_NIHIL_3 = 2, + SAY_NIHIL_4 = 3, + SAY_NIHIL_INTERRUPT = 4, ENTRY_WHELP = 20021, ENTRY_PROTO = 21821, @@ -176,7 +177,7 @@ public: //we are nihil, so say before transform if (me->GetEntry() == ENTRY_NIHIL) { - DoScriptText(SAY_NIHIL_INTERRUPT, me); + Talk(SAY_NIHIL_INTERRUPT); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); IsNihil = false; } @@ -203,19 +204,19 @@ public: switch (NihilSpeech_Phase) { case 0: - DoScriptText(SAY_NIHIL_1, me); + Talk(SAY_NIHIL_1); ++NihilSpeech_Phase; break; case 1: - DoScriptText(SAY_NIHIL_2, me); + Talk(SAY_NIHIL_2); ++NihilSpeech_Phase; break; case 2: - DoScriptText(SAY_NIHIL_3, me); + Talk(SAY_NIHIL_3); ++NihilSpeech_Phase; break; case 3: - DoScriptText(SAY_NIHIL_4, me); + Talk(SAY_NIHIL_4); ++NihilSpeech_Phase; break; case 4: @@ -266,7 +267,7 @@ public: enum eDaranelle { - SAY_SPELL_INFLUENCE = -1000174, + SAY_SPELL_INFLUENCE = 0, SPELL_LASHHAN_CHANNEL = 36904 }; @@ -294,7 +295,7 @@ public: { if (who->HasAura(SPELL_LASHHAN_CHANNEL) && me->IsWithinDistInMap(who, 10.0f)) { - DoScriptText(SAY_SPELL_INFLUENCE, me, who); + Talk(SAY_SPELL_INFLUENCE, who->GetGUID()); //TODO: Move the below to updateAI and run if this statement == true DoCast(who, 37028, true); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 1f23d0a4d7a..b54cc3cdf55 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3335,6 +3335,61 @@ class spell_gen_increase_stats_buff : public SpellScriptLoader } }; +enum Replenishment +{ + SPELL_REPLENISHMENT = 57669, + SPELL_INFINITE_REPLENISHMENT = 61782 +}; + +class spell_gen_replenishment : public SpellScriptLoader +{ + public: + spell_gen_replenishment() : SpellScriptLoader("spell_gen_replenishment") { } + + class spell_gen_replenishment_AuraScript : public AuraScript + { + PrepareAuraScript(spell_gen_replenishment_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_REPLENISHMENT) || + !sSpellMgr->GetSpellInfo(SPELL_INFINITE_REPLENISHMENT)) + return false; + return true; + } + + bool Load() + { + return GetUnitOwner()->GetPower(POWER_MANA); + } + + void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) + { + switch (GetSpellInfo()->Id) + { + case SPELL_REPLENISHMENT: + amount = GetUnitOwner()->GetMaxPower(POWER_MANA) * 0.002f; + break; + case SPELL_INFINITE_REPLENISHMENT: + amount = GetUnitOwner()->GetMaxPower(POWER_MANA) * 0.0025f; + break; + default: + break; + } + } + + void Register() + { + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_replenishment_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_gen_replenishment_AuraScript(); + } +}; + void AddSC_generic_spell_scripts() { new spell_gen_absorb0_hitlimit1(); @@ -3418,4 +3473,5 @@ void AddSC_generic_spell_scripts() new spell_gen_increase_stats_buff("spell_pri_shadow_protection"); new spell_gen_increase_stats_buff("spell_mage_arcane_brilliance"); new spell_gen_increase_stats_buff("spell_mage_dalaran_brilliance"); + new spell_gen_replenishment(); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index a73af6892ca..e52034ed2d9 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -706,6 +706,36 @@ class spell_hun_tame_beast : public SpellScriptLoader } }; +class spell_hun_furious_howl : public SpellScriptLoader +{ + public: + spell_hun_furious_howl() : SpellScriptLoader("spell_hun_furious_howl") { } + + class spell_hun_furious_howl_SpellScript : public SpellScript + { + PrepareSpellScript(spell_hun_furious_howl_SpellScript); + + void FilterTargets(std::list<WorldObject*>& targets) + { + targets.clear(); + targets.push_back(GetCaster()); + if (Unit* owner = GetCaster()->GetOwner()) + targets.push_back(owner); + } + + void Register() + { + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_furious_howl_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_furious_howl_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_PARTY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_hun_furious_howl_SpellScript(); + } +}; + void AddSC_hunter_spell_scripts() { new spell_hun_aspect_of_the_beast(); @@ -722,4 +752,5 @@ void AddSC_hunter_spell_scripts() new spell_hun_misdirection_proc(); new spell_hun_disengage(); new spell_hun_tame_beast(); + new spell_hun_furious_howl(); } diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index f28f62e6410..765bb97bf64 100644 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -54,9 +54,11 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_SEL_CHAR_POSITION, "SELECT position_x, position_y, position_z, orientation, map, taxi_path FROM characters WHERE guid = ?", CONNECTION_SYNCH); PREPARE_STATEMENT(CHAR_DEL_QUEST_STATUS_DAILY, "DELETE FROM character_queststatus_daily", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_DEL_QUEST_STATUS_WEEKLY, "DELETE FROM character_queststatus_weekly", CONNECTION_ASYNC); + PREPARE_STATEMENT(CHAR_DEL_QUEST_STATUS_MONTHLY, "DELETE FROM character_queststatus_monthly", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_DEL_QUEST_STATUS_SEASONAL, "DELETE FROM character_queststatus_seasonal WHERE event = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_DEL_QUEST_STATUS_DAILY_CHAR, "DELETE FROM character_queststatus_daily WHERE guid = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_DEL_QUEST_STATUS_WEEKLY_CHAR, "DELETE FROM character_queststatus_weekly WHERE guid = ?", CONNECTION_ASYNC); + PREPARE_STATEMENT(CHAR_DEL_QUEST_STATUS_MONTHLY_CHAR, "DELETE FROM character_queststatus_monthly WHERE guid = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_DEL_QUEST_STATUS_SEASONAL_CHAR, "DELETE FROM character_queststatus_seasonal WHERE guid = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_DEL_BATTLEGROUND_RANDOM, "DELETE FROM character_battleground_random", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_INS_BATTLEGROUND_RANDOM, "INSERT INTO character_battleground_random (guid) VALUES (?)", CONNECTION_ASYNC); @@ -76,9 +78,11 @@ void CharacterDatabaseConnection::DoPrepareStatements() "itemcount1, itemcount2, itemcount3, itemcount4, playercount FROM character_queststatus WHERE guid = ? AND status <> 0", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_DAILYQUESTSTATUS, "SELECT quest, time FROM character_queststatus_daily WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_WEEKLYQUESTSTATUS, "SELECT quest FROM character_queststatus_weekly WHERE guid = ?", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_SEL_CHARACTER_MONTHLYQUESTSTATUS, "SELECT quest FROM character_queststatus_monthly WHERE guid = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_SEL_CHARACTER_SEASONALQUESTSTATUS, "SELECT quest, event FROM character_queststatus_seasonal WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_INS_CHARACTER_DAILYQUESTSTATUS, "INSERT INTO character_queststatus_daily (guid, quest, time) VALUES (?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_INS_CHARACTER_WEEKLYQUESTSTATUS, "INSERT INTO character_queststatus_weekly (guid, quest) VALUES (?, ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_INS_CHARACTER_MONTHLYQUESTSTATUS, "INSERT INTO character_queststatus_monthly (guid, quest) VALUES (?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_INS_CHARACTER_SEASONALQUESTSTATUS, "INSERT INTO character_queststatus_seasonal (guid, quest, event) VALUES (?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_REPUTATION, "SELECT faction, standing, flags FROM character_reputation WHERE guid = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_INVENTORY, "SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyId, durability, playedTime, text, bag, slot, " @@ -140,7 +144,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_SEL_CHARACTER_GIFT_BY_ITEM, "SELECT entry, flags FROM character_gifts WHERE item_guid = ?", CONNECTION_SYNCH); PREPARE_STATEMENT(CHAR_SEL_ACCOUNT_BY_NAME, "SELECT account FROM characters WHERE name = ?", CONNECTION_SYNCH) PREPARE_STATEMENT(CHAR_SEL_ACCOUNT_BY_GUID, "SELECT account FROM characters WHERE guid = ?", CONNECTION_SYNCH); - PREPARE_STATEMENT(CHAR_SEL_ACCOUNT_NAME_BY_GUID, "SELECT account, name FROM characters WHERE guid = ?", CONNECTION_SYNCH); + PREPARE_STATEMENT(CHAR_SEL_CHARACTER_DATA_BY_GUID, "SELECT account, name, level FROM characters WHERE guid = ?", CONNECTION_SYNCH); PREPARE_STATEMENT(CHAR_DEL_ACCOUNT_INSTANCE_LOCK_TIMES, "DELETE FROM account_instance_times WHERE accountId = ?", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_INS_ACCOUNT_INSTANCE_LOCK_TIMES, "INSERT INTO account_instance_times (accountId, instanceId, releaseTime) VALUES (?, ?, ?)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SEL_CHARACTER_NAME_CLASS, "SELECT name, class FROM characters WHERE guid = ?", CONNECTION_SYNCH); diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h index 06721232ad5..a1ff27ce507 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.h +++ b/src/server/shared/Database/Implementation/CharacterDatabase.h @@ -74,9 +74,11 @@ enum CharacterDatabaseStatements CHAR_SEL_CHAR_POSITION, CHAR_DEL_QUEST_STATUS_DAILY, CHAR_DEL_QUEST_STATUS_WEEKLY, + CHAR_DEL_QUEST_STATUS_MONTHLY, CHAR_DEL_QUEST_STATUS_SEASONAL, CHAR_DEL_QUEST_STATUS_DAILY_CHAR, CHAR_DEL_QUEST_STATUS_WEEKLY_CHAR, + CHAR_DEL_QUEST_STATUS_MONTHLY_CHAR, CHAR_DEL_QUEST_STATUS_SEASONAL_CHAR, CHAR_DEL_BATTLEGROUND_RANDOM, CHAR_INS_BATTLEGROUND_RANDOM, @@ -89,9 +91,11 @@ enum CharacterDatabaseStatements CHAR_SEL_CHARACTER_QUESTSTATUS, CHAR_SEL_CHARACTER_DAILYQUESTSTATUS, CHAR_SEL_CHARACTER_WEEKLYQUESTSTATUS, + CHAR_SEL_CHARACTER_MONTHLYQUESTSTATUS, CHAR_SEL_CHARACTER_SEASONALQUESTSTATUS, CHAR_INS_CHARACTER_DAILYQUESTSTATUS, CHAR_INS_CHARACTER_WEEKLYQUESTSTATUS, + CHAR_INS_CHARACTER_MONTHLYQUESTSTATUS, CHAR_INS_CHARACTER_SEASONALQUESTSTATUS, CHAR_SEL_CHARACTER_REPUTATION, CHAR_SEL_CHARACTER_INVENTORY, @@ -157,7 +161,7 @@ enum CharacterDatabaseStatements CHAR_SEL_CHARACTER_COUNT, CHAR_UPD_NAME, CHAR_DEL_DECLINED_NAME, - CHAR_SEL_ACCOUNT_NAME_BY_GUID, + CHAR_SEL_CHARACTER_DATA_BY_GUID, CHAR_INS_GUILD, CHAR_DEL_GUILD, |