From dcf85d4f2d6ac973525d89c37e326b7bbade4291 Mon Sep 17 00:00:00 2001 From: killerwife Date: Fri, 5 Jul 2024 09:09:50 +0200 Subject: [PATCH] ZG: Revert renataki commit and fix it based on data --- .../scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp index 9fd30b00b8..762a907113 100644 --- a/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp +++ b/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp @@ -28,7 +28,7 @@ EndScriptData enum { - SPELL_THOUSAND_BLADES = 24767, + SPELL_THOUSAND_BLADES = 24649, SPELL_VANISH = 24699, SPELL_GOUGE = 24698, SPELL_TRASH = 3391, @@ -90,10 +90,14 @@ struct boss_renatakiAI : public CombatAI } }; +// 24649 - Thousand Blades struct ThousandBladesRenataki : public SpellScript { void OnEffectExecute(Spell* spell, SpellEffectIndex effIdx) const override { + if (spell->m_IsTriggeredSpell) // only initial normal cast + return; + if (effIdx != EFFECT_INDEX_1) return; @@ -105,7 +109,7 @@ struct ThousandBladesRenataki : public SpellScript std::shuffle(selectedTargets.begin(), selectedTargets.end(), *GetRandomGenerator()); selectedTargets.resize(9); for (Unit* target : selectedTargets) - caster->CastSpell(target, SPELL_THOUSAND_BLADES, TRIGGERED_OLD_TRIGGERED); + caster->CastSpell(target, SPELL_THOUSAND_BLADES, TRIGGERED_OLD_TRIGGERED | TRIGGERED_INSTANT_CAST); } };