From ce70dcdb3f657f8fa1cf48ca9ba9a6074f40c3f5 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Wed, 11 Jan 2006 18:52:29 +0000 Subject: * Flamer damage down to 20 from 31 * Zap repeat rate down to 1500ms from 2000ms * Knockback from pouncing now 3 times as strong * Updates to the particle and trail systems sections of the manual * Merged ioq3-r470 --- src/game/g_combat.c | 4 ++++ src/game/tremulous.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/game') diff --git a/src/game/g_combat.c b/src/game/g_combat.c index eb8698c1..7e38f119 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -962,6 +962,10 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, if( !strcmp( inflictor->classname, "team_human_tesla" ) ) knockback *= 4; + // ...and for goon pouncing + if( mod == MOD_LEVEL3_POUNCE ) + knockback *= 3; + if( targ->client ) { knockback = (int)( (float)knockback * diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 002d7a81..8508a1e4 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -74,7 +74,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL2_AREAZAP_DMG ADM(80) #define LEVEL2_AREAZAP_RANGE 200.0f #define LEVEL2_AREAZAP_WIDTH 15.0f -#define LEVEL2_AREAZAP_REPEAT 2000 +#define LEVEL2_AREAZAP_REPEAT 1500 #define LEVEL2_AREAZAP_TIME 1000 #define LEVEL2_AREAZAP_MAX_TARGETS 3 #define LEVEL2_WALLJUMP_MAXSPEED 1000.0f @@ -390,7 +390,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define FLAMER_PRICE 450 #define FLAMER_GAS 150 #define FLAMER_REPEAT 200 -#define FLAMER_DMG HDM(31) +#define FLAMER_DMG HDM(20) #define FLAMER_RADIUS 50 #define FLAMER_LIFETIME 800.0f #define FLAMER_SPEED 200.0f -- cgit