Regenerate maps

8 files changed, 46 insertions, 29 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 71a8ca13b..40ddd7085 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -79,6 +79,7 @@ map_list: (
     "015-4",
     "015-5",
     "015-6",
+    "015-7",
     "016-1",
     "016-6",
     "016-7",
diff --git a/db/map_index.txt b/db/map_index.txt
index a1f38c839..e456b79f4 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -76,32 +76,33 @@
 015-4 76
 015-5 77
 015-6 78
-016-1 79
-016-6 80
-016-7 81
-017-1 82
-017-2-1 83
-017-2 84
-017-3 85
-017-4 86
-017-5 87
-017-6 88
-018-1-1 89
-018-1 90
-018-2-1 91
-018-2 92
-018-3-1 93
-018-3 94
-018-4-1 95
-018-4-2 96
-018-4 97
-018-5 98
-019-1-1 99
-019-1 100
-boss 101
-botcheck 102
-sec_pri 103
-soren-2 104
-soren 105
-test 106
-testbg 107
+015-7 79
+016-1 80
+016-6 81
+016-7 82
+017-1 83
+017-2-1 84
+017-2 85
+017-3 86
+017-4 87
+017-5 88
+017-6 89
+018-1-1 90
+018-1 91
+018-2-1 92
+018-2 93
+018-3-1 94
+018-3 95
+018-4-1 96
+018-4-2 97
+018-4 98
+018-5 99
+019-1-1 100
+019-1 101
+boss 102
+botcheck 103
+sec_pri 104
+soren-2 105
+soren 106
+test 107
+testbg 108
diff --git a/maps/re/015-7.mcache b/maps/re/015-7.mcache
new file mode 100644
index 000000000..e0c837adb
--- /dev/null
+++ b/maps/re/015-7.mcache
diff --git a/npc/014-5/_warps.txt b/npc/014-5/_warps.txt
index 4b7a2e5f0..6744cd67a 100644
--- a/npc/014-5/_warps.txt
+++ b/npc/014-5/_warps.txt
@@ -1,5 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 014-5: North Woodlands warps
+014-5,48,161,0	warp	#014-5_48_161	0,0,015-7,38,94
+014-5,59,154,0	warp	#014-5_59_154	0,0,015-7,84,65
 014-5,82,229,0	warp	#014-5_82_229	1,0,014-3,172,60
 014-5,86,31,0	warp	#014-5_86_31	0,0,015-5,81,139
 014-5,192,16,0	warp	#014-5_192_16	2,0,019-1,60,101
diff --git a/npc/015-7/_import.txt b/npc/015-7/_import.txt
new file mode 100644
index 000000000..1954ecd0c
--- /dev/null
+++ b/npc/015-7/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-7: Small Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-7/_mobs.txt",
+"npc/015-7/_warps.txt",
diff --git a/npc/015-7/_mobs.txt b/npc/015-7/_mobs.txt
new file mode 100644
index 000000000..5b3ec36e4
--- /dev/null
+++ b/npc/015-7/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-7: Small Cave mobs
+015-7,58,66,37,29	monster	Cave Snake	1035,21,20000,20000
+015-7,57,67,31,24	monster	Cave Maggot	1027,16,20000,20000
diff --git a/npc/015-7/_warps.txt b/npc/015-7/_warps.txt
new file mode 100644
index 000000000..e1432919e
--- /dev/null
+++ b/npc/015-7/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-7: Small Cave warps
+015-7,38,95,0	warp	#015-7_38_95	0,0,014-5,48,162
+015-7,84,66,0	warp	#015-7_84_66	0,0,014-5,59,155
diff --git a/npc/_import.txt b/npc/_import.txt
index 1df91b4d4..ba0c7a502 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -78,6 +78,7 @@
 @include "npc/015-4/_import.txt"
 @include "npc/015-5/_import.txt"
 @include "npc/015-6/_import.txt"
+@include "npc/015-7/_import.txt"
 @include "npc/016-1/_import.txt"
 @include "npc/016-6/_import.txt"
 @include "npc/016-7/_import.txt"