zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-17 08:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2018-11-17 00:33:06 -05:00
commit 8995eb8c5d
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wadsrc/static/zscript/strife/weapongrenade.txt
View file

@ -244,11 +244,18 @@ class PhosphorousFire : Actor
override int DoSpecialDamage (Actor target, int damage, Name damagetype)
{
// This may look a bit weird but is the same as in SVE:
// For the bosses, only their regular 0.5 damage factor for fire applies.
let firedamage = target.ApplyDamageFactor('Fire', damage);
if (firedamage != damage) return damage; // if the target has a factor, do nothing here. The factor will be applied elsewhere.
// For everything else damage is halved, for robots quartered.
damage >>= 1;
if (target.bNoBlood)
{
return damage / 2;
damage >>= 1;
}
return Super.DoSpecialDamage (target, damage, damagetype);
return damage;
}
// This function is mostly redundant and only kept in case some mod references it.