Low Level Tulimshar Release

News, Small Fixes, Tulimshar Related Quests, Sandstorm Mob Changes
Expensive Hurnscald Warp NPC

31 files changed, 1184 insertions, 84 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 0b7723c9..960b3b9c 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -514,3 +514,4 @@
 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,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
diff --git a/db/mob_db.txt b/db/mob_db.txt
index b0bfd737..d6624b82 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -53,3 +53,8 @@
 //1053, Froad
 //1054, Troll
 1055,	Butterfly,	Butterfly,	25,	250,	0,	0,	10,	2,	10,	50,	3,	5,	10,	45,	10,	15,	35,	40,	1,	1,	1,	3,	44,	129,	350,	780,	300,	800,	718,	1000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		60
+1056,	CaveMaggot,	Cave Maggot,	10,	100,	0,	0,	4,	1,	10,	10,	0,	5,	5,	5,	1,	0,	6,	5,	1,	1,	1,	3,	21,	133,	700,	1872,	672,	480,	505,	800,		501,	150,		518,	400,		533,	150,		502,	70,		522,	10,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	0,		0
+1057,	AngryScorpion,	Angry Scorpion,	20,	200,	0,	0,	4,	1,	15,	15,	0,	5,	5,	5,	1,	0,	15,	5,	1,	1,	1,	3,	20,	133,	1000,	1872,	672,	480,	4000,	700,		510,	100,		509,	50,		518,	700,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	0,		0
+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
diff --git a/news.txt b/news.txt
index 44c07f5e..679b9fc5 100644
--- a/news.txt
+++ b/news.txt
@@ -1,3 +1,38 @@
+##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 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.
+
+##3 The Candor Challenge 
+##3 2010-08-18
+##0
+##0 In the lost island of Candor, a skeletal figure
+##0 stands, awaiting for fresh blood to wander right
+##0 in and pay him for the privilege of being killed
+##0 in nasty ways. How long are you and your friends 
+##0 able to survive in the cave of horrors?      
+##0
+##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!
+
 ##3 The End is not nigh
 ##3 2010-06-09
 
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
index daacf8da..b7ea36c1 100644
--- a/npc/001-1_Tulimshar/_import.txt
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -4,6 +4,7 @@ npc: npc/001-1_Tulimshar/_warps.txt
 npc: npc/001-1_Tulimshar/banker.txt
 npc: npc/001-1_Tulimshar/barber.txt
 npc: npc/001-1_Tulimshar/bard.txt
+npc: npc/001-1_Tulimshar/bernard.txt
 npc: npc/001-1_Tulimshar/bleacher.txt
 npc: npc/001-1_Tulimshar/children.txt
 npc: npc/001-1_Tulimshar/constable.txt
@@ -14,9 +15,11 @@ npc: npc/001-1_Tulimshar/guide.txt
 npc: npc/001-1_Tulimshar/luca.txt
 npc: npc/001-1_Tulimshar/mapflags.txt
 npc: npc/001-1_Tulimshar/merchant.txt
+npc: npc/001-1_Tulimshar/mikhail.txt
 npc: npc/001-1_Tulimshar/monster_guide.txt
 npc: npc/001-1_Tulimshar/rewards_master.txt
 npc: npc/001-1_Tulimshar/sandra.txt
+npc: npc/001-1_Tulimshar/sarah.txt
 npc: npc/001-1_Tulimshar/soul-menhir.txt
 npc: npc/001-1_Tulimshar/trader.txt
 npc: npc/001-1_Tulimshar/vincent.txt
diff --git a/npc/001-1_Tulimshar/bernard.txt b/npc/001-1_Tulimshar/bernard.txt
new file mode 100755
index 00000000..25aad835
--- /dev/null
+++ b/npc/001-1_Tulimshar/bernard.txt
@@ -0,0 +1,117 @@
+//
+
+001-1.gat,37,44,0	script	Bernard	117,{
+	if(TMW_Quest >= 4) goto L_Done2;
+	if(TMW_Quest == 3) goto L_Progress2;
+	if(TMW_Quest == 2) goto L_Done1;
+	if(TMW_Quest == 1) goto L_Progress;
+
+	set @TEMP, rand(2);
+	if(@TEMP == 0) goto L_Opening0;
+	if(@TEMP == 1) goto L_Opening1;
+
+L_Opening0:
+	mes "[Bernard]";
+	mes "\"In Tulimshar, there are a lot of maggots. I need a favor, please help me. Will you?\"";
+	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?\"";
+	next;
+	goto L_Ask;
+
+L_Ask:
+	menu
+		"Yes", L_Yes,
+		"No", L_No;
+
+L_Yes:
+	set @TEMP, rand(2);
+	if(@TEMP == 0) goto L_Req0;
+	if(@TEMP == 1) goto L_Req1;
+
+L_Req0:
+	mes "[Bernard]";
+	mes "\"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.\"";
+	next;
+	goto L_Set;
+
+L_Set:
+	set TMW_Quest,1;
+	mes "[Bernard]";
+	mes "\"Please bring me it!\"";
+	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.\"";
+	getinventorylist;
+	if ((@inventorylist_count - (countitem("RoastedMMaggot") == 1) > 99 - (countitem("CherryCake") == 0) )) goto L_TooMany;
+	delitem "RoastedMaggot", 1;
+        getexp 100, 0;
+	getitem "CherryCake", 5;
+	set TMW_Quest, 2;
+	close;
+
+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.\"";
+        getinventorylist;             
+        if ((@inventorylist_count - (countitem("MaggotSlime") == 3) > 99  - (countitem("Beer") == 0) )) goto L_TooMany;
+        delitem "MaggotSlime", 3;
+        getexp 100, 0;     
+        getitem "Beer", 3;       
+        set TMW_Quest, 4;                
+        close;
+
+
+L_NotEnough:
+	mes "[Bernard]";
+	mes "\"Please hurry and bring me a [Roasted Maggot].\"";
+	close;
+
+L_NotEnough1:
+        mes "[Bernard]";
+        mes "\"Please hurry and bring me 3 [Maggot Slime]s.\"";
+        close;
+
+
+L_Done1:
+	mes "[Bernard]";
+	mes "\"Thank you so much !\"";
+	mes "\"But something is missing to make the soup creamy !\"";
+	next;
+	mes "\"I need 3 [Maggot Slime] for the soup.\"";
+	mes "\"Bring me them. I'll give you something if you do.\"";
+	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..\"";
+        next;
+        mes "\"Beer is life!\"";
+        close;
+
+
+L_No:
+	close;
+
+L_TooMany:
+	next;
+	mes "[Bernard]";
+	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
new file mode 100755
index 00000000..6946f7f5
--- /dev/null
+++ b/npc/001-1_Tulimshar/mikhail.txt
@@ -0,0 +1,60 @@
+//
+
+001-1.gat,50,46,0	script	Mikhail	120,{
+	if (TMW_Quest == 6) goto L_Done;
+	if (TMW_Quest == 5) goto L_Progress;
+	if (TMW_Quest == 4) goto L_Start;
+	
+	mes "[Mikhail]";
+	mes "\"Hello...\"";
+	close;
+
+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!\"";
+	next;
+	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;
+	close;
+	
+L_close:
+	close;
+	
+L_accept:
+	mes "[Mikhail]";
+	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?\"";
+	next;
+	menu
+		"Yes, here they are boy!", L_try,
+		"Not yet, I'll be back soon.", L_close;
+	close;
+	
+L_try:
+	if countitem("MaggotSlime") >= 5 goto L_get;
+	mes "[Mikhail]";
+	mes "\"It doesn't look like you have them all...\"";
+	close;
+	
+L_get:
+	delitem "MaggotSlime", 5;
+	set TMW_Quest, 6;
+	mes "[Mikhail]";
+	mes "\"Thank you so much! I can get back to my grandma now!\"";
+	next;
+	getexp 100, 0;
+	mes "You get 100 xp.";
+	close;
+	
+L_Done:
+	mes "[Mikhail]";
+	mes "\"Thanks for helping me getting those maggot slimes!\"";
+	close;
+	
diff --git a/npc/001-1_Tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt
index 30e762c4..571fe1c8 100644
--- a/npc/001-1_Tulimshar/rewards_master.txt
+++ b/npc/001-1_Tulimshar/rewards_master.txt
@@ -5,7 +5,7 @@
 	if (tvis == 0) set tvis, 1;
 	if (Mobpt < tvis) goto L_NotEnough;
 
-	setarray @Items$, "AppleCake", "Arrow", "BatTeeth", "BatWing", "Beer", "BluePresentBox", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CandyCane", "CasinoCoins", "CaveSnakeLamp", "CaveSnakeTongue", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "DecorCandy", "EasterEgg", "FancyHat", "GingerBreadMan", "GrassSnakeEgg", "GrassSnakeTongue", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "MountainSnakeEgg", "MountainSnakeTongue", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "PurplePresentBox", "RawLog", "RedApple", "RedDye", "RedScorpionStinger", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeEgg", "SnakeSkin", "SnakeTongue", "SpectrePowder", "Steak", "TinyHealingPotion", "TreasureKey", "WhiteCake", "WhiteFur", "WispPowder", "XmasCake", "XmasCandyCane", "YellowDye";
+	setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye";
 
 	mes "[Ishi the Rewards Master]";
 	mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\"";
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 1dab65ed..352e953b 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -1,8 +1,15 @@
 //
 
 001-1.gat,110,71,0	script	Sandra	114,{
-	if(Scorp == 2) goto L_Done;
-	if(Scorp == 1) goto L_Progress;
+	if (TMW_Quest >= 12) goto L_Done;
+	if (TMW_Quest == 11) goto L_Progress;
+	if (TMW_Quest == 10) goto L_Start;
+
+	mes "[Sandra]";
+	mes "\"Hunting monsters for potion ingredients can sometimes be a difficult task.\"";
+	close;
+
+L_Start:
 
 	set @TEMP, rand(4);
 	if(@TEMP == 0) goto L_Opening0;
@@ -47,46 +54,44 @@ L_Yes:
 
 L_Req0:
 	mes "[Sandra]";
-	mes "\"I need 5 [Scorpion Stinger]s and 1 [Red Scorpion Stinger].\"";
+	mes "\"I need 5 [Scorpion Stinger]s.\"";
 	next;
 	goto L_Set;
 
 L_Req1:
 	mes "[Sandra]";
-	mes "\"I heard a while ago that scorpion stingers can be used for medical purposes. I need you to help me get 5 [Scorpion Stinger]s and 1 [Red Scorpion Stinger].\"";
+	mes "\"I heard a while ago that scorpion stingers can be used for medical purposes. I need you to help me get 5 [Scorpion Stinger]s.\"";
 	next;
 	goto L_Set;
 
 L_Req2:
 	mes "[Sandra]";
-	mes "\"Bring me 5 [Scorpion Stinger]s and 1 [Red Scorpion Stinger]. I'll give you something if you do.\"";
+	mes "\"Bring me 5 [Scorpion Stinger]s. I'll give you something if you do.\"";
 	next;
 	goto L_Set;
 
 L_Set:
-	set Scorp,1;
+	set TMW_Quest,11;
 	mes "[Sandra]";
 	mes "\"Please bring me them!\"";
 	close;
 
 L_Progress:
 	if (countitem("ScorpionStinger") < 5) goto L_NotEnough;
-	if (countitem("RedScorpionStinger") < 1) goto L_NotEnough;
 	mes "[Sandra]";
 	mes "\"Excellent!";
-	mes "You brought me 5 [Scorpion Stinger]s and 1 [Red Scorpion Stinger]!\"";
+	mes "You brought me 5 [Scorpion Stinger]s!\"";
 	getinventorylist;
-	if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) - (countitem("RedScorpionStinger") == 1)) > 99 - (countitem("Arrow") == 0)) goto L_TooMany;
+	if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) > 99) - (countitem("Arrow") == 0)) goto L_TooMany;
 	delitem "ScorpionStinger", 5;
-	delitem "RedScorpionStinger", 1;
 	getitem "Bow", 1;
 	getitem "Arrow", 100;
-	set Scorp, 2;
+	set TMW_Quest, 12;
 	close;
 
 L_NotEnough:
 	mes "[Sandra]";
-	mes "\"Please hurry and bring me 5 [Scorpion Stinger]s and 1 [Red Scorpion Stinger].\"";
+	mes "\"Please hurry and bring me 5 [Scorpion Stinger]s.\"";
 	close;
 
 L_Done:
diff --git a/npc/001-1_Tulimshar/sarah.txt b/npc/001-1_Tulimshar/sarah.txt
new file mode 100755
index 00000000..d815b6d3
--- /dev/null
+++ b/npc/001-1_Tulimshar/sarah.txt
@@ -0,0 +1,81 @@
+//
+
+001-1.gat,137,78,0	script	Sarah	106,{
+	if (TMW_Quest >= 8) goto L_Done;
+	if (TMW_Quest == 7) goto L_Progress;
+	if (TMW_Quest == 6) goto L_Start;
+
+	mes "[Sarah]";
+	mes "\"Boy am I hungry\"";
+	close;
+
+L_Start:
+
+	set @TEMP, rand(2);
+	if(@TEMP == 0) goto L_Opening0;
+	if(@TEMP == 1) goto L_Opening1;
+
+L_Opening0:
+	mes "[Sarah]";
+	mes "\"[Cherry Cake] is the best!\"";
+	next;
+	goto L_Ask;
+
+L_Opening1:
+	mes "[Sarah]";
+	mes "\"[Cherry Cake]...I love it \"";
+	next;
+	goto L_Ask;
+
+L_Ask:
+	mes "\"Can you bring me a piece of [Cherry Cake]?\"";
+	menu
+		"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 !\"";
+	next;
+	goto L_Set;
+
+L_Set:
+	set TMW_Quest,7;
+	mes "[Sarah]";
+	mes "\"Please bring me it!\"";
+	close;
+
+L_Progress:
+	if (countitem("CherryCake") < 1) goto L_NotEnough;
+	mes "[Sarah]";
+	mes "\"Hummm!\"";
+	next;
+	mes "You brought me my [Cherry Cake]!  Here is the hat, as promised.\"";
+	emotion 9;
+	getinventorylist;
+	if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany;
+	delitem "CherryCake", 1;
+	getitem "serfhat", 1;
+	set TMW_Quest, 8;
+	close;
+
+L_NotEnough:
+	mes "[Sarah]";
+	mes "\"I'm starving, please bring me a [Cherry Cake].\"";
+	close;
+
+L_Done:
+	mes "[Sarah]";
+	mes "\"It was so tasty, I can't eat anything more... Thank you!\"";
+	emotion 9;
+	close;
+
+L_No:
+	close;
+
+L_TooMany:
+	next;
+	mes "[Sarah]";
+	mes "\"You don't have room for my reward. I'll wait until you do.\"";
+	close;
+}
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index ba3bec00..b2f2e98b 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -1,8 +1,15 @@
 //
 
 001-1.gat,135,42,0	script	Vincent	113,{
-	if(Bugleg == 2) goto L_Done;
-	if(Bugleg == 1) goto L_Progress;
+	if (TMW_Quest >= 10) goto L_Done;
+	if (TMW_Quest == 9) goto L_Progress;
+	if (TMW_Quest == 8) goto L_Start;
+
+	mes "[Vincent]";
+	mes "\"I'm making an action figure.  I'm almost done with it.\"";
+	close;
+
+L_Start:
 
 	set @TEMP, rand(4);
 	if(@TEMP == 0) goto L_Opening1;
@@ -44,7 +51,7 @@ L_Ask:
 	close;
 
 L_Sure:
-	set Bugleg, 1;
+	set TMW_Quest, 9;
 	set @TEMP,rand(4);
 	if(@TEMP == 0) goto L_Req1;
 	if(@TEMP == 1) goto L_Req2;
@@ -94,7 +101,7 @@ L_Have:
 	if(countitem("BugLeg") < 10) goto L_Progress;
 	delitem "BugLeg", 10;
 	set zeny, zeny + 1000;
-	set Bugleg, 2;
+	set TMW_Quest, 10;
 
 	mes "[Vincent]";
 	mes "\"Here you go, a little of my appreciation!\"";
diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
index 0066d7bd..8bdb052b 100644
--- a/npc/002-1_Sandstorm/_import.txt
+++ b/npc/002-1_Sandstorm/_import.txt
@@ -1,6 +1,10 @@
 map: 002-1.gat
 npc: npc/002-1_Sandstorm/_mobs.txt
 npc: npc/002-1_Sandstorm/_warps.txt
+npc: npc/002-1_Sandstorm/lieutenant_dausen.txt
 npc: npc/002-1_Sandstorm/merchant.txt
+npc: npc/002-1_Sandstorm/nickos.txt
 npc: npc/002-1_Sandstorm/nomads.txt
 npc: npc/002-1_Sandstorm/rogue.txt
+npc: npc/002-1_Sandstorm/sandstorm_mine_barrier.txt
+npc: npc/002-1_Sandstorm/stewen.txt
diff --git a/npc/002-1_Sandstorm/_warps.txt b/npc/002-1_Sandstorm/_warps.txt
index 5153e83b..fa86b539 100644
--- a/npc/002-1_Sandstorm/_warps.txt
+++ b/npc/002-1_Sandstorm/_warps.txt
@@ -1,7 +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
-002-1.gat,20,94	warp	ToCave	-1,-1,002-3.gat,37,32
diff --git a/npc/002-1_Sandstorm/lieutenant_dausen.txt b/npc/002-1_Sandstorm/lieutenant_dausen.txt
new file mode 100644
index 00000000..65616a72
--- /dev/null
+++ b/npc/002-1_Sandstorm/lieutenant_dausen.txt
@@ -0,0 +1,110 @@
+// Lieutenant in charge of monitoring the monster threat surrounding the city.
+
+002-1.gat,54,27,0	script	Lieutenant Dausen	122,{
+
+	if (TMW_Quest == 33) goto L_LD_Key;
+	if (TMW_Quest == 19) goto L_LD_Miners;
+	if (TMW_Quest == 18) goto L_LD_Orders;
+	if (TMW_Quest == 17) goto L_LD_Nickos_Waits;
+	if (TMW_Quest == 16) goto L_LD_Nickos;
+	if (TMW_Quest == 15) goto L_LD_Waits;
+	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;
+
+	mes "[Lieutenant Dausen]";
+	mes "\"Hello.  I am Lieutenant Dausen.  I monitor the monster threats surrounding the city to ensure the safety of its citizens.\"";
+	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.\"";
+	close;
+
+L_LD_Drinks:
+	if (countitem ("CactusDrink") < 10) goto L_LD_NotEnough_Drink;
+	getinventorylist;
+	if (@inventorylist_count - (countitem("CactusDrink") == 10) > 99) goto L_LD_TooMany;
+	set TMW_Quest, 14;
+	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..\"";
+	next;
+	mes "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..\"";
+	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;
+	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.\"";
+	close;
+
+L_LD_TooMany:
+	mes "[Lieutenant Dausen]";
+	mes "\"Oh, it seems you have too many items for me to give you a reward.  Come back after you drop or sell some items.\"";
+	close;
+
+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..\"";
+	menu
+		"Oh, it wouldn't bother me to help you out, since you helped me out", 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!\"";
+	close;
+
+L_LD_NoHelp:
+	mes "[Lieutenant Dausen]";
+	mes "\"See you later.\"";
+	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.\"";
+	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.\"";
+	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.\"";
+	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.\"";
+	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.\"";
+	close;
+
+L_LD_Miners:
+	mes "[Lieutenant Dausen]";
+	mes "\"I monitor the monster threats surrounding the city to ensure the safe 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.\"";
+	close;
+
+L_LD_Key:
+	set TMW_Quest, 34;
+	mes "[Lieutenant Dausen]";
+	mes "\"Oh, Naem lost his key?  Here, take this spare.  It should help you get into the underground palace.\"";
+	close;
+
+}
diff --git a/npc/002-1_Sandstorm/nickos.txt b/npc/002-1_Sandstorm/nickos.txt
new file mode 100644
index 00000000..fb8594ca
--- /dev/null
+++ b/npc/002-1_Sandstorm/nickos.txt
@@ -0,0 +1,102 @@
+// Sandstorm mine guard
+
+002-1.gat,28,94,0	script	Nickos	123,{
+
+	if (TMW_Quest == 32) goto L_Nickos_UGQ;
+	if (TMW_Quest == 31) goto L_Nickos_AS_Done;
+	if (TMW_Quest == 30) goto L_Nickos_AS_Start;
+	if (TMW_Quest >= 23) && (TMW_Quest < 30) goto L_Nickos_Guards;
+	if (TMW_Quest == 22) goto L_Nickos_Check_Happy;
+	if (TMW_Quest > 19) && (TMW_Quest < 22) goto L_Nickos_Waits;
+	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;
+
+	mes "[Nickos]";
+	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
+	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\"";
+	close;
+
+L_Nickos_Orders_Received:
+	mes "[Nickos]";
+	mes "\"Thanks for letting me know Lieutenant Dausen wants me to stick it out for a while longer.  Even though I would've liked my break, I'm sure these miners could use my watchful eye.\"";
+	close;
+
+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?\"";
+	menu
+		"Yes", L_Nickos_Mine_Open,
+		"No", L_Nickos_Disappoint;
+	close;
+
+L_Nickos_Disappoint:
+	mes "[Nickos]";
+	mes "\"I am 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.\"";
+	close;
+
+L_Nickos_Waits:
+	mes "[Nickos]";
+	mes "\"Please be sure to get word from Nathan and Naem to make sure everthing is okay down there.  Your assistance helps ease my worries.\"";
+	close;
+
+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.\"";
+	close;
+
+L_Nickos_Guards:
+	mes "[Nickos]";
+	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
+	next;
+	mes "\"Talk to Nathan the miner, I'm sure the miners could use some help down there.\"";
+	close;
+
+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.\"";
+	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;
+	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.\"";
+	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.\"";
+	close;
+
+L_Nickos_TooMany:
+	mes "[Nickos]";
+	mes "\"Oh, it seems you have too many items.  Please get rid some some and I'll give you a reward.\"";
+	close;
+
+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.\"";
+	close;
+
+}
diff --git a/npc/002-1_Sandstorm/sandstorm_mine_barrier.txt b/npc/002-1_Sandstorm/sandstorm_mine_barrier.txt
new file mode 100644
index 00000000..62abceac
--- /dev/null
+++ b/npc/002-1_Sandstorm/sandstorm_mine_barrier.txt
@@ -0,0 +1,14 @@
+//Sandstorm mine barrier
+
+002-1.gat,20,94,0	script	#Sandstorm_Mine_Barrier	127,0,0,{
+
+	if (TMW_Quest >= 20) goto L_Sandstorm_Barrier_Open;
+
+	message strcharinfo(0), "Some force seems to block your entrance.";
+	end;
+	
+L_Sandstorm_Barrier_Open:
+	warp "002-3.gat",37,31;
+	end;
+
+}
diff --git a/npc/002-1_Sandstorm/stewen.txt b/npc/002-1_Sandstorm/stewen.txt
new file mode 100644
index 00000000..e28f6057
--- /dev/null
+++ b/npc/002-1_Sandstorm/stewen.txt
@@ -0,0 +1,23 @@
+// East sandstorm guard
+
+002-1.gat,106,76,0	script	Stewen	123,{
+
+	if (TMW_Quest == 16) goto L_TMW_Quest_Received;
+	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.\"";
+	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.\"";
+	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!\"";
+	close;
+
+}
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
index acb84bb4..e7b0d52d 100644
--- a/npc/002-3_Desert_mines/_import.txt
+++ b/npc/002-3_Desert_mines/_import.txt
@@ -1,4 +1,9 @@
 map: 002-3.gat
 npc: npc/002-3_Desert_mines/_mobs.txt
 npc: npc/002-3_Desert_mines/_warps.txt
-npc: npc/002-3_Desert_mines/miners.txt
+npc: npc/002-3_Desert_mines/mine_triggerone.txt
+npc: npc/002-3_Desert_mines/mine_triggerthree.txt
+npc: npc/002-3_Desert_mines/mine_triggertwo.txt
+npc: npc/002-3_Desert_mines/naem.txt
+npc: npc/002-3_Desert_mines/nathan.txt
+npc: npc/002-3_Desert_mines/underground_palace_barrier.txt
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
index d348ac8f..d2509e8a 100644
--- a/npc/002-3_Desert_mines/_mobs.txt
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -1,44 +1,34 @@
 // 002-3 Desert mines mobs
 
-002-3.gat,45,38,30,19	monster	Yellow Slime	1007,5,100000,30000,Mob002-3::On1007
-002-3.gat,91,41,17,20	monster	Snake	1010,3,100000,30000,Mob002-3::On1010
-002-3.gat,71,35,25,17	monster	Red Slime	1008,4,100000,30000,Mob002-3::On1008
-002-3.gat,69,100,8,5	monster	Spider	1012,2,100000,30000,Mob002-3::On1012
-002-3.gat,68,57,26,24	monster	Black Scorpion	1009,5,100000,30000,Mob002-3::On1009
-002-3.gat,45,61,11,28	monster	Red Slime	1008,5,100000,30000,Mob002-3::On1008
-002-3.gat,38,76,15,22	monster	Black Scorpion	1009,4,100000,30000,Mob002-3::On1009
-002-3.gat,58,78,6,17	monster	Red Slime	1008,2,100000,30000,Mob002-3::On1008
-002-3.gat,89,68,11,32	monster	Black Scorpion	1009,4,100000,30000,Mob002-3::On1009
-002-3.gat,83,93,19,17	monster	Red Slime	1008,4,100000,30000,Mob002-3::On1008
-002-3.gat,72,77,21,14	monster	Red Slime	1008,3,100000,30000,Mob002-3::On1008
-002-3.gat,67,91,11,12	monster	Black Scorpion	1009,2,100000,30000,Mob002-3::On1009
-002-3.gat,58,95,6,13	monster	Snake	1010,2,100000,30000,Mob002-3::On1010
-002-3.gat,63,100,2,5	monster	Black Scorpion	1009,1,100000,30000,Mob002-3::On1009
+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,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
+002-3.gat,58,78,6,17	monster	Cave Maggot	1056,4,100000,30000,Mob002-3::On1056
+002-3.gat,89,68,11,32	monster	Angry Scorpion	1057,4,100000,30000,Mob002-3::On1057
+002-3.gat,84,93,19,17	monster	Cave Maggot	1056,4,100000,30000,Mob002-3::On1056
+002-3.gat,72,77,21,14	monster	Ice Goblin	1058,3,100000,30000,Mob002-3::On1058
+002-3.gat,67,91,11,12	monster	Angry Scorpion	1057,4,100000,30000,Mob002-3::On1057
+002-3.gat,58,95,6,13	monster	Cave Maggot	1056,4,100000,30000,Mob002-3::On1056
+002-3.gat,63,100,2,5	monster	Angry Scorpion	1057,3,100000,30000,Mob002-3::On1057
 
 
 002-3.gat,0,0,0	script	Mob002-3	-1,{
-On1007:
-	set @mobID, 1007;
+On1056:
+	set @mobID, 1056;
 	callfunc "MobPoints";
 	break;
 
-On1008:
-	set @mobID, 1008;
+On1057:
+	set @mobID, 1057;
 	callfunc "MobPoints";
 	break;
 
-On1009:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-On1010:
-	set @mobID, 1010;
-	callfunc "MobPoints";
-	break;
-
-On1012:
-	set @mobID, 1012;
+On1058:
+	set @mobID, 1058;
 	callfunc "MobPoints";
 	break;
 
diff --git a/npc/002-3_Desert_mines/mine_triggerone.txt b/npc/002-3_Desert_mines/mine_triggerone.txt
new file mode 100644
index 00000000..604e2aa9
--- /dev/null
+++ b/npc/002-3_Desert_mines/mine_triggerone.txt
@@ -0,0 +1,52 @@
+//Sandstorm mine trigger 1 Trigger 002-3 35,43 (127)
+
+002-3.gat,30,47,0	script	Button	127,0,0,{
+
+	if (TMW_Quest == 36) goto L_Trigger_Wrong_1;
+	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.";
+	close;
+
+L_Trigger_Wrong_1:
+	mes "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,
+		"Do nothing.", L_Nothing_1;
+	close;
+
+L_Right_Wrong_1:
+	set TMW_Quest, 34;
+	mes "You turn the key right.";
+	close;
+
+L_Left_Wrong_1:
+	set TMW_Quest, 34;
+	mes "You turn the key left.";
+	close;
+
+L_Trigger_1:
+	mes "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,
+		"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.";
+	close;
+
+L_Left_1:
+	set TMW_Quest, 34;
+	mes "You turn the key left.";
+	close;
+
+L_Nothing_1:
+	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
new file mode 100644
index 00000000..c5596e8f
--- /dev/null
+++ b/npc/002-3_Desert_mines/mine_triggerthree.txt
@@ -0,0 +1,51 @@
+//Sandstorm mine trigger 3 Trigger 002-3 98,42 (127)
+
+002-3.gat,91,99,0	script	Button	127,0,0,{
+
+	if (TMW_Quest == 36) goto L_Trigger_Wrong_3;
+	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.";
+	close;
+
+L_Trigger_Wrong_3:
+	mes "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,
+		"Do nothing.", L_Nothing_3;
+	close;
+
+L_Right_Wrong_3:
+	set TMW_Quest, 34;
+	mes "You turn the key right.";
+	close;
+
+L_Left_Wrong_3:
+	set TMW_Quest, 34;
+	mes "You turn the key left*.";
+	close;
+
+L_Trigger_3:
+	mes "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,
+		"Do nothing.", L_Nothing_3;
+	close;
+
+L_Right_3:
+	set TMW_Quest, 34;
+	mes "You turn the key right.";
+	close;
+
+L_Left_3:
+	set TMW_Quest, 36;
+	mes "You turn the key left, the sound of clicking is heard throughout the mine.";
+	close;
+
+L_Nothing_3:
+	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
new file mode 100644
index 00000000..ff1ff654
--- /dev/null
+++ b/npc/002-3_Desert_mines/mine_triggertwo.txt
@@ -0,0 +1,53 @@
+//Sandstorm mine trigger
+
+002-3.gat,100,37,0	script	Button	127,0,0,{
+
+	if (TMW_Quest == 36) goto L_Trigger_2;
+	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.";
+	close;
+
+L_Trigger_Wrong_2:
+	mes "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,
+		"Do nothing.", L_Nothing_2;
+	close;
+
+L_Right_Wrong_2:
+	set TMW_Quest, 34;
+	mes "You turn the key right.";
+	close;
+
+L_Left_Wrong_2:
+	set TMW_Quest, 34;
+	mes "You turn the key left";
+	close;
+
+L_Trigger_2:
+	mes "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,
+		"Do nothing.", L_Nothing_2;
+	close;
+
+L_Right_2:
+	set TMW_Quest, 34;
+	mes "You turn the key right.";
+	close;
+
+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.";
+	close;
+
+L_Nothing_2:
+	mes "You leave the button alone.";
+	close;
+
+}
diff --git a/npc/002-3_Desert_mines/miners.txt b/npc/002-3_Desert_mines/miners.txt
deleted file mode 100644
index 8f69c47d..00000000
--- a/npc/002-3_Desert_mines/miners.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-
-002-3.gat,35,35,6	script	Nathan	109,{
-	mes "[Nathan the Miner]";
-
-	if (getskilllv(SKILL_MAGIC))
-		goto L_message;
-
-	mes "\"It's very dangerous in here.";
-        mes "We had a big earthquake here";
-        mes "just recently, too... so be";
-	mes "careful!\"";
-	close;
-
-L_message:
-        mes "\"We found a good way to carry our ores out of here safely:  one of us always runs ahead shouting '" + getspellinvocation("aggravate") + "'.  Somehow this seems to distract the monsters.\"";
-	close;
-}
-
-002-3.gat,85,97,6	script	Naem	109,{
-	mes "[Naem the Miner]";
-	mes "\"We discovered an underground palace.";
-	mes "You can get there using the passage on the left.\"";
-	close;
-}
diff --git a/npc/002-3_Desert_mines/naem.txt b/npc/002-3_Desert_mines/naem.txt
new file mode 100644
index 00000000..74d8465f
--- /dev/null
+++ b/npc/002-3_Desert_mines/naem.txt
@@ -0,0 +1,129 @@
+//
+
+002-3.gat,85,97,6	script	Naem	109,{
+
+	if (Naem_Quest_Done == 1) goto L_Naem_Complete;
+	if (Open_Underground_Palace_Barrier == 1) goto L_Naem_Gloves;
+	if (TMW_Quest == 34) goto L_Naem_Code;
+	if (TMW_Quest == 33) goto L_Naem_Lt;
+	if (TMW_Quest == 32) goto L_Naem_Memory;
+	if (TMW_Quest > 29) && (TMW_Quest < 31)goto L_Naem_Great;
+	if (TMW_Quest == 29) goto L_Naem_Waits_3;
+	if (TMW_Quest == 28) goto L_Naem_Help_3;
+	if (TMW_Quest == 27) goto L_Naem_Waits_2;
+	if (TMW_Quest == 26) goto L_Naem_Help_2;
+	if (TMW_Quest == 25) goto L_Naem_Waits_1;
+	if (TMW_Quest == 24) goto L_Naem_Help_1;
+	if (TMW_Quest == 22) goto L_Naem_Cool;
+	if (TMW_Quest == 21) goto L_Naem_Okay;
+
+	mes "[Naem]";
+	mes "\"Just mining away.  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.\"";
+	close;
+
+L_Naem_Cool:
+	mes "[Naem]";
+	mes "\"Yeah, I'm cool.  Just mining away.\"";
+	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.\"";
+	next;
+	mes "Naem hands you a bag of ore";
+	next;
+	mes "\"After you deliver that one to Nathan, come on back, I've got a couple more ready to go.\"";
+	close;
+
+L_Naem_Waits_1:
+	mes "[Naem]";
+	mes "\"After you deliver that bag of ore to Nathan, come on back, I've got a couple more ready to go.\"";
+	close;
+
+L_Naem_Help_2:
+	set TMW_Quest, 27;
+	mes "[Naem]";
+	mes "Naem Gives you a bag of ore.";
+	next;
+	mes "\"Just one more after this one and we'll be 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.\"";
+	close;
+
+L_Naem_Help_3:
+	set TMW_Quest, 29;
+	mes "[Naem]";
+	mes "Hands a bag of ore to you.";
+	next;
+	mes "\"Last one!\"";
+	close;
+
+L_Naem_Waits_3:
+	mes "[Naem]";
+	mes "\"You got my last sack.  Just give it to Nathan and we'll be 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.\"";
+	close;
+
+L_Naem_Memory:
+	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,
+		"You should be more careful.", L_Naem_Duh;
+	close;
+
+L_Naem_Duh:
+	mes "[Naem]";
+	mes "\"I guess I should...\"";
+	close;
+
+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.\"";
+	close;
+
+L_Naem_Lt:
+	mes "[Naem]";
+	mes "\"I hurt my head pretty bad.  I also lost my key.  If you want to get into the underground palace, you'll have to talk to Lieutenant Dausen about getting the spare.\"";
+	close;
+
+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.\"";
+	close;
+
+L_Naem_Gloves:
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Nathan_TooMany;
+	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.\"";
+	close;
+	
+L_Naem_TooMany:
+	mes "[Naem]";
+	mes "\"You have too many items for me to give you a reward.\"";
+	close;
+
+L_Naem_Complete:
+	mes "[Naem]";
+	mes "\"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
new file mode 100644
index 00000000..a9f9c377
--- /dev/null
+++ b/npc/002-3_Desert_mines/nathan.txt
@@ -0,0 +1,109 @@
+//
+
+002-3.gat,35,35,6	script	Nathan	109,{
+
+	if (getskilllv(SKILL_MAGIC)) goto L_message;
+	if (TMW_Quest >= 32) goto L_Nathan_Complete;
+	if (TMW_Quest == 31) goto L_Nathan_UGQ_Naem;
+	if (TMW_Quest == 30) goto L_Nathan_Help_Cool;
+	if (TMW_Quest == 29) goto L_Nathan_Help_Done;
+	if (TMW_Quest == 28) goto L_Nathan_Waits_3;
+	if (TMW_Quest == 27) goto L_Nathan_Help_3;
+	if (TMW_Quest == 26) goto L_Nathan_Waits_2;
+	if (TMW_Quest == 25) goto L_Nathan_Help_2;
+	if (TMW_Quest == 24) goto L_Nathan_Waits_1;
+	if (TMW_Quest == 23) goto L_Nathan_Help_1;
+	if (TMW_Quest == 21) goto L_Nathan_Cool;
+	if (TMW_Quest == 20) goto L_Nathan_Okay;
+	
+
+	mes "[Nathan the Miner]";
+	mes "\"It's very dangerous in here.  We had a big earthquake here just recently, too... so be careful!\"";
+	close;
+
+L_message:
+        mes "\"We found a good way to carry our ores out of here safely:  one of us always runs ahead shouting '" + getspellinvocation("aggravate") + "'.  Somehow this seems to distract the monsters.\"";
+	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.\"";
+	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.\"";
+	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.\"";
+	close;
+
+L_Nathan_Waits_1:
+	mes "[Nathan]";
+	mes "\"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.\"";
+	close;
+
+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.\"";
+	close;
+
+L_Nathan_Waits_2:
+	mes "[Nathan]";
+	mes "\"Just a couple more and we'll be caught up.\"";
+	close;
+
+L_Nathan_Help_3:
+	set TMW_Quest, 28;
+	mes "[Nathan]";
+	mes "You hand the bag of ore to Nathan";
+	next;
+	mes "\"Just one more bag and you'll be done.\"";
+	close;
+
+L_Nathan_Waits_3:
+	mes "[Nathan]";
+	mes "\"Just get one more bag of ore from Naem and bring it to me and you'll be done.\"";
+	close;
+
+L_Nathan_Help_Done:
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Nathan_TooMany;
+	set TMW_Quest, 30;
+	getitem "MinersHat", 1;
+	mes "[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!\"";
+	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?\"";
+	close;
+
+L_Nathan_TooMany:
+	mes "[Nathan]";
+	mes "\"You have too many items for me to give you a reward.\"";
+	close;
+
+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.\"";
+	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.\"";
+	close;
+
+L_Nathan_Complete:
+	mes "[Nathan]";
+	mes "\"Mining is a dangerous job, but somebody's got to do it.\"";
+	close;
+
+}
diff --git a/npc/002-3_Desert_mines/underground_palace_barrier.txt b/npc/002-3_Desert_mines/underground_palace_barrier.txt
new file mode 100644
index 00000000..34eeaf57
--- /dev/null
+++ b/npc/002-3_Desert_mines/underground_palace_barrier.txt
@@ -0,0 +1,14 @@
+//underground palace barrier
+
+002-3.gat,68,98,0	script	#UGP_Barrier	127,0,0,{
+
+	if (TMW_Quest >= 37) goto L_Underground_Palace_Barrier_Open;
+	message strcharinfo(0), "Some force seems to block your entrance.";
+	end;
+
+
+L_Underground_Palace_Barrier_Open:
+	warp "002-4.gat",34,98;
+	end;
+
+}
diff --git a/npc/002-4_Desert_mines/_mobs.txt b/npc/002-4_Desert_mines/_mobs.txt
index f0a77adf..d86f0272 100644
--- a/npc/002-4_Desert_mines/_mobs.txt
+++ b/npc/002-4_Desert_mines/_mobs.txt
@@ -1,7 +1,22 @@
 // 002-4 Desert mines mobs
 
-002-4.gat,0,0,0,0	monster	Spider	1012,20,100000,30000,Mob002-4::On1012
-002-4.gat,0,0,0,0	monster	Yellow Slime	1007,25,100000,30000,Mob002-4::On1007
+002-4.gat,36,89,11,6	monster	Ice Goblin	1058,3,100000,30000,Mob002-4::On1058
+002-4.gat,33,76,2,11	monster	Cave Maggot	1056,3,100000,30000,Mob002-4::On1056
+002-4.gat,39,67,5,3	monster	Angry Scorpion	1057,3,100000,30000,Mob002-4::On1057
+002-4.gat,39,37,17,4	monster	Archant	1060,3,100000,30000,Mob002-4::On1060
+002-4.gat,61,70,1,7	monster	Ice Goblin	1058,3,100000,30000,Mob002-4::On1058
+002-4.gat,55,96,1,3	monster	Archant	1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,67,99,11,1	monster	Yellow Slime	1007,4,100000,30000,Mob002-4::On1007
+002-4.gat,91,80,1,4	monster	Archant	1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,88,93,1,4	monster	Archant	1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,73,77,1,4	monster	Archant	1060,2,100000,30000,Mob002-4::On1060
+002-4.gat,93,69,1,4	monster	Archant	1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,90,62,7,1	monster	Yellow Slime	1007,1,100000,30000,Mob002-4::On1007
+002-4.gat,73,35,1,4	monster	Archant	1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,84,33,1,4	monster	Archant	1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,84,45,1,4	monster	Archant	1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,98,37,1,4	monster	Archant	1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,92,38,7,1	monster	Yellow Slime	1007,2,100000,30000,Mob002-4::On1007
 
 
 002-4.gat,0,0,0	script	Mob002-4	-1,{
@@ -10,8 +25,23 @@ On1007:
 	callfunc "MobPoints";
 	break;
 
-On1012:
-	set @mobID, 1012;
+On1056:
+	set @mobID, 1056;
+	callfunc "MobPoints";
+	break;
+
+On1057:
+	set @mobID, 1057;
+	callfunc "MobPoints";
+	break;
+
+On1058:
+	set @mobID, 1058;
+	callfunc "MobPoints";
+	break;
+
+On1060:
+	set @mobID, 1060;
 	callfunc "MobPoints";
 	break;
 
diff --git a/npc/002-4_Desert_mines/chest.txt b/npc/002-4_Desert_mines/chest.txt
index e1825d0f..158b79fc 100644
--- a/npc/002-4_Desert_mines/chest.txt
+++ b/npc/002-4_Desert_mines/chest.txt
@@ -1,7 +1,8 @@
 //
 
 002-4.gat,93,37,0	script	Treasure	111,{
-	if( ChestQuest & 1) goto L_Finished;
+
+	if (TMW_Quest >= 38) goto L_Finished;
 
 	mes "[Chest]";
 	mes "Would you try to open it?";
@@ -16,10 +17,10 @@ L_Yes:
 	getinventorylist;
 	if (@inventorylist_count == 100 && countitem("TreasureKey") > 3) goto L_TooMany;
 	mes "[Chest]";
-	mes "You opened it and found a short sword!";
+	mes "You opened it and found a short bow!";
 	delitem "TreasureKey", 3;
-	getitem "ShortSword", 1;
-	set ChestQuest, ChestQuest | 1;
+	getitem "ShortBow", 1;
+	set TMW_Quest, 38;
 	close;
 
 L_Not_Enough:
diff --git a/npc/002-4_Desert_mines/miners.txt b/npc/002-4_Desert_mines/miners.txt
index 90cf4068..9fbaea89 100644
--- a/npc/002-4_Desert_mines/miners.txt
+++ b/npc/002-4_Desert_mines/miners.txt
@@ -1,7 +1,60 @@
 //
 
 002-4.gat,32,94,6	script	Sema	109,{
+
+	if (TMW_Quest >= 40) goto L_Sema_Done;
+	if (TMW_Quest == 39) goto L_Sema_Happy;
+	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.\"";
+	close;
+
+L_Sema_GCM:
+	mes "[Sema the Miner]";
+	mes "\"I saw a giant cave maggot eat one of the other miners and it might eat me!  Can you kill it?\"";
+	menu
+		"Yes.", L_Sema_Yes,
+		"No.", L_Sema_No;
+	close;
+
+L_Sema_No:
+	mes "[Sema the Miner]";
+	mes "\"Ahh!  I am very scared now!\"";
+	close;
+
+L_Sema_Yes:
+	set TMW_Quest, 39;
+	monster "002-4.gat", 70, 90, "", 1059, 1;
 	mes "[Sema the Miner]";
-	mes "\"This place is odd.\"";
+	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:
+	if (countitem ("Iten") < 1) goto L_Sema_Not_Happy;
+	getinventorylist;
+	if (@inventorylist_count - (countitem ("Iten") == 1) > 99) goto L_Sema_TooMany;
+	delitem "Iten", 1;
+	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\"";
+	close;
+
+L_Sema_TooMany:
+	mes "[Sema the Miner]";
+	mes "\"You have too many items for me to give you a reward.  Please drop or sell something so I can give it to you.\"";
+	close;
+
+L_Sema_Not_Happy:
+	set TMW_Quest, 38;
+	itemheal -Hp, 0;
+	mes "A stone falls on your head.";
+	close;
+
+L_Sema_Done:
+	mes "[Sema the Miner]";
+	mes "\"Thank you for all your help.\"";
+	close;
+
 }
diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt
index ff08fce7..07c60602 100644
--- a/npc/009-1_Hurnscald/_import.txt
+++ b/npc/009-1_Hurnscald/_import.txt
@@ -1,6 +1,7 @@
 map: 009-1.gat
 npc: npc/009-1_Hurnscald/_mobs.txt
 npc: npc/009-1_Hurnscald/_warps.txt
+npc: npc/009-1_Hurnscald/diryn.txt
 npc: npc/009-1_Hurnscald/jack.txt
 npc: npc/009-1_Hurnscald/mapflags.txt
 npc: npc/009-1_Hurnscald/milly.txt
diff --git a/npc/009-1_Hurnscald/diryn.txt b/npc/009-1_Hurnscald/diryn.txt
new file mode 100644
index 00000000..70d646d4
--- /dev/null
+++ b/npc/009-1_Hurnscald/diryn.txt
@@ -0,0 +1,66 @@
+//This is a teleportation (warp) NPC.  Its purpose is to offer expensive, fast trips throughout the world.
+
+009-1.gat,51,38,0	script	Diryn the Traveler	103,{
+	mes "[Diryn]";
+    	mes "\"Greetings.  I am Diryn the Traveler, Assistant Councilor of Tulimshar and teleportation extraordinaire.  Tulimshar is expanding our influence throughout the world, so I was sent here to aid all who are willing and able to take on the threats to our interests.\"";
+	next;
+	mes "\"The monsters of the world have grown out of control, harming people, trade and travel.  Needless to say, Tulimshar is not happy with this problem.  Our solution: Rally those powerful enough to combat the monster threat and send them to hot spots to challenge the monster threat head on.  However, teleportation to these areas is not only extremely dangerous, but also highly expensive.   Do you think you got what it takes?\"";
+	menu
+		"I sure do!", L_Diryn_Yes,
+		"No thank you", L_Diryn_No;
+	close;
+
+L_Diryn_Yes:
+	mes "[Diryn]";
+	mes "\"Excellent.  I can send you to many places, but again, the fees are large. Where shall I send you?\"";
+	menu
+		"Druid Tree (5000 GP)", L_Diryn_Druid_Tree,
+		"Graveyard (10000 GP)", L_Diryn_Graveyard,
+		"Magic House (5000 GP)", L_Diryn_Magic_House,
+		"Tulimshar Town Square (2000 GP)", L_Diryn_Tulimshar,
+		"Not Interested", L_Diryn_No;
+	close;
+
+L_Diryn_Druid_Tree:
+	if (zeny < 10000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-10000;
+	warp "005-1.gat",73,36;
+	close;
+
+L_Diryn_Graveyard:
+	if (zeny < 15000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-15000;
+    	warp "027-1.gat",70,85;
+    	close;
+
+L_Diryn_Magic_House:
+	if (zeny < 10000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-10000;
+	warp "013-1.gat",45,92;
+	close;
+
+L_Diryn_Tulimshar:
+	if (zeny < 5000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-5000;
+	warp "001-1.gat",44,70;
+	close;
+
+L_Diryn_No:
+	mes "[Diryn]";
+	mes "\"Perhaps some day you will have the courage to help us.  Enjoy your stay here in Hurnscald.\"";
+	close;
+
+L_NoMoney:
+	mes "[Diryn]";
+	mes "\"Sorry, you don't have enough.  Maybe next time.\"";
+	close;
+
+}
diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt
index a3ca5b5f..07f05247 100644
--- a/npc/functions/clear_vars.txt
+++ b/npc/functions/clear_vars.txt
@@ -79,4 +79,9 @@ L_Fix_Full:
 	set zeny, zeny + #BankAccount;
 	set #BankAccount, 0;
 	return;
+//Tulimshar and Mine Variables
+	set Scorp, 0;
+	set Bugleg, 0; 
+	set ChestQuest, 0;
+	
 }