*yawn* last submission for now: add 012-5 map.

The NPC can come later.

9 files changed, 23 insertions, 10 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 7735ec9d3..fca32f816 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -51,6 +51,7 @@ map_list: (
     "012-2",
     "012-3",
     "012-4",
+    "012-5",
     "014-1",
     "014-2",
     "015-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 20e5373f7..1e9f686cc 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -48,13 +48,14 @@
 012-2 48
 012-3 49
 012-4 50
-014-1 51
-014-2 52
-015-1 53
-boss 54
-botcheck 55
-sec_pri 56
-soren-2 57
-soren 58
-test 59
-testbg 60
+012-5 51
+014-1 52
+014-2 53
+015-1 54
+boss 55
+botcheck 56
+sec_pri 57
+soren-2 58
+soren 59
+test 60
+testbg 61
diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache
index d51b8e7f8..19bd69825 100644
--- a/maps/re/012-1.mcache
+++ b/maps/re/012-1.mcache
diff --git a/maps/re/012-5.mcache b/maps/re/012-5.mcache
new file mode 100644
index 000000000..40b7c6681
--- /dev/null
+++ b/maps/re/012-5.mcache
diff --git a/npc/012-1/_mobs.txt b/npc/012-1/_mobs.txt
index 1d7d42f95..60a3b9d76 100644
--- a/npc/012-1/_mobs.txt
+++ b/npc/012-1/_mobs.txt
@@ -6,3 +6,4 @@
 012-1,44,47,21,32	monster	Clover Patch	1028,4,60000,90000
 012-1,135,58,7,29	monster	Piousse	1003,6,40000,60000
 012-1,85,86,52,15	monster	Silk Worm	1034,5,30000,30000
+012-1,115,69,1,1	monster	Training Dummy	1021,1,10000,10000
diff --git a/npc/012-1/_warps.txt b/npc/012-1/_warps.txt
index e9444ae3d..4de3bd504 100644
--- a/npc/012-1/_warps.txt
+++ b/npc/012-1/_warps.txt
@@ -6,3 +6,5 @@
 012-1,65,55,0	warp	#012-1_65_55	0,0,012-2,36,46
 012-1,89,58,0	warp	#012-1_89_58	0,0,012-3,41,45
 012-1,101,55,0	warp	#012-1_101_55	0,0,012-4,35,30
+012-1,121,71,0	warp	#012-1_121_71	0,0,012-5,34,36
+012-1,116,66,0	warp	#012-1_116_66	0,0,012-5,23,26
diff --git a/npc/012-5/_import.txt b/npc/012-5/_import.txt
new file mode 100644
index 000000000..e65d06a2c
--- /dev/null
+++ b/npc/012-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 012-5: Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-5/_warps.txt",
diff --git a/npc/012-5/_warps.txt b/npc/012-5/_warps.txt
new file mode 100644
index 000000000..2816bf32d
--- /dev/null
+++ b/npc/012-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-5: Indoors warps
+012-5,34,37,0	warp	#012-5_34_37	0,0,012-1,121,72
+012-5,23,27,0	warp	#012-5_23_27	0,0,012-1,116,67
diff --git a/npc/_import.txt b/npc/_import.txt
index 976e1fe3e..711de6aeb 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -50,6 +50,7 @@
 @include "npc/012-2/_import.txt"
 @include "npc/012-3/_import.txt"
 @include "npc/012-4/_import.txt"
+@include "npc/012-5/_import.txt"
 @include "npc/014-1/_import.txt"
 @include "npc/014-2/_import.txt"
 @include "npc/015-1/_import.txt"