* 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

1 files changed, 24 insertions, 25 deletions

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