Playtested and it works, but Carrot is missing...

Replace Rotonen with Jenalya. Not so sure about 4144, Platyna and o11c, though.

4 files changed, 15 insertions, 5 deletions

diff --git a/npc/026-1/evil_guard.txt b/npc/026-1/evil_guard.txt
index df3b2c7f..7da76679 100644
--- a/npc/026-1/evil_guard.txt
+++ b/npc/026-1/evil_guard.txt
@@ -13,6 +13,7 @@
 }
 
 026-1,29,28,0	script	Forwin	NPC316,{
+    XMAS21_NPC();
     mes "[Evil Guard]";
     mes "\"" + strcharinfo(0) + "...\"";
     next;
diff --git a/npc/080-1/final.txt b/npc/080-1/final.txt
index f42c967f..5298364b 100644
--- a/npc/080-1/final.txt
+++ b/npc/080-1/final.txt
@@ -53,6 +53,8 @@ OnInit:
     'XMAS21CUTSCENE=true;
 
     // Position the NPCs based on Gak's maximum distance and visible window
+    enablenpc(.@ali$); // Fail-safe
+    setnpcdir(.@ali$, 4); // Fail-safe
     unitwarp(getnpcid(.@ali$), .@m$, 97, 60);
     sleep2(100);
     npcwalkto(97, 42, .@ali$);
@@ -207,7 +209,10 @@ OnKil:
     mes l("There are several names in fine print below this gargoyle:");
     // Sorry for missing names (e.g. Platyna) and spurious names (e.g. Crush)
     // Wanted to list only TMW sysadmins but too much trouble
-    mes "Bjorn ~ Crush ~ ElvenProgrammer ~ Freeyorp ~ Frost ~ Jak1 ~ Jaxad ~ Jesusalva ~ MadCamel ~ Reid ~ Rotonen ~ Tux9th ~ Wombat ~ Wushin";
+    // Remove: Crush Rotonen Tux9th Wombat
+    // Add: Platyna o11c 4144 Jenalya 
+    // Bjorn ~ ElvenProgrammer ~ Freeyorp ~ Frost ~ Jak1 ~ Jaxad ~ Jesusalva ~ MadCamel ~ Reid ~ Wushin ~ Platyna ~ o11c
+    mes "Bjorn ~ Crush ~ ElvenProgrammer ~ Freeyorp ~ Frost ~ Jak1 ~ Jaxad ~ Jesusalva ~ MadCamel ~ Reid ~ Jenalya ~ Tux9th ~ Wombat ~ Wushin";
     next;
     mes l("Whose name do you press?");
     select
@@ -272,11 +277,11 @@ function showgak {
         l("Do you know where Gak lives?");
     mes "";
     switch (@menu) {
-    case 1:
+    case 2:
         mesn;
         mesq l("Not this year, no.");
         break;
-    case 2:
+    case 3:
         mesn;
         mesq l("I believe he warps to the world during Halloween and warps back afterwards.");
         next;
@@ -293,7 +298,7 @@ function showgak {
 
 OnInit:
     .distance = 5;
-    setarray .adm$, "Bjorn", "Crush", "ElvenProgrammer", "Freeyorp", "Frost", "Jak1", "Jaxad", "Jesusalva", "MadCamel", "Reid", "Rotonen", "Tux9th", "Wombat", "Wushin";
+    setarray .adm$, "Bjorn", "Crush", "ElvenProgrammer", "Freeyorp", "Frost", "Jak1", "Jaxad", "Jesusalva", "MadCamel", "Reid", "Jenalya", "Tux9th", "Wombat", "Wushin";
     if (!isChristmas21()) goto L_Off;
     goto L_On;
 
diff --git a/npc/081-1/dungeon.txt b/npc/081-1/dungeon.txt
index e90b7324..f996a7ff 100644
--- a/npc/081-1/dungeon.txt
+++ b/npc/081-1/dungeon.txt
@@ -173,7 +173,7 @@ OnInit:
     mesq l("ho-hum ho-hum ho-hum, why hello there, %s!", g("Young Heroine", "Young Hero"));
     next;
     mesn;
-    mesq l("Welcome to the %s! Try avoiding the edges of this place, you know, æether all over the place, not really an appealing way to leave this world. Ho! Ho! Ho!", b(l("Frontier of Existence")));
+    mesq l("Welcome to the %s! Try avoiding the edges of this place, you know, æther all over the place, not really an appealing way to leave this world. Ho! Ho! Ho!", b(l("Frontier of Existence")));
     do
     {
     next;
@@ -318,6 +318,9 @@ function idiot {
 }
 
 function report {
+    mesn;
+    mesq l("Have you found anything, %s?", g("Young Heroine", "Young Hero"));
+    mes "";
     select
         l("I've found Alissa.");
     mes "";
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index 593b3f71..b35676b1 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -130,6 +130,7 @@ function	script	XMAS21_NPC	{
         next;
     } else {
         npctalk l("BUG, REPORT ME! Invalid Christmas 2021 NPC!");
+        debugmes "Invalid NPC: %s", .@npc$;
     }
     return;
 }