diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_misc.c | 2 | ||||
| -rw-r--r-- | src/game/bg_public.h | 1 | ||||
| -rw-r--r-- | src/game/g_active.c | 2 | ||||
| -rw-r--r-- | src/game/g_combat.c | 22 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 6 |
5 files changed, 22 insertions, 11 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index cd54f3d0..d4d75462 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -1273,7 +1273,7 @@ classAttributes_t bg_classList[ ] = 0, 0, //int viewheight, crouchviewheight; 25, //int health; 0, //int armor; - SCA_WALLCLIMBER|SCA_CANJUMP|SCA_NOWEAPONDRIFT|SCA_FOVWARPS, //int abilities; + SCA_WALLCLIMBER|SCA_CANJUMP|SCA_NOWEAPONDRIFT|SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities; 0.0f, //float buildDist; 140, //int fov; 0.0f, //float bob; diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 69843c79..da8d65fa 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -234,6 +234,7 @@ typedef enum { #define SCA_CANJUMP 8 #define SCA_NOWEAPONDRIFT 16 #define SCA_FOVWARPS 32 +#define SCA_ALIENSENSE 64 #define SS_WALLCLIMBING 1 #define SS_WALLCLIMBINGCEILING 2 diff --git a/src/game/g_active.c b/src/game/g_active.c index 691f1559..a3ddecd5 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -466,7 +466,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) //client is poisoned if( client->ps.stats[ STAT_STATE ] & SS_POISONED ) { - int damage = ( level.time - client->lastPoisonTime ) / 100; + int damage = ( level.time - client->lastPoisonTime ) / 1000; G_Damage( ent, NULL, NULL, NULL, NULL, damage, 0, MOD_VENOM ); } diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 8ec9dd93..fbb13547 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1027,7 +1027,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, if( knockback && targ->client ) { vec3_t kvel; - float mass; + float mass; mass = 200; @@ -1053,12 +1053,12 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, } // check for completely getting out of the damage - if( !(dflags & DAMAGE_NO_PROTECTION) ) + if( !( dflags & DAMAGE_NO_PROTECTION ) ) { // if TF_NO_FRIENDLY_FIRE is set, don't do damage to the target // if the attacker was on the same team - if( targ != attacker && OnSameTeam (targ, attacker) ) + if( targ != attacker && OnSameTeam( targ, attacker ) ) { if( !g_friendlyFire.integer ) return; @@ -1080,9 +1080,9 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, }*/ // add to the attacker's hit counter - if ( attacker->client && targ != attacker && targ->health > 0 + if( attacker->client && targ != attacker && targ->health > 0 && targ->s.eType != ET_MISSILE - && targ->s.eType != ET_GENERAL) + && targ->s.eType != ET_GENERAL ) { if( OnSameTeam( targ, attacker ) ) attacker->client->ps.persistant[ PERS_HITS ]--; @@ -1149,12 +1149,22 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, if( g_gametype.integer == GT_CTF) Team_CheckHurtCarrier(targ, attacker); - if(targ->client) + if( targ->client ) { // set the last client who damaged the target targ->client->lasthurt_client = attacker->s.number; targ->client->lasthurt_mod = mod; take = (int)( (float)take * G_CalcDamageModifier( point, targ, attacker, client->ps.stats[ STAT_PCLASS ] ) ); + + //if boosted poison every attack + if( client && client->ps.stats[ STAT_STATE ] & SS_BOOSTED ) + { + if( !( targ->client->ps.stats[ STAT_STATE ] & SS_POISONED ) ) + { + targ->client->ps.stats[ STAT_STATE ] |= SS_POISONED; + targ->client->lastPoisonTime = level.time; + } + } } // do the damage diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 1d8180dd..1b1fcf33 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -358,15 +358,15 @@ qboolean CheckVenomAttack( gentity_t *ent ) tent->s.weapon = ent->s.weapon; } - G_Damage( traceEnt, ent, ent, forward, tr.endpos, 5, DAMAGE_NO_KNOCKBACK, MOD_VENOM ); - if( traceEnt->client ) + G_Damage( traceEnt, ent, ent, forward, tr.endpos, 100, DAMAGE_NO_KNOCKBACK, MOD_VENOM ); +/* if( traceEnt->client ) { if( !( traceEnt->client->ps.stats[ STAT_STATE ] & SS_POISONED ) ) { traceEnt->client->ps.stats[ STAT_STATE ] |= SS_POISONED; traceEnt->client->lastPoisonTime = level.time; } - } + }*/ return qtrue; } |