Adjust some more cvars to the new system

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index ddb3f473309b012e6db489ee856fd68fa3065eaf..bcfe34910d86380a0b74eae7d83f661b0268f200 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -186,8 +186,9 @@ set g_balance_grabber_reload_time 2
 \r
 // {{{ stomach\r
 set g_balance_vore_load_pred_capacity 100 "capacity percent a player's stomach has, influenced by player size"\r
-set g_balance_vore_load_pred_weight 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"\r
-set g_balance_vore_load_pred_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_load_pred_weight 0.01 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"\r
+set g_balance_vore_load_pred_speed 0.0015 "you get this slower the more you eat, at 0.5 each meal makes you two times slower"\r
+set g_balance_vore_load_pred_speedcap 34 "when a predator is going faster than this, their prey is squeezed out of them, multiplied by stomach load"\r
 set g_balance_vore_load_prey_mass 30 "prey mass, influenced by player size"\r
 set g_balance_vore_swallow_range 140 "distance below which you can swallow another player when facing them"\r
 set g_balance_vore_swallow_speed_fill 2.5 "how long it takes to swallow a player, 0 is instant"\r
@@ -201,7 +202,6 @@ set g_balance_vore_swallow_stealprey 0.7 "probability of stealing someone's prey
 set g_balance_vore_swallow_dropweapon 0.6 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates"\r
 set g_balance_vore_swallow_punchangle 12 "your view gets tilted by this amount when swallowing someone"\r
 set g_balance_vore_regurgitate_damage 5 "predators take this amount of damage whenever regurgitating someone (influenced by player scale difference)"\r
-set g_balance_vore_regurgitate_speedcap 3400 "when a predator is going faster than this, their prey is squeezed out of them, multiplied by stomach load"\r
 set g_balance_vore_regurgitate_swallowprogress 0.5 "regurgitated prey is given this amount of swallow progress, to simulate being more vulnerable (if slow swallowing is enabled)"\r
 set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at this speed, in the direction the predator is facing"\r
 set g_balance_vore_regurgitate_predatorforce 450 "players are pushed back by this amount when regurgitating someone, opposite of the direction they are facing"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 4fdb7ea4c344adc924f47aa2c2e5cbe7385724de..a683fc659539230f30f258d5054e129360196b5c 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -40,7 +40,7 @@ float Swallow_condition_check(entity prey)
        if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach\r
        if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r
        if(!self.BUTTON_REGURGITATE && time > self.action_delay)\r
-       if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / (1 + self.stomach_load))\r
+       if not(vlen(self.velocity) > cvar("g_balance_vore_load_pred_speedcap") / (1 + self.stomach_load))\r
        {\r
                string swallow_complain;\r
                if(teams_matter && prey.team == self.team && !cvar("g_vore_teamvore"))\r
@@ -883,7 +883,7 @@ void Vore()
 \r
        if(self.predator.deadflag != DEAD_NO)\r
                Vore_Regurgitate(self);\r
-       else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / (1 + self.predator.stomach_load))\r
+       else if(vlen(self.predator.velocity) > cvar("g_balance_vore_load_pred_speedcap") / (1 + self.predator.stomach_load))\r
                Vore_Regurgitate(self);\r
 \r
        // apply delayed regurgitating if it was scheduled\r