- 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://svn.code.sf.net/p/rathena/svn/trunk@13569 54d463be-8e91-2dee-dedb-b68131a5f0ec

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

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

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

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

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

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

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

npc/battleground/bg_common.txt

@@ -310,7 +310,7 @@ bat_room,156,121,1	script	Tierra Valley Officer#2	414,{
 
 // Guillaume Knight - Tierra
 // *********************************************************************
-bat_room,175,178,5	script	Guillaume Knight#3	417,{
+bat_room,175,178,5	script	Guillaume Knight#2	417,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -375,7 +375,7 @@ bat_room,172,178,5	script	Tierra Valley Officer#3	418,{
 
 // Croix Knight - Tierra
 // *********************************************************************
-bat_room,175,121,1	script	Croix Knight#3	413,{
+bat_room,175,121,1	script	Croix Knight#2	413,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -440,7 +440,7 @@ bat_room,172,121,1	script	Tierra Valley Officer#4	414,{
 
 // Guillaune Knight - Flavius
 // *********************************************************************
-bat_room,151,178,5	script	Guillaume Knight#2	417,{
+bat_room,151,178,5	script	Guillaume Knight#3	417,{
 	mes "[Guillaume Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destryoing theur crystal.";
 	next;
@@ -506,7 +506,7 @@ bat_room,148,178,5	script	Flavius Officer#1	418,{
 
 // Croix Knight - Flavius
 // *********************************************************************
-bat_room,151,121,1	script	Croix Knight#2	413,{
+bat_room,151,121,1	script	Croix Knight#3	413,{
 	mes "[Croix Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destryoing theur crystal.";
 	next;
@@ -572,7 +572,7 @@ bat_room,148,121,1	script	Flavius Officer#2	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,143,178,5	script	Guillaume Knight#3	417,{
+bat_room,143,178,5	script	Guillaume Knight#4	417,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other oponents before all of you die.";
 	next;
@@ -635,7 +635,7 @@ bat_room,140,178,5	script	KVM [80-99] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,143,121,1	script	Croix Knight#3	413,{
+bat_room,143,121,1	script	Croix Knight#4	413,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other oponents before all of you die.";
 	next;
@@ -698,7 +698,7 @@ bat_room,140,121,1	script	KVM [80-99] Officer#2	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,135,178,5	script	Guillaume Knight#4	417,{
+bat_room,135,178,5	script	Guillaume Knight#5	417,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other oponents before all of you die.";
 	next;
@@ -761,7 +761,7 @@ bat_room,132,178,5	script	KVM [60-79] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,135,121,1	script	Croix Knight#4	413,{
+bat_room,135,121,1	script	Croix Knight#5	413,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other oponents before all of you die.";
 	next;
@@ -824,7 +824,7 @@ bat_room,132,121,1	script	KVM [60-79] Officer#2	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,127,178,5	script	Guillaume Knight#5	417,{
+bat_room,127,178,5	script	Guillaume Knight#6	417,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other oponents before all of you die.";
 	next;
@@ -887,7 +887,7 @@ bat_room,124,178,5	script	KVM [1-59] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,127,121,1	script	Croix Knight#5	413,{
+bat_room,127,121,1	script	Croix Knight#6	413,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other oponents before all of you die.";
 	next;