CRC Day Updates

2 files changed, 16 insertions, 10 deletions

diff --git a/world/map/npc/annuals/2022.txt b/world/map/npc/annuals/2022.txt
index 3c4aa6de..e215d7c2 100644
--- a/world/map/npc/annuals/2022.txt
+++ b/world/map/npc/annuals/2022.txt
@@ -9,7 +9,7 @@
     end;
 
 OnFirst:
-    if (strcharinfo(0) != "Dave Sugar" && GM < G_SYSOP) end;
+    if (strcharinfo(0) != "Blanc" && GM < G_SYSOP) end;
     wgm "==> CRC Day Phase 1 Started by "+strcharinfo(0);
     set $@CRC22, 1;
     enablenpc "Unknown Ship";
@@ -17,15 +17,17 @@ OnFirst:
     goto OnTimer30000;
 
 OnSecond:
-    if (strcharinfo(0) != "Zax De'Kagen" && GM < G_SYSOP) end;
+    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";
+    fakenpcname "Zax De'Kagen#CRC", "Zax De'Kagen#CRC", 1142;
     initnpctimer;
     goto L_Extra;
 
 OnThird:
-    if (strcharinfo(0) != "Red Reidy" && GM < G_SYSOP) end;
+    if (strcharinfo(0) != "Cerise" && GM < G_SYSOP) end;
     wgm "==> CRC Day Phase 3 Started by "+strcharinfo(0);
     set $@CRC22, 3;
     disablenpc "Enemy Ship";
@@ -271,3 +273,14 @@ OnInit:
     end;
 }
 
+// Puppets
+020-1,76,85,0|script|Zax De'Kagen#CRC|425
+{
+    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;
+OnInit:
+    disablenpc strnpcinfo(0);
+    end;
+}
+
diff --git a/world/map/npc/functions/doomsday.txt b/world/map/npc/functions/doomsday.txt
index 612bd916..6d5cabe3 100644
--- a/world/map/npc/functions/doomsday.txt
+++ b/world/map/npc/functions/doomsday.txt
@@ -157,12 +157,6 @@ L_NivalCouncil:
 
 L_Zealite:
     set $DOOMSDAY_SUMMON, 2;
-    disablenpc "Soul Menhir#deadmire";
-    disablenpc "Soul Menhir#hurnscald";
-    disablenpc "Soul Menhir#nivalis";
-    disablenpc "Soul Menhir#tulimshar";
-    enablenpc "Chest#Zealite";
-    //disablenpc "Soul Menhir#candor";
     gmlog strcharinfo(0) + " changed the availability of #manatez and Savior Armor.";
     return;
 
@@ -905,7 +899,6 @@ OnDD4SurvivorReward:
 ////////////////////////////////////////////////////////////////////////////////
 // Act 5 utils
 L_Doomsday5:
-    enablenpc "Chest#DarkRose";
     if ($DOOMSDAY_SUMMON == 2)
         goto L_MenhirUpdate;
     end;