Merge remote-tracking branch 'testing/master'v2011.09.08

9 files changed, 273 insertions, 280 deletions

diff --git a/world/map/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt
index c6568edf..2f37b959 100644
--- a/world/map/npc/002-3/_import.txt
+++ b/world/map/npc/002-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 002-3: Desert mines
+// Map 002-3: Desert Mines
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 002-3.gat
 npc: npc/002-3/_mobs.txt
diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt
index 55a27959..276e0462 100644
--- a/world/map/npc/002-3/_mobs.txt
+++ b/world/map/npc/002-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mines mobs
+// Desert Mines mobs
 
 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
diff --git a/world/map/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt
index 4c42c73f..913bbd9d 100644
--- a/world/map/npc/002-3/_warps.txt
+++ b/world/map/npc/002-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mines warps
+// Desert Mines warps
 
 002-3.gat,37,29|warp|Exit|-1,-1,002-1.gat,25,95
diff --git a/world/map/npc/002-3/mine_triggerone.txt b/world/map/npc/002-3/mine_triggerone.txt
index d182609b..b757c453 100644
--- a/world/map/npc/002-3/mine_triggerone.txt
+++ b/world/map/npc/002-3/mine_triggerone.txt
@@ -1,52 +1,51 @@
 //Sandstorm mine trigger 1 Trigger 002-3 35,43 (127)
 
-002-3.gat,30,47,0	script	Button	127,0,0,{
+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;
+    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 "There is a large button on the ground.  A key hole appears on the button.";
-	close;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    close;
 
 L_Trigger_Wrong_1:
-	mes "There is a large button on the ground.  A key hole appears on the button.";
-	menu
-		"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;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    menu
+        "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;
 
 L_Right_Wrong_1:
-	set TMW_Quest, 34;
-	mes "You turn the key right.";
-	close;
+    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;
+    set TMW_Quest, 34;
+    mes "You turn the key left.";
+    close;
 
 L_Trigger_1:
-	mes "There is a large button on the ground.  A key hole appears on the button.";
-	menu
-		"Put the key in, turn right.", L_Right_1,
-		"Put the key in, turn left.", L_Left_1,
-		"Do nothing.", L_Nothing_1;
-	close;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    menu
+        "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.  A clicking sound echoes throughout the mine.";
-	close;
+    set TMW_Quest, 35;
+    mes "You turn the key right.  A clicking sound echoes throughout the mine.";
+    close;
 
 L_Left_1:
-	set TMW_Quest, 34;
-	mes "You turn the key left.";
-	close;
+    set TMW_Quest, 34;
+    mes "You turn the key left.";
+    close;
 
 L_Nothing_1:
-	mes "You leave the button alone.";
-	close;
-
+    mes "You leave the button alone.";
+    close;
 }
diff --git a/world/map/npc/002-3/mine_triggerthree.txt b/world/map/npc/002-3/mine_triggerthree.txt
index 828eb594..c1b7b3c6 100644
--- a/world/map/npc/002-3/mine_triggerthree.txt
+++ b/world/map/npc/002-3/mine_triggerthree.txt
@@ -1,51 +1,51 @@
 //Sandstorm mine trigger 3 Trigger 002-3 98,42 (127)
 
-002-3.gat,91,99,0	script	Button	127,0,0,{
+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;
+    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 "There is a large button on the ground.  A key hole appears on the button.";
-	close;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    close;
 
 L_Trigger_Wrong_3:
-	mes "There is a large button on the ground.  A key hole appears on the button.";
-	menu
-		"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;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    menu
+        "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;
 
 L_Right_Wrong_3:
-	set TMW_Quest, 34;
-	mes "You turn the key right.";
-	close;
+    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;
+    set TMW_Quest, 34;
+    mes "You turn the key left.";
+    close;
 
 L_Trigger_3:
-	mes "There is a large button on the ground.  A key hole appears on the button.";
-	menu
-		"Put the key in, turn right.", L_Right_3,
-		"Put the key in, turn left.", L_Left_3,
-		"Do nothing.", L_Nothing_3;
-	close;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    menu
+        "Put the key in, turn right.", L_Right_3,
+        "Put the 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;
+    set TMW_Quest, 34;
+    mes "You turn the key right.";
+    close;
 
 L_Left_3:
-	set TMW_Quest, 36;
-	mes "You turn the key left. A clicking sound echoes throughout the mine.";
-	close;
+    set TMW_Quest, 36;
+    mes "You turn the key left. A clicking sound echoes throughout the mine.";
+    close;
 
 L_Nothing_3:
-	mes "You leave the button alone.";
-	close;
+    mes "You leave the button alone.";
+    close;
 }
diff --git a/world/map/npc/002-3/mine_triggertwo.txt b/world/map/npc/002-3/mine_triggertwo.txt
index 5d005620..478351b1 100644
--- a/world/map/npc/002-3/mine_triggertwo.txt
+++ b/world/map/npc/002-3/mine_triggertwo.txt
@@ -1,53 +1,52 @@
 //Sandstorm mine trigger
 
-002-3.gat,100,37,0	script	Button	127,0,0,{
+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;
+    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 "There is a large button on the ground.  A key hole appears on the button.";
-	close;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    close;
 
 L_Trigger_Wrong_2:
-	mes "There is a large button on the ground.  A key hole appears on the button.";
-	menu
-		"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;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    menu
+        "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;
 
 L_Right_Wrong_2:
-	set TMW_Quest, 34;
-	mes "You turn the key right.";
-	close;
+    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;
+    set TMW_Quest, 34;
+    mes "You turn the key left.";
+    close;
 
 L_Trigger_2:
-	mes "There is a large button on the ground.  A key hole appears on the button.";
-	menu
-		"Put the key in, turn right.", L_Right_2,
-		"Put the key in, turn left.", L_Left_2,
-		"Do nothing.", L_Nothing_2;
-	close;
+    mes "There is a large button on the ground.  A key hole appears on the button.";
+    menu
+        "Put the key in, turn right.", L_Right_2,
+        "Put the 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;
+    set TMW_Quest, 34;
+    mes "You turn the key right.";
+    close;
 
 L_Left_2:
-	set TMW_Quest, 37;
-	set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND;
-	mes "You turn the key left. A clicking sound echoes throughout the mine, followed by a loud thump.";
-	close;
+    set TMW_Quest, 37;
+    set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND;
+    mes "You turn the key left. A clicking sound echoes throughout the mine, followed by a loud thump.";
+    close;
 
 L_Nothing_2:
-	mes "You leave the button alone.";
-	close;
-
+    mes "You leave the button alone.";
+    close;
 }
diff --git a/world/map/npc/002-3/naem.txt b/world/map/npc/002-3/naem.txt
index 5f0f9bd6..d5ddbd2b 100644
--- a/world/map/npc/002-3/naem.txt
+++ b/world/map/npc/002-3/naem.txt
@@ -1,132 +1,131 @@
 //
 
-002-3.gat,85,97,6	script	Naem	109,{
-
-	if (FLAGS & FLAG_GOT_NAEM_GLOVES) goto L_Naem_Complete;
-	if (FLAGS & FLAG_OPENED_UNDERGROUND) 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 "\"I'm just mining away here.  Lots of work to do.\"";
-	close;
+002-3.gat,85,97,6|script|Naem|109,{
+
+    if (FLAGS & FLAG_GOT_NAEM_GLOVES) goto L_Naem_Complete;
+    if (FLAGS & FLAG_OPENED_UNDERGROUND) 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 "\"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, you can tell him I'm okay.\"";
-	close;
+    set TMW_Quest, 22;
+    mes "[Naem]";
+    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 here.\"";
-	close;
+    mes "[Naem]";
+    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!\"";
-	next;
-	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;
+    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 "[Naem]";
+    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;
+    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 gives you a bag of ore.";
-	next;
-	mes "[Naem]";
-	mes "\"Just one more after this one and we'll be all caught up!\"";
-	close;
+    set TMW_Quest, 27;
+    mes "Naem gives you a bag of ore.";
+    next;
+    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 all caught up!\"";
-	close;
+    mes "[Naem]";
+    mes "\"Just one more bag of ore after the one you got and we'll be all 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;
+    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 already.  Just give it to Nathan and we'll have caught up.\"";
-	close;
+    mes "[Naem]";
+    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 every day for meager pay, a miner's life for me...\"";
-	close;
+    mes "[Naem]";
+    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 have a key so I can go to the underground palace?", L_Naem_Palace_No,
-		"You should be more careful.", L_Naem_Duh;
-	close;
+    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 have 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;
+    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 worry though, talk to Lieutenant Dausen about getting the spare key.\"";
-	close;
+    set TMW_Quest, 33;
+    mes "[Naem]";
+    mes "\"Oh no!  I lost the key!  Don't worry 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;
+    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!  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;
+    mes "[Naem]";
+    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:
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_Nathan_TooMany;
-	set FLAGS, FLAGS | FLAG_GOT_NAEM_GLOVES;
-	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;
+    getinventorylist;
+    if (@inventorylist_count == 100) goto L_Nathan_TooMany;
+    set FLAGS, FLAGS | FLAG_GOT_NAEM_GLOVES;
+    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;
+    mes "[Naem]";
+    mes "\"You have too many items for me to give you a reward.\"";
+    close;
 
 L_Naem_Complete:
-	mes "[Naem]";
-	mes "\"Yo-ho-ho, a miner's life for me!\"";
-	close;
-
+    mes "[Naem]";
+    mes "\"Yo-ho-ho, a miner's life for me!\"";
+    close;
 }
diff --git a/world/map/npc/002-3/nathan.txt b/world/map/npc/002-3/nathan.txt
index 6eb56875..7a6b5fd5 100644
--- a/world/map/npc/002-3/nathan.txt
+++ b/world/map/npc/002-3/nathan.txt
@@ -1,104 +1,102 @@
 //
 
-002-3.gat,35,35,6	script	Nathan	109,{
-
-	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;
+002-3.gat,35,35,6|script|Nathan|109,{
+
+    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_Nathan_Okay:
-	set TMW_Quest, 21;
-	mes "[Nathan]";
-	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;
+    set TMW_Quest, 21;
+    mes "[Nathan]";
+    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 too.  He's at the southeast parts of the mine.\"";
-	close;
+    mes "[Nathan]";
+    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 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;
+    set TMW_Quest, 24;
+    mes "[Nathan]";
+    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:
-	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;
+    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 "You give the bag of ore to Nathan";
-	next;
-	mes "[Nathan]";
-	mes "\"Ah, thank you.  Just a couple more and we'll have caught up!\"";
-	close;
+    set TMW_Quest, 26;
+    mes "You give the bag of ore to Nathan";
+    next;
+    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 all caught up!\"";
-	close;
+    mes "[Nathan]";
+    mes "\"Just a couple more and we'll be all caught up!\"";
+    close;
 
 L_Nathan_Help_3:
-	set TMW_Quest, 28;
-	mes "You hand the bag of ore to Nathan.";
-	next;
-	mes "[Nathan]";
-	mes "\"Just one more bag and you'll be done!\"";
-	close;
+    set TMW_Quest, 28;
+    mes "You hand the bag of ore to Nathan.";
+    next;
+    mes "[Nathan]";
+    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;
+    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 "\"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;
+    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 "\"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:
-	mes "[Nathan]";
-	mes "\"You have too many items for me to give you a reward.\"";
-	close;
+    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 for the unexperienced.  Mining is a dangerous job, but somebody's got to do it!\"";
-	close;
+    mes "[Nathan]";
+    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 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;
+    mes "[Nathan]";
+    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!\"";
-	close;
-
+    mes "[Nathan]";
+    mes "\"Mining is a dangerous job, but somebody's got to do it!\"";
+    close;
 }
diff --git a/world/map/npc/002-3/underground_palace_barrier.txt b/world/map/npc/002-3/underground_palace_barrier.txt
index 34eeaf57..4e6e369f 100644
--- a/world/map/npc/002-3/underground_palace_barrier.txt
+++ b/world/map/npc/002-3/underground_palace_barrier.txt
@@ -1,14 +1,12 @@
 //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;
+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;
-
+    warp "002-4.gat",34,98;
+    end;
 }