Hook a dozen NPCs

6 files changed, 41 insertions, 0 deletions

diff --git a/npc/016-1/gwendolyn.txt b/npc/016-1/gwendolyn.txt
index ae2da9d7..b7c0356a 100644
--- a/npc/016-1/gwendolyn.txt
+++ b/npc/016-1/gwendolyn.txt
@@ -7,6 +7,7 @@
 //    Archery Trainer
 
 016-1,91,54,0	script	Gwendolyn	NPC182,{
+    XMAS21_NPC();
     //.@q=getq();
 
     .@Q_hawkseye_MASK = NIBBLE_6_MASK;
diff --git a/npc/026-1/evil_guard.txt b/npc/026-1/evil_guard.txt
index 8f6e3c09..df3b2c7f 100644
--- a/npc/026-1/evil_guard.txt
+++ b/npc/026-1/evil_guard.txt
@@ -1,4 +1,5 @@
 026-1,50,32,0	script	Blackwin	NPC316,{
+    XMAS21_NPC();
     mes "...";
     next;
     mes "The guard glares at you, silently daring you to try something.";
diff --git a/npc/026-1/headless_man.txt b/npc/026-1/headless_man.txt
index f70809de..e1307008 100644
--- a/npc/026-1/headless_man.txt
+++ b/npc/026-1/headless_man.txt
@@ -1,5 +1,6 @@
 
 026-1,34,30,0	script	Thurstan	NPC318,{
+    XMAS21_NPC();
     @Graveyard_Inn_MASK = NIBBLE_6_MASK;
     @Graveyard_Inn_SHIFT = NIBBLE_6_SHIFT;
 
diff --git a/npc/026-1/husband.txt b/npc/026-1/husband.txt
index 922a554c..48a1af6a 100644
--- a/npc/026-1/husband.txt
+++ b/npc/026-1/husband.txt
@@ -1,5 +1,6 @@
 
 026-1,40,41,0	script	Hamond	NPC319,{
+    XMAS21_NPC();
     @Graveyard_Inn_MASK = NIBBLE_3_MASK;
     @Graveyard_Inn_SHIFT = NIBBLE_3_SHIFT;
 
diff --git a/npc/026-1/traveler.txt b/npc/026-1/traveler.txt
index 1f263fe7..97466338 100644
--- a/npc/026-1/traveler.txt
+++ b/npc/026-1/traveler.txt
@@ -1,5 +1,6 @@
 
 026-1,49,46,0	script	Styx the Traveler	NPC103,{
+    XMAS21_NPC();
     @npcname$ = "Styx";
     @NpcTravelBit = $@graveyard_bit;
     callfunc "Traveler";
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index 3e10faff..593b3f71 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -98,6 +98,42 @@ function	script	X21SRLZ	{
     return str(.@n);
 }
 
+function	script	XMAS21_NPC	{
+    if (!isChristmas21()) return;
+    if (!X21GAK_GOTO()) return;
+    if (X21GAK_GATE()) return;
+
+    .@npc$=getarg(0, strnpcinfo(1));
+    if (.@npc$ == "Forwin") {
+        mesn;
+        mesq l("Gak lived around here way before Golbenez moved in. He went north.");
+        next;
+    } else if (.@npc$ == "Thurstan") {
+        mesn;
+        mesq l("I can't believe Gak refused to lend me Duck Tape! Then he went into the graveyard...");
+        next;
+    } else if (.@npc$ == "Hamond") {
+        mesn;
+        mesq l("If you're looking for Kytty, she went east, looking for Gwendolyn. You're welcome.");
+        next;
+    } else if (.@npc$ == "Styx the Traveler") {
+        mesn;
+        mesq l("Gak and Kytty never need my services. So I didn't pay attention to either of them.");
+        next;
+    } else if (.@npc$ == "Blackwin") {
+        mesn;
+        mesq l("Kytty came visit, but she already left. You would be wise to do so as well.");
+        next;
+    } else if (.@npc$ == "Gwendolyn") {
+        mesn;
+        mesq l("Kytty is in my house waiting for someone. If you need her, feel free to enter.");
+        next;
+    } else {
+        npctalk l("BUG, REPORT ME! Invalid Christmas 2021 NPC!");
+    }
+    return;
+}
+
 function	script	X21INIT	{
     // If it is not Christmas, there is no meaning to this.
     // Halt script execution