Fix a typo on Alissa ID. Update Boss Chamber 1 Front Gate (handle defeat)

3 files changed, 15 insertions, 5 deletions

diff --git a/npc/080-3/cutscene.txt b/npc/080-3/cutscene.txt
index b4a2d452..e0417b07 100644
--- a/npc/080-3/cutscene.txt
+++ b/npc/080-3/cutscene.txt
@@ -114,8 +114,8 @@ OnInit:
 }
 
 
-// FIXME: Alissa's NPC ID; Make more clear the sequence to players.
-080-3,85,52,0	script	Alissa#ED1	NPC106,{
+// FIXME: Sequence is told by Santa... When you're locked down here =/
+080-3,85,52,0	script	Alissa#ED1	NPC_ALISSA,{
     function rushed;
     function ending;
     if (!isChristmas21()) end;
diff --git a/npc/081-2/logic.txt b/npc/081-2/logic.txt
index acaea897..9f1982c7 100644
--- a/npc/081-2/logic.txt
+++ b/npc/081-2/logic.txt
@@ -11,14 +11,23 @@ OnTouch:
     if (!'XMAS21AMBUSH) end;
     if (!'XMAS21CANDLE) end;
     if (!'XMAS21TREE) end;
-
     /* We need to determine if instance exists and is needed */
     X21INIT();
 
 	.@mapn$="0813@"+X21ID2();
+
+    /* Boss Chamber may be... unique */
+    if ('LOCKD) {
+        if (getmapusers(.@mapn$) > 0) {
+            dispbottom l("Northern Lights")+" : "+l("This chamber is full.");
+            end;
+        } else {
+            // Cleanup the chamber
+            doevent instance_npcname("Pentagram#Xmas21A", instance_id())+"::OnClean";
+        }
+    }
+
     warp .@mapn$, 44, 49;
-    // FIXME: Cleanup if inst returns -4
-    //doevent instance_npcname("Pentagram#Xmas21A", .@inst)+"::OnClean";
     end;
 }
 
diff --git a/npc/081-3/logic.txt b/npc/081-3/logic.txt
index 02f353b1..ad18e529 100644
--- a/npc/081-3/logic.txt
+++ b/npc/081-3/logic.txt
@@ -149,6 +149,7 @@ OnInit:
     .distance=2;
     .BC1ID = 0;
     .CYCLE = 0;
+    'LOCKD = false;
     end;
 }