Remove the stealprey feature. It's hard to test and maintain it, and I don't see...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index d92909c2bbb7d72414d349a9ed5e924cd9d60b6d..4e8572e457bea0ba98d64566fa6f2f9e4e2d9867 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -204,7 +204,6 @@ set g_balance_vore_swallow_speed_decrease 0.5 "how fast the swallow progress dec
 set g_balance_vore_swallow_speed_cutspd_prey 1 "prey movement slows down by this amount the closer they are to being swallowed"\r
 set g_balance_vore_swallow_speed_cutspd_pred 0.5 "predator movement slows down by this amount the closer they are to finishing 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_predator_punchangle 12 "your view gets tilted by this amount when swallowing someone"\r
 set g_balance_vore_swallow_predator_punchangle_item 6 "your view gets tilted by this amount when swallowing an item"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 678aa9015bd850ebf125972437b5ca570a0592af..5870a69430c305bafd5669b839154e39a7186f70 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -700,26 +700,8 @@ void Vore()
        // prevent this by checking if such has happened, and taking the proper measures\r
        // this code has a high priority and must not be stopped by any delay, so run it here\r
        if(self.predator.stat_eaten)\r
-       {\r
-               entity target_predator, target_predator_predator, oldself;\r
-               target_predator = self.predator;\r
-               target_predator_predator = self.predator.predator;\r
-\r
                Vore_Regurgitate(self);\r
 \r
-               // now steal our prey's prey if this probability applies\r
-               if(random() < cvar("g_balance_vore_swallow_stealprey"))\r
-               {\r
-                       oldself = self;\r
-                       self = target_predator_predator;\r
-                       if(Swallow_condition_check(oldself))\r
-                       if not(teams_matter && self.team == target_predator.team) // don't steal a team mate's prey\r
-                       if not(teams_matter && self.team == oldself.team) // if the prey we would be stealing is a team mate, don't do it\r
-                               Vore_Swallow(oldself);\r
-                       self = oldself;\r
-               }\r
-       }\r
-\r
        // the swallow progress of prey and preds idly decrease by this amount\r
        if(cvar("g_balance_vore_swallow_speed_decrease"))\r
        {\r