summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_misc.c10
-rw-r--r--src/game/bg_pmove.c6
-rw-r--r--src/game/bg_public.h6
-rw-r--r--src/game/g_active.c65
-rw-r--r--src/game/g_buildable.c37
5 files changed, 81 insertions, 43 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 1686f172..a6c5e644 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -438,8 +438,8 @@ buildableAttributes_t bg_buildableList[ ] =
BA_H_MGTURRET, //int buildNum;
"mgturret", //char *buildName;
"Machinegun Turret", //char *humanName;
- "Automated base defense that is effective against fast moving targets, "
- "but does not cause much damage on its own and should always be "
+ "Automated base defense that is effective against large targets, "
+ "but is slow to begin firing and should always be "
"backed up by physical support.",
"team_human_mgturret", //char *entityName;
{ "models/buildables/mgturret/turret_base.md3",
@@ -480,9 +480,9 @@ buildableAttributes_t bg_buildableList[ ] =
BA_H_TESLAGEN, //int buildNum;
"tesla", //char *buildName;
"Tesla Generator", //char *humanName;
- "A structure equipped with a strong electrical attack that always "
- "hits its target. It is useful against larger aliens "
- "and for consolidating basic defense.",
+ "A structure equipped with a strong electrical attack that fires "
+ "instantly and always hits its target. It is effective against smaller "
+ "aliens and for consolidating basic defense.",
"team_human_tesla", //char *entityName;
{ "models/buildables/tesla/tesla.md3", 0, 0, 0 },
1.0f, //float modelScale;
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 45cf89e0..a80bb5ab 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2783,6 +2783,12 @@ static void PM_Weapon( void )
qboolean attack2 = qfalse;
qboolean attack3 = qfalse;
+ // Set overcharging flag so other players can hear warning
+ pm->ps->eFlags &= ~EF_WARN_CHARGE;
+ if( pm->ps->weapon == WP_LUCIFER_CANNON &&
+ pm->ps->stats[ STAT_MISC ] > LCANNON_TOTAL_CHARGE * 2 / 3 )
+ pm->ps->eFlags |= EF_WARN_CHARGE;
+
// don't allow attack until all buttons are up
if( pm->ps->pm_flags & PMF_RESPAWNED )
return;
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index ecc284e3..6a23595e 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -244,8 +244,10 @@ typedef enum
#define SS_BOOSTED 0x00000200
#define SS_SLOWLOCKED 0x00000400
#define SS_POISONCLOUDED 0x00000800
-#define SS_MEDKIT_ACTIVE 0x00001000
-#define SS_CHARGING 0x00002000
+#define SS_CHARGING 0x00001000
+#define SS_HEALING_ACTIVE 0x00002000 // medkit for Humans, creep for Aliens
+#define SS_HEALING_2X 0x00004000 // double healing rate (for HUD)
+#define SS_HEALING_3X 0x00008000 // triple healing rate (for HUD)
#define SB_VALID_TOGGLEBIT 0x00004000
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 4e7134e2..ba1e28c8 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -669,8 +669,6 @@ void ClientTimerActions( gentity_t *ent, int msec )
client->ps.stats[ STAT_MISC2 ] <= 0 &&
client->ps.weaponstate != WEAPON_NEEDS_RESET )
{
- int ammo;
-
if( client->ps.stats[ STAT_MISC ] <= 0 )
client->lcannonStartTime = level.time;
@@ -735,7 +733,8 @@ void ClientTimerActions( gentity_t *ent, int msec )
break;
}
- if( client->ps.stats[ STAT_STATE ] & SS_MEDKIT_ACTIVE )
+ if( ent->client->pers.teamSelection == PTE_HUMANS &&
+ ( client->ps.stats[ STAT_STATE ] & SS_HEALING_ACTIVE ) )
{
int remainingStartupTime = MEDKIT_STARTUP_TIME - ( level.time - client->lastMedKitTime );
@@ -749,7 +748,7 @@ void ClientTimerActions( gentity_t *ent, int msec )
ent->health++;
}
else
- ent->client->ps.stats[ STAT_STATE ] &= ~SS_MEDKIT_ACTIVE;
+ ent->client->ps.stats[ STAT_STATE ] &= ~SS_HEALING_ACTIVE;
}
else
{
@@ -768,7 +767,7 @@ void ClientTimerActions( gentity_t *ent, int msec )
}
}
else
- ent->client->ps.stats[ STAT_STATE ] &= ~SS_MEDKIT_ACTIVE;
+ ent->client->ps.stats[ STAT_STATE ] &= ~SS_HEALING_ACTIVE;
}
}
}
@@ -794,19 +793,19 @@ void ClientTimerActions( gentity_t *ent, int msec )
G_Damage( ent, client->lastPoisonClient, client->lastPoisonClient, NULL,
0, damage, 0, MOD_POISON );
- }
+ }
//replenish alien health
if( client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS &&
- level.surrenderTeam != PTE_ALIENS )
+ level.surrenderTeam != PTE_ALIENS )
{
int entityList[ MAX_GENTITIES ];
vec3_t range = { LEVEL4_REGEN_RANGE, LEVEL4_REGEN_RANGE, LEVEL4_REGEN_RANGE };
vec3_t mins, maxs;
int i, num;
gentity_t *boostEntity;
- float modifier = 1.0f;
- qboolean modified = qfalse;
+ float modifier = 1.0f, new_modifier;
+ qboolean creep;
VectorAdd( client->ps.origin, range, maxs );
VectorSubtract( client->ps.origin, range, mins );
@@ -816,34 +815,42 @@ void ClientTimerActions( gentity_t *ent, int msec )
{
boostEntity = &g_entities[ entityList[ i ] ];
+ new_modifier = 0.0f;
if( boostEntity->s.eType == ET_BUILDABLE &&
boostEntity->s.modelindex == BA_A_BOOSTER &&
boostEntity->spawned && boostEntity->health > 0)
- {
- modifier = BOOSTER_REGEN_MOD;
- modified = qtrue;
- break;
- }
+ new_modifier = BOOSTER_REGEN_MOD;
else if( boostEntity->client && boostEntity->health > 0 &&
- boostEntity->client->pers.teamSelection == PTE_ALIENS &&
- ( boostEntity->client->pers.classSelection == PCL_ALIEN_LEVEL1 ||
- boostEntity->client->pers.classSelection == PCL_ALIEN_LEVEL1_UPG ) )
+ boostEntity->client->pers.teamSelection == PTE_ALIENS )
{
if( boostEntity->client->pers.classSelection == PCL_ALIEN_LEVEL1_UPG )
- modifier = LEVEL1_UPG_REGEN_MOD;
- else
- modifier = LEVEL1_REGEN_MOD;
-
- modified = qtrue;
- break;
+ new_modifier = LEVEL1_UPG_REGEN_MOD;
+ else if( boostEntity->client->pers.classSelection == PCL_ALIEN_LEVEL1 )
+ new_modifier = LEVEL1_REGEN_MOD;
}
+ if( new_modifier > modifier )
+ modifier = new_modifier;
}
+
+ creep = G_FindCreep( ent );
+
+ // Transmit heal rate to the client so the HUD can display it properly
+ client->ps.stats[ STAT_STATE ] &= ~( SS_HEALING_2X | SS_HEALING_3X );
+ if( modifier >= 3.0f )
+ client->ps.stats[ STAT_STATE ] |= SS_HEALING_3X;
+ else if( modifier >= 2.0f )
+
+ client->ps.stats[ STAT_STATE ] |= SS_HEALING_2X;
+ if( creep || modifier != 1.0f )
+ client->ps.stats[ STAT_STATE ] |= SS_HEALING_ACTIVE;
+ else
+ client->ps.stats[ STAT_STATE ] &= ~SS_HEALING_ACTIVE;
if( ent->health > 0 &&
- ent->health < client->ps.stats[ STAT_MAX_HEALTH ] &&
+ ent->health < client->ps.stats[ STAT_MAX_HEALTH ] &&
( ent->lastDamageTime + ALIEN_REGEN_DAMAGE_TIME ) < level.time )
{
- if( !modified && !G_FindCreep( ent ) )
+ if( modifier == 1.0f && !creep )
{
if( ( ent->lastRegenTime + ALIEN_REGEN_NOCREEP_TIME ) < level.time )
{
@@ -866,7 +873,7 @@ void ClientTimerActions( gentity_t *ent, int msec )
// turn off life support when a team admits defeat
if( client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS &&
- level.surrenderTeam == PTE_ALIENS )
+ level.surrenderTeam == PTE_ALIENS )
{
G_Damage( ent, NULL, NULL, NULL, NULL,
BG_FindRegenRateForClass( client->ps.stats[ STAT_PCLASS ] ),
@@ -891,9 +898,9 @@ void ClientTimerActions( gentity_t *ent, int msec )
if( client->ps.ammo < maxAmmo )
client->ps.ammo++;
+ }
}
}
-}
/*
====================
@@ -1508,7 +1515,7 @@ void ClientThink_real( gentity_t *ent )
BG_UpgradeIsActive( UP_MEDKIT, client->ps.stats ) )
{
//if currently using a medkit or have no need for a medkit now
- if( client->ps.stats[ STAT_STATE ] & SS_MEDKIT_ACTIVE ||
+ if( client->ps.stats[ STAT_STATE ] & SS_HEALING_ACTIVE ||
( client->ps.stats[ STAT_HEALTH ] == client->ps.stats[ STAT_MAX_HEALTH ] &&
!( client->ps.stats[ STAT_STATE ] & SS_POISONED ) ) )
{
@@ -1523,7 +1530,7 @@ void ClientThink_real( gentity_t *ent )
client->ps.stats[ STAT_STATE ] &= ~SS_POISONED;
client->poisonImmunityTime = level.time + MEDKIT_POISON_IMMUNITY_TIME;
- client->ps.stats[ STAT_STATE ] |= SS_MEDKIT_ACTIVE;
+ client->ps.stats[ STAT_STATE ] |= SS_HEALING_ACTIVE;
client->lastMedKitTime = level.time;
client->medKitHealthToRestore =
client->ps.stats[ STAT_MAX_HEALTH ] - client->ps.stats[ STAT_HEALTH ];
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index ec3c76fd..7ef5054e 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -1952,6 +1952,23 @@ void HDCC_Think( gentity_t *self )
/*
================
+HMedistat_Die
+
+Die function for Human Medistation
+================
+*/
+void HMedistat_Die( gentity_t *self, gentity_t *inflictor,
+ gentity_t *attacker, int damage, int mod )
+{
+ //clear target's healing flag
+ if( self->enemy && self->enemy->client )
+ self->enemy->client->ps.stats[ STAT_STATE ] &= ~SS_HEALING_3X;
+
+ HSpawn_Die( self, inflictor, attacker, damage, mod );
+}
+
+/*
+================
HMedistat_Think
think function for Human Medistation
@@ -1967,6 +1984,10 @@ void HMedistat_Think( gentity_t *self )
self->nextthink = level.time + BG_FindNextThinkForBuildable( self->s.modelindex );
+ //clear target's healing flag
+ if( self->enemy && self->enemy->client )
+ self->enemy->client->ps.stats[ STAT_STATE ] &= ~SS_HEALING_3X;
+
//make sure we have power
if( !( self->powered = G_FindPower( self ) ) )
{
@@ -1993,19 +2014,20 @@ void HMedistat_Think( gentity_t *self )
//if active use the healing idle
if( self->active )
G_SetIdleBuildableAnim( self, BANIM_IDLE2 );
-
+
//check if a previous occupier is still here
num = trap_EntitiesInBox( mins, maxs, entityList, MAX_GENTITIES );
for( i = 0; i < num; i++ )
{
player = &g_entities[ entityList[ i ] ];
- if( player->client && player->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
+ if( self->enemy == player && player->client &&
+ player->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS &&
+ player->health < player->client->ps.stats[ STAT_MAX_HEALTH ] &&
+ player->client->ps.pm_type != PM_DEAD )
{
- if( player->health < player->client->ps.stats[ STAT_MAX_HEALTH ] &&
- player->client->ps.pm_type != PM_DEAD &&
- self->enemy == player )
- occupied = qtrue;
+ occupied = qtrue;
+ player->client->ps.stats[ STAT_STATE ] |= SS_HEALING_3X;
}
}
@@ -2031,6 +2053,7 @@ void HMedistat_Think( gentity_t *self )
{
G_SetBuildableAnim( self, BANIM_ATTACK1, qfalse );
self->active = qtrue;
+ player->client->ps.stats[ STAT_STATE ] |= SS_HEALING_3X;
}
}
else if( !BG_InventoryContainsUpgrade( UP_MEDKIT, player->client->ps.stats ) )
@@ -3414,7 +3437,7 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable, vec3_t ori
case BA_H_MEDISTAT:
built->think = HMedistat_Think;
- built->die = HSpawn_Die;
+ built->die = HMedistat_Die;
break;
case BA_H_REACTOR:
generated by cgit (git 2.34.1) at 2025-04-03 10:39:47 +0000