From e9bd1dd178ffdc275306e457c9a904f46ab745dd Mon Sep 17 00:00:00 2001
From: zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 6 Mar 2009 18:21:00 +0000
Subject: - Removing battleground maps mapflags from conf/mapflag. I will
 handle then on each script. - Fixing some duplicate names on bg_common.txt.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13569 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 conf/mapflag/nobranch.txt   | 7 -------
 conf/mapflag/nomemo.txt     | 7 -------
 conf/mapflag/nopenalty.txt  | 7 -------
 conf/mapflag/nosave.txt     | 7 -------
 conf/mapflag/noteleport.txt | 7 -------
 conf/mapflag/nowarpto.txt   | 7 -------
 conf/mapflag/pvp.txt        | 6 ------
 7 files changed, 48 deletions(-)

(limited to 'conf')

diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index 1ea183ea8..835a49a8a 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -265,13 +265,6 @@ turbo_e_16	mapflag	nobranch
 p_track01	mapflag	nobranch
 p_track02	mapflag	nobranch
 
-//Battle Fields ================
-bat_room	mapflag	nobranch
-bat_a01	mapflag	nobranch
-bat_a02	mapflag	nobranch
-bat_b01	mapflag	nobranch
-bat_b02	mapflag	nobranch
-
 //Vision of Okolnir ============
 que_qsch01	mapflag	nobranch
 que_qsch02	mapflag	nobranch
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 3cf97c4c8..1959a0b13 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -614,13 +614,6 @@ turbo_e_16	mapflag	nomemo
 p_track01	mapflag	nomemo
 p_track02	mapflag	nomemo
 
-//Battle Fields ==============
-bat_room	mapflag	nomemo
-bat_a01	mapflag	nomemo
-bat_a02	mapflag	nomemo
-bat_b01	mapflag	nomemo
-bat_b02	mapflag	nomemo
-
 //Vision of Okolnir ==========
 que_qsch01	mapflag	nomemo
 que_qsch02	mapflag	nomemo
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index d8683d0f0..ddffc147e 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -227,13 +227,6 @@ turbo_e_16	mapflag	nopenalty
 p_track01	mapflag	nopenalty
 p_track02	mapflag	nopenalty
 
-//Battle Fields =================
-bat_room	mapflag	nopenalty
-bat_a01	mapflag	nopenalty
-bat_a02	mapflag	nopenalty
-bat_b01	mapflag	nopenalty
-bat_b02	mapflag	nopenalty
-
 //Vision of Okolnir =============
 que_qsch01	mapflag	nopenalty
 que_qsch02	mapflag	nopenalty
diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt
index 68319ab61..38d084bf6 100644
--- a/conf/mapflag/nosave.txt
+++ b/conf/mapflag/nosave.txt
@@ -214,13 +214,6 @@ turbo_e_16	mapflag	nosave	SavePoint
 p_track01	mapflag	nosave	SavePoint
 p_track02	mapflag	nosave	SavePoint
 
-//Battle Fields ===============================
-bat_room	mapflag	nosave	SavePoint
-bat_a01	mapflag	nosave	SavePoint
-bat_a02	mapflag	nosave	SavePoint
-bat_b01	mapflag	nosave	SavePoint
-bat_b02	mapflag	nosave	SavePoint
-
 //Vision of Okolnir ===========================
 que_qsch01	mapflag	nosave	SavePoint
 que_qsch02	mapflag	nosave	SavePoint
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
index ef59ae2d8..d6f75f84a 100644
--- a/conf/mapflag/noteleport.txt
+++ b/conf/mapflag/noteleport.txt
@@ -311,13 +311,6 @@ turbo_e_16	mapflag	noteleport
 p_track01	mapflag	noteleport
 p_track02	mapflag	noteleport
 
-//Battle Fields ==================
-bat_room	mapflag	noteleport
-bat_a01	mapflag	noteleport
-bat_a02	mapflag	noteleport
-bat_b01	mapflag	noteleport
-bat_b02	mapflag	noteleport
-
 //Vision of Okolnir ==============
 que_qsch01	mapflag	noteleport
 que_qsch02	mapflag	noteleport
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
index d3f74dd9a..5345fe31d 100644
--- a/conf/mapflag/nowarpto.txt
+++ b/conf/mapflag/nowarpto.txt
@@ -74,13 +74,6 @@ prt_are_in	mapflag	nowarpto
 p_track01	mapflag	nowarpto
 p_track02	mapflag	nowarpto
 
-//Battle Fields ================
-bat_room	mapflag	nowarpto
-bat_a01	mapflag	nowarpto
-bat_a02	mapflag	nowarpto
-bat_b01	mapflag	nowarpto
-bat_b02	mapflag	nowarpto
-
 //Vision of Okolnir ============
 que_qsch01	mapflag	nowarpto
 que_qsch02	mapflag	nowarpto
diff --git a/conf/mapflag/pvp.txt b/conf/mapflag/pvp.txt
index dc4a6e679..78f65b5e8 100644
--- a/conf/mapflag/pvp.txt
+++ b/conf/mapflag/pvp.txt
@@ -97,9 +97,3 @@ pvp_2vs2	mapflag	pvp
 turbo_e_4	mapflag	pvp
 turbo_e_8	mapflag	pvp
 turbo_e_16	mapflag	pvp
-
-//Battle Fields ===============
-bat_a01	mapflag	pvp
-bat_a02	mapflag	pvp
-bat_b01	mapflag	pvp
-bat_b02	mapflag	pvp
-- 
cgit v1.2.3-70-g09d2