A lot of stuff ceased to work as it used to in Doomsday Act 5, update docs.

3 files changed, 28 insertions, 9 deletions

diff --git a/npc/099-2/logic.txt b/npc/099-2/logic.txt
index 66390270..6376129d 100644
--- a/npc/099-2/logic.txt
+++ b/npc/099-2/logic.txt
@@ -526,6 +526,7 @@ OnJanitor:
     mes "Not only that, but he may become immune to certain sources of damage.";
     mes "It is a killer move which also allows him to assemble an army right after.";
     mes "I do believe there is a weakness, though. Something about excessive fur growth?";
+    mesc l("It obviously did not work for them."); // FIXME: Shear broken
 	close;
 }
 
@@ -575,8 +576,9 @@ OnJanitor:
 	mes "They fly very fast and can quickly swarm you.";
     mes "Their damage and health is not important.";
     mes "But if not careful, they will overwhelm you.";
-    mes "Also, did you hear about lay on hands on overlapping dimensions?";
-    mes "This have nothing to do with bats but is a cool fact!";
+    // FIXME #inma is now allowed
+    //mes "Also, did you hear about lay on hands on overlapping dimensions?";
+    //mes "This have nothing to do with bats but is a cool fact!";
 	close;
 }
 
@@ -605,6 +607,8 @@ OnJanitor:
     mes "I think what should sense magic, might sense mana devoid-ness as well.";
     mes "In this case, such would be the only way to know how far of killing we are.";
     mes "But I'm not sure if such trick would work except on support role.";
+    next;
+    mesc l("The following word was written in blood: %s", col("miteyo", 1));
 	close;
 }
 
@@ -615,8 +619,8 @@ OnJanitor:
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-    mes "Reading this is as hard as finding a needle in a haystack.";
-    if (debug) goto L_close;
+    //mes "Reading this is as hard as finding a needle in a haystack.";
+    //if (debug) goto L_close;
     if (countitem(FlawedLens) < 1) goto L_Tools;
 	mes "Although the painting also has no artistic value on its own...";
     mes "Something tells you there is something ominous with it.";
diff --git a/npc/099-5/boss.txt b/npc/099-5/boss.txt
index 9ee67a09..467c5295 100644
--- a/npc/099-5/boss.txt
+++ b/npc/099-5/boss.txt
@@ -964,10 +964,25 @@ OnInit:
     setarray $@DD5MB_AVERAGE, VoidScorpion, VoidShroom, VoidScorpion, VoidShroom, VoidScorpion, VoidShroom, VoidSoldier, VoidMouboo;
     setarray $@DD5MB_STRONG, VoidArchant, VoidSlime, VoidSnake, VoidArchant, VoidSlime, VoidSnake, VoidArchant, VoidSlime, VoidSnake;
     setarray $@DD5MB_BOSSLV, Flashmob, Koyntety, Tengu, Sasquatch, ManaSlayer, Enchanter, DoomGolem, Tengu;
-    // Flower VoidFlower, Mouboo VoidMouboo
-    end;
-
-OnMiteyo:
+    // In theory, pattern ID must be between 1~9
+    // To set $@p1$~$@p9$ with the PERL expression
+    // But as we're only using $@p0$ (full string)
+    // the value itself is meaningless
+    .pid=getnpcid();
+    debugmes "Doomsday: Pattern %d", .pid;
+    //I'm not going to learn PERL just for that
+    defpattern(.pid, "^(.*)$", "OnTalkNearby");
+    activatepset(.pid);
+    end;
+
+OnTalkNearby:
+    // not very obvious stuff by gumi, $@p0$ contains the whole string
+    // so we must cut it. Could use $@p1$ if perl was proper but... meh.
+    .@no_nick$ = strip(substr($@p0$, getstrlen(strcharinfo(PC_NAME)) + 3, getstrlen($@p0$) - 1));
+    .@message$ = strtoupper(.@no_nick$);
+    // Only react if the message is what we want to hear
+    if (.@message$ != "MITEYO")
+        end;
     if ($DOOMSDAY != 3)
         end;
     if ($@DD5_HP < 1)
diff --git a/npc/magic/level0-reapercry.txt b/npc/magic/level0-reapercry.txt
index 1b6f07d5..633f9a05 100644
--- a/npc/magic/level0-reapercry.txt
+++ b/npc/magic/level0-reapercry.txt
@@ -223,6 +223,6 @@ L_Exec5:
     @reapercry = 0;
     getexp 100000, 0;
     misceffect FX_MAGIC_TELEPORT, strcharinfo(0);
-    warp "099-7", 75, 36;
+    warp "099-7", 95, 52;
     end;
 }