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

20 files changed, 2950 insertions, 3172 deletions

diff --git a/world/map/npc/009-2/_import.txt b/world/map/npc/009-2/_import.txt
index 5289780c..f3e16386 100644
--- a/world/map/npc/009-2/_import.txt
+++ b/world/map/npc/009-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 009-2: Hurnscald
+// Map 009-2: Hurnscald Indoor
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 009-2.gat
 npc: npc/009-2/_mobs.txt
diff --git a/world/map/npc/009-2/_mobs.txt b/world/map/npc/009-2/_mobs.txt
index fd021fa2..198257c3 100644
--- a/world/map/npc/009-2/_mobs.txt
+++ b/world/map/npc/009-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald mobs
+// Hurnscald Indoor mobs
 
 
 
diff --git a/world/map/npc/009-2/_warps.txt b/world/map/npc/009-2/_warps.txt
index 21361ee5..1911c736 100644
--- a/world/map/npc/009-2/_warps.txt
+++ b/world/map/npc/009-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald warps
+// Hurnscald Indoor warps
 
 009-2.gat,75,23|warp|To1stFloor|0,-1,009-2.gat,73,46
 009-2.gat,95,30|warp|ToOutdoor|-1,-1,009-1.gat,59,34
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 5ccaea3f..ca0b4f74 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -6,263 +6,245 @@
 //   * Airlia quest = 2 unlocks other options, perhaps with future Warrior Guild prospects (this is long term) 
 
 
-009-2.gat,123,71,0	script	Airlia	108,{
-	// Subquest 1a: Caretaker's daughter (initial, once)
-	set @LETTER_REWARD_GOLD_INITIAL, 1000;
-	set @LETTER_REWARD_EXP_INITIAL, 2000;
+009-2.gat,123,71,0|script|Airlia|108,{
+    // Subquest 1a: Caretaker's daughter (initial, once)
+    set @LETTER_REWARD_GOLD_INITIAL, 1000;
+    set @LETTER_REWARD_EXP_INITIAL, 2000;
 
-	set @Q_STATUS_RECIEVED_FIRST_LETTER, 2;
-	set @Q_STATUS_DELIVERED_FIRST_LETTER, 3;
+    set @Q_STATUS_RECIEVED_FIRST_LETTER, 2;
+    set @Q_STATUS_DELIVERED_FIRST_LETTER, 3;
 
-	// Subquest 1b: Continued delivery of letters (unlimited)
-	set @LETTER_REWARD_GOLD, 42;
-	set @LETTER_REWARD_EXP, 500;
+    // Subquest 1b: Continued delivery of letters (unlimited)
+    set @LETTER_REWARD_GOLD, 42;
+    set @LETTER_REWARD_EXP, 500;
 
-	set @Q_STATUS_HAS_NO_NEW_LETTER, 4;
-	set @Q_STATUS_HAS_NEW_LETTER, 5;
+    set @Q_STATUS_HAS_NO_NEW_LETTER, 4;
+    set @Q_STATUS_HAS_NEW_LETTER, 5;
 
-	// Subquest 2a: Fetch those undead drops (initial, once)
-	// TODO: Set sane values below
-	set @FETCH_AMOUNT_INITIAL, 50;
-	set @FETCH_LABEL_INITIAL$, "Bone";
-	set @FETCH_REWARD_GOLD_INITIAL, 5000;
-	set @FETCH_REWARD_EXP_INITIAL, 50000;
+    // Subquest 2a: Fetch those undead drops (initial, once)
+    // TODO: Set sane values below
+    set @FETCH_AMOUNT_INITIAL, 50;
+    set @FETCH_LABEL_INITIAL$, "Bone";
+    set @FETCH_REWARD_GOLD_INITIAL, 5000;
+    set @FETCH_REWARD_EXP_INITIAL, 50000;
 
-	set @Q_STATUS_HELP_AIRLIA, 1;
-	set @Q_STATUS_INITIAL_FETCH_REWARDED, 2;
+    set @Q_STATUS_HELP_AIRLIA, 1;
+    set @Q_STATUS_INITIAL_FETCH_REWARDED, 2;
 
-	// Subquest 2b: Fetch those undead drops (unlimited)
-	// TODO: Set sane values below
-	set @FETCH_AMOUNT, 10;
-	set @FETCH_LABEL$, "DiseasedHeart";
-	set @FETCH_REWARD_GOLD, 6000;
-	set @FETCH_REWARD_EXP, 40000;
+    // Subquest 2b: Fetch those undead drops (unlimited)
+    // TODO: Set sane values below
+    set @FETCH_AMOUNT, 10;
+    set @FETCH_LABEL$, "DiseasedHeart";
+    set @FETCH_REWARD_GOLD, 6000;
+    set @FETCH_REWARD_EXP, 40000;
 
 
-	if (QUEST_Airlia == @Q_STATUS_INITIAL_FETCH_REWARDED) goto L_Rewarded;
-	if (QUEST_Airlia == @Q_STATUS_HELP_AIRLIA) goto L_Fetch;
-	if (QUEST_Graveyard_Caretaker > @Q_STATUS_RECIEVED_FIRST_LETTER) goto L_Airlia_intro;
+    if (QUEST_Airlia == @Q_STATUS_INITIAL_FETCH_REWARDED) goto L_Rewarded;
+    if (QUEST_Airlia == @Q_STATUS_HELP_AIRLIA) goto L_Fetch;
+    if (QUEST_Graveyard_Caretaker > @Q_STATUS_RECIEVED_FIRST_LETTER) goto L_Airlia_intro;
 
 L_Caretaker:
-	mes "[Airlia]";
-	mes "\"Greetings. Do you need a housing permit, or to license your mount?\"";
-	next;
-
-	if (QUEST_Graveyard_Caretaker < @Q_STATUS_RECIEVED_FIRST_LETTER)
-		menu
-			"Sorry, no.", -,
-			"My what?", L_Caretaker_mount;
-
-	if (QUEST_Graveyard_Caretaker == @Q_STATUS_RECIEVED_FIRST_LETTER)
-		menu
-			"Sorry, no.", -,
-			"I have a letter from your father.", L_Caretaker_first_reward,
-			"My what?", L_Caretaker_mount;
-
-	mes "[Airlia]";
-	mes "\"Nobody ever does...\"";
-	close;
+    mes "[Airlia]";
+    mes "\"Greetings. Do you need a housing permit, or to license your mount?\"";
+    next;
+    if (QUEST_Graveyard_Caretaker < @Q_STATUS_RECIEVED_FIRST_LETTER)
+        menu
+            "Sorry, no.", -,
+            "My what?", L_Caretaker_mount;
+    if (QUEST_Graveyard_Caretaker == @Q_STATUS_RECIEVED_FIRST_LETTER)
+        menu
+            "Sorry, no.", -,
+            "I have a letter from your father.", L_Caretaker_first_reward,
+            "My what?", L_Caretaker_mount;
+    mes "[Airlia]";
+    mes "\"Nobody ever does...\"";
+    close;
 
 L_Caretaker_mount:
-	// The mention of mounts will certainly gather some interest from players,
-	// this section may be extended.
-	close;
+    // The mention of mounts will certainly gather some interest from players,
+    // this section may be extended.
+    close;
 
 L_Caretaker_first_reward:
-	mes "[Airlia]";
-	mes "\"Oh! Thank you very, very much! Please take this for your trouble.\"";
-	if (@LETTER_REWARD_GOLD_INITIAL > 0)
-		mes "[" + @LETTER_REWARD_GOLD_INITIAL + " GP]";
-	if (@LETTER_REWARD_EXP_INITIAL > 0)
-		mes "[" + @LETTER_REWARD_EXP_INITIAL + " experience points]";
-
-	set zeny, zeny + @LETTER_REWARD_GOLD_INITIAL;
-	getexp @LETTER_REWARD_EXP_INITIAL, 0;
-	set QUEST_Graveyard_Caretaker, @Q_STATUS_DELIVERED_FIRST_LETTER;
-	close;
+    mes "[Airlia]";
+    mes "\"Oh! Thank you very, very much! Please take this for your trouble.\"";
+    if (@LETTER_REWARD_GOLD_INITIAL > 0)
+        mes "[" + @LETTER_REWARD_GOLD_INITIAL + " GP]";
+    if (@LETTER_REWARD_EXP_INITIAL > 0)
+        mes "[" + @LETTER_REWARD_EXP_INITIAL + " experience points]";
+    set zeny, zeny + @LETTER_REWARD_GOLD_INITIAL;
+    getexp @LETTER_REWARD_EXP_INITIAL, 0;
+    set QUEST_Graveyard_Caretaker, @Q_STATUS_DELIVERED_FIRST_LETTER;
+    close;
 
 L_Caretaker_later_rewards:
-	mes "[Airlia]";
-	mes "\"Oh! Thank you very, very much! Please take this for your trouble.\"";
-	if (@LETTER_REWARD_GOLD > 0)
-		mes "[" + @LETTER_REWARD_GOLD + " GP]";
-	if (@LETTER_REWARD_EXP > 0)
-		mes "[" + @LETTER_REWARD_EXP + " experience points]";
-
-	set zeny, zeny + @LETTER_REWARD_GOLD;
-	getexp @LETTER_REWARD_EXP, 0;
-	set QUEST_Graveyard_Caretaker, @Q_STATUS_HAS_NO_NEW_LETTER;
-	close;
+    mes "[Airlia]";
+    mes "\"Oh! Thank you very, very much! Please take this for your trouble.\"";
+    if (@LETTER_REWARD_GOLD > 0)
+        mes "[" + @LETTER_REWARD_GOLD + " GP]";
+    if (@LETTER_REWARD_EXP > 0)
+        mes "[" + @LETTER_REWARD_EXP + " experience points]";
+    set zeny, zeny + @LETTER_REWARD_GOLD;
+    getexp @LETTER_REWARD_EXP, 0;
+    set QUEST_Graveyard_Caretaker, @Q_STATUS_HAS_NO_NEW_LETTER;
+    close;
 
 L_Airlia_intro:
-	mes "[Airlia]";
-	mes "\"My poor father, doomed to that awful cemetery.\"";
-	next;
-
-	// CASE REMOVED:
-	// This step is pointless and just forces the player to make a selection that doesn't effect anything.
-	// ALSO it misses the case where QUEST_Graveyard_Caretaker == 3, in this case it proceeds to the message without wasting player clicks
-	// Removing this check will make execution the same for QUEST_Graveyard_Caretaker == 3 and QUEST_Graveyard_Caretaker == 4
-	// If for some reason this is desireable, uncomment it and make sure to catch the extra case mentioned
-	//
-	//if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NO_NEW_LETTER)
-	//	menu
-	//		"...", -;
-
-	if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
-		menu
-			"...", -,
-			"Oh, I have a letter from him.", L_Caretaker_later_rewards;
-
-	mes "[Airlia]";
-	mes "\"You know, there are many who believe that each time the undead rise after being killed, they lose mana.";
-	mes "Eventually, there will not be enough mana for them to rise again and they can be at rest. Do you believe this is true?\"";
-	next;
-
-	menu
-		"I believe so, yes.", L_Airlia_intro_mana_loss,
-		"Maybe...", L_Airlia_intro_mana_loss,
-		"No, that is not proven.", -;
-
-	mes "[Airlia]";
-	mes "\"Oh...\"";
-	close;
+    mes "[Airlia]";
+    mes "\"My poor father, doomed to that awful cemetery.\"";
+    next;
+
+    // CASE REMOVED:
+    // This step is pointless and just forces the player to make a selection that doesn't effect anything.
+    // ALSO it misses the case where QUEST_Graveyard_Caretaker == 3, in this case it proceeds to the message without wasting player clicks
+    // Removing this check will make execution the same for QUEST_Graveyard_Caretaker == 3 and QUEST_Graveyard_Caretaker == 4
+    // If for some reason this is desireable, uncomment it and make sure to catch the extra case mentioned
+    //
+    //if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NO_NEW_LETTER)
+    //    menu
+    //        "...", -;
+
+    if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
+        menu
+            "...", -,
+            "Oh, I have a letter from him.", L_Caretaker_later_rewards;
+    mes "[Airlia]";
+    mes "\"You know, there are many who believe that each time the undead rise after being killed, they lose mana.";
+    mes "Eventually, there will not be enough mana for them to rise again and they can be at rest. Do you believe this is true?\"";
+    next;
+    menu
+        "I believe so, yes.", L_Airlia_intro_mana_loss,
+        "Maybe...", L_Airlia_intro_mana_loss,
+        "No, that is not proven.", -;
+    mes "[Airlia]";
+    mes "\"Oh...\"";
+    close;
 
 L_Airlia_intro_mana_loss:
-	mes "[Airlia]";
-	mes "\"When I am not working, I recruit help for the esteemed Fighters of the Undead, or FoU.";
-	mes "They are an official group effort of the Warriors' Guild and Magicians, you know, a very prestigious group.\"";
-	next;
-
-	menu
-		"...", L_Airlia_intro_fou,
-		"I have heard of them.", L_Airlia_intro_fou,
-		"Keep up the good work. I have to go now, bye.", -;
-	close;
+    mes "[Airlia]";
+    mes "\"When I am not working, I recruit help for the esteemed Fighters of the Undead, or FoU.";
+    mes "They are an official group effort of the Warriors' Guild and Magicians, you know, a very prestigious group.\"";
+    next;
+    menu
+        "...", L_Airlia_intro_fou,
+        "I have heard of them.", L_Airlia_intro_fou,
+        "Keep up the good work. I have to go now, bye.", -;
+    close;
 
 L_Airlia_intro_fou:
-	mes "[Airlia]";
-	mes "\"If we drain those evil creatures of their mana, I can get my father back. He is getting very old. Will you help us?\"";
-	next;
-
-	menu
-		"Of course I will.", L_Airlia_intro_fight,
-		"Sure, I guess.", L_Airlia_intro_fight,
-		"Thanks, but no thanks. I have other business to attend to.", -;
-	close;
+    mes "[Airlia]";
+    mes "\"If we drain those evil creatures of their mana, I can get my father back. He is getting very old. Will you help us?\"";
+    next;
+    menu
+        "Of course I will.", L_Airlia_intro_fight,
+        "Sure, I guess.", L_Airlia_intro_fight,
+        "Thanks, but no thanks. I have other business to attend to.", -;
+    close;
 
 L_Airlia_intro_fight:
-	mes "[Airlia]";
-	mes "\"Great, just kill any of the undead creatures you can and bring me proof of your work, and I will put in a word for you with the guild.\"";
-	next;
-
-	menu
-		"I'm on it.", -,
-		"What sort of proof?", L_Airlia_intro_proof;
-
-	set QUEST_Airlia, @Q_STATUS_HELP_AIRLIA;
-	close;
+    mes "[Airlia]";
+    mes "\"Great, just kill any of the undead creatures you can and bring me proof of your work, and I will put in a word for you with the guild.\"";
+    next;
+    menu
+        "I'm on it.", -,
+        "What sort of proof?", L_Airlia_intro_proof;
+    set QUEST_Airlia, @Q_STATUS_HELP_AIRLIA;
+    close;
 
 L_Airlia_intro_proof:
-	mes "[Airlia]";
-	mes "\"Let's say " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s. You don't know how much this means to me, thank you.\"";
-	set QUEST_Airlia, @Q_STATUS_HELP_AIRLIA;
-	close;
+    mes "[Airlia]";
+    mes "\"Let's say " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s. You don't know how much this means to me, thank you.\"";
+    set QUEST_Airlia, @Q_STATUS_HELP_AIRLIA;
+    close;
 
 L_Fetch:
-	mes "[Airlia]";
-	mes "\"Thank you for helping my father.\"";
-	next;	
-	
-	// Make sure to check if the player has a letter to deliver.
-	// If the check is not made then there is a bug, where the player
-	// has a letter but has not completed the initial fetch
-	// and is prevented from turing in the letter until the fetch is completed.
-	// 
-	if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
-		menu
-			"You are welcome.", -,
-			"I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
-
-	if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
-		menu
-			"You are welcome.", -,
-			"I have another letter from your father.", L_Caretaker_later_rewards,
-			"I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
-
-	// The following checks are REDUNDANT
-	// The only way to get to this lable is after a check for QUEST_Airlia == @Q_STATUS_HELP_AIRLIA
-	// Incase you weren't paying attention: @Q_STATUS_HELP_AIRLIA = 1 < @Q_STATUS_INITIAL_FETCH_REWARDED
-	// Note: proper handling of the first case is done above.
-	//       The second case never gets executed anyway and not handled.
-	//
-	//if (QUEST_Airlia < @Q_STATUS_INITIAL_FETCH_REWARDED)
-	//	menu
-	//		"You are welcome.", -,
-	//		"I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
-	//
-	//if (QUEST_Airlia == @Q_STATUS_INITIAL_FETCH_REWARDED)
-	//	menu
-	//		"You are welcome.", -,
-	//		"I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
-	
-	close;
+    mes "[Airlia]";
+    mes "\"Thank you for helping my father.\"";
+    next;
+
+    // Make sure to check if the player has a letter to deliver.
+    // If the check is not made then there is a bug, where the player
+    // has a letter but has not completed the initial fetch
+    // and is prevented from turing in the letter until the fetch is completed.
+
+    if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
+        menu
+            "You are welcome.", -,
+            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+    if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
+        menu
+            "You are welcome.", -,
+            "I have another letter from your father.", L_Caretaker_later_rewards,
+            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+
+    // The following checks are REDUNDANT
+    // The only way to get to this lable is after a check for QUEST_Airlia == @Q_STATUS_HELP_AIRLIA
+    // Incase you weren't paying attention: @Q_STATUS_HELP_AIRLIA = 1 < @Q_STATUS_INITIAL_FETCH_REWARDED
+    // Note: proper handling of the first case is done above.
+    //       The second case never gets executed anyway and not handled.
+    //
+    //if (QUEST_Airlia < @Q_STATUS_INITIAL_FETCH_REWARDED)
+    //    menu
+    //        "You are welcome.", -,
+    //        "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+    //
+    //if (QUEST_Airlia == @Q_STATUS_INITIAL_FETCH_REWARDED)
+    //    menu
+    //        "You are welcome.", -,
+    //        "I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+
+    close;
 
 L_Fetch_initial_reward:
-	if (countitem(@FETCH_LABEL_INITIAL$) < @FETCH_AMOUNT_INITIAL) goto L_Fetch_not_enough;
-
-	mes "[Airlia]";
-	mes "\"Excellent work. You are definitely a great warrior. I will tell the guild of your deeds.\"";
-	if (@FETCH_REWARD_GOLD_INITIAL > 0)
-		mes "[" + @FETCH_REWARD_GOLD_INITIAL + " GP]";
-	if (@FETCH_REWARD_EXP_INITIAL > 0)
-		mes "[" + @FETCH_REWARD_EXP_INITIAL + " experience points]";
-	delitem @FETCH_LABEL_INITIAL$, @FETCH_AMOUNT_INITIAL;
-	set zeny, zeny + @FETCH_REWARD_GOLD_INITIAL;
-	getexp @FETCH_REWARD_EXP_INITIAL, 0;
-	set QUEST_Airlia, @Q_STATUS_INITIAL_FETCH_REWARDED;
-	next;
-
-	mes "[Airlia]";
-	// TODO: Write the dialogue when I'm not tired...
-	mes "\"Oh, before you leave. We all must do what we can to stop this tragedy.";
-	mes "If you are willing to keep draining the undead of mana, I will give you what gold I can afford as a token of my gratitude.\"";
-	close;
+    if (countitem(@FETCH_LABEL_INITIAL$) < @FETCH_AMOUNT_INITIAL) goto L_Fetch_not_enough;
+    mes "[Airlia]";
+    mes "\"Excellent work. You are definitely a great warrior. I will tell the guild of your deeds.\"";
+    if (@FETCH_REWARD_GOLD_INITIAL > 0)
+        mes "[" + @FETCH_REWARD_GOLD_INITIAL + " GP]";
+    if (@FETCH_REWARD_EXP_INITIAL > 0)
+        mes "[" + @FETCH_REWARD_EXP_INITIAL + " experience points]";
+    delitem @FETCH_LABEL_INITIAL$, @FETCH_AMOUNT_INITIAL;
+    set zeny, zeny + @FETCH_REWARD_GOLD_INITIAL;
+    getexp @FETCH_REWARD_EXP_INITIAL, 0;
+    set QUEST_Airlia, @Q_STATUS_INITIAL_FETCH_REWARDED;
+    next;
+    mes "[Airlia]";
+    // TODO: Write the dialogue when I'm not tired...
+    mes "\"Oh, before you leave. We all must do what we can to stop this tragedy.";
+    mes "If you are willing to keep draining the undead of mana, I will give you what gold I can afford as a token of my gratitude.\"";
+    close;
 
 L_Fetch_later_rewards:
-	if (countitem(@FETCH_LABEL$) < @FETCH_AMOUNT) goto L_Fetch_not_enough;
-
-	mes "[Airlia]";
-	mes "\"Excellent work. You are definitely a great warrior.\"";
-	if (@FETCH_REWARD_GOLD > 0)
-		mes "[" + @FETCH_REWARD_GOLD + " GP]";
-	if (@FETCH_REWARD_EXP > 0)
-		mes "[" + @FETCH_REWARD_EXP + " experience points]";
-	delitem @FETCH_LABEL$, @FETCH_AMOUNT;
-	set zeny, zeny + @FETCH_REWARD_GOLD;
-	getexp @FETCH_REWARD_EXP, 0;
-	close;
+    if (countitem(@FETCH_LABEL$) < @FETCH_AMOUNT)
+        goto L_Fetch_not_enough;
+    mes "[Airlia]";
+    mes "\"Excellent work. You are definitely a great warrior.\"";
+    if (@FETCH_REWARD_GOLD > 0)
+        mes "[" + @FETCH_REWARD_GOLD + " GP]";
+    if (@FETCH_REWARD_EXP > 0)
+        mes "[" + @FETCH_REWARD_EXP + " experience points]";
+    delitem @FETCH_LABEL$, @FETCH_AMOUNT;
+    set zeny, zeny + @FETCH_REWARD_GOLD;
+    getexp @FETCH_REWARD_EXP, 0;
+    close;
 
 L_Fetch_not_enough:
-	mes "[Airlia]";
-	mes "\"I'm sorry, I didn't realize you couldn't count. Perhaps when I have some free time, I can help you learn if you'd like.\"";
-	close;
+    mes "[Airlia]";
+    mes "\"I'm sorry, I didn't realize you couldn't count. Perhaps when I have some free time, I can help you learn if you'd like.\"";
+    close;
 
 L_Rewarded:
-	mes "[Airlia]";
-	mes "\"Thank you for your help.\"";
-	next;
-
-	if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
-		menu
-			"You are welcome.", -,
-			"I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
-
-	if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
-		menu
-			"You are welcome.", -,
-			"I have another letter from your father.", L_Caretaker_later_rewards,
-			"I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
-
-	close;
+    mes "[Airlia]";
+    mes "\"Thank you for your help.\"";
+    next;
+    if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
+        menu
+            "You are welcome.", -,
+            "I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+    if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
+        menu
+            "You are welcome.", -,
+            "I have another letter from your father.", L_Caretaker_later_rewards,
+            "I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+    close;
 }
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index f19990d9..1eeb51f0 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -8,217 +8,213 @@
 //#################################################################################
 
 // Archer Shop Master
-009-2.gat,99,23,0	script	Alan	125, {
-	set @Q_MASK, NIBBLE_0_MASK;
-	set @Q_SHIFT, NIBBLE_0_SHIFT;
-
-        set @Q_status, ((QUEST_Forestbow_state) & @Q_MASK) >> @Q_SHIFT;
-
-	if (@Q_status == 1) goto L_State_1;
-	if (@Q_status == 2) goto L_State_2;
-	if (@Q_status == 3) goto L_State_3;
-	if (@Q_status == 4) goto L_State_4;
-	if (@Q_status == 5) goto L_State_5;
-
-	mes "[Alan]";
-	mes "\"When you want to buy something then please speak to my apprentice. I am only doing special requests.\"";
-	next;
-	if (Inspector == 1)
-		menu
-			"OK, thanks.", -,
-			"Can you make me a really good bow?", L_State_0_1,
-			"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-	if (Inspector != 1)
-		menu
-			"OK, thanks.", -,
-			"Can you make me a really good bow?", L_State_0_1;
-	close;
+009-2.gat,99,23,0|script|Alan|125,{
+    set @Q_MASK, NIBBLE_0_MASK;
+    set @Q_SHIFT, NIBBLE_0_SHIFT;
+
+    set @Q_status, ((QUEST_Forestbow_state) & @Q_MASK) >> @Q_SHIFT;
+
+    if (@Q_status == 1) goto L_State_1;
+    if (@Q_status == 2) goto L_State_2;
+    if (@Q_status == 3) goto L_State_3;
+    if (@Q_status == 4) goto L_State_4;
+    if (@Q_status == 5) goto L_State_5;
+
+    mes "[Alan]";
+    mes "\"When you want to buy something then please speak to my apprentice. I am only doing special requests.\"";
+    next;
+    if (Inspector == 1)
+        menu
+            "OK, thanks.", -,
+            "Can you make me a really good bow?", L_State_0_1,
+            "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
+    if (Inspector != 1)
+        menu
+            "OK, thanks.", -,
+            "Can you make me a really good bow?", L_State_0_1;
+    close;
 
 L_State_0_1:
-	mes "[Alan]";
-	mes "\"You mean like one of my legendary forest bows?\"";
-	next;
-	menu
-		"Yes, that would be nice.", -;
-	mes "[Alan]";
-	mes "\"Sorry, I am not making these anymore.\"";
-	next;
-	menu
-		"Oh, too bad.", -,
-		"What? Why not?", L_State_0_2;
-	close;
+    mes "[Alan]";
+    mes "\"You mean like one of my legendary forest bows?\"";
+    next;
+    menu
+        "Yes, that would be nice.", -;
+    mes "[Alan]";
+    mes "\"Sorry, I am not making these anymore.\"";
+    next;
+    menu
+        "Oh, too bad.", -,
+        "What? Why not?", L_State_0_2;
+    close;
 
 L_State_0_2:
-	mes "[Alan]";
-	mes "\"The problem is that I am short of material. My forestbows are not made of regular wood, you know.";
-	mes "They are made of special living wood. And only the best logs of living wood are good enough for them.";
-	mes "I used to get these logs from Jack, the lumberjack. But the last time I asked him for a new delivery he said that he would never again get any for me.\"";
-
-	set @Q_status, 1;
-        callsub S_Update_Var;
-
-	next;
-	menu
-		"Too bad.", -,
-		"Did you ask him why?", L_State_0_3;
-	close;
+    mes "[Alan]";
+    mes "\"The problem is that I am short of material. My forestbows are not made of regular wood, you know.";
+    mes "They are made of special living wood. And only the best logs of living wood are good enough for them.";
+    mes "I used to get these logs from Jack, the lumberjack. But the last time I asked him for a new delivery he said that he would never again get any for me.\"";
+    set @Q_status, 1;
+    callsub S_Update_Var;
+    next;
+    menu
+        "Too bad.", -,
+        "Did you ask him why?", L_State_0_3;
+    close;
 
 L_State_0_3:
-	mes "[Alan]";
-	mes "\"Sure I did. But he just told me to leave him alone. Maybe you could ask him what's wrong?\"";
-	next;
-	menu
-		"OK, I'll ask him.", -,
-		"I am sure he got his reasons.", -;
-	close;
+    mes "[Alan]";
+    mes "\"Sure I did. But he just told me to leave him alone. Maybe you could ask him what's wrong?\"";
+    next;
+    menu
+        "OK, I'll ask him.", -,
+        "I am sure he got his reasons.", -;
+    close;
 
 L_State_1:
-	mes "[Alan]";
-	mes "\"Did you already ask Jack why he won't deliver me any more living wood?\"";
-	next;
-	if (Inspector == 1)
-		menu
-			"No, I haven't had the time yet.", -,
-			"No, I didn't find him yet.", L_State_1_1,
-			"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-	if (Inspector != 1)
-		menu
-			"No, I haven't had the time yet.", -,
-			"No, I didn't find him yet.", L_State_1_1;
-	close;
+    mes "[Alan]";
+    mes "\"Did you already ask Jack why he won't deliver me any more living wood?\"";
+    next;
+    if (Inspector == 1)
+        menu
+            "No, I haven't had the time yet.", -,
+            "No, I didn't find him yet.", L_State_1_1,
+            "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
+    if (Inspector != 1)
+        menu
+            "No, I haven't had the time yet.", -,
+            "No, I didn't find him yet.", L_State_1_1;
+    close;
 
 L_State_1_1:
-	mes "[Alan]";
-	mes "\"When you leave my shop just go southwest over the village plaza. You can't miss it.\"";
-	close;
+    mes "[Alan]";
+    mes "\"When you leave my shop just go southwest over the village plaza. You can't miss it.\"";
+    close;
 
 L_State_2:
-	mes "[Alan]";
-	mes "\"Did you already ask Jack why he won't deliver me any more living wood?\"";
-	next;
-	if (Inspector == 1)
-		menu
-			"Yes, I did. He said that the trees turned into dangerous monsters.", -,
-			"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-	if (Inspector != 1)
-		menu
-			"Yes, I did. He said that the trees turned into dangerous monsters.", -;
-	mes "[Alan]";
-	mes "\"Oh, that's really bad news. Maybe you can do his job?";
-	mes "When you kill some of these tree monsters and bring me their wood I can take a look at them.";
-	mes "Maybe you will find a piece of wood that is strong enough to become one of my forest bows.\"";
-
-	set @Q_status, 3;
-        callsub S_Update_Var;
-
-	close;
+    mes "[Alan]";
+    mes "\"Did you already ask Jack why he won't deliver me any more living wood?\"";
+    next;
+    if (Inspector == 1)
+        menu
+            "Yes, I did. He said that the trees turned into dangerous monsters.", -,
+            "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
+    if (Inspector != 1)
+        menu
+            "Yes, I did. He said that the trees turned into dangerous monsters.", -;
+    mes "[Alan]";
+    mes "\"Oh, that's really bad news. Maybe you can do his job?";
+    mes "When you kill some of these tree monsters and bring me their wood I can take a look at them.";
+    mes "Maybe you will find a piece of wood that is strong enough to become one of my forest bows.\"";
+    set @Q_status, 3;
+    callsub S_Update_Var;
+    close;
 
 L_State_3:
-	mes "[Alan]";
-	mes "\"How is the hunt going? Did you bring me any wood?\"";
-	if (countitem(569) < 1) close;
-	next;
-	if (Inspector == 1)
-		menu
-			"Here, take a look!", L_State_3_try,
-			"Yes, but I need it for something else.", -,
-			"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-	if (Inspector != 1)
-		menu
-			"Here, take a look!", L_State_3_try,
-			"Yes, but I need it for something else.", -;
-	close;
+    mes "[Alan]";
+    mes "\"How is the hunt going? Did you bring me any wood?\"";
+    if (countitem(569) < 1) close;
+    next;
+    if (Inspector == 1)
+        menu
+            "Here, take a look!", L_State_3_try,
+            "Yes, but I need it for something else.", -,
+            "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
+    if (Inspector != 1)
+        menu
+            "Here, take a look!", L_State_3_try,
+            "Yes, but I need it for something else.", -;
+    close;
 
 L_State_3_try:
-	if (countitem(569) < 1) goto L_No_Log;
-	delitem "RawLog", 1;
-	mes "[Alan]";
-	mes "\"Hmmm... looks ok, but is it strong enough?\"";
-	mes "Alan bends the log over his knee.";
-	next;
-	set @Temp1, rand(20);
-	if (@Temp1 == 0) goto L_State_3_success;
-	mes "The log breaks with a loud crack.";
-	next;
-	mes "[Alan]";
-	mes "\"Sorry, this log was too weak for one of my forest bows. Now it is junk. Give me another.\"";
-	if (countitem(569) < 1) close;
-	next;
-	menu
-		"Sure, here you go.", L_State_3_try,
-		"Hey! Stop breaking my stuff!", -;
-	close;
+    if (countitem(569) < 1)
+        goto L_No_Log;
+    delitem "RawLog", 1;
+    mes "[Alan]";
+    mes "\"Hmmm... looks ok, but is it strong enough?\"";
+    mes "Alan bends the log over his knee.";
+    next;
+    set @Temp1, rand(20);
+    if (@Temp1 == 0) goto L_State_3_success;
+    mes "The log breaks with a loud crack.";
+    next;
+    mes "[Alan]";
+    mes "\"Sorry, this log was too weak for one of my forest bows. Now it is junk. Give me another.\"";
+    if (countitem(569) < 1) close;
+    next;
+    menu
+        "Sure, here you go.", L_State_3_try,
+        "Hey! Stop breaking my stuff!", -;
+    close;
 
 L_State_3_success:
-	mes "Alan tries as hard as he can but the log won't bend.";
-	next;
-	mes "[Alan]";
-	mes "\"Aaah! Yes! That is a really fine piece of wood you brought me. It will make an excellent bow!\"";
-	next;
-	set @Q_status, 4;
-        callsub S_Update_Var;
+    mes "Alan tries as hard as he can but the log won't bend.";
+    next;
+    mes "[Alan]";
+    mes "\"Aaah! Yes! That is a really fine piece of wood you brought me. It will make an excellent bow!\"";
+    next;
+    set @Q_status, 4;
+    callsub S_Update_Var;
 
 L_State_4:
-	mes "[Alan]";
-	mes "\"I can make you a really nice forest bow out of this. I just need 10,000 GP for material and work time.\"";
-	next;
-	if (Inspector == 1)
-		menu
-			"10,000??? What a ripoff!", -,
-			"Sure, here you go!", L_State_4_pay,
-			"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-	if (Inspector != 1)
-		menu
-			"10,000??? What a ripoff!", -,
-			"Sure, here you go!", L_State_4_pay;
-	close;
+    mes "[Alan]";
+    mes "\"I can make you a really nice forest bow out of this. I just need 10,000 GP for material and work time.\"";
+    next;
+    if (Inspector == 1)
+        menu
+            "10,000??? What a ripoff!", -,
+            "Sure, here you go!", L_State_4_pay,
+            "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
+    if (Inspector != 1)
+        menu
+            "10,000??? What a ripoff!", -,
+            "Sure, here you go!", L_State_4_pay;
+    close;
 
 L_State_4_pay:
-	if (zeny < 10000) goto L_State_4_nocash;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_State_4_TooMany;
-	set zeny, zeny - 10000;
-	getitem "ForestBow", 1;
-	set @Q_status, 5;
-        callsub S_Update_Var;
-	mes "[Alan]";
-	mes "\"Here you go - have fun with it.\"";
-	close;
+    if (zeny < 10000)
+        goto L_State_4_nocash;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_State_4_TooMany;
+    set zeny, zeny - 10000;
+    getitem "ForestBow", 1;
+    set @Q_status, 5;
+    callsub S_Update_Var;
+    mes "[Alan]";
+    mes "\"Here you go - have fun with it.\"";
+    close;
 
 L_State_4_nocash:
-	mes "[Alan]";
-	mes "\"Seems like you are out of cash.\"";
-	close;
+    mes "[Alan]";
+    mes "\"Seems like you are out of cash.\"";
+    close;
 
 L_State_4_TooMany:
-	mes "[Alan]";
-	mes "\"Seems like you don't have room for this bow. Come back later.\"";
-	close;
+    mes "[Alan]";
+    mes "\"Seems like you don't have room for this bow. Come back later.\"";
+    close;
 
 L_State_5:
-	mes "[Alan]";
-	mes "\"I hope you are satisfied with your forest bow. It is one of my best works.\"";
-	next;
-
-	if (Inspector == 1)
-		menu
-			"I am!", -,
-			"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-	close;
+    mes "[Alan]";
+    mes "\"I hope you are satisfied with your forest bow. It is one of my best works.\"";
+    next;
+    if (Inspector == 1)
+        menu
+            "I am!", -,
+            "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
+    close;
 
 L_NohMask_Answer:
-	mes "[Alan]";
-	mes "\"No.\"";
-	close;
+    mes "[Alan]";
+    mes "\"No.\"";
+    close;
 
 L_No_Log:
-	mes "[Alan]";
-	mes "\"Where should I look at? You don't have a raw log.\"";
-	close;
+    mes "[Alan]";
+    mes "\"Where should I look at? You don't have a raw log.\"";
+    close;
 
 S_Update_Var:
-        set QUEST_Forestbow_state,
-        	(QUEST_Forestbow_state & ~(@Q_MASK)
-                | (@Q_status << @Q_SHIFT));
-        return;
+    set QUEST_Forestbow_state, (QUEST_Forestbow_state & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
+    return;
 }
diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt
index 2fbfcbd1..7b6931e0 100644
--- a/world/map/npc/009-2/doctor.txt
+++ b/world/map/npc/009-2/doctor.txt
@@ -1,81 +1,78 @@
 // Doctor
 
-009-2.gat,148,25,0	script	Doctor	107,{
-	if (getequipid(equip_head) == 616) goto L_Axe;
-	if (getequipid(equip_head) == 621) goto L_Eyepatch;
+009-2.gat,148,25,0|script|Doctor|107,{
+    if (getequipid(equip_head) == 616) goto L_Axe;
+    if (getequipid(equip_head) == 621) goto L_Eyepatch;
 
-	mes "[Doctor]";
-	mes "\"Hello, can I help you?\"";
-	next;
+    mes "[Doctor]";
+    mes "\"Hello, can I help you?\"";
+    next;
 
-	if (Inspector == 1)
-		menu
-			"I think I am sick!", L_Cure,
-			"No, I feel fine.", -,
-			"Have you seen anything strange in town? Anything that might have to do with the robberies?", L_NohMask;
-	if (Inspector != 1)
-		menu
-			"I think I am sick!", L_Cure,
-			"No, I feel fine.", -;
+    if (Inspector == 1)
+        menu
+            "I think I am sick!", L_Cure,
+            "No, I feel fine.", -,
+            "Have you seen anything strange in town? Anything that might have to do with the robberies?", L_NohMask;
+    if (Inspector != 1)
+        menu
+            "I think I am sick!", L_Cure,
+            "No, I feel fine.", -;
 
-	mes "[Doctor]";
-	mes "\"Then please stop wasting my precious time.\"";
-	close;
+    mes "[Doctor]";
+    mes "\"Then please stop wasting my precious time.\"";
+    close;
 
 L_Cure:
-	mes "[Doctor]";
-        if (sc_check(sc_poison))
-		goto L_CurePoison;
-        mes "The doctor examines you briefly.";
-	mes "\"Nonsense!  You look fine and dandy to me.  All you need is a bit more exercise and fresh fruit in your diet!\"";
-	close;
+    mes "[Doctor]";
+    if (sc_check(sc_poison)) goto L_CurePoison;
+    mes "The doctor examines you briefly.";
+    mes "\"Nonsense!  You look fine and dandy to me.  All you need is a bit more exercise and fresh fruit in your diet!\"";
+    close;
 
 L_CurePoison:
-	mes "\"Well, well, well!  Look at all those green bubbles coming out of your head; that looks like poisoning to me!  Did you eat something rotten?\"";
-        next;
-	mes "[Doctor]";
-        mes "The doctor pulls out a syringe and fills it with a white liquid from a jar on his desk.";
-        mes "\"Now hold still, this won't hurt a bit...\"";
-        next;
-	mes "[Doctor]";
-        sc_end(sc_poison);
-        sc_end(sc_slowpoison);
-	mes "*Ouch!*";
-	mes "\"Next time, be more careful!  Make sure to cook any meats before you eat them, and don't eat fish once it starts to smell.\"";
-        close;
+    mes "\"Well, well, well!  Look at all those green bubbles coming out of your head; that looks like poisoning to me!  Did you eat something rotten?\"";
+    next;
+    mes "[Doctor]";
+    mes "The doctor pulls out a syringe and fills it with a white liquid from a jar on his desk.";
+    mes "\"Now hold still, this won't hurt a bit...\"";
+    next;
+    mes "[Doctor]";
+    sc_end(sc_poison);
+    sc_end(sc_slowpoison);
+    mes "*Ouch!*";
+    mes "\"Next time, be more careful!  Make sure to cook any meats before you eat them, and don't eat fish once it starts to smell.\"";
+    close;
 
 L_Axe:
-	mes "[Doctor]";
-	mes "\"Oh my, what happened to you?\"";
-	next;
-	mes "[Doctor]";
-	mes "\"Wait. Thats just a fake. Shame on you!\"";
-	close;
+    mes "[Doctor]";
+    mes "\"Oh my, what happened to you?\"";
+    next;
+    mes "[Doctor]";
+    mes "\"Wait. Thats just a fake. Shame on you!\"";
+    close;
 
 L_Eyepatch:
-	mes "[Doctor]";
-	mes "\"Would you like a glass eye to replace that eye patch you have? We just got a whole load of them in today. I'll even let you keep the patch as a souvenir.\"";
-	next;
-	menu
-		"Yes, please.", L_Eyepatch_GlassEye,
-		"No thank you", -;
-
-	mes "[Doctor]";
-	mes "\"If you change your mind, please come back and see me.\"";
-	close;
+    mes "[Doctor]";
+    mes "\"Would you like a glass eye to replace that eye patch you have? We just got a whole load of them in today. I'll even let you keep the patch as a souvenir.\"";
+    next;
+    menu
+        "Yes, please.", L_Eyepatch_GlassEye,
+        "No thank you", -;
+    mes "[Doctor]";
+    mes "\"If you change your mind, please come back and see me.\"";
+    close;
 
 L_Eyepatch_GlassEye:
-	mes "[Doctor]";
-	mes "\"Now, where did I put that box of eyes...\"";
-	mes "He goes off to look for them and comes back empty handed.";
-	next;
-
-	mes "[Doctor]";
-	mes "\"I can't seem to find where I put that box. You should come back later, I may have found them by then.\"";
-	close;
+    mes "[Doctor]";
+    mes "\"Now, where did I put that box of eyes...\"";
+    mes "He goes off to look for them and comes back empty handed.";
+    next;
+    mes "[Doctor]";
+    mes "\"I can't seem to find where I put that box. You should come back later, I may have found them by then.\"";
+    close;
 
 L_NohMask:
-	mes "[Doctor]";
-	mes "\"No, I haven't seen anything.\"";
-	close;
+    mes "[Doctor]";
+    mes "\"No, I haven't seen anything.\"";
+    close;
 }
diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt
index 61246b4e..a20a0c91 100644
--- a/world/map/npc/009-2/drunks.txt
+++ b/world/map/npc/009-2/drunks.txt
@@ -1,16 +1,16 @@
 //Left drinking contest guy
 
-009-2.gat,65,55,0	script	Drinker	121, {
-	mes "[Binge Drinker]";
-	mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\"";
-	close;
+009-2.gat,65,55,0|script|Drinker|121,{
+    mes "[Binge Drinker]";
+    mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\"";
+    close;
 }
 
 //Right drinking contest guy
 
-009-2.gat,68,55,0	script	Drinker	121, {
-	mes "[Binge Drinker]";
-	mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\"";
-	//I know it's called "teetotaler". That error is on purpose.
-	close;
+009-2.gat,68,55,0|script|Drinker|121,{
+    mes "[Binge Drinker]";
+    mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\"";
+    //I know it's called "teetotaler". That error is on purpose.
+    close;
 }
diff --git a/world/map/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt
index f25d026a..e1461584 100644
--- a/world/map/npc/009-2/inspector.txt
+++ b/world/map/npc/009-2/inspector.txt
@@ -1,127 +1,125 @@
 //
 
-009-2.gat,24,99,0	script	Inspector#Hurnscald	150,{
-	if (Inspector == 0 && BaseLevel >= 30) goto L_NohMask_Start;
-	if (Inspector == 1) goto L_NohMask_AskVillage;
-	if (Inspector == 2) goto L_NohMask_OldWoman;
-	if (Inspector == 3) goto L_NohMask_TheaterMask;
-	if (Inspector == 4) goto L_NohMask_TravelingTroupe;
-	if (Inspector == 5) goto L_NohMask_OldMan;
-	if (Inspector == 6) goto L_NohMask_OldMan_2;
-	if (Inspector == 7) goto L_NohMask_Alibi;
-	if (Inspector == 8) goto L_NohMask_Alibi_2;
-	if (Inspector == 9) goto L_NohMask_Alibi_3;
-	if (Inspector == 10) goto L_NohMask_Satchel;
-	if (Inspector == 11) goto L_NohMask_Basement;
-	if (Inspector == 12) goto L_NohMask_Note;
-	if (Inspector == 13) goto L_NohMask_TravelingTroupe_2;
-	if (Inspector == 14) goto L_NohMask_Over;
-	if (Inspector == 15) goto L_NohMask_End;
-	mes "[Inspector]";
-	mes "\"I'm sorry, but I'm busy looking into this string of robberies.\"";
-	close;
+009-2.gat,24,99,0|script|Inspector#Hurnscald|150,{
+    if (Inspector == 0 && BaseLevel >= 30) goto L_NohMask_Start;
+    if (Inspector == 1) goto L_NohMask_AskVillage;
+    if (Inspector == 2) goto L_NohMask_OldWoman;
+    if (Inspector == 3) goto L_NohMask_TheaterMask;
+    if (Inspector == 4) goto L_NohMask_TravelingTroupe;
+    if (Inspector == 5) goto L_NohMask_OldMan;
+    if (Inspector == 6) goto L_NohMask_OldMan_2;
+    if (Inspector == 7) goto L_NohMask_Alibi;
+    if (Inspector == 8) goto L_NohMask_Alibi_2;
+    if (Inspector == 9) goto L_NohMask_Alibi_3;
+    if (Inspector == 10) goto L_NohMask_Satchel;
+    if (Inspector == 11) goto L_NohMask_Basement;
+    if (Inspector == 12) goto L_NohMask_Note;
+    if (Inspector == 13) goto L_NohMask_TravelingTroupe_2;
+    if (Inspector == 14) goto L_NohMask_Over;
+    if (Inspector == 15) goto L_NohMask_End;
+    mes "[Inspector]";
+    mes "\"I'm sorry, but I'm busy looking into this string of robberies.\"";
+    close;
 
 L_NohMask_Start:
-	mes "\"Hmm...what to do.\"";
-	mes "He looks up and into your face.";
-	next;
-
-	mes "[Inspector]";
-	mes "\"You look capable, will you help me solve these robberies?\"";
-	next;
-
-	menu
-		"Yes", L_NohMask_Accept,
-		"No", -;
-	close;
+    mes "\"Hmm...what to do.\"";
+    mes "He looks up and into your face.";
+    next;
+    mes "[Inspector]";
+    mes "\"You look capable, will you help me solve these robberies?\"";
+    next;
+    menu
+        "Yes", L_NohMask_Accept,
+        "No", -;
+    close;
 
 L_NohMask_Accept:
-	set Inspector, 1;
-	mes "[Inspector]";
-	mes "\"Ok then. I'd like you to ask the villagers about the recent string of robberies.\"";
-	close;
+    set Inspector, 1;
+    mes "[Inspector]";
+    mes "\"Ok then. I'd like you to ask the villagers about the recent string of robberies.\"";
+    close;
 
 L_NohMask_AskVillage:
-	mes "[Inspector]";
-	mes "\"Please continue talking to the villagers.\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Please continue talking to the villagers.\"";
+    close;
 
 L_NohMask_OldWoman:
-	mes "[Inspector]";
-	mes "\"Hm...I don't know if I trust her eyesight or memory. See if someone else knows anything.\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Hm...I don't know if I trust her eyesight or memory. See if someone else knows anything.\"";
+    close;
 
 L_NohMask_TheaterMask:
-	set Inspector, 4;
-	mes "[Inspector]";
-	mes "\"Someone in a theater mask, eh? There was a traveling theater troupe in town recently, but they've moved on to Tulimshar. Please go talk to their leader about this.\"";
-	close;
+    set Inspector, 4;
+    mes "[Inspector]";
+    mes "\"Someone in a theater mask, eh? There was a traveling theater troupe in town recently, but they've moved on to Tulimshar. Please go talk to their leader about this.\"";
+    close;
 
 L_NohMask_TravelingTroupe:
-	mes "[Inspector]";
-	mes "\"Please go talk to the leader of the traveling troupe about the theater mask.\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Please go talk to the leader of the traveling troupe about the theater mask.\"";
+    close;
 
 L_NohMask_OldMan:
-	set Inspector, 6;
-	mes "[Inspector]";
-	mes "\"Hm...an old man? Could you interrogate him for me?\"";
-	close;
+    set Inspector, 6;
+    mes "[Inspector]";
+    mes "\"Hm...an old man? Could you interrogate him for me?\"";
+    close;
 
 L_NohMask_OldMan_2:
-	mes "[Inspector]";
-	mes "\"Have you talked with the old man yet?\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Have you talked with the old man yet?\"";
+    close;
 
 L_NohMask_Alibi:
-	mes "[Inspector]";
-	mes "\"Can you verify that with his wife?\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Can you verify that with his wife?\"";
+    close;
 
 L_NohMask_Alibi_2:
-	set Inspector, 9;
-	mes "[Inspector]";
-	mes "\"Hm...then it couldn't be him. I'm not sure where to go from here, maybe you can find something else. Try talking to everyone again.\"";
-	close;
+    set Inspector, 9;
+    mes "[Inspector]";
+    mes "\"Hm...then it couldn't be him. I'm not sure where to go from here, maybe you can find something else. Try talking to everyone again.\"";
+    close;
 
 L_NohMask_Alibi_3:
-	mes "[Inspector]";
-	mes "\"Made any progress yet?\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Made any progress yet?\"";
+    close;
 
 L_NohMask_Satchel:
-	mes "[Inspector]";
-	mes "\"Then go north and investigate!\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Then go north and investigate!\"";
+    close;
 
 L_NohMask_Basement:
-	mes "[Inspector]";
-	mes "\"Did you look over the basement?\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Did you look over the basement?\"";
+    close;
 
 L_NohMask_Note:
-	set Inspector, 13;
-	mes "[Inspector]";
-	mes "\"What a strange note. I'll keep track of this, while you return the mask to the troupe.\"";
-	mes "";
-	mes "\"By the way, stay sharp! I may call upon you again.\"";
-	close;
+    set Inspector, 13;
+    mes "[Inspector]";
+    mes "\"What a strange note. I'll keep track of this, while you return the mask to the troupe.\"";
+    mes "";
+    mes "\"By the way, stay sharp! I may call upon you again.\"";
+    close;
 
 L_NohMask_TravelingTroupe_2:
-	mes "[Inspector]";
-	mes "\"Please return the mask to the traveling troupe.\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Please return the mask to the traveling troupe.\"";
+    close;
 
 L_NohMask_Over:
-	set Inspector, 15;
-	mes "[Inspector]";
-	mes "\"My men have found all of the stolen items. They were all in the mining camp. We still don't know who did it.\"";
-	mes "[2500 experience points]";
-	getexp 2500, 0;
-	close;
+    set Inspector, 15;
+    mes "[Inspector]";
+    mes "\"My men have found all of the stolen items. They were all in the mining camp. We still don't know who did it.\"";
+    mes "[2500 experience points]";
+    getexp 2500, 0;
+    close;
 
 L_NohMask_End:
-	mes "[Inspector]";
-	mes "\"Remember to stay sharp. I might need your help on another case.\"";
-	close;
+    mes "[Inspector]";
+    mes "\"Remember to stay sharp. I might need your help on another case.\"";
+    close;
 }
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index b45a1f80..b5d3abcf 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -9,1241 +9,1073 @@
 //#    (win arm-wrestling + bring 10 snake skins + level 60) -> golden stinger
 //#
 //# Variables used:  @QUEST_Forestbow_state, nibble 2 (knife quest)
-//#		  @QUEST_Forestbow_state, nibble 3 (monster oil subquest)
+//#  @QUEST_Forestbow_state, nibble 3 (monster oil subquest)
 //#
 //#################################################################################
 
-009-2.gat,67,57,0	script	Kfahr	125,{
-
-	set @QS_NEWBIE, 0;
-	set @QS_MET_KFAHR, 1;
-	set @QS_KNOWS_KFAHR, 2;
-	set @QS_KNIFE_QUEST, 3;
-	set @QS_KNIFE_QUEST_DONE, 4;
-	set @QS_LOST_WRESTLING, 5;
-	set @QS_STINGER_QUEST, 6;
-	set @QS_STINGER_QUEST_DONE, 7;
-
-	set @BLACK_STINGERS_NR, 10;
-	set @MUSHROOMS_NR, 10;
-	set @SNAKE_SKINS_NR, 10;
-
-	set @KNIFE_QUEST_XP, 50000;
-	set @STINGER_QUEST_XP, 80000;
-
-	set @Q_MASK, NIBBLE_2_MASK;
-	set @Q_SHIFT, NIBBLE_2_SHIFT;
-
-	set @Q_status, (QUEST_Forestbow_state & @Q_MASK) >> @Q_SHIFT;
-
-	set @Q_needs_stinger, ((QUEST_Forestbow_state & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT) > 1;
-
-	if (@Q_status == @QS_KNIFE_QUEST)
-		goto L_knife_quest_check;
-
-	if (@Q_status == @QS_STINGER_QUEST)
-		goto L_stinger_quest_check;
-
-	if (@Q_status > @QS_NEWBIE)
-		goto L_meet_again;
-
-	mes "[Warrior]";
-	mes "You stand before a battle-scarred, darkly tanned warrior, brimming with muscles.";
-	mes "Just looking at him you smell danger, adventure, excitement...";
-	next;
-
-	mes "[Warrior]";
-	mes "On second thought, he really could use a bath.";
-	mes "";
-	mes "The warrior turns towards you, grinning broadly.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Why, hello there!  Come to visit Kfahr the Warrior to hear of my exploits, have you?\"";
-	mes "He laughs heartily and gives you a slap on the back.";
-	mes "\"Can't blame you, can't blame you at all!  Here, take a seat!\"";
-	next;
-
-	set @has_beer, 0;
-	set @beer_count, 0;
-	set @last_story, 0;
-
-	set @Q_status, @QS_MET_KFAHR;
-	callsub L_Update_Var;
-
-	goto L_main_menu;
+009-2.gat,67,57,0|script|Kfahr|125,{
+
+    set @QS_NEWBIE, 0;
+    set @QS_MET_KFAHR, 1;
+    set @QS_KNOWS_KFAHR, 2;
+    set @QS_KNIFE_QUEST, 3;
+    set @QS_KNIFE_QUEST_DONE, 4;
+    set @QS_LOST_WRESTLING, 5;
+    set @QS_STINGER_QUEST, 6;
+    set @QS_STINGER_QUEST_DONE, 7;
+
+    set @BLACK_STINGERS_NR, 10;
+    set @MUSHROOMS_NR, 10;
+    set @SNAKE_SKINS_NR, 10;
+
+    set @KNIFE_QUEST_XP, 50000;
+    set @STINGER_QUEST_XP, 80000;
+
+    set @Q_MASK, NIBBLE_2_MASK;
+    set @Q_SHIFT, NIBBLE_2_SHIFT;
+
+    set @Q_status, (QUEST_Forestbow_state & @Q_MASK) >> @Q_SHIFT;
+
+    set @Q_needs_stinger, ((QUEST_Forestbow_state & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT) > 1;
+
+    if (@Q_status == @QS_KNIFE_QUEST) goto L_knife_quest_check;
+
+    if (@Q_status == @QS_STINGER_QUEST) goto L_stinger_quest_check;
+
+    if (@Q_status > @QS_NEWBIE) goto L_meet_again;
+
+    mes "[Warrior]";
+    mes "You stand before a battle-scarred, darkly tanned warrior, brimming with muscles.";
+    mes "Just looking at him you smell danger, adventure, excitement...";
+    next;
+    mes "[Warrior]";
+    mes "On second thought, he really could use a bath.";
+    mes "";
+    mes "The warrior turns towards you, grinning broadly.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Why, hello there!  Come to visit Kfahr the Warrior to hear of my exploits, have you?\"";
+    mes "He laughs heartily and gives you a slap on the back.";
+    mes "\"Can't blame you, can't blame you at all!  Here, take a seat!\"";
+    next;
+    set @has_beer, 0;
+    set @beer_count, 0;
+    set @last_story, 0;
+    set @Q_status, @QS_MET_KFAHR;
+    callsub L_Update_Var;
+    goto L_main_menu;
 
 L_meet_again:
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr nods and grins as you greet him.";
-	mes "\"Came back for more stories?  Have a seat!\"";
-	next;
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr nods and grins as you greet him.";
+    mes "\"Came back for more stories?  Have a seat!\"";
+    next;
+    goto L_main_menu;
 
 L_main_menu:
-	if (@Q_status >= @QS_KNOWS_KFAHR)
-		goto L_real_main_menu;
-	menu "Who are you?", -,
-	     "Goodbye.", L_end;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr laughs again.";
-	mes "\"Surely you jest!  You must have heard of Kfahr, Slayer of Toby Rick the Desert Worm, Raider of the Lost Temple, Hero of Tulimshar?\"";
-	next;
-
-	menu "Uhm...", -,
-	     "Well...", -,
-	     "To be quite honest...", -,
-	     "Excuse me, someone is, er, whispering me...", L_end;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Ah, I knew it!  So you have come to hear some tales about the dangers of the desert?  You've come to the right man!\"";
-	next;
-
-	set @Q_status, @QS_KNOWS_KFAHR;
-	callsub L_Update_Var;
-	goto L_real_main_menu;
+    if (@Q_status >= @QS_KNOWS_KFAHR)
+        goto L_real_main_menu;
+    menu
+        "Who are you?", -,
+        "Goodbye.", L_end;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr laughs again.";
+    mes "\"Surely you jest!  You must have heard of Kfahr, Slayer of Toby Rick the Desert Worm, Raider of the Lost Temple, Hero of Tulimshar?\"";
+    next;
+    menu
+        "Uhm...", -,
+        "Well...", -,
+        "To be quite honest...", -,
+        "Excuse me, someone is, er, whispering me...", L_end;
+    mes "[Kfahr the Warrior]";
+    mes "\"Ah, I knew it!  So you have come to hear some tales about the dangers of the desert?  You've come to the right man!\"";
+    next;
+    set @Q_status, @QS_KNOWS_KFAHR;
+    callsub L_Update_Var;
+    goto L_real_main_menu;
 
 L_tale_sub:
-	if (@current_story == @last_story)
-		goto L_same_story_abort;
-	if (@has_beer == 0)
-		goto L_out_of_beer_abort;
-	set @last_story, @current_story;
-	set @has_beer, 0;
-	set @story_abort, 0;
-	return;
+    if (@current_story == @last_story)
+        goto L_same_story_abort;
+    if (@has_beer == 0)
+        goto L_out_of_beer_abort;
+    set @last_story, @current_story;
+    set @has_beer, 0;
+    set @story_abort, 0;
+    return;
 
 L_same_story_abort:
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr frowns.";
-	mes "\"I only just told you that story.  Trust me, the others are worth hearing, too!\"";
-	next;
-	set @story_abort, 1;
-	return;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr frowns.";
+    mes "\"I only just told you that story.  Trust me, the others are worth hearing, too!\"";
+    next;
+    set @story_abort, 1;
+    return;
 
 L_out_of_beer_abort:
-	mes "[Kfahr the Warrior]";
-	if (@beer_count > 4)
-		mes "\"I think I've talked 'nuff for now... but thanks for lis'ning!\"";
-	if (@beer_count <= 4)
-		mes "\"Now that's one of my favorite tales, but my throat is just a little too dry to talk about something like that... could you help me out a little here?\"";
-	next;
-	set @story_abort, 1;
-	return;
+    mes "[Kfahr the Warrior]";
+    if (@beer_count > 4)
+        mes "\"I think I've talked 'nuff for now... but thanks for lis'ning!\"";
+    if (@beer_count <= 4)
+        mes "\"Now that's one of my favorite tales, but my throat is just a little too dry to talk about something like that... could you help me out a little here?\"";
+    next;
+    set @story_abort, 1;
+    return;
 
 L_real_main_menu:
-	if (@Q_needs_stinger)
-		goto L_long_main_menu;
-
-	menu	"What's a Desert Worm?", L_tale_desert_worm,
-		"Desert Temple?", L_tale_desert_temple,
-		"Hero of Tulimshar?", L_tale_hero_tulimshar,
-		"Tell me about the desert!", L_tale_desert,
-		"I want to become as powerful as you!", L_gain_power,
-	 	"Here, have a beer!", L_give_beer,
-		"Goodbye!", L_end;
-
-	close;
+    if (@Q_needs_stinger)
+        goto L_long_main_menu;
+
+    menu
+        "What's a Desert Worm?", L_tale_desert_worm,
+        "Desert Temple?", L_tale_desert_temple,
+        "Hero of Tulimshar?", L_tale_hero_tulimshar,
+        "Tell me about the desert!", L_tale_desert,
+        "I want to become as powerful as you!", L_gain_power,
+        "Here, have a beer!", L_give_beer,
+        "Goodbye!", L_end;
+    close;
 
 L_long_main_menu:
-
-	menu	"What's a Desert Worm?", L_tale_desert_worm,
-		"Desert Temple?", L_tale_desert_temple,
-		"Hero of Tulimshar?", L_tale_hero_tulimshar,
-		"Tell me about the desert!", L_tale_desert,
-		"I want to become as powerful as you!", L_gain_power,
-		"Have you fought any Golden Scorpions?", L_golden_scorpion,
-	 	"Here, have a beer!", L_give_beer,
-		"Goodbye!", L_end;
-
-	close;
+    menu
+        "What's a Desert Worm?", L_tale_desert_worm,
+        "Desert Temple?", L_tale_desert_temple,
+        "Hero of Tulimshar?", L_tale_hero_tulimshar,
+        "Tell me about the desert!", L_tale_desert,
+        "I want to become as powerful as you!", L_gain_power,
+        "Have you fought any Golden Scorpions?", L_golden_scorpion,
+        "Here, have a beer!", L_give_beer,
+        "Goodbye!", L_end;
+    close;
 
 L_tale_desert_worm:
-	set @current_story, 1;
-	callsub L_tale_sub;
-	if (@story_abort) goto L_main_menu;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr smiles and leans back.";
-	mes "\"A desert worm is probably the largest creature you will ever see, larger even than most dragons.  It spans a good twenty chains (or six box tosses if you're used to the Imperial system) in length, has a thick, rubbery skin, and teeth as long as my legs.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Most are a darkish gray, except for the young ones; those are more purplish, I've been told.  Well, anyway, you hardly ever see one of them in their entirety, you only see the head, if they decide to come out and fight-- they tend to burrow under the ground.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"They are terrifying beasts, but lack any intelligent thought whatsoever.  They just eat whatever gets in their way.  There's nothing out there that can kill one, I think, and they can grow hundreds of years old.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Fortunately, they're kind of rare these days, and mostly roam in the empty deserts far, far south of Tulimshar.  They don't like the area too close to the mountains, I think; probably too rocky underground.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr takes a sip from his beer.";
-	mes "\"Anyway.  Desert worms are dangerous, as I said, but there was one particularly terrifying one, called Toby Rick.  You must've heard of it-- the greatest and most dangerous worm, scourge of the trade routes.  It could smell humans from miles away.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Most desert worms don't smell or see or feel much, you see.  They just notice when something's walking nearby, then jump up and swallow it.  But Toby Rick was different.  He was a terrifying beast, three times as long as a regular worm.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"So to feed itself, it had learned to smell.  That's right, the beast had grown nostrils and learned how to use 'em!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"One day I was hired to protect a caravan going north to Tulimshar, with a friend of mine, old Arvek.  He only came along for the fun, of course; it's not as if I really need much help defending a caravan... or at least normally it isn't.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Arvek's fun to have about.  His manners are as bad as his breath, but he knows how to make a laugh out of everything.  One thing you musnt't ever do with him, though, and that is to try his `homebrew'-- some kind of ale he makes out of maggot slime...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr takes another sip of beer, momentarily irritated as if surprised by the taste.";
-	mes "\"Anyway, This time was different.  We were barely three days out in the desert, when we spotted him-- `the Black Worm!', the Caravan Master cried, `Over there; it will kill us all!'\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I had barely enough time to draw out my sword, and the beast was upon us!  The caravan people were fleeing for their lives, so it was up to me and Arvek to stop it.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"That was madness, of course; no-one takes on a desert worm, if they have a choice.  But we didn't; you see, with most desert worms you can just stand still and it won't notice you and pass by.  But not with this one!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr leans forward.";
-	mes "\"So this humongous beast came roaring towards us, a big back hole where the mouth is, spikey fins sticking out to the side, all ready to swallow us all!  My sword felt like a toothpick against that monster!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "He pauses, then leans back a little to take another long sip from his beer.";
-	mes "\"So it seemed that our last hour was at hand, that we'd be swallowed and never heard from again!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Aha, but Kfahr doesn't die quite so easily.  What happened was this:  Me and Arvek charged towards that thing, slashing and stabbing, but our blows would just glance off.  The beast roared and just slid by us, slapping us to the side with its fins like maggots, knocking us to the ground.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"It bolted up into the air, and tore down on the caravan, swallowing each and everyone in there in a single big gulp!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Then it turned around towards us.  Those fins had hit us pretty badly; I had lost my shield and Arvek his backpack.  Better for him, I suppose, but I had been rather fond of that shield-- not that it would have helped me much here...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr leans foward again, nearly knocking over his beer.";
-	mes "\"So the beast charges at the two of us again and we dodge-- Arvek left, me right.  The beast is smarter than the average desert worm, though, and had expected that-- so it bends to the side and swallows poor Arvek, hair and hide and all.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr's eyes sparkle with excitement.";
-	mes "\"It turns around, trying to get me too.  I dodge it-- left,   then the same again, I dodge it right.  But it can't go on like that, the beast isn't tiring, but I am...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"So for one instant I think that this might be it, that I might die out here!  A worthy death, I suppose, against the king of desert worms!  And just as I think that, I bump against something\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr slaps on the table.";
-	mes "\"Arvek's backpack!  Doesn't sound terribly exciting, of course-- what am I going to do, toss it at the beast and hope that it chokes on it?\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "He grins.";
-	mes "\"But I remember something better.  That beast had grown nostrils, right?  So it can smell and taste!  So I tear open his backpack and pull out that big snakeskin of that disgusting maggot ale of his.  It's still filled to the brim.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I quickly put on my gloves again, because I don't want to touch that stuff with my bare skin.  The beast is almost upon me, but I have only that one chance-- so I squeeze the skin while sticking my thumb into the opening, until I can see the black of its nostrils...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"...and when I think it's almost too late already, I shoot out that revolting brew at the beast's smelling holes, and I hit!  Two at once, and up and sideways it rolls, away from me, and roaring and bellowing in pain!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"It roared for a good five minutes, then convulsed... and first it spat out old Arvek, who was a bit irritated at all that because, as he told me, he had `almost pierced the pancreas', whatever that means...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Next it spat out the caravan, and then some other caravan it had plucked off from elswehere.  Somehow, everyone from there was still alive, too.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Then it slid away from us, away to the north, but we could see it getting slower and slower.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Two days later we caught up with it, but it was already dead then and had started to smell.  We looked around and inside of it, found treasures and remnants of some less fortunate caravans and split them up appropriately.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"(I never told Arvek that it was his brew that killed it; he'd never have forgiven me.)\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"One of the nomads that had been travelling with the other caravan then told me that you could make special kinds of knives and swords and armor out of desert worm bones.\"";
-	next;
-
-	menu "Hang on... bones in a... worm?", L_worm_bones,
-	     "That's neat!  Do you have any that I could see?", L_worm_see_bones,
-	     "And then?", L_worm_final,
-	     "Zzzzzzzz.......", L_end;
+    set @current_story, 1;
+    callsub L_tale_sub;
+    if (@story_abort) goto L_main_menu;
+
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr smiles and leans back.";
+    mes "\"A desert worm is probably the largest creature you will ever see, larger even than most dragons.  It spans a good twenty chains (or six box tosses if you're used to the Imperial system) in length, has a thick, rubbery skin, and teeth as long as my legs.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Most are a darkish gray, except for the young ones; those are more purplish, I've been told.  Well, anyway, you hardly ever see one of them in their entirety, you only see the head, if they decide to come out and fight-- they tend to burrow under the ground.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"They are terrifying beasts, but lack any intelligent thought whatsoever.  They just eat whatever gets in their way.  There's nothing out there that can kill one, I think, and they can grow hundreds of years old.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Fortunately, they're kind of rare these days, and mostly roam in the empty deserts far, far south of Tulimshar.  They don't like the area too close to the mountains, I think; probably too rocky underground.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr takes a sip from his beer.";
+    mes "\"Anyway.  Desert worms are dangerous, as I said, but there was one particularly terrifying one, called Toby Rick.  You must've heard of it-- the greatest and most dangerous worm, scourge of the trade routes.  It could smell humans from miles away.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Most desert worms don't smell or see or feel much, you see.  They just notice when something's walking nearby, then jump up and swallow it.  But Toby Rick was different.  He was a terrifying beast, three times as long as a regular worm.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"So to feed itself, it had learned to smell.  That's right, the beast had grown nostrils and learned how to use 'em!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"One day I was hired to protect a caravan going north to Tulimshar, with a friend of mine, old Arvek.  He only came along for the fun, of course; it's not as if I really need much help defending a caravan... or at least normally it isn't.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Arvek's fun to have about.  His manners are as bad as his breath, but he knows how to make a laugh out of everything.  One thing you musnt't ever do with him, though, and that is to try his `homebrew'-- some kind of ale he makes out of maggot slime...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr takes another sip of beer, momentarily irritated as if surprised by the taste.";
+    mes "\"Anyway, This time was different.  We were barely three days out in the desert, when we spotted him-- `the Black Worm!', the Caravan Master cried, `Over there; it will kill us all!'\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I had barely enough time to draw out my sword, and the beast was upon us!  The caravan people were fleeing for their lives, so it was up to me and Arvek to stop it.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"That was madness, of course; no-one takes on a desert worm, if they have a choice.  But we didn't; you see, with most desert worms you can just stand still and it won't notice you and pass by.  But not with this one!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr leans forward.";
+    mes "\"So this humongous beast came roaring towards us, a big back hole where the mouth is, spikey fins sticking out to the side, all ready to swallow us all!  My sword felt like a toothpick against that monster!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "He pauses, then leans back a little to take another long sip from his beer.";
+    mes "\"So it seemed that our last hour was at hand, that we'd be swallowed and never heard from again!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Aha, but Kfahr doesn't die quite so easily.  What happened was this:  Me and Arvek charged towards that thing, slashing and stabbing, but our blows would just glance off.  The beast roared and just slid by us, slapping us to the side with its fins like maggots, knocking us to the ground.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"It bolted up into the air, and tore down on the caravan, swallowing each and everyone in there in a single big gulp!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Then it turned around towards us.  Those fins had hit us pretty badly; I had lost my shield and Arvek his backpack.  Better for him, I suppose, but I had been rather fond of that shield-- not that it would have helped me much here...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr leans foward again, nearly knocking over his beer.";
+    mes "\"So the beast charges at the two of us again and we dodge-- Arvek left, me right.  The beast is smarter than the average desert worm, though, and had expected that-- so it bends to the side and swallows poor Arvek, hair and hide and all.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr's eyes sparkle with excitement.";
+    mes "\"It turns around, trying to get me too.  I dodge it-- left,   then the same again, I dodge it right.  But it can't go on like that, the beast isn't tiring, but I am...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"So for one instant I think that this might be it, that I might die out here!  A worthy death, I suppose, against the king of desert worms!  And just as I think that, I bump against something\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr slaps on the table.";
+    mes "\"Arvek's backpack!  Doesn't sound terribly exciting, of course-- what am I going to do, toss it at the beast and hope that it chokes on it?\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "He grins.";
+    mes "\"But I remember something better.  That beast had grown nostrils, right?  So it can smell and taste!  So I tear open his backpack and pull out that big snakeskin of that disgusting maggot ale of his.  It's still filled to the brim.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I quickly put on my gloves again, because I don't want to touch that stuff with my bare skin.  The beast is almost upon me, but I have only that one chance-- so I squeeze the skin while sticking my thumb into the opening, until I can see the black of its nostrils...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"...and when I think it's almost too late already, I shoot out that revolting brew at the beast's smelling holes, and I hit!  Two at once, and up and sideways it rolls, away from me, and roaring and bellowing in pain!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"It roared for a good five minutes, then convulsed... and first it spat out old Arvek, who was a bit irritated at all that because, as he told me, he had `almost pierced the pancreas', whatever that means...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Next it spat out the caravan, and then some other caravan it had plucked off from elswehere.  Somehow, everyone from there was still alive, too.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Then it slid away from us, away to the north, but we could see it getting slower and slower.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Two days later we caught up with it, but it was already dead then and had started to smell.  We looked around and inside of it, found treasures and remnants of some less fortunate caravans and split them up appropriately.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"(I never told Arvek that it was his brew that killed it; he'd never have forgiven me.)\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"One of the nomads that had been travelling with the other caravan then told me that you could make special kinds of knives and swords and armor out of desert worm bones.\"";
+    next;
+    menu
+        "Hang on... bones in a... worm?", L_worm_bones,
+        "That's neat!  Do you have any that I could see?", L_worm_see_bones,
+        "And then?", L_worm_final,
+        "Zzzzzzzz.......", L_end;
 
 L_worm_final:
-	mes "[Kfahr the Warrior]";
-	mes "\"Nothing much else happened on that trip.  When we arrived in Tulimshar, people at first didn't believe the story, of course, until we showed them the treasures and the bones.  Ah, those were wonderful days...\"";
-	mes "He sighs and leans back, a nostalgic look on his face.";
-	next;
-
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "\"Nothing much else happened on that trip.  When we arrived in Tulimshar, people at first didn't believe the story, of course, until we showed them the treasures and the bones.  Ah, those were wonderful days...\"";
+    mes "He sighs and leans back, a nostalgic look on his face.";
+    next;
+    goto L_main_menu;
 
 L_worm_bones:
-	mes "[Kfahr the Warrior]";
-	mes "\"Weren't you listening?  A desert worm is not a regular worm; a worm couldn't survive in the desert.\"";
-	next;
-
-	menu "Do you have any bones that I could see?", L_worm_see_bones,
-	     "Never mind that, what happened then?", L_worm_final,
-	     "Zzzzzzzz.......", L_end;
+    mes "[Kfahr the Warrior]";
+    mes "\"Weren't you listening?  A desert worm is not a regular worm; a worm couldn't survive in the desert.\"";
+    next;
+    menu
+        "Do you have any bones that I could see?", L_worm_see_bones,
+        "Never mind that, what happened then?", L_worm_final,
+        "Zzzzzzzz.......", L_end;
 
 L_worm_see_bones:
-	if (@Q_status == @QS_KNIFE_QUEST)
-		goto L_boneknife_quest_ip;
-
-	if (@Q_status > @QS_KNIFE_QUEST)
-		goto L_worm_continue2;
-
-	if (baselevel >= 40)
-		goto L_boneknife_quest;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Of course!\"";
-	mes "He pulls out a strangely curved knife with a yellow-whiteish blade that is almost transparent at the edge.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"When hardened properly, this bone knife can last a lifetime!  One of the best knives you will find, too.\"";
-	mes "He puts the knife back into his pocket.";
-	next;
-
-	goto L_main_menu;
-
+    if (@Q_status == @QS_KNIFE_QUEST)
+        goto L_boneknife_quest_ip;
+    if (@Q_status > @QS_KNIFE_QUEST)
+        goto L_worm_continue2;
+    if (baselevel >= 40)
+        goto L_boneknife_quest;
+
+    mes "[Kfahr the Warrior]";
+    mes "\"Of course!\"";
+    mes "He pulls out a strangely curved knife with a yellow-whiteish blade that is almost transparent at the edge.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"When hardened properly, this bone knife can last a lifetime!  One of the best knives you will find, too.\"";
+    mes "He puts the knife back into his pocket.";
+    next;
+    goto L_main_menu;
 
 L_worm_continue2:
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr laughs.";
-	mes "\"Just have a look at the knife I gave you if you don't believe me!\"";
-	next;
-
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr laughs.";
+    mes "\"Just have a look at the knife I gave you if you don't believe me!\"";
+    next;
+    goto L_main_menu;
 
 L_tale_desert_temple:
-	set @current_story, 2;
-	callsub L_tale_sub;
-	if (@story_abort) goto L_main_menu;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Ah, that...\"";
-	mes "Kfahr leans back and takes a sip from his beer.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"That was many years ago, when George and I were just kids.  George later became a pirate, you see; he always loved hunting for treasure.  But back in those days it was all on level ground.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"George had found a treasure map somewhere... and when I say `found', I mean that in a fairly liberal sense; he always loved those maps, almost as much as the excitement of hunting for treasure.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Anyway, that map pointed to a spot in the desert a good day's walk south of Tulimshar.  So we grabbed our satchels and coats and packed food and water, and headed there in the evening.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We walked all night.  As you know, it's best not to travel during the day if you can avoid it, and we were young and energetic in those days, so that was easily avoided.\"";
-	mes "He sighs and takes another sip.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Anyway, when the sun rose in the morning, we still hadn't found the place.  So we climbed up on the nearest dune and looked all around to find it.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"But there was nothing, nothing at all.  We looked and looked-- and suddenly George screamed:  While we weren't paying attention to nearby things, scorpions had crept up on us!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"The scorpions had smelled the food we had brought and cut open our satchels, tearing our waterskins and making a mess of our food-- and now that they were done with that, they were coming for us!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We didn't have any suitable weapons, and not much of a choice either, so we made a break for it.  We ran into the desert, fast as our legs would carry us, and the scorpions after us.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We very nearly didn't make it.  There was nothing around but sand, and we had no water, no food-- at least we'd had our breakfast already-- and the sun kept burning, and burning, and trying to cook us alive.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We had long lost the scorpions, but we were dry like parchment, and exhausted from all the sun and running.  So we sat down in the shades of a dune and contemplated our options.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Without water we couldn't last during the day.  So our only hope was to find shelter somewhere-- except that the only thing around was sand, and the mid-day sun would rob that of all shelter.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"So we resigned to continuing to search for something, anything-- it was either that, or die of thirst for sure.  The only problem was that we were already so thirsty and it was so bright that we couldn't see nor walk straight anymore.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"So we had barely made it to the top of the next dune when George slipped and rolled down the other side.  I wanted to catch him, but I was too dizzy myself, and so I rolled after him.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We seemed to roll down for hours, and I kept feeling dizzier and dizzier; I didn't have the strength to stop.  When we arrived at the bottom, I just wanted to lie down and let the sun dry me up.\"";
-	mes "Kfahr takes a deep sip of beer.  \"Aaah.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I was being foolish, of course.  You should never give up, no matter how hopeless the situation may seem.  Anyway, I finally did decide to get up on my knees and look around again...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"...and what I saw right before me, believe it or not, was a giant face of a man, carved into rock-- there, in the middle of the desert, half-sunk, a shattered visage!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I pulled George up-- I didn't have the strength to speak, but walking seemed to work-- and we slowly made our way over to it.  We weren't thinking much, just trying to find some shade, so we climbed into that thing's ear.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Inside it felt moist, as if it was a real ear-- not that I've climbed inside a real ear, mind you!  But that feeling of cool and dampness and water was like a magical healing potion; we suddenly felt strength in our legs again.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"When we looked aorund, we noticed that there was a passage leading further underground, and long-spent torches on the wall.  Fortunately I still had my tinderbox, so I wrapped my shirt around a torch and lighted it.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We climbed down, and soon we heard the dripping of water-- we had found an underground water-hole!  More than that, we had found a gigantic underground cave, and, at the end of it, a huge portal.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We first drenched ourselves in water-- somehow managing not to douse the torch-- and drank until we were ready to burst.  When we had rested, we went to the portal to have a closer look.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"The portal was made out of bronze, or some similar metal, with images of snakes engraved all over.  Curious as we were, we pulled the door open-- it wasn't locked or barred in any way-- and had a look inside.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"The passages in there were cool and dark, with a ceiling high enough to swallow the light of my torch.  There were snakes, quite a few of them, but we were both quick-footed and managed to avoid them.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"There were chambers and inscriptions and more torches, but not a living being besides us and the snakes.  Hmm.  Though I could have sworn that some of the statues there were following us with their eyes...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"All went well, until George stepped into a trap.  A piece of ground just caved in, and if I hadn't grabbed his hand at the last second, he would have ended up on some rusty and probably poisoned spikes on the bottom...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"But I moved too fast, and slipped, and let go of the torch to catch myself with the other hand-- and the torch ended up in the bottom of the pit!  Well, better the torch than George, I suppose...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Still, we no longer had any light.  Being careless, I had gotten my tinderbox wet while we were at the water-hole, so we couldn't make another torch either.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We had the choice between staying by our torch and watching it die, and then follow suit at the hands, or, well, fangs of the snakes, or wandering off in the dark, to be eaten by snakes someplace else.\"";
-	mes "Kfahr empties his beer, looking a bit disappointed.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Anyway, we took the latter option.  We wandered through the dark, somehow barely avoiding the snakes and the traps, running into walls and hitting our heads on archways, until, suddenly, we saw something shining up ahead.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"That thing was on some kind of pedestal, and it looked like a golden tablet of sorts.  We clambered towards it-- the only source of light in here, the only thing that could save us-- and hesitated.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Should we just take it?  This was clearly some kind of temple, so it might be something sacred.  George and I argued about it for a while, until I decided to end the discussion-- so I simply grabbed it: we needed light.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"At that point, a terrible grinding noise started all around us, as the pedestal began to sink into the ground.  We had triggered some ancient trap!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Holes on the walls were opening up, and snakes began to gush out-- only now did we realise that we were in a huge, opulent chamber, with gold and gems and images all around!  But now it was too late for any looting; we had to run for our lives!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"So we ran from that slithering mass, faster than we ever had!  We had no idea where we were going of course, but at least we had light again...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Somehow we got lucky, somehow we escaped.  It was evening again when we climbed out of that ear into the desert again, with only our lives and that golden tablet.  We only barely made it back to Tulimshar in the morning.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"But we did have the tablet as a proof of what happened.\"";
-	mes "He grins.";
-	mes "\"That was my first real adventure, I think.  Ah, those were exciting days.\"";
-	next;
-
-	menu "Wow.", -,
-	     "What happened to the tablet?", L_tale_tablet,
-	     "Did you go there again?", L_tale_temple_again,
-	     "Zzzzzzz.....", L_end;
-
-	goto L_main_menu;
+    set @current_story, 2;
+    callsub L_tale_sub;
+    if (@story_abort) goto L_main_menu;
+
+    mes "[Kfahr the Warrior]";
+    mes "\"Ah, that...\"";
+    mes "Kfahr leans back and takes a sip from his beer.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"That was many years ago, when George and I were just kids.  George later became a pirate, you see; he always loved hunting for treasure.  But back in those days it was all on level ground.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"George had found a treasure map somewhere... and when I say `found', I mean that in a fairly liberal sense; he always loved those maps, almost as much as the excitement of hunting for treasure.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Anyway, that map pointed to a spot in the desert a good day's walk south of Tulimshar.  So we grabbed our satchels and coats and packed food and water, and headed there in the evening.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We walked all night.  As you know, it's best not to travel during the day if you can avoid it, and we were young and energetic in those days, so that was easily avoided.\"";
+    mes "He sighs and takes another sip.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Anyway, when the sun rose in the morning, we still hadn't found the place.  So we climbed up on the nearest dune and looked all around to find it.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"But there was nothing, nothing at all.  We looked and looked-- and suddenly George screamed:  While we weren't paying attention to nearby things, scorpions had crept up on us!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"The scorpions had smelled the food we had brought and cut open our satchels, tearing our waterskins and making a mess of our food-- and now that they were done with that, they were coming for us!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We didn't have any suitable weapons, and not much of a choice either, so we made a break for it.  We ran into the desert, fast as our legs would carry us, and the scorpions after us.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We very nearly didn't make it.  There was nothing around but sand, and we had no water, no food-- at least we'd had our breakfast already-- and the sun kept burning, and burning, and trying to cook us alive.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We had long lost the scorpions, but we were dry like parchment, and exhausted from all the sun and running.  So we sat down in the shades of a dune and contemplated our options.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Without water we couldn't last during the day.  So our only hope was to find shelter somewhere-- except that the only thing around was sand, and the mid-day sun would rob that of all shelter.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"So we resigned to continuing to search for something, anything-- it was either that, or die of thirst for sure.  The only problem was that we were already so thirsty and it was so bright that we couldn't see nor walk straight anymore.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"So we had barely made it to the top of the next dune when George slipped and rolled down the other side.  I wanted to catch him, but I was too dizzy myself, and so I rolled after him.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We seemed to roll down for hours, and I kept feeling dizzier and dizzier; I didn't have the strength to stop.  When we arrived at the bottom, I just wanted to lie down and let the sun dry me up.\"";
+    mes "Kfahr takes a deep sip of beer.  \"Aaah.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I was being foolish, of course.  You should never give up, no matter how hopeless the situation may seem.  Anyway, I finally did decide to get up on my knees and look around again...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"...and what I saw right before me, believe it or not, was a giant face of a man, carved into rock-- there, in the middle of the desert, half-sunk, a shattered visage!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I pulled George up-- I didn't have the strength to speak, but walking seemed to work-- and we slowly made our way over to it.  We weren't thinking much, just trying to find some shade, so we climbed into that thing's ear.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Inside it felt moist, as if it was a real ear-- not that I've climbed inside a real ear, mind you!  But that feeling of cool and dampness and water was like a magical healing potion; we suddenly felt strength in our legs again.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"When we looked aorund, we noticed that there was a passage leading further underground, and long-spent torches on the wall.  Fortunately I still had my tinderbox, so I wrapped my shirt around a torch and lighted it.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We climbed down, and soon we heard the dripping of water-- we had found an underground water-hole!  More than that, we had found a gigantic underground cave, and, at the end of it, a huge portal.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We first drenched ourselves in water-- somehow managing not to douse the torch-- and drank until we were ready to burst.  When we had rested, we went to the portal to have a closer look.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"The portal was made out of bronze, or some similar metal, with images of snakes engraved all over.  Curious as we were, we pulled the door open-- it wasn't locked or barred in any way-- and had a look inside.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"The passages in there were cool and dark, with a ceiling high enough to swallow the light of my torch.  There were snakes, quite a few of them, but we were both quick-footed and managed to avoid them.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"There were chambers and inscriptions and more torches, but not a living being besides us and the snakes.  Hmm.  Though I could have sworn that some of the statues there were following us with their eyes...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"All went well, until George stepped into a trap.  A piece of ground just caved in, and if I hadn't grabbed his hand at the last second, he would have ended up on some rusty and probably poisoned spikes on the bottom...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"But I moved too fast, and slipped, and let go of the torch to catch myself with the other hand-- and the torch ended up in the bottom of the pit!  Well, better the torch than George, I suppose...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Still, we no longer had any light.  Being careless, I had gotten my tinderbox wet while we were at the water-hole, so we couldn't make another torch either.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We had the choice between staying by our torch and watching it die, and then follow suit at the hands, or, well, fangs of the snakes, or wandering off in the dark, to be eaten by snakes someplace else.\"";
+    mes "Kfahr empties his beer, looking a bit disappointed.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Anyway, we took the latter option.  We wandered through the dark, somehow barely avoiding the snakes and the traps, running into walls and hitting our heads on archways, until, suddenly, we saw something shining up ahead.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"That thing was on some kind of pedestal, and it looked like a golden tablet of sorts.  We clambered towards it-- the only source of light in here, the only thing that could save us-- and hesitated.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Should we just take it?  This was clearly some kind of temple, so it might be something sacred.  George and I argued about it for a while, until I decided to end the discussion-- so I simply grabbed it: we needed light.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"At that point, a terrible grinding noise started all around us, as the pedestal began to sink into the ground.  We had triggered some ancient trap!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Holes on the walls were opening up, and snakes began to gush out-- only now did we realise that we were in a huge, opulent chamber, with gold and gems and images all around!  But now it was too late for any looting; we had to run for our lives!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"So we ran from that slithering mass, faster than we ever had!  We had no idea where we were going of course, but at least we had light again...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Somehow we got lucky, somehow we escaped.  It was evening again when we climbed out of that ear into the desert again, with only our lives and that golden tablet.  We only barely made it back to Tulimshar in the morning.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"But we did have the tablet as a proof of what happened.\"";
+    mes "He grins.";
+    mes "\"That was my first real adventure, I think.  Ah, those were exciting days.\"";
+    next;
+    menu
+        "Wow.", -,
+        "What happened to the tablet?", L_tale_tablet,
+        "Did you go there again?", L_tale_temple_again,
+        "Zzzzzzz.....", L_end;
+    goto L_main_menu;
 
 L_tale_tablet:
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Well, we couldn't read it.  We later sold it for a good price, to a young travelling archeologist; Doctor Nohlidge or something like that.  She said that the engravings described sacrifical practices of an ancient snake cult...\"";
-	mes "He shrugs.";
-	next;
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "\"Well, we couldn't read it.  We later sold it for a good price, to a young travelling archeologist; Doctor Nohlidge or something like that.  She said that the engravings described sacrifical practices of an ancient snake cult...\"";
+    mes "He shrugs.";
+    next;
+    goto L_main_menu;
 
 L_tale_temple_again:
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr laughs.";
-	mes "\"Of course we tried to go there again.  After seeing all that treasure, George wouldn't give up on it.  We tried many times-- as did others, from what I've heard-- but we never found it again.\"";
-	next;
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr laughs.";
+    mes "\"Of course we tried to go there again.  After seeing all that treasure, George wouldn't give up on it.  We tried many times-- as did others, from what I've heard-- but we never found it again.\"";
+    next;
+    goto L_main_menu;
 
 L_tale_hero_tulimshar:
-	set @current_story, 3;
-	callsub L_tale_sub;
-	if (@story_abort) goto L_main_menu;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Yes, Hero of Tulimshar.  That was many years";
-	mes "ago, but I did save the city of Tulimshar from a deadly drought.\"";
-	mes "He grins broadly.";
-	mes "\"And quite a feat that was, let me tell you!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Back in those days, there wasn't much trade with Hurnscald, and Tulimshar was dependent on its own water supply-- critically dependent, even.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Now, one day the water people drew from the wells started smelling.  The smell was nauseating, and people who drank from it became violently sick.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"So the entire town was without water, except for the water reserves in the cistern.  Someone had to act quickly-- and of course that someone was me.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"With nothing more than a torch, some light armor and a sword, I climbed down one of the wells.  It was a long climb; the wells go down fairly deep.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I noticed that there were some holes in the walls of the wells, with hollow spaces on the sides... Hmm, that reminds me that I still have to check whether the rumors of a labyrinth underneath Tulimshar are true.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Anyway, it took me a long time to get down, and every minute the stench was getting worse-- something really bad was down there.  I had to stop and tie a wet piece of cloth over my mouth so that I wouldn't inhale all of that nasty stuff.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"My torch was in an even poorer shape-- whatever was making that smell had killed the flame, so I soon had to rely on the light from above to see anything.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Finally I arrived at the water level.  All Tulimshar wells dip into the same underground lake, which is on the side of a huge underground cavern.  And in the midst of that cavern lay-- hardly visible through the greenish mist coming from it-- a Stinkewyrm!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Stinkewyrms are smaller cousins of dragons, but just as dangerous.  They have a green, sticky skin, and, well, they stink.  A lot.  This one was particularly bad-- it had filled up the entire cave with stinkiness!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I climbed down and swam to the shore.  The stench was terrible; I had to hold my breath to get closer to the monster.  There it was, lying on the ground, snoring, poisoning all our water!  So I tried to wake it up to scare it away.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I kicked it.  I yelled at it.  (Bad mistake, I got some of that stinky stuff in my lungs.)  I poked at it with my sword.  I even tried to poke it in the eyes, but I couldn't get that close to its mouth-- that was where most of the smell was coming from.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"After a few attempts I couldn't take it anymore, so I had myself be pulled up again.  It took me a while to recover and to tell the tale.  We talked about what could be done, but no-one had an idea.\"";
-	mes "Kfahr takes a deep sip from his beer.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Finally, I came up with something.  Stinkewyrms love that terrible stench of theirs, so what should be their natural enemy?  Why, soap, of course!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"We couldn't just dump all the soap into the underground lake, of course; the water would be undrinkable again.  So we collected some of the soap, and I climbed down again with it.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Having arrived at the bottom, I cut off the biggest of the water buckets and filled it with water-- and that was a really big one, I could hardly carry it when it was full.  Then I dissolved most the soap, and poured that onto the Stinkewyrm's head.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr laughs.";
-	mes "\"Ah, that caught its attention!  You should have seen that dragon roar, as it jumped to its feet and tried to find out who had soaped it!  I rushed back to the water and made another bucket of soap water.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"But it had noticed me!  And as soon as it had realized where I was, it came after me.  Then it stopped, towering right before me, its stench nearly killing me, and grinned that broad, crooked-teeth dragon smile of its kind.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Then it took a deep breath-- and I realised that that was probably 'it' for me;  Stinkewyrms can breathe fire like real dragons, and I didn't have the time to run back to the water.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"But when it breathed out, only a tiny little flame came out-- and a lot of terrible smell that nearly knocked me off my feet.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"For you see, it had generated so much of the deadly smell around itself that even its own fire breath couldn't survive!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"So it stared at me, mouth wide agape-- the perfect opening!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I stormed at it and before it could even blink, it had a huge load of bubbly soap water down its throat.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"You should have heard the coughing and shaking!  I swear, I thought the roof would collapse as it was jumping and choking...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Bubbles were coming out of its mouth, its nostrils, even its ears!  The poor wyrm must have never felt so clean in its life!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"I was out of soap, but the beast didn't know that-- so I quickly grabbed another bucket and charged it again.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"And it worked!  Seeing me like this again, it ran, squealing, back into the underground caves from where it must have come.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr roars with laughter and slaps his hands on the table.";
-	mes "\"So we defeated it with hygiene!  Ah, that was wonderful.  After a day, the stench had worn off enough that we could drink the water again, and a week later it was almost completely gone.  And of course I was the hero of the day.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr downs the rest of his beer.";
-	mes "\"And from that day on they called me the `Hero of Tulimshar'.\"";
-	next;
-
-	goto L_main_menu;
+    set @current_story, 3;
+    callsub L_tale_sub;
+    if (@story_abort) goto L_main_menu;
+
+    mes "[Kfahr the Warrior]";
+    mes "\"Yes, Hero of Tulimshar.  That was many years";
+    mes "ago, but I did save the city of Tulimshar from a deadly drought.\"";
+    mes "He grins broadly.";
+    mes "\"And quite a feat that was, let me tell you!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Back in those days, there wasn't much trade with Hurnscald, and Tulimshar was dependent on its own water supply-- critically dependent, even.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Now, one day the water people drew from the wells started smelling.  The smell was nauseating, and people who drank from it became violently sick.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"So the entire town was without water, except for the water reserves in the cistern.  Someone had to act quickly-- and of course that someone was me.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"With nothing more than a torch, some light armor and a sword, I climbed down one of the wells.  It was a long climb; the wells go down fairly deep.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I noticed that there were some holes in the walls of the wells, with hollow spaces on the sides... Hmm, that reminds me that I still have to check whether the rumors of a labyrinth underneath Tulimshar are true.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Anyway, it took me a long time to get down, and every minute the stench was getting worse-- something really bad was down there.  I had to stop and tie a wet piece of cloth over my mouth so that I wouldn't inhale all of that nasty stuff.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"My torch was in an even poorer shape-- whatever was making that smell had killed the flame, so I soon had to rely on the light from above to see anything.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Finally I arrived at the water level.  All Tulimshar wells dip into the same underground lake, which is on the side of a huge underground cavern.  And in the midst of that cavern lay-- hardly visible through the greenish mist coming from it-- a Stinkewyrm!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Stinkewyrms are smaller cousins of dragons, but just as dangerous.  They have a green, sticky skin, and, well, they stink.  A lot.  This one was particularly bad-- it had filled up the entire cave with stinkiness!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I climbed down and swam to the shore.  The stench was terrible; I had to hold my breath to get closer to the monster.  There it was, lying on the ground, snoring, poisoning all our water!  So I tried to wake it up to scare it away.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I kicked it.  I yelled at it.  (Bad mistake, I got some of that stinky stuff in my lungs.)  I poked at it with my sword.  I even tried to poke it in the eyes, but I couldn't get that close to its mouth-- that was where most of the smell was coming from.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"After a few attempts I couldn't take it anymore, so I had myself be pulled up again.  It took me a while to recover and to tell the tale.  We talked about what could be done, but no-one had an idea.\"";
+    mes "Kfahr takes a deep sip from his beer.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Finally, I came up with something.  Stinkewyrms love that terrible stench of theirs, so what should be their natural enemy?  Why, soap, of course!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"We couldn't just dump all the soap into the underground lake, of course; the water would be undrinkable again.  So we collected some of the soap, and I climbed down again with it.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Having arrived at the bottom, I cut off the biggest of the water buckets and filled it with water-- and that was a really big one, I could hardly carry it when it was full.  Then I dissolved most the soap, and poured that onto the Stinkewyrm's head.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr laughs.";
+    mes "\"Ah, that caught its attention!  You should have seen that dragon roar, as it jumped to its feet and tried to find out who had soaped it!  I rushed back to the water and made another bucket of soap water.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"But it had noticed me!  And as soon as it had realized where I was, it came after me.  Then it stopped, towering right before me, its stench nearly killing me, and grinned that broad, crooked-teeth dragon smile of its kind.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Then it took a deep breath-- and I realised that that was probably 'it' for me;  Stinkewyrms can breathe fire like real dragons, and I didn't have the time to run back to the water.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"But when it breathed out, only a tiny little flame came out-- and a lot of terrible smell that nearly knocked me off my feet.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"For you see, it had generated so much of the deadly smell around itself that even its own fire breath couldn't survive!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"So it stared at me, mouth wide agape-- the perfect opening!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I stormed at it and before it could even blink, it had a huge load of bubbly soap water down its throat.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"You should have heard the coughing and shaking!  I swear, I thought the roof would collapse as it was jumping and choking...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Bubbles were coming out of its mouth, its nostrils, even its ears!  The poor wyrm must have never felt so clean in its life!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"I was out of soap, but the beast didn't know that-- so I quickly grabbed another bucket and charged it again.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"And it worked!  Seeing me like this again, it ran, squealing, back into the underground caves from where it must have come.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr roars with laughter and slaps his hands on the table.";
+    mes "\"So we defeated it with hygiene!  Ah, that was wonderful.  After a day, the stench had worn off enough that we could drink the water again, and a week later it was almost completely gone.  And of course I was the hero of the day.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr downs the rest of his beer.";
+    mes "\"And from that day on they called me the `Hero of Tulimshar'.\"";
+    next;
+    goto L_main_menu;
 
 L_tale_desert:
-	set @current_story, 4;
-	callsub L_tale_sub;
-	if (@story_abort) goto L_main_menu;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr leans back, trying to find the right words to describe the desert.";
-	mes "\"The desert... a cold and lonely place at night, and a hot and lonely place during the day.\"";
-	mes "For someone who apparently spent most of his life in the desert, his insights sometimes seem less than profound.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"The desert is a living hell during some times of the year.  Filled with black scorpions and snakes, except for the shadier areas, and mountain snakes if you go further east.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"South of Tulimshar is a fairly protected region; the nomads keep the snakes out of there and you'll find only relatively harmless monsters.  But go west from there, to the beach, and it's scorpions and snakes...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"...and east of there you find the old Hatmaker cave, now filled to the brim with snakes!  Rumors have it that this was once an oasis, in centuries long gone by, but as far as I'm concerned that pit is just a dump that you best avoid.\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Go further to the east and you'll find ol' Pachua up on the mountain.  He seems to have some kind of power over the mountain snakes there; they never attack him.  I think he's a bit creepy, personally...\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"...but if he offers you some of his tobacco, then by all means give it a try!  That stuff is amazing.\"";
-	mes "He laughs, then begins to cough.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Not terribly healthy, though, I s'pose...\"";
-	next;
-
-	goto L_main_menu;
+    set @current_story, 4;
+    callsub L_tale_sub;
+    if (@story_abort) goto L_main_menu;
+
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr leans back, trying to find the right words to describe the desert.";
+    mes "\"The desert... a cold and lonely place at night, and a hot and lonely place during the day.\"";
+    mes "For someone who apparently spent most of his life in the desert, his insights sometimes seem less than profound.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"The desert is a living hell during some times of the year.  Filled with black scorpions and snakes, except for the shadier areas, and mountain snakes if you go further east.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"South of Tulimshar is a fairly protected region; the nomads keep the snakes out of there and you'll find only relatively harmless monsters.  But go west from there, to the beach, and it's scorpions and snakes...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"...and east of there you find the old Hatmaker cave, now filled to the brim with snakes!  Rumors have it that this was once an oasis, in centuries long gone by, but as far as I'm concerned that pit is just a dump that you best avoid.\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Go further to the east and you'll find ol' Pachua up on the mountain.  He seems to have some kind of power over the mountain snakes there; they never attack him.  I think he's a bit creepy, personally...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"...but if he offers you some of his tobacco, then by all means give it a try!  That stuff is amazing.\"";
+    mes "He laughs, then begins to cough.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Not terribly healthy, though, I s'pose...\"";
+    next;
+    goto L_main_menu;
 
 L_gain_power:
-	if ((@beer_count - @has_beer) < 1)
-		goto L_listen_to_a_story_first;
-
-	if (@Q_status < @QS_KNIFE_QUEST)
-		goto L_boneknife_quest;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"Yeees, yes... doesn't everyone?\"";
-	mes "He laughs briefly.";
-	mes "\"Don't worry-- you can't become as powerful as I, of course, but if you keep practicing, you can get pretty damn close!  Just make sure to pick your opponents carefully, and know when to run to live another day!\"";
-	next;
-
-	goto L_main_menu;
+    if ((@beer_count - @has_beer) < 1)
+        goto L_listen_to_a_story_first;
+    if (@Q_status < @QS_KNIFE_QUEST)
+        goto L_boneknife_quest;
+
+    mes "[Kfahr the Warrior]";
+    mes "\"Yeees, yes... doesn't everyone?\"";
+    mes "He laughs briefly.";
+    mes "\"Don't worry-- you can't become as powerful as I, of course, but if you keep practicing, you can get pretty damn close!  Just make sure to pick your opponents carefully, and know when to run to live another day!\"";
+    next;
+    goto L_main_menu;
 
 L_listen_to_a_story_first:
-	mes "[Kfahr the Warrior]";
-	mes "\"That's the spirit!  Perhaps you better listen to one of my tales, then!\"";
-	next;
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "\"That's the spirit!  Perhaps you better listen to one of my tales, then!\"";
+    next;
+    goto L_main_menu;
 
 L_boneknife_quest:
-	if (@Q_status == @QS_KNIFE_QUEST)
-		goto L_boneknife_quest_ip;
-
-	if (@Q_status > @QS_KNIFE_QUEST)
-		goto L_boneknife_quest_completed;
-
-	if (baselevel < 40)
-		goto L_boneknife_quest_tooweak;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr stares at you for a moment, then nods.";
-	mes "\"You seem reasonably skilled.  I think I may have something that I no longer need, but I don't want to give it to just anyone...\"";
-	mes "He hesitates, obviously trying to make up his mind about something, then continues.";
-
-	set @Q_status, @QS_KNIFE_QUEST;
-	callsub L_Update_Var;
-	next;
+    if (@Q_status == @QS_KNIFE_QUEST)
+        goto L_boneknife_quest_ip;
+    if (@Q_status > @QS_KNIFE_QUEST)
+        goto L_boneknife_quest_completed;
+    if (baselevel < 40)
+        goto L_boneknife_quest_tooweak;
+
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr stares at you for a moment, then nods.";
+    mes "\"You seem reasonably skilled.  I think I may have something that I no longer need, but I don't want to give it to just anyone...\"";
+    mes "He hesitates, obviously trying to make up his mind about something, then continues.";
+    set @Q_status, @QS_KNIFE_QUEST;
+    callsub L_Update_Var;
+    next;
 
 L_boneknife_quest_ip:
-	mes "[Kfahr the Warrior]";
-	mes "\"Bring me " + @BLACK_STINGERS_NR + " black scorpion stingers and " + @MUSHROOMS_NR + " small mushrooms to prove that you are a competent warrior, and I'll see if I have something for you.\"";
-	mes "He grins.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"But while you are here... perhaps you would like to listen to another story?\"";
-	next;
-
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "\"Bring me " + @BLACK_STINGERS_NR + " black scorpion stingers and " + @MUSHROOMS_NR + " small mushrooms to prove that you are a competent warrior, and I'll see if I have something for you.\"";
+    mes "He grins.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"But while you are here... perhaps you would like to listen to another story?\"";
+    next;
+    goto L_main_menu;
 
 L_boneknife_quest_completed:
-	mes "[Kfahr the Warrior]";
-	mes "\"I really don't have anything else I'd want to give away to make you stronger.  Look around a bit yourself!  You won't become a hero if you keep begging for help!\"";
-	next;
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "\"I really don't have anything else I'd want to give away to make you stronger.  Look around a bit yourself!  You won't become a hero if you keep begging for help!\"";
+    next;
+    goto L_main_menu;
 
 L_boneknife_quest_tooweak:
-	mes "[Kfahr the Warrior]";
-	mes "\"You know, little one, if you keep practicing a little and come back once you're a bit stronger, I might have something for you...\"";
-	mes "He winks.";
-	next;
-	goto L_main_menu;
-
+    mes "[Kfahr the Warrior]";
+    mes "\"You know, little one, if you keep practicing a little and come back once you're a bit stronger, I might have something for you...\"";
+    mes "He winks.";
+    next;
+    goto L_main_menu;
 
 L_knife_quest_check:
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr eyes you with unconcealed amusement.";
-	mes "\"Welcome back!  Did you bring me the things I asked for?\"";
-	next;
-
-	menu "Yes, here they are!", L_knife_quest_completecheck,
-	     "Er, what were those things again?", L_boneknife_quest_ip,
-	     "No, sorry, I didn't have the time.", L_main_menu,
-	     "I forgot!  Let me get them right now.", L_end;
-	close;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr eyes you with unconcealed amusement.";
+    mes "\"Welcome back!  Did you bring me the things I asked for?\"";
+    next;
+    menu
+        "Yes, here they are!", L_knife_quest_completecheck,
+        "Er, what were those things again?", L_boneknife_quest_ip,
+        "No, sorry, I didn't have the time.", L_main_menu,
+        "I forgot!  Let me get them right now.", L_end;
+    close;
 
 L_knife_quest_completecheck:
-	if (countitem("BlackScorpionStinger") < @BLACK_STINGERS_NR)
-		goto L_knife_quest_missing_stingers;
-
-	if (countitem("SmallMushroom") < @MUSHROOMS_NR)
-		goto L_knife_quest_missing_mushrooms;
-
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr is delighted.";
-	mes "\"Well done, well done!  Now that's what I call Warrior spirit!\"";
-	mes "He laughs, then suddenly stops, turning to you with suspicion in his eyes.";
-	mes "\"You DID get those yourself, didn't you?  Not buy them or somesuch...?\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "Before you can answer, he laughs and slaps you on the back again.";
-	mes "\"Ah, what am I thinking!  Too many years in the desert make you a little suspicious of everyone and everything!  Naah, I believe you.\"";
-	mes "He pulls a strangely curved knife out of a side pocket and holds it up to the light.  The blade is partly transparent, and looks quite sharp.";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"It's a bone knife, carved out of the umplex bone of a desert worm... you can probably guess which one.\"";
-	mes "He grins broadly again, weighing the weapon.";
-	mes "\"It's a little heavy, but one of the best knives you can get.  Certainly beats a short sword any time of day.\"";
-	mes "I had the nomads make me a few of them, and I hardly use them nowadays, so I think I can part with this one.";
-	next;
-
-	if (countitem("BlackScorpionStinger") < @BLACK_STINGERS_NR)
-		goto L_knife_quest_missing_stingers_2;
-
-	if (countitem("SmallMushroom") < @MUSHROOMS_NR)
-		goto L_knife_quest_missing_mushrooms_2;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_Knife_TooMany;
-
-	mes "[Kfahr the Warrior]";
-	mes "He hands you the knife.";
-	mes "\"Oh, and I think I'll keep those in return; I know someone who will trade them for antidote potions.\"";
-	mes "He pockets the stingers and mushrooms.";
-	mes "[" + @KNIFE_QUEST_XP + " experience points]";
-
-	set @Q_status, @QS_KNIFE_QUEST_DONE;
-	callsub L_Update_Var;
-
-	delitem "BlackScorpionStinger", @BLACK_STINGERS_NR;
-	delitem "SmallMushroom", @MUSHROOMS_NR;
-	getexp @KNIFE_QUEST_XP, 0;
-	getitem "BoneKnife", 1;
-        next;
-
-	goto L_main_menu;
+    if (countitem("BlackScorpionStinger") < @BLACK_STINGERS_NR)
+        goto L_knife_quest_missing_stingers;
+    if (countitem("SmallMushroom") < @MUSHROOMS_NR)
+        goto L_knife_quest_missing_mushrooms;
+
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr is delighted.";
+    mes "\"Well done, well done!  Now that's what I call Warrior spirit!\"";
+    mes "He laughs, then suddenly stops, turning to you with suspicion in his eyes.";
+    mes "\"You DID get those yourself, didn't you?  Not buy them or somesuch...?\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Before you can answer, he laughs and slaps you on the back again.";
+    mes "\"Ah, what am I thinking!  Too many years in the desert make you a little suspicious of everyone and everything!  Naah, I believe you.\"";
+    mes "He pulls a strangely curved knife out of a side pocket and holds it up to the light.  The blade is partly transparent, and looks quite sharp.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"It's a bone knife, carved out of the umplex bone of a desert worm... you can probably guess which one.\"";
+    mes "He grins broadly again, weighing the weapon.";
+    mes "\"It's a little heavy, but one of the best knives you can get.  Certainly beats a short sword any time of day.\"";
+    mes "I had the nomads make me a few of them, and I hardly use them nowadays, so I think I can part with this one.";
+    next;
+    if (countitem("BlackScorpionStinger") < @BLACK_STINGERS_NR)
+        goto L_knife_quest_missing_stingers_2;
+    if (countitem("SmallMushroom") < @MUSHROOMS_NR)
+        goto L_knife_quest_missing_mushrooms_2;
+    getinventorylist;
+    if (@inventorylist_count == 100) goto L_Knife_TooMany;
+    mes "[Kfahr the Warrior]";
+    mes "He hands you the knife.";
+    mes "\"Oh, and I think I'll keep those in return; I know someone who will trade them for antidote potions.\"";
+    mes "He pockets the stingers and mushrooms.";
+    mes "[" + @KNIFE_QUEST_XP + " experience points]";
+    set @Q_status, @QS_KNIFE_QUEST_DONE;
+    callsub L_Update_Var;
+    delitem "BlackScorpionStinger", @BLACK_STINGERS_NR;
+    delitem "SmallMushroom", @MUSHROOMS_NR;
+    getexp @KNIFE_QUEST_XP, 0;
+    getitem "BoneKnife", 1;
+    next;
+    goto L_main_menu;
 
 L_Knife_TooMany:
-	mes "[Kfahr the Warrior]";
-	mes "\"You don't have room for this. Come back when you do.\"";
-	close;
+    mes "[Kfahr the Warrior]";
+    mes "\"You don't have room for this. Come back when you do.\"";
+    close;
 
 L_knife_quest_missing_stingers:
-	mes "[Kfahr the Warrior]";
-	mes "\"No, no... I said " + @BLACK_STINGERS_NR + " black scorpion stingers.";
-	if (countitem("BlackScorpionStinger"))
-		mes "You will need " + (@BLACK_STINGERS_NR - (countitem ("BlackScorpionStinger"))) + " more of those.\"";
-	if (countitem("BlackScorpionStinger") == 0)
-		mes "You didn't bring even a single one!\"";
-	close;
+    mes "[Kfahr the Warrior]";
+    mes "\"No, no... I said " + @BLACK_STINGERS_NR + " black scorpion stingers.";
+    if (countitem("BlackScorpionStinger"))
+        mes "You will need " + (@BLACK_STINGERS_NR - (countitem ("BlackScorpionStinger"))) + " more of those.\"";
+    if (countitem("BlackScorpionStinger") == 0)
+        mes "You didn't bring even a single one!\"";
+    close;
 
 L_knife_quest_missing_stingers_2:
-	mes "[Kfahr the Warrior]";
-	mes "\"You just had " + @BLACK_STINGERS_NR + " black scorpion stingers. What happened to them?";
-	if (countitem("BlackScorpionStinger"))
-		mes "You will need " + (@BLACK_STINGERS_NR - (countitem ("BlackScorpionStinger"))) + " more of those.\"";
-	if (countitem("BlackScorpionStinger") == 0)
-		mes "You didn't bring even a single one!\"";
-	close;
+    mes "[Kfahr the Warrior]";
+    mes "\"You just had " + @BLACK_STINGERS_NR + " black scorpion stingers. What happened to them?";
+    if (countitem("BlackScorpionStinger"))
+        mes "You will need " + (@BLACK_STINGERS_NR - (countitem ("BlackScorpionStinger"))) + " more of those.\"";
+    if (countitem("BlackScorpionStinger") == 0)
+        mes "You didn't bring even a single one!\"";
+    close;
 
 L_knife_quest_missing_mushrooms:
-	mes "[Kfahr the Warrior]";
-	mes "\"No, no... I said " + @MUSHROOMS_NR + " small mushrooms.";
-	if (countitem("SmallMushroom"))
-		mes "You will need " + (@MUSHROOMS_NR - (countitem ("SmallMushroom"))) + " more of those.\"";
-	if (countitem("SmallMushroom") == 0)
-		mes "You didn't bring me even a single little mushroom!\"";
-	close;
+    mes "[Kfahr the Warrior]";
+    mes "\"No, no... I said " + @MUSHROOMS_NR + " small mushrooms.";
+    if (countitem("SmallMushroom"))
+        mes "You will need " + (@MUSHROOMS_NR - (countitem ("SmallMushroom"))) + " more of those.\"";
+    if (countitem("SmallMushroom") == 0)
+        mes "You didn't bring me even a single little mushroom!\"";
+    close;
 
 L_knife_quest_missing_mushrooms_2:
-	mes "[Kfahr the Warrior]";
-	mes "\"You just had " + @MUSHROOMS_NR + " small mushrooms. What happened to them?";
-	if (countitem("SmallMushroom"))
-		mes "You will need " + (@MUSHROOMS_NR - (countitem ("SmallMushroom"))) + " more of those.\"";
-	if (countitem("SmallMushroom") == 0)
-		mes "You didn't bring me even a single little mushroom!\"";
-	close;
+    mes "[Kfahr the Warrior]";
+    mes "\"You just had " + @MUSHROOMS_NR + " small mushrooms. What happened to them?";
+    if (countitem("SmallMushroom"))
+        mes "You will need " + (@MUSHROOMS_NR - (countitem ("SmallMushroom"))) + " more of those.\"";
+    if (countitem("SmallMushroom") == 0)
+        mes "You didn't bring me even a single little mushroom!\"";
+    close;
 
 L_stinger_quest_check:
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr grins at you.";
-	mes "\"Welcome, welcome!  Did you bring me my snake skins?\"";
-	next;
-
-	menu "Yes, here they are!", L_snakeskins_completecheck,
-	     "No, sorry, I didn't have the time.", L_main_menu,
-	     "I forgot!  Let me get them right now.", L_end;
-	close;
-
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr grins at you.";
+    mes "\"Welcome, welcome!  Did you bring me my snake skins?\"";
+    next;
+    menu
+        "Yes, here they are!", L_snakeskins_completecheck,
+        "No, sorry, I didn't have the time.", L_main_menu,
+        "I forgot!  Let me get them right now.", L_end;
+    close;
 
 L_snakeskins_completecheck:
-	if (countitem("SnakeSkin") < @SNAKE_SKINS_NR)
-		goto L_snakeskins_missing;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_SnakeSkins_TooMany;
-
-	delitem "SnakeSkin", @SNAKE_SKINS_NR;
-	getitem "GoldenScorpionStinger", 1;
-
-	set @Q_status, @QS_STINGER_QUEST_DONE;
-	callsub L_Update_Var;
-
-        getexp @STINGER_QUEST_XP, 0;
-
-	mes "[Kfahr the Warrior]";
-        mes "Kfahr takes the skins and pulls a golden scorpion stinger out of his pocket.";
-	mes "\"Well, you've earned it.  But be careful-- the poison in there is still lethal, after all those years.\"";
-        mes "He hands you the scorpion stinger.";
-        mes "[" + @STINGER_QUEST_XP + " experience points]";
-        next;
-	goto L_main_menu;
+    if (countitem("SnakeSkin") < @SNAKE_SKINS_NR)
+        goto L_snakeskins_missing;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_SnakeSkins_TooMany;
+    delitem "SnakeSkin", @SNAKE_SKINS_NR;
+    getitem "GoldenScorpionStinger", 1;
+    set @Q_status, @QS_STINGER_QUEST_DONE;
+    callsub L_Update_Var;
+    getexp @STINGER_QUEST_XP, 0;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr takes the skins and pulls a golden scorpion stinger out of his pocket.";
+    mes "\"Well, you've earned it.  But be careful-- the poison in there is still lethal, after all those years.\"";
+    mes "He hands you the scorpion stinger.";
+    mes "[" + @STINGER_QUEST_XP + " experience points]";
+    next;
+    goto L_main_menu;
 
 L_snakeskins_missing:
-	mes "[Kfahr the Warrior]";
-	mes "\"No, no... I said " + @SNAKE_SKINS_NR + " snake skins.";
-	if (countitem("SnakeSkin"))
-		mes "You will need " + (@SNAKE_SKINS_NR - (countitem ("SnakeSkin"))) + " more of those.\"";
-	if (countitem("SnakeSkin") == 0)
-		mes "You didn't bring even a single skin!\"";
-	close;
+    mes "[Kfahr the Warrior]";
+    mes "\"No, no... I said " + @SNAKE_SKINS_NR + " snake skins.";
+    if (countitem("SnakeSkin"))
+        mes "You will need " + (@SNAKE_SKINS_NR - (countitem ("SnakeSkin"))) + " more of those.\"";
+    if (countitem("SnakeSkin") == 0)
+        mes "You didn't bring even a single skin!\"";
+    close;
 
 L_SnakeSkins_TooMany:
-	mes "[Kfahr the Warrior]";
-	mes "\"You don't have room for this. Come back when you do.\"";
-	close;
+    mes "[Kfahr the Warrior]";
+    mes "\"You don't have room for this. Come back when you do.\"";
+    close;
 
 L_give_beer:
-	if (countitem("Beer") < 1)
-		goto L_player_out_of_beer;
-
-	if (@has_beer)
-		goto L_enough_beer_for_now;
-
-	if @beer_count > 4
-		goto L_too_much_beer;
-
-	setarray @beermessages$,
-		 "Ah yes... a warrior's drink!",
-		 "Generous, generous!  I like that!",
-		 "Hahah!  That's just what I needed!",
-		 "I love this town!  Hurnscaldian hospitality!  Mrahahahah!",
-		 "A'ight, one more can't hurt, eh?";
-
-	set @mesg$, @beermessages$[@beer_count];
-
-	delitem "Beer", 1;
-
-	set @has_beer, 1;
-	set @beer_count, @beer_count + 1;
-
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr is visibly delighted.";
-	mes "\"" + @mesg$ + "\"";
-	mes "He takes a deep sip.";
-	mes "\"Aaah, magnificent!\"";
-
-	if (@beer_count > 4)
-		mes "Kfahr seems quite relaxed now.";
-
-	next;
-
-	goto L_main_menu;
+    if (countitem("Beer") < 1)
+        goto L_player_out_of_beer;
+    if (@has_beer)
+        goto L_enough_beer_for_now;
+    if (@beer_count > 4)
+        goto L_too_much_beer;
+
+    setarray @beermessages$,
+        "Ah yes... a warrior's drink!",
+        "Generous, generous!  I like that!",
+        "Hahah!  That's just what I needed!",
+        "I love this town!  Hurnscaldian hospitality!  Mrahahahah!",
+        "A'ight, one more can't hurt, eh?";
+
+    set @mesg$, @beermessages$[@beer_count];
+
+    delitem "Beer", 1;
+    set @has_beer, 1;
+    set @beer_count, @beer_count + 1;
+
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr is visibly delighted.";
+    mes "\"" + @mesg$ + "\"";
+    mes "He takes a deep sip.";
+    mes "\"Aaah, magnificent!\"";
+
+    if (@beer_count > 4)
+        mes "Kfahr seems quite relaxed now.";
+    next;
+    goto L_main_menu;
 
 L_enough_beer_for_now:
-	mes "[Kfahr the Warrior]";
-	mes "\"Generous, generous!  But I still have plenty in here!\"";
-	mes "He laughs and takes a sip from the beer you gave him earlier.";
-	next;
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "\"Generous, generous!  But I still have plenty in here!\"";
+    mes "He laughs and takes a sip from the beer you gave him earlier.";
+    next;
+    goto L_main_menu;
 
 L_too_much_beer:
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr leans back and sighs heavily.";
-	mes "\"Very, very generous... bu' I think I'm fine for now.\"";
-	mes "He suppresses a burp.";
-	next;
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr leans back and sighs heavily.";
+    mes "\"Very, very generous... bu' I think I'm fine for now.\"";
+    mes "He suppresses a burp.";
+    next;
+    goto L_main_menu;
 
 L_player_out_of_beer:
-	mes "[Kfahr the Warrior]";
-	mes "Kfahr stares at you, then begins to laugh.";
-	mes "\"Mrahahahahaha!  Here's the beer!  Right, right!  Naah, I get it!  Save your gold for whatever you need it for!  But if you have some spare and want to share a beer, you know where to find me!\"";
-	next;
-	goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr stares at you, then begins to laugh.";
+    mes "\"Mrahahahahaha!  Here's the beer!  Right, right!  Naah, I get it!  Save your gold for whatever you need it for!  But if you have some spare and want to share a beer, you know where to find me!\"";
+    next;
+    goto L_main_menu;
 
 L_golden_scorpion:
-        if (@Q_status > @QS_STINGER_QUEST)
-		goto L_golden_scorpion_over_ask;
-
-        if (@Q_status == @QS_STINGER_QUEST)
-		goto L_golden_scorpion_ask_again;
-
-        if (@Q_status == @QS_LOST_WRESTLING)
-		goto L_golden_scorpion_wrestle_again;
-
-	mes "[Kfahr the Warrior]";
-	mes "He grins.";
-	mes "\"Fought any?  I single-handedly raided a nest of those beasts!  Ah, but golden scorpions are almost unheard of in these parts.  Why do you ask?\"";
-        next;
-
-	menu "Never mind, I was just curious.", L_main_menu,
-		"I need a golden scorpion stinger.", -;
-
-	mes "[Kfahr the Warrior]";
-	mes "\"A golden scorpion stinger?  Those are rare and valuable, I hope that you know that!\"";
-
-        if (baselevel < 60)
-		goto L_too_lowlevel_for_stinger;
-
-	if (@Q_status < @QS_KNIFE_QUEST)
-		goto L_golden_requires_knife_quest;
-
-	if (@Q_status < @QS_KNIFE_QUEST_DONE)
-		goto L_golden_requires_knife_quest_done;
-
-	mes "\"Still, you are a warrior of repute.  I'll consider giving it to you...\"";
-        next;
-
-	mes "[Kfahr the Warrior]";
-	mes "A mischievous sparkle lightens up in his eyes.";
-        mes "\"...if you arm-wrestle me for it!\"";
-        next;
+    if (@Q_status > @QS_STINGER_QUEST)
+        goto L_golden_scorpion_over_ask;
+    if (@Q_status == @QS_STINGER_QUEST)
+        goto L_golden_scorpion_ask_again;
+    if (@Q_status == @QS_LOST_WRESTLING)
+        goto L_golden_scorpion_wrestle_again;
+
+    mes "[Kfahr the Warrior]";
+    mes "He grins.";
+    mes "\"Fought any?  I single-handedly raided a nest of those beasts!  Ah, but golden scorpions are almost unheard of in these parts.  Why do you ask?\"";
+    next;
+    menu
+        "Never mind, I was just curious.", L_main_menu,
+        "I need a golden scorpion stinger.", -;
+    mes "[Kfahr the Warrior]";
+    mes "\"A golden scorpion stinger?  Those are rare and valuable, I hope that you know that!\"";
+    if (baselevel < 60)
+        goto L_too_lowlevel_for_stinger;
+    if (@Q_status < @QS_KNIFE_QUEST)
+        goto L_golden_requires_knife_quest;
+    if (@Q_status < @QS_KNIFE_QUEST_DONE)
+        goto L_golden_requires_knife_quest_done;
+
+    mes "\"Still, you are a warrior of repute.  I'll consider giving it to you...\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "A mischievous sparkle lightens up in his eyes.";
+    mes "\"...if you arm-wrestle me for it!\"";
+    next;
 
 L_golden_scorpion_wrestle_intro:
-
-        menu	"Never!", L_main_menu,
-		"Wait... what?", L_wrestle_explain,
-		"Bring it on!", L_golden_scorpion_wrestle;
-	close;
+    menu
+        "Never!", L_main_menu,
+        "Wait... what?", L_wrestle_explain,
+        "Bring it on!", L_golden_scorpion_wrestle;
+    close;
 
 L_golden_requires_knife_quest_done:
-	mes "He hesitates.";
-	mes "\"But no, this is too valuable.  Perhaps if you finish that other quest I gave you...?\".";
-        next;
-	goto L_main_menu;
+    mes "He hesitates.";
+    mes "\"But no, this is too valuable.  Perhaps if you finish that other quest I gave you...?\".";
+    next;
+    goto L_main_menu;
 
 L_golden_requires_knife_quest:
-	mes "He hesitates.";
-	mes "\"But no, this is too valuable.  I think I should have you prove your worthiness with another quest first...\"";
-        next;
-	goto L_boneknife_quest;
+    mes "He hesitates.";
+    mes "\"But no, this is too valuable.  I think I should have you prove your worthiness with another quest first...\"";
+    next;
+    goto L_boneknife_quest;
 
 L_wrestle_explain:
-	mes "[Kfahr the Warrior]";
-	mes "\"Arm wrestling!  Arm against arm!  And whoever is stronger wins!  If you manage to defeat me, I'll give you a little quest for the stinger.  How about it?\"";
-        next;
-        goto L_golden_scorpion_wrestle_intro;
+    mes "[Kfahr the Warrior]";
+    mes "\"Arm wrestling!  Arm against arm!  And whoever is stronger wins!  If you manage to defeat me, I'll give you a little quest for the stinger.  How about it?\"";
+    next;
+    goto L_golden_scorpion_wrestle_intro;
 
 L_too_lowlevel_for_stinger:
-	mes "\"Well, I have one, but I can't just give it to anyone.  Maybe if you train a little and become a worthy warrior I will consider giving it away...\"";
-        next;
-        goto L_main_menu;
+    mes "\"Well, I have one, but I can't just give it to anyone.  Maybe if you train a little and become a worthy warrior I will consider giving it away...\"";
+    next;
+    goto L_main_menu;
 
 L_golden_scorpion_over_ask:
-	mes "[Kfahr the Warrior]";
-        mes "\"Is this about the stingers again? I already gave you a golden stinger, I'm not going to part with any more.\"";
-        next;
-        goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "\"Is this about the stingers again? I already gave you a golden stinger, I'm not going to part with any more.\"";
+    next;
+    goto L_main_menu;
 
 L_golden_scorpion_ask_again:
-	mes "[Kfahr the Warrior]";
-        mes "\"This is about the stinger again, right?  Well, just bring me " + @SNAKE_SKINS_NR + " snake skins, and you can have one.\"";
-        next;
-        goto L_main_menu;
+    mes "[Kfahr the Warrior]";
+    mes "\"This is about the stinger again, right?  Well, just bring me " + @SNAKE_SKINS_NR + " snake skins, and you can have one.\"";
+    next;
+    goto L_main_menu;
 
 L_golden_scorpion_wrestle_again:
-	mes "[Kfahr the Warrior]";
-        mes "\"This is about the stinger again, eh?  So you want to give it another try?\"";
-        mes "He grins broadly.";
-        next;
-        goto L_golden_scorpion_wrestle;
+    mes "[Kfahr the Warrior]";
+    mes "\"This is about the stinger again, eh?  So you want to give it another try?\"";
+    mes "He grins broadly.";
+    next;
+    goto L_golden_scorpion_wrestle;
 
 L_golden_scorpion_wrestle:
-	mes "[Kfahr the Warrior]";
-	mes "You sit down.  Both of you place your arms on the table, on opposing sides, and grab each other's hands.";
-        next;
+    mes "[Kfahr the Warrior]";
+    mes "You sit down.  Both of you place your arms on the table, on opposing sides, and grab each other's hands.";
+    next;
 
-        set @KFAHR_STR, 70 + @beer_count * 6;
-        set @KFAHR_AGI, 60 - @beer_count * 5;
-        set @kfahr_stamina, 120;
+    set @KFAHR_STR, 70 + @beer_count * 6;
+    set @KFAHR_AGI, 60 - @beer_count * 5;
+    set @kfahr_stamina, 120;
 
-        set @PC_STR, readparam(bStr);
-        set @PC_AGI, readparam(bAgi);
-        set @PC_MAX_STAMINA, readparam(bVit) + 20;
-        set @pc_stamina, @PC_MAX_STAMINA;
+    set @PC_STR, readparam(bStr);
+    set @PC_AGI, readparam(bAgi);
+    set @PC_MAX_STAMINA, readparam(bVit) + 20;
+    set @pc_stamina, @PC_MAX_STAMINA;
 
-        setarray @positions$,
-		"Kfahr's hand is almost on the table.",
-		"Kfahr's hand is pushed back.",
-		"Kfahr and your hands are centered.",
-		"Your hand is pushed back.",
-		"Your hand is almost on the table.";
+    setarray @positions$,
+        "Kfahr's hand is almost on the table.",
+        "Kfahr's hand is pushed back.",
+        "Kfahr and your hands are centered.",
+        "Your hand is pushed back.",
+        "Your hand is almost on the table.";
 
-	set @position, 2;
-        set @first_round, 1;
+    set @position, 2;
+    set @first_round, 1;
 
 L_wrestle_loop:
-	mes "[Arm-wrestling with Kfahr]";
-
-        mes @positions$[@position];
-
-        if ((@PC_STAMINA * 2 <= @PC_MAX_STAMINA) && (@PC_STAMINA * 4 > @PC_MAX_STAMINA))
-		mes "You feel a little exhausted.";
-        if (@PC_STAMINA * 4 <= @PC_MAX_STAMINA)
-		mes "You feel very exhausted.";
-        next;
-
-        menu	"Push!", L_wrestle_push,
-		"Hold!", L_wrestle_hold,
-		"Slam!", L_wrestle_slam,
-		"Consider your options", L_wrestle_info;
-	close;
+    mes "[Arm-wrestling with Kfahr]";
+    mes @positions$[@position];
+    if ((@PC_STAMINA * 2 <= @PC_MAX_STAMINA) && (@PC_STAMINA * 4 > @PC_MAX_STAMINA))
+        mes "You feel a little exhausted.";
+    if (@PC_STAMINA * 4 <= @PC_MAX_STAMINA)
+        mes "You feel very exhausted.";
+    next;
+    menu
+        "Push!", L_wrestle_push,
+        "Hold!", L_wrestle_hold,
+        "Slam!", L_wrestle_slam,
+        "Consider your options", L_wrestle_info;
+    close;
 
 L_wrestle_info:
-	mes "[Arm-wrestling with Kfahr]";
-        mes "Kfahr is a strong arm-wrestling opponent.  Winning against him won't be easy.";
-        mes "Each round you have to choose an action; what you choose determines both your chances of moving each other's arms and how much weaker you get.";
-        next;
-	mes "[Arm-wrestling with Kfahr]";
-        mes "If you PUSH, you may be able to push him back, but if you fail, you will lose more stamina than if you had succeeded.";
-        next;
-	mes "[Arm-wrestling with Kfahr]";
-        mes "If you HOLD, you lose little stamina and may be able to hold him and drain his stength, but you cannot win just by holding.";
-        next;
-	mes "[Arm-wrestling with Kfahr]";
-        mes "If you SLAM, you try to move against him quickly-- if you are successful, you may push him back quite a bit, but losing this will drain you badly.";
-        next;
-	goto L_wrestle_loop;
-
+    mes "[Arm-wrestling with Kfahr]";
+    mes "Kfahr is a strong arm-wrestling opponent.  Winning against him won't be easy.";
+    mes "Each round you have to choose an action; what you choose determines both your chances of moving each other's arms and how much weaker you get.";
+    next;
+    mes "[Arm-wrestling with Kfahr]";
+    mes "If you PUSH, you may be able to push him back, but if you fail, you will lose more stamina than if you had succeeded.";
+    next;
+    mes "[Arm-wrestling with Kfahr]";
+    mes "If you HOLD, you lose little stamina and may be able to hold him and drain his stength, but you cannot win just by holding.";
+    next;
+    mes "[Arm-wrestling with Kfahr]";
+    mes "If you SLAM, you try to move against him quickly-- if you are successful, you may push him back quite a bit, but losing this will drain you badly.";
+    next;
+    goto L_wrestle_loop;
 
 L_wrestle_push:
-        set @kfahr_def, @KFAHR_STR;
-        set @attack, @PC_STR;
-        set @cost_factor, 2;
-        callsub L_wrestle_attack;
-        if (@result < -1)
-		set @result, -1; // can't push back further than one
-        goto L_wrestle_next;
+    set @kfahr_def, @KFAHR_STR;
+    set @attack, @PC_STR;
+    set @cost_factor, 2;
+    callsub L_wrestle_attack;
+    if (@result < -1) set @result, -1; // can't push back further than one
+    goto L_wrestle_next;
 
 L_wrestle_hold:
-        set @kfahr_def, @KFAHR_STR;
-        set @attack, @PC_STR;
-        set @cost_factor, 1;
-        callsub L_wrestle_attack;
-        if (@result < 0)
-		set @result, 0; // hold only
-        goto L_wrestle_next;
+    set @kfahr_def, @KFAHR_STR;
+    set @attack, @PC_STR;
+    set @cost_factor, 1;
+    callsub L_wrestle_attack;
+    if (@result < 0) set @result, 0; // hold only
+    goto L_wrestle_next;
 
 L_wrestle_slam:
-	if (@beer_count == 5 && @first_round) goto L_quick_slam;
-        set @kfahr_def, @KFAHR_AGI;
-        set @attack, @PC_AGI;
-        set @cost_factor, 4;
-        callsub L_wrestle_attack;
-        goto L_wrestle_next;
-
+    if (@beer_count == 5 && @first_round)
+        goto L_quick_slam;
+    set @kfahr_def, @KFAHR_AGI;
+    set @attack, @PC_AGI;
+    set @cost_factor, 4;
+    callsub L_wrestle_attack;
+    goto L_wrestle_next;
 
 L_wrestle_attack:
-	set @kfahr_stamina_bonus, @kfahr_stamina;
-	set @pc_stamina_bonus, @kfahr_stamina;
-
-	if (@kfahr_stamina_bonus > 40)
-		set @kfahr_stamina_bonus, 40;
-
-	if (@pc_stamina_bonus > 40)
-		set @pc_stamina_bonus, 40;
-
-        set @score, @kfahr_def + @kfahr_stamina_bonus - @attack - @pc_stamina_bonus + rand(20) - rand(20);
-
-	set @result, @score / 10;
-
-	if (@result > 1)
-		set @result, 1;
-
-	if (@result > 0) set @kfahr_stamina, @kfahr_stamina - 12;
-	if (@result == 0) set @kfahr_stamina, @kfahr_stamina - 16;
-	if (@result < 0) set @kfahr_stamina, @kfahr_stamina - 8;
-
-	if (@result < 0) set @pc_stamina, @pc_stamina - (6 * @cost_factor);
-	if (@result == 0) set @pc_stamina, @pc_stamina - (8 * @cost_factor);
-	if (@result > 0) set @pc_stamina, @pc_stamina - (4 * @cost_factor);
-
-        if (@kfahr_stamina < 0)
-		set @kfahr_stamina, 0;
-
-        if (@kfahr_stamina < 0)
-		set @pc_stamina, 0;
-
-	return;
+    set @kfahr_stamina_bonus, @kfahr_stamina;
+    set @pc_stamina_bonus, @kfahr_stamina;
+
+    if (@kfahr_stamina_bonus > 40)
+        set @kfahr_stamina_bonus, 40;
+    if (@pc_stamina_bonus > 40)
+        set @pc_stamina_bonus, 40;
+
+    set @score, @kfahr_def + @kfahr_stamina_bonus - @attack - @pc_stamina_bonus + rand(20) - rand(20);
+    set @result, @score / 10;
+
+    if (@result > 1)
+        set @result, 1;
+    if (@result > 0)
+        set @kfahr_stamina, @kfahr_stamina - 12;
+    if (@result == 0)
+        set @kfahr_stamina, @kfahr_stamina - 16;
+    if (@result < 0)
+        set @kfahr_stamina, @kfahr_stamina - 8;
+    if (@result < 0)
+        set @pc_stamina, @pc_stamina - (6 * @cost_factor);
+    if (@result == 0)
+        set @pc_stamina, @pc_stamina - (8 * @cost_factor);
+    if (@result > 0)
+        set @pc_stamina, @pc_stamina - (4 * @cost_factor);
+    if (@kfahr_stamina < 0)
+        set @kfahr_stamina, 0;
+    if (@kfahr_stamina < 0)
+        set @pc_stamina, 0;
+    return;
 
 L_wrestle_next:
-	set @first_round, 0;
-
-	mes "[Arm-wrestling with Kfahr]";
-	if (@result < 0) mes "You manage to push him back!";
-	if (@result == 0) mes "You hold your position!";
-	if (@result > 0) mes "Kfahr pushes you back!";
-        next;
-
-	set @position, @position + @result;
-	if (@position < 0) goto L_wrestle_win;
-	if (@position > 4) goto L_wrestle_lose;
-
-	goto L_wrestle_loop;
+    set @first_round, 0;
+
+    mes "[Arm-wrestling with Kfahr]";
+    if (@result < 0)
+        mes "You manage to push him back!";
+    if (@result == 0)
+        mes "You hold your position!";
+    if (@result > 0)
+        mes "Kfahr pushes you back!";
+    next;
+    set @position, @position + @result;
+    if (@position < 0)
+        goto L_wrestle_win;
+    if (@position > 4)
+        goto L_wrestle_lose;
+    goto L_wrestle_loop;
 
 L_wrestle_lose:
-	mes "[Arm-wrestling with Kfahr]";
-        mes "Kfahr slams your hand on the table.";
-        next;
-
-	mes "[Kfahr the Warrior]";
-        mes "\"Don't worry!  It was a good attempt-- but beating Kfahr is not quite so easy!\"";
-        mes "He laughs and slaps you on the shoulder.";
-        mes "\"But come back any time you want to try again!\"";
-        next;
-
-	set @Q_status, @QS_LOST_WRESTLING;
-	callsub L_Update_Var;
-
-	goto L_main_menu;
+    mes "[Arm-wrestling with Kfahr]";
+    mes "Kfahr slams your hand on the table.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "\"Don't worry!  It was a good attempt-- but beating Kfahr is not quite so easy!\"";
+    mes "He laughs and slaps you on the shoulder.";
+    mes "\"But come back any time you want to try again!\"";
+    next;
+    set @Q_status, @QS_LOST_WRESTLING;
+    callsub L_Update_Var;
+    goto L_main_menu;
 
 L_quick_slam:
-	mes "[Arm-wrestling with Kfahr]";
-        mes "Your hands have barely touched as you push against him with all your might.  His reactions slowed by the beer, Kfahr doesn't stand a chance.";
-        next;
-	goto L_wrestle_win;
+    mes "[Arm-wrestling with Kfahr]";
+    mes "Your hands have barely touched as you push against him with all your might.  His reactions slowed by the beer, Kfahr doesn't stand a chance.";
+    next;
+    goto L_wrestle_win;
 
 L_wrestle_win:
-	mes "[Arm-wrestling with Kfahr]";
-        mes "You slam Kfahr's hand on the table.";
-        next;
-
-	mes "[Kfahr the Warrior]";
-        mes "Kfahr stares first at the hand, then at you, incredulously.";
-        mes "Then he begins to roar with laughter, slapping you on the shoulder.";
-        mes "\"Excellent, excellent!  Caught me in a weak moment there, did ya!\"";
-	next;
-
-	mes "[Kfahr the Warrior]";
-	mes "After calming down, Kfahr outlines your quest.";
-	mes "\"As I promised, I will give you the stinger if you do something for me.  Get me " + @SNAKE_SKINS_NR + " snake skins, and I'll let you have it.\"";
-        next;
-
-	set @Q_status, @QS_STINGER_QUEST;
-	callsub L_Update_Var;
-
-	goto L_main_menu;
+    mes "[Arm-wrestling with Kfahr]";
+    mes "You slam Kfahr's hand on the table.";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "Kfahr stares first at the hand, then at you, incredulously.";
+    mes "Then he begins to roar with laughter, slapping you on the shoulder.";
+    mes "\"Excellent, excellent!  Caught me in a weak moment there, did ya!\"";
+    next;
+    mes "[Kfahr the Warrior]";
+    mes "After calming down, Kfahr outlines your quest.";
+    mes "\"As I promised, I will give you the stinger if you do something for me.  Get me " + @SNAKE_SKINS_NR + " snake skins, and I'll let you have it.\"";
+    next;
+    set @Q_status, @QS_STINGER_QUEST;
+    callsub L_Update_Var;
+    goto L_main_menu;
 
 L_end:
-	close;
+    close;
 
 L_Update_Var:
-	set QUEST_Forestbow_state,
-		(QUEST_Forestbow_state & ~(@Q_MASK)
-		| (@Q_status << @Q_SHIFT));
-	return;
+    set QUEST_Forestbow_state, (QUEST_Forestbow_state & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
+    return;
 }
diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt
index 23f0e165..ee4cb7f5 100644
--- a/world/map/npc/009-2/lena.txt
+++ b/world/map/npc/009-2/lena.txt
@@ -1,107 +1,109 @@
 // Quest for Fairy Hat and Forest Armor
 
-009-2.gat,146,43,0	script	Lena	182,{
-
-	if (TMW_Quest >= 46) goto L_Lena_Done;
-	if (TMW_Quest == 45) goto L_Lena_Success;
-	if (TMW_Quest == 44) goto L_Lena_Bandit_Leader_Fail;
-	if (TMW_Quest == 43) goto L_Lena_Bandit_Leader_Fail;
-	if (TMW_Quest == 42) goto L_Lena_Bandit_Leader;
-	if (TMW_Quest == 41) goto L_Lena_Fairy_Hat;
-	if (TMW_Quest == 40) && (baselevel >= 30) goto L_Lena_Start;
-
-	mes "[Lena]";
-	mes "\"I got ambushed by a group of bandits and one of them stabbed me pretty good.  Hopefully I heal up soon so I can fight this menace.\"";
-	next;
-	mes "\"Ah, I wish my dear friend Nickos could be here. He's one of the guards in Tulimshar and he'd know how to deal with those outlaws!\"";
-	close;
+009-2.gat,146,43,0|script|Lena|182,{
+
+    if (TMW_Quest >= 46) goto L_Lena_Done;
+    if (TMW_Quest == 45) goto L_Lena_Success;
+    if (TMW_Quest == 44) goto L_Lena_Bandit_Leader_Fail;
+    if (TMW_Quest == 43) goto L_Lena_Bandit_Leader_Fail;
+    if (TMW_Quest == 42) goto L_Lena_Bandit_Leader;
+    if (TMW_Quest == 41) goto L_Lena_Fairy_Hat;
+    if (TMW_Quest == 40) && (baselevel >= 30) goto L_Lena_Start;
+
+    mes "[Lena]";
+    mes "\"I got ambushed by a group of bandits and one of them stabbed me pretty good.  Hopefully I heal up soon so I can fight this menace.\"";
+    next;
+    mes "\"Ah, I wish my dear friend Nickos could be here. He's one of the guards in Tulimshar and he'd know how to deal with those outlaws!\"";
+    close;
 
 L_Lena_Start:
-	mes "[Lena]";
-	mes "\"While wandering through the forest, I was ambushed by bandits.  Though I got them all, one of them stabbed me pretty good.  I'm still healing from that encounter.  I'm worried that the bandit threat may spread.\"";
-	menu
-		"Don't worry, I can take out some of these scumbags.", L_Lena_Approves,
-		"I think I left my courage in another pair of pants.  See you later!", L_Lena_No_Fan;
-	close;
+    mes "[Lena]";
+    mes "\"While wandering through the forest, I was ambushed by bandits.  Though I got them all, one of them stabbed me pretty good.  I'm still healing from that encounter.  I'm worried that the bandit threat may spread.\"";
+    menu
+        "Don't worry, I can take out some of these scumbags.", L_Lena_Approves,
+        "I think I left my courage in another pair of pants.  See you later!", L_Lena_No_Fan;
+    close;
 
 L_Lena_Approves:
-	set TMW_Quest, 41;
-	mes "[Lena]";
-	mes "\"You look like you can handle yourself in a fight.  If you can take on this scourge I'll reward you with a hat like mine.  In order to prove your mettle, bring me 10 Bandit Hoods so I know they've met their match.\"";
-	areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::";
-	areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::";
-	close;
+    set TMW_Quest, 41;
+    mes "[Lena]";
+    mes "\"You look like you can handle yourself in a fight.  If you can take on this scourge I'll reward you with a hat like mine.  In order to prove your mettle, bring me 10 Bandit Hoods so I know they've met their match.\"";
+    areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::";
+    areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::";
+    close;
 
 L_Lena_No_Fan:
-	mes "[Lena]";
-	mes "\"What will Hurnscald do if these bandits overrun the town?  I hope you reconsider.\"";
-	close;
+    mes "[Lena]";
+    mes "\"What will Hurnscald do if these bandits overrun the town?  I hope you reconsider.\"";
+    close;
 
 L_Lena_Fairy_Hat:
-	if (countitem("BanditHood") < 10) goto L_Lena_NotEnough;
-	getinventorylist;
-	if (@inventorylist_count - (countitem("BanditHood")== 10) > 99) goto L_TooMany;
-	set TMW_Quest, 42;
-	delitem "BanditHood", 10;
-	getitem "FairyHat", 1;
-	mes "[Lena]";
-	mes "\"Ah, you've brought me the Bandit Hoods.  As promised, here is a hat like mine.\"";
-	next;
-	mes "\"Unfortunately, I feel this bandit threat may have grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
-	menu
-		"Consider it done!", L_Lena_Bandit_Leader_Yes,
-		"Woah there, that sounds a bit harder than what I can succeed at.", L_Lena_NoWay;
-	close;
+    if (countitem("BanditHood") < 10)
+        goto L_Lena_NotEnough;
+    getinventorylist;
+    if (@inventorylist_count - (countitem("BanditHood")== 10) > 99)
+        goto L_TooMany;
+    set TMW_Quest, 42;
+    delitem "BanditHood", 10;
+    getitem "FairyHat", 1;
+    mes "[Lena]";
+    mes "\"Ah, you've brought me the Bandit Hoods.  As promised, here is a hat like mine.\"";
+    next;
+    mes "\"Unfortunately, I feel this bandit threat may have grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
+    menu
+        "Consider it done!", L_Lena_Bandit_Leader_Yes,
+        "Woah there, that sounds a bit harder than what I can succeed at.", L_Lena_NoWay;
+    close;
 
 L_Lena_NotEnough:
-	mes "[Lena]";
-	mes "\"You don't have enough Bandit Hoods to prove you are taking care of this threat.  Please come back with 10 Bandit Hoods to show you are taking care of these bandits.\"";
-	close;
+    mes "[Lena]";
+    mes "\"You don't have enough Bandit Hoods to prove you are taking care of this threat.  Please come back with 10 Bandit Hoods to show you are taking care of these bandits.\"";
+    close;
 
 L_Lena_Bandit_Leader:
-	mes "[Lena]";
-	mes "\"I feel this bandit threat may have grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
-	menu
-		"Consider it done!", L_Lena_Bandit_Leader_Yes,
-		"Woah there, that sounds a bit harder than what I can succeed at.", L_Lena_NoWay;
-	close;
+    mes "[Lena]";
+    mes "\"I feel this bandit threat may have grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
+    menu
+        "Consider it done!", L_Lena_Bandit_Leader_Yes,
+        "Woah there, that sounds a bit harder than what I can succeed at.", L_Lena_NoWay;
+    close;
 
 L_Lena_Bandit_Leader_Yes:
-	set TMW_Quest, 43;
-	areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::";
-	areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::";
-	mes "[Lena]";
-	mes "\"You have a brave heart.  Though I know you can succeed on your own, I recommend finding others to help you defeat the bandit leader.  I believe he could pose a significant threat to solitary individuals seeking to challenge him.  Good luck!\"";
-	close;
+    set TMW_Quest, 43;
+    areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::";
+    areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::";
+    mes "[Lena]";
+    mes "\"You have a brave heart.  Though I know you can succeed on your own, I recommend finding others to help you defeat the bandit leader.  I believe he could pose a significant threat to solitary individuals seeking to challenge him.  Good luck!\"";
+    close;
 
 L_Lena_NoWay:
-	mes "[Lena]";
-	mes "\"That is too bad.  Feel free to return at any time.  This bandit threat needs to be pushed back.\"";
-	close;
+    mes "[Lena]";
+    mes "\"That is too bad.  Feel free to return at any time.  This bandit threat needs to be pushed back.\"";
+    close;
 
 L_Lena_Bandit_Leader_Fail:
-	set TMW_Quest, 43;
-	mes "[Lena]";
-	mes "\"You haven't killed the bandit leader yet.  This is a big problem.  Please be careful.\"";
-	close;
+    set TMW_Quest, 43;
+    mes "[Lena]";
+    mes "\"You haven't killed the bandit leader yet.  This is a big problem.  Please be careful.\"";
+    close;
 
 L_Lena_Success:
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_TooMany;
-	set TMW_Quest, 46;
-	getitem "ForestArmor", 1;
-	mes "[Lena]";
-	mes "\"Excellent!  You killed the bandit leader.  Here is the armor as I promised you.  Safe journeys!\"";
-	close;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_TooMany;
+    set TMW_Quest, 46;
+    getitem "ForestArmor", 1;
+    mes "[Lena]";
+    mes "\"Excellent!  You killed the bandit leader.  Here is the armor as I promised you.  Safe journeys!\"";
+    close;
 
 L_Lena_Done:
-	mes "[Lena]";
-	mes "\"Thank you for all your help.  With your efforts, we can only hope this scourge doesn't see a resurgence.\"";
-	close;
+    mes "[Lena]";
+    mes "\"Thank you for all your help.  With your efforts, we can only hope this scourge doesn't see a resurgence.\"";
+    close;
 
 L_TooMany:
-	mes "[Lena]";
-	mes "\"You have too many items in your inventory.  Please get rid of something so I can reward you.\"";
-	close;
-
+    mes "[Lena]";
+    mes "\"You have too many items in your inventory.  Please get rid of something so I can reward you.\"";
+    close;
 }
diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt
index b969af7d..9a0a3e16 100644
--- a/world/map/npc/009-2/misc.txt
+++ b/world/map/npc/009-2/misc.txt
@@ -1,61 +1,53 @@
 //Note in bar
 
-009-2.gat,54,49,0	script	Note	127, {
-	mes "[Note]";
-	mes "\"We refuse service to anyone who:\"";
-	mes "\"-Has a bubblehead\"";
-	mes "\"-Is not properly shaded\"";
-	mes "\"-Can't walk without stopping after every step\"";
-	close;
-	// In case you don't get the joke - it's a parody on Illutia.
+009-2.gat,54,49,0|script|Note|127,{
+    mes "[Note]";
+    mes "\"We refuse service to anyone who:\"";
+    mes "\"-Has a bubblehead\"";
+    mes "\"-Is not properly shaded\"";
+    mes "\"-Can't walk without stopping after every step\"";
+    close;
+    // In case you don't get the joke - it's a parody on Illutia.
 }
 
 //Bookshelf
-009-2.gat,109,44,0	script	#Book	127, {
-	if (getskilllv(SKILL_MAGIC))
-		goto L_magic;
-        mes "[Bookshelf]";
-        mes "This bookshelf seems to have a selection of diaries and manuscripts, though you can't make out anything that strikes you as being particularly interesting.";
-        close;
+009-2.gat,109,44,0|script|#Book|127,{
+    if (getskilllv(SKILL_MAGIC))
+        goto L_magic;
+    mes "[Bookshelf]";
+    mes "This bookshelf seems to have a selection of diaries and manuscripts, though you can't make out anything that strikes you as being particularly interesting.";
+    close;
 
 L_magic:
-        mes "[Bookshelf]";
-        mes "Browsing through the books, you come across a manuscript entitled 'Notes of Potaffe, On Transmutation'.";
-        next;
-
-	if (getskilllv(SKILL_MAGIC_TRANSMUTE) < 2)
-		goto L_magic_boring;
-
-        mes "[Bookshelf]";
-        mes "Leafing through the manuscript, you find that you can read little of the tiny handwriting, and understand only a fraction of what is said.";
-        next;
-
-        mes "[Bookshelf]";
-        mes "After a while, you stumble across a section that appears to be in more careful handwriting.  The author notes that he (or she?) is describing a completely new transmutation there.";
-        next;
-
-        mes "[Bookshelf]";
-        mes "Excitedly, you turn the page-- only to find that it is stuck to the next, and won't get unstuck!";
-        next;
-
-        mes "[Bookshelf]";
-        mes "The page after that is more scribbly again, with many crossed-out words and sections, and side remarks such as 'It almost worked' or 'Worked fine yesterday.'";
-        next;
-
-        mes "[Bookshelf]";
-        mes "The last word on that page is '" + getspellinvocation("make-iron-powder") + "', underlined twice, with a comment saying 'finally got it right'.";
-        next;
-
-        mes "[Bookshelf]";
-        mes "Unfortunately, you can't make out from the text what the transmutation is for or whether it requires any material components...";
-        next;
-
-        mes "[Bookshelf]";
-        mes "You can't make out anything else of value, so you place the manuscript back in the bookshelf.";
-        close;
+    mes "[Bookshelf]";
+    mes "Browsing through the books, you come across a manuscript entitled 'Notes of Potaffe, On Transmutation'.";
+    next;
+    if (getskilllv(SKILL_MAGIC_TRANSMUTE) < 2)
+        goto L_magic_boring;
+    mes "[Bookshelf]";
+    mes "Leafing through the manuscript, you find that you can read little of the tiny handwriting, and understand only a fraction of what is said.";
+    next;
+    mes "[Bookshelf]";
+    mes "After a while, you stumble across a section that appears to be in more careful handwriting.  The author notes that he (or she?) is describing a completely new transmutation there.";
+    next;
+    mes "[Bookshelf]";
+    mes "Excitedly, you turn the page-- only to find that it is stuck to the next, and won't get unstuck!";
+    next;
+    mes "[Bookshelf]";
+    mes "The page after that is more scribbly again, with many crossed-out words and sections, and side remarks such as 'It almost worked' or 'Worked fine yesterday.'";
+    next;
+    mes "[Bookshelf]";
+    mes "The last word on that page is '" + getspellinvocation("make-iron-powder") + "', underlined twice, with a comment saying 'finally got it right'.";
+    next;
+    mes "[Bookshelf]";
+    mes "Unfortunately, you can't make out from the text what the transmutation is for or whether it requires any material components...";
+    next;
+    mes "[Bookshelf]";
+    mes "You can't make out anything else of value, so you place the manuscript back in the bookshelf.";
+    close;
 
 L_magic_boring:
-        mes "[Bookshelf]";
-        mes "Leafing through the manuscript, you find that you understand too little of what is said there to make any sense of it.";
-        close;
+    mes "[Bookshelf]";
+    mes "Leafing through the manuscript, you find that you understand too little of what is said there to make any sense of it.";
+    close;
 }
diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index 9ce99879..043705dd 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -11,390 +11,401 @@
 //#
 //#################################################################################
 
-009-2.gat,185,55,0	script	Nicholas	135,{
+009-2.gat,185,55,0|script|Nicholas|135,{
 
-        set @SETZER_XP, 100000;
-        set @SHIELD_XP, 20000;
+    set @SETZER_XP, 100000;
+    set @SHIELD_XP, 20000;
 
-        set @SHIELD_INITIAL, 0;
-        set @SHIELD_KNOWS_PATCH, 1;	// knows that a leather patch is needed
-        set @SHIELD_COMPLETED, 2;	// shield completed once
+    set @SHIELD_INITIAL, 0;
+    set @SHIELD_KNOWS_PATCH, 1; // knows that a leather patch is needed
+    set @SHIELD_COMPLETED, 2; // shield completed once
 
-        set @SETZER_INITIAL, 0;
-        set @SETZER_KNOWS_OIL, 1;
-        set @SETZER_KNOWS_STINGER, 2;
-        set @SETZER_FLAG_MADE_OIL, 4;
-        set @SETZER_FLAG_MADE_SETZER, 8;
+    set @SETZER_INITIAL, 0;
+    set @SETZER_KNOWS_OIL, 1;
+    set @SETZER_KNOWS_STINGER, 2;
+    set @SETZER_FLAG_MADE_OIL, 4;
+    set @SETZER_FLAG_MADE_SETZER, 8;
 
-        set @Q_SETZER_MASK, NIBBLE_3_MASK;
-        set @Q_SETZER_SHIFT, NIBBLE_3_SHIFT;
+    set @Q_SETZER_MASK, NIBBLE_3_MASK;
+    set @Q_SETZER_SHIFT, NIBBLE_3_SHIFT;
 
-        set @Q_SHIELD_MASK, NIBBLE_4_MASK;
-        set @Q_SHIELD_SHIFT, NIBBLE_4_SHIFT;
+    set @Q_SHIELD_MASK, NIBBLE_4_MASK;
+    set @Q_SHIELD_SHIFT, NIBBLE_4_SHIFT;
 
-        set @Q_SETZER_status, (QUEST_Forestbow_state & @Q_SETZER_MASK) >> @Q_SETZER_SHIFT;
-        set @Q_SHIELD_status, (QUEST_Forestbow_state & @Q_SHIELD_MASK) >> @Q_SHIELD_SHIFT;
+    set @Q_SETZER_status, (QUEST_Forestbow_state & @Q_SETZER_MASK) >> @Q_SETZER_SHIFT;
+    set @Q_SHIELD_status, (QUEST_Forestbow_state & @Q_SHIELD_MASK) >> @Q_SHIELD_SHIFT;
 
-	mes "[Nicholas]";
-	mes "\"Hello, there!  I'm an expert blacksmith.  If you get me some Coal and Iron Ingots, I could make you a very valuable shield or helmet.\"";
-	next;
-	menu
-		"I have Iron Ingots!", L_Check,
-		"Where can I get Coal and Iron Ingots?", L_Info,
-		"I'm okay, thanks.", L_Pass;
+    mes "[Nicholas]";
+    mes "\"Hello, there!  I'm an expert blacksmith.  If you get me some Coal and Iron Ingots, I could make you a very valuable shield or helmet.\"";
+    next;
+    menu
+        "I have Iron Ingots!", L_Check,
+        "Where can I get Coal and Iron Ingots?", L_Info,
+        "I'm okay, thanks.", L_Pass;
 
 L_Check:
-	mes "[Nicholas]";
-	mes "\"Let me take a look at how much you have...\"";
-	next;
-	if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) ) goto L_NoItem;
-	if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_StageA;
-	if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_StageB;
-	goto L_StageC;
+    mes "[Nicholas]";
+    mes "\"Let me take a look at how much you have...\"";
+    next;
+    if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) )
+        goto L_NoItem;
+    if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+        goto L_StageA;
+    if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+        goto L_StageB;
+    goto L_StageC;
 
 L_Info:
-	mes "[Nicholas]";
-	mes "\"You can find Coal and Iron Ore in mines.  Once you have Coal and Iron Ore, find a smith that will smelt the Iron Ore and cast them into Iron Ingots.\"";
-	next;
-	mes "[Nicholas]";
-	mes "\"Come back here with some Coal and Iron Ingots, and I'll make something nice for you.\"";
-	close;
+    mes "[Nicholas]";
+    mes "\"You can find Coal and Iron Ore in mines.  Once you have Coal and Iron Ore, find a smith that will smelt the Iron Ore and cast them into Iron Ingots.\"";
+    next;
+    mes "[Nicholas]";
+    mes "\"Come back here with some Coal and Iron Ingots, and I'll make something nice for you.\"";
+    close;
 
 L_Pass:
-	mes "[Nicholas]";
-	mes "\"Oh, okay.  Come back any time.\"";
-	close;
+    mes "[Nicholas]";
+    mes "\"Oh, okay.  Come back any time.\"";
+    close;
 
 L_StageA:
-	mes "[Nicholas]";
-	mes "\"That's just enough for me to make you a winged Knight's Helmet, but it'll cost you 10,000GP, 6 Coal and 3 Iron Ingots.\"";
-	next;
-        goto L_main_menu;
+    mes "[Nicholas]";
+    mes "\"That's just enough for me to make you a winged Knight's Helmet, but it'll cost you 10,000GP, 6 Coal and 3 Iron Ingots.\"";
+    next;
+    goto L_main_menu;
 
 L_StageB:
-	mes "[Nicholas]";
-	mes "\"Ahh, with that much Coal and Iron Ingots I can make you one of two helmets, for only 10,000GP, or I can make you a shield, for 20,000GP.\"";
-	mes "";
-	mes "\"What would you like?\"";
-	next;
-        goto L_main_menu;
+    mes "[Nicholas]";
+    mes "\"Ahh, with that much Coal and Iron Ingots I can make you one of two helmets, for only 10,000GP, or I can make you a shield, for 20,000GP.\"";
+    mes "";
+    mes "\"What would you like?\"";
+    next;
+    goto L_main_menu;
 
 L_StageC:
-	mes "[Nicholas]";
-	mes "\"Excellent, that's enough to make three different types of helmet.  My fee is 10,000GP.  I can also make a shield, but that will cost you 20,000 GP.\"";
-	mes "";
-	mes "\"Which will it be?\"";
-	next;
-        goto L_main_menu;
+    mes "[Nicholas]";
+    mes "\"Excellent, that's enough to make three different types of helmet.  My fee is 10,000GP.  I can also make a shield, but that will cost you 20,000 GP.\"";
+    mes "";
+    mes "\"Which will it be?\"";
+    next;
+    goto L_main_menu;
 
 L_main_menu:
 
-        set @CHOICE_KNIGHT, 1;
-        set @CHOICE_CRUSADE, 2;
-        set @CHOICE_WARLORD, 3;
-        set @CHOICE_SHIELD, 4;
-        set @CHOICE_SETZER, 5;
-        set @CHOICE_CANCEL, 6;
+    set @CHOICE_KNIGHT, 1;
+    set @CHOICE_CRUSADE, 2;
+    set @CHOICE_WARLORD, 3;
+    set @CHOICE_SHIELD, 4;
+    set @CHOICE_SETZER, 5;
+    set @CHOICE_CANCEL, 6;
 
-        setarray @choice$, "", "", "", "", "", "";
-        set @choices_nr, 0;
-        setarray @choice_idx, 0, 0, 0, 0, 0, 0;
+    setarray @choice$, "", "", "", "", "", "";
+    set @choices_nr, 0;
+    setarray @choice_idx, 0, 0, 0, 0, 0, 0;
 
-	if (countitem("ShortSword") < 1) goto L_main_menu_post_setzer;
-	set @choice$[@choices_nr], "Can you make my Short Sword better?";
-	set @choice_idx[@choices_nr], @CHOICE_SETZER;
-	set @choices_nr, 1 + @choices_nr;
+    if (countitem("ShortSword") < 1)
+        goto L_main_menu_post_setzer;
+    set @choice$[@choices_nr], "Can you make my Short Sword better?";
+    set @choice_idx[@choices_nr], @CHOICE_SETZER;
+    set @choices_nr, 1 + @choices_nr;
 
 L_main_menu_post_setzer:
 
-	if ( (countitem("IngotIron")<3) || (countitem("Coal") <6) ) goto L_no_more_helmets;
-        set @choice$[@choices_nr], "Knight's Helmet (3 Iron Ingots & 6 Coal).";
-        set @choice_idx[@choices_nr], @CHOICE_KNIGHT;
-        set @choices_nr, 1 + @choices_nr;
+    if ( (countitem("IngotIron")<3) || (countitem("Coal") <6) )
+        goto L_no_more_helmets;
+    set @choice$[@choices_nr], "Knight's Helmet (3 Iron Ingots & 6 Coal).";
+    set @choice_idx[@choices_nr], @CHOICE_KNIGHT;
+    set @choices_nr, 1 + @choices_nr;
 
-	if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_no_more_helmets;
+    if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+        goto L_no_more_helmets;
+    set @choice$[@choices_nr], "Crusade Helmet (6 Iron Ingots & 12 Coal).";
+    set @choice_idx[@choices_nr], @CHOICE_CRUSADE;
+    set @choices_nr, 1 + @choices_nr;
 
-        set @choice$[@choices_nr], "Crusade Helmet (6 Iron Ingots & 12 Coal).";
-        set @choice_idx[@choices_nr], @CHOICE_CRUSADE;
-        set @choices_nr, 1 + @choices_nr;
+    set @choice$[@choices_nr], "Steel Shield (6 Iron Ingots & 12 Coal).";
+    set @choice_idx[@choices_nr], @CHOICE_SHIELD;
+    set @choices_nr, 1 + @choices_nr;
 
-        set @choice$[@choices_nr], "Steel Shield (6 Iron Ingots & 12 Coal).";
-        set @choice_idx[@choices_nr], @CHOICE_SHIELD;
-        set @choices_nr, 1 + @choices_nr;
+    if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+        goto L_no_more_helmets;
+    set @choice$[@choices_nr], "Warlord Helmet (9 Iron Ingots & 18 Coal).";
+    set @choice_idx[@choices_nr], @CHOICE_WARLORD;
+    set @choices_nr, 1 + @choices_nr;
 
-	if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_no_more_helmets;
-
-        set @choice$[@choices_nr], "Warlord Helmet (9 Iron Ingots & 18 Coal).";
-        set @choice_idx[@choices_nr], @CHOICE_WARLORD;
-        set @choices_nr, 1 + @choices_nr;
 L_no_more_helmets:
-		set @choice$[@choices_nr], "No thanks.";
-		set @choice_idx[@choices_nr], @CHOICE_CANCEL;
-		set @choices_nr, 1 + @choices_nr;
-
-	menu	@choice$[0], -,
-		@choice$[1], -,
-		@choice$[2], -,
-		@choice$[3], -,
-		@choice$[4], -,
-		@choice$[5], -;
-
-        set @menu, @menu - 1;
-
-        if (@menu >= @choices_nr)
-		close;
-
-	set @choice, @choice_idx[@menu];
-
-	if (@choice == @CHOICE_KNIGHT) goto L_YesKnight;
-	if (@choice == @CHOICE_CRUSADE) goto L_YesCrusade;
-	if (@choice == @CHOICE_WARLORD) goto L_YesWarlord;
-	if (@choice == @CHOICE_SHIELD) goto L_YesShield;
-	if (@choice == @CHOICE_SETZER) goto L_SetzerQuest;
-	if (@choice == @CHOICE_CANCEL) goto L_end;
-
-	close;                
-
+    set @choice$[@choices_nr], "No thanks.";
+    set @choice_idx[@choices_nr], @CHOICE_CANCEL;
+    set @choices_nr, 1 + @choices_nr;
+    menu
+        @choice$[0], -,
+        @choice$[1], -,
+        @choice$[2], -,
+        @choice$[3], -,
+        @choice$[4], -,
+        @choice$[5], -;
+
+    set @menu, @menu - 1;
+    if (@menu >= @choices_nr)
+    close;
+
+    set @choice, @choice_idx[@menu];
+    if (@choice == @CHOICE_KNIGHT)
+        goto L_YesKnight;
+    if (@choice == @CHOICE_CRUSADE)
+        goto L_YesCrusade;
+    if (@choice == @CHOICE_WARLORD)
+        goto L_YesWarlord;
+    if (@choice == @CHOICE_SHIELD)
+        goto L_YesShield;
+    if (@choice == @CHOICE_SETZER)
+        goto L_SetzerQuest;
+    if (@choice == @CHOICE_CANCEL)
+        goto L_end;
+    close;
 
 L_NoItem:
-	mes "[Nicholas]";
-	mes "\"It appears you don't have enough Coal and Iron Ingots for me to work with.  Please do come back when you have more, though.\"";
-	close;
+    mes "[Nicholas]";
+    mes "\"It appears you don't have enough Coal and Iron Ingots for me to work with.  Please do come back when you have more, though.\"";
+    close;
 
 L_ComeBack:
-	mes "[Nicholas]";
-	mes "\"Come back any time.\"";
-	close;
+    mes "[Nicholas]";
+    mes "\"Come back any time.\"";
+    close;
 
 L_NoMoney:
-	mes "[Nicholas]";
-	mes "\"Oh dear, it seems you don't have enough money.\"";
-	close;
+    mes "[Nicholas]";
+    mes "\"Oh dear, it seems you don't have enough money.\"";
+    close;
 
 L_YesKnight:
-	if (zeny < 10000) goto L_NoMoney;
-	if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) ) goto L_NoItem;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_TooMany;
-	set zeny, zeny - 10000;
-	delitem "IngotIron", 3;
-	delitem "Coal", 6;
-	getitem "KnightsHelmet", 1;
-	goto L_Done;
+    if (zeny < 10000)
+        goto L_NoMoney;
+    if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) )
+        goto L_NoItem;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_TooMany;
+    set zeny, zeny - 10000;
+    delitem "IngotIron", 3;
+    delitem "Coal", 6;
+    getitem "KnightsHelmet", 1;
+    goto L_Done;
 
 L_YesCrusade:
-	if (zeny < 10000) goto L_NoMoney;
-	if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_NoItem;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_TooMany;
-	set zeny, zeny-10000;
-	delitem "IngotIron", 6;
-	delitem "Coal", 12;
-	getitem "CrusadeHelmet", 1;
-	goto L_Done;
+    if (zeny < 10000) goto L_NoMoney;
+    if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+        goto L_NoItem;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_TooMany;
+    set zeny, zeny-10000;
+    delitem "IngotIron", 6;
+    delitem "Coal", 12;
+    getitem "CrusadeHelmet", 1;
+    goto L_Done;
 
 L_YesWarlord:
-	if (zeny < 10000) goto L_NoMoney;
-	if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_NoItem;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_TooMany;
-	set zeny, zeny-10000;
-	delitem "IngotIron", 9;
-	delitem "Coal", 18;
-	getitem "WarlordHelmet", 1;
-	goto L_Done;
+    if (zeny < 10000) goto L_NoMoney;
+    if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+        goto L_NoItem;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_TooMany;
+    set zeny, zeny-10000;
+    delitem "IngotIron", 9;
+    delitem "Coal", 18;
+    getitem "WarlordHelmet", 1;
+    goto L_Done;
 
 L_YesShield:
-        mes "[Nicholas]";
-        mes "Nicholas examines your Iron Ingots.";
-        mes "\"No, this iron is too brittle; for something as large as a shield I need to mix in softer iron.  Can I see if you have anything suitable?\"";
-        next;
-
-        menu	"Sure, have a look!", -,
-		"No.", L_Pass;
-
-	if (countitem("InfantryHelmet") == 1) goto L_MoreInfantry;
-        if (countitem("InfantryHelmet") == 0) goto L_NoInfantry;
-
-        mes "[Nicholas]";
-        mes "Nicholas pulls out two of your Infantry Helmets.";
-        mes "\"I can use those...  yes, that should work.  Now all I need is a Leather Patch for the handle, and 20,000 GP.\"";
-
-        if (@Q_SHIELD_status < @SHIELD_KNOWS_PATCH)
-        	set @Q_SHIELD_status, @SHIELD_KNOWS_PATCH;
-        callsub L_Update_Var;
-
-        next;
-
-	menu	"Here you are!", -,
-		"Where can I get a Leather Patch?", L_WhereLeather,
-        	"No way.", L_Pass;
-
-	if (zeny < 20000) goto L_ShieldNoZeny;
-	if (countitem("InfantryHelmet") < 2) goto L_ShieldNoInfantry;
-	if (countitem("IngotIron") < 6) goto L_ShieldNoIngot;
-	if (countitem("Coal") < 12) goto L_ShieldNoCoal;
-	if (countitem("LeatherPatch") < 1) goto L_ShieldNoLeatherPatch;
-	// No inventory check needed, as infantry helms are removed, opening two slots
-
-        mes "[Nicholas]";
-        mes "\"Yes, it looks as if you have all that is needed!\"";
-        mes "You watch Nicholas melt the ingots and helmets and form a shield out of the resulting iron.  He then cuts your Leather Patch apart and adds it to the handles.";
-        mes "\"Here is your shield!\"";
-
-        delitem "InfantryHelmet", 1;
-        delitem "InfantryHelmet", 1;
-        delitem "LeatherPatch", 1;
-        delitem "IngotIron", 6;
-	delitem "Coal", 12;
-        set zeny, zeny - 20000;
-
-        if (@Q_SHIELD_status < @SHIELD_COMPLETED)
-		getexp @SHIELD_XP, 0;
-        if (@Q_SHIELD_status < @SHIELD_COMPLETED)
-		mes "[" + @SHIELD_XP + " experience points]";
-
-        set @Q_SHIELD_status, @SHIELD_COMPLETED; // get XP only once
-        callsub L_Update_Var;
-
-        getitem "SteelShield", 1;
-        close;
+    mes "[Nicholas]";
+    mes "Nicholas examines your Iron Ingots.";
+    mes "\"No, this iron is too brittle; for something as large as a shield I need to mix in softer iron.  Can I see if you have anything suitable?\"";
+    next;
+    menu
+        "Sure, have a look!", -,
+        "No.", L_Pass;
+    if (countitem("InfantryHelmet") == 1)
+        goto L_MoreInfantry;
+    if (countitem("InfantryHelmet") == 0)
+        goto L_NoInfantry;
+
+    mes "[Nicholas]";
+    mes "Nicholas pulls out two of your Infantry Helmets.";
+    mes "\"I can use those...  yes, that should work.  Now all I need is a Leather Patch for the handle, and 20,000 GP.\"";
+    if (@Q_SHIELD_status < @SHIELD_KNOWS_PATCH)
+        set @Q_SHIELD_status, @SHIELD_KNOWS_PATCH;
+    callsub L_Update_Var;
+    next;
+    menu
+        "Here you are!", -,
+        "Where can I get a Leather Patch?", L_WhereLeather,
+        "No way.", L_Pass;
+    if (zeny < 20000)
+        goto L_ShieldNoZeny;
+    if (countitem("InfantryHelmet") < 2)
+        goto L_ShieldNoInfantry;
+    if (countitem("IngotIron") < 6)
+        goto L_ShieldNoIngot;
+    if (countitem("Coal") < 12)
+        goto L_ShieldNoCoal;
+    if (countitem("LeatherPatch") < 1)
+        goto L_ShieldNoLeatherPatch;
+    // No inventory check needed, as infantry helms are removed, opening two slots
+
+    mes "[Nicholas]";
+    mes "\"Yes, it looks as if you have all that is needed!\"";
+    mes "You watch Nicholas melt the ingots and helmets and form a shield out of the resulting iron.  He then cuts your Leather Patch apart and adds it to the handles.";
+    mes "\"Here is your shield!\"";
+    delitem "InfantryHelmet", 1;
+    delitem "InfantryHelmet", 1;
+    delitem "LeatherPatch", 1;
+    delitem "IngotIron", 6;
+    delitem "Coal", 12;
+    set zeny, zeny - 20000;
+
+    if (@Q_SHIELD_status < @SHIELD_COMPLETED)
+        getexp @SHIELD_XP, 0;
+    if (@Q_SHIELD_status < @SHIELD_COMPLETED)
+        mes "[" + @SHIELD_XP + " experience points]";
+    set @Q_SHIELD_status, @SHIELD_COMPLETED; // get XP only once
+    callsub L_Update_Var;
+    getitem "SteelShield", 1;
+    close;
 
 L_ShieldNoZeny:
-        mes "[Nicholas]";
-        mes "\"I am sorry, but I must ask that you pay 20,000 GP; this is quality work.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"I am sorry, but I must ask that you pay 20,000 GP; this is quality work.\"";
+    close;
 
 L_ShieldNoInfantry:
-        mes "[Nicholas]";
-        mes "\"Now this is strange...  I could have sworn that you had two Infantry Helmets right here.  Well, come back if you have some more!\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"Now this is strange...  I could have sworn that you had two Infantry Helmets right here.  Well, come back if you have some more!\"";
+    close;
 
 L_ShieldNoIngot:
-        mes "[Nicholas]";
-        mes "\"How odd...  didn't I put your Iron Ingots on the table right here?  Well, I will need them back to make the shield.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"How odd...  didn't I put your Iron Ingots on the table right here?  Well, I will need them back to make the shield.\"";
+    close;
 
 L_ShieldNoCoal:
-	mes "[Nicholas]";
-        mes "\"How odd...  didn't I put your Coal on the table right here?  Well, I will need it back to make the shield.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"How odd...  didn't I put your Coal on the table right here?  Well, I will need it back to make the shield.\"";
+    close;
 
 L_ShieldNoLeatherPatch:
-        mes "[Nicholas]";
-        mes "\"You don't have a suitable Leather Patch.  I'm sorry, but a shield without one would chafe terribly.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"You don't have a suitable Leather Patch.  I'm sorry, but a shield without one would chafe terribly.\"";
+    close;
 
 L_MoreInfantry:
-        mes "[Nicholas]";
-        mes "Nicholas takes your Infantry Helmet and examines it.";
-        mes "\"Yes, this is perfect!  If you can bring me another one of those, I can make your shield.\"";
-        close;
-	
+    mes "[Nicholas]";
+    mes "Nicholas takes your Infantry Helmet and examines it.";
+    mes "\"Yes, this is perfect!  If you can bring me another one of those, I can make your shield.\"";
+    close;
+
 L_NoInfantry:
-        mes "[Nicholas]";
-        mes "Nicholas shakes his head.";
-        mes "\"No, none of these items are suitable.  Try looking for somewhat large metal items.\"";
-        close;
+    mes "[Nicholas]";
+    mes "Nicholas shakes his head.";
+    mes "\"No, none of these items are suitable.  Try looking for somewhat large metal items.\"";
+    close;
 
 L_WhereLeather:
-        mes "[Nicholas]";
-	mes "\"Hmm.  You should look for someone who can work with some kind of leather.  Rumor has it that there is someone in the eastern desert who can, but I haven't been there.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"Hmm.  You should look for someone who can work with some kind of leather.  Rumor has it that there is someone in the eastern desert who can, but I haven't been there.\"";
+    close;
 
 
 L_SetzerQuest:
-        mes "[Nicholas]";
-        if (@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER)
-        	mes "\"Another one?  Sure, why not.\"";
-	mes "Nicholas examines your Short Sword, then nods.";
-        mes "\"This is good quality.  I can make something special out of it, with three ingot bars of iron, six lumps of coal and 50,000 GP -- but I will also need a potion of monster oil.\"";
-        if (@Q_SETZER_status < @SETZER_KNOWS_OIL)
-        	set @Q_SETZER_status, @SETZER_KNOWS_OIL;
-        callsub L_Update_Var;
-        next;
-
-        menu "Here you are.", -,
-             "Monster oil?  What's that?", L_ExplainMonsterOil,
-             "HOW much?  Nevermind then!", L_Pass;
-
-	if (zeny < 50000) goto L_SetzerNoZeny;
-	if ( (countitem("IngotIron") < 3) || (countitem("Coal") < 6) ) goto L_SetzerNoIngot;
-	if (countitem("MonsterOilPotion") < 1) goto L_SetzerNoMonsterOil;
-	if (countitem("ShortSword") < 1) goto L_SetzerNoSword;
-	// No inventory check needed, as the short sword is removed, opening a slot
-
-        mes "[Nicholas]";
-        mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer.  As you watch, it turns thinner and flatter.  Finally he pours the monster oil over it, heats the metal up again and douses it in water.";
-
-        set zeny, zeny - 50000;
-        delitem "IngotIron", 3;
-	delitem "Coal", 6;
-        delitem "MonsterOilPotion", 1;
-        delitem "ShortSword", 1;
-
-        getitem "Setzer", 1;
-        if (!(@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER))
-		mes "[" + @SETZER_XP + " experience points]";
-        if (!(@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER))
-		getexp @SETZER_XP, 1;
-        set @Q_SETZER_status, @Q_SETZER_status | @SETZER_FLAG_MADE_SETZER;
-        callsub L_Update_Var;
-        next;
-
-        mes "[Nicholas]";
-        mes "Nicholas hands you the completed sword.  It feels strangely light in your hands.";
-        mes "\"I made it lighter and faster, it should also cut a little better now.  This kind of sword is called a Setzer, after a famous gambler who invented it as a weapon in between a knife and a sword.\"";
-        next;
-
-        mes "[Nicholas]";
-        mes "\"I'm quite happy with this one.  Be careful around the edge, though, it is quite sharp!\"";
-        close;
+    mes "[Nicholas]";
+    if (@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER)
+            mes "\"Another one?  Sure, why not.\"";
+    mes "Nicholas examines your Short Sword, then nods.";
+    mes "\"This is good quality.  I can make something special out of it, with three ingot bars of iron, six lumps of coal and 50,000 GP -- but I will also need a potion of monster oil.\"";
+    if (@Q_SETZER_status < @SETZER_KNOWS_OIL)
+        set @Q_SETZER_status, @SETZER_KNOWS_OIL;
+    callsub L_Update_Var;
+    next;
+    menu
+        "Here you are.", -,
+        "Monster oil?  What's that?", L_ExplainMonsterOil,
+        "HOW much?  Nevermind then!", L_Pass;
+    if (zeny < 50000)
+        goto L_SetzerNoZeny;
+    if ( (countitem("IngotIron") < 3) || (countitem("Coal") < 6) )
+        goto L_SetzerNoIngot;
+    if (countitem("MonsterOilPotion") < 1)
+        goto L_SetzerNoMonsterOil;
+    if (countitem("ShortSword") < 1)
+        goto L_SetzerNoSword;
+    // No inventory check needed, as the short sword is removed, opening a slot
+
+    mes "[Nicholas]";
+    mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer.  As you watch, it turns thinner and flatter.  Finally he pours the monster oil over it, heats the metal up again and douses it in water.";
+    set zeny, zeny - 50000;
+    delitem "IngotIron", 3;
+    delitem "Coal", 6;
+    delitem "MonsterOilPotion", 1;
+    delitem "ShortSword", 1;
+    getitem "Setzer", 1;
+    if (!(@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER))
+        mes "[" + @SETZER_XP + " experience points]";
+    if (!(@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER))
+        getexp @SETZER_XP, 1;
+    set @Q_SETZER_status, @Q_SETZER_status | @SETZER_FLAG_MADE_SETZER;
+    callsub L_Update_Var;
+    next;
+    mes "[Nicholas]";
+    mes "Nicholas hands you the completed sword.  It feels strangely light in your hands.";
+    mes "\"I made it lighter and faster, it should also cut a little better now.  This kind of sword is called a Setzer, after a famous gambler who invented it as a weapon in between a knife and a sword.\"";
+    next;
+    mes "[Nicholas]";
+    mes "\"I'm quite happy with this one.  Be careful around the edge, though, it is quite sharp!\"";
+    close;
 
 L_ExplainMonsterOil:
-        mes "[Nicholas]";
-        mes "\"Monster oil is a special oil that can be used to harden thin sheets of metal, if used properly.  Unfortunately, it is very hard to get.  Perhaps one of our local alchemists can help you with it?\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"Monster oil is a special oil that can be used to harden thin sheets of metal, if used properly.  Unfortunately, it is very hard to get.  Perhaps one of our local alchemists can help you with it?\"";
+    close;
 
 L_SetzerNoZeny:
-        mes "[Nicholas]";
-        mes "\"I am sorry, but I must ask that you pay 50,000 GP; the kind of weapon I am thinking of is not easy to make.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"I am sorry, but I must ask that you pay 50,000 GP; the kind of weapon I am thinking of is not easy to make.\"";
+    close;
 
 L_SetzerNoIngot:
-        mes "[Nicholas]";
-        mes "\"Without 3 ingots of iron, and six lumps of coal, I can't improve your sword.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"Without 3 ingots of iron, and six lumps of coal, I can't improve your sword.\"";
+    close;
 
 L_SetzerNoMonsterOil:
-        mes "[Nicholas]";
-        mes "\"I know that monster oil is hard to come by, but I can't do much without it.  Ask an alchemist if you need help making it.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"I know that monster oil is hard to come by, but I can't do much without it.  Ask an alchemist if you need help making it.\"";
+    close;
 
 L_SetzerNoSword:
-        mes "[Nicholas]";
-        mes "\"I will need your old Short Sword as a basis.  Please bring it to me first.\"";
-        close;
+    mes "[Nicholas]";
+    mes "\"I will need your old Short Sword as a basis.  Please bring it to me first.\"";
+    close;
 
 L_end:
-        close;
+    close;
 
 L_Done:
-	mes "[Nicholas]";
-	mes "\"Here you go!\"";
-	mes "";
-	mes "\"Come back any time.\"";
-	close;
+    mes "[Nicholas]";
+    mes "\"Here you go!\"";
+    mes "";
+    mes "\"Come back any time.\"";
+    close;
 
 L_Update_Var:
-        set QUEST_Forestbow_state,
-            (QUEST_Forestbow_state & ~(@Q_SHIELD_MASK | @Q_SETZER_MASK)
-                | (@Q_SHIELD_status << @Q_SHIELD_SHIFT)
-                | (@Q_SETZER_status << @Q_SETZER_SHIFT));
-        return;
+    set QUEST_Forestbow_state, (QUEST_Forestbow_state & ~(@Q_SHIELD_MASK | @Q_SETZER_MASK) | (@Q_SHIELD_status << @Q_SHIELD_SHIFT) | (@Q_SETZER_status << @Q_SETZER_SHIFT));
+    return;
 
 L_TooMany:
-        mes "[Nicholas]";
-        mes "\"You don't have room for it. Come back later when you do.\"";
-	close;
+    mes "[Nicholas]";
+    mes "\"You don't have room for it. Come back later when you do.\"";
+    close;
 }
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index 292bf5b2..5ee20905 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -22,7 +22,7 @@
 
 
 //######################################################################################
-009-2.gat,147,65,0	script	Nurse	119,	{
+009-2.gat,147,65,0|script|Nurse|119,{
     set @SNAKET_AMOUNT, 5;
     set @BSCORPIONST_AMOUNT, 10;
     // This quest can be done very often: so give less xp
@@ -107,17 +107,16 @@ state0:
     menu
         "I will do what I can. What do you need?", L_firstquest,
         "I'm really sorry, but I don't think I can help you.", -;
-
     mes "\"That is disagreeable to hear. Maybe I can find another person to take this task.\"";
     next;
     goto L_Usual;
 
 L_firstquest:
     set @Q_poison, 1;
-        callsub S_Update_Var;
-
+    callsub S_Update_Var;
     mes "\"That's great! First, I need some parts of the poisonous creatures.\"";
     next;
+
 L_ExplainAgain1:
     mes "\"Please bring me five tongues of snakes and ten stingers of black scorpions.\"";
     close;
@@ -131,20 +130,19 @@ state1:
         "Sorry, I forgot. What shall I bring you?", L_ExplainAgain1,
         "I have what you asked for.", -,
         "I'm still working on that.", quit;
-
-    if (countitem("SnakeTongue") < @SNAKET_AMOUNT || countitem("BlackScorpionStinger") < @BSCORPIONST_AMOUNT) goto L_NotEnough;
+    if (countitem("SnakeTongue") < @SNAKET_AMOUNT || countitem("BlackScorpionStinger") < @BSCORPIONST_AMOUNT)
+        goto L_NotEnough;
     delitem "SnakeTongue", @SNAKET_AMOUNT;
     delitem "BlackScorpionStinger", @BSCORPIONST_AMOUNT;
     getexp @QUEST1_EXP, 0;
-
     set @Q_poison, 2;
-        callsub S_Update_Var;
-
+    callsub S_Update_Var;
     mes "[Nurse]";
     mes "\"Very good. Now I have to extract the poison from this, it will take some time.\"";
     next;
     mes "\"But there are some other things we will need in any case. It would be courteous if you could get them meanwhile.\"";
     next;
+
 L_ExplainAgain2:
     mes "\"Please bring me ten acorns, five red apples, five green apples and also five oranges. And we need some small healing potions. They will be useful to hold off the baneful effects. Three of them will be enough, I guess.\"";
     close;
@@ -159,17 +157,20 @@ state2:
         "I have a bad memory. Can you tell me again what we need?", L_ExplainAgain2,
         "I managed to get everything we need.", -,
         "I will go and get it.", quit;
-
-    if (countitem("Acorn") < @ACORNS_AMOUNT || countitem("GreenApple") < @GREENAPPLE_AMOUNT || countitem("RedApple") < @REDAPPLE_AMOUNT || countitem("Orange") < @ORANGE_AMOUNT || countitem("SmallHealingPotion") < @HEALING_AMOUNT) goto L_NotEnough;
+    if (countitem("Acorn") < @ACORNS_AMOUNT
+        || countitem("GreenApple") < @GREENAPPLE_AMOUNT
+        || countitem("RedApple") < @REDAPPLE_AMOUNT
+        || countitem("Orange") < @ORANGE_AMOUNT
+        || countitem("SmallHealingPotion") < @HEALING_AMOUNT)
+            goto L_NotEnough;
     delitem "Acorn", @ACORNS_AMOUNT;
     delitem "GreenApple", @GREENAPPLE_AMOUNT;
     delitem "RedApple", @REDAPPLE_AMOUNT;
     delitem "Orange", @ORANGE_AMOUNT;
     delitem "SmallHealingPotion", @HEALING_AMOUNT;
     getexp @QUEST2_EXP, 0;
-
     set @Q_poison, 3;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
 
 L_Chemistry:
     callsub L_Shuffle_Need;
@@ -220,9 +221,10 @@ L_Exp_Game:
     menu
         "Please explain it again.", L_Exp_Game,
         "Alright.", -;
+
 L_Game:
     set @Q_poison, @Q_poison + 1;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
     // healing, venom, stabilizer
     callsub L_Load_Need;
     //descriptions
@@ -244,17 +246,26 @@ L_Game:
     mes "\"As far as I can tell you will need " + @desc$[@stIndex] + " of the stabilizer.\"";
     next;
 
-    if(@hlNeed/@vnNeed > 1 ) mes "\"I see that the healing potions are needed at least " + @hlNeed/@vnNeed + " times as much as the venom.\"";
-    if(@vnNeed/@hlNeed > 1 ) mes "\"I see that the venom extracts are needed at least " + @vnNeed/@hlNeed + " times as much as the healing potions.\"";
-    if ( (@hlNeed/@vnNeed > 1 ) || (@vnNeed/@hlNeed > 1 )) next;
+    if(@hlNeed/@vnNeed > 1 )
+        mes "\"I see that the healing potions are needed at least " + @hlNeed/@vnNeed + " times as much as the venom.\"";
+    if(@vnNeed/@hlNeed > 1 )
+        mes "\"I see that the venom extracts are needed at least " + @vnNeed/@hlNeed + " times as much as the healing potions.\"";
+    if ( (@hlNeed/@vnNeed > 1 ) || (@vnNeed/@hlNeed > 1 ))
+        next;
 
-    if(@stNeed/@vnNeed > 1 ) mes "\"I see that the stabilizer is needed at least " + @stNeed/@vnNeed + " times as much as the venom extracts.\"";
-    if(@vnNeed/@stNeed > 1 ) mes "\"I see that the venom extracts are needed at least " + @vnNeed/@stNeed + " times as much as the stabilizer.\"";
-    if ((@vnNeed/@stNeed > 1 ) || (@stNeed/@vnNeed > 1 )) next;
+    if(@stNeed/@vnNeed > 1 )
+        mes "\"I see that the stabilizer is needed at least " + @stNeed/@vnNeed + " times as much as the venom extracts.\"";
+    if(@vnNeed/@stNeed > 1 )
+        mes "\"I see that the venom extracts are needed at least " + @vnNeed/@stNeed + " times as much as the stabilizer.\"";
+    if ((@vnNeed/@stNeed > 1 ) || (@stNeed/@vnNeed > 1 ))
+        next;
 
-    if(@stNeed/@hlNeed > 1 ) mes "\"I see that the stabilizer is needed at least " + @stNeed/@hlNeed + " times as much as the healing potions.\"";
-    if(@hlNeed/@stNeed > 1 ) mes "\"I see that the healing potions are needed at least " + @hlNeed/@stNeed + " times as much as the stabilizer.\"";
-    if ((@hlNeed/@stNeed > 1 ) || (@stNeed/@hlNeed > 1 )) next;
+    if(@stNeed/@hlNeed > 1 )
+        mes "\"I see that the stabilizer is needed at least " + @stNeed/@hlNeed + " times as much as the healing potions.\"";
+    if(@hlNeed/@stNeed > 1 )
+        mes "\"I see that the healing potions are needed at least " + @hlNeed/@stNeed + " times as much as the stabilizer.\"";
+    if ((@hlNeed/@stNeed > 1 ) || (@stNeed/@hlNeed > 1 ))
+        next;
 
 L_choosePut:
     set @max, @count+@offset-1;
@@ -264,18 +275,24 @@ L_choosePut:
 
     mes "\"How many drops of the healing potion should we use?\"";
     input @hlPut;
-    if (@hlPut < @offset) goto L_Game_tooless;
-    if (@hlPut > @max) goto L_Game_toomuch;
+    if (@hlPut < @offset)
+        goto L_Game_tooless;
+    if (@hlPut > @max)
+        goto L_Game_toomuch;
 
     mes "\"How many drops of the venom extract potion should we use? \"";
     input @vnPut;
-    if (@vnPut < @offset) goto L_Game_tooless;
-    if (@vnPut > @max) goto L_Game_toomuch;
+    if (@vnPut < @offset)
+        goto L_Game_tooless;
+    if (@vnPut > @max)
+        goto L_Game_toomuch;
 
     mes "\"How many drops of the stabilizer potion should we use? \"";
     input @stPut;
-    if (@stPut < @offset) goto L_Game_tooless;
-    if (@stPut > @max) goto L_Game_toomuch;
+    if (@stPut < @offset)
+        goto L_Game_tooless;
+    if (@stPut > @max)
+        goto L_Game_toomuch;
 
     mes "The nurse puts the potions together according to your instructions. Then she takes a spoon and stirs it.";
     next;
@@ -296,10 +313,14 @@ L_choosePut:
     mes "You lift the glass to your lips and drink it all at once.";
     next;
 
-    if ( (@hlPut >  @hlNeed) && (@vnPut >  @vnNeed) ) goto m_hl_m_vn;
-    if ( (@hlPut >  @hlNeed) && (@vnPut <= @vnNeed) ) goto m_hl_l_vn;
-    if ( (@hlPut <= @hlNeed) && (@vnPut >  @vnNeed) ) goto l_hl_m_vn;
-    if ( (@hlPut <  @hlNeed) && (@vnPut <  @vnNeed) ) goto l_hl_l_vn;
+    if ( (@hlPut >  @hlNeed) && (@vnPut >  @vnNeed) )
+        goto m_hl_m_vn;
+    if ( (@hlPut >  @hlNeed) && (@vnPut <= @vnNeed) )
+        goto m_hl_l_vn;
+    if ( (@hlPut <= @hlNeed) && (@vnPut >  @vnNeed) )
+        goto l_hl_m_vn;
+    if ( (@hlPut <  @hlNeed) && (@vnPut <  @vnNeed) )
+        goto l_hl_l_vn;
 
     mes "You feel quite normal.";
     mes "[Nurse]";
@@ -337,7 +358,6 @@ m_hl_l_vn:
     next;
     mes "\"Very well, you are sober again.\"";
     next;
-
     goto check_st;
 
 l_hl_m_vn:
@@ -363,9 +383,12 @@ l_hl_l_vn:
     goto check_st;
 
 check_st:
-    if ( (@stPut < @stNeed) ) goto l_st;
-    if ( (@stPut > @stNeed) ) goto m_st;
-    if (@hl_vn_ok == 1) goto allcorrect;
+    if ( (@stPut < @stNeed) )
+        goto l_st;
+    if ( (@stPut > @stNeed) )
+        goto m_st;
+    if (@hl_vn_ok == 1)
+        goto allcorrect;
 
     mes "[Nurse]";
     mes "\"The amount of the stabilizer seems alright, but we have to think again about the other ingredients.\"";
@@ -377,11 +400,13 @@ l_st:
     mes "\"It looks like we used not enough of the stabilizer. The antidote will lose its effect after some time.\"";
     next;
     goto notallcorrect;
+
 m_st:
     mes "[Nurse]";
     mes "\"It looks like we used too much of the stabilizer. The antidote will turn into venom again after some time.\"";
     next;
     goto notallcorrect;
+
 allcorrect:
     mes "You feel totally normal again.";
     next;
@@ -395,67 +420,64 @@ allcorrect:
     getexp @ANTIDOTE_EXP, 0;
     setskill SKILL_RESIST_POISON, 1;
     set @Q_poison, 7;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
     close;
 
 notallcorrect:
     mes "[Nurse]";
     mes "\"It didn't work. You are a really brave person. Now you should rest and recover. I hope you won't give up now. Please come back later, so we can try it again.\"";
     next;
+    close;
 
-     close;
 state4:
-     mes "The nurse has a worried look in her face.";
-     mes "[Nurse]";
-     mes "\"Hello. I hope you recovered well.\"";
-     next;
-     mes "\"There is enough of the distillates left to have another try.\"";
-     next;
-     mes "\"Oh no, with all that trouble I forgot to label your distillate.\"";
-     next;
-     mes "She holds up two ampullas.";
-     next;
-     mes "\"I hope this one is yours. I'm sorry.\"";
-     next;
-     mes "\"If you feel ok, we could try it again.\"";
-     next;
-
-     menu
+    mes "The nurse has a worried look in her face.";
+    mes "[Nurse]";
+    mes "\"Hello. I hope you recovered well.\"";
+    next;
+    mes "\"There is enough of the distillates left to have another try.\"";
+    next;
+    mes "\"Oh no, with all that trouble I forgot to label your distillate.\"";
+    next;
+    mes "She holds up two ampullas.";
+    next;
+    mes "\"I hope this one is yours. I'm sorry.\"";
+    next;
+    mes "\"If you feel ok, we could try it again.\"";
+    next;
+    menu
         "I still feel a bit dizzy, so I don't want to do it now.", L_Usual,
         "I'm ok. We can try, but please explain again.", L_Exp_Game,
         "Let's start right now.", L_Game;
 
 state5:
-     mes "The nurse looks at you pitifully.";
-     mes "[Nurse]";
-     mes "\"Hello. I'm really sorry for causing you so much pain.\"";
-     next;
-     mes "\"But if we succeed we will be heroes! I will be able to help a lot of people.\"";
-     next;
-     mes "\"Next time you might remind me to label the distillates correctly. I am sorry that it is screwed up again.\"";
-     next;
-     mes "\"There is enough stuff left for one last try.\"";
-     next;
-     mes "\"If we don't get it this time, you will have to get new ingredients.\"";
-     next;
-     mes "\"Do you want to try again?\"";
-     next;
-
-     menu
+    mes "The nurse looks at you pitifully.";
+    mes "[Nurse]";
+    mes "\"Hello. I'm really sorry for causing you so much pain.\"";
+    next;
+    mes "\"But if we succeed we will be heroes! I will be able to help a lot of people.\"";
+    next;
+    mes "\"Next time you might remind me to label the distillates correctly. I am sorry that it is screwed up again.\"";
+    next;
+    mes "\"There is enough stuff left for one last try.\"";
+    next;
+    mes "\"If we don't get it this time, you will have to get new ingredients.\"";
+    next;
+    mes "\"Do you want to try again?\"";
+    next;
+    menu
         "I still feel a bit dizzy, so I don't want to do it now.", L_Usual,
         "I'm ok. We can try, but please explain again.", L_Exp_Game,
         "Let's start right now.", L_Game;
 
 state6:
-     mes "The nurse looks at you pitifully.";
-     mes "[Nurse]";
-     mes "\"There is not enough stuff left for another try.\"";
-     next;
-     mes "\"We should try again, right?\"";
-     set @Q_poison, 1;
-        callsub S_Update_Var;
-
-     goto L_ExplainAgain1;
+    mes "The nurse looks at you pitifully.";
+    mes "[Nurse]";
+    mes "\"There is not enough stuff left for another try.\"";
+    next;
+    mes "\"We should try again, right?\"";
+    set @Q_poison, 1;
+    callsub S_Update_Var;
+    goto L_ExplainAgain1;
 
 state7: // geschafft
     mes "[Nurse]";
@@ -468,8 +490,10 @@ state7: // geschafft
 L_NotEnough:
     mes "[Nurse]";
     mes "\"This must be a misunderstanding. You don't have all the things I asked you for.\"";
-    if (@Q_poison == 1) goto L_ExplainAgain1;
-    if (@Q_poison == 2) goto L_ExplainAgain2;
+    if (@Q_poison == 1)
+        goto L_ExplainAgain1;
+    if (@Q_poison == 2)
+        goto L_ExplainAgain2;
     // the following close *should* never be reached, but who knows, whoever will mess this script up!
     close;
 
@@ -477,10 +501,8 @@ quit:
     close;
 
 S_Update_Var:
-        set QUEST_Forestbow_state,
-            (QUEST_Forestbow_state & ~(@Q_poison_MASK)
-                | (@Q_poison << @Q_poison_SHIFT));
-        return;
+    set QUEST_Forestbow_state, (QUEST_Forestbow_state & ~(@Q_poison_MASK) | (@Q_poison << @Q_poison_SHIFT));
+    return;
 
 L_Game_init_vars:
     set @count, 24;
@@ -508,14 +530,12 @@ L_Load_Need:
     return;
 
 L_Game_tooless:
-   mes "[Nurse]";
-   mes "\"That is nothing! You need to put in there at least a small amount.";
-   goto L_choosePut;
+    mes "[Nurse]";
+    mes "\"That is nothing! You need to put in there at least a small amount.";
+    goto L_choosePut;
 
 L_Game_toomuch:
-   mes "[Nurse]";
-   mes "\"This would be way too much for my scale. I don't want to break it.\"";
-   goto L_choosePut;
+    mes "[Nurse]";
+    mes "\"This would be way too much for my scale. I don't want to break it.\"";
+    goto L_choosePut;
 }
-
-
diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index 84643483..3f5024f9 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -1,219 +1,226 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-009-2.gat,63,79,0	script	Olana	190,{
-
-  set @MinLevel, 60;
-
-  set @Cherry_Amount, 10;
-  set @Cherry_EXP, 1000;
-  set @Cherry_Money, 1000;
-
-  set @RedRose_Amount, 15;
-  set @RedTulip_Amount, 15;
-  set @Flower_Money, 1500;
-
-  set @Finish_EXP, 5000;
-  set @Finish_Money, 5000;
-
-  if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
-  if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
-
-  if (Rossy_Quest >= 14 && Rossy_Quest <= 16) goto L_Julia;
-  if (Rossy_Quest == 13) goto L_Best;
-  if (Rossy_Quest == 12) goto L_Give;
-  if (Rossy_Quest == 11) goto L_Allergic;
-  if (Rossy_Quest == 10) goto L_BringRose;
-  if (Rossy_Quest == 9) goto L_RC;
-  if (Rossy_Quest == 8) goto L_Rose;
-  if (Rossy_Quest >= 6 && Rossy_Quest < 8) goto L_BL;
-  if (Rossy_Quest == 5) goto L_Bring;
-  if (Rossy_Quest == 4) goto L_See;
-  if (Rossy_Quest == 3) goto L_Worried;
-  if (Rossy_Quest == 1 || Rossy_Quest == 2) goto L_Daughter;
-
-  mes "[Olana]";
-  mes "\"Hello. We don't usually get guests back here.\"";
-  next;
-  mes "\"My name is Olana and my father owns this inn. I live in Tulimshar, but came to Hurnscald on vacation with my two young daughters, Rossy and Julia.\"";
-  if (baselevel < @MinLevel) close;
-  next;
-  mes "\"I let my two lovely girls play in the woods nearby but they haven't come back yet!\"";
-  next;
-  mes "Olana suddenly looks very pale and starts to shiver.";
-  next;
-  mes "\"I'm starting to get a bad feeling about this. If you go to the forest near the swamps, could you see if you can find my daughters? I need to know if they are safe!\"";
-  menu
-    "Sure, I can do that.", -,
-    "I am sorry, I don't usually go to that area.", L_No;
-  set Rossy_Quest, 1;
-  close;
+009-2.gat,63,79,0|script|Olana|190,{
+
+    set @MinLevel, 60;
+
+    set @Cherry_Amount, 10;
+    set @Cherry_EXP, 1000;
+    set @Cherry_Money, 1000;
+
+    set @RedRose_Amount, 15;
+    set @RedTulip_Amount, 15;
+    set @Flower_Money, 1500;
+
+    set @Finish_EXP, 5000;
+    set @Finish_Money, 5000;
+
+    if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
+    if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
+
+    if (Rossy_Quest >= 14 && Rossy_Quest <= 16) goto L_Julia;
+    if (Rossy_Quest == 13) goto L_Best;
+    if (Rossy_Quest == 12) goto L_Give;
+    if (Rossy_Quest == 11) goto L_Allergic;
+    if (Rossy_Quest == 10) goto L_BringRose;
+    if (Rossy_Quest == 9) goto L_RC;
+    if (Rossy_Quest == 8) goto L_Rose;
+    if (Rossy_Quest >= 6 && Rossy_Quest < 8) goto L_BL;
+    if (Rossy_Quest == 5) goto L_Bring;
+    if (Rossy_Quest == 4) goto L_See;
+    if (Rossy_Quest == 3) goto L_Worried;
+    if (Rossy_Quest == 1 || Rossy_Quest == 2) goto L_Daughter;
+
+    mes "[Olana]";
+    mes "\"Hello. We don't usually get guests back here.\"";
+    next;
+    mes "\"My name is Olana and my father owns this inn. I live in Tulimshar, but came to Hurnscald on vacation with my two young daughters, Rossy and Julia.\"";
+    if (baselevel < @MinLevel) close;
+    next;
+    mes "\"I let my two lovely girls play in the woods nearby but they haven't come back yet!\"";
+    next;
+    mes "Olana suddenly looks very pale and starts to shiver.";
+    next;
+    mes "\"I'm starting to get a bad feeling about this. If you go to the forest near the swamps, could you see if you can find my daughters? I need to know if they are safe!\"";
+    menu
+        "Sure, I can do that.", -,
+        "I am sorry, I don't usually go to that area.", L_No;
+    set Rossy_Quest, 1;
+    close;
 
 L_Daughter:
-  mes "Olana looks really worried - she seems about to burst into tears.";
-  mes "[Olana]";
-  mes "\"I would be relieved if you could look for my daughters.";
-  mes "They must be playing in the forest near the swamps.\"";
-  if (Rossy_Quest == 1) close;
-  next;
-  menu
-    "Wait, I saw Rossy, she is fine.", L_Help,
-    "Hey, don't worry, I'm sure they'll be back soon.", L_No;
+    mes "Olana looks really worried - she seems about to burst into tears.";
+    mes "[Olana]";
+    mes "\"I would be relieved if you could look for my daughters.";
+    mes "They must be playing in the forest near the swamps.\"";
+    if (Rossy_Quest == 1)
+        close;
+    next;
+    menu
+        "Wait, I saw Rossy, she is fine.", L_Help,
+        "Hey, don't worry, I'm sure they'll be back soon.", L_No;
 
 L_No:
-  close;
+    close;
 
 L_Help:
-  mes "[Olana]";
-  mes "\"Oh you did? That's good. I'm relieved. But what about Julia?\"";
-  next;
-  menu
-    "I haven't found Julia yet, sorry.", -;
-  mes "\"Ok. They must be playing hide and seek. Thanks again... I can't express how grateful I am.\"";
-  set Rossy_Quest, 3;
-  close;
+    mes "[Olana]";
+    mes "\"Oh you did? That's good. I'm relieved. But what about Julia?\"";
+    next;
+    menu
+        "I haven't found Julia yet, sorry.", -;
+    mes "\"Ok. They must be playing hide and seek. Thanks again... I can't express how grateful I am.\"";
+    set Rossy_Quest, 3;
+    close;
 
 L_Worried:
-  mes "Olana smiles at you, trying to show some happiness, but her facial expression only conveys tension and preoccupation.";
-  next;
-  mes "You suddenly remember that Rossy asked for your help to collect some fruits. Maybe she could also have some ideas on how to cheer her mother up.";
-  close;
+    mes "Olana smiles at you, trying to show some happiness, but her facial expression only conveys tension and preoccupation.";
+    next;
+    mes "You suddenly remember that Rossy asked for your help to collect some fruits. Maybe she could also have some ideas on how to cheer her mother up.";
+    close;
 
 L_See:
-  if (gotcherry == 1) goto L_Task;
-  if (countitem("cherry") < @Cherry_Amount) goto L_Worried;
-  delitem "cherry", @Cherry_Amount;
-  menu
-    "Hi, Rossy asked me to give you this. She says it is a gift from both her and Julia.", -;
-  mes "[Olana]";
-  mes "\"Ohhh... How sweet... Sometimes Rossy impresses me with her kindness. Here... You are spending so much time helping us, and we give nothing back. Take this as a small reward.\"";
-  getexp @Cherry_EXP, 0;
-  set zeny, zeny + @Cherry_Money;
-  set gotcherry, 1;
-  goto L_Task;
+    if (gotcherry == 1)
+        goto L_Task;
+    if (countitem("cherry") < @Cherry_Amount)
+        goto L_Worried;
+    delitem "cherry", @Cherry_Amount;
+    menu
+        "Hi, Rossy asked me to give you this. She says it is a gift from both her and Julia.", -;
+    mes "[Olana]";
+    mes "\"Ohhh... How sweet... Sometimes Rossy impresses me with her kindness. Here... You are spending so much time helping us, and we give nothing back. Take this as a small reward.\"";
+    getexp @Cherry_EXP, 0;
+    set zeny, zeny + @Cherry_Money;
+    set gotcherry, 1;
+    goto L_Task;
 
 L_Task:
-  mes "[Olana]";
-  mes "\"I know I barely know you, but can I ask you for a small favor?\"";
-  menu
-    "Sure, tell me about it.", L_Cont,
-    "No, sorry, I'm busy.", L_No;
+    mes "[Olana]";
+    mes "\"I know I barely know you, but can I ask you for a small favor?\"";
+    menu
+        "Sure, tell me about it.", L_Cont,
+        "No, sorry, I'm busy.", L_No;
 
 L_Cont:
-  mes "[Olana]";
-  mes "\"Would you mind giving this letter to my little Rossy? Today is the last day for her final exam, and I know my daughter. If I don't remind her, she will surely forget about it and flunk the exam. I would deliver the letter myself, but I can't walk, my aching knees...\"";
-  menu
-    "Of course I can. Hand me the letter, I'll give it to Rossy as soon as I see her.", L_Let,
-    "No, sorry, I'm not interested in that sort of task. Hand it to her yourself.", L_No;
+    mes "[Olana]";
+    mes "\"Would you mind giving this letter to my little Rossy? Today is the last day for her final exam, and I know my daughter. If I don't remind her, she will surely forget about it and flunk the exam. I would deliver the letter myself, but I can't walk, my aching knees...\"";
+    menu
+        "Of course I can. Hand me the letter, I'll give it to Rossy as soon as I see her.", L_Let,
+        "No, sorry, I'm not interested in that sort of task. Hand it to her yourself.", L_No;
 
 L_Let:
-  mes "[Olana]";
-  set Rossy_Quest, 5;
-  set gotcherry, 0;
-  mes "\"Thank you again. Please, bring it to her as fast as you can.\"";
-  close;
+    mes "[Olana]";
+    set Rossy_Quest, 5;
+    set gotcherry, 0;
+    mes "\"Thank you again. Please, bring it to her as fast as you can.\"";
+    close;
 
 L_Bring:
-  mes "[Olana]";
-  mes "\"Please, bring this letter to my daughter as fast as you can.\"";
-  close;
+    mes "[Olana]";
+    mes "\"Please, bring this letter to my daughter as fast as you can.\"";
+    close;
 
 L_BL:
-  mes "[Olana]";
-  mes "\"Good, now she won't forget her final exam.\"";
-  close;
+    mes "[Olana]";
+    mes "\"Good, now she won't forget her final exam.\"";
+    close;
 
 L_Rose:
-  menu
-    "Hi, Rossy did great in the exam. David told me her potion was flawless.", -;
-  mes "[Olana]";
-  mes "\"Wow! Really? That is great! I would like to congratulate my little Rossy. Would you mind helping me a little more?\"";
-  menu
-    "Just tell me what to do.", -,
-    "No, I'm busy, maybe later.", L_No;
-  mes "[Olana]";
-  mes "\"Can you bring me " + @RedRose_Amount + " Red Roses? I would like to give them to Rossy. I am sure she will love them!\"";
-  menu
-    "Ok, I will be back with the roses.", L_RG,
-    "I'm allergic to roses, can't even touch them. Sorry.", L_No;
+    menu
+        "Hi, Rossy did great in the exam. David told me her potion was flawless.", -;
+    mes "[Olana]";
+    mes "\"Wow! Really? That is great! I would like to congratulate my little Rossy. Would you mind helping me a little more?\"";
+    menu
+        "Just tell me what to do.", -,
+        "No, I'm busy, maybe later.", L_No;
+    mes "[Olana]";
+    mes "\"Can you bring me " + @RedRose_Amount + " Red Roses? I would like to give them to Rossy. I am sure she will love them!\"";
+    menu
+        "Ok, I will be back with the roses.", L_RG,
+        "I'm allergic to roses, can't even touch them. Sorry.", L_No;
 
 L_RG:
-  if (Rossy_Quest == 8) set Rossy_Quest, 9;
-  mes "[Olana]";
-  mes "\"Please, bring me " + @RedRose_Amount + " Red Roses as soon as you can.\"";
-  close;
+    if (Rossy_Quest == 8)
+        set Rossy_Quest, 9;
+    mes "[Olana]";
+    mes "\"Please, bring me " + @RedRose_Amount + " Red Roses as soon as you can.\"";
+    close;
 
 L_RC:
-  if(countitem("redrose") < @RedRose_Amount) goto L_RG;
-  mes "[Olana]";
-  set Rossy_Quest, 10;
-  mes "\"Great job! Please hand them to my brilliant daughter, Rossy.\"";
-  close;
+    if(countitem("redrose") < @RedRose_Amount)
+        goto L_RG;
+    mes "[Olana]";
+    set Rossy_Quest, 10;
+    mes "\"Great job! Please hand them to my brilliant daughter, Rossy.\"";
+    close;
 
 L_BringRose:
-  mes "[Olana]";
-  mes "\"Now please hand them to my brilliant daughter, Rossy.\"";
-  close;
+    mes "[Olana]";
+    mes "\"Now please hand them to my brilliant daughter, Rossy.\"";
+    close;
 
 L_Allergic:
-  mes "[Olana]";
-  mes "\"Did she like my present?\"";
-  menu
-    "Sure she did...", L_No,
-    "Well, you should have known that your daughter is allergic to roses.", -;
-  set Rossy_Quest, 12;
-  mes "[Olana]";
-  mes "\"Oh, how stupid I am! Here, take some of my money and buy Red Tulips instead, the same amount. Keep the flowers.\"";
-  set zeny, zeny + @Flower_Money;
-  next;
-  mes "\"Please, tell Rossy I am really sorry. My mind was on Julia when I asked you to bring the red roses, they are her favorite.\"";
-  menu
-    "I will give her the tulips when I see her.", -;
-  mes "[Olana]";
-  mes "\"Thank you. And don't forget to tell her that I'm really sorry.\"";
-  close;
+    mes "[Olana]";
+    mes "\"Did she like my present?\"";
+    menu
+        "Sure she did...", L_No,
+        "Well, you should have known that your daughter is allergic to roses.", -;
+    set Rossy_Quest, 12;
+    mes "[Olana]";
+    mes "\"Oh, how stupid I am! Here, take some of my money and buy Red Tulips instead, the same amount. Keep the flowers.\"";
+    set zeny, zeny + @Flower_Money;
+    next;
+    mes "\"Please, tell Rossy I am really sorry. My mind was on Julia when I asked you to bring the red roses, they are her favorite.\"";
+    menu
+        "I will give her the tulips when I see her.", -;
+    mes "[Olana]";
+    mes "\"Thank you. And don't forget to tell her that I'm really sorry.\"";
+    close;
 
 L_Give:
-  mes "[Olana]";
-  mes "\""+ strcharinfo(0) +", please, get " + @RedTulip_Amount + " Red Tulips and hand them to Rossy. Don't forget to tell her that I'm really sorry.\"";
-  close;
+    mes "[Olana]";
+    mes "\""+ strcharinfo(0) +", please, get " + @RedTulip_Amount + " Red Tulips and hand them to Rossy. Don't forget to tell her that I'm really sorry.\"";
+    close;
 
 L_Best:
-  mes "[Olana]";
-  mes "\"Thank you for your help "+ strcharinfo(0) +"!\"";
-  close;
+    mes "[Olana]";
+    mes "\"Thank you for your help "+ strcharinfo(0) +"!\"";
+    close;
 
 L_Julia:
-  mes "[Olana]";
-  mes "\"Oh no, I can't take this anymore. Something must have happened... Where is Julia? I want to know where she is! Please, find her "+ strcharinfo(0) +"!\"";
-  close;
+    mes "[Olana]";
+    mes "\"Oh no, I can't take this anymore. Something must have happened... Where is Julia? I want to know where she is! Please, find her "+ strcharinfo(0) +"!\"";
+    close;
 
 L_End:
-  mes "[Olana]";
-  mes "\"Where is Julia? I want to know where she is! Please, find her "+ strcharinfo(0) +"!\"";
-  menu
-    "She'll be back soon, trust me. I saved her from an evil spirit.", L_Found,
-    "I haven't seen her yet, sorry.", L_No;
+    mes "[Olana]";
+    mes "\"Where is Julia? I want to know where she is! Please, find her "+ strcharinfo(0) +"!\"";
+    menu
+        "She'll be back soon, trust me. I saved her from an evil spirit.", L_Found,
+        "I haven't seen her yet, sorry.", L_No;
 
 L_Found:
-  mes "[Olana]";
-  if (Rossy_Quest == 17) set Rossy_Quest, 18;
-  if (Rossy_Quest == 18) set Rossy_Quest, 19;
-  mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\"";
-  getexp @Finish_EXP, 0;
-  set zeny, zeny + @Finish_Money;
-  if (Rossy_Quest == 19) goto L_Clear;
-  close;
+    mes "[Olana]";
+    if (Rossy_Quest == 17)
+        set Rossy_Quest, 18;
+    if (Rossy_Quest == 18)
+        set Rossy_Quest, 19;
+    mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\"";
+    getexp @Finish_EXP, 0;
+    set zeny, zeny + @Finish_Money;
+    if (Rossy_Quest == 19)
+        goto L_Clear;
+    close;
 
 L_Clear:
-  set Rossy_Quest, 0;
-  set cavefights, 0;
-  set FLAGS, FLAGS | FLAG_ROSSI_COMPLETED;
-  close;
+    set Rossy_Quest, 0;
+    set cavefights, 0;
+    set FLAGS, FLAGS | FLAG_ROSSI_COMPLETED;
+    close;
 
 L_FinalEnd:
-  mes "[Olana]";
-  mes "\"Thanks again for your help.";
-  mes "I hope the girls will come home soon enough for dinner.\"";
-  close;
-
+    mes "[Olana]";
+    mes "\"Thanks again for your help.";
+    mes "I hope the girls will come home soon enough for dinner.\"";
+    close;
 }
diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index 11d9931d..97fa219c 100644
--- a/world/map/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
@@ -1,80 +1,91 @@
 // Nicholas' Apprentice and Armorsmith
 
-009-2.gat,183,57,0	script	Peter	157,{
+009-2.gat,183,57,0|script|Peter|157,{
 
-	mes "[Peter]";
-	mes "\"Hello, I am Peter, apprentice to Nicholas.\"";
-	next;
-	mes "\"I can make you some sturdy armor: you must give me Iron Ingots to craft with and some gold pieces for my efforts.\"";
-	next;
-	mes "[Peter]";
-	mes "\"What would you like me to make?\"";
-	menu
-		"Chain Mail (10 coal, 5 ingots and 20000 GP).", L_Peter_Chain_Mail,
-		"Light Plate (20 coal, 10 ingots and 50000 GP).", L_Peter_Light_Plate,
-		"Warlord Plate (30 coal, 15 ingots and 100000 GP).", L_Peter_Warlord_Plate,
-		"Nevermind.", -;
-	close;
+    mes "[Peter]";
+    mes "\"Hello, I am Peter, apprentice to Nicholas.\"";
+    next;
+    mes "\"I can make you some sturdy armor: you must give me Iron Ingots to craft with and some gold pieces for my efforts.\"";
+    next;
+    mes "[Peter]";
+    mes "\"What would you like me to make?\"";
+    menu
+        "Chain Mail (10 coal, 5 ingots and 20000 GP).", L_Peter_Chain_Mail,
+        "Light Plate (20 coal, 10 ingots and 50000 GP).", L_Peter_Light_Plate,
+        "Warlord Plate (30 coal, 15 ingots and 100000 GP).", L_Peter_Warlord_Plate,
+        "Nevermind.", -;
+    close;
 
 L_Peter_Chain_Mail:
-	if (zeny < 20000) goto L_Peter_NotEnough_Zeny;
-	if (countitem("IngotIron") < 5) goto L_Peter_NotEnough_Ingot;
-	if (countitem("Coal") < 10) goto L_Peter_NotEnough_Coal;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_Peter_TooMany;
-	set zeny, zeny - 20000;
-	delitem "IngotIron", 5;
-	getitem "ChainmailShirt", 1;
-	mes "[Peter]";
-	mes "\"Here you go!\"";
-	close;
+    if (zeny < 20000)
+        goto L_Peter_NotEnough_Zeny;
+    if (countitem("IngotIron") < 5)
+        goto L_Peter_NotEnough_Ingot;
+    if (countitem("Coal") < 10)
+        goto L_Peter_NotEnough_Coal;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Peter_TooMany;
+    set zeny, zeny - 20000;
+    delitem "IngotIron", 5;
+    getitem "ChainmailShirt", 1;
+    mes "[Peter]";
+    mes "\"Here you go!\"";
+    close;
 
 L_Peter_Light_Plate:
-	if (zeny < 50000) goto L_Peter_NotEnough_Zeny;
-	if (countitem("IngotIron") < 10) goto L_Peter_NotEnough_Ingot;
-	if (countitem("Coal") < 20) goto L_Peter_NotEnough_Coal;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_Peter_TooMany;
-	set zeny, zeny - 50000;
-	delitem "IngotIron", 10;
-	delitem "Coal", 20;
-	getitem "LightPlatemail", 1;
-	mes "[Peter]";
-	mes "\"Here you go!\"";
-	close;
+    if (zeny < 50000)
+        goto L_Peter_NotEnough_Zeny;
+    if (countitem("IngotIron") < 10)
+        goto L_Peter_NotEnough_Ingot;
+    if (countitem("Coal") < 20)
+        goto L_Peter_NotEnough_Coal;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Peter_TooMany;
+    set zeny, zeny - 50000;
+    delitem "IngotIron", 10;
+    delitem "Coal", 20;
+    getitem "LightPlatemail", 1;
+    mes "[Peter]";
+    mes "\"Here you go!\"";
+    close;
 
 L_Peter_Warlord_Plate:
-	if (zeny < 100000) goto L_Peter_NotEnough_Zeny;
-	if (countitem("IngotIron") < 15) goto L_Peter_NotEnough_Ingot;
-	if (countitem("Coal") < 30) goto L_Peter_NotEnough_Coal;
-	getinventorylist;
-	if (@inventorylist_count == 100) goto L_Peter_TooMany;
-	set zeny, zeny - 100000;
-	delitem "IngotIron", 15;
-	delitem "Coal", 30;
-	getitem "WarlordPlate", 1;
-	mes "[Peter]";
-	mes "\"Here you go!\"";
-	close;
+    if (zeny < 100000)
+        goto L_Peter_NotEnough_Zeny;
+    if (countitem("IngotIron") < 15)
+        goto L_Peter_NotEnough_Ingot;
+    if (countitem("Coal") < 30)
+        goto L_Peter_NotEnough_Coal;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Peter_TooMany;
+    set zeny, zeny - 100000;
+    delitem "IngotIron", 15;
+    delitem "Coal", 30;
+    getitem "WarlordPlate", 1;
+    mes "[Peter]";
+    mes "\"Here you go!\"";
+    close;
 
 L_Peter_NotEnough_Zeny:
-	mes "[Peter]";
-	mes "\"You don't have enough gold.\"";
-	close;
+    mes "[Peter]";
+    mes "\"You don't have enough gold.\"";
+    close;
 
 L_Peter_NotEnough_Ingot:
-	mes "[Peter]";
-	mes "\"You don't have enough ingots.\"";
-	close;
+    mes "[Peter]";
+    mes "\"You don't have enough ingots.\"";
+    close;
 
 L_Peter_NotEnough_Coal:
-	mes "[Peter]";
-	mes "\"You don't have enough Coal.\"";
-	close;
+    mes "[Peter]";
+    mes "\"You don't have enough Coal.\"";
+    close;
 
 L_Peter_TooMany:
-	mes "[Peter]";
-	mes "\"You have too much stuff.  Please get rid of something if you want some armor.\"";
-	close;
-
+    mes "[Peter]";
+    mes "\"You have too much stuff.  Please get rid of something if you want some armor.\"";
+    close;
 }
diff --git a/world/map/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt
index 023f1244..b19b215f 100644
--- a/world/map/npc/009-2/richard.txt
+++ b/world/map/npc/009-2/richard.txt
@@ -1,8 +1,8 @@
 //
 
-009-2.gat,20,99,0	script	Richard	161,{
-	callfunc "ClearVariables";
-	set @npcname$, "Richard";
-	callfunc "Banker";
-	close;
+009-2.gat,20,99,0|script|Richard|161,{
+    callfunc "ClearVariables";
+    set @npcname$, "Richard";
+    callfunc "Banker";
+    close;
 }
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index dc7d29df..aad7ff24 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -5,206 +5,209 @@
 //#                                                                               #
 //#################################################################################
 
-009-2.gat,32,104,0	script	Selim	142,{
-	setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green";
-	setarray @all_colours_cap$, "Red", "Green", "Dark Blue", "Yellow", "Light Blue", "Pink", "Black", "Orange", "Purple", "Dark Green";
+009-2.gat,32,104,0|script|Selim|142,{
+    setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green";
+    setarray @all_colours_cap$, "Red", "Green", "Dark Blue", "Yellow", "Light Blue", "Pink", "Black", "Orange", "Purple", "Dark Green";
 
-        mes "[Selim]";	
-	mes "\"What can I dye for you today?\"";
-        set QUEST_clothdyer_state, 3;
-	next;
+    mes "[Selim]";
+    mes "\"What can I dye for you today?\"";
+    set QUEST_clothdyer_state, 3;
+    next;
 
 L_clothes_choice:
-        set @pronoun$, "it";
-        set @is_verb$, "is";
-	menu
-		"Cotton shirt", L_cottonshirt,
-		"V-Neck sweater", L_vneck,
-		"Turtleneck sweater", L_tneck,
-		"Cotton shorts", L_shorts,
-		"Cotton skirt", L_skirt,
-		"Miniskirt", L_miniskirt,
-		"Tank top ", L_tanktop,
-		"Short tank top", L_tanktop_short,
-		"Silk robe", L_robe,
-		"Cotton headband", L_headband,
-		"Desert hat", L_desert_hat,
-		"Cotton boots", L_cottonboots,
-		"Cotton gloves", L_cottongloves,
-		"Rabbit ears", L_rabbitears,
-		"Wizard hat", L_wizardhat,
-		"Bowler hat", L_bowlerhat,
-		"Red lined sorcerer robe", L_redlinedsorcererrobe,
-		"Bowler hat (brown)", L_bowlerhatbrown,
-		"I'm fine for now, thanks.", -;
-	close;
+    set @pronoun$, "it";
+    set @is_verb$, "is";
+    menu
+        "Cotton shirt", L_cottonshirt,
+        "V-Neck sweater", L_vneck,
+        "Turtleneck sweater", L_tneck,
+        "Cotton shorts", L_shorts,
+        "Cotton skirt", L_skirt,
+        "Miniskirt", L_miniskirt,
+        "Tank top ", L_tanktop,
+        "Short tank top", L_tanktop_short,
+        "Silk robe", L_robe,
+        "Cotton headband", L_headband,
+        "Desert hat", L_desert_hat,
+        "Cotton boots", L_cottonboots,
+        "Cotton gloves", L_cottongloves,
+        "Rabbit ears", L_rabbitears,
+        "Wizard hat", L_wizardhat,
+        "Bowler hat", L_bowlerhat,
+        "Red lined sorcerer robe", L_redlinedsorcererrobe,
+        "Bowler hat (brown)", L_bowlerhatbrown,
+        "I'm fine for now, thanks.", -;
+    close;
 
 L_cottonshirt:
-	set @del, 1202;
-	set @new, 2050;
-        set @name$, "cotton shirt";
-	goto L_picked_item;
+    set @del, 1202;
+    set @new, 2050;
+    set @name$, "cotton shirt";
+    goto L_picked_item;
 
 L_vneck:
-	set @del, 624;
-	set @new, 2060;
-        set @name$, "V-neck sweater";
-	goto L_picked_item;
+    set @del, 624;
+    set @new, 2060;
+    set @name$, "V-neck sweater";
+    goto L_picked_item;
 
 L_tneck:
-	set @del, 564;
-	set @new, 2070;
-        set @name$, "turtleneck sweater";
-	goto L_picked_item;
+    set @del, 564;
+    set @new, 2070;
+    set @name$, "turtleneck sweater";
+    goto L_picked_item;
 
 L_shorts:
-	set @del, 586;
-	set @new, 2110;
-        set @name$, "cotton shorts";
-        set @pronoun$, "them";
-        set @is_verb$, "are";
-	goto L_picked_item;
+    set @del, 586;
+    set @new, 2110;
+    set @name$, "cotton shorts";
+    set @pronoun$, "them";
+    set @is_verb$, "are";
+    goto L_picked_item;
 
 L_skirt:
-	set @del, 632;
-	set @new, 2100;
-        set @name$, "cotton skirt";
-	goto L_picked_item;
+    set @del, 632;
+    set @new, 2100;
+    set @name$, "cotton skirt";
+    goto L_picked_item;
 
 L_miniskirt:
-	set @del, 771;
-	set @new, 2170;
-        set @name$, "miniskirt";
-	goto L_picked_item;
+    set @del, 771;
+    set @new, 2170;
+    set @name$, "miniskirt";
+    goto L_picked_item;
 
 L_tanktop:
-	set @del, 688;
-	set @new, 2090;
-        set @name$, "tanktop";
-	goto L_picked_item;
+    set @del, 688;
+    set @new, 2090;
+    set @name$, "tanktop";
+    goto L_picked_item;
 
 L_tanktop_short:
-	set @del, 689;
-	set @new, 2120;
-        set @name$, "short tanktop";
-	goto L_picked_item;
+    set @del, 689;
+    set @new, 2120;
+    set @name$, "short tanktop";
+    goto L_picked_item;
 
 L_robe:
-	set @del, 720;
-	set @new, 2080;
-        set @name$, "silk robe";
-	goto L_picked_item;
+    set @del, 720;
+    set @new, 2080;
+    set @name$, "silk robe";
+    goto L_picked_item;
 
 L_headband:
-	set @del, 724;
-	set @new, 2140;
-        set @name$, "cotton headband";
-	goto L_picked_item;
+    set @del, 724;
+    set @new, 2140;
+    set @name$, "cotton headband";
+    goto L_picked_item;
 
 L_desert_hat:
-	set @del, 723;
-	set @new, 2130;
-        set @name$, "desert hat";
-	goto L_picked_item;
+    set @del, 723;
+    set @new, 2130;
+    set @name$, "desert hat";
+    goto L_picked_item;
 
 L_cottonboots:
-	set @del, 735;
-	set @new, 2150;
-	set @name$, "cotton boots";
-	goto L_picked_item;
+    set @del, 735;
+    set @new, 2150;
+    set @name$, "cotton boots";
+    goto L_picked_item;
 
 L_cottongloves:
-	set @del, 741;
-	set @new, 2160;
-	set @name$, "cotton gloves";
-	goto L_picked_item;
+    set @del, 741;
+    set @new, 2160;
+    set @name$, "cotton gloves";
+    goto L_picked_item;
 
 L_rabbitears:
-	set @del, 1255;
-	set @new, 2190;
-	set @name$, "rabbit ears";
-        set @pronoun$, "them";
-        set @is_verb$, "are";
-	goto L_picked_item;
+    set @del, 1255;
+    set @new, 2190;
+    set @name$, "rabbit ears";
+    set @pronoun$, "them";
+    set @is_verb$, "are";
+    goto L_picked_item;
 
 L_wizardhat:
-	set @del, 4028;
-	set @new, 2200;
-	set @name$, "wizard hat";
-	goto L_picked_item;
+    set @del, 4028;
+    set @new, 2200;
+    set @name$, "wizard hat";
+    goto L_picked_item;
 
 L_bowlerhat:
-	set @del, 4030;
-	set @new, 2210;
-	set @name$, "bowler hat";
-	goto L_picked_item;
+    set @del, 4030;
+    set @new, 2210;
+    set @name$, "bowler hat";
+    goto L_picked_item;
 
 L_redlinedsorcererrobe:
-	set @del, 798;
-	set @new, 2220;
-	set @name$, "red lined sorcerer robe";
-	goto L_picked_item;
+    set @del, 798;
+    set @new, 2220;
+    set @name$, "red lined sorcerer robe";
+    goto L_picked_item;
 
 L_bowlerhatbrown:
-	set @del, 800;
-	set @new, 2230;
-	set @name$, "bowler hat (brown)";
-	goto L_picked_item;
+    set @del, 800;
+    set @new, 2230;
+    set @name$, "bowler hat (brown)";
+    goto L_picked_item;
 
 L_picked_item:
-	if (countitem(@del) == 0) goto L_havenone;
+    if (countitem(@del) == 0) goto L_havenone;
+
 L_colour:
-        mes "[Selim]";	
-	mes "\"Excellent.  Now, what color do you want?\"";
-	next;
-	menu
-		@all_colours_cap$[0], -,
-		@all_colours_cap$[1], -,
-		@all_colours_cap$[2], -,
-		@all_colours_cap$[3], -,
-		@all_colours_cap$[4], -,
-		@all_colours_cap$[5], -,
-		@all_colours_cap$[6], -,
-		@all_colours_cap$[7], -,
-		@all_colours_cap$[8], -,
-		@all_colours_cap$[9], -;
+    mes "[Selim]";
+    mes "\"Excellent.  Now, what color do you want?\"";
+    next;
+    menu
+        @all_colours_cap$[0], -,
+        @all_colours_cap$[1], -,
+        @all_colours_cap$[2], -,
+        @all_colours_cap$[3], -,
+        @all_colours_cap$[4], -,
+        @all_colours_cap$[5], -,
+        @all_colours_cap$[6], -,
+        @all_colours_cap$[7], -,
+        @all_colours_cap$[8], -,
+        @all_colours_cap$[9], -;
         set @colour, @menu - 1;
         set @vial, 690 + @colour;
         if (countitem(@vial) == 0) goto L_no_dye;
         goto L_finish;
 
 L_no_dye:
-        mes "[Selim]";	
-        mes "\"I would love to dye your " + @name$ + " for you, but you will have to bring me some " + @all_colours$[@colour] + " dye first.\"";
-        next;
-        menu
-        	"Sorry, I meant a different color.", L_colour,
-                "I wanted to dye a different item anyway.", L_clothes_choice,
-                "What do you mean, `bring you dye'?", L_explain_dye,
-                "Where would I get dye?", L_explain_dye,
-        	"Never mind.", -;
-        close;
+    mes "[Selim]";
+    mes "\"I would love to dye your " + @name$ + " for you, but you will have to bring me some " + @all_colours$[@colour] + " dye first.\"";
+    next;
+    menu
+        "Sorry, I meant a different color.", L_colour,
+        "I wanted to dye a different item anyway.", L_clothes_choice,
+        "What do you mean, `bring you dye'?", L_explain_dye,
+        "Where would I get dye?", L_explain_dye,
+        "Never mind.", -;
+    close;
 
 L_explain_dye:
-	if (QUEST_clothdyer_knowsdye < 1) set QUEST_clothdyer_knowsdye, 1;
-        mes "[Selim]";	
-        mes "\"Well, dye is very expensive, and since I don't charge adventurers anything, I can't give you any for free.";
-        mes "But most alchemists can make dye; perhaps you can find one around here.\"";
-        close;
+    if (QUEST_clothdyer_knowsdye < 1)
+        set QUEST_clothdyer_knowsdye, 1;
+    mes "[Selim]";
+    mes "\"Well, dye is very expensive, and since I don't charge adventurers anything, I can't give you any for free.";
+    mes "But most alchemists can make dye; perhaps you can find one around here.\"";
+    close;
 
 L_finish:
-	if (countitem(@del) == 0) goto L_havenone;
-	delitem @vial, 1;
-	delitem @del, 1;
-	getitem @new + @colour, 1;
-        mes "[Selim]";	
-	mes "\"Here " + @is_verb$ + " your " + @all_colours$[@colour] + " " + @name$ + "!  Please let " + @pronoun$ + " dry for a minute before you put " + @pronoun$ + " on.\"";
-	close;
+    if (countitem(@del) == 0)
+        goto L_havenone;
+    delitem @vial, 1;
+    delitem @del, 1;
+    getitem @new + @colour, 1;
+    mes "[Selim]";
+    mes "\"Here " + @is_verb$ + " your " + @all_colours$[@colour] + " " + @name$ + "!  Please let " + @pronoun$ + " dry for a minute before you put " + @pronoun$ + " on.\"";
+    close;
 
 L_havenone:
-        mes "[Selim]";	
-	mes "\"You don't have any uncolored " + @name$ + "?  That's unfortunate.";
-	mes "Would you like to dye something else?\"";
-        next;
-        goto L_clothes_choice;	
+    mes "[Selim]";
+    mes "\"You don't have any uncolored " + @name$ + "?  That's unfortunate.";
+    mes "Would you like to dye something else?\"";
+    next;
+    goto L_clothes_choice;
 }
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index 3283c30b..6071906e 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -6,24 +6,24 @@
 
 // Bartender
 // sells beer, cake and steak
-009-2.gat,65,49,0	shop	Barkeeper	112,539:-1,513:-1,676:-1
+009-2.gat,65,49,0|shop|Barkeeper|112,539:-1,513:-1,676:-1
 
 // Receptionist
 // Offers the player to rest at the inn for 100gp
-009-2.gat,50,48,0	script	Receptionist	108,{
-	set @npcname$, "Receptionist";
-	set @cost, 100;
-	callfunc "Inn";
+009-2.gat,50,48,0|script|Receptionist|108,{
+    set @npcname$, "Receptionist";
+    set @cost, 100;
+    callfunc "Inn";
 }
 
 // Archer Shop
 // sells bow, short bow, arrows and iron arrows
-009-2.gat,97,24,0	shop	Apprentice	120,Arrow :-1,IronArrow :-1,Bow :1000,ShortBow :3000
+009-2.gat,97,24,0|shop|Apprentice|120,Arrow :-1,IronArrow :-1,Bow :1000,ShortBow :3000
 
 // Potion Shop
 // sells cactus drink, cactus potion, iron potion, concentration potion, and slow poison potion
-009-2.gat,123,22,0	shop	Potions#_M	127,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1,SlowPoisonPotion :-1
+009-2.gat,123,22,0|shop|Potions#_M|127,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1,SlowPoisonPotion :-1
 
 // General Store
 // Sells various things, many not sold elsewhere
-009-2.gat,32,99,0	shop	General Store	112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1
+009-2.gat,32,99,0|shop|General Store|112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1
diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt
index 265cd234..550cd6c4 100644
--- a/world/map/npc/009-2/waitress.txt
+++ b/world/map/npc/009-2/waitress.txt
@@ -1,83 +1,72 @@
 // Waitress
 
-009-2.gat,60,52,0	script	Melinda	140,{
+009-2.gat,60,52,0|script|Melinda|140,{
 
-	mes "[Melinda]";
-	mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\"";
-	next;
+    mes "[Melinda]";
+    mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\"";
+    next;
 
-	menu
-		"\"Sure! [don't tip]\"", L_NoTip,
-		"Sure! [tip 5 GP]", L_5Tip,
-		"Sure! [tip 10 GP]", L_10Tip,
-		"Nah, maybe later.", L_No;
-	close;
+    menu
+        "\"Sure! [don't tip]\"", L_NoTip,
+        "Sure! [tip 5 GP]", L_5Tip,
+        "Sure! [tip 10 GP]", L_10Tip,
+        "Nah, maybe later.", L_No;
+    close;
 
 L_NoTip:
-	if (zeny < 170)
-		goto L_NoMoney;
-
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("Beer") == 0)
-		goto L_TooMany;
-
-	set zeny, zeny - 170;
-	getitem "Beer", 1;
-
-	mes "[Melinda]";
-	mes "Pff... nickel nurser!";
-	close;
+    if (zeny < 170)
+        goto L_NoMoney;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("Beer") == 0)
+        goto L_TooMany;
+    set zeny, zeny - 170;
+    getitem "Beer", 1;
+    mes "[Melinda]";
+    mes "Pff... nickel nurser!";
+    close;
 
 L_5Tip:
-	if (zeny < 175)
-		goto L_NoMoney;
-
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("Beer") == 0)
-		goto L_TooMany;
-
-	set zeny, zeny - 175;
-	getitem "Beer", 1;
-
-	mes "[Melinda]";
-	mes "\"Here you go, sweetheart!\"";
-	close;
+    if (zeny < 175)
+        goto L_NoMoney;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("Beer") == 0)
+        goto L_TooMany;
+    set zeny, zeny - 175;
+    getitem "Beer", 1;
+    mes "[Melinda]";
+    mes "\"Here you go, sweetheart!\"";
+    close;
 
 L_10Tip:
-	if (zeny < 180)
-		goto L_NoMoney;
-
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("Beer") == 0)
-		goto L_TooMany;
-
-	set zeny, zeny - 180;
-	getitem "Beer", 1;
-
-	mes "[Melinda]";
-	mes "\"Thank you, sweetie! Want to hear a secret?\"";
-	next;
-
-	menu
-		"What is it, darling?", -,
-		"Nah, I don't feel like chatting.", L_No;
-
-	mes "[Melinda]";
-	mes "\"The master bowyer in this village used to construct exceptional bows. When you want one you should go and ask him.\"";
-	close;
+    if (zeny < 180)
+        goto L_NoMoney;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("Beer") == 0)
+        goto L_TooMany;
+    set zeny, zeny - 180;
+    getitem "Beer", 1;
+    mes "[Melinda]";
+    mes "\"Thank you, sweetie! Want to hear a secret?\"";
+    next;
+    menu
+        "What is it, darling?", -,
+        "Nah, I don't feel like chatting.", L_No;
+    mes "[Melinda]";
+    mes "\"The master bowyer in this village used to construct exceptional bows. When you want one you should go and ask him.\"";
+    close;
 
 L_No:
-	mes "[Melinda]";
-	mes "\"Just call me when you've changed your mind.\"";
-	close;
+    mes "[Melinda]";
+    mes "\"Just call me when you've changed your mind.\"";
+    close;
 
 L_NoMoney:
-	mes "[Melinda]";
-	mes "\"You look broke. Don't think that you can dine and dash here!\"";
-	close;
+    mes "[Melinda]";
+    mes "\"You look broke. Don't think that you can dine and dash here!\"";
+    close;
 
 L_TooMany:
-	mes "[Melinda]";
-	mes "\"You don't have room for a beer!\"";
-	close;
+    mes "[Melinda]";
+    mes "\"You don't have room for a beer!\"";
+    close;
 }
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index 145f09a5..25f88f82 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -1,595 +1,533 @@
 // ----------------------------------------
 // Wyara the Hurnscald witch
 // ----------------------------------------
-009-2.gat,121,26,0	script	Wyara#_M	103,{
-        set @Q_MASK, NIBBLE_2_MASK;
-        set @Q_SHIFT, NIBBLE_2_SHIFT;
-        set @Q_status, (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT;
-
-        // Set up SkillUp function
-        set @SUP_id, SKILL_MAGIC_NATURE;
-        set @SUP_name$, "Nature Magic";
-
-        set @STATUS_INITIAL, 0;
-        set @STATUS_PURIFY_EXPLAINED, 1;
-        set @STATUS_PURIFY_ONCE, 2;
-        set @STATUS_PURIFY_TWICE, 3;
-        set @STATUS_PURIFY_OVER, 4;
-        set @STATUS_MAX, @STATUS_PURIFY_OVER;
-
-        // This operation works around an earlier possible corruption of this state
-        if (@Q_status > @STATUS_MAX)
-		set @Q_status, @STATUS_INITIAL;
-        if ((@Q_status == @STATUS_PURIFY_OVER) && (getskilllv(SKILL_MAGIC_NATURE) < 2))
-		set @Q_status, @STATUS_INITIAL;
-        callsub S_update_var;
-
-	set @has_magic, getskilllv(SKILL_MAGIC);
-
-        if (@Q_status == @STATUS_PURIFY_ONCE)
-		goto L_Magic_purify_once;
-        if (@Q_status == @STATUS_PURIFY_TWICE)
-		goto L_Magic_purify_done;
-
-        mes "[Wyara the witch]";
-        if (!Sex)
-        	mes "\"Greetings, fair traveller! What can I do for you?\"";
-        if (Sex)
-        	mes "\"Hello! What brings you here?\"";
-        next;
-
-        set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_WYARA;
+009-2.gat,121,26,0|script|Wyara#_M|103,{
+    set @Q_MASK, NIBBLE_2_MASK;
+    set @Q_SHIFT, NIBBLE_2_SHIFT;
+    set @Q_status, (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT;
+
+    // Set up SkillUp function
+    set @SUP_id, SKILL_MAGIC_NATURE;
+    set @SUP_name$, "Nature Magic";
+
+    set @STATUS_INITIAL, 0;
+    set @STATUS_PURIFY_EXPLAINED, 1;
+    set @STATUS_PURIFY_ONCE, 2;
+    set @STATUS_PURIFY_TWICE, 3;
+    set @STATUS_PURIFY_OVER, 4;
+    set @STATUS_MAX, @STATUS_PURIFY_OVER;
+
+    // This operation works around an earlier possible corruption of this state
+    if (@Q_status > @STATUS_MAX)
+    set @Q_status, @STATUS_INITIAL;
+    if ((@Q_status == @STATUS_PURIFY_OVER) && (getskilllv(SKILL_MAGIC_NATURE) < 2)) set @Q_status, @STATUS_INITIAL;
+    callsub S_update_var;
+
+    set @has_magic, getskilllv(SKILL_MAGIC);
+
+    if (@Q_status == @STATUS_PURIFY_ONCE) goto L_Magic_purify_once;
+    if (@Q_status == @STATUS_PURIFY_TWICE) goto L_Magic_purify_done;
+
+    mes "[Wyara the witch]";
+    if (!Sex)
+        mes "\"Greetings, fair traveller! What can I do for you?\"";
+    if (Sex)
+        mes "\"Hello! What brings you here?\"";
+    next;
+    set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_WYARA;
+
 L_Main:
-        if (!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED))
-             menu "What do you know about...", L_Question,
-                  "Can you help me use the mana seed?", L_Q_manaseed_unabsorbed,
-                  "Can you help me learn magic?", L_Magic,
-                  "I would like to buy potions.", L_Shop,
-                  "Bye!", -;
-        if (!(!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED)))
-             menu "What do you know about...", L_Question,
-                  "Can you help me learn magic?", L_Magic,
-                  "I would like to buy potions.", L_Shop,
-                  "Bye!", -;
-        close;
+    if (!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED))
+        menu
+            "What do you know about...", L_Question,
+            "Can you help me use the mana seed?", L_Q_manaseed_unabsorbed,
+            "Can you help me learn magic?", L_Magic,
+            "I would like to buy potions.", L_Shop,
+            "Bye!", -;
+    if (!(!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED)))
+        menu
+            "What do you know about...", L_Question,
+            "Can you help me learn magic?", L_Magic,
+            "I would like to buy potions.", L_Shop,
+            "Bye!", -;
+    close;
 
 L_Shop:
-	mes "[Wyara the Witch]";
-        mes "\"Please have a look at the shelf behind me.\"";
-        close;
+    mes "[Wyara the Witch]";
+    mes "\"Please have a look at the shelf behind me.\"";
+    close;
 
 L_Question:
-        callfunc "MagicTalkOptionsSetup";
-        set @ignore, @QQ_WYARA;
-        callfunc "MagicTalkMenu";
-
-        if (@c == 0)		goto L_Main;
-        if (@c == @QQ_ELANORE)	goto L_Q_elanore;
-        if (@c == @QQ_MANASEED)	goto L_Q_manaseed;
-        if (@c == @QQ_MANAPOTION)	goto L_Q_manapotion;
-        if (@c == @QQ_SAGATHA)	goto L_Q_sagatha;
-        if (@c == @QQ_AULDSBEL)	goto L_Q_auldsbel;
-        if (@c == @QQ_IMP)	goto L_Q_imp;
-        if (@c == @QQ_OLDWIZ)	goto L_Q_old_wizard;
-        if (@c == @QQ_ASTRALSOUL)goto L_Q_astralsoul;
-
-        mes "[Wyara the Witch]";
-        mes "\"I fear that I can't help you with that.\"";
-        next;
-        goto L_Main;
+    callfunc "MagicTalkOptionsSetup";
+    set @ignore, @QQ_WYARA;
+    callfunc "MagicTalkMenu";
+
+    if (@c == 0) goto L_Main;
+    if (@c == @QQ_ELANORE) goto L_Q_elanore;
+    if (@c == @QQ_MANASEED) goto L_Q_manaseed;
+    if (@c == @QQ_MANAPOTION) goto L_Q_manapotion;
+    if (@c == @QQ_SAGATHA) goto L_Q_sagatha;
+    if (@c == @QQ_AULDSBEL) goto L_Q_auldsbel;
+    if (@c == @QQ_IMP) goto L_Q_imp;
+    if (@c == @QQ_OLDWIZ) goto L_Q_old_wizard;
+    if (@c == @QQ_ASTRALSOUL) goto L_Q_astralsoul;
+
+    mes "[Wyara the Witch]";
+    mes "\"I fear that I can't help you with that.\"";
+    next;
+    goto L_Main;
 
 
 L_Q_astralsoul:
-        mes "[Wyara the Witch]";
-        mes "\"The astral soul skill? Yes, I have heard about that. It can be taught by old and wise mages usually.\"";
-        next;
-        mes "\"You need lots of practise until you can handle the ability, and even more practise until you have the powers to teach it to someone else.\"";
-        next;
-        goto L_Main;
-
+    mes "[Wyara the Witch]";
+    mes "\"The astral soul skill? Yes, I have heard about that. It can be taught by old and wise mages usually.\"";
+    next;
+    mes "\"You need lots of practise until you can handle the ability, and even more practise until you have the powers to teach it to someone else.\"";
+    next;
+    goto L_Main;
 
 L_Q_old_wizard:
-        mes "[Wyara the Witch]";
-        mes "\"I don't know his name, but I do know that he has been living in the mountains since I first came here.  He is a master of many schools of magic, I believe.\"";
-        next;
-        mes "[Wyara the Witch]";
-        mes "She smiles.";
-        mes "\"He is also a nice and friendly person to talk to, and quite knowledgeable about the teas of this area.\"";
-        next;
-        goto L_Main;
-
+    mes "[Wyara the Witch]";
+    mes "\"I don't know his name, but I do know that he has been living in the mountains since I first came here.  He is a master of many schools of magic, I believe.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "She smiles.";
+    mes "\"He is also a nice and friendly person to talk to, and quite knowledgeable about the teas of this area.\"";
+    next;
+    goto L_Main;
 
 L_Q_elanore:
-        mes "[Wyara the Witch]";
-        mes "\"Elanore is the Tulimshar healer.  She is a very kind person and an outstanding healer.\"";
-        next;
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "\"Elanore is the Tulimshar healer.  She is a very kind person and an outstanding healer.\"";
+    next;
+    goto L_Main;
 
 L_Q_manaseed:
-        if (!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED))
-        	goto L_Q_manaseed_unabsorbed;
-        mes "[Wyara the Witch]";
-        mes "\"A mana seed?  I'm afraid that I can't help you with that.\"";
-        next;
-        goto L_Main;
+    if (!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED))
+        goto L_Q_manaseed_unabsorbed;
+    mes "[Wyara the Witch]";
+    mes "\"A mana seed?  I'm afraid that I can't help you with that.\"";
+    next;
+    goto L_Main;
 
 L_Q_manaseed_unabsorbed:
-        mes "[Wyara the Witch]";
-        mes "\"So you touched the mana seed but weren't able to absorb its powers?  That means that you're lacking a natural magical ability.  Still, there are ways around that.\"";
-        next;
-        mes "[Wyara the Witch]";
-        mes "\"If you drink a mana potion, you should be able to retain this magical power and slowly build up a magical skill.\"";
-        set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_MANAPOTION;
-        next;
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "\"So you touched the mana seed but weren't able to absorb its powers?  That means that you're lacking a natural magical ability.  Still, there are ways around that.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"If you drink a mana potion, you should be able to retain this magical power and slowly build up a magical skill.\"";
+    set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_MANAPOTION;
+    next;
+    goto L_Main;
 
 L_Q_manapotion:
-        mes "[Wyara the Witch]";
-        mes "\"I have a simple recipe for making mana potions, but I don't have one ready right now.  Can you bring me 40 mauve leaves and a bottle of water?  I can make one from those quite easily.\"";
-        next;
-        menu "Sure!", L_make_manapotion,
-             "No.", L_Main;
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "\"I have a simple recipe for making mana potions, but I don't have one ready right now.  Can you bring me 40 mauve leaves and a bottle of water?  I can make one from those quite easily.\"";
+    next;
+    menu
+        "Sure!", L_make_manapotion,
+        "No.", L_Main;
+    goto L_Main;
 
 L_manapotion_toomany:
-        mes "[Wyara the Witch]";
-        mes "\"Hmm... looking at you, I don't think that you would be able to carry it.\"";
-        next;
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "\"Hmm... looking at you, I don't think that you would be able to carry it.\"";
+    next;
+    goto L_Main;
 
 L_make_manapotion:
-	if(countitem("MauveHerb") < 40) goto L_make_manapotion_lack;
-	if(countitem("BottleOfWater") < 1) goto L_make_manapotion_lack;
-	getinventorylist;
-	if ((@inventorylist_count == 100)
-            && (countitem("MauveHerb") > 40)
-            && (countitem("BottleOfWater") > 100)
-            && (countitem("ManaPotion") < 1))
-        	goto L_manapotion_toomany;
-
-        delitem "MauveHerb", 40;
-        delitem "BottleOfWater", 1;
-        getitem "ManaPotion", 1;
-
-        mes "[Wyara the Witch]";
-        mes "Wyara takes your mauve leaves, grinds them, and pours some of the resultant paste into her cauldron.  She then takes your bottle and sticks it into her brew, head-first.";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "The water in the bottle takes on a strange golden hue, but doesn't flow out.";
-        mes "After a while, she retrieves the bottle, fills some of the liquid into a smaller, clay bottle, mixes in the rest of the paste, plugs the bottle and shakes it.";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"I shall keep the rest of your water and the bottle as a payment, if you don't mind.  But here is the potion; let it rest for a minute before you use it for maximum effect.\"";
-        next;
-
-        goto L_Main;
+    if(countitem("MauveHerb") < 40)
+        goto L_make_manapotion_lack;
+    if(countitem("BottleOfWater") < 1)
+        goto L_make_manapotion_lack;
+    getinventorylist;
+    if ((@inventorylist_count == 100)
+        && (countitem("MauveHerb") > 40)
+        && (countitem("BottleOfWater") > 100)
+        && (countitem("ManaPotion") < 1))
+            goto L_manapotion_toomany;
+
+    delitem "MauveHerb", 40;
+    delitem "BottleOfWater", 1;
+    getitem "ManaPotion", 1;
+
+    mes "[Wyara the Witch]";
+    mes "Wyara takes your mauve leaves, grinds them, and pours some of the resultant paste into her cauldron.  She then takes your bottle and sticks it into her brew, head-first.";
+    next;
+    mes "[Wyara the Witch]";
+    mes "The water in the bottle takes on a strange golden hue, but doesn't flow out.";
+    mes "After a while, she retrieves the bottle, fills some of the liquid into a smaller, clay bottle, mixes in the rest of the paste, plugs the bottle and shakes it.";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"I shall keep the rest of your water and the bottle as a payment, if you don't mind.  But here is the potion; let it rest for a minute before you use it for maximum effect.\"";
+    next;
+    goto L_Main;
 
 L_make_manapotion_lack:
-        mes "[Wyara the Witch]";
-        mes "\"No, we need forty mauve leaves and a bottle of water.\"";
-        next;
-
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "\"No, we need forty mauve leaves and a bottle of water.\"";
+    next;
+    goto L_Main;
 
 L_Q_imp:
-        mes "[Wyara the Witch]";
-        mes "\"Sagatha told me that she imprisoned an evil earth spirit in a dried-up well.  She wants it to stay there until it has mended its ways, or forever, if it doesn't.\"";
-        next;
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "\"Sagatha told me that she imprisoned an evil earth spirit in a dried-up well.  She wants it to stay there until it has mended its ways, or forever, if it doesn't.\"";
+    next;
+    goto L_Main;
 
 L_Q_sagatha:
-        mes "[Wyara the Witch]";
-        mes "Wyara smiles.";
-        mes "\"You have met Sagatha?  She's a wonderful person, isn't she?  Well, she does hold back a little towards humans, but deep down she feels for them, too.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"She does hold all plants and animals very dear, though.  Well, the peaceful ones more than the aggressive ones, I suppose, and scorpions not very much at all.\"";
-        next;
-
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "Wyara smiles.";
+    mes "\"You have met Sagatha?  She's a wonderful person, isn't she?  Well, she does hold back a little towards humans, but deep down she feels for them, too.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"She does hold all plants and animals very dear, though.  Well, the peaceful ones more than the aggressive ones, I suppose, and scorpions not very much at all.\"";
+    next;
+    goto L_Main;
 
 L_Q_auldsbel:
-        mes "[Wyara the Witch]";
-        mes "\"Auldsbel... the guild wizard?  I don't know him very well; as far as I know, he is only visiting.\"";
-        next;
-
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "\"Auldsbel... the guild wizard?  I don't know him very well; as far as I know, he is only visiting.\"";
+    next;
+    goto L_Main;
 
 L_Magic_no:
-        mes "[Wyara the Witch]";
-        mes "\"I am sorry, but you don't seem to be able to control any magic.  That means that I really can't help you with that.\"";
-        next;
-        goto L_Main;
+    mes "[Wyara the Witch]";
+    mes "\"I am sorry, but you don't seem to be able to control any magic.  That means that I really can't help you with that.\"";
+    next;
+    goto L_Main;
 
 L_Magic:
-	if (!@has_magic)
-		goto L_Magic_no;
-        mes "[Wyara the Witch]";
-        mes "\"Perhaps I can help you a little, but I am not a master of any school of magic.\"";
-        next;
+    if (!@has_magic)
+        goto L_Magic_no;
+    mes "[Wyara the Witch]";
+    mes "\"Perhaps I can help you a little, but I am not a master of any school of magic.\"";
+    next;
 
 L_Magic_main:
-        menu
-		"Can you explain magic to me?", L_Magic_explain,
-		"Can you teach me a spell?", L_Magic_spell,
-		"Can you train me?", L_Magic_train,
-                "Never mind.", -;
-
-        goto L_Main;
+    menu
+        "Can you explain magic to me?", L_Magic_explain,
+        "Can you teach me a spell?", L_Magic_spell,
+        "Can you train me?", L_Magic_train,
+        "Never mind.", -;
+    goto L_Main;
 
 L_Magic_explain:
-        mes "[Wyara the Witch]";
-        mes "\"Magic is just a name for the force that lives in all plants and animals and emanates from there into all things, living or dead.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"Some things it finds easier to pass through-- natural things, living things-- but dead things, such as rock or metal, can slow it down.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"There are different kinds of magic, too; nature, astral, and so on, but if this interests you, you should talk to a scholar.\"";
-        next;
-
-        goto L_Magic_main;
+    mes "[Wyara the Witch]";
+    mes "\"Magic is just a name for the force that lives in all plants and animals and emanates from there into all things, living or dead.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"Some things it finds easier to pass through-- natural things, living things-- but dead things, such as rock or metal, can slow it down.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"There are different kinds of magic, too; nature, astral, and so on, but if this interests you, you should talk to a scholar.\"";
+    next;
+    goto L_Magic_main;
 
 L_Magic_spell:
-        if (getskilllv(SKILL_MAGIC_NATURE) > 1)
-		goto L_Magic_spell3;
-        if (getskilllv(SKILL_MAGIC) > 1)
-		goto L_Magic_spell2;
-        mes "[Wyara the Witch]";
-        mes "\"No... I don't think that you are ready yet.  But please ask me again when you have some more control over your magical powers.\"";
-        next;
-
-        goto L_Magic_main;
+    if (getskilllv(SKILL_MAGIC_NATURE) > 1)
+        goto L_Magic_spell3;
+    if (getskilllv(SKILL_MAGIC) > 1)
+        goto L_Magic_spell2;
+    mes "[Wyara the Witch]";
+    mes "\"No... I don't think that you are ready yet.  But please ask me again when you have some more control over your magical powers.\"";
+    next;
+    goto L_Magic_main;
 
 L_Magic_spell3:
-        mes "[Wyara the Witch]";
-        mes "\"Now that you know the basics of nature magic, here is one of my favourites: '" + getspellinvocation("rain") + "' will summon rain, whereever you are standing.  It will consume a bottle of water, though.\"";
-        if (getskilllv(SKILL_MAGIC) < 2)
-           mes "\"You are not powerful enough to use it yet, though; you will first have to absorb more magic from the mana seed.\"";
-        next;
+    mes "[Wyara the Witch]";
+    mes "\"Now that you know the basics of nature magic, here is one of my favourites: '" + getspellinvocation("rain") + "' will summon rain, whereever you are standing.  It will consume a bottle of water, though.\"";
+    if (getskilllv(SKILL_MAGIC) < 2)
+        mes "\"You are not powerful enough to use it yet, though; you will first have to absorb more magic from the mana seed.\"";
+    next;
 
 L_Magic_spell2:
-        mes "[Wyara the Witch]";
-        mes "\"Here is another useful one: '" + getspellinvocation("detect-players") + "'.  It will tell you the names of everyone nearby, but beware that there are ways to protect against it.\"";
-        if (getskilllv(SKILL_MAGIC) < 2)
-           mes "\"Hmm.  You aren't powerful enough for this one either yet, I think.\"";
-        next;
-
-        if (!(getpartnerid2(0)))
-           goto L_Magic_main;
-
-        mes "[Wyara the Witch]";
-        mes "\"Married partners can find each other even more easily.  Use the '" + getspellinvocation("sense-spouse") + "' spell instead.\"";
-        next;
+    mes "[Wyara the Witch]";
+    mes "\"Here is another useful one: '" + getspellinvocation("detect-players") + "'.  It will tell you the names of everyone nearby, but beware that there are ways to protect against it.\"";
+    if (getskilllv(SKILL_MAGIC) < 2)
+        mes "\"Hmm.  You aren't powerful enough for this one either yet, I think.\"";
+    next;
+    if (!(getpartnerid2()))
         goto L_Magic_main;
+    mes "[Wyara the Witch]";
+    mes "\"Married partners can find each other even more easily.  Use the '" + getspellinvocation("sense-spouse") + "' spell instead.\"";
+    next;
+    goto L_Magic_main;
 
 L_Magic_train:
-        if (getskilllv(SKILL_MAGIC_NATURE) > 1)
-		goto L_Magic_train_no;
-        mes "[Wyara the Witch]";
-
-        if (@Q_status >= @STATUS_PURIFY_EXPLAINED)
-		goto L_Magic_train_wb;
-
-        mes "\"Train you?  No... you should talk to Sagatha.\"";
-        mes "She hesitates.";
-        next;
-
-	callfunc "SagathaStatus";
-
-        if (@evil)
-		goto L_Magic_train_evil;
-
-        mes "[Wyara the Witch]";
-        mes "\"It would be difficult to ask her to accept you unless you understand some of the basics already.\"";
-        next;
-
-        goto L_Magic_train_dispatch;
+    if (getskilllv(SKILL_MAGIC_NATURE) > 1)
+        goto L_Magic_train_no;
+    mes "[Wyara the Witch]";
+    if (@Q_status >= @STATUS_PURIFY_EXPLAINED)
+        goto L_Magic_train_wb;
+    mes "\"Train you?  No... you should talk to Sagatha.\"";
+    mes "She hesitates.";
+    next;
+    callfunc "SagathaStatus";
+    if (@evil) goto L_Magic_train_evil;
+    mes "[Wyara the Witch]";
+    mes "\"It would be difficult to ask her to accept you unless you understand some of the basics already.\"";
+    next;
+    goto L_Magic_train_dispatch;
 
 L_Magic_train_evil:
-      	mes "Wyara looks at you sadly.";
-        mes "\"I have heard that you have done something unforgiveable.  No witch in this land will teach you now.\"";
-        next;
-        goto L_Magic_main;
+    mes "Wyara looks at you sadly.";
+    mes "\"I have heard that you have done something unforgiveable.  No witch in this land will teach you now.\"";
+    next;
+    goto L_Magic_main;
 
 L_Magic_train_wb:
-	callfunc "SagathaStatus";
-
-        if (@evil)
-		goto L_Magic_train_evil;
-
-        mes "\"Ah, yes, your training...\"";
-        next;
-
+    callfunc "SagathaStatus";
+    if (@evil)
+        goto L_Magic_train_evil;
+    mes "\"Ah, yes, your training...\"";
+    next;
 
 L_Magic_train_dispatch:
-        if (@Q_status == @STATUS_PURIFY_TWICE)
-		goto L_Magic_purify_done;
-        if (@Q_status == @STATUS_PURIFY_ONCE)
-		goto L_Magic_purify_once;
-        if (@Q_status == @STATUS_PURIFY_EXPLAINED)
-		goto L_Magic_purify_explained;
-
-        mes "[Wyara the Witch]";
-        mes "\"Well, let me help you get started, then!  But first, to make sure that you are serious, I have a small task for you.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"There is a pond west of Hurnscald, a very small one, almost square in shape, with a rock on its southern ledge leading to its center.  This pond is close to dying.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"I want to save it; for that, someone will have to pour a purification potion into it.\"";
-        next;
-
-        set @Q_status, @STATUS_PURIFY_EXPLAINED;
-        callsub S_update_var;
+    if (@Q_status == @STATUS_PURIFY_TWICE)
+        goto L_Magic_purify_done;
+    if (@Q_status == @STATUS_PURIFY_ONCE)
+        goto L_Magic_purify_once;
+    if (@Q_status == @STATUS_PURIFY_EXPLAINED)
+        goto L_Magic_purify_explained;
+
+    mes "[Wyara the Witch]";
+    mes "\"Well, let me help you get started, then!  But first, to make sure that you are serious, I have a small task for you.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"There is a pond west of Hurnscald, a very small one, almost square in shape, with a rock on its southern ledge leading to its center.  This pond is close to dying.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"I want to save it; for that, someone will have to pour a purification potion into it.\"";
+    next;
+    set @Q_status, @STATUS_PURIFY_EXPLAINED;
+    callsub S_update_var;
+    
 L_Magic_purify_explained:
-        if (countitem("PurificationPotion"))
-		goto L_Magic_purify_doit;
-
-        mes "[Wyara the Witch]";
-        mes "\"To make the purification potion, I will need twenty maggot slimes and twenty leaves of mauve.\"";
-        next;
-
-        menu
-		"I shall get them later.", L_Magic_main,
-		"Booring.", L_Magic_main,
-		"Here they are.", -;
-
-	getinventorylist;
-	if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
-		goto L_Magic_purify_nospace;
-
-        if (countitem("MauveHerb") < 20)
-		goto L_Magic_purify_lacking;
-        if (countitem("MaggotSlime") < 20)
-		goto L_Magic_purify_lacking;
-
-	delitem "MauveHerb", 20;
-	delitem "MaggotSlime", 20;
-        getitem "PurificationPotion", 1;
-        mes "[Wyara the Witch]";
-        mes "Wyara grinds the leaves and mixes them with the slime, boils them, then speaks a brief incantation over them and hands you the result.";
-        next;
+    if (countitem("PurificationPotion"))
+        goto L_Magic_purify_doit;
+
+    mes "[Wyara the Witch]";
+    mes "\"To make the purification potion, I will need twenty maggot slimes and twenty leaves of mauve.\"";
+    next;
+    menu
+        "I shall get them later.", L_Magic_main,
+        "Booring.", L_Magic_main,
+        "Here they are.", -;
+    getinventorylist;
+    if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
+        goto L_Magic_purify_nospace;
+    if (countitem("MauveHerb") < 20)
+        goto L_Magic_purify_lacking;
+    if (countitem("MaggotSlime") < 20)
+        goto L_Magic_purify_lacking;
+    delitem "MauveHerb", 20;
+    delitem "MaggotSlime", 20;
+    getitem "PurificationPotion", 1;
+    mes "[Wyara the Witch]";
+    mes "Wyara grinds the leaves and mixes them with the slime, boils them, then speaks a brief incantation over them and hands you the result.";
+    next;
 
 L_Magic_purify_doit:
-        mes "[Wyara the Witch]";
-        mes "\"Take your purification potion to the pond, right next to its center, and pour the potion in.\"";
-        close;
+    mes "[Wyara the Witch]";
+    mes "\"Take your purification potion to the pond, right next to its center, and pour the potion in.\"";
+    close;
 
 L_Magic_purify_nospace:
-        mes "[Wyara the Witch]";
-        mes "\"You don't have enough space to carry the potion.  Please come back later.\"";
-        next;
-        goto L_Magic_main;
+    mes "[Wyara the Witch]";
+    mes "\"You don't have enough space to carry the potion.  Please come back later.\"";
+    next;
+    goto L_Magic_main;
 
 L_Magic_purify_lacking:
-        mes "[Wyara the Witch]";
-        mes "\"You'll need twenty mauve leaves and twenty maggot slimes for the potion.\"";
-        next;
-        goto L_Magic_main;
+    mes "[Wyara the Witch]";
+    mes "\"You'll need twenty mauve leaves and twenty maggot slimes for the potion.\"";
+    next;
+    goto L_Magic_main;
 
 L_Magic_purify_once:
-        mes "[Wyara the Witch]";
-        mes "Wyara nods.";
-        mes "\"You have purified the pond a little, but not enough, I think.  We'll need another potion.\"";
-        next;
+    mes "[Wyara the Witch]";
+    mes "Wyara nods.";
+    mes "\"You have purified the pond a little, but not enough, I think.  We'll need another potion.\"";
+    next;
+    if (countitem("PurificationPotion"))
+        goto L_Magic_purify_doit2;
+    mes "[Wyara the Witch]";
+    mes "\"I'll need twenty more maggot slimes and leaves of mauve.\"";
+    next;
+    menu
+        "I'll do that later.", L_Main,
+        "No way.", L_Main,
+        "Here you are.", -;
+    getinventorylist;
+    if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
+        goto L_Magic_purify_nospace;
+    if (countitem("MauveHerb") < 20)
+        goto L_Magic_purify_lacking;
+    if (countitem("MaggotSlime") < 20)
+        goto L_Magic_purify_lacking;
+    delitem "MauveHerb", 20;
+    delitem "MaggotSlime", 20;
+    getitem "PurificationPotion", 1;
+    mes "[Wyara the Witch]";
+    mes "Wyara brews another purification potion.";
+    next;
 
-        if (countitem("PurificationPotion"))
-		goto L_Magic_purify_doit2;
-
-        mes "[Wyara the Witch]";
-        mes "\"I'll need twenty more maggot slimes and leaves of mauve.\"";
-        next;
-
-        menu
-		"I'll do that later.", L_Main,
-		"No way.", L_Main,
-		"Here you are.", -;
-	getinventorylist;
-	if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
-		goto L_Magic_purify_nospace;
-
-        if (countitem("MauveHerb") < 20)
-		goto L_Magic_purify_lacking;
-        if (countitem("MaggotSlime") < 20)
-		goto L_Magic_purify_lacking;
-
-	delitem "MauveHerb", 20;
-	delitem "MaggotSlime", 20;
-        getitem "PurificationPotion", 1;
-        mes "[Wyara the Witch]";
-        mes "Wyara brews another purification potion.";
-        next;
 L_Magic_purify_doit2:
-        mes "[Wyara the Witch]";
-        mes "\"Please apply this one quickly, again.\"";
-        close;
+    mes "[Wyara the Witch]";
+    mes "\"Please apply this one quickly, again.\"";
+    close;
 
 L_Magic_purify_done:
-        mes "[Wyara the Witch]";
-        mes "Wyara smiles at you.";
-        mes "\"A friend told me... you have saved the pond for now.  Perhaps it will need some more attention later, but I'll ask others for this.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"Please sit down and touch the ground.\"";
-        next;
-
-        menu
-		"Very well.", -,
-                "No way!", L_Magic_purify_abort;
-
-        mes "[Wyara the Witch]";
-        mes "You sit down and touch the ground, and so does Wyara.";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "You sense the earth, through the floor boards, and begin to feel one with it, as if you were a plant or rock.";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "The gentle breeze coming in through the window begins to take on a very different quality, as if it were the gentle caress of a mother soothing her child.";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "You can sense the water within the ground, and from it you sense your sisters and brothers, plants, animals, people...";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "Slowly, the sensation recedes, but you feel changed.";
-
-        set @SUP_xp, 5000;
-        set @SUP_lvl, 2;
-        callfunc "SkillUp";
-
-        set @Q_status, @STATUS_PURIFY_OVER;
-        callsub S_update_var;
-        close;
+    mes "[Wyara the Witch]";
+    mes "Wyara smiles at you.";
+    mes "\"A friend told me... you have saved the pond for now.  Perhaps it will need some more attention later, but I'll ask others for this.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"Please sit down and touch the ground.\"";
+    next;
+    menu
+        "Very well.", -,
+        "No way!", L_Magic_purify_abort;
+    mes "[Wyara the Witch]";
+    mes "You sit down and touch the ground, and so does Wyara.";
+    next;
+    mes "[Wyara the Witch]";
+    mes "You sense the earth, through the floor boards, and begin to feel one with it, as if you were a plant or rock.";
+    next;
+    mes "[Wyara the Witch]";
+    mes "The gentle breeze coming in through the window begins to take on a very different quality, as if it were the gentle caress of a mother soothing her child.";
+    next;
+    mes "[Wyara the Witch]";
+    mes "You can sense the water within the ground, and from it you sense your sisters and brothers, plants, animals, people...";
+    next;
+    mes "[Wyara the Witch]";
+    mes "Slowly, the sensation recedes, but you feel changed.";
+    set @SUP_xp, 5000;
+    set @SUP_lvl, 2;
+    callfunc "SkillUp";
+    set @Q_status, @STATUS_PURIFY_OVER;
+    callsub S_update_var;
+    close;
 
 L_Magic_purify_abort:
-        mes "[Wyara the Witch]";
-        mes "\"I can't help you if you don't subject yourself to the ritual.\"";
-        close;
+    mes "[Wyara the Witch]";
+    mes "\"I can't help you if you don't subject yourself to the ritual.\"";
+    close;
 
 L_Magic_train_no:
-        mes "[Wyara the Witch]";
-        mes "\"I can't teach you anything at this time.  Perhaps Sagatha can help you, but I'm not sure if she will accept you as a student.\"";
-        next;
+    mes "[Wyara the Witch]";
+    mes "\"I can't teach you anything at this time.  Perhaps Sagatha can help you, but I'm not sure if she will accept you as a student.\"";
+    next;
 
 L_Magic_train_sagatha:
-        menu
-                "OK.", L_Magic_main,
-		"How can I convince her to accept me?", -;
-
-	callfunc "SagathaStatus";
-        mes "[Wyara the Witch]";
-        if (@evil)
-			goto L_Magic_train_sagatha_fail;
-
-        if (getskilllv(SKILL_MAGIC) < 2)
-        	goto L_Magic_train_sagatha_lvl1;
-
-        if (@good > 1)
-		mes "\"Come to think of it, I have heard good things about you.  Perhaps she will be willing to accept you as a student now?\"";
-        if (@good == 1)
-		mes "\"I have heard some good things about you, but I'm not sure if it will be enough to sway her-- she is hesitant to accept students.\"";
-        if (@good == 0)
-		mes "\"Sagatha cares greatly about all living creatures, but particularly about the creatures of the forest.  If you are kind to them, she will be more likely to be kind to you.\"";
-        next;
-
-        if (@druid == 3)
-        	goto L_Magic_main;
-
-        mes "[Wyara the Witch]";
-        mes "She smiles.";
-        mes "\"Actually, I think I know of a good thing you could do.  There is a very special tree in the desert south-east of Tulimshar, a tree that has been there for a very long time.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"The tree is slowly dying-- and has been for a long time-- but it is there because of a wonderful thing that happened long ago.  Tend to it, and I am sure that she will learn about this.\"";
-        next;
-        set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_DRUIDTREE;
-
-        menu
-		"What is that tree?", L_Magic_train_tree_backgd,
-		"How should I tend to it?", -,
-		"Nah.", L_Magic_main;
-
-        mes "[Wyara the Witch]";
-        mes "\"The tree has been there alone and unattended for a long time; what he needs most is water and affection.  Give him both.\"";
-        next;
-        mes "[Wyara the Witch]";
-        mes "She hesitates for a moment.";
-        mes "\"But stay away from the well in the area.  There is no water in there anymore, and it's also dangerous.\"";
-        next;
-	goto L_Magic_main;
+    menu
+        "OK.", L_Magic_main,
+        "How can I convince her to accept me?", -;
+
+    callfunc "SagathaStatus";
+    mes "[Wyara the Witch]";
+    if (@evil)
+        goto L_Magic_train_sagatha_fail;
+    if (getskilllv(SKILL_MAGIC) < 2)
+        goto L_Magic_train_sagatha_lvl1;
+    if (@good > 1)
+        mes "\"Come to think of it, I have heard good things about you.  Perhaps she will be willing to accept you as a student now?\"";
+    if (@good == 1)
+        mes "\"I have heard some good things about you, but I'm not sure if it will be enough to sway her-- she is hesitant to accept students.\"";
+    if (@good == 0)
+        mes "\"Sagatha cares greatly about all living creatures, but particularly about the creatures of the forest.  If you are kind to them, she will be more likely to be kind to you.\"";
+    next;
+    if (@druid == 3)
+        goto L_Magic_main;
+    mes "[Wyara the Witch]";
+    mes "She smiles.";
+    mes "\"Actually, I think I know of a good thing you could do.  There is a very special tree in the desert south-east of Tulimshar, a tree that has been there for a very long time.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"The tree is slowly dying-- and has been for a long time-- but it is there because of a wonderful thing that happened long ago.  Tend to it, and I am sure that she will learn about this.\"";
+    next;
+    set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_DRUIDTREE;
+    menu
+        "What is that tree?", L_Magic_train_tree_backgd,
+        "How should I tend to it?", -,
+        "Nah.", L_Magic_main;
+    mes "[Wyara the Witch]";
+    mes "\"The tree has been there alone and unattended for a long time; what he needs most is water and affection.  Give him both.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "She hesitates for a moment.";
+    mes "\"But stay away from the well in the area.  There is no water in there anymore, and it's also dangerous.\"";
+    next;
+    goto L_Magic_main;
 
 L_Magic_train_tree_backgd:
-        mes "[Wyara the Witch]";
-        mes "\"Many generations ago, there was a lush, green oasis in the desert south-east of Tulimshar.  Plants of all kinds grew there, and many animals, including mouboos, made this place their home.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"Then there came war, and some people pleaded to the demon Grenxen.  He founded Tulimshar, and to provide it with water he changed the underground waterflow.  The oasis began to dry out quickly.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"But the oasis, like many such places back in the old days, had a druid watching over it.  The druid refused to accept what Grenxen had done, but he was powerless to revert or change it.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"All he could do was to delay the inevitable, to give the animals and nomads some time to adapt.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"But to do so, he had to reach the water streams deep underground.  Thus, he turned himself into a tree, a deep-rooted fyrad, so that his roots could reach underground.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"He had to exert himself tremendously; he had to grow deep, quickly; I believe that no druid or witch has summoned such magic before or since.  But he succeeded, and for a while he saved the oasis.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"Many generations he remained the only one ever to have successfully defied Grenxen, but this came at a price:  he had to remain a tree, and he never turned back.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"I believe that he has not forgotten his old magic, because even though a tree remembers many things for a very long time, trees are not keen to change things, not even themselves.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"Now he stands alone in the desert, dried-up and forgotten, with no-one remembering him.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"Please give him water, for he is always in need of it, and thank him for his sacrifice.  It is all we can do for him now.\"";
-        next;
+    mes "[Wyara the Witch]";
+    mes "\"Many generations ago, there was a lush, green oasis in the desert south-east of Tulimshar.  Plants of all kinds grew there, and many animals, including mouboos, made this place their home.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"Then there came war, and some people pleaded to the demon Grenxen.  He founded Tulimshar, and to provide it with water he changed the underground waterflow.  The oasis began to dry out quickly.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"But the oasis, like many such places back in the old days, had a druid watching over it.  The druid refused to accept what Grenxen had done, but he was powerless to revert or change it.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"All he could do was to delay the inevitable, to give the animals and nomads some time to adapt.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"But to do so, he had to reach the water streams deep underground.  Thus, he turned himself into a tree, a deep-rooted fyrad, so that his roots could reach underground.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"He had to exert himself tremendously; he had to grow deep, quickly; I believe that no druid or witch has summoned such magic before or since.  But he succeeded, and for a while he saved the oasis.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"Many generations he remained the only one ever to have successfully defied Grenxen, but this came at a price:  he had to remain a tree, and he never turned back.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"I believe that he has not forgotten his old magic, because even though a tree remembers many things for a very long time, trees are not keen to change things, not even themselves.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"Now he stands alone in the desert, dried-up and forgotten, with no-one remembering him.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"Please give him water, for he is always in need of it, and thank him for his sacrifice.  It is all we can do for him now.\"";
+    next;
 
 L_Magic_tree_menu:
-        menu
-		"How should I give him water?", L_Magic_tree_water,
-		"How should I thank him?", L_Magic_tree_remind,
-                "I will.", -,
-                "No.", -;
-        goto L_Magic_main;
+    menu
+        "How should I give him water?", L_Magic_tree_water,
+        "How should I thank him?", L_Magic_tree_remind,
+        "I will.", -,
+        "No.", -;
+    goto L_Magic_main;
 
 L_Magic_tree_water:
-        mes "[Wyara the Witch]";
-        mes "\"A bottle of water would probably not be enough.  No, you would have to water the ground all around... that's too many bottles.  You will have to get water from elsewhere.\"";
-        next;
-        goto L_Magic_tree_menu;
+    mes "[Wyara the Witch]";
+    mes "\"A bottle of water would probably not be enough.  No, you would have to water the ground all around... that's too many bottles.  You will have to get water from elsewhere.\"";
+    next;
+    goto L_Magic_tree_menu;
 
 L_Magic_tree_remind:
-        mes "[Wyara the Witch]";
-        mes "\"Give him a sign of affection.  Something that works with a tree, but also something that humans might do to each other, to remind him of his days as a human.\"";
-        next;
-
-        mes "[Wyara the Witch]";
-        mes "\"Yes... that would be important.  Show your affection in the same way that you might towards a human.\"";
-        next;
-        goto L_Magic_tree_menu;
+    mes "[Wyara the Witch]";
+    mes "\"Give him a sign of affection.  Something that works with a tree, but also something that humans might do to each other, to remind him of his days as a human.\"";
+    next;
+    mes "[Wyara the Witch]";
+    mes "\"Yes... that would be important.  Show your affection in the same way that you might towards a human.\"";
+    next;
+    goto L_Magic_tree_menu;
 
 L_Magic_train_sagatha_fail:
-        mes "She shakes her head.";
-        mes "\"No... from what I have heard, you have done something unforgivable.  I very much doubt that you can be her student now, and I won't teach you any further either.\"";
-        next;
-        goto L_Magic_main;
+    mes "She shakes her head.";
+    mes "\"No... from what I have heard, you have done something unforgivable.  I very much doubt that you can be her student now, and I won't teach you any further either.\"";
+    next;
+    goto L_Magic_main;
 
 L_Magic_train_sagatha_lvl1:
-        mes "\"Well, you're still a bit of a beginner, so I don't think she will accept you yet.  Maybe you can absorb some more power from the mana seed?  If you can grow your magical powers a little, I might be able to help you.\"";
-        next;
-        goto L_Magic_main;
+    mes "\"Well, you're still a bit of a beginner, so I don't think she will accept you yet.  Maybe you can absorb some more power from the mana seed?  If you can grow your magical powers a little, I might be able to help you.\"";
+    next;
+    goto L_Magic_main;
 
 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;
 }