These two are balance cvars

diff --git a/data/balance.cfg b/data/balance.cfg
index b4420c1e89355f325111414d3c41d075275bd42d..91f9da0d9d19f01a2fb7b690c4603b95b457d7a1 100644 (file)
--- a/data/balance.cfg
+++ b/data/balance.cfg
@@ -182,6 +182,8 @@ set g_balance_grabber_secondary_radius 75
 set g_balance_vore_swallow_range 50 "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.5 "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.75 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates"\r
 set g_balance_vore_regurgitate_speedcap 1200 "when a predator is going faster than this, their prey is squeezed out of them"\r
 set g_balance_vore_regurgitate_force 500 "regurgitated players rocket out at this speed when released"\r
 set g_balance_vore_regurgitate_predatorforce 250 "players are pushed back by this amount when regurgitating someone"\r

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index c4cfaac82d27563406aeac6cb9df08a2b26ec92c..7d394e4a6cc154f0977b3c652171e3f443099c5e 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1502,8 +1502,6 @@ set g_vore_regurgitatecolor_release "0.875 1 0.375" "the color players will have
 set g_vore_regurgitatecolor_digest "0.125 0.25 0" "the color players will have when digested"\r
 set g_vore_gurglesound 1 "predators make an ambient gurgling sound"\r
 set g_vore_biggergut 1 "when enabled, a player can't swallow someone with more players in their stomach than them"\r
-set g_vore_stealprey 0.5 "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_vore_dropweapon 0.75 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates"\r
 set g_vore_showpreyhealth 1 "when enabled, a predator can see their prey's health on the stomach board, and prey can see the health of players he's joining in the stomach"\r
 set g_vore_soundocclusion 0.25 "directional player sounds are cut to this amount of their initial volume for eaten players (simulates hearing harder from the stomach)"\r
 \r

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index 26b50d44b85fc56797b51b60e97739df4e1fe990..740cc6a9ee6a6b5042843fcf20e1e63c19af77a5 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -750,7 +750,7 @@ void UpdateSelectedPlayer()
        {\r
                if(!self.dropweapon_check)\r
                if(self.predator.team != self.team) // don't disarm team mates when swallowing them\r
-               if(random() < cvar("g_vore_dropweapon"))\r
+               if(random() < cvar("g_balance_vore_swallow_dropweapon"))\r
                        SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);\r
                self.dropweapon_check = TRUE;\r
        }\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 218978834b9575bd7c1c84e1837a315e1d47f7f1..1c8b2d058f7ca659372d806063adf726ac719c38 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -335,7 +335,7 @@ void Vore()
                Vore_Regurgitate(self);\r
 \r
                // now steal our prey's prey if this probability applies\r
-               if(random() < cvar("g_vore_stealprey"))\r
+               if(random() < cvar("g_balance_vore_swallow_stealprey"))\r
                {\r
                        oldself = self;\r
                        self = target_predator_predator;\r