From 7718d5684563bbff26094012b67386a177474d12 Mon Sep 17 00:00:00 2001
From: Rocco Silipo <108557877+Rorschach91@users.noreply.github.com>
Date: Sun, 12 Apr 2026 17:22:23 +0200
Subject: [PATCH] fix(DB/SAI): Armorer Orkuruk and Innkeeper Thulfram now stop
 moving on player interact. (#25434)

---
 .../pending_db_world/rev_1775988750.sql       | 153 ++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1775988750.sql

diff --git a/data/sql/updates/pending_db_world/rev_1775988750.sql b/data/sql/updates/pending_db_world/rev_1775988750.sql
new file mode 100644
index 000000000..15cd3639f
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1775988750.sql
@@ -0,0 +1,153 @@
+
+-- Armorer Orkuruk
+DELETE FROM `waypoints` WHERE `entry` = 25274;
+DELETE FROM `waypoint_data` WHERE (`id` IN (2527400));
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(2527400, 1, 2761.85, 6187.82, 83.448, NULL, 0, 0, 0, 100, 0),
+(2527400, 2, 2763.1, 6203.83, 83.4409, NULL, 0, 0, 0, 100, 0),
+(2527400, 3, 2765.37, 6209.65, 83.4451, NULL, 0, 0, 0, 100, 0),
+(2527400, 4, 2772.92, 6217.22, 83.4475, NULL, 0, 0, 0, 100, 0),
+(2527400, 5, 2766.39, 6211.48, 83.437, NULL, 0, 0, 0, 100, 0),
+(2527400, 6, 2762.96, 6202.62, 83.4409, NULL, 0, 0, 0, 100, 0),
+(2527400, 7, 2762.31, 6187.53, 83.4546, NULL, 0, 0, 0, 100, 0),
+(2527400, 8, 2765.22, 6178.21, 83.4565, NULL, 0, 0, 0, 100, 0),
+(2527400, 9, 2762.24, 6188.36, 83.4575, NULL, 0, 0, 0, 100, 0),
+(2527400, 10, 2763.33, 6204.33, 83.4432, NULL, 0, 0, 0, 100, 0),
+(2527400, 11, 2766.61, 6211.59, 83.4381, NULL, 0, 0, 0, 100, 0),
+(2527400, 12, 2773.5, 6217.87, 83.4484, NULL, 0, 0, 0, 100, 0),
+(2527400, 13, 2765.7, 6210.09, 83.4438, NULL, 0, 0, 0, 100, 0),
+(2527400, 14, 2762.77, 6202.1, 83.4395, NULL, 0, 0, 0, 100, 0),
+(2527400, 15, 2762.54, 6187.41, 83.4578, NULL, 0, 0, 0, 100, 0),
+(2527400, 16, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0),
+(2527400, 17, 2764.09, 6182.25, 83.4576, NULL, 0, 0, 0, 100, 0),
+(2527400, 18, 2762.03, 6188.66, 83.4549, NULL, 0, 0, 0, 100, 0),
+(2527400, 19, 2763.21, 6203.82, 83.4422, NULL, 0, 0, 0, 100, 0),
+(2527400, 20, 2766.87, 6211.5, 83.4422, NULL, 0, 0, 0, 100, 0),
+(2527400, 21, 2773.88, 6218.09, 83.4497, NULL, 0, 0, 0, 100, 0),
+(2527400, 22, 2765.7, 6210.09, 83.4438, NULL, 0, 0, 0, 100, 0),
+(2527400, 23, 2762.77, 6202.1, 83.4395, NULL, 0, 0, 0, 100, 0),
+(2527400, 24, 2762.54, 6187.41, 83.4578, NULL, 0, 0, 0, 100, 0),
+(2527400, 25, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0),
+(2527400, 26, 2762.24, 6188.36, 83.4575, NULL, 0, 0, 0, 100, 0),
+(2527400, 27, 2763.33, 6204.33, 83.4432, NULL, 0, 0, 0, 100, 0),
+(2527400, 28, 2766.61, 6211.59, 83.4381, NULL, 0, 0, 0, 100, 0),
+(2527400, 29, 2773.5, 6217.87, 83.4484, NULL, 0, 0, 0, 100, 0),
+(2527400, 30, 2765.7, 6210.09, 83.4438, NULL, 0, 0, 0, 100, 0),
+(2527400, 31, 2762.77, 6202.1, 83.4395, NULL, 0, 0, 0, 100, 0),
+(2527400, 32, 2762.54, 6187.41, 83.4578, NULL, 0, 0, 0, 100, 0),
+(2527400, 33, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0),
+(2527400, 34, 2762.24, 6188.36, 83.4575, NULL, 0, 0, 0, 100, 0),
+(2527400, 35, 2763.33, 6204.33, 83.4432, NULL, 0, 0, 0, 100, 0),
+(2527400, 36, 2766.61, 6211.59, 83.4381, NULL, 0, 0, 0, 100, 0),
+(2527400, 37, 2773.5, 6217.87, 83.4484, NULL, 0, 0, 0, 100, 0),
+(2527400, 38, 2765.7, 6210.09, 83.4438, NULL, 0, 0, 0, 100, 0),
+(2527400, 39, 2762.77, 6202.1, 83.4395, NULL, 0, 0, 0, 100, 0),
+(2527400, 40, 2762.54, 6187.41, 83.4578, NULL, 0, 0, 0, 100, 0),
+(2527400, 41, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0),
+(2527400, 42, 2762.24, 6188.36, 83.4575, NULL, 0, 0, 0, 100, 0),
+(2527400, 43, 2763.33, 6204.33, 83.4432, NULL, 0, 0, 0, 100, 0),
+(2527400, 44, 2766.61, 6211.59, 83.4381, NULL, 0, 0, 0, 100, 0),
+(2527400, 45, 2773.5, 6217.87, 83.4484, NULL, 0, 0, 0, 100, 0),
+(2527400, 46, 2765.7, 6210.09, 83.4438, NULL, 0, 0, 0, 100, 0),
+(2527400, 47, 2762.77, 6202.1, 83.4395, NULL, 0, 0, 0, 100, 0),
+(2527400, 48, 2762.54, 6187.41, 83.4578, NULL, 0, 0, 0, 100, 0),
+(2527400, 49, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0),
+(2527400, 50, 2762.24, 6188.36, 83.4575, NULL, 0, 0, 0, 100, 0),
+(2527400, 51, 2763.33, 6204.33, 83.4432, NULL, 0, 0, 0, 100, 0),
+(2527400, 52, 2766.61, 6211.59, 83.4381, NULL, 0, 0, 0, 100, 0),
+(2527400, 53, 2773.5, 6217.87, 83.4484, NULL, 0, 0, 0, 100, 0),
+(2527400, 54, 2765.7, 6210.09, 83.4438, NULL, 0, 0, 0, 100, 0),
+(2527400, 55, 2762.77, 6202.1, 83.4395, NULL, 0, 0, 0, 100, 0),
+(2527400, 56, 2762.54, 6187.41, 83.4578, NULL, 0, 0, 0, 100, 0),
+(2527400, 57, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0),
+(2527400, 58, 2762.24, 6188.36, 83.4575, NULL, 0, 0, 0, 100, 0),
+(2527400, 59, 2763.33, 6204.33, 83.4432, NULL, 0, 0, 0, 100, 0),
+(2527400, 60, 2766.61, 6211.59, 83.4381, NULL, 0, 0, 0, 100, 0),
+(2527400, 61, 2773.5, 6217.87, 83.4484, NULL, 0, 0, 0, 100, 0),
+(2527400, 62, 2765.7, 6210.09, 83.4438, NULL, 0, 0, 0, 100, 0),
+(2527400, 63, 2762.77, 6202.1, 83.4395, NULL, 0, 0, 0, 100, 0),
+(2527400, 64, 2762.54, 6187.41, 83.4578, NULL, 0, 0, 0, 100, 0),
+(2527400, 65, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0),
+(2527400, 66, 2762.24, 6188.36, 83.4575, NULL, 0, 0, 0, 100, 0),
+(2527400, 67, 2763.33, 6204.33, 83.4432, NULL, 0, 0, 0, 100, 0),
+(2527400, 68, 2766.61, 6211.59, 83.4381, NULL, 0, 0, 0, 100, 0),
+(2527400, 69, 2773.5, 6217.87, 83.4484, NULL, 0, 0, 0, 100, 0),
+(2527400, 70, 2766.07, 6210.93, 83.4391, NULL, 0, 0, 0, 100, 0),
+(2527400, 71, 2762.53, 6207.16, 83.4206, NULL, 0, 0, 0, 100, 0),
+(2527400, 72, 2762.16, 6187.79, 83.4531, NULL, 0, 0, 0, 100, 0),
+(2527400, 73, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0),
+(2527400, 74, 2761.85, 6187.82, 83.448, NULL, 0, 0, 0, 100, 0),
+(2527400, 75, 2763.1, 6203.83, 83.4409, NULL, 0, 0, 0, 100, 0),
+(2527400, 76, 2765.37, 6209.65, 83.4451, NULL, 0, 0, 0, 100, 0),
+(2527400, 77, 2772.92, 6217.22, 83.4475, NULL, 0, 0, 0, 100, 0),
+(2527400, 78, 2766.39, 6211.48, 83.437, NULL, 0, 0, 0, 100, 0),
+(2527400, 79, 2762.96, 6202.62, 83.4409, NULL, 0, 0, 0, 100, 0),
+(2527400, 80, 2762.31, 6187.53, 83.4546, NULL, 0, 0, 0, 100, 0),
+(2527400, 81, 2765.22, 6178.21, 83.4565, NULL, 0, 0, 0, 100, 0),
+(2527400, 82, 2762.24, 6188.36, 83.4575, NULL, 0, 0, 0, 100, 0),
+(2527400, 83, 2763.33, 6204.33, 83.4432, NULL, 0, 0, 0, 100, 0),
+(2527400, 84, 2766.61, 6211.59, 83.4381, NULL, 0, 0, 0, 100, 0),
+(2527400, 85, 2773.5, 6217.87, 83.4484, NULL, 0, 0, 0, 100, 0),
+(2527400, 86, 2765.7, 6210.09, 83.4438, NULL, 0, 0, 0, 100, 0),
+(2527400, 87, 2762.77, 6202.1, 83.4395, NULL, 0, 0, 0, 100, 0),
+(2527400, 88, 2762.54, 6187.41, 83.4578, NULL, 0, 0, 0, 100, 0),
+(2527400, 89, 2765.46, 6178.01, 83.4598, NULL, 0, 0, 0, 100, 0);
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 25274;
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 25274);
+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
+(25274, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 2527400, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Armorer Orkuruk - On Reset - Start Path 2527400'),
+(25274, 0, 1, 2, 108, 0, 100, 0, 17, 2527400, 0, 0, 0, 0, 235, 15000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Armorer Orkuruk - On Point 17 of Path 2527400 Reached - Pause Movement'),
+(25274, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 3.38169, 'Armorer Orkuruk - On Point 17 of Path 2527400 Reached - Set Orientation 3.38169'),
+(25274, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 80, 2527400, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Armorer Orkuruk - On Point 17 of Path 2527400 Reached - Run Script'),
+(25274, 0, 4, 5, 108, 0, 100, 0, 71, 2527400, 0, 0, 0, 0, 235, 15000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Armorer Orkuruk - On Point 71 of Path 2527400 Reached - Pause Movement'),
+(25274, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 2.88465, 'Armorer Orkuruk - On Point 71 of Path 2527400 Reached - Set Orientation 2.88465'),
+(25274, 0, 6, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 80, 2527400, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Armorer Orkuruk - On Point 71 of Path 2527400 Reached - Run Script');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2527400);
+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
+(2527400, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Armorer Orkuruk - Actionlist - Play Emote 5'),
+(2527400, 9, 1, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 0, 1, 0, 10000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Armorer Orkuruk - Actionlist - Say Line 0');
+
+-- Innkeeper Thulfram
+DELETE FROM `waypoints` WHERE `entry` = 774400;
+DELETE FROM `waypoint_data` WHERE (`id` IN (774400));
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(774400, 1, 399.622, -2118.75, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 2, 398.372, -2113.75, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 3, 398.122, -2112.5, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 4, 396.622, -2104.75, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 5, 396.19, -2103.14, 131.792, NULL, 0, 0, 0, 100, 0),
+(774400, 6, 395.44, -2100.64, 131.792, NULL, 0, 0, 0, 100, 0),
+(774400, 7, 394.19, -2094.14, 131.792, NULL, 0, 0, 0, 100, 0),
+(774400, 8, 393.69, -2092.39, 131.792, NULL, 0, 0, 0, 100, 0),
+(774400, 9, 393.223, -2090.41, 131.734, NULL, 0, 0, 0, 100, 0),
+(774400, 10, 392.723, -2089.16, 131.734, NULL, 0, 0, 0, 100, 0),
+(774400, 11, 392.473, -2087.91, 131.734, NULL, 0, 0, 0, 100, 0),
+(774400, 12, 392.223, -2086.91, 131.734, NULL, 0, 0, 0, 100, 0),
+(774400, 13, 390.917, -2081.43, 131.801, NULL, 0, 0, 0, 100, 0),
+(774400, 14, 391.848, -2085.33, 131.707, NULL, 0, 0, 0, 100, 0),
+(774400, 15, 392.434, -2087.05, 131.937, NULL, 0, 0, 0, 100, 0),
+(774400, 16, 393.184, -2089.55, 131.937, NULL, 0, 0, 0, 100, 0),
+(774400, 17, 393.434, -2090.8, 131.937, NULL, 0, 0, 0, 100, 0),
+(774400, 18, 393.684, -2092.3, 131.937, NULL, 0, 0, 0, 100, 0),
+(774400, 19, 393.934, -2093.8, 131.937, NULL, 0, 0, 0, 100, 0),
+(774400, 20, 394.684, -2097.05, 131.937, NULL, 0, 0, 0, 100, 0),
+(774400, 21, 395.69, -2100.93, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 22, 396.44, -2103.43, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 23, 396.69, -2104.43, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 24, 398.19, -2112.43, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 25, 398.19, -2113.18, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 26, 398.44, -2113.93, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 27, 399.44, -2118.68, 131.918, NULL, 0, 0, 0, 100, 0),
+(774400, 28, 399.725, -2119.74, 131.668, NULL, 0, 0, 0, 100, 0);
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 7744;
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 7744);
+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
+(7744, 0, 0, 1, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Innkeeper Thulfram - On Respawn - Set Reactstate Defensive'),
+(7744, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 774400, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Innkeeper Thulfram - On Respawn - Start Path 774400'),
+(7744, 0, 2, 3, 62, 0, 100, 0, 345, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Innkeeper Thulfram - On Gossip Option 0 Selected - Close Gossip'),
+(7744, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 134, 24751, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Innkeeper Thulfram - On Gossip Option 0 Selected - Invoker Cast \'Trick or Treat\'');