From 1088828c46027b0b4817809132b25b87e28bb712 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 28 Feb 2024 06:22:36 +0000 Subject: [PATCH] Implemented Heat Blast Gadget Aesthetics --- .../Content/Gadgets/BP_Grenade.uasset | 4 +-- .../HeatBlast/CG_HeatBlast.uasset | 3 +++ .../HeatBlast/WBP_HeatBlastDisplay.uasset | 3 +++ .../Content/Gadgets/GM_GadgetManager.uasset | 4 +-- .../Content/Levels/TempOpenWorld.umap | 4 +-- .../Architecture/Floor_400x400.uasset | 4 +-- .../Blueprints/Blueprint_CeilingLight.uasset | 4 +-- .../Combat/HeatBlast/HeatBlast.cpp | 17 +++++++++++++ .../Combat/HeatBlast/HeatBlast.h | 25 +++++++++++++++++++ 9 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset create mode 100644 EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Combat/HeatBlast/HeatBlast.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Combat/HeatBlast/HeatBlast.h diff --git a/EndlessVendetta/Content/Gadgets/BP_Grenade.uasset b/EndlessVendetta/Content/Gadgets/BP_Grenade.uasset index b1f7c397..e91e57b8 100644 --- a/EndlessVendetta/Content/Gadgets/BP_Grenade.uasset +++ b/EndlessVendetta/Content/Gadgets/BP_Grenade.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0973ba2e3915d82c77975bb8899e2edebcca3eac00001b2d43dc28e63c7070a0 -size 48239 +oid sha256:68216e9350fc9d5ac58b22dca2bec0daf9a78ddba9be49a7588ec603f92a73d5 +size 49013 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset new file mode 100644 index 00000000..095065ff --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2d54ca98acf958f09d34320a149ea69adcf7618feb402cd10ede1bae0ba146 +size 103693 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset new file mode 100644 index 00000000..172b8350 --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/WBP_HeatBlastDisplay.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9705fc014e83f6f110cbef6811ca1980e53f628112a7a81382f76039596efce2 +size 151806 diff --git a/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset b/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset index f6832661..dfbd9980 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:7f36dbd62982f1fae85ce2aeae6a85218502454c1288dea3d94464bc94366a34 -size 22677 +oid sha256:b0d2623bcccbe62806245c5b0a2cfe7eaa543ba59c5f29d2ae445682be9da437 +size 22662 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index 48429966..da233710 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:e88c49eaafb25948638b0a3319df0732af0381cf5feec08ef4fa6d0396b0d724 -size 14020766 +oid sha256:12a3a117020f9c6b3f909e88bba4cf8a2c5be5dca187b5f9b33e035ea01056e0 +size 14020814 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..8189a07a 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:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:9da9c8dcb1bce8efd1ee551251b86b03bd93df5777624e26c1f33e11063bcff3 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 9fed8047..c5c3b84e 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:8e260c426e2e1c9c6405cb651b68378a4fd90baf837cf8609ba3b507c0482c99 -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Combat/HeatBlast/HeatBlast.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Combat/HeatBlast/HeatBlast.cpp new file mode 100644 index 00000000..4c8da538 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Combat/HeatBlast/HeatBlast.cpp @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "HeatBlast.h" + +void AHeatBlast::Activate() +{ + if (GadgetCantBeUsed()) return; + Super::Activate(); + ShootHeatBlast(); +} + +void AHeatBlast::FinishedUsing() +{ + Super::FinishedUsing(); + DisplayCooldown(CooldownTime); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Combat/HeatBlast/HeatBlast.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Combat/HeatBlast/HeatBlast.h new file mode 100644 index 00000000..b3cb27fb --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Combat/HeatBlast/HeatBlast.h @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "EndlessVendetta/GadgetSystem/CombatGadget.h" +#include "HeatBlast.generated.h" + + +UCLASS() +class ENDLESSVENDETTA_API AHeatBlast : public ACombatGadget +{ + GENERATED_BODY() + + void Activate() override; + + void FinishedUsing() override; + +protected: + UFUNCTION(BlueprintImplementableEvent) + void ShootHeatBlast(); + + UFUNCTION(BlueprintImplementableEvent) + void DisplayCooldown(float CooldownLength); +};