diff options
| -rw-r--r-- | src/game/g_combat.c | 21 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 16 | ||||
| -rw-r--r-- | src/game/tremulous.h | 5 |
3 files changed, 29 insertions, 13 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index d104f78..b6de2f4 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1361,7 +1361,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, dflags ) + 0.5f ); - // check possible poisoning + // check possible poisoning if( ( attacker->client ) && ( targ->client->poisonImmunityTime < level.time ) && ( targ->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS ) ) @@ -1369,15 +1369,16 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, //if boosted poison every attack if( ( attacker->client->ps.stats[ STAT_STATE ] & SS_BOOSTED ) - && mod != MOD_POISON - && mod != MOD_LEVEL2_ZAP - && mod != MOD_LEVEL5_ZAP - && mod != MOD_LEVEL1_PCLOUD - && mod != MOD_HSPAWN - && mod != MOD_ASPAWN ) + && mod != MOD_POISON + && mod != MOD_LEVEL2_ZAP + && mod != MOD_LEVEL5_ZAP + && mod != MOD_LEVEL1_PCLOUD + && mod != MOD_HSPAWN + && mod != MOD_ASPAWN + && mod != MOD_LEVEL5_PRICKLES) poisonTime = level.time + ALIEN_POISON_TIME; - // no more zap poisen - else if( mod == MOD_LEVEL1_CLAW && ( mod != MOD_LEVEL2_ZAP || mod != MOD_LEVEL5_ZAP || mod != MOD_FLAMES )) + // no more zap poisen + else if( mod == MOD_LEVEL1_CLAW && ( mod != MOD_LEVEL2_ZAP || mod != MOD_LEVEL5_ZAP || mod != MOD_FLAMES )) { if( attacker->client->ps.weapon == WP_ALEVEL1_UPG ) poisonTime = level.time + g_basiPoisonTime.integer * 1000; @@ -1387,7 +1388,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, if( poisonTime > 0 ) { targ->client->ps.stats[ STAT_STATE ] |= SS_POISONED; -if( poisonTime > targ->client->poisonExpiryTime ) { + if( poisonTime > targ->client->poisonExpiryTime ) { targ->client->poisonExpiryTime = poisonTime; targ->client->lastPoisonClient = attacker; diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 99cf5c5..b86f41a 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -1679,7 +1679,21 @@ LEVEL5 void Prickles( gentity_t *ent ) { - Prickles_Fire( ent, muzzle, forward ); + trace_t tr; + vec3_t end; + float r; + float u; + gentity_t *tent; + gentity_t *traceEnt; + + r = random( ) * M_PI * 2.0f; + u = sin( r ) * crandom( ) * LEVEL5_PRICKLES_SPREAD * 16; + r = cos( r ) * crandom( ) * LEVEL5_PRICKLES_SPREAD * 16; + VectorMA( muzzle, 8192 * 16, forward, end ); + VectorMA( end, r, right, end ); + VectorMA( end, u, up, end ); + + Prickles_Fire( ent, muzzle, end ); } diff --git a/src/game/tremulous.h b/src/game/tremulous.h index ced40f2..0a82f1f 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -289,7 +289,7 @@ TREMULOUS EDGE MOD SRC FILE #define LEVEL4_FIREBREATHDMG 50 //Hummel -#define LEVEL5_UPG_SPEED 0.875f +#define LEVEL5_UPG_SPEED 0.81f #define LEVEL5_UPG_VALUE AVM(400) #define LEVEL5_UPG_HEALTH AHM(140) #define LEVEL5_UPG_REGEN (0.04f * LEVEL5_UPG_HEALTH) @@ -298,7 +298,7 @@ TREMULOUS EDGE MOD SRC FILE #define LEVEL5_CLAW_U_K_SCALE 1.0f #define LEVEL5_CLAW_U_RANGE 85.0f #define LEVEL5_CLAW_WIDTH 12.0f -#define LEVEL5_CLAW_DMG ADM(36) +#define LEVEL5_CLAW_DMG ADM(30) #define LEVEL5_PRICKLES_REPEAT 160 #define LEVEL5_PRICKLES_NEXTTHINK 6000 #define LEVEL5_PRICKLES_RADIUS 50 @@ -307,6 +307,7 @@ TREMULOUS EDGE MOD SRC FILE #define LEVEL5_PRICKLES_DMG 6 #define LEVEL5_PRICKLES_RELOADTIME 160 #define LEVEL5_PRICKLES_AMMO 10 +#define LEVEL5_PRICKLES_SPREAD 100 #define LEVEL5_POUNCE_JUMP_MAG 900 #define LEVEL5_POUNCE_REPEAT 250 #define LEVEL5_POUNCE_TIME 600 |