summaryrefslogtreecommitdiff
path: root/world/map/npc/annuals
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-01-03 12:29:26 -0600
committerBernhardt <orgzfrgh@gmail.com>2014-01-27 22:39:40 +0100
commitb2a215f461ca89b3b5509c0b94cbe7324aa15227 (patch)
tree7fab3eb98f8fc4472604a8ee0a4f9f56f6bc7dec /world/map/npc/annuals
parent3158c6cc0ef331a8dfa49745af3652c5e273ea5b (diff)
downloadserverdata-b2a215f461ca89b3b5509c0b94cbe7324aa15227.tar.gz
serverdata-b2a215f461ca89b3b5509c0b94cbe7324aa15227.tar.bz2
serverdata-b2a215f461ca89b3b5509c0b94cbe7324aa15227.tar.xz
serverdata-b2a215f461ca89b3b5509c0b94cbe7324aa15227.zip
Xmas Chamber Fixes
- Should no longer get stuck - Has a bit more challenge to sitting - Cooldown in between rounds to allow changing of the guard - Allowing Entry/Exit but not Start Xmas Reward/Event time fixed to properly display proper event mode
Diffstat (limited to 'world/map/npc/annuals')
-rw-r--r--world/map/npc/annuals/xmas/barriers.txt2
-rw-r--r--world/map/npc/annuals/xmas/config.txt11
2 files changed, 9 insertions, 4 deletions
diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt
index 7db8a472..219ca55b 100644
--- a/world/map/npc/annuals/xmas/barriers.txt
+++ b/world/map/npc/annuals/xmas/barriers.txt
@@ -47,7 +47,7 @@ L_XmasMain:
"No, It's quite nice out here.", L_Close;
L_Open:
- if ($@XmasBattleStatus) goto L_BattleInProgress;
+ if (($@XmasBattleStatus) && (!($@XmasBattleCoolDown))) goto L_BattleInProgress;
warp "030-4.gat",34,48;
goto L_Close;
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index caf4ad77..4eacec58 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -268,10 +268,15 @@ L_Main:
if($@xmas_debug == $@xmas_reward_time)
goto L_RewardTime;
- if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day)
- || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_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
+ || !($@xmas_reward_start_month == $@xmas_end_month)))
+ || (gettime(6) < $@xmas_end_month && gettime(6) > $@xmas_reward_start_month))
goto L_RewardTime;
- if(gettime(6) == $@xmas_start_month)
+ if((gettime(6) >= $@xmas_start_month) || (gettime(6) <= $@xmas_end_month && gettime(5) <= $@xmas_reward_start_day))
goto L_EventTime;
L_NoEventTime: