MK Challenge can still be done, but move the victory core to his rightful place.

2 files changed, 24 insertions, 14 deletions

diff --git a/npc/026-7/boss.txt b/npc/026-7/boss.txt
index 4f282695b..0f8b97119 100644
--- a/npc/026-7/boss.txt
+++ b/npc/026-7/boss.txt
@@ -35,7 +35,31 @@ function _moveNpc {
 } // _moveNpc
 
 // Controls the Event
+// TODO: Autostart
 OnBegin:
+    $@MK_CHALLENGE=true;
+    // Initial assortment of monsters
+    siege_cast("026-7", .name$, 15, TP_TULIM|TP_HURNS|TP_NIVAL);
+    // Spawn the boss himself
+    .MK=monster("026-7", 39, 34, "The Monster King", MonsterKing, 1, .name$+"::OnVictory");
+    immortal(.MK); // Immortal until conditions are met
+    initnpctimer;
+    end;
+
+// Fail-safe Mechanism (will never happen)
+OnTimer60000:
+    consolebug("Warning! final fail-safe mechanism triggered to Monster King.");
+    initnpctimer;
+    end;
+
+// Run every 10 seconds
+OnTimer25000:
+OnTimer15000:
+    consolewarn("Warning, fail-safe mechanism triggered to Monster King.");
+OnTimer10000:
+    // TODO: Heal fully if in immortal mode, fix HP when immortality is lost
+    // TODO: (Also heal if no players are around)
+    initnpctimer:
     end;
 
 // Monster King was defeated - game won
diff --git a/npc/boss/throne.txt b/npc/boss/throne.txt
index 6255b4b31..8c9bea9d6 100644
--- a/npc/boss/throne.txt
+++ b/npc/boss/throne.txt
@@ -109,21 +109,7 @@ OnVictory:
     kamibroadcast("has just defeated the Monster King.", strcharinfo(0));
     stopnpctimer;
     mapwarp("boss", "017-1", 120, 88);
-    $GAME_STORYLINE=5;
     specialeffect(FX_FANFARE, AREA, getcharid(3));
-    // Without the Monster King to rule monsters... TODO Isbamuth
-    setbattleflag("monster_ai", 0x209);
-    setbattleflag("monster_active_enable", false);
-    setbattleflag("mob_count_rate", 25);
-    //charcommand("@reloadbattleconf"); // Careful!
-    donpcevent("@exprate::OnReload");
-    donpcevent("@droprate::OnReload");
-    // Player Reward
-    /*getitembound(AegisShield, 1, 1);
-    dispbottom l("For defeating the Monster King, you've got the Legendary @@.", getitemlink(AegisShield));
-    dispbottom l("This item cannot be traded normally and is a Legendary Item.");
-    dispbottom l("You can transfer it with \"@grantpower\" command. Please contact a GM for more info.");
-    dispbottom l("Protip: If you plan in selling it, it's adviseable to ask for GM mediation."); */
     end;
 }