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

Conflicts:
	world/map/db/mob_db.txt

18 files changed, 51 insertions, 32 deletions

diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index b0c56143..38e0dc5d 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -9,7 +9,8 @@
 027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
 
 
-027-2.gat,0,0,0|script|Mob027-2|-1,{
+027-2.gat,0,0,0|script|Mob027-2|-1,
+{
 On1077:
     set @mobID, 1077;
     callfunc "MobPoints";
diff --git a/world/map/npc/027-2/alacrius.txt b/world/map/npc/027-2/alacrius.txt
index 3271986e..d8b2b513 100644
--- a/world/map/npc/027-2/alacrius.txt
+++ b/world/map/npc/027-2/alacrius.txt
@@ -2,7 +2,8 @@
 //(incomplete, use alacrius2.txt instead)
 //To enable: sed 's_^// __' -i npc/027-2/alacrius.txt
 
-//027-2.gat,107,29,0|script|Alacrius|313,{
+//027-2.gat,107,29,0|script|Alacrius|313,
+//{
 //     // if started, go to started
 //     // if fail go to failed
 //     // if complete go to complete
diff --git a/world/map/npc/027-2/alacrius2.txt b/world/map/npc/027-2/alacrius2.txt
index b6ed70ff..94607b2d 100644
--- a/world/map/npc/027-2/alacrius2.txt
+++ b/world/map/npc/027-2/alacrius2.txt
@@ -1,7 +1,8 @@
 //Starts the reaper quest
 //To enable: sed 's_^// __' -i npc/027-2/alacrius2.txt
 
-// 027-2.gat,107,29,0|script|Alacrius|313,{
+// 027-2.gat,107,29,0|script|Alacrius|313,
+// {
 //     if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_Enjoy;
 
 
diff --git a/world/map/npc/027-2/barman.txt b/world/map/npc/027-2/barman.txt
index 36b20533..8fbf4867 100644
--- a/world/map/npc/027-2/barman.txt
+++ b/world/map/npc/027-2/barman.txt
@@ -1,4 +1,5 @@
-027-2.gat,103,22,0|script|Bennet|310,{
+027-2.gat,103,22,0|script|Bennet|310,
+{
     mes "[Bennet]";
     mes "\"Hi there, stranger!  My name is Bennet, the bartender here.\"";
     next;
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index c3959604..cb1cdc8f 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -2,7 +2,8 @@
 // TODO: add dialog/code for giving more letters
 //       Airlia supports receiving an infinate number of letters
 
-027-2.gat,24,25,0|script|Caretaker|159,{
+027-2.gat,24,25,0|script|Caretaker|159,
+{
     set @hw2011_npc_id, $@hw2011_npc_caretaker;
     if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
         goto L_TrickOrTreat;
@@ -116,7 +117,7 @@ OnTimer3000:
     setnpctimer 0;
     end;
 
-onInit:
+OnInit:
     monster "027-2.gat", 29, 21, "Caretaker's Wife", 1044, 1, "Caretaker::OnWifeDeath";
     end;
 
diff --git a/world/map/npc/027-2/cerhan.txt b/world/map/npc/027-2/cerhan.txt
index 6f453835..ec860ca4 100644
--- a/world/map/npc/027-2/cerhan.txt
+++ b/world/map/npc/027-2/cerhan.txt
@@ -1,6 +1,7 @@
 // Author: Jenalya
 
-027-2.gat,70,77,0|script|Cerhan|311,{
+027-2.gat,70,77,0|script|Cerhan|311,
+{
     mes "[Cerhan]";
     mes "\"Ah, hello! It's good to see another normal human at this strange place!\"";
     next;
diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index f6df816c..a2eedf80 100644
--- a/world/map/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
@@ -2,8 +2,8 @@
 // love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez
 // Jenalya: some changes about variables (setting to zero if only used locally, naming)
 
-027-2.gat,50,92,0|script|Aldred|314,{
-
+027-2.gat,50,92,0|script|Aldred|314,
+{
 // Crying Child subquest
 // Variable states:
 // 1 = You agree to help the child to find the ring outside
diff --git a/world/map/npc/027-2/diary.txt b/world/map/npc/027-2/diary.txt
index bfef84a6..d4f4b4ab 100644
--- a/world/map/npc/027-2/diary.txt
+++ b/world/map/npc/027-2/diary.txt
@@ -1,6 +1,7 @@
 // Author: Jenalya
 
-027-2.gat,26,97,0|script|#Diary|400, {
+027-2.gat,26,97,0|script|#Diary|400,
+{
     set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
 
diff --git a/world/map/npc/027-2/door.txt b/world/map/npc/027-2/door.txt
index a39b21f6..8c0c54cc 100644
--- a/world/map/npc/027-2/door.txt
+++ b/world/map/npc/027-2/door.txt
@@ -1,4 +1,5 @@
-027-2.gat,25,100,0|script|#DoorIn|45,1,1,{
+027-2.gat,25,100,0|script|#DoorIn|45,1,1,
+{
     set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
 
@@ -14,7 +15,8 @@ L_Warp:
     end;
 }
 
-027-2.gat,26,99,0|script|#DoorOut|45,1,1,{
+027-2.gat,26,99,0|script|#DoorOut|45,1,1,
+{
     warp "027-2.gat", 23, 98;
     end;
 }
diff --git a/world/map/npc/027-2/evil_guard.txt b/world/map/npc/027-2/evil_guard.txt
index bbb349df..99175c23 100644
--- a/world/map/npc/027-2/evil_guard.txt
+++ b/world/map/npc/027-2/evil_guard.txt
@@ -1,4 +1,5 @@
-027-2.gat,100,43,0|script|Blackwin|316,{
+027-2.gat,100,43,0|script|Blackwin|316,
+{
     mes "...";
     next;
     mes "The guard glares at you, silently daring you to try something.";
@@ -11,7 +12,8 @@
     close;
 }
 
-027-2.gat,112,37,0|script|Forwin|316,{
+027-2.gat,112,37,0|script|Forwin|316,
+{
     mes "[Evil Guard]";
     mes "\"" + strcharinfo(0) + "...\"";
     next;
diff --git a/world/map/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt
index 75836658..ffc0206f 100644
--- a/world/map/npc/027-2/golbenez.txt
+++ b/world/map/npc/027-2/golbenez.txt
@@ -9,8 +9,8 @@
 // state 6: wants jackOsouls, random chance of 1/50 to success, small amount of exp for fail
 // state 7: done
 
-027-2.gat,39,91,0|script|Golbenez|307,{
-
+027-2.gat,39,91,0|script|Golbenez|307,
+{
     set @Graveyard_Inn_MASK, NIBBLE_4_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_4_SHIFT;
 
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index 4298106f..15ec2292 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -12,7 +12,8 @@
 027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows :-1,ShockSweet :-1
 027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink :-1,CactusPotion :-1,BugLeg :-1,SmallMushroom :-1,IronPotion :-1,ConcentrationPotion :-1,HardSpike :-1,DarkCrystal :-1,Root :-1,WispPowder :-1,SpectrePowder :-1,PoltergeistPowder :-1
 
-027-2.gat,106,22,0|script|Edwin|309,{
+027-2.gat,106,22,0|script|Edwin|309,
+{
     set @npcname$, "Edwin";
 
     mes "[" + @npcname$ + "]";
@@ -23,7 +24,8 @@
 }
 
 // Inn
-027-2.gat,107,39,0|script|Barbara Grey|320,{
+027-2.gat,107,39,0|script|Barbara Grey|320,
+{
     set @npcname$, "Barbara Grey";
     set @cost, 1000;
 
@@ -35,7 +37,8 @@
 }
 
 // Bank and Storage
-027-2.gat,88,22,0|script|J.P. Morbid|321,{
+027-2.gat,88,22,0|script|J.P. Morbid|321,
+{
     callfunc "ClearVariables";
     set @npcname$, "J.P. Morbid";
     callfunc "Banker";
diff --git a/world/map/npc/027-2/headless_man.txt b/world/map/npc/027-2/headless_man.txt
index 086856cf..e22b6442 100644
--- a/world/map/npc/027-2/headless_man.txt
+++ b/world/map/npc/027-2/headless_man.txt
@@ -5,8 +5,8 @@
 // state 2: items delivered, return for reward and followup story
 // state 3: quest completed
 
-027-2.gat,22,76,0|script|Thurstan|318,{
-
+027-2.gat,22,76,0|script|Thurstan|318,
+{
     if (Sex == 0) set @madamsir$, "Madam";
     if (Sex == 1) set @madamsir$, "Sir";
 
diff --git a/world/map/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt
index 9e1b0c04..4217d9a4 100644
--- a/world/map/npc/027-2/husband.txt
+++ b/world/map/npc/027-2/husband.txt
@@ -9,8 +9,8 @@
 // state 6: is set in reid, gives as reward a special bowler hat
 // state 7: done
 
-027-2.gat,22,84,0|script|Hamond|319,{
-
+027-2.gat,22,84,0|script|Hamond|319,
+{
     set @Graveyard_Inn_MASK, NIBBLE_3_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_3_SHIFT;
 
diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt
index e3319b76..4204d041 100644
--- a/world/map/npc/027-2/innkeeper.txt
+++ b/world/map/npc/027-2/innkeeper.txt
@@ -13,8 +13,8 @@
 // state 10: she spoke with hamond and savaric, gives reward mylarin dust (needed for a crafting quest in thermin)
 // state 11: done, can ask about mylarin dust again
 
-027-2.gat,104,39,0|script|Reid's Ghost|315,{
-
+027-2.gat,104,39,0|script|Reid's Ghost|315,
+{
     set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
 
diff --git a/world/map/npc/027-2/lover.txt b/world/map/npc/027-2/lover.txt
index 1a544158..354362b1 100644
--- a/world/map/npc/027-2/lover.txt
+++ b/world/map/npc/027-2/lover.txt
@@ -9,8 +9,8 @@
 // state 6: waiting for youl, if @golbanez >= 7 got it, giving sorcerer robe
 // state 7: done
 
-027-2.gat,43,73,0|script|Savaric|317,{
-
+027-2.gat,43,73,0|script|Savaric|317,
+{
     set @Graveyard_Inn_MASK, NIBBLE_1_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_1_SHIFT;
 
diff --git a/world/map/npc/027-2/testnpcs.txt b/world/map/npc/027-2/testnpcs.txt
index 48f85a95..88d762e3 100644
--- a/world/map/npc/027-2/testnpcs.txt
+++ b/world/map/npc/027-2/testnpcs.txt
@@ -1,6 +1,7 @@
 //several NPCs in the Reid's Inn
 
-027-2.gat,80,34,0|script|Lovers|303,{
+027-2.gat,80,34,0|script|Lovers|303,
+{
     mes "You see a man and a woman holding each other very tight.";
     next;
     mes "They are kissing and whispering things to each other you can't hear.";
@@ -11,7 +12,8 @@
     close;
 }
 
-027-2.gat,75,29,0|script|Archibald|306,{
+027-2.gat,75,29,0|script|Archibald|306,
+{
 //the broken grammar is intentional
     mes "[Archibald]";
     mes "\"Me need to prepare the food. Me helping the chef cook.\"";
@@ -20,7 +22,8 @@
     close;
 }
 
-027-2.gat,77,40,0|script|Darnel|308,{
+027-2.gat,77,40,0|script|Darnel|308,
+{
     set @drunker, rand(4);
     if (@drunker == 0) goto L_0;
     if (@drunker == 1) goto L_1;
@@ -49,7 +52,8 @@ L_Close:
     close;
 }
 
-027-2.gat,110,23,0|script|Nigel|312,{
+027-2.gat,110,23,0|script|Nigel|312,
+{
     mes "[Nigel]";
     mes "\"Ohh... My head is killing me! I have to stop "
         + "drinking too much or I will lose my job... But "
diff --git a/world/map/npc/027-2/werewolf.txt b/world/map/npc/027-2/werewolf.txt
index 9c7c4468..c3187e92 100644
--- a/world/map/npc/027-2/werewolf.txt
+++ b/world/map/npc/027-2/werewolf.txt
@@ -1,6 +1,7 @@
 // author: Jenalya
 
-027-2.gat,118,23,0|script|Wolfgang|305,{
+027-2.gat,118,23,0|script|Wolfgang|305,
+{
     set @Graveyard_Inn_MASK, NIBBLE_5_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_5_SHIFT;