]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Disable health regeneration in invasion mode
authorMario <mario.mario@y7mail.com>
Sun, 13 Oct 2013 00:42:20 +0000 (11:42 +1100)
committerMario <mario.mario@y7mail.com>
Sun, 13 Oct 2013 00:42:20 +0000 (11:42 +1100)
qcsrc/server/cl_client.qc

index e39bbb672b9bba43b0547c5ec5cb65ce68ccfe75..1c94d36505e279c8bb6b4a731bf42ec616d6efc3 100644 (file)
@@ -1609,10 +1609,10 @@ void player_regen (void)
        limita = limita * limit_mod;
        //limitf = limitf * limit_mod;
 
-       if(g_ca)
+       if(g_ca || g_invasion)
                rot_mod = 0;
 
-       if (!g_minstagib && !g_ca && (!g_lms || autocvar_g_lms_regenerate))
+       if (!g_minstagib && !g_ca && !g_invasion && (!g_lms || autocvar_g_lms_regenerate))
        {
                self.armorvalue = CalcRotRegen(self.armorvalue, mina, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, regen_mod * frametime * (time > self.pauseregen_finished), maxa, autocvar_g_balance_armor_rot, autocvar_g_balance_armor_rotlinear, rot_mod * frametime * (time > self.pauserotarmor_finished), limita);
                self.health = CalcRotRegen(self.health, minh, autocvar_g_balance_health_regen, autocvar_g_balance_health_regenlinear, regen_mod * frametime * (time > self.pauseregen_finished), maxh, autocvar_g_balance_health_rot, autocvar_g_balance_health_rotlinear, rot_mod * frametime * (time > self.pauserothealth_finished), limith);