summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-09 06:12:02 -0300
committerJesusaves <cpntb1@ymail.com>2020-04-09 06:12:02 -0300
commitfa1b727762bca48c2503b1b6ec85fbb78fe04779 (patch)
tree498375432b5599dd0059ba5680494a8a2614189f /world
parentcfc3380e507af7bcd1a91145c40c2b09347a2a8d (diff)
downloadserverdata-fa1b727762bca48c2503b1b6ec85fbb78fe04779.tar.gz
serverdata-fa1b727762bca48c2503b1b6ec85fbb78fe04779.tar.bz2
serverdata-fa1b727762bca48c2503b1b6ec85fbb78fe04779.tar.xz
serverdata-fa1b727762bca48c2503b1b6ec85fbb78fe04779.zip
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.
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/functions/doomsday.txt24
1 files changed, 22 insertions, 2 deletions
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: