Now only the reward is missing

3 files changed, 12 insertions, 12 deletions

diff --git a/npc/025-4/_mobs.txt b/npc/025-4/_mobs.txt
index bc6332a3a..996e96908 100644
--- a/npc/025-4/_mobs.txt
+++ b/npc/025-4/_mobs.txt
@@ -7,5 +7,5 @@
 025-4,66,56,17,30	monster	Whirly Bird	1232,4,90000,60000
 025-4,93,56,17,10	monster	Gobo Bear	1214,4,60000,20000
 025-4,41,90,21,6	monster	Green Skull Slime	1405,4,60000,30000
-025-4,37,39,17,13	monster	Nightmare Dragon	1230,16,60000,30000
+025-4,37,39,17,13	monster	Nightmare Dragon	1230,12,60000,30000
 025-4,67,76,21,9	monster	Green Skull Slime	1405,4,60000,30000
diff --git a/npc/025-4/main.txt b/npc/025-4/main.txt
index 6fe161f05..e41770aba 100644
--- a/npc/025-4/main.txt
+++ b/npc/025-4/main.txt
@@ -183,6 +183,7 @@ OnTouch:
 OnTouch:
     .@q=getq(General_Narrator);
     .@q2=getq2(General_Narrator);
+    .@q3=getq3(General_Narrator);
     if (.@q > 22) end;
     // Cheater Detected
     if (.@q < 22 || !(.@q2 & FRAG_EXPLOREDCAMP)) {
@@ -198,7 +199,7 @@ OnTouch:
     mesc l("With exploring the northern part as a non-option, you look at a small chest over the desk. It's locked, and there's a name plate on it.");
     next;
     // Lets make your name code
-    mesc l("The name plate reads: \"%s - #%d\". Now, that's not ominous at all.", strcharinfo(0), #REG_DATE));
+    mesc l("The name plate reads: \"%s - #%d\". Now, that's not ominous at all.", strcharinfo(0), #REG_DATE);
     next;
     if (!(.@q2 & FRAG_HASKEY)) {
         mesc l("If you had a key, you could open this chest.");
@@ -234,7 +235,7 @@ OnTouch:
     mesq l("Your mother is still missing, but if the sea didn't claim her then she'll not come back here, and will find my message to her at the designated point.");
     next;
     mesn l("Your father?");
-    mesq l("As my mother suspected, Benjamin Yorn betrayed us. Or rather, the Moubootaur took control over him. But you never believed that, so I have no choice but to leave this message in our old residence, risky as that may, in case the sea didn't claim your soul."); // Benjamin Yorn = B. Jorn = Bjørn :3
+    mesq l("As your mother suspected, Benjamin Yorn betrayed us. Or rather, the Moubootaur took control over him. But you never believed that, so I have no choice but to leave this message in our old residence, risky as that may, in case the sea didn't claim your soul."); // Benjamin Yorn = B. Jorn = Bjørn :3
     next;
     mesn l("Your father?");
     mesq l("As you surely remember, there are 8 Mana Fragments, which symbolize the essence of the eight places where Soul Menhirs are: Candor, Hurnscald, Halinarzo, Lilit, Nivalis, Tulimshar, Land of Fire and Frostia. And that the Monster King collected all of them %s ago.", FuzzyTime($NIVALIS_LIBDATE));
@@ -251,7 +252,7 @@ OnTouch:
     mesn l("Your father?");
     mesq l("For the Mana Source and the Moubootaur haven't finished their struggle, the Supreme Guardian of the World giving form and source to all mana, and granting its protection to us mortals, by magic and the Aegis Scutum.");
     next;
-    // AT THIS POINT, send to kill Madragoras, set FRAG_LETTER
+    // AT THIS POINT, send to kill Mandragoras, set FRAG_LETTER
     // Then open the box on the upper floor where the rest the letter shall be.
     // You need to kill the Mandragoras to climb the ladder, not to open the box
     // To open the box you need to earn Lightbringer's acknowledgement, which
@@ -276,7 +277,7 @@ OnTouch:
 OnKill:
     .@q=getq(General_Narrator);
     .@q2=getq2(General_Narrator);
-    .@q3=getq3(General_Narrator);
+    .@q3=getq3(General_Narrator) + 1;
     if (.@q > 22) end;
     // Cheater Detected
     if (.@q < 22 || !(.@q2 & FRAG_EXPLOREDCAMP)) {
@@ -287,8 +288,8 @@ OnKill:
     if (!(.@q2 & FRAG_LETTER)) end;
     if (.@q2 & FRAG_LADDER) end;
     if (.@q3 > 5) end;
-    setq3 General_Narrator, .@q3 + 1;
-    dispbottom l("Progress %d/%d %s", .@q3, 5, getmonstername(Mandragora));
+    setq3 General_Narrator, .@q3;
+    dispbottom l("Progress %d/%d %s", .@q3, 5, strmobinfo(1, Mandragora));
     end;
 }
 
@@ -314,8 +315,6 @@ OnTouch:
     }
 
     slide 26, 51;
-    // Endtrail (short)
-    dispbottom l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
     end;
 }
 
@@ -323,7 +322,7 @@ OnTouch:
 
 
 // Pandorica's Box
-025-4,32,41,0	script	#MQFinBox	NPC_HIDDEN,{
+025-4,32,41,0	script	#MQFinBox	NPC_NO_SPRITE,{
     .@q=getq(General_Narrator);
     .@q2=getq2(General_Narrator);
     .@q3=getq3(General_Narrator);
@@ -366,7 +365,8 @@ OnTouch:
     next;
     mesc l("You find a %s inside. Holding it, you can feel it - The Lightbringer, source of mana and supreme guardian of the world, blessing your journey. You can now choose a new trait. This concludes the player quest.", getitemlink(SunnyCrystal));
     next;
-    //setq General_Narrator, 23, 0, 0;
+    // FIXME this currently resets the quest for testing purposes
+    setq General_Narrator, 22, 0, 0;
 
     // Endtrail
     mes "";
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index fd7b70a53..065b86f36 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -1206,7 +1206,7 @@ function	script	clientupdater	{
         if (PETER_REPEAT >= 50 && PETER_REPEAT < 100)
             getitem Cap, 1;
         // You were in Fortress Encampment? Fix coordinates
-        if (getmap() == "025-4") {
+        if (getmap() == "025-4")
             slide 27, 91;
     }
     // TODO: Anniversary (leap years disregarded)