qf/prozac-qfcc
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/prozac-qfcc synced 2024-11-09 23:01:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

rip out OTR code, rewrite later but still have off by default

Browse source
This commit is contained in:
Finny Merrill 2004-02-17 04:31:17 +00:00
parent dd93fa9b21
commit 4e641d72fc
3 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
obituary.qc
View file

@ -1103,10 +1103,13 @@ void (entity targ, entity attacker) Obituary_Player_by_Player =
deathstring2 = "\n";
}
} else if (deathmsg == DMSG_SNIPERRIFLE) {
#ifdef OTR // OTR out
if (attacker.cutf_items & CUTF_OTR) {
deathstring = " learns from ";
deathstring2 = " what an OTR bullet is\n";
} else {
} else
#endif
{
if (random () < FRAC (1, 2)) {
deathstring = " takes a bullet in the chest from ";
deathstring2 = "\n";
@ -1116,10 +1119,13 @@ void (entity targ, entity attacker) Obituary_Player_by_Player =
}
}
} else if (deathmsg == DMSG_SNIPERHEADSHOT) {
#ifdef OTR // OTR out
if (attacker.cutf_items & CUTF_OTR && random () < FRAC (3, 5)) {
deathstring = "'s head flies away due to ";
deathstring2 = " and his OTR bullets\n";
} else {
} else
#endif
{
if (random () < FRAC (1, 2)) {
deathstring = " gets a third eye from ";
deathstring2 = "\n";
@ -1129,10 +1135,13 @@ void (entity targ, entity attacker) Obituary_Player_by_Player =
}
}
} else if (deathmsg == DMSG_SNIPERLEGSHOT) {
#ifdef OTR // OTR out
if (attacker.cutf_items & CUTF_OTR && random () < FRAC (1, 4)) {
deathstring = " owns a metallic replacement for his legs from ";
deathstring2 = "\n";
} else {
} else
#endif
{
if (random () < FRAC (1, 2)) {
deathstring = " is made legless by ";
deathstring2 = "\n";

2
ofndefs.qh
View file

@ -37,8 +37,6 @@
#define SCRAG_DMG 29 // damage the scrag does
#define WAYPOINT_LIFE 240 // 120 after this amount of seconds any unused waypoint will be removed
#define OTR_DMGFACTOR 0.6 // How much damage OTR does normally (should not be more than 1)
#define OTR_IGNFACTOR 0.3 // How much armor-piercing damage OTR does (this + dmgfactor should be slightly <1)
#define SENTRY_UNLOCKTIME 2.5 // (must be greater than 1.1) time for the sentries to begin to rotate after they have no target (+/- 1 second)
#define HAX_UNSTABLEDIST 300 // distance at which enemy hacks take longer cause of "unstable connection"
#define WAYPOINT_AI_LIFE 10 // life for grunty ai created waypoints - last seen enemy mark

36
weapons.qc
View file

@ -1237,7 +1237,6 @@ void() W_FireSniperRifle =
sound (self ,CHAN_WEAPON, "weapons/sniper.wav", 1, ATTN_NORM);
KickPlayer(-2, self);
// self.currentammo = self.ammo_shells = self.ammo_shells - 1; // ofn moved!
angle = self.v_angle;
@ -1286,11 +1285,13 @@ void() W_FireSniperRifle =
if (!dam_mult)
dam_mult = SNIPER_DMG;
#if 0 // otr out
if (self.cutf_items & CUTF_OTR)
{
ign_mult=dam_mult*OTR_IGNFACTOR;
dam_mult=dam_mult*OTR_DMGFACTOR;
}
#endif
self.ammo_shells -= 5;
W_SetCurrentAmmo();
@ -1322,21 +1323,24 @@ void() W_FireSniperRifle =
if (zdif < 0) {
// leg shot doesn't hurt very much
dam_mult *= 0.40;
ign_mult *= 0.40;
if ((dam_mult + ign_mult) > SNIPER_MAXLEG)
if (dam_mult > SNIPER_MAXLEG)
{
dam_mult *= (dam_mult + ign_mult) / SNIPER_MAXLEG;
ign_mult *= (dam_mult + ign_mult) / SNIPER_MAXLEG;
dam_mult = SNIPER_MAXLEG;
}
if (trace_ent.armorvalue < 0.8)
trace_ent.leg_damage++;
if (trace_ent.leg_damage > 5)
trace_ent.leg_damage = 5;
#if 0 // OTR out
//- OfN - OTR bullets do twice damage ----------//
if (self.cutf_items & CUTF_OTR) {
trace_ent.leg_damage++;
}
#endif
TeamFortress_SetSpeed(trace_ent);
deathmsg = DMSG_SNIPERLEGSHOT;
@ -1344,17 +1348,19 @@ void() W_FireSniperRifle =
//GR red armor has leg protection
if (trace_ent.armortype >= 0.7 && trace_ent.armorvalue > 0) {
TF_T_Damage (trace_ent, self, self, ign_mult, TF_TD_IGNOREARMOUR, TF_TD_SHOT);
TF_T_Damage (trace_ent, self, self, dam_mult, 0, TF_TD_SHOT);
} else {
TF_T_Damage (trace_ent, self, self, dam_mult + ign_mult, TF_TD_IGNOREARMOUR,0);
TF_T_Damage (trace_ent, self, self, dam_mult, TF_TD_IGNOREARMOUR,0);
}
if (trace_ent.health > 0) {
#if 0 // OTR out
if (self.cutf_items & CUTF_OTR) {
sprint(trace_ent, PRINT_MEDIUM, "Leg injury! That was OTR stuff!\n");
sprint(self, PRINT_MEDIUM, "OTR Leg shot - that'll slow him down!\n");
} else { //- not OTR..
} else
#endif
{ //- not OTR..
sprint(trace_ent, PRINT_MEDIUM, "Leg injury!\n");
sprint(self, PRINT_MEDIUM, "Leg shot - that'll slow him down!\n");
}
@ -1364,7 +1370,6 @@ void() W_FireSniperRifle =
} else if (zdif > 20) {
// head shot
dam_mult *= 2;
ign_mult *= 2;
stuffcmd(trace_ent, "bf\n");
@ -1372,27 +1377,26 @@ void() W_FireSniperRifle =
deathmsg = DMSG_SNIPERHEADSHOT;
if (trace_ent.armortype > 0.5 && trace_ent.armorvalue > 0)
{
TF_T_Damage (trace_ent, self, self, ign_mult, TF_TD_IGNOREARMOUR, TF_TD_SHOT);
TF_T_Damage (trace_ent, self, self, dam_mult, 0, TF_TD_SHOT);
} else {
TF_T_Damage (trace_ent, self, self, dam_mult + ign_mult, TF_TD_IGNOREARMOUR, 0);
TF_T_Damage (trace_ent, self, self, dam_mult, TF_TD_IGNOREARMOUR, 0);
}
if (trace_ent.health > 0) {
#if 0 // otr out
if (self.cutf_items & CUTF_OTR) {
sprint(trace_ent, PRINT_MEDIUM, "Head injury! That was OTR stuff!\n");
sprint(self, PRINT_MEDIUM, "OTR Head shot - that's gotta hurt!\n");
} else {
} else
#endif
{
sprint(trace_ent, PRINT_MEDIUM, "Head injury!\n");
sprint(self, PRINT_MEDIUM, "Head shot - that's gotta hurt!\n");
}
}
return;
} else
deathmsg = DMSG_SNIPERRIFLE;
TF_T_Damage (trace_ent, self, self, ign_mult, TF_TD_IGNOREARMOUR, TF_TD_SHOT);
}
}
}