From e56c9d39b7b520abe26a76b8181f884770f3b389 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 11 Apr 2024 20:40:49 +0100 Subject: [PATCH 1/2] Add Proper Texture Maps for Mars Planet --- EndlessVendetta/Content/Levels/TempLevels/8k_mars.uasset | 4 ++-- EndlessVendetta/Content/Levels/TempLevels/8k_mars_AO.uasset | 3 +++ EndlessVendetta/Content/Levels/TempLevels/8k_mars_Mat.uasset | 4 ++-- .../Content/Levels/TempLevels/8k_mars_height.uasset | 3 +++ .../Content/Levels/TempLevels/8k_mars_normal.uasset | 3 +++ 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 EndlessVendetta/Content/Levels/TempLevels/8k_mars_AO.uasset create mode 100644 EndlessVendetta/Content/Levels/TempLevels/8k_mars_height.uasset create mode 100644 EndlessVendetta/Content/Levels/TempLevels/8k_mars_normal.uasset diff --git a/EndlessVendetta/Content/Levels/TempLevels/8k_mars.uasset b/EndlessVendetta/Content/Levels/TempLevels/8k_mars.uasset index 819f61e8..f16c38d0 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/8k_mars.uasset +++ b/EndlessVendetta/Content/Levels/TempLevels/8k_mars.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7648ee85f3356dc6526c1b7efc1b686f5d7960359b16e3644af0a67986195b6d -size 8408590 +oid sha256:7caa859428f44f7494e0f6e84d09e567cb129a240af66d57476bc2754bc7db41 +size 8408668 diff --git a/EndlessVendetta/Content/Levels/TempLevels/8k_mars_AO.uasset b/EndlessVendetta/Content/Levels/TempLevels/8k_mars_AO.uasset new file mode 100644 index 00000000..2ffde667 --- /dev/null +++ b/EndlessVendetta/Content/Levels/TempLevels/8k_mars_AO.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4ff6277907eb4085aa0e20e66c50d69f20101031b42a35d8acf78b36d5c171a +size 17714327 diff --git a/EndlessVendetta/Content/Levels/TempLevels/8k_mars_Mat.uasset b/EndlessVendetta/Content/Levels/TempLevels/8k_mars_Mat.uasset index d8a57974..3e4c9135 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/8k_mars_Mat.uasset +++ b/EndlessVendetta/Content/Levels/TempLevels/8k_mars_Mat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:963dd55952ad0a5eb2a5e5d2364155d7a889926e6eadaade6feeed1e74fe309d -size 11143 +oid sha256:708000eff0e82584c0cf223397e310fc7d0a88243a240352b7550ba2f4ad32da +size 15560 diff --git a/EndlessVendetta/Content/Levels/TempLevels/8k_mars_height.uasset b/EndlessVendetta/Content/Levels/TempLevels/8k_mars_height.uasset new file mode 100644 index 00000000..301a0359 --- /dev/null +++ b/EndlessVendetta/Content/Levels/TempLevels/8k_mars_height.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d6103cc8632987f93e81c883baf270ab241ad7b6cb7b4f02a42d7aa4143ba48 +size 5291866 diff --git a/EndlessVendetta/Content/Levels/TempLevels/8k_mars_normal.uasset b/EndlessVendetta/Content/Levels/TempLevels/8k_mars_normal.uasset new file mode 100644 index 00000000..57c1a2ee --- /dev/null +++ b/EndlessVendetta/Content/Levels/TempLevels/8k_mars_normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1cfde533480370a348caad01fec53818b5843be49fead581d2143af0c3496e5 +size 41962993 From e306ecf9a1e53550d48e99776ec865b8afb07907 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 11 Apr 2024 20:51:37 +0100 Subject: [PATCH 2/2] Update Enemy Character to Stop Setting Alert Level on Sense --- EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp index 1e779bdc..96455cc1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp @@ -60,10 +60,9 @@ void AEnemyCharacter::SetAlertLevel(const int NewAlertLevel) const void AEnemyCharacter::SetLocalAlertLevel(int NewAlertLevel) { if (!IsValid(GetController())) return; - Cast(GetController())->GetBlackboardComponent()->SetValueAsBool("IsInvestigating", true); + if (NewAlertLevel == Cast(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)