diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/BP_CombatWorkbench.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/BP_CombatWorkbench.uasset new file mode 100644 index 00000000..faa2e306 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/BP_CombatWorkbench.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f506b5b0ad3d818c7bb6bd8f82a1fb7c632e92eb3dfedf4ae0e49401b6a6f060 +size 23514 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset new file mode 100644 index 00000000..cc9ef05e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6efb4e0830f54b67f16f914ed3089a120ba27610b5483c3b316cacc5ba397f63 +size 128490 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/CG_OverloadModule.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/CG_OverloadModule.uasset index b6136e8d..ac45c725 100644 --- a/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/CG_OverloadModule.uasset +++ b/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/CG_OverloadModule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3986954492ecb336baf2a23fdc7005cffddb10af130b3f9af9a679f5c052b709 -size 110442 +oid sha256:2a0ac6bb1c776390adbc9e10c1a9e9c6629c4f69eea6d3720d502a3b7807abf0 +size 110595 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index c8231a23..b2e83cdc 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec2d9cddf84ce12c2afd9105364ee6405766ac7f23a19f7b6a515699a18c35b1 -size 607443 +oid sha256:08b525ee32d982c27c00a940ff67fc86f358c5ddfb953a60bd68ccfebef74e10 +size 610106 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 444c1727..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:9024e1d847357d4cdf585e615ef2924a4cbf4795b0458184d195c379105134d4 -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..5644bcb6 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:ec208781a00b8b13eae265ead16ff015629316c1fef6e53fdf91e042fccfd021 +size 43745 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/OverloadModuleTutorial.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/OverloadModuleTutorial.cpp new file mode 100644 index 00000000..d7a36834 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/OverloadModuleTutorial.cpp @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "OverloadModuleTutorial.h" + +#include "EndlessVendetta/EndlessVendettaCharacter.h" + +void AOverloadModuleTutorial::BeginPlay() +{ + Super::BeginPlay(); + GadgetManager = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->GadgetManager; + SpawnNewWaypoint(HackTargetWaypointLoc, HackTargetWaypointDesc); +} + +void AOverloadModuleTutorial::Tick(float DeltaSeconds) +{ + Super::Tick(DeltaSeconds); + + if (!GadgetManager->CombatInUse()) return; + + SpawnNewWaypoint(ResultWaypointLoc, ResultWaypointDesc); + SetActorTickEnabled(false); + FTimerHandle TimerHandle; + GetWorld()->GetTimerManager().SetTimer(TimerHandle, this, &AOverloadModuleTutorial::FinishedTutorial, 7.5); +} \ No newline at end of file diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/OverloadModuleTutorial.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/OverloadModuleTutorial.h new file mode 100644 index 00000000..393b134f --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/OverloadModuleTutorial.h @@ -0,0 +1,35 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "BaseGadgetTutorial.h" +#include "EndlessVendetta/GadgetSystem/GadgetManager.h" +#include "OverloadModuleTutorial.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API AOverloadModuleTutorial : public ABaseGadgetTutorial +{ + GENERATED_BODY() + + AGadgetManager* GadgetManager; + + void BeginPlay() override; + + void Tick(float DeltaSeconds) override; + +protected: + UPROPERTY(EditDefaultsOnly, Category = "Gadget Tutorial") + FString HackTargetWaypointDesc; + UPROPERTY(EditDefaultsOnly, Category = "Gadget Tutorial") + FString ResultWaypointDesc; + + UPROPERTY(BlueprintReadWrite, Category = "Gadget Tutorial") + FVector HackTargetWaypointLoc; + UPROPERTY(BlueprintReadWrite, Category = "Gadget Tutorial") + FVector ResultWaypointLoc; + +};