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 +19 -8
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9c4ec1b095 - Show all commits

27
sources/Zeds/NiceMonsterController.uc
View File

@ -414,36 +414,47 @@ Begin:
}
WhatToDoNext(99);
}
function bool SetEnemy( pawn newEnemy,
optional bool bHateMonster,
optional float MonsterHateChanceOverride){
optional float MonsterHateChanceOverride)
{
local NiceMonster niceZed;
local NiceZombieFleshpound niceFP;
local bool bCanForceFight;
// Can we fight anything?
niceZed = NiceMonster(pawn);
niceFP = NiceZombieFleshpound(niceZed);
if(niceZed != none)
bCanForceFight =
if (niceZed != none)
{
bCanForceFight =
KFMonster(pawn).HeadHealth <= 0
|| KFMonster(pawn).bDecapitated
|| newEnemy.Health <= 15;
|| (newEnemy != none && newEnemy.Health <= 15);
}
if (niceFP != none && niceFP.IsInState('RageCharging'))
bCanForceFight = false;
if(newEnemy != none)
bCanForceFight = bCanForceFight
&& newEnemy.Health > 0 && newEnemy != enemy;
if (newEnemy != none)
bCanForceFight = bCanForceFight && newEnemy.Health > 0 && newEnemy != enemy;
else
bCanForceFight = false;
// Do fight if we can
if(bCanForceFight){
if(bCanForceFight)
{
ChangeEnemy(newEnemy, true);
FightEnemy(false);
return true;
}
// Otherwise - do the usual stupid stuff
return super.SetEnemy(newEnemy, bHateMonster, monsterHateChanceOverride);
}
simulated function AddKillAssistant(Controller PC, float damage){
local bool bIsalreadyAssistant;
local int i;