Bugfixes (actual testing)

8 files changed, 28 insertions, 24 deletions

diff --git a/npc/026-0/ctrl.c b/npc/026-0/ctrl.c
index bc2723499..ea7233278 100644
--- a/npc/026-0/ctrl.c
+++ b/npc/026-0/ctrl.c
@@ -13,10 +13,10 @@ OnTouch:
     if (getq(General_Fortress) > 1) goto L_Warp;
     mesc l(".:: Impregnable Fortress, %sF ::.", "B0"), 3;
     msObjective(getq(General_Fortress) == 2, l("* Solo \"The Yetifly\""));
-    msObjective($MK_TEMPVAR < MKIF_LV_B1F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B1F));
+    msObjective($MK_TEMPVAR >= MKIF_LV_B1F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B1F));
     mes "";
     mesc l("Hint: Stomp! Stomp! Stomp! Walk around.");
-    end;
+    close;
 
 L_Warp:
     // Not unlocked
diff --git a/npc/026-1/ctrl.c b/npc/026-1/ctrl.c
index 702180e3d..e5cc71480 100644
--- a/npc/026-1/ctrl.c
+++ b/npc/026-1/ctrl.c
@@ -13,10 +13,10 @@ OnTouch:
     if (getq(General_Fortress) > 2) goto L_Warp;
     mesc l(".:: Impregnable Fortress, %sF ::.", "B1"), 3;
     msObjective(getq(General_Fortress) == 3, l("* Obtain clearance"));
-    msObjective($MK_TEMPVAR < MKIF_LV_B2F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B2F));
+    msObjective($MK_TEMPVAR >= MKIF_LV_B2F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B2F));
     mes "";
     mesc l("Hint: You might need to come back later.");
-    end;
+    close;
 
 L_Warp:
     // Not unlocked
@@ -26,7 +26,7 @@ L_Warp:
         mesc l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B2F), 1;
         close;
     }
-    warp "026-2", 32, 97;
+    warp "026-2", 32, 96;
     end;
 
 // Disarm & reset everything
diff --git a/npc/026-2/_config.txt b/npc/026-2/_config.txt
index b29c00822..44830e690 100644
--- a/npc/026-2/_config.txt
+++ b/npc/026-2/_config.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 026-2: The Impregnable Fortress (B2F) conf
 
-026-2,32,97,0	script	#026-2_32_97	NPC_HIDDEN,0,0,{
+026-2,32,96,0	script	#026-2_32_96	NPC_HIDDEN,0,0,{
 	end;
 OnTouch:
 	doevent "#DungeonCore::OnCurse";
diff --git a/npc/026-2/_warps.txt b/npc/026-2/_warps.txt
index a80657fb6..d65a7564e 100644
--- a/npc/026-2/_warps.txt
+++ b/npc/026-2/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 026-2: The Impregnable Fortress (B2F) warps
-026-2,32,98,0	warp	#026-2_32_98	0,0,026-1,60,27
+026-2,32,97,0	warp	#026-2_32_97	0,0,026-1,60,27
diff --git a/npc/026-2/ctrl.c b/npc/026-2/ctrl.c
index 92914d45a..0864d3265 100644
--- a/npc/026-2/ctrl.c
+++ b/npc/026-2/ctrl.c
@@ -4,7 +4,7 @@
 // Description:
 //   The Impregnable Fortress Control Files
 // Quest: General_Fortress
-//  (MaxFloor+1, internal, internal)
+//  (MaxFloor+2, internal, internal)
 
 026-2,62,91,0	script	Books#B2F	NPC_NO_SPRITE,{
     mesc l("These books seem to belong to the fortress keeper. They seem more important than the others.");
@@ -33,14 +33,14 @@ OnInit:
     end;
 
 OnTouch:
-    if (getq(General_Fortress) > 4) goto L_Warp;
+    //if (getq(General_Fortress) > 3) goto L_Warp;
     mesc l(".:: Impregnable Fortress, %sF ::.", "B2"), 3;
     mesc l("Living Quarters")+" ↑", 3;
-    msObjective(getq(General_Fortress) == 4, l("* Chant magic words"));
-    msObjective($MK_TEMPVAR < MKIF_LV_B3F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B3F));
+    msObjective(getq(General_Fortress) >= 4, l("* Chant magic words"));
+    msObjective($MK_TEMPVAR >= MKIF_LV_B3F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B3F));
     mes "";
     mesc l("Hint: Go read a book if you're bored.");
-    end;
+    close;
 
 L_Warp:
     // Not unlocked
@@ -59,14 +59,14 @@ L_Warp:
     end;
 
 OnTouch:
-    if (getq(General_Fortress) > 4) goto L_Warp;
+    if (getq(General_Fortress) > 3) goto L_Warp;
     mesc l(".:: Impregnable Fortress, %sF ::.", "B2"), 3;
     mesc l("Throne Room")+" ↑", 3;
     msObjective(getq(General_Fortress) == 4, l("* Chant magic words"));
-    msObjective($MK_TEMPVAR < MKIF_LV_B3F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B3F));
+    msObjective($MK_TEMPVAR >= MKIF_LV_B3F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B3F));
     mes "";
     mesc l("Hint: Go read a book if you're bored.");
-    end;
+    close;
 
 L_Warp:
     // Not unlocked
@@ -80,14 +80,14 @@ L_Warp:
     end;
 
 OnTalkNearby:
-    if (getq2(General_Fortress) != 1 && getq(General_Fortress) != 3) end;
+    if (getq2(General_Fortress) != 1 || getq(General_Fortress) != 3) end;
     // not very obvious stuff by gumi
     .@no_nick$ = strip(substr($@p0$, getstrlen(strcharinfo(PC_NAME)) + 3, getstrlen($@p0$) - 1));
     .@message$ = strtoupper(.@no_nick$);
     // TODO: I don't know his true name either, but the latin part is in 006-10
     if (.@message$ == "PER ASPER AD SALVOS") {
         setq General_Fortress, 4, 0, 0;
-        specialeffect(FX_CIRCLE, SELF, getcharid(3));
+        specialeffect(FX_MGWARP, SELF, getcharid(3));
     }
     end;
 OnInit:
diff --git a/npc/026-3/ctrl.c b/npc/026-3/ctrl.c
index fd8c52138..820c50bb9 100644
--- a/npc/026-3/ctrl.c
+++ b/npc/026-3/ctrl.c
@@ -4,7 +4,7 @@
 // Description:
 //   The Impregnable Fortress Control Files
 // Quest: General_Fortress
-//  (MaxFloor+1, internal, internal)
+//  (MaxFloor+2, internal, internal)
 
 // 0263Event(switchID)
 function	script	0263Event	{
@@ -19,7 +19,7 @@ function	script	0263Event	{
     // And if all switches are flipped...!
     if (getq2(General_Fortress) == 15) {
         setq General_Fortress, 5, 0, 0;
-        specialeffect(FX_CIRCLE, SELF, getcharid(3));
+        specialeffect(FX_MGWARP, SELF, getcharid(3));
     }
     return;
 }
@@ -30,13 +30,13 @@ function	script	0263Event	{
 
 OnTouch:
     dispbottom l("From this point forward, you'll no longer be able to return to the previous floor.");
-    if (getq(General_Fortress) > 5) goto L_Warp;
+    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_B3F, 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.");
-    end;
+    close;
 
 L_Warp:
     // Not unlocked
@@ -60,3 +60,7 @@ OnClock1700:
     end;
 }
 
+
+// TODO: Miller system (otherwise, you can't reach the switches & platforms)
+
+
diff --git a/npc/026-4/ctrl.c b/npc/026-4/ctrl.c
index 2138a064b..3398452d6 100644
--- a/npc/026-4/ctrl.c
+++ b/npc/026-4/ctrl.c
@@ -4,7 +4,7 @@
 // Description:
 //   The Impregnable Fortress Control Files
 // Quest: General_Fortress
-//  (MaxFloor+1, internal, internal)
+//  (MaxFloor+2, internal, internal)
 
 // This script must set 026-4 up on init, and refresh it when needed
 -	script	Impregnable#B4F	NPC_HIDDEN,{
diff --git a/npc/026-5/ctrl.c b/npc/026-5/ctrl.c
index 9d8e0ea5c..9255a145c 100644
--- a/npc/026-5/ctrl.c
+++ b/npc/026-5/ctrl.c
@@ -4,7 +4,7 @@
 // Description:
 //   The Impregnable Fortress Control Files
 // Quest: General_Fortress
-//  (MaxFloor+1, internal, internal)
+//  (MaxFloor+2, internal, internal)
 
 // This script must set 026-5 up on init, and refresh it when needed
 // This one also contains a blackbox