Skip to content

Commit ec29eb0

Browse files
LannyELannyE
authored
Merge branch 'azerothcore:master' into master
2 parents c5eb085 + 5711976 commit ec29eb0

29 files changed

+886
-20
lines changed

‎data/sql/updates/db_world/2026_02_22_02.sql‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- DB update 2026_02_22_01 -> 2026_02_22_02
2+
-- Honor Among Thieves spell script registration
3+
DELETE FROM `spell_script_names` WHERE `spell_id` IN (51698, 51700, 51701, 52916);
4+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
5+
(51698, 'spell_rog_honor_among_thieves'),
6+
(51700, 'spell_rog_honor_among_thieves'),
7+
(51701, 'spell_rog_honor_among_thieves'),
8+
(52916, 'spell_rog_honor_among_thieves_proc');

‎data/sql/updates/db_world/2026_02_22_03.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-- DB update 2026_02_22_02 -> 2026_02_22_03
2+
--
3+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 10 AND `SourceGroup` IN (1267174, 1266870, 1267579, 1268083) AND `SourceEntry` = 43876 AND `ConditionTypeOrReference` = 7 AND `ConditionValue1` = 197;
4+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
5+
(10, 1266870, 43876, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Player must have Tailoring Skill to loot A Guide to Northern Cloth Scavenging'),
6+
(10, 1267174, 43876, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Player must have Tailoring Skill to loot A Guide to Northern Cloth Scavenging'),
7+
(10, 1267579, 43876, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Player must have Tailoring Skill to loot A Guide to Northern Cloth Scavenging'),
8+
(10, 1268083, 43876, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Player must have Tailoring Skill to loot A Guide to Northern Cloth Scavenging');
9+
10+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 10 AND `SourceGroup` IN (1260002) AND `SourceEntry` IN (42172,42173,42175,42176,42177,42178) AND `ConditionTypeOrReference` = 1 AND `ConditionValue1` IN (55993,55994,55996,55998,55997,55999);
11+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
12+
(10, 1260002, 42172, 0, 0, 1, 0, 55993, 0, 0, 1, 0, 0, '', 'Player must not know this Tailoring pattern already'),
13+
(10, 1260002, 42173, 0, 0, 1, 0, 55994, 0, 0, 1, 0, 0, '', 'Player must not know this Tailoring pattern already'),
14+
(10, 1260002, 42175, 0, 0, 1, 0, 55996, 0, 0, 1, 0, 0, '', 'Player must not know this Tailoring pattern already'),
15+
(10, 1260002, 42176, 0, 0, 1, 0, 55998, 0, 0, 1, 0, 0, '', 'Player must not know this Tailoring pattern already'),
16+
(10, 1260002, 42177, 0, 0, 1, 0, 55997, 0, 0, 1, 0, 0, '', 'Player must not know this Tailoring pattern already'),
17+
(10, 1260002, 42178, 0, 0, 1, 0, 55999, 0, 0, 1, 0, 0, '', 'Player must not know this Tailoring pattern already');

‎data/sql/updates/db_world/2026_02_22_04.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2026_02_22_03 -> 2026_02_22_04
2+
--
3+
UPDATE `conditions` SET `ConditionTypeOrReference` = 25 WHERE `SourceTypeOrReferenceId` = 10 AND `SourceGroup` IN (1260002) AND `SourceEntry` IN (42172,42173,42175,42176,42177,42178) AND `ConditionTypeOrReference` = 1 AND `ConditionValue1` IN (55993,55994,55996,55998,55997,55999);

‎data/sql/updates/db_world/2026_02_22_05.sql‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
-- DB update 2026_02_22_04 -> 2026_02_22_05
2+
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 7784;
3+
4+
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 7784) AND (`source_type` = 0) AND (`id` IN (7));
5+
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
6+
(7784, 0, 7, 0, 11, 0, 100, 512, 0, 0, 0, 0, 0, 0, 28, 68499, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Homing Robot OOX-17/TN - On Respawn - Remove Aura \'OOX Lift Off\'');
7+
8+
-- Update waypoints with sniffed data
9+
DELETE FROM `waypoints` WHERE `entry` = 7784;
10+
INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `orientation`, `point_comment`) VALUES
11+
(7784, 1, -8832.505, -4374.4556, 45.228176, NULL, 'Homing Robot OOX-17/TN'),
12+
(7784, 2, -8810.634, -4373.8345, 32.52725, NULL, 'Homing Robot OOX-17/TN'),
13+
(7784, 3, -8794.969, -4366.311, 25.909113, NULL, 'Homing Robot OOX-17/TN'),
14+
(7784, 4, -8752.488, -4366.4326, 24.156054, NULL, 'Homing Robot OOX-17/TN'),
15+
(7784, 5, -8724.97, -4352.2266, 20.758305, NULL, 'Homing Robot OOX-17/TN'),
16+
(7784, 6, -8708.822, -4353.277, 18.39893, NULL, 'Homing Robot OOX-17/TN'),
17+
(7784, 7, -8684.997, -4379.1943, 13.580014, NULL, 'Homing Robot OOX-17/TN'),
18+
(7784, 8, -8656.829, -4388.013, 12.268159, NULL, 'Homing Robot OOX-17/TN'),
19+
(7784, 9, -8612.755, -4397.2524, 9.681026, NULL, 'Homing Robot OOX-17/TN'),
20+
(7784, 10, -8578.566, -4408.652, 11.647685, NULL, 'Homing Robot OOX-17/TN'),
21+
(7784, 11, -8539.096, -4421.452, 12.621063, NULL, 'Homing Robot OOX-17/TN'),
22+
(7784, 12, -8514.029, -4425.8203, 13.824177, NULL, 'Homing Robot OOX-17/TN'),
23+
(7784, 13, -8486.308, -4428.784, 11.725893, NULL, 'Homing Robot OOX-17/TN'),
24+
(7784, 14, -8446.95, -4440.7183, 9.385215, NULL, 'Homing Robot OOX-17/TN'),
25+
(7784, 15, -8417.598, -4445.191, 10.350303, NULL, 'Homing Robot OOX-17/TN'),
26+
(7784, 16, -8388.8955, -4448.0015, 10.9764805, NULL, 'Homing Robot OOX-17/TN'),
27+
(7784, 17, -8352.005, -4447.594, 10.134734, NULL, 'Homing Robot OOX-17/TN'),
28+
(7784, 18, -8352.005, -4447.594, 10.134734, 0.0104949, 'Homing Robot OOX-17/TN'),
29+
-- Fly waypoints to give lift off time to play
30+
(7784, 19, -8327.56, -4442.5103, 18.585197, NULL, 'Homing Robot OOX-17/TN'),
31+
(7784, 20, -8262.676, -4426.0054, 34.8352, NULL, 'Homing Robot OOX-17/TN'),
32+
(7784, 21, -8161.7275, -4410.5435, 58.08519, NULL, 'Homing Robot OOX-17/TN');
33+
34+
-- Update SmartAI waypoint references to match sniffed data
35+
-- ID 3: Ambush/pause trigger on WP18 (pause point with orientation)
36+
-- ID 5: Despawn on WP21 (final fly waypoint)
37+
UPDATE `smart_scripts` SET `event_param1` = 18 WHERE `entryorguid` = 7784 AND `source_type` = 0 AND `id` = 3;
38+
UPDATE `smart_scripts` SET `event_param1` = 21 WHERE `entryorguid` = 7784 AND `source_type` = 0 AND `id` = 5;

‎data/sql/updates/db_world/2026_02_22_06.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- DB update 2026_02_22_05 -> 2026_02_22_06
2+
-- Lock and Load: allow periodic tick procs (Black Arrow, Explosive Trap)
3+
-- SpellPhaseMask 6 = PROC_SPELL_PHASE_HIT | PROC_SPELL_PHASE_FINISH
4+
UPDATE `spell_proc` SET `SpellPhaseMask` = 6 WHERE `SpellId` = -56342;

‎data/sql/updates/db_world/2026_02_23_00.sql‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
-- DB update 2026_02_22_06 -> 2026_02_23_00
2+
-- Update gameobject 'Offering Bowl' with sniffed values
3+
-- updated spawns
4+
DELETE FROM `gameobject` WHERE (`id` IN (195068)) AND (`guid` IN (240205, 240206, 240207, 240208, 240209, 240210, 240211, 240212, 240213, 240214, 240215, 240216, 240217, 240218, 240219));
5+
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES
6+
(240205, 195068, 0, 0, 0, 1, 1, 1780.13720703125, 269.758697509765625, 59.87249755859375, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
7+
(240206, 195068, 0, 0, 0, 1, 1, 1777.3125, 220.5381927490234375, 59.57676315307617187, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
8+
(240207, 195068, 1, 0, 0, 1, 1, 10053.5673828125, 2109.588623046875, 1329.647705078125, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
9+
(240208, 195068, 1, 0, 0, 1, 1, 10065.0107421875, 2118.71875, 1329.6578369140625, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
10+
(240209, 195068, 1, 0, 0, 1, 1, 10053.4443359375, 2128.55029296875, 1329.6578369140625, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
11+
(240210, 195068, 0, 0, 0, 1, 1, -5160.017578125, -869.029541015625, 507.289947509765625, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
12+
(240211, 195068, 0, 0, 0, 1, 1, -5159.92041015625, -870.56597900390625, 507.307281494140625, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
13+
(240212, 195068, 0, 0, 0, 1, 1, -9328.3662109375, 170.1875, 61.62678909301757812, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
14+
(240213, 195068, 0, 0, 0, 1, 1, -9327.1318359375, 181.86285400390625, 61.65506362915039062, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
15+
(240214, 195068, 1, 0, 0, 1, 1, 1180.125, -4457.48291015625, 21.48893928527832031, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
16+
(240215, 195068, 1, 0, 0, 1, 1, 1186.0677490234375, -4471.15283203125, 21.37073898315429687, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
17+
(240216, 195068, 1, 0, 0, 1, 1, 1172.282958984375, -4463.251953125, 21.28664779663085937, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
18+
(240217, 195068, 1, 0, 0, 1, 1, -983.0086669921875, -70.095489501953125, 20.78351402282714843, 0, 0, 0, 0, 1, 120, 255, 1, "", 46368, NULL),
19+
(240218, 195068, 1, 0, 0, 1, 1, -984.638916015625, -76.1319427490234375, 20.85489082336425781, 0, 0, 0, 0, 1, 120, 255, 1, "", 46368, NULL),
20+
(240219, 195068, 1, 0, 0, 1, 1, -984.920166015625, -75.171875, 20.93883132934570312, 0, 0, 0, 0, 1, 120, 255, 1, "", 46368, NULL);
21+
22+
-- new spawns
23+
DELETE FROM `gameobject` WHERE (`id` IN (195068)) AND (`guid` IN (1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185));
24+
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES
25+
(1176, 195068, 530, 0, 0, 1, 1, -1782.2535400390625, 4935.55029296875, -22.6603317260742187, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
26+
(1177, 195068, 530, 0, 0, 1, 1, -1835.9149169921875, 4922.8203125, -21.208261489868164, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
27+
(1178, 195068, 530, 0, 0, 1, 1, -4310.3369140625, -12439.53515625, 17.13308906555175781, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
28+
(1179, 195068, 530, 0, 0, 1, 1, -4318.94775390625, -12448.236328125, 17.12119102478027343, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
29+
(1180, 195068, 530, 0, 0, 1, 1, -4319.37353515625, -12455.69140625, 17.32845878601074218, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
30+
(1181, 195068, 530, 0, 0, 1, 1, -4322.97216796875, -12439.4619140625, 17.49305534362792968, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
31+
(1182, 195068, 530, 0, 0, 1, 1, 9418.6474609375, -6849.44970703125, 15.08854198455810546, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
32+
(1183, 195068, 530, 0, 0, 1, 1, 9418.884765625, -6854.578125, 14.94306755065917968, 0, 0, 0, 0, 1, 120, 255, 1, "", 51943, NULL),
33+
(1184, 195068, 571, 0, 0, 1, 1, 5851.962890625, 771.29864501953125, 641.49884033203125, 0, 0, 0, 0, 1, 120, 255, 1, "", 46248, NULL),
34+
(1185, 195068, 571, 0, 0, 1, 1, 5856.6162109375, 765.54339599609375, 641.33111572265625, 0, 0, 0, 0, 1, 120, 255, 1, "", 46248, NULL);
35+
36+
-- enable all spawns for eventEntry 51
37+
DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 51) AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` IN (195068)));
38+
INSERT INTO `game_event_gameobject` (SELECT 51, `guid` FROM `gameobject` WHERE `id` IN (195068));

‎data/sql/updates/db_world/2026_02_23_01.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2026_02_23_00 -> 2026_02_23_01
2+
-- Malygos (10 and 25) - Add despawn on evade (CREATURE_FLAG_EXTRA_HARD_RESET)
3+
UPDATE `creature_template` SET `flags_extra` = `flags_extra`|0x80000000 WHERE `entry` IN (28859, 31734);

‎data/sql/updates/db_world/2026_02_23_02.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2026_02_23_01 -> 2026_02_23_02
2+
-- Darkmoon Card: Illusion - remove duplicate mana restore (handled by C++ script)
3+
DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = -57350 AND `spell_effect` = 60242;

0 commit comments

Comments
 (0)