From 3f6fd66c02b74d20613a10f37129292328cf28e9 Mon Sep 17 00:00:00 2001 From: Asa Kravets Date: Sat, 3 Oct 2009 12:19:50 +0000 Subject: * Reduced pounce range 64->54 * Reduce upgraded pounce range to regular + 6 instead of 8 (the model size difference is 6, not 8) * Introduced upgraded goon pounce range (regular goon range + 6) * Increased hive health 125->175 --- src/game/g_weapon.c | 6 ++++-- src/game/tremulous.h | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 8bf63fdd..41ec53f8 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -1234,7 +1234,7 @@ qboolean CheckPounceAttack( gentity_t *ent ) { trace_t tr; gentity_t *traceEnt; - int damage, timeMax, payload; + int damage, timeMax, pounceRange, payload; if( ent->client->pmext.pouncePayload <= 0 ) return qfalse; @@ -1252,7 +1252,9 @@ qboolean CheckPounceAttack( gentity_t *ent ) CalcMuzzlePoint( ent, forward, right, up, muzzle ); // Trace from muzzle to see what we hit - G_WideTrace( &tr, ent, LEVEL3_POUNCE_RANGE, LEVEL3_POUNCE_WIDTH, + pounceRange = ent->client->ps.weapon == WP_ALEVEL3 ? LEVEL3_POUNCE_RANGE : + LEVEL3_POUNCE_UPG_RANGE; + G_WideTrace( &tr, ent, pounceRange, LEVEL3_POUNCE_WIDTH, LEVEL3_POUNCE_WIDTH, &traceEnt ); if( traceEnt == NULL ) return qfalse; diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 35c651ec..dced83e5 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -86,14 +86,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL3_CLAW_DMG ADM(80) #define LEVEL3_CLAW_RANGE 72.0f -#define LEVEL3_CLAW_UPG_RANGE LEVEL3_CLAW_RANGE + 8.0f +#define LEVEL3_CLAW_UPG_RANGE LEVEL3_CLAW_RANGE + 6.0f #define LEVEL3_CLAW_WIDTH 12.0f #define LEVEL3_CLAW_REPEAT 700 #define LEVEL3_CLAW_K_SCALE 1.0f #define LEVEL3_CLAW_U_REPEAT 600 #define LEVEL3_CLAW_U_K_SCALE 1.0f #define LEVEL3_POUNCE_DMG ADM(100) -#define LEVEL3_POUNCE_RANGE 64.0f +#define LEVEL3_POUNCE_RANGE 54.0f +#define LEVEL3_POUNCE_UPG_RANGE LEVEL3_POUNCE_RANGE + 6.0f #define LEVEL3_POUNCE_WIDTH 14.0f #define LEVEL3_POUNCE_TIME 700 // msec for full Dragoon pounce #define LEVEL3_POUNCE_TIME_UPG 700 // msec for full Adv. Dragoon pounce @@ -280,7 +281,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define HIVE_BP 12 #define HIVE_BT 20000 -#define HIVE_HEALTH ABHM(125) +#define HIVE_HEALTH ABHM(175) #define HIVE_REGEN 10 #define HIVE_SPLASHDAMAGE 30 #define HIVE_SPLASHRADIUS 200 -- cgit