From e19fc640b36616ba7ba0b3dcbf061afb396cfb70 Mon Sep 17 00:00:00 2001 From: insunaa Date: Sun, 27 Oct 2024 10:51:02 +0100 Subject: [PATCH 1/3] [5430] Hodir --- Updates/5430_Ulduar_Hodir.sql | 47 ++++++++++++++++++++++++++++++++ Updates/Instances/603_ulduar.sql | 4 +++ 2 files changed, 51 insertions(+) create mode 100644 Updates/5430_Ulduar_Hodir.sql diff --git a/Updates/5430_Ulduar_Hodir.sql b/Updates/5430_Ulduar_Hodir.sql new file mode 100644 index 0000000000..41881aa876 --- /dev/null +++ b/Updates/5430_Ulduar_Hodir.sql @@ -0,0 +1,47 @@ +-- Ulduar: Boss encounter Hodir +DELETE FROM `creature_spell_list` WHERE `Id` IN (3284500, 3284600); +INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Flags`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `Comments`) VALUES +(3284500, 0, 61968, 50000, 50000, 40000, 40000, 2, 0, 0, 100, 1, 'Hodir 10 - Flash Freeze'), +(3284500, 1, 62478, 70000, 70000, 60000, 60000, 0, 0, 29281, 100, 1, 'Hodir 10 - Frozen Blows'), +(3284500, 2, 62469, 25000, 30000, 15000, 15000, 2, 100, 0, 100, 1, 'Hodir 10 - Freeze'), +(3284600, 0, 61968, 50000, 50000, 40000, 40000, 2, 0, 0, 100, 1, 'Hodir 25 - Flash Freeze'), +(3284600, 1, 63512, 70000, 70000, 60000, 60000, 0, 0, 29281, 100, 1, 'Hodir 25 - Frozen Blows'), +(3284600, 2, 62469, 25000, 30000, 15000, 15000, 2, 100, 0, 100, 1, 'Hodir 25 - Freeze'); + +DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (3284500, 3284600); +INSERT INTO `creature_spell_list_entry` VALUES +(3284500, 'Ulduar - Hodir (10)', 100, 100), +(3284600, 'Ulduar - Hodir (25)', 100, 100); + +DELETE FROM `string_id` WHERE `Name`='ULDUAR_HODIR_HELPERS'; +INSERT INTO `string_id` VALUES +(6030701,'ULDUAR_HODIR_HELPERS'); + +DELETE FROM `string_id` WHERE `Name`='ULDUAR_HODIR_FIRES'; +INSERT INTO `string_id` VALUES +(6030702,'ULDUAR_HODIR_FIRES'); + +UPDATE `creature_template` SET `SpellList`=3284500 WHERE `entry`=32845; -- Hodir (10) +UPDATE `creature_template` SET `SpellList`=3284600 WHERE `entry`=32846; -- Hodir (25) +-- Snowpacked Icicle Target +UPDATE `creature_template` SET `StaticFlags1`=`StaticFlags1`|0x00000100|0x02000000 WHERE `entry`=33174; +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=33174; +UPDATE `creature_template` SET `AIName`='', `ScriptName`='npc_snowpack_target' WHERE `Entry`=33174; +UPDATE `creature_template` SET `AIName`='EventAI', `ScriptName` = '' WHERE `Entry` = 33169; -- Icicle +-- Hodir's Helper NPCs +UPDATE `creature_template` SET `StringId1`=6030701 WHERE `entry` IN (32941, 33333, 32950, 33332, 32946, 33331, 32948, 33330, 32901, 33325, 32900, 33328, 32893, 33327, 32897, 33326, 33342); +-- Toasty Fire +UPDATE `creature_template` SET `StringId2`=6030702 WHERE `entry`=33342; + +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (33174, 33169); +INSERT INTO `creature_ai_scripts` (`id`, `creature_id`, `event_type`, `event_inverse_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action1_type`, `action1_param1`, `action1_param2`, `action1_param3`, `action2_type`, `action2_param1`, `action2_param2`, `action2_param3`, `action3_type`, `action3_param1`, `action3_param2`, `action3_param3`, `comment`) VALUES +(3316901, 33169, 29, 0, 100, 1024, 3500, 3500, 0, 0, 0, 0, 11, 62453, 15, 0, 11, 62236, 15, 2, 0, 0, 0, 0, 'Time = 4 seconds - Self: Cast Icicle (62453) on none, Self: Cast Icicle (62236) on none with flags TRIGGERED, '); + +UPDATE `broadcast_text` SET `ChatTypeID`=3 WHERE `Id`=33314; +UPDATE `broadcast_text` SET `ChatTypeID`=3 WHERE `Id`=33313; +UPDATE `broadcast_text` SET `ChatTypeID`=1,`SoundEntriesID1`=15552 WHERE `Id`=34336; +UPDATE `broadcast_text` SET `ChatTypeID`=1,`SoundEntriesID1`=15553 WHERE `Id`=34337; +UPDATE `broadcast_text` SET `ChatTypeID`=1,`SoundEntriesID1`=15554 WHERE `Id`=34338; +UPDATE `broadcast_text` SET `ChatTypeID`=1,`SoundEntriesID1`=15555 WHERE `Id`=34339; +UPDATE `broadcast_text` SET `ChatTypeID`=1,`SoundEntriesID1`=15557 WHERE `Id`=33484; +UPDATE `broadcast_text` SET `ChatTypeID`=1,`SoundEntriesID1`=15558 WHERE `Id`=34340; diff --git a/Updates/Instances/603_ulduar.sql b/Updates/Instances/603_ulduar.sql index bfddf7545b..a3e17e02f4 100644 --- a/Updates/Instances/603_ulduar.sql +++ b/Updates/Instances/603_ulduar.sql @@ -2865,6 +2865,10 @@ INSERT INTO `dbscripts_on_relay` (`id`, `command`, `dataint`, `comments`) VALUES (29103, 0, 34307, 'Ignis - Say Constructs'), (29105, 0, 33871, 'Ignis - Say Berserk'); +INSERT INTO `dbscripts_on_relay` (`id`, `command`, `dataint`, `datalong`, `datalong2`, `comments`) VALUES +(29281, 0, 33313, 0, 0, 'Hodir - Emote Frozen Blows'), +(29281, 16, 0, 15556, 0, 'Hodir - Play Sound Frozen Blows'); + -- INSERT INTO `dbscripts_on_creature_death` (`id`, `delay`, `command`, `datalong`, `datalong2`, `datalong3`, `buddy_entry`, `search_radius`, `data_flags`, `dataint`, `dataint2`, `dataint3`, `dataint4`, `x`, `y`, `z`, `o`, `comments`) VALUES -- INSERT INTO `dbscripts_on_go_use` (`id`, `delay`, `command`, `datalong`, `datalong2`, `datalong3`, `buddy_entry`, `search_radius`, `data_flags`, `dataint`, `dataint2`, `dataint3`, `dataint4`, `x`, `y`, `z`, `o`, `comments`) VALUES -- INSERT INTO `dbscripts_on_go_template_use` (`id`, `delay`, `command`, `datalong`, `datalong2`, `datalong3`, `buddy_entry`, `search_radius`, `data_flags`, `dataint`, `dataint2`, `dataint3`, `dataint4`, `x`, `y`, `z`, `o`, `comments`) VALUES From 207b221d898cd64fd5e20a9cc0abc4970ef717f4 Mon Sep 17 00:00:00 2001 From: insunaa Date: Sun, 10 Nov 2024 15:54:31 +0100 Subject: [PATCH 2/3] [5430] Hodir: Implement Grz3s requests --- ACID/acid_wotlk.sql | 2 ++ Updates/5430_Ulduar_Hodir.sql | 16 ---------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ACID/acid_wotlk.sql b/ACID/acid_wotlk.sql index f7339ee1ad..f0c828dc3c 100644 --- a/ACID/acid_wotlk.sql +++ b/ACID/acid_wotlk.sql @@ -43769,6 +43769,8 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers ('3317001','33170','11','0','100','6','0','0','0','0','0','0','11','62216','0','0','0','0','0','0','0','0','0','0','Sun Beam - Cast Unstable Sun Beam on Spawn'), ('3317002','33170','1','0','100','2','1000','1000','0','0','0','0','11','62451','0','0','0','0','0','0','0','0','0','0','Sun Beam (Normal) - Cast Unstable Energy'), ('3317003','33170','1','0','100','4','1000','1000','0','0','0','0','11','62865','0','0','0','0','0','0','0','0','0','0','Sun Beam (Heroic) - Cast Unstable Energy'), +-- Icicle 33169 +('3316901', '33169', '29', '0', '100', '1024', '3500', '3500', '0', '0', '0', '0', '11', '62453', '15', '0', '11', '62236', '15', '2', '0', '0', '0', '0', 'Time = 4 seconds - Self: Cast Icicle (62453) on none, Self: Cast Icicle (62236) on none with flags TRIGGERED,'), -- Snowpacked Icicle 33173 ('3317301','33173','1','0','100','6','4000','4000','0','0','0','0','11','62460','0','2','11','62453','0','0','0','0','0','0','Snowpacked Icicle - Cast Icicle and Icicle (dummy) on OOC Timer'), -- Snowpacked Icicle Target 33174 diff --git a/Updates/5430_Ulduar_Hodir.sql b/Updates/5430_Ulduar_Hodir.sql index 41881aa876..87fa774e4f 100644 --- a/Updates/5430_Ulduar_Hodir.sql +++ b/Updates/5430_Ulduar_Hodir.sql @@ -21,22 +21,6 @@ DELETE FROM `string_id` WHERE `Name`='ULDUAR_HODIR_FIRES'; INSERT INTO `string_id` VALUES (6030702,'ULDUAR_HODIR_FIRES'); -UPDATE `creature_template` SET `SpellList`=3284500 WHERE `entry`=32845; -- Hodir (10) -UPDATE `creature_template` SET `SpellList`=3284600 WHERE `entry`=32846; -- Hodir (25) --- Snowpacked Icicle Target -UPDATE `creature_template` SET `StaticFlags1`=`StaticFlags1`|0x00000100|0x02000000 WHERE `entry`=33174; -UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=33174; -UPDATE `creature_template` SET `AIName`='', `ScriptName`='npc_snowpack_target' WHERE `Entry`=33174; -UPDATE `creature_template` SET `AIName`='EventAI', `ScriptName` = '' WHERE `Entry` = 33169; -- Icicle --- Hodir's Helper NPCs -UPDATE `creature_template` SET `StringId1`=6030701 WHERE `entry` IN (32941, 33333, 32950, 33332, 32946, 33331, 32948, 33330, 32901, 33325, 32900, 33328, 32893, 33327, 32897, 33326, 33342); --- Toasty Fire -UPDATE `creature_template` SET `StringId2`=6030702 WHERE `entry`=33342; - -DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (33174, 33169); -INSERT INTO `creature_ai_scripts` (`id`, `creature_id`, `event_type`, `event_inverse_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action1_type`, `action1_param1`, `action1_param2`, `action1_param3`, `action2_type`, `action2_param1`, `action2_param2`, `action2_param3`, `action3_type`, `action3_param1`, `action3_param2`, `action3_param3`, `comment`) VALUES -(3316901, 33169, 29, 0, 100, 1024, 3500, 3500, 0, 0, 0, 0, 11, 62453, 15, 0, 11, 62236, 15, 2, 0, 0, 0, 0, 'Time = 4 seconds - Self: Cast Icicle (62453) on none, Self: Cast Icicle (62236) on none with flags TRIGGERED, '); - UPDATE `broadcast_text` SET `ChatTypeID`=3 WHERE `Id`=33314; UPDATE `broadcast_text` SET `ChatTypeID`=3 WHERE `Id`=33313; UPDATE `broadcast_text` SET `ChatTypeID`=1,`SoundEntriesID1`=15552 WHERE `Id`=34336; From 9d0aa75fcc6b2b6db0b85e9615bc48b7de33989b Mon Sep 17 00:00:00 2001 From: insunaa Date: Sun, 10 Nov 2024 16:22:44 +0100 Subject: [PATCH 3/3] [5430] Move some stuff back from core to DB --- Updates/5430_Ulduar_Hodir.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Updates/5430_Ulduar_Hodir.sql b/Updates/5430_Ulduar_Hodir.sql index 87fa774e4f..695b9f566a 100644 --- a/Updates/5430_Ulduar_Hodir.sql +++ b/Updates/5430_Ulduar_Hodir.sql @@ -21,6 +21,16 @@ DELETE FROM `string_id` WHERE `Name`='ULDUAR_HODIR_FIRES'; INSERT INTO `string_id` VALUES (6030702,'ULDUAR_HODIR_FIRES'); +-- Hodir +UPDATE `creature_template` SET `SpellList`=3284500 WHERE `entry`=32845; -- Hodir (10) +UPDATE `creature_template` SET `SpellList`=3284600 WHERE `entry`=32846; -- Hodir (25) +-- Snowpacked Icicle Target +UPDATE `creature_template` SET `StaticFlags1`=`StaticFlags1`|0x00000100|0x02000000 WHERE `entry`=33174; +-- Hodir's Helper NPCs +UPDATE `creature_template` SET `StringId1`=6030701 WHERE `entry` IN (32941, 33333, 32950, 33332, 32946, 33331, 32948, 33330, 32901, 33325, 32900, 33328, 32893, 33327, 32897, 33326, 33342); +-- Toasty Fire +UPDATE `creature_template` SET `StringId2`=6030702 WHERE `entry`=33342; + UPDATE `broadcast_text` SET `ChatTypeID`=3 WHERE `Id`=33314; UPDATE `broadcast_text` SET `ChatTypeID`=3 WHERE `Id`=33313; UPDATE `broadcast_text` SET `ChatTypeID`=1,`SoundEntriesID1`=15552 WHERE `Id`=34336;