diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset index 5e571245..f030a2bb 100644 --- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset +++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:150f775d1dd9676edfff3ca936843a20b46032df429d2b91cc31b30768fdcc69 -size 34269 +oid sha256:bc9d6d24d9a303a2dd106aead4c9bedd44c4149b79cfebf9ef43bbfa749757c5 +size 51453 diff --git a/EndlessVendetta/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset b/EndlessVendetta/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset index e864a47a..154bd426 100644 --- a/EndlessVendetta/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset +++ b/EndlessVendetta/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:777b2aa0a679b5d326814440204787ff0ba56b4ad9477a407b24d689155b050c -size 160872 +oid sha256:4024eba4f295ed5bcdb98ed2898f685bea6b99e67bc6f84162618a77c2a46698 +size 157697 diff --git a/EndlessVendetta/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset b/EndlessVendetta/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset index f9c827a9..aec51178 100644 --- a/EndlessVendetta/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset +++ b/EndlessVendetta/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:968ba2fa8bf2bca36556b5623b895b9ac9db162f9c2936acda0b0504239543b4 -size 580522 +oid sha256:fbadeebb79924bf3524773237abee268d810d698eb4ad6b8651149339aab59b1 +size 656245 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp index e7e9360c..b258cb28 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.cpp @@ -59,10 +59,15 @@ void AEnemyCharacter::SetLocalAlertLevel(int NewAlertLevel) const DelegatedControlHub->SetAlertLevel(NewAlertLevel); } +void AEnemyCharacter::EquipWeapon_Implementation() +{ +} + void AEnemyCharacter::HuntPlayer(FVector PlayerLastKnownLocation) { if (!IsValid(this)) return; if (!IsValid(GetController())) return; SetAlertLevel(2); + EquipWeapon(); Cast(GetController())->GetBlackboardComponent()->SetValueAsVector("LastKnownLocation", PlayerLastKnownLocation); } diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h b/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h index 7b6f23f4..c0fccd40 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/AI/EnemyCharacter.h @@ -28,6 +28,10 @@ public: virtual void Tick(float DeltaTime) override; void SubscribeToGroupAIEvents(class AAIControlHub* ControlHub); void SetLocalAlertLevel(int NewAlertLevel) const; + + UFUNCTION(BlueprintNativeEvent) + void EquipWeapon(); + virtual void EquipWeapon_Implementation(); private: FDelegateHandle AlertLevelDelegateHandle;