From dab2cb1664b0ce2c39404dd6660d2faf5b2f4a26 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 2 May 2024 13:44:41 +0100 Subject: [PATCH] Updated Gadget Workbenches to Hide Gadgets after Picking Them Up --- .../Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset | 4 ++-- .../Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset | 4 ++-- .../Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset | 4 ++-- EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp | 2 +- .../GadgetSystem/GadgetTutorial/GadgetTutorialStation.h | 3 +++ 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_CombatWorkbench.uasset index 295a6fb1..acbff334 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:b25506368616f3fba1b737a300d725eb95eb9f45ce24bb23b5e25da660548492 -size 35160 +oid sha256:731cf480f9156c21d7c97b239ee3affbc32406e67ddb98536a5c52d687b2f4d8 +size 45241 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_ReconWorkbench.uasset index addd9736..b6f9cb38 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:8201cc8190a7337168cbf73b3571a0bab1af436ecb7ac41ed818d93d17f990d3 -size 38684 +oid sha256:7ba3dc4169679f8c6480fe814227630833bc07368af4e0b8bf9a13acd909b67e +size 53969 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset index 450378cb..bfc5e19e 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:0f466658ba3bb71eb0451daa52516c652a433aaa26000999d9ba781b229a2796 -size 150264 +oid sha256:2efb44a99ce471ca9bf5eb1613f8d1903826f7cd4280fa89f276fc29066c36a1 +size 145612 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index c253bdaf..77c73876 100644 --- a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap +++ b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db6ae7929f73b67d5f7795f3fefa56f1b77d45d4967fd77e5273dcba3dd54a45 -size 1958487 +oid sha256:be7cac66a963c5acd07e702b21791b2858f76e8e5bb6a05c3994a7ecd2d81d3d +size 1967015 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index bf47108b..c2a34afc 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:b7b881463b7c26a79bb7281067bc226c9d90fdc0b2248d8c7a6af2ac6a6a8dce -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..9a752b66 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d -size 72364642 +oid sha256:17a7455b276cfe1d33e9f1fe86597c760404a5670a4119bc4cd35718b8763d66 +size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp index f1bc712d..07e40929 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp @@ -90,7 +90,7 @@ void AGadgetTutorialStation::SelectGadget() { // Eventually expand to give player feedback of being denied if changing gadgets fails if (!EndlessVendettaCharacter->UpdateGadgetType(GadgetsArray[GadgetIndex])) return; - + HideGadgetMesh(); if (IsValid(CurrentGadgetTutorial)) CurrentGadgetTutorial->DestroyTutorial(); FActorSpawnParameters SpawnParams; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h index f59f4fc7..3a35cf04 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h @@ -55,6 +55,9 @@ protected: UFUNCTION(BlueprintCallable) void CloseWidget(); + UFUNCTION(BlueprintImplementableEvent) + void HideGadgetMesh(); + public: // Sets default values for this actor's properties AGadgetTutorialStation();