From 66e86c7b06ac24b0b7c1f14629ed8eebaba25521 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 13 Oct 2020 11:19:07 -0300 Subject: Allow Aurora Events to happen during Thanksgiving. They'll still be cancelled for Christmas --- npc/functions/event.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3-60-g2f50