From a3368bc647d5854bbfb16797f406315f63be528a Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 6 May 2024 17:51:13 +0100 Subject: [PATCH] Updated Gadget, Gadget Workbench, Restricted Area and Interaction Propmt UI --- EndlessVendetta/Content/AI/UI_RestrictedZone.uasset | 4 ++-- .../Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset | 3 --- .../Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset | 4 ++-- .../Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset | 4 ++-- .../Tutorial/GadgetGamemode/Widgets/WBP_GadgetMenu.uasset | 3 +++ .../Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset | 4 ++-- .../CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset | 4 ++-- .../ReconGadgets/VisionPulse/WBP_VisionPulseScreen.uasset | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 2 +- .../Source/EndlessVendetta/EndlessVendettaCharacter.cpp | 4 ++++ 10 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Widgets/WBP_GadgetMenu.uasset diff --git a/EndlessVendetta/Content/AI/UI_RestrictedZone.uasset b/EndlessVendetta/Content/AI/UI_RestrictedZone.uasset index 49cdb961..334e34e4 100644 --- a/EndlessVendetta/Content/AI/UI_RestrictedZone.uasset +++ b/EndlessVendetta/Content/AI/UI_RestrictedZone.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8947c61c4c077f9c014c95bcd6ad3ae7b40eedcaf946b58bc9e617310b849fd6 -size 51722 +oid sha256:d52432a75546b5ca8ca4dc44e23e8a569baec228068cd27815259e8e1ef975f6 +size 51037 diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset deleted file mode 100644 index 129eefbf..00000000 --- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c480a50c56791e4ae21ac2cdf3f9a362ec14665b376bbe595f310fa6ea30d7f -size 118680 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset index acbff334..2a99668e 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:731cf480f9156c21d7c97b239ee3affbc32406e67ddb98536a5c52d687b2f4d8 -size 45241 +oid sha256:9e076b7f1821ef8b3968c77fe6cea43ebb0694dbe2e60fd10cadde6d4877fa1a +size 45298 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset index b6f9cb38..cae7c76d 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ba3dc4169679f8c6480fe814227630833bc07368af4e0b8bf9a13acd909b67e -size 53969 +oid sha256:9a675e47106672dd51cf5054dfb92caa9977a0e0de5381897aaee981460f4b9f +size 53263 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Widgets/WBP_GadgetMenu.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Widgets/WBP_GadgetMenu.uasset new file mode 100644 index 00000000..02bebc8e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/Widgets/WBP_GadgetMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93af46010dfbb3a41f55f179aab01488ed10e1372bacae9425457ad6949f70ea +size 119671 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset index 22a00378..6859e08c 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_InteractPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3d62c5e71e9b50d7818b4536aace4d35b174725a8fa508f73659f81019c4e30 -size 39596 +oid sha256:a851dda4f10d65992f3ca42f2a65d3cd05d9453ddc14b8cd0c85d46d2103eafb +size 38772 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset index 172b8350..20dcf00e 100644 --- a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset +++ b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9705fc014e83f6f110cbef6811ca1980e53f628112a7a81382f76039596efce2 -size 151806 +oid sha256:65d877b260192fdd0275020549fb2c08452110ff956ce7b0ebc8ffcfc7fc0ecf +size 149045 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/WBP_VisionPulseScreen.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/WBP_VisionPulseScreen.uasset index 6d7561a9..ddbaa8ab 100644 --- a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/WBP_VisionPulseScreen.uasset +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPulse/WBP_VisionPulseScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:838184b1f7f7635a4f0aaee27ddf6b8e22b864e5dc6d8294e095d6e4cf4430aa -size 197632 +oid sha256:9fc906a7f1862a9a3a67b020aabe028e0fc0b7cc44ac4c8d0a6bdbefb1e7ee9e +size 191505 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 7be6cc99..4be17980 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e221e6841cd1d11fe2c3670ec1e4e1d5ed61122cc9cc57a87f58b5b851a9faf +oid sha256:82f0a25d3459152a411697a1299f3c8a438f16aac05a6be1e517b0fce36ddab3 size 14831 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 4a17f488..3fd0666e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -884,6 +884,10 @@ bool AEndlessVendettaCharacter::UpdateGadgetType(TSubclassOf NewGad GadgetManager->SpawnGadget(NewGadgetClass, Cast(PlayersCamera)); break; } + + if (NewGadgetClass.GetDefaultObject()->IsA(AReconGadget::StaticClass())) ToggleRecon(); + else if (NewGadgetClass.GetDefaultObject()->IsA(ACombatGadget::StaticClass())) ToggleCombat(); + return true; }