- Follow up r15281.

- Removed MaxLvl check in BG Waitingrooms.

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

2 files changed, 24 insertions, 48 deletions

diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 871780800..4bb6fa7be 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -98,16 +98,12 @@ OnRoundStart:
 	set .Match, .Match + 1;
 	// Crystal Spawn
 	set .Guillaume_Crystal, bg_monster($@FlaviusBG1_id1,"bat_b01",328,150,"Crystal Guillaume",1914,"Flavius_BG1::OnGuillaumeBreak");
-	setwall "bat_b01",327,149,2,6,0,"gui_wall1-1";
-	setwall "bat_b01",329,149,2,0,0,"gui_wall1-2";
-	setwall "bat_b01",329,151,2,2,0,"gui_wall1-3";
-	setwall "bat_b01",327,151,2,4,0,"gui_wall1-4";
+	setcell "bat_b01",327,151,329,149,cell_basilica,1;
+	setcell "bat_b01",327,151,329,149,cell_walkable,1;
 
 	set .Croix_Crystal, bg_monster($@FlaviusBG1_id2,"bat_b01",62,150,"Crystal Croix",1915,"Flavius_BG1::OnCroixBreak");
-	setwall "bat_b01",61,149,2,6,0,"cro_wall1-1";
-	setwall "bat_b01",63,149,2,0,0,"cro_wall1-2";
-	setwall "bat_b01",63,151,2,2,0,"cro_wall1-3";
-	setwall "bat_b01",61,151,2,4,0,"cro_wall1-4";
+	setcell "bat_b01",62,149,60,151,cell_basilica,1;
+	setcell "bat_b01",62,149,60,151,cell_walkable,1;
 
 	// Guardian Spawns
 	bg_monster $@FlaviusBG1_id1,"bat_b01",328,160,"Guillaume Guardian",1949,"Flavius_BG1::OnGuiGuardian";
@@ -124,25 +120,19 @@ OnRoundStop:
 	// Remove Monsters
 	killmonster "bat_b01","Flavius_BG1::OnGuiGuardian";
 	killmonster "bat_b01","Flavius_BG1::OnCroGuardian";
-	delwall "gui_wall1-1";
-	delwall "gui_wall1-2";
-	delwall "gui_wall1-3";
-	delwall "gui_wall1-4";
+	setcell "bat_b01",327,151,329,149,cell_walkable,0;
+	setcell "bat_b01",327,151,329,149,cell_basilica,0;
 	killmonster "bat_b01","Flavius_BG1::OnGuillaumeBreak";
-	delwall "cro_wall1-1";
-	delwall "cro_wall1-2";
-	delwall "cro_wall1-3";
-	delwall "cro_wall1-4";
+	setcell "bat_b01",62,149,60,151,cell_walkable,0;
+	setcell "bat_b01",62,149,60,151,cell_basilica,0;
 	killmonster "bat_b01","Flavius_BG1::OnCroixBreak";
 	end;
 
 OnGuiGuardian:
 	if( set(.Guillaume_Guardian, .Guillaume_Guardian - 1) <= 0 )
 	{
-		delwall "gui_wall1-1";
-		delwall "gui_wall1-2";
-		delwall "gui_wall1-3";
-		delwall "gui_wall1-4";
+		setcell "bat_b01",327,151,329,149,cell_walkable,0;
+		setcell "bat_b01",327,151,329,149,cell_basilica,0;
 		mapannounce "bat_b01","The Guillaume Crystal is vulnerable to attack!",1,0x0000FF;
 	}
 	end;
@@ -150,10 +140,8 @@ OnGuiGuardian:
 OnCroGuardian:
 	if( set(.Croix_Guardian, .Croix_Guardian - 1) <= 0 )
 	{
-		delwall "cro_wall1-1";
-		delwall "cro_wall1-2";
-		delwall "cro_wall1-3";
-		delwall "cro_wall1-4";
+		setcell "bat_b01",62,149,60,151,cell_walkable,0;
+		setcell "bat_b01",62,149,60,151,cell_basilica,0;
 		mapannounce "bat_b01","The Croix Crystal is vulnerable to attack!",1,0xFF0000;
 	}
 	end;
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index 255f96a0a..4dc180d14 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -98,16 +98,12 @@ OnRoundStart:
 	set .Match, .Match + 1;
 	// Crystal Spawn
 	set .Guillaume_Crystal, bg_monster($@FlaviusBG2_id1,"bat_b02",328,150,"Crystal Guillaume",1914,"Flavius_BG2::OnGuillaumeBreak");
-	setwall "bat_b02",327,149,2,6,0,"gui_wall2-1";
-	setwall "bat_b02",329,149,2,0,0,"gui_wall2-2";
-	setwall "bat_b02",329,151,2,2,0,"gui_wall2-3";
-	setwall "bat_b02",327,151,2,4,0,"gui_wall2-4";
+	setcell "bat_b02",327,151,329,149,cell_basilica,1;
+	setcell "bat_b02",327,151,329,149,cell_walkable,1;
 
 	set .Croix_Crystal, bg_monster($@FlaviusBG2_id2,"bat_b02",62,150,"Crystal Croix",1915,"Flavius_BG2::OnCroixBreak");
-	setwall "bat_b02",61,149,2,6,0,"cro_wall2-1";
-	setwall "bat_b02",63,149,2,0,0,"cro_wall2-2";
-	setwall "bat_b02",63,151,2,2,0,"cro_wall2-3";
-	setwall "bat_b02",61,151,2,4,0,"cro_wall2-4";
+	setcell "bat_b02",62,149,60,151,cell_basilica,1;
+	setcell "bat_b02",62,149,60,151,cell_walkable,1;
 
 	// Guardian Spawns
 	bg_monster $@FlaviusBG2_id1,"bat_b02",328,160,"Guillaume Guardian",1949,"Flavius_BG2::OnGuiGuardian";
@@ -124,25 +120,19 @@ OnRoundStop:
 	// Remove Monsters
 	killmonster "bat_b02","Flavius_BG2::OnGuiGuardian";
 	killmonster "bat_b02","Flavius_BG2::OnCroGuardian";
-	delwall "gui_wall2-1";
-	delwall "gui_wall2-2";
-	delwall "gui_wall2-3";
-	delwall "gui_wall2-4";
+	setcell "bat_b02",327,151,329,149,cell_walkable,0;
+	setcell "bat_b02",327,151,329,149,cell_basilica,0;
 	killmonster "bat_b02","Flavius_BG2::OnGuillaumeBreak";
-	delwall "cro_wall2-1";
-	delwall "cro_wall2-2";
-	delwall "cro_wall2-3";
-	delwall "cro_wall2-4";
+	setcell "bat_b02",62,149,60,151,cell_walkable,0;
+	setcell "bat_b02",62,149,60,151,cell_basilica,0;
 	killmonster "bat_b02","Flavius_BG2::OnCroixBreak";
 	end;
 
 OnGuiGuardian:
 	if( set(.Guillaume_Guardian, .Guillaume_Guardian - 1) <= 0 )
 	{
-		delwall "gui_wall2-1";
-		delwall "gui_wall2-2";
-		delwall "gui_wall2-3";
-		delwall "gui_wall2-4";
+		setcell "bat_b02",327,151,329,149,cell_walkable,0;
+		setcell "bat_b02",327,151,329,149,cell_basilica,0;
 		mapannounce "bat_b02","The Guillaume Crystal is vulnerable to attack!",1,0x0000FF;
 	}
 	end;
@@ -150,10 +140,8 @@ OnGuiGuardian:
 OnCroGuardian:
 	if( set(.Croix_Guardian, .Croix_Guardian - 1) <= 0 )
 	{
-		delwall "cro_wall2-1";
-		delwall "cro_wall2-2";
-		delwall "cro_wall2-3";
-		delwall "cro_wall2-4";
+		setcell "bat_b02",62,149,60,151,cell_walkable,0;
+		setcell "bat_b02",62,149,60,151,cell_basilica,0;
 		mapannounce "bat_b02","The Croix Crystal is vulnerable to attack!",1,0xFF0000;
 	}
 	end;