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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 21 insertions, 16 deletions

diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index acba1fdc..edbade40 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -9,7 +9,8 @@
 //     3: Luvia is defeated
 //-----------------------------------------------------------------------------
 
-052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2,{
+052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2,
+{
     set @step, 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_7_progress == 0 && strcharinfo(0) == $@ILLIA_HERO$) goto L_SpawnLuvia;
@@ -28,7 +29,8 @@ L_ShouldNotBeHere:
 
 // A trigger whose only purpose is to place Luvia npcs back in place.
 // (even though the Janitor 7 will have done this job)
-052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1,{
+052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1,
+{
     if (strcharinfo(0) != $@ILLIA_HERO$) end;
     if ($@illia_progress == 7 && $@illia_level_7_progress == 0) goto L_PlaceLuvia;
     end;
@@ -40,7 +42,8 @@ L_PlaceLuvia:
 
 }
 
-052-2.gat,88,15,0|script|Luvia|371,{
+052-2.gat,88,15,0|script|Luvia|371,
+{
     set @step, 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_7_progress == 0 && strcharinfo(0) == $@ILLIA_HERO$) goto L_Start;
@@ -80,7 +83,8 @@ OnTimer15000:
 
 }
 
-052-2.gat,88,15,0|script|#LuviaDaemon|127,{
+052-2.gat,88,15,0|script|#LuviaDaemon|127,
+{
 end;
 
 OnCommandInvoke:
@@ -138,7 +142,7 @@ OnTimer5500:
     enablenpc "#LuviaDaemon";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_CHANNELLING_CAST;
-    monster "052-2.gat", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::onDeath";
+    monster "052-2.gat", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::OnDeath";
     set $@illia_luvia_x, 0;
     set $@illia_luvia_y, 0;
     end;
@@ -178,9 +182,9 @@ S_SpawnWitchGuard:
     npcwarp getx(), gety(), "#LuviaDaemon";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_GROUND_SPAWN;
-    monster "052-2.gat", getx(), gety(), "", 1103, 1, "#LuviaDaemon::onWGD";
+    monster "052-2.gat", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD";
     detachrid;
-    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::onWGS";
+    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS";
     return;
 
 OnTimer30000:
@@ -196,7 +200,7 @@ OnTimer30000:
 L_TriggerTrance:
     set $@illia_level_7_progress, 3;
     set $@illia_luvia_trance_delay, 0;
-    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::onTT";
+    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT";
     setnpctimer 0;
     end;
 
@@ -205,19 +209,19 @@ L_Clear:
     setnpctimer 0;
     end;
 
-onDeath:
+OnDeath:
     stopnpctimer;
     setnpctimer 0;
     if ($@illia_progress != 7)
         end;
     set $@illia_level_7_progress, 4;
-    killmonster "052-2.gat", "#LuviaDaemon::onWGD";
+    killmonster "052-2.gat", "#LuviaDaemon::OnWGD";
     mapannounce "052-2.gat", "Luvia: How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
     set @illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120;
     set BOSS_POINTS, BOSS_POINTS + @illia_bp;
     message strcharinfo(0), "You gain " + @illia_bp + " Boss Points giving you a total of " + BOSS_POINTS + ".";
     set @illia_bp, 0;
-    areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::onW00t";
+    areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t";
 
     set $@illia_progress, 8;
     callfunc "UpdateIlliaProgress";
@@ -245,27 +249,28 @@ onDeath:
 
     end;
 
-onWGD:
+OnWGD:
     end;
 
-onWGS:
+OnWGS:
     if ($@illia_level_7_progress == 2)
         message strcharinfo(0), "One of Luvia's guard spawned from the depths to assist her!";
     end;
 
-onTT:
+OnTT:
     if ($@illia_level_7_progress == 3)
         message strcharinfo(0), "Luvia seems to become in trance!";
     end;
 
-onW00t:
+OnW00t:
     message strcharinfo(0), "You defeated this evil sorceress... But what about her sister now?";
     end;
 
 }
 
 // Warp from the party room, to the chest room
-052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2,{
+052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2,
+{
     set @step, 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_7_progress < 4) end;