refactor(Core/EventMap): Refactor EventMap and related scripts (#23121)

Co-authored-by: Kelno <3866946+kelno@users.noreply.github.com>
Co-authored-by: Peter Keresztes Schmidt <carbenium@outlook.com>
This commit is contained in:
天鹭
2025-10-13 09:19:24 +08:00
committed by GitHub
parent 8e1426c06a
commit 9c49349e1e
168 changed files with 1468 additions and 1593 deletions

View File

@@ -367,10 +367,10 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
if (AllowStart())
{
PrepareEvent();
events.RepeatEvent(300000);
events.Repeat(300s);
return;
}
events.RepeatEvent(2000);
events.Repeat(2s);
break;
}
case EVENT_SPAWN_MOLE_MACHINE:
@@ -393,7 +393,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
if (Creature* cr = me->SummonCreature(NPC_MOLE_MACHINE_TRIGGER, x, y, 398.11f, 0.0f))
cr->CastSpell(cr, SPELL_SPAWN_MOLE_MACHINE, true);
}
events.RepeatEvent(3000);
events.Repeat(3s);
break;
}
case EVENT_PRE_FINISH_ATTACK:
@@ -410,7 +410,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI
}
case EVENT_BARTENDER_SAY:
{
events.RepeatEvent(12000);
events.Repeat(12s);
Creature* sayer = GetRandomBartender();
if (!sayer)
return;
@@ -1714,12 +1714,12 @@ struct npc_coren_direbrew : public ScriptedAI
case EVENT_SUMMON_MOLE_MACHINE:
{
me->CastCustomSpell(SPELL_MOLE_MACHINE_TARGET_PICKER, SPELLVALUE_MAX_TARGETS, 1, nullptr, true);
_events.RepeatEvent(15 * IN_MILLISECONDS);
_events.Repeat(15s);
break;
}
case EVENT_DIREBREW_DISARM:
DoCastSelf(SPELL_DIREBREW_DISARM_PRE_CAST, true);
_events.RepeatEvent(20 * IN_MILLISECONDS);
_events.Repeat(20s);
break;
default:
break;

View File

@@ -763,7 +763,7 @@ struct npc_hallows_end_soh : public ScriptedAI
}
CastFires(false);
events.RepeatEvent(15000);
events.Repeat(15s);
break;
}
case 4:
@@ -868,7 +868,7 @@ struct npc_hallows_end_soh : public ScriptedAI
me->RemoveAllAuras();
me->SetCanFly(false);
me->SetDisableGravity(false);
events.ScheduleEvent(4, 2000);
events.ScheduleEvent(4, 2s);
}
}
@@ -1202,7 +1202,7 @@ struct boss_headless_horseman : public ScriptedAI
talkCount = 0;
return; // pop and return, skip repeat
}
events.RepeatEvent(2000);
events.Repeat(2s);
break;
}
case EVENT_HORSEMAN_FOLLOW:
@@ -1218,7 +1218,7 @@ struct boss_headless_horseman : public ScriptedAI
case EVENT_HORSEMAN_CLEAVE:
{
me->CastSpell(me->GetVictim(), SPELL_HORSEMAN_CLEAVE, false);
events.RepeatEvent(8000);
events.Repeat(8s);
break;
}
case EVENT_HORSEMAN_WHIRLWIND:
@@ -1226,11 +1226,11 @@ struct boss_headless_horseman : public ScriptedAI
if (me->HasAuraEffect(SPELL_HORSEMAN_WHIRLWIND, EFFECT_0))
{
me->RemoveAura(SPELL_HORSEMAN_WHIRLWIND);
events.RepeatEvent(15000);
events.Repeat(15s);
break;
}
me->CastSpell(me, SPELL_HORSEMAN_WHIRLWIND, true);
events.RepeatEvent(6000);
events.Repeat(6s);
break;
}
case EVENT_HORSEMAN_CHECK_HEALTH:
@@ -1241,7 +1241,7 @@ struct boss_headless_horseman : public ScriptedAI
return;
}
events.RepeatEvent(1000);
events.Repeat(1s);
break;
}
case EVENT_HORSEMAN_CONFLAGRATION:
@@ -1253,21 +1253,21 @@ struct boss_headless_horseman : public ScriptedAI
Talk(TALK_CONFLAGRATION);
}
events.RepeatEvent(12500);
events.Repeat(12500ms);
break;
}
case EVENT_SUMMON_PUMPKIN:
{
if (talkCount < 4)
{
events.RepeatEvent(1);
events.Repeat(1ms);
talkCount++;
me->CastSpell(me, SPELL_SUMMON_PUMPKIN, false);
}
else
{
Talk(TALK_SPROUTING_PUMPKINS);
events.RepeatEvent(15000);
events.Repeat(15s);
talkCount = 0;
}