Updated for KF Version 1056

This commit is contained in:
Forrest Keller 2017-10-19 21:12:29 -05:00
parent 439d1b2ab2
commit 830a70436e
6 changed files with 10 additions and 10 deletions

View File

@ -816,7 +816,7 @@ ignores FaceRotation, SetMovementPhysics;
{
return (bForceCheck ? Global.CanDoSpecialMove(AMove,bForceCheck) : false);
}
function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling)
function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling, optional bool bAllowSameTeamGrab)
{
return false;
}

View File

@ -597,7 +597,7 @@ simulated function CancelConnection()
function NotifyLevelUp(class<KFPerk> PerkClass, byte PerkLevel);
function ShowBossNameplate( KFPawn_Monster KFBoss, optional string PlayerName)
function ShowBossNameplate( KFInterface_MonsterBoss KFBoss, optional string PlayerName)
{
if( !bNamePlateShown ) // Dont make multiple bosses pop this up multiple times.
{

View File

@ -8,7 +8,7 @@ struct FCustomCharEntry
};
struct FMyCustomChar // Now without constant.
{
var byte CharacterIndex,HeadMeshIndex,HeadSkinIndex,BodyMeshIndex,BodySkinIndex,AttachmentMeshIndices[`MAX_COSMETIC_ATTACHMENTS],AttachmentSkinIndices[`MAX_COSMETIC_ATTACHMENTS];
var int CharacterIndex,HeadMeshIndex,HeadSkinIndex,BodyMeshIndex,BodySkinIndex,AttachmentMeshIndices[`MAX_COSMETIC_ATTACHMENTS],AttachmentSkinIndices[`MAX_COSMETIC_ATTACHMENTS];
structdefaultproperties
{

View File

@ -52,13 +52,13 @@ final function bool HasBossesAlive()
return (BossList.Length>0);
}
function SetBossPawn(KFPawn_Monster NewBossPawn)
function SetBossPawn(KFInterface_MonsterBoss NewBoss)
{
if( !KFPC.bHideBossHealthBar && NewBossPawn!=None && NewBossPawn.IsAliveAndWell() )
if( !KFPC.bHideBossHealthBar && NewBoss!=None && NewBoss.GetMonsterPawn().IsAliveAndWell() )
{
bHasInit = true;
++NumBosses;
BossList.AddItem(NewBossPawn);
BossList.AddItem(NewBoss.GetMonsterPawn());
}
}
@ -73,7 +73,7 @@ final function UpdateBossInfo()
CheckBestBoss();
}
V = (BossPawn!=None ? FClamp(float(BossPawn.Health) / float(BossPawn.HealthMax),0.f,1.f) : 0.f);
V = (BossPawn!=None ? FClamp(float(BossPawn.GetMonsterPawn().Health) / float(BossPawn.GetMonsterPawn().HealthMax),0.f,1.f) : 0.f);
if( LastHP!=V )
{
LastHP = V;
@ -114,7 +114,7 @@ final function CheckBestBoss()
if( Best!=BossPawn )
{
BossPawn = Best;
SetBossName(Best.BossName);
SetBossName(Best.static.GetLocalizedName());
}
}

View File

@ -1,6 +1,6 @@
class KFPawn_ZedSirenX extends KFPawn_ZedSiren;
function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling)
function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling, optional bool bAllowSameTeamGrab)
{
return false;
}

View File

@ -429,7 +429,7 @@ function bool DoJump( bool bUpdating )
}
// Nope.
function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling)
function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling, optional bool bAllowSameTeamGrab)
{
return false;
}