From 4acb4e0df3bac8dcc8f92776242fe6d1780c6851 Mon Sep 17 00:00:00 2001
From: Saulc <lucashelaine14@gmail.com>
Date: Sun, 11 Feb 2018 01:00:15 +0100
Subject: add new map 003-1-2 Inwall bridge

---
 conf/map/maps.conf      |   1 +
 db/map_index.txt        |  73 ++++++++++++++++++++++++------------------------
 db/re/map_cache.dat     | Bin 23087 -> 23154 bytes
 npc/003-1-2/_import.txt |   4 +++
 npc/003-1-2/_mobs.txt   |   3 ++
 npc/003-1-2/_warps.txt  |   5 ++++
 npc/003-1/_warps.txt    |   5 ++--
 npc/_import.txt         |   1 +
 8 files changed, 54 insertions(+), 38 deletions(-)
 create mode 100644 npc/003-1-2/_import.txt
 create mode 100644 npc/003-1-2/_mobs.txt
 create mode 100644 npc/003-1-2/_warps.txt

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 237a6ab53..7f86dc054 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -64,6 +64,7 @@ map_list: (
     "002-2",
     "002-3",
     "002-4",
+    "003-1-2",
     "003-1",
     "003-2-0",
     "003-2-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 0d18d32da..d92b970bb 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -61,39 +61,40 @@
 002-2 61
 002-3 62
 002-4 63
-003-1 64
-003-2-0 65
-003-2-1 66
-003-2-2 67
-003-2 68
-003-3 69
-003-4 70
-003-5 71
-003-6 72
-003-7 73
-003-8 74
-004-1 75
-005-1 76
-005-2 77
-005-3 78
-005-4 79
-005-5 80
-005-6 81
-008-1 82
-008-2-0 83
-008-2-1 84
-008-2-10 85
-008-2-11 86
-008-2-12 87
-008-2-13 88
-008-2-14 89
-008-2-2 90
-008-2-3 91
-008-2-4 92
-008-2-5 93
-008-2-6 94
-008-2-7 95
-008-2-8 96
-008-2-9 97
-test 98
-testbg 99
+003-1-2 64
+003-1 65
+003-2-0 66
+003-2-1 67
+003-2-2 68
+003-2 69
+003-3 70
+003-4 71
+003-5 72
+003-6 73
+003-7 74
+003-8 75
+004-1 76
+005-1 77
+005-2 78
+005-3 79
+005-4 80
+005-5 81
+005-6 82
+008-1 83
+008-2-0 84
+008-2-1 85
+008-2-10 86
+008-2-11 87
+008-2-12 88
+008-2-13 89
+008-2-14 90
+008-2-2 91
+008-2-3 92
+008-2-4 93
+008-2-5 94
+008-2-6 95
+008-2-7 96
+008-2-8 97
+008-2-9 98
+test 99
+testbg 100
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index c2eef4452..f21ff532d 100755
Binary files a/db/re/map_cache.dat and b/db/re/map_cache.dat differ
diff --git a/npc/003-1-2/_import.txt b/npc/003-1-2/_import.txt
new file mode 100644
index 000000000..2b6b015f7
--- /dev/null
+++ b/npc/003-1-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 003-1-2: Tulimshar Jeweler
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-1-2/_mobs.txt",
+"npc/003-1-2/_warps.txt",
diff --git a/npc/003-1-2/_mobs.txt b/npc/003-1-2/_mobs.txt
new file mode 100644
index 000000000..531b82111
--- /dev/null
+++ b/npc/003-1-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-1-2: Tulimshar Jeweler mobs
+003-1-2,34,36,15,3	monster	Black Scorpion	1074,2,35000,150000
diff --git a/npc/003-1-2/_warps.txt b/npc/003-1-2/_warps.txt
new file mode 100644
index 000000000..84eaa9b60
--- /dev/null
+++ b/npc/003-1-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-1-2: Tulimshar Jeweler warps
+003-1-2,33,34,0	warp	#003-1-2_33_34	0,0,003-1,81,119
+003-1-2,19,34,0	warp	#003-1-2_19_34	0,0,003-1,53,119
+003-1-2,48,34,0	warp	#003-1-2_48_34	0,0,003-1,116,119
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 34d1f4ff5..46b562f7b 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -5,8 +5,8 @@
 003-1,52,72,0	warp	#003-1_52_72	0,0,003-2,38,40
 003-1,56,99,0	warp	#003-1_56_99	0,0,003-3,39,40
 003-1,54,137,0	warp	#003-1_54_137	0,0,003-4,39,38
-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,51,120,0	warp	#003-1_51_120	0,0,003-1-2,19,35
+003-1,81,120,0	warp	#003-1_81_120	0,0,003-1-2,33,35
 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,32,38
 003-1,112,147,0	warp	#003-1_112_147	0,0,003-6,40,38
@@ -17,3 +17,4 @@
 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
 003-1,60,157,0	warp	#003-1_60_157	0,0,004-1,64,57
+003-1,116,120,0	warp	#003-1_116_120	0,0,003-1-2,48,35
diff --git a/npc/_import.txt b/npc/_import.txt
index 098e7b4b0..75717ef81 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -63,6 +63,7 @@
 @include "npc/002-2/_import.txt"
 @include "npc/002-3/_import.txt"
 @include "npc/002-4/_import.txt"
+@include "npc/003-1-2/_import.txt"
 @include "npc/003-1/_import.txt"
 @include "npc/003-2-0/_import.txt"
 @include "npc/003-2-1/_import.txt"
-- 
cgit v1.2.3-60-g2f50