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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 12 insertions, 12 deletions

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;