summaryrefslogtreecommitdiff
path: root/npc/functions/event.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions/event.txt')
-rw-r--r--npc/functions/event.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 8f55bfb21..902f6e21b 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -300,6 +300,8 @@ OnClock0000:
.@dofy=true;
.@confname$=".conf_"+.@m;
+ // NOTE: Maybe make a single .annuals array and cycle it
+ // Gather the ST variable from interest...?
for (.@i=0;.@i < getarraysize(getd(.@confname$)); .@i++) {
.@val=getd(.@confname$+"["+.@i+"]");
//debugmes "Looping, %d = %d", .@i, .@val;
@@ -313,6 +315,9 @@ OnClock0000:
// So they might still overlap.
// A possible solution is to, eventually, record start and end date.
// And only inhibit FY event if the MONDAY is within the event...?
+ // 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;
// In this case there's already an event!
// .@d == .@val <= .@d+6 AND