summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/annuals/2022.txt22
1 files changed, 12 insertions, 10 deletions
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;