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

Conflicts:
	world/map/db/mob_db.txt

6 files changed, 12 insertions, 9 deletions

diff --git a/world/map/npc/024-1/_mobs.txt b/world/map/npc/024-1/_mobs.txt
index 3e8c406e..5dac248d 100644
--- a/world/map/npc/024-1/_mobs.txt
+++ b/world/map/npc/024-1/_mobs.txt
@@ -10,7 +10,8 @@
 024-1.gat,63,54,3,6|monster|Maggot|1002,1,100000,30000,Mob024-1::On1002
 
 
-024-1.gat,0,0,0|script|Mob024-1|-1,{
+024-1.gat,0,0,0|script|Mob024-1|-1,
+{
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
diff --git a/world/map/npc/024-1/ched.txt b/world/map/npc/024-1/ched.txt
index 662c6b81..2628f99a 100644
--- a/world/map/npc/024-1/ched.txt
+++ b/world/map/npc/024-1/ched.txt
@@ -1,6 +1,7 @@
 // Student at Tulimshar's magic academy
 
-024-1.gat,69,56,0|script|Ched|113,{
+024-1.gat,69,56,0|script|Ched|113,
+{
     if (isin("024-1.gat", 62, 52, 65, 57)) goto L_Garden;
     if (isin("024-1.gat", 66, 43, 80, 54)) goto L_Canyon;
 
diff --git a/world/map/npc/024-1/david.txt b/world/map/npc/024-1/david.txt
index 6924e5ad..14b8d848 100644
--- a/world/map/npc/024-1/david.txt
+++ b/world/map/npc/024-1/david.txt
@@ -1,5 +1,5 @@
-024-1.gat,70,70,0|script|David|120,{
-
+024-1.gat,70,70,0|script|David|120,
+{
     set @Potion_EXP, 2000;
 
     if (Rossy_Quest == 17) goto L_FinalEnd;
diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt
index 6999eccf..544eeaf9 100644
--- a/world/map/npc/024-1/eomie.txt
+++ b/world/map/npc/024-1/eomie.txt
@@ -18,8 +18,8 @@
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
 
-024-1.gat,72,94,0|script|Eomie|164,{
-
+024-1.gat,72,94,0|script|Eomie|164,
+{
 // lines belong to easter 2011:
 //    set @month, 4;
 //    set @start_day, 15;
diff --git a/world/map/npc/024-1/tinris.txt b/world/map/npc/024-1/tinris.txt
index a0313b32..1dcb3ccd 100644
--- a/world/map/npc/024-1/tinris.txt
+++ b/world/map/npc/024-1/tinris.txt
@@ -17,8 +17,8 @@
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
 
-024-1.gat,82,64,0|script|Tinris|160,{
-
+024-1.gat,82,64,0|script|Tinris|160,
+{
     set @state, ((QUEST_NorthTulimshar & $@magicfieldNT_MASK) >> $@magicfieldNT_SHIFT);
 
     set @cake_exp, 50;
diff --git a/world/map/npc/024-1/tondar.txt b/world/map/npc/024-1/tondar.txt
index 29041e33..7252b476 100644
--- a/world/map/npc/024-1/tondar.txt
+++ b/world/map/npc/024-1/tondar.txt
@@ -1,6 +1,7 @@
 // A professor at Tulimshar's magic academy
 
-024-1.gat,83,51,0|script|Tondar|168,{
+024-1.gat,83,51,0|script|Tondar|168,
+{
     mes "[Tondar]";
     mes "\"We're not accepting any new students right now.\"";
     if (getskilllv(SKILL_MAGIC) > 0)