rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-01-22 09:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Kevlar hits didnt tell the target who was shooting or of the kevlar got hit

Browse source
This commit is contained in:
Richard Allen 2002-08-27 11:28:43 +00:00
parent f5c7b279a5
commit 0f09fa84d5
2 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reaction/ChangeLog
View file

@ -56,6 +56,7 @@
* Fixed dropped weapons and items blocking doors and other movers. * Fixed dropped weapons and items blocking doors and other movers.
* Added ref say command to talk to everyone, dead or alive * Added ref say command to talk to everyone, dead or alive
* Players can now use the kill cmd, plummet and kill teammates after rounds in tp without loosing frags. * Players can now use the kill cmd, plummet and kill teammates after rounds in tp without loosing frags.
* Fixed message for players wearing a kevlar vest and get hiot by weapons other than the SSG

40
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.123 2002/08/27 11:28:43 jbravo
// Kevlar hits didnt tell the target who was shooting or of the kevlar got hit
//
// Revision 1.122 2002/08/27 07:50:55 jbravo // Revision 1.122 2002/08/27 07:50:55 jbravo
// Players can now use the kill cmd, plummet and kill teammates after rounds in // Players can now use the kill cmd, plummet and kill teammates after rounds in
// tp without loosing frags. // tp without loosing frags.
@ -2153,7 +2156,7 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
switch (targ->client->lasthurt_location) { switch (targ->client->lasthurt_location) {
case LOCATION_HEAD: case LOCATION_HEAD:
if (attacker->client && level.team_round_going) if (attacker->client && ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY))
attacker->client->pers.records[REC_HEADSHOTS]++; attacker->client->pers.records[REC_HEADSHOTS]++;
//save headshot time for player_die //save headshot time for player_die
targ->client->headShotTime = level.time; targ->client->headShotTime = level.time;
@ -2177,51 +2180,36 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
take *= 1.8; //+ 1; take *= 1.8; //+ 1;
break; break;
case LOCATION_CHEST: case LOCATION_CHEST:
if (attacker->client && level.team_round_going) if (attacker->client && ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY))
attacker->client->pers.records[REC_CHESTSHOTS]++; attacker->client->pers.records[REC_CHESTSHOTS]++;
// Vest stuff - is the knife supposed to be affected? // Vest stuff - is the knife supposed to be affected?
// NiceAss: Added mod != MOD_KNIFE_THROWN so kevlar doesn't help against thrown knives // NiceAss: Added mod != MOD_KNIFE_THROWN so kevlar doesn't help against thrown knives
// JBravo: added mod != MOD_KNIFE so kevlar doesn't help against slashing knives either // JBravo: added mod != MOD_KNIFE so kevlar doesn't help against slashing knives either
if (bg_itemlist[targ->client->ps.stats[STAT_HOLDABLE_ITEM]].giTag == HI_KEVLAR if (bg_itemlist[targ->client->ps.stats[STAT_HOLDABLE_ITEM]].giTag == HI_KEVLAR &&
&& mod != MOD_KNIFE_THROWN && mod != MOD_KNIFE) { mod != MOD_KNIFE_THROWN && mod != MOD_KNIFE) {
targ->client->kevlarHit = qtrue; targ->client->kevlarHit = qtrue;
if (attacker->client->ps.weapon == WP_SSG3000) { if (attacker->client->ps.weapon == WP_SSG3000) {
trap_SendServerCommand(attacker - g_entities, trap_SendServerCommand(attacker - g_entities,
va va("print \"%s^7 has a Kevlar Vest, too bad you have AP rounds...\n\"",
("print \"%s ^7has a Kevlar Vest, too bad you have AP rounds...\n\"",
targ->client->pers.netname)); targ->client->pers.netname));
trap_SendServerCommand(targ - g_entities, trap_SendServerCommand(targ - g_entities,
va va("print \"Kevlar Vest absorbed some of %s^7's AP sniper round\n\"",
("print \"Kevlar Vest absorbed some of %s^7's AP sniper round\n\"",
attacker->client->pers.netname)); attacker->client->pers.netname));
take = take * 0.325; take = take * 0.325;
} else { } else {
if (mod != MOD_KNIFE && mod != MOD_KNIFE_THROWN) {
trap_SendServerCommand(attacker - g_entities, trap_SendServerCommand(attacker - g_entities,
va va("print \"%s^7 has a Kevlar Vest - AIM FOR THE HEAD!\n\"",
("print \"%s^7 has a Kevlar Vest - AIM FOR THE HEAD!\n\"",
targ->client->pers.netname));
} else {
trap_SendServerCommand(attacker - g_entities,
va
("print \"You hit %s^7 in the chest.\n\"",
targ->client->pers.netname)); targ->client->pers.netname));
trap_SendServerCommand(targ - g_entities, trap_SendServerCommand(targ - g_entities,
va va("print \"Kevlar Vest absorbed most of %s^7's shot\n\"",
("print \"Kevlar Vest absorbed most of %s ^7shot\n\"", attacker->client->pers.netname));
attacker->client->pers.
netname));
}
take = take / 10; take = take / 10;
instant_dam = 1; instant_dam = 1;
bleeding = 0; bleeding = 0;
} }
//Kevlar sound //Kevlar sound
if (mod != MOD_KNIFE && mod != MOD_KNIFE_THROWN) {
tent = G_TempEntity(targ->s.pos.trBase, EV_BULLET_HIT_KEVLAR); tent = G_TempEntity(targ->s.pos.trBase, EV_BULLET_HIT_KEVLAR);
tent->s.eventParm = DirToByte(dir); tent->s.eventParm = DirToByte(dir);
//tent = G_TempEntity2(targ->s.pos.trBase, EV_RQ3_SOUND, RQ3_SOUND_KEVLARHIT);
}
} else { } else {
trap_SendServerCommand(attacker - g_entities, trap_SendServerCommand(attacker - g_entities,
va("print \"You hit %s^7 in the chest.\n\"", va("print \"You hit %s^7 in the chest.\n\"",
@ -2232,7 +2220,7 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
} }
break; break;
case LOCATION_STOMACH: case LOCATION_STOMACH:
if (attacker->client && level.team_round_going) if (attacker->client && ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY))
attacker->client->pers.records[REC_STOMACHSHOTS]++; attacker->client->pers.records[REC_STOMACHSHOTS]++;
trap_SendServerCommand(attacker - g_entities, trap_SendServerCommand(attacker - g_entities,
va("print \"You hit %s^7 in the stomach.\n\"", va("print \"You hit %s^7 in the stomach.\n\"",
@ -2245,7 +2233,7 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
} }
break; break;
case LOCATION_LEG: case LOCATION_LEG:
if (attacker->client && level.team_round_going) if (attacker->client && ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY))
attacker->client->pers.records[REC_LEGSHOTS]++; attacker->client->pers.records[REC_LEGSHOTS]++;
trap_SendServerCommand(attacker - g_entities, trap_SendServerCommand(attacker - g_entities,
va("print \"You hit %s^7 in the leg.\n\"", va("print \"You hit %s^7 in the leg.\n\"",