summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2013-10-30 10:37:02 -0400
committerMadCamel <madcamel@gmail.com>2013-10-30 10:37:02 -0400
commitb2a807100e553eb8dc578ba3c6c89934bd52d5e0 (patch)
tree533e3489981336acb2975531979c3fd8c3e8c7a2 /world/map
parent5044f6a9684dd9f902844eb118519cb73aa51050 (diff)
downloadserverdata-b2a807100e553eb8dc578ba3c6c89934bd52d5e0.tar.gz
serverdata-b2a807100e553eb8dc578ba3c6c89934bd52d5e0.tar.bz2
serverdata-b2a807100e553eb8dc578ba3c6c89934bd52d5e0.tar.xz
serverdata-b2a807100e553eb8dc578ba3c6c89934bd52d5e0.zip
Fixed Munro NPC. I thought gettime() was based at 0, duh
Diffstat (limited to 'world/map')
-rw-r--r--world/map/db/const.txt2
-rw-r--r--world/map/npc/026-1/munro.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 240507a7..d4c393bf 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -3,7 +3,7 @@
// This defaults to 1, but should be disabled on the official server.
// If set to 2 or higher, it also disables global timers to aid gdb'ing.
-debug 1
+debug 0
// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
//MF_NOMEMO 0
diff --git a/world/map/npc/026-1/munro.txt b/world/map/npc/026-1/munro.txt
index d1419a70..5db5709d 100644
--- a/world/map/npc/026-1/munro.txt
+++ b/world/map/npc/026-1/munro.txt
@@ -50,10 +50,10 @@ OnInit:
OnTimer1000:
set $@isHalloween, 0;
- if ((gettime(6) == 9 && gettime(5) >= 27) || (gettime(6) == 10 && gettime(5) <= 5) || debug)
+ if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5) || debug)
set $@isHalloween, 1;
- if ((gettime(6) == 11 && gettime(5) >= 23) || (gettime(6) == 11 && gettime(5) <= 26) || debug)
+ if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26) || debug)
set $@isHalloween, 1;
if ($@isHalloween)
@@ -76,10 +76,10 @@ L_End:
function|script|CheckMunro|,
{
- if ((gettime(6) == 9 && gettime(5) >= 27) || (gettime(6) == 10 && gettime(5) <= 5) || debug)
+ if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5) || debug)
goto L_Return;
- if ((gettime(6) == 11 && gettime(5) >= 23) || (gettime(6) == 11 && gettime(5) <= 26) || debug)
+ if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26) || debug)
goto L_Return;
unequipbyid @slotId;