Merge pull request #440 from wushin/move-valia

Move Valia to safe location

14 files changed, 51 insertions, 30 deletions

diff --git a/world/map/data/007-2.wlk b/world/map/data/007-2.wlk
new file mode 100644
index 00000000..57ccb981
--- /dev/null
+++ b/world/map/data/007-2.wlk
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index 1061431a..c303fb65 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -14,6 +14,7 @@
 006-2#006-2.wlk#
 006-3#006-3.wlk#
 007-1#007-1.wlk#
+007-2#007-2.wlk#
 008-1#008-1.wlk#
 009-1#009-1.wlk#
 009-2#009-2.wlk#
diff --git a/world/map/npc/007-1/_import.txt b/world/map/npc/007-1/_import.txt
index 181fd7ca..eca15081 100644
--- a/world/map/npc/007-1/_import.txt
+++ b/world/map/npc/007-1/_import.txt
@@ -5,4 +5,3 @@ npc: npc/007-1/_mobs.txt
 npc: npc/007-1/_warps.txt
 npc: npc/007-1/mapflags.txt
 npc: npc/007-1/voltain.txt
-npc: npc/007-1/witch.txt
diff --git a/world/map/npc/007-1/_warps.txt b/world/map/npc/007-1/_warps.txt
index a4e1e697..236737c1 100644
--- a/world/map/npc/007-1/_warps.txt
+++ b/world/map/npc/007-1/_warps.txt
@@ -4,3 +4,4 @@
 007-1,20,54|warp|-1,0,010-1,130,53
 007-1,69,21|warp|2,-1,008-1,78,101
 007-1,122,20|warp|1,-1,008-1,132,98
+007-1,73,76|warp|-1,-1,007-2,34,34
diff --git a/world/map/npc/007-2/_import.txt b/world/map/npc/007-2/_import.txt
new file mode 100644
index 00000000..bce6eb02
--- /dev/null
+++ b/world/map/npc/007-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 007-2: Illia forsaken inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 007-2
+npc: npc/007-2/_mobs.txt
+npc: npc/007-2/_warps.txt
+npc: npc/007-2/witch.txt
diff --git a/world/map/npc/007-2/_mobs.txt b/world/map/npc/007-2/_mobs.txt
new file mode 100644
index 00000000..ca392cc6
--- /dev/null
+++ b/world/map/npc/007-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Illia forsaken inn mobs
+
+
+
+007-2,0,0,0|script|Mob007-2|32767
+{
+    end;
+}
diff --git a/world/map/npc/007-2/_warps.txt b/world/map/npc/007-2/_warps.txt
new file mode 100644
index 00000000..66c10abd
--- /dev/null
+++ b/world/map/npc/007-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Illia forsaken inn warps
+
+007-2,34,35|warp|-1,-1,007-1,73,77
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-2/witch.txt
index b8cb3850..557b5f62 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-2/witch.txt
@@ -14,7 +14,7 @@
 //    254: Quest is being ended and cleaned: the hero logged off.
 //    255: Quest is being ended and cleaned: the hero died or he ran out of time
 
-007-1,77,81,0|script|Valia|370
+007-2,36,23,0|script|Valia|370
 {
     set @illia_sapphire_powder, 3;
     set @illia_amethyst_powder, 1;
@@ -402,22 +402,22 @@ L_AskToTeleport:
     // $@ILLIA_HERO$ $@ILLIA_HELPER1$ $@ILLIA_HELPER2$ $@ILLIA_HELPER3$
     if (!(attachrid(getcharid(3,$@ILLIA_HELPER1$))))
         goto L_NotEveryoneHere;
-    if (!(isin("007-1", 66, 73, 92, 88)))
+    if (!(isin("007-2", 0, 0, 57, 55)))
         goto L_NotEveryoneHere;
     detachrid;
     if (!(attachrid(getcharid(3,$@ILLIA_HELPER2$))))
         goto L_NotEveryoneHere;
-    if (!(isin("007-1", 66, 73, 92, 88)))
+    if (!(isin("007-2", 0, 0, 57, 55)))
         goto L_NotEveryoneHere;
     detachrid;
     if (!(attachrid(getcharid(3,$@ILLIA_HELPER3$))))
         goto L_NotEveryoneHere;
-    if (!(isin("007-1", 66, 73, 92, 88)))
+    if (!(isin("007-2", 0, 0, 57, 55)))
         goto L_NotEveryoneHere;
     detachrid;
     if (!(attachrid(getcharid(3,$@ILLIA_HERO$))))
         goto L_NotEveryoneHere;
-    if (!(isin("007-1", 66, 73, 92, 88)))
+    if (!(isin("007-2", 0, 0, 57, 55)))
         goto L_NotEveryoneHere;
     mes "[Valia]";
     mes "\"Everyone seems to be here. Make sure to stay close to me.\"";
@@ -639,10 +639,10 @@ OnTimer34000:
         end;
     // Trigger 4 areatimers to show the teleport spell
     // This is better looking than a basic areawarp
-    areatimer "007-1", 66, 73, 92, 88, 3000, "Valia::OnWarpHero";
-    areatimer "007-1", 66, 73, 92, 88, 3500, "Valia::OnWarpHelper1";
-    areatimer "007-1", 66, 73, 92, 88, 4000, "Valia::OnWarpHelper2";
-    areatimer "007-1", 66, 73, 92, 88, 4500, "Valia::OnWarpHelper3";
+    areatimer "007-2", 0, 0, 57, 55, 3000, "Valia::OnWarpHero";
+    areatimer "007-2", 0, 0, 57, 55, 3500, "Valia::OnWarpHelper1";
+    areatimer "007-2", 0, 0, 57, 55, 4000, "Valia::OnWarpHelper2";
+    areatimer "007-2", 0, 0, 57, 55, 4500, "Valia::OnWarpHelper3";
     npctalk strnpcinfo(0), "Spiralis Major!";
     misceffect FX_BLUE_MAGIC_CAST;
     end;
@@ -686,7 +686,7 @@ L_KillHero:
 
 }
 
-007-1,128,100,0|script|#IlliaDaemon|32767
+007-2,57,55,0|script|#IlliaDaemon|32767
 {
 end;
 
@@ -837,7 +837,7 @@ L_DoWarpHelper:
     // At this point, the player has been attached
     if ($@illia_progress >= 5)
         message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right.";
-    warp "007-1",85 + rand(0,2),75 + rand(0,2);
+    warp "007-2",31 + rand(0,2),23 + rand(0,2);
     detachrid;
     goto L_NextHelperToWarp;
 
@@ -892,7 +892,7 @@ L_WarpHero:
     // At this point, the player has been attached
     if ($@illia_progress >= 5)
         message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right.";
-    warp "007-1",85 + rand(0,2),75 + rand(0,2);
+    warp "007-2",31 + rand(0,2),23 + rand(0,2);
     detachrid;
     end;
 
@@ -981,42 +981,42 @@ L_Torch1:
     return;
 }
 
-007-1,72,88,0|script|#IlliaTorch1|374
+007-2,29,22,0|script|#IlliaTorch1|374
 {
 end;
 }
 
-007-1,71,85,0|script|#IlliaTorch2|374
+007-2,30,21,0|script|#IlliaTorch2|374
 {
 end;
 }
 
-007-1,75,70,0|script|#IlliaTorch3|374
+007-2,33,24,0|script|#IlliaTorch3|374
 {
 end;
 }
 
-007-1,85,71,0|script|#IlliaTorch4|374
+007-2,32,25,0|script|#IlliaTorch4|374
 {
 end;
 }
 
-007-1,88,69,0|script|#IlliaTorch5|374
+007-2,32,21,0|script|#IlliaTorch5|374
 {
 end;
 }
 
-007-1,86,68,0|script|#IlliaTorch6|374
+007-2,33,22,0|script|#IlliaTorch6|374
 {
 end;
 }
 
-007-1,87,68,0|script|#IlliaTorch7|374
+007-2,29,24,0|script|#IlliaTorch7|374
 {
 end;
 }
 
-007-1,88,67,0|script|#IlliaTorch8|374
+007-2,30,25,0|script|#IlliaTorch8|374
 {
 end;
 }
diff --git a/world/map/npc/051-1/mapflags.txt b/world/map/npc/051-1/mapflags.txt
index a75ad03b..ddac528a 100644
--- a/world/map/npc/051-1/mapflags.txt
+++ b/world/map/npc/051-1/mapflags.txt
@@ -1,2 +1,2 @@
-051-1|mapflag|nosave|007-1,86,76
-051-1|mapflag|resave|007-1,86,76
+051-1|mapflag|nosave|007-2,36,23
+051-1|mapflag|resave|007-2,36,23
diff --git a/world/map/npc/051-3/mapflags.txt b/world/map/npc/051-3/mapflags.txt
index 19836e59..3615db4b 100644
--- a/world/map/npc/051-3/mapflags.txt
+++ b/world/map/npc/051-3/mapflags.txt
@@ -1,2 +1,2 @@
-051-3|mapflag|nosave|007-1,86,76
-051-3|mapflag|resave|007-1,86,76
+051-3|mapflag|nosave|007-2,36,23
+051-3|mapflag|resave|007-2,36,23
diff --git a/world/map/npc/052-1/mapflags.txt b/world/map/npc/052-1/mapflags.txt
index 1813a7cd..c937dc79 100644
--- a/world/map/npc/052-1/mapflags.txt
+++ b/world/map/npc/052-1/mapflags.txt
@@ -1,2 +1,2 @@
-052-1|mapflag|nosave|007-1,86,76
-052-1|mapflag|resave|007-1,86,76
+052-1|mapflag|nosave|007-2,36,23
+052-1|mapflag|resave|007-2,36,23
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index 2012e0a8..12752e80 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -164,7 +164,7 @@ OnFx:
     end;
 
 OnRing:
-    warp "007-1", 85 + rand(0,2), 75 + rand(0,2);
+    warp "007-2",31 + rand(0,2),23 + rand(0,2);
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_ScheduleEnd;
     end;
diff --git a/world/map/npc/052-2/mapflags.txt b/world/map/npc/052-2/mapflags.txt
index efccaddd..3fe6852b 100644
--- a/world/map/npc/052-2/mapflags.txt
+++ b/world/map/npc/052-2/mapflags.txt
@@ -1,2 +1,2 @@
-052-2|mapflag|nosave|007-1,86,76
-052-2|mapflag|resave|007-1,86,76
+052-2|mapflag|nosave|007-2,36,23
+052-2|mapflag|resave|007-2,36,23
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 67f7d664..a0c07173 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -16,6 +16,7 @@ import: npc/006-1/_import.txt
 import: npc/006-2/_import.txt
 import: npc/006-3/_import.txt
 import: npc/007-1/_import.txt
+import: npc/007-2/_import.txt
 import: npc/008-1/_import.txt
 import: npc/009-1/_import.txt
 import: npc/009-2/_import.txt