qf/prozac-qfcc
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/prozac-qfcc synced 2025-02-12 07:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix the "infinite sensors with aura of resistance" bug

Browse source
This commit is contained in:
Adam Olsen 2001-10-13 19:44:27 +00:00
parent d9a3e54a66
commit 0cb97bdfbc
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
combat.qc
View file

@ -371,15 +371,6 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags
} }
return; return;
} }
else if (self.aura == AURA_RESISTANCE)
{
if (self.invincible_sound < time)
{
sound (targ, CHAN_ITEM, "auras/aura1.wav", 1, ATTN_NORM);
self.invincible_sound = time + 1.5;
}
return;
}
//CHAPLAIN CALCULATIONS //CHAPLAIN CALCULATIONS
// WK See if they're close enough to chap to get protection // WK See if they're close enough to chap to get protection
@ -415,11 +406,16 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags
damage = damage * 4; damage = damage * 4;
} }
if (attacker.aura == AURA_POWER || (attacker.job == JOB_CRUSADER && IsMonsterNonArmy(targ))) if (attacker.aura == AURA_POWER)
damage = damage * 1.5; damage = damage * 1.5;
if (targ.aura == AURA_RESISTANCE || (attacker.job == JOB_CRUSADER && IsMonsterNonArmy(targ))) if (targ.aura == AURA_RESISTANCE) {
damage = damage * 0.66; damage = damage * 0.66;
if (self.invincible_sound < time) {
sound (targ, CHAN_ITEM, "auras/aura1.wav", 1, ATTN_NORM);
self.invincible_sound = time + 1.5;
}
}
//DAMAGE ADJUSTMENT //DAMAGE ADJUSTMENT