diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-10-13 11:19:07 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-10-13 11:19:07 -0300 |
commit | 66e86c7b06ac24b0b7c1f14629ed8eebaba25521 (patch) | |
tree | f622cf7a40111a3e1b0b3066decd5d8359d0df36 /npc | |
parent | 3dfe08539b2fa0586b5825290286a4c97367b9e8 (diff) | |
download | serverdata-66e86c7b06ac24b0b7c1f14629ed8eebaba25521.tar.gz serverdata-66e86c7b06ac24b0b7c1f14629ed8eebaba25521.tar.bz2 serverdata-66e86c7b06ac24b0b7c1f14629ed8eebaba25521.tar.xz serverdata-66e86c7b06ac24b0b7c1f14629ed8eebaba25521.zip |
Allow Aurora Events to happen during Thanksgiving.
They'll still be cancelled for Christmas
Diffstat (limited to 'npc')
-rw-r--r-- | npc/functions/event.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 1de8d7ef0..8093d053f 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -370,10 +370,14 @@ OnClock0000: // XXX: Now it inhibits by itself; But it should NOT begin a FYE if // another (annual) event is scheduled for the same week. // Namely: TMW2 Day and Thanksgiving - debugmes "%d >= %d && %d <= %d", .@val, .@d-6, .@val, .@d+6; + //debugmes "%d >= %d && %d <= %d", .@val, .@d-6, .@val, .@d+6; // In this case there's already an event! // .@d == .@val <= .@d+6 AND if ( .@val >= .@d-6 && .@val <= .@d+6 ) { + // Keep events running during Thanksgiving (November) + if (.@m == NOVEMBER) + break; + // Otherwise: No aurora event! .@dofy=false; break; } |