From 7b8fadaa0cea9a74732980910f1e06cedac4ade0 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 9 Nov 2024 20:11:56 -0300 Subject: [PATCH] refactor(Scripts/ZulAman): Move Jan'alai Fire Bomb to SAI (#20496) --- .../pending_db_world/rev_1731192427658198900.sql | 7 +++++++ .../scripts/EasternKingdoms/ZulAman/boss_janalai.cpp | 12 ------------ 2 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1731192427658198900.sql diff --git a/data/sql/updates/pending_db_world/rev_1731192427658198900.sql b/data/sql/updates/pending_db_world/rev_1731192427658198900.sql new file mode 100644 index 000000000..81e680e8f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1731192427658198900.sql @@ -0,0 +1,7 @@ +-- +UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 23920; + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 23920); +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 +(23920, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fire Bomb (Zul\'Aman)- On Reset - Set Reactstate Passive'), +(23920, 0, 1, 0, 8, 0, 100, 0, 42628, 0, 0, 0, 0, 0, 11, 42629, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fire Bomb (Zul\'Aman) - On Spellhit \'Fire Bomb\' - Cast \'Fire Bomb\''); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index bb7fae9a4..0fd4a8334 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -333,17 +333,6 @@ private: bool _isFlameBreathing; }; -struct npc_janalai_firebomb : public NullCreatureAI -{ - npc_janalai_firebomb(Creature* creature) : NullCreatureAI(creature) { } - - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override - { - if (spell->Id == SPELL_FIRE_BOMB_THROW) - DoCastSelf(SPELL_FIRE_BOMB_DUMMY, true); - } -}; - struct npc_janalai_hatcher : public ScriptedAI { npc_janalai_hatcher(Creature* creature) : ScriptedAI(creature) @@ -484,7 +473,6 @@ struct npc_janalai_egg : public NullCreatureAI void AddSC_boss_janalai() { RegisterZulAmanCreatureAI(boss_janalai); - RegisterZulAmanCreatureAI(npc_janalai_firebomb); RegisterZulAmanCreatureAI(npc_janalai_hatcher); RegisterZulAmanCreatureAI(npc_janalai_hatchling); RegisterZulAmanCreatureAI(npc_janalai_egg);