Balance the swallow progress movement cutting factor, and do some small tweaks

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 8522aeddffd007c24a0708fe6da0c19607585eff..e2e1a22647e83c3e974e452b228631a255c82019 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -188,8 +188,8 @@ set g_balance_grabber_reload_time 2
 set g_balance_vore_swallow_range 100 "distance below which you can swallow another player when facing them"\r
 set g_balance_vore_swallow_limit 3 "how many players can fit in the stomach at a time, may range between 1 and 9"\r
 set g_balance_vore_swallow_speed_fill 2 "how long it takes to swallow a player, 0 is instant"\r
 set g_balance_vore_swallow_range 100 "distance below which you can swallow another player when facing them"\r
 set g_balance_vore_swallow_limit 3 "how many players can fit in the stomach at a time, may range between 1 and 9"\r
 set g_balance_vore_swallow_speed_fill 2 "how long it takes to swallow a player, 0 is instant"\r

-set g_balance_vore_swallow_speed_decrease 0.5 "how fast the swallow progress decreases, when the predator is no longer swallowing"\r
-set g_balance_vore_swallow_speed_cutspd 1 "if enabled, prey walks slower the closer they are to being swallowed"\r
+set g_balance_vore_swallow_speed_decrease 0.25 "how fast the swallow progress decreases, when the predator is no longer swallowing"\r
+set g_balance_vore_swallow_speed_cutspd 0.5 "prey movement slows down by this amount the closer they are to being swallowed"\r

 set g_balance_vore_swallow_speed 1 "how long it takes to swallow a player"\r
 set g_balance_vore_swallow_stealprey 0.7 "probability of stealing someone's prey when eating them (when true their prey joins your stomach rather than popping out). 0 = never, 1 = always"\r
 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_speed 1 "how long it takes to swallow a player"\r
 set g_balance_vore_swallow_stealprey 0.7 "probability of stealing someone's prey when eating them (when true their prey joins your stomach rather than popping out). 0 = never, 1 = always"\r
 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

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 3118cdb556a3899e8fcbec2fb964f704ece45ec0..36c5f0b14e1d0c5070a74a4a2b7002f5bb0f69e3 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -825,7 +825,7 @@ void SV_PlayerPhysics()
        if(cvar("g_balance_vore_weight_gravity") > 0)\r
                maxspd_mod *= 1 - bound(0, self.stomach_load * cvar("g_balance_vore_weight_speed"), 1); // apply stomach weight\r
        if(self.swallow_progress_prey && cvar("g_balance_vore_swallow_speed_cutspd"))\r
        if(cvar("g_balance_vore_weight_gravity") > 0)\r
                maxspd_mod *= 1 - bound(0, self.stomach_load * cvar("g_balance_vore_weight_speed"), 1); // apply stomach weight\r
        if(self.swallow_progress_prey && cvar("g_balance_vore_swallow_speed_cutspd"))\r

-               maxspd_mod *= 1 - self.swallow_progress_prey; // cut speed based on swallow progress\r
+               maxspd_mod *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd")); // cut speed based on swallow progress\r

        swampspd_mod = 1;\r
 \r
        // if dead, behave differently\r
        swampspd_mod = 1;\r
 \r
        // if dead, behave differently\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 6c787ca3fa5ab3f6d222aedcea7f38fd7d1530e5..d0abeb65659279c267c1929c83d68cf66e4500d9 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -637,17 +637,20 @@ void Vore()
        }\r
 \r
        // the swallow progress of prey and preds idly decrease by this amount\r
        }\r
 \r
        // the swallow progress of prey and preds idly decrease by this amount\r

-       if(self.swallow_progress_pred)\r
+       if(cvar("g_balance_vore_swallow_speed_decrease"))\r

        {\r
        {\r

-               self.swallow_progress_pred -= cvar("g_balance_vore_swallow_speed_decrease") * frametime;\r
-               if(self.swallow_progress_pred < 0)\r
-                       self.swallow_progress_pred = 0;\r
-       }\r
-       if(self.swallow_progress_prey)\r
-       {\r
-               self.swallow_progress_prey -= cvar("g_balance_vore_swallow_speed_decrease") * frametime;\r
-               if(self.swallow_progress_prey < 0)\r
-                       self.swallow_progress_prey = 0;\r
+               if(self.swallow_progress_pred)\r
+               {\r
+                       self.swallow_progress_pred -= cvar("g_balance_vore_swallow_speed_decrease") * frametime;\r
+                       if(self.swallow_progress_pred < 0)\r
+                               self.swallow_progress_pred = 0;\r
+               }\r
+               if(self.swallow_progress_prey)\r
+               {\r
+                       self.swallow_progress_prey -= cvar("g_balance_vore_swallow_speed_decrease") * frametime;\r
+                       if(self.swallow_progress_prey < 0)\r
+                               self.swallow_progress_prey = 0;\r
+               }\r

        }\r
 \r
        // apply delays and skip the vore system under some circumstances\r
        }\r
 \r
        // apply delays and skip the vore system under some circumstances\r