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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 24 insertions, 18 deletions

diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index b50a0273..744a0a2a 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -14,7 +14,8 @@
 //     8: Witch guards defeated. Door is open.
 //-----------------------------------------------------------------------------
 
-052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2,{
+052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2,
+{
     set @step, 5;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_5_progress == 8) goto L_Warp;
@@ -32,7 +33,8 @@ L_ShouldNotBeHere:
 
 }
 
-052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2,{
+052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2,
+{
     set @step, 5;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_5_progress == 0 && strcharinfo(0) == $@ILLIA_HERO$) goto L_StartVoices;
@@ -48,7 +50,8 @@ L_ShouldNotBeHere:
     end;
 }
 
-052-2.gat,1,1,0|script|#LuviaShadow|127,{
+052-2.gat,1,1,0|script|#LuviaShadow|127,
+{
 end;
 
 // Escape sequence
@@ -100,10 +103,11 @@ OnNN:
 
 }
 
-052-2.gat,1,1,0|script|#MysteriousVoice|127,{
+052-2.gat,1,1,0|script|#MysteriousVoice|127,
+{
 end;
 
-onInit:
+OnInit:
     setarray $@illia_lobby_voices$, "Finally.", "I was...", "Waiting...", "For you!";
     end;
 
@@ -145,7 +149,8 @@ L_Continue:
 
 // Dummy npc to display the mysterious voice,
 // as a workaround to fakenpcname causing problems
-052-2.gat,1,1,0|script|?|127,{
+052-2.gat,1,1,0|script|?|127,
+{
 end;
 
 OnCommandTalk:
@@ -154,7 +159,8 @@ OnCommandTalk:
 
 }
 
-052-2.gat,1,1,0|script|Luvia?|371,2,2{
+052-2.gat,1,1,0|script|Luvia?|371,2,2
+{
     if ($@illia_level_5_progress != 3) end;
     if (isin("052-2.gat", 37,36, 41,39)) goto L_HandleTalk;
     // Notify too far
@@ -230,7 +236,7 @@ OnTimer24500:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -240,7 +246,7 @@ OnTimer44000:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -250,7 +256,7 @@ OnTimer77000:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     // That was the last spawn: reset the timer to start the CheckInvoke loop.
     set $@illia_level_5_progress, 5;
@@ -283,7 +289,7 @@ OnTimer18500:
     misceffect FX_EVIL_SUMMON;
     misceffect FX_MAGIC_DARK_EXPLOSION;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::onWGDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::OnWGDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -303,19 +309,19 @@ OnTimer2000:
         end;
     setnpctimer 0;
     // Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them
-    if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2.gat", "Luvia?::onDSDeath") > 20))
+    if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") > 20))
         npctalk "Ahaha! Run... Run!";
-    if ($@illia_level_5_progress == 5 && (mobcount("052-2.gat", "Luvia?::onDSDeath") < 0))
+    if ($@illia_level_5_progress == 5 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") < 0))
         goto L_AllWavesClear;
-    if ($@illia_level_5_progress == 7 && (mobcount("052-2.gat", "Luvia?::onWGDeath") < 0))
+    if ($@illia_level_5_progress == 7 && (mobcount("052-2.gat", "Luvia?::OnWGDeath") < 0))
         goto L_AllWavesClear;
     end;
 
 L_Clear:
     stopnpctimer;
     setnpctimer 0;
-    killmonster "052-2.gat", "Luvia?::onDSDeath";
-    killmonster "052-2.gat", "Luvia?::onWGDeath";
+    killmonster "052-2.gat", "Luvia?::OnDSDeath";
+    killmonster "052-2.gat", "Luvia?::OnWGDeath";
     end;
 
 L_AllWavesClear:
@@ -366,10 +372,10 @@ S_ClearHeroRect:
     set $@illia_lobby_y2, 0;
     return;
 
-onDSDeath:
+OnDSDeath:
     end;
 
-onWGDeath:
+OnWGDeath:
     end;
 
 }