Separate health and armor regen pauses

diff --git a/data/balance.cfg b/data/balance.cfg
index 98de20eafcb3b89415ccf50977d7aa38219f71d8..bbbcbbbf2a4ca91a331b25b4157888b13d59bfc2 100644 (file)
--- a/data/balance.cfg
+++ b/data/balance.cfg
@@ -64,9 +64,11 @@ set g_pickup_respawntimejitter_ammo 0
 set g_balance_health_regen 0\r
 set g_balance_health_regenlinear 5\r
 set g_balance_armor_regen 0\r
-set g_balance_armor_regenlinear 0\r
+set g_balance_armor_regenlinear 25\r
 set g_balance_pause_health_regen 5\r
 set g_balance_pause_health_regen_spawn 0\r
+set g_balance_pause_armor_regen 6\r
+set g_balance_pause_armor_regen_spawn 6\r
 set g_balance_health_rot 0\r
 set g_balance_health_rotlinear 5\r
 set g_balance_armor_rot 0\r

diff --git a/data/qcsrc/server/cheats.qc b/data/qcsrc/server/cheats.qc
index 4abb385323fd815d38a6efe9f92ba818e0c88215..1f3a85533fc6cd6d38206d56a7c18d4f88c6d2b3 100644 (file)
--- a/data/qcsrc/server/cheats.qc
+++ b/data/qcsrc/server/cheats.qc
@@ -120,7 +120,8 @@ float CheatImpulse(float i)
                        self.personal.pauserotarmor_finished = self.pauserotarmor_finished;
                        self.personal.pauserothealth_finished = self.pauserothealth_finished;
                        self.personal.pauserotfuel_finished = self.pauserotfuel_finished;
-                       self.personal.pauseregen_finished = self.pauseregen_finished;
+                       self.personal.pauseregenhealth_finished = self.pauseregenhealth_finished;
+                       self.personal.pauseregenarmor_finished = self.pauseregenarmor_finished;
                        self.personal.strength_finished = self.strength_finished;
                        self.personal.invincible_finished = self.invincible_finished;
                        self.personal.teleport_time = time;
@@ -176,7 +177,8 @@ float CheatImpulse(float i)
                                        self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");
                                        self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn");
                                        self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn");
-                                       self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");
+                                       self.pauseregenhealth_finished = time + cvar("g_balance_pause_health_regen_spawn");
+                                       self.pauseregenarmor_finished = time + cvar("g_balance_pause_armor_regen_spawn");
                                        self.strength_finished = 0;
                                        self.invincible_finished = 0;
                                }
@@ -190,7 +192,8 @@ float CheatImpulse(float i)
                                        self.pauserotarmor_finished = time + self.personal.pauserotarmor_finished - self.personal.teleport_time;
                                        self.pauserothealth_finished = time + self.personal.pauserothealth_finished - self.personal.teleport_time;
                                        self.pauserotfuel_finished = time + self.personal.pauserotfuel_finished - self.personal.teleport_time;
-                                       self.pauseregen_finished = time + self.personal.pauseregen_finished - self.personal.teleport_time;
+                                       self.pauseregenhealth_finished = time + self.personal.pauseregenhealth_finished - self.personal.teleport_time;
+                                       self.pauseregenarmor_finished = time + self.personal.pauseregenarmor_finished - self.personal.teleport_time;
                                        self.strength_finished = time + self.personal.strength_finished - self.personal.teleport_time;
                                        self.invincible_finished = time + self.personal.invincible_finished - self.personal.teleport_time;
                                }

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 5eff6c80b80f98e248cddc15520e56951918406e..dcafed6c26cf942b9a722695bb48f0aa0fb0fc36 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -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
@@ -873,13 +874,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
@@ -1906,8 +1909,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);\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);\r
 \r
                // if player rotted to death...  die!\r
                if(self.health < 1)\r
@@ -1915,7 +1918,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

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 0224bd01f15ce824293b8697c9c6bffca9f9679d..9cd11650b0fe88f63fd4e6fb9dbc170f1e783f86 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -998,7 +998,7 @@ void SV_PlayerPhysics()
                        self.items |= IT_USING_JETPACK;\r
 \r
                        // jetpack also inhibits health regeneration, but only for 1 second\r
-                       self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_fuel_regen"));\r
+                       self.pauseregenhealth_finished = max(self.pauseregenhealth_finished, time + cvar("g_balance_pause_fuel_regen"));\r
                }\r
        }\r
        else if (self.flags & FL_ONGROUND)\r

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index 932d0b96058e6b9daef3a21bec571518a8ed82aa..45bb087aac07774ba84a20a19117d4aa849f1d63 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -393,7 +393,8 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
                self.armorvalue = self.armorvalue - save;\r
                self.health = self.health - take;\r
                // pause regeneration for 5 seconds\r
-               self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_health_regen"));\r
+               self.pauseregenhealth_finished = max(self.pauseregenhealth_finished, time + cvar("g_balance_pause_health_regen"));\r
+               self.pauseregenarmor_finished = max(self.pauseregenarmor_finished, time + cvar("g_balance_pause_armor_regen"));\r
        }\r
        self.dmg_save = self.dmg_save + save;//max(save - 10, 0);\r
        self.dmg_take = self.dmg_take + take;//max(take - 10, 0);\r
@@ -470,7 +471,8 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                        self.armorvalue = self.armorvalue - save;\r
                        self.health = self.health - take;\r
                        // pause regeneration for 5 seconds\r
-                       self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_health_regen"));\r
+                       self.pauseregenhealth_finished = max(self.pauseregenhealth_finished, time + cvar("g_balance_pause_health_regen"));\r
+                       self.pauseregenarmor_finished = max(self.pauseregenarmor_finished, time + cvar("g_balance_pause_armor_regen"));\r
 \r
                        if (time > self.pain_finished)          //Don't switch pain sequences like crazy\r
                        {\r

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 8bfb0ac9943a1fea3f3868f783ee75aced7bae3a..ee8766234ed45cf60c07daf51a212e9c0d550f3a 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -200,8 +200,9 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 .float iscreature;\r
 .vector oldvelocity;\r
 \r
-.float pauseregen_finished;\r
+.float pauseregenhealth_finished;\r
 .float pauserothealth_finished;\r
+.float pauseregenarmor_finished;\r
 .float pauserotarmor_finished;\r
 .float pauserotfuel_finished;\r
 .string item_pickupsound;\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 3505039f3fe1b525b2d1854712a5d0b48a2c7d6c..2ad8336226f2e9f8c01c1efa7cb470087605a8cd 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -1330,9 +1330,9 @@ float GiveItems(entity e, float beginarg, float endarg)
        }\r
        POSTGIVE_VALUE(e, strength_finished, 1, "misc/powerup.wav", "misc/poweroff.wav");\r
        POSTGIVE_VALUE(e, invincible_finished, 1, "misc/powerup_shield.wav", "misc/poweroff.wav");\r
-       POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, cvar("g_balance_pause_fuel_rot"), pauseregen_finished, cvar("g_balance_pause_fuel_regen"), "misc/itempickup.wav", string_null);\r
-       POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, cvar("g_balance_pause_armor_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/armor25.wav", string_null);\r
-       POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, cvar("g_balance_pause_health_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/megahealth.wav", string_null);\r
+       POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, cvar("g_balance_pause_fuel_rot"), pauseregenhealth_finished, cvar("g_balance_pause_fuel_regen"), "misc/itempickup.wav", string_null);\r
+       POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, cvar("g_balance_pause_armor_rot"), pauseregenarmor_finished, cvar("g_balance_pause_armor_regen"), "misc/armor25.wav", string_null);\r
+       POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, cvar("g_balance_pause_health_rot"), pauseregenhealth_finished, cvar("g_balance_pause_health_regen"), "misc/megahealth.wav", string_null);\r
 \r
        if(e.strength_finished <= 0)\r
                e.strength_finished = 0;\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 9cd4fa7711b390371afec43b37d5eed1866fc6d7..b1e4e13bb28ba2c135cb1db6e9053bd478b7c2ac 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -108,7 +108,7 @@ float w_grabber(float req)
 \r
                        // grabber also inhibits health regeneration, but only for 1 second\r
                        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)\r
-                               self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_fuel_regen"));\r
+                               self.pauseregenhealth_finished = max(self.pauseregenhealth_finished, time + cvar("g_balance_pause_fuel_regen"));\r
                }\r
 \r
                if(self.grabber && self.grabber.state == 1)\r