Fix more cvar comments

diff --git a/data/balance.cfg b/data/balance.cfg
index 26950ead27d17b690abf9d846f858e928f58685b..b1599b05f642893c86b62ae5a85b42afd4af413f 100644 (file)
--- a/data/balance.cfg
+++ b/data/balance.cfg
@@ -179,22 +179,22 @@ set g_balance_grabber_secondary_force 175
 set g_balance_grabber_secondary_radius 75\r
 // }}}\r
 // {{{ stomach\r
-set g_balance_vore_swallow_range 50 "distance at 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 states for player models"\r
-set g_balance_vore_swallow_delay 0.5 "how many seconds must pass before you can swallow someone, after having swallowed or regurgitated another player"\r
-set g_balance_vore_regurgitate_delay 0.135 "regurgitation delay"\r
-set g_balance_vore_regurgitate_velocitylimit 1200 "when a predator is going faster than this, the prey is squeezed out of them"\r
+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.5 "how many seconds must pass before you can swallow again, after swallowing or regurgitating another player"\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_eaterforce 250 "players are pushed by this amount when regurgitating someone"\r
+set g_balance_vore_regurgitate_predatorforce 250 "players are pushed back by this amount when regurgitating someone"\r
+set g_balance_vore_regurgitate_delay 0.135 "regurgitation delay"\r
 set g_balance_vore_digestion_damage 4 "amount of damage applied to victims during digestion"\r
-set g_balance_vore_digestion_vampire 1 "amount of health you gain from each enemy during digestion"\r
-set g_balance_vore_digestion_vampire_stable 150 "you stop gaining health past this point (best to keep equal or lower than g_balance_health_rotstable)"\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
 set g_balance_vore_teamheal 1 "when enabled, having a team mate in your stomach will keep healing them by this amount"\r
-set g_balance_vore_teamheal_stable 150 "maximum amount of health you can get from a teamheal"\r
+set g_balance_vore_teamheal_stable 150 "maximum amount of health you can gain from a teamheal (best kept equal or less than g_balance_health_rotstable)"\r
 set g_balance_vore_weight_gravity 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"\r
 set g_balance_vore_weight_speed 0.15 "you get this slower the more you eat, at 0.5 each meal makes you two times slower"\r
-set g_balance_vore_kick_damage_min 10 "minimum amount of damage you can do during a stomach kick"\r
-set g_balance_vore_kick_damage_max 30 "maximum amount of damage you can do during a stomach kick"\r
+set g_balance_vore_kick_damage_min 10 "minimum amount of damage you can do with a stomach kick"\r
+set g_balance_vore_kick_damage_max 30 "maximum amount of damage you can do with a stomach kick"\r
 set g_balance_vore_kick_delay 1 "how many seconds must pass before you can perform another stomach kick"\r
-set g_balance_vore_kick_escapeprobability 0.25 "probability to get regurgitated while performing scomach kicks (0 = never, 1 = always)"\r
+set g_balance_vore_kick_escapeprobability 0.25 "probability of getting regurgitated while performing stomach kicks (0 = never, 1 = always)"\r
 // }}}\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 00ba629bf9c38999b7b0e9fbf1b37c45b8741541..90c8472c580ec2710728379adef7d69f2ec8f93f 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -27,7 +27,7 @@ float Swallow_condition_check(entity prey)
        // checks the necessary conditions for swallowing another player\r
        if(prey.classname == "player" && prey.predator.classname != "player" && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach\r
        if(self.classname == "player" && self.predator.classname != "player" && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r
-       if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_velocitylimit"))\r
+       if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
        {\r
                if(self.stomach_load >= cvar("g_balance_vore_swallow_limit"))\r
                {\r
@@ -165,7 +165,7 @@ void Vore_Regurgitate(entity e)
        oldup = v_up;\r
        makevectors(e.predator.v_angle);\r
        e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force");\r
-       e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_eaterforce");\r
+       e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce");\r
        v_forward = oldforward;\r
        v_right = oldright;\r
        v_up = oldup;\r
@@ -403,7 +403,7 @@ void Vore()
                        self = oldself;\r
                }\r
        }\r
-       else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_velocitylimit"))\r
+       else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
                Vore_Regurgitate(self);\r
 \r
        // apply delayed regurgitating\r