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

Adjust Heathin & Inya

2 files changed, 94 insertions, 67 deletions

diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index 022c91ab..4bd9aae7 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -5,6 +5,7 @@
     set @TARROW_REQ_TERRA_ORE, 1;
     set @TARROW_REQ_COAL, 5;
     set @TARROW_REQ_GP, 3000;
+    set @heathin_xp_bonus, (100 * BaseLevel);
 
     set @state, ((QUEST_NorthTulimshar & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT);
 
@@ -21,8 +22,8 @@
     if (@state == 4) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood_Ready;
     if (@state == 3) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood_Forge;
     if (@state == 2) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood;
-    if (@state == 2) && (BaseLevel >= 60) goto L_Heathin_Ring_Thanks;
-    if (@state == 1) && (BaseLevel >= 60) goto L_Heathin_Ring_Award;
+    if (@state == 2) && (BaseLevel >= 60) goto L_Heathin_Forge_Thanks;
+    if (@state == 1) && (BaseLevel >= 60) goto L_Heathin_Forge_Award;
     if (BaseLevel >= 60) goto L_Heathin_Start;
 
     mes "[Heathin]";
@@ -33,23 +34,19 @@ L_Heathin_Start:
     mes "[Heathin]";
     mes "\"Hello, friend. I am Heathin, a smith of exotic metals. \"";
     next;
-    mes "\"By the order of the Wizard's Council, I've been commissioned to forge gold ingots from gold pieces. I need to collect as many gold pieces as I can manage, forge them and give the ingots to the Council. However, I am but a simple smith and cannot complete this effort by myself.\"";
+    mes "\"By the order of the Wizard's Council, I've been commissioned to forge armor for the upcoming expediation. However, I am but a simple smith and cannot complete all this effort by myself. I need individuals that can gather Coal to heat my forge.\"";
     next;
-    mes "\"Forging gold ingots is not just a simple matter of gold falling from the sky!  I need individuals that can gather not just the gold, but also help collect Coal to heat my forge.\"";
-    next;
-    mes "\"Of course it would make little sense for me to gather gold pieces from helpers just to pass them back out. However, I am willing to smith an award for any who would put an effort in towards completing my goal.\"";
-    next;
-    mes "\"Perhaps you would be interested in helping me out?  Would you be willing to help me gather Coal and gold to fulfill my commission?  I am asking any and all willing souls to get me 50 coal and 100,000 gold pieces, as that would put a significant dint in my goal.\"";
+    mes "\"Perhaps you would be interested in helping me out?  Would you be willing to help me gather Coal and help me fulfill my commission?  I am asking any and all willing souls to get me 50 coal, as that would put a significant dint in my goal.\"";
     menu
         "Sure, I'll help!", L_Heathin_Help,
-        "I'd rather keep my gold for my own purposes, thank you very much.", L_Heathin_No,
+        "I'd rather keep my Coal for my own purposes, thank you very much.", L_Heathin_No,
         "Wait, what kind of award are we talking about?", L_Heathin_Interested;
 
 L_Heathin_Help:
     set @state, 1;
     callsub S_Update_Mask;
     mes "[Heathin]";
-    mes "\"Excellent!  I am always glad when someone can be of service not just to me, but to all of Tulimshar. Please get me 50 Coal and 100,000 gold pieces, and you will be compensated for your efforts.\"";
+    mes "\"Excellent!  I am always glad when someone can be of service not just to me, but to all of Tulimshar. Please get me 50 Coal and you will be compensated for your efforts.\"";
     close;
 
 L_Heathin_No:
@@ -59,44 +56,40 @@ L_Heathin_No:
 
 L_Heathin_Interested:
     mes "[Heathin]";
-    mes "\"Well, when I am crafting these ingots, there are always stray metals left over. Surely I could forge them into ingots again, but I'd rather ensure that my commission be completed. I am willing to forge a Simple Ring for you, which could be made more beautiful by a skilled jeweler.\"";
+    mes "\"Well, I can compensate you from the commision I getting from the council.\"";
     next;
-    mes "\"What you do with the ring after I am done forging it is your own business, but it could come in handy.\"";
+    mes "\"How does 20,000 GP and I'll offer my smithing services for a discount?\"";
     next;
     mes "\"Does this sound like something you might be interested in?\"";
     menu
         "Sure, I'll help!", L_Heathin_Help,
-        "I'd rather keep my gold.", L_Heathin_No,
+        "I'd rather keep my Coal.", L_Heathin_No,
         "Can you repeat that again?", L_Heathin_Interested;
 
-L_Heathin_Ring_Award:
-    if ( (Zeny < 100000)
-        || (countitem ("Coal") < 50) )
-            goto L_Heathin_Ring_Wait;
+L_Heathin_Forge_Award:
+    if (countitem ("Coal") < 50) goto L_Heathin_Forge_Wait;
     getinventorylist;
-    if ((checkweight("SimpleRing", 1) == 0) || (@inventorylist_count == 100))
-        goto L_InventoryNoSpace;
     set @state, 2;
     callsub S_Update_Mask;
-    set Zeny, Zeny - 100000;
     delitem "Coal", 50;
-    getitem "SimpleRing", 1;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny + 20000;
     mes "[Heathin]";
-    mes "\"You have brought the Coal and gold pieces. This is most excellent!  As promised, I have crafted a ring for you. Hopefully you will find it useful.\"";
+    mes "\"You have brought the Coal. This is most excellent!  As promised, I have a reward for you. Hopefully you will find it useful.\"";
     next;
-    mes "\"Time to smelt these gold pieces into ingots. The Council will be pleased. Thank you for your efforts!\"";
+    mes "\"Time to make some armor. The Council will be pleased. Thank you for your efforts!\"";
     close;
 
-L_Heathin_Ring_Wait:
+L_Heathin_Forge_Wait:
     mes "[Heathin]";
-    mes "\"Hello again. Making golden ingots keeps me pretty busy. I certainly hope I can fulfill my commission soon so that I can move on to bigger and better things.\"";
+    mes "\"Hello again. Making armor keeps me pretty busy. I certainly hope I can fulfill my commission soon so that I can move on to bigger and better things.\"";
     next;
-    mes "\"The pay is good, certainly, but I am a far better smith than this. If you can bring me 100,000 gold pieces and 50 Coal, it would surely get me to my goal faster.\"";
+    mes "\"The pay is good, certainly, but I am a far better smith than this. If you can bring me 50 Coal, it would surely get me to my goal faster.\"";
     next;
     mes "\"I will be sure to provide an apt award once you are done.\"";
     close;
 
-L_Heathin_Ring_Thanks:
+L_Heathin_Forge_Thanks:
     mes "[Heathin]";
     mes "\"Thank you again for helping me fulfil my commission. It has made a signficant dint in what the Council requires of me. Perhaps I may be of service to you again one day!\"";
     close;
@@ -133,11 +126,11 @@ L_Heathin_Terranite_Yes:
     next;
     mes "\"Ah, I know!  I will make a helm... Well, more like a hood, since it will be woven.\"";
     next;
-    mes "\"It will require a great amount of heat, if the rumors are to be believed. For this, I will need 100 Coal to keep my forge burning hot. I will also need 10 Terranite Ore to make the armor. Of course, such work does not come cheap. While I may enjoy my work, my time and effort is very valuable. To compensate my efforts I will need 200,000 gold pieces. Please come back with the gold, Coal and ore and I'll make this hood for you.\"";
+    mes "\"It will require a great amount of heat, if the rumors are to be believed. For this, I will need 100 Coal to keep my forge burning hot. I will also need 10 Terranite Ore to make the armor. Of course, such work does not come cheap. While I may enjoy my work, my time and effort is very valuable. Since you have been a great help I will only need 20,000 gold pieces, well below my going rate. Please come back with the gold, Coal and ore and I'll make this hood for you.\"";
     close;
 
 L_Heathin_Terranite_Hood_Forge:
-    if ( (Zeny < 200000)
+    if ( (Zeny < 20000)
         || (countitem("Coal") < 100)
         || (countitem("TerraniteOre") < 10) )
             goto L_Heathin_Terranite_Hood_Wait;
@@ -145,14 +138,15 @@ L_Heathin_Terranite_Hood_Forge:
     callsub S_Update_Mask;
     delitem "Coal", 100;
     delitem "TerraniteOre", 10;
-    set Zeny, Zeny - 200000;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny - 20000;
     mes "[Heathin]";
     mes "\"Great, you brought everything!  Come back later and I'll have the helm ready for you.\"";
     close;
 
 L_Heathin_Terranite_Hood_Wait:
     mes "[Heathin]";
-    mes "\"I am very busy right now. If you could bring me 10 Terranite Ore, 100 Coal and 200,000 gold pieces, I will make that terranite hood for you.\"";
+    mes "\"I am very busy right now. If you could bring me 10 Terranite Ore, 100 Coal and 20,000 gold pieces, I will make that terranite hood for you.\"";
     close;
 
 L_Heathin_Terranite_Hood_Ready:
@@ -172,11 +166,11 @@ L_Heathin_Terranite_Legs:
     mes "[Heathin]";
     mes "\"I am glad you are back!  I've just finished up some more of my commission. Now I can get back to making terranite armor for you. This time I will make some pants, but they need more ore, more Coal to heat my forge and of course, more gold for my efforts.\"";
     next;
-    mes "\"To make terranite pants, I need 200 Coal, 30 Terranite Ore and 400,000 gold pieces. The faster you bring this to me, the faster I can have your terranite pants ready.\"";
+    mes "\"To make terranite pants, I need 200 Coal, 30 Terranite Ore and 40,000 gold pieces. The faster you bring this to me, the faster I can have your terranite pants ready.\"";
     close;
 
 L_Heathin_Terranite_Legs_Forge:
-    if ( (Zeny < 400000)
+    if ( (Zeny < 40000)
         || (countitem("Coal") < 200)
         || (countitem("TerraniteOre") < 30) )
             goto L_Heathin_Terranite_Legs_Wait;
@@ -184,14 +178,15 @@ L_Heathin_Terranite_Legs_Forge:
     callsub S_Update_Mask;
     delitem "Coal", 200;
     delitem "TerraniteOre", 30;
-    set Zeny, Zeny - 400000;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny - 40000;
     mes "[Heathin]";
     mes "\"Great, you have brought everything!  Come back later and I will have those terranite pants ready for you.\"";
     close;
 
 L_Heathin_Terranite_Legs_Wait:
     mes "[Heathin]";
-    mes "\"I am very busy right now. If you could bring me 30 Terranite Ore, 200 Coal and 400,000 gold pieces, I will make those terranite pants for you.\"";
+    mes "\"I am very busy right now. If you could bring me 30 Terranite Ore, 200 Coal and 40,000 gold pieces, I will make those terranite pants for you.\"";
     close;
 
 L_Heathin_Terranite_Legs_Ready:
@@ -211,11 +206,11 @@ L_Heathin_Terranite_Chest_Armor:
     mes "[Heathin]";
     mes "\"Good to see you again. I have just finished up some more of my commission. Now I can get back to making terranite armor for you. This time, I will make some terranite chest armor, but it needs more ore, more Coal for my forge and of course, more gold to compensate for my efforts.\"";
     next;
-    mes "\"To make terranite chest armor, I need 250 Coal, 40 Terranite Ore and 500,000 gold pieces. The faster you bring this to me, the faster I can have your terranite armor ready.\"";
+    mes "\"To make terranite chest armor, I need 250 Coal, 40 Terranite Ore and 50,000 gold pieces. The faster you bring this to me, the faster I can have your terranite armor ready.\"";
     close;
 
 L_Heathin_Terranite_Chest_Armor_Forge:
-    if ( (Zeny < 500000)
+    if ( (Zeny < 50000)
         || (countitem("Coal") < 250)
         || (countitem("TerraniteOre") < 40) )
             goto L_Heathin_Terranite_Chest_Armor_Wait;
@@ -223,14 +218,15 @@ L_Heathin_Terranite_Chest_Armor_Forge:
     callsub S_Update_Mask;
     delitem "Coal", 250;
     delitem "TerraniteOre", 40;
-    set Zeny, Zeny - 500000;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny - 50000;
     mes "[Heathin]";
     mes "\"Splendid, you have brought everything!  Come back later and I will have the terranite chest armor ready for you.\"";
     close;
 
 L_Heathin_Terranite_Chest_Armor_Wait:
     mes "[Heathin]";
-    mes "\"I am very busy right now. If you could bring me 40 Terranite Ore, 250 Coal and 500,000 gold pieces, I will make that chest armor for you.\"";
+    mes "\"I am very busy right now. If you could bring me 40 Terranite Ore, 250 Coal and 50,000 gold pieces, I will make that chest armor for you.\"";
     close;
 
 L_Heathin_Terranite_Chest_Armor_Ready:
@@ -276,6 +272,7 @@ L_Heathin_Terranite_Arrows_Forge:
     callsub S_Update_Mask;
     delitem "Coal", @TARROW_REQ_COAL;
     delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
+    getexp @heathin_xp_bonus, 0;
     set Zeny, Zeny - @TARROW_REQ_GP;
     mes "[Heathin]";
     mes "\"Wonderful! You have everything I asked for. I will start working on the arrows right away.\"";
@@ -340,3 +337,24 @@ S_Update_Mask:
     set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_6_MASK)) | (@state << NIBBLE_6_SHIFT);
     return;
 }
+021-2.gat,72,129,0|script|HeathinDebug|147
+{
+    mes "[Heathin Debug]";
+    mes "Debug Action";
+    menu
+        "Reset", L_Reset,
+        "Exit", L_End;
+
+L_Reset:
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_6_MASK) | (0 << NIBBLE_6_SHIFT));
+    mes "Reset!";
+    goto L_End;
+
+L_End:
+    end;
+
+OnInit:
+    if (!debug)
+        disablenpc "HeathinDebug";
+    end;
+}
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;