summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorMaeJong <mewiceclair@gmail.com>2017-05-14 22:44:56 +0200
committerMaeJong <mewiceclair@gmail.com>2017-05-14 22:44:56 +0200
commit91b6eb4011c55120f6e5700b8086e8d4992f018f (patch)
treebacb521484526b9c24704843bbe3a02d91590eae /src/game
parent0f43c487b1688136b39488aca5df5d2e9ec95fc2 (diff)
Adv. Basilisk healing aura & tyrant regen tweaks
Adv. Basi healing aura now boosts regen x1.5 instead of x2 (rounded up) Tyrant regen lowered from 9 to 8
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_active.c6
-rw-r--r--src/game/tremulous.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c
index da2df83..5bee472 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -953,7 +953,7 @@ void ClientTimerActions( gentity_t *ent, int msec )
( ent->lastDamageTime + ALIEN_REGEN_DAMAGE_TIME ) < level.time )
{
float dist_mod = 1.0f;
- float hadd;
+ int hadd;
if( g_modAlienRegenRange.integer )
{
@@ -974,9 +974,7 @@ void ClientTimerActions( gentity_t *ent, int msec )
}
}
- hadd = (float)(BG_FindRegenRateForClass( client->ps.stats[ STAT_PCLASS ] ) * modifier * dist_mod);
- if( hadd < 1.0 && hadd >= 0.5 )
- hadd = 1.0;
+ hadd = ceil((float)(BG_FindRegenRateForClass( client->ps.stats[ STAT_PCLASS ] ) * modifier * dist_mod));
ent->health += hadd;
// if completely healed, cancel retribution
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 0d21a5f..ee917da 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -71,7 +71,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define LEVEL1_PCLOUD_TIME 10000
#define LEVEL1_PCLOUD_BOOST_TIME 5000
#define LEVEL1_REGEN_RANGE 200.0f
-#define LEVEL1_REGEN_MOD 2.0f
+#define LEVEL1_REGEN_MOD 1.5f
#define LEVEL2_CLAW_DMG ADM(40)
#define LEVEL2_CLAW_RANGE 96.0f
@@ -197,7 +197,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define LEVEL4_SPEED 1.2f
#define LEVEL4_VALUE AVM(800)
#define LEVEL4_HEALTH AHM(400)
-#define LEVEL4_REGEN 9
+#define LEVEL4_REGEN 8
#define LEVEL4_COST 2