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

7 files changed, 215 insertions, 239 deletions

diff --git a/world/map/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt
index f517bb23..419b018b 100644
--- a/world/map/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 008-1: Hurnscald outskirts
+// Map 008-1: Hurnscald Outskirts
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 008-1.gat
 npc: npc/008-1/_mobs.txt
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index b45b27cf..c81d7214 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald outskirts mobs
+// Hurnscald Outskirts mobs
 
 008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20,0,Mob008-1::On1014
 008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20,0,Mob008-1::On1018
diff --git a/world/map/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt
index 7b71a640..131c5818 100644
--- a/world/map/npc/008-1/_warps.txt
+++ b/world/map/npc/008-1/_warps.txt
@@ -1,11 +1,11 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald outskirts warps
+// Hurnscald Outskirts warps
 
-008-1.gat,54,61|warp|HurnscaldWestGate|-1,1,009-1.gat,26,36
+008-1.gat,54,61|warp|HurnscaldWestGate|-1,1,009-1.gat,25,36
 008-1.gat,79,80|warp|HurnscaldSouthGate|2,-1,009-1.gat,48,54
-008-1.gat,127,61|warp|HurnscaldEastGate|-1,0,009-1.gat,96,35
-008-1.gat,79,49|warp|HurnscaldNorthGate|2,-1,009-1.gat,48,24
-008-1.gat,24,62|warp|ToWoodland|-1,2,011-1.gat,122,61
+008-1.gat,127,61|warp|HurnscaldEastGate|-1,0,009-1.gat,96,36
+008-1.gat,79,49|warp|HurnscaldNorthGate|2,-1,009-1.gat,48,25
+008-1.gat,24,62|warp|ToWoodland|-1,2,011-1.gat,123,61
 008-1.gat,79,17|warp|ToWoodlandMines|2,-1,018-1.gat,79,97
 008-1.gat,79,102|warp|ToWoodland|2,-1,007-1.gat,68,23
 008-1.gat,132,101|warp|ToWoodland|1,-1,007-1.gat,122,23
diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index eae8641a..0ad3ab2a 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -1,8 +1,6 @@
 // Andra asks for your help to keep the soil fertile. The best way to do it is planting, so she asks for water and seeds. When she plants the seeds, some plants are spawned.
 
-008-1.gat,36,26,0	script	Andra	201,{
-    mes "This script is disabled because of possible bugs";
-    close;
+008-1.gat,36,26,0|script|Andra|201,{
 
     set @water_amount, 1;
     set @seeds_amount, 4;
@@ -45,8 +43,8 @@
     mes "[Andra]";
     mes "\"Great! Thank you for you help. If you have more items and want to help again, feel free to talk to me. We just have to be careful to not oversoak the soil with water.. but you don't need to worry, I will know when it is the right time to stop planting.";
     next;
-    delitem "BottleOfWater", @water_amount;	
-    delitem "GrassSeed", @seeds_amount;	
+    delitem "BottleOfWater", @water_amount;
+    delitem "GrassSeed", @seeds_amount;
     set FLAGS, FLAGS | FLAG_ANDRA_HELPED;
     mes "Andra pours some water in a lot of different places and then throws some seeds to the sky. The wind carries some of them really far from her.";
     close2;
@@ -104,7 +102,7 @@ L_Return:
         "No, I just wanted to say hello.", L_Bye;
     if ($@spawned_plants >= $@MAX_GLOBAL_PLANTS) goto L_Gather;
     if (countitem("BottleOfWater") < @water_amount || countitem("GrassSeed") < @seeds_amount) goto L_NotEnough;
-    delitem "BottleOfWater", @water_amount;	
+    delitem "BottleOfWater", @water_amount;
     delitem "GrassSeed", @seeds_amount;
     mes "Andra pours some water in a lot of different places and then throws the seeds to the sky. The wind carries some of them really far from her.";
     close2;
@@ -153,9 +151,6 @@ L_TooYoung:
     close;
 
 OnInit:
-    end;
     set $@PLANTS_PER_SEED, 3;
     set $@MAX_GLOBAL_PLANTS, 100; // You can plant only if the amount of plants currently in the map is < than this value.
-    initnpctimer;
-    stopnpctimer;
 }
diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt
index 46aa5a92..af8c6ff8 100644
--- a/world/map/npc/008-1/dock.txt
+++ b/world/map/npc/008-1/dock.txt
@@ -1,6 +1,6 @@
 // The ferry dock
 
-008-1.gat,140,64,0	script	#hurnscalddock	127,2,1,{
-	set @loc, DOCK_hurnscald;
-	callfunc "Ferry";
+008-1.gat,140,64,0|script|#hurnscalddock|127,2,1,{
+    set @loc, DOCK_hurnscald;
+    callfunc "Ferry";
 }
diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt
index 429fdbca..e4a37718 100644
--- a/world/map/npc/008-1/george.txt
+++ b/world/map/npc/008-1/george.txt
@@ -1,25 +1,25 @@
 //
 
-008-1.gat,136,36,0	script	George	138,{
-	if (getequipid(equip_head) == 617) goto L_Pirate;
-	if (getequipid(equip_head) == 622) goto L_Bandana;
-	if (getequipid(equip_head) == 621) goto L_EyePatch;
-	mes "[George the Pirate]";
-	mes "\"Arrrrh! 'Tis some kind of treasure map!\"";
-	close;
+008-1.gat,136,36,0|script|George|138,{
+    if (getequipid(equip_head) == 617) goto L_Pirate;
+    if (getequipid(equip_head) == 622) goto L_Bandana;
+    if (getequipid(equip_head) == 621) goto L_EyePatch;
+    mes "[George the Pirate]";
+    mes "\"Arrrrh! 'Tis some kind of treasure map!\"";
+    close;
 
 L_Pirate:
-	mes "[George the Pirate]";
-	mes "\"Arrrrh! Ye be wearing a pirate's hat!\"";
-	close;
+    mes "[George the Pirate]";
+    mes "\"Arrrrh! Ye be wearing a pirate's hat!\"";
+    close;
 
 L_Bandana:
-	mes "[George the Pirate]";
-	mes "\"Arrrrh! Ye remind me of my old first mate!\"";
-	close;
+    mes "[George the Pirate]";
+    mes "\"Arrrrh! Ye remind me of my old first mate!\"";
+    close;
 
 L_EyePatch:
-	mes "[George the Pirate]";
-	mes "\"Arrrrh! Looks like ye lost an eye there!\"";
-	close;
+    mes "[George the Pirate]";
+    mes "\"Arrrrh! Looks like ye lost an eye there!\"";
+    close;
 }
diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt
index 4d17310c..9e2c8cde 100644
--- a/world/map/npc/008-1/hinnak.txt
+++ b/world/map/npc/008-1/hinnak.txt
@@ -10,254 +10,235 @@
 
 //Farmer
 
-008-1.gat,101,30,0	script	Hinnak	142, {
-	if (Inspector == 10) goto L_NohMask;
+008-1.gat,101,30,0|script|Hinnak|142,{
+    if (Inspector == 10) goto L_NohMask;
 
 L_No_NohMask:
-	if (QUEST_Scythe_state == 1) goto L_Exchange;
-	if (QUEST_Scythe_state == 2) goto L_ThanksAgain;
-	if (getequipid(equip_head) == 751) goto L_Intro_Hat;
-	
-	mes "[Farmer Hinnak]";
-	mes "\"Argh! I hate them! I @#$% hate them! I @#$% hate these @#$% pinkies!\"";
-	next;
-
-	menu
-		"You need some anger control therapy.", -,
-		"Why do you hate them?", L_Reason;
-	close;
+    if (QUEST_Scythe_state == 1) goto L_Exchange;
+    if (QUEST_Scythe_state == 2) goto L_ThanksAgain;
+    if (getequipid(equip_head) == 751) goto L_Intro_Hat;
+
+    mes "[Farmer Hinnak]";
+    mes "\"Argh! I hate them! I @#$% hate them! I @#$% hate these @#$% pinkies!\"";
+    next;
+    menu
+        "You need some anger control therapy.", -,
+        "Why do you hate them?", L_Reason;
+    close;
 
 L_Intro_Hat:
-	mes "The farmer lunges at you with a farming implement.";
-	next;
-	heal -50, 0;
-	
-	menu
-		"I'm out of here.", -,
-		"Whoa, what are you doing?", L_Intro_Hat_Explain;
-	close;
+    mes "The farmer lunges at you with a farming implement.";
+    next;
+    heal -50, 0;
+    menu
+        "I'm out of here.", -,
+        "Whoa, what are you doing?", L_Intro_Hat_Explain;
+    close;
 
 L_Intro_Hat_Explain:
-	mes "[Farmer Hinnak]";
-	mes "\"Sorry, you look like a pinkie. They've been destroying my fields, and I guess I got a bit worked up.\"";
-	next;
-	goto L_Help;
+    mes "[Farmer Hinnak]";
+    mes "\"Sorry, you look like a pinkie. They've been destroying my fields, and I guess I got a bit worked up.\"";
+    next;
+    goto L_Help;
 
 L_Reason:
-	mes "[Farmer Hinnak]";
-	mes "\"These @#$% beasts are jumping around in my fields destroying all my harvest.";
-	mes "But they are too fast. I can't catch them.\"";
-	next;
-
-	menu
-		"Want me to help you?", L_Help,
-		"Well, life ain't fair.", -;
-	close;
+    mes "[Farmer Hinnak]";
+    mes "\"These @#$% beasts are jumping around in my fields destroying all my harvest.";
+    mes "But they are too fast. I can't catch them.\"";
+    next;
+    menu
+        "Want me to help you?", L_Help,
+        "Well, life ain't fair.", -;
+    close;
 
 L_Help:
-	mes "[Farmer Hinnak]";
-	mes "\"Yes, you look quite fast. Maybe you can catch some of them. That will pay them a lesson.";
-	mes "Slay some of them and bring me 10 of their antennae.\"";
-	set QUEST_Scythe_state, 1;
-	next;
-
-	menu
-		"Sure, I'm on my way", -,
-		"How much is this worth to you?", L_Reward;
-	close;
+    mes "[Farmer Hinnak]";
+    mes "\"Yes, you look quite fast. Maybe you can catch some of them. That will pay them a lesson.";
+    mes "Slay some of them and bring me 10 of their antennae.\"";
+    set QUEST_Scythe_state, 1;
+    next;
+    menu
+        "Sure, I'm on my way", -,
+        "How much is this worth to you?", L_Reward;
+    close;
 
 L_Reward:
-	mes "[Farmer Hinnak]";
-	mes "\"Well, I can't offer you much. But I got an old scythe laying around. Maybe you can use it as a weapon.\"";
-	close;
+    mes "[Farmer Hinnak]";
+    mes "\"Well, I can't offer you much. But I got an old scythe laying around. Maybe you can use it as a weapon.\"";
+    close;
 
 L_Exchange:
-	if (getequipid(equip_head) != 751) goto L_Exchange_Start;
-	mes "The farmer glares at your hat.";
-	next;
+    if (getequipid(equip_head) != 751)
+        goto L_Exchange_Start;
+    mes "The farmer glares at your hat.";
+    next;
 
 L_Exchange_Start:
-	mes "[Farmer Hinnak]";
-	mes "\"Have you got the 10 antennae?\"";
-	next;
-
-	menu
-		"Not yet, but I am working on it.", -,
-		"Sure, here they are!", L_Exchange_Exchange;
-	close;
+    mes "[Farmer Hinnak]";
+    mes "\"Have you got the 10 antennae?\"";
+    next;
+    menu
+        "Not yet, but I am working on it.", -,
+        "Sure, here they are!", L_Exchange_Exchange;
+    close;
 
 L_Exchange_Exchange:
-	if (countitem("PinkAntenna") < 10) goto L_Exchange_Notenough;
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("PinkAntenna") > 10) goto L_Exchange_TooMany;
-	delitem "PinkAntenna", 10;
-	getitem "Scythe", 1;
-	set QUEST_Scythe_state, 2;
-	mes "[Farmer Hinnak]";
-	mes "\"Thank you very much. I've got something for you. My old scythe. Maybe you can use it as a weapon. It is a bit cumbersome but its strikes are deadly.\"";
-	close;
+    if (countitem("PinkAntenna") < 10)
+        goto L_Exchange_Notenough;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("PinkAntenna") > 10)
+        goto L_Exchange_TooMany;
+    delitem "PinkAntenna", 10;
+    getitem "Scythe", 1;
+    set QUEST_Scythe_state, 2;
+    mes "[Farmer Hinnak]";
+    mes "\"Thank you very much. I've got something for you. My old scythe. Maybe you can use it as a weapon. It is a bit cumbersome but its strikes are deadly.\"";
+    close;
 
 L_Exchange_Notenough:
-	mes "[Farmer Hinnak]";
-	mes "\"It doesn't look like you do.\"";
-	close;
+    mes "[Farmer Hinnak]";
+    mes "\"It doesn't look like you do.\"";
+    close;
 
 L_Exchange_TooMany:
-	mes "[Farmer Hinnak]";
-	mes "\"Looks like you don't have room for this. Come back later to receive your reward. Hold on to the antennea until then.\"";
-	close;
+    mes "[Farmer Hinnak]";
+    mes "\"Looks like you don't have room for this. Come back later to receive your reward. Hold on to the antennea until then.\"";
+    close;
 
 L_ThanksAgain:
-	if (getequipid(equip_head) == 751) goto L_ThanksHat;
-	mes "[Farmer Hinnak]";
-	mes "\"Good to see you again, and thanks again for helping me with the pinkies!\"";
-	next;
-	goto L_ThanksMenu;
+    if (getequipid(equip_head) == 751)
+        goto L_ThanksHat;
+    mes "[Farmer Hinnak]";
+    mes "\"Good to see you again, and thanks again for helping me with the pinkies!\"";
+    next;
+    goto L_ThanksMenu;
 
 L_ThanksHat:
-	mes "[Farmer Hinnak]";
-	mes "\"That better be a trophy on your head.\"";
-	menu
-		"It is.", -;
-	
-	mes "[Farmer Hinnak]";
-	mes "\"Good then. Thanks for your help with the pinkies.\"";
+    mes "[Farmer Hinnak]";
+    mes "\"That better be a trophy on your head.\"";
+    menu
+        "It is.", -;
+    mes "[Farmer Hinnak]";
+    mes "\"Good then. Thanks for your help with the pinkies.\"";
 
 L_ThanksMenu:
-        menu
-		"Sure, any time!", -,
-		"Anything else you want me to do?", -,
-                "You're welcome.  Bye!", L_Bye;
-
-	mes "[Farmer Hinnak]";
-        mes "\"Actually, it's been a long day.  If it's no trouble, could you get me a beer?\"";
-        next;
-
-        menu
-		"Here you are.", L_GiveBeer,
-                "Sure, I'll go get one.  Bye!", L_Bye,
-                "You shouldn't drink while working!", -;
-
-	mes "[Farmer Hinnak]";
-        mes "\"Well, I'm done for the day, and I'm quite old enough to decide when I can have a beer, thank you!\"";
-        next;
-
-        menu
-		"Sorry... here you are.", L_GiveBeer,
-                "I don't have any.", L_NoBeer;
+    menu
+        "Sure, any time!", -,
+        "Anything else you want me to do?", -,
+        "You're welcome.  Bye!", L_Bye;
+    mes "[Farmer Hinnak]";
+    mes "\"Actually, it's been a long day.  If it's no trouble, could you get me a beer?\"";
+    next;
+    menu
+        "Here you are.", L_GiveBeer,
+        "Sure, I'll go get one.  Bye!", L_Bye,
+        "You shouldn't drink while working!", -;
+    mes "[Farmer Hinnak]";
+    mes "\"Well, I'm done for the day, and I'm quite old enough to decide when I can have a beer, thank you!\"";
+    next;
+    menu
+        "Sorry... here you are.", L_GiveBeer,
+        "I don't have any.", L_NoBeer;
 
 L_GiveBeer:
-        if (countitem("Beer") < 1) goto L_NoBeer;
-        delitem "Beer", 1;
-	mes "[Farmer Hinnak]";
-        mes "Hinnak takes a sip.";
-        mes "\"Aaah!  Nothing like a well-deserved beer after a long day of tending the crops!\"";
-        mes "\"Thanks, that was very kind of you!\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "He takes another sip.";
-        mes "\"Thanks!  You know, I had the strangest thing happen to me.  I had this patch of ground that was really clumpy; lots of clay, you see.\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"Right over there.\"";
-        mes "He points to a stretch of soft, raked ground.";
-        mes "\"Looks much better now, doesn't it?  But how I got there is kind-a scary...\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"I'd been trying to break it up for a while, but that kind of work is a pain.  So my wife said that I should go and see the witch, just in case she knows something.\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"And sure enough I ask the witch, and she has a look at it.  'Nothing I can do', she says, 'but I can ask a friend'.\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"So the next day another witch shows up.  Gorgeous woman, but when she looked at me, the scares went scuttling down my spine....\"";
-        mes "\"First thing she asked was if I'm a farmer.  Said her friend had told her that I needed help.\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"I show her what the problem is, and she tells me to go inside and wait.\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"Hinnak drains his beer in one long sip, then hesitates.";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"So I go inside.  I'm barely in when it starts raining outside, pouring cats and mouboos!\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"Not so weird, perhaps, except that it was been bright and sunny just a second before!  So I rush out, my wife telling me to leave the witch alone, and I see her standing there in the middle of the rain...\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"None of the raindrops touched her, as if they was afraid!\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"Then she yells out some gobbledygook word, and out of the ground there comes a swarm of maggots, crawling and digging and climbing over each other's backs...\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"And then she turns to me!  Seeing her stare, for a moment there I think that she'll turn me into a pinkie, for sure...\"";
-        next;
-
-	mes "[Farmer Hinnak]";
-        mes "\"But all she says is, 'if you'd stayed inside, you wouldn't be wet now'.\"";
-        next;
-
-        menu
-		"Hahaha!", L_Sagatha_hahaha,
-                "Whoah, scary...", L_Sagatha_scary,
-                "What was that gobbledygook word?", L_Sagatha_word,
-                "I better go now.", -;
-	goto L_Bye;
+    if (countitem("Beer") < 1)
+        goto L_NoBeer;
+    delitem "Beer", 1;
+    mes "[Farmer Hinnak]";
+    mes "Hinnak takes a sip.";
+    mes "\"Aaah!  Nothing like a well-deserved beer after a long day of tending the crops!\"";
+    mes "\"Thanks, that was very kind of you!\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "He takes another sip.";
+    mes "\"Thanks!  You know, I had the strangest thing happen to me.  I had this patch of ground that was really clumpy; lots of clay, you see.\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"Right over there.\"";
+    mes "He points to a stretch of soft, raked ground.";
+    mes "\"Looks much better now, doesn't it?  But how I got there is kind-a scary...\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"I'd been trying to break it up for a while, but that kind of work is a pain.  So my wife said that I should go and see the witch, just in case she knows something.\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"And sure enough I ask the witch, and she has a look at it.  'Nothing I can do', she says, 'but I can ask a friend'.\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"So the next day another witch shows up.  Gorgeous woman, but when she looked at me, the scares went scuttling down my spine....\"";
+    mes "\"First thing she asked was if I'm a farmer.  Said her friend had told her that I needed help.\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"I show her what the problem is, and she tells me to go inside and wait.\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"Hinnak drains his beer in one long sip, then hesitates.";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"So I go inside.  I'm barely in when it starts raining outside, pouring cats and mouboos!\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"Not so weird, perhaps, except that it was been bright and sunny just a second before!  So I rush out, my wife telling me to leave the witch alone, and I see her standing there in the middle of the rain...\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"None of the raindrops touched her, as if they was afraid!\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"Then she yells out some gobbledygook word, and out of the ground there comes a swarm of maggots, crawling and digging and climbing over each other's backs...\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"And then she turns to me!  Seeing her stare, for a moment there I think that she'll turn me into a pinkie, for sure...\"";
+    next;
+    mes "[Farmer Hinnak]";
+    mes "\"But all she says is, 'if you'd stayed inside, you wouldn't be wet now'.\"";
+    next;
+    menu
+        "Hahaha!", L_Sagatha_hahaha,
+        "Whoah, scary...", L_Sagatha_scary,
+        "What was that gobbledygook word?", L_Sagatha_word,
+        "I better go now.", -;
+    goto L_Bye;
 
 L_Sagatha_hahaha:
-	mes "[Farmer Hinnak]";
-        mes "\"Yeah, funny now...  But you should've seen that stare!  Ah, well, never mind.\"";
-        close;
+    mes "[Farmer Hinnak]";
+    mes "\"Yeah, funny now...  But you should've seen that stare!  Ah, well, never mind.\"";
+    close;
 
 L_Sagatha_scary:
-	mes "[Farmer Hinnak]";
-        mes "\"Yeah, you could say that...\"";
-        mes "He stares into his empty beer jug, as if wishing it weren't empty yet.";
-        close;
+    mes "[Farmer Hinnak]";
+    mes "\"Yeah, you could say that...\"";
+    mes "He stares into his empty beer jug, as if wishing it weren't empty yet.";
+    close;
 
 L_Sagatha_word:
-	mes "[Farmer Hinnak]";
-        mes "\"Oh, I can't be sure... but something like '" + getspellinvocation("summon-maggots") + "', I think.\"";
-        close;
+    mes "[Farmer Hinnak]";
+    mes "\"Oh, I can't be sure... but something like '" + getspellinvocation("summon-maggots") + "', I think.\"";
+    close;
 
 L_NoBeer:
-	mes "[Farmer Hinnak]";
-        mes "\"Ah... no beer?  Oh well.\"";
-        close;
+    mes "[Farmer Hinnak]";
+    mes "\"Ah... no beer?  Oh well.\"";
+    close;
 
 L_Bye:
-	mes "[Farmer Hinnak]";
-        mes "\"Bye!\"";
-        close;
+    mes "[Farmer Hinnak]";
+    mes "\"Bye!\"";
+    close;
 
 L_NohMask:
-	menu
-		"Did you see anyone in a mask come by here at night?", L_NohMask_Mask,
-		"Did you see anyone with a large satchel come by here at night?", L_NohMask_Satchel,
-		"Hello", L_No_NohMask;
-	close;
+    menu
+        "Did you see anyone in a mask come by here at night?", L_NohMask_Mask,
+        "Did you see anyone with a large satchel come by here at night?", L_NohMask_Satchel,
+        "Hello", L_No_NohMask;
+    close;
 
 L_NohMask_Mask:
-	mes "[Farmer Hinnak]";
-	mes "\"No. It tends to be too dark to see a mask.\"";
-	close;
+    mes "[Farmer Hinnak]";
+    mes "\"No. It tends to be too dark to see a mask.\"";
+    close;
 
 L_NohMask_Satchel:
-	mes "[Farmer Hinnak]";
-	mes "\"Yes, I saw someone with a large sack on their back go to the mining camp.\"";
-	close;
+    mes "[Farmer Hinnak]";
+    mes "\"Yes, I saw someone with a large sack on their back go to the mining camp.\"";
+    close;
 }