From 16784b051f3468e9f9830032e4666569adf6b305 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Tue, 23 Apr 2024 05:01:05 +0100 Subject: [PATCH] Implemented Checkpoints for Gadget Tutorial Area --- EndlessVendetta/Config/DefaultGame.ini | 1 + .../Elevator/BP_ElevatorDoor_Ind.uasset | 3 +++ .../Elevator/BP_Ind_Elevator.uasset | 4 ++-- .../CP_ContinueThroughFacility.uasset | 3 +++ .../Tutorial/Checkpoints/CP_DepositGun.uasset | 3 +++ .../Tutorial/Checkpoints/CP_Empty.uasset | 3 +++ .../Checkpoints/CP_EnterTheElevator.uasset | 3 +++ .../CP_GadgetTrainingCinematic.uasset | 3 +++ .../CP_LeaveTheGadgetTrainingFacility.uasset | 3 +++ .../CP_ProtectTheHoloSupplies.uasset | 3 +++ .../Checkpoints/CP_SelectCombat.uasset | 3 +++ .../Checkpoints/CP_SelectRecon.uasset | 3 +++ .../Checkpoints/CP_ShootTheTargets.uasset | 4 ++-- .../Tutorial/Checkpoints/CP_TempEmpty.uasset | 3 +++ .../GadgetGamemode/BP_WaveComputer.uasset | 4 ++-- .../BountySystem/Tutorial/MB_Training.uasset | 4 ++-- .../Levels/TempLevels/NewTutorialMap.umap | 4 ++-- .../Blueprints/Blueprint_CeilingLight.uasset | 2 +- .../CheckPoints/WeaponDepositCheckpoint.cpp | 18 ++++++++++++++ .../CheckPoints/WeaponDepositCheckpoint.h | 24 +++++++++++++++++++ .../EndlessVendettaCharacter.cpp | 2 +- .../EndlessVendettaCharacter.h | 2 ++ 22 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset create mode 100644 EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.h diff --git a/EndlessVendetta/Config/DefaultGame.ini b/EndlessVendetta/Config/DefaultGame.ini index 8744e92f..9a962fd5 100644 --- a/EndlessVendetta/Config/DefaultGame.ini +++ b/EndlessVendetta/Config/DefaultGame.ini @@ -107,6 +107,7 @@ bSkipMovies=False +MapsToCook=(FilePath="/Game/Levels/OpenWorldRework") +MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/MarketAreaEnemies") +MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies") ++MapsToCook=(FilePath="/Game/Levels/TempLevels/NewTutorialMap") +DirectoriesToAlwaysCook=(Path="/Interchange/Functions") +DirectoriesToAlwaysCook=(Path="/Interchange/gltf") +DirectoriesToAlwaysCook=(Path="/Interchange/Materials") diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset new file mode 100644 index 00000000..0f4f6c80 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dea20e5d6a3f6ed66cc512864b20a61c091586977344ba851102819accd67af3 +size 44085 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset index 6894fe2f..a36c1e16 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d15d05d02e22ee7212bdf1b8ce9d2e59e7381ff2f3acde98a2b9c4b6226ebd26 -size 120082 +oid sha256:cd4ac8c1ceda8aacaf312104e54ced6bc9575fc6525f157dfb8d5484040c8151 +size 123778 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset new file mode 100644 index 00000000..47b14233 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b60223379c2ef6eab084cfc7cbc36495e98903541cd2706f2e2bd1ce3b3f775 +size 36902 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset new file mode 100644 index 00000000..b3543c42 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbbd98bf3691755654cb904710901bbd9932099a968f9598fd762d4e508a0a6c +size 26478 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset new file mode 100644 index 00000000..55a86d07 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d6d7d15242cb223e91311a243310c61cd501c52a52d96415b7a1dfc9e012db8 +size 35189 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset new file mode 100644 index 00000000..a5baaeb1 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c931230fefec4bb9b8b2291f4475511420afccec0bbe8dc013e5a51f5147a38e +size 42586 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset new file mode 100644 index 00000000..94b1578b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47d5998f8b8eb42f63c66a5c950cd3923042113fbab7c1307ec3ca7f51d0ebd7 +size 39464 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset new file mode 100644 index 00000000..93dbf0eb --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d259a334d0ea048dfef93d8b8eda98d297d0d54b62a3c767f259f87f0f541d5 +size 43124 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset new file mode 100644 index 00000000..7b8118c8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16ad484fecc7bfa11ff70ed7cde51d7ced395fcab41d73c3d238d7237fb62c0a +size 50113 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset new file mode 100644 index 00000000..27ee9484 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94fdccabfe717d535068965238dbfe093bc84d7f5506cd9ed4e0132a73baa4ec +size 49517 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset new file mode 100644 index 00000000..9c6d4282 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdc62a74409dc494b6739127c7155d7e94c80a235c649327b00d954d1bcfb548 +size 49445 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset index 42ce6249..9cca82ee 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f69a66df3e842c5f70b434d523e22d8ae8ff1757be0db07797a01b477a196bb -size 86471 +oid sha256:944b94ec41547f02e04760ba1ccdf5b903e66f70674fc9bf222e8ada5f4bc57d +size 82333 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset new file mode 100644 index 00000000..67a1176a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fedfe3a6f7917c088a125c6acc634a9d3a1dc49c7d400be7a30eaafd139c8ba9 +size 32826 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset index 72725284..eccc8f8e 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a01486d1395650bc7800d9362fed266a8216201e4ed34e3466ffff9a4632550e -size 176242 +oid sha256:3e9dda08a025f74281c7608d7d8f3e986494a763c981c1aef936088da1ab4fc8 +size 182824 diff --git a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset index 9c669c20..04866db2 100644 --- a/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:339d24fd1f9dcc65f821af947466a5c7278a74790ede50941fce5c9561e556fe -size 25252 +oid sha256:88530c75feaa3a5ae973962f72a1ca7b2c34be7a552a61db18a74b0c739c4a3f +size 27114 diff --git a/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap b/EndlessVendetta/Content/Levels/TempLevels/NewTutorialMap.umap index 3356b054..d320596e 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:6018597114beef9dd695ae8cfd205ecb429e5d854c31244a49930a28688df7cf -size 1936322 +oid sha256:9f66d5325e533e2512616a08ec970350af33783d40079e87a3fddcd7f9c1f8a1 +size 1936940 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 3f0cf8be..4c4d5bca 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:dcd744415c36d7f01a64653563dd413a017466bf707c108ec6733da0fcfb7d66 +oid sha256:251d138dfec13168b7377f8bf7ff38b62151dc9968919a11ce68ab1e86bd0e02 size 43745 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.cpp new file mode 100644 index 00000000..2f6d999e --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.cpp @@ -0,0 +1,18 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "WeaponDepositCheckpoint.h" + +#include "EndlessVendetta/EndlessVendettaCharacter.h" + +void AWeaponDepositCheckpoint::Interact() +{ + if (!Active) return; + + UE_LOG(LogTemp,Warning, TEXT("Sooooo ermmmmmm")); + AEndlessVendettaCharacter* Player = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); + if (Player->bHasRifle) Player->EquipSecondary(); + Player->bLockSecondary = true; + OpenElevatorDoor(); + BroadcastCompletion(); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.h new file mode 100644 index 00000000..953f0b01 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/WeaponDepositCheckpoint.h @@ -0,0 +1,24 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "EndlessVendetta/InteractionInterface.h" +#include "EndlessVendetta/BountySystem/CheckpointClass.h" +#include "WeaponDepositCheckpoint.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API AWeaponDepositCheckpoint : public ACheckpointClass, public IInteractionInterface +{ + GENERATED_BODY() + +protected: + void Interact() override; + + UFUNCTION(BlueprintImplementableEvent) + void OpenElevatorDoor(); + +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 5de27d68..7b2cdbcc 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -493,7 +493,7 @@ void AEndlessVendettaCharacter::EquipPrimary() void AEndlessVendettaCharacter::EquipSecondary() { - if (bIsReloading) return; + if (bIsReloading || bLockSecondary) return; if (!IsValid(SecondaryWeaponClass)) return; if (PlayerOnShip || InPauseMenu) return; FActorSpawnParameters spawnParams; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 8255dd6d..778da25d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -219,6 +219,8 @@ public: AGadgetManager* GadgetManager; bool bIsReloading = false; + bool bLockSecondary = false; + bool bIsPlayerMoving = false; UPROPERTY(VisibleAnywhere, BlueprintReadWrite)