Unlock the new area, however, the Main Quest is unfinished

6 files changed, 132 insertions, 1 deletions

diff --git a/npc/025-1/commander.txt b/npc/025-1/commander.txt
index c7e0fe6f2..a20b494cd 100644
--- a/npc/025-1/commander.txt
+++ b/npc/025-1/commander.txt
@@ -5,9 +5,26 @@
 //   Leads the Alliance in the Fortress Town
 
 025-1,96,26,0	script	Commander Povo	NPC_BRGUARD_SPEAR,{
+    .@q=getq(General_Narrator);
+    if (.@q < 21) { legiontalk(); end; } // No cutting corners!
     mesn;
     mesq l("Greetings %s, I am %s, the man in charge for the Alliance occupation of Fortress Town.", (strcharinfo(0) == $MOST_HEROIC$ ? lg("Hero") : lg("Adventurer")), .name$);
     next;
+
+    // Povo is worried with the upcoming siege
+    if ($FIRESOFSTEAM >= 10 && gettime(4) == MONDAY) {
+        mesn;
+        mesq l("It's a matter of hours before the Impregnable Fortress send enough monsters to overrun us, so we're preparing a strategic withdraw before this. I'm sorry, but I cannot spare any time for you.");
+        close;
+    // Povo is worried with the upcoming siege, but he doesn't know when
+    } else if (!$FIRESOFSTEAM && gettime(4) < TUESDAY) {
+        mesn;
+        mesq l("It's a matter of hours before the Impregnable Fortress send enough monsters to overrun us, and we still haven't understood the pattern. We must be ready to withdraw at any time, which precludes casual talk.");
+        mesc l("%s clearly thinks you're distracting him. It's better to talk to him another day.", .name$);
+        close;
+    }
+
+    // Depending on how you finished Barbara's Quest, claim your reward now
     if (BARBARA_STATE == 2) {
         inventoryplace NPCEyes, 1;
         mesn;
@@ -35,11 +52,65 @@
         }
     }
 
+    // Switch the quest
+    if (.@q == 21) goto L_Intro;
+    if (.@q == 22) goto L_Short;
+    // ...
+
     // Endtrail
     mes "";
     mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
     close;
 
+// Dispatch you to the abandoned encampment.
+L_Intro:
+    mesn;
+    mesq l("Don't worry, I was briefed. You're looking for the Mana Fragment Expedition, right? The one which your parents supposedly participated or something?");
+    next;
+    mesn;
+    mesq l("We scoured this place. Found notes left behind by the expedition, they seem to have had set an encampment southwest of here.");
+    next;
+    mesn;
+    mesq l("I have no idea how successful they were; the place we found the notes in was... well... lets just say the wood walls were red, and have been that way for a long time.");
+    next;
+    mesn;
+    mesq l("However, it was mentioned that there is a small tunnel with a closed passage to reach the encampment; I assume they weren't exactly welcomed by the local monster population and the Fortress Town if anything was swarming with monsters back then.");
+    next;
+    if ($FIRESOFSTEAM < 10) {
+        mesn;
+        mesq l("And truth be told, it still is - the Impregnable Fortress seems to periodically release massive batches of monsters, trying to hold the ground is a death wish.");
+        next;
+        mesn;
+        if ($FIRESOFSTEAM)
+            mesq l("Hopefully Andrei Sakar will find what he's looking for in Artis. I believe Nard was in charge of ferrying adventurers to his exploration, consider helping him.");
+        else
+            mesq l("I cannot let go of a single combat capable person - even volunteer adventurers like yourself - until we can confirm the Impregnable Fortress north of us has a pattern to their spawns.");
+        close;
+    }
+    mesn;
+    mesq l("I don't have anyone to send ahead to scout the place, and even if you go, I'm not expecting you to find anything alive on that encampment. But I understand that finding out the truth is important to you and that you'll go all the same.");
+    next;
+    mesn;
+    mesq l("So, here is the key. Well, I say \"key\", but it is really just a magic pattern which you can draw on your hand and use it to open the passage. I can only wish you luck... Godspeed, %s, may the wind be in your favor.", (strcharinfo(0) == $MOST_HEROIC$ ? lg("Hero") : lg("Adventurer")));
+    next;
+    mesc b(l(".:: Main Quest ::.")), 3;
+    msObjective($FORTRESS_STATE, l("* Invade the Fortress Town"));
+    msObjective(true, l("* Find clues"));
+    msObjective(false, l("  ** Explore the encampment southwest of Fortress Town."));
+    msObjective(false, l("* (optional) Save the world!"));
+    setq General_Narrator, 22;
+    getexp 0, 2225; // You gain some Job Experience for completing this talk
+    close;
+
+// Reminder to go to the Fortress Encampment
+L_Short:
+    mesn;
+    mesq l("Why are you hesitating to explore the abandoned encampment southwest of this town? Well, not that I blame you; the dangers likely outweights the benefits.");
+    next;
+    mesn;
+    mesq l("They might have sealed the direct path, but there's a tunnel in a cave which you can go in now that you have the magic key to open it.");
+    close;
+
 OnInit:
     .sex = G_MALE;
     .distance = 5;
diff --git a/npc/025-2-1/_import.txt b/npc/025-2-1/_import.txt
index 362abe0b0..ba2eae352 100644
--- a/npc/025-2-1/_import.txt
+++ b/npc/025-2-1/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/025-2-1/_mobs.txt",
 "npc/025-2-1/_warps.txt",
+"npc/025-2-1/logic.txt",
diff --git a/npc/025-2-1/logic.txt b/npc/025-2-1/logic.txt
new file mode 100644
index 000000000..2b65c7901
--- /dev/null
+++ b/npc/025-2-1/logic.txt
@@ -0,0 +1,27 @@
+// TMW-2 Script.
+// Author:
+//    Jesusalva
+// Notes:
+//    Protected warp
+
+025-2-1,87,89,0	script	#To0254	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 20) {
+        warp "Save", 0, 0;
+        die();
+        end;
+    }
+    if (.@q < 22) {
+        dispbottom l("You can see a small locked door in what seems a tight tunnel. Entering this tunnel without the key would be suicide.");
+        end;
+    }
+    warp "025-4", 27, 91;
+    end;
+}
+
+
diff --git a/npc/025-4/_import.txt b/npc/025-4/_import.txt
index 21ced80be..0261128be 100644
--- a/npc/025-4/_import.txt
+++ b/npc/025-4/_import.txt
@@ -3,3 +3,4 @@
 "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
new file mode 100644
index 000000000..90306efbe
--- /dev/null
+++ b/npc/025-4/main.txt
@@ -0,0 +1,29 @@
+// TMW-2 Script.
+// Author:
+//    Jesusalva
+// Notes:
+//    Player Quest Finale
+
+025-4,81,78,0	script	#MQFinPlaceholderA	NPC_HIDDEN,1,0,{
+    end;
+
+OnTouch:
+    .@q=getq(General_Narrator);
+    .@q2=getq2(General_Narrator);
+    // Cheater Detected
+    if (.@q < 22) {
+        warp "Save", 0, 0;
+        die();
+        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
+
+
diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index 663aa64c2..c3efccd6c 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -104,7 +104,9 @@ OnInit:
     sellitem TitaniumOre,   6000, 9+(.@steam*2-2);
     if ($GAME_STORYLINE >= 4) {
         sellitem IridiumOre,    16000, 6+(.@steam*2-2);
-        sellitem PlatinumOre,   24000, 3+(.@steam*2-2);
+        // Platinum Ore is only stocked if Platinum Mines are liberated
+        if ($FORTRESS_STATE)
+            sellitem PlatinumOre,   24000, 3+(.@steam*2-2);
     }
     sellitem EarthPowder,   -1, 3+.@steam-1;
     sellitem EverburnPowder, 15000, 2+.@steam-1;