From b1ee80dba4d7bb15cf5a75239c613f661437dd58 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Thu, 7 Nov 2024 07:43:42 +0100 Subject: [PATCH 1/2] Update spell_restorations.sql - Twilight Cultists SmartAI Added SmartAI for twilight cultists in Searing Gorge Notes: This may be an AzerothCore issue, not individual progression. I used data from other NPCs, like when to cast and how often, so this is most likely not be 100% accurate. For it to be accurate testing would have to be done on classic servers. Still, I think this is pretty close and much better than these enemies not casting their spells at all. --- sql/world/base/spell_restorations.sql | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/sql/world/base/spell_restorations.sql b/sql/world/base/spell_restorations.sql index 8097ba9..8a817ac 100644 --- a/sql/world/base/spell_restorations.sql +++ b/sql/world/base/spell_restorations.sql @@ -24,8 +24,25 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (2926, 0, 1, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 22766, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Silvermane Stalker - Out of Combat - Cast \'Sneak\''); /* Deviate Stalker (3634) should have sneak spell 22766 */ -UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 3634; +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 3634; DELETE FROM `smart_scripts` WHERE `entryorguid` = 3634 AND `action_param1` = 22766; 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 (3634, 0, 0, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 22766, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Deviate Stalker - Out of Combat - Cast \'Sneak\''); +/* Twilight cultists in Searing Gorge missing smart AI */ +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (5860, 5861, 5862); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (5860, 5861, 5862); +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 + +/* Twilight Dark Shaman (5860) */ +(5860, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 0, 11, 15500, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - In Combat CMC - Cast \'Shock\''), +(5860, 0, 1, 0, 0, 0, 100, 0, 2500, 10000, 35000, 40000, 0, 0, 11, 7289, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - In Combat - Cast Shrink'), +(5860, 0, 2, 0, 14, 0, 100, 0, 1000, 30, 8000, 11000, 0, 0, 11, 12491, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - Friendly Missing Health - Cast Healing Wave'), + +/* Twilight Fire Guard (5861) */ +(5861, 0, 0, 0, 0, 0, 100, 0, 4000, 9000, 18000, 26000, 0, 0, 11, 15243, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Fire Guard - In Combat - Cast \'Fireball Volley\''), + +/* Twilight Geomancer (5862) */ +(5862, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 0, 11, 9053, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - In Combat CMC - Cast \'Fireball\''), +(5862, 0, 1, 0, 0, 0, 100, 0, 4000, 9000, 18000, 26000, 0, 0, 11, 11436, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - In Combat - Cast \'Slow\''), +(5862, 0, 2, 0, 2, 0, 100, 1, 30, 60, 0, 0, 0, 0, 11, 11990, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - Between 30-60% Health - Cast \'11990\' (No Repeat)'); From 158b419f10d25e79624c5afa92f71e69f739d8cb Mon Sep 17 00:00:00 2001 From: acore-crap <174030747+acore-crap@users.noreply.github.com> Date: Thu, 7 Nov 2024 03:13:17 -0700 Subject: [PATCH 2/2] axes flipped in this zone? --- src/naxx40Scripts/boss_heigan_40.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/naxx40Scripts/boss_heigan_40.cpp b/src/naxx40Scripts/boss_heigan_40.cpp index 431bc5e..1da88d3 100644 --- a/src/naxx40Scripts/boss_heigan_40.cpp +++ b/src/naxx40Scripts/boss_heigan_40.cpp @@ -232,7 +232,7 @@ public: { if (player->IsAlive() && !player->IsGameMaster()) { - if (player->GetPositionX() <= 2769.0f) + if (player->GetPositionY() <= -3735.0f) { player->KillSelf(); }