summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2013-10-30 09:42:37 -0400
committerMadCamel <madcamel@gmail.com>2013-10-30 09:42:37 -0400
commit97bdb6d306e12e486dc34565f408dce4084c8066 (patch)
treee5df094249b709a60ec1bb7fe4e82bf2d7b2add6 /world/map/npc
parenta1cee96e5e9d99d5c8eb20b39bae699e1546dc44 (diff)
downloadserverdata-97bdb6d306e12e486dc34565f408dce4084c8066.tar.gz
serverdata-97bdb6d306e12e486dc34565f408dce4084c8066.tar.bz2
serverdata-97bdb6d306e12e486dc34565f408dce4084c8066.tar.xz
serverdata-97bdb6d306e12e486dc34565f408dce4084c8066.zip
Fixup on halloween script
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/026-1/munro.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/world/map/npc/026-1/munro.txt b/world/map/npc/026-1/munro.txt
index d5498389..d1419a70 100644
--- a/world/map/npc/026-1/munro.txt
+++ b/world/map/npc/026-1/munro.txt
@@ -53,6 +53,9 @@ OnTimer1000:
if ((gettime(6) == 9 && gettime(5) >= 27) || (gettime(6) == 10 && gettime(5) <= 5) || debug)
set $@isHalloween, 1;
+ if ((gettime(6) == 11 && gettime(5) >= 23) || (gettime(6) == 11 && gettime(5) <= 26) || debug)
+ set $@isHalloween, 1;
+
if ($@isHalloween)
goto L_enablemunro;
@@ -76,6 +79,9 @@ function|script|CheckMunro|,
if ((gettime(6) == 9 && gettime(5) >= 27) || (gettime(6) == 10 && gettime(5) <= 5) || debug)
goto L_Return;
+ if ((gettime(6) == 11 && gettime(5) >= 23) || (gettime(6) == 11 && gettime(5) <= 26) || debug)
+ goto L_Return;
+
unequipbyid @slotId;
L_Return: