12 files changed, 194 insertions, 141 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 080b58f52..548abe8d4 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -276,6 +276,8 @@ map_list: (
     "025-2-4",
     "025-2",
     "025-3",
+    "025-4-1",
+    "025-4",
     "026-0",
     "026-1",
     "026-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 5734ecdc9..b6b0722da 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -273,144 +273,146 @@
 025-2-4 273
 025-2 274
 025-3 275
-026-0 276
-026-1 277
-026-2 278
-026-3 279
-026-6 280
-026-7 281
-027-0 282
-027-1 283
-027-2 284
-027-3 285
-027-4 286
-027-5 287
-027-6 288
-027-7 289
-029-0 290
-029-1 291
-029-2 292
-029-3 293
-029-4 294
-029-5 295
-029-6 296
-029-7 297
-029-8 298
-029-9 299
-030-01 300
-030-02 301
-030-03 302
-030-04 303
-030-05 304
-030-06 305
-030-07 306
-030-08 307
-030-09 308
-030-10 309
-030-11 310
-030-12 311
-030-13 312
-030-14 313
-030-15 314
-030-16 315
-030-17 316
-030-18 317
-030-19 318
-030-20 319
-030-21 320
-030-22 321
-030-23 322
-030-24 323
-030-25 324
-030-26 325
-030-27 326
-030-28 327
-030-29 328
-030-30 329
-030-31 330
-030-32 331
-030-33 332
-030-34 333
-030-35 334
-030-36 335
-030-37 336
-030-38 337
-030-39 338
-030-40 339
-030-41 340
-030-42 341
-030-43 342
-030-44 343
-030-45 344
-030-46 345
-030-47 346
-030-48 347
-030-49 348
-030-50 349
-030-51 350
-030-52 351
-030-53 352
-030-54 353
-030-55 354
-030-56 355
-030-57 356
-030-58 357
-030-59 358
-030-60 359
-030-61 360
-030-62 361
-030-63 362
-030-64 363
-030-65 364
-030-66 365
-030-67 366
-030-68 367
-030-69 368
-030-70 369
-030-71 370
-030-72 371
-030-73 372
-030-74 373
-030-75 374
-031-0 375
-031-1 376
-031-2 377
-031-3 378
-031-4 379
-031-5 380
-031-6 381
-031-7 382
-031-8 383
-031-9 384
-032-1 385
-032-2 386
-032-3 387
-032-4 388
-032-5 389
-033-1 390
-033-2 391
-033-3 392
-033-4 393
-033-5 394
-034-1 395
-034-2 396
-034-3 397
-034-4 398
-042-0 399
-042-1 400
-042-10 401
-042-11 402
-042-2 403
-042-3 404
-042-4 405
-042-5 406
-042-6 407
-042-7 408
-042-8 409
-042-9 410
-boss 411
-botcheck 412
-guilds 413
-sec_pri 414
-soren-2 415
-soren 416
+025-4-1 276
+025-4 277
+026-0 278
+026-1 279
+026-2 280
+026-3 281
+026-6 282
+026-7 283
+027-0 284
+027-1 285
+027-2 286
+027-3 287
+027-4 288
+027-5 289
+027-6 290
+027-7 291
+029-0 292
+029-1 293
+029-2 294
+029-3 295
+029-4 296
+029-5 297
+029-6 298
+029-7 299
+029-8 300
+029-9 301
+030-01 302
+030-02 303
+030-03 304
+030-04 305
+030-05 306
+030-06 307
+030-07 308
+030-08 309
+030-09 310
+030-10 311
+030-11 312
+030-12 313
+030-13 314
+030-14 315
+030-15 316
+030-16 317
+030-17 318
+030-18 319
+030-19 320
+030-20 321
+030-21 322
+030-22 323
+030-23 324
+030-24 325
+030-25 326
+030-26 327
+030-27 328
+030-28 329
+030-29 330
+030-30 331
+030-31 332
+030-32 333
+030-33 334
+030-34 335
+030-35 336
+030-36 337
+030-37 338
+030-38 339
+030-39 340
+030-40 341
+030-41 342
+030-42 343
+030-43 344
+030-44 345
+030-45 346
+030-46 347
+030-47 348
+030-48 349
+030-49 350
+030-50 351
+030-51 352
+030-52 353
+030-53 354
+030-54 355
+030-55 356
+030-56 357
+030-57 358
+030-58 359
+030-59 360
+030-60 361
+030-61 362
+030-62 363
+030-63 364
+030-64 365
+030-65 366
+030-66 367
+030-67 368
+030-68 369
+030-69 370
+030-70 371
+030-71 372
+030-72 373
+030-73 374
+030-74 375
+030-75 376
+031-0 377
+031-1 378
+031-2 379
+031-3 380
+031-4 381
+031-5 382
+031-6 383
+031-7 384
+031-8 385
+031-9 386
+032-1 387
+032-2 388
+032-3 389
+032-4 390
+032-5 391
+033-1 392
+033-2 393
+033-3 394
+033-4 395
+033-5 396
+034-1 397
+034-2 398
+034-3 399
+034-4 400
+042-0 401
+042-1 402
+042-10 403
+042-11 404
+042-2 405
+042-3 406
+042-4 407
+042-5 408
+042-6 409
+042-7 410
+042-8 411
+042-9 412
+boss 413
+botcheck 414
+guilds 415
+sec_pri 416
+soren-2 417
+soren 418
diff --git a/maps/re/025-4-1.mcache b/maps/re/025-4-1.mcache
new file mode 100644
index 000000000..dd251dfd0
--- /dev/null
+++ b/maps/re/025-4-1.mcache
diff --git a/maps/re/025-4.mcache b/maps/re/025-4.mcache
new file mode 100644
index 000000000..bad0539af
--- /dev/null
+++ b/maps/re/025-4.mcache
diff --git a/npc/025-4-1/_import.txt b/npc/025-4-1/_import.txt
new file mode 100644
index 000000000..24f133deb
--- /dev/null
+++ b/npc/025-4-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 025-4-1: Luminous Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-4-1/_mobs.txt",
+"npc/025-4-1/_warps.txt",
diff --git a/npc/025-4-1/_mobs.txt b/npc/025-4-1/_mobs.txt
new file mode 100644
index 000000000..c12c62fde
--- /dev/null
+++ b/npc/025-4-1/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-4-1: Luminous Cave mobs
+025-4-1,52,36,23,17	monster	Copper Skull Slime	1406,12,120000,80000
+025-4-1,62,42,22,25	monster	Lava Skull Slime	1407,9,120000,80000
+025-4-1,45,48,25,26	monster	Terranite Protector	1212,15,60000,30000
+025-4-1,51,50,29,32	monster	Crafty	1018,37,90000,60000
+025-4-1,51,70,32,14	monster	Troll	1171,6,90000,60000
diff --git a/npc/025-4-1/_warps.txt b/npc/025-4-1/_warps.txt
new file mode 100644
index 000000000..27e6d08b7
--- /dev/null
+++ b/npc/025-4-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-4-1: Luminous Cave warps
+025-4-1,33,78,0	warp	#025-4-1_33_78	0,0,025-4,65,70
+025-4-1,72,83,0	warp	#025-4-1_72_83	0,0,025-4,120,33
diff --git a/npc/025-4/_config.txt b/npc/025-4/_config.txt
new file mode 100644
index 000000000..b591aef24
--- /dev/null
+++ b/npc/025-4/_config.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-4: Fortress Island - Southeast conf
+
+025-4,26,56,0	script	#025-4_26_56	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	callfunc "Exception", "FTLadderCheck";
+	end;
+}
diff --git a/npc/025-4/_import.txt b/npc/025-4/_import.txt
new file mode 100644
index 000000000..21ced80be
--- /dev/null
+++ b/npc/025-4/_import.txt
@@ -0,0 +1,5 @@
+// Map 025-4: Fortress Island - Southeast
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-4/_config.txt",
+"npc/025-4/_mobs.txt",
+"npc/025-4/_warps.txt",
diff --git a/npc/025-4/_mobs.txt b/npc/025-4/_mobs.txt
new file mode 100644
index 000000000..5c77cf130
--- /dev/null
+++ b/npc/025-4/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-4: Fortress Island - Southeast mobs
+025-4,32,57,0,0	monster	Terranite Protector	1212,3,60000,30000
+025-4,32,55,0,0	monster	Green Skull Slime	1405,3,60000,30000
+025-4,32,59,0,0	monster	Black Skull Slime	1408,3,60000,30000
+025-4,32,61,0,0	monster	Nightmare Dragon	1230,3,60000,30000
+025-4,34,63,0,0	monster	Pinkie Suseran	1419,3,60000,30000
+025-4,34,65,0,0	monster	Mandragora	1423,3,60000,30000
+025-4,28,62,0,0	monster	Whirly Bird	1232,2,90000,60000
diff --git a/npc/025-4/_warps.txt b/npc/025-4/_warps.txt
new file mode 100644
index 000000000..db811cda6
--- /dev/null
+++ b/npc/025-4/_warps.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-4: Fortress Island - Southeast warps
+025-4,65,69,0	warp	#025-4_65_69	0,0,025-4-1,33,77
+025-4,120,32,0	warp	#025-4_120_32	0,0,025-4-1,72,82
+025-4,26,52,0	script	#025-4_26_52	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 26,57; end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 885db7540..c1af6d172 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -275,6 +275,8 @@
 @include "npc/025-2-4/_import.txt"
 @include "npc/025-2/_import.txt"
 @include "npc/025-3/_import.txt"
+@include "npc/025-4-1/_import.txt"
+@include "npc/025-4/_import.txt"
 @include "npc/026-0/_import.txt"
 @include "npc/026-1/_import.txt"
 @include "npc/026-2/_import.txt"