Fixed build

This commit is contained in:
Ovahlord committed 2020-07-22 15:21:50 +02:00
1 parent 2cc36c5eec
commit 280b8dc799
8 files changed
+19 -17

No files matched your search

@@ -131,10 +131,10 @@ class boss_selin_fireheart : public CreatureScript
crystal->KillSelf();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
_EnterCombat();
_JustEngagedWith();
events.SetPhase(PHASE_NORMAL);
events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL);
@@ -267,7 +267,7 @@ class npc_fel_crystal : public CreatureScript
{
if (InstanceScript* instance = me->GetInstanceScript())
{
Creature* Selin = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SELIN));
Creature* Selin = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SELIN_FIREHEART));
if (Selin && Selin->IsAlive())
Selin->AI()->DoAction(ACTION_SWITCH_PHASE);
}
@@ -208,13 +208,13 @@ struct boss_kalecgos : public BossAI
damage = 0;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
Talk(SAY_EVIL_AGGRO);
_EnterCombat();
_JustEngagedWith();
if (Creature* kalecgosHuman = me->SummonCreature(NPC_KALECGOS_HUMAN, KalecgosSummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000))
if (Creature* kalecgosHuman = me->SummonCreature(NPC_KALEC, KalecgosSummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000))
if (Creature* sathrovar = instance->GetCreature(DATA_SATHROVARR))
{
sathrovar->SetInCombatWith(kalecgosHuman);
@@ -461,9 +461,9 @@ struct boss_sathrovarr : public BossAI
events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1));
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
Talk(SAY_SATH_AGGRO);
}
@@ -748,7 +748,7 @@ class spell_kalecgos_curse_of_boundless_agony : public AuraScript
if (instance->GetBossState(DATA_KALECGOS) == IN_PROGRESS)
return;
Remove(AURA_REMOVE_BY_CANCEL);
Remove(AuraRemoveFlags::ByCancel);
}
void OnPeriodic(AuraEffect const* aurEff)
@@ -769,7 +769,7 @@ class spell_kalecgos_curse_of_boundless_agony : public AuraScript
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_CANCEL)
if (!GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::ByCancel))
GetTarget()->CastSpell(GetTarget(), SPELL_AGONY_CURSE_ALLY, true);
}
@@ -17,6 +17,7 @@
#include "ScriptMgr.h"
#include "AreaBoundary.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Log.h"
#include "Map.h"
@@ -80,9 +80,9 @@ struct boss_blackheart_the_inciter : public BossAI
_Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000);
events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5000);
events.ScheduleEvent(EVENT_WAR_STOMP, 15000);
@@ -16,6 +16,7 @@
*/
#include "ScriptMgr.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Map.h"
#include "ScriptedCreature.h"