zedtest3 #3

Merged
dkanus merged 15 commits from :zedtest3 into master 2022-01-21 11:56:43 +03:00
2 changed files with 14 additions and 8 deletions
Showing only changes of commit 0f98b8f6ea - Show all commits

View File

@ -77,6 +77,7 @@ simulated function CloakStalker()
SetOverlayMaterial(Material'KFX.FBDecloakShader', 0.25, true);
}
}
simulated function UnCloakStalker()
{
if (bZapped)
@ -92,7 +93,8 @@ simulated function UnCloakStalker()
bUnlit = false;
// 25% chance of our Enemy saying something about us being invisible
if( Level.NetMode!=NM_Client && !KFGameType(Level.Game).bDidStalkerInvisibleMessage && FRand()<0.25 && Controller.Enemy!=none &&
// added Controller check here
if (Level.NetMode!=NM_Client && !KFGameType(Level.Game).bDidStalkerInvisibleMessage && FRand()<0.25 && Controller != none && Controller.Enemy!=none &&
PlayerController(Controller.Enemy.Controller)!=none)
{
PlayerController(Controller.Enemy.Controller).Speech('AUTO', 17, "");
@ -115,6 +117,7 @@ simulated function UnCloakStalker()
}
}
}
simulated function SetZappedBehavior()
{
super(NiceMonster).SetZappedBehavior();

View File

@ -115,6 +115,7 @@ simulated function CloakStalker()
SetOverlayMaterial(Material'KFX.FBDecloakShader', 0.25, true);
}
}
simulated function UnCloakStalker()
{
if (bZapped)
@ -130,7 +131,8 @@ simulated function UnCloakStalker()
bUnlit = false;
// 25% chance of our Enemy saying something about us being invisible
if( Level.NetMode!=NM_Client && !KFGameType(Level.Game).bDidStalkerInvisibleMessage && FRand()<0.25 && Controller.Enemy!=none &&
// added Controller check here
if (Level.NetMode!=NM_Client && !KFGameType(Level.Game).bDidStalkerInvisibleMessage && FRand()<0.25 && Controller != none && Controller.Enemy!=none &&
PlayerController(Controller.Enemy.Controller) != none )
{
PlayerController(Controller.Enemy.Controller).Speech('AUTO', 17, "");
@ -153,6 +155,7 @@ simulated function UnCloakStalker()
}
}
}
// Set the zed to the zapped behavior
simulated function SetZappedBehavior()
{