Allow Game Masters to start the MK Showdown at will. Improve the intro "cutscene"

2 files changed, 10 insertions, 4 deletions

diff --git a/npc/026-6/ctrl.c b/npc/026-6/ctrl.c
index 79539b399..d7f8bf54f 100644
--- a/npc/026-6/ctrl.c
+++ b/npc/026-6/ctrl.c
@@ -34,7 +34,7 @@ L_Warp:
         end;
     }
     // Not a hero
-    if (!$@MK_CHALLENGE && !islegendary() && strcharinfo(0) != $MOST_HEROIC$) {
+    if (!$@MK_CHALLENGE && !islegendary() && strcharinfo(0) != $MOST_HEROIC$ && !is_gm()) {
         dispbottom l("I should wait for %s or one of the heroes to challenge the Monster King.", $MOST_HEROIC$);
         end;
     }
@@ -54,7 +54,7 @@ OnInit:
 026-6,22,40,0,	script	#MKBossFightFire	NPC_HIDDEN,0,0,{
     end;
 OnTouch:
-    if ($@MK_COOLDOWN > gettimetick(2)) {
+    if ($@MK_COOLDOWN > gettimetick(2) && !is_gm()) {
         dispbottom l("I should wait for %s.", ($GAME_STORYLINE >= 5 ? l("the Moubootaur arrange a new puppet") : l("the blood stains to be cleaned up")));
         end;
     }
@@ -76,7 +76,9 @@ OnTouch:
             closeclientdialog;
         }
         // Already started or no difficulty selected
-        if ($@MK_CHALLENGE || !@menuint) end;
+        if ($@MK_CHALLENGE) end;
+        if (!@menuint) cwarp "026-6", 22, 41;
+        // Begin the challenge! It's SHOWDOWN TIME!
         $@MK_CHALLENGE=@menuint;
         kamibroadcast(strcharinfo(0)+" has CHALLENGED the MONSTER KING to a SHOWDOWN!", "WORLD HEART");
         sleep(2500);
diff --git a/npc/026-7/boss.txt b/npc/026-7/boss.txt
index 711882713..4832354b3 100644
--- a/npc/026-7/boss.txt
+++ b/npc/026-7/boss.txt
@@ -193,7 +193,11 @@ OnBegin:
     areamonster("026-7", 30, 30, 45, 45, "Ranged Support", RobinBandit, 12);
     areamonster("026-7", 30, 30, 45, 45, "Ranged Support", DustRevolver, 5);
     areamonster("026-7", 30, 30, 45, 45, "Ranged Support", DustRifle, 3);
-    unittalk(.MK, "You dare to challenge me?!"); // No one will see...
+    // Some "cutscene" most likely no one will see, taking half second
+    sleep(150);
+    unittalk(.MK, "You dare to challenge me?!");
+    sleep(350);
+    unittalk(.MK, "You noobs, you all deserve to die!");
     initnpctimer;
     end;