Fires Of Steam, Final Showdown - Initial Version

2 files changed, 22 insertions, 5 deletions

diff --git a/npc/functions/mkbot.txt b/npc/functions/mkbot.txt
index 7fc290a24..4f1037488 100644
--- a/npc/functions/mkbot.txt
+++ b/npc/functions/mkbot.txt
@@ -16,7 +16,7 @@
 //  2 - The Monster King is currently sieging towns at random
 //  3 - The Monster King is preparing to perfom the Rite and Lightbringer seeks
 //      a wielder
-//  4 - The Rite is in progress. Players must walk to MK evil lair and fight.
+//  4 - The Rite is CONCLUDED. Players must walk to MK evil lair and fight.
 //  5 - The Monster King is dead. Or something. Depends on players.
 //
 // $MK_TEMPVAR meaning depends on GAME STORYLINE
@@ -104,7 +104,7 @@ OnTimer90000:
 
     // The Monster King will not move anymore because story
     if ($GAME_STORYLINE == 0 ||
-        $GAME_STORYLINE == 4) {
+        $GAME_STORYLINE == 5) {
         if (.mp$ != "boss")
             unitwarp($@MK, "boss", 45, 45);
         initnpctimer;
@@ -163,12 +163,12 @@ OnTimer90000:
 
     // Siege events (req. 300 aggro, 3 users, and 70% chances to begin)
     if ($@MK_AGGRO >= ($GAME_STORYLINE == 2 ? 300 : 900) && .users >= 3 && rand2(0,100) < 70 &&
-        is_between(1, 3, $GAME_STORYLINE) && $@MK_THROTTLE < gettimetick(2)){
+        is_between(1, 4, $GAME_STORYLINE) && $@MK_THROTTLE < gettimetick(2)){
         // Delta handles the compulsory wait time between waves.
         // 6 hours normally, 24 hours if the army is in disarray.
         .@delta=6;
         $@SIEGE_ABORTED = false;
-        if ($GAME_STORYLINE == 3)
+        if ($GAME_STORYLINE >= 3)
             .@delta=24;
         // Tulimshar
         if (compare(.mp$, "003-")) {
@@ -203,7 +203,7 @@ OnTimer90000:
     // If a player is nearby while the Monster King prepares, event may happen
     // Minimum 60 Aggro
     if (.nearby > 1 && $@MK_AGGRO >= 80 &&
-        ($GAME_STORYLINE == 1 || ($GAME_STORYLINE == 3 && $@MK_THROTTLE >= gettimetick(2)) )){
+        ($GAME_STORYLINE == 1 || ($GAME_STORYLINE >= 3 && $@MK_THROTTLE >= gettimetick(2)) )){
         // We should decide event kind, but that's NYI
         announce ("Monster King: I smell humans! Humans must die!"), bc_map|bc_npc;
 
@@ -242,6 +242,8 @@ OnTimer90000:
         // Apply the changes
         $GAME_STORYLINE=3;
         $MK_TEMPVAR=0; // In past, we forced 1 month wait. Now we have KW mechs...
+        $MANA_BLVL-=10; // Set level to 20~30
+        $MANA_JLVL-=5; // Set job level to 15
     }
 
     // We're done, restart loop timer
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index 9192db862..7f7152d41 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -60,6 +60,17 @@ function	script	GameNews	{
         mesc l("Only then we may have peace!!");
         next;
         break;
+    //////////////////////////////////////////////////////////////////
+    case 105:
+        mes "";
+        mes ".:: "+ l("The Final Act") + " ::.";
+        next;
+        mesc l("The Moubootaur is the final opponent.");
+        mesc l("How many lives will be claimed until he is put to rest?");
+        next;
+        mesc l("According to the prophecy, he'll not stop, until life itself as we know today is removed from existence.");
+        next;
+        break;
     default:
         break;
     }
@@ -317,6 +328,9 @@ function	script	Journalman	{
             mesc l("We must defeat the Monster King on his evil lair!");
             mesc l("Only then we may have peace!!");
             break;
+        case 5:
+            mesc l("Moubootaur, please spare me...");
+            break;
         default:
             Exception(l("I do now know what this means: GS-@@-ICXN-@@", $GAME_STORYLINE, $MK_TEMPVAR), RB_DEFAULT|RB_SPEECH); break;
     }
@@ -327,6 +341,7 @@ function	script	Journalman	{
         menuint
             l("Thanks for your help!"), 1,
             l("Event News"), 0,
+            rif($GAME_STORYLINE >= 5, l("The Final Act")), 105,
             rif($GAME_STORYLINE >= 4, l("The Fifth Act")), 104,
             rif($GAME_STORYLINE >= 3, l("The Fourth Act")), 103,
             rif($GAME_STORYLINE >= 2, l("The Third Act")), 102,