Crafting NPC release and related changes

Ingots now needed for armor and helmets, terranite quest, ring jeweler quest
fixes related to these changes to maintain balance

10 files changed, 635 insertions, 42 deletions

diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt
index 8b3dd0dc..25d4868d 100644
--- a/npc/009-2_Hurnscald/_import.txt
+++ b/npc/009-2_Hurnscald/_import.txt
@@ -11,6 +11,7 @@ npc: npc/009-2_Hurnscald/mapflags.txt
 npc: npc/009-2_Hurnscald/misc.txt
 npc: npc/009-2_Hurnscald/nicholas.txt
 npc: npc/009-2_Hurnscald/nurse.txt
+npc: npc/009-2_Hurnscald/peter.txt
 npc: npc/009-2_Hurnscald/richard.txt
 npc: npc/009-2_Hurnscald/selim.txt
 npc: npc/009-2_Hurnscald/shops.txt
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 0a1834f0..8c820849 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -3,7 +3,7 @@
 //# Nicholas the Smith.
 //# Participates in iron ore smithery and the following quests:
 //# - Together with Pachua: Iron Shield quest (repeatable)
-//#    (10 iron ores, 2 infantry helmets, 20000 GP, leather patch) -> iron shield
+//#    (6 iron ingots, 2 infantry helmets, 20000 GP, leather patch) -> iron shield
 //# - Primary participant in the Setzer quest (monster oil/golden stinger subquests)
 //#
 //# Variables used:  @QUEST_Forestbow_state, nibble 3 (setzer quest)
@@ -38,28 +38,29 @@
 	mes "[Nicholas]";
 	mes "\"Hello there,";
 	mes "I'm an expert blacksmith.";
-	mes "If you get me some Iron Ore";
+	mes "If you get me some coal and iron ingots";
 	mes "I could make you a very valuable shield";
         mes "or helmet.\"";
 	next;
 	menu
-		"I have some Iron Ore!", L_Check,
-		"Where can I get this Iron Ore?", L_Info,
+		"I have iron ingots!", L_Check,
+		"Where can I get coal and iron Ingots?", L_Info,
 		"I'm okay, thanks.", L_Pass;
 
 L_Check:
 	mes "[Nicholas]";
 	mes "\"Let me take at look at how much you have...\"";
 	next;
-	if(countitem("IronOre")<5) goto L_NoItem;
-	if(countitem("IronOre")<10) goto L_StageA;
-	if(countitem("IronOre")<15) goto L_StageB;
+	if ( (countitem("IngotIron")<3) | (countitem("Coal") < 6) ) goto L_NoItem;
+	if ( (countitem("IngotIron")<6) | (countitem("Coal") < 12) ) goto L_StageA;
+	if ( (countitem("IngotIron")<9) | (countitem("Coal") < 18) ) goto L_StageB;
 	goto L_StageC;
 
 L_Info:
 	mes "[Nicholas]";
-	mes "\"You can find Iron Ore in mines.";
-	mes "It is quite hard to come by though.\"";
+	mes "\"You can find coal and iron ore in mines."; 
+	mes "\"Once you have coal and iron ore, find a smith that will smelt the iron ore and cast them into iron ingots.";
+	mes "\"Come back here with more coal and the iron ingots and I'll make something nice for you.\"";
 	close;
 
 L_Pass:
@@ -72,14 +73,14 @@ L_StageA:
 	mes "[Nicholas]";
 	mes "\"That's just enough for me to make you";
 	mes "a winged Knight's Helmet.";
-	mes "But it'll cost you 10,000GP";
-	mes "and 5 lumps of Iron Ore.\"";
+	mes "But it'll cost you 10,000GP,";
+	mes "6 Coal and 3 Iron Ingots.\"";
 	next;
         goto L_main_menu;
 
 L_StageB:
 	mes "[Nicholas]";
-	mes "\"Ahh, with that much Iron Ore I can";
+	mes "\"Ahh, with that much coal and iron ingots I can";
 	mes "make you one of two helmets,";
 	mes "for only 10,000GP, or I can";
 	mes "make you a shield, for 20,000GP.\"";
@@ -120,24 +121,24 @@ L_main_menu:
 
 L_main_menu_post_setzer:
 
-	if (countitem("IronOre")<5) goto L_no_more_helmets;
-        set @choice$[@choices_nr], "Knight's Helmet. (5 Iron Ores)";
+	if ( (countitem("IngotIron")<3) | (countitem("Coal") <6) ) goto L_no_more_helmets;
+        set @choice$[@choices_nr], "Knight's Helmet. (3 Iron Ingots & 6 Coal)";
         set @choice_idx[@choices_nr], @CHOICE_KNIGHT;
         set @choices_nr, 1 + @choices_nr;
 
-	if (countitem("IronOre")<10) goto L_no_more_helmets;
+	if ( (countitem("IngotIron")<6) | (countitem("Coal") < 12) ) goto L_no_more_helmets;
 
-        set @choice$[@choices_nr], "Crusade Helmet. (10 Iron Ores)";
+        set @choice$[@choices_nr], "Crusade Helmet. (6 Iron Ingots & 12 Coal)";
         set @choice_idx[@choices_nr], @CHOICE_CRUSADE;
         set @choices_nr, 1 + @choices_nr;
 
-        set @choice$[@choices_nr], "Steel Shield. (10 Iron Ores)";
+        set @choice$[@choices_nr], "Steel Shield. (6 Iron Ingots)";
         set @choice_idx[@choices_nr], @CHOICE_SHIELD;
         set @choices_nr, 1 + @choices_nr;
 
-	if (countitem("IronOre")<15) goto L_no_more_helmets;
+	if ( (countitem("IngotIron")<9) | (countitem("Coal") < 18) ) goto L_no_more_helmets;
 
-        set @choice$[@choices_nr], "Warlord Helmet. (15 Iron Ores)";
+        set @choice$[@choices_nr], "Warlord Helmet. (9 Iron Ingots & 18 Coal)";
         set @choice_idx[@choices_nr], @CHOICE_WARLORD;
         set @choices_nr, 1 + @choices_nr;
 L_no_more_helmets:
@@ -171,7 +172,7 @@ L_no_more_helmets:
 
 L_NoItem:
 	mes "[Nicholas]";
-	mes "\"It appears you don't have enough Iron Ore for me to work with.";
+	mes "\"It appears you don't have enough Coal and Iron Ingots for me to work with.";
 	mes "Please do come back when you have more though.\"";
 	close;
 
@@ -190,7 +191,8 @@ L_YesKnight:
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny - 10000;
-	delitem "IronOre", 5;
+	delitem "IngotIron", 3;
+	delitem "Coal", 6;
 	getitem "KnightsHelmet", 1;
 	goto L_Done;
 
@@ -199,7 +201,8 @@ L_YesCrusade:
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-10000;
-	delitem "IronOre", 10;
+	delitem "IngotIron", 6;
+	delitem "Coal", 12;
 	getitem "CrusadeHelmet", 1;
 	goto L_Done;
 
@@ -208,13 +211,14 @@ L_YesWarlord:
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-10000;
-	delitem "IronOre", 15;
+	delitem "IngotIron", 9;
+	delitem "Coal", 18;
 	getitem "WarlordHelmet", 1;
 	goto L_Done;
 
 L_YesShield:
         mes "[Nicholas]";
-        mes "Nicholas examines your iron ore.";
+        mes "Nicholas examines your Iron Ingots.";
         mes "\"No, this iron is too brittle; for something as large as a shield I need to mix in softer iron.  Can I see if you have anything suitable?\"";
         next;
 
@@ -240,19 +244,21 @@ L_YesShield:
 
 	if (zeny < 20000) goto L_ShieldNoZeny;
 	if (countitem("InfantryHelmet") < 2) goto L_ShieldNoInfantry;
-	if (countitem("IronOre") < 10) goto L_ShieldNoOre;
+	if (countitem("IngotIron") < 6) goto L_ShieldNoIngot;
+	if (countitem("Coal") < 12) goto L_ShieldNoCoal;
 	if (countitem("LeatherPatch") < 1) goto L_ShieldNoLeatherPatch;
 	// No inventory check needed, as infantry helms are removed, opening two slots
 
         mes "[Nicholas]";
         mes "\"Yes, it looks as if you have all that is needed!\"";
-        mes "You watch Nicholas melt the ore and helmets and form a shield out of the resulting iron.  He then cuts your leather patch apart and adds it to the handles.";
+        mes "You watch Nicholas melt the ingots and helmets and form a shield out of the resulting iron.  He then cuts your leather patch apart and adds it to the handles.";
         mes "\"Here is your shield!\"";
 
         delitem "InfantryHelmet", 1;
         delitem "InfantryHelmet", 1;
         delitem "LeatherPatch", 1;
-        delitem "IronOre", 10;
+        delitem "IngotIron", 6;
+	delitem "Coal", 12;
         set zeny, zeny - 20000;
 
         if (@Q_SHIELD_status < @SHIELD_COMPLETED)
@@ -276,9 +282,14 @@ L_ShieldNoInfantry:
         mes "\"Now this is strange... I could have sworn that you had two infantry helmets right here.  Well, come back if you have some more!\"";
         close;
 
-L_ShieldNoOre:
+L_ShieldNoIngot:
         mes "[Nicholas]";
-        mes "\"How odd... didn't I put your iron ore on the table right here?  Well, I will need it back to make the shield.\"";
+        mes "\"How odd... didn't I put your iron ingots on the table right here?  Well, I will need it back to make the shield.\"";
+        close;
+
+L_ShieldNoCoal:
+	mes "[Nicholas]";
+        mes "\"How odd... didn't I put your coal on the table right here?  Well, I will need it back to make the shield.\"";
         close;
 
 L_ShieldNoLeatherPatch:
@@ -309,7 +320,7 @@ L_SetzerQuest:
         if (@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER)
         	mes "\"Another one?  Sure, why not.\"";
 	mes "Nicholas examines your short sword, then nods.";
-        mes "\"This is good quality.  I can make something special out of it, for five chunks of iron ore and 50,000 GP-- but I will also need a potion of monster oil.\"";
+        mes "\"This is good quality.  I can make something special out of it, with three ingot bars of iron and 50,000 GP-- but I will also need a potion of monster oil.\"";
         if (@Q_SETZER_status < @SETZER_KNOWS_OIL)
         	set @Q_SETZER_status, @SETZER_KNOWS_OIL;
         callsub L_Update_Var;
@@ -320,7 +331,7 @@ L_SetzerQuest:
              "HOW much?  Never mind.", L_Pass;
 
 	if (zeny < 50000) goto L_SetzerNoZeny;
-	if (countitem("IronOre") < 5) goto L_SetzerNoOre;
+	if ( (countitem("IngotIron") < 3) | (countitem("Coal") < 6) ) goto L_SetzerNoIngot;
 	if (countitem("MonsterOilPotion") < 1) goto L_SetzerNoMonsterOil;
 	if (countitem("ShortSword") < 1) goto L_SetzerNoSword;
 	// No inventory check needed, as the short sword is removed, opening a slot
@@ -329,7 +340,8 @@ L_SetzerQuest:
         mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer.  Before your eyes it turns thinner and flatter.  Finally he pours the monster oil over it, heats it up again and douses it in water.";
 
         set zeny, zeny - 50000;
-        delitem "IronOre", 5;
+        delitem "IngotIron", 3;
+	delitem "Coal", 6;
         delitem "MonsterOilPotion", 1;
         delitem "ShortSword", 1;
 
@@ -361,9 +373,9 @@ L_SetzerNoZeny:
         mes "\"I am sorry, but I must ask that you pay 50,000 GP; the kind of weapon I am thinking of is not easy to make.\"";
         close;
 
-L_SetzerNoOre:
+L_SetzerNoIngot:
         mes "[Nicholas]";
-        mes "\"Without five chunks of iron ore I can't improve your sword.\"";
+        mes "\"Without 3 ingots of iron, I can't improve your sword.\"";
         close;
 
 L_SetzerNoMonsterOil:
diff --git a/npc/009-2_Hurnscald/peter.txt b/npc/009-2_Hurnscald/peter.txt
new file mode 100644
index 00000000..1fcea250
--- /dev/null
+++ b/npc/009-2_Hurnscald/peter.txt
@@ -0,0 +1,75 @@
+// Nicholas' Apprentice and Armorsmith
+
+009-2.gat,183,57,0	script	Peter	157,{
+
+	mes "[Peter]";
+	mes "\"Hello, I am Nicholas' apprentice, Peter.\"";
+	next;
+	mes "\"I can make you some sturdy armor if you give me iron ingots to craft with and gold pieces for my efforts.  What would you like me to make?\"";
+	menu
+		"Chain Mail (10 coal, 5 ingots and 20000 GP)", L_Peter_Chain_Mail,
+		"Light Plate (20 coal, 10 ingots and 50000 GP)", L_Peter_Light_Plate,
+		"Warlord Plate (30 coal, 15 ingots and 100000 GP)", L_Peter_Warlord_Plate,
+		"nevermind", -;
+	close;
+
+L_Peter_Chain_Mail:
+	if (zeny < 20000) goto L_Peter_NotEnough_Zeny;
+	if (countitem("IngotIron") < 5) goto L_Peter_NotEnough_Ingot;
+	if (countitem("Coal") < 10) goto L_Peter_NotEnough_Coal;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Peter_TooMany;
+	set zeny, zeny - 20000;
+	delitem "IngotIron", 5;
+	getitem "ChainmailShirt", 1;
+	mes "[Peter]";
+	mes "\"Here you go!\"";
+	close;
+
+L_Peter_Light_Plate:
+	if (zeny < 20000) goto L_Peter_NotEnough_Zeny;
+	if (countitem("IngotIron") < 10) goto L_Peter_NotEnough_Ingot;
+	if (countitem("Coal") < 20) goto L_Peter_NotEnough_Coal;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Peter_TooMany;
+	set zeny, zeny - 50000;
+	delitem "IngotIron", 10;
+	getitem "LightPlatemail", 1;
+	mes "[Peter]";
+	mes "\"Here you go!\"";
+	close;
+
+L_Peter_Warlord_Plate:
+	if (zeny < 20000) goto L_Peter_NotEnough_Zeny;
+	if (countitem("IngotIron") < 15) goto L_Peter_NotEnough_Ingot;
+	if (countitem("Coal") < 30) goto L_Peter_NotEnough_Coal;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Peter_TooMany;
+	set zeny, zeny - 100000;
+	delitem "IngotIron", 15;
+	getitem "WarlordPlate", 1;
+	mes "[Peter]";
+	mes "\"Here you go!\"";
+	close;
+
+L_Peter_NotEnough_Zeny:
+	mes "[Peter]";
+	mes "\"You don't have enough gold.\"";
+	close;
+
+L_Peter_NotEnough_Ingot:
+	mes "[Peter]";
+	mes "\"You don't have enough ingots.\"";
+	close;
+
+L_Peter_NotEnough_Coal:
+	mes "[Peter]";
+	mes "\"You don't have enough coal.\"";
+	close;
+
+L_Peter_TooMany:
+	mes "[Peter]";
+	mes "\"You have too much stuff.  Please get rid of something if you want some armor.\"";
+	close;
+
+}
diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt
index 9d36a166..9c85c845 100644
--- a/npc/009-2_Hurnscald/shops.txt
+++ b/npc/009-2_Hurnscald/shops.txt
@@ -24,11 +24,6 @@
 // sells cactus drink, cactus potion, iron potion, concentration potion, and slow poison potion
 009-2.gat,123,22,0	shop	Potions#_M	127,501:50,502:70,567:500,568:500,750:500
 
-// Blacksmith
-// Sells all knives, chainmail armor, light platemail
-009-2.gat,183,57,0	shop	Blacksmith	135,625:20000,626:50000,658:100000,1201:25,522:100,521:1000
-
-
 // General Store
 // Sells various things, many not sold elsewhere
 009-2.gat,32,99,0	shop	General Store	112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000,741:-1
diff --git a/npc/010-2_Dimonds_Cove/dimonds.txt b/npc/010-2_Dimonds_Cove/dimonds.txt
index 7d3bea39..fcf02125 100644
--- a/npc/010-2_Dimonds_Cove/dimonds.txt
+++ b/npc/010-2_Dimonds_Cove/dimonds.txt
@@ -113,7 +113,7 @@
 
 010-2.gat,32,34,0	shop	Waitress	139,519:100,533:150,534:90,562:500,676:200
 
-010-2.gat,85,41,0	shop	Blacksmith	146,545:20000,529:5,625:20000,626:50000,603:-1
+010-2.gat,85,41,0	shop	Blacksmith	146,545:20000,529:5,603:-1
 
 010-2.gat,65,41,0	shop	General Store	137,586:1000,524:1600,544:10000,632:10000,528:1000,735:-1
 
diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt
index 333b88e1..83d25145 100644
--- a/npc/021-1_Tulimshar/north_shops.txt
+++ b/npc/021-1_Tulimshar/north_shops.txt
@@ -3,7 +3,7 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,136,38,0	shop	Inar	108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,ChainmailShirt :-1,SilkRobe :-5,DesertHat :-4
+021-1.gat,136,38,0	shop	Inar	108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
 
 // Some general stuff
 021-1.gat,128,36,0	shop	Imec	162,CoinBag :-3,EmptyBottle :-6,CasinoCoins :10,CottonCloth :-6
diff --git a/npc/021-2_Tulimshar/_import.txt b/npc/021-2_Tulimshar/_import.txt
index d33c0268..3f8e80b7 100644
--- a/npc/021-2_Tulimshar/_import.txt
+++ b/npc/021-2_Tulimshar/_import.txt
@@ -1,8 +1,11 @@
 map: 021-2.gat
 npc: npc/021-2_Tulimshar/_mobs.txt
 npc: npc/021-2_Tulimshar/_warps.txt
-npc: npc/021-2_Tulimshar/bakery.txt
 npc: npc/021-2_Tulimshar/furquest.txt
+npc: npc/021-2_Tulimshar/bakery.txt
 npc: npc/021-2_Tulimshar/government_building.txt
 npc: npc/021-2_Tulimshar/mapflags.txt
 npc: npc/021-2_Tulimshar/workshop.txt
+npc: npc/021-2_Tulimshar/heathin.txt
+npc: npc/021-2_Tulimshar/inya.txt
+npc: npc/021-2_Tulimshar/jhedia.txt
diff --git a/npc/021-2_Tulimshar/heathin.txt b/npc/021-2_Tulimshar/heathin.txt
new file mode 100644
index 00000000..5559614e
--- /dev/null
+++ b/npc/021-2_Tulimshar/heathin.txt
@@ -0,0 +1,282 @@
+//Items for NPC are incomplete.  Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
+
+021-2.gat,29,55,0	script	Heathin	147,{
+	
+	if (HEATHIN_QUEST == 14) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Trade;
+	if (HEATHIN_QUEST == 13) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Ready;
+	if (HEATHIN_QUEST == 12) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Forge;
+	if (HEATHIN_QUEST == 11) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows;
+	if (HEATHIN_QUEST == 10) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Ready;
+	if (HEATHIN_QUEST == 9) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Forge;
+	if (HEATHIN_QUEST == 8) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor;
+	if (HEATHIN_QUEST == 7) && (baselevel >= 80) goto L_Heathin_Terranite_Legs_Ready;
+	if (HEATHIN_QUEST == 6) && (baselevel >= 80) goto L_Heathin_Terranite_Legs_Forge;
+	if (HEATHIN_QUEST == 5) && (baselevel >= 80) goto L_Heathin_Terranite_Legs;
+	if (HEATHIN_QUEST == 4) && (baselevel >= 80) goto L_Heathin_Terranite_Hood_Ready;
+	if (HEATHIN_QUEST == 3) && (baselevel >= 80) goto L_Heathin_Terranite_Hood_Forge;
+	if (HEATHIN_QUEST == 2) && (baselevel >= 80) goto L_Heathin_Terranite_Hood;
+	if (HEATHIN_QUEST == 2) && (baselevel >= 60)goto L_Heathin_Ring_Thanks;
+	if (HEATHIN_QUEST == 1) && (baselevel >= 60) goto L_Heathin_Ring_Award;
+	if (baselevel >= 60) goto L_Heathin_Start;
+
+	mes "[Heathin]";
+	mes "\"Hello friend.  I am Heathin, a smith of exotic metals. \"";
+	close;
+
+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 can't do this effort by myself.\"";
+	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, just to pass them back out, but I am willing to create 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'm 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.\"";
+	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,
+		"Wait, what kind of award are we talking about?", L_Heathin_Interested;
+
+L_Heathin_Help:
+	set HEATHIN_QUEST, 1;
+	mes "[Heathin]";
+	mes "\"Excellent! I'm always glad some one can be of service not just to me, but to Tulimshar.  Please get me 50 coal and 100,000 gold pieces and you will be compensated for your efforts.\"";
+	close;
+
+L_Heathin_No:
+	mes "[Heathin]";
+	mes "\"That is too bad.  If you change your mind, I'll still be here attempting to get my commission done.\"";
+	close;
+
+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 done.  I am willing to forge a simple ring for you, which could be made more beautiful by a skilled jeweler.\"";
+	next;
+	mes "\"What you do with the ring after I'm done forging it is your own business, but it could come in handy.\"";
+	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,
+		"Can you repeat that again?", L_Heathin_Interested;
+	close;
+
+L_Heathin_Ring_Award:
+	if ( (zeny < 100000) | (countitem ("Coal") < 50) ) goto L_Heathin_Ring_Wait;
+	set HEATHIN_QUEST, 2;
+	set zeny, zeny - 100000;
+	delitem "Coal", 50;
+	getitem "RingSimple", 1;
+	mes "[Heathin]";
+	mes "\"You brought the coal and gold pieces.  Most excellent!  As promised, I have crafted a ring 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!\"";
+	close;
+
+L_Heathin_Ring_Wait:
+	mes "[Heathin]";
+	mes "\"Hello again, making golden ingots has got me pretty busy.  I sure hope I can fulfil my commission soon so I can move on to bigger and better things.\"";
+	next;
+	mes "\"Sure the pay is good, but I'm 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.\"";
+	next;
+	mes "\"I'll be sure to provide an apt award once you are done.\"";
+	close;
+
+L_Heathin_Ring_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;
+
+L_Heathin_Terranite_Hood:
+	mes "[Heathin]";
+	mes "\"Hello again friend, I just found out about this great metal, called terranite.\"";
+	next;
+	mes "\"This metal is almost as strong as steel, but is also very ductile.\"";
+	next; 
+	mes "\"With some effort, I can make this metal form rings tighter than any chain mail.  It isn't the prettiest, but its uses can be many.\"";
+	next;
+	mes "\"Unfortunately, it seems to be difficult to gather.  Most that have searched for terranite ore either can't find it or they have never returned.\"";
+	next;
+	mes "\"I may be an excellent smith, but I'm no combatant.  However, I would enjoy turning this ore into some useful, perhaps some type of armor to help those that may be.\"";
+	next;
+	mes "\"So what do you say?  Are you interested?\"";
+	menu
+		"No thank you.  Maybe later", L_Heathin_Terranite_No,
+		"Armor you say?  Definitely!", L_Heathin_Terranite_Yes;
+	close;
+
+L_Heathin_Terranite_No:
+	mes "[Heathin]";
+	mes "\"Ah, that is too bad.  Come by again anytime.\"";
+	close;
+
+L_Heathin_Terranite_Yes:
+	set HEATHIN_QUEST, 3;
+	mes "[Heathin]";
+	mes "\"Great, this is going to be fun.  Because I haven't had much practice with this armor, I'd like to get started soon.\"";
+	next; 
+	mes "\"*Thinks for a moment*\"";
+	next;
+	mes "\"Ah, I know.  I'll make a helm..well more like a hood, since it will woven.\"";
+	next;
+	mes "\"It will require a great amount of heat, or so the rumor goes.  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, doing such work doesn't 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.\"";
+	close;
+
+L_Heathin_Terranite_Hood_Forge:
+	if ( (zeny < 200000) | (countitem("Coal") < 100) | (countitem("TerraniteOre") < 10) ) goto L_Heathin_Terranite_Hood_Wait;
+	set HEATHIN_QUEST, 4;
+	delitem "Coal", 100;
+	delitem "TerraniteOre", 10;
+	set zeny, zeny - 200000;
+	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'm very busy right now.  If you could bring me 10 terranite ore, 100 coal and 200,000 gold pieces, I'll make that terranite hood for you.\"";
+	close;
+
+L_Heathin_Terranite_Hood_Ready:
+	set HEATHIN_QUEST, 5;
+	getitem "TerraniteHelmet", 1;
+	mes "[Heathin]";
+	mes "\"All done with your terranite hood.  Hope you enjoy it.  I've got some work to wrap up for the Council, but come back later and I might be able to assist you again.\"";
+	close;
+
+L_Heathin_Terranite_Legs:
+	set HEATHIN_QUEST, 6;
+	mes "[Heathin]";
+	mes "\"Glad you are back.  Just finished up some more of my commission.  Now I can get back to making terranite armor for you.  This time I'll 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.\"";
+	close;
+
+L_Heathin_Terranite_Legs_Forge:
+	if ( (zeny < 400000) | (countitem("Coal") < 200) | (countitem("TerraniteOre") < 30) ) goto L_Heathin_Terranite_Legs_Wait;
+	set HEATHIN_QUEST, 7;
+	delitem "Coal", 200;
+	delitem "TerraniteOre", 30;
+	set zeny, zeny - 400000;
+	mes "[Heathin]";
+	mes "\"Great, you brought everything!  Come back later and I'll have those terranite pants ready for you.\"";
+	close;
+
+L_Heathin_Terranite_Legs_Wait:
+	mes "[Heathin]";
+	mes "\"I'm very busy right now.  If you could bring me 30 terranite ore, 200 coal and 400,000 gold pieces, I'll make those terranite pants for you.\"";
+	close;
+
+L_Heathin_Terranite_Legs_Ready:
+	set HEATHIN_QUEST, 8;
+	getitem "TerraniteLegsArmor", 1;
+	mes "[Heathin]";
+	mes "\"All done with your terranite pants.  Hope you enjoy it.  I've got some work to wrap up for the Council.  Come back later and I might be able to assist you again.\"";
+	close;
+	
+L_Heathin_Terranite_Chest_Armor:
+	set HEATHIN_QUEST, 9;
+	mes "[Heathin]";
+	mes "\"Glad you are back.  Just finished up some more of my commission.  Now I can get back to making terranite armor for you.  This time I'll make some terranite chest armor, but they need more ore, more coal to heat my forge and of course, more gold 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 pants ready.\"";
+	close;
+
+L_Heathin_Terranite_Chest_Armor_Forge:
+	if ( (zeny < 500000) | (countitem("Coal") < 250) | (countitem("TerraniteOre") < 40) ) goto L_Heathin_Terranite_Chest_Armor_Wait;
+	set HEATHIN_QUEST, 10;
+	delitem "Coal", 250;
+	delitem "TerraniteOre", 40;
+	set zeny, zeny - 500000;
+	mes "[Heathin]";
+	mes "\"Great, you brought everything!  Come back later and I'll have the terranite chest armor ready for you.\"";
+	close;
+
+L_Heathin_Terranite_Chest_Armor_Wait:
+	mes "[Heathin]";
+	mes "\"I'm very busy right now.  If you could bring me 40 terranite ore, 250 coal and 500,000 gold pieces, I'll make that chest armor for you.\"";
+	close;
+
+L_Heathin_Terranite_Chest_Armor_Ready:
+	set HEATHIN_QUEST, 11;
+	getitem "TerraniteChestArmor", 1;
+	mes "[Heathin]";
+	mes "\"All done with your terranite chest armor.  Hope you enjoy it.  I've got some work to wrap up for the Council, but come back later and I might be able to assist you again.\"";
+	close;
+
+L_Heathin_Terranite_Arrows:
+	mes "[Heathin]";
+	mes "\"Glad you are back.  I've experimented a little with terranite ore to see what else can be done with it.  It seems to have some weapon qualities, but I've only tested it with arrows.  If you'd like, I can make terranite arrows, but as as with the armor, I need coal, terranite ore and payment for my efforts.\"";
+	next;
+	mes "\"Also, it might be a while until I have time to see what else I can make with terranite other than arrows, the Council is keeping me rather busy with my commission.  So would you like some terranite arrows?\"";
+	menu
+		"No thank you.", L_Heathin_Terranite_Arrows_No,
+		"Sure, I could use some arrows.", L_Heathin_Terranite_Arrows_Yes;
+	close;
+
+L_Heathin_Terranite_Arrows_No:
+	mes "[Heathin]";
+	mes "\"Well, if you change your mind, I'm not going anywhere.\"";
+	close;
+
+L_Heathin_Terranite_Arrows_Yes:
+	set HEATHIN_QUEST, 12;
+	mes "[Heathin]";
+	mes "\"Good, good.  I'll begin crafting these arrows as soon as you come back.  However, I don't just make small handfuls because it isn't worth my time and effort to have my concentration interrupted for small tasks.  I'll make 1,000 terranite arrows per request, but I'll need 10 terranite ore, 20 coal and 10,000 gold pieces to begin.\"";
+	next;
+	mes "\"See you soon!\"";
+	close;
+
+L_Heathin_Terranite_Arrows_Forge:
+	if ( (zeny < 10000) | (countitem("Coal") < 20) | (countitem("TerraniteOre") < 10) ) goto L_Heathin_Terranite_Arrows_Wait;
+	set HEATHIN_QUEST, 13;
+	delitem "Coal", 20;
+	delitem "TerraniteOre", 10;
+	set zeny, zeny - 10000;
+	mes "[Heathin]";
+	mes "\"All right! You got everything I asked for.  I'll start working on them right away.\"";
+	close;
+
+L_Heathin_Terranite_Arrows_Wait:
+	mes "[Heathin]";
+	mes "\"If you want terranite arrows, please get me 10 terranite ore, 20 coal and 10,000 gold pieces.\"";
+	close;
+
+L_Heathin_Terranite_Arrows_Ready:
+	getitem "TerraniteArrow", 1000;
+	set HEATHIN_QUEST, 14;
+	mes "[Heathin]";
+	mes "\"All done.  Here you go.  Hope you like them.  I am still working on my commission, but if you ever need anymore terranite arrows, just come on by with 20 coal, 10 terranite ore and 10,000 gold pieces and I'll make another 1,000 arrows for you.  I have enough terranite ore in reserve that you can just trade me my requirements to keep my resources up.  Thank you for all your efforts.\"";
+	close;
+
+L_Heathin_Terranite_Arrows_Trade:
+	mes "[Heathin]";
+	mes "\"Hi there.  If you have 20 coal, 10 terranite ore and 10,000 gold pieces I'll trade you 1,000 terranite arrows.  Would you like some terranite arrows?\"";
+	menu
+		"No.", L_Heathin_Terranite_Arrows_Trade_No,
+		"Yes.", L_Heathin_Terranite_Arrows_Trade_Yes;
+	close;
+
+L_Heathin_Terranite_Arrows_Trade_No:
+	mes "[Heathin]";
+	mes "\"Come back again if you'd like to get terranite arrows.\"";
+	close;
+
+L_Heathin_Terranite_Arrows_Trade_Yes:
+	if ( (zeny < 10000) | (countitem("Coal") < 20) | (countitem("TerraniteOre") < 10) ) goto L_Heathin_Terranite_Arrows_Trade_Wait;
+	delitem "Coal", 20;
+	delitem "TerraniteOre", 10;
+	set zeny, zeny - 10000;
+	getitem "TerraniteArrow", 1000;
+	mes "[Heathin]";
+	mes "\"Here you go.  Come back again if you want more terranite arrows\"";
+	close;
+
+L_Heathin_Terranite_Arrows_Trade_Wait:
+	mes "[Heathin]";
+	mes "\"Doesn't seem like you have enough for me to trade you.  Please come back with 20 coal, 10 terranite ore and 10,000 gold pieces if you want another 1,000 terranite arrows.\"";
+	close;
+
+}
diff --git a/npc/021-2_Tulimshar/inya.txt b/npc/021-2_Tulimshar/inya.txt
new file mode 100644
index 00000000..7f4964ec
--- /dev/null
+++ b/npc/021-2_Tulimshar/inya.txt
@@ -0,0 +1,174 @@
+//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?
+
+021-2.gat,43,62,0	script	Inya	106,{
+
+	mes "[Inya]";
+	mes "\"I'm 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.\"";
+	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.\"";
+	next;
+	mes "\"So how can I help you?\"";
+	menu
+		"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,
+		"Not interested", L_Inya_NotInterested;	
+	close;
+
+L_Inya_Wedding_Ring:
+	mes "[Inya]";
+	mes "\"No, I'm sorry.  I don't alter wedding rings at this time.\"";
+	close;
+
+L_Inya_Remove_RingGem:
+	mes "[Inya]";
+	mes "\"What kind of gem would you like to have removed?\"";
+	menu
+		"Diamond", L_Inya_Remove_Diamond,
+		"Ruby", L_Inya_Remove_Ruby,
+		"Emerald", L_Inya_Remove_Emerald,
+		"Sapphire", L_Inya_Remove_Sapphire,
+		"Topaz", L_Inya_Remove_Topaz,
+		"Amethyst", L_Inya_Remove_Amethyst,
+		"Not interested", L_Inya_NotInterested;
+	close;
+
+L_Inya_Add_RingGem:
+	mes "[Inya]";
+	mes "\"What kind of gem would you like to add?\"";
+	menu
+		"Diamond", L_Inya_Add_Diamond,
+		"Ruby", L_Inya_Add_Ruby,
+		"Emerald", L_Inya_Add_Emerald,
+		"Sapphire", L_Inya_Add_Sapphire,
+		"Topaz", L_Inya_Add_Topaz,
+		"Amethyst", L_Inya_Add_Amethyst,
+		"Not interested", L_Inya_NotInterested;
+	close;
+
+L_Inya_Remove_Diamond:
+	if ( (zeny < 500000) | (countitem ("RingGemWhite") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 500000;
+	delitem "RingGemWhite", 1;
+	getitem "RingSimple", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Remove_Ruby:
+	if ( (zeny < 500000) | (countitem ("RingGemRed") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 500000;
+	delitem "RingGemRed", 1;
+	getitem "RingSimple", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Remove_Emerald:
+	if ( (zeny < 500000) | (countitem ("RingGemGreen") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 500000;
+	delitem "RingGemGreen", 1;
+	getitem "RingSimple", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Remove_Sapphire:
+	if ( (zeny < 500000) | (countitem ("RingGemBlue") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 500000;
+	delitem "RingGemBlue", 1;
+	getitem "RingSimple", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Remove_Topaz:
+	if ( (zeny < 500000) | (countitem ("RingGemYellow") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 500000;
+	delitem "RingGemYellow", 1;
+	getitem "RingSimple", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Remove_Amethyst:
+	if ( (zeny < 500000) | (countitem ("RingGemPurple") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 500000;
+	delitem "RingGemPurple", 1;
+	getitem "RingSimple", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Add_Diamond:
+	if ( (zeny < 1000000) | (countitem ("RingSimple") < 1) | (countitem ("GemRawWhite") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 1000000;
+	delitem "RingSimple", 1;
+	delitem "GemRawWhite", 1;
+	getitem "RingGemWhite", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Add_Ruby:
+	if ( (zeny < 1000000) | (countitem ("RingSimple") < 1) | (countitem ("GemRawRed") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 1000000;
+	delitem "RingSimple", 1;
+	delitem "GemRawRed", 1;
+	getitem "RingGemRed", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Add_Emerald:
+	if ( (zeny < 1000000) | (countitem ("RingSimple") < 1) | (countitem ("GemRawGreen") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 1000000;
+	delitem "RingSimple", 1;
+	delitem "GemRawGreen", 1;
+	getitem "RingGemGreen", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Add_Sapphire:
+	if ( (zeny < 1000000) | (countitem ("RingSimple") < 1) | (countitem ("GemRawBlue") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 1000000;
+	delitem "RingSimple", 1;
+	delitem "GemRawBlue", 1;
+	getitem "RingGemBlue", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Add_Topaz:
+	if ( (zeny < 1000000) | (countitem ("RingSimple") < 1) | (countitem ("GemRawYellow") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 1000000;
+	delitem "RingSimple", 1;
+	delitem "GemRawYellow", 1;
+	getitem "RingGemYellow", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_Add_Amethyst:
+	if ( (zeny < 1000000) | (countitem ("RingSimple") < 1) | (countitem ("GemRawPurple") < 1) ) goto L_Inya_Not_Enough;
+	set zeny, zeny - 1000000;
+	delitem "RingSimple", 1;
+	delitem "GemRawPurple", 1;
+	getitem "RingGemPurple", 1;
+	mes "[Inya]";
+	mes "\"Here you go.\"";
+	close;
+
+L_Inya_NotInterested:
+	mes "[Inya]";
+	mes "\"Come back later and I'll try to be of assistance.\"";
+	close;
+
+L_Inya_Not_Enough:
+	mes "[Inya]";
+	mes "\"I'm sorry, you just don't seem to have enough for me to help you.  Please come back when you do and I'll be more than happy to help you out.\"";
+	close;
+
+}
diff --git a/npc/021-2_Tulimshar/jhedia.txt b/npc/021-2_Tulimshar/jhedia.txt
new file mode 100644
index 00000000..096f4932
--- /dev/null
+++ b/npc/021-2_Tulimshar/jhedia.txt
@@ -0,0 +1,51 @@
+// Ingot maker takes iron ore, gives ingots for future crafting purposes.
+
+021-2.gat,23,55,0	script	Jhedia	160,{
+
+	set @Cost_Per_Ingot, 1000;
+	set @Iron_Ore_Per, 5;
+	set @Coal_Per, 10;
+
+	mes "[Jhedia]";
+	mes "\"I forge iron ore into ingots.  Ingots are more useful for skilled smiths, like armorers, because the ore is refined and made into useful units which can be worked with.  To make ingots I need " + @Iron_Ore_Per + " iron ore and " + @Cost_Per_Ingot + " gp per ingot. I also need " + @Coal_Per + " coal for my forgeHow many ingots would you like?\"";
+	input @ingot_count;
+
+	if (@ingot_count == 0) goto L_Jhedia_Bye;
+	set @Zeny_cost, @ingot_count * @Cost_Per_Ingot;
+	if (countitem("IronOre") < @Iron_Ore_Per * @ingot_count) goto L_Jhedia_NotEnough_Ore;
+	if (countitem("Coal") < @Coal_Per * @ingot_count) goto L_Jhedia_NotEnough_Coal;
+	if (zeny < @Zeny_cost) goto L_Jhedia_NotEnough_Zeny;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem("IngotIron") == 0 && countitem("IronOre") > @ingot_count * @Iron_Ore_Per | countitem("Coal") > @ingot_count * @Coal_Per) goto L_Jhedia_NotEnoughSlots;
+	set zeny, zeny - @Zeny_cost;
+	delitem "IronOre", @ingot_count * @Iron_Ore_Per;
+	delitem "Coal", @ingot_count * @Coal_Per;
+	getitem "IngotIron", @ingot_count;
+	close;
+
+L_Jhedia_Bye:
+	mes "[Jhedia]";
+	mes "\"Good Bye.\"";
+	close;
+
+L_Jhedia_NotEnough_Ore:
+	mes "[Jhedia]";
+	mes "\"You don't seem to have enough iron ore.\"";
+	close;
+
+L_Jhedia_NotEnough_Coal:
+	mes "[Jhedia]";
+	mes "\"You don't seem to have enough coal.\"";
+	close;
+
+L_Jhedia_NotEnough_Zeny:
+	mes "[Jhedia]";
+	mes "\"You don't seem to have enough gold pieces.\"";
+	close;
+
+L_Jhedia_NotEnoughSlots:
+	mes "[Jhedia]";
+	mes "You don't seem to have enough room to carry this many ingots.";
+	close;
+
+}