Second batch of tab conversion. Maps 001-2 through 002-4 complete.

23 files changed, 1032 insertions, 1105 deletions

diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
index b4cb7bb0..9dcbf5c5 100644
--- a/world/map/npc/001-2/casino.txt
+++ b/world/map/npc/001-2/casino.txt
@@ -1,181 +1,177 @@
 //
 
-001-2.gat,134,23,0	script	Valdo	117,{
-	mes "[Valdo the Worker]";
-	mes "\"Please let me work, I'm really in a hurry!\"";
-	close;
+001-2.gat,134,23,0|script|Valdo|117,{
+    mes "[Valdo the Worker]";
+    mes "\"Please let me work, I'm really in a hurry!\"";
+    close;
 }
 
-001-2.gat,37,65,0	script	Slot1	127,{
-	callfunc "SlotMachine";
-	close;
+001-2.gat,37,65,0|script|Slot1|127,{
+    callfunc "SlotMachine";
+    close;
 }
 
-001-2.gat,39,65,0	script	Slot2	127,{
-	callfunc "SlotMachine";
-	close;
+001-2.gat,39,65,0|script|Slot2|127,{
+    callfunc "SlotMachine";
+    close;
 }
 
-001-2.gat,41,65,0	script	Slot3	127,{
-	callfunc "SlotMachine";
-	close;
+001-2.gat,41,65,0|script|Slot3|127,{
+    callfunc "SlotMachine";
+    close;
 }
 
-001-2.gat,32,67,0	script	MoneyChanger	124,{
-	mes "[" + @npcname$ + "]";
-	mes "\"I used to exchange Casino Coins for cash, but the Wizard's Council shut me down.  Now the casino only runs off Casino Coins currently in circulation.\"";
-	next;
-	mes "\"I heard that many a gambler wandered onto the Beach to the South West and through to the Snake Desert to the South East.  If you want to find coins already in circulation, you might find some on the monsters there.\"";
-	close;
+001-2.gat,32,67,0|script|MoneyChanger|124,{
+    mes "[" + @npcname$ + "]";
+    mes "\"I used to exchange Casino Coins for cash, but the Wizard's Council shut me down.  Now the casino only runs off Casino Coins currently in circulation.\"";
+    next;
+    mes "\"I heard that many a gambler wandered onto the Beach to the South West and through to the Snake Desert to the South East.  If you want to find coins already in circulation, you might find some on the monsters there.\"";
+    close;
 }
 
-001-2.gat,28,63,0	script	BlackJack	107,{
-	mes "[Croupier]";
-	mes "\"Would you like to play Black Jack?";
-	mes "You will need 15 casino coins.\"";
-	next;
-	
-	menu
-		"Yes", L_Begin,
-		"No", -;
-	mes "\"As you wish.\"";
-	close;
+001-2.gat,28,63,0|script|BlackJack|107,{
+    mes "[Croupier]";
+    mes "\"Would you like to play Black Jack?";
+    mes "You will need 15 casino coins.\"";
+    next;
+    menu
+        "Yes", L_Begin,
+        "No", -;
+    mes "\"As you wish.\"";
+    close;
 
 L_Begin:
-	if(countitem("CasinoCoins") < 15) goto L_NoCoin;
-	delitem "CasinoCoins", 15;
-	set @croupier, rand(0, 4);
-	set @croupier, @croupier + 17;
-	set @player, rand(4, 21);
-	mes "\"You got " + @player + " with your cards.";
-	if(@player == 21) goto L_End;
-	mes "Do you want another card?\"";
-	next;
-
-	menu
-		"Yes", L_Another,
-		"No", L_End;
-	
+    if(countitem("CasinoCoins") < 15) goto L_NoCoin;
+    delitem "CasinoCoins", 15;
+    set @croupier, rand(0, 4);
+    set @croupier, @croupier + 17;
+    set @player, rand(4, 21);
+    mes "\"You got " + @player + " with your cards.";
+    if(@player == 21) goto L_End;
+    mes "Do you want another card?\"";
+    next;
+    menu
+        "Yes", L_Another,
+        "No", L_End;
+
 L_Another:
-	set @tempace, rand(2, 11);
-	if (@tempace == 11) goto L_Ace;
-	set @player, @player + @tempace;
-	if (@player > 21) goto L_Lost;
-	if (@player == 21) goto L_End;
-	mes "\"You got " + @player + " with your cards.";
-	mes "Do you want another card?\"";
-	next;
-
-	menu
-		"Yes", L_Another,
-		"No", L_End;
+    set @tempace, rand(2, 11);
+    if (@tempace == 11) goto L_Ace;
+    set @player, @player + @tempace;
+    if (@player > 21) goto L_Lost;
+    if (@player == 21) goto L_End;
+    mes "\"You got " + @player + " with your cards.";
+    mes "Do you want another card?\"";
+    next;
+    menu
+        "Yes", L_Another,
+        "No", L_End;
+
 L_End:
-	if (@player <= @croupier) goto L_Lost;
-	mes "\"Congratulations, you won!";
-	mes "I had " + @croupier + ".";
-	mes "You get 45 casino coins.\"";
-	getitem "CasinoCoins", 45;
-	close;
+    if (@player <= @croupier) goto L_Lost;
+    mes "\"Congratulations, you won!";
+    mes "I had " + @croupier + ".";
+    mes "You get 45 casino coins.\"";
+    getitem "CasinoCoins", 45;
+    close;
 
 L_NoCoin:
-	mes "\"You need at least 15 coins.\"";
-	close;
+    mes "\"You need at least 15 coins.\"";
+    close;
 
 L_Lost:
-	mes "\"I'm sorry but you lost.";
-	mes "You got " + @player + " with your cards.";	
-	mes "I had " + @croupier + ".\"";
-	close;
+    mes "\"I'm sorry but you lost.";
+    mes "You got " + @player + " with your cards.";
+    mes "I had " + @croupier + ".\"";
+    close;
 
 L_Ace:
-	set @player, @player + 11;
-	if (@player > 21) set @player, @player - 10;
-	if (@player > 21) goto L_Lost;	
-	if (@player == 21) goto L_End;
-	mes "You got " + @player + " with your cards.";	
-	mes "Do you want another card?";
-	next;
-
-	menu
-		"Yes", L_Another,
-		"No", L_End;
-	close;
+    set @player, @player + 11;
+    if (@player > 21) set @player, @player - 10;
+    if (@player > 21) goto L_Lost;
+    if (@player == 21) goto L_End;
+    mes "You got " + @player + " with your cards.";
+    mes "Do you want another card?";
+    next;
+    menu
+        "Yes", L_Another,
+        "No", L_End;
+    close;
 }
 
-001-2.gat,22,69,0	script	Roulette	107,{
-	mes "\"Good evening monsieur...";
-	mes "How much would you like to bet?\"";
-	next;
-	
-	menu
-		"1 coin", L_b1,
-		"5 coins", L_b5,
-		"10 coins", L_b10,
-		"50 coins", L_b50,
-		"100 coins", L_b100,
-		"Maybe I'll play later", -;
-	mes "Come again.";
-	close;
+001-2.gat,22,69,0|script|Roulette|107,{
+    mes "\"Good evening monsieur...";
+    mes "How much would you like to bet?\"";
+    next;
+    menu
+        "1 coin", L_b1,
+        "5 coins", L_b5,
+        "10 coins", L_b10,
+        "50 coins", L_b50,
+        "100 coins", L_b100,
+        "Maybe I'll play later", -;
+    mes "Come again.";
+    close;
 
 L_b1:
-	set @bet, 1;
-	goto L_Check;
+    set @bet, 1;
+    goto L_Check;
 
 L_b5:
-	set @bet, 5;
-	goto L_Check;
+    set @bet, 5;
+    goto L_Check;
 
 L_b10:
-	set @bet, 10;
-	goto L_Check;
+    set @bet, 10;
+    goto L_Check;
 
 L_b50:
-	set @bet, 50;
-	goto L_Check;
+    set @bet, 50;
+    goto L_Check;
 
 L_b100:
-	set @bet, 100;
-	goto L_Check;
-	
+    set @bet, 100;
+    goto L_Check;
+
 L_Check:
-	if(countitem("CasinoCoins") < @bet) goto L_NoCoin;
-	delitem "CasinoCoins", @bet;
-	menu
-		"Choose a color", -,
-		"Choose a number", L_Number;
-	menu
-		"Black", -,
-		"Red", -;
+    if(countitem("CasinoCoins") < @bet) goto L_NoCoin;
+    delitem "CasinoCoins", @bet;
+    menu
+        "Choose a color", -,
+        "Choose a number", L_Number;
+    menu
+        "Black", -,
+        "Red", -;
     set @color,rand(2);
-	if(@color == 1) goto L_Lost;
-	mes "You won!";
-	getitem "CasinoCoins", @bet * 2;
-	close;
+    if(@color == 1) goto L_Lost;
+    mes "You won!";
+    getitem "CasinoCoins", @bet * 2;
+    close;
 
 L_Number:
-	menu
-		"0", -, "00", -, "1", -, "2", -, "3", -, "4", -, "5", -, "6", -, "7", -, "8", -,
-		"9", -, "10", -, "11", -, "12", -, "13", -, "14", -, "15", -, "16", -, "17", -, "18", -,
-		"19", -, "20", -, "21", -, "22", -, "23", -, "24", -, "25", -, "26", -, "27", -, "28", -,
-		"29", -, "30", -, "31", -, "32", -, "33", -, "34", -, "35", -, "36", -;
-
-	if (@menu == 1) set @number, 0;
-	if (@menu == 2) set @number, 37;
-	if (@menu >= 3) set @number, @menu - 2;
-	
-	set @roulette, rand(38);
-	if (@roulette == 37) mes "The ball stopped on 00";
-	if (@roulette < 37) mes "The ball stopped on " + @roulette;
-	if (@number != @roulette) goto L_Lost;
-	mes "\"You won!\"";
-	getitem "CasinoCoins", @bet * 10;
-	close;
+    menu
+        "0", -, "00", -, "1", -, "2", -, "3", -, "4", -, "5", -, "6", -, "7", -, "8", -,
+        "9", -, "10", -, "11", -, "12", -, "13", -, "14", -, "15", -, "16", -, "17", -, "18", -,
+        "19", -, "20", -, "21", -, "22", -, "23", -, "24", -, "25", -, "26", -, "27", -, "28", -,
+        "29", -, "30", -, "31", -, "32", -, "33", -, "34", -, "35", -, "36", -;
+
+    if (@menu == 1) set @number, 0;
+    if (@menu == 2) set @number, 37;
+    if (@menu >= 3) set @number, @menu - 2;
+
+    set @roulette, rand(38);
+    if (@roulette == 37) mes "The ball stopped on 00";
+    if (@roulette < 37) mes "The ball stopped on " + @roulette;
+    if (@number != @roulette) goto L_Lost;
+    mes "\"You won!\"";
+    getitem "CasinoCoins", @bet * 10;
+    close;
 
 L_NoCoin:
-	mes "\"You don't have enough coins.\"";
-	close;
+    mes "\"You don't have enough coins.\"";
+    close;
 
 L_Lost:
-	mes "\"I'm sorry, you lost.\"";
-	close;
+    mes "\"I'm sorry, you lost.\"";
+    close;
 }
diff --git a/world/map/npc/001-2/dedication.txt b/world/map/npc/001-2/dedication.txt
index d65f47d1..1a668da7 100644
--- a/world/map/npc/001-2/dedication.txt
+++ b/world/map/npc/001-2/dedication.txt
@@ -1,9 +1,9 @@
 // Dedication to Irene Christina
 
-001-2.gat,76,68,0	script	#IreneDedication	127,{
-	mes "~ Irene Christina ~";
-	mes "The song in this house is dedicated to Irene.";
-        next;
-	mes "She had seen only twenty hours of this world when she died in her father's arms.";
-	close;
-};
+001-2.gat,76,68,0|script|#IreneDedication|127,{
+    mes "~ Irene Christina ~";
+    mes "The song in this house is dedicated to Irene.";
+    next;
+    mes "She had seen only twenty hours of this world when she died in her father's arms.";
+    close;
+}
diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt
index 4f75574e..37bd3307 100644
--- a/world/map/npc/001-2/omar.txt
+++ b/world/map/npc/001-2/omar.txt
@@ -1,348 +1,300 @@
 //
-function	script	KadiyaSubquestConsts	{
-        set @Q_kadiya_status, (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT;
-
-        set @Q_STATUS_NONE, 0;
-        set @Q_STATUS_KNOWS_MOPOX, 1;
-        set @Q_STATUS_MADE_MOPOX, 2;
-        set @Q_STATUS_DIDNT_DRINK, 3;
-        set @Q_STATUS_WANTS_CHOCOCAKE, 4;
-        set @Q_STATUS_WANTS_ORANGECUPCAKE, 5;
-        set @Q_STATUS_COMPLETED, 6;
-        set @Q_STATUS_COMPLETED_ELANORE, 7;
-        set @Q_STATUS_COMPLETED_NOELANORE, 8;
-        set @Q_STATUS_COMPLETED_POST_ELANORE, 9;
-
-        if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) < 4)
-        	set @Q_kadiya_status, @Q_STATUS_NONE;
-
-        if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) > 4)
-        	set @Q_kadiya_status, @Q_STATUS_COMPLETED_POST_ELANORE;
-
-	return;
-}
+function|script|KadiyaSubquestConsts|{
+    set @Q_kadiya_status, (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT;
+
+    set @Q_STATUS_NONE, 0;
+    set @Q_STATUS_KNOWS_MOPOX, 1;
+    set @Q_STATUS_MADE_MOPOX, 2;
+    set @Q_STATUS_DIDNT_DRINK, 3;
+    set @Q_STATUS_WANTS_CHOCOCAKE, 4;
+    set @Q_STATUS_WANTS_ORANGECUPCAKE, 5;
+    set @Q_STATUS_COMPLETED, 6;
+    set @Q_STATUS_COMPLETED_ELANORE, 7;
+    set @Q_STATUS_COMPLETED_NOELANORE, 8;
+    set @Q_STATUS_COMPLETED_POST_ELANORE, 9;
 
+    if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) < 4) set @Q_kadiya_status, @Q_STATUS_NONE;
 
-001-2.gat,70,60,0	script	Omar	162,{
-        callfunc "ElanoreFix";
-	callfunc "KadiyaSubquestConsts";
+    if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) > 4) set @Q_kadiya_status, @Q_STATUS_COMPLETED_POST_ELANORE;
 
-        set @Q_status, @Q_kadiya_status;
+    return;
+}
 
-        if (@Q_status >= @Q_STATUS_COMPLETED)
-		goto L_cured;
+001-2.gat,70,60,0|script|Omar|162,{
+    callfunc "ElanoreFix";
+    callfunc "KadiyaSubquestConsts";
 
-        if (@Q_status == @Q_STATUS_DIDNT_DRINK)
-		goto L_didnt_drink;
+    set @Q_status, @Q_kadiya_status;
 
-        if (@Q_status > @Q_STATUS_DIDNT_DRINK)
-		goto L_make_food;
+    if (@Q_status >= @Q_STATUS_COMPLETED) goto L_cured;
 
-	mes "[Omar]";
-	mes "\"Welcome to my humble abode.\"";
-        next;
+    if (@Q_status == @Q_STATUS_DIDNT_DRINK) goto L_didnt_drink;
 
-        menu
-		"Well met!  May I ask who you are?", L_omar,
-		"What's wrong with your daughter?", L_kadiya_sick,
-                "Thank you!", -;
-	close;
+    if (@Q_status > @Q_STATUS_DIDNT_DRINK) goto L_make_food;
+
+    mes "[Omar]";
+    mes "\"Welcome to my humble abode.\"";
+    next;
+    menu
+        "Well met!  May I ask who you are?", L_omar,
+        "What's wrong with your daughter?", L_kadiya_sick,
+        "Thank you!", -;
+    close;
 
 L_omar:
-	mes "[Omar]";
-        mes "\"My name is Omar;  I am a trader of oils and spices.\"";
-        close;
+    mes "[Omar]";
+    mes "\"My name is Omar;  I am a trader of oils and spices.\"";
+    close;
 
 L_kadiya_sick:
-	mes "[Omar]";
-        mes "\"Kadiya has caught Ponderpox, I fear.\"";
-        mes "He sighs.";
-        mes "\"She's has been feverish for many days now.  I wish there were something I could do.\"";
-        next;
-
-        menu
-		"Have you asked Elanore the healer?", L_sick_elanore,
-		"How about the Hurnscald hospital?", L_sick_hospital,
-		"Can I help?", L_sick_self,
-		"I'm sorry to hear that.", -;
-
-	mes "[Omar]";
-        mes "\"Well, she is a strong girl.  I am sure that she will get over it eventually.\"";
-        mes "He smiles, but you see doubt in his eyes.";
-        close;
+    mes "[Omar]";
+    mes "\"Kadiya has caught Ponderpox, I fear.\"";
+    mes "He sighs.";
+    mes "\"She's has been feverish for many days now.  I wish there were something I could do.\"";
+    next;
+    menu
+        "Have you asked Elanore the healer?", L_sick_elanore,
+        "How about the Hurnscald hospital?", L_sick_hospital,
+        "Can I help?", L_sick_self,
+        "I'm sorry to hear that.", -;
+
+    mes "[Omar]";
+    mes "\"Well, she is a strong girl.  I am sure that she will get over it eventually.\"";
+    mes "He smiles, but you see doubt in his eyes.";
+    close;
 
 L_sick_elanore:
-	mes "[Omar]";
-        mes "\"Elanore?\"";
-        mes "He frowns.";
-        mes "\"She knows nothing.  I see no point in talking to her.\"";
-        close;
+    mes "[Omar]";
+    mes "\"Elanore?\"";
+    mes "He frowns.";
+    mes "\"She knows nothing.  I see no point in talking to her.\"";
+    close;
 
 L_sick_hospital:
-	mes "[Omar]";
-        mes "\"Hurnscald is too far away.  I don't think that it would be good for her to go on such a long trip.\"";
-        close;
+    mes "[Omar]";
+    mes "\"Hurnscald is too far away.  I don't think that it would be good for her to go on such a long trip.\"";
+    close;
 
 L_sick_self:
-	mes "[Omar]";
-        mes "\"You are very kind, but I don't think there is anything you can do.\"";
-        close;
+    mes "[Omar]";
+    mes "\"You are very kind, but I don't think there is anything you can do.\"";
+    close;
 
 L_didnt_drink:
-        mes "[Omar]";
-        mes "\"So she has Mopox, not Ponderpox, you say?  Hmm.  That is much harder to cure, I think.\"";
-        mes "\"I am grateful for the effort you put into brewing a potion for her.  But it does smell vile...\"";
-        next;
-
-        mes "[Omar]";
-        mes "\"I promised my dear wife that I would never make Kadiya eat or drink anything she doesn't like.  So I won't force her to drink this.\"";
-        next;
-
-        mes "[Omar]";
-        set @Q_status, (@Q_STATUS_WANTS_CHOCOCAKE + rand(2));
-        callsub S_update_var;
-
-        if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE)
-        	mes "\"If only we could make it smell and taste like orange cupcakes...  she really loves those cupcakes.\"";
-        if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE)
-        	mes "\"If only this were a chocolate cake and not a potion... she really loves chocolate cakes.\"";
-        close;
+    mes "[Omar]";
+    mes "\"So she has Mopox, not Ponderpox, you say?  Hmm.  That is much harder to cure, I think.\"";
+    mes "\"I am grateful for the effort you put into brewing a potion for her.  But it does smell vile...\"";
+    next;
+    mes "[Omar]";
+    mes "\"I promised my dear wife that I would never make Kadiya eat or drink anything she doesn't like.  So I won't force her to drink this.\"";
+    next;
+    mes "[Omar]";
+    set @Q_status, (@Q_STATUS_WANTS_CHOCOCAKE + rand(2));
+    callsub S_update_var;
+    if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE)
+        mes "\"If only we could make it smell and taste like orange cupcakes...  she really loves those cupcakes.\"";
+    if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE)
+        mes "\"If only this were a chocolate cake and not a potion... she really loves chocolate cakes.\"";
+    close;
 
 L_make_food:
-        mes "[Omar]";
-        mes "\"I should stay here to watch over her.  I wish I could think of a way to convince her to drink the potion...\"";
-        if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE)
-        	mes "\"Alas, it is not an orange cupcake.\"";
-        if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE)
-        	mes "\"If only it were to smell and taste like her favourite chocolate cake...\"";
-        close;
+    mes "[Omar]";
+    mes "\"I should stay here to watch over her.  I wish I could think of a way to convince her to drink the potion...\"";
+    if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE)
+        mes "\"Alas, it is not an orange cupcake.\"";
+    if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE)
+        mes "\"If only it were to smell and taste like her favourite chocolate cake...\"";
+    close;
 
 L_cured:
-        if (@Q_status == @Q_STATUS_COMPLETED)
-		goto L_cured_choice;
-        mes "[Omar]";
-        mes "\"She is sleeping now, but she seems to be much better.  I am sure that she will be up and running around again soon.\"";
-        close;
+    if (@Q_status == @Q_STATUS_COMPLETED) goto L_cured_choice;
+    mes "[Omar]";
+    mes "\"She is sleeping now, but she seems to be much better.  I am sure that she will be up and running around again soon.\"";
+    close;
 
 L_cured_choice:
-        mes "[Omar]";
-        mes "\"I am very grateful for your help.  I really was sure that it was Ponderpox, not Mopox, that she had.\"";
-        next;
-
-        menu
-		"Oh, it was nothing.", L_cured_nothing,
-                "I didn't do it alone; Elanore helped.", L_cured_elanore,
-                "That will be 5000 GP.", -;
-
-        mes "[Omar]";
-        mes "\"Ah, certainly.\"";
-        mes "He hands you a small bag of money.";
-        next;
-
-        set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
-        callsub S_update_var;
-
-        set zeny, zeny + 5000;
-        close;
+    mes "[Omar]";
+    mes "\"I am very grateful for your help.  I really was sure that it was Ponderpox, not Mopox, that she had.\"";
+    next;
+    menu
+        "Oh, it was nothing.", L_cured_nothing,
+        "I didn't do it alone; Elanore helped.", L_cured_elanore,
+        "That will be 5000 GP.", -;
+    mes "[Omar]";
+    mes "\"Ah, certainly.\"";
+    mes "He hands you a small bag of money.";
+    next;
+    set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
+    callsub S_update_var;
+    set zeny, zeny + 5000;
+    close;
 
 L_cured_nothing:
-        mes "[Omar]";
-        mes "\"No, this wasn't nothing.  She is everything to me.  Here, you deserve a reward.\"";
-        mes "He hands you a bag of money containing 10,000 GP and two pearls.";
-        mes "\"And feel free to drop by again whenever you would like!\"";
-
-        set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
-        callsub S_update_var;
-
-        getitem "Pearl", 2;
-        set zeny, zeny + 10000;
-        close;
+    mes "[Omar]";
+    mes "\"No, this wasn't nothing.  She is everything to me.  Here, you deserve a reward.\"";
+    mes "He hands you a bag of money containing 10,000 GP and two pearls.";
+    mes "\"And feel free to drop by again whenever you would like!\"";
+    set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
+    callsub S_update_var;
+    getitem "Pearl", 2;
+    set zeny, zeny + 10000;
+    close;
 
 L_cured_elanore:
-        mes "[Omar]";
-        mes "Omar frowns.";
-        mes "\"That witch?  You worked with her without telling me?\"";
-        mes "He looks over to his daughter, concern suddenly in his eyes.";
-        mes "\"She is looking better, though...\"";
-        next;
-
-        mes "[Omar]";
-        mes "Omar shakes his head.";
-        mes "\"I will have to think about this.  Please leave me alone.\"";
-        next;
-
-        set @Q_status, @Q_STATUS_COMPLETED_ELANORE;
-        callsub S_update_var;
-
-        close;
+    mes "[Omar]";
+    mes "Omar frowns.";
+    mes "\"That witch?  You worked with her without telling me?\"";
+    mes "He looks over to his daughter, concern suddenly in his eyes.";
+    mes "\"She is looking better, though...\"";
+    next;
+    mes "[Omar]";
+    mes "Omar shakes his head.";
+    mes "\"I will have to think about this.  Please leave me alone.\"";
+    next;
+    set @Q_status, @Q_STATUS_COMPLETED_ELANORE;
+    callsub S_update_var;
+    close;
 
 S_update_var:
-	set QUEST_MAGIC2,
-		(QUEST_MAGIC2 & ~(NIBBLE_3_MASK)
-		| (@Q_status << NIBBLE_3_SHIFT));
-	return;
+    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(NIBBLE_3_MASK) | (@Q_status << NIBBLE_3_SHIFT));
+    return;
 }
 
-
-001-2.gat,76,59,0	script	_______Kadiya	174,{
-        callfunc "ElanoreFix";
-        set @Q_MASK, NIBBLE_3_MASK;
-        set @Q_SHIFT, NIBBLE_3_SHIFT;
-
-	callfunc "KadiyaSubquestConsts";
-        set @Q_status, @Q_kadiya_status;
-
-        if (@Q_status >= @Q_STATUS_COMPLETED)
-		goto L_cured;
-
-        mes "You see a young girl lying in bed.  At first she doesn't seem to notice you approaching.";
-        mes "Finally, she turns her head towards you.  Judging from the sweat on her forehead and look in her eyes, she is suffering from some kind of fever.";
-        next;
-
-	mes "[Kadiya]";
-	mes "\"Hello,\" she says in a tiny voice.";
-        next;
-
-        set @M_NAME, 1;
-        set @M_CANDY, 2;
-        set @M_POTION, 3;
-        set @M_CHOCOCAKE, 4;
-        set @M_CUPCAKE, 5;
-
-        setarray @choice$, "Hello!  What's your name?", "Would you like some candy?", "", "", "", "", "", "";
-        setarray @choice_idx, @M_NAME, @M_CANDY, 0, 0, 0, 0, 0, 0;
-        set @choices_nr, 2;
-
-        if (countitem("MopoxCurePotion") == 0)
-        	goto L_M_no_cure;
-
-        set @choice_idx[@choices_nr], @M_POTION;
-        set @choice$[@choices_nr], "This potion will cure your illness!";
-        set @choices_nr, @choices_nr + 1;
+001-2.gat,76,59,0|script|Kadiya|174,{
+    callfunc "ElanoreFix";
+    set @Q_MASK, NIBBLE_3_MASK;
+    set @Q_SHIFT, NIBBLE_3_SHIFT;
+    callfunc "KadiyaSubquestConsts";
+    set @Q_status, @Q_kadiya_status;
+    if (@Q_status >= @Q_STATUS_COMPLETED) goto L_cured;
+
+    mes "You see a young girl lying in bed.  At first she doesn't seem to notice you approaching.";
+    mes "Finally, she turns her head towards you.  Judging from the sweat on her forehead and look in her eyes, she is suffering from some kind of fever.";
+    next;
+    mes "[Kadiya]";
+    mes "\"Hello,\" she says in a tiny voice.";
+    next;
+    set @M_NAME, 1;
+    set @M_CANDY, 2;
+    set @M_POTION, 3;
+    set @M_CHOCOCAKE, 4;
+    set @M_CUPCAKE, 5;
+
+    setarray @choice$, "Hello!  What's your name?", "Would you like some candy?", "", "", "", "", "", "";
+    setarray @choice_idx, @M_NAME, @M_CANDY, 0, 0, 0, 0, 0, 0;
+    set @choices_nr, 2;
+
+    if (countitem("MopoxCurePotion") == 0) goto L_M_no_cure;
+
+    set @choice_idx[@choices_nr], @M_POTION;
+    set @choice$[@choices_nr], "This potion will cure your illness!";
+    set @choices_nr, @choices_nr + 1;
 
 L_M_no_cure:
-
-        if ((countitem("LacedChocolateCake") == 0) || (@Q_status != @Q_STATUS_WANTS_CHOCOCAKE))
-        	goto L_M_no_chococake;
-
-        set @choice_idx[@choices_nr], @M_CHOCOCAKE;
-        set @choice$[@choices_nr], "Would you like special chocolate cake?";
-        set @choices_nr, @choices_nr + 1;
+    if ((countitem("LacedChocolateCake") == 0) || (@Q_status != @Q_STATUS_WANTS_CHOCOCAKE))
+        goto L_M_no_chococake;
+    set @choice_idx[@choices_nr], @M_CHOCOCAKE;
+    set @choice$[@choices_nr], "Would you like special chocolate cake?";
+    set @choices_nr, @choices_nr + 1;
 
 L_M_no_chococake:
-
-        if ((countitem("LacedOrangeCupcake") == 0) || (@Q_status != @Q_STATUS_WANTS_ORANGECUPCAKE))
-        	goto L_M_no_cupcake;
-
-        set @choice_idx[@choices_nr], @M_CUPCAKE;
-        set @choice$[@choices_nr], "Would you like special orange cupcake?";
-        set @choices_nr, @choices_nr + 1;
+    if ((countitem("LacedOrangeCupcake") == 0) || (@Q_status != @Q_STATUS_WANTS_ORANGECUPCAKE))
+        goto L_M_no_cupcake;
+    set @choice_idx[@choices_nr], @M_CUPCAKE;
+    set @choice$[@choices_nr], "Would you like special orange cupcake?";
+    set @choices_nr, @choices_nr + 1;
 
 L_M_no_cupcake:
-
-        set @choice_idx[@choices_nr], 0;
-        set @choice$[@choices_nr], "Goodbye.";
-        set @choices_nr, @choices_nr + 1;
-
-        menu
-		@choice$[0], -,
-		@choice$[1], -,
-		@choice$[2], -,
-		@choice$[3], -,
-		@choice$[4], -,
-		@choice$[5], -;
-
-        set @choice, @choice_idx[@menu - 1];
-
-        if (@choice == @M_NAME)		goto L_name;
-        if (@choice == @M_CANDY)	goto L_no_candy;
-        if (@choice == @M_POTION)	goto L_potion;
-        if (@choice == @M_CHOCOCAKE)	goto L_chococake;
-        if (@choice == @M_CUPCAKE)	goto L_cupcake;
-
-        close;
+    set @choice_idx[@choices_nr], 0;
+    set @choice$[@choices_nr], "Goodbye.";
+    set @choices_nr, @choices_nr + 1;
+
+    menu
+        @choice$[0], -,
+        @choice$[1], -,
+        @choice$[2], -,
+        @choice$[3], -,
+        @choice$[4], -,
+        @choice$[5], -;
+
+    set @choice, @choice_idx[@menu - 1];
+
+    if (@choice == @M_NAME) goto L_name;
+    if (@choice == @M_CANDY) goto L_no_candy;
+    if (@choice == @M_POTION) goto L_potion;
+    if (@choice == @M_CHOCOCAKE) goto L_chococake;
+    if (@choice == @M_CUPCAKE) goto L_cupcake;
+    close;
 
 L_name:
-	mes "[Kadiya]";
-        mes "She smiles a faint smile.";
-        mes "\"My name is Kadiya.\"";
-
-        close;
+    mes "[Kadiya]";
+    mes "She smiles a faint smile.";
+    mes "\"My name is Kadiya.\"";
+    close;
 
 L_no_candy:
-	mes "[Kadiya]";
-        mes "She hesitates for a moment.";
-        mes "\"No, thank you.  I don't think I should.\"";
-
-	close;
+    mes "[Kadiya]";
+    mes "She hesitates for a moment.";
+    mes "\"No, thank you.  I don't think I should.\"";
+    close;
 
 L_potion:
-	mes "[Kadiya]";
-        if (@Q_status < @Q_STATUS_DIDNT_DRINK)
-                set @Q_status, @Q_STATUS_DIDNT_DRINK;
-        callsub S_update_var;                
-
-        mes "Kadiya grimaces and pushes the bottle away.";
-        mes "\"That smells terrible!\"";
-        next;
-
-	mes "[Kadiya]";
-        mes "She pulls the sheets over her head.";
-        mes "\"I won't drink that!\"";
-        next;
-
-        close;
+    mes "[Kadiya]";
+    if (@Q_status < @Q_STATUS_DIDNT_DRINK) set @Q_status, @Q_STATUS_DIDNT_DRINK;
+    callsub S_update_var;
+
+    mes "Kadiya grimaces and pushes the bottle away.";
+    mes "\"That smells terrible!\"";
+    next;
+    mes "[Kadiya]";
+    mes "She pulls the sheets over her head.";
+    mes "\"I won't drink that!\"";
+    next;
+    close;
 
 L_chococake:
-        delitem "LacedChocolateCake", 1;
-        goto L_do_cure;
+    delitem "LacedChocolateCake", 1;
+    goto L_do_cure;
 
 L_cupcake:
-        delitem "LacedOrangeCupcake", 1;
-        goto L_do_cure;
+    delitem "LacedOrangeCupcake", 1;
+    goto L_do_cure;
 
 L_do_cure:
-        if (@Q_status < @Q_STATUS_COMPLETED)
-                set @Q_status, @Q_STATUS_COMPLETED;
-        callsub S_update_var;                
-	mes "[Kadiya]";
-        mes "Kadiya's eyes widen.";
-        mes "\"Oh!  Daddy, is it okay if I eat this?\"";
-        mes "Omar nods and smiles.  \"You should eat a bit to regain your strength, sweetheart.\"";
-        next;
-
-	mes "[Kadiya]";
-        mes "Kadiya devours your gift in just a handful of bites.";
-        next;
-
-	mes "[Kadiya]";
-        mes "She smiles.  \"Thank you!  I feel better already!\".";
-        next;
-
-        mes "[Kadiya]";
-        mes "She looks much healthier, too.  Omar walks over and touches her forehead.";
-        mes "\"Now that is funny-- your fever has gone down quite a bit!\"";
-        mes "He smiles at you.  \"Thank you for your help!\"";
-        next;
-
-        mes "[Kadiya]";
-        mes "\"You should get some sleep now, sweetheart.  I'm sure that you will be better soon.\"";
-        close;
+    if (@Q_status < @Q_STATUS_COMPLETED) set @Q_status, @Q_STATUS_COMPLETED;
+    callsub S_update_var;
+
+    mes "[Kadiya]";
+    mes "Kadiya's eyes widen.";
+    mes "\"Oh!  Daddy, is it okay if I eat this?\"";
+    mes "Omar nods and smiles.  \"You should eat a bit to regain your strength, sweetheart.\"";
+    next;
+    mes "[Kadiya]";
+    mes "Kadiya devours your gift in just a handful of bites.";
+    next;
+    mes "[Kadiya]";
+    mes "She smiles.  \"Thank you!  I feel better already!\".";
+    next;
+    mes "[Kadiya]";
+    mes "She looks much healthier, too.  Omar walks over and touches her forehead.";
+    mes "\"Now that is funny-- your fever has gone down quite a bit!\"";
+    mes "He smiles at you.  \"Thank you for your help!\"";
+    next;
+    mes "[Kadiya]";
+    mes "\"You should get some sleep now, sweetheart.  I'm sure that you will be better soon.\"";
+    close;
 
 L_goodbye:
-	mes "[Kadiya]";
-        mes "Goodbye!";
-
-        close;
+    mes "[Kadiya]";
+    mes "Goodbye!";
+    close;
 
 L_cured:
-        mes "[Kadiya]";
-        mes "Kadiya seems to be sleeping calmly.  She looks much less sweaty than earlier; unless you are very much mistaken, her fever has disappeared.";
-        close;
+    mes "[Kadiya]";
+    mes "Kadiya seems to be sleeping calmly.  She looks much less sweaty than earlier; unless you are very much mistaken, her fever has disappeared.";
+    close;
 
 S_update_var:
-	set QUEST_MAGIC2,
-		(QUEST_MAGIC2 & ~(@Q_MASK)
-		| (@Q_status << @Q_SHIFT));
-	return;
+    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
+    return;
 }
diff --git a/world/map/npc/001-2/phaet.txt b/world/map/npc/001-2/phaet.txt
index e495d93d..1e37bdcb 100644
--- a/world/map/npc/001-2/phaet.txt
+++ b/world/map/npc/001-2/phaet.txt
@@ -1,30 +1,28 @@
 //
 
-001-2.gat,24,23,0	script	Phaet	125,{
-	mes "[Phaet the Royal Guard]";
-	mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
-	next;
+001-2.gat,24,23,0|script|Phaet|125,{
+    mes "[Phaet the Royal Guard]";
+    mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
+    next;
+    menu
+        "Yes", L_Sure,
+        "No", -;
 
-	menu
-		"Yes", L_Sure,
-		"No", -;
-
-	mes "[Phaet the Royal Guard]";
-	mes "\"Ha ha, coward.\"";
-	close;
+    mes "[Phaet the Royal Guard]";
+    mes "\"Ha ha, coward.\"";
+    close;
 
 L_Sure:
-	if (zeny < 50) goto L_NoMoney;
-	set zeny, zeny - 50;
-
-	mes "[Phaet the Royal Guard]";
-	mes "\"Get ready!\"";
-	next;
+    if (zeny < 50) goto L_NoMoney;
+    set zeny, zeny - 50;
 
-	warp "001-3.gat", 0, 0;
-	close;
+    mes "[Phaet the Royal Guard]";
+    mes "\"Get ready!\"";
+    next;
+    warp "001-3.gat", 0, 0;
+    close;
 
 L_NoMoney:
-	mes "\"Wait a second, you don't have enough money.\"";
-	close;
+    mes "\"Wait a second, you don't have enough money.\"";
+    close;
 }
diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
index e33ae53c..d4cf178b 100644
--- a/world/map/npc/001-2/shops.txt
+++ b/world/map/npc/001-2/shops.txt
@@ -1,10 +1,10 @@
 //
 
-001-2.gat,26,26,0	shop	InnKeeper	112,Beer :-1,Cake :-1,CherryCake :-1
+001-2.gat,26,26,0|shop|InnKeeper|112,Beer :-1,Cake :-1,CherryCake :-1
 
-001-2.gat,103,26,0	script	Rebecca	118,{
-	set @npcname$, "Rebecca the Inn Keeper";
-	set @cost, 100;
-	callfunc "Inn";
-	close;
+001-2.gat,103,26,0|script|Rebecca|118,{
+    set @npcname$, "Rebecca the Inn Keeper";
+    set @cost, 100;
+    callfunc "Inn";
+    close;
 }
diff --git a/world/map/npc/001-2/troupe_leader.txt b/world/map/npc/001-2/troupe_leader.txt
index e7b0486e..f34408d3 100644
--- a/world/map/npc/001-2/troupe_leader.txt
+++ b/world/map/npc/001-2/troupe_leader.txt
@@ -1,51 +1,51 @@
 //
 
-001-2.gat,34,25,0	script	Troupe Leader	165,{
-	if (Inspector == 4) goto L_NohMask_Troupe;
-	if (Inspector == 13) goto L_NohMask_Found;
+001-2.gat,34,25,0|script|Troupe Leader|165,{
+    if (Inspector == 4) goto L_NohMask_Troupe;
+    if (Inspector == 13) goto L_NohMask_Found;
 
-	mes "[Troupe Leader]";
-	mes "\"Hello. I'm the leader of a traveling theater troupe. We'll be staying here in Tulimshar for a while.\"";
-	close;
+    mes "[Troupe Leader]";
+    mes "\"Hello. I'm the leader of a traveling theater troupe. We'll be staying here in Tulimshar for a while.\"";
+    close;
 
 L_NohMask_Troupe:
-	mes "[Troupe Leader]";
-	mes "\"Yes, a mask was stolen from us the last night we were in Hurnscald.\"";
-	next;
-	menu
-		"Any ideas on who might have taken it?", L_NohMask_Idea,
-		"Are you sure one of your troupe members didn't hide it and commit those robberies?", L_NohMask_Accuse,
-		"Hmm...", -;
-	close;
+    mes "[Troupe Leader]";
+    mes "\"Yes, a mask was stolen from us the last night we were in Hurnscald.\"";
+    next;
+    menu
+        "Any ideas on who might have taken it?", L_NohMask_Idea,
+        "Are you sure one of your troupe members didn't hide it and commit those robberies?", L_NohMask_Accuse,
+        "Hmm...", -;
+    close;
 
 L_NohMask_Idea:
-	set Inspector, 5;
-	mes "[Troupe Leader]";
-	mes "\"Hm...I did see an old man hang out near the theater after our last show.\"";
-	close;
+    set Inspector, 5;
+    mes "[Troupe Leader]";
+    mes "\"Hm...I did see an old man hang out near the theater after our last show.\"";
+    close;
 
 L_NohMask_Accuse:
-	mes "[Troupe Leader]";
-	mes "\"I am absolutely positive. None of my troupe have left the city since we got here. Good day!\"";
-	close;
+    mes "[Troupe Leader]";
+    mes "\"I am absolutely positive. None of my troupe have left the city since we got here. Good day!\"";
+    close;
 
 L_NohMask_Found:
-	mes "[Troupe Leader]";
-	mes "\"Thank you for finding the mask. You did such a good job, you should keep it.\"";
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_NohMask_TooMany;
-	mes "[1500 experience points]";
-	getexp 1500, 0;
-	set Inspector, 14;
-	getitem "NohMask", 1;
-	next;
-	mes "[Troupe Leader]";
-	mes "\"We don't need it anymore. We're doing different shows here.\"";
-	close;
+    mes "[Troupe Leader]";
+    mes "\"Thank you for finding the mask. You did such a good job, you should keep it.\"";
+    getinventorylist;
+    if (@inventorylist_count == 100) goto L_NohMask_TooMany;
+    mes "[1500 experience points]";
+    getexp 1500, 0;
+    set Inspector, 14;
+    getitem "NohMask", 1;
+    next;
+    mes "[Troupe Leader]";
+    mes "\"We don't need it anymore. We're doing different shows here.\"";
+    close;
 
 L_NohMask_TooMany:
-	next;
-	mes "[Troupe Leader]";
-	mes "\"Except, you don't seem to have any room for it. I'll hold onto it for you until you do have room.\"";
-	close;
+    next;
+    mes "[Troupe Leader]";
+    mes "\"Except, you don't seem to have any room for it. I'll hold onto it for you until you do have room.\"";
+    close;
 }
diff --git a/world/map/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt
index 5b42ca4f..7ff899d0 100644
--- a/world/map/npc/001-3/guards.txt
+++ b/world/map/npc/001-3/guards.txt
@@ -1,28 +1,26 @@
 //
 
-001-3.gat,77,37,0	script	Phaet	125,{
-	mes "[Phaet the Royal Guard]";
-	mes "\"Do you want to go back?\"";
-	next;
-	
-	menu
-		"Yes", L_Sure,
-		"No", -;
-	mes "Have fun.";
-	close;
+001-3.gat,77,37,0|script|Phaet|125,{
+    mes "[Phaet the Royal Guard]";
+    mes "\"Do you want to go back?\"";
+    next;
+    menu
+        "Yes", L_Sure,
+        "No", -;
+    mes "Have fun.";
+    close;
 
 L_Sure:
-	mes "[Phaet the Royal Guard]";
-	mes "\"Ok.\"";
-	next;
-	
-	warp "001-2.gat", 25, 23;
-	close;
+    mes "[Phaet the Royal Guard]";
+    mes "\"Ok.\"";
+    next;
+    warp "001-2.gat", 25, 23;
+    close;
 }
 
-001-3.gat,69,37,0	script	Aradin	126,{
-	mes "[Aradin the Royal Guard]";
-	mes "\"Don't touch me...";
-	mes "You wouldn't enjoy the consequences.\"";
-	close;
+001-3.gat,69,37,0|script|Aradin|126,{
+    mes "[Aradin the Royal Guard]";
+    mes "\"Don't touch me...";
+    mes "You wouldn't enjoy the consequences.\"";
+    close;
 }
diff --git a/world/map/npc/001-3/monsters.txt b/world/map/npc/001-3/monsters.txt
index 04e6b11d..8f5e167c 100644
--- a/world/map/npc/001-3/monsters.txt
+++ b/world/map/npc/001-3/monsters.txt
@@ -2,13 +2,12 @@
 // This is the Tulimshar Arena -- below Tulimshar.
 //
 
-001-3.gat,0,0,0,0	monster	Maggot	1002,10,0,0,Mob6::OnMaggot
+001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob6::OnMaggot
 
-001-3.gat,0,0,0	script	Mob6	-1,{
+001-3.gat,0,0,0|script|Mob6|-1,{
 OnMaggot:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
\ No newline at end of file
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    break;
+    end;
+}
diff --git a/world/map/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt
index 0573482b..605a4d58 100644
--- a/world/map/npc/002-1/lieutenant_dausen.txt
+++ b/world/map/npc/002-1/lieutenant_dausen.txt
@@ -1,119 +1,118 @@
 // 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;
-        if (TMW_Quest < 12) goto 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.\"";
-	close;
+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;
+    if (TMW_Quest < 12) goto 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.\"";
+    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;
+    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 "\"Out here in the desert, it sure does get hot!  My men and I get thirsty rather quickly.  Cactus Drinks are our favourite; if you can get some for us, we'd surely appreciate your effort.  About 10 would do.\"";
-	close;
+    set TMW_Quest, 13;
+    mes "[Lieutenant Dausen]";
+    mes "\"Out here in the desert, it sure does get hot!  My men and I get thirsty rather quickly.  Cactus Drinks are our favourite; if you can get some for us, we'd surely appreciate your effort.  About 10 would 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 "Lieutenant Dausen mumbles to himself and rubs his head.";
-	next;
-	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
-		"I can help you out, since you helped me too.", L_LD_Help,
-		"Thanks for the boots, gotta run now.", L_LD_NoHelp;
-	close;
+    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 "Lieutenant Dausen mumbles to himself and rubs his head.";
+    next;
+    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
+        "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.\"";
-	close;
+    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;
+    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!  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
-		"I can help you out, since you helped me out too.", L_LD_Help,
-		"Bye-bye.", L_LD_NoHelp;
-	close;
+    mes "[Lieutenant Dausen]";
+    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
+        "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!  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;
+    set TMW_Quest, 15;
+    mes "[Lieutenant Dausen]";
+    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 then.\"";
-	close;
+    mes "[Lieutenant Dausen]";
+    mes "\"See you later then.\"";
+    close;
 
 L_LD_Waits:
-	mes "[Lieutenant Dausen]";
-	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;
+    mes "[Lieutenant Dausen]";
+    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 too?  He guards the mine to the south, monitoring the monster threat and protecting the miners when he can.\"";
-	close;
+    set TMW_Quest, 17;
+    mes "[Lieutenant Dausen]";
+    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 "\"Could you let Nickos know to hold his post?  It would be very helpful.  He is guarding the mine south of here.\"";
-	close;
+    mes "[Lieutenant Dausen]";
+    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 efforts.\"";
-	next;
-	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;
+    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 efforts.\"";
+    next;
+    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 threat around the city to ensure the safety of its citizens.\"";
-	next;
-	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;
+    mes "[Lieutenant Dausen]";
+    mes "\"I monitor the monster threat around the city to ensure the safety of its citizens.\"";
+    next;
+    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:
-	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;
-
+    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/world/map/npc/002-1/merchant.txt b/world/map/npc/002-1/merchant.txt
index ae7de533..b1b2c3fd 100644
--- a/world/map/npc/002-1/merchant.txt
+++ b/world/map/npc/002-1/merchant.txt
@@ -1,3 +1,3 @@
 //
 
-002-1.gat,19,99,0	shop	Ishyah	109,MinersHat :-1,MinerGloves :-1,ShortBow :-1,Arrow :-1,LeatherShield :-1
+002-1.gat,19,99,0|shop|Ishyah|109,MinersHat :-1,MinerGloves :-1,ShortBow :-1,Arrow :-1,LeatherShield :-1
diff --git a/world/map/npc/002-1/nickos.txt b/world/map/npc/002-1/nickos.txt
index bf5de510..1e469ef8 100644
--- a/world/map/npc/002-1/nickos.txt
+++ b/world/map/npc/002-1/nickos.txt
@@ -1,114 +1,113 @@
 // 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;
-	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;
+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;
+    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_Nickos_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;
+    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.\"";
-	close;
+    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;
+    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.\"";
-        next;
-        mes "[Nickos]";
-        mes "\"Could you check on them for me, though?\"";
-	menu
-		"Yes.", L_Nickos_Mine_Open,
-		"No.", L_Nickos_Disappoint;
-	close;
+    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.\"";
+    next;
+    mes "[Nickos]";
+    mes "\"Could you check on them for me, though?\"";
+    menu
+        "Yes.", L_Nickos_Mine_Open,
+        "No.", L_Nickos_Disappoint;
+    close;
 
 L_Nickos_Disappoint:
-	mes "Nickos looks disappointed.";
-	close;
+    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.\"";
-	close;
+    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;
+    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;
+    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;
+    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.  I can make it worth your time, but of course, I'll need something to show your work.  Bring me 10 Angry Scorpion Stingers to demonstrate your effectiveness, and you will be rewarded for your efforts.\"";
-	close;
+    set TMW_Quest, 31;
+    mes "[Nickos]";
+    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 Stingers 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("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.\"";
-	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;
+    if (countitem ("AngryScorpionStinger") < 10) goto L_Nickos_AS_NotDone;
+    getinventorylist;
+    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.\"";
+    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;
+    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;
+    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've got the key to open it.\"";
-	close;
-
+    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've got the key to open it.\"";
+    close;
 }
diff --git a/world/map/npc/002-1/nomads.txt b/world/map/npc/002-1/nomads.txt
index 0b7e7426..805b8fef 100644
--- a/world/map/npc/002-1/nomads.txt
+++ b/world/map/npc/002-1/nomads.txt
@@ -1,16 +1,14 @@
 //
 
-002-1.gat,15,67,0	script	Samuel	132,{
-	mes "[Samuel the Nomad]";
-	mes "\"This is really a nice place.\"";
-	
-	mes "Don't you think so?\"";
-	close;
+002-1.gat,15,67,0|script|Samuel|132,{
+    mes "[Samuel the Nomad]";
+    mes "\"This is really a nice place.\"";
+    mes "Don't you think so?\"";
+    close;
 }
 
-002-1.gat,18,68,0	script	Elijah	128,{
-	mes "[Elijah the Nomad]";
-	mes "\"If I only had a tent...\"";
-	
-	close;
+002-1.gat,18,68,0|script|Elijah|128,{
+    mes "[Elijah the Nomad]";
+    mes "\"If I only had a tent...\"";
+    close;
 }
diff --git a/world/map/npc/002-1/rogue.txt b/world/map/npc/002-1/rogue.txt
index e5afe354..79812bee 100644
--- a/world/map/npc/002-1/rogue.txt
+++ b/world/map/npc/002-1/rogue.txt
@@ -1,50 +1,49 @@
 //
 
-002-1.gat,22,21,0	script	Malivox	103,{
+002-1.gat,22,21,0|script|Malivox|103,{
 
-//	if (ResetA_charstate == 1) goto L_Multiple;
+// if (ResetA_charstate == 1) goto L_Multiple;
 
-//	set @cost, 10000000 / ($ResetA_uses + 1);
+// set @cost, 10000000 / ($ResetA_uses + 1);
 
-	set @cost, baselevel * 100;
+    set @cost, baselevel * 100;
 
-	mes "[Rogue Mage]";
-	mes "\"I have come across a spell that will";
-	mes "reset your status points.";
-	mes "Normally this spell is expensive, but";
-        mes "due to an unusual constellation of the";
-        mes "stars I can cast it very cheaply!";
-        mes "For you it will cost only "+@cost+" gp.\"";
-	next;
+    mes "[Rogue Mage]";
+    mes "\"I have come across a spell that will";
+    mes "reset your status points.";
+    mes "Normally this spell is expensive, but";
+    mes "due to an unusual constellation of the";
+    mes "stars I can cast it very cheaply!";
+    mes "For you it will cost only "+@cost+" gp.\"";
+    next;
+    menu
+        "Reset my stats",-,
+        "Forget about it",L_Pass;
 
-	menu "Reset my stats",-,"Forget about it",L_Pass;
+    if (zeny<@cost) goto L_NoMoney;
 
-	if (zeny<@cost) goto L_NoMoney;
-
-//	set $ResetA_uses, $ResetA_uses + 1;
-//	set ResetA_charstate, 1;
+// set $ResetA_uses, $ResetA_uses + 1;
+// set ResetA_charstate, 1;
 
 L_Reset:
+    set zeny, zeny-@cost;
+    resetstatus;
 
-	set zeny, zeny-@cost;
-
-	resetstatus;
-
-	mes "[Rogue Mage]";
-	mes "\"There you are.";
-	mes "";
-	mes "Good as new!\"";
-	close;
+    mes "[Rogue Mage]";
+    mes "\"There you are.";
+    mes "";
+    mes "Good as new!\"";
+    close;
 
 L_Pass:
-	mes "[Rogue Mage]";
-	mes "\"Very well then, see you.\"";
-	close;
+    mes "[Rogue Mage]";
+    mes "\"Very well then, see you.\"";
+    close;
 
 L_NoMoney:
-	mes "[Rogue Mage]";
-	mes "\"Oh dear, the price cannot be bargained.";
-	mes "";
-	mes "Perhaps you can borrow from a friend?\"";
-	close;
+    mes "[Rogue Mage]";
+    mes "\"Oh dear, the price cannot be bargained.";
+    mes "";
+    mes "Perhaps you can borrow from a friend?\"";
+    close;
 }
diff --git a/world/map/npc/002-1/sandstorm_mine_barrier.txt b/world/map/npc/002-1/sandstorm_mine_barrier.txt
index 62abceac..82841bf7 100644
--- a/world/map/npc/002-1/sandstorm_mine_barrier.txt
+++ b/world/map/npc/002-1/sandstorm_mine_barrier.txt
@@ -1,14 +1,12 @@
 //Sandstorm mine barrier
 
-002-1.gat,20,94,0	script	#Sandstorm_Mine_Barrier	127,0,0,{
+002-1.gat,20,94,0|script|#Sandstorm_Mine_Barrier|127,0,0,{
 
-	if (TMW_Quest >= 20) goto L_Sandstorm_Barrier_Open;
+    if (TMW_Quest >= 20) goto L_Sandstorm_Barrier_Open;
+    message strcharinfo(0), "Some force seems to block your entrance.";
+    end;
 
-	message strcharinfo(0), "Some force seems to block your entrance.";
-	end;
-	
 L_Sandstorm_Barrier_Open:
-	warp "002-3.gat",37,31;
-	end;
-
+    warp "002-3.gat",37,31;
+    end;
 }
diff --git a/world/map/npc/002-1/stewen.txt b/world/map/npc/002-1/stewen.txt
index 6c099b3a..b0c98ebe 100644
--- a/world/map/npc/002-1/stewen.txt
+++ b/world/map/npc/002-1/stewen.txt
@@ -1,23 +1,22 @@
 // East sandstorm guard
 
-002-1.gat,106,76,0	script	Stewen	123,{
+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;
+    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 pretty strong.\"";
-	close;
+    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 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;
+    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 take a break.  Once I get out of here, I'll let him know I want a raise!\"";
-	close;
-
+    mes "[Stewen]";
+    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/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;
 }
diff --git a/world/map/npc/002-4/chest.txt b/world/map/npc/002-4/chest.txt
index 542ce345..f61ee889 100644
--- a/world/map/npc/002-4/chest.txt
+++ b/world/map/npc/002-4/chest.txt
@@ -1,36 +1,36 @@
 //
 
-002-4.gat,93,37,0	script	Treasure	111,{
+002-4.gat,93,37,0|script|Treasure|111,{
 
-	if (TMW_Quest >= 38) goto L_Finished;
+    if (TMW_Quest >= 38) goto L_Finished;
 
-	mes "There is a chest here.";
-	mes "Do you want to try to open it?";
-	next;
-	menu
-		"Yes.", L_Yes,
-		"No.", -;
-	close;
+    mes "There is a chest here.";
+    mes "Do you want to try to open it?";
+    next;
+    menu
+        "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 "You opened the chest and found a short bow!";
-	delitem "TreasureKey", 3;
-	getitem "ShortBow", 1;
-	set TMW_Quest, 38;
-	close;
+    if(countitem("TreasureKey") < 3) goto L_Not_Enough;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("TreasureKey") > 3) goto L_TooMany;
+    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 "It seems that you do not have the right key for this chest yet...";
-	close;
+    mes "It seems that you do not have the right key for this chest yet...";
+    close;
 
 L_Finished:
-        mes "You have already opened this chest.";
-        close;
+    mes "You have already opened this chest.";
+    close;
 
 L_TooMany:
-        mes "You do not have enough room to loot this chest. Maybe you should try again later.";
-	close;
+    mes "You do not have enough room to loot this chest. Maybe you should try again later.";
+    close;
 }
diff --git a/world/map/npc/002-4/miners.txt b/world/map/npc/002-4/miners.txt
index 6e71461d..74bedfe6 100644
--- a/world/map/npc/002-4/miners.txt
+++ b/world/map/npc/002-4/miners.txt
@@ -1,60 +1,59 @@
 //
 
-002-4.gat,32,94,6	script	Sema	109,{
+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;
+    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, too.\"";
-	close;
+    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, too.\"";
+    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;
+    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;
+    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 "\"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;
+    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.\"";
+    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!  What a relief!  Please accept this Desert Shirt as reward.\"";
-	close;
+    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!  What a relief!  Please accept this Desert Shirt as reward.\"";
+    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;
+    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;
+    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;
-
+    mes "[Sema the Miner]";
+    mes "\"Thank you for all your help.\"";
+    close;
 }