diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/bg_pmove.c | 10 | ||||
| -rw-r--r-- | src/game/g_missile.c | 2 | ||||
| -rw-r--r-- | src/game/tremulous.h | 11 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 79b02f11..f9a36812 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -426,13 +426,13 @@ static float PM_CmdScale( usercmd_t *cmd ) modifier *= HUMAN_SIDE_MODIFIER; } - //must have +ve stamina to jump - if( pm->ps->stats[ STAT_STAMINA ] < 0 ) + //must have have stamina to jump + if( pm->ps->stats[ STAT_STAMINA ] < STAMINA_SLOW_LEVEL + STAMINA_JUMP_TAKE ) cmd->upmove = 0; //slow down once stamina depletes if( pm->ps->stats[ STAT_STAMINA ] <= STAMINA_SLOW_LEVEL ) - modifier *= (float)( pm->ps->stats[ STAT_STAMINA ] + 1000 ) / 500.0f; + modifier *= (float)( pm->ps->stats[ STAT_STAMINA ] + STAMINA_MAX ) / (float)(STAMINA_SLOW_LEVEL + STAMINA_MAX); if( pm->ps->stats[ STAT_STATE ] & SS_CREEPSLOWED ) { @@ -793,7 +793,7 @@ static qboolean PM_CheckJump( void ) return qfalse; if( ( pm->ps->stats[ STAT_TEAM ] == TEAM_HUMANS ) && - ( pm->ps->stats[ STAT_STAMINA ] < 0 ) ) + ( pm->ps->stats[ STAT_STAMINA ] < STAMINA_SLOW_LEVEL + STAMINA_JUMP_TAKE ) ) return qfalse; //no bunny hopping off a dodge @@ -945,7 +945,7 @@ static qboolean PM_CheckDodge( void ) } // Reasons why we can't start a dodge or sprint - if( pm->ps->pm_type != PM_NORMAL || pm->ps->stats[ STAT_STAMINA ] < 0 || + if( pm->ps->pm_type != PM_NORMAL || pm->ps->stats[ STAT_STAMINA ] < STAMINA_SLOW_LEVEL + STAMINA_DODGE_TAKE || ( pm->ps->pm_flags & PMF_DUCKED ) ) return qfalse; diff --git a/src/game/g_missile.c b/src/game/g_missile.c index 868cb87b..43cc9ec9 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -356,7 +356,7 @@ gentity_t *fire_flamer( gentity_t *self, vec3_t start, vec3_t dir ) bolt->r.ownerNum = self->s.number; bolt->parent = self; bolt->damage = FLAMER_DMG; - bolt->splashDamage = FLAMER_DMG; + bolt->splashDamage = FLAMER_SPLASHDAMAGE; bolt->splashRadius = FLAMER_RADIUS; bolt->methodOfDeath = MOD_FLAMER; bolt->splashMethodOfDeath = MOD_FLAMER_SPLASH; diff --git a/src/game/tremulous.h b/src/game/tremulous.h index dda90f64..c6533ec6 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -89,7 +89,7 @@ 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_RANGE 72.0f +#define LEVEL3_CLAW_RANGE 80.0f #define LEVEL3_CLAW_UPG_RANGE LEVEL3_CLAW_RANGE + 3.0f #define LEVEL3_CLAW_WIDTH 12.0f #define LEVEL3_CLAW_REPEAT 900 @@ -97,7 +97,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL3_CLAW_U_REPEAT 800 #define LEVEL3_CLAW_U_K_SCALE 1.0f #define LEVEL3_POUNCE_DMG ADM(100) -#define LEVEL3_POUNCE_RANGE 54.0f +#define LEVEL3_POUNCE_RANGE 40.0f #define LEVEL3_POUNCE_UPG_RANGE LEVEL3_POUNCE_RANGE + 3.0f #define LEVEL3_POUNCE_WIDTH 14.0f #define LEVEL3_POUNCE_TIME 800 // msec for full Dragoon pounce @@ -440,6 +440,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define FLAMER_REPEAT 200 #define FLAMER_K_SCALE 1.0f #define FLAMER_DMG HDM(25) +#define FLAMER_SPLASHDAMAGE HDM(12) #define FLAMER_RADIUS 50 // splash radius #define FLAMER_SIZE 15 // missile bounding box #define FLAMER_LIFETIME 700.0f @@ -616,7 +617,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define REPEATER_HEALTH HBHM(250) #define REPEATER_SPLASHDAMAGE 50 #define REPEATER_SPLASHRADIUS 100 -#define REPEATER_VALUE HBVM(2) +#define REPEATER_VALUE HBVM(REPEATER_BP) /* * HUMAN misc @@ -632,10 +633,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define HUMAN_DODGE_TIMEOUT 500 #define HUMAN_LAND_FRICTION 3.0f -#define STAMINA_STOP_RESTORE 25 +#define STAMINA_STOP_RESTORE 30 #define STAMINA_WALK_RESTORE 15 #define STAMINA_MEDISTAT_RESTORE 30 // stacked on STOP or WALK -#define STAMINA_SPRINT_TAKE 8 +#define STAMINA_SPRINT_TAKE 6 #define STAMINA_JUMP_TAKE 250 #define STAMINA_DODGE_TAKE 250 #define STAMINA_MAX 1000 |