At Monster King defeat, mana stone no longer kills

7 files changed, 59 insertions, 3 deletions

diff --git a/npc/003-0-2/manastone.txt b/npc/003-0-2/manastone.txt
index 6ab980ccb..2bdbf1d53 100644
--- a/npc/003-0-2/manastone.txt
+++ b/npc/003-0-2/manastone.txt
@@ -66,7 +66,8 @@ L_LevelUp:
     if (MAGIC_LVL) mes l("More Magic Power is granted to you, but you die from it.");
     MAGIC_LVL = MAGIC_LVL+1;
     sk_lvup(AL_DP);
-    die();
+    if ($GAME_STORYLINE < 5)
+        die();
     close;
 
 OnInit:
diff --git a/npc/011-1/manastone.txt b/npc/011-1/manastone.txt
index 3d8df2b5e..7cb410790 100644
--- a/npc/011-1/manastone.txt
+++ b/npc/011-1/manastone.txt
@@ -83,7 +83,8 @@ L_LevelUp:
     @deathpenalty_realvaljob=readparam(JobExp);
     @deathpenalty_override=1;
     */
-    die();
+    if ($GAME_STORYLINE < 5)
+        die();
     close;
 
 function dearLord {
diff --git a/npc/026-3/ctrl.c b/npc/026-3/ctrl.c
index 4ecacfa93..059b903b6 100644
--- a/npc/026-3/ctrl.c
+++ b/npc/026-3/ctrl.c
@@ -33,7 +33,7 @@ OnTouch:
     if (getq(General_Fortress) > 4) goto L_Warp;
     mesc l(".:: Impregnable Fortress, %sF ::.", "B3"), 3;
     msObjective(getq(General_Fortress) == 5, l("* Flip all four switches"));
-    msObjective($MK_TEMPVAR >= MKIF_LV_B3F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B4F));
+    msObjective($MK_TEMPVAR >= MKIF_LV_B4F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B4F));
     mes "";
     mesc l("Hint: You cannot unflip a switch, but they unflip every 12 hours.");
     close;
diff --git a/npc/026-6/_import.txt b/npc/026-6/_import.txt
index 6ac4f71ef..6f0d3f607 100644
--- a/npc/026-6/_import.txt
+++ b/npc/026-6/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/026-6/_mobs.txt",
 "npc/026-6/_warps.txt",
+"npc/026-6/ctrl.c",
diff --git a/npc/026-6/ctrl.c b/npc/026-6/ctrl.c
new file mode 100644
index 000000000..f443e331a
--- /dev/null
+++ b/npc/026-6/ctrl.c
@@ -0,0 +1,40 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//   The Impregnable Fortress Control Files
+// Quest: General_Fortress
+//  (MaxFloor+2, internal, internal)
+
+// The antechamber has some traps you should avoid, but beyond the Blood Pact map
+// effect, it only has some support NPCs (banker and healer) if you completed the
+// Moubootaur Showdown earlier.
+
+// TODO: Validate the use of MKIF_LV_BXF
+// TODO: The main NPC which lets you out of here
+// TODO: The traps
+// TODO: The boss chamber (also, are mapflags working? This should be a Blood Pact)
+026-6,21,70,0,	script	#026-6Gate	NPC_FANCY_CIRCLE,1,0,{
+    if (getq(General_Fortress) < 6) { die(); end; }
+    mesc l(".:: Impregnable Fortress, %sF ::.", "B6"), 3;
+    msObjective($MK_TEMPVAR >= MKIF_LV_B7F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B7F));
+    mes "";
+    mesc l("Hint: The Boss Chamber lies herein ahead.");
+    close;
+
+L_Warp:
+    // Not unlocked
+    if ($GAME_STORYLINE >= 3 && $MK_TEMPVAR < MKIF_LV_B7F) {
+        mesc l("The gate is sealed shut."), 1;
+        mesc l("The monster army is still strong on this floor!"), 1;
+        mesc l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B7F), 1;
+        close;
+    }
+    //warp "026-7", X, Y; // Or maybe just a slide
+    end;
+
+OnInit:
+	.distance=3;
+    end;
+}
+
diff --git a/npc/026-7/_import.txt b/npc/026-7/_import.txt
index a43729e17..c79c41acd 100644
--- a/npc/026-7/_import.txt
+++ b/npc/026-7/_import.txt
@@ -1,3 +1,4 @@
 // Map 026-7: Boss Chamber
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/026-7/_warps.txt",
+"npc/026-7/boss.txt",
diff --git a/npc/026-7/boss.txt b/npc/026-7/boss.txt
new file mode 100644
index 000000000..b2df2a388
--- /dev/null
+++ b/npc/026-7/boss.txt
@@ -0,0 +1,12 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//   The Impregnable Fortress Control Files - Boss Chamber - Final Showdown
+
+-	script	Impregnable#B7F	NPC_HIDDEN,{
+    end;
+
+
+}
+