From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 10 Jul 2011 23:53:12 +0000 (+0300)
Subject: Require re-pressing the stomach kick key by default
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=c096eccb4414934a5c99f69550591f772ed6e6b4;ds=sidebyside

Require re-pressing the stomach kick key by default
---

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index a81ad7e9..99cf11b4 100644
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -216,6 +216,7 @@ set g_balance_vore_kick_damage_min 30 "minimum amount of damage you can do with
 set g_balance_vore_kick_damage_max 45 "maximum amount of damage you can do with a stomach kick"
 set g_balance_vore_kick_delay 0.6 "how many seconds must pass before you can perform another stomach kick"
 set g_balance_vore_kick_force 420 "predators are pushed by this amount when stomach kicked, in the direction their prey is facing"
+set g_balance_vore_kick_repress 1 "require pressing the fire key each kick rather than holding it down"
 set g_balance_vore_kick_scalediff 1 "if enabled, the damage / force of stomach kicks is affected by the size of the prey compared to the size of the predator"
 set g_balance_vore_kick_predator_punchangle 6 "your view gets tilted by this amount when receiving stomach kicks"
 set g_balance_vore_kick_prey_punchangle 6 "your view gets tilted by this amount when dealing stomach kicks"
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 9a3d9412..531f95d0 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -518,11 +518,12 @@ void Vore_Teamheal()
 	}
 }
 
+.float kick_pressed;
 void Vore_StomachKick()
 {
 	// allows prey to kick the predator's stomach and do some damage or attempt to escape
 
-	if(time > self.stomachkick_delay)
+	if(time > self.stomachkick_delay && !self.kick_pressed)
 	{
 		float damage;
 		vector force;
@@ -546,6 +547,8 @@ void Vore_StomachKick()
 			self.predator.regurgitate_prepare = 0;
 
 		self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay");
+		if(cvar("g_balance_vore_kick_repress"))
+			self.kick_pressed = TRUE;
 	}
 }
 
@@ -847,8 +850,13 @@ void Vore()
 		Vore_Teamheal();
 
 	// execute prey commands
-	if(self.BUTTON_ATCK && cvar("g_vore_kick"))
-		Vore_StomachKick();
+	if(self.BUTTON_ATCK)
+	{
+		if(cvar("g_vore_kick"))
+			Vore_StomachKick();
+	}
+	else
+		self.kick_pressed = FALSE;
 	if(self.BUTTON_JUMP)
 		Vore_StomachLeave();