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

zedtest3 #3

Merged
dkanus merged 15 commits from :zedtest3 into master 2022-01-21 11:56:43 +03:00
Conversation 0 Commits 15 Files Changed 22 +14 -8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0f98b8f6ea - Show all commits

11
sources/Zeds/Mean/MeanZombieStalker.uc
View File

@ -77,13 +77,14 @@ simulated function CloakStalker()
SetOverlayMaterial(Material'KFX.FBDecloakShader', 0.25, true); SetOverlayMaterial(Material'KFX.FBDecloakShader', 0.25, true);
} }
} }
simulated function UnCloakStalker() simulated function UnCloakStalker()
{ {
if( bZapped ) if (bZapped)
{ {
return; return;
} }
if( !bCrispified ) if (!bCrispified)
{ {
LastUncloakTime = Level.TimeSeconds; LastUncloakTime = Level.TimeSeconds;
@ -92,8 +93,9 @@ simulated function UnCloakStalker()
bUnlit = false; bUnlit = false;
// 25% chance of our Enemy saying something about us being invisible // 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
PlayerController(Controller.Enemy.Controller)!=none ) 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, ""); PlayerController(Controller.Enemy.Controller).Speech('AUTO', 17, "");
KFGameType(Level.Game).bDidStalkerInvisibleMessage = true; KFGameType(Level.Game).bDidStalkerInvisibleMessage = true;
@ -115,6 +117,7 @@ simulated function UnCloakStalker()
} }
} }
} }
simulated function SetZappedBehavior() simulated function SetZappedBehavior()
{ {
super(NiceMonster).SetZappedBehavior(); super(NiceMonster).SetZappedBehavior();

11
sources/Zeds/Nice/NiceZombieStalker.uc
View File

@ -115,13 +115,14 @@ simulated function CloakStalker()
SetOverlayMaterial(Material'KFX.FBDecloakShader', 0.25, true); SetOverlayMaterial(Material'KFX.FBDecloakShader', 0.25, true);
} }
} }
simulated function UnCloakStalker() simulated function UnCloakStalker()
{ {
if( bZapped ) if (bZapped)
{ {
return; return;
} }
if( !bCrispified ) if (!bCrispified)
{ {
LastUncloakTime = Level.TimeSeconds; LastUncloakTime = Level.TimeSeconds;
@ -130,8 +131,9 @@ simulated function UnCloakStalker()
bUnlit = false; bUnlit = false;
// 25% chance of our Enemy saying something about us being invisible // 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
PlayerController(Controller.Enemy.Controller)!=none ) 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, ""); PlayerController(Controller.Enemy.Controller).Speech('AUTO', 17, "");
KFGameType(Level.Game).bDidStalkerInvisibleMessage = true; KFGameType(Level.Game).bDidStalkerInvisibleMessage = true;
@ -153,6 +155,7 @@ simulated function UnCloakStalker()
} }
} }
} }
// Set the zed to the zapped behavior // Set the zed to the zapped behavior
simulated function SetZappedBehavior() simulated function SetZappedBehavior()
{ {