From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 14 Jul 2011 14:08:39 +0000 (+0300)
Subject: Don't have a min and max value on the damage stomach kicks can do. Also make bots... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7264109c77479881da62a21ae148bddff1dd71cb;p=voretournament%2Fvoretournament.git

Don't have a min and max value on the damage stomach kicks can do. Also make bots need to be skill 5 or up in order to know when it's safe to regurgitate their prey.
---

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 0dd5593a..36af6d89 100644
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -176,7 +176,7 @@ set g_balance_grabber_primary_recoil 2.5
 set g_balance_grabber_secondary_ammo 15
 set g_balance_grabber_secondary_refire 1.1
 set g_balance_grabber_secondary_animtime 1 // good melee anim
-set g_balance_grabber_secondary_damage 70
+set g_balance_grabber_secondary_damage 65
 set g_balance_grabber_secondary_force 250
 set g_balance_grabber_secondary_radius 150
 set g_balance_grabber_secondary_recoil 5
@@ -214,8 +214,7 @@ set g_balance_vore_teamheal 1 "when enabled, having a team mate in your stomach
 set g_balance_vore_teamheal_stable 150 "maximum amount of health you can gain from a teamheal (best kept equal or less than g_balance_health_rotstable)"
 set g_balance_vore_weight_gravity 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"
 set g_balance_vore_weight_speed 0.15 "you get this slower the more you eat, at 0.5 each meal makes you two times slower"
-set g_balance_vore_kick_damage_min 25 "minimum amount of damage you can do with a stomach kick"
-set g_balance_vore_kick_damage_max 40 "maximum amount of damage you can do with a stomach kick"
+set g_balance_vore_kick_damage 35 "amount of damage you can do during 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 0 "require pressing the fire key each kick rather than holding it down"
diff --git a/data/qcsrc/server/bot/havocbot/vore_ai.qc b/data/qcsrc/server/bot/havocbot/vore_ai.qc
index 4543dc2c..a468fd7f 100644
--- a/data/qcsrc/server/bot/havocbot/vore_ai.qc
+++ b/data/qcsrc/server/bot/havocbot/vore_ai.qc
@@ -8,7 +8,7 @@ float Swallow_condition_check_bot(entity prey)
 	if(Swallow_condition_check(prey)) // check the normal conditions of the vore system
 	if(time >= prey.spawnshieldtime) // spawn shield means you are invincible
 	if not(prey.BUTTON_CHAT) // don't eat players who are chatting
-	if(self.health > cvar("g_balance_vore_kick_damage_max")) // explained below
+	if(self.health > cvar("g_balance_vore_kick_damage") && skill >= 5) // explained below
 		return TRUE;
 	return FALSE;
 }
@@ -174,10 +174,9 @@ void Vore_AI()
 
 		if(self.stomach_load && time > self.decide_pred)
 		{
-			// if the predator's health is smaller than the maximum damage a stomach kick can do, regurgitate the player(s)
+			// if the predator's health is smaller than the damage a stomach kick can do, regurgitate the player(s)
 			// otherwise the predator is putting himself at risk by keeping you inside
-			// TODO: make bots also know the amount of damage boost a melee attack can do
-			if(self.health <= cvar("g_balance_vore_kick_damage_max"))
+			if(self.health <= cvar("g_balance_vore_kick_damage") && skill >= 5) // such awareness comes from skill 5 and up
 				self.BUTTON_REGURGITATE = TRUE;
 
 			else if(!self.digesting && cvar("g_vore_digestion"))
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index d3323401..f6a3ebd7 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -539,7 +539,7 @@ void Vore_StomachKick()
 	{
 		float damage, vol;
 		vector force;
-		damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min"));
+		damage = cvar("g_balance_vore_kick_damage");
 		force = v_forward * cvar("g_balance_vore_kick_force");
 		vol = VOL_BASE;