Begin 19.0 plot, however the flags you need aren't set yet.

Being pushed early due to _config.txt adjustment.

5 files changed, 68 insertions, 15 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 20814d94d..37241eb1c 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2259,6 +2259,11 @@ constants_db: {
     BS_SNEST9:          256
     BS_SNESTALL:        511
 
+	comment__: "Fragments Expedition Constants"
+    FRAG_HASKEY:        1
+    FRAG_NEEDSKEY:      2
+    FRAG_EXPLOREDCAMP:  4
+
 	comment__: "Event Feat Constants"
     EVFEAT_EASTER:        1
     EVFEAT_VALENTINE:     2
diff --git a/maps/re/025-4.mcache b/maps/re/025-4.mcache
index bad0539af..3594c27c4 100644
--- a/maps/re/025-4.mcache
+++ b/maps/re/025-4.mcache
diff --git a/npc/025-4/_config.txt b/npc/025-4/_config.txt
deleted file mode 100644
index b591aef24..000000000
--- a/npc/025-4/_config.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 025-4: Fortress Island - Southeast conf
-
-025-4,26,56,0	script	#025-4_26_56	NPC_HIDDEN,0,0,{
-	end;
-OnTouch:
-	callfunc "Exception", "FTLadderCheck";
-	end;
-}
diff --git a/npc/025-4/_import.txt b/npc/025-4/_import.txt
index 0261128be..91059b0f3 100644
--- a/npc/025-4/_import.txt
+++ b/npc/025-4/_import.txt
@@ -1,6 +1,5 @@
 // Map 025-4: Fortress Island - Southeast
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/025-4/_config.txt",
 "npc/025-4/_mobs.txt",
 "npc/025-4/_warps.txt",
 "npc/025-4/main.txt",
diff --git a/npc/025-4/main.txt b/npc/025-4/main.txt
index 90306efbe..49ac9a48c 100644
--- a/npc/025-4/main.txt
+++ b/npc/025-4/main.txt
@@ -4,7 +4,7 @@
 // Notes:
 //    Player Quest Finale
 
-025-4,81,78,0	script	#MQFinPlaceholderA	NPC_HIDDEN,1,0,{
+025-4,81,78,0	script	#MQFinHutA	NPC_HIDDEN,1,0,{
     end;
 
 OnTouch:
@@ -16,14 +16,72 @@ OnTouch:
         die();
         end;
     }
+    if (.@q != 22) end;
+    mesc l("This hut seems to be abandoned. Do you want to explore it?");
+    if (askyesno() == ASK_YES) {
+        mesc l("Looking inside, it becomes clear it has been abandoned for several years.");
+        next;
+        mesc l("The hut appears to be a mix between a watchhouse and a lighthouse. It likely was used to support the naval operations of the expedition.");
+        next;
+        mesc l("You can find harpoons, a telescope, an empty weapon rack, and of course, the central light. The hut definitely wasn't assaulted by monsters, but it's hard to say what happened to its occupants.");
+        if (!(.@q & FRAG_HASKEY)) {
+            next;
+            mesc l("You see several keys hanging on the wall, along small plates, presumably describing what they're for.");
+            next;
+            if (!(.@q & FRAG_NEEDSKEY)) {
+                mesc l("You don't need any of them, so you leave them alone.");
+            } else {
+                mesc l("You grab the key to open the small chest.");
+                setq2 General_Narrator, .@q | FRAG_HASKEY;
+            }
+        } else {
+            mesc l("You are currently carrying all the keys you needed here.");
+        }
+    }
+    close;
+}
+
+025-4,91,50,0	script	#MQFinCtrlA	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 22) {
+        warp "Save", 0, 0;
+        die();
+        end;
+    }
+    if (.@q != 22) end;
+    if (!(.@q2 & FRAG_EXPLOREDCAMP)) {
+        slide any(90, 92), 51;
+        dispbottom l("I should explore the huts before going up.");
+    }
+    end;
+}
+
+///////////////
+025-4,0,0,0	script	#MQFinPlaceholder	NPC_HIDDEN,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 22) {
+        warp "Save", 0, 0;
+        die();
+        end;
+    }
+    if (.@q != 22) end;
     // Endtrail (short)
     dispbottom l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
     end;
 }
 
-025-4,91,63,0	duplicate(#MQFinPlaceholderA)	#MQFinPlaceholderB	NPC_HIDDEN,0,1
-025-4,74,22,0	duplicate(#MQFinPlaceholderA)	#MQFinPlaceholderH	NPC_HIDDEN,1,0
-025-4,91,51,0	duplicate(#MQFinPlaceholderA)	#MQFinPlaceholderU	NPC_HIDDEN,0,0
-025-4,26,56,0	duplicate(#MQFinPlaceholderA)	#MQFinPlaceholderS	NPC_HIDDEN,0,0
+025-4,91,63,0	duplicate(#MQFinPlaceholder)	#MQFinPlaceholderB	NPC_HIDDEN,0,1
+025-4,74,22,0	duplicate(#MQFinPlaceholder)	#MQFinPlaceholderH	NPC_HIDDEN,1,0
+025-4,26,56,0	duplicate(#MQFinPlaceholder)	#MQFinPlaceholderS	NPC_HIDDEN,0,0