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

update16 #35

Merged
NikC- merged 11 commits from update16 into master 2024-11-27 20:00:56 +03:00
Conversation 0 Commits 11 Files Changed 32 +8 -2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f54f0d40db - Show all commits

8
sources/NiceHumanPawn.uc
View File

@ -737,6 +737,7 @@ simulated function TakeDamage(int Damage, Pawn InstigatedBy, Vector Hitlocation,
local float healPotency; local float healPotency;
local bool bOldArmorStops; local bool bOldArmorStops;
local float adrResistance; local float adrResistance;
local float oldHealthToGive;
local NicePlayerController nicePlayer; local NicePlayerController nicePlayer;
ApplyWeaponStats(Weapon); ApplyWeaponStats(Weapon);
if(invincibilityTimer > 0) if(invincibilityTimer > 0)
@ -767,7 +768,12 @@ simulated function TakeDamage(int Damage, Pawn InstigatedBy, Vector Hitlocation,
damageType.default.bArmorStops = true; damageType.default.bArmorStops = true;
} }
lastExplosionDistance = 0.0; // hack, but scrn fucks with usotherwise lastExplosionDistance = 0.0; // hack, but scrn fucks with usotherwise
oldHealthToGive = healthToGive; // remember this to restore this value, in case we are using safeguard skill
super.TakeDamage(Damage, InstigatedBy, hitLocation, Momentum, damageType, HitIndex); super.TakeDamage(Damage, InstigatedBy, hitLocation, Momentum, damageType, HitIndex);
if (class'NiceVeterancyTypes'.static.HasSkill(nicePlayer, class'NiceSkillHeavySafeguard')) {
healthToGive = oldHealthToGive;
clientHealthToGive = healthToGive;
}
// Commando's zed time // Commando's zed time
if( forcedZedTimeCountDown <= 0.0 if( forcedZedTimeCountDown <= 0.0
&& health < class'NiceSkillCommandoCriticalFocus'.default.healthBoundary && KFGameType(Level.Game) != none && health < class'NiceSkillCommandoCriticalFocus'.default.healthBoundary && KFGameType(Level.Game) != none
@ -790,7 +796,7 @@ simulated function TakeDamage(int Damage, Pawn InstigatedBy, Vector Hitlocation,
if(ShieldStrength < 0) if(ShieldStrength < 0)
ShieldStrength = 0; ShieldStrength = 0;
health += HealAmount * 0.5; health += HealAmount * 0.5;
TakeHealing(self, HealAmount * 0.5, HealPotency); TakeHealing(self, HealAmount * 0.5 + 1, HealPotency);
} }
if(ShieldStrength <= 0) if(ShieldStrength <= 0)
getFreeJacket(); getFreeJacket();

2
sources/Perks/Enforcer/NiceVetEnforcer.uc
View File

@ -185,7 +185,7 @@ defaultproperties
SkillGroupA(4)=class'NiceSkillEnforcerZEDBarrage' SkillGroupA(4)=class'NiceSkillEnforcerZEDBarrage'
SkillGroupB(0)=class'NiceSkillEnforcerUnkillable' SkillGroupB(0)=class'NiceSkillEnforcerUnkillable'
SkillGroupB(1)=class'NiceSkillEnforcerMultitasker' SkillGroupB(1)=class'NiceSkillEnforcerMultitasker'
SkillGroupB(2)=class'NiceSkillEnforcerFinisherRounds' SkillGroupB(2)=class'NiceSkillHeavySafeguard'
SkillGroupB(3)=class'NiceSkillEnforcerBruteA' SkillGroupB(3)=class'NiceSkillEnforcerBruteA'
SkillGroupB(4)=class'NiceSkillEnforcerZEDIceGiant' SkillGroupB(4)=class'NiceSkillEnforcerZEDIceGiant'
progressArray0(0)=100 progressArray0(0)=100