setting miriam to a new map 032-1

That map is reachable when you go west of pachua through that little cave.

15 files changed, 38 insertions, 4 deletions

diff --git a/data/006-1.wlk b/data/006-1.wlk
index 49ddb542..680b6096 100644
--- a/data/006-1.wlk
+++ b/data/006-1.wlk
diff --git a/data/032-1.wlk b/data/032-1.wlk
new file mode 100644
index 00000000..007631fd
--- /dev/null
+++ b/data/032-1.wlk
diff --git a/data/032-3.wlk b/data/032-3.wlk
new file mode 100644
index 00000000..235ddaa1
--- /dev/null
+++ b/data/032-3.wlk
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 6a1efd92..cd3404e8 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -68,4 +68,7 @@
 031-1.gat#031-1.wlk#
 031-2.gat#031-2.wlk#
 031-3.gat#031-3.wlk#
+032-1.gat#032-1.wlk#
+032-3.gat#032-3.wlk#
+
 botcheck.gat#botcheck.wlk#
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
index 724fb642..4b1bddea 100644
--- a/npc/006-1_Desert_mountains/_import.txt
+++ b/npc/006-1_Desert_mountains/_import.txt
@@ -2,5 +2,4 @@ map: 006-1.gat
 npc: npc/006-1_Desert_mountains/_mobs.txt
 npc: npc/006-1_Desert_mountains/_warps.txt
 npc: npc/006-1_Desert_mountains/mika.txt
-npc: npc/006-1_Desert_mountains/miriam.txt
 npc: npc/006-1_Desert_mountains/pachua.txt
diff --git a/npc/006-1_Desert_mountains/_warps.txt b/npc/006-1_Desert_mountains/_warps.txt
index 823e937e..32d267e7 100644
--- a/npc/006-1_Desert_mountains/_warps.txt
+++ b/npc/006-1_Desert_mountains/_warps.txt
@@ -32,3 +32,4 @@
 006-1.gat,38,121	warp	ToCave	-1,-1,006-3.gat,38,122
 006-1.gat,74,90	warp	ToCave	-1,-1,006-3.gat,74,91
 006-1.gat,51,90	warp	ToCave	-1,-1,006-3.gat,51,91
+006-1.gat,30,123	warp	ToCave	-1,-1,032-3.gat,128,31
diff --git a/npc/016-1_Woodland/_import.txt b/npc/016-1_Woodland/_import.txt
index 29ac9eff..cab6a4ac 100644
--- a/npc/016-1_Woodland/_import.txt
+++ b/npc/016-1_Woodland/_import.txt
@@ -1,5 +1,5 @@
 map: 016-1.gat
 npc: npc/016-1_Woodland/_mobs.txt
 npc: npc/016-1_Woodland/_warps.txt
-npc: npc/016-1_Woodland/monsters.txt
 npc: npc/016-1_Woodland/gwendolyn.txt
+npc: npc/016-1_Woodland/monsters.txt
diff --git a/npc/032-1_Outback/_import.txt b/npc/032-1_Outback/_import.txt
new file mode 100644
index 00000000..ee0758e4
--- /dev/null
+++ b/npc/032-1_Outback/_import.txt
@@ -0,0 +1,4 @@
+map: 032-1.gat
+npc: npc/032-1_Outback/_mobs.txt
+npc: npc/032-1_Outback/_warps.txt
+npc: npc/032-1_Outback/miriam.txt
diff --git a/npc/032-1_Outback/_mobs.txt b/npc/032-1_Outback/_mobs.txt
new file mode 100644
index 00000000..e24c0fde
--- /dev/null
+++ b/npc/032-1_Outback/_mobs.txt
@@ -0,0 +1,7 @@
+// 032-1 Outback mobs
+
+
+
+032-1.gat,0,0,0	script	Mob032-1	-1,{
+	end;
+}
diff --git a/npc/032-1_Outback/_warps.txt b/npc/032-1_Outback/_warps.txt
new file mode 100644
index 00000000..254b8738
--- /dev/null
+++ b/npc/032-1_Outback/_warps.txt
@@ -0,0 +1,3 @@
+// 032-1 Outback warps
+
+032-1.gat,64,52	warp	ToCave	-1,-1,031-3.gat,56,59
diff --git a/npc/006-1_Desert_mountains/miriam.txt b/npc/032-1_Outback/miriam.txt
index e119e0f9..d42d904e 100644
--- a/npc/006-1_Desert_mountains/miriam.txt
+++ b/npc/032-1_Outback/miriam.txt
@@ -1,5 +1,5 @@
 // NPC place is provisory
-006-1.gat,74,95,0	script	Miriam	175,{
+032-1.gat,55,20,0	script	Miriam	175,{
 
 	if (getskilllv(SKILL_SPEED)) goto L_fast;
 	if (getequipid(equip_torso) < 0) goto L_naked;
@@ -70,7 +70,7 @@ L_offer:
 	close2;
 	message strcharinfo(0), "Miriam quickly grabs your arm and pull you to the place where she is sitting.";
 	// Warp the player to the place where the NPC is defined, so he can't cheat.
-	warp "006-1.gat",75,101;
+	warp "032-1.gat",55,21;
 	npctalk "Run " +strcharinfo(0)+ ", run!";
 	set QUEST_MIRIAM_start, gettimetick(1);
 	end;
@@ -126,6 +126,7 @@ L_goodjob:
 	mes "You feel dizzy and as soon as you move your head and look to the ground, Miriam pushes you hard, sending you meters away from her.";
 	close2;
 //	warp player a few tiles back - Write it when the NPC place is defined
+	warp "032-1.gat",55,22;
 	set QUEST_MIRIAM_run, 0;
 	message strcharinfo(0), "[You gain 2500 experience points]";
 	message strcharinfo(0), "[You learned Speed Skill]";
diff --git a/npc/032-3_Cave/_import.txt b/npc/032-3_Cave/_import.txt
new file mode 100644
index 00000000..de6feea0
--- /dev/null
+++ b/npc/032-3_Cave/_import.txt
@@ -0,0 +1,3 @@
+map: 032-3.gat
+npc: npc/032-3_Cave/_mobs.txt
+npc: npc/032-3_Cave/_warps.txt
diff --git a/npc/032-3_Cave/_mobs.txt b/npc/032-3_Cave/_mobs.txt
new file mode 100644
index 00000000..ea5bb75a
--- /dev/null
+++ b/npc/032-3_Cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 032-3 Cave mobs
+
+
+
+032-3.gat,0,0,0	script	Mob032-3	-1,{
+	end;
+}
diff --git a/npc/032-3_Cave/_warps.txt b/npc/032-3_Cave/_warps.txt
new file mode 100644
index 00000000..d27b4bc2
--- /dev/null
+++ b/npc/032-3_Cave/_warps.txt
@@ -0,0 +1,4 @@
+// 032-3 Cave warps
+
+032-3.gat,128,33	warp	ToDesert	-1,-1,006-1.gat,30,124
+032-3.gat,56,61	warp	toDesert	-1,-1,032-1.gat,64,53
diff --git a/npc/_import.txt b/npc/_import.txt
index 55141677..990c5315 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -66,4 +66,6 @@ import: npc/030-1_Snow_field/_import.txt
 import: npc/031-1_NivalisPort/_import.txt
 import: npc/031-2_Angelas_House/_import.txt
 import: npc/031-3_Cave/_import.txt
+import: npc/032-1_Outback/_import.txt
+import: npc/032-3_Cave/_import.txt
 import: npc/botcheck/_import.txt