* Quest log kill count now updated properly. (Added from topic 253813)

* More battleground editing, and some bug fixes.
- * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING *
- Rewrote the Badge Exchange NPC in bg_common.txt, is official now.
- Other changes to the bg_common folder, including disabled GM NPC.
- Completely rewrote Flavius for the most part, from ground up.
- Moved old Flavius battlegrounds to /custom/battleground folder.
- Restored original bg_common, and KVM to /custom/battleground
- Fixed wall bugs in Tierra Gorge, and added an oninit to the timers.
- Other minor tweaks to both Tierra Gorge and KVM scripts.
- Fixed the pseudo-cooldown on KVM not working properly, I hope.
- Added global time2str function which will be used later in Endless tower.
* Applied Epoque's mapflag clean up, which removes flags from scripts.


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

4 files changed, 90 insertions, 77 deletions

diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index 27f01d47d..1b8f3cb6c 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -60,23 +60,23 @@ OnKvM01Two:
 	end;
 }
 
-bat_c01,54,124,3	duplicate(CellEffect)	#RedcellA1-1	111
-bat_c01,55,124,3	duplicate(CellEffect)	#RedcellA2-1	111
-bat_c01,56,124,3	duplicate(CellEffect)	#RedcellA3-1	111
-bat_c01,57,124,3	duplicate(CellEffect)	#RedcellA4-1	111
-bat_c01,57,125,3	duplicate(CellEffect)	#RedcellA5-1	111
-bat_c01,57,126,3	duplicate(CellEffect)	#RedcellA6-1	111
-bat_c01,57,127,3	duplicate(CellEffect)	#RedcellA7-1	111
+bat_c01,54,124,3	duplicate(CellEffect)	#RedcellA1-1	139
+bat_c01,55,124,3	duplicate(CellEffect)	#RedcellA2-1	139
+bat_c01,56,124,3	duplicate(CellEffect)	#RedcellA3-1	139
+bat_c01,57,124,3	duplicate(CellEffect)	#RedcellA4-1	139
+bat_c01,57,125,3	duplicate(CellEffect)	#RedcellA5-1	139
+bat_c01,57,126,3	duplicate(CellEffect)	#RedcellA6-1	139
+bat_c01,57,127,3	duplicate(CellEffect)	#RedcellA7-1	139
 
-bat_c01,145,59,3	duplicate(CellEffect)	#RedcellB1-1	111
-bat_c01,144,59,3	duplicate(CellEffect)	#RedcellB2-1	111
-bat_c01,143,59,3	duplicate(CellEffect)	#RedcellB3-1	111
-bat_c01,142,59,3	duplicate(CellEffect)	#RedcellB4-1	111
-bat_c01,142,56,3	duplicate(CellEffect)	#RedcellB5-1	111
-bat_c01,142,57,3	duplicate(CellEffect)	#RedcellB6-1	111
-bat_c01,142,58,3	duplicate(CellEffect)	#RedcellB7-1	111
+bat_c01,145,59,3	duplicate(CellEffect)	#RedcellB1-1	139
+bat_c01,144,59,3	duplicate(CellEffect)	#RedcellB2-1	139
+bat_c01,143,59,3	duplicate(CellEffect)	#RedcellB3-1	139
+bat_c01,142,59,3	duplicate(CellEffect)	#RedcellB4-1	139
+bat_c01,142,56,3	duplicate(CellEffect)	#RedcellB5-1	139
+bat_c01,142,57,3	duplicate(CellEffect)	#RedcellB6-1	139
+bat_c01,142,58,3	duplicate(CellEffect)	#RedcellB7-1	139
 
-bat_c01,54,128,3	script	#A_camp_start01	111,4,4,{
+bat_c01,54,128,3	script	#A_camp_start01	139,4,4,{
 	end;
 
 OnInit:
@@ -97,7 +97,7 @@ OnTouch:
 	end;
 }
 
-bat_c01,146,56,3	script	#B_camp_start01	111,4,4,{
+bat_c01,146,56,3	script	#B_camp_start01	139,4,4,{
 	end;
 
 OnInit:
@@ -146,6 +146,10 @@ OnGuillaumeDie:
 		set .Croix_Score, .Croix_Score + 1;
 		bg_updatescore "bat_c01",.Guillaume_Score,.Croix_Score;
 		if( .Guillaume_Count < 1 ) donpcevent "KvM01_BG::OnCroixWin";
+		else {
+			mapannounce "bat_c01", "NUmber of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
+			mapannounce "bat_c01", "NUmber of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
+		}
 	}
 	end;
 
@@ -158,6 +162,10 @@ OnCroixDie:
 		set .Guillaume_Score, .Guillaume_Score + 1;
 		bg_updatescore "bat_c01",.Guillaume_Score,.Croix_Score;
 		if( .Croix_Count < 1 ) donpcevent "KvM01_BG::OnGuillaumeWin";
+		else {
+			mapannounce "bat_c01", "NUmber of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
+			mapannounce "bat_c01", "NUmber of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
+		}
 	}
 	end;
 
@@ -426,12 +434,3 @@ bat_c01,148,53,1	script	KVM Officer#KVM01B	415,{
 // MapFlags
 //============================================================
 
-bat_c01	mapflag	battleground	2
-bat_c01	mapflag	nomemo
-bat_c01	mapflag	nosave	SavePoint
-bat_c01	mapflag	noteleport
-bat_c01	mapflag	nowarp
-bat_c01	mapflag	nowarpto
-bat_c01	mapflag	noreturn
-bat_c01	mapflag	nobranch
-bat_c01	mapflag	nopenalty
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index 063f34ba6..11a1c3d47 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -60,23 +60,23 @@ OnKvM02Two:
 	end;
 }
 
-bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	111
-bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	111
-bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	111
-bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	111
-bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	111
-bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	111
-bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	111
+bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	139
+bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	139
+bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	139
+bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	139
+bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	139
+bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	139
+bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	139
 
-bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	111
-bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	111
-bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	111
-bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	111
-bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	111
-bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	111
-bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	111
+bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	139
+bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	139
+bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	139
+bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	139
+bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	139
+bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	139
+bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	139
 
-bat_c02,54,128,3	script	#A_camp_start02	111,4,4,{
+bat_c02,54,128,3	script	#A_camp_start02	139,4,4,{
 	end;
 
 OnInit:
@@ -97,7 +97,7 @@ OnTouch:
 	end;
 }
 
-bat_c02,146,56,3	script	#B_camp_start02	111,4,4,{
+bat_c02,146,56,3	script	#B_camp_start02	139,4,4,{
 	end;
 
 OnInit:
@@ -146,6 +146,10 @@ OnGuillaumeDie:
 		set .Croix_Score, .Croix_Score + 1;
 		bg_updatescore "bat_c02",.Guillaume_Score,.Croix_Score;
 		if( .Guillaume_Count < 1 ) donpcevent "KvM02_BG::OnCroixWin";
+		else {
+			mapannounce "bat_c02", "NUmber of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
+			mapannounce "bat_c02", "NUmber of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
+		}
 	}
 	end;
 
@@ -158,6 +162,10 @@ OnCroixDie:
 		set .Guillaume_Score, .Guillaume_Score + 1;
 		bg_updatescore "bat_c02",.Guillaume_Score,.Croix_Score;
 		if( .Croix_Count < 1 ) donpcevent "KvM02_BG::OnGuillaumeWin";
+		else {
+			mapannounce "bat_c02", "NUmber of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
+			mapannounce "bat_c02", "NUmber of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
+		}
 	}
 	end;
 
@@ -423,12 +431,3 @@ bat_c02,148,53,1	script	KVM Officer#KVM02B	415,{
 // MapFlags
 //============================================================
 
-bat_c02	mapflag	battleground	2
-bat_c02	mapflag	nomemo
-bat_c02	mapflag	nosave	SavePoint
-bat_c02	mapflag	noteleport
-bat_c02	mapflag	nowarp
-bat_c02	mapflag	nowarpto
-bat_c02	mapflag	noreturn
-bat_c02	mapflag	nobranch
-bat_c02	mapflag	nopenalty
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index 245fefc7d..ab30a6708 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -60,23 +60,23 @@ OnKvM03Two:
 	end;
 }
 
-bat_c03,54,124,3	duplicate(CellEffect3)	#RedcellA1-3	111
-bat_c03,55,124,3	duplicate(CellEffect3)	#RedcellA2-3	111
-bat_c03,56,124,3	duplicate(CellEffect3)	#RedcellA3-3	111
-bat_c03,57,124,3	duplicate(CellEffect3)	#RedcellA4-3	111
-bat_c03,57,125,3	duplicate(CellEffect3)	#RedcellA5-3	111
-bat_c03,57,126,3	duplicate(CellEffect3)	#RedcellA6-3	111
-bat_c03,57,127,3	duplicate(CellEffect3)	#RedcellA7-3	111
+bat_c03,54,124,3	duplicate(CellEffect3)	#RedcellA1-3	139
+bat_c03,55,124,3	duplicate(CellEffect3)	#RedcellA2-3	139
+bat_c03,56,124,3	duplicate(CellEffect3)	#RedcellA3-3	139
+bat_c03,57,124,3	duplicate(CellEffect3)	#RedcellA4-3	139
+bat_c03,57,125,3	duplicate(CellEffect3)	#RedcellA5-3	139
+bat_c03,57,126,3	duplicate(CellEffect3)	#RedcellA6-3	139
+bat_c03,57,127,3	duplicate(CellEffect3)	#RedcellA7-3	139
 
-bat_c03,145,59,3	duplicate(CellEffect3)	#RedcellB1-3	111
-bat_c03,144,59,3	duplicate(CellEffect3)	#RedcellB2-3	111
-bat_c03,143,59,3	duplicate(CellEffect3)	#RedcellB3-3	111
-bat_c03,142,59,3	duplicate(CellEffect3)	#RedcellB4-3	111
-bat_c03,142,56,3	duplicate(CellEffect3)	#RedcellB5-3	111
-bat_c03,142,57,3	duplicate(CellEffect3)	#RedcellB6-3	111
-bat_c03,142,58,3	duplicate(CellEffect3)	#RedcellB7-3	111
+bat_c03,145,59,3	duplicate(CellEffect3)	#RedcellB1-3	139
+bat_c03,144,59,3	duplicate(CellEffect3)	#RedcellB2-3	139
+bat_c03,143,59,3	duplicate(CellEffect3)	#RedcellB3-3	139
+bat_c03,142,59,3	duplicate(CellEffect3)	#RedcellB4-3	139
+bat_c03,142,56,3	duplicate(CellEffect3)	#RedcellB5-3	139
+bat_c03,142,57,3	duplicate(CellEffect3)	#RedcellB6-3	139
+bat_c03,142,58,3	duplicate(CellEffect3)	#RedcellB7-3	139
 
-bat_c03,54,128,3	script	#A_camp_start03	111,4,4,{
+bat_c03,54,128,3	script	#A_camp_start03	139,4,4,{
 	end;
 
 OnInit:
@@ -97,7 +97,7 @@ OnTouch:
 	end;
 }
 
-bat_c03,146,56,3	script	#B_camp_start03	111,4,4,{
+bat_c03,146,56,3	script	#B_camp_start03	139,4,4,{
 	end;
 
 OnInit:
@@ -146,6 +146,10 @@ OnGuillaumeDie:
 		set .Croix_Score, .Croix_Score + 1;
 		bg_updatescore "bat_c03",.Guillaume_Score,.Croix_Score;
 		if( .Guillaume_Count < 1 ) donpcevent "KvM03_BG::OnCroixWin";
+		else {
+			mapannounce "bat_c03", "NUmber of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
+			mapannounce "bat_c03", "NUmber of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
+		}
 	}
 	end;
 
@@ -158,6 +162,10 @@ OnCroixDie:
 		set .Guillaume_Score, .Guillaume_Score + 1;
 		bg_updatescore "bat_c03",.Guillaume_Score,.Croix_Score;
 		if( .Croix_Count < 1 ) donpcevent "KvM03_BG::OnGuillaumeWin";
+		else {
+			mapannounce "bat_c03", "NUmber of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
+			mapannounce "bat_c03", "NUmber of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
+		}
 	}
 	end;
 
@@ -425,12 +433,3 @@ bat_c03,148,53,1	script	KVM Officer#KVM03B	415,{
 // MapFlags
 //============================================================
 
-bat_c03	mapflag	battleground	2
-bat_c03	mapflag	nomemo
-bat_c03	mapflag	nosave	SavePoint
-bat_c03	mapflag	noteleport
-bat_c03	mapflag	nowarp
-bat_c03	mapflag	nowarpto
-bat_c03	mapflag	noreturn
-bat_c03	mapflag	nobranch
-bat_c03	mapflag	nopenalty
diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt
index 544438534..c6d50e87a 100644
--- a/npc/battleground/kvm/kvm_enter.txt
+++ b/npc/battleground/kvm/kvm_enter.txt
@@ -17,14 +17,22 @@
 // KvM Officer - Guillaume
 //============================================================
 bat_room,164,178,5	script	KVM Mercenary Officer#1	418,{
-	set .@permit,checkquest(6026,PLAYTIME);
+	/*
+	set .@kvm,checkquest(6027,PLAYTIME);
+	if ((.@kvm == 0) || (.@kvm == 1)) {
+		mes "[Croix Mercenary Officer]";
+		mes "It seems you ahve recently participated in a KVM battle. You must wait 5 minutes before signing up again.";
+		close;
+	}
+	*/
+	set .@permit,checkquest(6025,PLAYTIME);
 	if ((.@permit == 0) || (.@permit == 1)) {
 		mes "[Guillaume Mercenary Officer]";
 		mes "I know that you've already signed with the Croix. Go back and join their team. We will not accept traitors to fight for us.";
 		close;
 	}
 	else {
-		if (checkquest(6025) >= 0) erasequest 6026;
+		if (checkquest(6025) >= 0) erasequest 6025;
 	}
 	mes "[Guillaume Mercenary Officer]";
 	mes "Let them know the real might of Guillaume!";
@@ -115,6 +123,14 @@ bat_room,167,178,5	script	Guillaume Knight#kvm	417,{
 // KvM Officer - Croix
 //============================================================
 bat_room,164,121,1	script	KVM Mercenary Officer#2	414,{
+	/*
+	set .@kvm,checkquest(6027,PLAYTIME);
+	if ((.@kvm == 0) || (.@kvm == 1)) {
+		mes "[Croix Mercenary Officer]";
+		mes "It seems you ahve recently participated in a KVM battle. You must wait 5 minutes before signing up again.";
+		close;
+	}
+	*/
 	set .@permit,checkquest(6025,PLAYTIME);
 	if ((.@permit == 0) || (.@permit == 1)) {
 		mes "[Croix Mercenary Officer]";