Merge pull request #2098 from Asheraf/pairshipupdate

update private airship map list to match main kRO servers

180 files changed, 825 insertions, 293 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 0a975d62e..5adaefec8 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -1143,6 +1143,10 @@ map_list: (
 	"1@gl_k",
 	"2@gl_k",
 
+	// Glast Heim Memorial Dungeon - Hard Mode
+	"1@gl_kh",
+	"2@gl_kh",
+
 	"silk_lair",
 	"evt_bomb",
 
@@ -1179,6 +1183,156 @@ map_list: (
 	"c_tower2_",
 	"c_tower3_",
 
+	// Monster Invasion event
+	"e_hugel",
+
+	// Episode 15.1 Fantasmagorika
+	"1@mcd",
+	"ver_eju",
+	"ver_tunn",
+	"verus03",
+	"verus04",
+
+	// Rebellion Job Change
+	"job_gun",
+
+	// Heroes' Trails - Part 3
+	"1@air1",
+	"1@air2",
+	"1@glast",
+
+	// Tomb Of Honor
+	"lhz_d_n2",
+	"lhz_dun_n",
+
+	// Episode 15.2 Fantasmagorika
+	"1@lab",
+	"1@uns",
+	"un_bk_q",
+	"un_bunker",
+	"un_myst",
+	"verus01",
+	"verus02",
+
+	// Paradise Market
+	"paramk",
+
+	// Infinity Memorial Dungeon
+	"1@infi",
+
+	// Clans Memorial Dungeon
+	"1@ffp",
+
+	// Episode 16.1 Banquest of Heroes + Prontera Castle
+	"1@mir",
+	"2@mir",
+	"1@sthb",
+	"1@sthc",
+	"1@sthd",
+	"prt_cas",
+	"prt_cas_q",
+	"prt_lib",
+	"prt_lib_q",
+	"prt_pri00",
+	"prt_prison",
+	"prt_q",
+
+	// The Village of Lasagna
+	"conch_in",
+	"lasa_dun01",
+	"lasa_dun02",
+	"lasa_dun03",
+	"lasa_dun_q",
+	"lasa_fild01",
+	"lasa_fild02",
+	"lasa_in01",
+	"lasagna",
+
+	// Half Moon In The Daylight
+	"1@pop1",
+	"1@pop2",
+	"1@pop3",
+
+	// Episode 16.2
+	"1@slw",
+	"1@swat",
+	"que_swat",
+	"rebel_in",
+	"slabw01",
+
+	// Day Dungeons
+	"1@md_gef",
+	"1@md_pay",
+
+	// Rock Ridge
+	"har_in01",
+	"harboro1",
+	"harboro2",
+	"rockmi1",
+	"rockmi2",
+	"rockrdg1",
+	"rockrdg2",
+
+	// Glast Heim Memorial Dungeon - Newbie Mode
+	"1@gl_k2",
+	"2@gl_k2",
+
+	// Horror Toy Factory - Newbie Mode
+	"1@xm_d2",
+
+	// Illusion Of Moonlight
+	"pay_d03_i",
+
+	// Illusion Of Vampire
+	"gef_d01_i",
+
+	// Illusion Of Frozen
+	"ice_d03_i",
+
+	// A suspicious shipwreck
+	"1@tre",
+
+	// Poring Village
+	"1@begi",
+
+	// Illusion Of Turtle Island
+	"tur_d03_i",
+	"tur_d04_i",
+
+	// Volcanic Island - Comodo
+	"1@crd",
+
+	// Noodle Festival
+	"1@drdo",
+	"lasa_sea",
+
+	// X anniversary
+	"x_lhz",
+	"x_prt",
+	"x_ra",
+
+	// November Hunting Contest
+	"prt_evt_in",
+
+	// Bossnia Dungeon
+	"vis_h01",
+	"vis_h02",
+	"vis_h03",
+	"vis_h04",
+
+	// Illusion Of Teddy Bear
+	"ein_d02_i",
+
+	// Illusion Of Luanda
+	"com_d02_i",
+
+	// Soul Reaper Job Change
+	"1@soul",
+
+	// Star Emperor Job Change
+	"star_frst",
+	"star_in",
+
 	//------------------------- Clone Maps ---------------------------
 	//------------------------- Extra Maps ---------------------------
 
diff --git a/db/map_index.txt b/db/map_index.txt
index 39f79dcf7..2efafb0b2 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -938,6 +938,95 @@ moro_cav
 1@jtb
 c_tower2_
 c_tower3_
+1@gl_kh
+2@gl_kh
+e_hugel
+1@mcd
+ver_eju
+ver_tunn
+verus03
+verus04
+job_gun
+1@air1
+1@air2
+1@glast
+lhz_d_n2
+lhz_dun_n
+1@lab
+1@uns
+un_bk_q
+un_bunker
+un_myst
+verus01
+verus02
+paramk
+1@infi
+1@ffp
+1@mir
+2@mir
+1@sthb
+1@sthc
+1@sthd
+prt_cas
+prt_cas_q
+prt_lib
+prt_lib_q
+prt_pri00
+prt_prison
+prt_q
+conch_in
+lasa_dun01
+lasa_dun02
+lasa_dun03
+lasa_dun_q
+lasa_fild01
+lasa_fild02
+lasa_in01
+lasagna
+1@pop1
+1@pop2
+1@pop3
+1@slw
+1@swat
+que_swat
+rebel_in
+slabw01
+1@md_gef
+1@md_pay
+har_in01
+harboro1
+harboro2
+rockmi1
+rockmi2
+rockrdg1
+rockrdg2
+1@gl_k2
+2@gl_k2
+1@xm_d2
+pay_d03_i
+gef_d01_i
+ice_d03_i
+1@tre
+1@begi
+tur_d03_i
+tur_d04_i
+1@crd
+1@drdo
+lasa_sea
+x_lhz
+x_prt
+x_ra
+prt_evt_in
+vis_h01
+vis_h02
+vis_h03
+vis_h04
+ein_d02_i
+com_d02_i
+1@soul
+star_frst
+star_in
+
 
 // Only add maps under this line if they are not standard maps!
 //======================================================================================
diff --git a/maps/pre-re/1@air1.mcache b/maps/pre-re/1@air1.mcache
new file mode 100644
index 000000000..051601202
--- /dev/null
+++ b/maps/pre-re/1@air1.mcache
diff --git a/maps/pre-re/1@air2.mcache b/maps/pre-re/1@air2.mcache
new file mode 100644
index 000000000..051601202
--- /dev/null
+++ b/maps/pre-re/1@air2.mcache
diff --git a/maps/pre-re/1@begi.mcache b/maps/pre-re/1@begi.mcache
new file mode 100644
index 000000000..60947df18
--- /dev/null
+++ b/maps/pre-re/1@begi.mcache
diff --git a/maps/pre-re/1@crd.mcache b/maps/pre-re/1@crd.mcache
new file mode 100644
index 000000000..00c466e7e
--- /dev/null
+++ b/maps/pre-re/1@crd.mcache
diff --git a/maps/pre-re/1@drdo.mcache b/maps/pre-re/1@drdo.mcache
new file mode 100644
index 000000000..b6fdf9ef8
--- /dev/null
+++ b/maps/pre-re/1@drdo.mcache
diff --git a/maps/pre-re/1@ffp.mcache b/maps/pre-re/1@ffp.mcache
new file mode 100644
index 000000000..6dfc8bd38
--- /dev/null
+++ b/maps/pre-re/1@ffp.mcache
diff --git a/maps/pre-re/1@gl_k2.mcache b/maps/pre-re/1@gl_k2.mcache
new file mode 100644
index 000000000..c2f7c08b3
--- /dev/null
+++ b/maps/pre-re/1@gl_k2.mcache
diff --git a/maps/pre-re/1@gl_kh.mcache b/maps/pre-re/1@gl_kh.mcache
new file mode 100644
index 000000000..c2f7c08b3
--- /dev/null
+++ b/maps/pre-re/1@gl_kh.mcache
diff --git a/maps/pre-re/1@glast.mcache b/maps/pre-re/1@glast.mcache
new file mode 100644
index 000000000..a65293bb5
--- /dev/null
+++ b/maps/pre-re/1@glast.mcache
diff --git a/maps/pre-re/1@infi.mcache b/maps/pre-re/1@infi.mcache
new file mode 100644
index 000000000..082675ecd
--- /dev/null
+++ b/maps/pre-re/1@infi.mcache
diff --git a/maps/pre-re/1@lab.mcache b/maps/pre-re/1@lab.mcache
new file mode 100644
index 000000000..c2b49e882
--- /dev/null
+++ b/maps/pre-re/1@lab.mcache
diff --git a/maps/pre-re/1@mcd.mcache b/maps/pre-re/1@mcd.mcache
new file mode 100644
index 000000000..1f527a500
--- /dev/null
+++ b/maps/pre-re/1@mcd.mcache
diff --git a/maps/pre-re/1@md_gef.mcache b/maps/pre-re/1@md_gef.mcache
new file mode 100644
index 000000000..95eabec82
--- /dev/null
+++ b/maps/pre-re/1@md_gef.mcache
diff --git a/maps/pre-re/1@md_pay.mcache b/maps/pre-re/1@md_pay.mcache
new file mode 100644
index 000000000..212935951
--- /dev/null
+++ b/maps/pre-re/1@md_pay.mcache
diff --git a/maps/pre-re/1@mir.mcache b/maps/pre-re/1@mir.mcache
new file mode 100644
index 000000000..ea7023bb4
--- /dev/null
+++ b/maps/pre-re/1@mir.mcache
diff --git a/maps/pre-re/1@pop1.mcache b/maps/pre-re/1@pop1.mcache
new file mode 100644
index 000000000..cc71592fc
--- /dev/null
+++ b/maps/pre-re/1@pop1.mcache
diff --git a/maps/pre-re/1@pop2.mcache b/maps/pre-re/1@pop2.mcache
new file mode 100644
index 000000000..646742e68
--- /dev/null
+++ b/maps/pre-re/1@pop2.mcache
diff --git a/maps/pre-re/1@pop3.mcache b/maps/pre-re/1@pop3.mcache
new file mode 100644
index 000000000..af4e14159
--- /dev/null
+++ b/maps/pre-re/1@pop3.mcache
diff --git a/maps/pre-re/1@slw.mcache b/maps/pre-re/1@slw.mcache
new file mode 100644
index 000000000..b5e1af48e
--- /dev/null
+++ b/maps/pre-re/1@slw.mcache
diff --git a/maps/pre-re/1@soul.mcache b/maps/pre-re/1@soul.mcache
new file mode 100644
index 000000000..9dd06e423
--- /dev/null
+++ b/maps/pre-re/1@soul.mcache
diff --git a/maps/pre-re/1@sthb.mcache b/maps/pre-re/1@sthb.mcache
new file mode 100644
index 000000000..534bbcaf4
--- /dev/null
+++ b/maps/pre-re/1@sthb.mcache
diff --git a/maps/pre-re/1@sthc.mcache b/maps/pre-re/1@sthc.mcache
new file mode 100644
index 000000000..32ce5100a
--- /dev/null
+++ b/maps/pre-re/1@sthc.mcache
diff --git a/maps/pre-re/1@sthd.mcache b/maps/pre-re/1@sthd.mcache
new file mode 100644
index 000000000..a2556ba6a
--- /dev/null
+++ b/maps/pre-re/1@sthd.mcache
diff --git a/maps/pre-re/1@swat.mcache b/maps/pre-re/1@swat.mcache
new file mode 100644
index 000000000..719a2872b
--- /dev/null
+++ b/maps/pre-re/1@swat.mcache
diff --git a/maps/pre-re/1@tre.mcache b/maps/pre-re/1@tre.mcache
new file mode 100644
index 000000000..8a3f25c6a
--- /dev/null
+++ b/maps/pre-re/1@tre.mcache
diff --git a/maps/pre-re/1@uns.mcache b/maps/pre-re/1@uns.mcache
new file mode 100644
index 000000000..70c154f40
--- /dev/null
+++ b/maps/pre-re/1@uns.mcache
diff --git a/maps/pre-re/1@xm_d2.mcache b/maps/pre-re/1@xm_d2.mcache
new file mode 100644
index 000000000..560b08599
--- /dev/null
+++ b/maps/pre-re/1@xm_d2.mcache
diff --git a/maps/pre-re/2@gl_k2.mcache b/maps/pre-re/2@gl_k2.mcache
new file mode 100644
index 000000000..50a16b410
--- /dev/null
+++ b/maps/pre-re/2@gl_k2.mcache
diff --git a/maps/pre-re/2@gl_kh.mcache b/maps/pre-re/2@gl_kh.mcache
new file mode 100644
index 000000000..50a16b410
--- /dev/null
+++ b/maps/pre-re/2@gl_kh.mcache
diff --git a/maps/pre-re/2@mir.mcache b/maps/pre-re/2@mir.mcache
new file mode 100644
index 000000000..ea7023bb4
--- /dev/null
+++ b/maps/pre-re/2@mir.mcache
diff --git a/maps/pre-re/com_d02_i.mcache b/maps/pre-re/com_d02_i.mcache
new file mode 100644
index 000000000..dacd60ff9
--- /dev/null
+++ b/maps/pre-re/com_d02_i.mcache
diff --git a/maps/pre-re/conch_in.mcache b/maps/pre-re/conch_in.mcache
new file mode 100644
index 000000000..e1de349d5
--- /dev/null
+++ b/maps/pre-re/conch_in.mcache
diff --git a/maps/pre-re/e_hugel.mcache b/maps/pre-re/e_hugel.mcache
new file mode 100644
index 000000000..e350349bb
--- /dev/null
+++ b/maps/pre-re/e_hugel.mcache
diff --git a/maps/pre-re/ein_d02_i.mcache b/maps/pre-re/ein_d02_i.mcache
new file mode 100644
index 000000000..c7d314ced
--- /dev/null
+++ b/maps/pre-re/ein_d02_i.mcache
diff --git a/maps/pre-re/gef_d01_i.mcache b/maps/pre-re/gef_d01_i.mcache
new file mode 100644
index 000000000..e7c30b99d
--- /dev/null
+++ b/maps/pre-re/gef_d01_i.mcache
diff --git a/maps/pre-re/har_in01.mcache b/maps/pre-re/har_in01.mcache
new file mode 100644
index 000000000..403dd8b16
--- /dev/null
+++ b/maps/pre-re/har_in01.mcache
diff --git a/maps/pre-re/harboro1.mcache b/maps/pre-re/harboro1.mcache
new file mode 100644
index 000000000..899ff3c53
--- /dev/null
+++ b/maps/pre-re/harboro1.mcache
diff --git a/maps/pre-re/harboro2.mcache b/maps/pre-re/harboro2.mcache
new file mode 100644
index 000000000..d64dcbe3e
--- /dev/null
+++ b/maps/pre-re/harboro2.mcache
diff --git a/maps/pre-re/ice_d03_i.mcache b/maps/pre-re/ice_d03_i.mcache
new file mode 100644
index 000000000..584ac4e31
--- /dev/null
+++ b/maps/pre-re/ice_d03_i.mcache
diff --git a/maps/pre-re/job_gun.mcache b/maps/pre-re/job_gun.mcache
new file mode 100644
index 000000000..99cf914f1
--- /dev/null
+++ b/maps/pre-re/job_gun.mcache
diff --git a/maps/pre-re/lasa_dun01.mcache b/maps/pre-re/lasa_dun01.mcache
new file mode 100644
index 000000000..28a4d450f
--- /dev/null
+++ b/maps/pre-re/lasa_dun01.mcache
diff --git a/maps/pre-re/lasa_dun02.mcache b/maps/pre-re/lasa_dun02.mcache
new file mode 100644
index 000000000..9b927036e
--- /dev/null
+++ b/maps/pre-re/lasa_dun02.mcache
diff --git a/maps/pre-re/lasa_dun03.mcache b/maps/pre-re/lasa_dun03.mcache
new file mode 100644
index 000000000..e065395de
--- /dev/null
+++ b/maps/pre-re/lasa_dun03.mcache
diff --git a/maps/pre-re/lasa_dun_q.mcache b/maps/pre-re/lasa_dun_q.mcache
new file mode 100644
index 000000000..e065395de
--- /dev/null
+++ b/maps/pre-re/lasa_dun_q.mcache
diff --git a/maps/pre-re/lasa_fild01.mcache b/maps/pre-re/lasa_fild01.mcache
new file mode 100644
index 000000000..bf050e243
--- /dev/null
+++ b/maps/pre-re/lasa_fild01.mcache
diff --git a/maps/pre-re/lasa_fild02.mcache b/maps/pre-re/lasa_fild02.mcache
new file mode 100644
index 000000000..d7648a03f
--- /dev/null
+++ b/maps/pre-re/lasa_fild02.mcache
diff --git a/maps/pre-re/lasa_in01.mcache b/maps/pre-re/lasa_in01.mcache
new file mode 100644
index 000000000..e1de349d5
--- /dev/null
+++ b/maps/pre-re/lasa_in01.mcache
diff --git a/maps/pre-re/lasa_sea.mcache b/maps/pre-re/lasa_sea.mcache
new file mode 100644
index 000000000..432101de4
--- /dev/null
+++ b/maps/pre-re/lasa_sea.mcache
diff --git a/maps/pre-re/lasagna.mcache b/maps/pre-re/lasagna.mcache
new file mode 100644
index 000000000..3200ed927
--- /dev/null
+++ b/maps/pre-re/lasagna.mcache
diff --git a/maps/pre-re/lhz_d_n2.mcache b/maps/pre-re/lhz_d_n2.mcache
new file mode 100644
index 000000000..828587aeb
--- /dev/null
+++ b/maps/pre-re/lhz_d_n2.mcache
diff --git a/maps/pre-re/lhz_dun_n.mcache b/maps/pre-re/lhz_dun_n.mcache
new file mode 100644
index 000000000..21c5a0777
--- /dev/null
+++ b/maps/pre-re/lhz_dun_n.mcache
diff --git a/maps/pre-re/paramk.mcache b/maps/pre-re/paramk.mcache
new file mode 100644
index 000000000..4ef1baac3
--- /dev/null
+++ b/maps/pre-re/paramk.mcache
diff --git a/maps/pre-re/pay_d03_i.mcache b/maps/pre-re/pay_d03_i.mcache
new file mode 100644
index 000000000..cf8986a25
--- /dev/null
+++ b/maps/pre-re/pay_d03_i.mcache
diff --git a/maps/pre-re/prt_cas.mcache b/maps/pre-re/prt_cas.mcache
new file mode 100644
index 000000000..9f799cb35
--- /dev/null
+++ b/maps/pre-re/prt_cas.mcache
diff --git a/maps/pre-re/prt_cas_q.mcache b/maps/pre-re/prt_cas_q.mcache
new file mode 100644
index 000000000..2c0ec0234
--- /dev/null
+++ b/maps/pre-re/prt_cas_q.mcache
diff --git a/maps/pre-re/prt_evt_in.mcache b/maps/pre-re/prt_evt_in.mcache
new file mode 100644
index 000000000..3a342acab
--- /dev/null
+++ b/maps/pre-re/prt_evt_in.mcache
diff --git a/maps/pre-re/prt_lib.mcache b/maps/pre-re/prt_lib.mcache
new file mode 100644
index 000000000..ee6915535
--- /dev/null
+++ b/maps/pre-re/prt_lib.mcache
diff --git a/maps/pre-re/prt_lib_q.mcache b/maps/pre-re/prt_lib_q.mcache
new file mode 100644
index 000000000..ee6915535
--- /dev/null
+++ b/maps/pre-re/prt_lib_q.mcache
diff --git a/maps/pre-re/prt_pri00.mcache b/maps/pre-re/prt_pri00.mcache
new file mode 100644
index 000000000..df2f98364
--- /dev/null
+++ b/maps/pre-re/prt_pri00.mcache
diff --git a/maps/pre-re/prt_prison.mcache b/maps/pre-re/prt_prison.mcache
new file mode 100644
index 000000000..d8fa5d947
--- /dev/null
+++ b/maps/pre-re/prt_prison.mcache
diff --git a/maps/pre-re/prt_q.mcache b/maps/pre-re/prt_q.mcache
new file mode 100644
index 000000000..057f1fb86
--- /dev/null
+++ b/maps/pre-re/prt_q.mcache
diff --git a/maps/pre-re/que_swat.mcache b/maps/pre-re/que_swat.mcache
new file mode 100644
index 000000000..719a2872b
--- /dev/null
+++ b/maps/pre-re/que_swat.mcache
diff --git a/maps/pre-re/rebel_in.mcache b/maps/pre-re/rebel_in.mcache
new file mode 100644
index 000000000..75576241d
--- /dev/null
+++ b/maps/pre-re/rebel_in.mcache
diff --git a/maps/pre-re/rockmi1.mcache b/maps/pre-re/rockmi1.mcache
new file mode 100644
index 000000000..eb97a1df5
--- /dev/null
+++ b/maps/pre-re/rockmi1.mcache
diff --git a/maps/pre-re/rockmi2.mcache b/maps/pre-re/rockmi2.mcache
new file mode 100644
index 000000000..9e6aaffa8
--- /dev/null
+++ b/maps/pre-re/rockmi2.mcache
diff --git a/maps/pre-re/rockrdg1.mcache b/maps/pre-re/rockrdg1.mcache
new file mode 100644
index 000000000..33c60aa8a
--- /dev/null
+++ b/maps/pre-re/rockrdg1.mcache
diff --git a/maps/pre-re/rockrdg2.mcache b/maps/pre-re/rockrdg2.mcache
new file mode 100644
index 000000000..96bfc51ca
--- /dev/null
+++ b/maps/pre-re/rockrdg2.mcache
diff --git a/maps/pre-re/slabw01.mcache b/maps/pre-re/slabw01.mcache
new file mode 100644
index 000000000..02c8fdd97
--- /dev/null
+++ b/maps/pre-re/slabw01.mcache
diff --git a/maps/pre-re/star_frst.mcache b/maps/pre-re/star_frst.mcache
new file mode 100644
index 000000000..61d9203d5
--- /dev/null
+++ b/maps/pre-re/star_frst.mcache
diff --git a/maps/pre-re/star_in.mcache b/maps/pre-re/star_in.mcache
new file mode 100644
index 000000000..6224f2326
--- /dev/null
+++ b/maps/pre-re/star_in.mcache
diff --git a/maps/pre-re/tur_d03_i.mcache b/maps/pre-re/tur_d03_i.mcache
new file mode 100644
index 000000000..d3e259150
--- /dev/null
+++ b/maps/pre-re/tur_d03_i.mcache
diff --git a/maps/pre-re/tur_d04_i.mcache b/maps/pre-re/tur_d04_i.mcache
new file mode 100644
index 000000000..bd25c7a9a
--- /dev/null
+++ b/maps/pre-re/tur_d04_i.mcache
diff --git a/maps/pre-re/un_bk_q.mcache b/maps/pre-re/un_bk_q.mcache
new file mode 100644
index 000000000..8997d057c
--- /dev/null
+++ b/maps/pre-re/un_bk_q.mcache
diff --git a/maps/pre-re/un_bunker.mcache b/maps/pre-re/un_bunker.mcache
new file mode 100644
index 000000000..8997d057c
--- /dev/null
+++ b/maps/pre-re/un_bunker.mcache
diff --git a/maps/pre-re/un_myst.mcache b/maps/pre-re/un_myst.mcache
new file mode 100644
index 000000000..2702318d2
--- /dev/null
+++ b/maps/pre-re/un_myst.mcache
diff --git a/maps/pre-re/ver_eju.mcache b/maps/pre-re/ver_eju.mcache
new file mode 100644
index 000000000..d325dcdad
--- /dev/null
+++ b/maps/pre-re/ver_eju.mcache
diff --git a/maps/pre-re/ver_tunn.mcache b/maps/pre-re/ver_tunn.mcache
new file mode 100644
index 000000000..fec6b4790
--- /dev/null
+++ b/maps/pre-re/ver_tunn.mcache
diff --git a/maps/pre-re/verus01.mcache b/maps/pre-re/verus01.mcache
new file mode 100644
index 000000000..9590a0e6f
--- /dev/null
+++ b/maps/pre-re/verus01.mcache
diff --git a/maps/pre-re/verus02.mcache b/maps/pre-re/verus02.mcache
new file mode 100644
index 000000000..93c9ece19
--- /dev/null
+++ b/maps/pre-re/verus02.mcache
diff --git a/maps/pre-re/verus03.mcache b/maps/pre-re/verus03.mcache
new file mode 100644
index 000000000..ddc94d997
--- /dev/null
+++ b/maps/pre-re/verus03.mcache
diff --git a/maps/pre-re/verus04.mcache b/maps/pre-re/verus04.mcache
new file mode 100644
index 000000000..162a7140c
--- /dev/null
+++ b/maps/pre-re/verus04.mcache
diff --git a/maps/pre-re/vis_h01.mcache b/maps/pre-re/vis_h01.mcache
new file mode 100644
index 000000000..e61ccaa0b
--- /dev/null
+++ b/maps/pre-re/vis_h01.mcache
diff --git a/maps/pre-re/vis_h02.mcache b/maps/pre-re/vis_h02.mcache
new file mode 100644
index 000000000..e61ccaa0b
--- /dev/null
+++ b/maps/pre-re/vis_h02.mcache
diff --git a/maps/pre-re/vis_h03.mcache b/maps/pre-re/vis_h03.mcache
new file mode 100644
index 000000000..e61ccaa0b
--- /dev/null
+++ b/maps/pre-re/vis_h03.mcache
diff --git a/maps/pre-re/vis_h04.mcache b/maps/pre-re/vis_h04.mcache
new file mode 100644
index 000000000..e61ccaa0b
--- /dev/null
+++ b/maps/pre-re/vis_h04.mcache
diff --git a/maps/pre-re/x_lhz.mcache b/maps/pre-re/x_lhz.mcache
new file mode 100644
index 000000000..2b89c7ada
--- /dev/null
+++ b/maps/pre-re/x_lhz.mcache
diff --git a/maps/pre-re/x_prt.mcache b/maps/pre-re/x_prt.mcache
new file mode 100644
index 000000000..e503f9bb9
--- /dev/null
+++ b/maps/pre-re/x_prt.mcache
diff --git a/maps/pre-re/x_ra.mcache b/maps/pre-re/x_ra.mcache
new file mode 100644
index 000000000..2da14983c
--- /dev/null
+++ b/maps/pre-re/x_ra.mcache
diff --git a/maps/re/1@air1.mcache b/maps/re/1@air1.mcache
new file mode 100644
index 000000000..051601202
--- /dev/null
+++ b/maps/re/1@air1.mcache
diff --git a/maps/re/1@air2.mcache b/maps/re/1@air2.mcache
new file mode 100644
index 000000000..051601202
--- /dev/null
+++ b/maps/re/1@air2.mcache
diff --git a/maps/re/1@begi.mcache b/maps/re/1@begi.mcache
new file mode 100644
index 000000000..60947df18
--- /dev/null
+++ b/maps/re/1@begi.mcache
diff --git a/maps/re/1@crd.mcache b/maps/re/1@crd.mcache
new file mode 100644
index 000000000..00c466e7e
--- /dev/null
+++ b/maps/re/1@crd.mcache
diff --git a/maps/re/1@drdo.mcache b/maps/re/1@drdo.mcache
new file mode 100644
index 000000000..b6fdf9ef8
--- /dev/null
+++ b/maps/re/1@drdo.mcache
diff --git a/maps/re/1@ffp.mcache b/maps/re/1@ffp.mcache
new file mode 100644
index 000000000..6dfc8bd38
--- /dev/null
+++ b/maps/re/1@ffp.mcache
diff --git a/maps/re/1@gl_k2.mcache b/maps/re/1@gl_k2.mcache
new file mode 100644
index 000000000..c2f7c08b3
--- /dev/null
+++ b/maps/re/1@gl_k2.mcache
diff --git a/maps/re/1@gl_kh.mcache b/maps/re/1@gl_kh.mcache
new file mode 100644
index 000000000..c2f7c08b3
--- /dev/null
+++ b/maps/re/1@gl_kh.mcache
diff --git a/maps/re/1@glast.mcache b/maps/re/1@glast.mcache
new file mode 100644
index 000000000..a65293bb5
--- /dev/null
+++ b/maps/re/1@glast.mcache
diff --git a/maps/re/1@infi.mcache b/maps/re/1@infi.mcache
new file mode 100644
index 000000000..082675ecd
--- /dev/null
+++ b/maps/re/1@infi.mcache
diff --git a/maps/re/1@lab.mcache b/maps/re/1@lab.mcache
new file mode 100644
index 000000000..c2b49e882
--- /dev/null
+++ b/maps/re/1@lab.mcache
diff --git a/maps/re/1@mcd.mcache b/maps/re/1@mcd.mcache
new file mode 100644
index 000000000..1f527a500
--- /dev/null
+++ b/maps/re/1@mcd.mcache
diff --git a/maps/re/1@md_gef.mcache b/maps/re/1@md_gef.mcache
new file mode 100644
index 000000000..95eabec82
--- /dev/null
+++ b/maps/re/1@md_gef.mcache
diff --git a/maps/re/1@md_pay.mcache b/maps/re/1@md_pay.mcache
new file mode 100644
index 000000000..212935951
--- /dev/null
+++ b/maps/re/1@md_pay.mcache
diff --git a/maps/re/1@mir.mcache b/maps/re/1@mir.mcache
new file mode 100644
index 000000000..ea7023bb4
--- /dev/null
+++ b/maps/re/1@mir.mcache
diff --git a/maps/re/1@pop1.mcache b/maps/re/1@pop1.mcache
new file mode 100644
index 000000000..cc71592fc
--- /dev/null
+++ b/maps/re/1@pop1.mcache
diff --git a/maps/re/1@pop2.mcache b/maps/re/1@pop2.mcache
new file mode 100644
index 000000000..646742e68
--- /dev/null
+++ b/maps/re/1@pop2.mcache
diff --git a/maps/re/1@pop3.mcache b/maps/re/1@pop3.mcache
new file mode 100644
index 000000000..af4e14159
--- /dev/null
+++ b/maps/re/1@pop3.mcache
diff --git a/maps/re/1@slw.mcache b/maps/re/1@slw.mcache
new file mode 100644
index 000000000..b5e1af48e
--- /dev/null
+++ b/maps/re/1@slw.mcache
diff --git a/maps/re/1@soul.mcache b/maps/re/1@soul.mcache
new file mode 100644
index 000000000..9dd06e423
--- /dev/null
+++ b/maps/re/1@soul.mcache
diff --git a/maps/re/1@sthb.mcache b/maps/re/1@sthb.mcache
new file mode 100644
index 000000000..534bbcaf4
--- /dev/null
+++ b/maps/re/1@sthb.mcache
diff --git a/maps/re/1@sthc.mcache b/maps/re/1@sthc.mcache
new file mode 100644
index 000000000..32ce5100a
--- /dev/null
+++ b/maps/re/1@sthc.mcache
diff --git a/maps/re/1@sthd.mcache b/maps/re/1@sthd.mcache
new file mode 100644
index 000000000..a2556ba6a
--- /dev/null
+++ b/maps/re/1@sthd.mcache
diff --git a/maps/re/1@swat.mcache b/maps/re/1@swat.mcache
new file mode 100644
index 000000000..719a2872b
--- /dev/null
+++ b/maps/re/1@swat.mcache
diff --git a/maps/re/1@tre.mcache b/maps/re/1@tre.mcache
new file mode 100644
index 000000000..8a3f25c6a
--- /dev/null
+++ b/maps/re/1@tre.mcache
diff --git a/maps/re/1@uns.mcache b/maps/re/1@uns.mcache
new file mode 100644
index 000000000..70c154f40
--- /dev/null
+++ b/maps/re/1@uns.mcache
diff --git a/maps/re/1@xm_d2.mcache b/maps/re/1@xm_d2.mcache
new file mode 100644
index 000000000..560b08599
--- /dev/null
+++ b/maps/re/1@xm_d2.mcache
diff --git a/maps/re/2@gl_k2.mcache b/maps/re/2@gl_k2.mcache
new file mode 100644
index 000000000..50a16b410
--- /dev/null
+++ b/maps/re/2@gl_k2.mcache
diff --git a/maps/re/2@gl_kh.mcache b/maps/re/2@gl_kh.mcache
new file mode 100644
index 000000000..50a16b410
--- /dev/null
+++ b/maps/re/2@gl_kh.mcache
diff --git a/maps/re/2@mir.mcache b/maps/re/2@mir.mcache
new file mode 100644
index 000000000..ea7023bb4
--- /dev/null
+++ b/maps/re/2@mir.mcache
diff --git a/maps/re/com_d02_i.mcache b/maps/re/com_d02_i.mcache
new file mode 100644
index 000000000..dacd60ff9
--- /dev/null
+++ b/maps/re/com_d02_i.mcache
diff --git a/maps/re/conch_in.mcache b/maps/re/conch_in.mcache
new file mode 100644
index 000000000..e1de349d5
--- /dev/null
+++ b/maps/re/conch_in.mcache
diff --git a/maps/re/e_hugel.mcache b/maps/re/e_hugel.mcache
new file mode 100644
index 000000000..e350349bb
--- /dev/null
+++ b/maps/re/e_hugel.mcache
diff --git a/maps/re/ein_d02_i.mcache b/maps/re/ein_d02_i.mcache
new file mode 100644
index 000000000..c7d314ced
--- /dev/null
+++ b/maps/re/ein_d02_i.mcache
diff --git a/maps/re/gef_d01_i.mcache b/maps/re/gef_d01_i.mcache
new file mode 100644
index 000000000..e7c30b99d
--- /dev/null
+++ b/maps/re/gef_d01_i.mcache
diff --git a/maps/re/har_in01.mcache b/maps/re/har_in01.mcache
new file mode 100644
index 000000000..403dd8b16
--- /dev/null
+++ b/maps/re/har_in01.mcache
diff --git a/maps/re/harboro1.mcache b/maps/re/harboro1.mcache
new file mode 100644
index 000000000..899ff3c53
--- /dev/null
+++ b/maps/re/harboro1.mcache
diff --git a/maps/re/harboro2.mcache b/maps/re/harboro2.mcache
new file mode 100644
index 000000000..d64dcbe3e
--- /dev/null
+++ b/maps/re/harboro2.mcache
diff --git a/maps/re/ice_d03_i.mcache b/maps/re/ice_d03_i.mcache
new file mode 100644
index 000000000..584ac4e31
--- /dev/null
+++ b/maps/re/ice_d03_i.mcache
diff --git a/maps/re/job_gun.mcache b/maps/re/job_gun.mcache
new file mode 100644
index 000000000..99cf914f1
--- /dev/null
+++ b/maps/re/job_gun.mcache
diff --git a/maps/re/lasa_dun01.mcache b/maps/re/lasa_dun01.mcache
new file mode 100644
index 000000000..28a4d450f
--- /dev/null
+++ b/maps/re/lasa_dun01.mcache
diff --git a/maps/re/lasa_dun02.mcache b/maps/re/lasa_dun02.mcache
new file mode 100644
index 000000000..9b927036e
--- /dev/null
+++ b/maps/re/lasa_dun02.mcache
diff --git a/maps/re/lasa_dun03.mcache b/maps/re/lasa_dun03.mcache
new file mode 100644
index 000000000..e065395de
--- /dev/null
+++ b/maps/re/lasa_dun03.mcache
diff --git a/maps/re/lasa_dun_q.mcache b/maps/re/lasa_dun_q.mcache
new file mode 100644
index 000000000..e065395de
--- /dev/null
+++ b/maps/re/lasa_dun_q.mcache
diff --git a/maps/re/lasa_fild01.mcache b/maps/re/lasa_fild01.mcache
new file mode 100644
index 000000000..bf050e243
--- /dev/null
+++ b/maps/re/lasa_fild01.mcache
diff --git a/maps/re/lasa_fild02.mcache b/maps/re/lasa_fild02.mcache
new file mode 100644
index 000000000..d7648a03f
--- /dev/null
+++ b/maps/re/lasa_fild02.mcache
diff --git a/maps/re/lasa_in01.mcache b/maps/re/lasa_in01.mcache
new file mode 100644
index 000000000..e1de349d5
--- /dev/null
+++ b/maps/re/lasa_in01.mcache
diff --git a/maps/re/lasa_sea.mcache b/maps/re/lasa_sea.mcache
new file mode 100644
index 000000000..432101de4
--- /dev/null
+++ b/maps/re/lasa_sea.mcache
diff --git a/maps/re/lasagna.mcache b/maps/re/lasagna.mcache
new file mode 100644
index 000000000..3200ed927
--- /dev/null
+++ b/maps/re/lasagna.mcache
diff --git a/maps/re/lhz_d_n2.mcache b/maps/re/lhz_d_n2.mcache
new file mode 100644
index 000000000..828587aeb
--- /dev/null
+++ b/maps/re/lhz_d_n2.mcache
diff --git a/maps/re/lhz_dun_n.mcache b/maps/re/lhz_dun_n.mcache
new file mode 100644
index 000000000..21c5a0777
--- /dev/null
+++ b/maps/re/lhz_dun_n.mcache
diff --git a/maps/re/paramk.mcache b/maps/re/paramk.mcache
new file mode 100644
index 000000000..4ef1baac3
--- /dev/null
+++ b/maps/re/paramk.mcache
diff --git a/maps/re/pay_d03_i.mcache b/maps/re/pay_d03_i.mcache
new file mode 100644
index 000000000..cf8986a25
--- /dev/null
+++ b/maps/re/pay_d03_i.mcache
diff --git a/maps/re/prt_cas.mcache b/maps/re/prt_cas.mcache
new file mode 100644
index 000000000..9f799cb35
--- /dev/null
+++ b/maps/re/prt_cas.mcache
diff --git a/maps/re/prt_cas_q.mcache b/maps/re/prt_cas_q.mcache
new file mode 100644
index 000000000..2c0ec0234
--- /dev/null
+++ b/maps/re/prt_cas_q.mcache
diff --git a/maps/re/prt_evt_in.mcache b/maps/re/prt_evt_in.mcache
new file mode 100644
index 000000000..3a342acab
--- /dev/null
+++ b/maps/re/prt_evt_in.mcache
diff --git a/maps/re/prt_lib.mcache b/maps/re/prt_lib.mcache
new file mode 100644
index 000000000..ee6915535
--- /dev/null
+++ b/maps/re/prt_lib.mcache
diff --git a/maps/re/prt_lib_q.mcache b/maps/re/prt_lib_q.mcache
new file mode 100644
index 000000000..ee6915535
--- /dev/null
+++ b/maps/re/prt_lib_q.mcache
diff --git a/maps/re/prt_pri00.mcache b/maps/re/prt_pri00.mcache
new file mode 100644
index 000000000..df2f98364
--- /dev/null
+++ b/maps/re/prt_pri00.mcache
diff --git a/maps/re/prt_prison.mcache b/maps/re/prt_prison.mcache
new file mode 100644
index 000000000..d8fa5d947
--- /dev/null
+++ b/maps/re/prt_prison.mcache
diff --git a/maps/re/prt_q.mcache b/maps/re/prt_q.mcache
new file mode 100644
index 000000000..057f1fb86
--- /dev/null
+++ b/maps/re/prt_q.mcache
diff --git a/maps/re/que_swat.mcache b/maps/re/que_swat.mcache
new file mode 100644
index 000000000..719a2872b
--- /dev/null
+++ b/maps/re/que_swat.mcache
diff --git a/maps/re/rebel_in.mcache b/maps/re/rebel_in.mcache
new file mode 100644
index 000000000..75576241d
--- /dev/null
+++ b/maps/re/rebel_in.mcache
diff --git a/maps/re/rockmi1.mcache b/maps/re/rockmi1.mcache
new file mode 100644
index 000000000..eb97a1df5
--- /dev/null
+++ b/maps/re/rockmi1.mcache
diff --git a/maps/re/rockmi2.mcache b/maps/re/rockmi2.mcache
new file mode 100644
index 000000000..9e6aaffa8
--- /dev/null
+++ b/maps/re/rockmi2.mcache
diff --git a/maps/re/rockrdg1.mcache b/maps/re/rockrdg1.mcache
new file mode 100644
index 000000000..33c60aa8a
--- /dev/null
+++ b/maps/re/rockrdg1.mcache
diff --git a/maps/re/rockrdg2.mcache b/maps/re/rockrdg2.mcache
new file mode 100644
index 000000000..96bfc51ca
--- /dev/null
+++ b/maps/re/rockrdg2.mcache
diff --git a/maps/re/slabw01.mcache b/maps/re/slabw01.mcache
new file mode 100644
index 000000000..02c8fdd97
--- /dev/null
+++ b/maps/re/slabw01.mcache
diff --git a/maps/re/star_frst.mcache b/maps/re/star_frst.mcache
new file mode 100644
index 000000000..61d9203d5
--- /dev/null
+++ b/maps/re/star_frst.mcache
diff --git a/maps/re/star_in.mcache b/maps/re/star_in.mcache
new file mode 100644
index 000000000..6224f2326
--- /dev/null
+++ b/maps/re/star_in.mcache
diff --git a/maps/re/tur_d03_i.mcache b/maps/re/tur_d03_i.mcache
new file mode 100644
index 000000000..d3e259150
--- /dev/null
+++ b/maps/re/tur_d03_i.mcache
diff --git a/maps/re/tur_d04_i.mcache b/maps/re/tur_d04_i.mcache
new file mode 100644
index 000000000..bd25c7a9a
--- /dev/null
+++ b/maps/re/tur_d04_i.mcache
diff --git a/maps/re/un_bk_q.mcache b/maps/re/un_bk_q.mcache
new file mode 100644
index 000000000..8997d057c
--- /dev/null
+++ b/maps/re/un_bk_q.mcache
diff --git a/maps/re/un_bunker.mcache b/maps/re/un_bunker.mcache
new file mode 100644
index 000000000..8997d057c
--- /dev/null
+++ b/maps/re/un_bunker.mcache
diff --git a/maps/re/un_myst.mcache b/maps/re/un_myst.mcache
new file mode 100644
index 000000000..2702318d2
--- /dev/null
+++ b/maps/re/un_myst.mcache
diff --git a/maps/re/ver_eju.mcache b/maps/re/ver_eju.mcache
new file mode 100644
index 000000000..d325dcdad
--- /dev/null
+++ b/maps/re/ver_eju.mcache
diff --git a/maps/re/ver_tunn.mcache b/maps/re/ver_tunn.mcache
new file mode 100644
index 000000000..fec6b4790
--- /dev/null
+++ b/maps/re/ver_tunn.mcache
diff --git a/maps/re/verus01.mcache b/maps/re/verus01.mcache
new file mode 100644
index 000000000..9590a0e6f
--- /dev/null
+++ b/maps/re/verus01.mcache
diff --git a/maps/re/verus02.mcache b/maps/re/verus02.mcache
new file mode 100644
index 000000000..93c9ece19
--- /dev/null
+++ b/maps/re/verus02.mcache
diff --git a/maps/re/verus03.mcache b/maps/re/verus03.mcache
new file mode 100644
index 000000000..ddc94d997
--- /dev/null
+++ b/maps/re/verus03.mcache
diff --git a/maps/re/verus04.mcache b/maps/re/verus04.mcache
new file mode 100644
index 000000000..162a7140c
--- /dev/null
+++ b/maps/re/verus04.mcache
diff --git a/maps/re/vis_h01.mcache b/maps/re/vis_h01.mcache
new file mode 100644
index 000000000..e61ccaa0b
--- /dev/null
+++ b/maps/re/vis_h01.mcache
diff --git a/maps/re/vis_h02.mcache b/maps/re/vis_h02.mcache
new file mode 100644
index 000000000..e61ccaa0b
--- /dev/null
+++ b/maps/re/vis_h02.mcache
diff --git a/maps/re/vis_h03.mcache b/maps/re/vis_h03.mcache
new file mode 100644
index 000000000..e61ccaa0b
--- /dev/null
+++ b/maps/re/vis_h03.mcache
diff --git a/maps/re/vis_h04.mcache b/maps/re/vis_h04.mcache
new file mode 100644
index 000000000..e61ccaa0b
--- /dev/null
+++ b/maps/re/vis_h04.mcache
diff --git a/maps/re/x_lhz.mcache b/maps/re/x_lhz.mcache
new file mode 100644
index 000000000..2b89c7ada
--- /dev/null
+++ b/maps/re/x_lhz.mcache
diff --git a/maps/re/x_prt.mcache b/maps/re/x_prt.mcache
new file mode 100644
index 000000000..e503f9bb9
--- /dev/null
+++ b/maps/re/x_prt.mcache
diff --git a/maps/re/x_ra.mcache b/maps/re/x_ra.mcache
new file mode 100644
index 000000000..2da14983c
--- /dev/null
+++ b/maps/re/x_ra.mcache
diff --git a/npc/mapflag/private_airship.txt b/npc/mapflag/private_airship.txt
index dc5c7fd1c..4258f486d 100644
--- a/npc/mapflag/private_airship.txt
+++ b/npc/mapflag/private_airship.txt
@@ -27,56 +27,45 @@
 //=========================================================================
 
 // Private Airship Startable Maps
-// prt_cas	mapflag	pairship_startable
-// prt_cas_q	mapflag	pairship_startable
-prt_fild08d	mapflag	pairship_startable
-prt_fild08c	mapflag	pairship_startable
-prt_fild08b	mapflag	pairship_startable
-prt_fild08a	mapflag	pairship_startable
-iz_ac01_d	mapflag	pairship_startable
-iz_ac02_d	mapflag	pairship_startable
-iz_ac01_c	mapflag	pairship_startable
-iz_ac02_c	mapflag	pairship_startable
-iz_ac01_b	mapflag	pairship_startable
-iz_ac02_b	mapflag	pairship_startable
-iz_ac01_a	mapflag	pairship_startable
-iz_ac02_a	mapflag	pairship_startable
-izlude_d	mapflag	pairship_startable
-izlude_c	mapflag	pairship_startable
-izlude_b	mapflag	pairship_startable
-izlude_a	mapflag	pairship_startable
-iz_ac01	mapflag	pairship_startable
-iz_ac02	mapflag	pairship_startable
-iz_ng01	mapflag	pairship_startable
-treasure_n1	mapflag	pairship_startable
-treasure_n2	mapflag	pairship_startable
-moc_para01	mapflag	pairship_startable
-itemmall	mapflag	pairship_startable
-um_dun01	mapflag	pairship_startable
-um_dun02	mapflag	pairship_startable
-um_in	mapflag	pairship_startable
-um_fild01	mapflag	pairship_startable
-um_fild02	mapflag	pairship_startable
-um_fild03	mapflag	pairship_startable
-um_fild04	mapflag	pairship_startable
-umbala	mapflag	pairship_startable
-alde_alche	mapflag	pairship_startable
-job_duncer	mapflag	pairship_startable
-job_sage	mapflag	pairship_startable
-job_cru	mapflag	pairship_startable
-job_monk	mapflag	pairship_startable
-monk_test	mapflag	pairship_startable
-in_rogue	mapflag	pairship_startable
-job_wiz	mapflag	pairship_startable
-job_prist	mapflag	pairship_startable
-job_knt	mapflag	pairship_startable
-job_hunte	mapflag	pairship_startable
-cmd_in02	mapflag	pairship_startable
-cmd_in01	mapflag	pairship_startable
-comodo	mapflag	pairship_startable
+abbey01	mapflag	pairship_startable
+abbey02	mapflag	pairship_startable
+abbey03	mapflag	pairship_startable
+abyss_01	mapflag	pairship_startable
+abyss_02	mapflag	pairship_startable
+abyss_03	mapflag	pairship_startable
+alb2trea	mapflag	pairship_startable
+alberta	mapflag	pairship_startable
+alde_dun01	mapflag	pairship_startable
+alde_dun02	mapflag	pairship_startable
+alde_dun03	mapflag	pairship_startable
+alde_dun04	mapflag	pairship_startable
+alde_gld	mapflag	pairship_startable
+aldebaran	mapflag	pairship_startable
+ama_dun01	mapflag	pairship_startable
+ama_dun02	mapflag	pairship_startable
+ama_dun03	mapflag	pairship_startable
+ama_fild01	mapflag	pairship_startable
+amatsu	mapflag	pairship_startable
+anthell01	mapflag	pairship_startable
+anthell02	mapflag	pairship_startable
+aru_gld	mapflag	pairship_startable
+ayo_dun01	mapflag	pairship_startable
+ayo_dun02	mapflag	pairship_startable
+ayo_fild01	mapflag	pairship_startable
+ayothaya	mapflag	pairship_startable
 beach_dun	mapflag	pairship_startable
 beach_dun2	mapflag	pairship_startable
 beach_dun3	mapflag	pairship_startable
+bif_fild01	mapflag	pairship_startable
+bif_fild02	mapflag	pairship_startable
+bra_dun01	mapflag	pairship_startable
+bra_dun02	mapflag	pairship_startable
+bra_fild01	mapflag	pairship_startable
+brasilis	mapflag	pairship_startable
+c_tower1	mapflag	pairship_startable
+c_tower2	mapflag	pairship_startable
+c_tower3	mapflag	pairship_startable
+c_tower4	mapflag	pairship_startable
 cmd_fild01	mapflag	pairship_startable
 cmd_fild02	mapflag	pairship_startable
 cmd_fild03	mapflag	pairship_startable
@@ -85,31 +74,40 @@ cmd_fild06	mapflag	pairship_startable
 cmd_fild07	mapflag	pairship_startable
 cmd_fild08	mapflag	pairship_startable
 cmd_fild09	mapflag	pairship_startable
-mjolnir_01	mapflag	pairship_startable
-mjolnir_02	mapflag	pairship_startable
-mjolnir_03	mapflag	pairship_startable
-mjolnir_04	mapflag	pairship_startable
-mjolnir_05	mapflag	pairship_startable
-mjolnir_06	mapflag	pairship_startable
-mjolnir_07	mapflag	pairship_startable
-mjolnir_08	mapflag	pairship_startable
-mjolnir_09	mapflag	pairship_startable
-mjolnir_10	mapflag	pairship_startable
-mjolnir_11	mapflag	pairship_startable
-mjolnir_12	mapflag	pairship_startable
-prt_fild00	mapflag	pairship_startable
-prt_fild01	mapflag	pairship_startable
-prt_fild02	mapflag	pairship_startable
-prt_fild03	mapflag	pairship_startable
-prt_fild04	mapflag	pairship_startable
-prt_fild05	mapflag	pairship_startable
-prt_fild06	mapflag	pairship_startable
-prt_fild07	mapflag	pairship_startable
-prt_fild08	mapflag	pairship_startable
-prt_fild09	mapflag	pairship_startable
-prt_fild10	mapflag	pairship_startable
-prt_fild11	mapflag	pairship_startable
-prt_monk	mapflag	pairship_startable
+comodo	mapflag	pairship_startable
+dali	mapflag	pairship_startable
+dali02	mapflag	pairship_startable
+dew_dun01	mapflag	pairship_startable
+dew_dun02	mapflag	pairship_startable
+dew_fild01	mapflag	pairship_startable
+dewata	mapflag	pairship_startable
+dic_dun01	mapflag	pairship_startable
+dic_dun02	mapflag	pairship_startable
+dic_dun03	mapflag	pairship_startable
+dic_fild01	mapflag	pairship_startable
+dic_fild02	mapflag	pairship_startable
+dicastes01	mapflag	pairship_startable
+dicastes02	mapflag	pairship_startable
+ecl_fild01	mapflag	pairship_startable
+ecl_tdun01	mapflag	pairship_startable
+ecl_tdun02	mapflag	pairship_startable
+ecl_tdun03	mapflag	pairship_startable
+eclage	mapflag	pairship_startable
+ein_dun01	mapflag	pairship_startable
+ein_dun02	mapflag	pairship_startable
+ein_fild01	mapflag	pairship_startable
+ein_fild03	mapflag	pairship_startable
+ein_fild04	mapflag	pairship_startable
+ein_fild05	mapflag	pairship_startable
+ein_fild06	mapflag	pairship_startable
+ein_fild07	mapflag	pairship_startable
+ein_fild08	mapflag	pairship_startable
+ein_fild09	mapflag	pairship_startable
+einbech	mapflag	pairship_startable
+einbroch	mapflag	pairship_startable
+gef_dun00	mapflag	pairship_startable
+gef_dun01	mapflag	pairship_startable
+gef_dun02	mapflag	pairship_startable
 gef_fild00	mapflag	pairship_startable
 gef_fild01	mapflag	pairship_startable
 gef_fild02	mapflag	pairship_startable
@@ -121,160 +119,302 @@ gef_fild07	mapflag	pairship_startable
 gef_fild08	mapflag	pairship_startable
 gef_fild09	mapflag	pairship_startable
 gef_fild10	mapflag	pairship_startable
-in_orcs01	mapflag	pairship_startable
 gef_fild11	mapflag	pairship_startable
+gef_fild12	mapflag	pairship_startable
+gef_fild13	mapflag	pairship_startable
+gef_fild14	mapflag	pairship_startable
+gefenia01	mapflag	pairship_startable
+gefenia02	mapflag	pairship_startable
+gefenia03	mapflag	pairship_startable
+gefenia04	mapflag	pairship_startable
+geffen	mapflag	pairship_startable
+gl_cas01	mapflag	pairship_startable
+gl_cas02	mapflag	pairship_startable
+gl_church	mapflag	pairship_startable
+gl_chyard	mapflag	pairship_startable
+gl_dun01	mapflag	pairship_startable
+gl_dun02	mapflag	pairship_startable
+gl_in01	mapflag	pairship_startable
+gl_knt01	mapflag	pairship_startable
+gl_knt02	mapflag	pairship_startable
+gl_prison	mapflag	pairship_startable
+gl_prison1	mapflag	pairship_startable
+gl_sew01	mapflag	pairship_startable
+gl_sew02	mapflag	pairship_startable
+gl_sew03	mapflag	pairship_startable
+gl_sew04	mapflag	pairship_startable
+gl_step	mapflag	pairship_startable
+glast_01	mapflag	pairship_startable
+gon_dun01	mapflag	pairship_startable
+gon_dun02	mapflag	pairship_startable
+gon_dun03	mapflag	pairship_startable
+gon_fild01	mapflag	pairship_startable
+gonryun	mapflag	pairship_startable
+hu_fild01	mapflag	pairship_startable
+hu_fild02	mapflag	pairship_startable
+hu_fild04	mapflag	pairship_startable
+hu_fild05	mapflag	pairship_startable
+hu_fild06	mapflag	pairship_startable
+hugel	mapflag	pairship_startable
+ice_dun01	mapflag	pairship_startable
+ice_dun02	mapflag	pairship_startable
+ice_dun03	mapflag	pairship_startable
+in_sphinx1	mapflag	pairship_startable
+in_sphinx2	mapflag	pairship_startable
+in_sphinx3	mapflag	pairship_startable
+in_sphinx4	mapflag	pairship_startable
+in_sphinx5	mapflag	pairship_startable
+iz_dun00	mapflag	pairship_startable
+iz_dun01	mapflag	pairship_startable
+iz_dun02	mapflag	pairship_startable
+iz_dun03	mapflag	pairship_startable
+iz_dun04	mapflag	pairship_startable
+iz_dun05	mapflag	pairship_startable
+izlu2dun	mapflag	pairship_startable
+izlude	mapflag	pairship_startable
+jupe_core	mapflag	pairship_startable
+juperos_01	mapflag	pairship_startable
+juperos_02	mapflag	pairship_startable
+kh_dun01	mapflag	pairship_startable
+kh_dun02	mapflag	pairship_startable
+lasa_dun01	mapflag	pairship_startable
+lasa_dun02	mapflag	pairship_startable
+lasa_dun03	mapflag	pairship_startable
+lasa_fild01	mapflag	pairship_startable
+lasa_fild02	mapflag	pairship_startable
+lasagna	mapflag	pairship_startable
+lhz_dun01	mapflag	pairship_startable
+lhz_dun02	mapflag	pairship_startable
+lhz_dun03	mapflag	pairship_startable
+lhz_fild01	mapflag	pairship_startable
+lhz_fild02	mapflag	pairship_startable
+lhz_fild03	mapflag	pairship_startable
+lighthalzen	mapflag	pairship_startable
+lou_dun01	mapflag	pairship_startable
+lou_dun02	mapflag	pairship_startable
+lou_dun03	mapflag	pairship_startable
+lou_fild01	mapflag	pairship_startable
+louyang	mapflag	pairship_startable
+ma_dun01	mapflag	pairship_startable
+ma_fild01	mapflag	pairship_startable
+ma_fild02	mapflag	pairship_startable
+ma_scene01	mapflag	pairship_startable
+mag_dun01	mapflag	pairship_startable
+mag_dun02	mapflag	pairship_startable
+mal_dun01	mapflag	pairship_startable
+malangdo	mapflag	pairship_startable
+malaya	mapflag	pairship_startable
+man_fild01	mapflag	pairship_startable
+man_fild02	mapflag	pairship_startable
+man_fild03	mapflag	pairship_startable
+manuk	mapflag	pairship_startable
+mid_camp	mapflag	pairship_startable
+mjo_dun01	mapflag	pairship_startable
+mjo_dun02	mapflag	pairship_startable
+mjo_dun03	mapflag	pairship_startable
+mjolnir_01	mapflag	pairship_startable
+mjolnir_02	mapflag	pairship_startable
+mjolnir_03	mapflag	pairship_startable
+mjolnir_04	mapflag	pairship_startable
+mjolnir_05	mapflag	pairship_startable
+mjolnir_06	mapflag	pairship_startable
+mjolnir_07	mapflag	pairship_startable
+mjolnir_08	mapflag	pairship_startable
+mjolnir_09	mapflag	pairship_startable
+mjolnir_10	mapflag	pairship_startable
+mjolnir_11	mapflag	pairship_startable
+mjolnir_12	mapflag	pairship_startable
 moc_fild01	mapflag	pairship_startable
 moc_fild02	mapflag	pairship_startable
 moc_fild03	mapflag	pairship_startable
+moc_fild04	mapflag	pairship_startable
+moc_fild05	mapflag	pairship_startable
+moc_fild06	mapflag	pairship_startable
 moc_fild07	mapflag	pairship_startable
+moc_fild08	mapflag	pairship_startable
+moc_fild09	mapflag	pairship_startable
+moc_fild10	mapflag	pairship_startable
 moc_fild11	mapflag	pairship_startable
 moc_fild12	mapflag	pairship_startable
 moc_fild13	mapflag	pairship_startable
+moc_fild14	mapflag	pairship_startable
+moc_fild15	mapflag	pairship_startable
 moc_fild16	mapflag	pairship_startable
-in_moc_16	mapflag	pairship_startable
 moc_fild17	mapflag	pairship_startable
 moc_fild18	mapflag	pairship_startable
 moc_fild19	mapflag	pairship_startable
-pay_fild01	mapflag	pairship_startable
-pay_fild02	mapflag	pairship_startable
-pay_fild03	mapflag	pairship_startable
-pay_fild04	mapflag	pairship_startable
-pay_fild06	mapflag	pairship_startable
-pay_fild07	mapflag	pairship_startable
-pay_fild08	mapflag	pairship_startable
-pay_fild09	mapflag	pairship_startable
-pay_fild10	mapflag	pairship_startable
-anthell01	mapflag	pairship_startable
-anthell02	mapflag	pairship_startable
-gef_dun00	mapflag	pairship_startable
-gef_dun01	mapflag	pairship_startable
-gef_dun02	mapflag	pairship_startable
-iz_dun00	mapflag	pairship_startable
-iz_dun01	mapflag	pairship_startable
-iz_dun02	mapflag	pairship_startable
-iz_dun03	mapflag	pairship_startable
-iz_dun04	mapflag	pairship_startable
-iz_dun05	mapflag	pairship_startable
-in_sphinx1	mapflag	pairship_startable
-in_sphinx2	mapflag	pairship_startable
-in_sphinx3	mapflag	pairship_startable
-in_sphinx4	mapflag	pairship_startable
-in_sphinx5	mapflag	pairship_startable
 moc_pryd01	mapflag	pairship_startable
 moc_pryd02	mapflag	pairship_startable
 moc_pryd03	mapflag	pairship_startable
 moc_pryd04	mapflag	pairship_startable
 moc_pryd05	mapflag	pairship_startable
 moc_pryd06	mapflag	pairship_startable
-moc_prydb1	mapflag	pairship_startable
-mjo_dun01	mapflag	pairship_startable
-mjo_dun02	mapflag	pairship_startable
-mjo_dun03	mapflag	pairship_startable
+moc_ruins	mapflag	pairship_startable
+mora	mapflag	pairship_startable
+moro_cav	mapflag	pairship_startable
+moro_vol	mapflag	pairship_startable
+morocc	mapflag	pairship_startable
+moscovia	mapflag	pairship_startable
+mosk_dun01	mapflag	pairship_startable
+mosk_dun02	mapflag	pairship_startable
+mosk_dun03	mapflag	pairship_startable
+mosk_fild02	mapflag	pairship_startable
+nameless_n	mapflag	pairship_startable
+nif_fild01	mapflag	pairship_startable
+nif_fild02	mapflag	pairship_startable
+niflheim	mapflag	pairship_startable
+odin_tem01	mapflag	pairship_startable
+odin_tem02	mapflag	pairship_startable
+odin_tem03	mapflag	pairship_startable
 orcsdun01	mapflag	pairship_startable
 orcsdun02	mapflag	pairship_startable
+pay_arche	mapflag	pairship_startable
 pay_dun00	mapflag	pairship_startable
 pay_dun01	mapflag	pairship_startable
 pay_dun02	mapflag	pairship_startable
 pay_dun03	mapflag	pairship_startable
 pay_dun04	mapflag	pairship_startable
+pay_fild01	mapflag	pairship_startable
+pay_fild02	mapflag	pairship_startable
+pay_fild03	mapflag	pairship_startable
+pay_fild04	mapflag	pairship_startable
+pay_fild05	mapflag	pairship_startable
+pay_fild06	mapflag	pairship_startable
+pay_fild07	mapflag	pairship_startable
+pay_fild08	mapflag	pairship_startable
+pay_fild09	mapflag	pairship_startable
+pay_fild10	mapflag	pairship_startable
+pay_fild11	mapflag	pairship_startable
+payon	mapflag	pairship_startable
+prontera	mapflag	pairship_startable
+prt_fild00	mapflag	pairship_startable
+prt_fild01	mapflag	pairship_startable
+prt_fild02	mapflag	pairship_startable
+prt_fild03	mapflag	pairship_startable
+prt_fild04	mapflag	pairship_startable
+prt_fild05	mapflag	pairship_startable
+prt_fild06	mapflag	pairship_startable
+prt_fild07	mapflag	pairship_startable
+prt_fild08	mapflag	pairship_startable
+prt_fild09	mapflag	pairship_startable
+prt_fild10	mapflag	pairship_startable
+prt_fild11	mapflag	pairship_startable
 prt_maze01	mapflag	pairship_startable
 prt_maze02	mapflag	pairship_startable
 prt_maze03	mapflag	pairship_startable
+prt_monk	mapflag	pairship_startable
 prt_sewb1	mapflag	pairship_startable
 prt_sewb2	mapflag	pairship_startable
 prt_sewb3	mapflag	pairship_startable
 prt_sewb4	mapflag	pairship_startable
+ra_fild01	mapflag	pairship_startable
+ra_fild03	mapflag	pairship_startable
+ra_fild04	mapflag	pairship_startable
+ra_fild05	mapflag	pairship_startable
+ra_fild06	mapflag	pairship_startable
+ra_fild08	mapflag	pairship_startable
+ra_fild12	mapflag	pairship_startable
+ra_san01	mapflag	pairship_startable
+ra_san02	mapflag	pairship_startable
+ra_san03	mapflag	pairship_startable
+ra_san04	mapflag	pairship_startable
+ra_san05	mapflag	pairship_startable
+ra_temple	mapflag	pairship_startable
+rachel	mapflag	pairship_startable
+spl_fild01	mapflag	pairship_startable
+spl_fild02	mapflag	pairship_startable
+spl_fild03	mapflag	pairship_startable
+splendide	mapflag	pairship_startable
+tha_t01	mapflag	pairship_startable
+tha_t02	mapflag	pairship_startable
+tha_t03	mapflag	pairship_startable
+tha_t04	mapflag	pairship_startable
+tha_t05	mapflag	pairship_startable
+tha_t06	mapflag	pairship_startable
+tha_t07	mapflag	pairship_startable
+tha_t08	mapflag	pairship_startable
+tha_t09	mapflag	pairship_startable
+tha_t10	mapflag	pairship_startable
+tha_t11	mapflag	pairship_startable
+tha_t12	mapflag	pairship_startable
+thor_v01	mapflag	pairship_startable
+thor_v02	mapflag	pairship_startable
+thor_v03	mapflag	pairship_startable
 treasure01	mapflag	pairship_startable
 treasure02	mapflag	pairship_startable
-in_hunter	mapflag	pairship_startable
-job_thief1	mapflag	pairship_startable
-alb_ship	mapflag	pairship_startable
-alberta	mapflag	pairship_startable
-alberta_in	mapflag	pairship_startable
-alb2trea	mapflag	pairship_startable
-aldebaran	mapflag	pairship_startable
-aldeba_in	mapflag	pairship_startable
-gef_tower	mapflag	pairship_startable
-geffen	mapflag	pairship_startable
-geffen_in	mapflag	pairship_startable
-moc_ruins	mapflag	pairship_startable
-morocc	mapflag	pairship_startable
-morocc_in	mapflag	pairship_startable
-pay_arche	mapflag	pairship_startable
-payon	mapflag	pairship_startable
-payon_in01	mapflag	pairship_startable
-payon_in02	mapflag	pairship_startable
-payon_in03	mapflag	pairship_startable
-prontera	mapflag	pairship_startable
-prt_in	mapflag	pairship_startable
-prt_castle	mapflag	pairship_startable
-prt_church	mapflag	pairship_startable
-izlude	mapflag	pairship_startable
-izlude_in	mapflag	pairship_startable
-izlu2dun	mapflag	pairship_startable
-monk_in	mapflag	pairship_startable
-xmas	mapflag	pairship_startable
-xmas_fild01	mapflag	pairship_startable
-xmas_dun01	mapflag	pairship_startable
-xmas_dun02	mapflag	pairship_startable
-alde_dun01	mapflag	pairship_startable
-alde_dun02	mapflag	pairship_startable
-alde_dun03	mapflag	pairship_startable
-alde_dun04	mapflag	pairship_startable
-c_tower1	mapflag	pairship_startable
-c_tower2	mapflag	pairship_startable
-c_tower3	mapflag	pairship_startable
-c_tower4	mapflag	pairship_startable
-gl_cas01	mapflag	pairship_startable
-gl_cas02	mapflag	pairship_startable
-gl_church	mapflag	pairship_startable
-gl_chyard	mapflag	pairship_startable
-gl_dun01	mapflag	pairship_startable
-gl_dun02	mapflag	pairship_startable
-gl_in01	mapflag	pairship_startable
-gl_knt01	mapflag	pairship_startable
-gl_knt02	mapflag	pairship_startable
-gl_prison	mapflag	pairship_startable
-gl_prison1	mapflag	pairship_startable
-gl_sew01	mapflag	pairship_startable
-gl_sew02	mapflag	pairship_startable
-gl_sew03	mapflag	pairship_startable
-gl_sew04	mapflag	pairship_startable
-gl_step	mapflag	pairship_startable
-niflheim	mapflag	pairship_startable
-nif_fild01	mapflag	pairship_startable
-nif_fild02	mapflag	pairship_startable
+tur_dun01	mapflag	pairship_startable
 tur_dun02	mapflag	pairship_startable
 tur_dun03	mapflag	pairship_startable
 tur_dun04	mapflag	pairship_startable
-tur_dun01	mapflag	pairship_startable
-glast_01	mapflag	pairship_startable
-lou_dun02	mapflag	pairship_startable
-lou_dun03	mapflag	pairship_startable
-louyang	mapflag	pairship_startable
-lou_fild01	mapflag	pairship_startable
-lou_dun01	mapflag	pairship_startable
+tur_dun05	mapflag	pairship_startable
+um_fild01	mapflag	pairship_startable
+um_fild02	mapflag	pairship_startable
+um_fild03	mapflag	pairship_startable
+um_fild04	mapflag	pairship_startable
+umbala	mapflag	pairship_startable
+ve_fild01	mapflag	pairship_startable
+ve_fild02	mapflag	pairship_startable
+ve_fild03	mapflag	pairship_startable
+ve_fild04	mapflag	pairship_startable
+ve_fild06	mapflag	pairship_startable
+ve_fild07	mapflag	pairship_startable
+veins	mapflag	pairship_startable
+ver_eju	mapflag	pairship_startable
+ver_tunn	mapflag	pairship_startable
+verus03	mapflag	pairship_startable
+verus04	mapflag	pairship_startable
+yuno	mapflag	pairship_startable
+yuno_fild01	mapflag	pairship_startable
+yuno_fild02	mapflag	pairship_startable
+yuno_fild03	mapflag	pairship_startable
+yuno_fild04	mapflag	pairship_startable
+yuno_fild06	mapflag	pairship_startable
+yuno_fild07	mapflag	pairship_startable
+yuno_fild08	mapflag	pairship_startable
+yuno_fild09	mapflag	pairship_startable
+yuno_fild11	mapflag	pairship_startable
+yuno_fild12	mapflag	pairship_startable
 
 // Private Airship Endable Maps
-prt_fild08d	mapflag	pairship_endable
-prt_fild08c	mapflag	pairship_endable
-prt_fild08b	mapflag	pairship_endable
-prt_fild08a	mapflag	pairship_endable
-izlude_d	mapflag	pairship_endable
-izlude_c	mapflag	pairship_endable
-izlude_b	mapflag	pairship_endable
-izlude_a	mapflag	pairship_endable
-um_dun01	mapflag	pairship_endable
-um_dun02	mapflag	pairship_endable
-um_fild01	mapflag	pairship_endable
-um_fild02	mapflag	pairship_endable
-um_fild03	mapflag	pairship_endable
-um_fild04	mapflag	pairship_endable
-umbala	mapflag	pairship_endable
-comodo	mapflag	pairship_endable
+abbey01	mapflag	pairship_endable
+abbey02	mapflag	pairship_endable
+abbey03	mapflag	pairship_endable
+abyss_01	mapflag	pairship_endable
+abyss_02	mapflag	pairship_endable
+abyss_03	mapflag	pairship_endable
+alb2trea	mapflag	pairship_endable
+alberta	mapflag	pairship_endable
+alde_dun01	mapflag	pairship_endable
+alde_dun02	mapflag	pairship_endable
+alde_dun03	mapflag	pairship_endable
+alde_dun04	mapflag	pairship_endable
+alde_gld	mapflag	pairship_endable
+aldebaran	mapflag	pairship_endable
+ama_dun01	mapflag	pairship_endable
+ama_dun02	mapflag	pairship_endable
+ama_dun03	mapflag	pairship_endable
+ama_fild01	mapflag	pairship_endable
+amatsu	mapflag	pairship_endable
+anthell01	mapflag	pairship_endable
+anthell02	mapflag	pairship_endable
+aru_gld	mapflag	pairship_endable
+ayo_dun01	mapflag	pairship_endable
+ayo_dun02	mapflag	pairship_endable
+ayo_fild01	mapflag	pairship_endable
+ayothaya	mapflag	pairship_endable
 beach_dun	mapflag	pairship_endable
 beach_dun2	mapflag	pairship_endable
 beach_dun3	mapflag	pairship_endable
+bif_fild01	mapflag	pairship_endable
+bif_fild02	mapflag	pairship_endable
+bra_dun01	mapflag	pairship_endable
+bra_dun02	mapflag	pairship_endable
+bra_fild01	mapflag	pairship_endable
+brasilis	mapflag	pairship_endable
+c_tower1	mapflag	pairship_endable
+c_tower2	mapflag	pairship_endable
+c_tower3	mapflag	pairship_endable
+c_tower4	mapflag	pairship_endable
 cmd_fild01	mapflag	pairship_endable
 cmd_fild02	mapflag	pairship_endable
 cmd_fild03	mapflag	pairship_endable
@@ -283,31 +423,40 @@ cmd_fild06	mapflag	pairship_endable
 cmd_fild07	mapflag	pairship_endable
 cmd_fild08	mapflag	pairship_endable
 cmd_fild09	mapflag	pairship_endable
-mjolnir_01	mapflag	pairship_endable
-mjolnir_02	mapflag	pairship_endable
-mjolnir_03	mapflag	pairship_endable
-mjolnir_04	mapflag	pairship_endable
-mjolnir_05	mapflag	pairship_endable
-mjolnir_06	mapflag	pairship_endable
-mjolnir_07	mapflag	pairship_endable
-mjolnir_08	mapflag	pairship_endable
-mjolnir_09	mapflag	pairship_endable
-mjolnir_10	mapflag	pairship_endable
-mjolnir_11	mapflag	pairship_endable
-mjolnir_12	mapflag	pairship_endable
-prt_fild00	mapflag	pairship_endable
-prt_fild01	mapflag	pairship_endable
-prt_fild02	mapflag	pairship_endable
-prt_fild03	mapflag	pairship_endable
-prt_fild04	mapflag	pairship_endable
-prt_fild05	mapflag	pairship_endable
-prt_fild06	mapflag	pairship_endable
-prt_fild07	mapflag	pairship_endable
-prt_fild08	mapflag	pairship_endable
-prt_fild09	mapflag	pairship_endable
-prt_fild10	mapflag	pairship_endable
-prt_fild11	mapflag	pairship_endable
-prt_monk	mapflag	pairship_endable
+comodo	mapflag	pairship_endable
+dali	mapflag	pairship_endable
+dali02	mapflag	pairship_endable
+dew_dun01	mapflag	pairship_endable
+dew_dun02	mapflag	pairship_endable
+dew_fild01	mapflag	pairship_endable
+dewata	mapflag	pairship_endable
+dic_dun01	mapflag	pairship_endable
+dic_dun02	mapflag	pairship_endable
+dic_dun03	mapflag	pairship_endable
+dic_fild01	mapflag	pairship_endable
+dic_fild02	mapflag	pairship_endable
+dicastes01	mapflag	pairship_endable
+dicastes02	mapflag	pairship_endable
+ecl_fild01	mapflag	pairship_endable
+ecl_tdun01	mapflag	pairship_endable
+ecl_tdun02	mapflag	pairship_endable
+ecl_tdun03	mapflag	pairship_endable
+eclage	mapflag	pairship_endable
+ein_dun01	mapflag	pairship_endable
+ein_dun02	mapflag	pairship_endable
+ein_fild01	mapflag	pairship_endable
+ein_fild03	mapflag	pairship_endable
+ein_fild04	mapflag	pairship_endable
+ein_fild05	mapflag	pairship_endable
+ein_fild06	mapflag	pairship_endable
+ein_fild07	mapflag	pairship_endable
+ein_fild08	mapflag	pairship_endable
+ein_fild09	mapflag	pairship_endable
+einbech	mapflag	pairship_endable
+einbroch	mapflag	pairship_endable
+gef_dun00	mapflag	pairship_endable
+gef_dun01	mapflag	pairship_endable
+gef_dun02	mapflag	pairship_endable
 gef_fild00	mapflag	pairship_endable
 gef_fild01	mapflag	pairship_endable
 gef_fild02	mapflag	pairship_endable
@@ -320,117 +469,257 @@ gef_fild08	mapflag	pairship_endable
 gef_fild09	mapflag	pairship_endable
 gef_fild10	mapflag	pairship_endable
 gef_fild11	mapflag	pairship_endable
+gef_fild12	mapflag	pairship_endable
+gef_fild13	mapflag	pairship_endable
+gef_fild14	mapflag	pairship_endable
+gefenia01	mapflag	pairship_endable
+gefenia02	mapflag	pairship_endable
+gefenia03	mapflag	pairship_endable
+gefenia04	mapflag	pairship_endable
+geffen	mapflag	pairship_endable
+gl_cas01	mapflag	pairship_endable
+gl_cas02	mapflag	pairship_endable
+gl_church	mapflag	pairship_endable
+gl_chyard	mapflag	pairship_endable
+gl_dun01	mapflag	pairship_endable
+gl_dun02	mapflag	pairship_endable
+gl_in01	mapflag	pairship_endable
+gl_knt01	mapflag	pairship_endable
+gl_knt02	mapflag	pairship_endable
+gl_prison	mapflag	pairship_endable
+gl_prison1	mapflag	pairship_endable
+gl_sew01	mapflag	pairship_endable
+gl_sew02	mapflag	pairship_endable
+gl_sew03	mapflag	pairship_endable
+gl_sew04	mapflag	pairship_endable
+gl_step	mapflag	pairship_endable
+glast_01	mapflag	pairship_endable
+gon_dun01	mapflag	pairship_endable
+gon_dun02	mapflag	pairship_endable
+gon_dun03	mapflag	pairship_endable
+gon_fild01	mapflag	pairship_endable
+gonryun	mapflag	pairship_endable
+hu_fild01	mapflag	pairship_endable
+hu_fild02	mapflag	pairship_endable
+hu_fild04	mapflag	pairship_endable
+hu_fild05	mapflag	pairship_endable
+hu_fild06	mapflag	pairship_endable
+hugel	mapflag	pairship_endable
+ice_dun01	mapflag	pairship_endable
+ice_dun02	mapflag	pairship_endable
+ice_dun03	mapflag	pairship_endable
+in_sphinx1	mapflag	pairship_endable
+in_sphinx2	mapflag	pairship_endable
+in_sphinx3	mapflag	pairship_endable
+in_sphinx4	mapflag	pairship_endable
+in_sphinx5	mapflag	pairship_endable
+iz_dun00	mapflag	pairship_endable
+iz_dun01	mapflag	pairship_endable
+iz_dun02	mapflag	pairship_endable
+iz_dun03	mapflag	pairship_endable
+iz_dun04	mapflag	pairship_endable
+iz_dun05	mapflag	pairship_endable
+izlu2dun	mapflag	pairship_endable
+izlude	mapflag	pairship_endable
+jupe_core	mapflag	pairship_endable
+juperos_01	mapflag	pairship_endable
+juperos_02	mapflag	pairship_endable
+kh_dun01	mapflag	pairship_endable
+kh_dun02	mapflag	pairship_endable
+lasa_dun01	mapflag	pairship_endable
+lasa_dun02	mapflag	pairship_endable
+lasa_dun03	mapflag	pairship_endable
+lasa_fild01	mapflag	pairship_endable
+lasa_fild02	mapflag	pairship_endable
+lasagna	mapflag	pairship_endable
+lhz_dun01	mapflag	pairship_endable
+lhz_dun02	mapflag	pairship_endable
+lhz_dun03	mapflag	pairship_endable
+lhz_fild01	mapflag	pairship_endable
+lhz_fild02	mapflag	pairship_endable
+lhz_fild03	mapflag	pairship_endable
+lighthalzen	mapflag	pairship_endable
+lou_dun01	mapflag	pairship_endable
+lou_dun02	mapflag	pairship_endable
+lou_dun03	mapflag	pairship_endable
+lou_fild01	mapflag	pairship_endable
+louyang	mapflag	pairship_endable
+ma_dun01	mapflag	pairship_endable
+ma_fild01	mapflag	pairship_endable
+ma_fild02	mapflag	pairship_endable
+ma_scene01	mapflag	pairship_endable
+mag_dun01	mapflag	pairship_endable
+mag_dun02	mapflag	pairship_endable
+mal_dun01	mapflag	pairship_endable
+malangdo	mapflag	pairship_endable
+malaya	mapflag	pairship_endable
+man_fild01	mapflag	pairship_endable
+man_fild02	mapflag	pairship_endable
+man_fild03	mapflag	pairship_endable
+manuk	mapflag	pairship_endable
+mid_camp	mapflag	pairship_endable
+mjo_dun01	mapflag	pairship_endable
+mjo_dun02	mapflag	pairship_endable
+mjo_dun03	mapflag	pairship_endable
+mjolnir_01	mapflag	pairship_endable
+mjolnir_02	mapflag	pairship_endable
+mjolnir_03	mapflag	pairship_endable
+mjolnir_04	mapflag	pairship_endable
+mjolnir_05	mapflag	pairship_endable
+mjolnir_06	mapflag	pairship_endable
+mjolnir_07	mapflag	pairship_endable
+mjolnir_08	mapflag	pairship_endable
+mjolnir_09	mapflag	pairship_endable
+mjolnir_10	mapflag	pairship_endable
+mjolnir_11	mapflag	pairship_endable
+mjolnir_12	mapflag	pairship_endable
 moc_fild01	mapflag	pairship_endable
 moc_fild02	mapflag	pairship_endable
 moc_fild03	mapflag	pairship_endable
+moc_fild04	mapflag	pairship_endable
+moc_fild05	mapflag	pairship_endable
+moc_fild06	mapflag	pairship_endable
 moc_fild07	mapflag	pairship_endable
+moc_fild08	mapflag	pairship_endable
+moc_fild09	mapflag	pairship_endable
+moc_fild10	mapflag	pairship_endable
 moc_fild11	mapflag	pairship_endable
 moc_fild12	mapflag	pairship_endable
 moc_fild13	mapflag	pairship_endable
+moc_fild14	mapflag	pairship_endable
+moc_fild15	mapflag	pairship_endable
 moc_fild16	mapflag	pairship_endable
 moc_fild17	mapflag	pairship_endable
 moc_fild18	mapflag	pairship_endable
 moc_fild19	mapflag	pairship_endable
-pay_fild01	mapflag	pairship_endable
-pay_fild02	mapflag	pairship_endable
-pay_fild03	mapflag	pairship_endable
-pay_fild04	mapflag	pairship_endable
-pay_fild06	mapflag	pairship_endable
-pay_fild07	mapflag	pairship_endable
-pay_fild08	mapflag	pairship_endable
-pay_fild09	mapflag	pairship_endable
-pay_fild10	mapflag	pairship_endable
-anthell01	mapflag	pairship_endable
-anthell02	mapflag	pairship_endable
-gef_dun00	mapflag	pairship_endable
-gef_dun01	mapflag	pairship_endable
-gef_dun02	mapflag	pairship_endable
-iz_dun00	mapflag	pairship_endable
-iz_dun01	mapflag	pairship_endable
-iz_dun02	mapflag	pairship_endable
-iz_dun03	mapflag	pairship_endable
-iz_dun04	mapflag	pairship_endable
-iz_dun05	mapflag	pairship_endable
-in_sphinx1	mapflag	pairship_endable
-in_sphinx2	mapflag	pairship_endable
-in_sphinx3	mapflag	pairship_endable
-in_sphinx4	mapflag	pairship_endable
-in_sphinx5	mapflag	pairship_endable
 moc_pryd01	mapflag	pairship_endable
 moc_pryd02	mapflag	pairship_endable
 moc_pryd03	mapflag	pairship_endable
 moc_pryd04	mapflag	pairship_endable
 moc_pryd05	mapflag	pairship_endable
 moc_pryd06	mapflag	pairship_endable
-moc_prydb1	mapflag	pairship_endable
-mjo_dun01	mapflag	pairship_endable
-mjo_dun02	mapflag	pairship_endable
-mjo_dun03	mapflag	pairship_endable
+moc_ruins	mapflag	pairship_endable
+mora	mapflag	pairship_endable
+moro_cav	mapflag	pairship_endable
+moro_vol	mapflag	pairship_endable
+morocc	mapflag	pairship_endable
+moscovia	mapflag	pairship_endable
+mosk_dun01	mapflag	pairship_endable
+mosk_dun02	mapflag	pairship_endable
+mosk_dun03	mapflag	pairship_endable
+mosk_fild02	mapflag	pairship_endable
+nameless_n	mapflag	pairship_endable
+nif_fild01	mapflag	pairship_endable
+nif_fild02	mapflag	pairship_endable
+niflheim	mapflag	pairship_endable
+odin_tem01	mapflag	pairship_endable
+odin_tem02	mapflag	pairship_endable
+odin_tem03	mapflag	pairship_endable
 orcsdun01	mapflag	pairship_endable
 orcsdun02	mapflag	pairship_endable
+pay_arche	mapflag	pairship_endable
 pay_dun00	mapflag	pairship_endable
 pay_dun01	mapflag	pairship_endable
 pay_dun02	mapflag	pairship_endable
 pay_dun03	mapflag	pairship_endable
 pay_dun04	mapflag	pairship_endable
+pay_fild01	mapflag	pairship_endable
+pay_fild02	mapflag	pairship_endable
+pay_fild03	mapflag	pairship_endable
+pay_fild04	mapflag	pairship_endable
+pay_fild05	mapflag	pairship_endable
+pay_fild06	mapflag	pairship_endable
+pay_fild07	mapflag	pairship_endable
+pay_fild08	mapflag	pairship_endable
+pay_fild09	mapflag	pairship_endable
+pay_fild10	mapflag	pairship_endable
+pay_fild11	mapflag	pairship_endable
+payon	mapflag	pairship_endable
+prontera	mapflag	pairship_endable
+prt_fild00	mapflag	pairship_endable
+prt_fild01	mapflag	pairship_endable
+prt_fild02	mapflag	pairship_endable
+prt_fild03	mapflag	pairship_endable
+prt_fild04	mapflag	pairship_endable
+prt_fild05	mapflag	pairship_endable
+prt_fild06	mapflag	pairship_endable
+prt_fild07	mapflag	pairship_endable
+prt_fild08	mapflag	pairship_endable
+prt_fild09	mapflag	pairship_endable
+prt_fild10	mapflag	pairship_endable
+prt_fild11	mapflag	pairship_endable
 prt_maze01	mapflag	pairship_endable
 prt_maze02	mapflag	pairship_endable
 prt_maze03	mapflag	pairship_endable
+prt_monk	mapflag	pairship_endable
 prt_sewb1	mapflag	pairship_endable
 prt_sewb2	mapflag	pairship_endable
 prt_sewb3	mapflag	pairship_endable
 prt_sewb4	mapflag	pairship_endable
+ra_fild01	mapflag	pairship_endable
+ra_fild03	mapflag	pairship_endable
+ra_fild04	mapflag	pairship_endable
+ra_fild05	mapflag	pairship_endable
+ra_fild06	mapflag	pairship_endable
+ra_fild08	mapflag	pairship_endable
+ra_fild12	mapflag	pairship_endable
+ra_san01	mapflag	pairship_endable
+ra_san02	mapflag	pairship_endable
+ra_san03	mapflag	pairship_endable
+ra_san04	mapflag	pairship_endable
+ra_san05	mapflag	pairship_endable
+ra_temple	mapflag	pairship_endable
+rachel	mapflag	pairship_endable
+spl_fild01	mapflag	pairship_endable
+spl_fild02	mapflag	pairship_endable
+spl_fild03	mapflag	pairship_endable
+splendide	mapflag	pairship_endable
+tha_t01	mapflag	pairship_endable
+tha_t02	mapflag	pairship_endable
+tha_t03	mapflag	pairship_endable
+tha_t04	mapflag	pairship_endable
+tha_t05	mapflag	pairship_endable
+tha_t06	mapflag	pairship_endable
+tha_t07	mapflag	pairship_endable
+tha_t08	mapflag	pairship_endable
+tha_t09	mapflag	pairship_endable
+tha_t10	mapflag	pairship_endable
+tha_t11	mapflag	pairship_endable
+tha_t12	mapflag	pairship_endable
+thor_v01	mapflag	pairship_endable
+thor_v02	mapflag	pairship_endable
+thor_v03	mapflag	pairship_endable
 treasure01	mapflag	pairship_endable
 treasure02	mapflag	pairship_endable
-alberta	mapflag	pairship_endable
-alb2trea	mapflag	pairship_endable
-aldebaran	mapflag	pairship_endable
-geffen	mapflag	pairship_endable
-moc_ruins	mapflag	pairship_endable
-morocc	mapflag	pairship_endable
-pay_arche	mapflag	pairship_endable
-payon	mapflag	pairship_endable
-prontera	mapflag	pairship_endable
-izlude	mapflag	pairship_endable
-izlu2dun	mapflag	pairship_endable
-xmas	mapflag	pairship_endable
-xmas_fild01	mapflag	pairship_endable
-xmas_dun01	mapflag	pairship_endable
-xmas_dun02	mapflag	pairship_endable
-alde_dun01	mapflag	pairship_endable
-alde_dun02	mapflag	pairship_endable
-alde_dun03	mapflag	pairship_endable
-alde_dun04	mapflag	pairship_endable
-c_tower1	mapflag	pairship_endable
-c_tower2	mapflag	pairship_endable
-c_tower3	mapflag	pairship_endable
-c_tower4	mapflag	pairship_endable
-gl_cas01	mapflag	pairship_endable
-gl_cas02	mapflag	pairship_endable
-gl_church	mapflag	pairship_endable
-gl_chyard	mapflag	pairship_endable
-gl_dun01	mapflag	pairship_endable
-gl_dun02	mapflag	pairship_endable
-gl_in01	mapflag	pairship_endable
-gl_knt01	mapflag	pairship_endable
-gl_knt02	mapflag	pairship_endable
-gl_prison	mapflag	pairship_endable
-gl_prison1	mapflag	pairship_endable
-gl_sew01	mapflag	pairship_endable
-gl_sew02	mapflag	pairship_endable
-gl_sew03	mapflag	pairship_endable
-gl_sew04	mapflag	pairship_endable
-gl_step	mapflag	pairship_endable
-niflheim	mapflag	pairship_endable
-nif_fild01	mapflag	pairship_endable
-nif_fild02	mapflag	pairship_endable
+tur_dun01	mapflag	pairship_endable
 tur_dun02	mapflag	pairship_endable
 tur_dun03	mapflag	pairship_endable
 tur_dun04	mapflag	pairship_endable
-tur_dun01	mapflag	pairship_endable
-glast_01	mapflag	pairship_endable
-lou_dun02	mapflag	pairship_endable
-lou_dun03	mapflag	pairship_endable
-louyang	mapflag	pairship_endable
-lou_fild01	mapflag	pairship_endable
-lou_dun01	mapflag	pairship_endable
+tur_dun05	mapflag	pairship_endable
+um_fild01	mapflag	pairship_endable
+um_fild02	mapflag	pairship_endable
+um_fild03	mapflag	pairship_endable
+um_fild04	mapflag	pairship_endable
+umbala	mapflag	pairship_endable
+ve_fild01	mapflag	pairship_endable
+ve_fild02	mapflag	pairship_endable
+ve_fild03	mapflag	pairship_endable
+ve_fild04	mapflag	pairship_endable
+ve_fild06	mapflag	pairship_endable
+ve_fild07	mapflag	pairship_endable
+veins	mapflag	pairship_endable
+ver_eju	mapflag	pairship_endable
+ver_tunn	mapflag	pairship_endable
+verus03	mapflag	pairship_endable
+verus04	mapflag	pairship_endable
+yuno	mapflag	pairship_endable
+yuno_fild01	mapflag	pairship_endable
+yuno_fild02	mapflag	pairship_endable
+yuno_fild03	mapflag	pairship_endable
+yuno_fild04	mapflag	pairship_endable
+yuno_fild06	mapflag	pairship_endable
+yuno_fild07	mapflag	pairship_endable
+yuno_fild08	mapflag	pairship_endable
+yuno_fild09	mapflag	pairship_endable
+yuno_fild11	mapflag	pairship_endable
+yuno_fild12	mapflag	pairship_endable
diff --git a/src/map/clif.c b/src/map/clif.c
index c085c4fe4..ce963f5ae 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -20767,7 +20767,7 @@ void clif_ui_action(struct map_session_data *sd, int32 UIType, int32 data)
 void clif_parse_private_airship_request(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 void clif_parse_private_airship_request(int fd, struct map_session_data *sd)
 {
-#if defined(PACKETVER_RE) && PACKETVER >= 20180321
+#if PACKETVER_RE_NUM >= 20180321 || PACKETVER_MAIN_NUM >= 20180620
 	char evname[EVENT_NAME_LENGTH];
 	struct event_data *ev = NULL;
 	const struct PACKET_CZ_PRIVATE_AIRSHIP_REQUEST *p = RP2PTR(fd);
@@ -20778,22 +20778,22 @@ void clif_parse_private_airship_request(int fd, struct map_session_data *sd)
 		pc->setreg(sd, script->add_str("@itemid"), p->ItemID);
 		script->run_npc(ev->nd->u.scr.script, ev->pos, sd->bl.id, ev->nd->bl.id);
 	} else {
-		ShowError("clif_parse_private_airship_request: event '%s' not found, operation failed\n", evname);
+		ShowError("clif_parse_private_airship_request: event '%s' not found, operation failed.\n", evname);
 	}
 #else
-	ShowWarning("clif_parse_private_airship_request: private airship is not supported in this client version, possible packet manipulation.");
+	ShowWarning("clif_parse_private_airship_request: private airship is not supported in this client version, possible packet manipulation.\n");
 #endif
 }
 
 void clif_private_airship_response(struct map_session_data *sd, uint32 flag)
 {
-#if defined(PACKETVER_RE) && PACKETVER >= 20180321
+#if PACKETVER_RE_NUM >= 20180321 || PACKETVER_MAIN_NUM >= 20180620
 	struct PACKET_ZC_PRIVATE_AIRSHIP_RESPONSE p;
 
 	nullpo_retv(sd);
 
 	if (flag > P_AIRSHIP_ITEM_INVALID) {
-		ShowError("clif_private_airship_response: invalid flag given '%d', defaulting to 0.\n", flag);
+		ShowError("clif_private_airship_response: invalid flag given '%u', defaulting to 0.\n", flag);
 		flag = 0;
 	}
 
@@ -20802,7 +20802,7 @@ void clif_private_airship_response(struct map_session_data *sd, uint32 flag)
 
 	clif->send(&p, sizeof(p), &sd->bl, SELF);
 #else
-	ShowWarning("clif_private_airship_response: private airship works only for clients >= 20180321.");
+	ShowWarning("clif_private_airship_response: private airship works only for clients PACKETVER_RE_NUM >= 20180321 || PACKETVER_MAIN_NUM >= 20180620.\n");
 #endif
 }