public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(scripts/Gruul): Boss script fine tuning (#4126)

Browse Source
This commit is contained in:
55Honey
2021-03-27 02:38:14 +01:00
committed by GitHub
parent 7067696f83
commit 3465904dc8
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
View File

@@ -113,7 +113,13 @@ public:
break; break;
case EVENT_HURTFUL_STRIKE: case EVENT_HURTFUL_STRIKE:
if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 5.0f)) if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 5.0f))
{
me->CastSpell(target, SPELL_HURTFUL_STRIKE, false); me->CastSpell(target, SPELL_HURTFUL_STRIKE, false);
}
else
{
me->CastSpell(me->GetVictim(), SPELL_HURTFUL_STRIKE, false);
}
events.ScheduleEvent(EVENT_HURTFUL_STRIKE, 15000); events.ScheduleEvent(EVENT_HURTFUL_STRIKE, 15000);
break; break;
case EVENT_GROUND_SLAM: case EVENT_GROUND_SLAM:
@@ -122,14 +128,19 @@ public:
events.DelayEvents(8001); events.DelayEvents(8001);
events.ScheduleEvent(EVENT_GROUND_SLAM, 60000); events.ScheduleEvent(EVENT_GROUND_SLAM, 60000);
events.ScheduleEvent(EVENT_SHATTER, 8000); events.ScheduleEvent(EVENT_SHATTER, 8000);
me->SetControlled(true, UNIT_STATE_ROOT);
break; break;
case EVENT_SHATTER: case EVENT_SHATTER:
Talk(SAY_SHATTER); Talk(SAY_SHATTER);
me->SetControlled(false, UNIT_STATE_ROOT);
me->CastSpell(me, SPELL_SHATTER, false); me->CastSpell(me, SPELL_SHATTER, false);
break; break;
} }
DoMeleeAttackIfReady(); if (!me->HasUnitState(UNIT_STATE_ROOT))
{
DoMeleeAttackIfReady();
}
} }
private: private:
@@ -178,7 +189,7 @@ public:
{ {
PrepareAuraScript(spell_gruul_ground_slam_trigger_AuraScript); PrepareAuraScript(spell_gruul_ground_slam_trigger_AuraScript);
void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{ {
if (GetUnitOwner()->GetAuraCount(GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell) == 5) if (GetUnitOwner()->GetAuraCount(GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell) == 5)
GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_STONED, true); GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_STONED, true);
@@ -186,7 +197,7 @@ public:
void Register() override void Register() override
{ {
AfterEffectRemove += AuraEffectRemoveFn(spell_gruul_ground_slam_trigger_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gruul_ground_slam_trigger_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
} }
}; };