Merge remote-tracking branch 'origin/dev' into ApartmentCheckpoints
This commit is contained in:
commit
1ea0bbb05e
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_AO.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_AO.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_Mat.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_Mat.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_height.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_height.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -60,10 +60,9 @@ void AEnemyCharacter::SetAlertLevel(const int NewAlertLevel) const
|
||||
void AEnemyCharacter::SetLocalAlertLevel(int NewAlertLevel)
|
||||
{
|
||||
if (!IsValid(GetController())) return;
|
||||
Cast<AAIController>(GetController())->GetBlackboardComponent()->SetValueAsBool("IsInvestigating", true);
|
||||
if (NewAlertLevel == Cast<AAIController>(GetController())->GetBlackboardComponent()->GetValueAsInt("AlertLevel")) return;
|
||||
SetAlertLevel(NewAlertLevel);
|
||||
if (NewAlertLevel >= 2) SetHostilityLevel(EHostilityLevel::Hostile);
|
||||
if (!IsValid(DelegatedControlHub)) return;
|
||||
DelegatedControlHub->SetAlertLevel(NewAlertLevel);
|
||||
}
|
||||
|
||||
void AEnemyCharacter::SetHostilityLevel(const EHostilityLevel NewHostilityLevel)
|
||||
|
Loading…
x
Reference in New Issue
Block a user