From: MirceaKitsune Date: Mon, 18 Jul 2011 10:57:29 +0000 (+0300) Subject: Rename some cvars X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75921c800e344d6d45dd9b4bca0b68472dfa2c10;p=voretournament%2Fvoretournament.git Rename some cvars --- diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index bcd266c5..ddb3f473 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -185,10 +185,10 @@ set g_balance_grabber_reload_time 2 // }}} // {{{ stomach -set g_balance_vore_load_capacity 100 "capacity percent a player's stomach has, influenced by player size" -set g_balance_vore_load_mass 30 "prey mass, influenced by player size" -set g_balance_vore_weight_gravity 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier" -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" +set g_balance_vore_load_pred_capacity 100 "capacity percent a player's stomach has, influenced by player size" +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" +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" +set g_balance_vore_load_prey_mass 30 "prey mass, influenced by player size" set g_balance_vore_swallow_range 140 "distance below which you can swallow another player when facing them" set g_balance_vore_swallow_speed_fill 2.5 "how long it takes to swallow a player, 0 is instant" set g_balance_vore_swallow_speed_fill_scalediff 0.5 "fill rate depends on predator size compared to prey size by this amount" diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c index c32f4d90..e6bf101b 100644 --- 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"); if(cvar("g_balance_vore_digestion_damage") >= 1000) s = strcat(s, ", Instant digestion"); - if(cvar("g_balance_vore_weight_gravity") < 0) + if(cvar("g_balance_vore_load_pred_weight") < 0) s = strcat(s, ", Lighten"); if(s == "") return "None"; @@ -113,7 +113,7 @@ void fillVoretMutatorsDialog(entity me) setDependent(e, "g_vore_digestion", 1, 1); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 2, e = makeVoretCheckBoxEx(-0.25, 1, "g_balance_vore_weight_gravity", "Lighten")); // must contain default cvar value for off position + 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 me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0')); diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc index 7d916fd4..e3dbb61a 100644 --- 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) accelqw = -accelqw; - if(cvar("g_balance_vore_weight_gravity") > 0) // apply stomach weight - wishspeed *= 1 - bound(0, self.stomach_maxload / self.stomach_load * cvar("g_balance_vore_weight_speed"), 1); + if(cvar("g_balance_vore_load_pred_weight") > 0) // apply stomach weight + wishspeed *= 1 - bound(0, self.stomach_maxload / self.stomach_load * cvar("g_balance_vore_load_pred_speed"), 1); if(cvar("g_healthsize")) // if we are smaller or larger, we run slower or faster wishspeed *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; if(self.swallow_progress_prey) // cut speed based on swallow progress for prey diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index 492fbf5c..05a793c9 100644 --- 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"); if(cvar("g_balance_vore_digestion_damage") >= 1000) modifications = strcat(modifications, ", Instant digestion"); - if(cvar("g_balance_vore_weight_gravity") < 0) + if(cvar("g_balance_vore_load_pred_weight") < 0) modifications = strcat(modifications, ", Lighten"); modifications = substring(modifications, 2, strlen(modifications) - 2); diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index a62036c0..4fdb7ea4 100644 --- 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) { float vore_mass; - vore_mass = cvar("g_balance_vore_load_mass"); + vore_mass = cvar("g_balance_vore_load_prey_mass"); if(cvar("g_healthsize")) vore_mass *= prey.scale; vore_mass = ceil(vore_mass); @@ -191,7 +191,7 @@ void Vore_WeightApply(entity e) // slowing the player is done in cl_physics.qc if(e.stomach_load != e.vore_oldstomachload) - e.gravity += 1 + (e.stomach_maxload / e.stomach_load * cvar("g_balance_vore_weight_gravity") - e.vore_oldstomachload); + e.gravity += 1 + (e.stomach_maxload / e.stomach_load * cvar("g_balance_vore_load_pred_weight") - e.vore_oldstomachload); if(e.gravity == 0) e.gravity = 0.00001; // 0 becomes 1 for gravity, so do this to allow 0 gravity e.vore_oldstomachload = e.stomach_load; @@ -795,7 +795,7 @@ void Vore() prey = Swallow_player_check(); // set the predator's stomach capacity - self.stomach_maxload = cvar("g_balance_vore_load_capacity"); + self.stomach_maxload = cvar("g_balance_vore_load_pred_capacity"); if(cvar("g_healthsize")) self.stomach_maxload *= self.scale; self.stomach_maxload = ceil(self.stomach_maxload);