ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(Scripts/World): Clean up script files (#17728)

Browse source 
* refactor(Scripts/World): Clean up script files

* Update boss_azuregos.cpp
This commit is contained in:
Andrew 2023-11-16 14:00:42 -03:00 • committed by GitHub
parent 0d8b1d4942
commit a5b5278929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/server/scripts/Kalimdor/boss_azuregos.cpp
View file

@ -54,15 +54,15 @@ public:
{
boss_azuregosAI(Creature* creature) : ScriptedAI(creature)
{
_scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override
{
_scheduler.CancelAll();
scheduler.CancelAll();
me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP);
me->RestoreFaction();
me->GetMap()->DoForAllPlayers([&](Player* p)
@ -89,7 +89,7 @@ public:
DoCastSelf(SPELL_MARK_OF_FROST_AURA);
Talk(SAY_AGGRO);
_scheduler
scheduler
.Schedule(7s, [this](TaskContext context)
{
DoCastVictim(SPELL_CLEAVE);
@ -149,14 +149,11 @@ public:
return;
}
_scheduler.Update(diff, [this]
{
DoMeleeAttackIfReady();
});
scheduler.Update(diff, [this]
{
DoMeleeAttackIfReady();
});
}
protected:
TaskScheduler _scheduler;
};
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) override

7
src/server/scripts/Outland/boss_doomlord_kazzak.cpp
View file

@ -56,7 +56,7 @@ public:
void Reset() override
{
_scheduler.CancelAll();
scheduler.CancelAll();
_inBerserk = false;
}
@ -68,7 +68,7 @@ public:
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
_scheduler.Schedule(6s, 10s, [this](TaskContext context)
scheduler.Schedule(6s, 10s, [this](TaskContext context)
{
DoCastVictim(SPELL_SHADOW_VOLLEY);
context.Repeat(4s, 6s);
@ -132,7 +132,7 @@ public:
if (!UpdateVictim())
return;
_scheduler.Update(diff);
scheduler.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
@ -140,7 +140,6 @@ public:
}
private:
TaskScheduler _scheduler;
bool _inBerserk;
};

7
src/server/scripts/Outland/boss_doomwalker.cpp
View file

@ -50,7 +50,7 @@ public:
void Reset() override
{
_inEnrage = false;
_scheduler.CancelAll();
scheduler.CancelAll();
}
void KilledUnit(Unit* victim) override
@ -73,7 +73,7 @@ public:
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
_scheduler.Schedule(1ms, [this](TaskContext context)
scheduler.Schedule(1ms, [this](TaskContext context)
{
if (!HealthAbovePct(20))
{
@ -129,7 +129,7 @@ public:
if (!UpdateVictim())
return;
_scheduler.Update(diff);
scheduler.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
@ -137,7 +137,6 @@ public:
}
private:
TaskScheduler _scheduler;
bool _inEnrage;
};

7
src/server/scripts/World/boss_emerald_dragons.cpp
View file

@ -193,9 +193,9 @@ public:
void ScheduleEvents()
{
_scheduler.CancelAll();
scheduler.CancelAll();
_scheduler.Schedule(1s, [this](TaskContext context)
scheduler.Schedule(1s, [this](TaskContext context)
{
// Chase target, but don't attack - otherwise just roam around
if (Unit* chaseTarget = GetRandomUnitFromDragonThreatList())
@ -251,13 +251,12 @@ public:
if (!UpdateVictim())
return;
_scheduler.Update(diff);
scheduler.Update(diff);
}
private:
ObjectGuid _targetGUID;
ObjectGuid _dragonGUID;
TaskScheduler _scheduler;
};
CreatureAI* GetAI(Creature* creature) const override