summaryrefslogtreecommitdiff
path: root/world/map/npc/annuals/xmas/config.txt
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-11-24 19:50:39 -0600
committerWushin <pasekei@gmail.com>2014-11-24 19:50:39 -0600
commit49234000cbcd16cf5bab89790cc89c0a21f5b972 (patch)
treee35b949fb94fa885621ca609d1c8b5cb489add91 /world/map/npc/annuals/xmas/config.txt
parent774ef969fa41dc0424d42c99f11f433049e2d502 (diff)
parent664fddbcccfddb4d38cde539a07baa7f1377a4d2 (diff)
downloadserverdata-49234000cbcd16cf5bab89790cc89c0a21f5b972.tar.gz
serverdata-49234000cbcd16cf5bab89790cc89c0a21f5b972.tar.bz2
serverdata-49234000cbcd16cf5bab89790cc89c0a21f5b972.tar.xz
serverdata-49234000cbcd16cf5bab89790cc89c0a21f5b972.zip
Merge pull request #214 from mekolat/mapexit
use builtin mapexit
Diffstat (limited to 'world/map/npc/annuals/xmas/config.txt')
-rw-r--r--world/map/npc/annuals/xmas/config.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index 70eb5b05..e95494d3 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -262,11 +262,11 @@ L_Main:
set $@xmas_spawn_y2, 89;
set $@xmas_respawn_count, 9;
- if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day
+ if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day
&& (gettime(5) <= $@xmas_reward_end_day && $@xmas_reward_start_month == $@xmas_end_month
|| !($@xmas_reward_start_month == $@xmas_end_month)))
- || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day
- && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month
+ || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day
+ && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month
|| !($@xmas_reward_start_month == $@xmas_end_month)))
|| (gettime(6) < $@xmas_end_month && gettime(6) > $@xmas_reward_start_month))
goto L_RewardTime;
@@ -299,6 +299,5 @@ L_Return:
L_XmasError:
debugmes "Xmas is Dead Jim.";
- gmcommand "@mapexit";
- end;
+ mapexit;
}