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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 8 insertions, 4 deletions

diff --git a/world/map/npc/048-2/bluesageConfig.txt b/world/map/npc/048-2/bluesageConfig.txt
index 6ff952bd..cb237441 100644
--- a/world/map/npc/048-2/bluesageConfig.txt
+++ b/world/map/npc/048-2/bluesageConfig.txt
@@ -51,7 +51,8 @@
 // Bit 0: started the subquest
 // Bit 1 - 7: each spawn point is unique and saved with a flag
 
--|script|#bluesageconfig|-1,{
+-|script|#bluesageconfig|-1,
+{
 OnInit:
     set $@Q_BlueSageMinimumLevel, 60;
 
@@ -93,17 +94,20 @@ OnInit:
     set $@BlueSageSlime6_Amount, 1;
 }
 
-function|script|updateBlueSageBookPages|{
+function|script|updateBlueSageBookPages|,
+{
     set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageBookPages_MASK) | (@bookpages << $@Q_BlueSageBookPages_SHIFT));
     return;
 }
 
-function|script|updateBlueSageInvestigate|{
+function|script|updateBlueSageInvestigate|,
+{
     set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageInvestigate_MASK) | (@investigate << $@Q_BlueSageInvestigate_SHIFT));
     return;
 }
 
-function|script|blueSageNumberOfClearedNests|{
+function|script|blueSageNumberOfClearedNests|,
+{
     set @slimenests, 0;
     if (QUEST_BlueSage & $@Q_BlueSageSlime0)
         set @slimenests, @slimenests+1;