1 files changed, 22 insertions, 67 deletions

diff --git a/npc/003-5/jeweler.txt b/npc/003-5/jeweler.txt
index 1ed91cbd6..793aa188a 100644
--- a/npc/003-5/jeweler.txt
+++ b/npc/003-5/jeweler.txt
@@ -23,7 +23,7 @@ L_Menu:
     menu
         l("I want to shop."), -,
         l("I want to craft rings."), L_Craft,
-        rif(countitem(GoldenRing) >= 1 && is_admin(), l("I want to add gemstones to a ring.")), L_Gemstone,
+        rif(countitem(GoldenRing) >= 1 && is_admin(), l("I want to create polished gemstones.")), L_Gemstone,
         l("Nothing, sorry."), L_Close;
 
     openshop;
@@ -52,85 +52,40 @@ L_Craft:
     goto L_Menu;
 
 L_Gemstone:
-    // We will be working with polished gems, so this code will be recycled.
     mes "";
     mesn;
-    mesq l("Adding gems will give special stats to rings, and they'll become lighter, but these gems cannot be removed easily.");
-    mesq l("I charge a service fee of 1000 GP.");
+    mesq l("Polished gemstones can be dragged and insert on rings. They'll give special stats to rings, but these gems cannot be removed easily.");
+    mesq l("I charge a service fee of 2000 GP, and two gemstones.");
     next;
-    if (Zeny < 1000) {
+    if (Zeny < 2000) {
         mesn;
         mesq lg("You clearly don't have money, so let's not bother with that right now.");
         next;
         goto L_Menu;
     }
-    menu
-        rif(countitem(Diamond) >= 1 , l("Diamond Ring (+2 vit)")), L_Diamond,
-        rif(countitem(Ruby) >= 1    , l("Ruby Ring (+2 str)")),     L_Ruby,
-        rif(countitem(Amethyst) >= 1, l("Amethyst Ring (+2 dex)")), L_Amethyst,
-        rif(countitem(Sapphire) >= 1, l("Sapphire Ring (+2 int)")), L_Sapphire,
-        rif(countitem(Topaz) >= 1   , l("Topaz Ring (+2 agi)")),    L_Topaz,
-
-        rif(countitem(Emerald) >= 1 , l("Emerald Ring (+2 luck)")), L_Emerald,
-        rif(countitem(Pearl) >= 3   , l("3x Pearl Ring (+1 agi/int/dex)")), L_Pearl,
-        rif(countitem(BlackPearl) >= 1, l("Black Pearl Ring (+1 str/vit/luk)")), L_BlackPearl,
-        l("I don't have any gemstone or three pearls with me."), L_Close;
-
-// As usual, I don't care with cheaters, so if you try to cheat money or gemstones, YOU WILL LOSE ALL REAGENTS. No refunds.
-L_Diamond:
-    inventoryplace GoldenDiamondRing;
-    delitem GoldenRing, 1;
-    Zeny=Zeny-1000;
-    delitem Diamond, 1;
-    getitem GoldenDiamondRing, 1;
-    getexp 800, 0;
-    goto L_Menu;
-
-L_Ruby:
-    inventoryplace GoldenRubyRing;
-    delitem GoldenRing, 1;
-    Zeny=Zeny-1000;
-    delitem Ruby, 1;
-    getitem GoldenRubyRing, 1;
-    getexp 800, 0;
-    goto L_Menu;
-
-L_Amethyst:
-    inventoryplace GoldenAmethystRing;
-    delitem GoldenRing, 1;
-    Zeny=Zeny-1000;
-    delitem Amethyst, 1;
-    getitem GoldenAmethystRing, 1;
-    getexp 800, 0;
-    goto L_Menu;
+    select
+        l("Not today, sorry."),
+        rif(countitem(Diamond) >= 2 , l("Diamond (+2 vit)")),
+        rif(countitem(Ruby) >= 2    , l("Ruby (+2 str)")),
+        rif(countitem(Amethyst) >= 2, l("Amethyst (+2 dex)")),
+        rif(countitem(Sapphire) >= 2, l("Sapphire (+2 int)")),
+        rif(countitem(Topaz) >= 2   , l("Topaz (+2 agi)")),
+        rif(countitem(Emerald) >= 2 , l("Emerald (+2 luck)"));
 
-L_Sapphire:
-    inventoryplace GoldenSapphireRing;
-    delitem GoldenRing, 1;
-    Zeny=Zeny-1000;
-    delitem Sapphire, 1;
-    getitem GoldenSapphireRing, 1;
-    getexp 800, 0;
-    goto L_Menu;
+    mes "";
+    if (@menu == 1)
+        goto L_Menu;
 
-L_Topaz:
-    inventoryplace GoldenTopazRing;
-    delitem GoldenRing, 1;
-    Zeny=Zeny-1000;
-    delitem Topaz, 1;
-    getitem GoldenTopazRing, 1;
+// As usual, I don't care with cheaters, so if you somehow cheat money or gemstones, YOU WILL LOSE ALL REAGENTS. No refunds.
+    inventoryplace PolishedDiamond-2+@menu;
+    delitem Diamond-2+@menu, 2;
+    Zeny=Zeny-2000;
+    getitem PolishedDiamond-2+@menu, 1;
     getexp 800, 0;
     goto L_Menu;
 
-L_Emerald:
-    inventoryplace GoldenEmeraldRing;
-    delitem GoldenRing, 1;
-    Zeny=Zeny-1000;
-    delitem Emerald, 1;
-    getitem GoldenEmeraldRing, 1;
-    getexp 800, 0;
-    goto L_Menu;
 
+/* TODO Special rings
 L_Pearl:
     inventoryplace GoldenPearlRing;
     delitem GoldenRing, 1;
@@ -148,7 +103,7 @@ L_BlackPearl:
     getitem GoldenBlackPearlRing, 1;
     getexp 1000, 0;
     goto L_Menu;
-
+*/
 
 L_Close:
     closedialog;