Skip some debug override functions from Doomsday Showdown

(For Winds of Calamity subevent)

1 files changed, 4 insertions, 20 deletions

diff --git a/npc/099-5/boss.txt b/npc/099-5/boss.txt
index 01ea29f7..646e908c 100644
--- a/npc/099-5/boss.txt
+++ b/npc/099-5/boss.txt
@@ -616,7 +616,6 @@ OnEpilogue1:
     mes "[Zax De'Kagen]";
     mes l("Thanks for the %s of fun you gave me!", $@DD5_TSPENT$);
     next;
-    if (debug) goto L_Epilogue1Part22;
     mes "[Zax De'Kagen]";
     mes l("This was not in the plan, but was fun nonetheless. Worth the detour.");
     next;
@@ -728,11 +727,7 @@ OnEpilogue2:
     mapannounce "099-5", "Zax De'Kagen : Now that I know where Nu'Rem is burried, nothing can stop me." , 0;
     npctalk2 "Zax De'Kagen#0", "Now that I know where Nu'Rem is burried, nothing can stop me.";
 
-    // FIXME DEBUG DEBUG DEBUG FIXME
-    if (debug)
-        addnpctimer 2000, "#TMWFinalExam::OnEpilogue5";
-    else
-        addnpctimer 5000, "#TMWFinalExam::OnEpilogue3";
+    addnpctimer 5000, "#TMWFinalExam::OnEpilogue3";
     end;
 
 OnEpilogue3:
@@ -764,11 +759,7 @@ OnEpilogue6:
     mapannounce "099-5", "Jande : With Zax gone, I could finally arrive here." , 0;
     npctalk2 "Jande#0", "With Zax gone, I could finally arrive here.";
 
-    // FIXME DEBUG DEBUG DEBUG FIXME
-    if (debug)
-        addnpctimer 2000, "#TMWFinalExam::OnEpilogue15";
-    else
-        addnpctimer 5000, "#TMWFinalExam::OnEpilogue7";
+    addnpctimer 5000, "#TMWFinalExam::OnEpilogue7";
     end;
 
 OnEpilogue7:
@@ -823,11 +814,7 @@ OnEpilogue15:
     $@DD5_STATUS = 9;
     mapannounce "099-5", "##1(Talk to Gema III to embark)" , 0;
     npctalk "Gema III", "##1(Talk to Gema III to embark)";
-    // FIXME DEBUG DEBUG DEBUG FIXME
-    if (debug)
-        addnpctimer 2000, "#TMWFinalExam::OnEpilogue25";
-    else
-        addnpctimer 30000, "#TMWFinalExam::OnEpilogue16";
+    addnpctimer 30000, "#TMWFinalExam::OnEpilogue16";
     end;
 
 
@@ -1288,10 +1275,7 @@ L_Yes:
     // Stop rendering the map and Embark - Player effect only
     mapmask 1 | 128;
     changemusic "099-5","epilogue.ogg";
-    if (debug)
-        addtimer 5000, "Gema III::OnDebugPrompt";
-    if (!debug)
-        addtimer 300, "Gema III::OnStart";
+    addtimer 300, "Gema III::OnStart";
     closeclientdialog;
     close;