Merge remote branch 'wombat/master'

38 files changed, 904 insertions, 232 deletions

diff --git a/data/012-3.wlk b/data/012-3.wlk
index cca3d324..7ad06ed0 100644
--- a/data/012-3.wlk
+++ b/data/012-3.wlk
diff --git a/data/027-2.wlk b/data/027-2.wlk
index e663406f..bda9e90e 100644
--- a/data/027-2.wlk
+++ b/data/027-2.wlk
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 5da60146..5e1d24c7 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -27,6 +27,7 @@
 011-5.gat#011-5.wlk#
 012-1.gat#012-1.wlk#
 012-3.gat#012-3.wlk#
+012-4.gat#012-4.wlk#
 013-1.gat#013-1.wlk#
 013-2.gat#013-2.wlk#
 013-3.gat#013-3.wlk#
diff --git a/db/item_db.txt b/db/item_db.txt
index 960b3b9c..1c895454 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -261,15 +261,15 @@
 //759,	PaladinsHelmet,			Paladin's Helmet,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
 //760,	OverlordsHelmet,		Overlord's Helmet,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
 //761,	DesertHelmet,			Desert Helmet,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//762,	TerraniteArrow,			Terranite Arrow,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//763,	TerraniteOre,			Terranite Ore,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//764,	SailorHat,			Sailor Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//765,	CaptainsHat,			Captain's Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//766,	TerraniteHelmet,		Terranite Helmet,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//767,	TerraniteChestArmor,		Terranite Chest Armor,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//768,	TerraniteLegsArmor,		Terranite Legs Armor,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//769,	GuyFawkesMask,			Guy Fawkes' Mask,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//770,	FairyHat,			Fairy Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
+762,	TerraniteArrow,			Terranite Arrow,		10,	800,	400,	1,	35,	0,	0,	0,	0,	2,	32768,	,	,	0,	{},					{bonus bAtkRange,  1;}
+763,	TerraniteOre,			Terranite Ore,			3,	500,	250,	40,	,	,	,	,	,	,	,	,	,	,	{},					{}										
+//764,	SailorHat,			Sailor Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}										
+//765,	CaptainsHat,			Captain's Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}										
+766,	TerraniteHelmet,		Terranite Helmet,		5,	30000,	3000,	300,	,	15,	,	-12,	0,	2,	256,	,	0,	0,	{},					{}
+767,	TerraniteChestArmor,		Terranite Chest Armor,		5,	100000,	3000,	800,	,	15,	,	70,	0,	2,	512,	,	0,	0,	{},					{ bonus bDex,1; }
+768,	TerraniteLegsArmor,		Terranite Legs Armor,		5,	10000,	3000,	30,	,	5,	,	-8,	0,	2,	1,	,	0,	0,	{},					{ bonus bAgi,1; }
+//769,	GuyFawkesMask,			Guy Fawkes' Mask,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}										
+//770,	FairyHat,			Fairy Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}										
 771,	Miniskirt,			Miniskirt,			5,	1000,	500,	8,	,	4,	,	-8,	0,	2,	1,	,	1,	0,	{},					{}																						
 772,	WispPowder,			Wisp Powder,			3,	700,	350,	3,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
 773,	SpectrePowder,			Spectre Powder,			3,	700,	350,	3,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
@@ -514,4 +514,19 @@
 2197,	OrangeRabbitEars,		Orange Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}																						
 2198,	PurpleRabbitEars,		Purple Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}																						
 2199,	DarkGreenRabbitEars,		Dark Green Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}																						
-4000,	AngryScorpionStinger,		Angry Scorpion Stinger,		3,	50,	25,	1,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
+4000,	AngryScorpionStinger,		Angry Scorpion Stinger,		3,	50,	25,	1,	,	,	,	,	,	,	,	,	,	,	{},					{}			
+4001,	Coal,				Coal,				3,	250,	100,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}
+4002,	GemRawWhite,			Diamond,			3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4003,	GemRawRed,			Ruby,				3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4004,	GemRawGreen,			Emerald,			3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4005,	GemRawBlue,			Sapphire,			3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4006,	GemRawYellow,			Topaz,				3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4007,	GemRawPurple,			Amethyst,			3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4008,	RingGemWhite,			Diamond Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4009,	RingGemRed,			Ruby Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4010,	RingGemGreen,			Emerald Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4011,	RingGemBlue,			Sapphire Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4012,	RingGemYellow,			Topaz Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4013,	RingGemPurple,			Amethyst Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4014,	RingSimple,			Simple Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4015,	IngotIron,			Iron Ingot,			3,	500,	250,	200,	,	,	,	,	,	,	,	,	,	,	{},					{}										
diff --git a/db/mob_db.txt b/db/mob_db.txt
index d6624b82..dc2b439c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -4,8 +4,8 @@
 1004,	RedScorpion,	Red Scorpion,	90,	550,	0,	0,	145,	1,	50,	55,	4,	6,	8,	8,	10,	10,	30,	10,	1,	1,	1,	0,	20,	129,	1000,	1872,	672,	480,	517,	2000,		509,	100,		518,	500,		1200,	10,		1199,	760,		1201,	540,		524,	25,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		50
 1005,	GreenSlime,	Green Slime,	40,	300,	0,	0,	8,	1,	25,	30,	2,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,	131,	1500,	1872,	672,	480,	502,	200,		513,	100,		501,	100,		521,	100,		522,	190,		526,	10,		503,	500,		535,	750,		0,	0,	0,	0,	,	,	,	,	,	,	1,		20
 1006,	GiantMaggot,	Giant Maggot,	80,	500,	0,	0,	16,	2,	45,	75,	2,	7,	8,	6,	2,	1,	22,	1,	2,	2,	1,	0,	41,	129,	2000,	1872,	672,	480,	1199,	900,		519,	100,		518,	750,		501,	5000,		502,	3000,		503,	11,		526,	20,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		25
-1007,	YellowSlime,	Yellow Slime,	60,	400,	0,	0,	2,	1,	35,	40,	2,	7,	9,	6,	2,	1,	34,	1,	1,	1,	1,	0,	21,	131,	1400,	1800,	672,	480,	534,	200,		519,	100,		501,	350,		502,	250,		522,	10,		640,	450,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		20
-1008,	RedSlime,	Red Slime,	70,	450,	0,	0,	56,	1,	40,	45,	2,	7,	12,	8,	2,	1,	25,	1,	1,	1,	1,	0,	21,	135,	1300,	1500,	672,	480,	1201,	300,		509,	110,		521,	200,		523,	80,		525,	80,		535,	750,		528,	250,		531,	150,		0,	0,	0,	0,	,	,	,	,	,	,	2,		20
+1007,	YellowSlime,	Yellow Slime,	60,	400,	0,	0,	2,	1,	35,	40,	2,	7,	9,	6,	2,	1,	34,	1,	1,	1,	1,	0,	21,	131,	1400,	1800,	672,	480,	534,	200,		519,	100,		501,	350,		502,	250,		522,	10,		640,	450,		4006,	20,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		20
+1008,	RedSlime,	Red Slime,	70,	450,	0,	0,	56,	1,	40,	45,	2,	7,	12,	8,	2,	1,	25,	1,	1,	1,	1,	0,	21,	135,	1300,	1500,	672,	480,	1201,	300,		509,	110,		521,	200,		4003,	20,		525,	80,		535,	750,		528,	250,		531,	150,		0,	0,	0,	0,	,	,	,	,	,	,	2,		20
 1009,	BlackScorpion,	Black Scorpion,	100,	600,	0,	0,	70,	1,	60,	100,	4,	6,	16,	30,	10,	10,	35,	10,	1,	1,	1,	0,	20,	133,	1000,	1500,	672,	480,	523,	150,		509,	100,		518,	800,		709,	800,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		50
 1010,	Snake,		Snake,		115,	850,	0,	0,	100,	1,	75,	90,	4,	6,	20,	11,	10,	10,	35,	10,	1,	1,	1,	0,	20,	133,	900,	1300,	672,	480,	524,	300,		0,	0,		714,	400,		714,	400,		710,	500,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
 1011,	FireGoblin,	Fire Goblin,	20,	220,	0,	0,	2,	1,	15,	20,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	23,	129,	800,	1872,	672,	480,	505,	800,		501,	150,		518,	800,		502,	150,		521,	70,		522,	10,		701,	500,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
@@ -58,3 +58,5 @@
 1058,	IceGoblin,	Ice Goblin,	25,	330,	0,	0,	2,	1,	20,	25,	0,	5,	5,	5,	1,	0,	6,	30,	1,	1,	1,	3,	23,	133,	700,	1872,	672,	480,	505,	800,		501,	150,		518,	800,		502,	150,		521,	70,		522,	10,		701,	500,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
 1059,	GCMaggot,    Giant Cave Maggot,	90,	2000,	0,	0,	16,	2,	60,	80,	2,	7,	10,	10,	2,	1,	22,	1,	2,	2,	1,	0,	41,	133,	1000,	1872,	672,	480,	727,	10000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		25
 1060,	Archant,	Archant,	30,	400,	0,	0,	200,	1,	20,	30,	4,	6,	10,	5,	1,	0,	12,	10,	1,	1,	1,	0,	25,	133,	1000,	1500,	672,	480,	537,	300,		535,	100,		640,	40,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
+1061,	Moggun,		Moggun,		60,	800,	0,	0,	100,	1,	70,	90,	20,	10,	50,	40,	10,	10,	10,	10,	1,	1,	1,	0,	25,	137,	600,	1500,	672,	480,	611,	600,		4001,	600,		4002,	20,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
+1062,	Terranite,	Terranite,	110,	6000,	0,	0,	1000,	1,	200,	300,	20,	40,	60,	40,	40,	30,	60,	40,	1,	1,	1,	0,	29,	133,	400,	872,	672,	900,	4001,	600,		4004,	20,		4005,	20,		4007,	20,		763,	500,		640,	500,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
diff --git a/news.txt b/news.txt
index 679b9fc5..9825fa21 100644
--- a/news.txt
+++ b/news.txt
@@ -1,25 +1,41 @@
+##3 Tulimshar Imposes Trade Regulations
+##3 2010-08-29
+##0 Throughout Argaes, new trade regulations from
+##0 Tulimshar have concentrated wealth and power
+##0 inside Tonori's largest city.  The primary 
+##0 resource of Argaes, iron ore, now must be 
+##0 refined into ingots within Tulimshar's
+##0 imperial capital.
+##0
+##0 Argaes miners, in search of new iron deposits,
+##0 have discovered a hostile mine north east of
+##0 the woodland town of Hurnscald.  More details
+##0 are coming in about this mine.
+##0
 ##3 Tulimshar's Power Expands
 ##3 2010-08-18
-##0 The impact of the Great Earthquake has brought a
-##0 rising evil to the land.  After much debate
-##0 Tulimshar's Wizard Council has begun to expand its
-##0 influence in the world to meet the new challenges
-##0 presented.
-
+##0 The impact of the Great Earthquake has brought
+##0 a rising evil to the land.  After much debate
+##0 Tulimshar's Wizard Council has begun to expand 
+##0 its influence in the world to meet the new 
+##0 challenges presented.
+##0
 ##0 While still slow to act, Tulimshar has begun 
-##0 monitoring the changing monster threat in the sandstorm
-##0 and sent agents into Argaes.  The landbridge that long 
-##0 united Argaes with Tonori has fallen into the sea,
-##0 prompting Tulimshar's merchants to charge a hefty fee
-##0 for trade and travel between the two continents.
-
-##0 Something sinister has happened to Taro, Nivalis and
-##0 the magical connection Kaizei had with Argaes.  Some
-##0 speculate it has something to do with the evil while
-##0 others think Nivalis and the Sages of Kaizei want to
-##0 isolate themselves from Tulimshar's influence.
-##0 Either way, all portals to Kaizei have been closed.
-
+##0 monitoring the changing monster threat in the
+##0 sandstorm and sent agents into Argaes.  The 
+##0 landbridge that long united Argaes with Tonori
+##0 has fallen into the sea, prompting Tulimshar's 
+##0 merchants to charge a hefty fee for trade and 
+##0 travel between the two continents.
+##0
+##0 Something sinister has happened to Taro, Nivalis 
+##0 and the magical connection Kaizei had with Argaes.
+##0 Some speculate it has something to do with the
+##0 evil while others think Nivalis and the Sages of
+##0 Kaizei want to isolate themselves from Tulimshar's
+##0 influence.  Either way, all portals to Kaizei have
+##0 been closed.
+##0
 ##3 The Candor Challenge 
 ##3 2010-08-18
 ##0
@@ -32,7 +48,7 @@
 ##0 In other news, you may also have run into an  
 ##0 evil obelisk, trader of strange items, a water
 ##0 pump, a flood and some new insect life recently!
-
+##0
 ##3 The End is not nigh
 ##3 2010-06-09
 
diff --git a/npc/001-1_Tulimshar/bernard.txt b/npc/001-1_Tulimshar/bernard.txt
index efef3167..1c5ee328 100755..100644
--- a/npc/001-1_Tulimshar/bernard.txt
+++ b/npc/001-1_Tulimshar/bernard.txt
@@ -12,20 +12,20 @@
 
 L_Opening0:
 	mes "[Bernard]";
-	mes "\"In Tulimshar, there are a lot of maggots. I need a favor, please help me. Will you?\"";
+	mes "\"Tulimshar is crawling with maggots.  Hey, I need a favor, could you help me a bit?\"";
 	next;
 	goto L_Ask;
 
 L_Opening1:
-	mes "[Bernard	]";
-	mes "\"The taste of maggots in soup is... unforgettable, taste so good. Will you help me kill some?\"";
+	mes "[Bernard]";
+	mes "\"The taste of maggots in soup is...  unforgettable, they taste simply divine!  Would you help me kill some?\"";
 	next;
 	goto L_Ask;
 
 L_Ask:
 	menu
-		"Yes", L_Yes,
-		"No", L_No;
+		"Yes.", L_Yes,
+		"No.", L_No;
 
 L_Yes:
 	set @TEMP, rand(2);
@@ -34,27 +34,27 @@ L_Yes:
 
 L_Req0:
 	mes "[Bernard]";
-	mes "\"I need a [Roasted Maggot] for my soup.\"";
+	mes "\"Great!  I need a [Roasted Maggot] for my soup.\"";
 	next;
 	goto L_Set;
 
 L_Req1:
 	mes "[Bernard]";
-	mes "\"Bring me a [Roasted Maggot]. I'll give you something if you do.\"";
+	mes "\"Bring me a [Roasted Maggot].  I'll give you something if you do.\"";
 	next;
 	goto L_Set;
 
 L_Set:
 	set TMW_Quest,1;
 	mes "[Bernard]";
-	mes "\"Please bring me it!\"";
+	mes "\"Please bring it to me!\"";
 	close;
 
 L_Progress:
 	if (countitem("RoastedMaggot") < 1) goto L_NotEnough;
 	mes "[Bernard]";
-	mes "\"Perfect! It's perfect !";
-	mes "You brought me my Roasted Maggot!  Here, have some cake.\"";
+	mes "\"Oooh, perfect! It's perfect!";
+	mes "You brought me my [Roasted Maggot]!  Here, have some cake for your troubles.\"";
 	getinventorylist;
 	if (@inventorylist_count - (countitem("RoastedMaggot") == 1) > 99 - (countitem("CherryCake") == 0) ) goto L_TooMany;
 	delitem "RoastedMaggot", 1;
@@ -66,8 +66,8 @@ L_Progress:
 L_Progress2:
         if (countitem("MaggotSlime") < 3) goto L_NotEnough1;
         mes "[Bernard]";
-        mes "\"Nice ! It'll perfect, so perfect !";           
-        mes "You brought me the 3 maggots slimes! Here, have some beer.\"";
+        mes "\"Nice!  They're perfect, just perfect!";           
+        mes "You brought me the 3 [Maggot Slimes]!  Here, have some beer as reward.\"";
         getinventorylist;             
         if ((@inventorylist_count - (countitem("MaggotSlime") == 3) > 99  - (countitem("Beer") == 0) )) goto L_TooMany;
         delitem "MaggotSlime", 3;
@@ -79,28 +79,28 @@ L_Progress2:
 
 L_NotEnough:
 	mes "[Bernard]";
-	mes "\"Please hurry and bring me a [Roasted Maggot].\"";
+	mes "\"Oh, please hurry and bring me a [Roasted Maggot].  I'm yearning for maggot soup!\"";
 	close;
 
 L_NotEnough1:
         mes "[Bernard]";
-        mes "\"Please hurry and bring me 3 [Maggot Slime]s.\"";
+        mes "\"Please do hurry and bring me 3 [Maggot Slime]s, so I can finish my soup!\"";
         close;
 
 
 L_Done1:
 	mes "[Bernard]";
-	mes "\"Thank you so much !\"";
-	mes "\"But something is missing to make the soup creamy!\"";
+	mes "\"Thank you so much!\"";
+	mes "\"But...  something is missing to make the soup creamy.\"";
 	next;
-	mes "\"I need 3 [Maggot Slime]s for the soup.\"";
-	mes "\"Bring me them. I'll give you something if you do.\"";
+	mes "\"I need 3 [Maggot Slime]s for that.\"";
+	mes "\"Bring them to me, and I'll give you something nice.\"";
 	set TMW_Quest,3;
 	close;
 
 L_Done2:
         mes "[Bernard]";
-        mes "\"I didn't tell you, I also put beer in my soup.  I hope you like beer as much as I do because..\"";
+        mes "\"I didn't mention it before, but I also put beer in my soup.  I hope you like beer as much as I do, because, you see...\"";
         next;
         mes "\"Beer is life!\"";
         close;
@@ -112,6 +112,6 @@ L_No:
 L_TooMany:
 	next;
 	mes "[Bernard]";
-	mes "\"You don't have room for my reward. I'll wait until you do.\"";
+	mes "\"You don't have room for my reward.  I'll wait until you do.\"";
 	close;
 }
diff --git a/npc/001-1_Tulimshar/mikhail.txt b/npc/001-1_Tulimshar/mikhail.txt
index 6946f7f5..76a1ad59 100755..100644
--- a/npc/001-1_Tulimshar/mikhail.txt
+++ b/npc/001-1_Tulimshar/mikhail.txt
@@ -11,12 +11,12 @@
 
 L_Start:	
 	mes "[Mikhail]";
-	mes "\"My grandma sent me to get five maggot slimes from the maggots in the desert, but they scare me so bad!\"";
+	mes "\"My grandma sent me to get five [Maggot Slime]s from the maggots in the desert, but they scare me so bad!\"";
 	next;
-	mes "\"You look like a nice person. Would you go get them for me?\"";	
+	mes "\"You look like a nice person.  Would you go get them for me?\"";	
 	menu
-		"Of course, I'll go get you that.", L_accept,
-		"I got other things to do right now.", L_close;
+		"Of course, I'll go get them for you.", L_accept,
+		"I've got other things to do right now.", L_close;
 	close;
 	
 L_close:
@@ -24,17 +24,17 @@ L_close:
 	
 L_accept:
 	mes "[Mikhail]";
-	mes "\"Thank you so much! I'll wait for you here.\"";
+	mes "\"Thank you so much!  I'll wait for you here.\"";
 	set TMW_Quest, 5;
 	close;
 	
 L_Progress:
 	mes "[Mikhail]";
-	mes "\"Did you bring me the five maggot slimes i need?\"";
+	mes "\"Did you bring me the five [Maggot Slime]s i need?\"";
 	next;
 	menu
-		"Yes, here they are boy!", L_try,
-		"Not yet, I'll be back soon.", L_close;
+		"Yes, here they are, kiddo!", L_try,
+		"Not yet, but I'll be back soon.", L_close;
 	close;
 	
 L_try:
@@ -47,7 +47,7 @@ L_get:
 	delitem "MaggotSlime", 5;
 	set TMW_Quest, 6;
 	mes "[Mikhail]";
-	mes "\"Thank you so much! I can get back to my grandma now!\"";
+	mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
 	next;
 	getexp 100, 0;
 	mes "You get 100 xp.";
@@ -55,6 +55,6 @@ L_get:
 	
 L_Done:
 	mes "[Mikhail]";
-	mes "\"Thanks for helping me getting those maggot slimes!\"";
+	mes "\"Thanks again for helping me get those [Maggot Slime]s!\"";
 	close;
 	
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 352e953b..49d47a8a 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -82,7 +82,7 @@ L_Progress:
 	mes "\"Excellent!";
 	mes "You brought me 5 [Scorpion Stinger]s!\"";
 	getinventorylist;
-	if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) > 99) - (countitem("Arrow") == 0)) goto L_TooMany;
+	if (@inventorylist_count + (countitem("ScorpionStinger") == 5) - (countitem("Arrow") == 0) > 99) goto L_TooMany;
 	delitem "ScorpionStinger", 5;
 	getitem "Bow", 1;
 	getitem "Arrow", 100;
diff --git a/npc/001-1_Tulimshar/sarah.txt b/npc/001-1_Tulimshar/sarah.txt
index d815b6d3..bc02bef4 100755..100644
--- a/npc/001-1_Tulimshar/sarah.txt
+++ b/npc/001-1_Tulimshar/sarah.txt
@@ -6,7 +6,7 @@
 	if (TMW_Quest == 6) goto L_Start;
 
 	mes "[Sarah]";
-	mes "\"Boy am I hungry\"";
+	mes "\"Boy, am I hungry or what!\"";
 	close;
 
 L_Start:
@@ -23,34 +23,34 @@ L_Opening0:
 
 L_Opening1:
 	mes "[Sarah]";
-	mes "\"[Cherry Cake]...I love it \"";
+	mes "\"Mmm, [Cherry Cake]...  I love it!\"";
 	next;
 	goto L_Ask;
 
 L_Ask:
-	mes "\"Can you bring me a piece of [Cherry Cake]?\"";
+	mes "\"Can you bring me a piece of [Cherry Cake]?  Pretty please?\"";
 	menu
-		"Yes", L_Req0,
-		"No", L_No;
+		"Yes.", L_Req0,
+		"No.", L_No;
 
 L_Req0:
 	mes "[Sarah]";
-	mes "\"I want one piece of [Cherry Cake]! If you get one, I'll give you a hat !\"";
+	mes "\"Yippee!  Bring me a piece of [Cherry Cake], and I'll give you a nice hat!\"";
 	next;
 	goto L_Set;
 
 L_Set:
 	set TMW_Quest,7;
 	mes "[Sarah]";
-	mes "\"Please bring me it!\"";
+	mes "\"Please bring it to me!\"";
 	close;
 
 L_Progress:
 	if (countitem("CherryCake") < 1) goto L_NotEnough;
 	mes "[Sarah]";
-	mes "\"Hummm!\"";
+	mes "\"Whee!\"";
 	next;
-	mes "You brought me my [Cherry Cake]!  Here is the hat, as promised.\"";
+	mes "You brought me [Cherry Cake]!  Here is your new hat, as promised.\"";
 	emotion 9;
 	getinventorylist;
 	if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany;
@@ -61,12 +61,12 @@ L_Progress:
 
 L_NotEnough:
 	mes "[Sarah]";
-	mes "\"I'm starving, please bring me a [Cherry Cake].\"";
+	mes "\"Oh, I'm starving!  Please bring me [Cherry Cake]!\"";
 	close;
 
 L_Done:
 	mes "[Sarah]";
-	mes "\"It was so tasty, I can't eat anything more... Thank you!\"";
+	mes "\"It was so tasty, I can't eat anything more...  Thank you!\"";
 	emotion 9;
 	close;
 
@@ -76,6 +76,6 @@ L_No:
 L_TooMany:
 	next;
 	mes "[Sarah]";
-	mes "\"You don't have room for my reward. I'll wait until you do.\"";
+	mes "\"You don't have room for my reward.  I'll wait until you do.\"";
 	close;
 }
diff --git a/npc/002-1_Sandstorm/_mobs.txt b/npc/002-1_Sandstorm/_mobs.txt
index d216b246..d30b02c8 100644
--- a/npc/002-1_Sandstorm/_mobs.txt
+++ b/npc/002-1_Sandstorm/_mobs.txt
@@ -5,14 +5,14 @@
 002-1.gat,94,35,11,4	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,68,59,7,6	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,57,86,15,8	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,18,94,7,8	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
+002-1.gat,19,94,7,8	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,44,35,3,2	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,38,29,3,2	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,62,91,24,6	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,61,74,41,43	monster	Fire Goblin	1011,15,100000,30000,Mob002-1::On1011
 002-1.gat,82,24,34,15	monster	Scorpion	1003,8,100000,30000,Mob002-1::On1003
 002-1.gat,32,35,34,33	monster	Scorpion	1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,29,81,22,43	monster	Scorpion	1003,8,100000,30000,Mob002-1::On1003
+002-1.gat,27,81,22,43	monster	Scorpion	1003,8,100000,30000,Mob002-1::On1003
 002-1.gat,95,75,15,17	monster	Black Scorpion	1009,1,100000,1800000,Mob002-1::On1009
 
 
diff --git a/npc/002-1_Sandstorm/_warps.txt b/npc/002-1_Sandstorm/_warps.txt
index fa86b539..b1a49bb8 100644
--- a/npc/002-1_Sandstorm/_warps.txt
+++ b/npc/002-1_Sandstorm/_warps.txt
@@ -1,6 +1,6 @@
 // 002-1 Sandstorm warps
 
 002-1.gat,58,12	warp	ToTulimshar	3,-1,001-1.gat,44,80
-002-1.gat,108,79 warp	ToEasternDesert	-1,1,005-1.gat,23,40
+002-1.gat,108,79	warp	ToEasternDesert	-1,1,005-1.gat,23,40
 002-1.gat,12,66	warp	ToWesternDesert	-1,3,003-1.gat,168,76
 002-1.gat,28,13	warp	ToBeach	1,-1,004-1.gat,84,111
diff --git a/npc/002-1_Sandstorm/lieutenant_dausen.txt b/npc/002-1_Sandstorm/lieutenant_dausen.txt
index 65616a72..69502cf6 100644
--- a/npc/002-1_Sandstorm/lieutenant_dausen.txt
+++ b/npc/002-1_Sandstorm/lieutenant_dausen.txt
@@ -11,15 +11,24 @@
 	if (TMW_Quest == 14) goto L_LD_Woe_Is_Me;
 	if (TMW_Quest == 13) goto L_LD_Drinks;
 	if (TMW_Quest == 12) goto L_LD_Start;
+        if (TMW_Quest < 12) goto L_LD_Get_Rep_First;
 
 	mes "[Lieutenant Dausen]";
-	mes "\"Hello.  I am Lieutenant Dausen.  I monitor the monster threats surrounding the city to ensure the safety of its citizens.\"";
+	mes "\"Hello.  I am Lieutenant Dausen.  I monitor the monster threat around the city to ensure the safety of its citizens.\"";
+	close;
+
+L_LD_Get_Rep_First:
+	mes "[Lieutenant Dausen]";
+	mes "\"Hello.  I am Lieutenant Dausen.  I monitor the monster threat around the city to ensure the safety of its citizens.\"";
+        next;
+	mes "[Lieutenant Dausen]";
+	mes "\"I may have a job for you, stranger, but first I would like to learn more about you. Go walk among the citizens of Tulimshar, see if any of them could use some help. Once you have established a good reputation, word will get to me.\"";
 	close;
 
 L_LD_Start:
 	set TMW_Quest, 13;
 	mes "[Lieutenant Dausen]";
-	mes "\"Our here in the desert, it sure does get hot.  My men and I get thirsty rather quickly.  If you can get some cactus drinks, our favorite, we'd surely appreciate your effort.  About 10 will do.\"";
+	mes "\"Out here in the desert, it sure does get hot!  My men and I get thirsty rather quickly.  [Cactus Drink]s are our favourite; if you can get some for us, we'd surely appreciate your effort.  About 10 would do.\"";
 	close;
 
 L_LD_Drinks:
@@ -30,19 +39,19 @@ L_LD_Drinks:
 	delitem "CactusDrink", 10;
 	getitem "Boots", 1;
 	mes "[Lieutenant Dausen]";
-	mes "\"Great!  This will help us make it through the hot day.  As a gift for your troubles, take these boots to keep your feet from burning on the sand.  Have a good day..\"";
+	mes "\"Great!  This will help us make it through the hot day.  As a gift for your troubles, take these boots to keep your feet from burning on the sand.  Have a good day...\"";
 	next;
-	mes "Mumbles to himself and rubs his head.";
+	mes "Lieutenant Dausen mumbles to himself and rubs his head.";
 	next;
-	mes "\"However, I have a problem.  I mixed up the orders to my men Nickos and Steven.  If someone would let them know they're going to have to hold their post for a while longer instead of taking a break, it would help me a great deal.  However, I can't leave my post.  Oh what to do, what to do..\"";
+	mes "\"I have another problem, though.  I mixed up the orders to my men, Nickos and Stewen.  Someone needs to let them know they're going to have to hold their post for a while longer instead of taking a break.  However, I can't leave my post!  Oh, what to do, what to do...\"";
 	menu
-		"Oh, it wouldn't be a bother to me to help you out, since you helped me out.", L_LD_Help,
-		"Thanks for the boots, gotta run.", L_LD_NoHelp;
+		"I can help you out, since you helped me too.", L_LD_Help,
+		"Thanks for the boots, gotta run now.", L_LD_NoHelp;
 	close;
 
 L_LD_NotEnough_Drink:
 	mes "[Lieutenant Dausen]";
-	mes "\"Hi again.  My men and I sure are thirsty for our favorite drink, the cactus drink.  If we had about 10, it would help us out a great deal in this sandstorm.\"";
+	mes "\"Hi again.  My men and I sure are thirsty for our favorite drink, the [Cactus Drink].  If we had about 10, it would help us out a great deal in this sandstorm.\"";
 	close;
 
 L_LD_TooMany:
@@ -52,53 +61,53 @@ L_LD_TooMany:
 
 L_LD_Woe_Is_Me:
 	mes "[Lieutenant Dausen]";
-	mes "\"I have a problem.  I mixed up the orders to my men.  If someone would let them know they're going to have to hold their post for a while longer instead of taking a break, it would help me a great deal.  However, I can't leave my post.  Oh what to do, what to do..\"";
+	mes "\"I have a problem.  I mixed up the orders to my men!  Someone needs to let them know they're going to have to hold their post for a while longer instead of taking a break.  However, I can't leave my post.  Oh, what to do, what to do...\"";
 	menu
-		"Oh, it wouldn't bother me to help you out, since you helped me out", L_LD_Help,
-		"Bye bye.", L_LD_NoHelp;
+		"I can help you out, since you helped me out too.", L_LD_Help,
+		"Bye-bye.", L_LD_NoHelp;
 	close;
 
 L_LD_Help:
 	set TMW_Quest, 15;
 	mes "[Lieutenant Dausen]";
-	mes "\"Oh!  You would!  You are ever most helpful.  Could you let Stewen know first.  I worry about the monsters from the eastern desert and he should know before anyone to hold his post.  Hope to hear from you soon!\"";
+	mes "\"Oh!  Would you?  You are ever most helpful!  Could you let Stewen know first?  I'm the most worried about the monsters from the eastern desert and he should know first to hold his post.  Come back to me after you see him.  Hope to hear from you soon!\"";
 	close;
 
 L_LD_NoHelp:
 	mes "[Lieutenant Dausen]";
-	mes "\"See you later.\"";
+	mes "\"See you later then.\"";
 	close;
 
 L_LD_Waits:
 	mes "[Lieutenant Dausen]";
-	mes "\"I hope Stewen holds his post.  If you could tell them to do so, it would help me out a great deal.\"";
+	mes "\"I do hope Stewen holds his post.  If you could tell them to do so, it would help me out a great deal.\"";
 	close;
 
 L_LD_Nickos:
 	set TMW_Quest, 17;
 	mes "[Lieutenant Dausen]";
-	mes "\"Thanks for letting Stewen know.  Can you now tell Nickos to hold his post?  He guards the mine to the south, monitoring the monster threat and protecting the miners when he can.\"";
+	mes "\"Thanks for letting Stewen know.  Can you now tell Nickos to hold his post too?  He guards the mine to the south, monitoring the monster threat and protecting the miners when he can.\"";
 	close;
 
 L_LD_Nickos_Waits:
 	mes "[Lieutenant Dausen]";
-	mes "\"Can you let Nickos know to hold his post?  It would help out a great deal.  He is guarding the mine to the south of here.\"";
+	mes "\"Could you let Nickos know to hold his post?  It would be very helpful.  He is guarding the mine south of here.\"";
 	close;
 
 L_LD_Orders:
 	set TMW_Quest, 19;
 	set zeny, zeny + 500;
 	mes "[Lieutenant Dausen]";
-	mes "\"Thank you for clearing up the orders to my men.  Here's some gold for your assistance.\"";
+	mes "\"Thank you for clearing up the orders to my men!  Here's some gold for your efforts.\"";
 	next;
-	mes "\"If you think you can handle these monster threats out here, I'm sure Nickos and the miners could use some help.  Talk to you later.\"";
+	mes "\"If you think you can handle the monsters lurking out here, I'm sure Nickos and the miners could use some help.  Talk to you later.\"";
 	close;
 
 L_LD_Miners:
 	mes "[Lieutenant Dausen]";
-	mes "\"I monitor the monster threats surrounding the city to ensure the safe of its citizens.\"";
+	mes "\"I monitor the monster threat around the city to ensure the safety of its citizens.\"";
 	next;
-	mes "\"If you think you can handle these monster threats out here, I'm sure Nickos and the miners could use some help.  Talk to you later.\"";
+	mes "\"If you think you can handle the monsters lurking out here, I'm sure Nickos and the miners could use some help.  Talk to you later.\"";
 	close;
 
 L_LD_Key:
diff --git a/npc/002-1_Sandstorm/nickos.txt b/npc/002-1_Sandstorm/nickos.txt
index fb8594ca..a6a12926 100644
--- a/npc/002-1_Sandstorm/nickos.txt
+++ b/npc/002-1_Sandstorm/nickos.txt
@@ -11,15 +11,25 @@
 	if (TMW_Quest == 19) goto L_Nickos_Mine;
 	if (TMW_Quest == 18) goto L_Nickos_Orders_Received;
 	if (TMW_Quest == 17) goto L_Nickos_Orders;
+	if (TMW_Quest < 17) goto L_Nickos_See_Dausen_First;
 
 	mes "[Nickos]";
 	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
 	close;
 
+L_See_Dausen_First:
+	mes "[Nickos]";
+	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
+	next;
+	mes "[Nickos]";
+	mes "\"The mines are closed from tourists due to the monster threat.  If you want to get in you will need to prove yourself first.  Talk to Lieutenant Dausen, my superior, if you want to make a formal complaint.\"";
+	close;
+
+
 L_Nickos_Orders:
 	set TMW_Quest, 18;
 	mes "[Nickos]";
-	mes "\"I have to hold my post longer?  Argh!  I was looking forward to my break.  Oh well, thanks for letting me know\"";
+	mes "\"I have to hold my post longer?  Argh!  I was looking forward to my break.  Oh well, thanks for letting me know.\"";
 	close;
 
 L_Nickos_Orders_Received:
@@ -29,21 +39,23 @@ L_Nickos_Orders_Received:
 
 L_Nickos_Mine:
 	mes "[Nickos]";
-	mes "\"I haven't heard from the miners in a while, but I've got to keep to my post unless there is due reason to investigate.  Normally the miners take care of themselves without any problem.  Could you check on them?\"";
+	mes "\"I haven't heard from the miners in a while, but I've got to keep to my post unless there is due reason to investigate.  Normally the miners take care of themselves without any problem.\"";
+        next;
+        mes "[Nickos]";
+        mes "\"Could you check on them for me, though?\"";
 	menu
-		"Yes", L_Nickos_Mine_Open,
-		"No", L_Nickos_Disappoint;
+		"Yes.", L_Nickos_Mine_Open,
+		"No.", L_Nickos_Disappoint;
 	close;
 
 L_Nickos_Disappoint:
-	mes "[Nickos]";
-	mes "\"I am disappointed.\"";
+	mes "Nickos looks disappointed.";
 	close;
 
 L_Nickos_Mine_Open:
 	set TMW_Quest, 20;
 	mes "[Nickos]";
-	mes "\" Excellent!  You now have my permission to enter the mine.  Your assistance helps ease my worries.\"";
+	mes "\"Excellent!  You now have my permission to enter the mine.  Your assistance helps ease my worries.\"";
 	close;
 
 L_Nickos_Waits:
@@ -55,7 +67,7 @@ L_Nickos_Check_Happy:
 	set TMW_Quest, 23;
 	set zeny, zeny + 500;
 	mes "[Nickos]";
-	mes "\"Oh, everything is okay?  That's great.  I think they are pretty busy and could use some help.  Feel free to give them a hand.  Here's some gold for your troubles.\"";
+	mes "\"Oh, everything is okay?  That's great!  I think they are pretty busy and could use some help.  Feel free to give them a hand.  Here's some gold for your troubles.\"";
 	close;
 
 L_Nickos_Guards:
@@ -68,25 +80,25 @@ L_Nickos_Guards:
 L_Nickos_AS_Start:
 	set TMW_Quest, 31;
 	mes "[Nickos]";
-	mes "\"Oh, the angry scorpions are becoming a problem?  We could thin down their numbers a bit.  Of course, I'll need something to show your work.  Bring me 10 angry scorpion stingers and I'll know their numbers are down.  You will be rewarded for your efforts.\"";
+	mes "\"Oh, the angry scorpions are becoming a problem?  We could thin down their numbers a bit.  I can make it worth your time, but of course, I'll need something to show your work.  Bring me 10 [Angry Scorpion Stinger]s to demonstrate your effectiveness, and you will be rewarded for your efforts.\"";
 	close;
 
 L_Nickos_AS_Done:
 	if (countitem ("AngryScorpionStinger") < 10) goto L_Nickos_AS_NotDone;
 	getinventorylist;
-	if (@inventorylist_count - (countitem("AngryScorpionStiner") == 10) > 99) goto L_Nickos_TooMany;
+	if (@inventorylist_count - (countitem("AngryScorpionStinger") == 10) > 99) goto L_Nickos_TooMany;
 	set TMW_Quest, 32;
 	delitem "AngryScorpionStinger", 10;
 	getitem "LeatherShield", 1;
 	mes "[Nickos]";
-	mes "\"Ah, you are a fine combatant!  Take this leather shield, it might be useful for your future battles.\"";
+	mes "\"Ah, you are a fine combatant!  Take this [Leather Shield], it might be useful for your future battles.\"";
 	next;
 	mes "\"You might be ready to take on the underground palace.  If you are interested, go talk to Naem about unlocking the barrier, he's got the key and the code to open it.\"";
 	close;
 
 L_Nickos_AS_NotDone:
 	mes "[Nickos]";
-	mes "\"Bring me 10 angry scorpion stingers and I'll know their numbers are down.  You will be rewarded for your efforts.\"";
+	mes "\"Bring me 10 [Angry Scorpion Stinger]s and I'll know their numbers are down.  You will be rewarded for your efforts.\"";
 	close;
 
 L_Nickos_TooMany:
@@ -96,7 +108,7 @@ L_Nickos_TooMany:
 
 L_Nickos_UGQ:
 	mes "[Nickos]";
-	mes "\"You might be ready to take on the underground palace.  If you are interested, talk to the miners about unlocking the barrier, they got the key to open it.\"";
+	mes "\"You might be ready to take on the underground palace.  If you are interested, talk to the miners about unlocking the barrier, they've got the key to open it.\"";
 	close;
 
 }
diff --git a/npc/002-1_Sandstorm/stewen.txt b/npc/002-1_Sandstorm/stewen.txt
index e28f6057..6c099b3a 100644
--- a/npc/002-1_Sandstorm/stewen.txt
+++ b/npc/002-1_Sandstorm/stewen.txt
@@ -6,18 +6,18 @@
 	if (TMW_Quest == 15) goto L_TMW_Quest;
 
 	mes "[Stewen]";
-	mes "\"I'm keeping a watchful eye on the monsters to the east so they don't threaten Tulimshar's citizens.  They are a pretty strong.\"";
+	mes "\"I'm keeping a watchful eye on the monsters to the east so they don't threaten Tulimshar's citizens.  They are pretty strong.\"";
 	close;
 
 L_TMW_Quest:
 	set TMW_Quest, 16;
 	mes "[Stewen]";
-	mes "\"I don't get a break!  Lieutenant Dausen needs to ask the Wizard's Council for more help out here.  Either that or give me a raise!  Oh well.  Thanks for letting me know.\"";
+	mes "\"I don't get a break?!  Lieutenant Dausen needs to ask the Wizard's Council for more help out here.  Either that or give me a raise!  Oh well.  Thanks for letting me know.\"";
 	close;
 
 L_TMW_Quest_Received:
 	mes "[Stewen]";
-	mes "\"Thanks again for letting me know Lieutenant Dausen isn't letting me get a break.  Once I get one, I'll let him know I want a raise!\"";
+	mes "\"Thanks again for letting me know Lieutenant Dausen isn't letting me take a break.  Once I get out of here, I'll let him know I want a raise!\"";
 	close;
 
 }
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
index d2509e8a..a5249e00 100644
--- a/npc/002-3_Desert_mines/_mobs.txt
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -3,7 +3,7 @@
 002-3.gat,39,37,14,10	monster	Cave Maggot	1056,5,100000,30000,Mob002-3::On1056
 002-3.gat,91,41,17,20	monster	Ice Goblin	1058,3,100000,30000,Mob002-3::On1058
 002-3.gat,71,35,25,17	monster	Cave Maggot	1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,69,100,8,5	monster	Ice Goblin	1058,2,100000,30000,Mob002-3::On1058
+002-3.gat,68,100,8,5	monster	Ice Goblin	1058,2,100000,30000,Mob002-3::On1058
 002-3.gat,68,57,26,24	monster	Angry Scorpion	1057,5,100000,30000,Mob002-3::On1057
 002-3.gat,48,57,3,14	monster	Angry Scorpion	1057,5,100000,30000,Mob002-3::On1057
 002-3.gat,38,76,15,22	monster	Angry Scorpion	1057,4,100000,30000,Mob002-3::On1057
diff --git a/npc/002-3_Desert_mines/mine_triggerone.txt b/npc/002-3_Desert_mines/mine_triggerone.txt
index 604e2aa9..d182609b 100644
--- a/npc/002-3_Desert_mines/mine_triggerone.txt
+++ b/npc/002-3_Desert_mines/mine_triggerone.txt
@@ -6,14 +6,14 @@
 	if (TMW_Quest == 35) goto L_Trigger_Wrong_1;
 	if (TMW_Quest == 34) goto L_Trigger_1;
 
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	close;
 
 L_Trigger_Wrong_1:
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	menu
-		"Put key in, turn right.", L_Right_Wrong_1,
-		"Put key in, turn left.", L_Left_Wrong_1,
+		"Put the key in, turn right.", L_Right_Wrong_1,
+		"Put the key in, turn left.", L_Left_Wrong_1,
 		"Do nothing.", L_Nothing_1;
 	close;
 
@@ -28,16 +28,16 @@ L_Left_Wrong_1:
 	close;
 
 L_Trigger_1:
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	menu
-		"Put key in, turn right.", L_Right_1,
-		"Put key in, turn left.", L_Left_1,
+		"Put the key in, turn right.", L_Right_1,
+		"Put the key in, turn left.", L_Left_1,
 		"Do nothing.", L_Nothing_1;
 	close;
 
 L_Right_1:
 	set TMW_Quest, 35;
-	mes "You turn the key right, the sound of clicking is heard throughout the mine.";
+	mes "You turn the key right.  A clicking sound echoes throughout the mine.";
 	close;
 
 L_Left_1:
@@ -46,7 +46,7 @@ L_Left_1:
 	close;
 
 L_Nothing_1:
-	mes "You leave the button alone";
+	mes "You leave the button alone.";
 	close;
 
 }
diff --git a/npc/002-3_Desert_mines/mine_triggerthree.txt b/npc/002-3_Desert_mines/mine_triggerthree.txt
index c5596e8f..828eb594 100644
--- a/npc/002-3_Desert_mines/mine_triggerthree.txt
+++ b/npc/002-3_Desert_mines/mine_triggerthree.txt
@@ -6,14 +6,14 @@
 	if (TMW_Quest == 35) goto L_Trigger_3;
 	if (TMW_Quest == 34) goto L_Trigger_Wrong_3;
 
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	close;
 
 L_Trigger_Wrong_3:
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	menu
-		"Put key in, turn right.", L_Right_Wrong_3,
-		"Put key in, turn left.", L_Left_Wrong_3,
+		"Put the key in, turn right.", L_Right_Wrong_3,
+		"Put the key in, turn left.", L_Left_Wrong_3,
 		"Do nothing.", L_Nothing_3;
 	close;
 
@@ -24,14 +24,14 @@ L_Right_Wrong_3:
 
 L_Left_Wrong_3:
 	set TMW_Quest, 34;
-	mes "You turn the key left*.";
+	mes "You turn the key left.";
 	close;
 
 L_Trigger_3:
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	menu
-		"Put key in, turn right.", L_Right_3,
-		"Put key in, turn left.", L_Left_3,
+		"Put the key in, turn right.", L_Right_3,
+		"Put the key in, turn left.", L_Left_3,
 		"Do nothing.", L_Nothing_3;
 	close;
 
@@ -42,10 +42,10 @@ L_Right_3:
 
 L_Left_3:
 	set TMW_Quest, 36;
-	mes "You turn the key left, the sound of clicking is heard throughout the mine.";
+	mes "You turn the key left. A clicking sound echoes throughout the mine.";
 	close;
 
 L_Nothing_3:
-	mes "You leave the button alone";
+	mes "You leave the button alone.";
 	close;
 }
diff --git a/npc/002-3_Desert_mines/mine_triggertwo.txt b/npc/002-3_Desert_mines/mine_triggertwo.txt
index ff1ff654..21e1d965 100644
--- a/npc/002-3_Desert_mines/mine_triggertwo.txt
+++ b/npc/002-3_Desert_mines/mine_triggertwo.txt
@@ -6,14 +6,14 @@
 	if (TMW_Quest == 35) goto L_Trigger_Wrong_2;
 	if (TMW_Quest == 34) goto L_Trigger_Wrong_2; 
 
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	close;
 
 L_Trigger_Wrong_2:
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	menu
-		"Put key in, turn right.", L_Right_Wrong_2,
-		"Put key in, turn left.", L_Left_Wrong_2,
+		"Put the key in, turn right.", L_Right_Wrong_2,
+		"Put the key in, turn left.", L_Left_Wrong_2,
 		"Do nothing.", L_Nothing_2;
 	close;
 
@@ -24,14 +24,14 @@ L_Right_Wrong_2:
 
 L_Left_Wrong_2:
 	set TMW_Quest, 34;
-	mes "You turn the key left";
+	mes "You turn the key left.";
 	close;
 
 L_Trigger_2:
-	mes "A large button on the ground.  A key hole appears on the button.";
+	mes "There is a large button on the ground.  A key hole appears on the button.";
 	menu
-		"Put key in, turn right.", L_Right_2,
-		"Put key in, turn left.", L_Left_2,
+		"Put the key in, turn right.", L_Right_2,
+		"Put the key in, turn left.", L_Left_2,
 		"Do nothing.", L_Nothing_2;
 	close;
 
@@ -43,7 +43,7 @@ L_Right_2:
 L_Left_2:
 	set TMW_Quest, 37;
 	set Open_Underground_Palace_Barrier, 1;
-	mes "You turn the key left, the sound of clicking is heard throughout the mine.  A loud thump is heard.";
+	mes "You turn the key left. A clicking sound echoes throughout the mine, followed by a loud thump.";
 	close;
 
 L_Nothing_2:
diff --git a/npc/002-3_Desert_mines/naem.txt b/npc/002-3_Desert_mines/naem.txt
index 74d8465f..aca3e0c2 100644
--- a/npc/002-3_Desert_mines/naem.txt
+++ b/npc/002-3_Desert_mines/naem.txt
@@ -18,27 +18,28 @@
 	if (TMW_Quest == 21) goto L_Naem_Okay;
 
 	mes "[Naem]";
-	mes "\"Just mining away.  Lots of work to do.\"";
+	mes "\"I'm just mining away here.  Lots of work to do.\"";
 	close;
 
 L_Naem_Okay:
 	set TMW_Quest, 22;
 	mes "[Naem]";
-	mes "\"Oh hello there.  Nickos wanted you to check on me?  Yeah, I'm okay.\"";
+	mes "\"Oh, hello there.  Nickos wanted you to check on me? Yeah, you can tell him I'm okay.\"";
 	close;
 
 L_Naem_Cool:
 	mes "[Naem]";
-	mes "\"Yeah, I'm cool.  Just mining away.\"";
+	mes "\"Yeah, I'm cool.  Just mining away here.\"";
 	close;
 
 L_Naem_Help_1:
 	set TMW_Quest, 25;
 	mes "[Naem]";
-	mes "\"Oh, you are here to help move my bags?  Cool, I've got a few ready to go.  Go ahead and take this one.\"";
+	mes "\"Oh, you are here to help move my bags?  Cool, I've got a few ready to go.  Go ahead and take this one!\"";
 	next;
-	mes "Naem hands you a bag of ore";
+	mes "Naem hands you a bag of ore.";
 	next;
+	mes "[Naem]";
 	mes "\"After you deliver that one to Nathan, come on back, I've got a couple more ready to go.\"";
 	close;
 
@@ -49,15 +50,15 @@ L_Naem_Waits_1:
 
 L_Naem_Help_2:
 	set TMW_Quest, 27;
-	mes "[Naem]";
-	mes "Naem Gives you a bag of ore.";
+	mes "Naem gives you a bag of ore.";
 	next;
-	mes "\"Just one more after this one and we'll be caught up.\"";
+	mes "[Naem]";
+	mes "\"Just one more after this one and we'll be all caught up!\"";
 	close;
 
 L_Naem_Waits_2:
 	mes "[Naem]";
-	mes "\"Just one more bag of ore after the one you got and we'll be caught up.\"";
+	mes "\"Just one more bag of ore after the one you got and we'll be all caught up!\"";
 	close;
 
 L_Naem_Help_3:
@@ -70,19 +71,21 @@ L_Naem_Help_3:
 
 L_Naem_Waits_3:
 	mes "[Naem]";
-	mes "\"You got my last sack.  Just give it to Nathan and we'll be caught up.\"";
+	mes "\"You got my last sack already.  Just give it to Nathan and we'll have caught up.\"";
 	close;
 
 L_Naem_Great:
 	mes "[Naem]";
-	mes "\"Hi ho! It's off to work I go! I work everyday for meager pay, a miner's life for me.\"";
+	mes "\"Hi ho!  It's off to work I go!  I work every day for meager pay, a miner's life for me...\"";
 	close;
 
 L_Naem_Memory:
+	mes "You see Naem grimacing in pain as you approach.";
+	next;
 	mes "[Naem]";
 	mes "\"Oh, my head!  Some rocks fell on me and bonked me pretty good.  I'm still a little sore.\"";
 	menu
-		"Don't you got a key so I can go to the underground palace?", L_Naem_Palace_No,
+		"Don't you have a key so I can go to the underground palace?", L_Naem_Palace_No,
 		"You should be more careful.", L_Naem_Duh;
 	close;
 
@@ -94,7 +97,7 @@ L_Naem_Duh:
 L_Naem_Palace_No:
 	set TMW_Quest, 33;
 	mes "[Naem]";
-	mes "\"Oh no!  I lost the key!  Don't fear though, talk to Lieutenant Dausen about getting the spare key.\"";
+	mes "\"Oh no!  I lost the key!  Don't worry though, talk to Lieutenant Dausen about getting the spare key.\"";
 	close;
 
 L_Naem_Lt:
@@ -104,7 +107,7 @@ L_Naem_Lt:
 
 L_Naem_Code:
 	mes "[Naem]";
-	mes "\"Oh you got the key.  That is good.  All I remember about the code is you have to put the key into the buttons around the mine in a certain order and turn them in a certain order and it will unlock the underground palace.  Good luck.\"";
+	mes "\"Oh, you got the key.  That is good!  But my head still hurts...  All I remember about the code is you have to put the key into the key hole buttons around the mine in a certain order and turn them in a certain order and it will unlock the underground palace.  Sorry, that's all I have for you.  Good luck!\"";
 	close;
 
 L_Naem_Gloves:
@@ -113,7 +116,7 @@ L_Naem_Gloves:
 	set Naem_Quest_Done, 1;
 	getitem "MinerGloves", 1;
 	mes "[Naem]";
-	mes "\"Hey, good job on getting that together.  Take these gloves, they might prove useful in the underground palace.\"";
+	mes "\"Hey, good job on getting that together!  Take these gloves, they might prove useful in the underground palace.\"";
 	close;
 	
 L_Naem_TooMany:
@@ -123,7 +126,7 @@ L_Naem_TooMany:
 
 L_Naem_Complete:
 	mes "[Naem]";
-	mes "\"A miner's life for me!\"";
+	mes "\"Yo-ho-ho, a miner's life for me!\"";
 	close;
 
 }
diff --git a/npc/002-3_Desert_mines/nathan.txt b/npc/002-3_Desert_mines/nathan.txt
index 17a57872..dde61d84 100644
--- a/npc/002-3_Desert_mines/nathan.txt
+++ b/npc/002-3_Desert_mines/nathan.txt
@@ -17,24 +17,24 @@
 	
 
 	mes "[Nathan the Miner]";
-	mes "\"It's very dangerous in here.  We had a big earthquake here just recently, too... so be careful!\"";
+	mes "\"It's very dangerous in here.  We had a big earthquake here just recently, too...  so be careful!\"";
 	close;
 
 L_Nathan_Okay:
 	set TMW_Quest, 21;
 	mes "[Nathan]";
-	mes "\"Hey!  Just mining away down here.  Nickos, was worried?  Nothing down here we can't handle, but try to be safe down here.  The monsters can be rather aggressive.  You might want to check on Naem to make sure he's okay.  You can find him on the southeast corner of the mine.\"";
+	mes "\"Hey there!  Just mining away down here.  You say Nickos was worried about us?  Nothing down here we can't handle, but you should try to be safe down here yourself.  The monsters can be rather aggressive.  Come to think of it, you might want to check on Naem to make sure he's okay.  You can find him in the southeast parts of the mine.\"";
 	close;
 
 L_Nathan_Cool:
 	mes "[Nathan]";
-	mes "\"Hey, be careful down here, the monsters can be rather aggressive.  You might want to check on Naem.  He's at the southeast corner of the mine.\"";
+	mes "\"Hey, be careful down here, the monsters can be rather aggressive!  You might want to check on Naem too.  He's at the southeast parts of the mine.\"";
 	close;
 
 L_Nathan_Help_1:
 	set TMW_Quest, 24;
 	mes "[Nathan]";
-	mes "\"Oh hey again.  Nickos told you we need some help down here?  Yeah, Naem could use some help moving his bags of ore to me.  He's got a lot of work built up.  Just go talk to him and he'll give you the bags.  You might have to make a few trips, but I'll make it worth your troubles.\"";
+	mes "\"Oh, hey again!  Nickos told you we need some help down here too?  Yeah, Naem could use a spare pair of hands moving his bags of ore to me.  He's got a lot of work built up.  Just go talk to him and he'll give you the bags.  You might have to make a few trips, but I'll make it worth your troubles.\"";
 	close;
 
 L_Nathan_Waits_1:
@@ -44,23 +44,23 @@ L_Nathan_Waits_1:
 
 L_Nathan_Help_2:
 	set TMW_Quest, 26;
-	mes "[Nathan]";
 	mes "You give the bag of ore to Nathan";
 	next;
-	mes "\"Ah, thank you.  Just a couple more and we'll be caught up.\"";
+	mes "[Nathan]";
+	mes "\"Ah, thank you.  Just a couple more and we'll have caught up!\"";
 	close;
 
 L_Nathan_Waits_2:
 	mes "[Nathan]";
-	mes "\"Just a couple more and we'll be caught up.\"";
+	mes "\"Just a couple more and we'll be all caught up!\"";
 	close;
 
 L_Nathan_Help_3:
 	set TMW_Quest, 28;
-	mes "[Nathan]";
-	mes "You hand the bag of ore to Nathan";
+	mes "You hand the bag of ore to Nathan.";
 	next;
-	mes "\"Just one more bag and you'll be done.\"";
+	mes "[Nathan]";
+	mes "\"Just one more bag and you'll be done!\"";
 	close;
 
 L_Nathan_Waits_3:
@@ -74,11 +74,11 @@ L_Nathan_Help_Done:
 	set TMW_Quest, 30;
 	getitem "MinersHat", 1;
 	mes "[Nathan]";
-	mes "You hand the bag of ore to Nathan";
+	mes "You hand the bag of ore to Nathan.";
 	next;
-	mes "\"Ah, that should be it.  Thank you for your help.  Here, take this miner's hat.  You're a real miner now!\"";
+	mes "\"Ah, that should be it!  Thank you for your help.  Here, take this [Miner's Hat].  You're a real miner now!\"";
 	next;
-	mes "\"I noticed a problem with these angry scorpions down here, they seem to make things much more difficult.  Maybe you could tell Nickos about it?\"";
+	mes "\"Oh, and I noticed a problem with these angry scorpions down here, they seem to make things much more difficult.  Maybe you could tell Nickos about it on your way out?\"";
 	close;
 
 L_Nathan_TooMany:
@@ -88,17 +88,17 @@ L_Nathan_TooMany:
 
 L_Nathan_Help_Cool:
 	mes "[Nathan]";
-	mes "\"Be safe down here, it's dangerous.  Mining is a dangerous job, but somebody's got to do it.\"";
+	mes "\"Be safe down here, it's dangerous for the unexperienced.  Mining is a dangerous job, but somebody's got to do it!\"";
 	close;
 
 L_Nathan_UGQ_Naem:
 	mes "[Nathan]";
-	mes "\"Thanks for thinning down the angry scorpion numbers.  It has made mining a little easier down here.  Oh, Nickos has given you permission to check out the underground palace?  Talk to Naem, he's got the key and the code.\"";
+	mes "\"Thanks for thinning down the angry scorpion population.  It sure has made mining a little easier down here!  Oh, you say Nickos has given you permission to check out the underground palace?  Talk to Naem, he's got the key and the code.\"";
 	close;
 
 L_Nathan_Complete:
 	mes "[Nathan]";
-	mes "\"Mining is a dangerous job, but somebody's got to do it.\"";
+	mes "\"Mining is a dangerous job, but somebody's got to do it!\"";
 	close;
 
 }
diff --git a/npc/002-4_Desert_mines/chest.txt b/npc/002-4_Desert_mines/chest.txt
index 158b79fc..8233611d 100644
--- a/npc/002-4_Desert_mines/chest.txt
+++ b/npc/002-4_Desert_mines/chest.txt
@@ -4,37 +4,33 @@
 
 	if (TMW_Quest >= 38) goto L_Finished;
 
-	mes "[Chest]";
-	mes "Would you try to open it?";
+	mes "There is a chest here.";
+	mes "Do you want to try to open it?";
 	next;
 	menu
-		"Yes", L_Yes,
-		"No", -;
+		"Yes.", L_Yes,
+		"No.", -;
 	close;
 
 L_Yes:
 	if(countitem("TreasureKey") < 3) goto L_Not_Enough;
 	getinventorylist;
 	if (@inventorylist_count == 100 && countitem("TreasureKey") > 3) goto L_TooMany;
-	mes "[Chest]";
-	mes "You opened it and found a short bow!";
+	mes "You opened the chest and found a short bow!";
 	delitem "TreasureKey", 3;
 	getitem "ShortBow", 1;
 	set TMW_Quest, 38;
 	close;
 
 L_Not_Enough:
-        mes "[Chest]";
-	mes "It seems that this is not the right key...";
+	mes "It seems that you do not the right key for this chest yet...";
 	close;
 
 L_Finished:
-        mes "[Chest]";
-        mes "You already opened this chest.";
+        mes "You have already opened this chest.";
         close;
 
 L_TooMany:
-        mes "[Chest]";
-        mes "You don't have room for what ever is inside. Maybe you should try again later.";
+        mes "You do not have enough room to loot this chest. Maybe you should try again later.";
 	close;
 }
diff --git a/npc/002-4_Desert_mines/miners.txt b/npc/002-4_Desert_mines/miners.txt
index 9fbaea89..91350e21 100644
--- a/npc/002-4_Desert_mines/miners.txt
+++ b/npc/002-4_Desert_mines/miners.txt
@@ -7,7 +7,7 @@
 	if (TMW_Quest == 38) goto L_Sema_GCM;
 
 	mes "[Sema the Miner]";
-	mes "\"This place is odd.  There is a chest somewhere in this palace, but I don't know where.  I think the archants have eaten all the spare keys for the chest.\"";
+	mes "\"This place is odd.  There is a chest somewhere in this palace, but I don't know where.  I think the archants have eaten all the spare keys for the chest, too.\"";
 	close;
 
 L_Sema_GCM:
@@ -27,7 +27,7 @@ L_Sema_Yes:
 	set TMW_Quest, 39;
 	monster "002-4.gat", 70, 90, "", 1059, 1;
 	mes "[Sema the Miner]";
-	mes "\"Good luck.  To prove you killed it, please bring the iten it swallowed when it ate the miner.  Be careful, there could be more than one.\"";
+	mes "\"Good luck.  To prove you killed it, please bring the [Iten] it swallowed when it ate the miner.  Be careful, there could be more than one.\"";
 	close;
 
 L_Sema_Happy:
@@ -38,7 +38,7 @@ L_Sema_Happy:
 	getitem "DesertShirt", 1;
 	set TMW_Quest, 40;
 	mes "[Sema the Miner]";
-	mes "\"You killed it! As a reward for helping me, take this desert shirt\"";
+	mes "\"You killed it!  What a relief!  Please accept this [Desert Shirt] as reward.\"";
 	close;
 
 L_Sema_TooMany:
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/012-3_Cave/_mobs.txt b/npc/012-3_Cave/_mobs.txt
index 70c39e3d..e3a247f6 100644
--- a/npc/012-3_Cave/_mobs.txt
+++ b/npc/012-3_Cave/_mobs.txt
@@ -1,7 +1,26 @@
 // 012-3 Cave mobs
 
+012-3.gat,447,65,17,7	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,441,45,17,7	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,411,30,17,7	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,345,39,7,16	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,362,101,16,18	monster	Moggun	1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,444,81,17,7	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,387,137,17,7	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,408,78,7,16	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,382,151,17,7	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,428,116,7,16	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,329,100,7,16	monster	Moggun	1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,268,138,16,18	monster	Moggun	1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,188,51,16,18	monster	Moggun	1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,164,105,16,18	monster	Moggun	1061,10,100000,30000,Mob012-3::On1061
 
 
 012-3.gat,0,0,0	script	Mob012-3	-1,{
+On1061:
+	set @mobID, 1061;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/012-3_Cave/_warps.txt b/npc/012-3_Cave/_warps.txt
index 58e842ba..044ea2b4 100644
--- a/npc/012-3_Cave/_warps.txt
+++ b/npc/012-3_Cave/_warps.txt
@@ -9,3 +9,4 @@
 012-3.gat,371,46	warp	CaveExit	0,-1,012-1.gat,51,40
 012-3.gat,354,79	warp	CaveExit	0,-1,012-1.gat,41,48
 012-3.gat,473,104	warp	CaveExit	-1,1,012-1.gat,146,67
+012-3.gat,448,61	warp	CaveExit	-1,-1,012-4.gat,194,57
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..f3711b3f 100644
--- a/npc/021-2_Tulimshar/_import.txt
+++ b/npc/021-2_Tulimshar/_import.txt
@@ -4,5 +4,8 @@ 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/government_building.txt
+npc: npc/021-2_Tulimshar/heathin.txt
+npc: npc/021-2_Tulimshar/inya.txt
+npc: npc/021-2_Tulimshar/jhedia.txt
 npc: npc/021-2_Tulimshar/mapflags.txt
 npc: npc/021-2_Tulimshar/workshop.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;
+
+}
diff --git a/npc/027-2_Caretakers_House/_warps.txt b/npc/027-2_Caretakers_House/_warps.txt
index 8b7af158..32db1af8 100644
--- a/npc/027-2_Caretakers_House/_warps.txt
+++ b/npc/027-2_Caretakers_House/_warps.txt
@@ -1,3 +1,3 @@
 // 027-2 Caretaker's House warps
 
-027-2.gat,26,33	warp	toGraveyard	-1,-1,027-1.gat,88,85
+027-2.gat,25,32	warp	toGraveyard	-1,-1,027-1.gat,88,85
diff --git a/npc/_import.txt b/npc/_import.txt
index 36ade972..3053d543 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -26,6 +26,9 @@ import: npc/011-4_Lake_cave/_import.txt
 import: npc/011-5/_import.txt
 import: npc/012-1_Woodland_Hills/_import.txt
 import: npc/012-3_Cave/_import.txt
+import: npc/012-4_Cave/_import.txt
+import: npc/012-5/_import.txt
+import: npc/012-6/_import.txt
 import: npc/013-1_Woodland_hills/_import.txt
 import: npc/013-2_Magic_house/_import.txt
 import: npc/013-3_Cave/_import.txt
diff --git a/npc/functions/mob_points.txt b/npc/functions/mob_points.txt
index c594fae2..768b874d 100644
--- a/npc/functions/mob_points.txt
+++ b/npc/functions/mob_points.txt
@@ -62,6 +62,8 @@ function	script	MobPoints	{
 		5, // Ice Goblin
 		8, // Archant
 		36, // Giant Cave Maggot
+		40, // Moggun
+		100, // Terranite
 		// Add more here		
 		0; // END