diff options
| author | enneract <trem.redman@gmail.com> | 2014-02-25 23:39:22 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-02-25 23:39:22 +0100 |
| commit | 2e8851609620e0e45a8a26b53ae7f3ba898c63df (patch) | |
| tree | b623fe1b8fe4d5bd55d6d7c54c2426b89357be6b | |
| parent | f8f7939c4f8e32e1421169a90c262fc4795f0caf (diff) | |
Fix Turrets and Teslas shooting at Humans, tweak power zap's parameters.
| -rw-r--r-- | src/game/g_buildable.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 8447e84..7c051bd 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -652,8 +652,8 @@ void G_UpdatePowerGrid( float dt ) ent->voltage -= ent->current * dt / CAPBANK_CAPACITY; //zapping effect - #define MIN_ZAP_CURRENT 2.0f - #define ZAP_CHANCE_FACTOR 0.01f + #define MIN_ZAP_CURRENT 8.0f + #define ZAP_CHANCE_FACTOR 0.007f if( ent->current > MIN_ZAP_CURRENT ) { float chance; @@ -2196,8 +2196,8 @@ qboolean HMGTurret_CheckTarget( gentity_t *self, gentity_t *target, trace_t tr; vec3_t dir, end; - if( !target || target->health <= 0 || !target->client /*|| - target->client->pers.teamSelection != TEAM_ALIENS */) //debug: target humans too for now + if( !target || target->health <= 0 || !target->client || + target->client->pers.teamSelection != TEAM_ALIENS ) return qfalse; if( target->flags & FL_NOTARGET ) @@ -2520,7 +2520,7 @@ void HTeslaGen_Think( gentity_t *self ) continue; if( self->enemy->client && self->enemy->health > 0 && - /*self->enemy->client->ps.stats[ STAT_TEAM ] == TEAM_ALIENS &&*/ + self->enemy->client->ps.stats[ STAT_TEAM ] == TEAM_ALIENS && Distance( origin, self->enemy->s.pos.trBase ) <= TESLAGEN_RANGE ) { if( !G_Surge( self, TESLAGEN_I_ACTIVE ) ) |