Merge pull request #222 from wushin/inya-heathin-redux

Adjust Heathin & Inya

1 files changed, 37 insertions, 28 deletions

diff --git a/world/map/npc/068-2/inya.txt b/world/map/npc/068-2/inya.txt
index b3301656..1958478c 100644
--- a/world/map/npc/068-2/inya.txt
+++ b/world/map/npc/068-2/inya.txt
@@ -1,20 +1,29 @@
 //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
 //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic?
 
+068-2.gat,29,56,0|shop|#InyaShop|127,SimpleRing:*100000
+
 068-2.gat,29,56,0|script|Inya|106
 {
     mes "[Inya]";
-    mes "\"I am Inya, a jeweler of fine rings. If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\"";
+    mes "\"I am Inya, a jeweler of fine rings. I sell and make rings.\"";
+    next; 
+    mes "\"If you have a Simple Ring and a gem, I can set the gem in it for 100,000 gold pieces.\"";
     next;
-    mes "\"Also, if you have a ring with gems on it, I can remove the gems and return the Simple Ring to you for 500,000 gold pieces.\"";
+    mes "\"Also, if you have a ring with gems on it, I can remove the gems and return the Simple Ring to you for 50,000 gold pieces.\"";
     next;
     mes "\"So, how can I help you?\"";
     menu
+        "What jewelry do you have for sale?", L_Inya_Shop,
         "I have a wedding ring, will that do?", L_Inya_Wedding_Ring,
-        "I'd like to remove a gem (500000 GP).", L_Inya_Remove_RingGem,
-        "I'd like to add a gem (1000000 GP).", L_Inya_Add_RingGem,
+        "I'd like to remove a gem (50000 GP).", L_Inya_Remove_RingGem,
+        "I'd like to add a gem (100000 GP).", L_Inya_Add_RingGem,
         "Not interested.", L_Inya_NotInterested;
 
+L_Inya_Shop:
+    close2;
+    shop "#InyaShop";
+
 L_Inya_Wedding_Ring:
     mes "[Inya]";
     mes "\"No, sorry. I do not alter wedding rings at this time.\"";
@@ -45,10 +54,10 @@ L_Inya_Add_RingGem:
         "I've changed my mind.", L_Inya_NotInterested;
 
 L_Inya_Remove_Diamond:
-    if ( (Zeny < 500000)
+    if ( (Zeny < 50000)
         | (countitem ("DiamondRing") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 500000;
+    set Zeny, Zeny - 50000;
     delitem "DiamondRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -56,10 +65,10 @@ L_Inya_Remove_Diamond:
     close;
 
 L_Inya_Remove_Ruby:
-    if ( (Zeny < 500000)
+    if ( (Zeny < 50000)
         | (countitem ("RubyRing") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 500000;
+    set Zeny, Zeny - 50000;
     delitem "RubyRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -67,10 +76,10 @@ L_Inya_Remove_Ruby:
     close;
 
 L_Inya_Remove_Emerald:
-    if ( (Zeny < 500000)
+    if ( (Zeny < 50000)
         | (countitem ("EmeraldRing") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 500000;
+    set Zeny, Zeny - 50000;
     delitem "EmeraldRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -78,10 +87,10 @@ L_Inya_Remove_Emerald:
     close;
 
 L_Inya_Remove_Sapphire:
-    if ( (Zeny < 500000)
+    if ( (Zeny < 50000)
         | (countitem ("SapphireRing") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 500000;
+    set Zeny, Zeny - 50000;
     delitem "SapphireRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -89,10 +98,10 @@ L_Inya_Remove_Sapphire:
     close;
 
 L_Inya_Remove_Topaz:
-    if ( (Zeny < 500000)
+    if ( (Zeny < 50000)
         | (countitem ("TopazRing") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 500000;
+    set Zeny, Zeny - 50000;
     delitem "TopazRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -100,10 +109,10 @@ L_Inya_Remove_Topaz:
     close;
 
 L_Inya_Remove_Amethyst:
-    if ( (Zeny < 500000)
+    if ( (Zeny < 50000)
         | (countitem ("AmethystRing") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 500000;
+    set Zeny, Zeny - 50000;
     delitem "AmethystRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -111,11 +120,11 @@ L_Inya_Remove_Amethyst:
     close;
 
 L_Inya_Add_Diamond:
-    if ( (Zeny < 1000000)
+    if ( (Zeny < 100000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Diamond") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 1000000;
+    set Zeny, Zeny - 100000;
     delitem "SimpleRing", 1;
     delitem "Diamond", 1;
     getitem "DiamondRing", 1;
@@ -124,11 +133,11 @@ L_Inya_Add_Diamond:
     close;
 
 L_Inya_Add_Ruby:
-    if ( (Zeny < 1000000)
+    if ( (Zeny < 100000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Ruby") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 1000000;
+    set Zeny, Zeny - 100000;
     delitem "SimpleRing", 1;
     delitem "Ruby", 1;
     getitem "RubyRing", 1;
@@ -137,11 +146,11 @@ L_Inya_Add_Ruby:
     close;
 
 L_Inya_Add_Emerald:
-    if ( (Zeny < 1000000)
+    if ( (Zeny < 100000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Emerald") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 1000000;
+    set Zeny, Zeny - 100000;
     delitem "SimpleRing", 1;
     delitem "Emerald", 1;
     getitem "EmeraldRing", 1;
@@ -150,11 +159,11 @@ L_Inya_Add_Emerald:
     close;
 
 L_Inya_Add_Sapphire:
-    if ( (Zeny < 1000000)
+    if ( (Zeny < 100000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Sapphire") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 1000000;
+    set Zeny, Zeny - 100000;
     delitem "SimpleRing", 1;
     delitem "Sapphire", 1;
     getitem "SapphireRing", 1;
@@ -163,11 +172,11 @@ L_Inya_Add_Sapphire:
     close;
 
 L_Inya_Add_Topaz:
-    if ( (Zeny < 1000000)
+    if ( (Zeny < 100000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Topaz") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 1000000;
+    set Zeny, Zeny - 100000;
     delitem "SimpleRing", 1;
     delitem "Topaz", 1;
     getitem "TopazRing", 1;
@@ -176,11 +185,11 @@ L_Inya_Add_Topaz:
     close;
 
 L_Inya_Add_Amethyst:
-    if ( (Zeny < 1000000)
+    if ( (Zeny < 100000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Amethyst") < 1) )
             goto L_Inya_Not_Enough;
-    set Zeny, Zeny - 1000000;
+    set Zeny, Zeny - 100000;
     delitem "SimpleRing", 1;
     delitem "Amethyst", 1;
     getitem "AmethystRing", 1;