Skip to content

Commit

Permalink
[SD] Magtheridon: SetInCombatWithZone when he is freed, Cleave Timer
Browse files Browse the repository at this point in the history
SMSG_AI_REACTION
SMSG_PLAY_SOUND 10253
SMSG_CHAT: "%s breaks free!"

Also correct this Cleave Timer to match CCSDB TBC data.

Closes #604
  • Loading branch information
AnonXS authored and killerwife committed Jan 10, 2024
1 parent 4f146c6 commit 1155b2b
Showing 1 changed file with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}
}

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 1155b2b

Please sign in to comment.