Rename some cvars

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index bcd266c5021a19a9f4859ddcebf7720c58d4a60c..ddb3f473309b012e6db489ee856fd68fa3065eaf 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -185,10 +185,10 @@ set g_balance_grabber_reload_time 2
 // }}}\r
 \r
 // {{{ stomach\r
-set g_balance_vore_load_capacity 100 "capacity percent a player's stomach has, influenced by player size"\r
-set g_balance_vore_load_mass 30 "prey mass, influenced by player size"\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_load_pred_capacity 100 "capacity percent a player's stomach has, influenced by player size"\r
+set g_balance_vore_load_pred_weight 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"\r
+set g_balance_vore_load_pred_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_load_prey_mass 30 "prey mass, influenced by player size"\r
 set g_balance_vore_swallow_range 140 "distance below which you can swallow another player when facing them"\r
 set g_balance_vore_swallow_speed_fill 2.5 "how long it takes to swallow a player, 0 is instant"\r
 set g_balance_vore_swallow_speed_fill_scalediff 0.5 "fill rate depends on predator size compared to prey size by this amount"\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c
index c32f4d90f551f44df4db60d5fc3c9eebf81be864..e6bf101b8833914c1a5da09b314215fa60830125 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c
@@ -45,7 +45,7 @@ string toStringVoretMutatorsDialog(entity me)
                s = strcat(s, ", Reverse scoring");\r
        if(cvar("g_balance_vore_digestion_damage") >= 1000)\r
                s = strcat(s, ", Instant digestion");\r
-       if(cvar("g_balance_vore_weight_gravity") < 0)\r
+       if(cvar("g_balance_vore_load_pred_weight") < 0)\r
                s = strcat(s, ", Lighten");\r
        if(s == "")\r
                return "None";\r
@@ -113,7 +113,7 @@ void fillVoretMutatorsDialog(entity me)
                setDependent(e, "g_vore_digestion", 1, 1);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(-0.25, 1, "g_balance_vore_weight_gravity", "Lighten")); // must contain default cvar value for off position\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(-0.25, 1, "g_balance_vore_load_pred_weight", "Lighten")); // must contain default cvar value for off position\r
 \r
        me.gotoRC(me, me.rows - 1, 0);\r
                me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));\r

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 7d916fd4030d4d3c071d35c45763c864c2972ba1..e3dbb61ab99903c10448a153220ceff425a17e65 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -507,8 +507,8 @@ void PM_Accelerate(vector wishdir, float wishspeed, float wishspeed0, float acce
        if(speedclamp)\r
                accelqw = -accelqw;\r
 \r
-       if(cvar("g_balance_vore_weight_gravity") > 0) // apply stomach weight\r
-               wishspeed *= 1 - bound(0, self.stomach_maxload / self.stomach_load * cvar("g_balance_vore_weight_speed"), 1);\r
+       if(cvar("g_balance_vore_load_pred_weight") > 0) // apply stomach weight\r
+               wishspeed *= 1 - bound(0, self.stomach_maxload / self.stomach_load * cvar("g_balance_vore_load_pred_speed"), 1);\r
        if(cvar("g_healthsize")) // if we are smaller or larger, we run slower or faster\r
                wishspeed *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; \r
        if(self.swallow_progress_prey) // cut speed based on swallow progress for prey\r

diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index 492fbf5c015934ea16c3e39e0b5fd953f256800e..05a793c91e989604bc97fb7ad1fc1016b10f83aa 100644 (file)
--- a/data/qcsrc/server/teamplay.qc
+++ b/data/qcsrc/server/teamplay.qc
@@ -492,7 +492,7 @@ void PrintWelcomeMessage(entity pl)
                modifications = strcat(modifications, ", Reverse scoring");\r
        if(cvar("g_balance_vore_digestion_damage") >= 1000)\r
                modifications = strcat(modifications, ", Instant digestion");\r
-       if(cvar("g_balance_vore_weight_gravity") < 0)\r
+       if(cvar("g_balance_vore_load_pred_weight") < 0)\r
                modifications = strcat(modifications, ", Lighten");\r
        modifications = substring(modifications, 2, strlen(modifications) - 2);\r
 \r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index a62036c05104ccb09a15ea5338783d94fa5d66e6..4fdb7ea4c344adc924f47aa2c2e5cbe7385724de 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -72,7 +72,7 @@ float Swallow_condition_check(entity prey)
 float Prey_Mass(entity prey)\r
 {\r
        float vore_mass;\r
-       vore_mass = cvar("g_balance_vore_load_mass");\r
+       vore_mass = cvar("g_balance_vore_load_prey_mass");\r
        if(cvar("g_healthsize"))\r
                vore_mass *= prey.scale;\r
        vore_mass = ceil(vore_mass);\r
@@ -191,7 +191,7 @@ void Vore_WeightApply(entity e)
        // slowing the player is done in cl_physics.qc\r
 \r
        if(e.stomach_load != e.vore_oldstomachload)\r
-               e.gravity += 1 + (e.stomach_maxload / e.stomach_load * cvar("g_balance_vore_weight_gravity") - e.vore_oldstomachload);\r
+               e.gravity += 1 + (e.stomach_maxload / e.stomach_load * cvar("g_balance_vore_load_pred_weight") - e.vore_oldstomachload);\r
        if(e.gravity == 0)\r
                e.gravity = 0.00001; // 0 becomes 1 for gravity, so do this to allow 0 gravity\r
        e.vore_oldstomachload = e.stomach_load;\r
@@ -795,7 +795,7 @@ void Vore()
        prey = Swallow_player_check();\r
 \r
        // set the predator's stomach capacity\r
-       self.stomach_maxload = cvar("g_balance_vore_load_capacity");\r
+       self.stomach_maxload = cvar("g_balance_vore_load_pred_capacity");\r
        if(cvar("g_healthsize"))\r
                self.stomach_maxload *= self.scale;\r
        self.stomach_maxload = ceil(self.stomach_maxload);\r