Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

11 files changed, 38 insertions, 25 deletions

diff --git a/world/map/npc/021-2/_mobs.txt b/world/map/npc/021-2/_mobs.txt
index d45ca8be..5b7d3384 100644
--- a/world/map/npc/021-2/_mobs.txt
+++ b/world/map/npc/021-2/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-021-2.gat,0,0,0|script|Mob021-2|-1,{
+021-2.gat,0,0,0|script|Mob021-2|-1,
+{
     end;
 }
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index bea20d9e..5239c498 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -1,8 +1,8 @@
 // The bakery
 
 // The chef
-021-2.gat,95,21,0|script|Riskim|148,{
-
+021-2.gat,95,21,0|script|Riskim|148,
+{
 // lines belong to easter 2011:
 //    set @month, 4;
 //    set @start_day, 15;
@@ -201,7 +201,8 @@ L_SeeBunny:
 }
 
 // Server?
-021-2.gat,82,23,0|script|Sara|108,{
+021-2.gat,82,23,0|script|Sara|108,
+{
     mes "[Sara]";
     mes "";
     mes "\"Hello!\"";
@@ -212,7 +213,8 @@ L_SeeBunny:
 021-2.gat,89,21,0|shop|Drabur|112,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,Cake :-1,CherryCake :-1,OrangeCupcake :-3,Milk :-5,XmasCake :-1
 
 // Stockroom boy
-021-2.gat,133,21,0|script|Iormo|160,{
+021-2.gat,133,21,0|script|Iormo|160,
+{
     mes "[Iormo]";
     mes "";
     mes "\"This stock room can get messy.\"";
@@ -220,14 +222,16 @@ L_SeeBunny:
 }
 
 // An old couple eating at the bakery
-021-2.gat,71,22,0|script|Rynoh|159,{
+021-2.gat,71,22,0|script|Rynoh|159,
+{
     mes "[Rynoh]";
     mes "";
     mes "\"The cakes may be expensive, but they sure are delicious!\"";
     close;
 }
 
-021-2.gat,73,22,0|script|Ontas|154,{
+021-2.gat,73,22,0|script|Ontas|154,
+{
     mes "[Ontas]";
     mes "";
     mes "\"We come here every week.  This place has some of the best bread I've ever eaten!\"";
diff --git a/world/map/npc/021-2/bank.txt b/world/map/npc/021-2/bank.txt
index 5ebbe5ea..a1fbd3c1 100644
--- a/world/map/npc/021-2/bank.txt
+++ b/world/map/npc/021-2/bank.txt
@@ -1,5 +1,6 @@
 // Another banker
-021-2.gat,69,135,0|script|Hydusun|149,{
+021-2.gat,69,135,0|script|Hydusun|149,
+{
     set @npcname$, "Hydusun";
     callfunc "Banker";
     close;
diff --git a/world/map/npc/021-2/barber.txt b/world/map/npc/021-2/barber.txt
index d0ff401e..a4075a36 100644
--- a/world/map/npc/021-2/barber.txt
+++ b/world/map/npc/021-2/barber.txt
@@ -1,5 +1,6 @@
 // A barber (later we can make it so certain styles need to come from him, for a price)
-021-2.gat,72,101,0|script|Issay|156,{
+021-2.gat,72,101,0|script|Issay|156,
+{
     mes "[Issay the Barber]";
     mes "\"Do you need a change of style?\"";
     next;
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index 944efd09..1422e50a 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
@@ -1,7 +1,8 @@
 // The government builing in the south west
 
 // A clerk
-021-2.gat,27,17,0|script|Estard|107,{
+021-2.gat,27,17,0|script|Estard|107,
+{
     mes "[Estard]";
     mes "\"Hello what can I do for you?\"";
     next;
@@ -138,7 +139,8 @@ S_give_rings:
     return;
 }
 
-021-2.gat,36,17,0|script|Tathin|107,{
+021-2.gat,36,17,0|script|Tathin|107,
+{
     set @hw2011_npc_id, $@hw2011_npc_tathin;
     if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
         goto L_TrickOrTreat;
@@ -225,7 +227,8 @@ L_TrickOrTreat:
 }
 
 // Guard
-021-2.gat,20,19,0|script|Guard|123,1,1,{
+021-2.gat,20,19,0|script|Guard|123,1,1,
+{
     mes "[Guard]";
     mes "\"You can't come back here.\"";
     close;
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index 681f40df..c01d2fd4 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -1,7 +1,7 @@
 //Items for NPC are incomplete.  Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
 
-021-2.gat,70,129,0|script|Heathin|147,{
-
+021-2.gat,70,129,0|script|Heathin|147,
+{
     set @TARROW_REQ_TERRA_ORE, 1;
     set @TARROW_REQ_COAL, 5;
     set @TARROW_REQ_GP, 3000;
diff --git a/world/map/npc/021-2/hotel_receptionist.txt b/world/map/npc/021-2/hotel_receptionist.txt
index 0a7fcbb2..dac560c6 100644
--- a/world/map/npc/021-2/hotel_receptionist.txt
+++ b/world/map/npc/021-2/hotel_receptionist.txt
@@ -1,7 +1,8 @@
 // Tulimshar's main workshop
 
 // The receptionist
-021-2.gat,22,63,0|script|Sonir|118,{
+021-2.gat,22,63,0|script|Sonir|118,
+{
     mes "[Sonir]";
     mes "\"Welcome to The Wizards's Rest!\"";
     next;
diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt
index 4a70730c..97424592 100644
--- a/world/map/npc/021-2/inya.txt
+++ b/world/map/npc/021-2/inya.txt
@@ -1,8 +1,8 @@
 //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
 //The power of the gems is important to future balance of these rings.  Are they related to stats, tiers of power, schools of magic?
 
-021-2.gat,80,134,0|script|Inya|106,{
-
+021-2.gat,80,134,0|script|Inya|106,
+{
     mes "[Inya]";
     mes "\"I am Inya, a jeweler of fine rings.  If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\"";
     next;
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index 1bffd0eb..dcb76d47 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
@@ -1,7 +1,7 @@
 // Ingot maker takes iron ore, gives ingots for future crafting purposes.
 
-021-2.gat,70,124,0|script|Jhedia|160,{
-
+021-2.gat,70,124,0|script|Jhedia|160,
+{
     set @Cost_Per_Ingot, 1000;
     set @Iron_Ore_Per, 5;
     set @Coal_Per, 10;
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt
index 737214a5..c228acba 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/021-2/kylian.txt
@@ -32,7 +32,8 @@
 // @KylianNTSightSeeing
 // @KylianNTCasino
 
--|script|#businessmanNTconfig|-1,{
+-|script|#businessmanNTconfig|-1,
+{
 OnInit:
     // Nibble 4
     set $@knowYanisNT,   0x10000;
@@ -45,15 +46,16 @@ OnInit:
     end;
 }
 
-021-2.gat,25,67,0|script|#KylianOut|32767,1,1,{
+021-2.gat,25,67,0|script|#KylianOut|32767,1,1,
+{
     set @KylianNTLicense, 0;
     set @KylianNTSightSeeing, 0;
     set @KylianNTCasino, 0;
     end;
 }
 
-021-2.gat,32,92,0|script|Kylian|193,{
-
+021-2.gat,32,92,0|script|Kylian|193,
+{
     set @state, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
 
     set @acorn_amount, 12;
diff --git a/world/map/npc/021-2/yanis.txt b/world/map/npc/021-2/yanis.txt
index 27e69f63..384c6d92 100644
--- a/world/map/npc/021-2/yanis.txt
+++ b/world/map/npc/021-2/yanis.txt
@@ -1,8 +1,8 @@
 // Government official taking care about shop licenses
 // involved in quest given by 021-1/imec.txt and 021-2/kylian.txt
 
-021-2.gat,33,17,0|script|Yanis|107,{
-
+021-2.gat,33,17,0|script|Yanis|107,
+{
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowYanisNT;
     set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
     set @imec, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT);