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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 22 insertions, 19 deletions

diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index b52dc759..464eee9b 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -8,7 +8,8 @@
 //     2: All spawns are done and the players killed all mobs
 //-----------------------------------------------------------------------------
 
-052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0,{
+052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0,
+{
     set @step, 6;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if (strcharinfo(0) != $@ILLIA_HERO$) end;
@@ -26,10 +27,11 @@ L_StartItemInvoker:
 
 }
 
-052-2.gat,1,1,0|script|#ItemsInvoker|127,{
+052-2.gat,1,1,0|script|#ItemsInvoker|127,
+{
 end;
 
-onInit:
+OnInit:
     setarray $@illia_storage_items, 541, 567, 568, 562;
     setarray $@illia_storage_special_items, 687, 827, 1229;
     // Map coords : x1,y1, x2,y2, ...
@@ -40,10 +42,10 @@ OnCommandStart:
     set $@illia_storage_max_items, 20;
     set $@illia_storage_deviation, (8 + ($Illia_Luvia_Harvest*70)/100)*3;
     initnpctimer;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onStart";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart";
     end;
 
-onStart:
+OnStart:
     message strcharinfo(0), "You feel a strange atmosphere in this room... You sense a strong magic rising from the depth!";
     end;
 
@@ -62,7 +64,7 @@ OnTimer1000:
 OnTimer1500:
     // See the note above.
     enablenpc "#ItemsInvoker";
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onItem";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem";
     misceffect FX_GROUND_SPAWN;
     end;
 
@@ -73,7 +75,7 @@ OnTimer3750:
     set $@item_invoke_index, 0;
     end;
 
-onItem:
+OnItem:
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_ItemSpawn;
     end;
@@ -106,20 +108,20 @@ L_ItemSpawn:
     end;
 
 L_MakeSpecialMonster:
-    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::onDeath";
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onWtf";
+    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     end;
 
 L_MakeMonster:
-    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::onDeath";
+    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::OnDeath";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     set @r, 0;
     end;
 
 L_MakeSpecialItem:
     makeitem $@illia_storage_special_items[rand(getarraysize($@illia_storage_special_items))], rand(2, 4), "052-2.gat", $@item_invoke_x, $@item_invoke_y;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onWow";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     set @r, 0;
     end;
@@ -127,7 +129,7 @@ L_MakeSpecialItem:
 L_CheckMobs:
     if ($@illia_progress != 6)
         goto L_Clear;
-    if (mobcount("052-2.gat", "#ItemsInvoker::onDeath") < 0)
+    if (mobcount("052-2.gat", "#ItemsInvoker::OnDeath") < 0)
         goto L_Stop;
     setnpctimer 0;
     end;
@@ -137,7 +139,7 @@ L_Clear:
     setnpctimer 0;
     set $@illia_storage_deviation, 0;
     set $@illia_storage_max_items, 0;
-    killmonster "052-2.gat", "#ItemsInvoker::onDeath";
+    killmonster "052-2.gat", "#ItemsInvoker::OnDeath";
     end;
 
 L_Stop:
@@ -150,27 +152,28 @@ L_Stop:
     set $@illia_progress, 7;
     callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 1200;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onStop";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop";
     end;
 
-onDeath:
+OnDeath:
     end;
 
-onStop:
+OnStop:
     message strcharinfo(0), "The magic seems to quickly dissipate.";
     end;
 
-onWtf:
+OnWtf:
     message strcharinfo(0), "Look out!";
     end;
 
-onWow:
+OnWow:
     message strcharinfo(0), "Wow, see what appeared!";
     end;
 
 }
 
-052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1,{
+052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1,
+{
     set @step, 6;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_6_progress == 2) goto L_Warp;