From 7569a3bf1b886583393b4e6d9f8f615443d3f053 Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:57:32 -0400 Subject: [PATCH 1/6] fix(Scripts/HyjalSummit): Adjust Air Burst cast targetting. (#19488) Init. --- .../pending_db_world/air-burst-script.sql | 1 + .../BattleForMountHyjal/boss_archimonde.cpp | 27 ++++--------------- 2 files changed, 6 insertions(+), 22 deletions(-) create mode 100644 data/sql/updates/pending_db_world/air-burst-script.sql diff --git a/data/sql/updates/pending_db_world/air-burst-script.sql b/data/sql/updates/pending_db_world/air-burst-script.sql new file mode 100644 index 000000000..f8560b6f9 --- /dev/null +++ b/data/sql/updates/pending_db_world/air-burst-script.sql @@ -0,0 +1 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 32014; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index cab91dd88..73accd7f7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -267,9 +267,11 @@ struct boss_archimonde : public BossAI Talk(SAY_AGGRO); ScheduleTimedEvent(25s, 35s, [&] { - scheduler.DelayGroup(GROUP_FEAR, 5s); - Talk(SAY_AIR_BURST); - DoCastRandomTarget(SPELL_AIR_BURST); + if (DoCastRandomTarget(SPELL_AIR_BURST, 1) == SPELL_CAST_OK) + { + scheduler.DelayGroup(GROUP_FEAR, 5s); + Talk(SAY_AIR_BURST); + } }, 25s, 40s); ScheduleTimedEvent(8s, [&] { @@ -471,24 +473,6 @@ class spell_red_sky_effect : public SpellScript } }; -class spell_air_burst : public SpellScript -{ - PrepareSpellScript(spell_air_burst); - - void FilterTargets(std::list& targets) - { - if (Unit* victim = GetCaster()->GetVictim()) - { - targets.remove_if(Acore::ObjectGUIDCheck(victim->GetGUID(), true)); - } - } - - void Register() override - { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_air_burst::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY); - } -}; - class spell_doomfire : public AuraScript { PrepareAuraScript(spell_doomfire); @@ -519,7 +503,6 @@ class spell_doomfire : public AuraScript void AddSC_boss_archimonde() { RegisterSpellScript(spell_red_sky_effect); - RegisterSpellScript(spell_air_burst); RegisterSpellScript(spell_doomfire); RegisterHyjalAI(boss_archimonde); RegisterHyjalAI(npc_ancient_wisp); From acc80d733791e0f9b73575561a6a2b383892e60d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 1 Aug 2024 22:58:27 +0000 Subject: [PATCH 2/6] chore(DB): import pending files Referenced commit(s): 7569a3bf1b886583393b4e6d9f8f615443d3f053 --- .../air-burst-script.sql => db_world/2024_08_01_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/air-burst-script.sql => db_world/2024_08_01_00.sql} (57%) diff --git a/data/sql/updates/pending_db_world/air-burst-script.sql b/data/sql/updates/db_world/2024_08_01_00.sql similarity index 57% rename from data/sql/updates/pending_db_world/air-burst-script.sql rename to data/sql/updates/db_world/2024_08_01_00.sql index f8560b6f9..127b7bbf8 100644 --- a/data/sql/updates/pending_db_world/air-burst-script.sql +++ b/data/sql/updates/db_world/2024_08_01_00.sql @@ -1 +1,2 @@ +-- DB update 2024_07_31_00 -> 2024_08_01_00 DELETE FROM `spell_script_names` WHERE `spell_id` = 32014; From f70e69cacfc0a830ab3e43f3463ad97fe952db2d Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Fri, 2 Aug 2024 16:19:16 -0300 Subject: [PATCH 3/6] fix(Scripts/BlackTemple): Mother Shahraz should not use frenzy (#19543) --- src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 47bbde7b3..d93159e81 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -54,7 +54,6 @@ enum Spells SPELL_FATAL_ATTRACTION_AURA = 41001, SPELL_FATAL_ATTRACTION_DAMAGE = 40871, SPELL_ENRAGE = 45078, - SPELL_FRENZY = 40683, SPELL_SABER_LASH_IMMUNITY = 43690 }; @@ -74,7 +73,6 @@ struct boss_mother_shahraz : public BossAI _canTalk = true; ScheduleHealthCheckEvent(10, [&] { - DoCastSelf(SPELL_FRENZY, true); Talk(SAY_EMOTE_FRENZY); }); } From c54fd66c7324b2fbef6cde1ddca2228ab5f9d233 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:20:27 +0300 Subject: [PATCH 4/6] fix(Core/Spells): Flame Wave (#19144) * fix(Core/Spells): Flame Wave * ) * . flamewave faction id https://github.com/TrinityCore/TrinityCore/blame/3365e6a4b84f59cca5f7ef5fca71fb3979697e52/sql/old/9.x/world/21081_2021_10_15/2021_09_29_04_world_2018_06_17_04_world.sql#L46 Co-Authored-By: Carlos Morales * lol --------- Co-authored-by: Carlos Morales --- .../updates/pending_db_world/rev_1719208787140826600.sql | 7 +++++++ src/server/game/Spells/SpellInfoCorrections.cpp | 8 ++++++++ 2 files changed, 15 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1719208787140826600.sql diff --git a/data/sql/updates/pending_db_world/rev_1719208787140826600.sql b/data/sql/updates/pending_db_world/rev_1719208787140826600.sql new file mode 100644 index 000000000..b647e2f1e --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1719208787140826600.sql @@ -0,0 +1,7 @@ +-- Flame Wave. +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (18975,19740)); +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 +(18975, 0, 0, 0, 0, 0, 75, 0, 5000, 10000, 15000, 20000, 0, 0, 11, 33804, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Wrathguard - In Combat - Cast \'Flame Wave\''), +(19740, 0, 0, 0, 0, 0, 75, 0, 5000, 10000, 15000, 20000, 0, 0, 11, 33804, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Wrathwalker - In Combat - Cast \'Flame Wave\''); + +UPDATE `creature_template` SET `faction` = 90 WHERE (`entry` = 19381); diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index 1da205ab9..35b3c450f 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4798,6 +4798,14 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_0].Amplitude = 9000; }); + // Flame Wave + ApplySpellFix({ 33800 }, [](SpellInfo* spellInfo) + { + spellInfo->Effects[EFFECT_1].Effect = SPELL_EFFECT_APPLY_AURA; + spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_PERIODIC_TRIGGER_SPELL; + spellInfo->Effects[EFFECT_1].Amplitude = 500; + }); + for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i]; From ee8c103d3d9b0473e8014f11bba910f2e8ee84ec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 2 Aug 2024 19:21:21 +0000 Subject: [PATCH 5/6] chore(DB): import pending files Referenced commit(s): c54fd66c7324b2fbef6cde1ddca2228ab5f9d233 --- .../rev_1719208787140826600.sql => db_world/2024_08_02_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1719208787140826600.sql => db_world/2024_08_02_00.sql} (95%) diff --git a/data/sql/updates/pending_db_world/rev_1719208787140826600.sql b/data/sql/updates/db_world/2024_08_02_00.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1719208787140826600.sql rename to data/sql/updates/db_world/2024_08_02_00.sql index b647e2f1e..778e7d92c 100644 --- a/data/sql/updates/pending_db_world/rev_1719208787140826600.sql +++ b/data/sql/updates/db_world/2024_08_02_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_08_01_00 -> 2024_08_02_00 -- Flame Wave. DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (18975,19740)); 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 From fcdc50306ff8734f6f56d22db54862c173879f10 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Sat, 3 Aug 2024 18:02:49 +0300 Subject: [PATCH 6/6] =?UTF-8?q?fix(Core/Spells):=20Chromatic=20Resistance?= =?UTF-8?q?=20Aura=20shouldn't=20give=20holy=20resis=E2=80=A6=20(#19549)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Core/Spells): Chromatic Resistance Aura shouldn't give holy resistance --- src/server/game/Spells/SpellInfoCorrections.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index 35b3c450f..de0e5c907 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4806,6 +4806,12 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_1].Amplitude = 500; }); + // Chromatic Resistance Aura + ApplySpellFix({ 41453 }, [](SpellInfo* spellInfo) + { + spellInfo->Effects[EFFECT_0].MiscValue = 124; + }); + for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i];