From 814fdb465966889a24393acd0b9180f2b98907b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E4=BD=A9=E8=8C=B9?= Date: Wed, 5 Apr 2023 11:22:14 -0600 Subject: [PATCH] Naxx 40 Fixes --- sql/world/base/naxx40.sql | 3 ++ sql/world/base/naxx40_creatures.sql | 50 ++--------------------------- src/naxx40Scripts/boss_noth_40.cpp | 6 ++-- 3 files changed, 8 insertions(+), 51 deletions(-) diff --git a/sql/world/base/naxx40.sql b/sql/world/base/naxx40.sql index 8b4405c..b69e4be 100644 --- a/sql/world/base/naxx40.sql +++ b/sql/world/base/naxx40.sql @@ -23,6 +23,9 @@ INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES UPDATE `creature` SET `spawnMask` = 3 WHERE `spawnMask` = 7 AND `map` = 533; UPDATE `gameobject` SET `spawnMask` = 7 WHERE `spawnMask` = 3 AND `map` = 533; +# Lich King uses same entry in Naxx WotLK and Naxx 40 - Allow spawning in all versions +UPDATE `creature` SET `spawnMask` = 7 WHERE `id1` = 16980; + UPDATE `gameobject` SET `spawnMask` = 3 WHERE `id` IN (202278, 202277); # Orb of Naxxramas does not exist in classic DELETE FROM `dungeon_access_template` WHERE `id`=122; diff --git a/sql/world/base/naxx40_creatures.sql b/sql/world/base/naxx40_creatures.sql index fb66845..6ea7a48 100644 --- a/sql/world/base/naxx40_creatures.sql +++ b/sql/world/base/naxx40_creatures.sql @@ -4300,74 +4300,50 @@ INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 351000 AND 351089; INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(351010, 0, 0, 0, 0, 0, 100, 0, 2000, 5000, 8000, 11000, 0, 11, 53803, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351010, 0, 1, 0, 0, 0, 100, 0, 2000, 5000, 8000, 11000, 0, 11, 28440, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351011, 0, 0, 0, 0, 0, 100, 0, 5000, 8000, 14000, 18000, 0, 11, 30043, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351011, 0, 1, 0, 0, 0, 100, 0, 5000, 8000, 14000, 18000, 0, 11, 56032, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351011, 0, 2, 0, 0, 0, 100, 0, 9000, 16000, 18000, 21000, 0, 11, 28434, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351012, 0, 0, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 11, 28431, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351012, 0, 1, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 11, 53809, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351014, 0, 0, 0, 0, 0, 100, 0, 2000, 5000, 6000, 9000, 0, 11, 40504, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351014, 0, 1, 0, 2, 0, 100, 0, 0, 29, 120000, 120000, 0, 11, 56625, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Crypt Reaver - On 30% HP - CastSelf Frenzy (Naxx 40)"), (351014, 0, 2, 0, 2, 0, 100, 0, 0, 29, 120000, 120000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Crypt Reaver - On 30% HP - Say EMOTE_FRENZY (Naxx 40)"), (351015, 0, 0, 0, 0, 0, 100, 0, 3000, 7000, 12000, 16000, 0, 11, 54311, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351015, 0, 1, 0, 0, 0, 100, 0, 3000, 7000, 12000, 16000, 0, 11, 54316, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351015, 0, 2, 0, 0, 0, 100, 0, 15000, 19000, 28000, 35000, 0, 11, 54313, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351015, 0, 3, 0, 0, 0, 100, 0, 15000, 19000, 28000, 35000, 0, 11, 54317, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351016, 0, 0, 0, 0, 0, 100, 0, 4000, 7000, 14000, 17000, 0, 11, 53850, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351016, 0, 1, 0, 0, 0, 100, 0, 4000, 7000, 14000, 17000, 0, 11, 53851, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351017, 0, 0, 0, 0, 0, 100, 0, 9000, 13000, 14000, 17000, 0, 11, 56063, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351017, 0, 1, 0, 0, 0, 100, 0, 9000, 13000, 14000, 17000, 0, 11, 56067, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351017, 0, 2, 0, 0, 0, 100, 0, 4000, 8000, 13000, 16000, 0, 11, 56064, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351017, 0, 3, 0, 0, 0, 100, 0, 4000, 8000, 13000, 16000, 0, 11, 56065, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351021, 0, 0, 0, 0, 0, 100, 0, 4800, 10700, 14000, 19000, 0, 11, 27758, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Patchwork Golem - In combat - Cast War Stomp (Naxx 40)"), -(351021, 0, 1, 0, 0, 0, 100, 0, 4800, 10700, 14000, 19000, 0, 11, 56427, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Patchwork Golem - In combat - Cast War Stomp (Naxx 40)"), (351021, 0, 2, 0, 0, 0, 100, 0, 5000, 9300, 15200, 15200, 0, 11, 27794, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Patchwork Golem - In combat - Cast Cleave (Naxx 40)"), -(351021, 0, 3, 0, 12, 0, 100, 0, 0, 20, 35000, 43000, 0, 11, 56426, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Patchwork Golem - On target HP 0-20% - Cast Execute (Naxx 40)"), (351021, 0, 4, 0, 12, 0, 100, 0, 0, 20, 35000, 43000, 0, 11, 7160, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Patchwork Golem - On target HP 0-20% - Cast Execute (Naxx 40)"), (351022, 0, 0, 0, 0, 0, 100, 0, 3600, 6800, 13700, 19700, 0, 11, 27807, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Bile Retcher - In combat - Cast Bile Vomit (Naxx 40)"), -(351022, 0, 1, 0, 0, 0, 100, 0, 3600, 6800, 13700, 19700, 0, 11, 54326, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Bile Retcher - In combat - Cast Bile Vomit (Naxx 40)"), (351023, 0, 0, 0, 0, 0, 100, 0, 7600, 17300, 6000, 13300, 0, 11, 28301, 0, 0, 0, 0, 0, 5, 0, 0, 1, 0, 0.0, 0.0, 0.0, 0.0, "Mad Scientist - In combat - Cast Mana Burn (Naxx 40)"), -(351023, 0, 1, 0, 0, 0, 100, 0, 7600, 17300, 6000, 13300, 0, 11, 54338, 0, 0, 0, 0, 0, 5, 0, 0, 1, 0, 0.0, 0.0, 0.0, 0.0, "Mad Scientist - In combat - Cast Mana Burn (Naxx 40)"), (351023, 0, 2, 0, 2, 0, 100, 0, 0, 30, 18000, 21000, 0, 11, 28306, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Mad Scientist - At 30% HP - Cast Great Heal (Naxx 40)"), -(351023, 0, 3, 0, 2, 0, 100, 0, 0, 30, 18000, 21000, 0, 11, 54337, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Mad Scientist - At 30% HP - Cast Great Heal (Naxx 40)"), (351024, 0, 0, 0, 0, 0, 100, 0, 7100, 12500, 18100, 20900, 0, 11, 28293, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Living Monstrosity - In combat - Cast Chain Lightning (Naxx 40)"), -(351024, 0, 1, 0, 0, 0, 100, 0, 5000, 8000, 18000, 24000, 0, 11, 54334, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Living Monstrosity - In combat - Cast Chain Lightning (Naxx 40)"), (351024, 0, 2, 0, 0, 0, 100, 0, 6400, 10000, 16900, 18500, 0, 11, 28294, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Living Monstrosity - In combat - Cast Lightning Totem (Naxx 40)"), (351025, 0, 0, 0, 0, 0, 100, 0, 1600, 2800, 7700, 11900, 0, 11, 28310, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Surgical Assistant - In combat - Cast Mind Flay (Naxx 40)"), -(351025, 0, 1, 0, 0, 0, 100, 0, 1600, 2800, 7700, 11900, 0, 11, 54339, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Surgical Assistant - In combat - Cast Mind Flay (Naxx 40)"), (351026, 0, 0, 0, 60, 0, 100, 0, 2000, 2000, 2000, 2000, 0, 11, 28322, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351027, 0, 0, 0, 0, 0, 100, 0, 5100, 10400, 18800, 21300, 0, 11, 28405, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stitched Giant - In combat - Cast target Knockback (Naxx 40)"), (351027, 0, 1, 0, 2, 0, 100, 1, 0, 29, 0, 0, 0, 11, 54356, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stitched Giant - At 30% HP - Cast self Unstoppable Enrage (Naxx 40)"), (351029, 0, 0, 0, 0, 0, 100, 0, 1900, 3000, 6000, 7300, 0, 11, 27891, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Sludge Belcher - In combat - Cast Acidic Sludge (Naxx 40)"), -(351029, 0, 1, 0, 0, 0, 100, 0, 1900, 3000, 6000, 7300, 0, 11, 54331, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Sludge Belcher - In combat - Cast Acidic Sludge (Naxx 40)"), (351029, 0, 2, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 11, 28362, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Sludge Belcher - On reset - Cast Disease Cloud (Naxx 40)"), (351030, 0, 0, 0, 2, 0, 100, 0, 0, 50, 25000, 30000, 0, 11, 54780, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Plague Beast - Between 0-50% HP - Cast Plague Splash (Naxx 40)"), -(351030, 0, 1, 0, 2, 0, 100, 0, 0, 50, 25000, 30000, 0, 11, 56538, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Plague Beast - Between 0-50% HP - Cast Plague Splash (Naxx 40)"), (351031, 0, 0, 0, 0, 0, 100, 0, 1000, 1000, 11000, 17000, 0, 11, 54781, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Frenzied Bat - In Combat - Cast Frenzied Dive (Naxx 40)"), (351032, 0, 0, 0, 0, 0, 100, 0, 3000, 6000, 9000, 13000, 0, 11, 30113, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Plagued Bat - In combat - Cast Putrid Bite (Naxx 40)"), -(351032, 0, 1, 0, 0, 0, 100, 0, 3000, 6000, 9000, 13000, 0, 11, 54772, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Plagued Bat - In combat - Cast Putrid Bite (Naxx 40)"), (351041, 0, 0, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 11, 55317, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Deathcharger Steed - On aggro - Cast Charge (Naxx 40)"), (351048, 0, 0, 0, 0, 0, 100, 0, 1600, 7200, 8100, 14100, 0, 11, 55255, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Captain - In combat - Cast Plague Strike (Naxx 40)"), -(351048, 0, 1, 0, 0, 0, 100, 0, 1600, 7200, 8100, 14100, 0, 11, 55321, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Captain - In combat - Cast Plague Strike (Naxx 40)"), (351048, 0, 2, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 11, 55222, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Captain - On aggro - Cast Unholy Presence (Naxx 40)"), (351048, 0, 3, 0, 0, 0, 100, 0, 3500, 10200, 0, 0, 0, 11, 28353, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Captain - In combat - Cast Raise Dead (Naxx 40)"), (351049, 0, 0, 0, 0, 0, 100, 0, 1000, 1400, 8500, 20500, 0, 11, 55209, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight - In combat - Cast Death Coil (damage) (Naxx 40)"), -(351049, 0, 1, 0, 0, 0, 100, 0, 1000, 1400, 8500, 20500, 0, 11, 55320, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight - In combat - Cast Death Coil (damage) (Naxx 40)"), (351049, 0, 2, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 11, 55212, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "On Aggro - Cast Self - Blood Presence (Naxx 40)"), (351049, 0, 3, 0, 0, 0, 100, 0, 1000, 7400, 10100, 17300, 0, 11, 55213, 0, 0, 0, 0, 0, 26, 20, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight - In combat - Cast Hysteria (Naxx 40)"), (351049, 0, 4, 0, 14, 0, 50, 0, 80, 20, 16600, 17300, 0, 11, 55210, 0, 0, 0, 0, 0, 26, 20, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight - On Friendly HP Deficit - Cast Death Coil (heal) (Naxx 40)"), (351053, 0, 0, 0, 0, 0, 100, 0, 4000, 7000, 45000, 48000, 0, 11, 55318, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Risen Squire - In combat - Cast Pierce Armor (Naxx 40)"), (351054, 0, 0, 0, 0, 0, 100, 0, 3300, 8900, 18900, 19000, 0, 11, 55266, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Dark Touched Warrior - In combat - Cast Whirlwind (Naxx 40)"), (351055, 0, 0, 0, 0, 0, 100, 0, 4700, 6100, 15700, 19800, 0, 11, 55315, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Cavalier - In combat - Cast Bone Armor (Naxx 40)"), -(351055, 0, 1, 0, 0, 0, 100, 0, 4700, 6100, 15700, 19800, 0, 11, 55336, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Cavalier - In combat - Cast Bone Armor (Naxx 40)"), (351055, 0, 2, 0, 0, 0, 100, 0, 1100, 2200, 4100, 6200, 0, 11, 55313, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Cavalier - In combat - Cast Icy Touch (Naxx 40)"), -(351055, 0, 3, 0, 0, 0, 100, 0, 1100, 2200, 4100, 6200, 0, 11, 55331, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Cavalier - In combat - Cast Icy Touch (Naxx 40)"), (351055, 0, 4, 0, 0, 0, 100, 0, 0, 0, 4600, 7300, 0, 11, 55314, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Cavalier - In combat - Cast Strangulate (Naxx 40)"), -(351055, 0, 5, 0, 0, 0, 100, 0, 0, 0, 4600, 7300, 0, 11, 55334, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Cavalier - In combat - Cast Strangulate (Naxx 40)"), (351055, 0, 6, 0, 2, 0, 100, 0, 0, 30, 0, 0, 0, 11, 55294, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Death Knight Cavalier - At 30% HP - Cast Dismount Deathcharger (Naxx 40)"), (351056, 0, 0, 0, 0, 0, 100, 0, 2800, 5100, 4500, 12000, 0, 11, 28407, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Shade of Naxxramas - In combat - Cast Shadow Bolt Volley (Naxx 40)"), -(351056, 0, 1, 0, 0, 0, 100, 0, 2800, 5100, 4500, 12000, 0, 11, 55323, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Shade of Naxxramas - In combat - Cast Shadow Bolt Volley (Naxx 40)"), (351056, 0, 2, 0, 0, 0, 100, 0, 4100, 8700, 60000, 60000, 0, 11, 28383, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Shade of Naxxramas - In combat - Cast Portal of Shadows (Naxx 40)"), (351056, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 41, 500, 0, 0, 0, 0, 0, 19, 16420, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Shade of Naxxramas - On reset - Despawn Portal of Shadows (Naxx 40)"), (351057, 0, 0, 0, 4, 0, 100, 512, 0, 0, 0, 0, 0, 30, 1, 2, 3, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Necro Knight - On Agro - Pick random Event Phase (1-2-3) (Naxx 40)"), @@ -4378,11 +4354,8 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (351057, 0, 5, 0, 0, 4, 100, 0, 3000, 6000, 25000, 35000, 0, 11, 30094, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Necro Knight - In combat - Cast Frost Nova (Naxx 40)"), (351057, 0, 6, 0, 0, 4, 100, 0, 17000, 21000, 17000, 23000, 0, 11, 30095, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Necro Knight - In combat - Cast Cone of Cold (Naxx 40)"), (351058, 0, 0, 0, 0, 0, 100, 0, 9000, 20000, 20000, 30000, 0, 11, 55319, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Bony Construct - In combat - Cast Brutal Swipe (Naxx 40)"), -(351058, 0, 1, 0, 0, 0, 100, 0, 9000, 20000, 20000, 30000, 0, 11, 55324, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Bony Construct - In combat - Cast Brutal Swipe (Naxx 40)"), (351059, 0, 0, 0, 0, 0, 100, 0, 3000, 5000, 5000, 7000, 0, 11, 29325, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stoneskin Gargoyle - In Combat - Cast Acid Volley (Naxx 40)"), -(351059, 0, 1, 0, 0, 0, 100, 0, 3000, 5000, 5000, 7000, 0, 11, 54714, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stoneskin Gargoyle - In Combat - Cast Acid Volley (Naxx 40)"), (351059, 0, 2, 0, 2, 0, 100, 0, 0, 30, 60000, 60000, 0, 11, 28995, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stoneskin Gargoyle - At 30% HP - Cast Stoneskin (Naxx 40)"), -(351059, 0, 3, 0, 2, 0, 100, 0, 0, 30, 60000, 60000, 0, 11, 54722, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stoneskin Gargoyle - At 30% HP - Cast Stoneskin (Naxx 40)"), (351059, 0, 4, 0, 1, 0, 100, 512, 1000, 1000, 0, 0, 0, 90, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stoneskin Gargoyle - On Update OOC - Set Unit Field Bytes 1 'UNIT_STAND_STATE_SUBMERGED' (Controlled via conditions - only when not roaming) (Naxx 40)"), (351059, 0, 5, 0, 1, 0, 100, 512, 1000, 1000, 0, 0, 0, 91, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stoneskin Gargoyle - On Update OOC - Remove Unit Field Bytes 1 'UNIT_STAND_STATE_SUBMERGED' (Controlled via conditions - only when roaming) (Naxx 40)"), (351059, 0, 6, 0, 4, 0, 100, 512, 0, 0, 0, 0, 0, 91, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Stoneskin Gargoyle - On Aggro - Remove Unit Field Bytes 1 'UNIT_STAND_STATE_SUBMERGED' (Naxx 40)"), @@ -4391,7 +4364,6 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (351061, 0, 0, 0, 0, 0, 100, 0, 2200, 8600, 8800, 13300, 0, 11, 55463, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Unholy Axe - In combat - Cast Whirlwind (Naxx 40)"), (351061, 0, 1, 0, 0, 0, 100, 0, 6100, 13100, 20100, 20100, 0, 11, 16856, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Unholy Axe - In combat - Cast Mortal Strike (Naxx 40)"), (351062, 0, 0, 0, 0, 0, 100, 0, 2400, 8400, 8400, 16100, 0, 11, 28450, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Unholy Staff - In combat - Cast Arcane Explosion (Naxx 40)"), -(351062, 0, 1, 0, 0, 0, 100, 0, 9000, 16000, 20000, 30000, 0, 11, 55467, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Unholy Staff - In combat - Cast Arcane Explosion (Naxx 40)"), (351062, 0, 2, 0, 0, 0, 100, 0, 6100, 10800, 11000, 15000, 0, 11, 29849, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Unholy Staff - In combat - Cast Frost Nova (Naxx 40)"), (351062, 0, 3, 0, 0, 0, 100, 0, 4800, 6200, 14800, 14900, 0, 11, 29848, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Unholy Staff - In combat - Cast Polymorph (Naxx 40)"), (351063, 0, 0, 0, 0, 0, 100, 0, 4000, 4700, 9200, 15500, 0, 11, 15284, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Unholy Swords - In combat - Cast Cleave (Naxx 40)"), @@ -4406,45 +4378,27 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (351064, 0, 7, 0, 23, 0, 100, 512, 28989, 1, 0, 0, 0, 75, 7941, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Plague Slime - On has aura - Add aura Immunity: Nature (Naxx 40)"), (351064, 0, 8, 0, 23, 0, 100, 512, 28990, 1, 0, 0, 0, 75, 7942, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Plague Slime - On has aura - Add aura Immunity: Fire (Naxx 40)"), (351065, 0, 0, 0, 0, 0, 100, 0, 3000, 6000, 9000, 12000, 0, 11, 29915, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351065, 0, 1, 0, 0, 0, 100, 0, 3000, 6000, 9000, 12000, 0, 11, 54709, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351065, 0, 2, 0, 0, 0, 100, 0, 8000, 14000, 19000, 24000, 0, 11, 54703, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351065, 0, 3, 0, 0, 0, 100, 0, 8000, 14000, 19000, 24000, 0, 11, 54708, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351065, 0, 4, 0, 2, 0, 100, 0, 0, 30, 60000, 60000, 0, 11, 54701, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Infectious Ghoul - On 30% HP - CastSelf Frenzy (Naxx 40)"), (351065, 0, 5, 0, 2, 0, 100, 0, 0, 30, 60000, 60000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Infectious Ghoul - On 30% HP - Say EMOTE_FRENZY (Naxx 40)"), (351066, 0, 0, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 11, 29232, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell on Death (Naxx 40)"), -(351066, 0, 1, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), -(351067, 0, 0, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), (351068, 0, 0, 0, 0, 0, 100, 0, 2000, 5000, 6000, 8000, 0, 11, 30109, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351068, 0, 1, 0, 0, 0, 100, 0, 2000, 5000, 6000, 8000, 0, 11, 54769, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351069, 0, 0, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), (351071, 0, 0, 0, 1, 0, 100, 7, 1000, 1000, 0, 0, 0, 11, 28156, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Sewage Slime - Out of Combat - Cast 'Disease Cloud' (Naxx 40)"), (351078, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 11, 55876, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Plagued Ghoul - On death - Cast Plague contamination (Naxx 40)"), (351080, 0, 0, 0, 0, 0, 100, 0, 1000, 1000, 16000, 21000, 0, 11, 56107, 0, 0, 0, 0, 0, 17, 7, 40, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351080, 0, 1, 0, 0, 0, 100, 0, 5000, 7000, 11000, 15000, 0, 11, 54093, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351080, 0, 2, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), (351081, 0, 0, 0, 0, 0, 100, 0, 4000, 5000, 7000, 9000, 0, 11, 54095, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351081, 0, 1, 0, 0, 0, 100, 0, 4000, 5000, 7000, 9000, 0, 11, 54096, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351081, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 11, 28732, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell on Death (Naxx 40)"), -(351081, 0, 3, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), (351082, 0, 0, 0, 0, 0, 100, 0, 7000, 9000, 7000, 9000, 0, 11, 40504, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351082, 0, 1, 0, 0, 0, 100, 0, 500, 500, 4000, 7000, 0, 11, 28969, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351082, 0, 2, 0, 0, 0, 100, 0, 500, 500, 4000, 7000, 0, 11, 56098, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351082, 0, 3, 0, 2, 0, 100, 0, 0, 29, 120000, 120000, 0, 11, 8269, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Crypt Guard - On 30% HP - CastSelf Frenzy (Naxx 40)"), -(351082, 0, 4, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), (351082, 0, 5, 0, 2, 0, 100, 0, 0, 29, 120000, 120000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Crypt Guard - On 30% HP - Say EMOTE_FRENZY (Naxx 40)"), -(351083, 0, 0, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), (351085, 0, 0, 0, 0, 0, 100, 0, 2000, 5000, 8000, 11000, 0, 11, 54890, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351085, 0, 1, 0, 0, 0, 100, 0, 2000, 5000, 8000, 11000, 0, 11, 54891, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351085, 0, 2, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), (351086, 0, 0, 0, 0, 0, 100, 0, 2000, 5000, 9000, 11000, 0, 11, 32736, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), (351086, 0, 1, 0, 0, 0, 100, 0, 5000, 8000, 13000, 15000, 0, 11, 30138, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351086, 0, 2, 0, 0, 0, 100, 0, 5000, 8000, 13000, 15000, 0, 11, 54889, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351086, 0, 3, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), (351087, 0, 0, 0, 0, 0, 100, 0, 2000, 5000, 7000, 9000, 0, 11, 15496, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351087, 0, 1, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"), -(351088, 0, 0, 0, 0, 0, 100, 0, 6000, 9000, 6000, 9000, 0, 11, 54121, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351088, 0, 1, 0, 0, 0, 100, 0, 6000, 9000, 6000, 9000, 0, 11, 28776, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"), -(351088, 0, 2, 0, 5, 0, 100, 512, 0, 0, 1, 0, 0, 34, 119, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Immortal Achievement - player Kill (Naxx 40)"); +(351088, 0, 1, 0, 0, 0, 100, 0, 6000, 9000, 6000, 9000, 0, 11, 28776, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Cast Spell IC (Naxx 40)"); DELETE FROM `creature_text` WHERE `CreatureID` BETWEEN 351000 AND 351089; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -5395,7 +5349,7 @@ UPDATE `creature_template` SET `name` = 'Deathknight Vindicator', `speed_walk` = UPDATE `creature_template` SET `speed_walk` = 1.0, `speed_run` = 1.71429, `DamageModifier` = 26.0, `ArmorModifier` = 1.25, `BaseAttackTime` = 2000, `RangeAttackTime` = 1450, `unit_class` = 8 WHERE `entry`=16452; /* Necro Stalker */ -UPDATE `creature_template` SET `speed_walk` = 1.0, `speed_run` = 1.42857, `DamageModifier` = 27.35, `ArmorModifier` = 1.15, `RangeAttackTime` = 1265 WHERE `entry`=16453; +UPDATE `creature_template` SET `speed_walk` = 1.0, `speed_run` = 1.42857, `DamageModifier` = 27.35, `ArmorModifier` = 1.15, `RangeAttackTime` = 1265, `lootid` = 351010 WHERE `entry`=16453; /* [UNUSED] Death Lord */ UPDATE `creature_template` SET `name` = 'Death Lord', `speed_run` = 1.42857, `DamageModifier` = 35.85, `ArmorModifier` = 1.15, `unit_class` = 2 WHERE `entry`=16861; diff --git a/src/naxx40Scripts/boss_noth_40.cpp b/src/naxx40Scripts/boss_noth_40.cpp index 82d2c36..dff8612 100644 --- a/src/naxx40Scripts/boss_noth_40.cpp +++ b/src/naxx40Scripts/boss_noth_40.cpp @@ -58,9 +58,9 @@ enum Events enum Misc { - NPC_PLAGUED_WARRIOR = 351088, - NPC_PLAGUED_CHAMPION = 351087, - NPC_PLAGUED_GUARDIAN = 351086 + NPC_PLAGUED_WARRIOR = 351087, + NPC_PLAGUED_CHAMPION = 351086, + NPC_PLAGUED_GUARDIAN = 351085 }; const Position summoningPosition[5] =