dkanus/NicePack
dkanus/NicePack
1
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

ModHeadDamage accessed none KFPRI fixed

Browse Source
This commit is contained in:
Shtoyan 2022-01-21 15:06:44 +04:00
parent 31a99d413b
commit 08ff5df2e7
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sources/Zeds/NiceMonster.uc
View File

@ -750,6 +750,7 @@ function ModFireDamage( out int damage,
if(bFireImmune)
damage /= 10;
}
function ModHeadDamage( out int damage,
Pawn instigatedBy,
Vector hitLocation,
@ -757,22 +758,30 @@ function ModHeadDamage( out int damage,
class<NiceWeaponDamageType> dmgType,
float headshotLevel,
KFPlayerReplicationInfo KFPRI,
optional float lockonTime){
optional float lockonTime)
{
local bool shouldCountHS;
local NicePlayerController nicePlayer;
local class<NiceVeterancyTypes> niceVet;
if (instigatedBy != none)
nicePlayer = NicePlayerController(instigatedBy.Controller);
shouldCountHS = (lockonTime >= dmgType.default.lockonTime)
&& (headshotLevel > dmgType.default.prReqMultiplier);
// Weapon damage bonus
if (dmgType != none && shouldCountHS)
damage *= dmgType.default.HeadShotDamageMult;
// Perk damage bonus
if (KFPRI != none)
{
niceVet = class<NiceVeterancyTypes>(KFPRI.ClientVeteranSkill);
if(KFPRI != none && niceVet != none)
if (niceVet != none)
damage *= niceVet.static.GetNiceHeadShotDamMulti(KFPRI, self, dmgType);
}
}
// This function must record damage actual value in 'damage' variable and
// return value that will decide stun/flinch
function int ModBodyDamage( out int damage,