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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 23 insertions, 14 deletions

diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index 354df9a0..8eb78a2b 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -14,8 +14,8 @@
 //    254: Quest is being ended and cleaned: the hero logged off.
 //    255: Quest is being ended and cleaned: the hero died or he ran out of time
 
-007-1.gat,77,81,0|script|Valia|370,{
-
+007-1.gat,77,81,0|script|Valia|370,
+{
     set @illia_sapphire_powder, 3;
     set @illia_amethyst_powder, 1;
     set @illia_iron_powder, 13;
@@ -639,10 +639,11 @@ OnTimer300000:
 
 }
 
-007-1.gat,128,100,0|script|#IlliaDaemon|127,{
+007-1.gat,128,100,0|script|#IlliaDaemon|127,
+{
 end;
 
-onInit:
+OnInit:
     disablenpc "#IlliaTorch1";
     disablenpc "#IlliaTorch2";
     disablenpc "#IlliaTorch3";
@@ -871,8 +872,8 @@ L_Start:
 
 }
 
-function|script|UpdateIlliaProgress|{
-
+function|script|UpdateIlliaProgress|,
+{
     if ($@illia_progress == 1)
         goto L_Torch1;
     if ($@illia_progress == 2)
@@ -921,34 +922,42 @@ return;
 
 }
 
-007-1.gat,72,88,0|script|#IlliaTorch1|374,{
+007-1.gat,72,88,0|script|#IlliaTorch1|374,
+{
 end;
 }
 
-007-1.gat,71,85,0|script|#IlliaTorch2|374,{
+007-1.gat,71,85,0|script|#IlliaTorch2|374,
+{
 end;
 }
 
-007-1.gat,75,70,0|script|#IlliaTorch3|374,{
+007-1.gat,75,70,0|script|#IlliaTorch3|374,
+{
 end;
 }
 
-007-1.gat,85,71,0|script|#IlliaTorch4|374,{
+007-1.gat,85,71,0|script|#IlliaTorch4|374,
+{
 end;
 }
 
-007-1.gat,88,69,0|script|#IlliaTorch5|374,{
+007-1.gat,88,69,0|script|#IlliaTorch5|374,
+{
 end;
 }
 
-007-1.gat,86,68,0|script|#IlliaTorch6|374,{
+007-1.gat,86,68,0|script|#IlliaTorch6|374,
+{
 end;
 }
 
-007-1.gat,87,68,0|script|#IlliaTorch7|374,{
+007-1.gat,87,68,0|script|#IlliaTorch7|374,
+{
 end;
 }
 
-007-1.gat,88,67,0|script|#IlliaTorch8|374,{
+007-1.gat,88,67,0|script|#IlliaTorch8|374,
+{
 end;
 }