18 files changed, 40 insertions, 25 deletions
diff --git a/world/map/npc/009-2/_mobs.txt b/world/map/npc/009-2/_mobs.txt
index 198257c3..f404b00d 100644
--- a/world/map/npc/009-2/_mobs.txt
+++ b/world/map/npc/009-2/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-009-2.gat,0,0,0|script|Mob009-2|-1,{
+009-2.gat,0,0,0|script|Mob009-2|-1,
+{
     end;
 }
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 3bc92277..33d38d38 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -6,7 +6,8 @@
 //   * 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,{
+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;
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index 53715527..22f2fbc1 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -8,7 +8,8 @@
 //#################################################################################
 
 // Archer Shop Master
-009-2.gat,99,23,0|script|Alan|125,{
+009-2.gat,99,23,0|script|Alan|125,
+{
     callfunc "ClearVariables";
 
     set @Q_MASK, NIBBLE_0_MASK;
diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt
index c9b5684a..a2e16ff9 100644
--- a/world/map/npc/009-2/doctor.txt
+++ b/world/map/npc/009-2/doctor.txt
@@ -1,6 +1,7 @@
 // Doctor
 
-009-2.gat,148,25,0|script|Doctor|107,{
+009-2.gat,148,25,0|script|Doctor|107,
+{
     callfunc "ClearVariables";
 
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt
index a20a0c91..d97100ac 100644
--- a/world/map/npc/009-2/drunks.txt
+++ b/world/map/npc/009-2/drunks.txt
@@ -1,6 +1,7 @@
 //Left drinking contest guy
 
-009-2.gat,65,55,0|script|Drinker|121,{
+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;
@@ -8,7 +9,8 @@
 
 //Right drinking contest guy
 
-009-2.gat,68,55,0|script|Drinker|121,{
+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.
diff --git a/world/map/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt
index 59bbd067..662b0c74 100644
--- a/world/map/npc/009-2/inspector.txt
+++ b/world/map/npc/009-2/inspector.txt
@@ -1,6 +1,7 @@
 //
 
-009-2.gat,24,99,0|script|Inspector#Hurnscald|150,{
+009-2.gat,24,99,0|script|Inspector#Hurnscald|150,
+{
     callfunc "ClearVariables";
 
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index 0df90c34..0b82d06a 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -13,7 +13,8 @@
 //#
 //#################################################################################
 
-009-2.gat,67,57,0|script|Kfahr|125,{
+009-2.gat,67,57,0|script|Kfahr|125,
+{
     set @hw2011_npc_id, $@hw2011_npc_kfahr;
     if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
         goto L_TrickOrTreat;
diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt
index c959d86f..4b49edf5 100644
--- a/world/map/npc/009-2/lena.txt
+++ b/world/map/npc/009-2/lena.txt
@@ -1,8 +1,8 @@
 // Quest for Fairy Hat and Forest Armor
 // Variables used: nibble 0 of QUEST_Hurnscald
 
-009-2.gat,146,43,0|script|Lena|182,{
-
+009-2.gat,146,43,0|script|Lena|182,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt
index 41d4c78e..5c80dc90 100644
--- a/world/map/npc/009-2/misc.txt
+++ b/world/map/npc/009-2/misc.txt
@@ -1,6 +1,7 @@
 //Note in bar
 
-009-2.gat,54,49,0|script|Note|400,{
+009-2.gat,54,49,0|script|Note|400,
+{
     mes "[Note]";
     mes "\"We refuse service to anyone who:\"";
     mes "\"-Has a bubblehead\"";
@@ -11,7 +12,8 @@
 }
 
 //Bookshelf
-009-2.gat,109,44,0|script|#Book|400,{
+009-2.gat,109,44,0|script|#Book|400,
+{
     if (getskilllv(SKILL_MAGIC))
         goto L_magic;
     mes "[Bookshelf]";
diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index 08fe98c2..d43b7df0 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -11,8 +11,8 @@
 //#
 //#################################################################################
 
-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;
 
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index b89d1f60..d89b30d4 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -22,7 +22,8 @@
 
 
 //######################################################################################
-009-2.gat,147,65,0|script|Nurse|119,{
+009-2.gat,147,65,0|script|Nurse|119,
+{
     set @hw2011_npc_id, $@hw2011_npc_nurse;
     if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
         goto L_TrickOrTreat;
diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index fe0e92e1..d528cc41 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -1,7 +1,7 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-009-2.gat,63,79,0|script|Olana|190,{
-
+009-2.gat,63,79,0|script|Olana|190,
+{
     set @MinLevel, 60;
 
     set @Cherry_Amount, 10;
diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index e0588f99..8c8f648d 100644
--- a/world/map/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
@@ -1,7 +1,7 @@
 // Nicholas' Apprentice and Armorsmith
 
-009-2.gat,183,57,0|script|Peter|157,{
-
+009-2.gat,183,57,0|script|Peter|157,
+{
     set @peter_chain_mail_coal, 10;
     set @peter_chain_mail_ingot, 5;
     set @peter_chain_mail_money, 20000;
diff --git a/world/map/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt
index b19b215f..143de014 100644
--- a/world/map/npc/009-2/richard.txt
+++ b/world/map/npc/009-2/richard.txt
@@ -1,6 +1,7 @@
 //
 
-009-2.gat,20,99,0|script|Richard|161,{
+009-2.gat,20,99,0|script|Richard|161,
+{
     callfunc "ClearVariables";
     set @npcname$, "Richard";
     callfunc "Banker";
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index c434b656..055e54eb 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -5,7 +5,8 @@
 //#                                                                               #
 //#################################################################################
 
-009-2.gat,32,104,0|script|Selim|326,{
+009-2.gat,32,104,0|script|Selim|326,
+{
     setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green";
 
     mes "[Selim]";
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index ce7fc548..c6267ceb 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -10,7 +10,8 @@
 
 // Receptionist
 // Offers the player to rest at the inn for 100gp
-009-2.gat,50,48,0|script|Receptionist|108,{
+009-2.gat,50,48,0|script|Receptionist|108,
+{
     set @npcname$, "Receptionist";
     set @cost, 100;
     callfunc "Inn";
diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt
index 782426b2..473b34e0 100644
--- a/world/map/npc/009-2/waitress.txt
+++ b/world/map/npc/009-2/waitress.txt
@@ -1,7 +1,7 @@
 // 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;
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index cef03385..27050f1d 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -1,7 +1,8 @@
 // ----------------------------------------
 // Wyara the Hurnscald witch
 // ----------------------------------------
-009-2.gat,121,26,0|script|Wyara#_M|103,{
+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;