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

Conflicts:
	world/map/db/mob_db.txt

6 files changed, 43 insertions, 35 deletions

diff --git a/world/map/npc/051-3/_mobs.txt b/world/map/npc/051-3/_mobs.txt
index 867b98f4..bf214d2f 100644
--- a/world/map/npc/051-3/_mobs.txt
+++ b/world/map/npc/051-3/_mobs.txt
@@ -19,7 +19,8 @@
 051-3.gat,60,94,18,5|monster|CopperSlime|1098,7,100000,60000,Mob051-3::On1098
 
 
-051-3.gat,0,0,0|script|Mob051-3|-1,{
+051-3.gat,0,0,0|script|Mob051-3|-1,
+{
 On1008:
     set @mobID, 1008;
     callfunc "MobPoints";
diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index 74e1ced7..109d55b2 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -10,12 +10,14 @@
 //     4: Key of the door found, to leave the cave
 //-----------------------------------------------------------------------------
 
-051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2,{
+051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2,
+{
     message strcharinfo(0), "There is no way I can pass here. Let's find another way.";
     end;
 }
 
-051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2,{
+051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2,
+{
     set @step, 2;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if (strcharinfo(0) == $@ILLIA_HERO$ && $@illia_level_2_progress == 0) goto L_PrepareAmbush;
@@ -32,7 +34,8 @@ L_ShouldNotBeHere:
 
 }
 
-051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3,{
+051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3,
+{
     set @step, 2;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_2_progress == 0 && strcharinfo(0) == $@ILLIA_HERO$) goto L_MakeAmbush;
@@ -49,7 +52,8 @@ L_ShouldNotBeHere:
     end;
 }
 
-051-3.gat,1,1,0|script|#BndtTl|127,{
+051-3.gat,1,1,0|script|#BndtTl|127,
+{
     end;
 
 OnCommandAmbush:
@@ -68,17 +72,17 @@ OnTimer9000:
     end;
 
 OnTimer11000:
-    areatimer "051-3.gat", 22, 12, 102, 97, 500, "#BndtTl::onOuch";
-    areatimer "051-3.gat", 22, 12, 102, 97, 3000, "#BndtTl::onA";
+    areatimer "051-3.gat", 22, 12, 102, 97, 500, "#BndtTl::OnOuch";
+    areatimer "051-3.gat", 22, 12, 102, 97, 3000, "#BndtTl::OnA";
     stopnpctimer;
     setnpctimer 0;
     end;
 
-onOuch:
+OnOuch:
     message strcharinfo(0), "Ouch my head...";
     end;
 
-onA:
+OnA:
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_CaptureHero;
     if (strcharinfo(0) == $@ILLIA_HELPER1$)
@@ -137,7 +141,8 @@ L_CaptureHelper3:
 
 }
 
-051-3.gat,29,94,0|script|Sneaky Bandit|127,{
+051-3.gat,29,94,0|script|Sneaky Bandit|127,
+{
     end;
 
 OnCommandTalk:
@@ -156,7 +161,8 @@ OnTimer3600:
 
 }
 
-051-3.gat,33,95,0|script|Another Sneaky Bandit|127,{
+051-3.gat,33,95,0|script|Another Sneaky Bandit|127,
+{
     end;
 
 OnCommandTalk:
diff --git a/world/map/npc/051-3/jailslimes.txt b/world/map/npc/051-3/jailslimes.txt
index a008a8fd..453704ad 100644
--- a/world/map/npc/051-3/jailslimes.txt
+++ b/world/map/npc/051-3/jailslimes.txt
@@ -4,8 +4,8 @@
 051-3.gat,63,104,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098
 051-3.gat,70,111,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098
 
-051-3.gat,0,0,0|script|IlliaCMobs051-3|-1,{
-
+051-3.gat,0,0,0|script|IlliaCMobs051-3|-1,
+{
 On1098:
     if (rand(100) < 80 && $@illia_progress == 2 && ($@illia_level_2_progress == 1 || $@illia_level_2_progress == 2))
         goto L_LockPicks;
diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt
index 5dfb1c30..527ca24c 100644
--- a/world/map/npc/051-3/janitor.txt
+++ b/world/map/npc/051-3/janitor.txt
@@ -1,10 +1,11 @@
 // Bandit cave janitor
-051-3.gat,1,1,0|script|#IlliaJanitor2|127,{
+051-3.gat,1,1,0|script|#IlliaJanitor2|127,
+{
 end;
 
 OnCommandClean:
     // Kill all remaining bandits spawned during the "reinforcements" event
-    killmonster "051-1.gat", "Door::onB";
+    killmonster "051-1.gat", "Door::OnB";
     end;
 
 }
diff --git a/world/map/npc/051-3/locks.txt b/world/map/npc/051-3/locks.txt
index 1d89bbf8..e04740af 100644
--- a/world/map/npc/051-3/locks.txt
+++ b/world/map/npc/051-3/locks.txt
@@ -1,5 +1,5 @@
-051-3.gat,69,107,0|script|Jail Lock 1|400,{
-
+051-3.gat,69,107,0|script|Jail Lock 1|400,
+{
     if (isin("051-3.gat", 69, 108, 73, 111)) goto L_Do_Lock_Picking;
     end;
 
@@ -17,8 +17,8 @@ L_OpenDoor:
     close;
 }
 
-051-3.gat,64,100,0|script|Jail Lock 2|400,{
-
+051-3.gat,64,100,0|script|Jail Lock 2|400,
+{
     if (isin("051-3.gat", 64, 101, 66, 104)) goto L_Do_Lock_Picking;
     end;
 
@@ -34,8 +34,8 @@ L_OpenDoor:
     close;
 }
 
-051-3.gat,62,100,0|script|Jail Lock 3|400,{
-
+051-3.gat,62,100,0|script|Jail Lock 3|400,
+{
     if (isin("051-3.gat", 61, 101, 62, 104)) goto L_Do_Lock_Picking;
     end;
 
@@ -51,8 +51,8 @@ L_OpenDoor:
     close;
 }
 
-051-3.gat,58,100,0|script|Jail Lock 4|400,{
-
+051-3.gat,58,100,0|script|Jail Lock 4|400,
+{
     if (isin("051-3.gat", 57, 101, 58, 104)) goto L_Do_Lock_Picking;
     end;
 
diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt
index b29a072d..90699b8b 100644
--- a/world/map/npc/051-3/reinforcements.txt
+++ b/world/map/npc/051-3/reinforcements.txt
@@ -1,5 +1,5 @@
-051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3,{
-
+051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3,
+{
     set @step, 2;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_2_progress == 2) goto L_CallReinforcements;
@@ -14,8 +14,8 @@ L_ShouldNotBeHere:
     end;
 }
 
-051-3.gat,37,24,0|script|Door|400,{
-
+051-3.gat,37,24,0|script|Door|400,
+{
     set @step, 2;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     mes "Try open the door?";
@@ -46,18 +46,18 @@ L_Warp:
 OnRnfrcmts:
     set $@illia_level_2_progress, 3;
     // Spawn 20 bandits
-    areamonster "051-3.gat", 29, 25, 48, 39, "", 1064, 18, "Door::onB";
+    areamonster "051-3.gat", 29, 25, 48, 39, "", 1064, 18, "Door::OnB";
     // Spawn 4 bandit lords
-    areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::onB";
+    areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::OnB";
     initnpctimer;
     mapannounce "051-3.gat", "Bandit Lords: Do not let them escape!!" , 0;
-    areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::onDRnfrcmts";
+    areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts";
     end;
 
-onB:
+OnB:
     end;
 
-onDRnfrcmts:
+OnDRnfrcmts:
     message strcharinfo(0), "Oh no, reinforcements! We must kill them all!";
     end;
 
@@ -65,7 +65,7 @@ OnTimer2000:
     setnpctimer 0;
     if ($@illia_level_2_progress != 3 || $@illia_progress != 2)
         end;
-    if (mobcount("051-3.gat", "Door::onB") < 0)
+    if (mobcount("051-3.gat", "Door::OnB") < 0)
         goto L_OpenDoor;
     end;
 
@@ -74,12 +74,12 @@ L_OpenDoor:
     set $@illia_progress, 3;
     callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 900;
-    areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::onKeyFound";
+    areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnKeyFound";
     stopnpctimer;
     setnpctimer 0;
     end;
 
-onKeyFound:
+OnKeyFound:
     message strcharinfo(0), "One of the defeated bandit lords had a door key attached to his belt.";
     end;