summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/bg_misc.c31
-rw-r--r--src/game/bg_pmove.c3
-rw-r--r--src/game/bg_public.h1
-rw-r--r--src/game/g_weapon.c4
-rw-r--r--src/game/tremulous.h24
5 files changed, 39 insertions, 24 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 00ddf63f..ad5727ca 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -1223,7 +1223,8 @@ classAttributes_t bg_classList[ ] =
12, 12, //int viewheight, crouchviewheight;
ABUILDER_HEALTH, //int health;
ABUILDER_REGEN, //int regenRate;
- SCA_TAKESFALLDAMAGE|SCA_FOVWARPS, //int abilities;
+ SCA_TAKESFALLDAMAGE|SCA_FOVWARPS|
+ SCA_NOFOOTSTEPS, //int abilities;
WP_ABUILD, //weapon_t startWeapon
95.0f, //float buildDist;
80, //int fov;
@@ -1252,7 +1253,8 @@ classAttributes_t bg_classList[ ] =
0, 0, //int viewheight, crouchviewheight;
ABUILDER_UPG_HEALTH, //int health;
ABUILDER_UPG_REGEN, //int regenRate;
- SCA_CANJUMP|SCA_FOVWARPS|SCA_WALLCLIMBER, //int abilities;
+ SCA_CANJUMP|SCA_FOVWARPS|SCA_WALLCLIMBER|
+ SCA_NOFOOTSTEPS, //int abilities;
WP_ABUILD2, //weapon_t startWeapon
95.0f, //float buildDist;
110, //int fov;
@@ -1282,7 +1284,7 @@ classAttributes_t bg_classList[ ] =
SOLDIER_HEALTH, //int health;
SOLDIER_REGEN, //int regenRate;
SCA_WALLCLIMBER|SCA_CANJUMP|SCA_NOWEAPONDRIFT|
- SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities;
+ SCA_FOVWARPS|SCA_ALIENSENSE|SCA_NOFOOTSTEPS, //int abilities;
WP_VENOM, //weapon_t startWeapon
0.0f, //float buildDist;
140, //int fov;
@@ -1311,7 +1313,8 @@ classAttributes_t bg_classList[ ] =
6, 6, //int viewheight, crouchviewheight;
DRAGOON_HEALTH, //int health;
DRAGOON_REGEN, //int regenRate;
- SCA_CANJUMP|SCA_NOWEAPONDRIFT|SCA_FOVWARPS, //int abilities;
+ SCA_CANJUMP|SCA_NOWEAPONDRIFT|
+ SCA_FOVWARPS|SCA_ALIENSENSE|SCA_NOFOOTSTEPS, //int abilities;
WP_POUNCE, //weapon_t startWeapon
0.0f, //float buildDist;
120, //int fov;
@@ -1340,7 +1343,8 @@ classAttributes_t bg_classList[ ] =
6, 6, //int viewheight, crouchviewheight;
DRAGOON_UPG_HEALTH, //int health;
DRAGOON_UPG_REGEN, //int regenRate;
- SCA_CANJUMP|SCA_NOWEAPONDRIFT|SCA_FOVWARPS, //int abilities;
+ SCA_CANJUMP|SCA_NOWEAPONDRIFT|
+ SCA_FOVWARPS|SCA_ALIENSENSE|SCA_NOFOOTSTEPS, //int abilities;
WP_POUNCE_UPG, //weapon_t startWeapon
0.0f, //float buildDist;
120, //int fov;
@@ -1370,7 +1374,8 @@ classAttributes_t bg_classList[ ] =
HYDRA_HEALTH, //int health;
HYDRA_REGEN, //int regenRate;
SCA_CANJUMP|SCA_NOWEAPONDRIFT|
- SCA_FOVWARPS|SCA_WALLCLIMBER, //int abilities;
+ SCA_FOVWARPS|SCA_WALLCLIMBER|SCA_ALIENSENSE|
+ SCA_NOFOOTSTEPS, //int abilities;
WP_GRAB_CLAW, //weapon_t startWeapon
0.0f, //float buildDist;
120, //int fov;
@@ -1399,8 +1404,9 @@ classAttributes_t bg_classList[ ] =
6, 6, //int viewheight, crouchviewheight;
HYDRA_UPG_HEALTH, //int health;
HYDRA_UPG_REGEN, //int regenRate;
- SCA_CANJUMP|SCA_NOWEAPONDRIFT|
- SCA_FOVWARPS|SCA_WALLCLIMBER, //int abilities;
+ SCA_CANJUMP|SCA_NOWEAPONDRIFT|SCA_FOVWARPS|
+ SCA_WALLCLIMBER|SCA_ALIENSENSE|
+ SCA_NOFOOTSTEPS, //int abilities;
WP_GRAB_CLAW_UPG, //weapon_t startWeapon
0.0f, //float buildDist;
120, //int fov;
@@ -1429,7 +1435,8 @@ classAttributes_t bg_classList[ ] =
4, 4, //int viewheight, crouchviewheight;
CHIMERA_HEALTH, //int health;
CHIMERA_REGEN, //int regenRate;
- SCA_CANJUMP|SCA_NOWEAPONDRIFT|SCA_FOVWARPS, //int abilities;
+ SCA_CANJUMP|SCA_NOWEAPONDRIFT|
+ SCA_FOVWARPS|SCA_ALIENSENSE|SCA_NOFOOTSTEPS, //int abilities;
WP_AREA_ZAP, //weapon_t startWeapon
0.0f, //float buildDist;
130, //int fov;
@@ -1458,7 +1465,8 @@ classAttributes_t bg_classList[ ] =
4, 4, //int viewheight, crouchviewheight;
CHIMERA_UPG_HEALTH, //int health;
CHIMERA_UPG_REGEN, //int regenRate;
- SCA_CANJUMP|SCA_NOWEAPONDRIFT|SCA_FOVWARPS, //int abilities;
+ SCA_CANJUMP|SCA_NOWEAPONDRIFT|
+ SCA_FOVWARPS|SCA_ALIENSENSE|SCA_NOFOOTSTEPS, //int abilities;
WP_DIRECT_ZAP, //weapon_t startWeapon
0.0f, //float buildDist;
130, //int fov;
@@ -1487,7 +1495,8 @@ classAttributes_t bg_classList[ ] =
4, 4, //int viewheight, crouchviewheight;
BMOFO_HEALTH, //int health;
BMOFO_REGEN, //int regenRate;
- SCA_CANJUMP|SCA_NOWEAPONDRIFT|SCA_FOVWARPS, //int abilities;
+ SCA_CANJUMP|SCA_NOWEAPONDRIFT|
+ SCA_FOVWARPS|SCA_ALIENSENSE|SCA_NOFOOTSTEPS, //int abilities;
WP_GROUND_POUND, //weapon_t startWeapon
0.0f, //float buildDist;
130, //int fov;
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 8cf32d01..4663d2bd 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2045,7 +2045,8 @@ static void PM_Footsteps( void )
if( pm->waterlevel == 0 )
{
// on ground will only play sounds if running
- if( footstep && !pm->noFootsteps )
+ if( footstep && !pm->noFootsteps &&
+ !BG_ClassHasAbility( pm->ps->stats[ STAT_PCLASS ], SCA_NOFOOTSTEPS ) )
PM_AddEvent( PM_FootstepForSurface( ) );
}
else if( pm->waterlevel == 1 )
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 5c32a435..890c1b88 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -216,6 +216,7 @@ typedef enum
#define SCA_NOWEAPONDRIFT 0x00000010
#define SCA_FOVWARPS 0x00000020
#define SCA_ALIENSENSE 0x00000040
+#define SCA_NOFOOTSTEPS 0x00000080
#define SS_WALLCLIMBING 0x00000001
#define SS_WALLCLIMBINGCEILING 0x00000002
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index d45814d2..11eb3b0c 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -526,6 +526,8 @@ qboolean CheckVenomAttack( gentity_t *ent )
return qfalse;
if( traceEnt->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
return qfalse;
+ if( traceEnt->client->ps.stats[ STAT_HEALTH ] <= 0 )
+ return qfalse;
// send blood impact
if ( traceEnt->takedamage && traceEnt->client )
@@ -579,6 +581,8 @@ void CheckGrabAttack( gentity_t *ent )
return;
if( traceEnt->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
return;
+ if( traceEnt->client->ps.stats[ STAT_HEALTH ] <= 0 )
+ return;
if( !( traceEnt->client->ps.stats[ STAT_STATE ] & SS_GRABBED ) )
VectorCopy( traceEnt->client->ps.viewangles, traceEnt->client->ps.grapplePoint );
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index d6013204..a079a66a 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -77,7 +77,7 @@
#define BMOFO_CLAW_RANGE 64.0f
#define BMOFO_CLAW_REPEAT 750
#define BMOFO_KNOCK_RANGE 200.0f
-#define BMOFO_KNOCK_REPEAT 3000
+#define BMOFO_KNOCK_REPEAT 15000
#define BMOFO_KOVER_TIME 2000
#define BMOFO_GETUP_TIME 1000
#define BMOFO_REGEN_RANGE 200.0f
@@ -103,59 +103,59 @@
#define ABUILDER_TTE 2000
#define ABUILDER_VALUE 50
#define ABUILDER_HEALTH AHM(50)
-#define ABUILDER_REGEN 5
+#define ABUILDER_REGEN 2
#define ABUILDER_UPG_SPEED 1.0f
#define ABUILDER_UPG_VALUE 120
#define ABUILDER_UPG_HEALTH AHM(75)
-#define ABUILDER_UPG_REGEN 7
+#define ABUILDER_UPG_REGEN 3
#define SOLDIER_SPEED 1.5f
#define SOLDIER_TTE 2000
#define SOLDIER_VALUE 50
#define SOLDIER_HEALTH AHM(25)
-#define SOLDIER_REGEN 2
+#define SOLDIER_REGEN 1
#define DRAGOON_SPEED 1.5f
#define DRAGOON_TTE 3000
#define DRAGOON_VALUE 100
#define DRAGOON_HEALTH AHM(50)
-#define DRAGOON_REGEN 5
+#define DRAGOON_REGEN 2
#define DRAGOON_UPG_SPEED 1.5f
#define DRAGOON_UPG_TTE 3000
#define DRAGOON_UPG_VALUE 120
#define DRAGOON_UPG_HEALTH AHM(60)
-#define DRAGOON_UPG_REGEN 6
+#define DRAGOON_UPG_REGEN 3
#define HYDRA_SPEED 1.5f
#define HYDRA_TTE 3000
#define HYDRA_VALUE 200
#define HYDRA_HEALTH AHM(100)
-#define HYDRA_REGEN 10
+#define HYDRA_REGEN 5
#define HYDRA_UPG_SPEED 1.5f
#define HYDRA_UPG_TTE 3000
#define HYDRA_UPG_VALUE 240
#define HYDRA_UPG_HEALTH AHM(120)
-#define HYDRA_UPG_REGEN 12
+#define HYDRA_UPG_REGEN 6
#define CHIMERA_SPEED 1.3f
#define CHIMERA_TTE 3000
#define CHIMERA_VALUE 300
#define CHIMERA_HEALTH AHM(200)
-#define CHIMERA_REGEN 15
+#define CHIMERA_REGEN 7
#define CHIMERA_UPG_SPEED 1.3f
#define CHIMERA_UPG_TTE 3000
#define CHIMERA_UPG_VALUE 360
#define CHIMERA_UPG_HEALTH AHM(250)
-#define CHIMERA_UPG_REGEN 20
+#define CHIMERA_UPG_REGEN 10
#define BMOFO_SPEED 1.2f
#define BMOFO_VALUE 400
#define BMOFO_HEALTH AHM(400)
-#define BMOFO_REGEN 30
+#define BMOFO_REGEN 15
@@ -417,7 +417,7 @@
#define MGTURRET_ANGULARSPEED 20 //degrees/think ~= 200deg/sec
#define MGTURRET_ACCURACYTOLERANCE MGTURRET_ANGULARSPEED / 2 //angular difference for turret to fire
#define MGTURRET_VERTICALCAP 30 // +/- maximum pitch
-#define MGTURRET_REPEAT 50
+#define MGTURRET_REPEAT 100
#define MGTURRET_RANGE 200
#define TESLAGEN_BP 100
generated by cgit (git 2.34.1) at 2024-11-15 18:46:24 +0000