diff --git a/data/actions/actions.xml b/data/actions/actions.xml
index 6d9abc8..6441a13 100644
--- a/data/actions/actions.xml
+++ b/data/actions/actions.xml
@@ -233,6 +233,9 @@
+
+
+
diff --git a/data/actions/scripts/misc/changegold.lua b/data/actions/scripts/misc/changegold.lua
new file mode 100644
index 0000000..cbfc299
--- /dev/null
+++ b/data/actions/scripts/misc/changegold.lua
@@ -0,0 +1,35 @@
+local config = {
+ [3031] = {changeTo = 3035},
+ [3035] = {changeBack = 3031, changeTo = 3043},
+ [3043] = {changeBack = 3035}
+}
+
+function onUse(player, item, fromPosition, target, toPosition, isHotkey)
+ local ring = player:getSlotItem(CONST_SLOT_RING)
+ if ring == nil or ring:getId() ~= 3007 then
+ return false
+ end
+
+ local ringCharges = ring:getAttribute(ITEM_ATTRIBUTE_CHARGES)
+ local coin = config[item:getId()]
+ if coin.changeTo and item.type == 100 then
+ item:remove()
+ player:addItem(coin.changeTo, 1)
+ if ringCharges > 1 then
+ ring:setAttribute(ITEM_ATTRIBUTE_CHARGES,(ringCharges-1))
+ else
+ ring:remove(1)
+ end
+ elseif coin.changeBack then
+ item:remove(1)
+ player:addItem(coin.changeBack, 100)
+ if ringCharges > 1 then
+ ring:setAttribute(ITEM_ATTRIBUTE_CHARGES,(ringCharges-1))
+ else
+ ring:remove(1)
+ end
+ else
+ return false
+ end
+ return true
+end
\ No newline at end of file
diff --git a/data/items780/items.srv b/data/items780/items.srv
index 07b27e5..7c62b2f 100644
--- a/data/items780/items.srv
+++ b/data/items780/items.srv
@@ -13413,8 +13413,9 @@ Attributes = {Weight=40,SlotType=RING}
TypeID = 3007
Name = "a crystal ring"
-Flags = {Take}
-Attributes = {Weight=90,SlotType=RING}
+Description = "The magical ring will convert the gold you touch"
+Flags = {Take,ShowDetail}
+Attributes = {Weight=90,SlotType=RING,TotalUses=100}
TypeID = 3008
Name = "a crystal necklace"
@@ -13712,9 +13713,9 @@ Attributes = {MinimumLevel=26,Weight=2650,Brightness=2,LightColor=67,Vocations=
TypeID = 3066
Name = "a snakebite rod"
-Description = "It seems to twitch and quiver as if trying to escape your grip"
+Description = "It seems to twitch and quiver as if trying to escape your grip. The rod has magical powers inside and requires no mana consumption"
Flags = {Take,Wand}
-Attributes = {MinimumLevel=7,Weight=4300,Vocations=2,Range=4,ManaConsumption=2,AttackStrength=13,AttackVariation=5,DamageType=Poison,MissileEffect=15}
+Attributes = {MinimumLevel=7,Weight=4300,Vocations=2,Range=4,AttackStrength=13,AttackVariation=5,DamageType=Poison,MissileEffect=15}
TypeID = 3067
Name = "a tempest rod"
@@ -13759,9 +13760,9 @@ Attributes = {MinimumLevel=26,Weight=2300,Brightness=2,LightColor=205,Vocations
TypeID = 3074
Name = "a wand of vortex"
-Description = "Surges of energy rush through the tip of this wand"
+Description = "Surges of energy rush through the tip of this wand. The wand has magical powers inside and requires no mana consumption"
Flags = {Take,Wand}
-Attributes = {MinimumLevel=7,Weight=2300,Brightness=2,LightColor=23,Vocations=1,ManaConsumption=2,AttackStrength=13,AttackVariation=5,DamageType=Energy,Range=3,MissileEffect=5}
+Attributes = {MinimumLevel=7,Weight=2300,Brightness=2,LightColor=23,Vocations=1,AttackStrength=13,AttackVariation=5,DamageType=Energy,Range=3,MissileEffect=5}
TypeID = 3075
Name = "a wand of dragonbreath"
diff --git a/data/items792/items.srv b/data/items792/items.srv
index 7741aad..e8bc4ba 100644
--- a/data/items792/items.srv
+++ b/data/items792/items.srv
@@ -13413,8 +13413,9 @@ Attributes = {Weight=40,SlotType=RING}
TypeID = 3007
Name = "a crystal ring"
-Flags = {Take}
-Attributes = {Weight=90,SlotType=RING}
+Description = "The magical ring will convert the gold you touch"
+Flags = {Take,ShowDetail}
+Attributes = {Weight=90,SlotType=RING,TotalUses=100}
TypeID = 3008
Name = "a crystal necklace"
@@ -13712,9 +13713,9 @@ Attributes = {MinimumLevel=26,Weight=2650,Brightness=2,LightColor=67,Vocations=
TypeID = 3066
Name = "a snakebite rod"
-Description = "It seems to twitch and quiver as if trying to escape your grip"
+Description = "It seems to twitch and quiver as if trying to escape your grip. The rod has magical powers inside and requires no mana consumption"
Flags = {Take,Wand}
-Attributes = {MinimumLevel=7,Weight=4300,Vocations=2,Range=3,ManaConsumption=2,AttackStrength=13,AttackVariation=5,DamageType=Poison,MissileEffect=15}
+Attributes = {MinimumLevel=7,Weight=4300,Vocations=2,Range=3,AttackStrength=13,AttackVariation=5,DamageType=Poison,MissileEffect=15}
TypeID = 3067
Name = "a tempest rod"
@@ -13759,9 +13760,9 @@ Attributes = {MinimumLevel=26,Weight=2300,Brightness=2,LightColor=205,Vocations
TypeID = 3074
Name = "a wand of vortex"
-Description = "Surges of energy rush through the tip of this wand"
+Description = "Surges of energy rush through the tip of this wand. The wand has magical powers inside and requires no mana consumption"
Flags = {Take,Wand}
-Attributes = {MinimumLevel=7,Weight=2300,Brightness=2,LightColor=23,Vocations=1,ManaConsumption=2,AttackStrength=13,AttackVariation=5,DamageType=Energy,Range=3,MissileEffect=5}
+Attributes = {MinimumLevel=7,Weight=2300,Brightness=2,LightColor=23,Vocations=1,AttackStrength=13,AttackVariation=5,DamageType=Energy,Range=3,MissileEffect=5}
TypeID = 3075
Name = "a wand of dragonbreath"
diff --git a/data/npc/briasol.npc b/data/npc/briasol.npc
index 6232969..c704d53 100644
--- a/data/npc/briasol.npc
+++ b/data/npc/briasol.npc
@@ -51,7 +51,7 @@ VANISH,! -> "Asha Thrazi."
"do","you","have" -> *
"gem" -> "You can buy and sell small diamonds, sapphires, rubies, emeralds, and amethysts."
"pearl" -> "I have white and black pearls for sale, but you also can sell me some."
-"jewel" -> "You can purchase our fine dwarfish wares like wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "You can purchase our fine dwarfish wares like gold converting rings, wedding rings, golden amulets, and ruby necklaces."
"talon" -> "We don't trade with them."
"wedding","ring" -> Type=3004, Amount=1, Price=990, "Do you want to buy a wedding ring for %P gold?", Topic=5
@@ -64,6 +64,8 @@ VANISH,! -> "Asha Thrazi."
"small","ruby" -> Type=3030, Amount=1, Price=500, "Do you want to buy a small ruby for %P gold?", Topic=5
"small","emerald" -> Type=3032, Amount=1, Price=500, "Do you want to buy a small emerald for %P gold?", Topic=5
"small","amethyst" -> Type=3033, Amount=1, Price=400, "Do you want to buy a small amethyst for %P gold?", Topic=5
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=5
+"gold","convert" -> *
%1,1<%1,"wedding","ring" -> Type=3004, Amount=%1, Price=990*%1, "Do you want to buy %A wedding rings for %P gold?", Topic=5
%1,1<%1,"golden","amulet" -> Type=3013, Amount=%1, Price=6600*%1, "Do you want to buy %A golden amulets for %P gold?", Topic=5
@@ -75,6 +77,8 @@ VANISH,! -> "Asha Thrazi."
%1,1<%1,"small","rub" -> Type=3030, Amount=%1, Price=500*%1, "Do you want to buy %A small rubies for %P gold?", Topic=5
%1,1<%1,"small","emerald" -> Type=3032, Amount=%1, Price=500*%1, "Do you want to buy %A small emeralds for %P gold?", Topic=5
%1,1<%1,"small","amethyst" -> Type=3033, Amount=%1, Price=400*%1, "Do you want to buy %A small amethysts for %P gold?", Topic=5
+%1,1<%1,"crystal","ring" -> Type=3007, Amount=%1, Price=250*%1, "Do you want to buy %A crystal rings to convert gold for %P gold?", Topic=5
+%1,1<%1,"gold","convert" -> *
"sell","white","pearl" -> Type=3026, Amount=1, Price=160, "Do you want to sell a white pearl for %P gold?", Topic=6
"sell","black","pearl" -> Type=3027, Amount=1, Price=280, "Do you want to sell a black pearl for %P gold?", Topic=6
diff --git a/data/npc/carina.npc b/data/npc/carina.npc
index a1454a0..f8bac94 100644
--- a/data/npc/carina.npc
+++ b/data/npc/carina.npc
@@ -24,15 +24,19 @@ VANISH,! -> "Good bye."
"goods" -> *
"do","you","sell" -> *
"do","you","have" -> *
-"jewel" -> "We offer wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "We offer gold converting rings, wedding rings, golden amulets, and ruby necklaces."
"wedding","ring" -> Type=3004, Amount=1, Price=990, "Do you want to buy a wedding ring for %P gold?", Topic=1
"golden","amulet" -> Type=3013, Amount=1, Price=6600, "Do you want to buy a golden amulet for %P gold?", Topic=1
"ruby","necklace" -> Type=3016, Amount=1, Price=3560, "Do you want to buy a ruby necklace for %P gold?", Topic=1
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=1
+"gold","convert" -> *
%1,1<%1,"wedding","ring" -> Type=3004, Amount=%1, Price=990*%1, "Do you want to buy %A wedding rings for %P gold?", Topic=1
%1,1<%1,"golden","amulet" -> Type=3013, Amount=%1, Price=6600*%1, "Do you want to buy %A golden amulets for %P gold?", Topic=1
%1,1<%1,"ruby","necklace" -> Type=3016, Amount=%1, Price=3560*%1, "Do you want to buy %A ruby necklaces for %P gold?", Topic=1
+%1,1<%1,"crystal","ring" -> Type=3007, Amount=%1, Price=250*%1, "Do you want to buy %A crystal rings to convert gold for %P gold?", Topic=1
+%1,1<%1,"gold","convert" -> *
Topic=1,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type)
Topic=1,"yes" -> "Sorry, make sure to come back, as soon as you have enough money."
diff --git a/data/npc/gail.npc b/data/npc/gail.npc
index a1dc981..3eb9a4d 100644
--- a/data/npc/gail.npc
+++ b/data/npc/gail.npc
@@ -53,7 +53,7 @@ VANISH,! -> "Good bye."
"do","you","have" -> *
"gem" -> "You can buy and sell small diamonds, small sapphires, small rubies, small emeralds and small amethysts."
"pearl" -> "There are white and black pearls you can buy or sell."
-"jewel" -> "Currently you can purchase wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "Currently you can purchase gold converting ring, wedding rings, golden amulets, and ruby necklaces."
"talon" -> "I don't trade or work with these magic gems. It's better you ask a mage about this."
"wedding","ring" -> Type=3004, Amount=1, Price=990, "Do you want to buy a wedding ring for %P gold?", Topic=1
@@ -66,6 +66,8 @@ VANISH,! -> "Good bye."
"small","ruby" -> Type=3030, Amount=1, Price=500, "Do you want to buy a small ruby for %P gold?", Topic=1
"small","emerald" -> Type=3032, Amount=1, Price=500, "Do you want to buy a small emerald for %P gold?", Topic=1
"small","amethyst" -> Type=3033, Amount=1, Price=400, "Do you want to buy a small amethyst for %P gold?", Topic=1
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=1
+"gold","convert" -> *
%1,1<%1,"wedding","ring" -> Type=3004, Amount=%1, Price=990*%1, "Do you want to buy %A wedding rings for %P gold?", Topic=1
%1,1<%1,"golden","amulet" -> Type=3013, Amount=%1, Price=6600*%1, "Do you want to buy %A golden amulets for %P gold?", Topic=1
@@ -77,6 +79,8 @@ VANISH,! -> "Good bye."
%1,1<%1,"small","rub" -> Type=3030, Amount=%1, Price=500*%1, "Do you want to buy %A small rubies for %P gold?", Topic=1
%1,1<%1,"small","emerald" -> Type=3032, Amount=%1, Price=500*%1, "Do you want to buy %A small emeralds for %P gold?", Topic=1
%1,1<%1,"small","amethyst" -> Type=3033, Amount=%1, Price=400*%1, "Do you want to buy %A small amethysts for %P gold?", Topic=1
+%1,1<%1,"crystal","ring" -> Type=3007, Amount=%1, Price=250*%1, "Do you want to buy %A crystal rings to convert gold for %P gold?", Topic=1
+%1,1<%1,"gold","convert" -> *
"sell","white","pearl" -> Type=3026, Amount=1, Price=160, "Do you want to sell a white pearl for %P gold?", Topic=2
"sell","black","pearl" -> Type=3027, Amount=1, Price=280, "Do you want to sell a black pearl for %P gold?", Topic=2
diff --git a/data/npc/gen-t-gems-s.ndb b/data/npc/gen-t-gems-s.ndb
index 9b88153..72f85d7 100644
--- a/data/npc/gen-t-gems-s.ndb
+++ b/data/npc/gen-t-gems-s.ndb
@@ -9,7 +9,7 @@
"do","you","have" -> *
"gem" -> "You can buy and sell small diamonds, sapphires, rubies, emeralds, and amethysts."
"pearl" -> "There are white and black pearls you can buy or sell."
-"jewel" -> "Currently you can purchase wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "Currently you can purchase gold converting rings, wedding rings, golden amulets, and ruby necklaces."
"wedding","ring" -> Type=3004, Amount=1, Price=990, "Do you want to buy a wedding ring for %P gold?", Topic=29
"golden","amulet" -> Type=3013, Amount=1, Price=6600, "Do you want to buy a golden amulet for %P gold?", Topic=29
@@ -21,6 +21,8 @@
"small","ruby" -> Type=3030, Amount=1, Price=500, "Do you want to buy a small ruby for %P gold?", Topic=29
"small","emerald" -> Type=3032, Amount=1, Price=500, "Do you want to buy a small emerald for %P gold?", Topic=29
"small","amethyst" -> Type=3033, Amount=1, Price=400, "Do you want to buy a small amethyst for %P gold?", Topic=29
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=29
+"gold","convert" -> *
Topic=29,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type)
Topic=29,"yes" -> "Come back, when you have enough money."
diff --git a/data/npc/hanna.npc b/data/npc/hanna.npc
index 9c42fa5..17eae58 100644
--- a/data/npc/hanna.npc
+++ b/data/npc/hanna.npc
@@ -27,7 +27,7 @@ VANISH,! -> "Good bye."
"do","you","have" -> *
"gem" -> "You can buy and sell small diamonds, sapphires, rubies, emeralds, and amethysts."
"pearl" -> "There are white and black pearls you can buy or sell."
-"jewel" -> "Currently you can purchase wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "Currently you can purchase gold converting rings, wedding rings, golden amulets, and ruby necklaces."
"talon" -> "I don't trade or work with these magic gems. It's better you ask a mage about this."
"wedding","ring" -> Type=3004, Amount=1, Price=990, "Do you want to buy a wedding ring for %P gold?", Topic=1
@@ -40,6 +40,8 @@ VANISH,! -> "Good bye."
"small","ruby" -> Type=3030, Amount=1, Price=500, "Do you want to buy a small ruby for %P gold?", Topic=1
"small","emerald" -> Type=3032, Amount=1, Price=500, "Do you want to buy a small emerald for %P gold?", Topic=1
"small","amethyst" -> Type=3033, Amount=1, Price=400, "Do you want to buy a small amethyst for %P gold?", Topic=1
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=1
+"gold","convert" -> *
%1,1<%1,"wedding","ring" -> Type=3004, Amount=%1, Price=990*%1, "Do you want to buy %A wedding rings for %P gold?", Topic=1
%1,1<%1,"golden","amulet" -> Type=3013, Amount=%1, Price=6600*%1, "Do you want to buy %A golden amulets for %P gold?", Topic=1
@@ -51,6 +53,8 @@ VANISH,! -> "Good bye."
%1,1<%1,"small","rub" -> Type=3030, Amount=%1, Price=500*%1, "Do you want to buy %A small rubies for %P gold?", Topic=1
%1,1<%1,"small","emerald" -> Type=3032, Amount=%1, Price=500*%1, "Do you want to buy %A small emeralds for %P gold?", Topic=1
%1,1<%1,"small","amethyst" -> Type=3033, Amount=%1, Price=400*%1, "Do you want to buy %A small amethysts for %P gold?", Topic=1
+%1,1<%1,"crystal","ring" -> Type=3007, Amount=%1, Price=250*%1, "Do you want to buy %A crystal rings to convert gold for %P gold?", Topic=1
+%1,1<%1,"gold","convert" -> *
"sell","white","pearl" -> Type=3026, Amount=1, Price=160, "Do you want to sell a white pearl for %P gold?", Topic=2
"sell","black","pearl" -> Type=3027, Amount=1, Price=280, "Do you want to sell a black pearl for %P gold?", Topic=2
diff --git a/data/npc/ishina.npc b/data/npc/ishina.npc
index 2f254c1..a8d74aa 100644
--- a/data/npc/ishina.npc
+++ b/data/npc/ishina.npc
@@ -30,7 +30,7 @@ VANISH,! -> "Daraman's blessings and good bye."
"do","you","have" -> *
"gem" -> "You can buy and sell small diamonds, sapphires, rubies, emeralds, and amethysts."
"pearl" -> "There are white and black pearls you can buy or sell."
-"jewel" -> "Currently you can purchase wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "Currently you can purchase gold converting rings, wedding rings, golden amulets, and ruby necklaces."
"talon" -> "I don't trade or work with these magic gems. It's better you ask a mage about this."
"wedding","ring" -> Type=3004, Amount=1, Price=990, "Do you want to buy a wedding ring for %P gold?", Topic=1
@@ -43,6 +43,8 @@ VANISH,! -> "Daraman's blessings and good bye."
"small","ruby" -> Type=3030, Amount=1, Price=500, "Do you want to buy a small ruby for %P gold?", Topic=1
"small","emerald" -> Type=3032, Amount=1, Price=500, "Do you want to buy a small emerald for %P gold?", Topic=1
"small","amethyst" -> Type=3033, Amount=1, Price=400, "Do you want to buy a small amethyst for %P gold?", Topic=1
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=1
+"gold","convert" -> *
%1,1<%1,"wedding","ring" -> Type=3004, Amount=%1, Price=990*%1, "Do you want to buy %A wedding rings for %P gold?", Topic=1
%1,1<%1,"golden","amulet" -> Type=3013, Amount=%1, Price=6600*%1, "Do you want to buy %A golden amulets for %P gold?", Topic=1
@@ -54,6 +56,8 @@ VANISH,! -> "Daraman's blessings and good bye."
%1,1<%1,"small","rub" -> Type=3030, Amount=%1, Price=500*%1, "Do you want to buy %A small rubies for %P gold?", Topic=1
%1,1<%1,"small","emerald" -> Type=3032, Amount=%1, Price=500*%1, "Do you want to buy %A small emeralds for %P gold?", Topic=1
%1,1<%1,"small","amethyst" -> Type=3033, Amount=%1, Price=400*%1, "Do you want to buy %A small amethysts for %P gold?", Topic=1
+%1,1<%1,"crystal","ring" -> Type=3007, Amount=%1, Price=250*%1, "Do you want to buy %A crystal rings to convert gold for %P gold?", Topic=1
+%1,1<%1,"gold","convert" -> *
"sell","white","pearl" -> Type=3026, Amount=1, Price=160, "Do you want to sell a white pearl for %P gold?", Topic=2
"sell","black","pearl" -> Type=3027, Amount=1, Price=280, "Do you want to sell a black pearl for %P gold?", Topic=2
diff --git a/data/npc/iwan.npc b/data/npc/iwan.npc
index 8f0962d..6202b76 100644
--- a/data/npc/iwan.npc
+++ b/data/npc/iwan.npc
@@ -37,7 +37,7 @@ VANISH,! -> "Bye, bye."
"do","you","have" -> *
"gem" -> "You can buy and sell small diamonds, small sapphires, small rubies, small emeralds, and small amethysts."
"pearl" -> "There are white and black pearls you can buy or sell."
-"jewel" -> "Currently you can purchase wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "Currently you can purchase gold converting rings, wedding rings, golden amulets, and ruby necklaces."
"sabrehaven","talon" -> "The Edron Academy is very interested in them, however the King doesn't want to invest that many money!"
"wedding","ring" -> Type=3004, Amount=1, Price=990, "Do you want to buy a wedding ring for %P gold?", Topic=1
@@ -50,6 +50,8 @@ VANISH,! -> "Bye, bye."
"small","ruby" -> Type=3030, Amount=1, Price=500, "Do you want to buy a small ruby for %P gold?", Topic=1
"small","emerald" -> Type=3032, Amount=1, Price=500, "Do you want to buy a small emerald for %P gold?", Topic=1
"small","amethyst" -> Type=3033, Amount=1, Price=400, "Do you want to buy a small amethyst for %P gold?", Topic=1
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=1
+"gold","convert" -> *
%1,1<%1,"wedding","ring" -> Type=3004, Amount=%1, Price=990*%1, "Do you want to buy %A wedding rings for %P gold?", Topic=1
%1,1<%1,"golden","amulet" -> Type=3013, Amount=%1, Price=6600*%1, "Do you want to buy %A golden amulets for %P gold?", Topic=1
@@ -61,6 +63,8 @@ VANISH,! -> "Bye, bye."
%1,1<%1,"small","rub" -> Type=3030, Amount=%1, Price=500*%1, "Do you want to buy %A small rubies for %P gold?", Topic=1
%1,1<%1,"small","emerald" -> Type=3032, Amount=%1, Price=500*%1, "Do you want to buy %A small emeralds for %P gold?", Topic=1
%1,1<%1,"small","amethyst" -> Type=3033, Amount=%1, Price=400*%1, "Do you want to buy %A small amethysts for %P gold?", Topic=1
+%1,1<%1,"crystal","ring" -> Type=3007, Amount=%1, Price=250*%1, "Do you want to buy %A crystal rings to convert gold for %P gold?", Topic=1
+%1,1<%1,"gold","convert" -> *
"sell","white","pearl" -> Type=3026, Amount=1, Price=160, "Do you want to sell a white pearl for %P gold?", Topic=2
"sell","black","pearl" -> Type=3027, Amount=1, Price=280, "Do you want to sell a black pearl for %P gold?", Topic=2
diff --git a/data/npc/tesha.npc b/data/npc/tesha.npc
index 3d0d719..146148a 100644
--- a/data/npc/tesha.npc
+++ b/data/npc/tesha.npc
@@ -67,7 +67,7 @@ VANISH,! -> "May enlightenment be your path."
"gem" -> "You can buy and sell small diamonds, small sapphires, small rubies, small emeralds, and small amethysts."
"pearl" -> "There are white and black pearls you can buy or sell."
-"jewel" -> "Currently you can purchase wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "Currently you can purchase gold converting rings, wedding rings, golden amulets, and ruby necklaces."
"talon" -> "I don't trade or work with these magic gems. It's better you ask a mage about this."
"wedding","ring" -> Type=3004, Amount=1, Price=990, "Do you want to buy a wedding ring for %P gold?", Topic=1
@@ -80,6 +80,8 @@ VANISH,! -> "May enlightenment be your path."
"small","ruby" -> Type=3030, Amount=1, Price=500, "Do you want to buy a small ruby for %P gold?", Topic=1
"small","emerald" -> Type=3032, Amount=1, Price=500, "Do you want to buy a small emerald for %P gold?", Topic=1
"small","amethyst" -> Type=3033, Amount=1, Price=400, "Do you want to buy a small amethyst for %P gold?", Topic=1
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=1
+"gold","convert" -> *
%1,1<%1,"wedding","ring" -> Type=3004, Amount=%1, Price=990*%1, "Do you want to buy %A wedding rings for %P gold?", Topic=1
%1,1<%1,"golden","amulet" -> Type=3013, Amount=%1, Price=6600*%1, "Do you want to buy %A golden amulets for %P gold?", Topic=1
@@ -91,6 +93,8 @@ VANISH,! -> "May enlightenment be your path."
%1,1<%1,"small","rub" -> Type=3030, Amount=%1, Price=500*%1, "Do you want to buy %A small rubies for %P gold?", Topic=1
%1,1<%1,"small","emerald" -> Type=3032, Amount=%1, Price=500*%1, "Do you want to buy %A small emeralds for %P gold?", Topic=1
%1,1<%1,"small","amethyst" -> Type=3033, Amount=%1, Price=400*%1, "Do you want to buy %A small amethysts for %P gold?", Topic=1
+%1,1<%1,"crystal","ring" -> Type=3007, Amount=%1, Price=250*%1, "Do you want to buy %A crystal rings to convert gold for %P gold?", Topic=1
+%1,1<%1,"gold","convert" -> *
"sell","white","pearl" -> Type=3026, Amount=1, Price=160, "Do you want to sell a white pearl for %P gold?", Topic=2
"sell","black","pearl" -> Type=3027, Amount=1, Price=280, "Do you want to sell a black pearl for %P gold?", Topic=2
diff --git a/data/npc/tezila.npc b/data/npc/tezila.npc
index 88b5fef..4f1527b 100644
--- a/data/npc/tezila.npc
+++ b/data/npc/tezila.npc
@@ -27,7 +27,7 @@ VANISH,! -> "Good bye."
"do","you","have" -> *
"gem" -> "You can buy and sell small diamonds, sapphires, rubies, emeralds, and amethysts."
"pearl" -> "I have white and black pearls you can buy, but you can also sell me some."
-"jewel" -> "You can purchase our fine dwarfish wares like wedding rings, golden amulets, and ruby necklaces."
+"jewel" -> "You can purchase our fine dwarfish wares like gold converting rings, wedding rings, golden amulets, and ruby necklaces."
"talon" -> "I am suspicious of these magic gems. Better you ask some mages about this."
"sabrehaven","talon" -> "I am more interested in buying them instead of selling."
@@ -41,6 +41,8 @@ VANISH,! -> "Good bye."
"small","ruby" -> Type=3030, Amount=1, Price=500, "Do you want to buy a small ruby for %P gold?", Topic=1
"small","emerald" -> Type=3032, Amount=1, Price=500, "Do you want to buy a small emerald for %P gold?", Topic=1
"small","amethyst" -> Type=3033, Amount=1, Price=400, "Do you want to buy a small amethyst for %P gold?", Topic=1
+"crystal","ring" -> Type=3007, Amount=1, Price=250, "Do you want to buy a crystal ring to convert gold for %P gold?", Topic=1
+"gold","convert" -> *
%1,1<%1,"wedding","ring" -> Type=3004, Amount=%1, Price=990*%1, "Do you want to buy %A wedding rings for %P gold?", Topic=1
%1,1<%1,"golden","amulet" -> Type=3013, Amount=%1, Price=6600*%1, "Do you want to buy %A golden amulets for %P gold?", Topic=1
@@ -52,6 +54,8 @@ VANISH,! -> "Good bye."
%1,1<%1,"small","rub" -> Type=3030, Amount=%1, Price=500*%1, "Do you want to buy %A small rubies for %P gold?", Topic=1
%1,1<%1,"small","emerald" -> Type=3032, Amount=%1, Price=500*%1, "Do you want to buy %A small emeralds for %P gold?", Topic=1
%1,1<%1,"small","amethyst" -> Type=3033, Amount=%1, Price=400*%1, "Do you want to buy %A small amethysts for %P gold?", Topic=1
+%1,1<%1,"crystal","ring" -> Type=3007, Amount=%1, Price=250*%1, "Do you want to buy %A crystal rings to convert gold for %P gold?", Topic=1
+%1,1<%1,"gold","convert" -> *
"sell","white","pearl" -> Type=3026, Amount=1, Price=160, "Do you want to sell a white pearl for %P gold?", Topic=2
"sell","black","pearl" -> Type=3027, Amount=1, Price=280, "Do you want to sell a black pearl for %P gold?", Topic=2