summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf49
-rw-r--r--db/map_index.txt531
-rw-r--r--maps/re/004-1.mcachebin850 -> 878 bytes
-rw-r--r--maps/re/004-2-1.mcachebin351 -> 393 bytes
-rw-r--r--maps/re/004-2-10.mcachebin0 -> 78 bytes
-rw-r--r--maps/re/004-2-11.mcachebin0 -> 166 bytes
-rw-r--r--maps/re/004-2-12.mcachebin0 -> 173 bytes
-rw-r--r--maps/re/004-2-2.mcachebin0 -> 284 bytes
-rw-r--r--maps/re/004-2-3.mcachebin0 -> 1156 bytes
-rw-r--r--maps/re/004-2-4.mcachebin0 -> 739 bytes
-rw-r--r--maps/re/004-2-5.mcachebin0 -> 215 bytes
-rw-r--r--maps/re/004-2-6.mcachebin0 -> 224 bytes
-rw-r--r--maps/re/004-2-7.mcachebin0 -> 148 bytes
-rw-r--r--maps/re/004-2-8.mcachebin0 -> 265 bytes
-rw-r--r--maps/re/004-2-9.mcachebin0 -> 205 bytes
-rw-r--r--maps/re/004-2.mcachebin1328 -> 1397 bytes
-rw-r--r--maps/re/004-3-1.mcachebin0 -> 223 bytes
-rw-r--r--maps/re/004-3-2.mcachebin0 -> 936 bytes
-rw-r--r--maps/re/004-3-3.mcachebin0 -> 131 bytes
-rw-r--r--maps/re/004-3-4.mcachebin0 -> 209 bytes
-rw-r--r--maps/re/004-3-5.mcachebin0 -> 119 bytes
-rw-r--r--maps/re/004-3-6.mcachebin0 -> 257 bytes
-rw-r--r--maps/re/004-3.mcachebin0 -> 241 bytes
-rw-r--r--maps/re/007-1-1.mcachebin0 -> 163 bytes
-rw-r--r--maps/re/007-1-2.mcachebin0 -> 179 bytes
-rw-r--r--maps/re/007-1.mcachebin2101 -> 2108 bytes
-rw-r--r--maps/re/010-1-1.mcachebin1596 -> 1737 bytes
-rw-r--r--maps/re/010-1-10.mcachebin0 -> 125 bytes
-rw-r--r--maps/re/010-1-11.mcachebin0 -> 84 bytes
-rw-r--r--maps/re/010-1-12.mcachebin0 -> 84 bytes
-rw-r--r--maps/re/010-1-2.mcachebin0 -> 685 bytes
-rw-r--r--maps/re/010-1-3.mcachebin0 -> 201 bytes
-rw-r--r--maps/re/010-1-4.mcachebin0 -> 173 bytes
-rw-r--r--maps/re/010-1-5.mcachebin0 -> 474 bytes
-rw-r--r--maps/re/010-1-6.mcachebin0 -> 402 bytes
-rw-r--r--maps/re/010-1-7.mcachebin0 -> 153 bytes
-rw-r--r--maps/re/010-1-8.mcachebin0 -> 81 bytes
-rw-r--r--maps/re/010-1-9.mcachebin0 -> 261 bytes
-rw-r--r--maps/re/010-1.mcachebin955 -> 967 bytes
-rw-r--r--maps/re/010-2-10.mcachebin0 -> 177 bytes
-rw-r--r--maps/re/010-2-11.mcachebin0 -> 202 bytes
-rw-r--r--maps/re/010-2-12.mcachebin0 -> 176 bytes
-rw-r--r--maps/re/010-2-13.mcachebin0 -> 116 bytes
-rw-r--r--maps/re/010-2-14.mcachebin0 -> 152 bytes
-rw-r--r--maps/re/010-2-15.mcachebin0 -> 144 bytes
-rw-r--r--maps/re/010-2-16.mcachebin0 -> 367 bytes
-rw-r--r--maps/re/010-2-2.mcachebin0 -> 388 bytes
-rw-r--r--maps/re/010-2-3.mcachebin0 -> 382 bytes
-rw-r--r--maps/re/010-2-4.mcachebin0 -> 184 bytes
-rw-r--r--maps/re/010-2-5.mcachebin0 -> 224 bytes
-rw-r--r--maps/re/010-2-6.mcachebin0 -> 224 bytes
-rw-r--r--maps/re/010-2-7.mcachebin0 -> 136 bytes
-rw-r--r--maps/re/010-2-8.mcachebin0 -> 145 bytes
-rw-r--r--maps/re/010-2-9.mcachebin0 -> 143 bytes
-rw-r--r--maps/re/010-2.mcachebin1655 -> 1805 bytes
-rw-r--r--maps/re/010-3.mcachebin0 -> 84 bytes
-rw-r--r--maps/re/010-4-1.mcachebin0 -> 180 bytes
-rw-r--r--maps/re/010-4-2.mcachebin0 -> 319 bytes
-rw-r--r--npc/003-1-1/_warps.txt4
-rw-r--r--npc/003-1/_mobs.txt10
-rw-r--r--npc/003-1/_warps.txt34
-rw-r--r--npc/004-1/_mobs.txt14
-rw-r--r--npc/004-1/_warps.txt11
-rw-r--r--npc/004-1/anwar.txt52
-rw-r--r--npc/004-1/elanore.txt2
-rw-r--r--npc/004-1/sign.txt2
-rw-r--r--npc/004-2-1/_import.txt2
-rw-r--r--npc/004-2-1/_mobs.txt22
-rw-r--r--npc/004-2-1/_warps.txt10
-rw-r--r--npc/004-2-10/_import.txt4
-rw-r--r--npc/004-2-10/_mobs.txt4
-rw-r--r--npc/004-2-10/_warps.txt3
-rw-r--r--npc/004-2-11/_import.txt4
-rw-r--r--npc/004-2-11/_mobs.txt10
-rw-r--r--npc/004-2-11/_warps.txt7
-rw-r--r--npc/004-2-12/_import.txt4
-rw-r--r--npc/004-2-12/_mobs.txt7
-rw-r--r--npc/004-2-12/_warps.txt4
-rw-r--r--npc/004-2-2/_import.txt4
-rw-r--r--npc/004-2-2/_mobs.txt9
-rw-r--r--npc/004-2-2/_warps.txt4
-rw-r--r--npc/004-2-3/_import.txt4
-rw-r--r--npc/004-2-3/_mobs.txt23
-rw-r--r--npc/004-2-3/_warps.txt22
-rw-r--r--npc/004-2-4/_import.txt4
-rw-r--r--npc/004-2-4/_mobs.txt17
-rw-r--r--npc/004-2-4/_warps.txt12
-rw-r--r--npc/004-2-5/_import.txt4
-rw-r--r--npc/004-2-5/_mobs.txt8
-rw-r--r--npc/004-2-5/_warps.txt5
-rw-r--r--npc/004-2-6/_import.txt4
-rw-r--r--npc/004-2-6/_mobs.txt9
-rw-r--r--npc/004-2-6/_warps.txt5
-rw-r--r--npc/004-2-7/_import.txt4
-rw-r--r--npc/004-2-7/_mobs.txt7
-rw-r--r--npc/004-2-7/_warps.txt5
-rw-r--r--npc/004-2-8/_import.txt4
-rw-r--r--npc/004-2-8/_mobs.txt7
-rw-r--r--npc/004-2-8/_warps.txt5
-rw-r--r--npc/004-2-9/_import.txt4
-rw-r--r--npc/004-2-9/_mobs.txt8
-rw-r--r--npc/004-2-9/_warps.txt5
-rw-r--r--npc/004-2/_mobs.txt25
-rw-r--r--npc/004-2/_warps.txt46
-rw-r--r--npc/004-2/bug.txt27
-rw-r--r--npc/004-3-1/_import.txt4
-rw-r--r--npc/004-3-1/_mobs.txt9
-rw-r--r--npc/004-3-1/_warps.txt4
-rw-r--r--npc/004-3-2/_import.txt4
-rw-r--r--npc/004-3-2/_mobs.txt19
-rw-r--r--npc/004-3-2/_warps.txt13
-rw-r--r--npc/004-3-3/_import.txt4
-rw-r--r--npc/004-3-3/_mobs.txt5
-rw-r--r--npc/004-3-3/_warps.txt4
-rw-r--r--npc/004-3-4/_import.txt4
-rw-r--r--npc/004-3-4/_mobs.txt8
-rw-r--r--npc/004-3-4/_warps.txt4
-rw-r--r--npc/004-3-5/_import.txt4
-rw-r--r--npc/004-3-5/_mobs.txt5
-rw-r--r--npc/004-3-5/_warps.txt4
-rw-r--r--npc/004-3-6/_import.txt4
-rw-r--r--npc/004-3-6/_mobs.txt7
-rw-r--r--npc/004-3-6/_warps.txt4
-rw-r--r--npc/004-3/_import.txt4
-rw-r--r--npc/004-3/_mobs.txt4
-rw-r--r--npc/004-3/_warps.txt4
-rw-r--r--npc/007-1-1/_import.txt4
-rw-r--r--npc/007-1-1/_mobs.txt8
-rw-r--r--npc/007-1-1/_warps.txt6
-rw-r--r--npc/007-1-2/_import.txt4
-rw-r--r--npc/007-1-2/_mobs.txt7
-rw-r--r--npc/007-1-2/_warps.txt6
-rw-r--r--npc/007-1/_mobs.txt10
-rw-r--r--npc/007-1/_warps.txt4
-rw-r--r--npc/009-1/_mobs.txt12
-rw-r--r--npc/009-1/_warps.txt2
-rw-r--r--npc/010-1-1/_import.txt2
-rw-r--r--npc/010-1-1/_mobs.txt20
-rw-r--r--npc/010-1-1/_warps.txt43
-rw-r--r--npc/010-1-10/_import.txt4
-rw-r--r--npc/010-1-10/_mobs.txt5
-rw-r--r--npc/010-1-10/_warps.txt4
-rw-r--r--npc/010-1-11/_import.txt3
-rw-r--r--npc/010-1-11/_warps.txt3
-rw-r--r--npc/010-1-12/_import.txt3
-rw-r--r--npc/010-1-12/_warps.txt3
-rw-r--r--npc/010-1-2/_import.txt4
-rw-r--r--npc/010-1-2/_mobs.txt3
-rw-r--r--npc/010-1-2/_warps.txt11
-rw-r--r--npc/010-1-3/_import.txt4
-rw-r--r--npc/010-1-3/_mobs.txt11
-rw-r--r--npc/010-1-3/_warps.txt5
-rw-r--r--npc/010-1-4/_import.txt4
-rw-r--r--npc/010-1-4/_mobs.txt8
-rw-r--r--npc/010-1-4/_warps.txt4
-rw-r--r--npc/010-1-5/_import.txt4
-rw-r--r--npc/010-1-5/_mobs.txt12
-rw-r--r--npc/010-1-5/_warps.txt7
-rw-r--r--npc/010-1-6/_import.txt4
-rw-r--r--npc/010-1-6/_mobs.txt7
-rw-r--r--npc/010-1-6/_warps.txt10
-rw-r--r--npc/010-1-7/_import.txt4
-rw-r--r--npc/010-1-7/_mobs.txt10
-rw-r--r--npc/010-1-7/_warps.txt4
-rw-r--r--npc/010-1-8/_import.txt3
-rw-r--r--npc/010-1-8/_warps.txt3
-rw-r--r--npc/010-1-9/_import.txt3
-rw-r--r--npc/010-1-9/_warps.txt6
-rw-r--r--npc/010-1/_mobs.txt39
-rw-r--r--npc/010-1/_warps.txt61
-rw-r--r--npc/010-2-10/_import.txt4
-rw-r--r--npc/010-2-10/_mobs.txt7
-rw-r--r--npc/010-2-10/_warps.txt4
-rw-r--r--npc/010-2-11/_import.txt4
-rw-r--r--npc/010-2-11/_mobs.txt6
-rw-r--r--npc/010-2-11/_warps.txt4
-rw-r--r--npc/010-2-12/_import.txt4
-rw-r--r--npc/010-2-12/_mobs.txt4
-rw-r--r--npc/010-2-12/_warps.txt3
-rw-r--r--npc/010-2-13/_import.txt3
-rw-r--r--npc/010-2-13/_warps.txt4
-rw-r--r--npc/010-2-14/_import.txt4
-rw-r--r--npc/010-2-14/_mobs.txt6
-rw-r--r--npc/010-2-14/_warps.txt4
-rw-r--r--npc/010-2-15/_import.txt4
-rw-r--r--npc/010-2-15/_mobs.txt5
-rw-r--r--npc/010-2-15/_warps.txt4
-rw-r--r--npc/010-2-16/_import.txt4
-rw-r--r--npc/010-2-16/_mobs.txt14
-rw-r--r--npc/010-2-16/_warps.txt5
-rw-r--r--npc/010-2-2/_import.txt3
-rw-r--r--npc/010-2-2/_warps.txt10
-rw-r--r--npc/010-2-3/_import.txt4
-rw-r--r--npc/010-2-3/_mobs.txt12
-rw-r--r--npc/010-2-3/_warps.txt7
-rw-r--r--npc/010-2-4/_import.txt4
-rw-r--r--npc/010-2-4/_mobs.txt8
-rw-r--r--npc/010-2-4/_warps.txt5
-rw-r--r--npc/010-2-5/_import.txt3
-rw-r--r--npc/010-2-5/_warps.txt5
-rw-r--r--npc/010-2-6/_import.txt4
-rw-r--r--npc/010-2-6/_mobs.txt6
-rw-r--r--npc/010-2-6/_warps.txt5
-rw-r--r--npc/010-2-7/_import.txt4
-rw-r--r--npc/010-2-7/_mobs.txt8
-rw-r--r--npc/010-2-7/_warps.txt4
-rw-r--r--npc/010-2-8/_import.txt4
-rw-r--r--npc/010-2-8/_mobs.txt5
-rw-r--r--npc/010-2-8/_warps.txt4
-rw-r--r--npc/010-2-9/_import.txt4
-rw-r--r--npc/010-2-9/_mobs.txt7
-rw-r--r--npc/010-2-9/_warps.txt4
-rw-r--r--npc/010-2/_mobs.txt34
-rw-r--r--npc/010-2/_warps.txt74
-rw-r--r--npc/010-2/sawis.txt1
-rw-r--r--npc/010-3/_import.txt4
-rw-r--r--npc/010-3/_mobs.txt3
-rw-r--r--npc/010-3/_warps.txt4
-rw-r--r--npc/010-4-1/_import.txt3
-rw-r--r--npc/010-4-1/_warps.txt3
-rw-r--r--npc/010-4-2/_import.txt4
-rw-r--r--npc/010-4-2/_mobs.txt4
-rw-r--r--npc/010-4-2/_warps.txt4
-rw-r--r--npc/_import.txt49
224 files changed, 1486 insertions, 495 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 1f1bb24e7..5f7f090ac 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -48,7 +48,25 @@ map_list: (
"003-9",
"004-1",
"004-2-1",
+ "004-2-10",
+ "004-2-11",
+ "004-2-12",
+ "004-2-2",
+ "004-2-3",
+ "004-2-4",
+ "004-2-5",
+ "004-2-6",
+ "004-2-7",
+ "004-2-8",
+ "004-2-9",
"004-2",
+ "004-3-1",
+ "004-3-2",
+ "004-3-3",
+ "004-3-4",
+ "004-3-5",
+ "004-3-6",
+ "004-3",
"005-1-1",
"005-1",
"005-2-1",
@@ -76,6 +94,8 @@ map_list: (
"006-7",
"006-8",
"006-9",
+ "007-1-1",
+ "007-1-2",
"007-1",
"007-2",
"008-0",
@@ -89,8 +109,37 @@ map_list: (
"009-6",
"009-7",
"010-1-1",
+ "010-1-10",
+ "010-1-11",
+ "010-1-12",
+ "010-1-2",
+ "010-1-3",
+ "010-1-4",
+ "010-1-5",
+ "010-1-6",
+ "010-1-7",
+ "010-1-8",
+ "010-1-9",
"010-1",
+ "010-2-10",
+ "010-2-11",
+ "010-2-12",
+ "010-2-13",
+ "010-2-14",
+ "010-2-15",
+ "010-2-16",
+ "010-2-2",
+ "010-2-3",
+ "010-2-4",
+ "010-2-5",
+ "010-2-6",
+ "010-2-7",
+ "010-2-8",
+ "010-2-9",
"010-2",
+ "010-3",
+ "010-4-1",
+ "010-4-2",
"011-1",
"011-2",
"011-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index ce4d85927..fc45a1830 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -45,244 +45,293 @@
003-9 45
004-1 46
004-2-1 47
-004-2 48
-005-1-1 49
-005-1 50
-005-2-1 51
-005-2 52
-005-3 53
-005-4 54
-005-5 55
-005-6 56
-005-7 57
-006-0 58
-006-1 59
-006-10 60
-006-2-1 61
-006-2-2 62
-006-2-3 63
-006-2-4 64
-006-2-5 65
-006-2-6 66
-006-2 67
-006-3 68
-006-4-1 69
-006-4 70
-006-5 71
-006-6 72
-006-7 73
-006-8 74
-006-9 75
-007-1 76
-007-2 77
-008-0 78
-008-1 79
-008-2 80
-009-1 81
-009-2 82
-009-3 83
-009-4 84
-009-5 85
-009-6 86
-009-7 87
-010-1-1 88
-010-1 89
-010-2 90
-011-1 91
-011-2 92
-011-3 93
-012-1 94
-012-2 95
-012-3 96
-012-4 97
-012-5 98
-012-6 99
-012-7 100
-012-8 101
-013-1 102
-014-1 103
-014-2-1 104
-014-2 105
-014-3 106
-014-4 107
-014-5-1 108
-014-5 109
-015-1 110
-015-2 111
-015-3-1 112
-015-3-2 113
-015-3-3 114
-015-3 115
-015-4 116
-015-5 117
-015-6 118
-015-7 119
-015-8-1 120
-015-8 121
-016-1 122
-016-6 123
-016-7 124
-017-0 125
-017-1 126
-017-10 127
-017-2-1 128
-017-2-2 129
-017-2 130
-017-3 131
-017-4 132
-017-5 133
-017-6 134
-017-7 135
-017-8 136
-018-1-1 137
-018-1 138
-018-2-1 139
-018-2-2 140
-018-2-3 141
-018-2-4 142
-018-2-5 143
-018-2-6 144
-018-2-7 145
-018-2-8 146
-018-2 147
-018-3 148
-018-4-1 149
-018-4-2 150
-018-4 151
-018-5-0 152
-018-5-1 153
-018-5-2 154
-018-5-3 155
-018-5-4 156
-018-5-5 157
-018-5-boss 158
-018-5 159
-018-6-0 160
-018-6-1 161
-018-6-2 162
-018-6-3 163
-018-7-1 164
-018-7 165
-019-1-1 166
-019-1 167
-019-2 168
-019-3 169
-019-4-1 170
-019-4 171
-020-1 172
-020-2 173
-020-3 174
-020-4 175
-020-5 176
-020-6 177
-020-7-1 178
-020-7-2 179
-020-7 180
-021-0 181
-021-1 182
-021-2 183
-021-3 184
-021-4 185
-022-1 186
-023-1 187
-023-2 188
-023-3-1 189
-023-3-2 190
-023-3 191
-023-4 192
-024-1 193
-024-10 194
-024-11 195
-024-12 196
-024-13 197
-024-14 198
-024-15 199
-024-16 200
-024-2 201
-024-3 202
-024-4 203
-024-5 204
-024-6 205
-024-7 206
-024-8 207
-024-9 208
-025-1 209
-025-2-1 210
-025-2-2 211
-025-2-3 212
-025-2-4 213
-025-2 214
-025-3 215
-026-0 216
-026-1 217
-026-2 218
-027-0 219
-027-1 220
-027-2 221
-027-3 222
-027-4 223
-029-0 224
-029-1 225
-029-2 226
-029-3 227
-029-4 228
-029-5 229
-029-6 230
-029-7 231
-029-8 232
-029-9 233
-030-01 234
-030-02 235
-030-03 236
-030-04 237
-030-05 238
-030-06 239
-030-07 240
-030-08 241
-030-09 242
-030-10 243
-030-11 244
-030-12 245
-030-13 246
-030-14 247
-030-15 248
-030-16 249
-030-17 250
-030-18 251
-030-19 252
-030-20 253
-030-21 254
-030-22 255
-030-23 256
-030-24 257
-031-0 258
-031-1 259
-031-2 260
-031-3 261
-031-4 262
-031-5 263
-031-6 264
-031-7 265
-031-8 266
-031-9 267
-032-1 268
-042-0 269
-042-1 270
-042-10 271
-042-11 272
-042-2 273
-042-3 274
-042-4 275
-042-5 276
-042-6 277
-042-7 278
-042-8 279
-042-9 280
-boss 281
-botcheck 282
-guilds 283
-sec_pri 284
-soren-2 285
-soren 286
-test 287
-testbg 288
+004-2-10 48
+004-2-11 49
+004-2-12 50
+004-2-2 51
+004-2-3 52
+004-2-4 53
+004-2-5 54
+004-2-6 55
+004-2-7 56
+004-2-8 57
+004-2-9 58
+004-2 59
+004-3-1 60
+004-3-2 61
+004-3-3 62
+004-3-4 63
+004-3-5 64
+004-3-6 65
+004-3 66
+005-1-1 67
+005-1 68
+005-2-1 69
+005-2 70
+005-3 71
+005-4 72
+005-5 73
+005-6 74
+005-7 75
+006-0 76
+006-1 77
+006-10 78
+006-2-1 79
+006-2-2 80
+006-2-3 81
+006-2-4 82
+006-2-5 83
+006-2-6 84
+006-2 85
+006-3 86
+006-4-1 87
+006-4 88
+006-5 89
+006-6 90
+006-7 91
+006-8 92
+006-9 93
+007-1-1 94
+007-1-2 95
+007-1 96
+007-2 97
+008-0 98
+008-1 99
+008-2 100
+009-1 101
+009-2 102
+009-3 103
+009-4 104
+009-5 105
+009-6 106
+009-7 107
+010-1-1 108
+010-1-10 109
+010-1-11 110
+010-1-12 111
+010-1-2 112
+010-1-3 113
+010-1-4 114
+010-1-5 115
+010-1-6 116
+010-1-7 117
+010-1-8 118
+010-1-9 119
+010-1 120
+010-2-10 121
+010-2-11 122
+010-2-12 123
+010-2-13 124
+010-2-14 125
+010-2-15 126
+010-2-16 127
+010-2-2 128
+010-2-3 129
+010-2-4 130
+010-2-5 131
+010-2-6 132
+010-2-7 133
+010-2-8 134
+010-2-9 135
+010-2 136
+010-3 137
+010-4-1 138
+010-4-2 139
+011-1 140
+011-2 141
+011-3 142
+012-1 143
+012-2 144
+012-3 145
+012-4 146
+012-5 147
+012-6 148
+012-7 149
+012-8 150
+013-1 151
+014-1 152
+014-2-1 153
+014-2 154
+014-3 155
+014-4 156
+014-5-1 157
+014-5 158
+015-1 159
+015-2 160
+015-3-1 161
+015-3-2 162
+015-3-3 163
+015-3 164
+015-4 165
+015-5 166
+015-6 167
+015-7 168
+015-8-1 169
+015-8 170
+016-1 171
+016-6 172
+016-7 173
+017-0 174
+017-1 175
+017-10 176
+017-2-1 177
+017-2-2 178
+017-2 179
+017-3 180
+017-4 181
+017-5 182
+017-6 183
+017-7 184
+017-8 185
+018-1-1 186
+018-1 187
+018-2-1 188
+018-2-2 189
+018-2-3 190
+018-2-4 191
+018-2-5 192
+018-2-6 193
+018-2-7 194
+018-2-8 195
+018-2 196
+018-3 197
+018-4-1 198
+018-4-2 199
+018-4 200
+018-5-0 201
+018-5-1 202
+018-5-2 203
+018-5-3 204
+018-5-4 205
+018-5-5 206
+018-5-boss 207
+018-5 208
+018-6-0 209
+018-6-1 210
+018-6-2 211
+018-6-3 212
+018-7-1 213
+018-7 214
+019-1-1 215
+019-1 216
+019-2 217
+019-3 218
+019-4-1 219
+019-4 220
+020-1 221
+020-2 222
+020-3 223
+020-4 224
+020-5 225
+020-6 226
+020-7-1 227
+020-7-2 228
+020-7 229
+021-0 230
+021-1 231
+021-2 232
+021-3 233
+021-4 234
+022-1 235
+023-1 236
+023-2 237
+023-3-1 238
+023-3-2 239
+023-3 240
+023-4 241
+024-1 242
+024-10 243
+024-11 244
+024-12 245
+024-13 246
+024-14 247
+024-15 248
+024-16 249
+024-2 250
+024-3 251
+024-4 252
+024-5 253
+024-6 254
+024-7 255
+024-8 256
+024-9 257
+025-1 258
+025-2-1 259
+025-2-2 260
+025-2-3 261
+025-2-4 262
+025-2 263
+025-3 264
+026-0 265
+026-1 266
+026-2 267
+027-0 268
+027-1 269
+027-2 270
+027-3 271
+027-4 272
+029-0 273
+029-1 274
+029-2 275
+029-3 276
+029-4 277
+029-5 278
+029-6 279
+029-7 280
+029-8 281
+029-9 282
+030-01 283
+030-02 284
+030-03 285
+030-04 286
+030-05 287
+030-06 288
+030-07 289
+030-08 290
+030-09 291
+030-10 292
+030-11 293
+030-12 294
+030-13 295
+030-14 296
+030-15 297
+030-16 298
+030-17 299
+030-18 300
+030-19 301
+030-20 302
+030-21 303
+030-22 304
+030-23 305
+030-24 306
+031-0 307
+031-1 308
+031-2 309
+031-3 310
+031-4 311
+031-5 312
+031-6 313
+031-7 314
+031-8 315
+031-9 316
+032-1 317
+042-0 318
+042-1 319
+042-10 320
+042-11 321
+042-2 322
+042-3 323
+042-4 324
+042-5 325
+042-6 326
+042-7 327
+042-8 328
+042-9 329
+boss 330
+botcheck 331
+guilds 332
+sec_pri 333
+soren-2 334
+soren 335
+test 336
+testbg 337
diff --git a/maps/re/004-1.mcache b/maps/re/004-1.mcache
index 36d355436..2a3f53459 100644
--- a/maps/re/004-1.mcache
+++ b/maps/re/004-1.mcache
Binary files differ
diff --git a/maps/re/004-2-1.mcache b/maps/re/004-2-1.mcache
index 08dfe15b1..fe59c51d0 100644
--- a/maps/re/004-2-1.mcache
+++ b/maps/re/004-2-1.mcache
Binary files differ
diff --git a/maps/re/004-2-10.mcache b/maps/re/004-2-10.mcache
new file mode 100644
index 000000000..09121164f
--- /dev/null
+++ b/maps/re/004-2-10.mcache
Binary files differ
diff --git a/maps/re/004-2-11.mcache b/maps/re/004-2-11.mcache
new file mode 100644
index 000000000..cbb13c114
--- /dev/null
+++ b/maps/re/004-2-11.mcache
Binary files differ
diff --git a/maps/re/004-2-12.mcache b/maps/re/004-2-12.mcache
new file mode 100644
index 000000000..fce68fd8a
--- /dev/null
+++ b/maps/re/004-2-12.mcache
Binary files differ
diff --git a/maps/re/004-2-2.mcache b/maps/re/004-2-2.mcache
new file mode 100644
index 000000000..ccd72c191
--- /dev/null
+++ b/maps/re/004-2-2.mcache
Binary files differ
diff --git a/maps/re/004-2-3.mcache b/maps/re/004-2-3.mcache
new file mode 100644
index 000000000..539d9b1fe
--- /dev/null
+++ b/maps/re/004-2-3.mcache
Binary files differ
diff --git a/maps/re/004-2-4.mcache b/maps/re/004-2-4.mcache
new file mode 100644
index 000000000..de6ffc11b
--- /dev/null
+++ b/maps/re/004-2-4.mcache
Binary files differ
diff --git a/maps/re/004-2-5.mcache b/maps/re/004-2-5.mcache
new file mode 100644
index 000000000..9490a1aef
--- /dev/null
+++ b/maps/re/004-2-5.mcache
Binary files differ
diff --git a/maps/re/004-2-6.mcache b/maps/re/004-2-6.mcache
new file mode 100644
index 000000000..80ce148d5
--- /dev/null
+++ b/maps/re/004-2-6.mcache
Binary files differ
diff --git a/maps/re/004-2-7.mcache b/maps/re/004-2-7.mcache
new file mode 100644
index 000000000..bd54d9c55
--- /dev/null
+++ b/maps/re/004-2-7.mcache
Binary files differ
diff --git a/maps/re/004-2-8.mcache b/maps/re/004-2-8.mcache
new file mode 100644
index 000000000..748c45994
--- /dev/null
+++ b/maps/re/004-2-8.mcache
Binary files differ
diff --git a/maps/re/004-2-9.mcache b/maps/re/004-2-9.mcache
new file mode 100644
index 000000000..fe91743c5
--- /dev/null
+++ b/maps/re/004-2-9.mcache
Binary files differ
diff --git a/maps/re/004-2.mcache b/maps/re/004-2.mcache
index d3ba00b17..e2a07df63 100644
--- a/maps/re/004-2.mcache
+++ b/maps/re/004-2.mcache
Binary files differ
diff --git a/maps/re/004-3-1.mcache b/maps/re/004-3-1.mcache
new file mode 100644
index 000000000..adca45def
--- /dev/null
+++ b/maps/re/004-3-1.mcache
Binary files differ
diff --git a/maps/re/004-3-2.mcache b/maps/re/004-3-2.mcache
new file mode 100644
index 000000000..e93ea8e1a
--- /dev/null
+++ b/maps/re/004-3-2.mcache
Binary files differ
diff --git a/maps/re/004-3-3.mcache b/maps/re/004-3-3.mcache
new file mode 100644
index 000000000..52f904fce
--- /dev/null
+++ b/maps/re/004-3-3.mcache
Binary files differ
diff --git a/maps/re/004-3-4.mcache b/maps/re/004-3-4.mcache
new file mode 100644
index 000000000..a5b7feda8
--- /dev/null
+++ b/maps/re/004-3-4.mcache
Binary files differ
diff --git a/maps/re/004-3-5.mcache b/maps/re/004-3-5.mcache
new file mode 100644
index 000000000..49a8e77dc
--- /dev/null
+++ b/maps/re/004-3-5.mcache
Binary files differ
diff --git a/maps/re/004-3-6.mcache b/maps/re/004-3-6.mcache
new file mode 100644
index 000000000..1ab8e51cb
--- /dev/null
+++ b/maps/re/004-3-6.mcache
Binary files differ
diff --git a/maps/re/004-3.mcache b/maps/re/004-3.mcache
new file mode 100644
index 000000000..ad4bd5b19
--- /dev/null
+++ b/maps/re/004-3.mcache
Binary files differ
diff --git a/maps/re/007-1-1.mcache b/maps/re/007-1-1.mcache
new file mode 100644
index 000000000..5e1698ac9
--- /dev/null
+++ b/maps/re/007-1-1.mcache
Binary files differ
diff --git a/maps/re/007-1-2.mcache b/maps/re/007-1-2.mcache
new file mode 100644
index 000000000..fb7a104b1
--- /dev/null
+++ b/maps/re/007-1-2.mcache
Binary files differ
diff --git a/maps/re/007-1.mcache b/maps/re/007-1.mcache
index 5e7a0766c..ba38a8afa 100644
--- a/maps/re/007-1.mcache
+++ b/maps/re/007-1.mcache
Binary files differ
diff --git a/maps/re/010-1-1.mcache b/maps/re/010-1-1.mcache
index 6d6669a77..7dca28b9c 100644
--- a/maps/re/010-1-1.mcache
+++ b/maps/re/010-1-1.mcache
Binary files differ
diff --git a/maps/re/010-1-10.mcache b/maps/re/010-1-10.mcache
new file mode 100644
index 000000000..b4e57d7eb
--- /dev/null
+++ b/maps/re/010-1-10.mcache
Binary files differ
diff --git a/maps/re/010-1-11.mcache b/maps/re/010-1-11.mcache
new file mode 100644
index 000000000..31586d280
--- /dev/null
+++ b/maps/re/010-1-11.mcache
Binary files differ
diff --git a/maps/re/010-1-12.mcache b/maps/re/010-1-12.mcache
new file mode 100644
index 000000000..07724b488
--- /dev/null
+++ b/maps/re/010-1-12.mcache
Binary files differ
diff --git a/maps/re/010-1-2.mcache b/maps/re/010-1-2.mcache
new file mode 100644
index 000000000..8aa03e1a0
--- /dev/null
+++ b/maps/re/010-1-2.mcache
Binary files differ
diff --git a/maps/re/010-1-3.mcache b/maps/re/010-1-3.mcache
new file mode 100644
index 000000000..921063a0d
--- /dev/null
+++ b/maps/re/010-1-3.mcache
Binary files differ
diff --git a/maps/re/010-1-4.mcache b/maps/re/010-1-4.mcache
new file mode 100644
index 000000000..ccd33c04d
--- /dev/null
+++ b/maps/re/010-1-4.mcache
Binary files differ
diff --git a/maps/re/010-1-5.mcache b/maps/re/010-1-5.mcache
new file mode 100644
index 000000000..cd87a65f0
--- /dev/null
+++ b/maps/re/010-1-5.mcache
Binary files differ
diff --git a/maps/re/010-1-6.mcache b/maps/re/010-1-6.mcache
new file mode 100644
index 000000000..b65d99b4b
--- /dev/null
+++ b/maps/re/010-1-6.mcache
Binary files differ
diff --git a/maps/re/010-1-7.mcache b/maps/re/010-1-7.mcache
new file mode 100644
index 000000000..4fddbf432
--- /dev/null
+++ b/maps/re/010-1-7.mcache
Binary files differ
diff --git a/maps/re/010-1-8.mcache b/maps/re/010-1-8.mcache
new file mode 100644
index 000000000..e6dcc495c
--- /dev/null
+++ b/maps/re/010-1-8.mcache
Binary files differ
diff --git a/maps/re/010-1-9.mcache b/maps/re/010-1-9.mcache
new file mode 100644
index 000000000..f06200c6a
--- /dev/null
+++ b/maps/re/010-1-9.mcache
Binary files differ
diff --git a/maps/re/010-1.mcache b/maps/re/010-1.mcache
index 269a637a0..b52f0e05c 100644
--- a/maps/re/010-1.mcache
+++ b/maps/re/010-1.mcache
Binary files differ
diff --git a/maps/re/010-2-10.mcache b/maps/re/010-2-10.mcache
new file mode 100644
index 000000000..cf8fff466
--- /dev/null
+++ b/maps/re/010-2-10.mcache
Binary files differ
diff --git a/maps/re/010-2-11.mcache b/maps/re/010-2-11.mcache
new file mode 100644
index 000000000..512e98492
--- /dev/null
+++ b/maps/re/010-2-11.mcache
Binary files differ
diff --git a/maps/re/010-2-12.mcache b/maps/re/010-2-12.mcache
new file mode 100644
index 000000000..e8cfadfa2
--- /dev/null
+++ b/maps/re/010-2-12.mcache
Binary files differ
diff --git a/maps/re/010-2-13.mcache b/maps/re/010-2-13.mcache
new file mode 100644
index 000000000..852da0227
--- /dev/null
+++ b/maps/re/010-2-13.mcache
Binary files differ
diff --git a/maps/re/010-2-14.mcache b/maps/re/010-2-14.mcache
new file mode 100644
index 000000000..f4dffc9e8
--- /dev/null
+++ b/maps/re/010-2-14.mcache
Binary files differ
diff --git a/maps/re/010-2-15.mcache b/maps/re/010-2-15.mcache
new file mode 100644
index 000000000..be3efcd38
--- /dev/null
+++ b/maps/re/010-2-15.mcache
Binary files differ
diff --git a/maps/re/010-2-16.mcache b/maps/re/010-2-16.mcache
new file mode 100644
index 000000000..44786f817
--- /dev/null
+++ b/maps/re/010-2-16.mcache
Binary files differ
diff --git a/maps/re/010-2-2.mcache b/maps/re/010-2-2.mcache
new file mode 100644
index 000000000..2f288e667
--- /dev/null
+++ b/maps/re/010-2-2.mcache
Binary files differ
diff --git a/maps/re/010-2-3.mcache b/maps/re/010-2-3.mcache
new file mode 100644
index 000000000..80bae1ed5
--- /dev/null
+++ b/maps/re/010-2-3.mcache
Binary files differ
diff --git a/maps/re/010-2-4.mcache b/maps/re/010-2-4.mcache
new file mode 100644
index 000000000..3eb21e65e
--- /dev/null
+++ b/maps/re/010-2-4.mcache
Binary files differ
diff --git a/maps/re/010-2-5.mcache b/maps/re/010-2-5.mcache
new file mode 100644
index 000000000..b32969a01
--- /dev/null
+++ b/maps/re/010-2-5.mcache
Binary files differ
diff --git a/maps/re/010-2-6.mcache b/maps/re/010-2-6.mcache
new file mode 100644
index 000000000..d881681a1
--- /dev/null
+++ b/maps/re/010-2-6.mcache
Binary files differ
diff --git a/maps/re/010-2-7.mcache b/maps/re/010-2-7.mcache
new file mode 100644
index 000000000..ef0c29b21
--- /dev/null
+++ b/maps/re/010-2-7.mcache
Binary files differ
diff --git a/maps/re/010-2-8.mcache b/maps/re/010-2-8.mcache
new file mode 100644
index 000000000..68cb5cc96
--- /dev/null
+++ b/maps/re/010-2-8.mcache
Binary files differ
diff --git a/maps/re/010-2-9.mcache b/maps/re/010-2-9.mcache
new file mode 100644
index 000000000..64c0a5c30
--- /dev/null
+++ b/maps/re/010-2-9.mcache
Binary files differ
diff --git a/maps/re/010-2.mcache b/maps/re/010-2.mcache
index 10cf32946..f665f6191 100644
--- a/maps/re/010-2.mcache
+++ b/maps/re/010-2.mcache
Binary files differ
diff --git a/maps/re/010-3.mcache b/maps/re/010-3.mcache
new file mode 100644
index 000000000..9088c723c
--- /dev/null
+++ b/maps/re/010-3.mcache
Binary files differ
diff --git a/maps/re/010-4-1.mcache b/maps/re/010-4-1.mcache
new file mode 100644
index 000000000..714500de5
--- /dev/null
+++ b/maps/re/010-4-1.mcache
Binary files differ
diff --git a/maps/re/010-4-2.mcache b/maps/re/010-4-2.mcache
new file mode 100644
index 000000000..141f08c53
--- /dev/null
+++ b/maps/re/010-4-2.mcache
Binary files differ
diff --git a/npc/003-1-1/_warps.txt b/npc/003-1-1/_warps.txt
index ba1bf5579..d2cbe9c6a 100644
--- a/npc/003-1-1/_warps.txt
+++ b/npc/003-1-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 003-1-1: Tulimshar Sewers warps
-003-1-1,143,127,0 warp #003-1-1_143_127 0,0,003-1,115,111
+003-1-1,29,62,0 warp #003-1-1_29_62 0,0,004-1,55,21
003-1-1,57,99,0 warp #003-1-1_57_99 0,0,003-1,56,84
-003-1-1,29,62,0 warp #003-1-1_29_62 0,0,004-1,49,21
003-1-1,44,143,0 warp #003-1-1_44_143 0,0,008-0,41,23
+003-1-1,143,127,0 warp #003-1-1_143_127 0,0,003-1,115,111
diff --git a/npc/003-1/_mobs.txt b/npc/003-1/_mobs.txt
index 979fa58e1..e31299dbb 100644
--- a/npc/003-1/_mobs.txt
+++ b/npc/003-1/_mobs.txt
@@ -1,20 +1,20 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 003-1: Tulimshar mobs
-003-1,84,106,33,48 monster Maggot 1030,42,35000,450000
+003-1,0,0,0,0 monster Maggot 1030,65,35000,450000
003-1,81,103,2,3 monster Croc 1006,1,35000,90000
-003-1,67,27,3,4 monster Four Leaf 1028,1,30000,20000
003-1,72,70,7,4 monster Piou 1002,2,20000,20000
003-1,85,136,8,11 monster Duck 1029,2,30000,20000
-003-1,109,145,7,4 monster Giant Maggot 1031,1,30000,20000
+003-1,110,145,7,4 monster Giant Maggot 1031,1,30000,20000
003-1,67,121,2,3 monster Croc 1006,1,35000,90000
003-1,39,101,8,11 monster Blub 1008,2,35000,150000
-003-1,25,73,8,25 monster Little Blub 1007,6,35000,150000
+003-1,25,73,8,25 monster Little Blub 1007,7,35000,150000
003-1,37,70,3,13 monster Toppy Blub 1009,2,35000,150000
003-1,64,58,4,1 monster Croc 1006,1,35000,90000
003-1,109,24,9,4 monster Piou 1002,3,30000,20000
003-1,82,116,9,11 monster Duck 1029,4,30000,20000
-003-1,108,43,9,11 monster Duck 1029,3,30000,20000
+003-1,109,45,12,13 monster Duck 1029,4,30000,20000
003-1,110,42,4,1 monster Croc 1006,1,35000,90000
003-1,70,106,6,3 monster Crocotree 1010,2,5000,150000
003-1,63,76,3,4 monster Croc 1006,1,35000,120000
003-1,99,75,2,7 monster Croc 1006,1,35000,120000
+003-1,67,27,3,4 monster Four Leaf 1028,1,30000,20000
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 2b9dc08e6..a724dd23c 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -1,26 +1,26 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 003-1: Tulimshar warps
-003-1,49,72,0 warp #003-1_49_72 0,0,003-2,35,40
-003-1,46,72,0 warp #003-1_46_72 0,0,003-2,32,40
-003-1,52,72,0 warp #003-1_52_72 0,0,003-2,38,40
-003-1,56,99,0 warp #003-1_56_99 0,0,003-3,39,40
+003-1,60,157,0 warp #003-1_60_157 4,0,004-1,69,57
003-1,54,137,0 warp #003-1_54_137 0,0,003-4,39,38
+003-1,70,137,0 warp #003-1_70_137 0,0,003-9,62,135
+003-1,64,130,0 warp #003-1_64_130 0,0,003-9,36,56
003-1,51,120,0 warp #003-1_51_120 0,0,003-1-2,19,35
-003-1,81,120,0 warp #003-1_81_120 0,0,003-1-2,33,35
-003-1,96,143,0 warp #003-1_96_143 0,0,003-5,38,40
-003-1,106,146,0 warp #003-1_106_146 0,0,003-6,32,38
-003-1,112,146,0 warp #003-1_112_146 0,0,003-6,40,38
-003-1,111,136,0 warp #003-1_111_136 0,0,003-7,39,40
-003-1,107,132,0 warp #003-1_107_132 0,0,003-7,29,31
-003-1,110,100,0 warp #003-1_110_100 0,0,003-8,31,43
+003-1,56,99,0 warp #003-1_56_99 0,0,003-3,39,40
+003-1,46,72,0 warp #003-1_46_72 0,0,003-2,32,40
+003-1,49,72,0 warp #003-1_49_72 0,0,003-2,35,40
+003-1,52,72,0 warp #003-1_52_72 0,0,003-2,38,40
003-1,51,65,0 warp #003-1_51_65 0,0,003-2,42,34
-003-1,115,88,0 warp #003-1_115_88 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,37,85
+003-1,58,54,0 warp #003-1_58_54 0,0,003-1-3,82,82
003-1,52,35,0 warp #003-1_52_35 1,0,003-0-1,48,51
003-1,49,23,0 warp #003-1_49_23 0,0,003-0-1,22,25
003-1,54,23,0 warp #003-1_54_23 0,0,003-0-1,69,24
-003-1,70,137,0 warp #003-1_70_137 0,0,003-9,62,135
-003-1,64,130,0 warp #003-1_64_130 0,0,003-9,36,56
+003-1,115,88,0 warp #003-1_115_88 0,0,003-8,41,28
+003-1,110,100,0 warp #003-1_110_100 0,0,003-8,31,43
+003-1,116,120,0 warp #003-1_116_120 0,0,003-1-2,48,35
+003-1,81,120,0 warp #003-1_81_120 0,0,003-1-2,33,35
+003-1,111,136,0 warp #003-1_111_136 0,0,003-7,39,40
+003-1,107,132,0 warp #003-1_107_132 0,0,003-7,29,31
+003-1,96,143,0 warp #003-1_96_143 0,0,003-5,38,40
+003-1,106,146,0 warp #003-1_106_146 0,0,003-6,32,38
+003-1,112,146,0 warp #003-1_112_146 0,0,003-6,40,38
diff --git a/npc/004-1/_mobs.txt b/npc/004-1/_mobs.txt
index d46e67e7c..261dc2b27 100644
--- a/npc/004-1/_mobs.txt
+++ b/npc/004-1/_mobs.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 004-1: Tulimshar mobs
-004-1,84,66,33,48 monster Maggot 1030,47,35000,420000
-004-1,44,26,7,5 monster Croc 1006,3,25000,60000
-004-1,38,77,8,21 monster Scorpion 1071,20,35000,270000
-004-1,108,65,10,7 monster Giant Maggot 1031,4,35000,270000
-004-1,106,114,11,7 monster Golden Scorpion 1078,1,99000,300000
-004-1,76,102,18,16 monster Fire Goblin 1067,7,45000,45000
-004-1,40,106,19,12 monster Red Scorpion 1072,3,95000,60000
+004-1,0,0,0,0 monster Maggot 1030,50,35000,420000
+004-1,48,35,5,13 monster Croc 1006,3,25000,60000
+004-1,49,77,10,21 monster Scorpion 1071,20,35000,270000
+004-1,109,66,15,8 monster Giant Maggot 1031,4,35000,270000
+004-1,112,113,12,5 monster Golden Scorpion 1078,1,99000,300000
+004-1,84,98,18,15 monster Fire Goblin 1067,6,45000,45000
+004-1,45,106,19,12 monster Red Scorpion 1072,3,95000,60000
diff --git a/npc/004-1/_warps.txt b/npc/004-1/_warps.txt
index 03cef589f..4acf882d4 100644
--- a/npc/004-1/_warps.txt
+++ b/npc/004-1/_warps.txt
@@ -1,7 +1,8 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 004-1: Tulimshar warps
-004-1,63,56,0 warp #004-1_63_56 4,0,003-1,60,156
-004-1,92,114,0 warp #004-1_92_114 0,0,007-1,90,51
-004-1,33,109,0 warp #004-1_33_109 0,0,007-1,56,36
-004-1,120,95,0 warp #004-1_120_95 0,2,004-2,21,48
-004-1,49,20,0 warp #004-1_49_20 0,0,003-1-1,29,61
+004-1,126,95,0 warp #004-1_126_95 0,2,004-2,31,51
+004-1,55,20,0 warp #004-1_55_20 0,0,003-1-1,29,61
+004-1,69,56,0 warp #004-1_69_56 4,0,003-1,60,156
+004-1,39,109,0 warp #004-1_39_109 0,0,007-1,56,36
+004-1,98,114,0 warp #004-1_98_114 0,0,007-1,90,51
+004-1,119,107,0 warp #004-1_119_107 0,0,007-1-1,35,37
diff --git a/npc/004-1/anwar.txt b/npc/004-1/anwar.txt
index 47ca64255..ca5371e04 100644
--- a/npc/004-1/anwar.txt
+++ b/npc/004-1/anwar.txt
@@ -5,7 +5,7 @@
// Description:
// Part of Anwar Field quest
-004-1,107,67,0 script Anwar NPC_RAIJIN,{
+004-1,113,67,0 script Anwar NPC_RAIJIN,{
.@q=getq(TulimsharQuest_AnwarField);
if (BaseLevel < 18) goto L_Weak;
@@ -139,79 +139,79 @@ OnInit:
.sex = G_MALE;
.distance = 5;
- initpath "move", 93, 84,//A
+ initpath "move", 99, 84,//A
"dir", RIGHT, 0,
"wait", 30, 0,
- "move", 84, 60,//C
+ "move", 90, 60,//C
"dir", UP, 0,
"wait", 12, 0,
- "move", 117, 64,//K
+ "move", 123, 64,//K
"dir", LEFT, 0,
"wait", 8, 0,
- "move", 95, 84,//B
+ "move", 101, 84,//B
"dir", DOWN, 0,
"wait", 29, 0,
- "move", 92, 68,//R
+ "move", 98, 68,//R
"dir", DOWN, 0,
"wait", 14, 0,
- "move", 94, 80,//F
+ "move", 100, 80,//F
"dir", UP, 0,
"wait", 13, 0,
- "move", 130, 73,//I
+ "move", 136, 73,//I
"dir", DOWN, 0,
"wait", 14, 0,
- "move", 95, 84,//B
+ "move", 101, 84,//B
"dir", DOWN, 0,
"wait", 28, 0,
- "move", 93, 64,//D
+ "move", 99, 64,//D
"dir", UP, 0,
"wait", 11, 0,
- "move", 108, 60,//M
+ "move", 114, 60,//M
"dir", RIGHT, 0,
"wait", 8, 0,
- "move", 93, 84,//A
+ "move", 99, 84,//A
"dir", RIGHT, 0,
"wait", 27, 0,
- "move", 98, 60,//O
+ "move", 104, 60,//O
"dir", UP, 0,
"wait", 18, 0,
- "move", 89, 62,//P
+ "move", 95, 62,//P
"dir", DOWN, 0,
"wait", 7, 0,
- "move", 95, 84,//B
+ "move", 101, 84,//B
"dir", DOWN, 0,
"wait", 26, 0,
- "move", 85, 66,//Q
+ "move", 91, 66,//Q
"dir", UP, 0,
"wait", 21, 0,
- "move", 89, 82,//G
+ "move", 95, 82,//G
"dir", UP, 0,
"wait", 10, 0,
- "move", 93, 84,//A
+ "move", 99, 84,//A
"dir", RIGHT, 0,
"wait", 25, 0,
- "move", 105, 78,//H
+ "move", 111, 78,//H
"dir", UP, 0,
"wait", 17, 0,
- "move", 114, 63,//L
+ "move", 120, 63,//L
"dir", UP, 0,
"wait", 1, 0,
- "move", 95, 84,//B
+ "move", 101, 84,//B
"dir", DOWN, 0,
"wait", 24, 0,
- "move", 109, 69,//J
+ "move", 115, 69,//J
"dir", DOWN, 0,
"wait", 15, 0,
- "move", 104, 63,//N
+ "move", 110, 63,//N
"dir", LEFT, 0,
"wait", 1, 0,
- "move", 95, 84,//B
+ "move", 101, 84,//B
"dir", DOWN, 0,
"wait", 23, 0,
- "move", 94, 80,//F
+ "move", 100, 80,//F
"dir", UP, 0,
"wait", 9, 0,
- "move", 75, 63,//S
+ "move", 81, 63,//S
"dir", UP, 0,
"wait", 15, 0;
diff --git a/npc/004-1/elanore.txt b/npc/004-1/elanore.txt
index 1617f2316..8f690bed2 100644
--- a/npc/004-1/elanore.txt
+++ b/npc/004-1/elanore.txt
@@ -2,7 +2,7 @@
// Author:
// Jesusalva
-004-1,75,62,0 script Elanore the Healer NPC_FEMALE,{
+004-1,80,62,0 script Elanore the Healer NPC_FEMALE,{
.@price=Nurse(.name$, 10, 5, 1);
mesq l("For you, it'll be @@ GP.", .@price);
mes "";
diff --git a/npc/004-1/sign.txt b/npc/004-1/sign.txt
index 4c0057355..649b229c0 100644
--- a/npc/004-1/sign.txt
+++ b/npc/004-1/sign.txt
@@ -4,7 +4,7 @@
// Description:
// Sign
-004-1,65,74,0 script Sign#HalinarzoGoto NPC_SWORDS_SIGN,{
+004-1,70,74,0 script Sign#HalinarzoGoto NPC_SWORDS_SIGN,{
mesc "↑ "+l("Tulimshar");
mesc "→ "+l("Halinarzo Route");
mesc "← "+l("Tulimshar Beach");
diff --git a/npc/004-2-1/_import.txt b/npc/004-2-1/_import.txt
index bb9d9d6b7..4c353fe63 100644
--- a/npc/004-2-1/_import.txt
+++ b/npc/004-2-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 004-2-1: Canyon Caves
+// Map 004-2-1: Canyon Cave
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/004-2-1/_mobs.txt",
"npc/004-2-1/_warps.txt",
diff --git a/npc/004-2-1/_mobs.txt b/npc/004-2-1/_mobs.txt
index fb214de0a..b24e70fb8 100644
--- a/npc/004-2-1/_mobs.txt
+++ b/npc/004-2-1/_mobs.txt
@@ -1,11 +1,13 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 004-2-1: Canyon Caves mobs
-004-2-1,55,58,29,22 monster Cave Snake 1035,12,35000,150000
-004-2-1,70,40,3,1 monster Small Topaz Bif 1101,1,35000,150000
-004-2-1,54,54,54,54 monster Cave Maggot 1027,20,40000,200000
-004-2-1,43,66,9,6 monster Snake 1122,3,35000,150000
-004-2-1,46,40,4,4 monster Snake 1122,3,35000,150000
-004-2-1,84,56,9,9 monster Snake 1122,3,35000,150000
-004-2-1,60,46,29,22 monster Cave Maggot 1027,6,35000,150000
-004-2-1,55,48,29,22 monster Small Topaz Bif 1101,3,35000,150000
-004-2-1,80,53,12,25 monster Chagashroom Field 1128,3,35000,150000
+// Map 004-2-1: Canyon Cave mobs
+004-2-1,0,0,0,0 monster Cave Maggot 1027,25,40000,200000
+004-2-1,67,48,29,23 monster Cave Snake 1035,12,35000,150000
+004-2-1,80,36,11,4 monster Snake 1122,1,35000,150000
+004-2-1,46,70,14,13 monster Snake 1122,3,35000,150000
+004-2-1,90,55,9,9 monster Snake 1122,3,35000,150000
+004-2-1,38,40,4,2 monster Maggot 1030,2,35000,150000
+004-2-1,57,24,4,2 monster Maggot 1030,2,35000,150000
+004-2-1,34,62,4,2 monster Maggot 1030,2,35000,150000
+004-2-1,88,68,4,2 monster Maggot 1030,2,35000,150000
+004-2-1,48,31,17,15 monster Scorpion 1071,5,35000,150000
+004-2-1,0,0,0,0 monster Small Topaz Bif 1101,2,35000,150000
diff --git a/npc/004-2-1/_warps.txt b/npc/004-2-1/_warps.txt
index eac3a882a..9facc2a75 100644
--- a/npc/004-2-1/_warps.txt
+++ b/npc/004-2-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 004-2-1: Canyon Caves warps
-004-2-1,78,73,0 warp #004-2-1_78_73 0,0,004-2,100,90
-004-2-1,26,86,0 warp #004-2-1_26_86 0,0,004-2,84,78
-004-2-1,25,47,0 warp #004-2-1_25_47 0,0,010-1,93,67
-004-2-1,51,26,0 warp #004-2-1_51_26 0,0,004-2,116,35
+// Map 004-2-1: Canyon Cave warps
+004-2-1,38,43,0 warp #004-2-1_38_43 0,0,004-2,117,55
+004-2-1,57,21,0 warp #004-2-1_57_21 0,0,004-2,116,28
+004-2-1,87,70,0 warp #004-2-1_87_70 0,0,004-2,142,78
+004-2-1,33,64,0 warp #004-2-1_33_64 0,0,004-2,81,72
diff --git a/npc/004-2-10/_import.txt b/npc/004-2-10/_import.txt
new file mode 100644
index 000000000..7a10799ac
--- /dev/null
+++ b/npc/004-2-10/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-10: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-10/_mobs.txt",
+"npc/004-2-10/_warps.txt",
diff --git a/npc/004-2-10/_mobs.txt b/npc/004-2-10/_mobs.txt
new file mode 100644
index 000000000..04c4072bc
--- /dev/null
+++ b/npc/004-2-10/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-10: Canyon Cave mobs
+004-2-10,0,0,0,0 monster Plushroom Field 1011,1,35000,150000
+004-2-10,0,0,0,0 monster Maggot 1030,1,35000,150000
diff --git a/npc/004-2-10/_warps.txt b/npc/004-2-10/_warps.txt
new file mode 100644
index 000000000..a4d454e41
--- /dev/null
+++ b/npc/004-2-10/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-10: Canyon Cave warps
+004-2-10,33,29,0 warp #004-2-10_33_29 0,0,004-2-3,61,89
diff --git a/npc/004-2-11/_import.txt b/npc/004-2-11/_import.txt
new file mode 100644
index 000000000..ce8f01e7f
--- /dev/null
+++ b/npc/004-2-11/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-11: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-11/_mobs.txt",
+"npc/004-2-11/_warps.txt",
diff --git a/npc/004-2-11/_mobs.txt b/npc/004-2-11/_mobs.txt
new file mode 100644
index 000000000..1cd1d47ff
--- /dev/null
+++ b/npc/004-2-11/_mobs.txt
@@ -0,0 +1,10 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-11: Canyon Cave mobs
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-11: Canyon Cave mobs
+004-2-11,33,39,4,3 monster Desert Maggot 1083,2,35000,150000
+004-2-11,0,0,0,0 monster Cave Maggot 1027,8,35000,150000
+004-2-11,42,33,12,10 monster Snake 1122,4,35000,150000
+004-2-11,55,39,14,11 monster Old Snake 1199,1,35000,150000
+004-2-11,46,33,16,11 monster Scorpion 1071,3,35000,150000
+004-2-11,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
diff --git a/npc/004-2-11/_warps.txt b/npc/004-2-11/_warps.txt
new file mode 100644
index 000000000..ad3ee40bb
--- /dev/null
+++ b/npc/004-2-11/_warps.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-11: Canyon Cave warps
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-11: Canyon Cave warps
+004-2-11,33,43,0 warp #004-2-11_33_43 0,0,010-1,64,77
+004-2-11,61,49,0 warp #004-2-11_61_49 0,0,004-2-3,72,29
+004-2-11,52,20,0 warp #004-2-11_52_20 0,0,010-1-11,36,29
diff --git a/npc/004-2-12/_import.txt b/npc/004-2-12/_import.txt
new file mode 100644
index 000000000..362871b57
--- /dev/null
+++ b/npc/004-2-12/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-12: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-12/_mobs.txt",
+"npc/004-2-12/_warps.txt",
diff --git a/npc/004-2-12/_mobs.txt b/npc/004-2-12/_mobs.txt
new file mode 100644
index 000000000..f9ea16e73
--- /dev/null
+++ b/npc/004-2-12/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-12: Canyon Cave mobs
+004-2-12,51,32,4,2 monster Maggot 1030,2,35000,150000
+004-2-12,39,33,9,13 monster Black Scorpion 1074,1,35000,150000
+004-2-12,40,34,12,12 monster Angry Scorpion 1131,3,35000,150000
+004-2-12,0,0,0,0 monster Cave Maggot 1027,3,35000,150000
+004-2-12,0,0,0,0 monster Small Ruby Bif 1098,1,35000,150000
diff --git a/npc/004-2-12/_warps.txt b/npc/004-2-12/_warps.txt
new file mode 100644
index 000000000..c25da92cd
--- /dev/null
+++ b/npc/004-2-12/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-12: Canyon Cave warps
+004-2-12,52,35,0 warp #004-2-12_52_35 1,0,004-2,51,112
+004-2-12,36,52,0 warp #004-2-12_36_52 0,0,004-3-2,43,84
diff --git a/npc/004-2-2/_import.txt b/npc/004-2-2/_import.txt
new file mode 100644
index 000000000..30d22a247
--- /dev/null
+++ b/npc/004-2-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-2: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-2/_mobs.txt",
+"npc/004-2-2/_warps.txt",
diff --git a/npc/004-2-2/_mobs.txt b/npc/004-2-2/_mobs.txt
new file mode 100644
index 000000000..7af73139b
--- /dev/null
+++ b/npc/004-2-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-2: Canyon Cave mobs
+004-2-2,50,84,14,5 monster Old Snake 1199,2,35000,150000
+004-2-2,0,0,0,0 monster Cave Maggot 1027,15,35000,150000
+004-2-2,56,55,4,26 monster Scorpion 1071,6,35000,150000
+004-2-2,36,79,4,2 monster Maggot 1030,2,35000,150000
+004-2-2,55,25,4,3 monster Desert Maggot 1083,2,35000,150000
+004-2-2,44,28,12,5 monster Old Snake 1199,2,35000,150000
+004-2-2,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
diff --git a/npc/004-2-2/_warps.txt b/npc/004-2-2/_warps.txt
new file mode 100644
index 000000000..2ed79718c
--- /dev/null
+++ b/npc/004-2-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-2: Canyon Cave warps
+004-2-2,36,76,0 warp #004-2-2_36_76 0,0,004-2,121,28
+004-2-2,55,21,0 warp #004-2-2_55_21 0,0,010-1,121,93
diff --git a/npc/004-2-3/_import.txt b/npc/004-2-3/_import.txt
new file mode 100644
index 000000000..ae0ef4499
--- /dev/null
+++ b/npc/004-2-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-3: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-3/_mobs.txt",
+"npc/004-2-3/_warps.txt",
diff --git a/npc/004-2-3/_mobs.txt b/npc/004-2-3/_mobs.txt
new file mode 100644
index 000000000..3b3d450d5
--- /dev/null
+++ b/npc/004-2-3/_mobs.txt
@@ -0,0 +1,23 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-3: Canyon Cave mobs
+004-2-3,51,31,4,3 monster Desert Maggot 1083,2,35000,150000
+004-2-3,87,44,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,65,28,4,3 monster Desert Maggot 1083,2,35000,150000
+004-2-3,94,28,4,3 monster Desert Maggot 1083,2,35000,150000
+004-2-3,98,45,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,113,45,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,125,49,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,135,63,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,108,68,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,69,59,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,58,124,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,102,113,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,134,112,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,123,75,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,87,93,4,2 monster Maggot 1030,2,35000,150000
+004-2-3,0,0,0,0 monster Cave Maggot 1027,90,35000,150000
+004-2-3,40,115,6,9 monster Blub 1008,2,35000,150000
+004-2-3,95,85,38,32 monster Snake 1122,8,35000,150000
+004-2-3,104,76,32,49 monster Old Snake 1199,8,35000,150000
+004-2-3,0,0,0,0 monster Topaz Bif 1102,6,35000,150000
+004-2-3,55,102,22,25 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/004-2-3/_warps.txt b/npc/004-2-3/_warps.txt
new file mode 100644
index 000000000..7ce29f06f
--- /dev/null
+++ b/npc/004-2-3/_warps.txt
@@ -0,0 +1,22 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-3: Canyon Cave warps
+004-2-3,58,127,0 warp #004-2-3_58_127 0,0,004-2,90,62
+004-2-3,123,78,0 warp #004-2-3_123_78 0,0,004-2,147,61
+004-2-3,87,96,0 warp #004-2-3_87_96 0,0,004-2,94,81
+004-2-3,135,115,0 warp #004-2-3_135_115 0,0,004-2,144,53
+004-2-3,102,116,0 warp #004-2-3_102_116 0,0,004-2,122,67
+004-2-3,69,62,0 warp #004-2-3_69_62 0,0,004-2,74,21
+004-2-3,108,66,0 warp #004-2-3_108_66 0,0,004-2,108,38
+004-2-3,135,66,0 warp #004-2-3_135_66 0,0,004-2,126,38
+004-2-3,97,48,0 warp #004-2-3_97_48 0,0,004-2,85,31
+004-2-3,124,47,0 warp #004-2-3_124_47 0,0,004-2,128,50
+004-2-3,87,42,0 warp #004-2-3_87_42 0,0,004-2,107,48
+004-2-3,49,32,0 warp #004-2-3_49_32 0,0,010-1,58,80
+004-2-3,95,31,0 warp #004-2-3_95_31 0,0,010-1,109,85
+004-2-3,65,25,0 warp #004-2-3_65_25 0,0,010-1,69,73
+004-2-3,135,57,0 warp #004-2-3_135_57 0,0,004-2-4,99,58
+004-2-3,72,28,0 warp #004-2-3_72_28 0,0,004-2-11,61,48
+004-2-3,74,97,0 warp #004-2-3_74_97 0,0,010-4-2,37,61
+004-2-3,114,42,0 warp #004-2-3_114_42 0,0,004-2,118,50
+004-2-3,102,61,0 warp #004-2-3_102_61 0,0,004-3-2,124,34
+004-2-3,61,88,0 warp #004-2-3_61_88 0,0,004-2-10,33,28
diff --git a/npc/004-2-4/_import.txt b/npc/004-2-4/_import.txt
new file mode 100644
index 000000000..d3ca21441
--- /dev/null
+++ b/npc/004-2-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-4: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-4/_mobs.txt",
+"npc/004-2-4/_warps.txt",
diff --git a/npc/004-2-4/_mobs.txt b/npc/004-2-4/_mobs.txt
new file mode 100644
index 000000000..5e048e975
--- /dev/null
+++ b/npc/004-2-4/_mobs.txt
@@ -0,0 +1,17 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-4: Canyon Cave mobs
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-4: Canyon Cave mobs
+004-2-4,34,41,4,3 monster Desert Maggot 1083,2,35000,150000
+004-2-4,124,83,4,2 monster Maggot 1030,2,35000,150000
+004-2-4,0,0,0,0 monster Cave Maggot 1027,70,35000,150000
+004-2-4,135,71,4,2 monster Maggot 1030,2,35000,150000
+004-2-4,71,45,23,5 monster Scorpion 1071,8,35000,150000
+004-2-4,120,42,24,15 monster Snake 1122,8,35000,150000
+004-2-4,91,66,55,7 monster Black Scorpion 1074,7,35000,150000
+004-2-4,98,40,10,6 monster Bat 1039,1,35000,150000
+004-2-4,68,83,15,15 monster Angry Scorpion 1131,9,35000,150000
+004-2-4,49,55,13,5 monster Old Snake 1122,1,35000,150000
+004-2-4,135,82,1,7 monster Old Snake 1122,1,35000,150000
+004-2-4,125,92,11,2 monster Old Snake 1122,1,35000,150000
+004-2-4,0,0,0,0 monster Ruby Bif 1099,3,35000,150000
diff --git a/npc/004-2-4/_warps.txt b/npc/004-2-4/_warps.txt
new file mode 100644
index 000000000..05dd3aec4
--- /dev/null
+++ b/npc/004-2-4/_warps.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-4: Canyon Cave warps
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-4: Canyon Cave warps
+004-2-4,34,45,0 warp #004-2-4_34_45 1,0,010-1,52,94
+004-2-4,124,86,0 warp #004-2-4_124_86 0,0,004-2,132,57
+004-2-4,134,24,0 warp #004-2-4_134_24 0,0,010-1-1,151,121
+004-2-4,135,69,0 warp #004-2-4_135_69 0,0,004-2,139,32
+004-2-4,103,21,0 warp #004-2-4_103_21 0,0,010-1-1,116,121
+004-2-4,99,59,0 warp #004-2-4_99_59 0,0,004-2-3,135,58
+004-2-4,118,42,0 warp #004-2-4_118_42 0,0,010-1-12,35,29
+004-2-4,121,20,0 warp #004-2-4_121_20 0,0,010-1-2,46,109
diff --git a/npc/004-2-5/_import.txt b/npc/004-2-5/_import.txt
new file mode 100644
index 000000000..2ca65f702
--- /dev/null
+++ b/npc/004-2-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-5: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-5/_mobs.txt",
+"npc/004-2-5/_warps.txt",
diff --git a/npc/004-2-5/_mobs.txt b/npc/004-2-5/_mobs.txt
new file mode 100644
index 000000000..c6205b07b
--- /dev/null
+++ b/npc/004-2-5/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-5: Canyon Cave mobs
+004-2-5,42,38,14,11 monster Old Snake 1199,1,35000,150000
+004-2-5,39,33,9,7 monster Bat 1039,2,35000,150000
+004-2-5,69,50,4,2 monster Little Blub 1007,1,35000,150000
+004-2-5,0,0,0,0 monster Cave Maggot 1027,8,35000,150000
+004-2-5,53,49,4,2 monster Maggot 1030,2,35000,150000
+004-2-5,65,54,9,6 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/004-2-5/_warps.txt b/npc/004-2-5/_warps.txt
new file mode 100644
index 000000000..635af5e45
--- /dev/null
+++ b/npc/004-2-5/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-5: Canyon Cave warps
+004-2-5,53,46,0 warp #004-2-5_53_46 0,0,004-2,146,84
+004-2-5,55,34,0 warp #004-2-5_55_34 0,0,004-2-8,57,21
+004-2-5,35,53,0 warp #004-2-5_35_53 0,0,004-2-7,39,21
diff --git a/npc/004-2-6/_import.txt b/npc/004-2-6/_import.txt
new file mode 100644
index 000000000..b96bb824d
--- /dev/null
+++ b/npc/004-2-6/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-6: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-6/_mobs.txt",
+"npc/004-2-6/_warps.txt",
diff --git a/npc/004-2-6/_mobs.txt b/npc/004-2-6/_mobs.txt
new file mode 100644
index 000000000..10b1eea0e
--- /dev/null
+++ b/npc/004-2-6/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-6: Canyon Cave mobs
+004-2-6,0,0,0,0 monster Cave Maggot 1027,16,35000,150000
+004-2-6,71,33,12,11 monster Moutain Snake 1123,1,35000,150000
+004-2-6,56,33,25,8 monster Snake 1122,5,35000,150000
+004-2-6,34,31,3,3 monster Scorpion 1071,1,35000,150000
+004-2-6,34,24,4,2 monster Maggot 1030,2,35000,150000
+004-2-6,83,42,4,2 monster Maggot 1030,2,35000,150000
+004-2-6,0,0,0,0 monster Small Sapphire Bif 1113,1,35000,150000
diff --git a/npc/004-2-6/_warps.txt b/npc/004-2-6/_warps.txt
new file mode 100644
index 000000000..d3d53d497
--- /dev/null
+++ b/npc/004-2-6/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-6: Canyon Cave warps
+004-2-6,34,21,0 warp #004-2-6_34_21 0,0,004-2,110,93
+004-2-6,84,44,0 warp #004-2-6_84_44 0,0,004-2,145,104
+004-2-6,77,21,0 warp #004-2-6_77_21 0,0,004-2-7,51,38
diff --git a/npc/004-2-7/_import.txt b/npc/004-2-7/_import.txt
new file mode 100644
index 000000000..43ce9489d
--- /dev/null
+++ b/npc/004-2-7/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-7: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-7/_mobs.txt",
+"npc/004-2-7/_warps.txt",
diff --git a/npc/004-2-7/_mobs.txt b/npc/004-2-7/_mobs.txt
new file mode 100644
index 000000000..705fcc9e0
--- /dev/null
+++ b/npc/004-2-7/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-7: Canyon Cave mobs
+004-2-7,0,0,0,0 monster Cave Maggot 1027,6,35000,150000
+004-2-7,46,29,11,7 monster Snake 1122,1,35000,150000
+004-2-7,45,29,15,6 monster Cave Snake 1035,2,35000,150000
+004-2-7,45,31,15,6 monster Bat 1039,6,35000,150000
+004-2-7,0,0,0,0 monster Topaz Bif 1102,1,35000,150000
diff --git a/npc/004-2-7/_warps.txt b/npc/004-2-7/_warps.txt
new file mode 100644
index 000000000..7d32f8ce0
--- /dev/null
+++ b/npc/004-2-7/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-7: Canyon Cave warps
+004-2-7,51,39,0 warp #004-2-7_51_39 0,0,004-2-6,77,22
+004-2-7,39,20,0 warp #004-2-7_39_20 0,0,004-2-5,35,52
+004-2-7,56,21,0 warp #004-2-7_56_21 0,0,004-2-8,47,40
diff --git a/npc/004-2-8/_import.txt b/npc/004-2-8/_import.txt
new file mode 100644
index 000000000..db0afcf5b
--- /dev/null
+++ b/npc/004-2-8/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-8: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-8/_mobs.txt",
+"npc/004-2-8/_warps.txt",
diff --git a/npc/004-2-8/_mobs.txt b/npc/004-2-8/_mobs.txt
new file mode 100644
index 000000000..300108f67
--- /dev/null
+++ b/npc/004-2-8/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-8: Canyon Cave mobs
+004-2-8,0,0,0,0 monster Cave Maggot 1027,17,35000,150000
+004-2-8,40,72,4,2 monster Maggot 1030,2,35000,150000
+004-2-8,50,44,17,20 monster Angry Scorpion 1131,19,35000,150000
+004-2-8,36,45,5,20 monster Black Scorpion 1074,1,35000,150000
+004-2-8,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
diff --git a/npc/004-2-8/_warps.txt b/npc/004-2-8/_warps.txt
new file mode 100644
index 000000000..2c528fe04
--- /dev/null
+++ b/npc/004-2-8/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-8: Canyon Cave warps
+004-2-8,39,75,0 warp #004-2-8_39_75 0,0,004-2,141,114
+004-2-8,57,20,0 warp #004-2-8_57_20 0,0,004-2-5,55,33
+004-2-8,47,41,0 warp #004-2-8_47_41 0,0,004-2-7,56,22
diff --git a/npc/004-2-9/_import.txt b/npc/004-2-9/_import.txt
new file mode 100644
index 000000000..6ca7eff9e
--- /dev/null
+++ b/npc/004-2-9/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-2-9: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-2-9/_mobs.txt",
+"npc/004-2-9/_warps.txt",
diff --git a/npc/004-2-9/_mobs.txt b/npc/004-2-9/_mobs.txt
new file mode 100644
index 000000000..13c46964a
--- /dev/null
+++ b/npc/004-2-9/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-9: Canyon Cave mobs
+004-2-9,61,25,4,3 monster Desert Maggot 1083,2,35000,150000
+004-2-9,45,41,14,3 monster Bat 1039,1,35000,150000
+004-2-9,0,0,0,0 monster Cave Maggot 1027,6,35000,150000
+004-2-9,47,39,17,11 monster Old Snake 1199,1,35000,150000
+004-2-9,45,39,15,12 monster Cave Snake 1035,4,35000,150000
+004-2-9,0,0,0,0 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/004-2-9/_warps.txt b/npc/004-2-9/_warps.txt
new file mode 100644
index 000000000..f069f1c87
--- /dev/null
+++ b/npc/004-2-9/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2-9: Canyon Cave warps
+004-2-9,61,21,0 warp #004-2-9_61_21 0,0,010-1,92,70
+004-2-9,46,32,0 warp #004-2-9_46_32 0,0,010-2-4,58,48
+004-2-9,36,57,0 warp #004-2-9_36_57 0,0,004-3-5,34,21
diff --git a/npc/004-2/_mobs.txt b/npc/004-2/_mobs.txt
index 150fa1a89..0723d3111 100644
--- a/npc/004-2/_mobs.txt
+++ b/npc/004-2/_mobs.txt
@@ -1,12 +1,17 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 004-2: Desert Mountains mobs
-004-2,36,40,15,21 monster Maggot 1030,8,35000,150000
-004-2,73,77,13,4 monster Maggot 1030,7,35000,150000
-004-2,100,55,14,14 monster Maggot 1030,7,35000,150000
-004-2,108,39,17,4 monster Scorpion 1071,3,35000,150000
-004-2,51,40,10,22 monster Scorpion 1071,6,35000,150000
-004-2,102,55,4,4 monster Mister Prickel 1436,1,35000,35000
-004-2,108,97,4,4 monster Snake 1122,2,35000,150000
-004-2,77,51,9,4 monster Old Snake 1199,1,35000,75000
-004-2,67,63,14,11 monster Scorpion 1071,6,35000,80000
-004-2,82,50,27,29 monster Desert Log Head 1127,5,35000,50000
+004-2,0,0,0,0 monster Maggot 1030,100,35000,150000
+004-2,118,37,17,15 monster Scorpion 1071,14,35000,150000
+004-2,61,43,10,22 monster Scorpion 1071,6,35000,150000
+004-2,111,58,4,4 monster Mister Prickel 1436,1,35000,35000
+004-2,118,100,4,4 monster Snake 1122,3,35000,150000
+004-2,87,54,9,4 monster Snake 1199,1,35000,150000
+004-2,77,66,14,11 monster Scorpion 1071,8,35000,150000
+004-2,94,56,42,32 monster Desert Log Head 1127,30,35000,150000
+004-2,56,98,1,1 monster Duck 1029,1,35000,150000
+004-2,71,100,28,10 monster Red Scorpion 1072,10,35000,150000
+004-2,146,28,3,2 monster Yellow Slime 1091,1,35000,150000
+004-2,143,47,6,18 monster Scorpion 1071,9,35000,150000
+004-2,140,57,9,8 monster Snake 1122,2,35000,150000
+004-2,142,96,3,5 monster Mountain Snake 1123,1,35000,300000
+004-2,131,75,17,9 monster Snake 1122,4,35000,150000
diff --git a/npc/004-2/_warps.txt b/npc/004-2/_warps.txt
index 3fc6454e3..b368afbdb 100644
--- a/npc/004-2/_warps.txt
+++ b/npc/004-2/_warps.txt
@@ -1,7 +1,43 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 004-2: Desert Mountains warps
-004-2,20,48,0 warp #004-2_20_48 0,2,004-1,119,95
-004-2,100,89,0 warp #004-2_100_89 0,0,004-2-1,78,72
-004-2,116,34,0 warp #004-2_116_34 0,0,004-2-1,51,27
-004-2,98,34,0 warp #004-2_98_34 0,0,010-1-1,142,119
-004-2,72,69,0 warp #004-2_72_69 1,0,010-2,97,123
+004-2,117,54,0 warp #004-2_117_54 0,0,004-2-1,38,42
+004-2,116,27,0 warp #004-2_116_27 0,0,004-2-1,87,22
+004-2,30,51,0 warp #004-2_30_51 0,2,004-1,125,95
+004-2,121,27,0 warp #004-2_121_27 0,0,004-2-2,36,77
+004-2,94,80,0 warp #004-2_94_80 0,0,004-2-3,87,95
+004-2,147,60,0 warp #004-2_147_60 0,0,004-2-3,123,77
+004-2,132,56,0 warp #004-2_132_56 0,0,004-2-4,121,79
+004-2,144,25,0 warp #004-2_144_25 0,0,010-4-2,87,41
+004-2,144,52,0 warp #004-2_144_52 0,0,004-2-3,135,114
+004-2,90,61,0 warp #004-2_90_61 0,0,004-2-3,58,126
+004-2,113,120,0 warp #004-2_113_120 0,0,004-3-2,83,63
+004-2,86,116,0 warp #004-2_86_116 0,0,004-3-2,59,54
+004-2,60,126,0 warp #004-2_60_126 0,0,004-3-1,68,32
+004-2,53,103,0 warp #004-2_53_103 0,0,004-3-1,70,24
+004-2,53,88,0 warp #004-2_53_88 0,0,004-3,53,41
+004-2,63,88,0 warp #004-2_63_88 0,0,004-3,63,41
+004-2,81,93,0 warp #004-2_81_93 0,0,004-3-2,44,37
+004-2,73,89,0 warp #004-2_73_89 0,0,010-2-8,37,21
+004-2,68,124,0 warp #004-2_68_124 0,0,010-2-8,32,62
+004-2,51,111,0 warp #004-2_51_111 0,0,004-2-12,52,34
+004-2,48,59,0 warp #004-2_48_59 0,0,007-1-1,56,35
+004-2,110,92,0 warp #004-2_110_92 0,0,004-2-6,34,22
+004-2,119,107,0 warp #004-2_119_107 0,0,004-3-2,95,51
+004-2,145,103,0 warp #004-2_145_103 0,0,004-2-6,84,43
+004-2,122,66,0 warp #004-2_122_66 0,0,004-2-3,102,115
+004-2,85,30,0 warp #004-2_85_30 0,0,004-2-3,97,47
+004-2,74,20,0 warp #004-2_74_20 0,0,004-2-3,69,61
+004-2,108,37,0 warp #004-2_108_37 0,0,004-2-3,108,67
+004-2,126,37,0 warp #004-2_126_37 0,0,004-2-3,135,65
+004-2,118,49,0 warp #004-2_118_49 0,0,004-2-3,114,43
+004-2,107,47,0 warp #004-2_107_47 0,0,004-2-3,87,43
+004-2,128,49,0 warp #004-2_128_49 0,0,004-2-3,124,48
+004-2,142,77,0 warp #004-2_142_77 0,0,004-2-1,87,69
+004-2,146,85,0 warp #004-2_146_85 0,0,004-2-5,53,47
+004-2,141,113,0 warp #004-2_141_113 0,0,004-2-8,39,74
+004-2,81,71,0 warp #004-2_81_71 0,0,004-2-1,33,63
+004-2,85,49,0 warp #004-2_85_49 0,0,007-1-2,50,53
+004-2,92,33,0 warp #004-2_92_33 0,0,007-1-2,56,27
+004-2,139,31,0 warp #004-2_139_31 0,0,004-2-4,135,70
+004-2,45,98,0 warp #004-2_45_98 0,0,004-3-6,45,58
+004-2,104,93,0 warp #004-2_104_93 0,0,004-3-2,74,41
diff --git a/npc/004-2/bug.txt b/npc/004-2/bug.txt
index a7d0a16e9..4c100bf87 100644
--- a/npc/004-2/bug.txt
+++ b/npc/004-2/bug.txt
@@ -4,9 +4,11 @@
// Description:
// Error Handler
-004-2,54,63,0 script Sign#ErrorHandler0041 NPC_SWORDS_SIGN,{
- mesc l("WARNING: Desert Canyon locked down due major bugs"), 1;
- mesc l("Please use the alternative route provided by the Alliance High Council"), 1;
+004-2,64,63,0 script Sign#HalinRoute NPC_SWORDS_SIGN,{
+ mesc "← "+l("Tulimshar");
+ mesc "→ "+l("Canyon - Safe Route");
+ mesc "↓ "+l("Canyon - Dangerous Route");
+ close;
close;
OnInit:
@@ -15,22 +17,3 @@ OnInit:
end;
}
-
-004-2,84,77,0 script Sign#ErrorHandler0042 NPC_SWORDS_SIGN,{
- mesc l("WARNING: This path has been locked down due to major bugs"), 1;
- mesc l("You may be trapped forever inside the desert maze beyond help"), 1;
- mesc l("shall you decide to disregard this warning."), 1;
- mes "";
- mesc l("Do not attempt to use the normal route without a %s with you.", getitemlink(TimeFlask)), 1;
- next;
- mesc l("Use the normal route?");
- if (askyesno() == ASK_YES)
- warp "004-2-1", 26, 87;
- closeclientdialog;
- close;
-
-OnInit:
- .sex = G_OTHER;
- .distance = 2;
- end;
-}
diff --git a/npc/004-3-1/_import.txt b/npc/004-3-1/_import.txt
new file mode 100644
index 000000000..c7d00ba90
--- /dev/null
+++ b/npc/004-3-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-3-1: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-3-1/_mobs.txt",
+"npc/004-3-1/_warps.txt",
diff --git a/npc/004-3-1/_mobs.txt b/npc/004-3-1/_mobs.txt
new file mode 100644
index 000000000..94df09ca7
--- /dev/null
+++ b/npc/004-3-1/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-1: Canyon Cave mobs
+004-3-1,69,31,4,2 monster Maggot 1030,2,35000,150000
+004-3-1,69,22,4,2 monster Maggot 1030,2,35000,150000
+004-3-1,70,36,14,7 monster Scorpion 1071,2,35000,150000
+004-3-1,0,0,0,0 monster Cave Maggot 1027,1,35000,150000
+004-3-1,38,34,8,9 monster Little Blub 1007,6,35000,150000
+004-3-1,60,23,11,3 monster Red Scorpion 1072,1,35000,150000
+004-3-1,45,32,15,12 monster Plushroom Field 1011,2,35000,150000
diff --git a/npc/004-3-1/_warps.txt b/npc/004-3-1/_warps.txt
new file mode 100644
index 000000000..d7eb1bcd3
--- /dev/null
+++ b/npc/004-3-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-1: Canyon Cave warps
+004-3-1,70,25,0 warp #004-3-1_70_25 0,0,004-2,53,104
+004-3-1,68,33,0 warp #004-3-1_68_33 0,0,004-2,60,127
diff --git a/npc/004-3-2/_import.txt b/npc/004-3-2/_import.txt
new file mode 100644
index 000000000..60fe3655d
--- /dev/null
+++ b/npc/004-3-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-3-2: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-3-2/_mobs.txt",
+"npc/004-3-2/_warps.txt",
diff --git a/npc/004-3-2/_mobs.txt b/npc/004-3-2/_mobs.txt
new file mode 100644
index 000000000..99f6bb8c3
--- /dev/null
+++ b/npc/004-3-2/_mobs.txt
@@ -0,0 +1,19 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-2: Canyon Cave mobs
+004-3-2,0,0,0,0 monster Cave Maggot 1027,70,35000,150000
+004-3-2,83,61,4,2 monster Maggot 1030,2,35000,150000
+004-3-2,44,36,4,2 monster Maggot 1030,2,35000,150000
+004-3-2,123,103,5,2 monster Lost Ocean Croc 1133,1,35000,150000
+004-3-2,119,69,8,7 monster Little Blub 1007,7,35000,150000
+004-3-2,96,86,10,8 monster Blub 1008,1,35000,150000
+004-3-2,126,101,17,4 monster Blub 1008,1,35000,150000
+004-3-2,81,58,38,30 monster Angry Scorpion 1131,30,35000,150000
+004-3-2,124,52,12,25 monster Black Scorpion 1074,1,35000,150000
+004-3-2,85,58,51,35 monster Nigth Scorpion 1077,1,35000,150000
+004-3-2,64,55,24,10 monster Red scorpion 1072,8,35000,150000
+004-3-2,69,59,6,22 monster Bat 1039,2,35000,150000
+004-3-2,59,52,4,2 monster Maggot 1030,2,35000,150000
+004-3-2,74,39,4,2 monster Maggot 1030,2,35000,150000
+004-3-2,95,52,4,2 monster Maggot 1030,2,35000,150000
+004-3-2,112,84,23,20 monster Plushroom Field 1011,3,35000,150000
+004-3-2,0,0,0,0 monster Ruby Bif 1099,4,35000,150000
diff --git a/npc/004-3-2/_warps.txt b/npc/004-3-2/_warps.txt
new file mode 100644
index 000000000..1472cd053
--- /dev/null
+++ b/npc/004-3-2/_warps.txt
@@ -0,0 +1,13 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-2: Canyon Cave warps
+004-3-2,126,95,0 warp #004-3-2_126_95 0,0,010-2-12,39,21
+004-3-2,95,50,0 warp #004-3-2_95_50 0,0,004-2,119,106
+004-3-2,44,38,0 warp #004-3-2_44_38 0,0,004-2,81,94
+004-3-2,59,55,0 warp #004-3-2_59_55 0,0,004-2,86,117
+004-3-2,83,64,0 warp #004-3-2_83_64 0,0,004-2,113,121
+004-3-2,62,34,0 warp #004-3-2_62_34 0,0,004-3-3,61,28
+004-3-2,124,35,0 warp #004-3-2_124_35 0,0,004-2-3,102,62
+004-3-2,129,63,0 warp #004-3-2_129_63 0,0,004-3-4,83,21
+004-3-2,80,79,0 warp #004-3-2_80_79 0,0,004-3-4,33,39
+004-3-2,43,83,0 warp #004-3-2_43_83 0,0,004-2-12,36,51
+004-3-2,74,42,0 warp #004-3-2_74_42 0,0,004-2,104,94
diff --git a/npc/004-3-3/_import.txt b/npc/004-3-3/_import.txt
new file mode 100644
index 000000000..583e11054
--- /dev/null
+++ b/npc/004-3-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-3-3: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-3-3/_mobs.txt",
+"npc/004-3-3/_warps.txt",
diff --git a/npc/004-3-3/_mobs.txt b/npc/004-3-3/_mobs.txt
new file mode 100644
index 000000000..fcfdc8791
--- /dev/null
+++ b/npc/004-3-3/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-3: Canyon Cave mobs
+004-3-3,0,0,0,0 monster Cave Maggot 1027,7,35000,150000
+004-3-3,46,29,11,7 monster Scorpion 1071,14,35000,150000
+004-3-3,0,0,0,0 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/004-3-3/_warps.txt b/npc/004-3-3/_warps.txt
new file mode 100644
index 000000000..eaa2a51d7
--- /dev/null
+++ b/npc/004-3-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-3: Canyon Cave warps
+004-3-3,33,32,0 warp #004-3-3_33_32 0,0,004-3-6,61,47
+004-3-3,61,29,0 warp #004-3-3_61_29 0,0,004-3-2,62,35
diff --git a/npc/004-3-4/_import.txt b/npc/004-3-4/_import.txt
new file mode 100644
index 000000000..da511cd16
--- /dev/null
+++ b/npc/004-3-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-3-4: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-3-4/_mobs.txt",
+"npc/004-3-4/_warps.txt",
diff --git a/npc/004-3-4/_mobs.txt b/npc/004-3-4/_mobs.txt
new file mode 100644
index 000000000..c0368a1e9
--- /dev/null
+++ b/npc/004-3-4/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-4: Canyon Cave mobs
+004-3-4,59,29,21,10 monster Bat 1039,4,35000,150000
+004-3-4,60,29,31,10 monster Cave Snake 1035,2,35000,150000
+004-3-4,76,28,13,11 monster Black Scorpion 1074,1,35000,150000
+004-3-4,36,34,8,6 monster Angry Scorpion 1131,1,35000,150000
+004-3-4,0,0,0,0 monster Cave Maggot 1027,1,35000,150000
+004-3-4,0,0,0,0 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/004-3-4/_warps.txt b/npc/004-3-4/_warps.txt
new file mode 100644
index 000000000..7c34841f7
--- /dev/null
+++ b/npc/004-3-4/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-4: Canyon Cave warps
+004-3-4,33,40,0 warp #004-3-4_33_40 0,0,004-3-2,80,80
+004-3-4,83,20,0 warp #004-3-4_83_20 0,0,004-3-2,129,64
diff --git a/npc/004-3-5/_import.txt b/npc/004-3-5/_import.txt
new file mode 100644
index 000000000..933cc4c1c
--- /dev/null
+++ b/npc/004-3-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-3-5: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-3-5/_mobs.txt",
+"npc/004-3-5/_warps.txt",
diff --git a/npc/004-3-5/_mobs.txt b/npc/004-3-5/_mobs.txt
new file mode 100644
index 000000000..580b6b3ed
--- /dev/null
+++ b/npc/004-3-5/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-5: Canyon Cave mobs
+004-3-5,34,31,4,10 monster Angry Red Scorpion 1130,14,35000,150000
+004-3-5,0,0,0,0 monster Cave Maggot 1027,3,35000,150000
+004-3-5,0,0,0,0 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/004-3-5/_warps.txt b/npc/004-3-5/_warps.txt
new file mode 100644
index 000000000..20de5e465
--- /dev/null
+++ b/npc/004-3-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-5: Canyon Cave warps
+004-3-5,36,45,0 warp #004-3-5_36_45 0,0,007-1-2,48,21
+004-3-5,34,20,0 warp #004-3-5_34_20 0,0,004-2-9,36,56
diff --git a/npc/004-3-6/_import.txt b/npc/004-3-6/_import.txt
new file mode 100644
index 000000000..1c892a6d1
--- /dev/null
+++ b/npc/004-3-6/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-3-6: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-3-6/_mobs.txt",
+"npc/004-3-6/_warps.txt",
diff --git a/npc/004-3-6/_mobs.txt b/npc/004-3-6/_mobs.txt
new file mode 100644
index 000000000..fc8b41836
--- /dev/null
+++ b/npc/004-3-6/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-6: Canyon Cave mobs
+004-3-6,45,42,11,14 monster Bat 1039,6,35000,150000
+004-3-6,42,49,12,8 monster Black Scorpion 1074,3,35000,150000
+004-3-6,0,0,0,0 monster Cave Maggot 1027,7,35000,150000
+004-3-6,49,38,15,15 monster Angry Scorpion 1131,6,35000,150000
+004-3-6,0,0,0,0 monster Topaz Bif 1102,1,35000,150000
diff --git a/npc/004-3-6/_warps.txt b/npc/004-3-6/_warps.txt
new file mode 100644
index 000000000..f0b130537
--- /dev/null
+++ b/npc/004-3-6/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3-6: Canyon Cave warps
+004-3-6,42,20,0 warp #004-3-6_42_20 0,0,007-1-1,45,47
+004-3-6,61,48,0 warp #004-3-6_61_48 0,0,004-3-3,33,33
diff --git a/npc/004-3/_import.txt b/npc/004-3/_import.txt
new file mode 100644
index 000000000..38f6124d5
--- /dev/null
+++ b/npc/004-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 004-3: Pachua's Village
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/004-3/_mobs.txt",
+"npc/004-3/_warps.txt",
diff --git a/npc/004-3/_mobs.txt b/npc/004-3/_mobs.txt
new file mode 100644
index 000000000..579ebadb6
--- /dev/null
+++ b/npc/004-3/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3: Pachua's Village mobs
+004-3,57,39,8,2 monster Maggot 1030,2,35000,150000
+004-3,34,30,4,7 monster Ratto 1005,1,35000,150000
diff --git a/npc/004-3/_warps.txt b/npc/004-3/_warps.txt
new file mode 100644
index 000000000..f293db749
--- /dev/null
+++ b/npc/004-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-3: Pachua's Village warps
+004-3,53,42,0 warp #004-3_53_42 0,0,004-2,53,89
+004-3,63,42,0 warp #004-3_63_42 0,0,004-2,63,89
diff --git a/npc/007-1-1/_import.txt b/npc/007-1-1/_import.txt
new file mode 100644
index 000000000..0746a76e0
--- /dev/null
+++ b/npc/007-1-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 007-1-1: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/007-1-1/_mobs.txt",
+"npc/007-1-1/_warps.txt",
diff --git a/npc/007-1-1/_mobs.txt b/npc/007-1-1/_mobs.txt
new file mode 100644
index 000000000..b975904ec
--- /dev/null
+++ b/npc/007-1-1/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 007-1-1: Canyon Cave mobs
+007-1-1,35,35,4,2 monster Maggot 1030,2,35000,150000
+007-1-1,56,34,4,2 monster Maggot 1030,2,35000,150000
+007-1-1,45,37,6,9 monster Little Blub 1007,4,35000,150000
+007-1-1,0,0,0,0 monster Cave Maggot 1027,6,35000,150000
+007-1-1,40,30,10,8 monster Scorpion 1071,5,35000,150000
+007-1-1,44,34,6,11 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/007-1-1/_warps.txt b/npc/007-1-1/_warps.txt
new file mode 100644
index 000000000..dc19e3c34
--- /dev/null
+++ b/npc/007-1-1/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 007-1-1: Canyon Cave warps
+007-1-1,35,38,0 warp #007-1-1_35_38 0,0,004-1,119,108
+007-1-1,42,20,0 warp #007-1-1_42_20 0,0,010-2-15,35,41
+007-1-1,45,49,0 warp #007-1-1_45_49 0,0,004-3-6,42,21
+007-1-1,56,36,0 warp #007-1-1_56_36 0,0,004-2,48,60
diff --git a/npc/007-1-2/_import.txt b/npc/007-1-2/_import.txt
new file mode 100644
index 000000000..ed81198a6
--- /dev/null
+++ b/npc/007-1-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 007-1-2: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/007-1-2/_mobs.txt",
+"npc/007-1-2/_warps.txt",
diff --git a/npc/007-1-2/_mobs.txt b/npc/007-1-2/_mobs.txt
new file mode 100644
index 000000000..172ef6600
--- /dev/null
+++ b/npc/007-1-2/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 007-1-2: Canyon Cave mobs
+007-1-2,50,51,4,2 monster Maggot 1030,2,35000,150000
+007-1-2,56,29,4,2 monster Maggot 1030,2,35000,150000
+007-1-2,0,0,0,0 monster Desert Maggot 1083,4,35000,150000
+007-1-2,44,36,7,7 monster Scorpion 1071,5,35000,150000
+007-1-2,0,0,0,0 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/007-1-2/_warps.txt b/npc/007-1-2/_warps.txt
new file mode 100644
index 000000000..379d05ba0
--- /dev/null
+++ b/npc/007-1-2/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 007-1-2: Canyon Cave warps
+007-1-2,50,54,0 warp #007-1-2_50_54 0,0,004-2,85,50
+007-1-2,56,26,0 warp #007-1-2_56_26 0,0,004-2,92,34
+007-1-2,48,20,0 warp #007-1-2_48_20 0,0,004-3-5,36,44
+007-1-2,32,32,0 warp #007-1-2_32_32 0,0,010-2-15,60,36
diff --git a/npc/007-1/_mobs.txt b/npc/007-1/_mobs.txt
index a8588d0ba..c0fe01986 100644
--- a/npc/007-1/_mobs.txt
+++ b/npc/007-1/_mobs.txt
@@ -1,14 +1,14 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 007-1: Tulimshar Mining Camp mobs
-007-1,140,101,43,90 monster Cave Maggot 1027,38,35000,300000,Tycoon::OnKillCaveMaggot
+007-1,140,101,43,90 monster Cave Maggot 1027,45,35000,300000,Tycoon::OnKillCaveMaggot
007-1,129,50,14,14 monster Black Scorpion 1074,5,32000,210000,Tycoon::OnKillBlackScorpion
-007-1,70,60,19,15 monster Ratto 1005,4,35000,220000,Tycoon::OnKillRatto
+007-1,71,61,20,18 monster Ratto 1005,5,35000,220000,Tycoon::OnKillRatto
007-1,64,50,19,23 monster Piou 1002,3,35000,300000
007-1,118,140,57,52 monster Cave Snake 1035,25,35000,300000,Tycoon::OnKillCaveSnake
-007-1,57,156,37,29 monster Red Scorpion 1072,10,35000,120000,Tycoon::OnKillRedScorpion
+007-1,57,156,37,29 monster Red Scorpion 1072,11,35000,120000,Tycoon::OnKillRedScorpion
007-1,39,125,7,6 monster Cave Maggot 1027,5,35000,270000,Tycoon::OnKillCaveMaggot
007-1,89,72,75,57 monster Cave Bat 1039,9,35000,240000
-007-1,104,99,99,99 monster Ruby Bif 1099,9,35000,300000
007-1,117,94,10,7 monster Black Scorpion 1074,1,35000,220000,Tycoon::OnKillBlackScorpion
007-1,93,110,9,9 monster Cave Maggot 1027,8,35000,300000,Tycoon::OnKillCaveMaggot
-007-1,86,152,92,58 monster Night Scorpion 1077,1,3600000,1800000
+007-1,101,141,76,47 monster Night Scorpion 1077,1,3600000,1800000
+007-1,0,0,0,0 monster Ruby Bif 1099,9,35000,300000
diff --git a/npc/007-1/_warps.txt b/npc/007-1/_warps.txt
index fd3d5007f..2aebed2c0 100644
--- a/npc/007-1/_warps.txt
+++ b/npc/007-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 007-1: Tulimshar Mining Camp warps
-007-1,56,37,0 warp #007-1_56_37 0,0,004-1,33,110
-007-1,90,52,0 warp #007-1_90_52 0,0,004-1,92,115
+007-1,56,37,0 warp #007-1_56_37 0,0,004-1,39,110
+007-1,90,52,0 warp #007-1_90_52 0,0,004-1,98,115
007-1,99,190,0 warp #007-1_99_190 1,0,007-2,64,66
diff --git a/npc/009-1/_mobs.txt b/npc/009-1/_mobs.txt
index 49b3a7401..7c0859b7a 100644
--- a/npc/009-1/_mobs.txt
+++ b/npc/009-1/_mobs.txt
@@ -2,10 +2,10 @@
// Map 009-1: Halinarzo mobs
009-1,76,35,49,10 monster Giant Maggot 1031,6,30000,90000
009-1,27,29,7,8 monster Piou 1002,1,60000,60000
-009-1,73,51,49,14 monster Fire Goblin 1067,7,45000,45000,Fisherman::OnKillFireGoblin
-009-1,70,31,49,21 monster Maggot 1030,25,30000,60000
-009-1,70,86,47,6 monster Scorpion 1071,3,30000,20000
-009-1,70,102,47,6 monster Red Scorpion 1072,1,30000,20000
-009-1,27,98,7,8 monster Duck 1029,1,60000,60000
-009-1,113,88,0,0 monster Chagashroom Field 1128,1,60000,60000
+009-1,73,51,49,14 monster Fire Goblin 1067,12,45000,45000,Fisherman::OnKillFireGoblin
+009-1,70,98,47,6 monster Scorpion 1071,3,30000,20000
+009-1,70,83,47,6 monster Red Scorpion 1072,1,30000,20000
+009-1,27,96,7,9 monster Duck 1029,2,60000,60000
+009-1,0,0,0,0 monster Desert Maggot 1083,45,35000,150000
009-1,76,105,1,0 monster Chagashroom Field 1128,1,70000,60000
+009-1,113,88,0,0 monster Chagashroom Field 1128,1,60000,60000
diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt
index 09a9baf36..82d16fb60 100644
--- a/npc/009-1/_warps.txt
+++ b/npc/009-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 009-1: Halinarzo warps
-009-1,56,107,0 warp #009-1_56_107 2,0,010-2,171,20
+009-1,56,109,0 warp #009-1_56_109 2,0,010-2,169,20
009-1,119,40,0 warp #009-1_119_40 0,0,011-1,177,177
009-1,84,63,0 warp #009-1_84_63 0,0,009-2,62,66
009-1,73,63,0 warp #009-1_73_63 0,0,009-2,28,65
diff --git a/npc/010-1-1/_import.txt b/npc/010-1-1/_import.txt
index a86ab148e..0cf78106d 100644
--- a/npc/010-1-1/_import.txt
+++ b/npc/010-1-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 010-1-1: Canyon Great Caves
+// Map 010-1-1: Canyon Cave
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/010-1-1/_mobs.txt",
"npc/010-1-1/_warps.txt",
diff --git a/npc/010-1-1/_mobs.txt b/npc/010-1-1/_mobs.txt
index c539ca2be..19c6ac513 100644
--- a/npc/010-1-1/_mobs.txt
+++ b/npc/010-1-1/_mobs.txt
@@ -1,11 +1,11 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 010-1-1: Canyon Great Caves mobs
-010-1-1,55,58,29,22 monster Cave Snake 1035,8,35000,150000
-010-1-1,70,40,3,1 monster Small Topaz Bif 1101,1,35000,150000
-010-1-1,79,54,59,54 monster Cave Maggot 1027,55,40000,200000
-010-1-1,24,34,4,4 monster Black Scorpion 1071,2,35000,150000
-010-1-1,112,34,4,4 monster Black Scorpion 1071,2,35000,150000
-010-1-1,147,83,29,22 monster Black Scorpion 1074,12,35000,150000
-010-1-1,124,43,29,22 monster Bat 1039,3,35000,150000
-010-1-1,135,63,54,54 monster Snake 1122,20,40000,200000
-010-1-1,92,90,54,48 monster Small Topaz Bif 1101,4,40000,200000
+// Map 010-1-1: Canyon Cave mobs
+010-1-1,0,0,0,0 monster Cave Maggot 1027,130,35000,150000
+010-1-1,124,52,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-1,83,118,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-1,109,95,26,24 monster Scorpion 1071,8,35000,150000
+010-1-1,135,88,20,20 monster Bat 1039,7,35000,150000
+010-1-1,165,49,17,19 monster Bat 1122,12,35000,150000
+010-1-1,0,0,0,0 monster Big Topaz Bif 1103,5,35000,150000
+010-1-1,109,38,78,14 monster Small Topaz Bif 1101,3,35000,150000
+010-1-1,64,41,12,23 monster Plushroom Field 1011,4,35000,150000
diff --git a/npc/010-1-1/_warps.txt b/npc/010-1-1/_warps.txt
index adcb84846..90e1599d5 100644
--- a/npc/010-1-1/_warps.txt
+++ b/npc/010-1-1/_warps.txt
@@ -1,21 +1,24 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 010-1-1: Canyon Great Caves warps
-010-1-1,78,73,0 warp #010-1-1_78_73 0,0,010-1,76,69
-010-1-1,31,115,0 warp #010-1-1_31_115 0,0,010-1,81,91
-010-1-1,27,71,0 warp #010-1-1_27_71 0,0,010-1,52,53
-010-1-1,30,39,0 warp #010-1-1_30_39 0,0,010-1,53,93
-010-1-1,41,37,0 warp #010-1-1_41_37 0,0,010-2,88,114
-010-1-1,34,30,0 warp #010-1-1_34_30 0,0,010-1,45,73
-010-1-1,32,24,0 warp #010-1-1_32_24 0,0,010-2,36,104
-010-1-1,43,18,0 warp #010-1-1_43_18 0,0,010-1,42,35
-010-1-1,47,83,0 warp #010-1-1_47_83 0,0,010-2,162,69
-010-1-1,85,98,0 warp #010-1-1_85_98 0,0,010-1,96,33
-010-1-1,163,105,0 warp #010-1-1_163_105 0,0,010-1,110,84
-010-1-1,142,120,0 warp #010-1-1_142_120 0,0,004-2,98,35
-010-1-1,170,49,0 warp #010-1-1_170_49 0,0,010-2,108,128
-010-1-1,178,85,0 warp #010-1-1_178_85 0,0,010-1,87,39
-010-1-1,112,44,0 warp #010-1-1_112_44 0,0,010-2,114,104
-010-1-1,119,36,0 warp #010-1-1_119_36 0,0,010-2,123,100
-010-1-1,112,42,0 warp #010-1-1_112_42 0,0,010-1,105,30
-010-1-1,168,23,0 warp #010-1-1_168_23 0,0,010-2,175,81
-010-1-1,176,50,0 warp #010-1-1_176_50 0,0,010-2,136,116
+// Map 010-1-1: Canyon Cave warps
+010-1-1,124,56,0 warp #010-1-1_124_56 0,0,010-2,86,112
+010-1-1,111,84,0 warp #010-1-1_111_84 0,0,010-1,86,40
+010-1-1,183,51,0 warp #010-1-1_183_51 0,0,010-2,131,113
+010-1-1,188,53,0 warp #010-1-1_188_53 0,0,010-2,134,114
+010-1-1,181,25,0 warp #010-1-1_181_25 0,0,010-2,121,98
+010-1-1,47,32,0 warp #010-1-1_47_32 0,0,010-2,37,97
+010-1-1,40,75,0 warp #010-1-1_40_75 0,0,010-1,46,52
+010-1-1,60,84,0 warp #010-1-1_60_84 0,0,010-4-1,41,56
+010-1-1,71,116,0 warp #010-1-1_71_116 0,0,010-1,77,84
+010-1-1,43,42,0 warp #010-1-1_43_42 0,0,010-2,34,102
+010-1-1,43,26,0 warp #010-1-1_43_26 0,0,010-1,45,30
+010-1-1,56,20,0 warp #010-1-1_56_20 0,0,010-2,61,58
+010-1-1,102,70,0 warp #010-1-1_102_70 0,0,010-1,104,67
+010-1-1,166,87,0 warp #010-1-1_166_87 0,0,010-1,124,63
+010-1-1,107,31,0 warp #010-1-1_107_31 0,0,010-1,95,34
+010-1-1,50,20,0 warp #010-1-1_50_20 0,0,010-2-14,34,21
+010-1-1,167,43,0 warp #010-1-1_167_43 0,0,010-2-6,60,58
+010-1-1,190,103,0 warp #010-1-1_190_103 0,0,010-2-10,36,50
+010-1-1,146,74,0 warp #010-1-1_146_74 0,0,010-1-6,86,40
+010-1-1,50,117,0 warp #010-1-1_50_117 0,0,010-1-5,62,80
+010-1-1,116,122,0 warp #010-1-1_116_122 0,0,004-2-4,103,22
+010-1-1,151,122,0 warp #010-1-1_151_122 0,0,004-2-4,134,25
diff --git a/npc/010-1-10/_import.txt b/npc/010-1-10/_import.txt
new file mode 100644
index 000000000..b88e251c3
--- /dev/null
+++ b/npc/010-1-10/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-1-10: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-10/_mobs.txt",
+"npc/010-1-10/_warps.txt",
diff --git a/npc/010-1-10/_mobs.txt b/npc/010-1-10/_mobs.txt
new file mode 100644
index 000000000..966dd8cc8
--- /dev/null
+++ b/npc/010-1-10/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-10: Canyon Cave mobs
+010-1-10,0,0,0,0 monster Cave Maggot 1027,12,35000,150000
+010-1-10,55,31,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-10,45,25,14,4 monster Mountain Snake 1123,3,35000,150000
diff --git a/npc/010-1-10/_warps.txt b/npc/010-1-10/_warps.txt
new file mode 100644
index 000000000..c83dda901
--- /dev/null
+++ b/npc/010-1-10/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-10: Canyon Cave warps
+010-1-10,33,35,0 warp #010-1-10_33_35 0,0,010-2-4,53,21
+010-1-10,55,38,0 warp #010-1-10_55_38 0,0,010-1,91,49
diff --git a/npc/010-1-11/_import.txt b/npc/010-1-11/_import.txt
new file mode 100644
index 000000000..3c69cdce1
--- /dev/null
+++ b/npc/010-1-11/_import.txt
@@ -0,0 +1,3 @@
+// Map 010-1-11: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-11/_warps.txt",
diff --git a/npc/010-1-11/_warps.txt b/npc/010-1-11/_warps.txt
new file mode 100644
index 000000000..11e27062b
--- /dev/null
+++ b/npc/010-1-11/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-11: Canyon Cave warps
+010-1-11,36,30,0 warp #010-1-11_36_30 0,0,004-2-11,52,51
diff --git a/npc/010-1-12/_import.txt b/npc/010-1-12/_import.txt
new file mode 100644
index 000000000..e317f7bae
--- /dev/null
+++ b/npc/010-1-12/_import.txt
@@ -0,0 +1,3 @@
+// Map 010-1-12: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-12/_warps.txt",
diff --git a/npc/010-1-12/_warps.txt b/npc/010-1-12/_warps.txt
new file mode 100644
index 000000000..3c5a96137
--- /dev/null
+++ b/npc/010-1-12/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-12: Canyon Cave warps
+010-1-12,35,30,0 warp #010-1-12_35_30 0,0,004-2-4,118,43
diff --git a/npc/010-1-2/_import.txt b/npc/010-1-2/_import.txt
new file mode 100644
index 000000000..803275efd
--- /dev/null
+++ b/npc/010-1-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-1-2: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-2/_mobs.txt",
+"npc/010-1-2/_warps.txt",
diff --git a/npc/010-1-2/_mobs.txt b/npc/010-1-2/_mobs.txt
new file mode 100644
index 000000000..22f0eb928
--- /dev/null
+++ b/npc/010-1-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-2: Canyon Cave mobs
+010-1-2,0,0,0,0 monster Cave Maggot 1027,50,35000,150000
diff --git a/npc/010-1-2/_warps.txt b/npc/010-1-2/_warps.txt
new file mode 100644
index 000000000..16e6258e6
--- /dev/null
+++ b/npc/010-1-2/_warps.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-2: Canyon Cave warps
+010-1-2,121,113,0 warp #010-1-2_121_113 0,0,010-2,190,109
+010-1-2,107,86,0 warp #010-1-2_107_86 0,0,010-2,149,120
+010-1-2,52,91,0 warp #010-1-2_52_91 0,0,010-1,124,54
+010-1-2,62,68,0 warp #010-1-2_62_68 0,0,010-2,106,126
+010-1-2,87,22,0 warp #010-1-2_87_22 0,0,010-2,160,67
+010-1-2,118,27,0 warp #010-1-2_118_27 0,0,010-2,173,79
+010-1-2,77,55,0 warp #010-1-2_77_55 0,0,010-2,126,120
+010-1-2,64,47,0 warp #010-1-2_64_47 0,0,010-2,112,102
+010-1-2,46,110,0 warp #010-1-2_46_110 0,0,004-2-4,121,21
diff --git a/npc/010-1-3/_import.txt b/npc/010-1-3/_import.txt
new file mode 100644
index 000000000..f4becbde5
--- /dev/null
+++ b/npc/010-1-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-1-3: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-3/_mobs.txt",
+"npc/010-1-3/_warps.txt",
diff --git a/npc/010-1-3/_mobs.txt b/npc/010-1-3/_mobs.txt
new file mode 100644
index 000000000..386347898
--- /dev/null
+++ b/npc/010-1-3/_mobs.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-3: Canyon Cave mobs
+010-1-3,0,0,0,0 monster Cave Maggot 1027,12,35000,150000
+010-1-3,43,37,10,11 monster Scorpion 1071,3,35000,150000
+010-1-3,34,34,7,15 monster Snale 1098,2,35000,150000
+010-1-3,32,46,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-3,53,51,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-3,51,28,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-3,0,0,0,0 monster Cave Maggot 1027,4,35000,150000
+010-1-3,47,38,11,3 monster Cave Snale 1035,1,35000,150000
+010-1-3,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
diff --git a/npc/010-1-3/_warps.txt b/npc/010-1-3/_warps.txt
new file mode 100644
index 000000000..0a6524f53
--- /dev/null
+++ b/npc/010-1-3/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-3: Canyon Cave warps
+010-1-3,51,31,0 warp #010-1-3_51_31 0,0,010-1,70,42
+010-1-3,32,50,0 warp #010-1-3_32_50 0,0,010-1,51,54
+010-1-3,53,55,0 warp #010-1-3_53_55 0,0,010-1,74,56
diff --git a/npc/010-1-4/_import.txt b/npc/010-1-4/_import.txt
new file mode 100644
index 000000000..0e07f8acc
--- /dev/null
+++ b/npc/010-1-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-1-4: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-4/_mobs.txt",
+"npc/010-1-4/_warps.txt",
diff --git a/npc/010-1-4/_mobs.txt b/npc/010-1-4/_mobs.txt
new file mode 100644
index 000000000..7dc56890e
--- /dev/null
+++ b/npc/010-1-4/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-4: Canyon Cave mobs
+010-1-4,0,0,0,0 monster Cave Maggot 1027,7,35000,150000
+010-1-4,49,35,9,13 monster Scorpion 1071,6,35000,150000
+010-1-4,39,42,9,14 monster Cave Snake 1035,2,35000,150000
+010-1-4,56,26,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-4,35,52,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-4,0,0,0,0 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/010-1-4/_warps.txt b/npc/010-1-4/_warps.txt
new file mode 100644
index 000000000..51367da91
--- /dev/null
+++ b/npc/010-1-4/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-4: Canyon Cave warps
+010-1-4,35,55,0 warp #010-1-4_35_55 0,0,010-1,67,54
+010-1-4,56,30,0 warp #010-1-4_56_30 0,0,010-1,87,52
diff --git a/npc/010-1-5/_import.txt b/npc/010-1-5/_import.txt
new file mode 100644
index 000000000..b41161a57
--- /dev/null
+++ b/npc/010-1-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-1-5: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-5/_mobs.txt",
+"npc/010-1-5/_warps.txt",
diff --git a/npc/010-1-5/_mobs.txt b/npc/010-1-5/_mobs.txt
new file mode 100644
index 000000000..2a83487d2
--- /dev/null
+++ b/npc/010-1-5/_mobs.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-5: Canyon Cave mobs
+010-1-5,0,0,0,0 monster Cave Maggot 1027,30,35000,150000
+010-1-5,58,69,18,18 monster Desert Bandit 1124,3,35000,150000
+010-1-5,46,42,5,19 monster Bat 1039,4,35000,150000
+010-1-5,69,39,15,17 monster Snake 1122,4,35000,150000
+010-1-5,41,40,10,15 monster Scorpion 1071,8,35000,150000
+010-1-5,58,27,28,4 monster Black Scorpion 1074,4,35000,150000
+010-1-5,44,71,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-5,55,39,4,3 monster Desert Maggot 1083,2,35000,150000
+010-1-5,0,0,0,0 monster Topaz Bif 1102,2,35000,150000
+010-1-5,54,35,24,11 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/010-1-5/_warps.txt b/npc/010-1-5/_warps.txt
new file mode 100644
index 000000000..d20b26b41
--- /dev/null
+++ b/npc/010-1-5/_warps.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-5: Canyon Cave warps
+010-1-5,44,75,0 warp #010-1-5_44_75 0,0,010-1,44,74
+010-1-5,56,39,0 warp #010-1-5_56_39 0,0,010-1,49,67
+010-1-5,36,20,0 warp #010-1-5_36_20 0,0,010-1-8,36,29
+010-1-5,83,36,0 warp #010-1-5_83_36 1,0,010-1-6,32,58
+010-1-5,62,79,0 warp #010-1-5_62_79 0,0,010-1-1,50,116
diff --git a/npc/010-1-6/_import.txt b/npc/010-1-6/_import.txt
new file mode 100644
index 000000000..e30a47de6
--- /dev/null
+++ b/npc/010-1-6/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-1-6: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-6/_mobs.txt",
+"npc/010-1-6/_warps.txt",
diff --git a/npc/010-1-6/_mobs.txt b/npc/010-1-6/_mobs.txt
new file mode 100644
index 000000000..d5b789f3b
--- /dev/null
+++ b/npc/010-1-6/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-6: Canyon Cave mobs
+010-1-6,86,25,5,3 monster Bat 1122,1,35000,150000
+010-1-6,78,31,11,4 monster Black Scorpion 1074,1,35000,150000
+010-1-6,0,0,0,0 monster Cave Maggot 1027,50,35000,150000
+010-1-6,51,72,5,4 monster Blub 1008,1,35000,150000
+010-1-6,0,0,0,0 monster Plushroom Field 1011,2,35000,150000
diff --git a/npc/010-1-6/_warps.txt b/npc/010-1-6/_warps.txt
new file mode 100644
index 000000000..b57cdc379
--- /dev/null
+++ b/npc/010-1-6/_warps.txt
@@ -0,0 +1,10 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-6: Canyon Cave warps
+010-1-6,34,72,0 warp #010-1-6_34_72 0,0,010-1,75,70
+010-1-6,46,46,0 warp #010-1-6_46_46 0,0,010-1,84,34
+010-1-6,70,65,0 warp #010-1-6_70_65 0,0,010-1,104,48
+010-1-6,86,39,0 warp #010-1-6_86_39 0,0,010-1-1,146,73
+010-1-6,64,36,0 warp #010-1-6_64_36 0,0,010-1,104,31
+010-1-6,87,20,0 warp #010-1-6_87_20 0,0,010-1-7,37,39
+010-1-6,32,57,0 warp #010-1-6_32_57 0,0,010-1-5,82,35
+010-1-6,52,23,0 warp #010-1-6_52_23 0,0,010-2-5,52,55
diff --git a/npc/010-1-7/_import.txt b/npc/010-1-7/_import.txt
new file mode 100644
index 000000000..b563c0d7c
--- /dev/null
+++ b/npc/010-1-7/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-1-7: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-7/_mobs.txt",
+"npc/010-1-7/_warps.txt",
diff --git a/npc/010-1-7/_mobs.txt b/npc/010-1-7/_mobs.txt
new file mode 100644
index 000000000..b407712a6
--- /dev/null
+++ b/npc/010-1-7/_mobs.txt
@@ -0,0 +1,10 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-7: Canyon Cave mobs
+010-1-7,56,33,3,9 monster Bat 1039,5,35000,150000
+010-1-7,33,31,3,6 monster Bat 1039,5,35000,150000
+010-1-7,42,24,12,2 monster Bat 1039,5,35000,150000
+010-1-7,52,41,5,2 monster Bat 1039,2,35000,150000
+010-1-7,38,37,7,2 monster Bat 1039,3,35000,150000
+010-1-7,44,30,8,4 monster Black Scorpion 1074,15,35000,150000
+010-1-7,0,0,0,0 monster Cave Maggot 1027,7,35000,150000
+010-1-7,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
diff --git a/npc/010-1-7/_warps.txt b/npc/010-1-7/_warps.txt
new file mode 100644
index 000000000..ef824d924
--- /dev/null
+++ b/npc/010-1-7/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-7: Canyon Cave warps
+010-1-7,47,20,0 warp #010-1-7_47_20 0,0,010-2-7,53,48
+010-1-7,37,40,0 warp #010-1-7_37_40 0,0,010-1-6,87,21
diff --git a/npc/010-1-8/_import.txt b/npc/010-1-8/_import.txt
new file mode 100644
index 000000000..2af915b37
--- /dev/null
+++ b/npc/010-1-8/_import.txt
@@ -0,0 +1,3 @@
+// Map 010-1-8: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-8/_warps.txt",
diff --git a/npc/010-1-8/_warps.txt b/npc/010-1-8/_warps.txt
new file mode 100644
index 000000000..432ab3e3d
--- /dev/null
+++ b/npc/010-1-8/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-8: Canyon Cave warps
+010-1-8,36,30,0 warp #010-1-8_36_30 0,0,010-1-5,36,21
diff --git a/npc/010-1-9/_import.txt b/npc/010-1-9/_import.txt
new file mode 100644
index 000000000..f4ba71291
--- /dev/null
+++ b/npc/010-1-9/_import.txt
@@ -0,0 +1,3 @@
+// Map 010-1-9: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-9/_warps.txt",
diff --git a/npc/010-1-9/_warps.txt b/npc/010-1-9/_warps.txt
new file mode 100644
index 000000000..8c990b97a
--- /dev/null
+++ b/npc/010-1-9/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-9: Canyon Cave warps
+010-1-9,60,33,0 warp #010-1-9_60_33 0,0,010-2,194,56
+010-1-9,73,20,0 warp #010-1-9_73_20 0,0,010-2,207,38
+010-1-9,60,63,0 warp #010-1-9_60_63 0,0,010-2-2,39,64
+010-1-9,49,47,0 warp #010-1-9_49_47 0,0,010-2,185,65
diff --git a/npc/010-1/_mobs.txt b/npc/010-1/_mobs.txt
index 60b5c7ad1..578613f80 100644
--- a/npc/010-1/_mobs.txt
+++ b/npc/010-1/_mobs.txt
@@ -1,20 +1,23 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 010-1: Desert Mountains mobs
-010-1,105,89,9,4 monster Desert Maggot 1083,12,35000,150000
-010-1,65,97,4,4 monster Scorpion 1071,8,35000,150000
-010-1,48,82,4,4 monster Scorpion 1071,6,35000,150000
-010-1,60,57,9,4 monster Sarracenus 1125,2,35000,300000
-010-1,88,76,3,8 monster Mountain Snake 1123,3,35000,300000
-010-1,103,29,3,8 monster Mountain Snake 1123,3,35000,300000
-010-1,120,32,3,2 monster Desert Bandit 1124,1,35000,300000
-010-1,115,47,3,2 monster Desert Bandit 1124,2,35000,300000
-010-1,53,87,3,2 monster Desert Bandit 1124,2,35000,300000
-010-1,93,79,6,5 monster Sarracenus 1125,2,35000,300000
-010-1,78,97,6,5 monster Sarracenus 1125,1,35000,300000
-010-1,75,45,6,5 monster Sarracenus 1125,1,35000,300000
-010-1,100,69,8,2 monster Snake 1122,12,35000,300000
-010-1,59,95,8,2 monster Snake 1122,2,35000,300000
-010-1,74,45,17,3 monster Snake 1122,4,35000,300000
-010-1,110,36,8,2 monster Desert Maggot 1083,10,35000,300000
-010-1,56,100,9,4 monster Desert Maggot 1083,12,35000,150000
-010-1,81,57,39,39 monster Desert Maggot 1083,60,35000,150000
+010-1,104,90,9,4 monster Desert Maggot 1083,12,35000,150000
+010-1,64,98,4,4 monster Scorpion 1071,8,35000,150000
+010-1,46,83,4,4 monster Scorpion 1071,6,35000,150000
+010-1,59,58,9,4 monster Sarracenus 1125,2,35000,300000
+010-1,87,77,3,8 monster Mountain Snake 1123,3,35000,300000
+010-1,102,30,3,8 monster Mountain Snake 1123,3,35000,300000
+010-1,119,33,3,2 monster Desert Bandit 1124,1,35000,300000
+010-1,114,48,3,2 monster Desert Bandit 1124,2,35000,300000
+010-1,52,88,3,2 monster Desert Bandit 1124,2,35000,300000
+010-1,92,80,6,5 monster Sarracenus 1125,2,35000,300000
+010-1,77,98,6,5 monster Sarracenus 1125,1,35000,300000
+010-1,74,46,6,5 monster Sarracenus 1125,1,35000,300000
+010-1,99,70,8,2 monster Snake 1122,12,35000,300000
+010-1,58,96,8,2 monster Snake 1122,2,35000,300000
+010-1,73,46,17,3 monster Snake 1122,4,35000,300000
+010-1,109,37,8,2 monster Desert Maggot 1083,10,35000,300000
+010-1,55,101,9,4 monster Desert Maggot 1083,12,35000,150000
+010-1,0,0,0,0 monster Desert Maggot 1083,70,35000,150000
+010-1,121,78,4,25 monster Desert Maggot 1083,14,35000,150000
+010-1,122,63,1,4 monster Lost Piou 1002,1,35000,300000
+010-1,111,73,13,9 monster Scorpion 1071,8,35000,150000
diff --git a/npc/010-1/_warps.txt b/npc/010-1/_warps.txt
index 8b5d85c76..aa5103acf 100644
--- a/npc/010-1/_warps.txt
+++ b/npc/010-1/_warps.txt
@@ -1,30 +1,35 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 010-1: Desert Mountains warps
-010-1,92,19,0 warp #010-1_92_19 0,0,004-1,33,110
-010-1,89,29,0 warp #010-1_89_29 0,0,004-1,33,110
-010-1,96,32,0 warp #010-1_96_32 0,0,010-1-1,85,99
-010-1,87,38,0 warp #010-1_87_38 0,0,010-1-1,178,84
-010-1,62,56,0 warp #010-1_62_56 0,0,010-1-1,43,19
-010-1,52,52,0 warp #010-1_52_52 0,0,010-1-1,27,70
-010-1,47,50,0 warp #010-1_47_50 0,0,004-1,33,110
-010-1,50,65,0 warp #010-1_50_65 0,0,004-1,33,110
-010-1,45,72,0 warp #010-1_45_72 0,0,010-1-1,34,31
-010-1,59,78,0 warp #010-1_59_78 0,0,004-1,33,110
-010-1,53,92,0 warp #010-1_53_92 0,0,010-1-1,30,38
-010-1,81,90,0 warp #010-1_81_90 0,0,010-1-1,31,114
-010-1,78,82,0 warp #010-1_78_82 0,0,004-1,33,110
-010-1,65,75,0 warp #010-1_65_75 0,0,004-1,33,110
-010-1,122,91,0 warp #010-1_122_91 0,0,004-1,33,110
-010-1,110,83,0 warp #010-1_110_83 0,0,010-1-1,163,106
-010-1,93,68,0 warp #010-1_93_68 0,0,004-2-1,25,46
-010-1,76,68,0 warp #010-1_76_68 0,0,010-1-1,77,73
-010-1,68,62,0 warp #010-1_68_62 0,0,004-1,33,110
-010-1,75,54,0 warp #010-1_75_54 0,0,004-1,33,110
-010-1,126,62,0 warp #010-1_126_62 0,0,004-1,33,110
-010-1,88,50,0 warp #010-1_88_50 0,0,004-1,33,110
-010-1,92,47,0 warp #010-1_92_47 0,0,004-1,33,110
-010-1,108,40,0 warp #010-1_108_40 0,0,004-1,33,110
-010-1,124,26,0 warp #010-1_124_26 0,0,010-2,95,125
-010-1,105,29,0 warp #010-1_105_29 0,0,010-1-1,112,41
-010-1,42,34,0 warp #010-1_42_34 0,0,010-1-1,43,19
-010-1,46,28,0 warp #010-1_46_28 0,0,004-1,33,110
+010-1,121,92,0 warp #010-1_121_92 0,0,004-2-2,55,22
+010-1,124,53,0 warp #010-1_124_53 0,0,010-1-2,52,90
+010-1,86,39,0 warp #010-1_86_39 0,0,010-1-1,111,83
+010-1,70,41,0 warp #010-1_70_41 0,0,010-1-3,51,30
+010-1,51,53,0 warp #010-1_51_53 0,0,010-1-3,32,49
+010-1,74,55,0 warp #010-1_74_55 0,0,010-1-3,53,54
+010-1,87,51,0 warp #010-1_87_51 0,0,010-1-4,56,29
+010-1,67,63,0 warp #010-1_67_63 0,0,010-1-4,53,54
+010-1,49,66,0 warp #010-1_49_66 0,0,010-1-5,56,38
+010-1,44,73,0 warp #010-1_44_73 0,0,010-1-5,44,74
+010-1,104,47,0 warp #010-1_104_47 0,0,010-1-6,70,64
+010-1,92,69,0 warp #010-1_92_69 0,0,004-2-9,61,22
+010-1,61,57,0 warp #010-1_61_57 0,0,010-1-1,55,20
+010-1,46,51,0 warp #010-1_46_51 0,0,010-1-1,40,74
+010-1,52,93,0 warp #010-1_52_93 0,0,004-2-4,33,44
+010-1,109,84,0 warp #010-1_109_84 0,0,004-2-3,95,30
+010-1,77,83,0 warp #010-1_77_83 0,0,010-1-1,71,115
+010-1,45,29,0 warp #010-1_45_29 0,0,010-1-1,43,27
+010-1,84,33,0 warp #010-1_84_33 0,0,010-1-6,46,45
+010-1,75,69,0 warp #010-1_75_69 0,0,010-1-6,33,73
+010-1,107,41,0 warp #010-1_107_41 0,0,010-1-1,100,68
+010-1,91,48,0 warp #010-1_91_48 0,0,010-1-10,55,37
+010-1,41,35,0 warp #010-1_41_35 0,0,010-1-1,42,40
+010-1,125,63,0 warp #010-1_125_63 0,0,010-1-1,166,88
+010-1,104,66,0 warp #010-1_104_66 0,0,010-1-1,102,69
+010-1,59,42,0 warp #010-1_59_42 0,0,010-1-5,81,35
+010-1,91,20,0 warp #010-1_91_20 0,0,010-2-5,40,54
+010-1,58,79,0 warp #010-1_58_79 0,0,004-2-3,49,31
+010-1,69,72,0 warp #010-1_69_72 0,0,004-2-3,65,26
+010-1,123,27,0 warp #010-1_123_27 0,0,010-3,32,28
+010-1,64,76,0 warp #010-1_64_76 0,0,004-2-11,33,42
+010-1,104,30,0 warp #010-1_104_30 0,0,010-1-6,64,37
+010-1,95,33,0 warp #010-1_95_33 0,0,010-1-1,107,30
diff --git a/npc/010-2-10/_import.txt b/npc/010-2-10/_import.txt
new file mode 100644
index 000000000..a9aa248f3
--- /dev/null
+++ b/npc/010-2-10/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-10: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-10/_mobs.txt",
+"npc/010-2-10/_warps.txt",
diff --git a/npc/010-2-10/_mobs.txt b/npc/010-2-10/_mobs.txt
new file mode 100644
index 000000000..42d4da87c
--- /dev/null
+++ b/npc/010-2-10/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-10: Canyon Cave mobs
+010-2-10,39,34,9,12 monster Bat 1039,6,35000,150000
+010-2-10,0,0,0,0 monster Cave Maggot 1027,8,35000,150000
+010-2-10,40,35,10,5 monster Snake 1199,12,35000,150000
+010-2-10,42,27,11,5 monster Old Snake 1122,3,35000,150000
+010-2-10,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
diff --git a/npc/010-2-10/_warps.txt b/npc/010-2-10/_warps.txt
new file mode 100644
index 000000000..ca9cec1d0
--- /dev/null
+++ b/npc/010-2-10/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-10: Canyon Cave warps
+010-2-10,36,51,0 warp #010-2-10_36_51 0,0,010-1-1,190,104
+010-2-10,53,24,0 warp #010-2-10_53_24 0,0,010-2-3,35,66
diff --git a/npc/010-2-11/_import.txt b/npc/010-2-11/_import.txt
new file mode 100644
index 000000000..7b77c0d33
--- /dev/null
+++ b/npc/010-2-11/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-11: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-11/_mobs.txt",
+"npc/010-2-11/_warps.txt",
diff --git a/npc/010-2-11/_mobs.txt b/npc/010-2-11/_mobs.txt
new file mode 100644
index 000000000..ca7ce1ae8
--- /dev/null
+++ b/npc/010-2-11/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-11: Canyon Cave mobs
+010-2-11,47,32,17,10 monster Scorpion 1071,5,35000,150000
+010-2-11,46,44,16,5 monster Snake 1199,2,35000,150000
+010-2-11,0,0,0,0 monster Cave Maggot 1027,7,35000,150000
+010-2-11,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
diff --git a/npc/010-2-11/_warps.txt b/npc/010-2-11/_warps.txt
new file mode 100644
index 000000000..c601c2fd8
--- /dev/null
+++ b/npc/010-2-11/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-11: Canyon Cave warps
+010-2-11,51,31,0 warp #010-2-11_51_31 0,0,010-2-2,84,73
+010-2-11,45,54,0 warp #010-2-11_45_54 0,0,010-2,230,116
diff --git a/npc/010-2-12/_import.txt b/npc/010-2-12/_import.txt
new file mode 100644
index 000000000..be089a59d
--- /dev/null
+++ b/npc/010-2-12/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-12: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-12/_mobs.txt",
+"npc/010-2-12/_warps.txt",
diff --git a/npc/010-2-12/_mobs.txt b/npc/010-2-12/_mobs.txt
new file mode 100644
index 000000000..172b15d7a
--- /dev/null
+++ b/npc/010-2-12/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-12: Canyon Cave mobs
+010-2-12,44,40,12,11 monster Golden Scorpion 1078,1,40000,200000
+010-2-12,0,0,0,0 monster Cave Maggot 1027,9,35000,150000
diff --git a/npc/010-2-12/_warps.txt b/npc/010-2-12/_warps.txt
new file mode 100644
index 000000000..b0f1c57e1
--- /dev/null
+++ b/npc/010-2-12/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-12: Canyon Cave warps
+010-2-12,39,20,0 warp #010-2-12_39_20 0,0,004-3-2,126,96
diff --git a/npc/010-2-13/_import.txt b/npc/010-2-13/_import.txt
new file mode 100644
index 000000000..0dd400038
--- /dev/null
+++ b/npc/010-2-13/_import.txt
@@ -0,0 +1,3 @@
+// Map 010-2-13: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-13/_warps.txt",
diff --git a/npc/010-2-13/_warps.txt b/npc/010-2-13/_warps.txt
new file mode 100644
index 000000000..30273c3d5
--- /dev/null
+++ b/npc/010-2-13/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-13: Canyon Cave warps
+010-2-13,49,25,0 warp #010-2-13_49_25 0,0,010-2,198,102
+010-2-13,34,37,0 warp #010-2-13_34_37 0,0,010-2,192,108
diff --git a/npc/010-2-14/_import.txt b/npc/010-2-14/_import.txt
new file mode 100644
index 000000000..9320e6094
--- /dev/null
+++ b/npc/010-2-14/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-14: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-14/_mobs.txt",
+"npc/010-2-14/_warps.txt",
diff --git a/npc/010-2-14/_mobs.txt b/npc/010-2-14/_mobs.txt
new file mode 100644
index 000000000..46bc9e1c3
--- /dev/null
+++ b/npc/010-2-14/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-14: Canyon Cave mobs
+010-2-14,0,0,0,0 monster Bat 1039,3,35000,150000
+010-2-14,35,37,5,12 monster Bat 1039,3,35000,150000
+010-2-14,35,43,7,9 monster Snake 1122,4,35000,150000
+010-2-14,0,0,0,0 monster Plushroom Field 1011,2,35000,150000
diff --git a/npc/010-2-14/_warps.txt b/npc/010-2-14/_warps.txt
new file mode 100644
index 000000000..d32d14593
--- /dev/null
+++ b/npc/010-2-14/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-14: Canyon Cave warps
+010-2-14,34,20,0 warp #010-2-14_34_20 0,0,010-1-1,50,21
+010-2-14,39,56,0 warp #010-2-14_39_56 0,0,010-2-9,36,21
diff --git a/npc/010-2-15/_import.txt b/npc/010-2-15/_import.txt
new file mode 100644
index 000000000..d9c52d16f
--- /dev/null
+++ b/npc/010-2-15/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-15: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-15/_mobs.txt",
+"npc/010-2-15/_warps.txt",
diff --git a/npc/010-2-15/_mobs.txt b/npc/010-2-15/_mobs.txt
new file mode 100644
index 000000000..39ad9da9e
--- /dev/null
+++ b/npc/010-2-15/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-15: Canyon Cave mobs
+010-2-15,50,27,13,5 monster Scorpion 1071,3,35000,150000
+010-2-15,0,0,0,0 monster Cave Maggot 1027,2,35000,150000
+010-2-15,45,26,12,7 monster Cave Snake 1035,1,35000,150000
diff --git a/npc/010-2-15/_warps.txt b/npc/010-2-15/_warps.txt
new file mode 100644
index 000000000..650ae3137
--- /dev/null
+++ b/npc/010-2-15/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-15: Canyon Cave warps
+010-2-15,35,42,0 warp #010-2-15_35_42 0,0,007-1-1,42,21
+010-2-15,60,37,0 warp #010-2-15_60_37 0,0,007-1-2,32,33
diff --git a/npc/010-2-16/_import.txt b/npc/010-2-16/_import.txt
new file mode 100644
index 000000000..167d9d8a9
--- /dev/null
+++ b/npc/010-2-16/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-16: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-16/_mobs.txt",
+"npc/010-2-16/_warps.txt",
diff --git a/npc/010-2-16/_mobs.txt b/npc/010-2-16/_mobs.txt
new file mode 100644
index 000000000..043b77b40
--- /dev/null
+++ b/npc/010-2-16/_mobs.txt
@@ -0,0 +1,14 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-16: Canyon Cave mobs
+010-2-16,37,24,4,3 monster Desert Maggot 1083,2,35000,150000
+010-2-16,57,25,4,3 monster Desert Maggot 1083,2,35000,150000
+010-2-16,105,40,4,3 monster Desert Maggot 1083,2,35000,150000
+010-2-16,48,44,17,3 monster Snake 1122,4,35000,300000
+010-2-16,73,45,15,10 monster Black Scorpion 1074,3,35000,150000
+010-2-16,56,52,6,4 monster Blub 1008,2,35000,150000
+010-2-16,0,0,0,0 monster Cave Maggot 1027,30,35000,150000
+010-2-16,48,37,18,9 monster Angry Scorpion 1131,9,35000,150000
+010-2-16,46,29,10,1 monster Black Scorpion 1074,1,35000,150000
+010-2-16,80,39,21,13 monster Mountain Snake 1123,2,35000,150000
+010-2-16,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
+010-2-16,66,48,5,2 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/010-2-16/_warps.txt b/npc/010-2-16/_warps.txt
new file mode 100644
index 000000000..6133f9ea0
--- /dev/null
+++ b/npc/010-2-16/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-16: Canyon Cave warps
+010-2-16,37,20,0 warp #010-2-16_37_20 0,0,010-2,219,37
+010-2-16,57,21,0 warp #010-2-16_57_21 0,0,010-2,232,36
+010-2-16,105,45,0 warp #010-2-16_105_45 0,0,010-2,241,39
diff --git a/npc/010-2-2/_import.txt b/npc/010-2-2/_import.txt
new file mode 100644
index 000000000..597193e07
--- /dev/null
+++ b/npc/010-2-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 010-2-2: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-2/_warps.txt",
diff --git a/npc/010-2-2/_warps.txt b/npc/010-2-2/_warps.txt
new file mode 100644
index 000000000..d9e228d7b
--- /dev/null
+++ b/npc/010-2-2/_warps.txt
@@ -0,0 +1,10 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-2: Canyon Cave warps
+010-2-2,94,20,0 warp #010-2-2_94_20 0,0,010-2,249,46
+010-2-2,84,72,0 warp #010-2-2_84_72 0,0,010-2-11,51,30
+010-2-2,64,48,0 warp #010-2-2_64_48 0,0,010-2,210,69
+010-2-2,33,82,0 warp #010-2-2_33_82 0,0,010-2,181,99
+010-2-2,39,63,0 warp #010-2-2_39_63 0,0,010-1-9,60,62
+010-2-2,80,29,0 warp #010-2-2_80_29 0,0,010-2,232,46
+010-2-2,77,52,0 warp #010-2-2_77_52 0,0,010-2,224,64
+010-2-2,70,56,0 warp #010-2-2_70_56 0,0,010-2,223,82
diff --git a/npc/010-2-3/_import.txt b/npc/010-2-3/_import.txt
new file mode 100644
index 000000000..ead458ce7
--- /dev/null
+++ b/npc/010-2-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-3: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-3/_mobs.txt",
+"npc/010-2-3/_warps.txt",
diff --git a/npc/010-2-3/_mobs.txt b/npc/010-2-3/_mobs.txt
new file mode 100644
index 000000000..3893c5ce1
--- /dev/null
+++ b/npc/010-2-3/_mobs.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-3: Canyon Cave mobs
+010-2-3,78,25,4,3 monster Desert Maggot 1083,2,35000,150000
+010-2-3,55,44,4,3 monster Desert Maggot 1083,2,35000,150000
+010-2-3,49,51,4,3 monster Desert Maggot 1083,2,35000,150000
+010-2-3,0,0,0,0 monster Cave Maggot 1027,35,35000,150000
+010-2-3,69,63,4,3 monster Little Blub 1008,3,35000,150000
+010-2-3,71,47,20,26 monster Snake 1122,8,35000,150000
+010-2-3,53,50,23,23 monster Mountain Snake 1123,6,35000,150000
+010-2-3,54,27,4,3 monster Desert Maggot 1083,2,35000,150000
+010-2-3,0,0,0,0 monster Topaz Bif 1102,2,35000,150000
+010-2-3,69,67,4,7 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/010-2-3/_warps.txt b/npc/010-2-3/_warps.txt
new file mode 100644
index 000000000..21c0565e6
--- /dev/null
+++ b/npc/010-2-3/_warps.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-3: Canyon Cave warps
+010-2-3,78,29,0 warp #010-2-3_78_29 0,0,010-2,204,96
+010-2-3,55,48,0 warp #010-2-3_55_48 0,0,010-2,175,112
+010-2-3,49,55,0 warp #010-2-3_49_55 0,0,010-2,168,120
+010-2-3,35,67,0 warp #010-2-3_35_67 0,0,010-2-10,53,25
+010-2-3,54,23,0 warp #010-2-3_54_23 0,0,010-2,171,91
diff --git a/npc/010-2-4/_import.txt b/npc/010-2-4/_import.txt
new file mode 100644
index 000000000..2faee4353
--- /dev/null
+++ b/npc/010-2-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-4: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-4/_mobs.txt",
+"npc/010-2-4/_warps.txt",
diff --git a/npc/010-2-4/_mobs.txt b/npc/010-2-4/_mobs.txt
new file mode 100644
index 000000000..adf097099
--- /dev/null
+++ b/npc/010-2-4/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-4: Canyon Cave mobs
+010-2-4,0,0,0,0 monster Cave Maggot 1027,23,35000,150000
+010-2-4,48,38,7,3 monster Bat 1039,1,35000,150000
+010-2-4,45,38,13,5 monster Cave Snake 1035,4,35000,150000
+010-2-4,45,35,14,14 monster Angry Scorpion 1131,20,35000,150000
+010-2-4,38,39,8,8 monster Old Snake 1199,1,35000,150000
+010-2-4,0,0,0,0 monster Small Topaz Bif 1101,1,35000,150000
diff --git a/npc/010-2-4/_warps.txt b/npc/010-2-4/_warps.txt
new file mode 100644
index 000000000..95655325c
--- /dev/null
+++ b/npc/010-2-4/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-4: Canyon Cave warps
+010-2-4,41,27,0 warp #010-2-4_41_27 0,0,010-2-9,41,42
+010-2-4,58,49,0 warp #010-2-4_58_49 0,0,010-2-9,46,33
+010-2-4,53,20,0 warp #010-2-4_53_20 0,0,010-1-10,33,34
diff --git a/npc/010-2-5/_import.txt b/npc/010-2-5/_import.txt
new file mode 100644
index 000000000..dba92ff22
--- /dev/null
+++ b/npc/010-2-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 010-2-5: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-5/_warps.txt",
diff --git a/npc/010-2-5/_warps.txt b/npc/010-2-5/_warps.txt
new file mode 100644
index 000000000..dd9110c52
--- /dev/null
+++ b/npc/010-2-5/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-5: Canyon Cave warps
+010-2-5,33,28,0 warp #010-2-5_33_28 0,0,010-2,58,87
+010-2-5,52,56,0 warp #010-2-5_52_56 0,0,010-1-6,52,24
+010-2-5,47,20,0 warp #010-2-5_47_20 0,0,010-2,62,74
diff --git a/npc/010-2-6/_import.txt b/npc/010-2-6/_import.txt
new file mode 100644
index 000000000..8750b55c9
--- /dev/null
+++ b/npc/010-2-6/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-6: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-6/_mobs.txt",
+"npc/010-2-6/_warps.txt",
diff --git a/npc/010-2-6/_mobs.txt b/npc/010-2-6/_mobs.txt
new file mode 100644
index 000000000..e48aae142
--- /dev/null
+++ b/npc/010-2-6/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-6: Canyon Cave mobs
+010-2-6,0,0,0,0 monster Cave Maggot 1027,40,35000,150000
+010-2-6,43,38,12,14 monster Mountain Snake 1123,20,35000,150000
+010-2-6,48,46,15,6 monster Snake 1122,7,35000,150000
+010-2-6,0,0,0,0 monster Big Topaz Bif 1103,1,35000,150000
diff --git a/npc/010-2-6/_warps.txt b/npc/010-2-6/_warps.txt
new file mode 100644
index 000000000..88b827cfc
--- /dev/null
+++ b/npc/010-2-6/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-6: Canyon Cave warps
+010-2-6,41,20,0 warp #010-2-6_41_20 0,0,010-2,97,64
+010-2-6,60,59,0 warp #010-2-6_60_59 0,0,010-1-1,167,44
+010-2-6,41,29,0 warp #010-2-6_41_29 0,0,010-2-7,35,27
diff --git a/npc/010-2-7/_import.txt b/npc/010-2-7/_import.txt
new file mode 100644
index 000000000..a52c6f7bb
--- /dev/null
+++ b/npc/010-2-7/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-7: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-7/_mobs.txt",
+"npc/010-2-7/_warps.txt",
diff --git a/npc/010-2-7/_mobs.txt b/npc/010-2-7/_mobs.txt
new file mode 100644
index 000000000..f6c43af57
--- /dev/null
+++ b/npc/010-2-7/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-7: Canyon Cave mobs
+010-2-7,41,26,11,3 monster Mountain Snake 1123,3,35000,150000
+010-2-7,0,0,0,0 monster Cave Maggot 1027,22,35000,150000
+010-2-7,41,32,11,4 monster Bat 1122,3,35000,150000
+010-2-7,47,38,9,7 monster Cave Snake 1035,11,35000,150000
+010-2-7,37,33,7,2 monster Black Scorpion 1074,2,35000,150000
+010-2-7,0,0,0,0 monster Plushroom Field 1011,2,35000,150000
diff --git a/npc/010-2-7/_warps.txt b/npc/010-2-7/_warps.txt
new file mode 100644
index 000000000..f4af0ad52
--- /dev/null
+++ b/npc/010-2-7/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-7: Canyon Cave warps
+010-2-7,53,49,0 warp #010-2-7_53_49 0,0,010-1-7,47,21
+010-2-7,35,28,0 warp #010-2-7_35_28 0,0,010-2-6,41,30
diff --git a/npc/010-2-8/_import.txt b/npc/010-2-8/_import.txt
new file mode 100644
index 000000000..754c02dfc
--- /dev/null
+++ b/npc/010-2-8/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-8: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-8/_mobs.txt",
+"npc/010-2-8/_warps.txt",
diff --git a/npc/010-2-8/_mobs.txt b/npc/010-2-8/_mobs.txt
new file mode 100644
index 000000000..b994ae7fb
--- /dev/null
+++ b/npc/010-2-8/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-8: Canyon Cave mobs
+010-2-8,0,0,0,0 monster Cave Maggot 1027,4,35000,150000
+010-2-8,37,23,4,2 monster Maggot 1030,2,35000,150000
+010-2-8,32,60,4,2 monster Maggot 1030,2,35000,150000
diff --git a/npc/010-2-8/_warps.txt b/npc/010-2-8/_warps.txt
new file mode 100644
index 000000000..0399432a3
--- /dev/null
+++ b/npc/010-2-8/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-8: Canyon Cave warps
+010-2-8,32,63,0 warp #010-2-8_32_63 0,0,004-2,68,125
+010-2-8,37,20,0 warp #010-2-8_37_20 0,0,004-2,73,88
diff --git a/npc/010-2-9/_import.txt b/npc/010-2-9/_import.txt
new file mode 100644
index 000000000..2310e8f33
--- /dev/null
+++ b/npc/010-2-9/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-2-9: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-2-9/_mobs.txt",
+"npc/010-2-9/_warps.txt",
diff --git a/npc/010-2-9/_mobs.txt b/npc/010-2-9/_mobs.txt
new file mode 100644
index 000000000..6f4826ba4
--- /dev/null
+++ b/npc/010-2-9/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-9: Canyon Cave mobs
+010-2-9,39,30,4,3 monster Little Blub 1007,7,35000,150000
+010-2-9,39,31,8,7 monster Bat 1039,7,35000,150000
+010-2-9,39,31,9,5 monster Giant Maggot 1031,9,35000,150000
+010-2-9,0,0,0,0 monster Cave Maggot 1027,20,35000,150000
+010-2-9,46,29,1,5 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/010-2-9/_warps.txt b/npc/010-2-9/_warps.txt
new file mode 100644
index 000000000..15ceb7dff
--- /dev/null
+++ b/npc/010-2-9/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-2-9: Canyon Cave warps
+010-2-9,41,43,0 warp #010-2-9_41_43 0,0,010-2-4,41,28
+010-2-9,36,20,0 warp #010-2-9_36_20 0,0,010-2-14,39,55
diff --git a/npc/010-2/_mobs.txt b/npc/010-2/_mobs.txt
index 2efa74b58..866c45e34 100644
--- a/npc/010-2/_mobs.txt
+++ b/npc/010-2/_mobs.txt
@@ -1,19 +1,19 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 010-2: Desert Mountains mobs
-010-2,122,102,8,2 monster Snake 1122,2,35000,300000
-010-2,163,77,3,8 monster Mountain Snake 1123,3,35000,300000
-010-2,98,122,3,2 monster Desert Bandit 1124,1,35000,300000
-010-2,110,113,3,2 monster Desert Bandit 1124,1,35000,300000
-010-2,126,110,3,2 monster Desert Bandit 1124,2,35000,300000
-010-2,141,102,6,5 monster Desert Bandit 1124,2,35000,300000
-010-2,158,57,6,5 monster Desert Bandit 1124,3,35000,300000
-010-2,149,95,6,5 monster Sarracenus 1125,2,35000,300000
-010-2,180,32,49,9 monster Desert Maggot 1083,9,35000,150000
-010-2,159,61,9,19 monster Desert Maggot 1083,8,35000,150000
-010-2,149,83,3,8 monster Mountain Snake 1123,4,35000,300000
-010-2,49,107,3,8 monster Mountain Snake 1123,7,35000,300000
-010-2,78,120,3,8 monster Mountain Snake 1123,2,35000,300000
-010-2,178,88,3,8 monster Mountain Snake 1123,3,35000,300000
-010-2,172,92,3,8 monster Snake 1122,4,35000,300000
-010-2,154,81,29,46 monster Desert Maggot 1083,30,35000,150000
-010-2,86,120,29,22 monster Desert Maggot 1083,16,35000,150000
+010-2,119,100,7,2 monster Snake 1122,2,35000,300000
+010-2,161,76,3,9 monster Mountain Snake 1123,7,35000,300000
+010-2,96,120,3,2 monster Desert Bandit 1124,1,35000,300000
+010-2,107,111,3,2 monster Desert Bandit 1124,1,35000,300000
+010-2,123,108,3,2 monster Desert Bandit 1124,2,35000,300000
+010-2,139,100,6,5 monster Desert Bandit 1124,3,35000,300000
+010-2,157,55,7,5 monster Desert Bandit 1124,3,35000,300000
+010-2,148,93,7,5 monster Sarracenus 1125,2,35000,300000
+010-2,175,30,46,9 monster Desert Maggot 1083,12,35000,150000
+010-2,157,60,9,20 monster Desert Maggot 1083,8,35000,150000
+010-2,147,82,3,9 monster Mountain Snake 1123,6,35000,300000
+010-2,47,105,3,9 monster Mountain Snake 1123,7,35000,300000
+010-2,76,118,3,8 monster Mountain Snake 1123,2,35000,300000
+010-2,176,87,3,9 monster Mountain Snake 1123,3,35000,300000
+010-2,169,91,3,9 monster Snake 1122,4,35000,300000
+010-2,151,78,28,45 monster Desert Maggot 1083,35,35000,150000
+010-2,85,113,30,17 monster Desert Maggot 1083,20,35000,150000
diff --git a/npc/010-2/_warps.txt b/npc/010-2/_warps.txt
index f3ffe77e3..cdc322825 100644
--- a/npc/010-2/_warps.txt
+++ b/npc/010-2/_warps.txt
@@ -1,31 +1,47 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 010-2: Desert Mountains warps
-010-2,36,103,0 warp #010-2_36_103 0,0,010-1-1,32,25
-010-2,39,98,0 warp #010-2_39_98 0,0,004-1,33,110
-010-2,59,81,0 warp #010-2_59_81 0,0,004-1,33,110
-010-2,64,75,0 warp #010-2_64_75 0,0,004-1,33,110
-010-2,108,129,0 warp #010-2_108_129 0,0,010-1-1,170,50
-010-2,88,113,0 warp #010-2_88_113 0,0,010-1-1,41,38
-010-2,127,122,0 warp #010-2_127_122 0,0,004-1,33,110
-010-2,136,115,0 warp #010-2_136_115 0,0,010-1-1,176,49
-010-2,133,114,0 warp #010-2_133_114 0,0,004-1,33,110
-010-2,114,103,0 warp #010-2_114_103 0,0,010-1-1,112,45
-010-2,123,99,0 warp #010-2_123_99 0,0,010-1-1,119,35
-010-2,158,121,0 warp #010-2_158_121 0,0,010-1-1,31,114
-010-2,165,114,0 warp #010-2_165_114 0,0,004-1,33,110
-010-2,144,111,0 warp #010-2_144_111 0,0,004-1,33,110
-010-2,157,102,0 warp #010-2_157_102 0,0,004-1,33,110
-010-2,192,110,0 warp #010-2_192_110 0,0,004-1,33,110
-010-2,194,109,0 warp #010-2_194_109 0,0,004-1,33,110
-010-2,162,68,0 warp #010-2_162_68 0,0,010-1-1,47,84
-010-2,175,80,0 warp #010-2_175_80 0,0,010-1-1,168,24
-010-2,187,66,0 warp #010-2_187_66 0,0,004-1,33,110
-010-2,196,57,0 warp #010-2_196_57 0,0,004-1,33,110
-010-2,253,95,0 warp #010-2_253_95 0,0,004-1,33,110
-010-2,252,91,0 warp #010-2_252_91 0,0,004-1,33,110
-010-2,239,63,0 warp #010-2_239_63 0,0,004-1,33,110
-010-2,212,70,0 warp #010-2_212_70 0,0,004-1,33,110
-010-2,209,41,0 warp #010-2_209_41 0,0,004-1,33,110
-010-2,243,41,0 warp #010-2_243_41 0,0,004-1,33,110
-010-2,171,18,0 warp #010-2_171_18 0,0,009-1,56,105
-010-2,97,124,0 warp #010-2_97_124 8,0,004-2,71,70
+010-2,190,108,0 warp #010-2_190_108 0,0,010-1-2,120,109
+010-2,149,119,0 warp #010-2_149_119 0,0,010-1-2,94,96
+010-2,125,120,0 warp #010-2_125_120 0,0,010-1-2,77,56
+010-2,112,101,0 warp #010-2_112_101 0,0,010-1-2,64,46
+010-2,185,64,0 warp #010-2_185_64 0,0,010-1-2,49,46
+010-2,194,55,0 warp #010-2_194_55 0,0,010-1-9,60,32
+010-2,249,47,0 warp #010-2_249_47 0,0,010-2-2,94,21
+010-2,210,68,0 warp #010-2_210_68 0,0,010-2-2,64,49
+010-2,224,63,0 warp #010-2_224_63 0,0,010-2-2,59,49
+010-2,223,81,0 warp #010-2_223_81 0,0,010-2-2,70,57
+010-2,230,115,0 warp #010-2_230_115 0,0,010-2-11,45,53
+010-2,175,111,0 warp #010-2_175_111 0,0,010-2-3,55,47
+010-2,168,119,0 warp #010-2_168_119 0,0,010-2-3,49,54
+010-2,232,45,0 warp #010-2_232_45 0,0,010-2-2,80,28
+010-2,236,52,0 warp #010-2_236_52 0,0,010-2-3,77,28
+010-2,204,95,0 warp #010-2_204_95 0,0,010-2-3,78,28
+010-2,142,109,0 warp #010-2_142_109 0,0,010-1-9,32,31
+010-2,160,66,0 warp #010-2_160_66 0,0,010-1-2,87,23
+010-2,173,78,0 warp #010-2_173_78 0,0,010-1-2,118,28
+010-2,192,107,0 warp #010-2_192_107 0,0,010-2-13,33,36
+010-2,201,115,0 warp #010-2_201_115 0,0,010-1-9,33,62
+010-2,218,118,0 warp #010-2_218_118 0,0,010-1-9,33,59
+010-2,237,61,0 warp #010-2_237_61 0,0,010-1-9,72,21
+010-2,106,127,0 warp #010-2_106_127 0,0,010-1-2,62,69
+010-2,86,111,0 warp #010-2_86_111 0,0,010-1-1,124,55
+010-2,241,39,0 warp #010-2_241_39 0,0,010-2-16,105,44
+010-2,232,37,0 warp #010-2_232_37 0,0,010-2-16,57,22
+010-2,219,38,0 warp #010-2_219_38 0,0,010-2-16,37,21
+010-2,168,100,0 warp #010-2_168_100 0,0,010-1-1,180,25
+010-2,131,112,0 warp #010-2_131_112 0,0,010-1-1,183,52
+010-2,134,113,0 warp #010-2_134_113 0,0,010-1-1,188,52
+010-2,121,97,0 warp #010-2_121_97 0,0,010-1-1,181,26
+010-2,97,63,0 warp #010-2_97_63 0,0,010-2-6,41,21
+010-2,62,73,0 warp #010-2_62_73 0,0,010-2-5,47,21
+010-2,48,89,0 warp #010-2_48_89 0,0,010-2-5,33,29
+010-2,37,96,0 warp #010-2_37_96 0,0,010-1-1,47,33
+010-2,34,101,0 warp #010-2_34_101 0,0,010-1-1,43,41
+010-2,57,79,0 warp #010-2_57_79 0,0,004-1,33,110
+010-2,169,19,0 warp #010-2_169_19 2,0,009-1,56,108
+010-2,155,100,0 warp #010-2_155_100 0,0,004-1,33,110
+010-2,93,123,0 warp #010-2_93_123 0,0,010-3,34,21
+010-2,40,78,0 warp #010-2_40_78 0,0,010-1-1,54,41
+010-2,171,90,0 warp #010-2_171_90 0,0,010-2-3,54,24
+010-2,181,98,0 warp #010-2_181_98 0,0,010-2-2,33,81
+010-2,207,39,0 warp #010-2_207_39 0,0,010-1-9,73,21
diff --git a/npc/010-2/sawis.txt b/npc/010-2/sawis.txt
index 3d9a028b3..dc3c9db21 100644
--- a/npc/010-2/sawis.txt
+++ b/npc/010-2/sawis.txt
@@ -128,6 +128,7 @@ OnInit:
.sex = G_MALE;
.distance = 5;
+ npcsit;
end;
}
diff --git a/npc/010-3/_import.txt b/npc/010-3/_import.txt
new file mode 100644
index 000000000..53c9f46e4
--- /dev/null
+++ b/npc/010-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-3: Canyon Stone
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-3/_mobs.txt",
+"npc/010-3/_warps.txt",
diff --git a/npc/010-3/_mobs.txt b/npc/010-3/_mobs.txt
new file mode 100644
index 000000000..371bab059
--- /dev/null
+++ b/npc/010-3/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-3: Canyon Stone mobs
+010-3,33,24,2,2 monster Plushroom Field 1011,1,35000,150000
diff --git a/npc/010-3/_warps.txt b/npc/010-3/_warps.txt
new file mode 100644
index 000000000..e70381eda
--- /dev/null
+++ b/npc/010-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-3: Canyon Stone warps
+010-3,33,29,0 warp #010-3_33_29 0,0,010-1,123,28
+010-3,34,20,0 warp #010-3_34_20 0,0,010-2,94,123
diff --git a/npc/010-4-1/_import.txt b/npc/010-4-1/_import.txt
new file mode 100644
index 000000000..d3a73a2a3
--- /dev/null
+++ b/npc/010-4-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 010-4-1: Katze Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-4-1/_warps.txt",
diff --git a/npc/010-4-1/_warps.txt b/npc/010-4-1/_warps.txt
new file mode 100644
index 000000000..a819a03ab
--- /dev/null
+++ b/npc/010-4-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-4-1: Katze Cave warps
+010-4-1,41,57,0 warp #010-4-1_41_57 0,0,010-1-1,60,85
diff --git a/npc/010-4-2/_import.txt b/npc/010-4-2/_import.txt
new file mode 100644
index 000000000..72f4774c1
--- /dev/null
+++ b/npc/010-4-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-4-2: Canyon Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-4-2/_mobs.txt",
+"npc/010-4-2/_warps.txt",
diff --git a/npc/010-4-2/_mobs.txt b/npc/010-4-2/_mobs.txt
new file mode 100644
index 000000000..2783db7d5
--- /dev/null
+++ b/npc/010-4-2/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-4-2: Canyon Cave mobs
+010-4-2,0,0,0,0 monster Topaz Bif 1097,30,35000,150000
+010-4-2,87,39,4,2 monster Maggot 1030,2,35000,150000
diff --git a/npc/010-4-2/_warps.txt b/npc/010-4-2/_warps.txt
new file mode 100644
index 000000000..c45544121
--- /dev/null
+++ b/npc/010-4-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-4-2: Canyon Cave warps
+010-4-2,37,62,0 warp #010-4-2_37_62 0,0,004-2-3,74,98
+010-4-2,87,42,0 warp #010-4-2_87_42 0,0,004-2,144,26
diff --git a/npc/_import.txt b/npc/_import.txt
index 45971c295..3363160a2 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -47,7 +47,25 @@
@include "npc/003-9/_import.txt"
@include "npc/004-1/_import.txt"
@include "npc/004-2-1/_import.txt"
+@include "npc/004-2-10/_import.txt"
+@include "npc/004-2-11/_import.txt"
+@include "npc/004-2-12/_import.txt"
+@include "npc/004-2-2/_import.txt"
+@include "npc/004-2-3/_import.txt"
+@include "npc/004-2-4/_import.txt"
+@include "npc/004-2-5/_import.txt"
+@include "npc/004-2-6/_import.txt"
+@include "npc/004-2-7/_import.txt"
+@include "npc/004-2-8/_import.txt"
+@include "npc/004-2-9/_import.txt"
@include "npc/004-2/_import.txt"
+@include "npc/004-3-1/_import.txt"
+@include "npc/004-3-2/_import.txt"
+@include "npc/004-3-3/_import.txt"
+@include "npc/004-3-4/_import.txt"
+@include "npc/004-3-5/_import.txt"
+@include "npc/004-3-6/_import.txt"
+@include "npc/004-3/_import.txt"
@include "npc/005-1-1/_import.txt"
@include "npc/005-1/_import.txt"
@include "npc/005-2-1/_import.txt"
@@ -75,6 +93,8 @@
@include "npc/006-7/_import.txt"
@include "npc/006-8/_import.txt"
@include "npc/006-9/_import.txt"
+@include "npc/007-1-1/_import.txt"
+@include "npc/007-1-2/_import.txt"
@include "npc/007-1/_import.txt"
@include "npc/007-2/_import.txt"
@include "npc/008-0/_import.txt"
@@ -88,8 +108,37 @@
@include "npc/009-6/_import.txt"
@include "npc/009-7/_import.txt"
@include "npc/010-1-1/_import.txt"
+@include "npc/010-1-10/_import.txt"
+@include "npc/010-1-11/_import.txt"
+@include "npc/010-1-12/_import.txt"
+@include "npc/010-1-2/_import.txt"
+@include "npc/010-1-3/_import.txt"
+@include "npc/010-1-4/_import.txt"
+@include "npc/010-1-5/_import.txt"
+@include "npc/010-1-6/_import.txt"
+@include "npc/010-1-7/_import.txt"
+@include "npc/010-1-8/_import.txt"
+@include "npc/010-1-9/_import.txt"
@include "npc/010-1/_import.txt"
+@include "npc/010-2-10/_import.txt"
+@include "npc/010-2-11/_import.txt"
+@include "npc/010-2-12/_import.txt"
+@include "npc/010-2-13/_import.txt"
+@include "npc/010-2-14/_import.txt"
+@include "npc/010-2-15/_import.txt"
+@include "npc/010-2-16/_import.txt"
+@include "npc/010-2-2/_import.txt"
+@include "npc/010-2-3/_import.txt"
+@include "npc/010-2-4/_import.txt"
+@include "npc/010-2-5/_import.txt"
+@include "npc/010-2-6/_import.txt"
+@include "npc/010-2-7/_import.txt"
+@include "npc/010-2-8/_import.txt"
+@include "npc/010-2-9/_import.txt"
@include "npc/010-2/_import.txt"
+@include "npc/010-3/_import.txt"
+@include "npc/010-4-1/_import.txt"
+@include "npc/010-4-2/_import.txt"
@include "npc/011-1/_import.txt"
@include "npc/011-2/_import.txt"
@include "npc/011-3/_import.txt"