* 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, 18 insertions, 2 deletions

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]";