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

Conflicts:
	world/map/db/mob_db.txt

7 files changed, 24 insertions, 14 deletions

diff --git a/world/map/npc/022-1/_mobs.txt b/world/map/npc/022-1/_mobs.txt
index 92b81a81..ceea5fc7 100644
--- a/world/map/npc/022-1/_mobs.txt
+++ b/world/map/npc/022-1/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-022-1.gat,0,0,0|script|Mob022-1|-1,{
+022-1.gat,0,0,0|script|Mob022-1|-1,
+{
     end;
 }
diff --git a/world/map/npc/022-1/adrian.txt b/world/map/npc/022-1/adrian.txt
index fbae8706..dd70914d 100644
--- a/world/map/npc/022-1/adrian.txt
+++ b/world/map/npc/022-1/adrian.txt
@@ -5,8 +5,8 @@
 // state 2: Adrian gave the luggage to the player
 // state 3: player gave luggage to Kylian and Kylian asks who to talk to for the shop license
 
-022-1.gat,58,54,0|script|Adrian|213,{
-
+022-1.gat,58,54,0|script|Adrian|213,
+{
     set @state, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
 
     mes "[Adrian]";
diff --git a/world/map/npc/022-1/anwar.txt b/world/map/npc/022-1/anwar.txt
index b53b6731..b45b5fd2 100644
--- a/world/map/npc/022-1/anwar.txt
+++ b/world/map/npc/022-1/anwar.txt
@@ -17,15 +17,16 @@
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
 
--|script|#magicfieldNTconfig|-1,{
+-|script|#magicfieldNTconfig|-1,
+{
 OnInit:
     set $@magicfieldNT_MASK, NIBBLE_3_MASK;
     set $@magicfieldNT_SHIFT, NIBBLE_3_SHIFT;
     end;
 }
 
-022-1.gat,41,46,0|script|Anwar|156,{
-
+022-1.gat,41,46,0|script|Anwar|156,
+{
     set @state, ((QUEST_NorthTulimshar & $@magicfieldNT_MASK) >> $@magicfieldNT_SHIFT);
 
     set @cloth_amount, 3;
diff --git a/world/map/npc/022-1/dock.txt b/world/map/npc/022-1/dock.txt
index 654f4199..ed4c7695 100644
--- a/world/map/npc/022-1/dock.txt
+++ b/world/map/npc/022-1/dock.txt
@@ -1,6 +1,7 @@
 // The ferry dock
 
-022-1.gat,84,72,0|script|#tulimshardock|45,6,1,{
+022-1.gat,84,72,0|script|#tulimshardock|45,6,1,
+{
     set @loc, DOCK_tulimshar;
     callfunc "Ferry";
 }
diff --git a/world/map/npc/022-1/ferry_master.txt b/world/map/npc/022-1/ferry_master.txt
index 0622fd98..a4ad69ba 100644
--- a/world/map/npc/022-1/ferry_master.txt
+++ b/world/map/npc/022-1/ferry_master.txt
@@ -1,6 +1,7 @@
 //
 
-022-1.gat,73,71,0|script|Ferry Master|138,{
+022-1.gat,73,71,0|script|Ferry Master|138,
+{
     mes "[Ferry Master]";
     mes "\"Hello! Do you need something?\"";
     next;
diff --git a/world/map/npc/022-1/npcs.txt b/world/map/npc/022-1/npcs.txt
index 4bcf9dcf..a5b815d8 100644
--- a/world/map/npc/022-1/npcs.txt
+++ b/world/map/npc/022-1/npcs.txt
@@ -1,6 +1,7 @@
 // Talk NPCs to help make trek interesting between Tutorial and Bazaar.
 
-022-1.gat,35,36,0|script|Marikel|211,{
+022-1.gat,35,36,0|script|Marikel|211,
+{
     set @npcname$, "Marikel";
 
     mes "[" + @npcname$ + "]";
@@ -27,7 +28,8 @@ L_Marikel_2:
     close;
 }
 
-022-1.gat,65,46,0|script|Joelin|212,{
+022-1.gat,65,46,0|script|Joelin|212,
+{
     set @npcname$, "Joelin";
 
     mes "[" + @npcname$ + "]";
@@ -37,7 +39,8 @@ L_Marikel_2:
     close;
 }
 
-022-1.gat,67,46,0|script|Harper|213,{
+022-1.gat,67,46,0|script|Harper|213,
+{
     set @npcname$, "Harper";
 
     mes "[" + @npcname$ + "]";
@@ -45,7 +48,8 @@ L_Marikel_2:
     close;
 }
 
-022-1.gat,75,99,0|script|Swezanne|206,{
+022-1.gat,75,99,0|script|Swezanne|206,
+{
     set @npcname$, "Swezanne";
 
     mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt
index 23a924f1..1ecbb1a8 100644
--- a/world/map/npc/022-1/tutorial.txt
+++ b/world/map/npc/022-1/tutorial.txt
@@ -2,13 +2,15 @@
 // Author: Jenalya
 // if you enter the tutorial area from outside, it is set to be already done
 
-022-1.gat,19,37,0|script|#tutorial|45,0,2{
+022-1.gat,19,37,0|script|#tutorial|45,0,2
+{
     callfunc "TutorialCompleted";
     warp "042-1.gat", 95, 69;
     end;
 }
 
-function|script|TutorialCompleted|{
+function|script|TutorialCompleted|,
+{
     set hasan, 0;
     set kaan, 0;
     set sorfina, 0;