Disable DD5 Debug Commands.

Change even more Test Server Debug Logic to withdraw more content.
Missing code contributed by Gumi for the next arc.

3 files changed, 7 insertions, 40 deletions

diff --git a/world/map/npc/099-2/logic.txt b/world/map/npc/099-2/logic.txt
index 45551e12..870ec87e 100644
--- a/world/map/npc/099-2/logic.txt
+++ b/world/map/npc/099-2/logic.txt
@@ -20,45 +20,8 @@ OnStorage:
     openstorage;
     end;
 
-// FIXME DEBUG DEBUG DEBUG FIXME
-OnDebug:
-    debugmes "CHEAT - JS33";
-    if (!debug || $DOOMSDAY != 3 || GM < GM_SYSOP)
-        end;
-    set $@DD5_TSWITCH, 18;
-    set $@DD5_OPENSESAME, 1;
-    message strcharinfo(0), "DOOMSDAY ACT 5 DEBUG SUCCESSFUL";
-    end;
-
-// FIXME DEBUG DEBUG DEBUG FIXME
-OnDebugDamage:
-    if (!debug || $DOOMSDAY != 3 || GM < GM_SYSOP)
-        end;
-    if ($@DD5_HP <= 1000)
-        end;
-    set $@DD5_HP, max(1000, $@DD5_HP-2500);
-    message strcharinfo(0), "Battle: Damage -2500 HP";
-    callfunc "FinalExamAttack";
-    end;
-
-// FIXME DEBUG DEBUG DEBUG FIXME
-OnDebugX:
-    debugmes "CHEAT - JS99";
-    if (!debug || $DOOMSDAY != 3 || GM < GM_SYSOP || $@DD5_STATUS)
-        end;
-    set $@DD5_HP, 100;
-    set $@DD5_STATUS, 7;
-    set $@DD5_BEGIN, gettimetick(2);
-    warp "099-5", 0, 0;
-    fakenpcname "Zax De'Kagen#0", "Zax De'Kagen#0", 1142;
-    message strcharinfo(0), "DOOMSDAY ACT 5 SUPER DEBUG SUCCESSFUL";
-    end;
-
 OnInit:
     // Register commands
-    registercmd "@js33", strnpcinfo(0)+"::OnDebug";
-    registercmd "@js67", strnpcinfo(0)+"::OnDebugDamage";
-    registercmd "@js99", strnpcinfo(0)+"::OnDebugX";
     registercmd "#storage", strnpcinfo(0)+"::OnStorage";
     end;
 }
@@ -1029,6 +992,7 @@ L_Enable:
     if(@npc_check) end;
 
     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.";
@@ -1049,7 +1013,9 @@ L_Tools:
 L_UseLens:
     delitem "FlawedLens", 1;
     getexp 10000, 10000;
+    mes "~~~graphics/images/kirin.png~";
     mes "[@@https://wiki.themanaworld.org/images/5/57/Kirin_by_clef.jpg|There is the image of a woman on it@@].";
+    next;
     mes "";
     mes "You can make out the following words on it:";
     mes "In memoriam ..... Kirin De'Kagen.";
@@ -1165,7 +1131,7 @@ L_UseLens:
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-    if (rand(6) % 2 == 0)
+    if (rand(60) % 2 == 0)
         goto L_Shock;
     goto L_Potion;
 
diff --git a/world/map/npc/099-5/boss.txt b/world/map/npc/099-5/boss.txt
index d89f60d2..8929c22d 100644
--- a/world/map/npc/099-5/boss.txt
+++ b/world/map/npc/099-5/boss.txt
@@ -375,7 +375,7 @@ OnWarn0:
     set $@DD5_PTS, 0;
     // FIXME DEBUG DEBUG DEBUG FIXME
     if (debug)
-        addnpctimer 10000, "#TMWFinalExam::OnBegin";
+        addnpctimer 15000, "#TMWFinalExam::OnBegin";
     else
         addnpctimer 90000, "#TMWFinalExam::OnWarn1";
     end;
@@ -648,6 +648,7 @@ OnEpilogue1:
     mes "[Zax De'Kagen]";
     mes "Thanks for the "+$@DD5_TSPENT$+" of fun you gave me!";
     next;
+    if (debug) goto L_Epilogue1Part22;
     mes "[Zax De'Kagen]";
     mes "This was not in the plan, but was fun nonetheless. Worth the detour.";
     next;
diff --git a/world/map/npc/magic/level1-detect-magic.txt b/world/map/npc/magic/level1-detect-magic.txt
index f22be844..e8a588a5 100644
--- a/world/map/npc/magic/level1-detect-magic.txt
+++ b/world/map/npc/magic/level1-detect-magic.txt
@@ -13,7 +13,7 @@
             strnpcinfo(0) + "::OnNearbyNpc";
     if (getmap() == "099-4")
         addtimer 10, "#TMWFinalExam::OnMiteyo";
-    if (getmap() == "099-5" && debug)
+    if (getmap() == "099-5")
         addtimer 10, "#TMWFinalExam::OnMiteyo";
     callfunc "magic_exp";
     end;