diff options
| author | Wushin <pasekei@gmail.com> | 2014-11-24 19:50:39 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-11-24 19:50:39 -0600 |
| commit | 49234000cbcd16cf5bab89790cc89c0a21f5b972 (patch) | |
| tree | e35b949fb94fa885621ca609d1c8b5cb489add91 /world/map/npc/annuals | |
| parent | 774ef969fa41dc0424d42c99f11f433049e2d502 (diff) | |
| parent | 664fddbcccfddb4d38cde539a07baa7f1377a4d2 (diff) | |
| download | serverdata-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')
| -rw-r--r-- | world/map/npc/annuals/halloween/config.txt | 9 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/config.txt | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt index 226d8bbb..0401fc3d 100644 --- a/world/map/npc/annuals/halloween/config.txt +++ b/world/map/npc/annuals/halloween/config.txt @@ -339,11 +339,11 @@ L_Main: if(gettime(6) <= $@halloween_end_month && gettime(5) > $@halloween_reward_end_day) goto L_NoEventTime; - if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day + if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day && (gettime(5) <= $@halloween_reward_end_day && $@halloween_reward_start_month == $@halloween_end_month || !($@halloween_reward_start_month == $@halloween_end_month))) - || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day - && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month + || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day + && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month || !($@halloween_reward_start_month == $@halloween_end_month))) || (gettime(6) < $@halloween_end_month && gettime(6) > $@halloween_reward_start_month)) goto L_RewardTime; @@ -372,6 +372,5 @@ L_Return: L_HalloweenError: debugmes "Halloween is Dead Jim."; - gmcommand "@mapexit"; - end; + mapexit; } 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; } |