Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Zul'aman: Use std::chrono::duration overloads of EventMap

Browse Source
This commit is contained in:
Shauren
2022-01-23 16:39:01 +01:00
parent 5a53fa4b58
commit 8417c7d815
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
View File

@@ -150,7 +150,7 @@ class instance_zulaman : public InstanceMapScript
{
DoUpdateWorldState(WORLD_STATE_ZULAMAN_TIMER_ENABLED, 1);
DoUpdateWorldState(WORLD_STATE_ZULAMAN_TIMER, 15);
events.ScheduleEvent(EVENT_UPDATE_ZULAMAN_TIMER, 60000);
events.ScheduleEvent(EVENT_UPDATE_ZULAMAN_TIMER, 1min);
SpeedRunTimer = 15;
ZulAmanState = data;
SaveToDB();
@@ -250,7 +250,7 @@ class instance_zulaman : public InstanceMapScript
SaveToDB();
DoUpdateWorldState(WORLD_STATE_ZULAMAN_TIMER, --SpeedRunTimer);
if (SpeedRunTimer)
events.ScheduleEvent(EVENT_UPDATE_ZULAMAN_TIMER, 60000);
events.ScheduleEvent(EVENT_UPDATE_ZULAMAN_TIMER, 1min);
else
{
DoUpdateWorldState(WORLD_STATE_ZULAMAN_TIMER_ENABLED, 0);
@@ -279,7 +279,7 @@ class instance_zulaman : public InstanceMapScript
if (ZulAmanState == IN_PROGRESS && SpeedRunTimer && SpeedRunTimer <= 15)
{
events.ScheduleEvent(EVENT_UPDATE_ZULAMAN_TIMER, 60000);
events.ScheduleEvent(EVENT_UPDATE_ZULAMAN_TIMER, 1min);
DoUpdateWorldState(WORLD_STATE_ZULAMAN_TIMER_ENABLED, 1);
DoUpdateWorldState(WORLD_STATE_ZULAMAN_TIMER, SpeedRunTimer);
}

22
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
View File

@@ -112,7 +112,7 @@ class npc_voljin_zulaman : public CreatureScript
me->SetMountDisplayId(0);
me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
me->SetDynamicFlags(UNIT_DYNFLAG_NONE);
_events.ScheduleEvent(EVENT_INTRO_MOVEPOINT_1, 1000);
_events.ScheduleEvent(EVENT_INTRO_MOVEPOINT_1, 1s);
Talk(SAY_INTRO_1, player);
me->SetWalk(true);
}
@@ -124,7 +124,7 @@ class npc_voljin_zulaman : public CreatureScript
if (action == ACTION_START_ZULAMAN)
{
if (++_gongCount == 10)
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_1, 500);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_1, 500ms);
}
}
@@ -137,15 +137,15 @@ class npc_voljin_zulaman : public CreatureScript
{
case EVENT_INTRO_MOVEPOINT_1:
me->GetMotionMaster()->MovePoint(POINT_INTRO, VoljinIntroWaypoint[0]);
_events.ScheduleEvent(EVENT_INTRO_MOVEPOINT_2, 1000);
_events.ScheduleEvent(EVENT_INTRO_MOVEPOINT_2, 1s);
break;
case EVENT_INTRO_MOVEPOINT_2:
me->GetMotionMaster()->MovePoint(POINT_STRANGE_GONG, VoljinIntroWaypoint[1]);
_events.ScheduleEvent(EVENT_INTRO_MOVEPOINT_3, 4000);
_events.ScheduleEvent(EVENT_INTRO_MOVEPOINT_3, 4s);
break;
case EVENT_INTRO_MOVEPOINT_3:
Talk(SAY_INTRO_2);
_events.ScheduleEvent(EVENT_BANGING_THE_GONG, 3000);
_events.ScheduleEvent(EVENT_BANGING_THE_GONG, 3s);
break;
case EVENT_BANGING_THE_GONG:
DoCast(me, SPELL_BANGING_THE_GONG);
@@ -155,13 +155,13 @@ class npc_voljin_zulaman : public CreatureScript
break;
case EVENT_START_DOOR_OPENING_1:
me->RemoveAura(SPELL_BANGING_THE_GONG);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_2, 500);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_2, 500ms);
break;
case EVENT_START_DOOR_OPENING_2:
me->SetVirtualItem(0, uint32(0));
if (GameObject* strangeGong = ObjectAccessor::GetGameObject(*me, _instance->GetGuidData(DATA_STRANGE_GONG)))
strangeGong->AddFlag(GO_FLAG_NOT_SELECTABLE);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_3, 500);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_3, 500ms);
break;
case EVENT_START_DOOR_OPENING_3:
me->GetMotionMaster()->MovePoint(POINT_START_DOOR_OPENING_1, VoljinIntroWaypoint[2]);
@@ -170,14 +170,14 @@ class npc_voljin_zulaman : public CreatureScript
_instance->SetData(DATA_ZULAMAN_STATE, IN_PROGRESS);
if (GameObject* masiveGate = ObjectAccessor::GetGameObject(*me, _instance->GetGuidData(DATA_MASSIVE_GATE)))
masiveGate->SetGoState(GO_STATE_ACTIVE);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_5, 3000);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_5, 3s);
break;
case EVENT_START_DOOR_OPENING_5:
Talk(SAY_INTRO_4);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_6, 6000);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_6, 6s);
break;
case EVENT_START_DOOR_OPENING_6:
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_7, 6000);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_7, 6s);
break;
case EVENT_START_DOOR_OPENING_7:
if (Creature* hexLordTrigger = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_HEXLORD_TRIGGER)))
@@ -204,7 +204,7 @@ class npc_voljin_zulaman : public CreatureScript
me->SetFacingTo(4.747295f);
me->GetMotionMaster()->MovePoint(POINT_START_DOOR_OPENING_2, VoljinIntroWaypoint[3]);
Talk(SAY_INTRO_3);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_4, 4500);
_events.ScheduleEvent(EVENT_START_DOOR_OPENING_4, 4500ms);
break;
default:
break;