zedtest3 #3

Merged
dkanus merged 15 commits from :zedtest3 into master 2022-01-21 11:56:43 +03:00
Showing only changes of commit 9d5fba5344 - Show all commits

View File

@ -232,6 +232,7 @@ function ClawDamageTarget()
PlaySound(MeleeAttackHitSound, SLOT_Interact, 1.25); PlaySound(MeleeAttackHitSound, SLOT_Interact, 1.25);
} }
} }
function bool ClawDamageSingleTarget(float UsedMeleeDamage, Actor ThisTarget) function bool ClawDamageSingleTarget(float UsedMeleeDamage, Actor ThisTarget)
{ {
local Pawn HumanTarget; local Pawn HumanTarget;
@ -239,6 +240,11 @@ function bool ClawDamageSingleTarget(float UsedMeleeDamage, Actor ThisTarget)
local bool bHitSomeone; local bool bHitSomeone;
local float EnemyAngle; local float EnemyAngle;
local vector PushForceVar; local vector PushForceVar;
// fix log spam
if (Controller == none || ThisTarget == none)
return false;
EnemyAngle = Normal(ThisTarget.Location - Location) dot vector(Rotation); EnemyAngle = Normal(ThisTarget.Location - Location) dot vector(Rotation);
if (EnemyAngle > 0) if (EnemyAngle > 0)
{ {
@ -272,6 +278,7 @@ function bool ClawDamageSingleTarget(float UsedMeleeDamage, Actor ThisTarget)
} }
return bHitSomeone; return bHitSomeone;
} }
function StartCharging() function StartCharging()
{ {
// How many times should we hit before we cool down? // How many times should we hit before we cool down?