From 7d0f17634b068f0bd4192bf7286a17a0e5cd98c4 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 23 Nov 2021 12:52:03 -0300
Subject: Fix typos

---
 db/constants.conf         |  2 +-
 npc/080-3/cutscene.txt    | 18 +++++++++++++++++-
 npc/081-3/logic.txt       |  2 +-
 npc/annuals/xmas/2021.txt |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/db/constants.conf b/db/constants.conf
index bd12dc2b..75b4af8d 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3214,7 +3214,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	NPC_UNUSED__MOBTOMB:    565
 	NPC_WARP_DEBUG:         722
 	NPC_UNUSED__FLAG:       722
-	NPC_NO_SPRITE:          999
+	NPC_NO_SPRITE:          400
 	NPC_HIDDEN:             32767
 
 	comment__: "Walk masks"
diff --git a/npc/080-3/cutscene.txt b/npc/080-3/cutscene.txt
index 7a1675db..2191e64e 100644
--- a/npc/080-3/cutscene.txt
+++ b/npc/080-3/cutscene.txt
@@ -7,7 +7,7 @@
 080-3,83,155,0	script	#0803exit	NPC_HIDDEN,1,0,{
     end;
 OnTouch:
-    if (!isChristmas21()) warp "081-1", 68, 31;
+    if (!isChristmas21()) { warp "081-1", 68, 31; end; }
     if (!X21ED1_CLEAR()) { dispbottom l("It is too early to leave yet!"); end; }
     mesn strcharinfo(0);
     mesq l("Are we done here? We won't be able to return later!");
@@ -30,6 +30,9 @@ OnTouch:
     next;
     mes l("-- @@1226|The Silver Bell@@");
     close;
+OnInit:
+    .distance=2;
+    end;
 }
 
 080-3,129,56,0	script	Book#X21B02	NPC_NO_SPRITE,{
@@ -45,6 +48,9 @@ OnTouch:
     next;
     mes l("For precaution, I'll also stop using this name. Do not seek for me. For I shall exile myself until the last day of my life.");
     close;
+OnInit:
+    .distance=2;
+    end;
 }
 
 080-3,46,80,0	script	Book#X21B04	NPC_NO_SPRITE,{
@@ -62,6 +68,9 @@ OnTouch:
     next;
     mes l("From now on, I'll be a witch's apprentice, to repay for what I ate. I am nervous, but... also glad for this chance, to rebuild my life, far from the conspiracies and backstabbings of Tulimshar court.");
     close;
+OnInit:
+    .distance=2;
+    end;
 }
 
 080-3,64,120,0	script	Book#X21B05	NPC_NO_SPRITE,{
@@ -78,6 +87,9 @@ OnTouch:
     next;
     mes l("The farthest body found was of a man called \"Gak\". According to the report, he likely tried to run away from the town alone but did not made it.");
     close;
+OnInit:
+    .distance=2;
+    end;
 }
 
 080-3,98,90,0	script	Package#X21B06	NPC_NO_SPRITE,{
@@ -94,6 +106,9 @@ OnTouch:
     next;
     mes l("5. The woman from the first photo, but without her hat and... floating? hovering? well, she is lying above the abyss.");
     close;
+OnInit:
+    .distance=2;
+    end;
 }
 
 
@@ -101,6 +116,7 @@ OnTouch:
 080-3,85,52,0	script	Alissa#ED1	NPC106,{
     function rushed;
     function ending;
+    if (!isChristmas21()) end;
     if (.stable == 6) ending();
     mesn;
     mesq l("...");
diff --git a/npc/081-3/logic.txt b/npc/081-3/logic.txt
index c2d19bd8..6632746d 100644
--- a/npc/081-3/logic.txt
+++ b/npc/081-3/logic.txt
@@ -174,7 +174,7 @@ OnTouch:
             X21INIT();
 
             .@mapn$="0803@"+X21ID2();
-            warp .@mapn$, 44, 49;
+            warp .@mapn$, 83, 154;
         }
         // NOTE: Right now, anyone can do so?
         else if (@menu == 3) {
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index f871fb4c..396564ae 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -51,6 +51,7 @@ function	script	X21INIT	{
 
 /* You cannot fiddle with party in this region */
 080-1	mapflag	partylock
+080-3	mapflag	partylock
 //081-1	mapflag	partylock
 081-2	mapflag	partylock
 081-3	mapflag	partylock
-- 
cgit v1.2.3-70-g09d2