* Fixed wrong events being called for flavius02 BG waiting rooms. (bugreport:4395)

* Fixed the setwalls in Tierra gorge, again. Removed extra mapflags.
* Moved overlapping guild flags outside arug_cas05 to proper points.
* Fixed kRO Name for Women's Bundle. (bugreport:4398)

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

6 files changed, 15 insertions, 41 deletions

diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index 4dd47b7af..b1e6a085b 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= - Losing Team: 3 badge
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.
+//= 1.1 Fixed NPCs being called for waiting rooms. (bugreport:4395)
 //============================================================
 
 // Waiting Room NPCs
@@ -76,8 +77,8 @@ OnInit:
 OnReadyCheck:
 	if( $@FlaviusBG2 )
 		end;
-	set .@Guillaume, getwaitingroomstate(0,"Lieutenant Ator");
-	set .@Croix, getwaitingroomstate(0,"Lieutenant Thelokus");
+	set .@Guillaume, getwaitingroomstate(0,"Lieutenant Huvas");
+	set .@Croix, getwaitingroomstate(0,"Lieutenant Yukon");
 	if( !.@Guillaume && !.@Croix ) {
 		donpcevent "#bat_b02_timer::OnStop";
 		end;
@@ -90,8 +91,8 @@ OnReadyCheck:
 	set $@Guill_ScoreBG2, 0;
 
 	bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
-	donpcevent "Lieutenant Ator::OnEnterBG";
-	donpcevent "Lieutenant Thelokus::OnEnterBG";
+	donpcevent "Lieutenant Huvas::OnEnterBG";
+	donpcevent "Lieutenant Yukon::OnEnterBG";
 	donpcevent "OBJ#bat_b02_a::Onkill";
 	donpcevent "OBJ#bat_b02_a::OnEnable";
 	donpcevent "OBJ#bat_b02_b::Onkill";
diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index 1b8f3cb6c..f58e34f04 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -430,7 +430,3 @@ bat_c01,148,53,1	script	KVM Officer#KVM01B	415,{
 	}
 	end;
 }
-
-// MapFlags
-//============================================================
-
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index 11a1c3d47..273ff8c78 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -427,7 +427,3 @@ bat_c02,148,53,1	script	KVM Officer#KVM02B	415,{
 	}
 	end;
 }
-
-// MapFlags
-//============================================================
-
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index ab30a6708..c01b0162b 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -429,7 +429,3 @@ bat_c03,148,53,1	script	KVM Officer#KVM03B	415,{
 	}
 	end;
 }
-
-// MapFlags
-//============================================================
-
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index bd351b7ea..5c911605d 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= - Losing Team: 1 badge
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.
+//= 1.1 Corrected setwalls for barricades. [L0ne_W0lf]
 //============================================================
 
 // Waiting Room NPCs
@@ -197,7 +198,7 @@ bat_a01,15,18,3	script	barricade#bat_a01_a	844,{
 OnEnable:
 	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
 		bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead";
-	setwall "bat_a01",185,265,16,6,1,"bat_a01_c1";
+	setwall "bat_a01",186,266,16,6,1,"bat_a01_c1";
 	end;
 
 Onkill:
@@ -219,7 +220,7 @@ bat_a01,15,19,3	script	barricade#bat_a01_b	844,{
 OnEnable:
 	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
 		bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead";
-	setwall "bat_a01",169,130,16,6,1,"bat_a01_g1";
+	setwall "bat_a01",170,129,16,6,1,"bat_a01_g1";
 	end;
 
 Onkill:
@@ -943,12 +944,3 @@ bat_a01,1,1,3	script	Release all#a01	81,{
 }
 */
 
-bat_a01	mapflag	battleground
-bat_a01	mapflag	nomemo
-bat_a01	mapflag	nosave	SavePoint
-bat_a01	mapflag	noteleport
-bat_a01	mapflag	nowarp
-bat_a01	mapflag	nowarpto
-bat_a01	mapflag	noreturn
-bat_a01	mapflag	nobranch
-bat_a01	mapflag	nopenalty
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index d09aa492f..0fb3c631e 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -197,7 +197,7 @@ bat_a02,15,18,3	script	barricade#bat_a02_a	844,{
 OnEnable:
 	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
 		bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead";
-	setwall "bat_a02",185,265,16,6,1,"bat_a02_c1";
+	setwall "bat_a02",186,266,16,6,1,"bat_a02_c1";
 	end;
 
 Onkill:
@@ -219,7 +219,7 @@ bat_a02,15,19,3	script	barricade#bat_a02_b	844,{
 OnEnable:
 	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
 		bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead";
-	setwall "bat_a02",169,130,16,6,1,"bat_a02_g1";
+	setwall "bat_a02",170,129,16,6,1,"bat_a02_g1";
 	end;
 
 Onkill:
@@ -762,6 +762,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	419,{
 			}
 		}
 	}
+	bg_leave;
 	warp "bat_room",154,150;
 	end;
 
@@ -855,6 +856,7 @@ bat_a02,45,19,3	script	Croix Vintenar#a02_b	415,{
 			}
 		}
 	}
+	bg_leave;
 	warp "bat_room",154,150;
 	end;
 
@@ -940,13 +942,4 @@ bat_a02,1,1,3	script	Release all#a02	81,{
 	}
 }
 */
-
-bat_a02	mapflag	battleground
-bat_a02	mapflag	nomemo
-bat_a02	mapflag	nosave	SavePoint
-bat_a02	mapflag	noteleport
-bat_a02	mapflag	nowarp
-bat_a02	mapflag	nowarpto
-bat_a02	mapflag	noreturn
-bat_a02	mapflag	nobranch
-bat_a02	mapflag	nopenalty
+	
\ No newline at end of file