Merge branch 'mapfix' into 'master'

Mapfix

See merge request themanaworld/evolved/serverdata!2

18 files changed, 65 insertions, 65 deletions

diff --git a/npc/004-5/chest.txt b/npc/004-5/chest.txt
index 0054571e..3a387470 100644
--- a/npc/004-5/chest.txt
+++ b/npc/004-5/chest.txt
@@ -1,4 +1,4 @@
-004-5,89,67,0	script	Old Chest#crastur	NPC111,{
+004-5,99,67,0	script	Old Chest#crastur	NPC111,{
     @npc_distance = 1;
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
diff --git a/npc/011-3/hermit.txt b/npc/011-3/hermit.txt
index 8b1eeb74..8ea9017b 100644
--- a/npc/011-3/hermit.txt
+++ b/npc/011-3/hermit.txt
@@ -1,5 +1,5 @@
 
-011-3,30,23,0	script	Arkim	NPC116,{
+011-3,45,33,0	script	Arkim	NPC116,{
     mes "[Arkim the Hermit]";
     mes "\"Do you want to go back outside?\"";
     if (@knowhermitstory == 1) goto L_Short_Menu;
diff --git a/npc/011-4/bl_barrier.txt b/npc/011-4/bl_barrier.txt
index 4f6512aa..6c76151f 100644
--- a/npc/011-4/bl_barrier.txt
+++ b/npc/011-4/bl_barrier.txt
@@ -1,5 +1,5 @@
 
-011-4,111,121,0	script	#BL_Barrier	NPC45,0,0,{
+011-4,136,141,0	script	#BL_Barrier	NPC45,0,0,{
     @state = ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
 
     if (@state >= 6) goto L_Cave_Abandoned;
diff --git a/npc/012-3/beheader.txt b/npc/012-3/beheader.txt
index f0725754..dd5207ee 100644
--- a/npc/012-3/beheader.txt
+++ b/npc/012-3/beheader.txt
@@ -1,5 +1,5 @@
 
-012-3,450,67,0	script	The Beheader	NPC429,{
+012-3,460,76,0	script	The Beheader	NPC429,{
     if (FLAGS & FLAG_BEHEADER_MASK) goto L_Complete;
     mes "[The Beheader]";
     mes "\"I am The Beheader, known for beheading Terranites.\"";
diff --git a/npc/012-3/mana-seed.txt b/npc/012-3/mana-seed.txt
index ea6dabcf..405b8038 100644
--- a/npc/012-3/mana-seed.txt
+++ b/npc/012-3/mana-seed.txt
@@ -1,4 +1,4 @@
-012-3,62,130,0	script	Forest Mana Seed#_M	NPC166,{
+012-3,72,139,0	script	Forest Mana Seed#_M	NPC166,{
     setarray @exp_bonus,
         0,
         1000, // level 1
diff --git a/npc/012-3/traveler.txt b/npc/012-3/traveler.txt
index be3c89bf..50793fa7 100644
--- a/npc/012-3/traveler.txt
+++ b/npc/012-3/traveler.txt
@@ -1,5 +1,5 @@
 
-012-3,439,62,0	script	Meridith the Traveler	NPC103,{
+012-3,449,71,0	script	Meridith the Traveler	NPC103,{
     @npcname$ = "Meridith";
     @NpcTravelBit = $@terranite_cave_bit;
     callfunc "Traveler";
diff --git a/npc/012-3/warningsigns.txt b/npc/012-3/warningsigns.txt
index 2e63e8a4..082ed2a5 100644
--- a/npc/012-3/warningsigns.txt
+++ b/npc/012-3/warningsigns.txt
@@ -1,5 +1,5 @@
 
-012-3,445,61,0	script	sign#pvp-1	NPC187,{
+012-3,455,70,0	script	sign#pvp-1	NPC187,{
     mes "You are about to enter a dangerous area!";
     next;
     mes "This area has a great distance to town. So the protection spell of the town is not active in that cave!";
@@ -7,7 +7,7 @@
     close;
 }
 
-012-3,451,61,0	script	sign#pvp-2	NPC186,{
+012-3,461,70,0	script	sign#pvp-2	NPC186,{
     mes "You are about to enter a dangerous area!";
     next;
     mes "This area has a great distance to town. So the protection spell of the town is not active in that cave!";
diff --git a/npc/020-2/baktar.txt b/npc/020-2/baktar.txt
index a3bc5cc8..a7f5c367 100644
--- a/npc/020-2/baktar.txt
+++ b/npc/020-2/baktar.txt
@@ -1,4 +1,4 @@
-020-2,70,61,0	script	Baktar	NPC191,{
+020-2,80,61,0	script	Baktar	NPC191,{
     @npcname$ = "[Baktar]";
 
     @BIT_KNOWHIM = 0;
diff --git a/npc/020-2/banker.txt b/npc/020-2/banker.txt
index 9a1ddcc8..69f5a48f 100644
--- a/npc/020-2/banker.txt
+++ b/npc/020-2/banker.txt
@@ -1,4 +1,4 @@
-020-2,122,64,0	script	Ben	NPC193,{
+020-2,132,64,0	script	Ben	NPC193,{
     @npcname$ = "Ben";
     callfunc "Banker";
     close;
diff --git a/npc/020-2/furquest.txt b/npc/020-2/furquest.txt
index 23847336..6cae2f62 100644
--- a/npc/020-2/furquest.txt
+++ b/npc/020-2/furquest.txt
@@ -1,5 +1,5 @@
 
-020-2,24,26,0	script	Agostine Debug	NPC137,{
+020-2,34,26,0	script	Agostine Debug	NPC137,{
     mes "[Agostine Debug]";
     mes "What do you want to do?";
     menu
@@ -34,7 +34,7 @@ OnInit:
         disablenpc "Agostine Debug";
     end;
 }
-020-2,27,26,0	script	Agostine	NPC137,{
+020-2,37,26,0	script	Agostine	NPC137,{
     @CUTFUR_EXP = 10;
     @FINEDRESS_COTTON_CLOTHS = 20;
     @FINEDRESS_GP = 20000;
diff --git a/npc/020-2/shops.txt b/npc/020-2/shops.txt
index 74a8315d..b7dc3ec7 100644
--- a/npc/020-2/shops.txt
+++ b/npc/020-2/shops.txt
@@ -1,5 +1,5 @@
 
-020-2,75,28,0	script	Taylor	NPC137,{
+020-2,85,28,0	script	Taylor	NPC137,{
     mes "[Taylor]";
     mes "\"While it can be dangerous up here in Kaizei, I take comfort that Nivalis is not surrounded by the Yeti like Thermin is. What a weird town.\"";
     next;
@@ -10,7 +10,7 @@
     mes "\"Well, pleasant journeys and I hope I haven't been too much of a bother. Good chatting with you.\"";
     close;
 }
-020-2,25,65,0	script	Bracco	NPC135,{
+020-2,35,65,0	script	Bracco	NPC135,{
     shop .name$;
     goodbye;
     close;
@@ -25,7 +25,7 @@ OnInit:
     end;
 }
 
-020-2,75,24,0	script	Mede	NPC103,{
+020-2,85,24,0	script	Mede	NPC103,{
     shop .name$;
     goodbye;
     close;
@@ -43,7 +43,7 @@ OnInit:
     end;
 }
 
-020-2,111,23,0	script	Kane	NPC120,{
+020-2,137,23,0	script	Kane	NPC120,{
     @npcname$ = "Kane the Inn Keeper";
     @Cost = 100;
 
diff --git a/npc/027-3/casket_traps.txt b/npc/027-3/casket_traps.txt
index f98f7674..206258ba 100644
--- a/npc/027-3/casket_traps.txt
+++ b/npc/027-3/casket_traps.txt
@@ -1,4 +1,4 @@
-027-3,32,96,0	script	#casket1	NPC127,1,1,{
+027-3,42,96,0	script	#casket1	NPC127,1,1,{
     end;
 
 OnTouch:
@@ -7,7 +7,7 @@ OnTouch:
     specialeffect 302;
     end;
 }
-027-3,38,86,0	script	#casket2	NPC127,1,1,{
+027-3,48,86,0	script	#casket2	NPC127,1,1,{
     end;
 
 OnTouch:
@@ -16,7 +16,7 @@ OnTouch:
     specialeffect 302;
     end;
 }
-027-3,46,76,0	script	#casket3	NPC127,1,1,{
+027-3,56,76,0	script	#casket3	NPC127,1,1,{
     end;
 
 OnTouch:
@@ -25,7 +25,7 @@ OnTouch:
     specialeffect 302;
     end;
 }
-027-3,38,57,0	script	#casket4	NPC127,1,1,{
+027-3,48,57,0	script	#casket4	NPC127,1,1,{
     end;
 
 OnTouch:
@@ -34,7 +34,7 @@ OnTouch:
     specialeffect 302;
     end;
 }
-027-3,22,44,0	script	#casket5	NPC127,1,1,{
+027-3,32,44,0	script	#casket5	NPC127,1,1,{
     end;
 
 OnTouch:
@@ -43,7 +43,7 @@ OnTouch:
     specialeffect 302;
     end;
 }
-027-3,48,43,0	script	#casket6	NPC127,1,1,{
+027-3,58,43,0	script	#casket6	NPC127,1,1,{
     end;
 
 OnTouch:
@@ -52,7 +52,7 @@ OnTouch:
     specialeffect 302;
     end;
 }
-027-3,86,30,0	script	#casket7	NPC127,1,1,{
+027-3,96,30,0	script	#casket7	NPC127,1,1,{
     end;
 
 OnTouch:
@@ -61,7 +61,7 @@ OnTouch:
     specialeffect 302;
     end;
 }
-027-3,108,45,0	script	#casket8	NPC127,1,1,{
+027-3,118,45,0	script	#casket8	NPC127,1,1,{
     end;
 
 OnTouch:
diff --git a/npc/027-3/general_krukan_door.txt b/npc/027-3/general_krukan_door.txt
index 7a86e971..995c6f60 100644
--- a/npc/027-3/general_krukan_door.txt
+++ b/npc/027-3/general_krukan_door.txt
@@ -1,5 +1,5 @@
 
-027-3,82,88,0	script	#GeneralDoor1	NPC45,1,0,{
+027-3,92,88,0	script	#GeneralDoor1	NPC45,1,0,{
     if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT1 != 0) )
         goto L_NoKeys;
 
diff --git a/npc/052-2/chest.txt b/npc/052-2/chest.txt
index ff632e1f..b1ed28cf 100644
--- a/npc/052-2/chest.txt
+++ b/npc/052-2/chest.txt
@@ -1,5 +1,5 @@
 
-052-2,136,73,0	script	Chest#illia	NPC111,{
+052-2,146,83,0	script	Chest#illia	NPC111,{
     @step = 8;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if (@illia_got_rewards > 2) end;
diff --git a/npc/052-2/janitor.txt b/npc/052-2/janitor.txt
index aedecb61..7583f4e4 100644
--- a/npc/052-2/janitor.txt
+++ b/npc/052-2/janitor.txt
@@ -25,8 +25,8 @@ end;
 OnCommandClean:
     killmonster "052-2", "#LuviaDaemon::OnDeath";
     killmonster "052-2", "#LuviaDaemon::OnWGD";
-    npcwarp 83, 28, "#LuviaDaemon";
-    npcwarp 88, 15, "Luvia";
+    npcwarp 93, 38, "#LuviaDaemon";
+    npcwarp 98, 25, "Luvia";
     end;
 
 }
diff --git a/npc/052-2/lobby.txt b/npc/052-2/lobby.txt
index 48fdac03..047fd903 100644
--- a/npc/052-2/lobby.txt
+++ b/npc/052-2/lobby.txt
@@ -1,5 +1,5 @@
 
-052-2,40,19,0	script	#InnDoorTrigger	NPC32767,2,2,{
+052-2,50,29,0	script	#InnDoorTrigger	NPC32767,2,2,{
     @step = 5;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_5_progress == 8) goto L_Warp;
@@ -7,7 +7,7 @@
     end;
 
 L_Warp:
-    warp "052-2", 23, 71;
+    warp "052-2", 33, 81;
     message strcharinfo(0), "This place is full of dust... *coughs*";
     end;
 
@@ -17,7 +17,7 @@ L_ShouldNotBeHere:
 
 }
 
-052-2,33,40,0	script	#EntranceTrigger	NPC32767,4,2,{
+052-2,43,50,0	script	#EntranceTrigger	NPC32767,4,2,{
     @step = 5;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_5_progress == 0 && strcharinfo(0) == $@iLLIA_HERO$) goto L_StartVoices;
@@ -43,7 +43,7 @@ OnCommandEscape:
 OnTimer100:
     if ($@illia_level_5_progress != 7)
         end;
-    npcwarp 39, 35, "#LuviaShadow";
+    npcwarp 49, 45, "#LuviaShadow";
     misceffect FX_DARK_TELEPORT;
     npcwarp 1, 1, "Luvia?";
     end;
@@ -63,7 +63,7 @@ OnCommandInvoke:
 OnTimer650:
     if ($@illia_level_5_progress != 2)
         end;
-    npcwarp 39, 35, "#LuviaShadow";
+    npcwarp 49, 45, "#LuviaShadow";
     misceffect FX_EVIL_SUMMON;
     end;
 
@@ -71,7 +71,7 @@ OnTimer1500:
     if ($@illia_level_5_progress != 2)
         end;
     npcwarp 1, 1, "#LuviaShadow";
-    npcwarp 39, 35, "Luvia?";
+    npcwarp 49, 45, "Luvia?";
     $@illia_level_5_progress = 3;
     stopnpctimer;
     setnpctimer 0;
@@ -98,7 +98,7 @@ OnCommandStart:
 OnTimer2000:
     if ($@illia_level_5_progress != 1)
         end;
-    npcwarp rand(30,42), rand(32,38), "?";
+    npcwarp rand(40,52), rand(42,48), "?";
     donpcevent "?::OnCommandTalk";
     end;
 
@@ -136,7 +136,7 @@ OnCommandTalk:
 
 052-2,1,1,0	script	Luvia?	NPC371,2,2,{
     if ($@illia_level_5_progress != 3) end;
-    if (isin("052-2", 37,36, 41,39)) goto L_HandleTalk;
+    if (isin("052-2", 47,46, 51,49)) goto L_HandleTalk;
     // Notify too far
     mes "You see a strange and frightening, yet beautiful woman.";
     if (strcharinfo(0) == $@iLLIA_HERO$)
@@ -307,13 +307,13 @@ L_ChaseLuvia:
     $@illia_progress = 6;
     callfunc "UpdateIlliaProgress";
     $@illia_max_time = $@illia_max_time + 360;
-    areatimer 0, "052-2", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN";
+    areatimer 0, "052-2", 29, 28, 58, 53, 2000, "#LuviaShadow::OnNN";
     end;
 
 S_GetHeroRect:
     if (!(attachrid($@iLLIA_HERO_ID)))
         goto L_Clear;
-    if(!(isin("052-2", 20, 21, 47, 43)))
+    if(!(isin("052-2", 30, 31, 57, 53)))
         goto L_Clear;
 
     $@illia_lobby_x = getx();
@@ -324,12 +324,12 @@ S_GetHeroRect:
     $@illia_lobby_x2 = $@illia_lobby_x + 12;
     $@illia_lobby_y2 = $@illia_lobby_y + 8;
 
-    if ($@illia_lobby_x1 < 20)
-        $@illia_lobby_x1 = 20;
+    if ($@illia_lobby_x1 < 30)
+        $@illia_lobby_x1 = 30;
     if ($@illia_lobby_y1 < 19)
         $@illia_lobby_y1 = 19;
-    if ($@illia_lobby_x2 > 47)
-        $@illia_lobby_x2 = 47;
+    if ($@illia_lobby_x2 > 57)
+        $@illia_lobby_x2 = 57;
     if ($@illia_lobby_y2 > 42)
         $@illia_lobby_y2 = 42;
 
@@ -337,9 +337,9 @@ S_GetHeroRect:
     return;
 
 S_ClearHeroRect:
-    $@illia_lobby_x1 = 20;
+    $@illia_lobby_x1 = 30;
     $@illia_lobby_y1 = 19;
-    $@illia_lobby_x2 = 47;
+    $@illia_lobby_x2 = 57;
     $@illia_lobby_y2 = 42;
     return;
 
diff --git a/npc/052-2/partyroom.txt b/npc/052-2/partyroom.txt
index 55c9bcdb..399c690d 100644
--- a/npc/052-2/partyroom.txt
+++ b/npc/052-2/partyroom.txt
@@ -1,5 +1,5 @@
 
-052-2,88,19,0	script	#TriggerDialog	NPC32767,3,2,{
+052-2,98,29,0	script	#TriggerDialog	NPC32767,3,2,{
     @step = 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_7_progress == 0 && strcharinfo(0) == $@iLLIA_HERO$) goto L_SpawnLuvia;
@@ -16,19 +16,19 @@ L_ShouldNotBeHere:
 
 }
 
-052-2,77,48,0	script	#TriggerPlaceLuvia	NPC32767,1,1,{
+052-2,87,58,0	script	#TriggerPlaceLuvia	NPC32767,1,1,{
     if (strcharinfo(0) != $@iLLIA_HERO$) end;
     if ($@illia_progress == 7 && $@illia_level_7_progress == 0) goto L_PlaceLuvia;
     end;
 
 L_PlaceLuvia:
-    npcwarp 88, 15, "#LuviaDaemon";
-    npcwarp 88, 15, "Luvia";
+    npcwarp 98, 25, "#LuviaDaemon";
+    npcwarp 98, 25, "Luvia";
     end;
 
 }
 
-052-2,88,15,0	script	Luvia	NPC371,{
+052-2,98,25,0	script	Luvia	NPC371,{
     @step = 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_7_progress == 0 && strcharinfo(0) == $@iLLIA_HERO$) goto L_Start;
@@ -68,7 +68,7 @@ OnTimer15000:
 
 }
 
-052-2,88,15,0	script	#LuviaDaemon	NPC32767,{
+052-2,98,25,0	script	#LuviaDaemon	NPC32767,{
 end;
 
 OnCommandInvoke:
@@ -165,7 +165,7 @@ S_SpawnWitchGuard:
     misceffect FX_GROUND_SPAWN;
     monster "052-2", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD";
     detachrid;
-    areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS";
+    areatimer 0, "052-2", 83, 21, 125, 59, 0, "#LuviaDaemon::OnWGS";
     return;
 
 OnTimer30000:
@@ -181,7 +181,7 @@ OnTimer30000:
 L_TriggerTrance:
     $@illia_level_7_progress = 3;
     $@illia_luvia_trance_delay = 0;
-    areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT";
+    areatimer 0, "052-2", 83, 21, 125, 59, 0, "#LuviaDaemon::OnTT";
     setnpctimer 0;
     end;
 
@@ -200,9 +200,9 @@ OnDeath:
     mapannounce "052-2", "Luvia : How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@iLLIA_HERO$ + "!!", 0;
 
     $@illia_bp = $Illia_Luvia_Harvest * 16 / 10 + 120;
-    areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP";
+    areatimer 0, "052-2", 83, 21, 125, 59, 0, "#LuviaDaemon::OnBP";
 
-    areatimer 0, "052-2", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t";
+    areatimer 0, "052-2", 83, 21, 125, 59, 2000, "#LuviaDaemon::OnW00t";
 
     $@illia_progress = 8;
     callfunc "UpdateIlliaProgress";
@@ -254,11 +254,11 @@ OnW00t:
 
 }
 
-052-2,88,12,0	script	#ToLuviaRoomDoor	NPC32767,1,2,{
+052-2,98,22,0	script	#ToLuviaRoomDoor	NPC32767,1,2,{
     @step = 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_7_progress < 4) end;
-    warp "052-2", 133, 84;
+    warp "052-2", 143, 94;
     end;
 
 L_ShouldNotBeHere:
diff --git a/npc/052-2/storage.txt b/npc/052-2/storage.txt
index 97e675f5..ae1656e3 100644
--- a/npc/052-2/storage.txt
+++ b/npc/052-2/storage.txt
@@ -1,5 +1,5 @@
 
-052-2,23,69,0	script	#TriggerItemsInvoker	NPC32767,1,0,{
+052-2,33,79,0	script	#TriggerItemsInvoker	NPC32767,1,0,{
     @step = 6;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if (strcharinfo(0) != $@iLLIA_HERO$) end;
@@ -24,14 +24,14 @@ OnInit:
     setarray $@illia_storage_items, 541, 567, 568, 562;
     setarray $@illia_storage_special_items, 687, 827, 1229;
     // Map coords:* x1,y1, x2,y2, ...
-    setarray $@illia_storage_item_points, 20,67, 22,75, 27,71, 30,73, 34,76, 30,64, 34,65, 34,62, 21,61, 22,64;
+    setarray $@illia_storage_item_points, 30,77, 32,85, 37,81, 40,83, 44,86, 40,74, 44,75, 44,72, 31,71, 32,74;
     end;
 
 OnCommandStart:
     $@illia_storage_max_items = 20;
     $@illia_storage_deviation = (8 + ($Illia_Luvia_Harvest*70)/100)*3;
     initnpctimer;
-    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart";
+    areatimer 0, "052-2", 29, 70, 45, 88, 10, "#ItemsInvoker::OnStart";
     end;
 
 OnStart:
@@ -53,7 +53,7 @@ OnTimer1000:
 OnTimer1500:
     // See the note above.
     enablenpc "#ItemsInvoker";
-    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem";
+    areatimer 0, "052-2", 29, 70, 45, 88, 10, "#ItemsInvoker::OnItem";
     misceffect FX_GROUND_SPAWN;
     end;
 
@@ -98,7 +98,7 @@ L_ItemSpawn:
 
 L_MakeSpecialMonster:
     monster "052-2", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath";
-    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf";
+    areatimer 0, "052-2", 29, 70, 45, 88, 10, "#ItemsInvoker::OnWtf";
     $@illia_storage_max_items = $@illia_storage_max_items - 1;
     end;
 
@@ -110,7 +110,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 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow";
+    areatimer 0, "052-2", 29, 70, 45, 88, 10, "#ItemsInvoker::OnWow";
     $@illia_storage_max_items = $@illia_storage_max_items - 1;
     @r = 0;
     end;
@@ -141,7 +141,7 @@ L_Stop:
     $@illia_progress = 7;
     callfunc "UpdateIlliaProgress";
     $@illia_max_time = $@illia_max_time + 900;
-    areatimer 0, "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop";
+    areatimer 0, "052-2", 29, 70, 45, 88, 10, "#ItemsInvoker::OnStop";
     end;
 
 OnDeath:
@@ -161,7 +161,7 @@ OnWow:
 
 }
 
-052-2,35,68,0	script	#ToPartyRoom	NPC32767,1,1,{
+052-2,45,78,0	script	#ToPartyRoom	NPC32767,1,1,{
     @step = 6;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
     if ($@illia_level_6_progress == 2) goto L_Warp;
@@ -169,7 +169,7 @@ OnWow:
     end;
 
 L_Warp:
-    warp "052-2", 73, 48;
+    warp "052-2", 83, 58;
     end;
 
 L_ShouldNotBeHere: