Hook 080-1 into the game; Still lacking a flag.

3 files changed, 58 insertions, 7 deletions

diff --git a/npc/080-1/final.txt b/npc/080-1/final.txt
index a318f6f6..5d5cbca0 100644
--- a/npc/080-1/final.txt
+++ b/npc/080-1/final.txt
@@ -200,3 +200,56 @@ OnKil:
     end;
 }
 
+027-1,105,63,0	script	#GakGate	NPC400,{
+    if (!isChristmas21()) end;
+    if (!X21GAK_GATE()) end;
+
+    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";
+    next;
+    mes l("Whose name do you press?");
+    select
+        l("None!"),
+        l("Bjorn"),
+        l("Crush"),
+        l("ElvenProgrammer"),
+        l("Freeyorp"),
+        l("Frost"),
+        l("Jak1"),
+        l("Jaxad"),
+        l("Jesusalva"),
+        l("MadCamel"),
+        l("Reid"),
+        l("Rotonen"),
+        l("Tux9th"),
+        l("Wombat"),
+        l("Wushin");
+    mes "";
+    .@id = @menu - 2;
+    if (.@id != XMAS21_KEYWORD) {
+        percentheal -10, -100;
+    } else {
+        X21INIT();
+	    .@mapa$="0801@"+X21ID2();
+        warp .@mapa$, 84, 145;
+    }
+    closeclientdialog;
+    close;
+OnInit:
+    .distance=2;
+    end;
+}
+
+080-1,97,140,0	script	#0801Exit	NPC424,0,0,{
+    end;
+OnTouch:
+    mes l("Warp back?");
+    next;
+    if (askyesno() == ASK_YES)
+        warp "027-2", 50, 29;
+    closeclientdialog;
+    end;
+}
+
diff --git a/npc/081-1/dungeon.txt b/npc/081-1/dungeon.txt
index 0de2155e..e90b7324 100644
--- a/npc/081-1/dungeon.txt
+++ b/npc/081-1/dungeon.txt
@@ -161,6 +161,7 @@ OnInit:
     function report;
     function gotogak;
     function finished;
+    if (!isChristmas21()) end;
     if (!X21_START()) end; // ??
     if (X21ED2_CLEAR()) finished();
     if (X21GAK_GOTO()) gotogak();
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index 056ca266..eefd3f41 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -21,6 +21,10 @@ function	script	X21_START	{
 }
 function	script	X21_DOSTART	{
     XMAS2021 = (XMAS2021 | X21_ACCEPTED);
+    // Actually - reset the quest.
+    XMAS2021 = X21_ACCEPTED;
+    /* Prepare the answer to Gak's Crypt */
+    XMAS21_KEYWORD = rand2(14);
     return;
 }
 
@@ -91,13 +95,6 @@ function	script	X21SRLZ	{
     return str(.@n);
 }
 
-function	script	X21QUESTON	{
-    // Create and setup the challenge. Allow to reset quest.
-    XMAS2021 = X21_ACCEPTED;
-    /* Prepare something */
-    return;
-}
-
 function	script	X21INIT	{
     // If it is not Christmas, there is no meaning to this.
     // Halt script execution