7 files changed, 89 insertions, 77 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 394d59d6f..58891b763 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -99,6 +99,7 @@ map_list: (
     "016-6",
     "016-7",
     "017-1",
+    "017-10",
     "017-2-1",
     "017-2-2",
     "017-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index b3b921704..aacf197c5 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -96,79 +96,80 @@
 016-6 96
 016-7 97
 017-1 98
-017-2-1 99
-017-2-2 100
-017-2 101
-017-3 102
-017-4 103
-017-5 104
-017-6 105
-017-7 106
-017-8 107
-018-1-1 108
-018-1 109
-018-2-1 110
-018-2-2 111
-018-2-3 112
-018-2-4 113
-018-2-5 114
-018-2 115
-018-3 116
-018-4-1 117
-018-4-2 118
-018-4 119
-018-5-0 120
-018-5-1 121
-018-5-2 122
-018-5-3 123
-018-5-boss 124
-018-5 125
-019-1-1 126
-019-1 127
-019-2 128
-019-3 129
-019-4-1 130
-019-4 131
-020-1 132
-020-2 133
-020-3 134
-020-4 135
-020-5 136
-020-6 137
-020-7-1 138
-020-7-2 139
-020-7 140
-021-1 141
-021-2 142
-021-3 143
-021-4 144
-022-1 145
-023-1 146
-023-2 147
-023-3-1 148
-023-3-2 149
-023-3 150
-024-1 151
-024-10 152
-024-11 153
-024-12 154
-024-13 155
-024-14 156
-024-15 157
-024-16 158
-024-2 159
-024-3 160
-024-4 161
-024-5 162
-024-6 163
-024-7 164
-024-8 165
-024-9 166
-boss 167
-botcheck 168
-guilds 169
-sec_pri 170
-soren-2 171
-soren 172
-test 173
-testbg 174
+017-10 99
+017-2-1 100
+017-2-2 101
+017-2 102
+017-3 103
+017-4 104
+017-5 105
+017-6 106
+017-7 107
+017-8 108
+018-1-1 109
+018-1 110
+018-2-1 111
+018-2-2 112
+018-2-3 113
+018-2-4 114
+018-2-5 115
+018-2 116
+018-3 117
+018-4-1 118
+018-4-2 119
+018-4 120
+018-5-0 121
+018-5-1 122
+018-5-2 123
+018-5-3 124
+018-5-boss 125
+018-5 126
+019-1-1 127
+019-1 128
+019-2 129
+019-3 130
+019-4-1 131
+019-4 132
+020-1 133
+020-2 134
+020-3 135
+020-4 136
+020-5 137
+020-6 138
+020-7-1 139
+020-7-2 140
+020-7 141
+021-1 142
+021-2 143
+021-3 144
+021-4 145
+022-1 146
+023-1 147
+023-2 148
+023-3-1 149
+023-3-2 150
+023-3 151
+024-1 152
+024-10 153
+024-11 154
+024-12 155
+024-13 156
+024-14 157
+024-15 158
+024-16 159
+024-2 160
+024-3 161
+024-4 162
+024-5 163
+024-6 164
+024-7 165
+024-8 166
+024-9 167
+boss 168
+botcheck 169
+guilds 170
+sec_pri 171
+soren-2 172
+soren 173
+test 174
+testbg 175
diff --git a/maps/re/017-10.mcache b/maps/re/017-10.mcache
new file mode 100644
index 000000000..15d1ecbb2
--- /dev/null
+++ b/maps/re/017-10.mcache
diff --git a/npc/016-6/_mobs.txt b/npc/016-6/_mobs.txt
index 7ad33cfe5..06d4415d0 100644
--- a/npc/016-6/_mobs.txt
+++ b/npc/016-6/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 016-6: Ocean mobs
-016-6,33,32,9,2	monster	Ocean Croc	1133,4,36000,30000
+016-6,33,32,9,2	monster	Ocean Croc	1133,4,16000,10000
diff --git a/npc/017-10/_import.txt b/npc/017-10/_import.txt
new file mode 100644
index 000000000..cd96bac0d
--- /dev/null
+++ b/npc/017-10/_import.txt
@@ -0,0 +1,3 @@
+// Map 017-10: Tech-User Forge
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/017-10/_warps.txt",
diff --git a/npc/017-10/_warps.txt b/npc/017-10/_warps.txt
new file mode 100644
index 000000000..636b97e54
--- /dev/null
+++ b/npc/017-10/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 017-10: Tech-User Forge warps
+017-10,36,79,0	warp	#017-10_36_79	0,0,017-1,171,21
+017-10,56,79,0	warp	#017-10_56_79	0,0,017-1,180,21
+017-10,60,79,0	warp	#017-10_60_79	0,0,017-1,182,21
+017-10,80,79,0	warp	#017-10_80_79	0,0,017-1,190,21
diff --git a/npc/_import.txt b/npc/_import.txt
index e004b6aaf..d568e0aaf 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -98,6 +98,7 @@
 @include "npc/016-6/_import.txt"
 @include "npc/016-7/_import.txt"
 @include "npc/017-1/_import.txt"
+@include "npc/017-10/_import.txt"
 @include "npc/017-2-1/_import.txt"
 @include "npc/017-2-2/_import.txt"
 @include "npc/017-2/_import.txt"