1 files changed, 55 insertions, 30 deletions

diff --git a/npc/007-1/pylon.txt b/npc/007-1/pylon.txt
index 9dd2bf19f..0390833af 100644
--- a/npc/007-1/pylon.txt
+++ b/npc/007-1/pylon.txt
@@ -12,71 +12,95 @@
 007-1,67,65,0	script	Pylon	NPC_PLAYER,{
 
     mesn;
-    mesq lg("Hello I'm Pylon!");
+    mesq lg("Hello, I'm Pylon!");
     next;
-    mesq lg("I work in this mine since 3 years, I'm an expert of gem's Ruby, Topaz, Sapphire, You know ! ");
+    mesq lg("I work in this mine since 3 years, I'm an expert on gems: Ruby, Topaz, Sapphire, You know!");
     next;
-    mesq lg("If you have some gem's i can transform them into gem's powder.");
+    mesq lg("If you have some gems, I can transform them into powder.");
     next;
     mesq lg("I only take a tax of 100 gp per gem.");
     next;
-    mesq lg("Then would you like me to transform one of your gem?");
+    mesq lg("Then, would you like me to transform one of your gem?");
     next;
     goto L_Menu;
 
 L_Menu:
-    mesn strcharinfo(0); // Useless ?
-    menu
-        l("Hum, How much gem's powders can i get from one gem?."),             L_Question;
-        rif(countitem(Ruby) >= 1, l("Yeah sure, take my Ruby!"),             L_Ruby;
-        rif(countitem(Topaz) >= 1, l("Yeah sure, take my Topaz!"),             L_Topaz;
-        rif(countitem(Emerald) >= 1, l("Yeah sure, take my Emerald!"),             L_Emerald;
-        rif(countitem(Diamond) >= 1, l("Yeah sure, take my Diamond!"),             L_Diamond;
-        rif(countitem(Amethyst) >= 1, l("Yeah sure, take my Amethyst!"),             L_Amethyst;
-        rif(countitem(Sapphire) >= 1, l("Yeah sure, take my Sapphire!"),             L_Sapphire;
-        l("No, thanks, I will keep my gem's."),             L_Close;
-
-L_Question
+    mesn strcharinfo(0);
+    // We could add a drag zone, and allow players to drag their gems, but... Meh.
+    select
+        l("Hum, How much gem's 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!"),
+        l("No, thanks, I will keep my gems.");
+
+    switch (@menu) {
+    case 1:
+        goto L_Question;
+        break;
+    case 8:
+        close;
+        break;
+    default:
+        goto L_Powder;
+        break;
+    }
+
+L_Question:
     mesn;
-    mesq lg("That depend of your luck!");
+    mesq lg("That depends on your luck!");
     next;
-    mesq lg("With one gem you can espect get 1 to 3 powders! ");
+    mesq l("With one gem you can expect to get 1 to 3 powders! ");
     next;
-    mesq lg("We must blame Saulc!"); // maybe anrrator could say that
+    mes col("We must blame Saulc!", 9);
     next;
     mesq lg("By the way would you like to transform your gem?");
     next;
     goto L_Menu;
 
+/*
+
 L_EndMenu:     
     menu
         l("Yeah i need more powder!"),             L_PowderMenu,
         l("Nah i'm done with it, Thanks dude."),                   L_Close,
 
 L_PowderMenu:
-        l("I Change my mind, i will keep it?."),             L_Close;
+        l("I Change my mind, I will keep it."),             L_Close;
         rif(countitem(Ruby) >= 1, l("Take my Ruby!"),             L_Ruby;
         rif(countitem(Topaz) >= 1, l("Take my Topaz!"),             L_Topaz;
         rif(countitem(Emerald) >= 1, l("Take my Emerald!"),             L_Emerald;
         rif(countitem(Diamond) >= 1, l("Take my Diamond!"),             L_Diamond;
         rif(countitem(Amethyst) >= 1, l("Take my Amethyst!"),             L_Amethyst;
         rif(countitem(Sapphire) >= 1, l("Take my Sapphire!"),             L_Sapphire;
+*/
+
+// Must rework IDs
+L_Powder:
+    // Magic
+    .@id=Diamond+@menu-2;
+    .@am=rand(1,3);
 
-L_Ruby: 
-    delitem Ruby, 1;
+    delitem .@id, 1;
     Zeny = Zeny - 100;
-    getexp 100, 0;
-    inventoryplace RubyPowder, 1; // @jesusalva how to set a random 1 to 3
-    getitem RubyPowder, 1;
+    getexp 60, 0;
+    //inventoryplace RubyPowder, 1; // @jesusalva how to set a random 1 to 3
+    //getitem RubyPowder, 1;
+
+    inventoryplace GemPowder, .@am;
+    getitem GemPowder, .@am;
     mes "";
     mesn;
-    mesq l("Here is your powder! I hope it will be useful");
+    mesq l("Here is your powder! I hope it will be useful.");
     next;
     mesq l("Would you like to transform one more?");
     next;
-    goto L_EndMenu;
-    close;
+    goto L_Menu;
 
+/*
 L_Topaz: 
     delitem Topaz, 1;
     Zeny = Zeny - 100;
@@ -151,7 +175,8 @@ L_Sapphire:
     next;
     goto L_EndMenu;
     close;  
- 
+*/
+
 L_Close:
     close;
 
@@ -166,4 +191,4 @@ OnInit:
     .sex = G_MALE;
     .distance = 4;
     end;
-}
\ No newline at end of file
+}