Make bots jump while being swallowed, to make it even harder to eat them. They should...

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

diff --git a/data/qcsrc/server/sv_main.qc b/data/qcsrc/server/sv_main.qc
index 6c45f77684d61a660a1cb73fb73d12f09402458e..bfdbd9c255e3e344c61c71a2b1e3cae3088accb3 100644 (file)
--- a/data/qcsrc/server/sv_main.qc
+++ b/data/qcsrc/server/sv_main.qc
@@ -67,17 +67,17 @@ void CreatureFrame (void)
                                self.dmg = 2;\r
                        }\r
                        // check for falling damage\r
-                       if(!self.grabber.state && !g_ca && !(g_cts && !cvar("g_cts_selfdamage")))\r
+                       if(!(g_cts && !cvar("g_cts_selfdamage")))\r
                        {\r
                                dm = vlen(self.oldvelocity) - vlen(self.velocity); // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage.\r
                                if (self.deadflag)\r
                                        dm = (dm - cvar("g_balance_falldamage_deadminspeed")) * cvar("g_balance_falldamage_factor");\r
                                else\r
                                        dm = min((dm - cvar("g_balance_falldamage_minspeed")) * cvar("g_balance_falldamage_factor"), cvar("g_balance_falldamage_maxdamage"));\r
+                               if(self.scale) // we are smaller or larger, so we take more or less falling damage\r
+                                       dm *= (1 + cvar("g_healthsize_movementfactor")) - cvar("g_healthsize_movementfactor") * self.scale; \r
                                if (dm > 0)\r
-                               {\r
                                        Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0');\r
-                               }\r
                                else if(vlen(self.velocity) > 100000 && cvar("developer"))\r
                                {\r
                                        dprint(strcat(self.netname, " became too fast, please investigate: ", vtos(self.spawnorigin), "\n"));\r