Implement full digest feature. When enabled, the pred doesn't spit the prey's dead...

[voretournament/voretournament.git] / data / qcsrc / server / cl_client.qc

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index b664ba357af3538b2ab39825734b7dd0d4266fdf..3ec0cddf5c4e0b37283600a961c4d1c7e1e79deb 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -516,13 +516,13 @@ float Client_customizeentityforclient()
        if(other.cvar_chase_active > 0 || other.classname == "observer") // the classname check prevents a bug\r
        {\r
                Client_setmodel(setmodel_state());\r
-               if not(self.predator.classname == "player")\r
+               if not(self.predator.classname == "player" || self.fakepredator.classname == "player")\r
                        self.alpha = default_player_alpha;\r
                return TRUE;\r
        }\r
        if(other.spectatee_status)\r
                other = other.enemy; // also do this for the player we are spectating\r
-       if(other.predator == self)\r
+       if(other.predator == self || other.fakepredator == self)\r
        {\r
                applymodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
                Client_setmodel(applymodel);\r
@@ -530,7 +530,7 @@ float Client_customizeentityforclient()
                return TRUE;\r
        }\r
        Client_setmodel(setmodel_state());\r
-       if not(self.predator.classname == "player")\r
+       if not(self.predator.classname == "player" || self.fakepredator.classname == "player")\r
                self.alpha = default_player_alpha;\r
        return TRUE;\r
 }\r
@@ -604,7 +604,8 @@ void PutObserverInServer (void)
        self.armorvalue = cvar("g_balance_armor_start");\r
        self.pauserotarmor_finished = 0;\r
        self.pauserothealth_finished = 0;\r
-       self.pauseregen_finished = 0;\r
+       self.pauseregenhealth_finished = 0;\r
+       self.pauseregenarmor_finished = 0;\r
        self.damageforcescale = 0;\r
        self.death_time = 0;\r
        self.dead_frame = 0;\r
@@ -827,6 +828,8 @@ void PutClientInServer (void)
 \r
                RemoveGrabber(self); // Wazat's Grabber\r
 \r
+               Vore_DeadPrey_Detach(self);\r
+\r
                self.classname = "player";\r
                self.wasplayer = TRUE;\r
                self.iscreature = TRUE;\r
@@ -835,20 +838,11 @@ void PutClientInServer (void)
                        self.solid = SOLID_SLIDEBOX;\r
                else\r
                        self.solid = SOLID_CORPSE;\r
+               self.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID;\r
                if(cvar("g_playerclip_collisions"))\r
-               {\r
-                       if(clienttype(self) == CLIENTTYPE_BOT && cvar("g_botclip_collisions"))\r
-                               self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;\r
-                       else\r
-                               self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;\r
-               }\r
-               else\r
-               {\r
-                       if(clienttype(self) == CLIENTTYPE_BOT && cvar("g_botclip_collisions"))\r
-                               self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP;\r
-                       else\r
-                               self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY;\r
-               }\r
+                       self.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;\r
+               if(clienttype(self) == CLIENTTYPE_BOT && cvar("g_botclip_collisions"))\r
+                       self.dphitcontentsmask |= DPCONTENTS_BOTCLIP;\r
                self.frags = FRAGS_PLAYER;\r
                if(independent_players)\r
                        MAKE_INDEPENDENT_PLAYER(self);\r
@@ -882,13 +876,15 @@ void PutClientInServer (void)
                self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");\r
                self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn");\r
                self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn");\r
-               self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");\r
+               self.pauseregenhealth_finished = time + cvar("g_balance_pause_health_regen_spawn");\r
+               self.pauseregenarmor_finished = time + cvar("g_balance_pause_armor_regen_spawn");\r
                //extend the pause of rotting if client was reset at the beginning of the countdown\r
                if(!cvar("sv_ready_restart_after_countdown") && time < game_starttime) { // TODO why is this cvar NOTted?\r
                        self.spawnshieldtime += game_starttime - time;\r
                        self.pauserotarmor_finished += game_starttime - time;\r
                        self.pauserothealth_finished += game_starttime - time;\r
-                       self.pauseregen_finished += game_starttime - time;\r
+                       self.pauseregenhealth_finished += game_starttime - time;\r
+                       self.pauseregenarmor_finished += game_starttime - time;\r
                }\r
                self.damageforcescale = 2;\r
                self.death_time = 0;\r
@@ -1860,7 +1856,8 @@ float CalcRot(float current, float stable, float rotfactor, float rotframetime)
                return max(stable, current + (stable - current) * rotfactor * rotframetime);\r
 }\r
 \r
-float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit)\r
+.float regen_soundtime;\r
+float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit, string regensound)\r
 {\r
        if(current > rotstable)\r
        {\r
@@ -1876,6 +1873,18 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re
                {\r
                        current = CalcRegen(current, regenstable, regenfactor, regenframetime);\r
                        current = min(regenstable, current + regenlinear * regenframetime);\r
+\r
+                       if(regensound != "")\r
+                       if(regenfactor || regenlinear)\r
+                       {\r
+                               if(self.regen_soundtime < time)\r
+                               {\r
+                                       msg_entity = self;\r
+                                       if(clienttype(msg_entity) == CLIENTTYPE_REAL)\r
+                                               soundto(MSG_ONE, self, CHAN_AUTO, regensound, VOL_BASE, ATTN_NONE);\r
+                               }\r
+                               self.regen_soundtime = time + 1; // only replay the sound if regen was paused for one second\r
+                       }\r
                }\r
        }\r
 \r
@@ -1915,8 +1924,8 @@ void player_regen (void)
 \r
        if (!g_ca && (!g_lms || cvar("g_lms_regenerate")))\r
        {\r
-               self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita);\r
-               self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith);\r
+               self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregenarmor_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita, "misc/armor_regen.ogg");\r
+               self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith, "misc/health_regen.ogg");\r
 \r
                // if player rotted to death...  die!\r
                if(self.health < 1)\r
@@ -1924,7 +1933,7 @@ void player_regen (void)
        }\r
 \r
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)\r
-               self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, cvar("g_balance_fuel_regen"), cvar("g_balance_fuel_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, cvar("g_balance_fuel_rot"), cvar("g_balance_fuel_rotlinear"), rot_mod * frametime * (time > self.pauserotfuel_finished), limitf);\r
+               self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, cvar("g_balance_fuel_regen"), cvar("g_balance_fuel_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, cvar("g_balance_fuel_rot"), cvar("g_balance_fuel_rotlinear"), rot_mod * frametime * (time > self.pauserotfuel_finished), limitf, "");\r
 }\r
 \r
 float zoomstate_set;\r
@@ -2016,6 +2025,7 @@ void SpectateCopy(entity spectatee) {
        self.health = spectatee.health;\r
        self.impulse = 0;\r
        self.items = spectatee.items;\r
+       self.last_pickup = spectatee.last_pickup;\r
        self.strength_finished = spectatee.strength_finished;\r
        self.invincible_finished = spectatee.invincible_finished;\r
        self.pressedkeys = spectatee.pressedkeys;\r