From fa1b727762bca48c2503b1b6ec85fbb78fe04779 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 9 Apr 2020 06:12:02 -0300 Subject: Add another event cast at 09:00 servertime (so everyone have a chance) Fix a possible bug with skip flag being lost at run time. --- world/map/npc/functions/doomsday.txt | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'world/map/npc') diff --git a/world/map/npc/functions/doomsday.txt b/world/map/npc/functions/doomsday.txt index 794bcac2..d4b32dcb 100644 --- a/world/map/npc/functions/doomsday.txt +++ b/world/map/npc/functions/doomsday.txt @@ -616,10 +616,10 @@ L_TimerFinish: stopnpctimer; end; -// Act 3 clock handlers +// Act 3 clock handlers [1] OnClock1750: if ($@DOOMSDAY_SKIP) - goto L_Doomsday3Skip; + end; if ($DOOMSDAY == 2) goto L_Doomsday3Init; end; @@ -637,6 +637,26 @@ OnClock1845: goto L_Doomsday3Check; end; +// Act 3 clock handlers [2] +OnClock0850: + if ($@DOOMSDAY_SKIP) + end; + if ($DOOMSDAY == 2) + goto L_Doomsday3Init; + end; + +OnClock0900: + if ($@DOOMSDAY_SKIP) + goto L_Doomsday3Skip; + if ($DOOMSDAY == 2) + goto L_Doomsday3; + end; + +OnClock0945: + if ($DOOMSDAY == 2) + goto L_Doomsday3Check; + end; + //////////////////////////////////////////////////////////////////////////////// // Puppet labels OnDeathMapname: -- cgit v1.2.3-60-g2f50