nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-27 07:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Scripts/Northrend): conversion to std::chrono (#15269)

Browse Source 
Co-authored-by: Maelthyrr <maelthyrr@users.noreply.github.com>
This commit is contained in:
Maelthyr
2023-03-07 13:23:33 +01:00
committed by GitHub
parent 527f462826
commit 0200a288cd
140 changed files with 3306 additions and 3371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
View File

@@ -87,12 +87,12 @@ public:
DoZoneInCombat();
Talk(SAY_AGGRO);
events.Reset();
events.RescheduleEvent(EVENT_SPELL_ARCANE_VACUUM, 30000);
events.RescheduleEvent(EVENT_SPELL_BLIZZARD, urand(5000, 10000));
events.RescheduleEvent(EVENT_SPELL_TAIL_SWEEP, urand(15000, 20000));
events.RescheduleEvent(EVENT_SPELL_UNCONTROLLABLE_ENERGY, urand(5000, 8000));
events.RescheduleEvent(EVENT_SPELL_ARCANE_VACUUM, 30s);
events.RescheduleEvent(EVENT_SPELL_BLIZZARD, 5s, 10s);
events.RescheduleEvent(EVENT_SPELL_TAIL_SWEEP, 15s, 20s);
events.RescheduleEvent(EVENT_SPELL_UNCONTROLLABLE_ENERGY, 5s, 8s);
if (IsHeroic())
events.RescheduleEvent(EVENT_SPELL_MANA_DESTRUCTION, 20000);
events.RescheduleEvent(EVENT_SPELL_MANA_DESTRUCTION, 20s);
}
void SpellHitTarget(Unit* target, SpellInfo const* spell) override
@@ -126,8 +126,8 @@ public:
DoResetThreatList();
me->SetControlled(true, UNIT_STATE_ROOT);
me->setAttackTimer(BASE_ATTACK, 3000);
events.RepeatEvent(30000);
events.ScheduleEvent(EVENT_UNROOT, 3000);
events.Repeat(30s);
events.ScheduleEvent(EVENT_UNROOT, 3s);
break;
case EVENT_UNROOT:
me->SetControlled(false, UNIT_STATE_ROOT);
@@ -136,20 +136,20 @@ public:
case EVENT_SPELL_BLIZZARD:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true))
me->CastSpell(target, SPELL_BLIZZARD, false);
events.RepeatEvent(15000);
events.Repeat(15s);
break;
case EVENT_SPELL_MANA_DESTRUCTION:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true))
me->CastSpell(target, SPELL_MANA_DESTRUCTION, false);
events.RepeatEvent(20000);
events.Repeat(20s);
break;
case EVENT_SPELL_TAIL_SWEEP:
me->CastSpell(me->GetVictim(), SPELL_TAIL_SWEEP, false);
events.RepeatEvent(urand(15000, 20000));
events.Repeat(15s, 20s);
break;
case EVENT_SPELL_UNCONTROLLABLE_ENERGY:
me->CastSpell(me->GetVictim(), SPELL_UNCONTROLLABLE_ENERGY, false);
events.RepeatEvent(urand(20000, 25000));
events.Repeat(20s, 25s);
break;
}

42
src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
View File

@@ -89,14 +89,14 @@ public:
Talk(SAY_AGGRO);
DoCast(me, SPELL_EARTH_SHIELD);
events.Reset();
events.RescheduleEvent(EVENT_SPELL_BLOODLUST, 15000);
events.RescheduleEvent(EVENT_SPELL_BREAK_BONDS, urand(9000, 14000));
events.RescheduleEvent(EVENT_SPELL_CHAIN_HEAL, 0);
events.RescheduleEvent(EVENT_SPELL_EARTH_SHIELD, 20000);
events.RescheduleEvent(EVENT_SPELL_EARTH_SHOCK, urand(2000, 8000));
events.RescheduleEvent(EVENT_SPELL_LIGHTNING_BOLT, urand(5000, 10000));
events.RescheduleEvent(EVENT_SPELL_BLOODLUST, 15s);
events.RescheduleEvent(EVENT_SPELL_BREAK_BONDS, 9s, 14s);
events.RescheduleEvent(EVENT_SPELL_CHAIN_HEAL, 0ms);
events.RescheduleEvent(EVENT_SPELL_EARTH_SHIELD, 20s);
events.RescheduleEvent(EVENT_SPELL_EARTH_SHOCK, 2s, 8s);
events.RescheduleEvent(EVENT_SPELL_LIGHTNING_BOLT, 5s, 10s);
if (IsHeroic())
events.RescheduleEvent(EVENT_SPELL_STORMSTRIKE, 3000);
events.RescheduleEvent(EVENT_SPELL_STORMSTRIKE, 3s);
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_EREKEM_GUARD_1_GUID)))
if (!c->IsInCombat())
@@ -122,11 +122,11 @@ public:
break;
case EVENT_SPELL_BLOODLUST:
me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, false);
events.RepeatEvent(urand(35000, 45000));
events.Repeat(35s, 45s);
break;
case EVENT_SPELL_BREAK_BONDS:
me->CastSpell((Unit*)nullptr, SPELL_BREAK_BONDS, false);
events.RepeatEvent(urand(16000, 22000));
events.Repeat(16s, 22s);
break;
case EVENT_SPELL_CHAIN_HEAL:
if (ObjectGuid TargetGUID = GetChainHealTargetGUID())
@@ -139,24 +139,24 @@ public:
Creature* pGuard2 = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_EREKEM_GUARD_2_GUID));
if ((pGuard1 && !pGuard1->IsAlive()) || (pGuard2 && !pGuard2->IsAlive()))
{
events.RepeatEvent(urand(3000, 6000));
events.Repeat(3s, 6s);
break;
}
}
events.RepeatEvent(urand(8000, 11000));
events.Repeat(8s, 11s);
break;
case EVENT_SPELL_EARTH_SHIELD:
me->CastSpell(me, SPELL_EARTH_SHIELD, false);
events.RepeatEvent(20000);
events.Repeat(20s);
break;
case EVENT_SPELL_EARTH_SHOCK:
me->CastSpell(me->GetVictim(), SPELL_EARTH_SHOCK, false);
events.RepeatEvent(urand(8000, 13000));
events.Repeat(8s, 13s);
break;
case EVENT_SPELL_LIGHTNING_BOLT:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true))
me->CastSpell(target, SPELL_LIGHTNING_BOLT, false);
events.RepeatEvent(urand(15000, 25000));
events.Repeat(15s, 25s);
break;
case EVENT_SPELL_STORMSTRIKE:
{
@@ -164,7 +164,7 @@ public:
Creature* pGuard2 = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_EREKEM_GUARD_2_GUID));
if (pGuard1 && !pGuard1->IsAlive() && pGuard2 && !pGuard2->IsAlive()) // both dead
me->CastSpell(me->GetVictim(), SPELL_STORMSTRIKE, false);
events.RepeatEvent(3000);
events.Repeat(3s);
}
break;
}
@@ -261,9 +261,9 @@ public:
{
DoZoneInCombat();
events.Reset();
events.RescheduleEvent(EVENT_SPELL_GUSHING_WOUND, urand(1000, 3000));
events.RescheduleEvent(EVENT_SPELL_HOWLING_SCREECH, urand(8000, 13000));
events.RescheduleEvent(EVENT_SPELL_STRIKE, urand(4000, 8000));
events.RescheduleEvent(EVENT_SPELL_GUSHING_WOUND, 1s, 3s);
events.RescheduleEvent(EVENT_SPELL_HOWLING_SCREECH, 8s, 13s);
events.RescheduleEvent(EVENT_SPELL_STRIKE, 4s, 8s);
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_EREKEM_GUID)))
if (!c->IsInCombat())
@@ -286,15 +286,15 @@ public:
break;
case EVENT_SPELL_GUSHING_WOUND:
me->CastSpell(me->GetVictim(), SPELL_GUSHING_WOUND, false);
events.RepeatEvent(urand(7000, 12000));
events.Repeat(7s, 12s);
break;
case EVENT_SPELL_HOWLING_SCREECH:
me->CastSpell(me->GetVictim(), SPELL_HOWLING_SCREECH, false);
events.RepeatEvent(urand(8000, 13000));
events.Repeat(8s, 13s);
break;
case EVENT_SPELL_STRIKE:
me->CastSpell(me->GetVictim(), SPELL_STRIKE, false);
events.RepeatEvent(urand(4000, 8000));
events.Repeat(4s, 8s);
break;
}

16
src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
View File

@@ -71,11 +71,11 @@ public:
{
DoZoneInCombat();
events.Reset();
events.RescheduleEvent(EVENT_SPELL_FIREBOLT, 1000);
events.RescheduleEvent(EVENT_SPELL_FLAME_BREATH, 5000);
events.RescheduleEvent(EVENT_SPELL_LAVA_BURN, 10000);
events.RescheduleEvent(EVENT_SPELL_FIREBOLT, 1s);
events.RescheduleEvent(EVENT_SPELL_FLAME_BREATH, 5s);
events.RescheduleEvent(EVENT_SPELL_LAVA_BURN, 10s);
if (IsHeroic())
events.RescheduleEvent(EVENT_SPELL_CAUTERIZING_FLAMES, 3000);
events.RescheduleEvent(EVENT_SPELL_CAUTERIZING_FLAMES, 3s);
}
void UpdateAI(uint32 diff) override
@@ -94,19 +94,19 @@ public:
break;
case EVENT_SPELL_FIREBOLT:
me->CastSpell(me->GetVictim(), SPELL_FIREBOLT, false);
events.RepeatEvent(urand(5000, 13000));
events.Repeat(5s, 13s);
break;
case EVENT_SPELL_FLAME_BREATH:
me->CastSpell(me->GetVictim(), SPELL_FLAME_BREATH, false);
events.RepeatEvent(urand(10000, 15000));
events.Repeat(10s, 15s);
break;
case EVENT_SPELL_LAVA_BURN:
me->CastSpell(me->GetVictim(), SPELL_LAVA_BURN, false);
events.RepeatEvent(urand(14000, 20000));
events.Repeat(14s, 20s);
break;
case EVENT_SPELL_CAUTERIZING_FLAMES:
me->CastSpell((Unit*)nullptr, SPELL_FLAME_BREATH, false);
events.RepeatEvent(urand(10000, 16000));
events.Repeat(10s, 16s);
break;
}

10
src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
View File

@@ -76,8 +76,8 @@ public:
me->CastSpell(me, SPELL_RAY_OF_SUFFERING, true);
me->CastSpell(me, SPELL_RAY_OF_PAIN, true);
events.Reset();
events.RescheduleEvent(EVENT_SPELL_CORROSIVE_SALIVA, urand(4000, 6000));
events.RescheduleEvent(EVENT_SPELL_OPTIC_LINK, urand(10000, 11000));
events.RescheduleEvent(EVENT_SPELL_CORROSIVE_SALIVA, 4s, 6s);
events.RescheduleEvent(EVENT_SPELL_OPTIC_LINK, 10s, 11s);
}
void UpdateAI(uint32 diff) override
@@ -96,16 +96,16 @@ public:
break;
case EVENT_SPELL_CORROSIVE_SALIVA:
me->CastSpell(me->GetVictim(), SPELL_CORROSIVE_SALIVA, false);
events.RepeatEvent(urand(8000, 10000));
events.Repeat(8s, 10s);
break;
case EVENT_SPELL_OPTIC_LINK:
if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 40.0f, true))
{
me->CastSpell(target, SPELL_OPTIC_LINK, false);
events.RepeatEvent(urand(18000, 21000));
events.Repeat(18s, 21s);
}
else
events.RepeatEvent(5000);
events.Repeat(5s);
break;
}

16
src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
View File

@@ -90,8 +90,8 @@ public:
Talk(SAY_AGGRO);
DoZoneInCombat();
events.Reset();
events.RescheduleEvent(EVENT_SPELL_ARCANE_BARRAGE_VOLLEY, urand(16000, 20000));
events.RescheduleEvent(EVENT_SUMMON_SPHERES, 10000);
events.RescheduleEvent(EVENT_SPELL_ARCANE_BARRAGE_VOLLEY, 16s, 20s);
events.RescheduleEvent(EVENT_SUMMON_SPHERES, 10s);
}
void UpdateAI(uint32 diff) override
@@ -110,7 +110,7 @@ public:
break;
case EVENT_SPELL_ARCANE_BARRAGE_VOLLEY:
me->CastSpell((Unit*)nullptr, SPELL_ARCANE_BARRAGE_VOLLEY, false);
events.RepeatEvent(20000);
events.Repeat(20s);
break;
case EVENT_SPELL_ARCANE_BUFFET:
me->CastSpell(me->GetVictim(), SPELL_ARCANE_BUFFET, false);
@@ -129,8 +129,8 @@ public:
me->CastSpell((Unit*)nullptr, entry2, true);
}
events.RepeatEvent(45000);
events.RescheduleEvent(EVENT_SPELL_ARCANE_BUFFET, 5000);
events.RescheduleEvent(EVENT_CHECK_DISTANCE, 6000);
events.RescheduleEvent(EVENT_SPELL_ARCANE_BUFFET, 5s);
events.RescheduleEvent(EVENT_CHECK_DISTANCE, 6s);
}
break;
case EVENT_CHECK_DISTANCE:
@@ -148,11 +148,11 @@ public:
if (found)
{
Talk(SAY_CHARGED);
events.RepeatEvent(9000);
events.RescheduleEvent(EVENT_SUMMON_SPHERES, 10000);
events.Repeat(9s);
events.RescheduleEvent(EVENT_SUMMON_SPHERES, 10s);
}
else
events.RepeatEvent(2000);
events.Repeat(2s);
}
break;
}

12
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
View File

@@ -86,9 +86,9 @@ public:
Talk(SAY_AGGRO);
DoZoneInCombat();
events.Reset();
events.RescheduleEvent(EVENT_SPELL_SHROUD_OF_DARKNESS, urand(5000, 7000));
events.RescheduleEvent(EVENT_SPELL_VOID_SHIFT, urand(23000, 25000));
events.RescheduleEvent(EVENT_SPELL_SUMMON_VOID_SENTRY, 10000);
events.RescheduleEvent(EVENT_SPELL_SHROUD_OF_DARKNESS, 5s, 7s);
events.RescheduleEvent(EVENT_SPELL_VOID_SHIFT, 23s, 25s);
events.RescheduleEvent(EVENT_SPELL_SUMMON_VOID_SENTRY, 10s);
if (pInstance)
pInstance->SetData(DATA_ACHIEV, 1);
}
@@ -110,7 +110,7 @@ public:
case EVENT_SPELL_SHROUD_OF_DARKNESS:
me->CastSpell(me, SPELL_SHROUD_OF_DARKNESS, false);
Talk(SAY_SHIELD);
events.RepeatEvent(20000);
events.Repeat(20s);
break;
case EVENT_SPELL_VOID_SHIFT:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true))
@@ -118,11 +118,11 @@ public:
me->CastSpell(target, SPELL_VOID_SHIFT, false);
me->Whisper("Gaze... into the void.", LANG_UNIVERSAL, target->ToPlayer());
}
events.RepeatEvent(urand(18000, 22000));
events.Repeat(18s, 22s);
break;
case EVENT_SPELL_SUMMON_VOID_SENTRY:
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_VOID_SENTRY, false);
events.RepeatEvent(12000);
events.Repeat(12s);
break;
}

27
src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
View File

@@ -20,9 +20,6 @@
#include "ScriptedCreature.h"
#include "violet_hold.h"
#define CLEANUP_CHECK_INTERVAL 5000
#define SPAWN_TIME 20000
enum vYells
{
CYANIGOSA_SAY_SPAWN = 3,
@@ -218,11 +215,11 @@ public:
EncounterStatus = IN_PROGRESS;
if (Creature* c = instance->GetCreature(NPC_SinclariGUID))
c->AI()->Talk(SAY_SINCLARI_1);
events.RescheduleEvent(EVENT_GUARDS_FALL_BACK, 4000);
events.RescheduleEvent(EVENT_GUARDS_FALL_BACK, 4s);
}
break;
case DATA_PORTAL_DEFEATED:
events.RescheduleEvent(EVENT_SUMMON_PORTAL, 3000);
events.RescheduleEvent(EVENT_SUMMON_PORTAL, 3s);
break;
case DATA_PORTAL_LOCATION:
PortalLocation = data;
@@ -258,7 +255,7 @@ public:
}
SaveToDB();
if (WaveCount < 18)
events.RescheduleEvent(EVENT_SUMMON_PORTAL, 35000);
events.RescheduleEvent(EVENT_SUMMON_PORTAL, 35s);
break;
case DATA_FAILED:
CLEANED = false;
@@ -406,7 +403,7 @@ public:
{
if( DoNeedCleanup(false) )
InstanceCleanup();
events.RepeatEvent(CLEANUP_CHECK_INTERVAL);
events.Repeat(5s);
}
break;
case EVENT_GUARDS_FALL_BACK:
@@ -419,7 +416,7 @@ public:
c->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
c->GetMotionMaster()->MovePoint(0, guardMovePosition);
}
events.RescheduleEvent(EVENT_GUARDS_DISAPPEAR, 5000);
events.RescheduleEvent(EVENT_GUARDS_DISAPPEAR, 5s);
}
break;
case EVENT_GUARDS_DISAPPEAR:
@@ -427,7 +424,7 @@ public:
for (uint8 i = 0; i < 4; ++i)
if (Creature* c = instance->GetCreature(NPC_GuardGUID[i]))
c->SetVisible(false);
events.RescheduleEvent(EVENT_SINCLARI_FALL_BACK, 2000);
events.RescheduleEvent(EVENT_SINCLARI_FALL_BACK, 2s);
}
break;
case EVENT_SINCLARI_FALL_BACK:
@@ -438,7 +435,7 @@ public:
c->GetMotionMaster()->MovePoint(0, sinclariOutsidePosition);
}
SetData(DATA_ACTIVATE_DEFENSE_SYSTEM, 0);
events.RescheduleEvent(EVENT_START_ENCOUNTER, 4000);
events.RescheduleEvent(EVENT_START_ENCOUNTER, 4s);
}
break;
case EVENT_START_ENCOUNTER:
@@ -457,7 +454,7 @@ public:
HandleGameObject(ObjectGuid::Empty, false, go); // not used yet
go->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE); // make it useable
}
events.RescheduleEvent(EVENT_SUMMON_PORTAL, 4000);
events.RescheduleEvent(EVENT_SUMMON_PORTAL, 4s);
}
break;
case EVENT_SUMMON_PORTAL:
@@ -487,7 +484,7 @@ public:
cyanigosa->AI()->Talk(CYANIGOSA_SAY_SPAWN);
cyanigosa->GetMotionMaster()->MoveJump(MiddleRoomLocation.GetPositionX(), MiddleRoomLocation.GetPositionY(), MiddleRoomLocation.GetPositionZ(), 10.0f, 20.0f);
}
events.RescheduleEvent(EVENT_CYANIGOSSA_TRANSFORM, 10000);
events.RescheduleEvent(EVENT_CYANIGOSSA_TRANSFORM, 10s);
}
}
break;
@@ -496,7 +493,7 @@ public:
{
c->RemoveAurasDueToSpell(SPELL_CYANIGOSA_BLUE_AURA);
c->CastSpell(c, SPELL_CYANIGOSA_TRANSFORM, 0);
events.RescheduleEvent(EVENT_CYANIGOSA_ATTACK, 2500);
events.RescheduleEvent(EVENT_CYANIGOSA_ATTACK, 2500ms);
}
break;
case EVENT_CYANIGOSA_ATTACK:
@@ -523,7 +520,7 @@ public:
else
plr->SendUpdateWorldState(WORLD_STATE_VH_SHOW, 0);
events.RescheduleEvent(EVENT_CHECK_PLAYERS, CLEANUP_CHECK_INTERVAL);
events.RescheduleEvent(EVENT_CHECK_PLAYERS, 5s);
}
bool DoNeedCleanup(bool enter)
@@ -622,7 +619,7 @@ public:
if (m_auiEncounter[MAX_ENCOUNTER - 1] == DONE)
EncounterStatus = DONE;
events.Reset();
events.RescheduleEvent(EVENT_CHECK_PLAYERS, CLEANUP_CHECK_INTERVAL);
events.RescheduleEvent(EVENT_CHECK_PLAYERS, 5s);
}
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override

8
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
View File

@@ -138,9 +138,9 @@ public:
addValue = 1;
if (wave % 6 != 0)
events.RescheduleEvent(RAND(EVENT_SUMMON_KEEPER_OR_GUARDIAN, EVENT_SUMMON_ELITES), 10000);
events.RescheduleEvent(RAND(EVENT_SUMMON_KEEPER_OR_GUARDIAN, EVENT_SUMMON_ELITES), 10s);
else
events.RescheduleEvent(EVENT_SUMMON_SABOTEOUR, 3000);
events.RescheduleEvent(EVENT_SUMMON_SABOTEOUR, 3s);
}
}
@@ -168,7 +168,7 @@ public:
spawned = true;
if (Creature* c = DoSummon(RAND(NPC_PORTAL_GUARDIAN, NPC_PORTAL_KEEPER), me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN))
me->CastSpell(c, SPELL_PORTAL_CHANNEL, false);
events.RescheduleEvent(EVENT_SUMMON_KEEPER_TRASH, 20000);
events.RescheduleEvent(EVENT_SUMMON_KEEPER_TRASH, 20s);
break;
case EVENT_SUMMON_KEEPER_TRASH:
for (uint8 i = 0; i < 3 + addValue; ++i)
@@ -176,7 +176,7 @@ public:
uint32 entry = RAND(NPC_AZURE_INVADER_1, NPC_AZURE_INVADER_2, NPC_AZURE_SPELLBREAKER_1, NPC_AZURE_SPELLBREAKER_2, NPC_AZURE_MAGE_SLAYER_1, NPC_AZURE_MAGE_SLAYER_2, NPC_AZURE_BINDER_1, NPC_AZURE_BINDER_2);
DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN);
}
events.RepeatEvent(20000);
events.Repeat(20s);
break;
case EVENT_SUMMON_ELITES:
spawned = true;