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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 13 insertions, 13 deletions

diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index d42cea48..f1c9872e 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -12,8 +12,8 @@
 //     3: player choosed to leave the room
 //-----------------------------------------------------------------------------
 
-052-2.gat,136,73,0|script|Chest|111,{
-
+052-2.gat,136,73,0|script|Chest|111,
+{
     set @step, 8;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if (@illia_got_rewards > 2) end;
@@ -29,7 +29,7 @@ L_ShouldNotBeHere:
     percentheal -100, 0;
     end;
 
-onInit:
+OnInit:
     setarray $@illia_item_common_rewards, 601, 636, 637, 638, 639, 625, 626, 658, 571, 579, 876, 782, 545, 758, 4028, 602, 536, 720, 532, 570, 642;
     setarray $@illia_item_unique_rewards, 877, 878, 879, 880;
     end;
@@ -139,30 +139,30 @@ L_PrepareLeaving:
 L_Leave:
     set @illia_got_rewards, 3;
     set @illia_current_num_rewards, 0;
-    addtimer 1000, "Chest::onMsg1";
-    addtimer 4000, "Chest::onMsg2";
-    addtimer 7000, "Chest::onMsg3";
-    addtimer 9000, "Chest::onFx";
-    addtimer 10000, "Chest::onRing";
+    addtimer 1000, "Chest::OnMsg1";
+    addtimer 4000, "Chest::OnMsg2";
+    addtimer 7000, "Chest::OnMsg3";
+    addtimer 9000, "Chest::OnFx";
+    addtimer 10000, "Chest::OnRing";
     close;
 
-onMsg1:
+OnMsg1:
     message strcharinfo(0), "At the moment you are wearing the ring, you start to feel dizzy...";
     end;
 
-onMsg2:
+OnMsg2:
     message strcharinfo(0), "Who is Luvia? Something isn't right... It looks like your memory is rewritten.";
     end;
 
-onMsg3:
+OnMsg3:
     message strcharinfo(0), "Damn, this ring! That Valia! Someone...";
     end;
 
-onFx:
+OnFx:
     misceffect FX_MAGIC_BLUE_TELEPORT, strcharinfo(0);
     end;
 
-onRing:
+OnRing:
     warp "007-1.gat", 85 + rand(0,2), 75 + rand(0,2);
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_ScheduleEnd;