17 files changed, 165 insertions, 131 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 599c51db2..11798feac 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -279,6 +279,9 @@ map_list: (
     "027-2",
     "027-3",
     "027-4",
+    "027-5",
+    "027-6",
+    "027-7",
     "029-0",
     "029-1",
     "029-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 833b324e0..d77a24973 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -276,132 +276,135 @@
 027-2 276
 027-3 277
 027-4 278
-029-0 279
-029-1 280
-029-2 281
-029-3 282
-029-4 283
-029-5 284
-029-6 285
-029-7 286
-029-8 287
-029-9 288
-030-01 289
-030-02 290
-030-03 291
-030-04 292
-030-05 293
-030-06 294
-030-07 295
-030-08 296
-030-09 297
-030-10 298
-030-11 299
-030-12 300
-030-13 301
-030-14 302
-030-15 303
-030-16 304
-030-17 305
-030-18 306
-030-19 307
-030-20 308
-030-21 309
-030-22 310
-030-23 311
-030-24 312
-030-25 313
-030-26 314
-030-27 315
-030-28 316
-030-29 317
-030-30 318
-030-31 319
-030-32 320
-030-33 321
-030-34 322
-030-35 323
-030-36 324
-030-37 325
-030-38 326
-030-39 327
-030-40 328
-030-41 329
-030-42 330
-030-43 331
-030-44 332
-030-45 333
-030-46 334
-030-47 335
-030-48 336
-030-49 337
-030-50 338
-030-51 339
-030-52 340
-030-53 341
-030-54 342
-030-55 343
-030-56 344
-030-57 345
-030-58 346
-030-59 347
-030-60 348
-030-61 349
-030-62 350
-030-63 351
-030-64 352
-030-65 353
-030-66 354
-030-67 355
-030-68 356
-030-69 357
-030-70 358
-030-71 359
-030-72 360
-030-73 361
-030-74 362
-030-75 363
-031-0 364
-031-1 365
-031-2 366
-031-3 367
-031-4 368
-031-5 369
-031-6 370
-031-7 371
-031-8 372
-031-9 373
-032-1 374
-032-2 375
-032-3 376
-032-4 377
-032-5 378
-033-1 379
-033-2 380
-033-3 381
-033-4 382
-033-5 383
-034-1 384
-034-2 385
-034-3 386
-034-4 387
-042-0 388
-042-1 389
-042-10 390
-042-11 391
-042-2 392
-042-3 393
-042-4 394
-042-5 395
-042-6 396
-042-7 397
-042-8 398
-042-9 399
-boss 400
-botcheck 401
-guilds 402
-sec_pri 403
-soren-2 404
-soren 405
-test 406
-testbg 407
+027-5 279
+027-6 280
+027-7 281
+029-0 282
+029-1 283
+029-2 284
+029-3 285
+029-4 286
+029-5 287
+029-6 288
+029-7 289
+029-8 290
+029-9 291
+030-01 292
+030-02 293
+030-03 294
+030-04 295
+030-05 296
+030-06 297
+030-07 298
+030-08 299
+030-09 300
+030-10 301
+030-11 302
+030-12 303
+030-13 304
+030-14 305
+030-15 306
+030-16 307
+030-17 308
+030-18 309
+030-19 310
+030-20 311
+030-21 312
+030-22 313
+030-23 314
+030-24 315
+030-25 316
+030-26 317
+030-27 318
+030-28 319
+030-29 320
+030-30 321
+030-31 322
+030-32 323
+030-33 324
+030-34 325
+030-35 326
+030-36 327
+030-37 328
+030-38 329
+030-39 330
+030-40 331
+030-41 332
+030-42 333
+030-43 334
+030-44 335
+030-45 336
+030-46 337
+030-47 338
+030-48 339
+030-49 340
+030-50 341
+030-51 342
+030-52 343
+030-53 344
+030-54 345
+030-55 346
+030-56 347
+030-57 348
+030-58 349
+030-59 350
+030-60 351
+030-61 352
+030-62 353
+030-63 354
+030-64 355
+030-65 356
+030-66 357
+030-67 358
+030-68 359
+030-69 360
+030-70 361
+030-71 362
+030-72 363
+030-73 364
+030-74 365
+030-75 366
+031-0 367
+031-1 368
+031-2 369
+031-3 370
+031-4 371
+031-5 372
+031-6 373
+031-7 374
+031-8 375
+031-9 376
+032-1 377
+032-2 378
+032-3 379
+032-4 380
+032-5 381
+033-1 382
+033-2 383
+033-3 384
+033-4 385
+033-5 386
+034-1 387
+034-2 388
+034-3 389
+034-4 390
+042-0 391
+042-1 392
+042-10 393
+042-11 394
+042-2 395
+042-3 396
+042-4 397
+042-5 398
+042-6 399
+042-7 400
+042-8 401
+042-9 402
+boss 403
+botcheck 404
+guilds 405
+sec_pri 406
+soren-2 407
+soren 408
+test 409
+testbg 410
diff --git a/maps/re/027-1.mcache b/maps/re/027-1.mcache
index e00874dc2..f6b9f0f77 100644
--- a/maps/re/027-1.mcache
+++ b/maps/re/027-1.mcache
diff --git a/maps/re/027-5.mcache b/maps/re/027-5.mcache
new file mode 100644
index 000000000..738aa7a05
--- /dev/null
+++ b/maps/re/027-5.mcache
diff --git a/maps/re/027-6.mcache b/maps/re/027-6.mcache
new file mode 100644
index 000000000..265bac5b9
--- /dev/null
+++ b/maps/re/027-6.mcache
diff --git a/maps/re/027-7.mcache b/maps/re/027-7.mcache
new file mode 100644
index 000000000..e881fcedf
--- /dev/null
+++ b/maps/re/027-7.mcache
diff --git a/npc/001-5/_mobs.txt b/npc/001-5/_mobs.txt
index bae3b0755..6a6fd7fc0 100644
--- a/npc/001-5/_mobs.txt
+++ b/npc/001-5/_mobs.txt
@@ -1,5 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-5: Contributor's Cave mobs
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-5: Contributor's Cave mobs
 001-5,49,49,29,29	monster	Blub	1008,2,35000,60000
 001-5,53,50,25,29	monster	Snake	1122,1,35000,120000
 001-5,54,51,25,29	monster	Night Scorpion	1077,1,35000,150000
diff --git a/npc/001-5/_warps.txt b/npc/001-5/_warps.txt
index a657e4a3a..5d4181022 100644
--- a/npc/001-5/_warps.txt
+++ b/npc/001-5/_warps.txt
@@ -1,3 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-5: Contributor's Cave warps
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-5: Contributor's Cave warps
 001-5,22,80,0	warp	#001-5_22_80	0,0,000-1,22,22
diff --git a/npc/027-1/_warps.txt b/npc/027-1/_warps.txt
index 22e4143e4..7d57ab2b8 100644
--- a/npc/027-1/_warps.txt
+++ b/npc/027-1/_warps.txt
@@ -7,3 +7,4 @@
 027-1,107,59,0	warp	#027-1_107_59	0,0,027-4,29,34
 027-1,46,100,0	warp	#027-1_46_100	0,0,027-3,27,25
 027-1,40,115,0	warp	#027-1_40_115	0,0,027-3,24,39
+027-1,103,101,0	warp	#027-1_103_101	0,0,027-6,30,38
diff --git a/npc/027-5/_import.txt b/npc/027-5/_import.txt
new file mode 100644
index 000000000..0b922fe44
--- /dev/null
+++ b/npc/027-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 027-5: Student's Office
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/027-5/_warps.txt",
diff --git a/npc/027-5/_warps.txt b/npc/027-5/_warps.txt
new file mode 100644
index 000000000..f8ddf9af6
--- /dev/null
+++ b/npc/027-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 027-5: Student's Office warps
+027-5,28,24,0	warp	#027-5_28_24	0,0,027-1,120,132
diff --git a/npc/027-6/_import.txt b/npc/027-6/_import.txt
new file mode 100644
index 000000000..2142c70ee
--- /dev/null
+++ b/npc/027-6/_import.txt
@@ -0,0 +1,3 @@
+// Map 027-6: Student House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/027-6/_warps.txt",
diff --git a/npc/027-6/_warps.txt b/npc/027-6/_warps.txt
new file mode 100644
index 000000000..f7e257a41
--- /dev/null
+++ b/npc/027-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 027-6: Student House warps
+027-6,30,39,0	warp	#027-6_30_39	0,0,027-1,103,102
diff --git a/npc/027-7/_import.txt b/npc/027-7/_import.txt
new file mode 100644
index 000000000..9f64ac15e
--- /dev/null
+++ b/npc/027-7/_import.txt
@@ -0,0 +1,3 @@
+// Map 027-7: Academy's Storage
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/027-7/_warps.txt",
diff --git a/npc/027-7/_warps.txt b/npc/027-7/_warps.txt
new file mode 100644
index 000000000..53b128c91
--- /dev/null
+++ b/npc/027-7/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 027-7: Academy's Storage warps
+027-7,41,49,0	warp	#027-7_41_49	0,0,027-1,77,119
+027-7,60,49,0	warp	#027-7_60_49	0,0,027-1,82,119
+027-7,24,49,0	warp	#027-7_24_49	0,0,027-1,72,119
diff --git a/npc/_import.txt b/npc/_import.txt
index f7cca4faf..4822a2d48 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -278,6 +278,9 @@
 @include "npc/027-2/_import.txt"
 @include "npc/027-3/_import.txt"
 @include "npc/027-4/_import.txt"
+@include "npc/027-5/_import.txt"
+@include "npc/027-6/_import.txt"
+@include "npc/027-7/_import.txt"
 @include "npc/029-0/_import.txt"
 @include "npc/029-1/_import.txt"
 @include "npc/029-2/_import.txt"
diff --git a/npc/craft/price.txt b/npc/craft/price.txt
index 72762a1e7..34949eace 100644
--- a/npc/craft/price.txt
+++ b/npc/craft/price.txt
@@ -137,7 +137,7 @@ function	script	fix_cPrice	{
     // And misc
     _fix_cPrice(TerranitePants);
     _fix_cPrice(TerraniteArmor);
-    _fix_cPrice(Skypiercer, 40);
+    _fix_cPrice(Skypiercer, 50);
 
     // And shields
     _fix_cPrice(WoodenShield);
@@ -148,7 +148,7 @@ function	script	fix_cPrice	{
     _fix_cPrice(BlueKnightShield);
     _fix_cPrice(SteelShield);
     _fix_cPrice(DragonShield);
-    _fix_cPrice(SaviorShield, 40);
+    _fix_cPrice(SaviorShield, 50);
 
     // Chest Armor
     _fix_cPrice(LeatherShirt);