Make the swallow progress idly decrease

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 15e91bd48fcf89d75bced6a0c78eb8b3496f128e..519a65b3047b59cda17394ee6df1d6762ddcf116 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -187,6 +187,8 @@ set g_balance_grabber_reload_time 2
 // {{{ stomach\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
 // {{{ stomach\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 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/vore.qc b/data/qcsrc/server/vore.qc
index dba7ca3233d70fbf078c9c731a412b213880abb0..6c787ca3fa5ab3f6d222aedcea7f38fd7d1530e5 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -249,7 +249,7 @@ void Vore_Swallow(entity e)
 \r
 void Vore_SwallowStep(entity e)\r
 {\r
 \r
 void Vore_SwallowStep(entity e)\r
 {\r

-       if(!cvar("g_balance_vore_swallow_speed"))\r
+       if(!cvar("g_balance_vore_swallow_speed_fill"))\r

        {\r
                Vore_Swallow(e);\r
                return;\r
        {\r
                Vore_Swallow(e);\r
                return;\r


@@ -257,7 +257,7 @@ void Vore_SwallowStep(entity e)
 \r
        // increase the progress value until it reaches 1, then swallow the player\r
        if(e.swallow_progress_prey < 1)\r
 \r
        // increase the progress value until it reaches 1, then swallow the player\r
        if(e.swallow_progress_prey < 1)\r

-               e.swallow_progress_prey += cvar("g_balance_vore_swallow_speed") * frametime;\r
+               e.swallow_progress_prey += cvar("g_balance_vore_swallow_speed_fill") * frametime;\r

        else\r
        {\r
                Vore_Swallow(e);\r
        else\r
        {\r
                Vore_Swallow(e);\r


@@ -636,6 +636,20 @@ void Vore()
                }\r
        }\r
 \r
                }\r
        }\r
 \r

+       // the swallow progress of prey and preds idly decrease by this amount\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

        // apply delays and skip the vore system under some circumstances\r
        if(time < game_starttime || (time < warmup && !inWarmupStage)) // don't allow vore before a round begins\r
        {\r
        // apply delays and skip the vore system under some circumstances\r
        if(time < game_starttime || (time < warmup && !inWarmupStage)) // don't allow vore before a round begins\r
        {\r