summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_event.c93
-rw-r--r--src/game/bg_public.h22
-rw-r--r--src/game/g_buildable.c4
-rw-r--r--src/game/g_missile.c20
-rw-r--r--src/game/g_weapon.c6
5 files changed, 52 insertions, 93 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index cdfd8718..02070fef 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -70,13 +70,13 @@ static void CG_Obituary( entityState_t *ent )
message = "suicides";
break;
case MOD_FALLING:
- message = "cratered";
+ message = "fell fowl to gravity";
break;
case MOD_CRUSH:
message = "was squished";
break;
case MOD_WATER:
- message = "sank like a rock";
+ message = "forgot to pack a snorkel";
break;
case MOD_SLIME:
message = "melted";
@@ -96,6 +96,21 @@ static void CG_Obituary( entityState_t *ent )
case MOD_ASPAWN:
message = "was melted by the acid blood";
break;
+ case MOD_MACHINEGUN:
+ message = "was gunned down by a turret";
+ break;
+ case MOD_TESLAGEN:
+ message = "was zapped by a tesla generator";
+ break;
+ case MOD_ATUBE:
+ message = "was melted by an acid tube";
+ break;
+ case MOD_OVERMIND:
+ message = "got too close to the overmind";
+ break;
+ case MOD_SLOWBLOB:
+ message = "should have visited a medical station";
+ break;
default:
message = NULL;
break;
@@ -106,24 +121,6 @@ static void CG_Obituary( entityState_t *ent )
gender = ci->gender;
switch( mod )
{
- case MOD_GRENADE_SPLASH:
- if( gender == GENDER_FEMALE )
- message = "tripped on her own grenade";
- else if( gender == GENDER_NEUTER )
- message = "tripped on its own grenade";
- else
- message = "tripped on his own grenade";
- break;
-
- case MOD_ROCKET_SPLASH:
- if( gender == GENDER_FEMALE )
- message = "blew herself up";
- else if( gender == GENDER_NEUTER )
- message = "blew itself up";
- else
- message = "blew himself up";
- break;
-
case MOD_FLAMER_SPLASH:
if( gender == GENDER_FEMALE )
message = "toasted herself";
@@ -133,10 +130,6 @@ static void CG_Obituary( entityState_t *ent )
message = "toasted himself";
break;
- case MOD_BFG_SPLASH:
- message = "should have used a smaller gun";
- break;
-
default:
if( gender == GENDER_FEMALE )
message = "killed herself";
@@ -154,17 +147,6 @@ static void CG_Obituary( entityState_t *ent )
return;
}
- // check for kill messages from the current clientNum
- if( attacker == cg.snap->ps.clientNum )
- {
- char *s;
-
-/* s = va( "You fragged %s", targetName );
- CG_CenterPrint( s, SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );*/
-
- // print the text message as well
- }
-
// check for double client messages
if( !attackerInfo )
{
@@ -184,11 +166,8 @@ static void CG_Obituary( entityState_t *ent )
{
switch( mod )
{
- case MOD_GRAPPLE:
- message = "was caught by";
- break;
- case MOD_GAUNTLET:
- message = "was pummeled by";
+ case MOD_BLASTER:
+ message = "was blasted by";
break;
case MOD_MACHINEGUN:
message = "was machinegunned by";
@@ -199,44 +178,28 @@ static void CG_Obituary( entityState_t *ent )
case MOD_SHOTGUN:
message = "was gunned down by";
break;
- case MOD_GRENADE:
- message = "ate";
- message2 = "'s grenade";
- break;
- case MOD_GRENADE_SPLASH:
- message = "was shredded by";
- message2 = "'s shrapnel";
- break;
- case MOD_ROCKET:
- message = "ate";
- message2 = "'s rocket";
- break;
- case MOD_ROCKET_SPLASH:
- message = "almost dodged";
- message2 = "'s rocket";
+ case MOD_PRIFLE:
+ message = "was pulse rifled by";
break;
case MOD_FLAMER:
- message = "was toasted by";
+ message = "was grilled by";
message2 = "'s flamer";
break;
case MOD_FLAMER_SPLASH:
message = "was toasted by";
message2 = "'s flamer";
break;
- case MOD_RAILGUN:
- message = "was railed by";
+ case MOD_LCANNON:
+ message = "felt the full force of";
+ message2 = "'s lucifer cannon";
break;
- case MOD_LIGHTNING:
- message = "was electrocuted by";
+ case MOD_LCANNON_SPLASH:
+ message = "was caught in the fallout of";
+ message2 = "'s lucifer cannon";
break;
case MOD_VENOM:
message = "was biten by";
break;
- case MOD_BFG:
- case MOD_BFG_SPLASH:
- message = "was blasted by";
- message2 = "'s BFG";
- break;
case MOD_TELEFRAG:
message = "tried to invade";
message2 = "'s personal space";
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 4ed62ec7..7984645c 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -781,19 +781,14 @@ typedef enum
{
MOD_UNKNOWN,
MOD_SHOTGUN,
- MOD_GAUNTLET,
+ MOD_BLASTER,
MOD_MACHINEGUN,
MOD_CHAINGUN,
- MOD_GRENADE,
- MOD_GRENADE_SPLASH,
- MOD_ROCKET,
- MOD_ROCKET_SPLASH,
+ MOD_PRIFLE,
+ MOD_LCANNON,
+ MOD_LCANNON_SPLASH,
MOD_FLAMER,
MOD_FLAMER_SPLASH,
- MOD_RAILGUN,
- MOD_LIGHTNING,
- MOD_BFG,
- MOD_BFG_SPLASH,
MOD_WATER,
MOD_SLIME,
MOD_LAVA,
@@ -803,10 +798,15 @@ typedef enum
MOD_SUICIDE,
MOD_TARGET_LASER,
MOD_TRIGGER_HURT,
- MOD_GRAPPLE,
+
MOD_VENOM,
+ MOD_SLOWBLOB,
+
MOD_HSPAWN,
- MOD_ASPAWN
+ MOD_TESLAGEN,
+ MOD_ASPAWN,
+ MOD_ATUBE,
+ MOD_OVERMIND
} meansOfDeath_t;
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 224efc72..c10df521 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -447,7 +447,7 @@ void ASpawn_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
self->think = ASpawn_Blast;
self->nextthink = level.time + 5000; //wait .5 seconds before damaging others
- if( attacker && attacker->client )
+ if( attacker && attacker->client && attacker->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
{
if( self->s.modelindex == BA_A_OVERMIND )
attacker->client->ps.persistant[ PERS_CREDIT ] += OVERMIND_VALUE;
@@ -1743,7 +1743,7 @@ void HSpawn_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
self->nextthink = level.time + HUMAN_DETONATION_DELAY;
self->powered = qfalse; //free up power
- if( attacker && attacker->client )
+ if( attacker && attacker->client && attacker->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
{
if( self->s.modelindex == BA_H_REACTOR )
attacker->client->ps.persistant[ PERS_CREDIT ] += REACTOR_VALUE;
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index e106aff9..76f3cd10 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -312,8 +312,8 @@ gentity_t *fire_blaster( gentity_t *self, vec3_t start, vec3_t dir )
bolt->damage = BLASTER_DMG;
bolt->splashDamage = 0;
bolt->splashRadius = 0;
- //bolt->methodOfDeath = MOD_FLAMER;
- //bolt->splashMethodOfDeath = MOD_FLAMER_SPLASH;
+ bolt->methodOfDeath = MOD_BLASTER;
+ bolt->splashMethodOfDeath = MOD_BLASTER;
bolt->clipmask = MASK_SHOT;
bolt->target_ent = NULL;
@@ -354,8 +354,8 @@ gentity_t *fire_pulseRifle( gentity_t *self, vec3_t start, vec3_t dir )
bolt->damage = PRIFLE_DMG;
bolt->splashDamage = 0;
bolt->splashRadius = 0;
- //bolt->methodOfDeath = MOD_FLAMER;
- //bolt->splashMethodOfDeath = MOD_FLAMER_SPLASH;
+ bolt->methodOfDeath = MOD_PRIFLE;
+ bolt->splashMethodOfDeath = MOD_PRIFLE;
bolt->clipmask = MASK_SHOT;
bolt->target_ent = NULL;
@@ -399,8 +399,8 @@ gentity_t *fire_luciferCannon( gentity_t *self, vec3_t start, vec3_t dir, int da
bolt->splashDamage = localDamage / 2;
bolt->splashRadius = localDamage;
bolt->s.generic1 = damage;
- //bolt->methodOfDeath = MOD_FLAMER;
- //bolt->splashMethodOfDeath = MOD_FLAMER_SPLASH;
+ bolt->methodOfDeath = MOD_LCANNON;
+ bolt->splashMethodOfDeath = MOD_LCANNON_SPLASH;
bolt->clipmask = MASK_SHOT;
bolt->target_ent = NULL;
@@ -440,8 +440,6 @@ gentity_t *fire_lockblob( gentity_t *self, vec3_t start, vec3_t dir )
bolt->damage = 0;
bolt->splashDamage = 0;
bolt->splashRadius = 0;
- bolt->methodOfDeath = MOD_ROCKET;
- bolt->splashMethodOfDeath = MOD_ROCKET_SPLASH;
bolt->clipmask = MASK_SHOT;
bolt->target_ent = NULL;
@@ -478,8 +476,8 @@ gentity_t *fire_slowBlob( gentity_t *self, vec3_t start, vec3_t dir )
bolt->damage = DRAGOON_SLOWBLOB_DMG;
bolt->splashDamage = 0;
bolt->splashRadius = 0;
- bolt->methodOfDeath = MOD_ROCKET;
- bolt->splashMethodOfDeath = MOD_ROCKET_SPLASH;
+ bolt->methodOfDeath = MOD_SLOWBLOB;
+ bolt->splashMethodOfDeath = MOD_SLOWBLOB;
bolt->clipmask = MASK_SHOT;
bolt->target_ent = NULL;
@@ -516,8 +514,6 @@ gentity_t *fire_paraLockBlob( gentity_t *self, vec3_t start, vec3_t dir )
bolt->damage = 0;
bolt->splashDamage = 0;
bolt->splashRadius = 0;
- bolt->methodOfDeath = MOD_ROCKET;
- bolt->splashMethodOfDeath = MOD_ROCKET_SPLASH;
bolt->clipmask = MASK_SHOT;
bolt->target_ent = NULL;
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 2d9d0744..06be1359 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -402,7 +402,7 @@ void teslaFire( gentity_t *ent )
if( traceEnt->takedamage)
{
G_Damage( traceEnt, ent, ent, forward, tr.endpos,
- damage, 0, MOD_LIGHTNING);
+ damage, 0, MOD_TESLAGEN );
}
// snap the endpos to integers to save net bandwidth, but nudged towards the line
@@ -774,7 +774,7 @@ void areaZapFire( gentity_t *ent )
//do some damage
G_Damage( enemy, ent, ent, dir, tr.endpos,
- damage, DAMAGE_NO_KNOCKBACK, MOD_LIGHTNING );
+ damage, DAMAGE_NO_KNOCKBACK, MOD_TESLAGEN );
// snap the endpos to integers to save net bandwidth, but nudged towards the line
SnapVectorTowards( tr.endpos, muzzle );
@@ -846,7 +846,7 @@ void directZapFire( gentity_t *ent )
{
//do some damage
G_Damage( target, ent, ent, dir, tr.endpos,
- CHIMERA_DIRECTZAP_DMG, DAMAGE_NO_KNOCKBACK, MOD_LIGHTNING );
+ CHIMERA_DIRECTZAP_DMG, DAMAGE_NO_KNOCKBACK, MOD_TESLAGEN );
// snap the endpos to integers to save net bandwidth, but nudged towards the line
SnapVectorTowards( tr.endpos, muzzle );
generated by cgit (git 2.34.1) at 2024-11-15 07:21:42 +0000