Skip to content

Commit 933e94f

Browse files
ZhengPeiRu21ZhengPeiRu21
authored
Merge pull request #265 from jellemeeus/sync
Naxx40: Spider Wing, KTZ, 4H, Feugen, Heigen, Archmage Tarsis RP
2 parents 81c011a + ba52795 commit 933e94f

9 files changed

+201
-18
lines changed

‎sql/world/base/naxx40_archmage_tarsis.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,8 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
7777
(16381, 0, 20, 0, 59, 0, 100, 0, 5, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Archmage Tarsis Kir-Moldir - On Timed Event 5 Triggered - Say Line 2'),
7878
(16381, 0, 22, 19, 59, 0, 100, 0, 6, 0, 0, 0, 0, 1, 3, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Archmage Tarsis Kir-Moldir - On Timed Event 6 Triggered - Say Line 3'),
7979
(16381, 0, 23, 19, 59, 0, 100, 0, 7, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Archmage Tarsis Kir-Moldir - On Timed Event 7 Triggered - Kill Self');
80+
81+
-- fix: archmage not sitting properly, wrong animation (sleep) to dead
82+
UPDATE `creature_template_addon` SET `bytes1` = 7, `bytes2` = 1 WHERE (`entry` = 16381);
83+
UPDATE `smart_scripts` SET `action_param1` = 7 WHERE (`entryorguid` = 16381) AND (`source_type` = 0) AND (`id` = 2);
84+
UPDATE `creature_template` SET `scale` = 1.2 WHERE (`entry` = 16381);

‎sql/world/base/naxx40_creatures.sql

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5675,3 +5675,88 @@ DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 351066)
56755675
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`, `event_param6`, `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
56765676
(351066, 0, 0, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 0, 218, 29232, 2, 4294967196, 49, 59, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Spore - On Just Died - Custom Cast Fungal Creep (Naxx 40)');
56775677

5678+
-- Blaumeux
5679+
-- Void Zone damage
5680+
-- upstream handles void zone damage incorrectly. Azerothcore (#18807)
5681+
DELETE FROM `spell_script_names` WHERE `spell_id` = 28865;
5682+
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
5683+
(28865,'spell_four_horsemen_consumption');
5684+
DELETE FROM `creature_template_spell` WHERE `CreatureID` = 16697;
5685+
UPDATE `creature_template` SET `ScriptName` = '', `AIName` = 'SmartAI' WHERE `entry` = 16697;
5686+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 16697);
5687+
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`, `event_param6`, `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
5688+
(16697, 0, 0, 0, 60, 0, 100, 0, 0, 0, 2500, 2500, 0, 0, 11, 28865, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Zone - On Update - Cast \'Consumption\''),
5689+
(16697, 0, 1, 0, 37, 0, 100, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Zone - On Initialize - Set Reactstate Passive');
5690+
5691+
-- Venom Stalker
5692+
-- Rupture, double attack aura; Poison Charge
5693+
DELETE FROM `creature_template_addon` WHERE (`entry` = 351012);
5694+
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
5695+
(351012, 0, 0, 0, 0, 0, 0, '18943');
5696+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 351012);
5697+
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`, `event_param6`, `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
5698+
(351012, 0, 0, 0, 0, 0, 100, 0, 5000, 15000, 20000, 40000, 0, 0, 11, 28431, 0, 0, 0, 0, 0, 5, 40, 1, 0, 0, 0, 0, 0, 0, 'Venom Stalker - In Combat - Cast \'Poison Charge\' (Naxx 40)');
5699+
5700+
-- Carrion Spinner
5701+
-- Poison Spray and Spider Web
5702+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 15975);
5703+
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`, `event_param6`, `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
5704+
(15975, 0, 0, 0, 0, 0, 90, 0, 0, 0, 7000, 7000, 0, 0, 11, 30043, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Carrion Spinner - In Combat - Cast \'Poison Spray\' (Naxx 40)'),
5705+
(15975, 0, 2, 0, 0, 0, 70, 0, 3000, 3000, 10000, 10000, 0, 0, 11, 28434, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Carrion Spinner - In Combat - Cast \'Spider Web\' (Naxx 40)');
5706+
5707+
-- Dread Creeper
5708+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 351010);
5709+
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`, `event_param6`, `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
5710+
(351010, 0, 1, 0, 0, 0, 100, 0, 2000, 2000, 8000, 8000, 0, 0, 11, 28440, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Dread Creeper - In Combat - Cast \'Veil of Shadow\' (Naxx 40)');
5711+
5712+
-- Skitterer, poison on attack
5713+
DELETE FROM `creature_template_addon` WHERE (`entry` = 351010);
5714+
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
5715+
(351010, 0, 0, 0, 0, 0, 0, '28429');
5716+
5717+
-- Crypt Reaver, poison proc
5718+
DELETE FROM `creature_template_addon` WHERE (`entry` = 351014);
5719+
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
5720+
(351014, 0, 0, 0, 0, 0, 0, '22413');
5721+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 351014);
5722+
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`, `event_param6`, `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
5723+
(351014, 0, 0, 0, 0, 0, 100, 0, 2000, 5000, 6000, 9000, 0, 0, 11, 40504, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Crypt Reaver - In Combat - Cast \'Cleave\' (Naxx 40)'),
5724+
(351014, 0, 1, 0, 2, 0, 100, 0, 0, 50, 120000, 120000, 0, 0, 11, 8269, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Crypt Reaver - Between 0-50% Health - Cast \'Frenzy\' (Naxx 40)'),
5725+
(351014, 0, 2, 0, 2, 0, 100, 0, 0, 50, 120000, 120000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Crypt Reaver - Between 0-50% Health - Say Line 0 (Naxx 40)');
5726+
5727+
-- Necro Stalker
5728+
UPDATE `creature_template_addon` SET `auras` = '18943' WHERE (`entry` = 16453);
5729+
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 16453;
5730+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 16453);
5731+
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`, `event_param6`, `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
5732+
(16453, 0, 0, 0, 0, 0, 100, 0, 5000, 15000, 20000, 40000, 0, 0, 11, 28431, 0, 0, 0, 0, 0, 5, 40, 1, 0, 0, 0, 0, 0, 0, 'Necro Stalker - In Combat - Cast \'Poison Charge\' (Naxx 40)');
5733+
5734+
-- Tomb Horror
5735+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 351015);
5736+
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`, `event_param6`, `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
5737+
(351015, 0, 0, 0, 0, 0, 75, 0, 2000, 2000, 4000, 4000, 0, 0, 11, 28614, 0, 0, 0, 0, 0, 5, 45, 0, 0, 0, 0, 0, 0, 0, 'Tomb Horror - In Combat - Cast \'Pointy Spike\' (Naxx 40)'),
5738+
(351015, 0, 2, 0, 0, 0, 75, 0, 5000, 5000, 8000, 8000, 0, 0, 11, 28615, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Tomb Horror - In Combat - Cast \'Spike Volley\' (Naxx 40)');
5739+
5740+
-- Naxxramas Acolyte: Arcane Explosion, Shadow Bolt Volley
5741+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 351017);
5742+
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`, `event_param6`, `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
5743+
(351017, 0, 0, 0, 0, 0, 100, 0, 2000, 2000, 5000, 5000, 0, 0, 11, 28450, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Naxxramas Acolyte - In Combat - Cast \'Arcane Explosion\' (Naxx 40)'),
5744+
(351017, 0, 1, 0, 0, 0, 100, 0, 4000, 4000, 6000, 6000, 0, 0, 11, 28448, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Naxxramas Acolyte - In Combat - Cast \'Shadow Bolt Volley\' (Naxx 40)');
5745+
-- Naxxramas Cultist: Shadow Burst
5746+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 351016);
5747+
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`, `event_param6`, `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
5748+
(351016, 0, 0, 0, 0, 0, 75, 0, 3000, 3000, 5000, 5000, 0, 0, 11, 28447, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Naxxramas Cultist - In Combat - Cast \'Shadow Burst\' (Naxx 40)');
5749+
5750+
-- Kel'Thuzad
5751+
-- Soldier of the Frozen Wastes: trigger dark blast on attack
5752+
DELETE FROM `creature_template_addon` WHERE (`entry` = 351073);
5753+
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
5754+
(351073, 0, 0, 0, 1, 0, 0, '28458');
5755+
-- Soul Weaver
5756+
-- Wail of Souls
5757+
DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 351075);
5758+
INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES
5759+
(351075, 0, 28459, 12340);
5760+
DELETE FROM `creature_template_addon` WHERE (`entry` = 351075);
5761+
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
5762+
(351075, 0, 0, 0, 1, 0, 0, '28460');

0 commit comments

Comments
 (0)