summaryrefslogtreecommitdiff
path: root/npc/functions
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions')
-rw-r--r--npc/functions/event.txt6
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;
}