Merge branch 'nahrec_fix' into 'master'

Rework nahrec logic

See merge request ml/serverdata!91

1 files changed, 10 insertions, 3 deletions

diff --git a/npc/017-5/nahrec.txt b/npc/017-5/nahrec.txt
index b2b3c71e0..4510b6f3e 100644
--- a/npc/017-5/nahrec.txt
+++ b/npc/017-5/nahrec.txt
@@ -62,7 +62,7 @@ function NahrecMain {
         l("Can you craft Chainmail?"),
         l("Can you craft Light Platemail?"),
         l("Can you craft Warlord Plate?"),
-        rif(countitem(MylarinDust) && !NAHREC_RECIPE, l("Can you craft Savior Equipment?")),
+        rif(@nahrec_mylarin_query, l("Can you craft Savior Equipment?")),
         l("Can you craft Chainmail Skirt?"),
         l("Do you know something about 'Mylarin Dust'?"),
         l("Nevermind, bye!");
@@ -106,6 +106,7 @@ function NahrecMain {
             break;
         case 6:
             NahrecSavior();
+            break;
         case 7:
             blacksmith_create(IronIngot, 10, SilverIngot, 15, ChainmailSkirt, 35000);
             break;
@@ -124,13 +125,19 @@ function Mylarin {
     next;
     mesq l("It has eluded so many craftsmiths, who knows what can be done with that!");
     next;
-    mesq l("I can make some stuff with it, but I have no idea where it can be found. Mylarin dust... amazing.");
+    mesq l("I can make some savior equipment with it, but I have no idea where it can be found. Mylarin dust... amazing.");
     next;
+    @nahrec_mylarin_query = true;
     return;
 }
 
 function NahrecSavior {
-    if (NAHREC_RECIPE) end;
+    if (NAHREC_RECIPE) {
+        mesn;
+        mesq l("Like I have said, I no longer craft savior pieces and I have no more blueprints for sale.");
+        next;
+        return;
+    }
     mesn;
     mesq l("Yes, I can craft Savior Pants. But it is not cheap. I'll need Platinum, Iridium, and Mylarin Dust. And gold. Much gold.");
     next;