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

Conflicts:
	world/map/db/mob_db.txt

6 files changed, 38 insertions, 21 deletions

diff --git a/world/map/npc/051-1/_mobs.txt b/world/map/npc/051-1/_mobs.txt
index 32dc8bbb..a1caa5be 100644
--- a/world/map/npc/051-1/_mobs.txt
+++ b/world/map/npc/051-1/_mobs.txt
@@ -5,7 +5,8 @@
 051-1.gat,42,35,41,22|monster|SpikyMushroom|1019,10,100000,30000,Mob051-1::On1019
 
 
-051-1.gat,0,0,0|script|Mob051-1|-1,{
+051-1.gat,0,0,0|script|Mob051-1|-1,
+{
 On1019:
     set @mobID, 1019;
     callfunc "MobPoints";
diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt
index c6d041af..b51cd187 100644
--- a/world/map/npc/051-1/desert.txt
+++ b/world/map/npc/051-1/desert.txt
@@ -8,7 +8,8 @@
 //     2: Players collected enough souls and gave the souls to the waterfall
 //-----------------------------------------------------------------------------
 
-051-1.gat,142,39,0|script|Bones|367,{
+051-1.gat,142,39,0|script|Bones|367,
+{
     mes "You find a ruined paper next to these bones.";
     mes "It says...";
     next;
@@ -21,7 +22,8 @@
 
 }
 
-051-1.gat,170,24,0|script|Cursed Waterfall|400,{
+051-1.gat,170,24,0|script|Cursed Waterfall|400,
+{
     set $@illia_num_sealed_souls, 7;
     set @step, 3;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
diff --git a/world/map/npc/051-1/desertmonsters.txt b/world/map/npc/051-1/desertmonsters.txt
index af33fefd..f46edd6f 100644
--- a/world/map/npc/051-1/desertmonsters.txt
+++ b/world/map/npc/051-1/desertmonsters.txt
@@ -1,8 +1,8 @@
 051-1.gat,134,36,67,49|monster|Soul Snake|1096,12,100000,30000,IlliaDMobs051-1::On1096
 
 // The soul snakes release a Sealed Soul at random, once the soul collecting is started
-051-1.gat,0,0,0|script|IlliaDMobs051-1|-1,{
-
+051-1.gat,0,0,0|script|IlliaDMobs051-1|-1,
+{
 On1096:
     if (rand(4) == 0 && $@illia_progress == 3 && $@illia_level_3_progress == 1)
         getitem "SealedSoul", 1;
@@ -15,7 +15,8 @@ On1096:
 // Soul eater spawns. They will eat a Sealed Soul when killed, and when the soul collecting is started.
 
 // Spawn in the island
-051-1.gat,142,38,0|script|#SoulEaters0Trigger|32767,3,3,{
+051-1.gat,142,38,0|script|#SoulEaters0Trigger|32767,3,3,
+{
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
     if ($@SoulEaters0_count > 0)
@@ -24,7 +25,8 @@ On1096:
     end;
 }
 
-051-1.gat,142,38,0|script|#SoulEaters0|32767,{
+051-1.gat,142,38,0|script|#SoulEaters0|32767,
+{
 OnSpawn:
     set $@SoulEaters0_count, 5;
     areamonster "051-1.gat", 139, 34, 145, 41, "", 1097, $@SoulEaters0_count, "#SoulEaters0::OnSoulEaterDeath";
@@ -42,7 +44,8 @@ OnSoulEaterDeath:
 }
 
 // Spawn inside the north building
-051-1.gat,134,16,0|script|#SoulEaters1Trigger|32767,9,2,{
+051-1.gat,134,16,0|script|#SoulEaters1Trigger|32767,9,2,
+{
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
     if ($@SoulEaters1_count > 0)
@@ -51,7 +54,8 @@ OnSoulEaterDeath:
     end;
 }
 
-051-1.gat,134,16,0|script|#SoulEaters1|32767,{
+051-1.gat,134,16,0|script|#SoulEaters1|32767,
+{
 OnSpawn:
     set $@SoulEaters1_count, 7;
     areamonster "051-1.gat", 125, 14, 143, 18, "", 1097, $@SoulEaters1_count, "#SoulEaters1::OnSoulEaterDeath";
@@ -69,7 +73,8 @@ OnSoulEaterDeath:
 }
 
 // Spawn in the south grass area
-051-1.gat,137,55,0|script|#SoulEaters2Trigger|32767,5,4,{
+051-1.gat,137,55,0|script|#SoulEaters2Trigger|32767,5,4,
+{
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
     if ($@SoulEaters2_count > 0)
@@ -78,7 +83,8 @@ OnSoulEaterDeath:
     end;
 }
 
-051-1.gat,137,55,0|script|#SoulEaters2|32767,{
+051-1.gat,137,55,0|script|#SoulEaters2|32767,
+{
 OnSpawn:
     set $@SoulEaters2_count, 4;
     areamonster "051-1.gat", 134, 54, 139, 58, "", 1097, $@SoulEaters2_count, "#SoulEaters2::OnSoulEaterDeath";
@@ -96,7 +102,8 @@ OnSoulEaterDeath:
 }
 
 // Spawn near the eastern cliff
-051-1.gat,155,35,0|script|#SoulEaters3Trigger|32767,4,7,{
+051-1.gat,155,35,0|script|#SoulEaters3Trigger|32767,4,7,
+{
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
     if ($@SoulEaters3_count > 0)
@@ -105,7 +112,8 @@ OnSoulEaterDeath:
     end;
 }
 
-051-1.gat,155,35,0|script|#SoulEaters3|32767,{
+051-1.gat,155,35,0|script|#SoulEaters3|32767,
+{
 OnSpawn:
     set $@SoulEaters3_count, 4;
     areamonster "051-1.gat", 151, 29, 160, 45, "", 1097, $@SoulEaters3_count, "#SoulEaters3::OnSoulEaterDeath";
@@ -123,7 +131,8 @@ OnSoulEaterDeath:
 }
 
 // Spawn near the western cliff
-051-1.gat,120,38,0|script|#SoulEaters4Trigger|32767,6,9,{
+051-1.gat,120,38,0|script|#SoulEaters4Trigger|32767,6,9,
+{
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
     if ($@SoulEaters4_count > 0)
@@ -132,7 +141,8 @@ OnSoulEaterDeath:
     end;
 }
 
-051-1.gat,120,38,0|script|#SoulEaters4|32767,{
+051-1.gat,120,38,0|script|#SoulEaters4|32767,
+{
 OnSpawn:
     set $@SoulEaters4_count, 4;
     areamonster "051-1.gat", 116, 29, 127, 50, "", 1097, $@SoulEaters4_count, "#SoulEaters4::OnSoulEaterDeath";
diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt
index e0f392ae..e773fb03 100644
--- a/world/map/npc/051-1/forest.txt
+++ b/world/map/npc/051-1/forest.txt
@@ -9,7 +9,8 @@
 //     3: Players unlocked the door
 //-----------------------------------------------------------------------------
 
-051-1.gat,64,46,0|script|Strange Stone|400,{
+051-1.gat,64,46,0|script|Strange Stone|400,
+{
     set @step, 1;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if (isin("051-1.gat", 65,45, 67,48) == 0) end;
@@ -59,7 +60,8 @@ L_TaskComplete:
 }
 
 // Warp from the forest, to the cave
-051-1.gat,66,44,0|script|#ToCave|32767,1,1,{
+051-1.gat,66,44,0|script|#ToCave|32767,1,1,
+{
     set @step, 1;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_1_progress < 2) goto L_Blocked;
diff --git a/world/map/npc/051-1/forestmonsters.txt b/world/map/npc/051-1/forestmonsters.txt
index 28d1ac50..2ede6574 100644
--- a/world/map/npc/051-1/forestmonsters.txt
+++ b/world/map/npc/051-1/forestmonsters.txt
@@ -1,7 +1,7 @@
 051-1.gat,52,32,10,8|monster|Green Slime|1005,20,100000,30000,IlliaFMobs051-1::On1005
 
-051-1.gat,0,0,0|script|IlliaFMobs051-1|-1,{
-
+051-1.gat,0,0,0|script|IlliaFMobs051-1|-1,
+{
 On1005:
     if ($@illia_level_1_progress == 1)
         goto L_RockFinding;
diff --git a/world/map/npc/051-1/janitor.txt b/world/map/npc/051-1/janitor.txt
index 333bb791..b2be30da 100644
--- a/world/map/npc/051-1/janitor.txt
+++ b/world/map/npc/051-1/janitor.txt
@@ -1,5 +1,6 @@
 // Forest janitor
-051-1.gat,1,1,0|script|#IlliaJanitor1|127,{
+051-1.gat,1,1,0|script|#IlliaJanitor1|127,
+{
 end;
 
 OnCommandClean:
@@ -9,7 +10,8 @@ OnCommandClean:
 }
 
 // Desert janitor
-051-1.gat,1,1,0|script|#IlliaJanitor3|127,{
+051-1.gat,1,1,0|script|#IlliaJanitor3|127,
+{
 end;
 
 OnCommandClean: