This should finish Pylon

2 files changed, 41 insertions, 36 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index eb7c3b9bd..dde26090d 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -4713,29 +4713,29 @@ item_db: (
 },
 {
 	Id: 858
-	AegisName: "RubyPowder"
-	Name: "Ruby Powder"
+	AegisName: "DiamondPowder"
+	Name: "Diamond Powder"
 	Type: "IT_ETC"
-	Buy: 5000
-	Sell: 500
+	Buy: 8000
+	Sell: 800
 	Weight: 12
 },
 {
 	Id: 859
-	AegisName: "TopazPowder"
-	Name: "Topaz Powder"
+	AegisName: "RubyPowder"
+	Name: "Ruby Powder"
 	Type: "IT_ETC"
-	Buy: 6000
-	Sell: 600
+	Buy: 5000
+	Sell: 500
 	Weight: 12
 },
 {
 	Id: 860
-	AegisName: "DiamondPowder"
-	Name: "Diamond Powder"
+	AegisName: "EmeraldPowder"
+	Name: "Emerald Powder"
 	Type: "IT_ETC"
-	Buy: 8000
-	Sell: 800
+	Buy: 7500
+	Sell: 750
 	Weight: 12
 },
 {
@@ -4749,20 +4749,20 @@ item_db: (
 },
 {
 	Id: 862
-	AegisName: "AmethystPowder"
-	Name: "Amethyst Powder"
+	AegisName: "TopazPowder"
+	Name: "Topaz Powder"
 	Type: "IT_ETC"
-	Buy: 10000
-	Sell: 1000
+	Buy: 6000
+	Sell: 600
 	Weight: 12
 },
 {
-	Id: 863
-	AegisName: "EmeraldPowder"
-	Name: "Emerald Powder"
+	Id: 862
+	AegisName: "AmethystPowder"
+	Name: "Amethyst Powder"
 	Type: "IT_ETC"
-	Buy: 7500
-	Sell: 750
+	Buy: 10000
+	Sell: 1000
 	Weight: 12
 },
 {
diff --git a/npc/007-1/pylon.txt b/npc/007-1/pylon.txt
index 0390833af..8cafff87f 100644
--- a/npc/007-1/pylon.txt
+++ b/npc/007-1/pylon.txt
@@ -28,7 +28,7 @@ L_Menu:
     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?."),
+        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!"),
@@ -37,6 +37,8 @@ L_Menu:
         rif(countitem(Amethyst) >= 1, l("Yeah sure, take my Amethyst!"),
         l("No, thanks, I will keep my gems.");
 
+    mes "";
+
     switch (@menu) {
     case 1:
         goto L_Question;
@@ -63,7 +65,7 @@ L_Question:
 
 /*
 
-L_EndMenu:     
+L_EndMenu:
     menu
         l("Yeah i need more powder!"),             L_PowderMenu,
         l("Nah i'm done with it, Thanks dude."),                   L_Close,
@@ -82,16 +84,19 @@ L_PowderMenu:
 L_Powder:
     // Magic
     .@id=Diamond+@menu-2;
+    .@pw=DiamondPowder+@menu-2;
+
+    // Amount
     .@am=rand(1,3);
 
     delitem .@id, 1;
     Zeny = Zeny - 100;
     getexp 60, 0;
-    //inventoryplace RubyPowder, 1; // @jesusalva how to set a random 1 to 3
-    //getitem RubyPowder, 1;
 
-    inventoryplace GemPowder, .@am;
-    getitem GemPowder, .@am;
+
+    inventoryplace .@pw, .@am;
+    getitem .@pw, .@am;
+
     mes "";
     mesn;
     mesq l("Here is your powder! I hope it will be useful.");
@@ -101,7 +106,7 @@ L_Powder:
     goto L_Menu;
 
 /*
-L_Topaz: 
+L_Topaz:
     delitem Topaz, 1;
     Zeny = Zeny - 100;
     getexp 100, 0;
@@ -116,7 +121,7 @@ L_Topaz:
     goto L_EndMenu;
     close;
 
-L_Emerald: 
+L_Emerald:
     delitem Emerald, 1;
     getexp 100, 0;
     Zeny = Zeny - 100;
@@ -129,9 +134,9 @@ L_Emerald:
     mesq l("Would you like to transform one more?");
     next;
     goto L_EndMenu;
-    close; 
+    close;
 
-L_Diamond: 
+L_Diamond:
     delitem Diamond, 1;
     getexp 100, 0;
     Zeny = Zeny - 100;
@@ -144,9 +149,9 @@ L_Diamond:
     mesq l("Would you like to transform one more?");
     next;
     goto L_EndMenu;
-    close;  
+    close;
 
-L_Amethyst: 
+L_Amethyst:
     delitem Amethyst, 1;
     getexp 100, 0;
     Zeny = Zeny - 100;
@@ -159,9 +164,9 @@ L_Amethyst:
     mesq l("Would you like to transform one more?");
     next;
     goto L_EndMenu;
-    close;  
+    close;
 
-L_Sapphire: 
+L_Sapphire:
     delitem Sapphire, 1;
     getexp 100, 0;
     Zeny = Zeny - 100;
@@ -174,7 +179,7 @@ L_Sapphire:
     mesq l("Would you like to transform one more?");
     next;
     goto L_EndMenu;
-    close;  
+    close;
 */
 
 L_Close: