From b231cb3da9ba4533470172549683ca42e61dcc99 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 2 Aug 2011 16:58:30 +0300 Subject: [PATCH] Don't make shrinking dead players part of the vore function (only when digested). Dead players will always shrink if eg: Damaging their dead body on the ground, or digesting them like before. --- data/defaultVT.cfg | 3 ++- data/qcsrc/server/cl_client.qc | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index d59cd9fa..40633f0b 100644 --- a/data/defaultVT.cfg +++ b/data/defaultVT.cfg @@ -1609,12 +1609,13 @@ set g_healthsize 1 "Players shrink and grow based on health, by this amount" set g_healthsize_center 100 "Health at which the player has the default size" set g_healthsize_min 50 "Player size may not drop below this amount of health" set g_healthsize_max 150 "Player size may not grow past this amount of health" +set g_healthsize_death 0.25 "Dead players are further shrunken by this amount" +set g_healthsize_death_min -100 "Health at which dead players stop being shrunken" set g_healthsize_movementfactor 0.5 "Amount by which player size affects jumping and running" set g_healthsize_soundfactor 0.5 "The sounds players make are amplified or reduced by this amount based on their size" set g_healthsize_exteriorweapon_scalefactor 1 "Amount by which player size resizes the exterior weapon model" set g_healthsize_weapon_scalefactor 1 "Amount by which player size resizes the view weapon model" set g_healthsize_weapon_scalefactor_pos 10 "Amount by which the view model is moved vertically based on player size" -set g_healthsize_vore_shrinkdeadprey 0.25 "Dead prey will be shrunken by this amount, the closer it gets to the digestion limit" // part of an ugly hack for the menu audio sliders to work with the cutsound feature seta menu_volume 1 diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index f426043f..0f144e81 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -2317,9 +2317,6 @@ void SetPlayerSize() { if(!cvar("g_healthsize")) return; - // don't scale dead players who aren't prey - if(!self.stat_eaten && self.deadflag != DEAD_NO) - return; // change player scale based on the amount of health we have self.scale = pow(bound(cvar("g_healthsize_min"), self.health, cvar("g_healthsize_max")) / cvar("g_healthsize_center"), cvar("g_healthsize")); @@ -2341,11 +2338,10 @@ void SetPlayerSize() self.view_ofs = PL_VIEW_OFS * self.scale; } - if(cvar("g_healthsize_vore_shrinkdeadprey") && cvar("g_balance_vore_digestion_limit") < 0) - if(self.deadflag != DEAD_NO && self.stat_eaten) + if(cvar("g_healthsize_death") && self.deadflag != DEAD_NO) { - // dead prey must shrink toward zero as they digest, until they reach digestion limit - self.scale *= 1 - bound(0, (self.health / cvar("g_balance_vore_digestion_limit")) * cvar("g_healthsize_vore_shrinkdeadprey"), 1); + // dead players shrink to zero as they head toward the health limit + self.scale *= 1 - bound(0, (self.health / cvar("g_healthsize_death_min")) * cvar("g_healthsize_death"), 1); } if(self.scale < 0.1) -- 2.39.2