From 26d454054191c304914d8a82acec805f1daa872c Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 28 Feb 2024 03:11:04 +0000 Subject: [PATCH] Implemented Vision Ping Aesthetics --- .../Content/Gadgets/GM_GadgetManager.uasset | 4 +-- .../VisionPule/RG_VisionPulse.uasset | 3 ++ .../VisionPule/WBP_VisionPulseScreen.uasset | 3 ++ .../Content/Levels/TempOpenWorld.umap | 4 +-- .../Architecture/Floor_400x400.uasset | 4 +-- .../Blueprints/Blueprint_CeilingLight.uasset | 4 +-- .../Recon/VisionPulse/VisionPulse.cpp | 18 +++++++++++ .../Recon/VisionPulse/VisionPulse.h | 30 +++++++++++++++++++ 8 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPule/RG_VisionPulse.uasset create mode 100644 EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPule/WBP_VisionPulseScreen.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionPulse/VisionPulse.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionPulse/VisionPulse.h diff --git a/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset b/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset index 3a71ffb5..842e9d1c 100644 --- a/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset +++ b/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e05b0025b98476924070ad8a2492e16ce32fb434b63e82b53a509c63f6e0962a -size 22228 +oid sha256:f9ded5ef757bfc023968a367793b7bced7c9d2b49d981058a02bf18d2411b415 +size 22676 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPule/RG_VisionPulse.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPule/RG_VisionPulse.uasset new file mode 100644 index 00000000..ba8738ba --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPule/RG_VisionPulse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c7476ad83f760b9ab01ae4bc5bd971547272aef79234dc3c6c7e95e6fe479ed +size 55727 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPule/WBP_VisionPulseScreen.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPule/WBP_VisionPulseScreen.uasset new file mode 100644 index 00000000..7e63fe95 --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionPule/WBP_VisionPulseScreen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59ff02b276113b95bc87df4b6682afd88ef311ecce46f79516178d343280e5d8 +size 197865 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index 9bc37ab7..cfe6a915 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bbd7da449cdfa4525a6526bfde4f568844837d44d8cea802654c2376671022c -size 14020814 +oid sha256:169c97efdea6ae14981bcaf6147ba24f285a108423c3082d4df76446641aaa1a +size 14020766 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 366c1001..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:3529173df99f424619a59bba2f5df7529dc388bc8ce1bdf6baa48a9e5d836d8a -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84e..9fed8047 100644 --- a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:8e260c426e2e1c9c6405cb651b68378a4fd90baf837cf8609ba3b507c0482c99 +size 43745 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionPulse/VisionPulse.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionPulse/VisionPulse.cpp new file mode 100644 index 00000000..3356724d --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionPulse/VisionPulse.cpp @@ -0,0 +1,18 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "VisionPulse.h" + +void AVisionPulse::Activate() +{ + if (GadgetCantBeUsed()) return; + Super::Activate(); + SendOutPulse(); + //try to unequip for a easier user experience +} + +void AVisionPulse::FinishedUsing() +{ + Super::FinishedUsing(); + DisplayCooldown(CooldownTime); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionPulse/VisionPulse.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionPulse/VisionPulse.h new file mode 100644 index 00000000..86beac84 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionPulse/VisionPulse.h @@ -0,0 +1,30 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "EndlessVendetta/GadgetSystem/ReconGadget.h" +#include "VisionPulse.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API AVisionPulse : public AReconGadget +{ + GENERATED_BODY() + + void Activate() override; + + void FinishedUsing() override; + +protected: + UFUNCTION(BlueprintImplementableEvent) + void SendOutPulse(); + + UFUNCTION(BlueprintImplementableEvent) + void DisplayCooldown(float CooldownLength); + + + +};