- Removing some comments "EoS" from my source.

- Adding the second Flavius entrance npcs (not script, just recruit)

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

1 files changed, 151 insertions, 19 deletions

diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index c4a243c46..42229816a 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -327,7 +327,7 @@ bat_room,175,178,5	script	Guillaume Knight#2	417,{
 	close;

 }

 

-// Tierra EoS Officer - Guillaume

+// Tierra Officer - Guillaume

 // *********************************************************************

 bat_room,172,178,5	script	Tierra Valley Officer#3	418,{

 	mes "[Tierra Officer]";

@@ -392,7 +392,7 @@ bat_room,175,121,1	script	Croix Knight#2	413,{
 	close;

 }

 

-// Tierra EoS Officer - Croix

+// Tierra Officer - Croix

 // *********************************************************************

 bat_room,172,121,1	script	Tierra Valley Officer#4	414,{

 	mes "[Tierra Officer]";

@@ -570,9 +570,141 @@ bat_room,148,121,1	script	Flavius Officer#2	414,{
 	end;

 }

 

+// Guillaune Knight - Flavius

+// *********************************************************************

+bat_room,167,178,5	script	Guillaume Knight#4	417,{

+	mes "[Guillaume Knight]";

+	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destryoing theur crystal.";

+	next;

+	mes "[Guillaume Knight]";

+	mes "The crystals for both armies are protected by special barricades that cannot be destroyed by direct attacks.";

+	next;

+	mes "[Guillaume Knight]";

+	mes "But they can be removed by destroying the Guardians that protect the enemy army base.";

+	next;

+	mes "[Guillaume Knight]";

+	mes "The crystals are immune to every type of skill; your physical attacks are the only choice for destroying your enemy's crystal.";

+	next;

+	mes "[Guillaume Knight]";

+	mes "Are you ready for battle? Then apply with the recruiter next to me!";

+	close;

+}

+

+// Flavius Officerer - Guillaume

+// *********************************************************************

+bat_room,164,178,5	script	Flavius Officer#3	418,{

+	mes "[Flavius Officer]";

+	if( Bat_Team == 2 )

+	{

+		mes "Get out of here you stupid Croix!";

+		close;

+	}

+

+	if( Bat_Team == 0 )

+	{

+		mes "Please sign up for an army with Prince Croix or General Guillaume!";

+		close;

+	}

+

+	mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!";

+	next;

+	if( select("I want to join your army!:End Conversation") == 2 )

+		close;

+

+	mes "[Flavius Officer]";

+	if( BG_Delay_Tick >= gettimetick(2) )

+	{

+		mes "You are a Deserter!!";

+		mes "Because of running away, you need to wait ^0000FF" + callfunc("Time2Str",BG_Delay_Tick) + "^000000 to join again a BattleGround.";

+		close;

+	}

+	if( Flavius_BG_Tick >= gettimetick(2) )

+	{

+		mes "Sorry, you can't join the battle right now.";

+		mes "You need to wait ^0000FF" + callfunc("Time2Str",Flavius_BG_Tick) + "^000000 to join again Flavius.";

+		close;

+	}

+	if( BaseLevel < 80 )

+	{

+		mes "I'm very please you want to join our army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield";

+		close;

+	}

+

+	mes "Good luck!";

+	close2;

+	warp "bat_room",57,94;

+	end;

+}

+

+// Croix Knight - Flavius

+// *********************************************************************

+bat_room,167,121,1	script	Croix Knight#4	413,{

+	mes "[Croix Knight]";

+	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destryoing theur crystal.";

+	next;

+	mes "[Croix Knight]";

+	mes "The crystals for both armies are protected by special barricades that cannot be destroyed by direct attacks.";

+	next;

+	mes "[Croix Knight]";

+	mes "But they can be removed by destroying the Guardians that protect the enemy army base.";

+	next;

+	mes "[Croix Knight]";

+	mes "The crystals are immune to every type of skill; your physical attacks are the only choice for destroying your enemy's crystal.";

+	next;

+	mes "[Croix Knight]";

+	mes "Are you ready for battle? Then apply with the recruiter next to me!";

+	close;

+}

+

+// Flavius Officerer - Croix

+// *********************************************************************

+bat_room,164,121,1	script	Flavius Officer#4	414,{

+	mes "[Flavius Officer]";

+	if( Bat_Team == 1 )

+	{

+		mes "Get out of here you stupid Guillaume!";

+		close;

+	}

+

+	if( Bat_Team == 0 )

+	{

+		mes "Please sign up for an army with Prince Croix or General Guillaume!";

+		close;

+	}

+

+	mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!";

+	next;

+	if( select("I want to join your army!:End Conversation") == 2 )

+		close;

+

+	mes "[Flavius Officer]";

+	if( BG_Delay_Tick >= gettimetick(2) )

+	{

+		mes "You are a Deserter!!";

+		mes "Because of running away, you need to wait ^0000FF" + callfunc("Time2Str",BG_Delay_Tick) + "^000000 to join again a BattleGround.";

+		close;

+	}

+	if( Flavius_BG_Tick >= gettimetick(2) )

+	{

+		mes "Sorry, you can't join the battle right now.";

+		mes "You need to wait ^0000FF" + callfunc("Time2Str",Flavius_BG_Tick) + "^000000 to join again Flavius.";

+		close;

+	}

+	if( BaseLevel < 80 )

+	{

+		mes "I'm very please you want to join our army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield";

+		close;

+	}

+

+	mes "Good luck!";

+	close2;

+	warp "bat_room",57,77;

+	end;

+}

+

 // Guillaume Knight - KvM

 // *********************************************************************

-bat_room,143,178,5	script	Guillaume Knight#4	417,{

+bat_room,143,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;

@@ -635,7 +767,7 @@ bat_room,140,178,5	script	KVM [80-99] Officer#1	418,{
 

 // Croix Knight - KvM

 // *********************************************************************

-bat_room,143,121,1	script	Croix Knight#4	413,{

+bat_room,143,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;

@@ -698,7 +830,7 @@ bat_room,140,121,1	script	KVM [80-99] Officer#2	414,{
 

 // Guillaume Knight - KvM

 // *********************************************************************

-bat_room,135,178,5	script	Guillaume Knight#5	417,{

+bat_room,135,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;

@@ -761,7 +893,7 @@ bat_room,132,178,5	script	KVM [60-79] Officer#1	418,{
 

 // Croix Knight - KvM

 // *********************************************************************

-bat_room,135,121,1	script	Croix Knight#5	413,{

+bat_room,135,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;

@@ -824,7 +956,7 @@ bat_room,132,121,1	script	KVM [60-79] Officer#2	414,{
 

 // Guillaume Knight - KvM

 // *********************************************************************

-bat_room,127,178,5	script	Guillaume Knight#6	417,{

+bat_room,127,178,5	script	Guillaume Knight#7	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 +1019,7 @@ bat_room,124,178,5	script	KVM [1-59] Officer#1	418,{
 

 // Croix Knight - KvM

 // *********************************************************************

-bat_room,127,121,1	script	Croix Knight#6	413,{

+bat_room,127,121,1	script	Croix Knight#7	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;

@@ -964,43 +1096,43 @@ bat_room,161,158,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid4	419
 

 // Exit from Registration

 // *********************************************************************

-

+// Flavius bat_b02

 bat_room,57,81,0	warp	bat1	2,2,bat_room,154,149

 bat_room,57,90,0	warp	bat2	2,2,bat_room,154,149

-

+// Free BG

 bat_room,57,220,0	warp	bat3	2,2,bat_room,154,149

 bat_room,57,211,0	warp	bat4	2,2,bat_room,154,149

-

+// Tierra Valley bat_a02

 bat_room,85,81,0	warp	bat5	2,2,bat_room,154,149

 bat_room,85,90,0	warp	bat6	2,2,bat_room,154,149

 // Tierra Valley bat_a01

 bat_room,85,220,0	warp	bat7	2,2,bat_room,154,149

 bat_room,85,211,0	warp	bat8	2,2,bat_room,154,149

-

+// Free BG

 bat_room,113,81,0	warp	bat9	2,2,bat_room,154,149

 bat_room,113,90,0	warp	bat10	2,2,bat_room,154,149

-

+// Free BG

 bat_room,113,220,0	warp	bat11	2,2,bat_room,154,149

 bat_room,113,211,0	warp	bat12	2,2,bat_room,154,149

-

+// Free BG

 bat_room,141,81,0	warp	bat13	2,2,bat_room,154,149

 bat_room,141,90,0	warp	bat14	2,2,bat_room,154,149

-

+// Free BG

 bat_room,141,220,0	warp	bat15	2,2,bat_room,154,149

 bat_room,141,211,0	warp	bat16	2,2,bat_room,154,149

-

+// Free BG

 bat_room,169,81,0	warp	bat17	2,2,bat_room,154,149

 bat_room,169,90,0	warp	bat18	2,2,bat_room,154,149

-

+// Free BG

 bat_room,169,220,0	warp	bat19	2,2,bat_room,154,149

 bat_room,169,211,0	warp	bat20	2,2,bat_room,154,149

-

+// Free BG

 bat_room,197,81,0	warp	bat21	2,2,bat_room,154,149

 bat_room,197,90,0	warp	bat22	2,2,bat_room,154,149

 // KvM bat_c03

 bat_room,197,220,0	warp	bat23	2,2,bat_room,154,149

 bat_room,197,211,0	warp	bat24	2,2,bat_room,154,149

-

+// Free BG

 bat_room,225,81,0	warp	bat25	2,2,bat_room,154,149

 bat_room,225,90,0	warp	bat26	2,2,bat_room,154,149

 // KvM bat_c02