From 1155b2b683e17b4daf862676170f323caf1abd23 Mon Sep 17 00:00:00 2001 From: AnonXS Date: Sun, 16 Apr 2023 00:35:03 +0200 Subject: [PATCH] [SD] Magtheridon: SetInCombatWithZone when he is freed, Cleave Timer SMSG_AI_REACTION SMSG_PLAY_SOUND 10253 SMSG_CHAT: "%s breaks free!" Also correct this Cleave Timer to match CCSDB TBC data. Closes https://github.com/cmangos/mangos-tbc/pull/604 --- .../magtheridons_lair/boss_magtheridon.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index 04556ffb1b..8d1c344e61 100644 --- a/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -150,6 +150,7 @@ struct boss_magtheridonAI : public CombatAI { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PLAYER); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE); + m_creature->SetInCombatWithZone(); DoScriptText(EMOTE_FREED, m_creature); DoScriptText(SAY_AGGRO, m_creature); @@ -166,13 +167,11 @@ struct boss_magtheridonAI : public CombatAI ResetCombatAction(MAGTHERIDON_BLAZE, urand(10000, 15000)); ResetCombatAction(MAGTHERIDON_QUAKE, 40000); ResetCombatAction(MAGTHERIDON_BLAST_NOVA, 55000); - ResetCombatAction(MAGTHERIDON_CLEAVE, 15000); + ResetCombatAction(MAGTHERIDON_CLEAVE, urand(8000, 12000)); } else if (eventType == AI_EVENT_CUSTOM_B) { - m_creature->SetInCombatWithZone(); DoScriptText(EMOTE_EVENT_BEGIN, m_creature); - SetCombatScriptStatus(true); } } @@ -297,7 +296,7 @@ struct boss_magtheridonAI : public CombatAI case MAGTHERIDON_CLEAVE: { if (DoCastSpellIfCan(m_creature->GetVictim(), SPELL_CLEAVE) == CAST_OK) - ResetCombatAction(action, 10000); + ResetCombatAction(action, urand(8000, 16000)); break; } case MAGTHERIDON_BLAZE: