From 43bfffe1fec74604e94961fa73e254f8a5ddc0e6 Mon Sep 17 00:00:00 2001
From: Micksha <ms-shaman@gmx.de>
Date: Thu, 10 Oct 2019 11:06:19 +0000
Subject: Merchanthouse
---
conf/map/maps.conf | 1 +
db/map_index.txt | 23 ++++++++++++-----------
maps/re/008-2-32.mcache | Bin 0 -> 116 bytes
npc/008-1-1/_warps.txt | 1 +
npc/008-1/_import.txt | 2 +-
npc/008-2-32/_import.txt | 3 +++
npc/008-2-32/_warps.txt | 3 +++
npc/_import.txt | 1 +
8 files changed, 22 insertions(+), 12 deletions(-)
create mode 100644 maps/re/008-2-32.mcache
create mode 100644 npc/008-2-32/_import.txt
create mode 100644 npc/008-2-32/_warps.txt
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 1c8e62df..8d1b712e 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -84,6 +84,7 @@ map_list: (
"008-2-29",
"008-2-3",
"008-2-30",
+ "008-2-32",
"008-2-4",
"008-2-5",
"008-2-6",
diff --git a/db/map_index.txt b/db/map_index.txt
index a0edf6c9..9585fa41 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -81,14 +81,15 @@
008-2-29 81
008-2-3 82
008-2-30 83
-008-2-4 84
-008-2-5 85
-008-2-6 86
-008-2-7 87
-008-2-8 88
-008-2-9 89
-008-3-0 90
-008-3-1 91
-008-4-1 92
-test 93
-testbg 94
+008-2-32 84
+008-2-4 85
+008-2-5 86
+008-2-6 87
+008-2-7 88
+008-2-8 89
+008-2-9 90
+008-3-0 91
+008-3-1 92
+008-4-1 93
+test 94
+testbg 95
diff --git a/maps/re/008-2-32.mcache b/maps/re/008-2-32.mcache
new file mode 100644
index 00000000..547b7d62
Binary files /dev/null and b/maps/re/008-2-32.mcache differ
diff --git a/npc/008-1-1/_warps.txt b/npc/008-1-1/_warps.txt
index 56d9cc3f..11a32b86 100644
--- a/npc/008-1-1/_warps.txt
+++ b/npc/008-1-1/_warps.txt
@@ -2,3 +2,4 @@
// Map 008-1-1: Woodland warps
008-1-1,247,85,0 warp #008-1-1_247_85 0,1,008-1,21,85
008-1-1,202,47,0 warp #008-1-1_202_47 0,0,008-3-0,129,112
+008-1-1,51,57,0 warp #008-1-1_51_57 0,0,008-2-32,40,37
diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt
index 6d5f4bfa..018577b5 100644
--- a/npc/008-1/_import.txt
+++ b/npc/008-1/_import.txt
@@ -1,8 +1,8 @@
// Map 008-1: Hurnscald
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-1/4144.txt",
"npc/008-1/_mobs.txt",
"npc/008-1/_warps.txt",
-"npc/008-1/4144.txt",
"npc/008-1/auldsbel.txt",
"npc/008-1/banu.txt",
"npc/008-1/blossom.txt",
diff --git a/npc/008-2-32/_import.txt b/npc/008-2-32/_import.txt
new file mode 100644
index 00000000..c9137dc7
--- /dev/null
+++ b/npc/008-2-32/_import.txt
@@ -0,0 +1,3 @@
+// Map 008-2-32: Merchant House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-32/_warps.txt",
diff --git a/npc/008-2-32/_warps.txt b/npc/008-2-32/_warps.txt
new file mode 100644
index 00000000..99f22bd8
--- /dev/null
+++ b/npc/008-2-32/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-32: Merchant House warps
+008-2-32,40,38,0 warp #008-2-32_40_38 0,0,008-1-1,51,58
diff --git a/npc/_import.txt b/npc/_import.txt
index c19f2e32..b821d9d9 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -83,6 +83,7 @@
@include "npc/008-2-29/_import.txt"
@include "npc/008-2-3/_import.txt"
@include "npc/008-2-30/_import.txt"
+@include "npc/008-2-32/_import.txt"
@include "npc/008-2-4/_import.txt"
@include "npc/008-2-5/_import.txt"
@include "npc/008-2-6/_import.txt"
--
cgit v1.2.3-70-g09d2