summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_local.h4
-rw-r--r--src/cgame/cg_main.c5
-rw-r--r--src/cgame/cg_players.c8
-rw-r--r--src/game/bg_misc.c39
-rw-r--r--src/game/bg_public.h3
-rw-r--r--src/game/g_active.c6
-rw-r--r--src/game/g_combat.c10
-rw-r--r--src/game/g_local.h2
-rw-r--r--src/game/g_missile.c6
-rw-r--r--src/game/g_weapon.c2
-rw-r--r--src/game/tremulous.h4
11 files changed, 27 insertions, 62 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 435de800..0ddf6574 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -937,10 +937,8 @@ typedef struct
qhandle_t helmetModel;
qhandle_t helmetSkin;
+ //light armour
qhandle_t larmourLegsSkin;
-
- qhandle_t carmourTorsoSkin;
- qhandle_t clarmourTorsoSkin;
qhandle_t larmourTorsoSkin;
qhandle_t jetpackModel;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index d651f329..f41de737 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -884,10 +884,7 @@ static void CG_RegisterClients( void )
cgs.media.helmetSkin = trap_R_RegisterSkin( "models/players/human_base/helmet_default.skin" );
cgs.media.larmourLegsSkin = trap_R_RegisterSkin( "models/players/sarge/lower_red.skin" );
-
- cgs.media.carmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_krusade.skin" );
- cgs.media.clarmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_roderic.skin" );
- cgs.media.larmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_blue.skin" );
+ cgs.media.larmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_red.skin" );
cgs.media.jetpackModel = trap_R_RegisterModel( "models/players/human_base/jetpack.md3" );
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index 7d49ae2f..4bfd4969 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -2031,7 +2031,7 @@ void CG_Player( centity_t *cent )
{
legs.hModel = ci->legsModel;
- if( held & ( 1 << UP_LIMBARMOUR ) )
+ if( held & ( 1 << UP_LIGHTARMOUR ) )
legs.customSkin = cgs.media.larmourLegsSkin;
else
legs.customSkin = ci->legsSkin;
@@ -2096,11 +2096,7 @@ void CG_Player( centity_t *cent )
//
torso.hModel = ci->torsoModel;
- if( ( held & ( 1 << UP_LIMBARMOUR ) ) && ( held & ( 1 << UP_CHESTARMOUR ) ) )
- torso.customSkin = cgs.media.clarmourTorsoSkin;
- else if( held & ( 1 << UP_CHESTARMOUR ) )
- torso.customSkin = cgs.media.carmourTorsoSkin;
- else if( held & ( 1 << UP_LIMBARMOUR ) )
+ if( held & ( 1 << UP_LIGHTARMOUR ) )
torso.customSkin = cgs.media.larmourTorsoSkin;
else
torso.customSkin = ci->torsoSkin;
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 75d2078e..f5037629 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -2923,26 +2923,13 @@ WUTeam_t BG_FindTeamForWeapon( int weapon )
upgradeAttributes_t bg_upgrades[ ] =
{
{
- UP_CHESTARMOUR, //int upgradeNum;
- CHESTARMOUR_PRICE, //int price;
+ UP_LIGHTARMOUR, //int upgradeNum;
+ LIGHTARMOUR_PRICE, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
- SLOT_TORSO, //int slots;
- "carmour", //char *upgradeName;
- "Chest Armour", //char *upgradeHumanName;
- "icons/iconw_bfg",
- WP_NONE, //weapon_t weaponAmmo;
- 0, //int ammo;
- 0, //int clips;
- WUT_HUMANS //WUTeam_t team;
- },
- {
- UP_LIMBARMOUR, //int upgradeNum;
- LIMBARMOUR_PRICE, //int price;
- ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
- SLOT_ARMS|SLOT_LEGS, //int slots;
+ SLOT_TORSO|SLOT_ARMS|SLOT_LEGS, //int slots;
"larmour", //char *upgradeName;
- "Limb Armour", //char *upgradeHumanName;
- "icons/iconw_plasma",
+ "Light Armour", //char *upgradeHumanName;
+ "icons/iconu_larmour",
WP_NONE, //weapon_t weaponAmmo;
0, //int ammo;
0, //int clips;
@@ -2955,7 +2942,7 @@ upgradeAttributes_t bg_upgrades[ ] =
SLOT_HEAD, //int slots;
"helmet", //char *upgradeName;
"Helmet", //char *upgradeHumanName;
- "icons/iconw_gauntlet",
+ "icons/iconu_helmet",
WP_NONE, //weapon_t weaponAmmo;
0, //int ammo;
0, //int clips;
@@ -2968,7 +2955,7 @@ upgradeAttributes_t bg_upgrades[ ] =
SLOT_NONE, //int slots;
"atoxin", //char *upgradeName;
"Anti-toxin", //char *upgradeHumanName;
- "icons/iconw_machinegun",
+ "icons/iconu_atoxin",
WP_NONE, //weapon_t weaponAmmo;
0, //int ammo;
0, //int clips;
@@ -2981,7 +2968,7 @@ upgradeAttributes_t bg_upgrades[ ] =
SLOT_BACKPACK, //int slots;
"battpack", //char *upgradeName;
"Battery Pack", //char *upgradeHumanName;
- "icons/iconw_gauntlet",
+ "icons/iconu_battpack",
WP_NONE, //weapon_t weaponAmmo;
0, //int ammo;
0, //int clips;
@@ -2994,7 +2981,7 @@ upgradeAttributes_t bg_upgrades[ ] =
SLOT_BACKPACK, //int slots;
"jetpack", //char *upgradeName;
"Jet Pack", //char *upgradeHumanName;
- "icons/iconw_gauntlet",
+ "icons/iconu_jetpack",
WP_NONE, //weapon_t weaponAmmo;
0, //int ammo;
0, //int clips;
@@ -3007,7 +2994,7 @@ upgradeAttributes_t bg_upgrades[ ] =
SLOT_HEAD|SLOT_TORSO|SLOT_ARMS|SLOT_LEGS, //int slots;
"bsuit", //char *upgradeName;
"Battlesuit", //char *upgradeHumanName;
- "icons/iconw_gauntlet",
+ "icons/iconu_bsuit",
WP_NONE, //weapon_t weaponAmmo;
0, //int ammo;
0, //int clips;
@@ -3020,7 +3007,7 @@ upgradeAttributes_t bg_upgrades[ ] =
SLOT_NONE, //int slots;
"mgclip", //char *upgradeName;
"1 Rifle Clip", //char *upgradeHumanName;
- "icons/iconw_gauntlet",
+ 0,
WP_MACHINEGUN, //weapon_t weaponAmmo;
0, //int ammo;
1, //int clips;
@@ -3033,7 +3020,7 @@ upgradeAttributes_t bg_upgrades[ ] =
SLOT_NONE, //int slots;
"cgammo", //char *upgradeName;
"Chaingun bullets", //char *upgradeHumanName;
- "icons/iconw_gauntlet",
+ 0,
WP_CHAINGUN, //weapon_t weaponAmmo;
100, //int ammo;
0, //int clips;
@@ -3046,7 +3033,7 @@ upgradeAttributes_t bg_upgrades[ ] =
SLOT_NONE, //int slots;
"gas", //char *upgradeName;
"Flamer gas", //char *upgradeHumanName;
- "icons/iconw_gauntlet",
+ 0,
WP_FLAMER, //weapon_t weaponAmmo;
200, //int ammo;
0, //int clips;
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index dd2f6a15..9ca3d6a1 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -349,8 +349,7 @@ typedef enum
{
UP_NONE,
- UP_CHESTARMOUR,
- UP_LIMBARMOUR,
+ UP_LIGHTARMOUR,
UP_HELMET,
UP_ANTITOXIN,
UP_BATTPACK,
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 4f6726d0..df7a2111 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -429,7 +429,7 @@ void ClientTimerActions( gentity_t *ent, int msec )
if( ( client->ps.stats[ STAT_STATE ] & SS_SPEEDBOOST ) && ucmd->upmove >= 0 )
{
//subtract stamina
- if( BG_gotItem( UP_LIMBARMOUR, client->ps.stats ) )
+ if( BG_gotItem( UP_LIGHTARMOUR, client->ps.stats ) )
client->ps.stats[ STAT_STAMINA ] -= STAMINA_LARMOUR_TAKE;
else
client->ps.stats[ STAT_STAMINA ] -= STAMINA_SPRINT_TAKE;
@@ -484,7 +484,7 @@ void ClientTimerActions( gentity_t *ent, int msec )
client->ps.stats[ STAT_MISC ] = DRAGOON_POUNCE_SPEED;
}
- //client is charging up an lcanon
+ //client is charging up an lcannon
if( client->ps.weapon == WP_LUCIFER_CANNON )
{
int ammo;
@@ -939,7 +939,7 @@ void ClientThink_real( gentity_t *ent )
( temp_v[ 2 ] <= 21 ) && //assumes mins of player is (x, x, -24)
( client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) )
{
- if( BG_gotItem( UP_LIMBARMOUR, client->ps.stats ) )
+ if( BG_gotItem( UP_LIGHTARMOUR, client->ps.stats ) )
client->ps.speed *= 0.75;
else
client->ps.speed *= 0.5;
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 96c9c55a..6cd67f6e 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -907,16 +907,6 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
return;
}
- // battlesuit protects from all radius damage (but takes knockback)
- // and protects 50% against all damage
- /*if ( client && client->ps.powerups[PW_BATTLESUIT] ) {
- G_AddEvent( targ, EV_POWERUP_BATTLESUIT, 0 );
- if ( ( dflags & DAMAGE_RADIUS ) || ( mod == MOD_FALLING ) ) {
- return;
- }
- damage *= 0.5;
- }*/
-
// add to the attacker's hit counter
if( attacker->client && targ != attacker && targ->health > 0
&& targ->s.eType != ET_MISSILE
diff --git a/src/game/g_local.h b/src/game/g_local.h
index c0fd6981..699258f5 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -624,7 +624,7 @@ void G_RunMissile( gentity_t *ent );
gentity_t *fire_flamer( gentity_t *self, vec3_t start, vec3_t aimdir );
gentity_t *fire_plasma( gentity_t *self, vec3_t start, vec3_t aimdir );
gentity_t *fire_pulseRifle( gentity_t *self, vec3_t start, vec3_t dir );
-gentity_t *fire_luciferCanon( gentity_t *self, vec3_t start, vec3_t dir, int damage );
+gentity_t *fire_luciferCannon( gentity_t *self, vec3_t start, vec3_t dir, int damage );
gentity_t *fire_lockblob( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *fire_paraLockBlob( gentity_t *self, vec3_t start, vec3_t dir );
gentity_t *fire_slowBlob( gentity_t *self, vec3_t start, vec3_t dir );
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index 5efecd70..9cbbad15 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -332,11 +332,11 @@ gentity_t *fire_pulseRifle( gentity_t *self, vec3_t start, vec3_t dir )
/*
=================
-fire_luciferCanon
+fire_luciferCannon
=================
*/
-gentity_t *fire_luciferCanon( gentity_t *self, vec3_t start, vec3_t dir, int damage )
+gentity_t *fire_luciferCannon( gentity_t *self, vec3_t start, vec3_t dir, int damage )
{
gentity_t *bolt;
int localDamage = (int)( ceil( ( (float)damage /
@@ -345,7 +345,7 @@ gentity_t *fire_luciferCanon( gentity_t *self, vec3_t start, vec3_t dir, int dam
VectorNormalize( dir );
bolt = G_Spawn( );
- bolt->classname = "lcanon";
+ bolt->classname = "lcannon";
bolt->nextthink = level.time + 10000;
bolt->think = G_ExplodeMissile;
bolt->s.eType = ET_MISSILE;
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 731f1269..e058a769 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -350,7 +350,7 @@ void LCChargeFire( gentity_t *ent, qboolean secondary )
if( secondary )
ent->client->ps.stats[ STAT_MISC ] = LCANNON_SECONDARY_DAMAGE;
- m = fire_luciferCanon( ent, muzzle, forward, ent->client->ps.stats[ STAT_MISC ] );
+ m = fire_luciferCannon( ent, muzzle, forward, ent->client->ps.stats[ STAT_MISC ] );
ent->client->ps.stats[ STAT_MISC ] = 0;
}
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index d21d5a62..fd7c013e 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -350,9 +350,7 @@
* HUMAN upgrades
*/
-#define CHESTARMOUR_PRICE 75
-
-#define LIMBARMOUR_PRICE 50
+#define LIGHTARMOUR_PRICE 100
#define HELMET_PRICE 90
#define HELMET_RANGE 1000.0f
generated by cgit (git 2.34.1) at 2024-11-15 07:21:08 +0000