12 files changed, 100 insertions, 83 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 1f6d396c8..de4058c1f 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -13,6 +13,7 @@ map_list: (
     "001-6",
     "001-7",
     "001-8",
+    "001-9",
     "002-1",
     "002-2",
     "002-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 22a82167d..5a9cfcf5b 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -10,85 +10,86 @@
 001-6 10
 001-7 11
 001-8 12
-002-1 13
-002-2 14
-002-3 15
-002-4 16
-002-5 17
-003-0-1 18
-003-0 19
-003-1-1 20
-003-1-2 21
-003-1-3 22
-003-1 23
-003-10 24
-003-13 25
-003-2 26
-003-3 27
-003-4-1 28
-003-4 29
-003-5 30
-003-6 31
-003-7 32
-003-8 33
-004-1 34
-004-2-1 35
-004-2 36
-005-1 37
-005-2-1 38
-005-2 39
-005-3 40
-005-4 41
-005-5 42
-005-6 43
-005-7 44
-006-1 45
-007-1 46
-008-0 47
-008-1 48
-008-2 49
-009-1 50
-009-2 51
-009-3 52
-009-4 53
-009-5 54
-010-1-1 55
-010-1 56
-010-2 57
-011-1 58
-011-2 59
-012-1 60
-012-2 61
-012-3 62
-012-4 63
-012-5 64
-012-6 65
-012-7 66
-014-1 67
-014-2 68
-014-3 69
-015-1 70
-015-2 71
-015-3 72
-016-1 73
-016-6 74
-016-7 75
-017-1 76
-017-2-1 77
-017-2 78
-018-1-1 79
-018-1 80
-018-2-1 81
-018-2 82
-018-3-1 83
-018-3 84
-018-4-1 85
-018-4-2 86
-018-4 87
-boss 88
-botcheck 89
-sec_pri 90
-soren-2 91
-soren 92
-test 93
-testbg 94
+001-9 13
+002-1 14
+002-2 15
+002-3 16
+002-4 17
+002-5 18
+003-0-1 19
+003-0 20
+003-1-1 21
+003-1-2 22
+003-1-3 23
+003-1 24
+003-10 25
+003-13 26
+003-2 27
+003-3 28
+003-4-1 29
+003-4 30
+003-5 31
+003-6 32
+003-7 33
+003-8 34
+004-1 35
+004-2-1 36
+004-2 37
+005-1 38
+005-2-1 39
+005-2 40
+005-3 41
+005-4 42
+005-5 43
+005-6 44
+005-7 45
+006-1 46
+007-1 47
+008-0 48
+008-1 49
+008-2 50
+009-1 51
+009-2 52
+009-3 53
+009-4 54
+009-5 55
+010-1-1 56
+010-1 57
+010-2 58
+011-1 59
+011-2 60
+012-1 61
+012-2 62
+012-3 63
+012-4 64
+012-5 65
+012-6 66
+012-7 67
+014-1 68
+014-2 69
+014-3 70
+015-1 71
+015-2 72
+015-3 73
+016-1 74
+016-6 75
+016-7 76
+017-1 77
+017-2-1 78
+017-2 79
+018-1-1 80
+018-1 81
+018-2-1 82
+018-2 83
+018-3-1 84
+018-3 85
+018-4-1 86
+018-4-2 87
+018-4 88
+boss 89
+botcheck 90
+sec_pri 91
+soren-2 92
+soren 93
+test 94
+testbg 95
diff --git a/maps/re/001-9.mcache b/maps/re/001-9.mcache
new file mode 100644
index 000000000..f911e8459
--- /dev/null
+++ b/maps/re/001-9.mcache
diff --git a/maps/re/017-1.mcache b/maps/re/017-1.mcache
index 8ed9fa1a7..4c3c55852 100644
--- a/maps/re/017-1.mcache
+++ b/maps/re/017-1.mcache
diff --git a/maps/re/017-2-1.mcache b/maps/re/017-2-1.mcache
index 17216061a..00714ca5b 100644
--- a/maps/re/017-2-1.mcache
+++ b/maps/re/017-2-1.mcache
diff --git a/npc/001-9/_import.txt b/npc/001-9/_import.txt
new file mode 100644
index 000000000..417c1114c
--- /dev/null
+++ b/npc/001-9/_import.txt
@@ -0,0 +1,2 @@
+// Map 001-9: Eternity Maze
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt
index ad9e84da6..5810d4b17 100644
--- a/npc/017-1/_warps.txt
+++ b/npc/017-1/_warps.txt
@@ -4,3 +4,4 @@
 017-1,185,197,0	warp	#017-1_185_197	0,0,018-3,114,24
 017-1,179,197,0	warp	#017-1_179_197	0,0,018-1,32,66
 017-1,182,197,0	warp	#017-1_182_197	0,0,018-4,164,104
+017-1,119,60,0	warp	#017-1_119_60	0,0,017-2,31,30
diff --git a/npc/017-2-1/_import.txt b/npc/017-2-1/_import.txt
index 0a8172af5..8b1633271 100644
--- a/npc/017-2-1/_import.txt
+++ b/npc/017-2-1/_import.txt
@@ -1,2 +1,4 @@
 // Map 017-2-1: Jack's Basement
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/017-2-1/_mobs.txt",
+"npc/017-2-1/_warps.txt",
diff --git a/npc/017-2-1/_mobs.txt b/npc/017-2-1/_mobs.txt
new file mode 100644
index 000000000..e51f666ad
--- /dev/null
+++ b/npc/017-2-1/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 017-2-1: Jack's Basement mobs
+017-2-1,62,83,5,6	monster	Small Emerald Bif	1104,1,45000,45000
+017-2-1,73,61,54,42	monster	Dark Lizard	1051,36,25000,25000
+017-2-1,49,71,40,58	monster	Red Slime	1092,29,45000,45000
diff --git a/npc/017-2-1/_warps.txt b/npc/017-2-1/_warps.txt
new file mode 100644
index 000000000..7c0035a5d
--- /dev/null
+++ b/npc/017-2-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 017-2-1: Jack's Basement warps
+017-2-1,121,115,0	warp	#017-2-1_121_115	0,0,017-2,21,29
diff --git a/npc/017-2/_warps.txt b/npc/017-2/_warps.txt
index 97c07e729..526c98f69 100644
--- a/npc/017-2/_warps.txt
+++ b/npc/017-2/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 017-2: Jack's House warps
-017-2,31,32,0	warp	#017-2_31_32	0,0,017-1,0,0
+017-2,31,32,0	warp	#017-2_31_32	0,0,017-1,119,61
+017-2,21,30,0	warp	#017-2_21_30	0,0,017-2-1,121,116
diff --git a/npc/_import.txt b/npc/_import.txt
index acb231c6a..7ee69fb31 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -12,6 +12,7 @@
 @include "npc/001-6/_import.txt"
 @include "npc/001-7/_import.txt"
 @include "npc/001-8/_import.txt"
+@include "npc/001-9/_import.txt"
 @include "npc/002-1/_import.txt"
 @include "npc/002-2/_import.txt"
 @include "npc/002-3/_import.txt"