Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk

# Conflicts:
#	src/server/game/Spells/Spell.cpp

Author: Terrorblade

data/sql/updates/db_world/2026_05_30_00.sql

@@ -0,0 +1,14 @@
+-- DB update 2026_05_28_00 -> 2026_05_30_00
+-- Hellfire Channelers formation: groupAI = 3 (MEMBER_ASSIST_LEADER | LEADER_ASSIST_MEMBER), pack-aggro only. Wipe handling lives in the instance script's hard reset.
+DELETE FROM `creature_formations` WHERE `leaderGUID`=90978;
+INSERT INTO `creature_formations`
+(`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`)
+VALUES
+(90978, 90978, 0, 0, 3, 0, 0),
+(90978, 90979, 0, 0, 3, 0, 0),
+(90978, 90980, 0, 0, 3, 0, 0),
+(90978, 90981, 0, 0, 3, 0, 0),
+(90978, 90982, 0, 0, 3, 0, 0);
+
+-- Hellfire Channeler SAI: drop id=6. Death tracking moved to the instance script (OnUnitDeath).
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17256 AND `source_type`=0 AND `id`=6;

data/sql/updates/db_world/2026_05_30_01.sql

@@ -0,0 +1,8 @@
+-- DB update 2026_05_30_00 -> 2026_05_30_01
+--
+DROP TABLE IF EXISTS `spell_cone`;
+CREATE TABLE `spell_cone` (
+    `ID` INT UNSIGNED NOT NULL COMMENT 'Spell ID',
+    `ConeDegrees` SMALLINT NOT NULL DEFAULT '60' COMMENT 'Cone angle in degrees',
+    PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

data/sql/updates/db_world/2026_05_30_02.sql

@@ -0,0 +1,107 @@
+-- DB update 2026_05_30_01 -> 2026_05_30_02
+--
+DELETE FROM `spell_cone` WHERE `ID` > 0;
+INSERT INTO `spell_cone` VALUES
+(5708, 90),
+(8374, 90),
+-- (9457, 90), -- Tharnariun's Heal
+(11019, 90),
+(12882, 90),
+(12887, 90),
+-- (15529, 359), -- Gout of Flame
+(15847, -120),
+(16094, 90),
+(16099, 90),
+(16169, 90),
+(16340, 90),
+(16350, 90),
+(16359, 90),
+(16390, 90),
+(16396, 120),
+(18144, 90),
+(18435, 120),
+(18500, 120),
+(19630, 120),
+(19641, 120),
+(19813, 180),
+(20667, 90),
+(20712, 120),
+(20716, 90),
+(20717, 90),
+(21071, 120),
+(21099, 120),
+(21189, 90),
+(21333, 180),
+(22479, 90),
+(22539, 120),
+(22558, 90),
+(22559, 90),
+(22560, 90),
+(22561, 90),
+-- (22600, 120), --  Force Reactive Disk
+(22642, 90),
+-- (22682, 120), -- Shadow Flame
+(22833, 120),
+(22945, 120),
+-- (22993, 120), -- Shadow Flame
+-- (23187, 120), -- Frost Burn
+-- (23189, 120), -- Frost Burn
+-- (23308, 120), -- Incinerate
+-- (23309, 120), -- Incinerate
+-- (23310, 120), -- Time Lapse
+-- (23311, 120), -- Time Lapse
+-- (23312, 120), -- Time Lapse
+-- (23313, 120), -- Corrosive Acid
+-- (23314, 120), -- Corrosive Acid
+-- (23315, 120), -- Ignite Flesh
+-- (23316, 120), -- Ignite Flesh
+(23339, 120),
+(23364, -120),
+(23461, 120),
+(23618, 90),
+(23919, 120),
+(24192, 120),
+(24682, 120),
+(24818, 120),
+(24821, 45),
+(24822, 135),
+(24823, 90),
+(24835, 180),
+(24836, 225),
+(24837, 270),
+(24838, 315),
+(24839, 120),
+(24933, 7),
+-- (25024, 45), -- Drop Mine
+-- (25026, 45), Activate MG Turret
+-- (25027, 30), -- Flamethrower
+(25029, 30), -- Flamethrower
+(25030, 90), -- Shoot Rocket
+-- (25031, 45), -- Shoot Missile
+-- (25032, 10), -- Machine Gun
+-- (25060, 90), -- Updraft
+(25145, 90),
+(25149, 90),
+(25150, 90),
+(25322, 90),
+(25653, -120),
+(25993, 120),
+(26025, 180), -- Impale used by 15233 Vekniss Guardian; Knockback AoE, Bleed Cone
+-- (26027, 180), -- Knockback
+(26029, 5), -- Dark Glare
+-- (27766, 90), -- Cannon
+(27807, 90),
+(28127, 90),
+(28157, 45),
+(28168, 120),
+(28405, 180),
+(28438, 180),
+(28459, 90),
+-- (28460, 90), -- Wail of Souls
+-- (28469, 360), -- Ghost Vision
+(28741, 120),
+(28783, 30),
+-- (29998, 180), -- Decrepit Fever
+(30043, 90),
+(30056, 180),
+(30732, 180);

data/sql/updates/db_world/2026_05_30_03.sql

@@ -0,0 +1,8 @@
+-- DB update 2026_05_30_02 -> 2026_05_30_03
+--
+-- 25029 Flamethrower TARGET_UNIT_CONE_ENTRY
+-- 25030 Shoot Rocket TARGET_UNIT_CONE_ENTRY
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceEntry` IN (25029, 25030)) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 31) AND (`ConditionTarget` = 0) AND (`ConditionValue1` = 3) AND (`ConditionValue2` = 15328) AND (`ConditionValue3` = 0);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 5, 25029, 0, 0, 31, 0, 3, 15328, 0, 0, 0, 0, '', 'target must be \'Steam Stonk\''),
+(13, 1, 25030, 0, 0, 31, 0, 3, 15328, 0, 0, 0, 0, '', 'target must be \'Steam Stonk\'');