summaryrefslogtreecommitdiff
path: root/world/map/npc/annuals/xmas/config.txt
diff options
context:
space:
mode:
authormekolat <mekolat@gmail.com>2014-11-19 16:18:25 -0500
committermekolat <mekolat@gmail.com>2014-11-19 16:18:25 -0500
commit664fddbcccfddb4d38cde539a07baa7f1377a4d2 (patch)
treea82a387c763a8f0d59bee0e23059cf7d746b7874 /world/map/npc/annuals/xmas/config.txt
parent0eb832119cbc1ce28dbe3e9a0bbc8b0f6ffec820 (diff)
downloadserverdata-664fddbcccfddb4d38cde539a07baa7f1377a4d2.tar.gz
serverdata-664fddbcccfddb4d38cde539a07baa7f1377a4d2.tar.bz2
serverdata-664fddbcccfddb4d38cde539a07baa7f1377a4d2.tar.xz
serverdata-664fddbcccfddb4d38cde539a07baa7f1377a4d2.zip
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;
}