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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 28 insertions, 14 deletions

diff --git a/world/map/npc/048-2/slimes.txt b/world/map/npc/048-2/slimes.txt
index ce0b6df0..2318d1f0 100644
--- a/world/map/npc/048-2/slimes.txt
+++ b/world/map/npc/048-2/slimes.txt
@@ -13,7 +13,8 @@
 // @spawnSlimeX:            Number of slimes killed by the character that triggered the spawn
 
 // white slimes
-048-2.gat,181,95,0|script|#Slime0Trigger|32767,2,2,{
+048-2.gat,181,95,0|script|#Slime0Trigger|32767,2,2,
+{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -45,7 +46,8 @@ L_End:
     end;
 }
 
-048-2.gat,181,95,0|script|#Slime0|32767,{
+048-2.gat,181,95,0|script|#Slime0|32767,
+{
     end;
 
 OnSpawn:
@@ -100,7 +102,8 @@ L_ClearedPoint:
 
 
 // white slimes
-048-2.gat,164,123,0|script|#Slime1Trigger|32767,2,2,{
+048-2.gat,164,123,0|script|#Slime1Trigger|32767,2,2,
+{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -132,7 +135,8 @@ L_End:
     end;
 }
 
-048-2.gat,164,123,0|script|#Slime1|32767,{
+048-2.gat,164,123,0|script|#Slime1|32767,
+{
     end;
 
 OnSpawn:
@@ -187,7 +191,8 @@ L_ClearedPoint:
 
 
 // white slimes
-048-2.gat,198,115,0|script|#Slime2Trigger|32767,2,2,{
+048-2.gat,198,115,0|script|#Slime2Trigger|32767,2,2,
+{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -219,7 +224,8 @@ L_End:
     end;
 }
 
-048-2.gat,198,115,0|script|#Slime2|32767,{
+048-2.gat,198,115,0|script|#Slime2|32767,
+{
     end;
 
 OnSpawn:
@@ -274,7 +280,8 @@ L_ClearedPoint:
 
 
 // white slimes
-048-2.gat,167,79,0|script|#Slime3Trigger|32767,2,2,{
+048-2.gat,167,79,0|script|#Slime3Trigger|32767,2,2,
+{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -306,7 +313,8 @@ L_End:
     end;
 }
 
-048-2.gat,167,79,0|script|#Slime3|32767,{
+048-2.gat,167,79,0|script|#Slime3|32767,
+{
     end;
 
 OnSpawn:
@@ -361,7 +369,8 @@ L_ClearedPoint:
 
 
 // blue slimes
-048-2.gat,192,86,0|script|#Slime4Trigger|32767,2,2,{
+048-2.gat,192,86,0|script|#Slime4Trigger|32767,2,2,
+{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -393,7 +402,8 @@ L_End:
     end;
 }
 
-048-2.gat,192,86,0|script|#Slime4|32767,{
+048-2.gat,192,86,0|script|#Slime4|32767,
+{
     end;
 
 OnSpawn:
@@ -448,7 +458,8 @@ L_ClearedPoint:
 
 
 // blue slimes
-048-2.gat,183,110,0|script|#Slime5Trigger|32767,2,2,{
+048-2.gat,183,110,0|script|#Slime5Trigger|32767,2,2,
+{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -480,7 +491,8 @@ L_End:
     end;
 }
 
-048-2.gat,183,110,0|script|#Slime5|32767,{
+048-2.gat,183,110,0|script|#Slime5|32767,
+{
     end;
 
 OnSpawn:
@@ -535,7 +547,8 @@ L_ClearedPoint:
 
 
 // blue slimes
-048-2.gat,164,102,0|script|#Slime6Trigger|32767,2,2,{
+048-2.gat,164,102,0|script|#Slime6Trigger|32767,2,2,
+{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -567,7 +580,8 @@ L_End:
     end;
 }
 
-048-2.gat,164,102,0|script|#Slime6|32767,{
+048-2.gat,164,102,0|script|#Slime6|32767,
+{
     end;
 
 OnSpawn: