4 files changed, 15 insertions, 16 deletions
diff --git a/world/map/npc/027-3/general_krukan_door.txt b/world/map/npc/027-3/general_krukan_door.txt
index 9ac26203..22134a4b 100644
--- a/world/map/npc/027-3/general_krukan_door.txt
+++ b/world/map/npc/027-3/general_krukan_door.txt
@@ -3,10 +3,9 @@
 
 027-3,82,88,0|script|#GeneralDoor1|45,1,0
 {
-    if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT1 != 0) )
+    if ( ($@CRYPT_FIGHT1 != 0) )
         goto L_NoKeys;
 
-    delitem "CryptKey", 10;
     warp "027-6",39,60;
     goto L_Close;
 
diff --git a/world/map/npc/027-4/general_razha_door.txt b/world/map/npc/027-4/general_razha_door.txt
index c7adf137..7d947368 100644
--- a/world/map/npc/027-4/general_razha_door.txt
+++ b/world/map/npc/027-4/general_razha_door.txt
@@ -3,10 +3,9 @@
 
 027-4,73,76,0|script|#GeneralDoor2|45,1,0
 {
-    if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT2 != 0) )
+    if ( ($@CRYPT_FIGHT2 != 0) )
         goto L_NoKeys;
 
-    delitem "CryptKey", 10;
     warp "027-7",39,60;
     goto L_Close;
 
diff --git a/world/map/npc/027-5/general_terogan_door.txt b/world/map/npc/027-5/general_terogan_door.txt
index 93f4d8c1..9f43b5c9 100644
--- a/world/map/npc/027-5/general_terogan_door.txt
+++ b/world/map/npc/027-5/general_terogan_door.txt
@@ -3,10 +3,9 @@
 
 027-5,70,25,0|script|#GeneralDoor3|45,1,0
 {
-    if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT3 != 0) )
+    if ( ($@CRYPT_FIGHT3 != 0) )
         goto L_NoKeys;
 
-    delitem "CryptKey", 10;
     warp "027-8",39,60;
     goto L_Close;
 
diff --git a/world/map/npc/annuals/2022.txt b/world/map/npc/annuals/2022.txt
index e215d7c2..3c2d4dbb 100644
--- a/world/map/npc/annuals/2022.txt
+++ b/world/map/npc/annuals/2022.txt
@@ -12,7 +12,7 @@ OnFirst:
     if (strcharinfo(0) != "Blanc" && GM < G_SYSOP) end;
     wgm "==> CRC Day Phase 1 Started by "+strcharinfo(0);
     set $@CRC22, 1;
-    enablenpc "Unknown Ship";
+    enablenpc "Red Bearer";
     initnpctimer;
     goto OnTimer30000;
 
@@ -20,8 +20,9 @@ OnSecond:
     if (strcharinfo(0) != "Cerise" && GM < G_SYSOP) end;
     wgm "==> CRC Day Phase 2 Started by "+strcharinfo(0);
     set $@CRC22, 2;
-    disablenpc "Unknown Ship";
-    enablenpc "Zax De'Kagen#CRC";
+    disablenpc "Red Bearer";
+    //enablenpc "Zax De'Kagen#CRC";
+    // set the sprite (implies enablenpc)
     fakenpcname "Zax De'Kagen#CRC", "Zax De'Kagen#CRC", 1142;
     initnpctimer;
     goto L_Extra;
@@ -30,7 +31,7 @@ OnThird:
     if (strcharinfo(0) != "Cerise" && GM < G_SYSOP) end;
     wgm "==> CRC Day Phase 3 Started by "+strcharinfo(0);
     set $@CRC22, 3;
-    disablenpc "Enemy Ship";
+    disablenpc "Halifax";
     stopnpctimer;
     end;
 
@@ -247,7 +248,7 @@ OnInit:
 }
 
 // Puppets
-008-1,140,72,0|script|Enemy Ship|395
+008-1,140,74,0|script|Halifax|395
 {
     end;
 OnInit:
@@ -256,7 +257,7 @@ OnInit:
 }
 
 // Puppets
-018-1,142,74,0|script|Unknown Ship|395
+018-1,142,75,0|script|Red Bearer|395
 {
     end;
 OnInit:
@@ -274,11 +275,12 @@ OnInit:
 }
 
 // Puppets
-020-1,76,85,0|script|Zax De'Kagen#CRC|425
+020-1,76,85,0|script|Zax De'Kagen#CRC|400
 {
-    mes "[Zax De'Kagen]";
-    mes "\"I will not tolerate people trying to defile my world. I'm sealing the lake, and that's final.\"";
-    close;
+    //mes "[Zax De'Kagen]";
+    //mes "\"I will not tolerate people trying to defile my world. I'm sealing the lake, and that's final.\"";
+    //close;
+    end;
 OnInit:
     disablenpc strnpcinfo(0);
     end;