diff options
| -rw-r--r-- | npc/003-9/recepcionist.txt | 2 | ||||
| -rw-r--r-- | npc/functions/event.txt | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/npc/003-9/recepcionist.txt b/npc/003-9/recepcionist.txt index cda685472..c9ebe7abf 100644 --- a/npc/003-9/recepcionist.txt +++ b/npc/003-9/recepcionist.txt @@ -6,7 +6,7 @@ 003-9,62,128,0 script Recepcionist#TInn NPC_LOF_BARKEEPER,{ npctalk3 l("Hello, and welcome to Tulimshar Inn."); - emote E_HAPPY; + emotion E_HAPPY; close; OnInit: diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 631a5093f..a62c8f0a7 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -225,6 +225,7 @@ function script sThanksgiving { end; // Event Schedule (all dates are inclusive) +// NEVER, ever, include the last day of the month. OnInit: .valentine_stday=13; .valentine_stmon=FEBRUARY; @@ -253,7 +254,7 @@ OnInit: .thanks_stday=1; .thanks_stmon=NOVEMBER; - .thanks_endday=30; + .thanks_endday=29; .thanks_endmon=NOVEMBER; .xmas_stday=19; @@ -271,6 +272,12 @@ OnClock0000: debugmes "EVENT CORE, the %02d/%02d", .@d, .@m; debugmes "Valentine: %02d/%02d", .valentine_stday, .valentine_stmon; debugmes "Valentine End: %02d/%02d", .valentine_endday, .valentine_endmon; + if ($@DEBUG_OD) + .@d=$@DEBUG_OD; + if ($@DEBUG_OM) + .@m=$@DEBUG_OM; + debugmes "EVENT CORE, the %02d/%02d", .@d, .@m; + // Handle Valentine Day if (.@m >=.valentine_stmon && .@m <= .valentine_endmon) { @@ -453,6 +460,7 @@ OnClock0000: $EVENT$=""; } } + debugmes "EVENT CORE has finished"; end; } |