Pirate Caves can now be accessed, but nothing to do there yet.

Except killing monsters.

16 files changed, 256 insertions, 173 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 0d3acbc7a..3911d868b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -111,6 +111,9 @@ map_list: (
     "014-5",
     "015-1",
     "015-2",
+    "015-3-1",
+    "015-3-2",
+    "015-3-3",
     "015-3",
     "015-4",
     "015-5",
diff --git a/db/map_index.txt b/db/map_index.txt
index a69249751..515a8765e 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -108,176 +108,179 @@
 014-5 108
 015-1 109
 015-2 110
-015-3 111
-015-4 112
-015-5 113
-015-6 114
-015-7 115
-015-8-1 116
-015-8 117
-016-1 118
-016-6 119
-016-7 120
-017-0 121
-017-1 122
-017-10 123
-017-2-1 124
-017-2-2 125
-017-2 126
-017-3 127
-017-4 128
-017-5 129
-017-6 130
-017-7 131
-017-8 132
-018-1-1 133
-018-1 134
-018-2-1 135
-018-2-2 136
-018-2-3 137
-018-2-4 138
-018-2-5 139
-018-2-6 140
-018-2-7 141
-018-2-8 142
-018-2 143
-018-3 144
-018-4-1 145
-018-4-2 146
-018-4 147
-018-5-0 148
-018-5-1 149
-018-5-2 150
-018-5-3 151
-018-5-4 152
-018-5-5 153
-018-5-boss 154
-018-5 155
-018-6-0 156
-018-6-1 157
-018-6-2 158
-018-6-3 159
-018-7-1 160
-018-7 161
-019-1-1 162
-019-1 163
-019-2 164
-019-3 165
-019-4-1 166
-019-4 167
-020-1 168
-020-2 169
-020-3 170
-020-4 171
-020-5 172
-020-6 173
-020-7-1 174
-020-7-2 175
-020-7 176
-021-0 177
-021-1 178
-021-2 179
-021-3 180
-021-4 181
-022-1 182
-023-1 183
-023-2 184
-023-3-1 185
-023-3-2 186
-023-3 187
-023-4 188
-024-1 189
-024-10 190
-024-11 191
-024-12 192
-024-13 193
-024-14 194
-024-15 195
-024-16 196
-024-2 197
-024-3 198
-024-4 199
-024-5 200
-024-6 201
-024-7 202
-024-8 203
-024-9 204
-025-1 205
-025-2-1 206
-025-2-2 207
-025-2-3 208
-025-2-4 209
-025-2 210
-025-3 211
-026-0 212
-026-1 213
-026-2 214
-027-0 215
-027-1 216
-027-2 217
-027-3 218
-027-4 219
-029-0 220
-029-1 221
-029-2 222
-029-3 223
-029-4 224
-029-5 225
-029-6 226
-029-7 227
-029-8 228
-029-9 229
-030-01 230
-030-02 231
-030-03 232
-030-04 233
-030-05 234
-030-06 235
-030-07 236
-030-08 237
-030-09 238
-030-10 239
-030-11 240
-030-12 241
-030-13 242
-030-14 243
-030-15 244
-030-16 245
-030-17 246
-030-18 247
-030-19 248
-030-20 249
-030-21 250
-030-22 251
-030-23 252
-030-24 253
-031-0 254
-031-1 255
-031-2 256
-031-3 257
-031-4 258
-031-5 259
-031-6 260
-031-7 261
-031-8 262
-031-9 263
-042-0 264
-042-1 265
-042-10 266
-042-11 267
-042-2 268
-042-3 269
-042-4 270
-042-5 271
-042-6 272
-042-7 273
-042-8 274
-042-9 275
-boss 276
-botcheck 277
-guilds 278
-sec_pri 279
-soren-2 280
-soren 281
-test 282
-testbg 283
+015-3-1 111
+015-3-2 112
+015-3-3 113
+015-3 114
+015-4 115
+015-5 116
+015-6 117
+015-7 118
+015-8-1 119
+015-8 120
+016-1 121
+016-6 122
+016-7 123
+017-0 124
+017-1 125
+017-10 126
+017-2-1 127
+017-2-2 128
+017-2 129
+017-3 130
+017-4 131
+017-5 132
+017-6 133
+017-7 134
+017-8 135
+018-1-1 136
+018-1 137
+018-2-1 138
+018-2-2 139
+018-2-3 140
+018-2-4 141
+018-2-5 142
+018-2-6 143
+018-2-7 144
+018-2-8 145
+018-2 146
+018-3 147
+018-4-1 148
+018-4-2 149
+018-4 150
+018-5-0 151
+018-5-1 152
+018-5-2 153
+018-5-3 154
+018-5-4 155
+018-5-5 156
+018-5-boss 157
+018-5 158
+018-6-0 159
+018-6-1 160
+018-6-2 161
+018-6-3 162
+018-7-1 163
+018-7 164
+019-1-1 165
+019-1 166
+019-2 167
+019-3 168
+019-4-1 169
+019-4 170
+020-1 171
+020-2 172
+020-3 173
+020-4 174
+020-5 175
+020-6 176
+020-7-1 177
+020-7-2 178
+020-7 179
+021-0 180
+021-1 181
+021-2 182
+021-3 183
+021-4 184
+022-1 185
+023-1 186
+023-2 187
+023-3-1 188
+023-3-2 189
+023-3 190
+023-4 191
+024-1 192
+024-10 193
+024-11 194
+024-12 195
+024-13 196
+024-14 197
+024-15 198
+024-16 199
+024-2 200
+024-3 201
+024-4 202
+024-5 203
+024-6 204
+024-7 205
+024-8 206
+024-9 207
+025-1 208
+025-2-1 209
+025-2-2 210
+025-2-3 211
+025-2-4 212
+025-2 213
+025-3 214
+026-0 215
+026-1 216
+026-2 217
+027-0 218
+027-1 219
+027-2 220
+027-3 221
+027-4 222
+029-0 223
+029-1 224
+029-2 225
+029-3 226
+029-4 227
+029-5 228
+029-6 229
+029-7 230
+029-8 231
+029-9 232
+030-01 233
+030-02 234
+030-03 235
+030-04 236
+030-05 237
+030-06 238
+030-07 239
+030-08 240
+030-09 241
+030-10 242
+030-11 243
+030-12 244
+030-13 245
+030-14 246
+030-15 247
+030-16 248
+030-17 249
+030-18 250
+030-19 251
+030-20 252
+030-21 253
+030-22 254
+030-23 255
+030-24 256
+031-0 257
+031-1 258
+031-2 259
+031-3 260
+031-4 261
+031-5 262
+031-6 263
+031-7 264
+031-8 265
+031-9 266
+042-0 267
+042-1 268
+042-10 269
+042-11 270
+042-2 271
+042-3 272
+042-4 273
+042-5 274
+042-6 275
+042-7 276
+042-8 277
+042-9 278
+boss 279
+botcheck 280
+guilds 281
+sec_pri 282
+soren-2 283
+soren 284
+test 285
+testbg 286
diff --git a/maps/re/015-3-1.mcache b/maps/re/015-3-1.mcache
new file mode 100644
index 000000000..e89535771
--- /dev/null
+++ b/maps/re/015-3-1.mcache
diff --git a/maps/re/015-3-2.mcache b/maps/re/015-3-2.mcache
new file mode 100644
index 000000000..303c2d95d
--- /dev/null
+++ b/maps/re/015-3-2.mcache
diff --git a/maps/re/015-3-3.mcache b/maps/re/015-3-3.mcache
new file mode 100644
index 000000000..5749c2927
--- /dev/null
+++ b/maps/re/015-3-3.mcache
diff --git a/npc/015-3-1/_import.txt b/npc/015-3-1/_import.txt
new file mode 100644
index 000000000..e00d98674
--- /dev/null
+++ b/npc/015-3-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-3-1: Pirate Caves B1F
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-3-1/_mobs.txt",
+"npc/015-3-1/_warps.txt",
diff --git a/npc/015-3-1/_mobs.txt b/npc/015-3-1/_mobs.txt
new file mode 100644
index 000000000..b5277050e
--- /dev/null
+++ b/npc/015-3-1/_mobs.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-3-1: Pirate Caves B1F mobs
+015-3-1,43,72,3,4	monster	Thug	1442,2,100000,30000
+015-3-1,41,73,3,4	monster	Swashbuckler	1443,1,100000,30000
+015-3-1,46,74,3,4	monster	Grenadier	1444,1,100000,30000
+015-3-1,28,69,4,1	monster	Thug	1442,2,100000,30000
+015-3-1,71,63,3,4	monster	Thug	1442,2,100000,30000
+015-3-1,39,39,3,1	monster	Swashbuckler	1443,2,100000,30000
+015-3-1,71,63,3,4	monster	Grenadier	1444,1,100000,30000
+015-3-1,64,49,6,4	monster	Swashbuckler	1443,1,100000,30000
+015-3-1,29,92,6,4	monster	Swashbuckler	1443,1,100000,30000
+015-3-1,33,50,8,2	monster	Thug	1442,2,100000,30000
diff --git a/npc/015-3-1/_warps.txt b/npc/015-3-1/_warps.txt
new file mode 100644
index 000000000..7683a63fd
--- /dev/null
+++ b/npc/015-3-1/_warps.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-3-1: Pirate Caves B1F warps
+015-3-1,49,80,0	warp	#015-3-1_49_80	0,0,015-3-2,49,83
+015-3-1,31,73,0	warp	#015-3-1_31_73	0,0,015-3-2,31,70
+015-3-1,49,56,0	warp	#015-3-1_49_56	0,0,015-3-2,49,51
+015-3-1,90,64,0	warp	#015-3-1_90_64	0,0,015-3-2,90,68
+015-3-1,80,22,0	warp	#015-3-1_80_22	0,0,015-3,138,196
+015-3-1,77,40,0	warp	#015-3-1_77_40	0,0,015-3-2,78,34
diff --git a/npc/015-3-2/_import.txt b/npc/015-3-2/_import.txt
new file mode 100644
index 000000000..cc4a4e546
--- /dev/null
+++ b/npc/015-3-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-3-2: Pirate Caves B2F
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-3-2/_mobs.txt",
+"npc/015-3-2/_warps.txt",
diff --git a/npc/015-3-2/_mobs.txt b/npc/015-3-2/_mobs.txt
new file mode 100644
index 000000000..61612b743
--- /dev/null
+++ b/npc/015-3-2/_mobs.txt
@@ -0,0 +1,14 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-3-2: Pirate Caves B2F mobs
+015-3-2,35,62,2,10	monster	Grenadier	1444,1,100000,30000
+015-3-2,37,61,2,10	monster	Swashbuckler	1443,2,100000,30000
+015-3-2,60,54,6,3	monster	Thug	1442,2,100000,30000
+015-3-2,39,85,6,3	monster	Thug	1442,2,100000,30000
+015-3-2,39,53,3,11	monster	Thug	1442,2,100000,30000
+015-3-2,29,83,5,3	monster	Swashbuckler	1443,2,100000,30000
+015-3-2,64,51,6,4	monster	Swashbuckler	1443,2,100000,30000
+015-3-2,61,51,6,2	monster	Grenadier	1444,1,100000,30000
+015-3-2,31,90,6,2	monster	Grenadier	1444,1,100000,30000
+015-3-2,97,47,3,11	monster	Thug	1442,2,100000,30000
+015-3-2,90,57,2,10	monster	Swashbuckler	1443,2,100000,30000
+015-3-2,83,40,9,5	monster	Grenadier	1444,1,100000,30000
diff --git a/npc/015-3-2/_warps.txt b/npc/015-3-2/_warps.txt
new file mode 100644
index 000000000..1a1878e40
--- /dev/null
+++ b/npc/015-3-2/_warps.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-3-2: Pirate Caves B2F warps
+015-3-2,49,81,0	warp	#015-3-2_49_81	0,0,015-3-1,49,76
+015-3-2,31,72,0	warp	#015-3-2_31_72	0,0,015-3-1,31,74
+015-3-2,49,53,0	warp	#015-3-2_49_53	0,0,015-3-1,49,57
+015-3-2,90,70,0	warp	#015-3-2_90_70	0,0,015-3-1,90,66
+015-3-2,24,64,0	warp	#015-3-2_24_64	0,0,015-3-3,34,67
+015-3-2,78,32,0	warp	#015-3-2_78_32	0,0,015-3-1,77,38
diff --git a/npc/015-3-3/_import.txt b/npc/015-3-3/_import.txt
new file mode 100644
index 000000000..10462d0b1
--- /dev/null
+++ b/npc/015-3-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-3-3: Pirate Den
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-3-3/_mobs.txt",
+"npc/015-3-3/_warps.txt",
diff --git a/npc/015-3-3/_mobs.txt b/npc/015-3-3/_mobs.txt
new file mode 100644
index 000000000..ab1dbe610
--- /dev/null
+++ b/npc/015-3-3/_mobs.txt
@@ -0,0 +1,16 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-3-3: Pirate Den mobs
+015-3-3,50,67,4,3	monster	Grenadier	1444,1,100000,30000
+015-3-3,47,72,8,3	monster	Swashbuckler	1443,2,100000,30000
+015-3-3,53,74,5,2	monster	Thug	1442,2,100000,30000
+015-3-3,50,90,3,2	monster	Grenadier	1444,1,100000,30000
+015-3-3,46,84,6,2	monster	Thug	1442,2,100000,30000
+015-3-3,40,89,6,3	monster	Swashbuckler	1443,2,100000,30000
+015-3-3,61,37,4,3	monster	Grenadier	1444,1,100000,30000
+015-3-3,66,40,5,1	monster	Thug	1442,2,100000,30000
+015-3-3,71,36,5,2	monster	Swashbuckler	1443,2,100000,30000
+015-3-3,93,40,4,4	monster	Grenadier	1444,1,100000,30000
+015-3-3,87,37,5,3	monster	Thug	1442,2,100000,30000
+015-3-3,102,39,4,2	monster	Swashbuckler	1443,2,100000,30000
+015-3-3,46,52,5,7	monster	Thug	1442,2,100000,30000
+015-3-3,48,44,5,7	monster	Swashbuckler	1443,2,100000,30000
diff --git a/npc/015-3-3/_warps.txt b/npc/015-3-3/_warps.txt
new file mode 100644
index 000000000..5d6a17781
--- /dev/null
+++ b/npc/015-3-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-3-3: Pirate Den warps
+015-3-3,34,65,0	warp	#015-3-3_34_65	0,0,015-3-2,24,62
diff --git a/npc/015-3/_warps.txt b/npc/015-3/_warps.txt
index a468b3548..46a752f49 100644
--- a/npc/015-3/_warps.txt
+++ b/npc/015-3/_warps.txt
@@ -11,6 +11,7 @@ OnTouch:
 	slide 147,39; end;
 }
 015-3,172,196,0	warp	#015-3_172_196	0,0,014-3,120,122
+015-3,138,197,0	warp	#015-3_138_197	0,0,015-3-1,80,23
 015-3,129,199,0	script	#015-3_129_199	NPC_HIDDEN,0,0,{
 	end;
 OnTouch:
diff --git a/npc/_import.txt b/npc/_import.txt
index bd623fe43..f13aedfd8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -110,6 +110,9 @@
 @include "npc/014-5/_import.txt"
 @include "npc/015-1/_import.txt"
 @include "npc/015-2/_import.txt"
+@include "npc/015-3-1/_import.txt"
+@include "npc/015-3-2/_import.txt"
+@include "npc/015-3-3/_import.txt"
 @include "npc/015-3/_import.txt"
 @include "npc/015-4/_import.txt"
 @include "npc/015-5/_import.txt"