*Updated mapflags for all maps up to Episode 14.2

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15201 54d463be-8e91-2dee-dedb-b68131a5f0ec

11 files changed, 429 insertions, 9 deletions

diff --git a/conf/mapflag/night.txt b/conf/mapflag/night.txt
index 6daaa1b2a..99f3538b8 100644
--- a/conf/mapflag/night.txt
+++ b/conf/mapflag/night.txt
@@ -295,5 +295,26 @@ manuk	mapflag	nightenabled
 man_fild02	mapflag	nightenabled
 splendide	mapflag	nightenabled
 spl_fild01	mapflag	nightenabled
+brasilis	mapflag	nightenabled
+bra_fild01	mapflag	nightenabled
+dicastes01	mapflag	nightenabled
+dicastes02	mapflag	nightenabled
+dic_fild01	mapflag	nightenabled
+dic_fild02	mapflag	nightenabled
+
+// Episode 14 ====================
+bif_fild01	mapflag	nightenabled
+bif_fild02	mapflag	nightenabled
+dewata	mapflag	nightenabled
+dew_fild01	mapflag	nightenabled
+dew_dun02	mapflag	nightenabled
+malangdo	mapflag	nightenabled
+malaya	mapflag	nightenabled
+ma_fild01	mapflag	nightenabled
+ma_fild02	mapflag	nightenabled
+ma_scene01	mapflag	nightenabled
+eclage	mapflag	nightenabled
+ecl_fild01	mapflag	nightenabled
+ecl_hub01	mapflag	nightenabled
 
 //evt_zombie	mapflag	nightenabled
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index 0684fbe74..3802f8e42 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -276,6 +276,7 @@ que_qaru03	mapflag	nobranch
 que_qaru04	mapflag	nobranch
 que_qaru05	mapflag	nobranch
 
+// Episode 12 ===========
 1@cata	mapflag	nobranch
 2@cata	mapflag	nobranch
 e_tower	mapflag	nobranch
@@ -286,6 +287,7 @@ e_tower	mapflag	nobranch
 5@tower	mapflag	nobranch
 6@tower	mapflag	nobranch
 
+// Episode 13.1 ===========
 mid_camp	mapflag	nobranch
 mid_campin	mapflag	nobranch
 man_fild01	mapflag	nobranch
@@ -307,6 +309,7 @@ bat_b02	mapflag	nobranch
 bat_a01	mapflag	nobranch
 bat_a02	mapflag	nobranch
 
+// Episode 13.2 ===========
 1@nyd	mapflag	nobranch
 2@nyd	mapflag	nobranch
 manuk	mapflag	nobranch
@@ -316,6 +319,7 @@ splendide	mapflag	nobranch
 spl_in01	mapflag	nobranch
 spl_in02	mapflag	nobranch
 
+// 3rd Class Job Maps & Paradise ===========
 moc_para01	mapflag	nobranch
 job3_arch01	mapflag	nobranch
 job3_arch02	mapflag	nobranch
@@ -332,9 +336,46 @@ job3_war01	mapflag	nobranch
 job3_war02	mapflag	nobranch
 jupe_core2	mapflag	nobranch
 
+// Brasilis ===========
 brasilis	mapflag	nobranch
 bra_in01	mapflag	nobranch
 
+// Episode 13.3 ===========
+dicastes01	mapflag	nobranch
+dicastes02	mapflag	nobranch
+dic_in01	mapflag	nobranch
+s_atelier	mapflag	nobranch
+
+// Episode 14.1 & Dewata ===========
+mora	mapflag	nobranch
+1@mist	mapflag	nobranch
+dewata	mapflag	nobranch
+dew_in01	mapflag	nobranch
+
+// Episode Zero & Malaya Port ===========
+malangdo	mapflag	nobranch
+mal_in01	mapflag	nobranch
+mal_in02	mapflag	nobranch
+1@cash	mapflag	nobranch
+1@pump	mapflag	nobranch
+2@pump	mapflag	nobranch
+1@lhz	mapflag	nobranch
+malaya	mapflag	nobranch
+ma_scene01	mapflag	nobranch
+ma_in01	mapflag	nobranch
+1@ma_h	mapflag	nobranch
+1@ma_c	mapflag	nobranch
+1@ma_b	mapflag	nobranch
+
+// Episode 14.2 ===========
+eclage	mapflag	nobranch
+ecl_in01	mapflag	nobranch
+ecl_in02	mapflag	nobranch
+ecl_in03	mapflag	nobranch
+ecl_in04	mapflag	nobranch
+1@ecl	mapflag	nobranch
+ecl_hub01	mapflag	nobranch
+
 //evt_zombie	mapflag	nobranch
 
 // Poring War ==================
diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt
index ae64cc3c0..f82a2745c 100644
--- a/conf/mapflag/noicewall.txt
+++ b/conf/mapflag/noicewall.txt
@@ -142,6 +142,39 @@ nguild_prt	mapflag	noicewall
 5@tower	mapflag	noicewall
 6@tower	mapflag	noicewall
 
+// Orc's Memory ===================
+1@orcs	mapflag	noicewall
+2@orcs	mapflag	noicewall
+
+// Nidhoggr's Instance ===========
+1@nyd	mapflag	noicewall
+2@nyd	mapflag	noicewall
+
+// Misty Forest Labyrinth ===========
+1@mist	mapflag	noicewall
+
+// Octopus Cave ===========
+1@cash	mapflag	noicewall
+
+// Drain ===========
+1@pump	mapflag	noicewall
+2@pump	mapflag	noicewall
+
+// Somatology Laboratory ===========
+1@lhz	mapflag	noicewall
+
+// Bangungot Hospital F2 ===========
+1@ma_h	mapflag	noicewall
+
+// Buwaya Cave ===========
+1@ma_c	mapflag	noicewall
+
+// Bakonawa Hideout ===========
+1@ma_b	mapflag	noicewall
+
+// Inside Eclage ===========
+1@ecl	mapflag	noicewall
+
 // Poring War ====================
 poring_w01	mapflag	noicewall
 poring_w02	mapflag	noicewall
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index e7aea26b6..78a279a8a 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -671,6 +671,90 @@ man_in01	mapflag	nomemo
 splendide	mapflag	nomemo
 spl_fild01	mapflag	nomemo
 spl_in01	mapflag	nomemo
+job3_arch01	mapflag	nomemo
+job3_arch02	mapflag	nomemo
+job3_arch03	mapflag	nomemo
+job3_guil01	mapflag	nomemo
+job3_guil02	mapflag	nomemo
+job3_guil03	mapflag	nomemo
+job3_rang01	mapflag	nomemo
+job3_rang02	mapflag	nomemo
+job3_rune01	mapflag	nomemo
+job3_rune02	mapflag	nomemo
+job3_rune03	mapflag	nomemo
+job3_war01	mapflag	nomemo
+job3_war02	mapflag	nomemo
+job3_gen01	mapflag	nomemo
+job3_sha01	mapflag	nomemo
+jupe_core2	mapflag	nomemo
+s_atelier	mapflag	nomemo
+bra_in01	mapflag	nomemo
+bra_dun01	mapflag	nomemo
+bra_dun02	mapflag	nomemo
+dicastes01	mapflag	nomemo
+dicastes02	mapflag	nomemo
+dic_in01	mapflag	nomemo
+dic_fild01	mapflag	nomemo
+dic_fild02	mapflag	nomemo
+dic_dun01	mapflag	nomemo
+dic_dun02	mapflag	nomemo
+
+// Episode 14 ====================
+bif_fild01	mapflag	nomemo
+bif_fild02	mapflag	nomemo
+1@mist	mapflag	nomemo
+mora	mapflag	nomemo
+dew_dun01	mapflag	nomemo
+dew_dun02	mapflag	nomemo
+dew_in01	mapflag	nomemo
+dic_dun03	mapflag	nomemo
+mal_in01	mapflag	nomemo
+mal_in02	mapflag	nomemo
+mal_dun01	mapflag	nomemo
+1@cash	mapflag	nomemo
+1@pump	mapflag	nomemo
+2@pump	mapflag	nomemo
+iz_dun05	mapflag	nomemo
+lhz_dun04	mapflag	nomemo
+que_lhz	mapflag	nomemo
+1@lhz	mapflag	nomemo
+gld_dun01_2	mapflag	nomemo
+gld_dun02_2	mapflag	nomemo
+gld_dun03_2	mapflag	nomemo
+gld_dun04_2	mapflag	nomemo
+gld2_ald	mapflag	nomemo
+gld2_gef	mapflag	nomemo
+gld2_pay	mapflag	nomemo
+gld2_prt	mapflag	nomemo
+ma_scene01	mapflag	nomemo
+ma_in01	mapflag	nomemo
+ma_dun01	mapflag	nomemo
+1@ma_h	mapflag	nomemo
+1@ma_c	mapflag	nomemo
+1@ma_b	mapflag	nomemo
+ma_zif01	mapflag	nomemo
+ma_zif02	mapflag	nomemo
+ma_zif03	mapflag	nomemo
+ma_zif04	mapflag	nomemo
+ma_zif05	mapflag	nomemo
+ma_zif06	mapflag	nomemo
+ma_zif07	mapflag	nomemo
+ma_zif08	mapflag	nomemo
+ma_zif09	mapflag	nomemo
+eclage	mapflag	nomemo
+ecl_fild01	mapflag	nomemo
+ecl_in01	mapflag	nomemo
+ecl_in02	mapflag	nomemo
+ecl_in03	mapflag	nomemo
+ecl_in04	mapflag	nomemo
+1@ecl	mapflag	nomemo
+ecl_tdun01	mapflag	nomemo
+ecl_tdun02	mapflag	nomemo
+ecl_tdun03	mapflag	nomemo
+ecl_tdun04	mapflag	nomemo
+ecl_hub01	mapflag	nomemo
+moc_prydn1	mapflag	nomemo
+moc_prydn2	mapflag	nomemo
 
 //Orc's Memory ===================
 1@orcs	mapflag	nomemo
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index 1881ae35c..911b54729 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -125,6 +125,44 @@ ve_in	mapflag	nopenalty
 ve_in02	mapflag	nopenalty
 thor_camp	mapflag	nopenalty
 moc_para01	mapflag	nopenalty
+mid_camp	mapflag	nopenalty
+mid_campin	mapflag	nopenalty
+moc_fild22b	mapflag	nopenalty
+manuk	mapflag	nopenalty
+man_in01	mapflag	nopenalty
+splendide	mapflag	nopenalty
+spl_in01	mapflag	nopenalty
+spl_in02	mapflag	nopenalty
+brasilis	mapflag	nopenalty
+bra_in01	mapflag	nopenalty
+dicastes01	mapflag	nopenalty
+dicastes02	mapflag	nopenalty
+dic_in01	mapflag	nopenalty
+s_atelier	mapflag	nopenalty
+mora	mapflag	nopenalty
+dewata	mapflag	nopenalty
+dew_in01	mapflag	nopenalty
+malangdo	mapflag	nopenalty
+mal_in01	mapflag	nopenalty
+mal_in02	mapflag	nopenalty
+malaya	mapflag	nopenalty
+ma_scene01	mapflag	nopenalty
+ma_in01	mapflag	nopenalty
+ma_zif01	mapflag	nopenalty
+ma_zif02	mapflag	nopenalty
+ma_zif03	mapflag	nopenalty
+ma_zif04	mapflag	nopenalty
+ma_zif05	mapflag	nopenalty
+ma_zif06	mapflag	nopenalty
+ma_zif07	mapflag	nopenalty
+ma_zif08	mapflag	nopenalty
+ma_zif09	mapflag	nopenalty
+eclage	mapflag	nopenalty
+ecl_in01	mapflag	nopenalty
+ecl_in02	mapflag	nopenalty
+ecl_in03	mapflag	nopenalty
+ecl_in04	mapflag	nopenalty
+ecl_hub01	mapflag	nopenalty
 
 // Job Quests ========================
 job_sword1	mapflag	nopenalty
@@ -144,6 +182,25 @@ monk_test	mapflag	nopenalty
 monk_in	mapflag	nopenalty
 in_rogue	mapflag	nopenalty
 job_sage	mapflag	nopenalty
+// 3-1 --------------------
+job3_arch01	mapflag	nopenalty
+job3_arch02	mapflag	nopenalty
+job3_arch03	mapflag	nopenalty
+job3_guil01	mapflag	nopenalty
+job3_guil02	mapflag	nopenalty
+job3_guil03	mapflag	nopenalty
+job3_rang01	mapflag	nopenalty
+job3_rang02	mapflag	nopenalty
+job3_rune01	mapflag	nopenalty
+job3_rune02	mapflag	nopenalty
+job3_rune03	mapflag	nopenalty
+job3_war01	mapflag	nopenalty
+job3_war02	mapflag	nopenalty
+// 3-2 --------------------
+job3_gen01	mapflag	nopenalty
+// Ext --------------------
+job3_sha01	mapflag	nopenalty
+job_ko	mapflag	nopenalty
 
 // Misc Quests =======================
 mosk_ship	mapflag	nopenalty
diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt
index 70c29e6a1..c7587c63c 100644
--- a/conf/mapflag/nopvp.txt
+++ b/conf/mapflag/nopvp.txt
@@ -16,6 +16,15 @@
 4@tower	mapflag	pvp	off
 5@tower	mapflag	pvp	off
 6@tower	mapflag	pvp	off
+1@mist	mapflag	pvp	off
+1@cash	mapflag	pvp	off
+1@pump	mapflag	pvp	off
+2@pump	mapflag	pvp	off
+1@lhz	mapflag	pvp	off
+1@ma_h	mapflag	pvp	off
+1@ma_c	mapflag	pvp	off
+1@ma_b	mapflag	pvp	off
+1@ecl	mapflag	pvp	off
 
 bat_a01	mapflag	pvp	off
 bat_a02	mapflag	pvp	off
@@ -133,4 +142,30 @@ moc_para01	mapflag	pvp	off
 brasilis	mapflag	pvp	off
 bra_in01	mapflag	pvp	off
 
+dicastes01	mapflag	pvp	off
+dicastes02	mapflag	pvp	off
+dic_in01	mapflag	pvp	off
+
+s_atelier	mapflag	pvp	off
+
+mora	mapflag	pvp	off
+
+dewata	mapflag	pvp	off
+dew_in01	mapflag	pvp	off
+
+malangdo	mapflag	pvp	off
+mal_in01	mapflag	pvp	off
+mal_in02	mapflag	pvp	off
+
+malaya	mapflag	pvp	off
+ma_scene01	mapflag	pvp	off
+ma_in01	mapflag	pvp	off
+
+eclage	mapflag	pvp	off
+ecl_in01	mapflag	pvp	off
+ecl_in02	mapflag	pvp	off
+ecl_in03	mapflag	pvp	off
+ecl_in04	mapflag	pvp	off
+ecl_hub01	mapflag	pvp	off
+
 //evt_zombie	mapflag	pvp	off
diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt
index 5296b049a..be5f430c5 100644
--- a/conf/mapflag/nosave.txt
+++ b/conf/mapflag/nosave.txt
@@ -24,9 +24,27 @@ monk_test	mapflag	nosave	SavePoint
 monk_in	mapflag	nosave	SavePoint
 in_rogue	mapflag	nosave	SavePoint
 job_sage	mapflag	nosave	SavePoint
-
+// Ext
 job_star	mapflag	nosave	SavePoint
 job_soul	mapflag	nosave	SavePoint
+job3_sha01	mapflag	nosave	SavePoint
+job_ko	mapflag	nosave	SavePoint
+// 3-1
+job3_arch01	mapflag	nosave	SavePoint
+job3_arch02	mapflag	nosave	SavePoint
+job3_arch03	mapflag	nosave	SavePoint
+job3_guil01	mapflag	nosave	SavePoint
+job3_guil02	mapflag	nosave	SavePoint
+job3_guil03	mapflag	nosave	SavePoint
+job3_rang01	mapflag	nosave	SavePoint
+job3_rang02	mapflag	nosave	SavePoint
+job3_rune01	mapflag	nosave	SavePoint
+job3_rune02	mapflag	nosave	SavePoint
+job3_rune03	mapflag	nosave	SavePoint
+job3_war01	mapflag	nosave	SavePoint
+job3_war02	mapflag	nosave	SavePoint
+// 3-2
+job3_gen01	mapflag	nosave	SavePoint
 
 // Special Quests Places =====
 ama_test	mapflag	nosave	SavePoint
@@ -196,6 +214,14 @@ gld_dun01	mapflag	nosave	SavePoint
 gld_dun02	mapflag	nosave	SavePoint
 gld_dun03	mapflag	nosave	SavePoint
 gld_dun04	mapflag	nosave	SavePoint
+gld_dun01_2	mapflag	nosave	SavePoint
+gld_dun02_2	mapflag	nosave	SavePoint
+gld_dun03_2	mapflag	nosave	SavePoint
+gld_dun04_2	mapflag	nosave	SavePoint
+gld2_ald	mapflag	nosave	SavePoint
+gld2_gef	mapflag	nosave	SavePoint
+gld2_pay	mapflag	nosave	SavePoint
+gld2_prt	mapflag	nosave	SavePoint
 
 //Normal Maps =================================
 yggdrasil01	mapflag	nosave	SavePoint
@@ -226,11 +252,11 @@ que_qaru03	mapflag	nosave	SavePoint
 que_qaru04	mapflag	nosave	SavePoint
 que_qaru05	mapflag	nosave	SavePoint
 
-//Sealed Shrine ==================
+// Sealed Shrine ==================
 1@cata	mapflag	nosave	SavePoint
 2@cata	mapflag	nosave	SavePoint
 
-//Endless Tower ==================
+// Endless Tower ==================
 e_tower	mapflag	nosave	SavePoint
 1@tower	mapflag	nosave	SavePoint
 2@tower	mapflag	nosave	SavePoint
@@ -257,7 +283,7 @@ schg_dun01	mapflag	nosave	SavePoint
 arug_que01	mapflag	nosave	SavePoint
 arug_dun01	mapflag	nosave	SavePoint
 
-//Orc's Memory ===================
+// Orc's Memory ===================
 1@orcs	mapflag	nosave	SavePoint
 2@orcs	mapflag	nosave	SavePoint
 
@@ -265,8 +291,30 @@ arug_dun01	mapflag	nosave	SavePoint
 1@nyd	mapflag	nosave	SavePoint
 2@nyd	mapflag	nosave	SavePoint
 
-arug_dun01	mapflag	nosave	SavePoint
-schg_dun01	mapflag	nosave	SavePoint
+// Misty Forest Labyrinth ===========
+1@mist	mapflag	nosave	SavePoint
+
+// Octopus Cave ===========
+1@cash	mapflag	nosave	SavePoint
+
+// Drain ===========
+1@pump	mapflag	nosave	SavePoint
+2@pump	mapflag	nosave	SavePoint
+
+// Somatology Laboratory ===========
+1@lhz	mapflag	nosave	SavePoint
+
+// Bangungot Hospital F2 ===========
+1@ma_h	mapflag	nosave	SavePoint
+
+// Buwaya Cave ===========
+1@ma_c	mapflag	nosave	SavePoint
+
+// Bakonawa Hideout ===========
+1@ma_b	mapflag	nosave	SavePoint
+
+// Inside Eclage ===========
+1@ecl	mapflag	nosave	SavePoint
 
 //evt_zombie	mapflag	nosave	SavePoint
 
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
index 15bd644f0..4dca5519f 100644
--- a/conf/mapflag/noteleport.txt
+++ b/conf/mapflag/noteleport.txt
@@ -374,6 +374,50 @@ schg_que01	mapflag	noteleport
 arug_que01	mapflag	noteleport
 man_in01	mapflag	noteleport
 spl_in01	mapflag	noteleport
+s_atelier	mapflag	noteleport
+bra_in01	mapflag	noteleport
+dic_in01	mapflag	noteleport
+
+// Episode 14 ====================
+1@mist	mapflag	noteleport
+1@mist	mapflag	monster_noteleport
+dew_in01	mapflag	noteleport
+mal_in01	mapflag	noteleport
+mal_in02	mapflag	noteleport
+1@cash	mapflag	noteleport
+1@cash	mapflag	monster_noteleport
+1@pump	mapflag	noteleport
+1@pump	mapflag	monster_noteleport
+2@pump	mapflag	noteleport
+2@pump	mapflag	monster_noteleport
+que_lhz	mapflag	noteleport
+que_lhz	mapflag	monster_noteleport
+1@lhz	mapflag	noteleport
+1@lhz	mapflag	monster_noteleport
+ma_scene01	mapflag	noteleport
+ma_in01	mapflag	noteleport
+1@ma_h	mapflag	noteleport
+1@ma_h	mapflag	monster_noteleport
+1@ma_c	mapflag	noteleport
+1@ma_c	mapflag	monster_noteleport
+1@ma_b	mapflag	noteleport
+1@ma_b	mapflag	monster_noteleport
+ma_zif01	mapflag	noteleport
+ma_zif02	mapflag	noteleport
+ma_zif03	mapflag	noteleport
+ma_zif04	mapflag	noteleport
+ma_zif05	mapflag	noteleport
+ma_zif06	mapflag	noteleport
+ma_zif07	mapflag	noteleport
+ma_zif08	mapflag	noteleport
+ma_zif09	mapflag	noteleport
+ecl_in01	mapflag	noteleport
+ecl_in02	mapflag	noteleport
+ecl_in03	mapflag	noteleport
+ecl_in04	mapflag	noteleport
+1@ecl	mapflag	noteleport
+1@ecl	mapflag	monster_noteleport
+ecl_hub01	mapflag	noteleport
 
 //Orc's Memory ===================
 1@orcs	mapflag	noteleport
diff --git a/conf/mapflag/partylock.txt b/conf/mapflag/partylock.txt
index e3720f5a6..ce304fadb 100644
--- a/conf/mapflag/partylock.txt
+++ b/conf/mapflag/partylock.txt
@@ -6,11 +6,11 @@
 //= v 1.0
 //===== Current Version: =====================================
 
-//Sealed Shrine ==================
+// Sealed Shrine ==================
 1@cata	mapflag	partylock
 2@cata	mapflag	partylock
 
-//Endless Tower ==================
+// Endless Tower ==================
 1@tower	mapflag	partylock
 2@tower	mapflag	partylock
 3@tower	mapflag	partylock
@@ -18,10 +18,35 @@
 5@tower	mapflag	partylock
 6@tower	mapflag	partylock
 
-//Orc's Memory ===================
+// Orc's Memory ===================
 1@orcs	mapflag	partylock
 2@orcs	mapflag	partylock
 
 // Nidhoggr's Instance ===========
 1@nyd	mapflag	partylock
 2@nyd	mapflag	partylock
+
+// Misty Forest Labyrinth ===========
+1@mist	mapflag	partylock
+
+// Octopus Cave ===========
+1@cash	mapflag	partylock
+
+// Drain ===========
+1@pump	mapflag	partylock
+2@pump	mapflag	partylock
+
+// Somatology Laboratory ===========
+1@lhz	mapflag	partylock
+
+// Bangungot Hospital F2 ===========
+1@ma_h	mapflag	partylock
+
+// Buwaya Cave ===========
+1@ma_c	mapflag	partylock
+
+// Bakonawa Hideout ===========
+1@ma_b	mapflag	partylock
+
+// Inside Eclage ===========
+1@ecl	mapflag	partylock
diff --git a/conf/mapflag/reset.txt b/conf/mapflag/reset.txt
index 5e0e621d9..0825c2f8d 100644
--- a/conf/mapflag/reset.txt
+++ b/conf/mapflag/reset.txt
@@ -16,6 +16,10 @@ amatsu	mapflag	reset
 ayothaya	mapflag	reset
 brasilis	mapflag	reset
 comodo	mapflag	reset
+dewata	mapflag	reset
+dicastes01	mapflag	reset
+dicastes02	mapflag	reset
+eclage	mapflag	reset
 einbroch	mapflag	reset
 einbech	mapflag	reset
 geffen	mapflag	reset
@@ -25,9 +29,12 @@ jawaii	mapflag	reset
 hugel	mapflag	reset
 lighthalzen	mapflag	reset
 louyang	mapflag	reset
+malangdo	mapflag	reset
+malaya	mapflag	reset
 manuk	mapflag	reset
 mid_camp	mapflag	reset
 moc_ruins	mapflag	reset
+mora	mapflag	reset
 morocc	mapflag	reset
 moscovia	mapflag	reset
 niflheim	mapflag	reset
diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt
index 908ea4476..01709fb7d 100644
--- a/conf/mapflag/restricted.txt
+++ b/conf/mapflag/restricted.txt
@@ -64,6 +64,31 @@ arug_cas05	mapflag	restricted	4
 1@nyd	mapflag	restricted	6
 2@nyd	mapflag	restricted	6
 
+// Misty Forest Labyrinth ===========
+1@mist	mapflag	restricted	6
+
+// Octopus Cave ===========
+1@cash	mapflag	restricted	6
+
+// Drain ===========
+1@pump	mapflag	restricted	6
+2@pump	mapflag	restricted	6
+
+// Somatology Laboratory ===========
+1@lhz	mapflag	restricted	6
+
+// Bangungot Hospital F2 ===========
+1@ma_h	mapflag	restricted	6
+
+// Buwaya Cave ===========
+1@ma_c	mapflag	restricted	6
+
+// Bakonawa Hideout ===========
+1@ma_b	mapflag	restricted	6
+
+// Inside Eclage ===========
+1@ecl	mapflag	restricted	6
+
 //Towns
 alberta	mapflag	restricted	7
 aldebaran	mapflag	restricted	7