Skip to content

Commit

Permalink
Fix Hallows event #5
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnclaras
mnclaras committed Oct 14, 2020
1 parent 35b3401 commit e36a917
Showing 1 changed file with 18 additions and 13 deletions.
31 changes: 18 additions & 13 deletions src/server/scripts/Custom/HolidayEvents/custom_hallows_end_event.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,15 @@ class custom_hallows_end_event_boss_two : public CreatureScript
switch (summon->GetEntry())
{
case NPC_BOSS_TWO_ADD:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true))
summon->AI()->AttackStart(target);
break;
default:
break;
}
}

void SummonedCreatureDies(Creature* summon, Unit*)
void SummonedCreatureDies(Creature* summon, Unit*) override
{
switch (summon->GetEntry())
{
Expand Down Expand Up @@ -357,7 +357,9 @@ class custom_hallows_end_event_boss_two : public CreatureScript
case EVENT_SUMMONS:
me->MonsterYell("Venid esbirros...", LANG_UNIVERSAL, 0);
me->SummonCreature(NPC_BOSS_TWO_ADD, me->GetPositionX() + 5, me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 600000);
_events.ScheduleEvent(EVENT_SUMMONS, 30000);
me->SummonCreature(NPC_BOSS_TWO_ADD, me->GetPositionX() + 5, me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 600000);
me->SummonCreature(NPC_BOSS_TWO_ADD, me->GetPositionX() + 5, me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 600000);
_events.ScheduleEvent(EVENT_SUMMONS, 30000, PHASE_TWO);
break;
case EVENT_UNROOT:
me->SetControlled(false, UNIT_STATE_ROOT);
Expand All @@ -378,14 +380,14 @@ class custom_hallows_end_event_boss_two : public CreatureScript
}
}
_events.DelayEvents(1);
_events.ScheduleEvent(EVENT_SLIME_SPRAY, 25000);
_events.ScheduleEvent(EVENT_SLIME_SPRAY, 25000, PHASE_ONE);
_events.ScheduleEvent(EVENT_UNROOT, 0);
}
break;
case EVENT_SPELL_SLIME_POOL:
if (Creature* c = me->SummonCreature(NPC_SLIME_POOL, *me, TEMPSUMMON_TIMED_DESPAWN, 30000))
c->CastSpell(c, SPELL_SLIME_POOL_EFFECT, true);
_events.ScheduleEvent(EVENT_SPELL_SLIME_POOL, 10000);
_events.ScheduleEvent(EVENT_SPELL_SLIME_POOL, 10000, PHASE_ONE);
break;
case EVENT_MORTAL_WOUND:
me->CastSpell(me->GetVictim(), SPELL_MORTAL_WOUND, false);
Expand Down Expand Up @@ -416,37 +418,40 @@ class custom_hallows_end_event_boss_two : public CreatureScript
me->CastSpell(target, SPELL_DOMINATE_MIND_25, true);
}

_events.ScheduleEvent(EVENT_SPELL_DOMINATE_MIND_25, 35000);
_events.ScheduleEvent(EVENT_SPELL_DOMINATE_MIND_25, 35000, PHASE_TWO);
}
break;

case EVENT_SPELL_LEGION_FLAME:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
me->MonsterYell("Corre insentato!", LANG_UNIVERSAL, 0);
me->CastSpell(target, SPELL_LEGION_FLAME, false);
}
_events.ScheduleEvent(EVENT_SPELL_LEGION_FLAME, 15000);
_events.ScheduleEvent(EVENT_SPELL_LEGION_FLAME, 15000, PHASE_THREE);
break;
case EVENT_SPELL_INCINERATE_FLESH:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
me->CastSpell(target, SPELL_INCINERATE_FLESH, false);
}
_events.ScheduleEvent(EVENT_SPELL_LEGION_FLAME, urand(10000, 13000));
_events.ScheduleEvent(EVENT_SPELL_INCINERATE_FLESH, urand(10000, 13000), PHASE_THREE);
break;

case EVENT_SPELL_RADIANCE:
me->CastSpell((Unit*)NULL, SPELL_RADIANCE, false);
me->MonsterTextEmote(TEXT_RADIATE, 0, true);
_events.ScheduleEvent(EVENT_SPELL_RADIANCE, 6000);
_events.ScheduleEvent(EVENT_SPELL_RADIANCE, 6000, PHASE_FOUR);
break;
case EVENT_DECIMATE:
me->CastSpell(me->GetVictim(), SPELL_DECIMATE, false);
_events.ScheduleEvent(EVENT_DECIMATE, 10000);
_events.ScheduleEvent(EVENT_DECIMATE, 10000, PHASE_FOUR);
break;

case EVENT_BLISTERING_COLD:
me->MonsterYell("Huid de mi...", LANG_UNIVERSAL, 0);
me->CastSpell(me, SPELL_BLISTERING_COLD, false);
break;
break;
case EVENT_ICY_GRIP:
me->CastSpell((Unit*)NULL, SPELL_ICY_GRIP, false);
_events.ScheduleEvent(EVENT_BLISTERING_COLD, 1500);
Expand Down Expand Up @@ -525,7 +530,7 @@ class custom_hallows_end_event_boss_two_add : public CreatureScript
void EnterCombat(Unit* /*who*/) override
{
_events.SetPhase(PHASE_ONE);
_events.ScheduleEvent(EVENT_BONE_SLICE, 7000);
//_events.ScheduleEvent(EVENT_BONE_SLICE, 7000);
}

void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
Expand Down Expand Up @@ -557,7 +562,7 @@ class custom_hallows_end_event_boss_two_add : public CreatureScript
_events.ScheduleEvent(EVENT_BEBENDE_ERDE, 10000);
break;
case EVENT_BOMB_SUICIDE:
DoCastSelf(SPELL_BOMB_SUICIDE, false);
DoCast(me, SPELL_BOMB_SUICIDE);
break;

default:
Expand Down

0 comments on commit e36a917

Please sign in to comment.