summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt53
-rwxr-xr-xdb/re/map_cache.datbin22125 -> 22229 bytes
-rw-r--r--npc/003-1/_warps.txt4
-rw-r--r--npc/003-6/_import.txt3
-rw-r--r--npc/003-6/_warps.txt4
-rw-r--r--npc/_import.txt1
7 files changed, 38 insertions, 28 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 43d79bf1d..c8a93df43 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -71,6 +71,7 @@ map_list: (
"003-2",
"003-3",
"003-5",
+ "003-6",
"003-7",
"003-8",
"005-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 06ccd54dd..4967bcf39 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -68,29 +68,30 @@
003-2 68
003-3 69
003-5 70
-003-7 71
-003-8 72
-005-1 73
-005-2 74
-005-3 75
-005-4 76
-005-5 77
-005-6 78
-008-1 79
-008-2-0 80
-008-2-1 81
-008-2-10 82
-008-2-11 83
-008-2-12 84
-008-2-13 85
-008-2-14 86
-008-2-2 87
-008-2-3 88
-008-2-4 89
-008-2-5 90
-008-2-6 91
-008-2-7 92
-008-2-8 93
-008-2-9 94
-test 95
-testbg 96
+003-6 71
+003-7 72
+003-8 73
+005-1 74
+005-2 75
+005-3 76
+005-4 77
+005-5 78
+005-6 79
+008-1 80
+008-2-0 81
+008-2-1 82
+008-2-10 83
+008-2-11 84
+008-2-12 85
+008-2-13 86
+008-2-14 87
+008-2-2 88
+008-2-3 89
+008-2-4 90
+008-2-5 91
+008-2-6 92
+008-2-7 93
+008-2-8 94
+008-2-9 95
+test 96
+testbg 97
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 2cdfd5a32..b1c374331 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 16531a287..c125f0dd8 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -8,8 +8,8 @@
003-1,51,119,0 warp #003-1_51_119 0,0,003-1,82,119
003-1,81,119,0 warp #003-1_81_119 0,0,003-1,52,119
003-1,96,144,0 warp #003-1_96_144 0,0,003-5,38,40
-003-1,106,147,0 warp #003-1_106_147 0,0,003-6,35,40
-003-1,112,147,0 warp #003-1_112_147 0,0,003-6,35,40
+003-1,106,147,0 warp #003-1_106_147 0,0,003-6,32,38
+003-1,112,147,0 warp #003-1_112_147 0,0,003-6,40,38
003-1,111,137,0 warp #003-1_111_137 0,0,003-7,39,40
003-1,107,132,0 warp #003-1_107_132 0,0,003-7,29,31
003-1,112,100,0 warp #003-1_112_100 0,0,003-8,31,43
diff --git a/npc/003-6/_import.txt b/npc/003-6/_import.txt
new file mode 100644
index 000000000..111152cdb
--- /dev/null
+++ b/npc/003-6/_import.txt
@@ -0,0 +1,3 @@
+// Map 003-6: Laundry
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-6/_warps.txt",
diff --git a/npc/003-6/_warps.txt b/npc/003-6/_warps.txt
new file mode 100644
index 000000000..d540cc5f9
--- /dev/null
+++ b/npc/003-6/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-6: Laundry warps
+003-6,40,39,0 warp #003-6_40_39 0,0,003-1,112,148
+003-6,32,39,0 warp #003-6_32_39 0,0,003-1,106,148
diff --git a/npc/_import.txt b/npc/_import.txt
index 95f72d17d..53c10e6b3 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -70,6 +70,7 @@
@include "npc/003-2/_import.txt"
@include "npc/003-3/_import.txt"
@include "npc/003-5/_import.txt"
+@include "npc/003-6/_import.txt"
@include "npc/003-7/_import.txt"
@include "npc/003-8/_import.txt"
@include "npc/005-1/_import.txt"