Basic implementation for scaling players based on their health

[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 8e3754b95bab6ffc5845efbff0ef325966f204ef..8ef9663f96942d8ca42ecfcd0964655745a95829 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -406,6 +406,7 @@ string CheckPlayerModel(string plyermodel) {
        {\r
                if(substring(plyermodel,-4,4) != ".zym")\r
                if(substring(plyermodel,-4,4) != ".dpm")\r
+               if(substring(plyermodel,-4,4) != ".iqm")\r
                if(substring(plyermodel,-4,4) != ".md3")\r
                if(substring(plyermodel,-4,4) != ".psk")\r
                        return FallbackPlayerModel;\r
@@ -417,11 +418,12 @@ string CheckPlayerModel(string plyermodel) {
        return plyermodel;\r
 }\r
 \r
-void setmodel_apply(string modelname)\r
+void setmodel_apply(string modelname, float reset_anims)\r
 {\r
        precache_model(modelname);\r
        setmodel(self, modelname); // players have high precision\r
-       player_setupanimsformodel();\r
+       if(reset_anims)\r
+               player_setupanimsformodel();\r
 }\r
 \r
 string setmodel_state()\r
@@ -457,7 +459,7 @@ void Client_setmodel(string applymodel)
        applymodel = CheckPlayerModel(applymodel); // this is never "", so no endless loop\r
        m1 = self.mins;\r
        m2 = self.maxs;\r
-       setmodel_apply(applymodel);\r
+       setmodel_apply(applymodel, FALSE);\r
        setsize (self, m1, m2);\r
 }\r
 \r
@@ -469,7 +471,7 @@ void Client_uncustomizeentityforclient()
 float Client_customizeentityforclient()\r
 {\r
        entity modelsource;\r
-       string applymodel;\r
+       string stomachmodel;\r
 \r
        if(self.modelindex == 0)\r
                return TRUE;\r
@@ -511,25 +513,20 @@ float Client_customizeentityforclient()
        // now change the predator's player model into a stomach model for the prey\r
        // in other words, when a player is swallowed by another player, the predator becomes an inward stomach model so the prey can see theirself in the stomach\r
        // this is only visible to the prey however, otherwise players would appear as a floating stomach to everyone (ewww)\r
+       stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
 \r
-       // don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view\r
-       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" || self.fakeprey)\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
+\r
+       // don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view\r
+       if not(other.cvar_chase_active || other.classname == "observer") // the observer check prevents a bug\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
-               self.frame = 0; // don't use any animations as a stomach\r
+               Client_setmodel(stomachmodel);\r
                self.alpha = other.cvar_cl_vore_stomachmodel;\r
                return TRUE;\r
        }\r
+\r
        Client_setmodel(setmodel_state());\r
        if not(self.predator.classname == "player" || self.fakeprey)\r
                self.alpha = default_player_alpha;\r
@@ -726,7 +723,7 @@ void FixPlayermodel()
                {\r
                        m1 = self.mins;\r
                        m2 = self.maxs;\r
-                       setmodel_apply (defaultmodel);\r
+                       setmodel_apply (defaultmodel, TRUE);\r
                        setsize (self, m1, m2);\r
                        chmdl = TRUE;\r
                }\r
@@ -739,7 +736,7 @@ void FixPlayermodel()
                        self.playermodel = CheckPlayerModel(self.playermodel); // this is never "", so no endless loop\r
                        m1 = self.mins;\r
                        m2 = self.maxs;\r
-                       setmodel_apply (self.playermodel);\r
+                       setmodel_apply (self.playermodel, TRUE);\r
                        setsize (self, m1, m2);\r
                        chmdl = TRUE;\r
                }\r
@@ -2249,6 +2246,23 @@ float vercmp(string v1, string v2)
        return vercmp_recursive(v1, v2);\r
 }\r
 \r
+.float current_scale;\r
+void ApplyHealthSize()\r
+{\r
+       if not(cvar("g_healthsize"))\r
+               return;\r
+\r
+       self.current_scale = self.health / 100; // range between 0 and 100\r
+       self.current_scale = bound(0, self.current_scale, 100);\r
+\r
+       if(self.scale < self.current_scale - self.scale)\r
+               self.scale += cvar("g_healthsize_speed") * sys_frametime;\r
+       else if(self.scale > self.current_scale + self.scale)\r
+               self.scale -= cvar("g_healthsize_speed") * sys_frametime;\r
+       else\r
+               self.scale = self.current_scale;\r
+}\r
+\r
 void ObserverThink()\r
 {\r
        if (self.flags & FL_JUMPRELEASED) {\r
@@ -2361,6 +2375,9 @@ void PlayerPreThink (void)
        // core code for the vore system\r
        Vore();\r
 \r
+       // health based player size\r
+       ApplyHealthSize();\r
+\r
        // version nagging\r
        if(self.version_nagtime)\r
                if(self.cvar_g_voretournamentversion)\r