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

Menus overhaul #14

Merged
dkanus merged 30 commits from :somechanges into master 2022-01-23 22:14:51 +03:00
Conversation 0 Commits 30 Files Changed 30 +43 -29
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4325a34acf - Show all commits

16
sources/Zeds/Nice/NiceZombieSiren.uc
View File

@ -77,13 +77,16 @@ function DiscardCurrentScreamBall(){
currScreamTiming = -1; currScreamTiming = -1;
} }
} }
function RangedAttack(Actor A) function RangedAttack(Actor A)
{ {
local int LastFireTime; local int LastFireTime;
local float Dist; local float Dist;
if (bShotAnim) if (bShotAnim)
return; return;
Dist = VSize(A.Location - Location); Dist = VSize(A.Location - Location);
if (Physics == PHYS_Swimming) if (Physics == PHYS_Swimming)
{ {
SetAnimAction('Claw'); SetAnimAction('Claw');
@ -98,7 +101,8 @@ function RangedAttack(Actor A)
Controller.bPreparingMove = true; Controller.bPreparingMove = true;
Acceleration = vect(0,0,0); Acceleration = vect(0,0,0);
} }
else if( Dist <= ScreamRadius && !bDecapitated && !bZapped ) // ok se we DO NOT want to scream at other nice zeds
else if (!bNotAHuman() && Dist <= ScreamRadius && !bDecapitated && !bZapped)
{ {
bShotAnim = true; bShotAnim = true;
SetAnimAction('Siren_Scream'); SetAnimAction('Siren_Scream');
@ -119,6 +123,16 @@ function RangedAttack(Actor A)
Acceleration.Z = FMin(Acceleration.Z, 0.0f); Acceleration.Z = FMin(Acceleration.Z, 0.0f);
} }
} }
final private function bool bNotAHuman()
{
if (Controller == none || Controller.Enemy == none)
return false;
// log("Zed enemy classname was " $ Controller.Enemy.class);
return ClassIsChildOf(Controller.Enemy.class, class'NiceMonster');
}
simulated function int DoAnimAction( name AnimName ) simulated function int DoAnimAction( name AnimName )
{ {
if( AnimName=='Siren_Scream' || AnimName=='Siren_Bite' || AnimName=='Siren_Bite2' ) if( AnimName=='Siren_Scream' || AnimName=='Siren_Bite' || AnimName=='Siren_Bite2' )