summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/commands/event.txt1
-rw-r--r--npc/commands/motd.txt13
2 files changed, 10 insertions, 4 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 5c423531e..4045de7cc 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -79,6 +79,7 @@ function script GlobalEventMenu {
DelAccRegFromEveryPlayer("#VALENTINE_RECEIVED");
DelAccRegFromEveryPlayer("#VALENTINE_OPENED");
DelAccRegFromEveryPlayer("#VALENTINE_SENT");
+ DelAccRegFromEveryPlayer("#VALENTINE_LOVELETTERS");
}
// We must remove any event drop
diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt
index a208b371b..c24b31b57 100644
--- a/npc/commands/motd.txt
+++ b/npc/commands/motd.txt
@@ -167,12 +167,17 @@ OnCall:
end;
OnPCLoginEvent:
- if ($MOTD_Disabled < 1) {
+ // Handle events
+ if ($@GM_EVENT)
+ dispbottom l("An event is happening at Aeros! Hurry up!");
+ if ($EVENT$)
+ dispbottom l("It's @@ (day)!", $EVENT$);
+
+ // Handle MOTD
+ if (!$MOTD_Disabled)
displayMOTD;
- }
- if (debug) {
+ if (debug)
dispbottom "##7<<##B @@help://test-server|" + col(l("Click here for instructions on how to use the test server."),6) + "@@ ##7>>";
- }
daily_login_bonus_handler();
end;