From 1f7af276c1fbb2453cd711466c23a1c9a5a83b24 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 18 May 2022 00:05:56 -0300
Subject: Fix bugs on Naem quest. We have a problem with shops, though

---
 npc/003-1/silvia.txt |  2 +-
 npc/007-1/naem.txt   | 14 ++++++--------
 npc/craft/price.txt  |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'npc')

diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index e6a69531d..a2f31d599 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -81,7 +81,7 @@ L_Hubby:
     mesf l("%d/%d %s",countitem(PiouLegs), 6, getitemlink(PiouLegs));
     mesf l("%d/%d %s",countitem(Cheese), 3, getitemlink(Cheese));
     mesf l("%d/%d %s",countitem(HalfCroconut), 3, getitemlink(HalfCroconut));
-    mesf l("%d/%d %s",countitem(ChamomileTea), 1, getitemlink(ChamomileTea));
+    mesf l("%d/%d %s",countitem(PurpleBlobime), 1, getitemlink(PurpleBlobime));
     next;
     if (askyesno() == ASK_NO) { closeclientdialog; end; }
     if (countitem(Aquada) < 7 ||
diff --git a/npc/007-1/naem.txt b/npc/007-1/naem.txt
index ed1f479d7..4a7414b25 100644
--- a/npc/007-1/naem.txt
+++ b/npc/007-1/naem.txt
@@ -10,8 +10,6 @@
     mesq l("My name is Naem and I guard the tunnels in this direction. You shall not pass. Now leave.");
     if (BaseLevel < 28)
         close;
-    if (.@q < 2)
-        close;
     if (.@q == 2) {
         if (!checkbound(IcedBottle)) close;
         next;
@@ -27,7 +25,7 @@
         mesq l("You can have this %s as a token of gratitude. But no, you cannot pass, so keep going!", getitemlink(MinerTankTop));
         close;
     }
-    if (.@q > 3)
+    if (.@q >= 3)
         close;
     next;
     mesn;
@@ -35,11 +33,11 @@
     next;
     mesn;
     mesq l("I need groceries. %d %s, %d %s, %d %s, %d %s and %d %s. Give it to my wife, Silvia.",
-           7, Aquada,
-           6, PiouLegs,
-           3, Cheese,
-           3, HalfCroconut,
-           1, PurpleBlobime);
+           7, getitemlink(Aquada),
+           6, getitemlink(PiouLegs),
+           3, getitemlink(Cheese),
+           3, getitemlink(HalfCroconut),
+           1, getitemlink(PurpleBlobime));
     next;
     mesn;
     mesq l("You can collect croconuts by killing any tree with it. Then you can break it in half from the inventory screen.");
diff --git a/npc/craft/price.txt b/npc/craft/price.txt
index 1471ffd99..ad05059cd 100644
--- a/npc/craft/price.txt
+++ b/npc/craft/price.txt
@@ -214,7 +214,7 @@ OnCall:
 
 OnInit:
     bindatcmd "reloaditemdb2", "craft_price_fix::OnCall", 99, 100, 1;
-    // This should be called last? Maybe?
+    // This should be called after craft_db is loaded
     sleep(750);
     fix_cPrice();
     end;
-- 
cgit v1.2.3-70-g09d2