initial commit for magic v3

Fix Druid Tree and add hug to TMW

3 files changed, 10 insertions, 10 deletions

diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index efc0a20a..1b36d929 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -337,7 +337,7 @@ L_ChaseLuvia:
     set $@illia_progress, 6;
     callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 360;
-    areatimer "052-2", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN";
+    areatimer 0, "052-2", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN";
     end;
 
 S_GetHeroRect:
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index 02d7a7ac..ec6d2a64 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -182,7 +182,7 @@ S_SpawnWitchGuard:
     misceffect FX_GROUND_SPAWN;
     monster "052-2", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD";
     detachrid;
-    areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS";
+    areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS";
     return;
 
 OnTimer30000:
@@ -198,7 +198,7 @@ OnTimer30000:
 L_TriggerTrance:
     set $@illia_level_7_progress, 3;
     set $@illia_luvia_trance_delay, 0;
-    areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT";
+    areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT";
     setnpctimer 0;
     end;
 
@@ -217,9 +217,9 @@ OnDeath:
     mapannounce "052-2", "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;
-    areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP";
+    areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP";
 
-    areatimer "052-2", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t";
+    areatimer 0, "052-2", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t";
 
     set $@illia_progress, 8;
     callfunc "UpdateIlliaProgress";
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 8abbb732..a8582408 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -42,7 +42,7 @@ OnCommandStart:
     set $@illia_storage_max_items, 20;
     set $@illia_storage_deviation, (8 + ($Illia_Luvia_Harvest*70)/100)*3;
     initnpctimer;
-    areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart";
+    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart";
     end;
 
 OnStart:
@@ -64,7 +64,7 @@ OnTimer1000:
 OnTimer1500:
     // See the note above.
     enablenpc "#ItemsInvoker";
-    areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem";
+    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem";
     misceffect FX_GROUND_SPAWN;
     end;
 
@@ -109,7 +109,7 @@ L_ItemSpawn:
 
 L_MakeSpecialMonster:
     monster "052-2", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath";
-    areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf";
+    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     end;
 
@@ -121,7 +121,7 @@ L_MakeMonster:
 
 L_MakeSpecialItem:
     makeitem $@illia_storage_special_items[rand(getarraysize($@illia_storage_special_items))], rand(2, 4), "052-2", $@item_invoke_x, $@item_invoke_y;
-    areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow";
+    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     set @r, 0;
     end;
@@ -152,7 +152,7 @@ L_Stop:
     set $@illia_progress, 7;
     callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 900;
-    areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop";
+    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop";
     end;
 
 OnDeath: