diff options
| author | IronClawTrem <louie.nutman@gmail.com> | 2019-08-27 00:35:14 +0100 |
|---|---|---|
| committer | IronClawTrem <louie.nutman@gmail.com> | 2019-08-27 00:35:14 +0100 |
| commit | b4948d3fef13d551bc976bccf7c554d49bc6233c (patch) | |
| tree | 839469663527b724ddcc833cafcce5a1364976fe /src | |
| parent | 3e1bb72bf1b410460e87cd10a71d5c8aff0a1a37 (diff) | |
move tyrant heal aura to the advanced basilisk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_active.c | 6 | ||||
| -rw-r--r-- | src/game/tremulous.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 446fe47..f171617 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -833,7 +833,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) level.surrenderTeam != PTE_ALIENS ) { int entityList[ MAX_GENTITIES ]; - vec3_t range = { LEVEL4_REGEN_RANGE, LEVEL4_REGEN_RANGE, LEVEL4_REGEN_RANGE }; + vec3_t range = { LEVEL1_REGEN_RANGE, LEVEL1_REGEN_RANGE, LEVEL1_REGEN_RANGE }; vec3_t mins, maxs; int i, num; gentity_t *boostEntity; @@ -848,9 +848,9 @@ void ClientTimerActions( gentity_t *ent, int msec ) boostEntity = &g_entities[ entityList[ i ] ]; if( boostEntity->client && boostEntity->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS && - boostEntity->client->ps.stats[ STAT_PCLASS ] == PCL_ALIEN_LEVEL4 ) + boostEntity->client->ps.stats[ STAT_PCLASS ] == PCL_ALIEN_LEVEL1_UPG ) { - modifier = LEVEL4_REGEN_MOD; + modifier = LEVEL1_REGEN_MOD; break; } else if( boostEntity->s.eType == ET_BUILDABLE && diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 5b930fa..423d465 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -70,6 +70,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL1_PCLOUD_REPEAT 2000 #define LEVEL1_PCLOUD_TIME 10000 #define LEVEL1_PCLOUD_BOOST_TIME 5000 +#define LEVEL1_REGEN_RANGE 200.0f +#define LEVEL1_REGEN_MOD 2.0f #define LEVEL2_CLAW_DMG ADM(40) #define LEVEL2_CLAW_RANGE 96.0f @@ -110,8 +112,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL4_CLAW_WIDTH 20.0f #define LEVEL4_CLAW_REPEAT 750 #define LEVEL4_CLAW_K_SCALE 1.0f -#define LEVEL4_REGEN_RANGE 200.0f -#define LEVEL4_REGEN_MOD 2.0f #define LEVEL4_CHARGE_SPEED 2.0f #define LEVEL4_CHARGE_TIME 3000 #define LEVEL4_CHARGE_CHARGE_TIME 1500 |