Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge remote-tracking branch 'origin/dev' into ApartmentCheckpoints

Browse Source
This commit is contained in:
Rafal Swierczek 2024-04-11 20:52:24 +01:00
commit 1ea0bbb05e
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_AO.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_Mat.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_height.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/TempLevels/8k_mars_normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

5
EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp
View File

@ -60,10 +60,9 @@ void AEnemyCharacter::SetAlertLevel(const int NewAlertLevel) const
void AEnemyCharacter::SetLocalAlertLevel(int NewAlertLevel) void AEnemyCharacter::SetLocalAlertLevel(int NewAlertLevel)
{ {
if (!IsValid(GetController())) return; 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 (NewAlertLevel >= 2) SetHostilityLevel(EHostilityLevel::Hostile);
if (!IsValid(DelegatedControlHub)) return;
DelegatedControlHub->SetAlertLevel(NewAlertLevel);
} }
void AEnemyCharacter::SetHostilityLevel(const EHostilityLevel NewHostilityLevel) void AEnemyCharacter::SetHostilityLevel(const EHostilityLevel NewHostilityLevel)