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

Conflicts:
	world/map/db/mob_db.txt

3 files changed, 12 insertions, 8 deletions

diff --git a/world/map/npc/042-2/_mobs.txt b/world/map/npc/042-2/_mobs.txt
index 4bebc4ec..a423b87a 100644
--- a/world/map/npc/042-2/_mobs.txt
+++ b/world/map/npc/042-2/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-042-2.gat,0,0,0|script|Mob042-2|-1,{
+042-2.gat,0,0,0|script|Mob042-2|-1,
+{
     end;
 }
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index 7d767e3f..dd63b753 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
@@ -1,8 +1,8 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 
-042-2.gat,28,26,0|script|Sorfina|154,4,4{
-
+042-2.gat,28,26,0|script|Sorfina|154,4,4
+{
     if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again;
     if (sorfina == 4) goto L_Heal;
     if (sorfina == 3) goto L_Clothes;
@@ -247,7 +247,8 @@ OnTouch:
     goto L_Start;
 }
 
-042-2.gat,33,27,0|script|#Carpet|32767,1,1{
+042-2.gat,33,27,0|script|#Carpet|32767,1,1
+{
     end;
 
 OnTouch:
@@ -269,8 +270,8 @@ OnTouch:
     close;
 }
 
-042-2.gat,27,23,0|script|Chest|111,{
-
+042-2.gat,27,23,0|script|Chest|111,
+{
     if (sorfina > 2) goto L_Empty;
     if (sorfina == 2) goto L_Shirt;
 
@@ -296,7 +297,8 @@ L_Empty:
     close;
 }
 
-042-2.gat,44,31,0|script|#DoorOut|45,0,0{
+042-2.gat,44,31,0|script|#DoorOut|45,0,0
+{
     end;
 
 OnTouch:
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index 9363d1b6..437099dd 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -2,7 +2,8 @@
 // Authors: Jenalya, alastrim
 // Cleanup: o11c
 
-042-2.gat,37,90,0|script|Tanisha|114,{
+042-2.gat,37,90,0|script|Tanisha|114,
+{
     if (isin("042-2.gat", 30, 85, 36, 89))
         goto L_Fighting;