summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-05-15 16:17:03 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2012-05-15 21:37:13 +0200
commitf75d11befa4096711ef9055e495286534ee81ba3 (patch)
tree47c1de8f7fa5d0778c8084c5c3aaf47cd189f2ae /world/map/npc
parent7d84c8135f63b3fa867c3f419ece78b008dbb26b (diff)
downloadserverdata-f75d11befa4096711ef9055e495286534ee81ba3.tar.gz
serverdata-f75d11befa4096711ef9055e495286534ee81ba3.tar.bz2
serverdata-f75d11befa4096711ef9055e495286534ee81ba3.tar.xz
serverdata-f75d11befa4096711ef9055e495286534ee81ba3.zip
Expand seasonal quest to be available during a londer period and fix how the time is checked.
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/019-1/santa_helper.txt2
-rw-r--r--world/map/npc/019-1/snowman.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/019-1/santa_helper.txt b/world/map/npc/019-1/santa_helper.txt
index f7d1f36e..e0b7456d 100644
--- a/world/map/npc/019-1/santa_helper.txt
+++ b/world/map/npc/019-1/santa_helper.txt
@@ -4,7 +4,7 @@
019-1.gat,74,75,0|script|Santa's Helper|105,{
callfunc "ClearVariables";
if (FLAGS & FLAG_SANTAS_HELPER) goto L_Done;
- if ($@month == 12) goto L_Quest;
+ if ((gettime(6) == 12) || ((gettime(6) == 1) && (gettime(5) < 7))) goto L_Quest;
mes "[Santa's Helper]";
mes "\"Ah, isn't it peaceful here? Around Christmas time we always have problems with some slimy monsters.";
diff --git a/world/map/npc/019-1/snowman.txt b/world/map/npc/019-1/snowman.txt
index 529a7a50..b2c8a67d 100644
--- a/world/map/npc/019-1/snowman.txt
+++ b/world/map/npc/019-1/snowman.txt
@@ -4,7 +4,7 @@
019-1.gat,77,44,0|script|Snowman|129,{
callfunc "ClearVariables";
if (FLAGS & FLAG_SNOWMAN) goto L_Done;
- if ($@month == 12 || $@month == 1 || $@month == 2) goto L_Quest;
+ if (gettime(6) == 12 || gettime(6) == 1 || gettime(6) == 2) goto L_Quest;
mes "A beautiful snowman. It looks almost alive.";
mes "Maybe the magic of Christmas time will breath life into it?";