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

Conflicts:
	world/map/db/mob_db.txt

5 files changed, 18 insertions, 14 deletions

diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
index 15b4d2e9..a64cf913 100644
--- a/world/map/npc/042-1/_mobs.txt
+++ b/world/map/npc/042-1/_mobs.txt
@@ -8,7 +8,8 @@
 042-1.gat,62,81,42,50|monster|FireGoblin|1011,2,100000,30000,Mob042-1::On1011
 
 
-042-1.gat,0,0,0|script|Mob042-1|-1,{
+042-1.gat,0,0,0|script|Mob042-1|-1,
+{
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 70b3a430..581eb83a 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -1,8 +1,8 @@
 // This file is part of the Tutorial
 // Authors: Jenalya, alastrim
 
-042-1.gat,90,61,0|script|Hasan|189,{
-
+042-1.gat,90,61,0|script|Hasan|189,
+{
     set @toll, 10000;
     set @x, getx();
     set @y, gety();
@@ -96,7 +96,7 @@ L_Trick:
     set $@ScorpionTimer, 0;
     set $@ScorpionFighter, getcharid(3);
     set $@ScorpDeath, PC_DIE_COUNTER;
-    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::OnScorpionDeath";
     initnpctimer;
     end;
 
@@ -158,11 +158,11 @@ L_SummonAgain:
     message strcharinfo(0), "Kaan is mad at you for your interference! He walks over to the edge of the cliff and throws a rock on top of your head, then lets another scorpion run just near Hasan!";
     percentheal -100, 0;
     message strcharinfo(0), "Kaan: \"Just go while he is distracted and no one is interfering!\"";
-    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::OnScorpionDeath";
     end;
 
 L_Clean:
-    killmonster "042-1.gat", "Hasan::onScorpionDeath";
+    killmonster "042-1.gat", "Hasan::OnScorpionDeath";
     set $@ScorpionFighter, 0;
     set $@ScorpionTimer, 0;
     set $@ScorpDeath, 0;
@@ -200,7 +200,7 @@ OnTimer5000:
     setnpctimer 0;
     end;
 
-onScorpionDeath:
+OnScorpionDeath:
     if (getcharid(3) != $@ScorpionFighter)
         goto L_SummonAgain;
     if (hasan != 3)
@@ -211,7 +211,8 @@ onScorpionDeath:
 
 }
 
-042-1.gat,90,62,0|script|#Toll|32767,2,2,{
+042-1.gat,90,62,0|script|#Toll|32767,2,2,
+{
     end;
 
 OnTouch:
@@ -226,7 +227,8 @@ OnTouch:
 
 }
 
-042-1.gat,96,69,0|script|#barrier|45,0,2{
+042-1.gat,96,69,0|script|#barrier|45,0,2
+{
     end;
 
 OnTouch:
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index ac2e6edc..027e5895 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
@@ -1,8 +1,8 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 
-042-1.gat,84,65,0|script|Kaan|160,{
-
+042-1.gat,84,65,0|script|Kaan|160,
+{
     if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
     if (hasan == 4) goto L_Hasan_Saved;
     if ($@ScorpionFighter == getcharid(3)) goto L_Run;
diff --git a/world/map/npc/042-1/npcs.txt b/world/map/npc/042-1/npcs.txt
index 9d2d6ebb..d1bb5586 100644
--- a/world/map/npc/042-1/npcs.txt
+++ b/world/map/npc/042-1/npcs.txt
@@ -1,6 +1,7 @@
 // Talk NPCs to help make trek interesting between Tutorial and Bazaar.
 
-042-1.gat,82,96,0|script|Liana|205,{
+042-1.gat,82,96,0|script|Liana|205,
+{
     set @npcname$, "Liana";
 
     mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/042-1/valon.txt b/world/map/npc/042-1/valon.txt
index 07d2ae66..63530aec 100644
--- a/world/map/npc/042-1/valon.txt
+++ b/world/map/npc/042-1/valon.txt
@@ -1,8 +1,8 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 
-042-1.gat,44,144,0|script|Valon|156,1,0{
-
+042-1.gat,44,144,0|script|Valon|156,1,0
+{
     if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
 
     mes "[Valon]";