diff options
Diffstat (limited to 'world/map/npc/xmas/2011/guardOfHonor.txt')
| -rw-r--r-- | world/map/npc/xmas/2011/guardOfHonor.txt | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/world/map/npc/xmas/2011/guardOfHonor.txt b/world/map/npc/xmas/2011/guardOfHonor.txt index 37adfc42..57c0cc1e 100644 --- a/world/map/npc/xmas/2011/guardOfHonor.txt +++ b/world/map/npc/xmas/2011/guardOfHonor.txt @@ -5,7 +5,8 @@ // outside of the building 030-1.gat,89,51,0|script|Grigory the Nutcracker|330,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; mes "[Grigory the Nutcracker]"; @@ -20,7 +21,8 @@ L_NoEvent: 030-1.gat,89,54,0|script|Vadim the Nutcracker|330,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; mes "[Vadim the Nutcracker]"; @@ -36,7 +38,8 @@ L_NoEvent: // in the entrance area 030-2.gat,83,43,0|script|Andrey the Nutcracker|330,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; mes "[Andrey the Nutcracker]"; @@ -53,7 +56,8 @@ L_NoEvent: 030-2.gat,99,23,0|script|Eugeny the Nutcracker|330,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; mes "[Eugeny the Nutcracker]"; @@ -75,7 +79,8 @@ L_NoEvent: 030-2.gat,77,23,0|script|Leonid the Nutcracker|330,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; mes "[Leonid the Nutcracker]"; @@ -92,7 +97,8 @@ L_NoEvent: // in office 030-2.gat,47,81,0|script|Yakov the Nutcracker|330,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; mes "[Yakov the Nutcracker]"; @@ -115,9 +121,11 @@ L_NoEvent: // in the room before Santa's 030-2.gat,96,77,0|script|Taras the Nutcracker|330,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; - if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day)) + if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day) + || (gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_RewardTime; mes "[Taras the Nutcracker]"; @@ -139,7 +147,8 @@ L_NoEvent: 030-2.gat,99,77,0|script|Stepan the Nutcracker|330,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; mes "[Stepan the Nutcracker]"; |