Change th swallow_delay cvar to also affect regurgitating. The system is now called...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 25d493e6e72f2678ce7189d45fd17e3f1cfdf0d5..2b0142a4706f99669ba5917e398c0ef40e554f30 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -187,7 +187,6 @@ 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 inside a stomach (should not be greater than 3 due to the number of stomach state models for players)"\r
-set g_balance_vore_swallow_delay 0.8 "how many seconds must pass before you can swallow again, after swallowing or regurgitating another 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_punchangle 12 "your view gets tilted by this amount when swallowing someone"\r
@@ -196,6 +195,7 @@ set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at thi
 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
 set g_balance_vore_regurgitate_delay 0.135 "regurgitation delay"\r
 set g_balance_vore_regurgitate_punchangle 12 "your view gets tilted by this amount when regurgitating someone"\r
+set g_balance_vore_action_delay 0.8 "how many seconds must pass before you can swallow or regurgitate again, after swallowing or regurgitating another player"\r
 set g_balance_vore_digestion_damage 5 "amount of damage applied to victims during digestion"\r
 set g_balance_vore_digestion_vampire 1 "amount of health you gain from digestion"\r
 set g_balance_vore_digestion_vampire_stable 150 "maximum amount of health you can gain from digestion (best kept equal or less than g_balance_health_rotstable)"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 4dfe4a3f35b7dbed8a5abcf469a62e6a03351f8d..7dd8017661d3a70b5aec4da5f932d2f35b5c0c0b 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -1,5 +1,5 @@
 .float regurgitate_prepare;\r
-.float stomachkick_delay, system_delay, swallow_delay, digest_button_delay_time, regurgitate_button_delay_time;\r
+.float stomachkick_delay, system_delay, action_delay, digest_button_delay_time, regurgitate_button_delay_time;\r
 .float complain_vore;\r
 .float vore_oldmovetype, vore_oldsolid, vore_oldstomachload;\r
 \r
@@ -35,7 +35,7 @@ float Swallow_condition_check(entity prey)
        if(prey != self)\r
        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 && self.swallow_delay < time)\r
+       if(!self.BUTTON_REGURGITATE && self.action_delay < time)\r
        if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
        {\r
                string swallow_complain;\r
@@ -194,7 +194,7 @@ void Vore_Swallow(entity e)
 \r
        // block firing for a small amount of time, or we'll be firing the next frame after we swallow\r
        e.predator.weapon_delay = time + button_delay_time;\r
-       e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
+       e.predator.action_delay = time + cvar("g_balance_vore_action_delay");\r
        e.system_delay = e.predator.system_delay = time + system_delay_time;\r
        e.stomachkick_delay = time + cvar("g_balance_vore_kick_delay"); // don't kick immediately after being swallowed\r
 }\r
@@ -229,7 +229,7 @@ void Vore_Regurgitate(entity e)
        e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\r
        e.predator.stomach_load -= 1;\r
        e.predator.regurgitate_prepare = 0;\r
-       e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
+       e.predator.action_delay = time + cvar("g_balance_vore_action_delay");\r
        Vore_WeightApply(e.predator);\r
 \r
        // block firing for a small amount of time, or we'll be firing the next frame\r
@@ -434,12 +434,10 @@ void Vore_AutoTaunt()
 \r
 void Vore_SetSbarRings()\r
 {\r
-       float min_time;\r
-       if(self.swallow_delay > time)\r
+       if(self.action_delay > time)\r
        {\r
-               self.stat_sbring1_type = 1; // ring shows vore system delay\r
-               min_time = self.swallow_delay - cvar("g_balance_vore_swallow_delay");\r
-               self.stat_sbring1_clip = bound(0, (time / self.swallow_delay - 1) / (min_time / self.swallow_delay - 1), 1);\r
+               self.stat_sbring1_type = 1; // ring shows vore action delay\r
+               self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);\r
        }\r
        else\r
        {\r
@@ -624,6 +622,7 @@ void Vore()
 \r
        // apply delayed regurgitating if it was scheduled\r
        if(self.predator.regurgitate_prepare && time > self.predator.regurgitate_prepare)\r
+       if(time > self.predator.action_delay)\r
        {\r
                self.predator.regurgitate_prepare = 0;\r
                self.predator.complain_vore = time + complain_delay_time; // prevent complaining the next frame if this empties our stomach\r