diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/bg_pmove.c | 1 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 2 | ||||
| -rw-r--r-- | src/game/tremulous.h | 8 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 8c33a500..64b6a01f 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -559,6 +559,7 @@ static qboolean PM_CheckPounce( void ) ( pm->ps->pm_flags & PMF_CHARGE ) ) { pm->ps->pm_flags &= ~PMF_CHARGE; + pm->ps->weaponTime += LEVEL3_POUNCE_REPEAT; return qfalse; } diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 045aa648..7e682628 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -1262,8 +1262,6 @@ qboolean CheckPounceAttack( gentity_t *ent ) G_Damage( traceEnt, ent, ent, forward, tr.endpos, damage, DAMAGE_NO_LOCDAMAGE, MOD_LEVEL3_POUNCE ); - ent->client->ps.weaponTime += LEVEL3_POUNCE_REPEAT; - return qtrue; } diff --git a/src/game/tremulous.h b/src/game/tremulous.h index a29cc5db..4e0b3350 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -77,7 +77,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL2_CLAW_K_SCALE 1.0f #define LEVEL2_CLAW_U_REPEAT 400 #define LEVEL2_CLAW_U_K_SCALE 1.0f -#define LEVEL2_AREAZAP_DMG ADM(50) +#define LEVEL2_AREAZAP_DMG ADM(40) #define LEVEL2_AREAZAP_RANGE 120.0f #define LEVEL2_AREAZAP_CUTOFF 300.0f #define LEVEL2_AREAZAP_REPEAT 500 @@ -85,8 +85,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL2_WALLJUMP_MAXSPEED 1000.0f #define LEVEL3_CLAW_DMG ADM(80) -#define LEVEL3_CLAW_UPG_RANGE 96.0f #define LEVEL3_CLAW_RANGE 72.0f +#define LEVEL3_CLAW_UPG_RANGE LEVEL3_CLAW_RANGE + 8.0f #define LEVEL3_CLAW_WIDTH 12.0f #define LEVEL3_CLAW_REPEAT 700 #define LEVEL3_CLAW_K_SCALE 1.0f @@ -96,7 +96,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL3_POUNCE_RANGE 64.0f #define LEVEL3_POUNCE_WIDTH 14.0f #define LEVEL3_POUNCE_TIME 700 // msec for full Dragoon pounce -#define LEVEL3_POUNCE_TIME_UPG 600 // msec for full Adv. Dragoon pounce +#define LEVEL3_POUNCE_TIME_UPG 700 // msec for full Adv. Dragoon pounce #define LEVEL3_POUNCE_TIME_MIN 200 // msec before which pounce cancels #define LEVEL3_POUNCE_REPEAT 400 // msec before a new pounce starts #define LEVEL3_POUNCE_SPEED_MOD 0.75f // walking speed modifier for pounce charging @@ -109,7 +109,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL3_BOUNCEBALL_REGEN 15000 // msec until new barb #define LEVEL4_CLAW_DMG ADM(100) -#define LEVEL4_CLAW_RANGE 116.0f +#define LEVEL4_CLAW_RANGE 100.0f #define LEVEL4_CLAW_WIDTH 14.0f #define LEVEL4_CLAW_HEIGHT 20.0f #define LEVEL4_CLAW_REPEAT 750 |