summaryrefslogtreecommitdiff
path: root/world/map/npc/annuals
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-01-30 15:04:29 -0800
committerwushin <pasekei@gmail.com>2014-01-30 15:04:29 -0800
commit9387e32fffe53279316c2596fd0f17f786506d81 (patch)
treebc832fea3cf1aae93f86a8a3256e912f3a7ed5cf /world/map/npc/annuals
parent447f80120e31b97abb935e38bc2fee9e0ec9809e (diff)
parent049b7e2e0023bd8b36fbb66d3fbb8c8da2a2baaa (diff)
downloadserverdata-9387e32fffe53279316c2596fd0f17f786506d81.tar.gz
serverdata-9387e32fffe53279316c2596fd0f17f786506d81.tar.bz2
serverdata-9387e32fffe53279316c2596fd0f17f786506d81.tar.xz
serverdata-9387e32fffe53279316c2596fd0f17f786506d81.zip
Merge pull request #70 from CandyCurt/XmasFix
Xmas fix
Diffstat (limited to 'world/map/npc/annuals')
-rw-r--r--world/map/npc/annuals/xmas/config.txt11
-rw-r--r--world/map/npc/annuals/xmas/core.txt14
2 files changed, 21 insertions, 4 deletions
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:
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index 41ec2ce5..0f0c53b4 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -173,8 +173,20 @@ function|script|XmasMainItemReward|,
{
callfunc "XmasSetReward";
- if(($@xmas_time == $@xmas_reward_time) && ((@xmas_reward_start_state) || (@xmas_reward1_done_state)))
+ if (($@xmas_time == $@xmas_reward_time) && ((@xmas_reward_start_state) || (@xmas_reward1_done_state)))
goto L_FinalGift;
+ if (($@xmas_time == $@xmas_reward_time) && ((@xmas_reward_done_state) || (@xmas_reward2_done_state)))
+ goto L_GotGift;
+ if ($@xmas_time == $@xmas_reward_time)
+ goto L_NoGift;
+ goto L_Return;
+
+L_GotGift:
+ mes "Hey, this is not for you!";
+ goto L_Return;
+
+L_NoGift:
+ mes "Oh someone got a present. Maybe you can get one too if help the right person?";
goto L_Return;
L_FinalGift: