11 files changed, 61 insertions, 30 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index c18b4da0c..4c86c6b2c 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -67,6 +67,9 @@ map_list: (
     "003-2-2",
     "003-2",
     "003-3",
+    "003-5",
+    "003-7",
+    "003-8",
     "005-1",
     "005-2",
     "005-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index de77f3f51..c27324385 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -64,27 +64,30 @@
 003-2-2 64
 003-2 65
 003-3 66
-005-1 67
-005-2 68
-005-3 69
-005-4 70
-005-5 71
-005-6 72
-008-1 73
-008-2-0 74
-008-2-1 75
-008-2-10 76
-008-2-11 77
-008-2-12 78
-008-2-13 79
-008-2-14 80
-008-2-2 81
-008-2-3 82
-008-2-4 83
-008-2-5 84
-008-2-6 85
-008-2-7 86
-008-2-8 87
-008-2-9 88
-test 89
-testbg 90
+003-5 67
+003-7 68
+003-8 69
+005-1 70
+005-2 71
+005-3 72
+005-4 73
+005-5 74
+005-6 75
+008-1 76
+008-2-0 77
+008-2-1 78
+008-2-10 79
+008-2-11 80
+008-2-12 81
+008-2-13 82
+008-2-14 83
+008-2-2 84
+008-2-3 85
+008-2-4 86
+008-2-5 87
+008-2-6 88
+008-2-7 89
+008-2-8 90
+008-2-9 91
+test 92
+testbg 93
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 0c78bbc61..170a49560 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 48af153b3..16531a287 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -7,10 +7,12 @@
 003-1,54,137,0	warp	#003-1_54_137	0,0,003-4,35,40
 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,143,0	warp	#003-1_96_143	0,0,003-5,35,40
-003-1,106,146,0	warp	#003-1_106_146	0,0,003-6,35,40
-003-1,112,146,0	warp	#003-1_112_146	0,0,003-6,35,40
-003-1,111,136,0	warp	#003-1_111_136	0,0,003-7,35,40
-003-1,107,132,0	warp	#003-1_107_132	0,0,003-7,35,40
-003-1,112,100,0	warp	#003-1_112_100	0,0,003-8,35,40
+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,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
 003-1,82,68,0	warp	#003-1_82_68	0,0,003-9,35,40
+003-1,51,65,0	warp	#003-1_51_65	0,0,003-2,42,34
+003-1,115,93,0	warp	#003-1_115_93	0,0,003-8,41,28
diff --git a/npc/003-5/_import.txt b/npc/003-5/_import.txt
new file mode 100644
index 000000000..b37bbfb80
--- /dev/null
+++ b/npc/003-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 003-5: Tulimshar Jeweler
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-5/_warps.txt",
diff --git a/npc/003-5/_warps.txt b/npc/003-5/_warps.txt
new file mode 100644
index 000000000..5e4345780
--- /dev/null
+++ b/npc/003-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-5: Tulimshar Jeweler warps
+003-5,38,41,0	warp	#003-5_38_41	0,0,003-1,96,145
diff --git a/npc/003-7/_import.txt b/npc/003-7/_import.txt
new file mode 100644
index 000000000..94d8c0cbf
--- /dev/null
+++ b/npc/003-7/_import.txt
@@ -0,0 +1,3 @@
+// Map 003-7: Tulimshar Storage
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-7/_warps.txt",
diff --git a/npc/003-7/_warps.txt b/npc/003-7/_warps.txt
new file mode 100644
index 000000000..55844fe2b
--- /dev/null
+++ b/npc/003-7/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-7: Tulimshar Storage warps
+003-7,39,41,0	warp	#003-7_39_41	0,0,003-1,111,138
+003-7,29,30,0	warp	#003-7_29_30	0,0,003-1,107,131
diff --git a/npc/003-8/_import.txt b/npc/003-8/_import.txt
new file mode 100644
index 000000000..6dd2e8a40
--- /dev/null
+++ b/npc/003-8/_import.txt
@@ -0,0 +1,3 @@
+// Map 003-8: Terranite Forge
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-8/_warps.txt",
diff --git a/npc/003-8/_warps.txt b/npc/003-8/_warps.txt
new file mode 100644
index 000000000..595a65d6b
--- /dev/null
+++ b/npc/003-8/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-8: Terranite Forge warps
+003-8,31,44,0	warp	#003-8_31_44	0,0,003-1,112,101
+003-8,41,27,0	warp	#003-8_41_27	0,0,003-1,115,94
diff --git a/npc/_import.txt b/npc/_import.txt
index e815e095c..f742937af 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -66,6 +66,9 @@
 @include "npc/003-2-2/_import.txt"
 @include "npc/003-2/_import.txt"
 @include "npc/003-3/_import.txt"
+@include "npc/003-5/_import.txt"
+@include "npc/003-7/_import.txt"
+@include "npc/003-8/_import.txt"
 @include "npc/005-1/_import.txt"
 @include "npc/005-2/_import.txt"
 @include "npc/005-3/_import.txt"