refactor(Scripts): Update vanilla scripts to std::chrono (#14876)

Co-authored-by: Maelthyrr <AmanThul-Project@proton.me>
Co-authored-by: Skjalf <47818697+Nyeriah@users.noreply.github.com>
This commit is contained in:
Maelthyr
2023-02-05 16:35:48 +01:00
committed by GitHub
parent b80470545d
commit afb071bb04
69 changed files with 822 additions and 831 deletions

View File

@@ -328,7 +328,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
summons.DespawnAll();
events.Reset();
events.ScheduleEvent(EVENT_CHECK_HOUR, 2000);
events.ScheduleEvent(EVENT_CHECK_HOUR, 2s);
kegCounter = 0;
guzzlerCounter = 0;
thrown = 0;
@@ -396,13 +396,13 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
case EVENT_PRE_FINISH_ATTACK:
{
events.CancelEvent(EVENT_SPAWN_MOLE_MACHINE);
events.ScheduleEvent(EVENT_FINISH_ATTACK, 20000);
events.ScheduleEvent(EVENT_FINISH_ATTACK, 20s);
break;
}
case EVENT_FINISH_ATTACK:
{
FinishAttackDueToWin();
events.RescheduleEvent(EVENT_CHECK_HOUR, 60000);
events.RescheduleEvent(EVENT_CHECK_HOUR, 1min);
break;
}
case EVENT_BARTENDER_SAY:
@@ -443,7 +443,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
}
Reset();
events.RescheduleEvent(EVENT_CHECK_HOUR, 60000);
events.RescheduleEvent(EVENT_CHECK_HOUR, 1min);
}
void FinishAttackDueToWin()
@@ -521,9 +521,9 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
guzzlerCounter = 0;
thrown = 0;
events.ScheduleEvent(EVENT_SPAWN_MOLE_MACHINE, 1500);
events.ScheduleEvent(EVENT_PRE_FINISH_ATTACK, 280000);
events.ScheduleEvent(EVENT_BARTENDER_SAY, 5000);
events.ScheduleEvent(EVENT_SPAWN_MOLE_MACHINE, 1500ms);
events.ScheduleEvent(EVENT_PRE_FINISH_ATTACK, 280s);
events.ScheduleEvent(EVENT_BARTENDER_SAY, 5s);
}
bool AllowStart()
@@ -1588,7 +1588,7 @@ struct npc_coren_direbrew : public ScriptedAI
}
_events.SetPhase(PHASE_INTRO);
_events.ScheduleEvent(EVENT_INTRO_1, 6 * IN_MILLISECONDS, 0, PHASE_INTRO);
_events.ScheduleEvent(EVENT_INTRO_1, 6s, 0, PHASE_INTRO);
Talk(SAY_INTRO);
}
@@ -1609,8 +1609,8 @@ struct npc_coren_direbrew : public ScriptedAI
EntryCheckPredicate pred(NPC_ANTAGONIST);
_summons.DoAction(ACTION_ANTAGONIST_HOSTILE, pred);
_events.ScheduleEvent(EVENT_SUMMON_MOLE_MACHINE, 15 * IN_MILLISECONDS);
_events.ScheduleEvent(EVENT_DIREBREW_DISARM, 20 * IN_MILLISECONDS);
_events.ScheduleEvent(EVENT_SUMMON_MOLE_MACHINE, 15s);
_events.ScheduleEvent(EVENT_DIREBREW_DISARM, 20s);
}
}
@@ -1632,11 +1632,11 @@ struct npc_coren_direbrew : public ScriptedAI
{
if (summon->GetEntry() == NPC_ILSA_DIREBREW)
{
_events.ScheduleEvent(EVENT_RESPAWN_ILSA, 1 * IN_MILLISECONDS);
_events.ScheduleEvent(EVENT_RESPAWN_ILSA, 1s);
}
else if (summon->GetEntry() == NPC_URSULA_DIREBREW)
{
_events.ScheduleEvent(EVENT_RESPAWN_URSULA, 1 * IN_MILLISECONDS);
_events.ScheduleEvent(EVENT_RESPAWN_URSULA, 1s);
}
}
@@ -1686,13 +1686,13 @@ struct npc_coren_direbrew : public ScriptedAI
{
case EVENT_INTRO_1:
Talk(SAY_INTRO1);
_events.ScheduleEvent(EVENT_INTRO_2, 4 * IN_MILLISECONDS, 0, PHASE_INTRO);
_events.ScheduleEvent(EVENT_INTRO_2, 4s, 0, PHASE_INTRO);
break;
case EVENT_INTRO_2:
{
EntryCheckPredicate pred(NPC_ANTAGONIST);
_summons.DoAction(ACTION_ANTAGONIST_SAY_1, pred);
_events.ScheduleEvent(EVENT_INTRO_3, 3 * IN_MILLISECONDS, 0, PHASE_INTRO);
_events.ScheduleEvent(EVENT_INTRO_3, 3s, 0, PHASE_INTRO);
break;
}
case EVENT_INTRO_3:

View File

@@ -679,10 +679,10 @@ struct npc_hallows_end_soh : public ScriptedAI
unitList.push_back((*itr)->GetGUID());
}
events.ScheduleEvent(1, 3000);
events.ScheduleEvent(2, 25000);
events.ScheduleEvent(2, 43000);
events.ScheduleEvent(3, 63000);
events.ScheduleEvent(1, 3s);
events.ScheduleEvent(2, 25s);
events.ScheduleEvent(2, 43s);
events.ScheduleEvent(3, 63s);
me->SetReactState(REACT_PASSIVE);
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
@@ -1034,7 +1034,7 @@ struct boss_headless_horseman : public ScriptedAI
if (spellInfo->Id == SPELL_SUMMONING_RHYME_TARGET)
{
playerGUID = target->GetGUID();
events.ScheduleEvent(EVENT_HH_PLAYER_TALK, 2000);
events.ScheduleEvent(EVENT_HH_PLAYER_TALK, 2s);
}
}
@@ -1055,9 +1055,9 @@ struct boss_headless_horseman : public ScriptedAI
me->Yell("Here's my body, fit and pure! Now, your blackened souls I'll cure!", LANG_UNIVERSAL);
if (phase == 1)
events.ScheduleEvent(EVENT_HORSEMAN_CONFLAGRATION, 6000);
events.ScheduleEvent(EVENT_HORSEMAN_CONFLAGRATION, 6s);
else if (phase == 2)
events.ScheduleEvent(EVENT_SUMMON_PUMPKIN, 6000);
events.ScheduleEvent(EVENT_SUMMON_PUMPKIN, 6s);
}
}
@@ -1074,8 +1074,8 @@ struct boss_headless_horseman : public ScriptedAI
me->SetInCombatWithZone();
inFight = true;
events.ScheduleEvent(EVENT_HORSEMAN_FOLLOW, 500);
events.ScheduleEvent(EVENT_HORSEMAN_CLEAVE, 7000);
events.ScheduleEvent(EVENT_HORSEMAN_FOLLOW, 500ms);
events.ScheduleEvent(EVENT_HORSEMAN_CLEAVE, 7s);
}
}
}
@@ -1109,8 +1109,8 @@ struct boss_headless_horseman : public ScriptedAI
if (phase < 2)
phase++;
events.ScheduleEvent(EVENT_HORSEMAN_WHIRLWIND, 6000);
events.ScheduleEvent(EVENT_HORSEMAN_CHECK_HEALTH, 1000);
events.ScheduleEvent(EVENT_HORSEMAN_WHIRLWIND, 6s);
events.ScheduleEvent(EVENT_HORSEMAN_CHECK_HEALTH, 1s);
}
}
}