add map 003-1-3 magic school cave

9 files changed, 57 insertions, 40 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 4a07cbbe2..f1399e59f 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -9,6 +9,7 @@ map_list: (
     "002-3",
     "002-4",
     "003-1-2",
+    "003-1-3",
     "003-1",
     "003-13",
     "003-2-0",
diff --git a/db/map_index.txt b/db/map_index.txt
index f12fccfba..4052ef5e3 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -6,42 +6,43 @@
 002-3 6
 002-4 7
 003-1-2 8
-003-1 9
-003-13 10
-003-2-0 11
-003-2-1 12
-003-2-2 13
-003-2 14
-003-3 15
-003-4 16
-003-5 17
-003-6 18
-003-7 19
-003-8 20
-004-1 21
-004-2 22
-005-1 23
-005-2 24
-005-3 25
-005-4 26
-005-5 27
-005-6 28
-008-1 29
-008-2-0 30
-008-2-1 31
-008-2-10 32
-008-2-11 33
-008-2-12 34
-008-2-13 35
-008-2-14 36
-008-2-2 37
-008-2-3 38
-008-2-4 39
-008-2-5 40
-008-2-6 41
-008-2-7 42
-008-2-8 43
-008-2-9 44
-aeros 45
-test 46
-testbg 47
+003-1-3 9
+003-1 10
+003-13 11
+003-2-0 12
+003-2-1 13
+003-2-2 14
+003-2 15
+003-3 16
+003-4 17
+003-5 18
+003-6 19
+003-7 20
+003-8 21
+004-1 22
+004-2 23
+005-1 24
+005-2 25
+005-3 26
+005-4 27
+005-5 28
+005-6 29
+008-1 30
+008-2-0 31
+008-2-1 32
+008-2-10 33
+008-2-11 34
+008-2-12 35
+008-2-13 36
+008-2-14 37
+008-2-2 38
+008-2-3 39
+008-2-4 40
+008-2-5 41
+008-2-6 42
+008-2-7 43
+008-2-8 44
+008-2-9 45
+aeros 46
+test 47
+testbg 48
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 53d825aa0..b0ab210f2 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/npc/003-1-3/_import.txt b/npc/003-1-3/_import.txt
new file mode 100644
index 000000000..90753ead4
--- /dev/null
+++ b/npc/003-1-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 003-1-3: magic school cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-1-3/_mobs.txt",
+"npc/003-1-3/_warps.txt",
diff --git a/npc/003-1-3/_mobs.txt b/npc/003-1-3/_mobs.txt
new file mode 100644
index 000000000..767ef1eb8
--- /dev/null
+++ b/npc/003-1-3/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-1-3: magic school cave mobs
+003-1-3,55,58,29,22	monster	Cave Snake	1035,8,35000,150000
+003-1-3,70,40,3,1	monster	Bif	1058,1,35000,150000
diff --git a/npc/003-1-3/_warps.txt b/npc/003-1-3/_warps.txt
new file mode 100644
index 000000000..c8e143d02
--- /dev/null
+++ b/npc/003-1-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-1-3: magic school cave warps
+003-1-3,83,82,0	warp	#003-1-3_83_82	0,0,003-1,59,54
+003-1-3,37,86,0	warp	#003-1-3_37_86	0,0,003-1,25,46
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 5a87130c0..bbd88c7e5 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -17,3 +17,5 @@
 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	4,0,004-1,63,57
 003-1,116,120,0	warp	#003-1_116_120	0,0,003-1-2,48,35
+003-1,58,54,0	warp	#003-1_58_54	0,0,003-1-3,82,82
+003-1,25,45,0	warp	#003-1_25_45	0,0,003-1-3,35,85
diff --git a/npc/004-2/_import.txt b/npc/004-2/_import.txt
index bc0ba945d..841c90112 100644
--- a/npc/004-2/_import.txt
+++ b/npc/004-2/_import.txt
@@ -1,5 +1,5 @@
 // Map 004-2: Desert Mountains
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/004-2/bgmaster.txt",
 "npc/004-2/_mobs.txt",
 "npc/004-2/_warps.txt",
+"npc/004-2/bgmaster.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index d4958414a..ebf8d30d3 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -8,6 +8,7 @@
 @include "npc/002-3/_import.txt"
 @include "npc/002-4/_import.txt"
 @include "npc/003-1-2/_import.txt"
+@include "npc/003-1-3/_import.txt"
 @include "npc/003-1/_import.txt"
 @include "npc/003-13/_import.txt"
 @include "npc/003-2-0/_import.txt"