Don't have a min and max value on the damage stomach kicks can do. Also make bots...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 0dd5593af3eea85d4f443ca18fac033ef2f83048..36af6d890214378cc04ff9f9e22ed8bbb6834f5e 100644 (file)
--- 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\r
 set g_balance_grabber_secondary_refire 1.1\r
 set g_balance_grabber_secondary_animtime 1 // good melee anim\r
-set g_balance_grabber_secondary_damage 70\r
+set g_balance_grabber_secondary_damage 65\r
 set g_balance_grabber_secondary_force 250\r
 set g_balance_grabber_secondary_radius 150\r
 set g_balance_grabber_secondary_recoil 5\r
@@ -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)"\r
 set g_balance_vore_weight_gravity 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"\r
 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"\r
-set g_balance_vore_kick_damage_min 25 "minimum amount of damage you can do with a stomach kick"\r
-set g_balance_vore_kick_damage_max 40 "maximum amount of damage you can do with a stomach kick"\r
+set g_balance_vore_kick_damage 35 "amount of damage you can do during stomach kick"\r
 set g_balance_vore_kick_delay 0.6 "how many seconds must pass before you can perform another stomach kick"\r
 set g_balance_vore_kick_force 420 "predators are pushed by this amount when stomach kicked, in the direction their prey is facing"\r
 set g_balance_vore_kick_repress 0 "require pressing the fire key each kick rather than holding it down"\r

diff --git a/data/qcsrc/server/bot/havocbot/vore_ai.qc b/data/qcsrc/server/bot/havocbot/vore_ai.qc
index 4543dc2cad26b585e036e451b94e63b903bcd92a..a468fd7f52dffd90d08c45c474f611bc5bfd216b 100644 (file)
--- 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 d33234013c65d5c86b3350872f193387a7459a2a..f6a3ebd7760f077f63a6051c6e1684c239a11f88 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -539,7 +539,7 @@ void Vore_StomachKick()
        {\r
                float damage, vol;\r
                vector force;\r
-               damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min"));\r
+               damage = cvar("g_balance_vore_kick_damage");\r
                force = v_forward * cvar("g_balance_vore_kick_force");\r
                vol = VOL_BASE;\r
 \r