Improve, correct and upgrade Pylon

1 files changed, 17 insertions, 16 deletions

diff --git a/npc/007-1/pylon.txt b/npc/007-1/pylon.txt
index 94c986b3f..7a3bccb41 100644
--- a/npc/007-1/pylon.txt
+++ b/npc/007-1/pylon.txt
@@ -31,13 +31,13 @@ L_Menu:
     // We could add a drag zone, and allow players to drag their gems, but... Meh.
     select
         l("Hum, how many gem powders can I get from one gem?"),
-        rif(countitem(Diamond) >= 1, l("Yeah sure, take my Diamond!")),
-        rif(countitem(Ruby) >= 1, l("Yeah sure, take my Ruby!")),
-        rif(countitem(Emerald) >= 1, l("Yeah sure, take my Emerald!")),
-        rif(countitem(Sapphire) >= 1, l("Yeah sure, take my Sapphire!")),
-        rif(countitem(Topaz) >= 1, l("Yeah sure, take my Topaz!")),
-        rif(countitem(Amethyst) >= 1, l("Yeah sure, take my Amethyst!")),
-        rif(countitem(IronOre) >= 1, l("And what's about Iron Ore?")),
+        rif(countitem(Diamond) >= 1 && Zeny >= 100, l("Yeah sure, take my Diamond!")),
+        rif(countitem(Ruby) >= 1 && Zeny >= 100, l("Yeah sure, take my Ruby!")),
+        rif(countitem(Emerald) >= 1 && Zeny >= 100, l("Yeah sure, take my Emerald!")),
+        rif(countitem(Sapphire) >= 1 && Zeny >= 100, l("Yeah sure, take my Sapphire!")),
+        rif(countitem(Topaz) >= 1 && Zeny >= 100, l("Yeah sure, take my Topaz!")),
+        rif(countitem(Amethyst) >= 1 && Zeny >= 100, l("Yeah sure, take my Amethyst!")),
+        rif(countitem(IronOre) >= 1 && Zeny >= 100, l("And what's about Iron Ore?")),
         l("No, thanks, I will keep my gems.");
 
     mes "";
@@ -57,11 +57,6 @@ L_Menu:
         break;
     }
 
-L_MenuOre:
-    menu
-        l("Yeah sure!"),             L_OreOk,
-        l("Nah Thanks you."),             L_Close;
-
 L_Question:
     mesn;
     mesq lg("That depends on your luck!");
@@ -78,12 +73,19 @@ L_Ore:
     mesn;
     mesq l("Hum... I'm not really good at it.");
     next;
+    mesn;
     mesq l("But I can try my best for you!");
     next;
-    mesq l("If you want it!");
+    mesn;
+    mesq l("If you want it?");
     next;
     goto L_MenuOre;
 
+L_MenuOre:
+    menu
+        rif(countitem(IronOre) >= 1 && Zeny >= 100, l("Make me an Iron Powder.")), L_OreOk,
+        l("Nah, thank you."), L_Close;
+
 L_OreOk:
     // Amount iron ore
     .@amo=rand(1,2);
@@ -95,10 +97,9 @@ L_OreOk:
     getitem IronPowder, .@amo;
     mes "";
     mesn;
-    mesq l("Here you are, i tried my best");
+    mesq l("Here you go, I tried my best! Do you want another?");
     next;
-    L_Close;
-    close;
+    goto L_MenuOre;
 
 
 // Must rework IDs