Make maps

9 files changed, 85 insertions, 61 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 4c47f73b8..c31807af0 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -6,6 +6,7 @@ map_list: (
     "000-1",
     "001-1",
     "001-2",
+    "001-3-1",
     "001-3",
     "001-4",
     "001-5",
diff --git a/db/map_index.txt b/db/map_index.txt
index 6f39d8ba9..97a0c71a4 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -3,64 +3,65 @@
 000-1 3
 001-1 4
 001-2 5
-001-3 6
-001-4 7
-001-5 8
-001-6 9
-002-1 10
-002-2 11
-002-3 12
-002-4 13
-002-5 14
-003-0-1 15
-003-0 16
-003-1-1 17
-003-1-2 18
-003-1-3 19
-003-1 20
-003-10 21
-003-13 22
-003-2 23
-003-3 24
-003-4-1 25
-003-4 26
-003-5 27
-003-6 28
-003-7 29
-003-8 30
-004-1 31
-004-2-1 32
-004-2 33
-005-1 34
-005-2-1 35
-005-2 36
-005-3 37
-005-4 38
-005-5 39
-005-6 40
-005-7 41
-006-1 42
-007-1 43
-009-1 44
-010-1-1 45
-010-1 46
-010-2 47
-011-1 48
-011-2 49
-012-1 50
-012-2 51
-012-3 52
-012-4 53
-012-5 54
-012-6 55
-012-7 56
-014-1 57
-014-2 58
-015-1 59
-boss 60
-botcheck 61
-sec_pri 62
-soren-2 63
-soren 64
-test 65
-testbg 66
+001-3-1 6
+001-3 7
+001-4 8
+001-5 9
+001-6 10
+002-1 11
+002-2 12
+002-3 13
+002-4 14
+002-5 15
+003-0-1 16
+003-0 17
+003-1-1 18
+003-1-2 19
+003-1-3 20
+003-1 21
+003-10 22
+003-13 23
+003-2 24
+003-3 25
+003-4-1 26
+003-4 27
+003-5 28
+003-6 29
+003-7 30
+003-8 31
+004-1 32
+004-2-1 33
+004-2 34
+005-1 35
+005-2-1 36
+005-2 37
+005-3 38
+005-4 39
+005-5 40
+005-6 41
+005-7 42
+006-1 43
+007-1 44
+009-1 45
+010-1-1 46
+010-1 47
+010-2 48
+011-1 49
+011-2 50
+012-1 51
+012-2 52
+012-3 53
+012-4 54
+012-5 55
+012-6 56
+012-7 57
+014-1 58
+014-2 59
+015-1 60
+boss 61
+botcheck 62
+sec_pri 63
+soren-2 64
+soren 65
+test 66
+testbg 67
diff --git a/maps/re/001-3-1.mcache b/maps/re/001-3-1.mcache
new file mode 100644
index 000000000..0876134bc
--- /dev/null
+++ b/maps/re/001-3-1.mcache
diff --git a/maps/re/001-3.mcache b/maps/re/001-3.mcache
index 001f89e2e..48bde7751 100644
--- a/maps/re/001-3.mcache
+++ b/maps/re/001-3.mcache
diff --git a/npc/001-3-1/_import.txt b/npc/001-3-1/_import.txt
new file mode 100644
index 000000000..c76277ccc
--- /dev/null
+++ b/npc/001-3-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-3-1: Saulc's Palace
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-3-1/_warps.txt",
diff --git a/npc/001-3-1/_warps.txt b/npc/001-3-1/_warps.txt
new file mode 100644
index 000000000..462db80d7
--- /dev/null
+++ b/npc/001-3-1/_warps.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-3-1: Saulc's Palace warps
+001-3-1,24,62,0	warp	#001-3-1_24_62	0,0,001-3,127,65
+001-3-1,117,62,0	warp	#001-3-1_117_62	0,0,001-3,127,125
+001-3-1,45,127,0	warp	#001-3-1_45_127	3,0,001-3,104,81
+001-3-1,45,83,0	warp	#001-3-1_45_83	3,0,001-3-1,106,116
+001-3-1,107,117,0	warp	#001-3-1_107_117	3,0,001-3-1,44,84
+001-3-1,116,127,0	warp	#001-3-1_116_127	2,0,001-3,106,66
+001-3-1,97,127,0	warp	#001-3-1_97_127	2,0,001-3,101,66
diff --git a/npc/001-3/_import.txt b/npc/001-3/_import.txt
index 80049616e..a49e27bc7 100644
--- a/npc/001-3/_import.txt
+++ b/npc/001-3/_import.txt
@@ -1,2 +1,3 @@
 // Map 001-3: Saulc's Home
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-3/_warps.txt",
diff --git a/npc/001-3/_warps.txt b/npc/001-3/_warps.txt
new file mode 100644
index 000000000..fd232ec6f
--- /dev/null
+++ b/npc/001-3/_warps.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-3: Saulc's Home warps
+001-3,80,123,0	warp	#001-3_80_123	0,0,001-1,0,0
+001-3,127,124,0	warp	#001-3_127_124	0,0,001-3-1,117,61
+001-3,104,80,0	warp	#001-3_104_80	3,0,001-3-1,45,126
+001-3,106,65,0	warp	#001-3_106_65	0,0,001-3-1,116,127
+001-3,127,64,0	warp	#001-3_127_64	0,0,001-3-1,24,61
+001-3,101,65,0	warp	#001-3_101_65	0,0,001-3-1,97,127
diff --git a/npc/_import.txt b/npc/_import.txt
index 118449f87..ecf091d72 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -5,6 +5,7 @@
 @include "npc/000-1/_import.txt"
 @include "npc/001-1/_import.txt"
 @include "npc/001-2/_import.txt"
+@include "npc/001-3-1/_import.txt"
 @include "npc/001-3/_import.txt"
 @include "npc/001-4/_import.txt"
 @include "npc/001-5/_import.txt"