From 6b6492592b0364755387d7332353a0aeb31f8358 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 28 Feb 2024 20:02:40 +0000 Subject: [PATCH] Added Interact Propmpt --- .../Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../FirstPerson/Blueprints/WBP_InteractPrompt.uasset | 3 +++ .../CombatGadgets/HeatBlast/CG_HeatBlast.uasset | 4 ++-- EndlessVendetta/Content/Levels/MainMenuLevel.umap | 4 ++-- .../EndlessVendetta/EndlessVendettaCharacter.cpp | 10 +++++++++- .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 3 +++ 6 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index e4be4f9c..0aa4f470 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfba0ce488edca2e95053cf496a1ea9be201b5e86653d851a7a58519d9841c7b -size 504180 +oid sha256:c5f5f93dc4069790ac1279bfc1dbc24b241f2a133619d5818be629e28b7eab3d +size 526016 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset new file mode 100644 index 00000000..22a00378 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3d62c5e71e9b50d7818b4536aace4d35b174725a8fa508f73659f81019c4e30 +size 39596 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset index 6ab31b4c..add56495 100644 --- a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset +++ b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:544422dc16e5932b58551bb04322de9768d9bc428bf73ba1460dc59acbdba690 -size 144203 +oid sha256:e364907426b0dbe26e7b75e14af5d2729fb7ca68b745b0a12b7f2cdbf39b243e +size 140863 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index d748a0d6..9290e469 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0cc3eba6f8943cc92061f89fd50f44569d59c10a484fe82ab53518b7e98062e -size 308758 +oid sha256:6b09feb9b8d78b3675fb5159f5400d568ae871b260ad185dfc216d4e55de460f +size 308710 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index c26ad3ca..12c6eba9 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -170,7 +170,15 @@ void AEndlessVendettaCharacter::WeaponPickUpSystem() AActor* HitActor = OutHit.GetActor(); IInteractionInterface* InteractableActor = Cast(HitActor); - if (InteractableActor) InteractableActor->InteractPrompt(); + if (InteractableActor) + { + InteractableActor->InteractPrompt(); + ShowInteractPropmpt(); + } + else if (UAC_Dialogue* Dialogue = Cast(HitActor->GetComponentByClass(UAC_Dialogue::StaticClass()))) + { + ShowInteractPropmpt(); + } } //////////////////////////////////////////////////////////////////////////// Input diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 500fd572..f5ac9b2a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -34,6 +34,9 @@ protected: bool InOpenWorld = false; + UFUNCTION(BlueprintImplementableEvent) + void ShowInteractPropmpt(); + private: /** First person camera */ UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true"))