summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/functions/random-talk.txt24
1 files changed, 17 insertions, 7 deletions
diff --git a/npc/functions/random-talk.txt b/npc/functions/random-talk.txt
index a5bea0568..4a4202f34 100644
--- a/npc/functions/random-talk.txt
+++ b/npc/functions/random-talk.txt
@@ -27,7 +27,10 @@ function script hello {
npctalkonce(l("Hi."));
break;
case 2:
- npctalkonce(l("Nice day to you."));
+ if ($EVENT$ == "Christmas")
+ npctalkonce(l("Merry Christmas!"));
+ else
+ npctalkonce(l("Nice day to you."));
break;
}
@@ -60,11 +63,15 @@ function script sailortalk {
if (.@rand == 2) npctalkonce(l("Hey! Good to hear from you!"));
if (.@rand == 3) npctalkonce(l("Yarr arr!"));
if (.@rand == 4) {
- speech(
- l("A sunny and hot day,"),
- l("a quiet place,"),
- l("a ground!"),
- l("What else do you need?"));
+ if ($EVENT$ == "Christmas")
+ npctalkonce(l("Merry Christmas, arr yarr!!"));
+ else {
+ speech(
+ l("A sunny and hot day,"),
+ l("a quiet place,"),
+ l("a ground!"),
+ l("What else do you need?"));
+ }
close;
}
if (.@rand == 5) npctalkonce(l("A-hoy matey!"));
@@ -141,7 +148,10 @@ function script legiontalk {
npctalkonce(l("Give me some space."));
break;
case 6:
- npctalkonce(l("Can you please go away?"));
+ if ($EVENT$ == "Christmas")
+ npctalkonce(l("Merry Christmas, adventurer."));
+ else
+ npctalkonce(l("Can you please go away?"));
break;
case 7:
npctalkonce(l("Can't talk right now, I'm on patrol duty."));