From a255c170624f4798ad478486606e30e84512944a Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Wed, 1 Oct 2025 19:31:33 +0200 Subject: [PATCH 01/17] fix(DB/SmartAI): quest Assault by Air attack Alliance and Horde players - modify event to try to shoot Player's turret instead of the body - add shoot turret event to target Alliance turret - add spawn for Horde vehicle to match the Alliance --- .../pending_db_world/rev_1759339786373011744.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1759339786373011744.sql diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql new file mode 100644 index 0000000000..456f730a8b --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -0,0 +1,13 @@ +-- +SET @CGUID := 20861; +DELETE FROM `creature` WHERE (`id1` = 31881) AND (`guid` = @CGUID); +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `Comment`, `VerifiedBuild`) VALUES +(@CGUID, 31881, 0, 0, 571, 0, 0, 1, 1, 0, 7505.81, 1707.04, 350.194, 1.53589, 300, 0, 0, 63000, 0, 0, 0, 0, 0, '', '', 0); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 31280); +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 +(31280, 0, 0, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 100, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), +(31280, 0, 1, 2, 8, 0, 100, 512, 59880, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Set Event Phase 2'), +(31280, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), +(31280, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Reset - Set Event Phase 1'), +(31280, 0, 4, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 100, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); From c773f2a25d2195441941677a37a48521c6bd4d50 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:04:42 +0200 Subject: [PATCH 02/17] reduce shoot range to 90 this matches spell dbc --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 456f730a8b..a2b581ae69 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -6,8 +6,8 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 31280); 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 -(31280, 0, 0, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 100, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), +(31280, 0, 0, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), (31280, 0, 1, 2, 8, 0, 100, 512, 59880, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Set Event Phase 2'), (31280, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), (31280, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Reset - Set Event Phase 1'), -(31280, 0, 4, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 100, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); +(31280, 0, 4, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); From f5e59bd574c61501d9c9ccbb296735fbb5904933 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:05:28 +0200 Subject: [PATCH 03/17] fix damage done by spear remove armor --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index a2b581ae69..4146d68a71 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -11,3 +11,5 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (31280, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), (31280, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Reset - Set Event Phase 1'), (31280, 0, 4, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); + +UPDATE `creature_template` SET `ArmorModifier` = 0 WHERE (`entry` = 32227); From 0dac96f9a55a14b2e5e42a3baa846d0ebf15bb8d Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:05:41 +0200 Subject: [PATCH 04/17] add quest conditional for vehicle entry --- .../updates/pending_db_world/rev_1759339786373011744.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 4146d68a71..4388f97f21 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -13,3 +13,9 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (31280, 0, 4, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); UPDATE `creature_template` SET `ArmorModifier` = 0 WHERE (`entry` = 32227); + +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 18) AND (`SourceGroup` IN (31884, 32227)) AND (`SourceEntry` = 46598) AND (`SourceId` = 0); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(18, 31884, 46598, 0, 0, 9, 0, 13310, 0, 0, 0, 0, 0, '', 'Kor\'kron Suppression Turret requires player to be on quest Assault by Air'), +(18, 32227, 46598, 0, 0, 9, 0, 13309, 0, 0, 0, 0, 0, '', 'Skybreaker Suppression Turret requires player to be on quest Assault by Air'); + From 73db7585e41deb595d9fa0f3747c363eb002e46c Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:05:57 +0200 Subject: [PATCH 05/17] fix seat not despawning --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 4388f97f21..66dcd4f6c2 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -19,3 +19,5 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (18, 31884, 46598, 0, 0, 9, 0, 13310, 0, 0, 0, 0, 0, '', 'Kor\'kron Suppression Turret requires player to be on quest Assault by Air'), (18, 32227, 46598, 0, 0, 9, 0, 13309, 0, 0, 0, 0, 0, '', 'Skybreaker Suppression Turret requires player to be on quest Assault by Air'); +UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=31881 AND `seat_id`=1; +UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=32225 AND `seat_id`=1; From 8b589388e3c741b1b5257d03250e1ac3812ca933 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:06:53 +0200 Subject: [PATCH 06/17] lower turret shoot action chance else quest becomes impossible --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 66dcd4f6c2..63cc379fbd 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -6,11 +6,11 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 31280); 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 -(31280, 0, 0, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), +(31280, 0, 0, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), (31280, 0, 1, 2, 8, 0, 100, 512, 59880, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Set Event Phase 2'), (31280, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), (31280, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Reset - Set Event Phase 1'), -(31280, 0, 4, 0, 60, 1, 100, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); +(31280, 0, 4, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); UPDATE `creature_template` SET `ArmorModifier` = 0 WHERE (`entry` = 32227); From 13ceca41117700d1447fe7648305274c8d64b50f Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:27:46 +0200 Subject: [PATCH 07/17] fix vehicle attacking player --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 63cc379fbd..e65717f132 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -21,3 +21,6 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=31881 AND `seat_id`=1; UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=32225 AND `seat_id`=1; + +-- Immune to PC +UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 256 WHERE (`entry` IN (32225, 31881)); From 643b795f988b02eb3b925fa6c878fcea860dce94 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:31:12 +0200 Subject: [PATCH 08/17] more reliable interrupt --- .../sql/updates/pending_db_world/rev_1759339786373011744.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index e65717f132..25391f468b 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -8,9 +8,10 @@ DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 31280); 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 (31280, 0, 0, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), (31280, 0, 1, 2, 8, 0, 100, 512, 59880, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Set Event Phase 2'), -(31280, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), +(31280, 0, 2, 5, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), (31280, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Reset - Set Event Phase 1'), -(31280, 0, 4, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); +(31280, 0, 4, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), +(31280, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 92, 0, 59894, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Interrupt Spell \'Launch Spear\''); UPDATE `creature_template` SET `ArmorModifier` = 0 WHERE (`entry` = 32227); From b97b0450b0a6ad9b8f9f8a88b11dbc4b4b25e1c4 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:48:11 +0200 Subject: [PATCH 09/17] fix pilot despawn instead of dying --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 25391f468b..9ecadf24a8 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -25,3 +25,6 @@ UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=32225 AND ` -- Immune to PC UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 256 WHERE (`entry` IN (32225, 31881)); + +UPDATE `vehicle_template_accessory` SET `minion`=0, `summontype`=5, `summontimer`=0 WHERE `entry`=31881 AND `seat_id`=0; +UPDATE `vehicle_template_accessory` SET `minion`=0, `summontype`=5, `summontimer`=0 WHERE `entry`=32225 AND `seat_id`=0; From b54e283e260c75d6ec58fb3e7c7f28055018fced Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Mon, 13 Oct 2025 23:54:08 +0200 Subject: [PATCH 10/17] remove NPC immunity from turret vehicle --- .../sql/updates/pending_db_world/rev_1759339786373011744.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 9ecadf24a8..ec307ab383 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -23,8 +23,11 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=31881 AND `seat_id`=1; UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=32225 AND `seat_id`=1; --- Immune to PC +-- Add immune to PC UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 256 WHERE (`entry` IN (32225, 31881)); +-- Remove immune to NPC +UPDATE `creature_template` SET `unit_flags` = `unit_flags` & ~256 WHERE (`entry` IN (32227, 31884)); + UPDATE `vehicle_template_accessory` SET `minion`=0, `summontype`=5, `summontimer`=0 WHERE `entry`=31881 AND `seat_id`=0; UPDATE `vehicle_template_accessory` SET `minion`=0, `summontype`=5, `summontimer`=0 WHERE `entry`=32225 AND `seat_id`=0; From 8fe081f3e4bde64e387e2e1cd5848fc7125c7f53 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Tue, 14 Oct 2025 00:30:22 +0200 Subject: [PATCH 11/17] Revert "more reliable interrupt" This reverts commit 643b795f988b02eb3b925fa6c878fcea860dce94. --- .../sql/updates/pending_db_world/rev_1759339786373011744.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index ec307ab383..74e125ddff 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -8,10 +8,9 @@ DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 31280); 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 (31280, 0, 0, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), (31280, 0, 1, 2, 8, 0, 100, 512, 59880, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Set Event Phase 2'), -(31280, 0, 2, 5, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), +(31280, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), (31280, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Reset - Set Event Phase 1'), -(31280, 0, 4, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), -(31280, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 92, 0, 59894, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Interrupt Spell \'Launch Spear\''); +(31280, 0, 4, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); UPDATE `creature_template` SET `ArmorModifier` = 0 WHERE (`entry` = 32227); From c9c3af8d3f85976ce193a509925c443d2f07da27 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Tue, 14 Oct 2025 00:37:12 +0200 Subject: [PATCH 12/17] fixup! lower turret shoot action chance --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 74e125ddff..d6b0bbeff8 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -6,11 +6,11 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 31280); 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 -(31280, 0, 0, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), +(31280, 0, 0, 0, 60, 1, 50, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), (31280, 0, 1, 2, 8, 0, 100, 512, 59880, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Set Event Phase 2'), (31280, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), (31280, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Reset - Set Event Phase 1'), -(31280, 0, 4, 0, 60, 1, 70, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); +(31280, 0, 4, 0, 60, 1, 50, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); UPDATE `creature_template` SET `ArmorModifier` = 0 WHERE (`entry` = 32227); From a5dcdf4fe13703fa0e1b69baa8155f1a0157ae6c Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Tue, 14 Oct 2025 01:00:19 +0200 Subject: [PATCH 13/17] fixup! remove NPC immunity from turret vehicle --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index d6b0bbeff8..775a2c0a98 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -26,7 +26,7 @@ UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=32225 AND ` UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 256 WHERE (`entry` IN (32225, 31881)); -- Remove immune to NPC -UPDATE `creature_template` SET `unit_flags` = `unit_flags` & ~256 WHERE (`entry` IN (32227, 31884)); +UPDATE `creature_template` SET `unit_flags` = `unit_flags` & ~512 WHERE (`entry` IN (32227, 31884)); UPDATE `vehicle_template_accessory` SET `minion`=0, `summontype`=5, `summontimer`=0 WHERE `entry`=31881 AND `seat_id`=0; UPDATE `vehicle_template_accessory` SET `minion`=0, `summontype`=5, `summontimer`=0 WHERE `entry`=32225 AND `seat_id`=0; From b57b31c4de08acc0bd10a1aa6b53998e640d4955 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Tue, 14 Oct 2025 01:09:12 +0200 Subject: [PATCH 14/17] fix passengers attacking player --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 775a2c0a98..647712be19 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -23,7 +23,7 @@ UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=31881 AND ` UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=32225 AND `seat_id`=1; -- Add immune to PC -UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 256 WHERE (`entry` IN (32225, 31881)); +UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 256 WHERE (`entry` IN (32225, 31881, 31882, 31891, 32223, 32225)); -- Remove immune to NPC UPDATE `creature_template` SET `unit_flags` = `unit_flags` & ~512 WHERE (`entry` IN (32227, 31884)); From 94be21c85bc192606633b846afbc8185ad5ab4e5 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Tue, 14 Oct 2025 01:21:46 +0200 Subject: [PATCH 15/17] add immune NPC to body --- data/sql/updates/pending_db_world/rev_1759339786373011744.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 647712be19..cb357ab149 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -24,6 +24,8 @@ UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=32225 AND ` -- Add immune to PC UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 256 WHERE (`entry` IN (32225, 31881, 31882, 31891, 32223, 32225)); +-- Add immune NPC for body +UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 512 WHERE (`entry` IN (31881, 32225)); -- Remove immune to NPC UPDATE `creature_template` SET `unit_flags` = `unit_flags` & ~512 WHERE (`entry` IN (32227, 31884)); From ac7e896ec88d87b108067f62a7d471d4ae39608c Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Sun, 2 Nov 2025 11:41:31 +0100 Subject: [PATCH 16/17] remove some changes --- .../rev_1759339786373011744.sql | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index cb357ab149..5f33d1e4b5 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -4,14 +4,6 @@ DELETE FROM `creature` WHERE (`id1` = 31881) AND (`guid` = @CGUID); INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `Comment`, `VerifiedBuild`) VALUES (@CGUID, 31881, 0, 0, 571, 0, 0, 1, 1, 0, 7505.81, 1707.04, 350.194, 1.53589, 300, 0, 0, 63000, 0, 0, 0, 0, 0, '', '', 0); -DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 31280); -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 -(31280, 0, 0, 0, 60, 1, 50, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 31884, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'), -(31280, 0, 1, 2, 8, 0, 100, 512, 59880, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Set Event Phase 2'), -(31280, 0, 2, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 80, 3128000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Spellhit \'Suppression Charge\' - Run Script'), -(31280, 0, 3, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Reset - Set Event Phase 1'), -(31280, 0, 4, 0, 60, 1, 50, 512, 5000, 5000, 3000, 4000, 0, 0, 11, 59894, 0, 0, 0, 0, 0, 19, 32227, 90, 0, 0, 0, 0, 0, 0, 'Ymirheim Spear Gun - On Update - Cast \'Launch Spear\' (Phase 1)'); - UPDATE `creature_template` SET `ArmorModifier` = 0 WHERE (`entry` = 32227); DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 18) AND (`SourceGroup` IN (31884, 32227)) AND (`SourceEntry` = 46598) AND (`SourceId` = 0); @@ -22,13 +14,5 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=31881 AND `seat_id`=1; UPDATE `vehicle_template_accessory` SET `summontype`=5 WHERE `entry`=32225 AND `seat_id`=1; --- Add immune to PC +-- Prevent vehicle and passengers to attack players from the opposite faction UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 256 WHERE (`entry` IN (32225, 31881, 31882, 31891, 32223, 32225)); --- Add immune NPC for body -UPDATE `creature_template` SET `unit_flags` = `unit_flags` | 512 WHERE (`entry` IN (31881, 32225)); - --- Remove immune to NPC -UPDATE `creature_template` SET `unit_flags` = `unit_flags` & ~512 WHERE (`entry` IN (32227, 31884)); - -UPDATE `vehicle_template_accessory` SET `minion`=0, `summontype`=5, `summontimer`=0 WHERE `entry`=31881 AND `seat_id`=0; -UPDATE `vehicle_template_accessory` SET `minion`=0, `summontype`=5, `summontimer`=0 WHERE `entry`=32225 AND `seat_id`=0; From 0eba51c73b6ed601aeb620736b64de2c4f47fd53 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Sat, 8 Nov 2025 12:24:09 +0100 Subject: [PATCH 17/17] add Parachute on exit --- .../updates/pending_db_world/rev_1759339786373011744.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql index 5f33d1e4b5..375b851533 100644 --- a/data/sql/updates/pending_db_world/rev_1759339786373011744.sql +++ b/data/sql/updates/pending_db_world/rev_1759339786373011744.sql @@ -6,6 +6,12 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, UPDATE `creature_template` SET `ArmorModifier` = 0 WHERE (`entry` = 32227); +-- Disable Gravity, allows Parachute on exit +DELETE FROM `creature_template_movement` WHERE (`CreatureId` IN (31884, 32227)); +INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`, `Chase`, `Random`, `InteractionPauseTimer`) VALUES +(31884, 0, 0, 1, 0, 0, 0, 0), +(32227, 0, 0, 1, 0, 0, 0, 0); + DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 18) AND (`SourceGroup` IN (31884, 32227)) AND (`SourceEntry` = 46598) AND (`SourceId` = 0); INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (18, 31884, 46598, 0, 0, 9, 0, 13310, 0, 0, 0, 0, 0, '', 'Kor\'kron Suppression Turret requires player to be on quest Assault by Air'),