* Mapflag updates. Will need to do a complete rewrite eventually.

- Removed several noicewall limitations from interior maps mostly.
- Removed several noreturn limitations from interior maps mostly.
- Removed nobranch limitations from PVP (yoyo and nightmare) maps.
- Removed nopenalty flag from nightmare PVP maps.
- Commented out all noloot and noexp mapflag entries.
- Added a few more noskill entries for some maps.


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

8 files changed, 211 insertions, 304 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 353e9ceb3..2b3993201 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,13 @@
 Date	Added
 
+2008/08/01
+	* Rev. 13033 Mapflag updates. Will need to do a complete rewrite eventually. [L0ne_W0lf]
+	- Removed several noicewall limitations from interior maps mostly.
+	- Removed several noreturn limitations from interior maps mostly.
+	- Removed nobranch limitations from PVP (yoyo and nightmare) maps.
+	- Removed nopenalty flag from nightmare PVP maps.
+	- Commented out all noloot and noexp mapflag entries.
+	- Added a few more noskill entries for some maps.
 2008/07/27
 	* Removed the unused login and txt->sql options in inter_athena.conf
 	* Renamed config option log_db to log_db_db in inter_athena.conf
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index 3772701a1..1ea183ea8 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -6,6 +6,7 @@
 //= 1.3 [massdriller]
 //= 1.6a [Lupus]
 //= 1.7 Added all novice maps. [L0ne_W0lf]
+//= 1.8 Removed restriction on PVP maps. [L0ne_W0lf]
 //===== Current Version: =====================================
 
 // Cities ================>\\
@@ -222,88 +223,7 @@ prt_are01	mapflag	nobranch
 
 // PvP Arenas =========================
 pvp_y_room	mapflag	nobranch
-pvp_y_1-1	mapflag	nobranch
-pvp_y_1-2	mapflag	nobranch
-pvp_y_1-3	mapflag	nobranch
-pvp_y_1-4	mapflag	nobranch
-pvp_y_1-5	mapflag	nobranch
-pvp_y_2-1	mapflag	nobranch
-pvp_y_2-2	mapflag	nobranch
-pvp_y_2-3	mapflag	nobranch
-pvp_y_2-4	mapflag	nobranch
-pvp_y_2-5	mapflag	nobranch
-pvp_y_3-1	mapflag	nobranch
-pvp_y_3-2	mapflag	nobranch
-pvp_y_3-3	mapflag	nobranch
-pvp_y_3-4	mapflag	nobranch
-pvp_y_3-5	mapflag	nobranch
-pvp_y_4-1	mapflag	nobranch
-pvp_y_4-2	mapflag	nobranch
-pvp_y_4-3	mapflag	nobranch
-pvp_y_4-4	mapflag	nobranch
-pvp_y_4-5	mapflag	nobranch
-pvp_y_5-1	mapflag	nobranch
-pvp_y_5-2	mapflag	nobranch
-pvp_y_5-3	mapflag	nobranch
-pvp_y_5-4	mapflag	nobranch
-pvp_y_5-5	mapflag	nobranch
-pvp_y_6-1	mapflag	nobranch
-pvp_y_6-2	mapflag	nobranch
-pvp_y_6-3	mapflag	nobranch
-pvp_y_6-4	mapflag	nobranch
-pvp_y_6-5	mapflag	nobranch
-pvp_y_7-1	mapflag	nobranch
-pvp_y_7-2	mapflag	nobranch
-pvp_y_7-3	mapflag	nobranch
-pvp_y_7-4	mapflag	nobranch
-pvp_y_7-5	mapflag	nobranch
-pvp_y_8-1	mapflag	nobranch
-pvp_y_8-2	mapflag	nobranch
-pvp_y_8-3	mapflag	nobranch
-pvp_y_8-4	mapflag	nobranch
-pvp_y_8-5	mapflag	nobranch
 pvp_n_room	mapflag	nobranch
-pvp_n_1-1	mapflag	nobranch
-pvp_n_1-2	mapflag	nobranch
-pvp_n_1-3	mapflag	nobranch
-pvp_n_1-4	mapflag	nobranch
-pvp_n_1-5	mapflag	nobranch
-pvp_n_2-1	mapflag	nobranch
-pvp_n_2-2	mapflag	nobranch
-pvp_n_2-3	mapflag	nobranch
-pvp_n_2-4	mapflag	nobranch
-pvp_n_2-5	mapflag	nobranch
-pvp_n_3-1	mapflag	nobranch
-pvp_n_3-2	mapflag	nobranch
-pvp_n_3-3	mapflag	nobranch
-pvp_n_3-4	mapflag	nobranch
-pvp_n_3-5	mapflag	nobranch
-pvp_n_4-1	mapflag	nobranch
-pvp_n_4-2	mapflag	nobranch
-pvp_n_4-3	mapflag	nobranch
-pvp_n_4-4	mapflag	nobranch
-pvp_n_4-5	mapflag	nobranch
-pvp_n_5-1	mapflag	nobranch
-pvp_n_5-2	mapflag	nobranch
-pvp_n_5-3	mapflag	nobranch
-pvp_n_5-4	mapflag	nobranch
-pvp_n_5-5	mapflag	nobranch
-pvp_n_6-1	mapflag	nobranch
-pvp_n_6-2	mapflag	nobranch
-pvp_n_6-3	mapflag	nobranch
-pvp_n_6-4	mapflag	nobranch
-pvp_n_6-5	mapflag	nobranch
-pvp_n_7-1	mapflag	nobranch
-pvp_n_7-2	mapflag	nobranch
-pvp_n_7-3	mapflag	nobranch
-pvp_n_7-4	mapflag	nobranch
-pvp_n_7-5	mapflag	nobranch
-pvp_n_8-1	mapflag	nobranch
-pvp_n_8-2	mapflag	nobranch
-pvp_n_8-3	mapflag	nobranch
-pvp_n_8-4	mapflag	nobranch
-pvp_n_8-5	mapflag	nobranch
-pvp_2vs2	mapflag	nobranch
 
 //Main City maps
 alberta	mapflag	nobranch
diff --git a/conf/mapflag/noexp.txt b/conf/mapflag/noexp.txt
index f01181b38..dfe57dfb8 100644
--- a/conf/mapflag/noexp.txt
+++ b/conf/mapflag/noexp.txt
@@ -4,20 +4,21 @@
 //= eAthena Dev Team
 //= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky
 //= 1.6 Added Lighthalzen (due to quests) [Lupus]
+//= 1.7 Commented out entries. (Quests are official) [L0ne_W0lf]
 //============================================================
 
 // Location for Job's Quests
-job_thief1	mapflag	noexp
-job_sword1	mapflag	noexp
-in_moc_16	mapflag	noexp
-job_hunte	mapflag	noexp
-job_knt	mapflag	noexp
-job_prist	mapflag	noexp
-job_wiz	mapflag	noexp
-job_cru	mapflag	noexp
-monk_test	mapflag	noexp
-in_rogue	mapflag	noexp
-job_sage	mapflag	noexp
-job_soul	mapflag	noexp
-job_star	mapflag	noexp
-que_ng	mapflag	noexp
+//job_thief1	mapflag	noexp
+//job_sword1	mapflag	noexp
+//in_moc_16	mapflag	noexp
+//job_hunte	mapflag	noexp
+//job_knt	mapflag	noexp
+//job_prist	mapflag	noexp
+//job_wiz	mapflag	noexp
+//job_cru	mapflag	noexp
+//monk_test	mapflag	noexp
+//in_rogue	mapflag	noexp
+//job_sage	mapflag	noexp
+//job_soul	mapflag	noexp
+//job_star	mapflag	noexp
+//que_ng	mapflag	noexp
diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt
index 2292e1c7d..defd502eb 100644
--- a/conf/mapflag/noicewall.txt
+++ b/conf/mapflag/noicewall.txt
@@ -6,94 +6,95 @@
 //= noicewall: Disables Icewall skill.
 //= To disable Icewall on a specific map add the mapname here.
 //= 1.6a Re-enabled icewalls for cities [Lupus]
+//= 1.7 Officially icewall is allowed on interoirs. [L0ne_w0lf]
 //============================================================
 
-ayo_in01	mapflag	noicewall
-ayo_in02	mapflag	noicewall
-alberta_in	mapflag	noicewall
+//ayo_in01	mapflag	noicewall
+//ayo_in02	mapflag	noicewall
+//alberta_in	mapflag	noicewall
 //alberta	mapflag	noicewall
-alde_alche	mapflag	noicewall
-aldeba_in	mapflag	noicewall
+//alde_alche	mapflag	noicewall
+//aldeba_in	mapflag	noicewall
 //aldebaran	mapflag	noicewall
-ama_in01	mapflag	noicewall
-ama_in02	mapflag	noicewall
+//ama_in01	mapflag	noicewall
+//ama_in02	mapflag	noicewall
 //amatsu	mapflag	noicewall
 //ayothaya	mapflag	noicewall
-cmd_in01	mapflag	noicewall
-cmd_in02	mapflag	noicewall
+//cmd_in01	mapflag	noicewall
+//cmd_in02	mapflag	noicewall
 //comodo	mapflag	noicewall
 //einbroch	mapflag	noicewall
 //einbech	mapflag	noicewall
-gef_tower	mapflag	noicewall
+//gef_tower	mapflag	noicewall
 //geffen	mapflag	noicewall
-geffen_in	mapflag	noicewall
-gon_in	mapflag	noicewall
+//geffen_in	mapflag	noicewall
+//gon_in	mapflag	noicewall
 //gonryun	mapflag	noicewall
-in_hunter	mapflag	noicewall
-in_moc_16	mapflag	noicewall
-in_orcs01	mapflag	noicewall
-izlude_in	mapflag	noicewall
+//in_hunter	mapflag	noicewall
+//in_moc_16	mapflag	noicewall
+//in_orcs01	mapflag	noicewall
+//izlude_in	mapflag	noicewall
 //izlude	mapflag	noicewall
 //hugel	mapflag	noicewall
 //jawaii	mapflag	noicewall
-moc_castle	mapflag	noicewall
-monk_in	mapflag	noicewall
-morocc_in	mapflag	noicewall
+//moc_castle	mapflag	noicewall
+//monk_in	mapflag	noicewall
+//morocc_in	mapflag	noicewall
 //morocc	mapflag	noicewall
-mosk_in	mapflag	noicewall
-payon_in01	mapflag	noicewall
-payon_in02	mapflag	noicewall
-payon_in03	mapflag	noicewall
+//mosk_in	mapflag	noicewall
+//payon_in01	mapflag	noicewall
+//payon_in02	mapflag	noicewall
+//payon_in03	mapflag	noicewall
 //payon	mapflag	noicewall
 //pay_arche	mapflag	noicewall
-prt_are_in	mapflag	noicewall
-prt_are01	mapflag	noicewall
-prt_castle	mapflag	noicewall
-prt_church	mapflag	noicewall
-prt_in	mapflag	noicewall
+//prt_are_in	mapflag	noicewall
+//prt_are01	mapflag	noicewall
+//prt_castle	mapflag	noicewall
+//prt_church	mapflag	noicewall
+//prt_in	mapflag	noicewall
 //prontera	mapflag	noicewall
-sec_in01	mapflag	noicewall
-job_sword1	mapflag	noicewall
-um_in	mapflag	noicewall
+//sec_in01	mapflag	noicewall
+//job_sword1	mapflag	noicewall
+//um_in	mapflag	noicewall
 //umbala	mapflag	noicewall
-xmas_in	mapflag	noicewall
+//xmas_in	mapflag	noicewall
 //xmas	mapflag	noicewall
-yuno_in01	mapflag	noicewall
-yuno_in02	mapflag	noicewall
-yuno_in03	mapflag	noicewall
-yuno_in04	mapflag	noicewall
-yuno_in05	mapflag	noicewall
+//yuno_in01	mapflag	noicewall
+//yuno_in02	mapflag	noicewall
+//yuno_in03	mapflag	noicewall
+//yuno_in04	mapflag	noicewall
+//yuno_in05	mapflag	noicewall
 //yuno	mapflag	noicewall
-gon_test	mapflag	noicewall
-nif_in	mapflag	noicewall
+//gon_test	mapflag	noicewall
+//nif_in	mapflag	noicewall
 //louyang	mapflag	noicewall
-que_sign01	mapflag	noicewall
-ein_in01	mapflag	noicewall
-airport	mapflag	noicewall
-airplane	mapflag	noicewall
-airplane_01	mapflag	noicewall
+//que_sign01	mapflag	noicewall
+//ein_in01	mapflag	noicewall
+//airport	mapflag	noicewall
+//airplane	mapflag	noicewall
+//airplane_01	mapflag	noicewall
 //lighthalzen	mapflag	noicewall
-yuno_pre	mapflag	noicewall
-y_airport	mapflag	noicewall
-lhz_airport	mapflag	noicewall
-lhz_in01	mapflag	noicewall
-lhz_in02	mapflag	noicewall
-lhz_in03	mapflag	noicewall
+//yuno_pre	mapflag	noicewall
+//y_airport	mapflag	noicewall
+//lhz_airport	mapflag	noicewall
+//lhz_in01	mapflag	noicewall
+//lhz_in02	mapflag	noicewall
+//lhz_in03	mapflag	noicewall
 //rachel	mapflag	noicewall
-ra_in01	mapflag	noicewall
-ra_temin	mapflag	noicewall
-ra_temple	mapflag	noicewall
-ra_temsky	mapflag	noicewall
-que_rachel	mapflag	noicewall
-auction_01	mapflag	noicewall
-auction_02	mapflag	noicewall
-hu_in01	mapflag	noicewall
-kh_mansion	mapflag	noicewall
-kh_rossi	mapflag	noicewall
-kh_school	mapflag	noicewall
-kh_vila	mapflag	noicewall
-ve_in	mapflag	noicewall
-ve_in02	mapflag	noicewall
+//ra_in01	mapflag	noicewall
+//ra_temin	mapflag	noicewall
+//ra_temple	mapflag	noicewall
+//ra_temsky	mapflag	noicewall
+//que_rachel	mapflag	noicewall
+//auction_01	mapflag	noicewall
+//auction_02	mapflag	noicewall
+//hu_in01	mapflag	noicewall
+//kh_mansion	mapflag	noicewall
+//kh_rossi	mapflag	noicewall
+//kh_school	mapflag	noicewall
+//kh_vila	mapflag	noicewall
+//ve_in	mapflag	noicewall
+//ve_in02	mapflag	noicewall
 
 // Guild Castles ==========
 aldeg_cas01	mapflag	noicewall
diff --git a/conf/mapflag/noloot.txt b/conf/mapflag/noloot.txt
index a260ed5b3..e488f8f0a 100644
--- a/conf/mapflag/noloot.txt
+++ b/conf/mapflag/noloot.txt
@@ -4,22 +4,23 @@
 //= eAthena Dev Team
 //= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky
 //= 1.6 Added Lighthalzen (due to quests) [Lupus]
+//= 1.7 Commented out entries. (Quests are official) [L0ne_W0lf]
 //============================================================
 
 // Location for Job's Quests
-job_sword1	mapflag	noloot
-in_moc_16	mapflag	noloot
-job_hunte	mapflag	noloot
-job_knt	mapflag	noloot
-job_prist	mapflag	noloot
-job_wiz	mapflag	noloot
-job_cru	mapflag	noloot
-monk_test	mapflag	noloot
-in_rogue	mapflag	noloot
-job_sage	mapflag	noloot
-job_soul	mapflag	noloot
-job_star	mapflag	noloot
-que_ng	mapflag	noloot
+//job_sword1	mapflag	noloot
+//in_moc_16	mapflag	noloot
+//job_hunte	mapflag	noloot
+//job_knt	mapflag	noloot
+//job_prist	mapflag	noloot
+//job_wiz	mapflag	noloot
+//job_cru	mapflag	noloot
+//monk_test	mapflag	noloot
+//in_rogue	mapflag	noloot
+//job_sage	mapflag	noloot
+//job_soul	mapflag	noloot
+//job_star	mapflag	noloot
+//que_ng	mapflag	noloot
 
 //Thieves have to gather some mushrooms. So they need loot
 //job_thief1	mapflag	noloot
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index 1745cabab..d8683d0f0 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -4,6 +4,7 @@
 //= eAthena Dev Team
 //= 1.2 [Lupus]
 //= 1.3 Added all novice maps. [L0ne_W0lf]
+//= 1.4 Removed Nightmare PVP maps. [L0ne_W0lf]
 //===== Current Version: =====================================
 
 
@@ -210,46 +211,6 @@ pvp_y_8-2	mapflag	nopenalty
 pvp_y_8-3	mapflag	nopenalty
 pvp_y_8-4	mapflag	nopenalty
 pvp_y_8-5	mapflag	nopenalty
-pvp_n_1-1	mapflag	nopenalty
-pvp_n_1-2	mapflag	nopenalty
-pvp_n_1-3	mapflag	nopenalty
-pvp_n_1-4	mapflag	nopenalty
-pvp_n_1-5	mapflag	nopenalty
-pvp_n_2-1	mapflag	nopenalty
-pvp_n_2-2	mapflag	nopenalty
-pvp_n_2-3	mapflag	nopenalty
-pvp_n_2-4	mapflag	nopenalty
-pvp_n_2-5	mapflag	nopenalty
-pvp_n_3-1	mapflag	nopenalty
-pvp_n_3-2	mapflag	nopenalty
-pvp_n_3-3	mapflag	nopenalty
-pvp_n_3-4	mapflag	nopenalty
-pvp_n_3-5	mapflag	nopenalty
-pvp_n_4-1	mapflag	nopenalty
-pvp_n_4-2	mapflag	nopenalty
-pvp_n_4-3	mapflag	nopenalty
-pvp_n_4-4	mapflag	nopenalty
-pvp_n_4-5	mapflag	nopenalty
-pvp_n_5-1	mapflag	nopenalty
-pvp_n_5-2	mapflag	nopenalty
-pvp_n_5-3	mapflag	nopenalty
-pvp_n_5-4	mapflag	nopenalty
-pvp_n_5-5	mapflag	nopenalty
-pvp_n_6-1	mapflag	nopenalty
-pvp_n_6-2	mapflag	nopenalty
-pvp_n_6-3	mapflag	nopenalty
-pvp_n_6-4	mapflag	nopenalty
-pvp_n_6-5	mapflag	nopenalty
-pvp_n_7-1	mapflag	nopenalty
-pvp_n_7-2	mapflag	nopenalty
-pvp_n_7-3	mapflag	nopenalty
-pvp_n_7-4	mapflag	nopenalty
-pvp_n_7-5	mapflag	nopenalty
-pvp_n_8-1	mapflag	nopenalty
-pvp_n_8-2	mapflag	nopenalty
-pvp_n_8-3	mapflag	nopenalty
-pvp_n_8-4	mapflag	nopenalty
-pvp_n_8-5	mapflag	nopenalty
 pvp_2vs2	mapflag	nopenalty
 
 //Aldebaran Turbo Track
diff --git a/conf/mapflag/noreturn.txt b/conf/mapflag/noreturn.txt
index 77d0e8675..3f9a201e9 100644
--- a/conf/mapflag/noreturn.txt
+++ b/conf/mapflag/noreturn.txt
@@ -9,101 +9,102 @@
 //= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex]
 //= 1.4a Added job_knt. [Samuray22]
 //= 1.5 Commented out new_zone entries. [L0ne_W0lf]
+//= 1.6 Enabled B. wings on all maps but que_hugel. [L0ne_W0lf]
 //===== Current Version: =====================================
 
 // Cities ========================
-ayo_in01	mapflag	noreturn
-ayo_in02	mapflag	noreturn
-alb_ship	mapflag	noreturn
-alberta_in	mapflag	noreturn
-aldeba_in	mapflag	noreturn
-ama_in01	mapflag	noreturn
-ama_in02	mapflag	noreturn
-ama_test	mapflag	noreturn
-cmd_in01	mapflag	noreturn
-cmd_in02	mapflag	noreturn
-gef_tower	mapflag	noreturn
-geffen_in	mapflag	noreturn
-gon_test	mapflag	noreturn
-gon_in	mapflag	noreturn
-in_orcs01	mapflag	noreturn
-izlude_in	mapflag	noreturn
-hu_in01	mapflag	noreturn
-jawaii_in	mapflag	noreturn
-lou_in01	mapflag	noreturn
-lou_in02	mapflag	noreturn
-moc_castle	mapflag	noreturn
-morocc_in	mapflag	noreturn
-mosk_in	mapflag	noreturn
+//ayo_in01	mapflag	noreturn
+//ayo_in02	mapflag	noreturn
+//alb_ship	mapflag	noreturn
+//alberta_in	mapflag	noreturn
+//aldeba_in	mapflag	noreturn
+//ama_in01	mapflag	noreturn
+//ama_in02	mapflag	noreturn
+//ama_test	mapflag	noreturn
+//cmd_in01	mapflag	noreturn
+//cmd_in02	mapflag	noreturn
+//gef_tower	mapflag	noreturn
+//geffen_in	mapflag	noreturn
+//gon_test	mapflag	noreturn
+//gon_in	mapflag	noreturn
+//in_orcs01	mapflag	noreturn
+//izlude_in	mapflag	noreturn
+//hu_in01	mapflag	noreturn
+//jawaii_in	mapflag	noreturn
+//lou_in01	mapflag	noreturn
+//lou_in02	mapflag	noreturn
+//moc_castle	mapflag	noreturn
+//morocc_in	mapflag	noreturn
+//mosk_in	mapflag	noreturn
 //new_zone01	mapflag	noreturn
 //new_zone02	mapflag	noreturn
 //new_zone03	mapflag	noreturn
 //new_zone04	mapflag	noreturn
-nif_in	mapflag	noreturn
-payon_in01	mapflag	noreturn
-payon_in02	mapflag	noreturn
-payon_in03	mapflag	noreturn
-prt_are_in	mapflag	noreturn
-prt_are01	mapflag	noreturn
-prt_castle	mapflag	noreturn
-prt_church	mapflag	noreturn
-prt_in	mapflag	noreturn
-um_in	mapflag	noreturn
-xmas_in	mapflag	noreturn
-yuno_in01	mapflag	noreturn
-yuno_in03	mapflag	noreturn
-yuno_in04	mapflag	noreturn
-yuno_in05	mapflag	noreturn
-que_sign01	mapflag	noreturn
-ein_in01	mapflag	noreturn
-airport	mapflag	noreturn
-airplane	mapflag	noreturn
-airplane_01	mapflag	noreturn
-yuno_pre	mapflag	noreturn
-y_airport	mapflag	noreturn
-lhz_airport	mapflag	noreturn
-lhz_in01	mapflag	noreturn
-lhz_in02	mapflag	noreturn
-lhz_in03	mapflag	noreturn
-lhz_que01	mapflag	noreturn
-kh_mansion	mapflag	noreturn
-kh_rossi	mapflag	noreturn
-kh_school	mapflag	noreturn
-kh_vila	mapflag	noreturn
-ra_in01	mapflag	noreturn
-ra_temin	mapflag	noreturn
-ve_in	mapflag	noreturn
-ve_in02	mapflag	noreturn
+//nif_in	mapflag	noreturn
+//payon_in01	mapflag	noreturn
+//payon_in02	mapflag	noreturn
+//payon_in03	mapflag	noreturn
+//prt_are_in	mapflag	noreturn
+//prt_are01	mapflag	noreturn
+//prt_castle	mapflag	noreturn
+//prt_church	mapflag	noreturn
+//prt_in	mapflag	noreturn
+//um_in	mapflag	noreturn
+//xmas_in	mapflag	noreturn
+//yuno_in01	mapflag	noreturn
+//yuno_in03	mapflag	noreturn
+//yuno_in04	mapflag	noreturn
+//yuno_in05	mapflag	noreturn
+//que_sign01	mapflag	noreturn
+//ein_in01	mapflag	noreturn
+//airport	mapflag	noreturn
+//airplane	mapflag	noreturn
+//airplane_01	mapflag	noreturn
+//yuno_pre	mapflag	noreturn
+//y_airport	mapflag	noreturn
+//lhz_airport	mapflag	noreturn
+//lhz_in01	mapflag	noreturn
+//lhz_in02	mapflag	noreturn
+//lhz_in03	mapflag	noreturn
+//lhz_que01	mapflag	noreturn
+//kh_mansion	mapflag	noreturn
+//kh_rossi	mapflag	noreturn
+//kh_school	mapflag	noreturn
+//kh_vila	mapflag	noreturn
+//ra_in01	mapflag	noreturn
+//ra_temin	mapflag	noreturn
+//ve_in	mapflag	noreturn
+//ve_in02	mapflag	noreturn
 
 // Job Quests ====================
-job_sword1	mapflag	noreturn
-job_thief1	mapflag	noreturn
+//job_sword1	mapflag	noreturn
+//job_thief1	mapflag	noreturn
 // 2-1 -----------------------
-job_knt	mapflag	noreturn
-job_hunte	mapflag	noreturn
-job_prist	mapflag	noreturn
-job_wiz	mapflag	noreturn
-in_hunter	mapflag	noreturn
-in_moc_16	mapflag	noreturn
+//job_knt	mapflag	noreturn
+//job_hunte	mapflag	noreturn
+//job_prist	mapflag	noreturn
+//job_wiz	mapflag	noreturn
+//in_hunter	mapflag	noreturn
+//in_moc_16	mapflag	noreturn
 // 2-2 --------------------
-alde_alche	mapflag	noreturn
-job_cru	mapflag	noreturn
-job_duncer	mapflag	noreturn
-job_monk	mapflag	noreturn
-monk_test	mapflag	noreturn
-monk_in	mapflag	noreturn
-in_rogue	mapflag	noreturn
-job_sage	mapflag	noreturn
-que_ng	mapflag	noreturn
+//alde_alche	mapflag	noreturn
+//job_cru	mapflag	noreturn
+//job_duncer	mapflag	noreturn
+//job_monk	mapflag	noreturn
+//monk_test	mapflag	noreturn
+//monk_in	mapflag	noreturn
+//in_rogue	mapflag	noreturn
+//job_sage	mapflag	noreturn
+//que_ng	mapflag	noreturn
 
 // Special Quests Places =========
-que_god01	mapflag	noreturn
-que_god02	mapflag	noreturn
-que_bingo	mapflag	noreturn
+//que_god01	mapflag	noreturn
+//que_god02	mapflag	noreturn
+//que_bingo	mapflag	noreturn
 que_hugel	mapflag	noreturn
-que_thor	mapflag	noreturn
-poring_c01	mapflag	noreturn
-poring_c02	mapflag	noreturn
+//que_thor	mapflag	noreturn
+//poring_c01	mapflag	noreturn
+//poring_c02	mapflag	noreturn
 
 // Guild Castles =================
 //= 1.3 According to the kRO patch, enabled Butterfly wings in the Castles
@@ -133,19 +134,19 @@ poring_c02	mapflag	noreturn
 //nguild_prt	mapflag	noreturn
 
 // GvG Arenas ===================
-guild_vs1	mapflag	noreturn
-guild_vs2	mapflag	noreturn
-guild_vs3	mapflag	noreturn
-guild_vs4	mapflag	noreturn
-guild_vs5	mapflag	noreturn
+//guild_vs1	mapflag	noreturn
+//guild_vs2	mapflag	noreturn
+//guild_vs3	mapflag	noreturn
+//guild_vs4	mapflag	noreturn
+//guild_vs5	mapflag	noreturn
 
 // Arenas =====================>\\
-arena_room	mapflag	noreturn
-sec_in01	mapflag	noreturn
-sec_in02	mapflag	noreturn
+//arena_room	mapflag	noreturn
+//sec_in01	mapflag	noreturn
+//sec_in02	mapflag	noreturn
 
 // PvP Arenas=======================
-pvp_y_room	mapflag	noreturn
+//pvp_y_room	mapflag	noreturn
 //pvp_y_1-1	mapflag	noreturn
 //pvp_y_1-2	mapflag	noreturn
 //pvp_y_1-3	mapflag	noreturn
@@ -186,7 +187,7 @@ pvp_y_room	mapflag	noreturn
 //pvp_y_8-3	mapflag	noreturn
 //pvp_y_8-4	mapflag	noreturn
 //pvp_y_8-5	mapflag	noreturn
-pvp_n_room	mapflag	noreturn
+//pvp_n_room	mapflag	noreturn
 //pvp_n_1-1	mapflag	noreturn
 //pvp_n_1-2	mapflag	noreturn
 //pvp_n_1-3	mapflag	noreturn
diff --git a/conf/mapflag/noskill.txt b/conf/mapflag/noskill.txt
index 7df4be110..35af4894c 100644
--- a/conf/mapflag/noskill.txt
+++ b/conf/mapflag/noskill.txt
@@ -3,8 +3,22 @@
 //===== By: ==================================================

 //= eAthena Dev Team

 //= 1.0 [L0ne_W0lf]

+//= 1.1 Added additional maps. [L0ne_W0lf]

 //===== Current Version: =====================================

 

-//Monster Races ================

+//Prontera Arena ===============

+prt_are_in	mapflag	noskill

+

+//The Sign Quest ===============

+himinn	mapflag	noskill

+

+// Quiz Maps ===================

+quiz_00	mapflag	noskill


+quiz_01	mapflag	noskill


+quiz_02	mapflag	noskill


+quiz_test	mapflag	noskill


+

+//Hugel Minigames ==============

+que_bingo	mapflag	noskill

 p_track01	mapflag	noskill

 p_track02	mapflag	noskill