From d12573f6cc14bbbc55b0368bd3adc017ab1ed708 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 23 Oct 2023 14:01:09 +0100 Subject: [PATCH 01/28] Added Sniper Weapon and started creating Base Functionality --- .../BaseWeapons/Snipers/BaseSniper.uasset | 3 ++ .../EndlessVendettaCharacter.cpp | 13 ++++++- .../EndlessVendettaCharacter.h | 4 ++ .../WeaponSystem/BaseWeaponClass.h | 4 +- .../WeaponSystem/SniperClass.cpp | 38 +++++++++++++++++++ .../WeaponSystem/SniperClass.h | 36 ++++++++++++++++++ 6 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.h diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset new file mode 100644 index 00000000..410bc4c2 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d4a7e220c05cd641cf8f6465c767efb4bf895ca9ac7d473530dff9daeecac55 +size 124137 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 3cfc910d..cd739e62 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -10,6 +10,7 @@ #include "AI/EnemyCharacter.h" #include "GameFramework/CharacterMovementComponent.h" #include "Kismet/GameplayStatics.h" +#include "GameFramework/MovementComponent.h" ////////////////////////////////////////////////////////////////////////// @@ -71,7 +72,17 @@ void AEndlessVendettaCharacter::Tick(float DeltaTime) Super::Tick(DeltaTime); WeaponPickUpSystem(); - + + MoveGroundSpeed = Cast(GetComponentByClass(UMovementComponent::StaticClass()))->Velocity.Size(); + + if (MoveGroundSpeed > 0) + { + bIsPlayerMoving = true; + } + else if (MoveGroundSpeed <= 0) + { + bIsPlayerMoving = false; + } } void AEndlessVendettaCharacter::WeaponPickUpSystem() diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index a3d099ce..775f12f2 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -93,6 +93,10 @@ public: int Money = 2000; bool bIsReloading = false; + bool bIsPlayerMoving = false; + + double MoveGroundSpeed; + /** Look Input Action */ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) class UInputAction* LookAction; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 36de56ca..1de19d01 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -25,7 +25,7 @@ protected: // Called when the game starts or when spawned virtual void BeginPlay() override; - void ApplyRecoil(float DeltaTime); + virtual void ApplyRecoil(float DeltaTime); void GenerateRecoilVector(); @@ -159,7 +159,7 @@ public: //UFUNCTION(BlueprintCallable, Category = "Weapons") //void RecoilVerticalLimit(FHitResult Outhit); - UPROPERTY(EditAnywhere) + UPROPERTY(VisibleAnywhere) int bulletCountShoot; //Gets how many bullets shot per void Interact() override; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp new file mode 100644 index 00000000..b357df11 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp @@ -0,0 +1,38 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "SniperClass.h" +#include "EndlessVendettaCharacter.h" + +// Sets default values +ASniperClass::ASniperClass() +{ + // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; +} + +// Called when the game starts or when spawned +void ASniperClass::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void ASniperClass::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + +void ASniperClass::Fire() +{ + +} + +void ASniperClass::ApplyRecoil(float DeltaTime) +{ + if (endlessVendettaChar->bIsPlayerMoving) + { + UE_LOG(LogTemp, Display, TEXT("playerMovingIsTrue")); + } +} diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.h new file mode 100644 index 00000000..1b590477 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.h @@ -0,0 +1,36 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "BaseWeaponClass.h" +#include "EndlessVendettaCharacter.h" +#include "SniperClass.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API ASniperClass : public ABaseWeaponClass +{ + GENERATED_BODY() + +public: + // Sets default values for this actor's properties + ASniperClass(); + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; + +protected: + + virtual void Fire() override; + + virtual void ApplyRecoil(float DeltaTime) override; + +}; From 53ecbbb472cfac7416378f211304e16ed28e70a3 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 23 Oct 2023 17:24:58 +0100 Subject: [PATCH 02/28] Bugfix Get Item At Index Returning Invaild Result --- .../Source/EndlessVendetta/Inventory/InventoryComponent.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index 5e8f39de..ad4d2687 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -107,7 +107,7 @@ bool UInventoryComponent::IsRoomAvailable(UBaseItem* Item, const int TopLeftInde TileToCheck.X = i; TileToCheck.Y = j; if (!IsTileValid(TileToCheck)) return false; - const TTuple ItemAtIndex = GetItemAtIndex(TileToIndex(TileToCheck)); + TTuple ItemAtIndex = GetItemAtIndex(TileToIndex(TileToCheck)); if (ItemAtIndex.Get<1>()) return false; if (IsValid(ItemAtIndex.Get<0>())) return true; } @@ -126,6 +126,7 @@ FInventoryTile UInventoryComponent::IndexToTile(const int Index) const TTuple UInventoryComponent::GetItemAtIndex(const int Index) { if (!InventoryItems.IsValidIndex(Index)) return MakeTuple(nullptr, false); + if (!IsValid(InventoryItems[Index])) return MakeTuple(nullptr, false); return MakeTuple(InventoryItems[Index], true); } From 58931ab222c6e2b3c5b5404a03d0b6908428c648 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Wed, 25 Oct 2023 16:58:38 +0100 Subject: [PATCH 03/28] Bugfix Inventory UI Not Refreshing on Dirty --- .../Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_Desk01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset | 4 ++-- .../Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset | 4 ++-- .../BountySystem/BountyDirector/PC_Background.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF1.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF10.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF11.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF12.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF13.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF14.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF15.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF16.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF17.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF18.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF19.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF2.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF20.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF21.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF22.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF23.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF24.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF3.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF4.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF5.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF6.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF7.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF8.uasset | 2 +- .../TutorialFacility/IntroCutscene/IntroF9.uasset | 2 +- .../IntroCutscene/PlayersHomeShipImage.uasset | 2 +- .../BountySystem/Waypoint/TempMainBountyIcon.uasset | 2 +- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/Inventory/MyBaseItem.uasset | 2 +- EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset | 4 ++-- .../Materials/Panel_Concrete_BaseColor.uasset | 4 ++-- .../Materials/Panel_Concrete_Normal.uasset | 4 ++-- .../Panel_Concrete_OcclusionRoughnessMetallic.uasset | 4 ++-- .../Source/EndlessVendetta/Inventory/BaseItem.h | 4 ++-- .../EndlessVendetta/Inventory/InventoryComponent.cpp | 8 ++++---- 39 files changed, 52 insertions(+), 52 deletions(-) diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset index 58f07fd5..8dfab0c1 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:510cdd364940ec3d074a4d801d97eb2399c478e7abaadbe4a391d1f5d5173d99 -size 17604 +oid sha256:78649458180a4491b40592e6a9a9e8447adea855c1cd85f81787ed7fe5969280 +size 17909 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset index 56d35587..2cf30861 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Desk01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b5800271c81b65754f3f21cb67b4cd0deedcbfb0232f2ab22ce604646841f71 -size 17782 +oid sha256:4fa2682740cc099fe7bbb329a3948b067f131bfb383ab0549b8d3d9d1ef5ba31 +size 18087 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset index 3802fc1c..5122e1e2 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_SmallTable01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbaa2286c539702b51a5a6174c462bc5fd8e0cd5ee583793f643a49ac7b7e753 -size 17113 +oid sha256:65c189f60265e279660472e3aabd26eb5023432f3e5b3d96849f50b142dcd2f1 +size 17434 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset index cb8d4719..199f6a07 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Wardrobe01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc48983716b4a41ddac4cdc283559cd56c76280b226550f6278a8104a68edf2c -size 20003 +oid sha256:a0f5675deaee197aaf1285dc476c5e79bd1869f7ee0849730d6b60c082f5d4b6 +size 20300 diff --git a/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset b/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset index e1c19927..4299270e 100644 --- a/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset +++ b/EndlessVendetta/Content/BountySystem/BountyDirector/PC_Background.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a9e3317f660c27f1e50f6d62dc7c41212247691362563f8ee0d1c0df4d419a3 +oid sha256:fc51145854d6759b4f32c669b1cbed0c62e07401e1ed6d309c5ab7d4e1b7f01f size 247653 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset index a77bd9c5..aaf6e2dd 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afb1af674f0886711bc46edd965062b1c70f843db5717f0805f93bec05d98ecb +oid sha256:f0a7a523b9dc5a9fd685258cfe8bc60991d2b239148d8c017972673ba0746022 size 520107 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset index 18b13d54..2d8edcfb 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF10.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfea54512bade08fea6d38d249df1471a97afa83883d0a197c87c0297704c432 +oid sha256:2b2eceefa723dc5a79b3448b1277eb03ad31fe713a73ae42884960402ea2429c size 190143 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset index cb198274..b4141b1a 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF11.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90ccbb7936984b7bb2a771875419d5e31d24a2c98f71f95a0b3c05f404ebf263 +oid sha256:071579af66b333f7354cdc3ee309285fe452adc58f847709ffd2dc1b01f41c81 size 199883 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset index 097e4bb0..10871996 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF12.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2199d1967ed03067cd6c682ca01ed36e440713be41562815461b59fb9ec4690f +oid sha256:c6659b1d9be99fffeb3adbbc370e72134d7171ec8fced2fd201cb05ca37879a1 size 278003 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset index b70cc5b2..a1bc0b4a 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF13.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b22afc9e55fb90cebd69c4193e2f151a4974bcda51d731ac233dd7548489e1f5 +oid sha256:e74bd8508b9be1aa54bbc732c981019da67048cc1ce66fb6ae73ed5291a89974 size 216041 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset index b31ae079..9d046e2d 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF14.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cd9b8e55e5e9f28262566d63785810e116b3ae17e6dbe9566ffaa77d6c4c830 +oid sha256:ca232afedbe4180964c5d88d58652e813ab13d21983d3180c8b3efe2db92ebd4 size 207080 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset index 6f41642b..c2e466ef 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF15.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cea03c89a2284e8ab2167515f5dc2202dca82b1ff42beb9cf99b0864194298b5 +oid sha256:27db0081fd42181a7b3029147cd9b60241ca34d5344895b42fb55b3c3736a7fc size 265249 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset index 60764b2b..0ad00735 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF16.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3597a1a414682dc1e0af20bb58411000fa9f53e5cc4bffa0cdef047f5bef5edb +oid sha256:5bb79f197937f86b99e5a6b78bb4d2a9ae213001c6bb5af8c4fae53aaf267b6f size 287298 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset index c4fc3ca9..ecc7f33b 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF17.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a1154ecb9ec4a484a0dbee1fe88ddfbd43d212be9b1741a2e5f242d26f07109 +oid sha256:56e3150d658610c8de5bb8ccf6d9c3ff6b36c0589e075a8ee7ad9d4bef669861 size 93869 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset index a092af28..2a91232e 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF18.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fad118773b61f2751df8d7fbfd5d2afdf7bb21363d613da169963e3eaff281a4 +oid sha256:4d349b3119d1681d78deddd0ee588beea88885d6f22cf243cd62a3fe5ecc17c9 size 222864 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset index eea44311..d5945eb4 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF19.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5591f94c1ceb0b5d4ca36f75d59eaaa15ad4e134679f1bbe762def817871b7ec +oid sha256:b95798ae92d9799996e45f036fc693a2677b1c109aa4ad47c9915c5468cc552e size 349128 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset index a58ba621..ff886d39 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f309675f2dc38d8c1bf81634b233f6ef0b67802515977b5cd2c4bb9e1d8b5bd0 +oid sha256:cdd7ef44fa54e4d6fc107c80a5a1b9fbf7eaa388d499c159301ed2104925dc4d size 514322 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset index 9497ff40..7fa3ddde 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF20.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0845004d52fda9772f4c34658217b73f74048eae13b3ff38ee9c6e23ec4b31f +oid sha256:daa532eeb32993dd1609b8c7dd4c1317a55e16041a8c7522202e79f3fa05b7c7 size 279708 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset index f7a2f316..b20f2df5 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF21.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea43f68bafd93d66443c5985be791c8a450e0a05a8fc6d9d38b94db48c2279b5 +oid sha256:214afb1bf6af99da3b9a6cd363d54ebbeaf9e60e72969ef6ce67dc4d4e5f6143 size 264982 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset index db16a3a9..2785d428 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF22.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50ceee3af884775b01cb2542007887326beaf0591e3c5b90c401bd90ac44bbe5 +oid sha256:9ecf3107ed78b41ad8a06501fc8822b97472e1bc17b51a3e38789e4abb212c30 size 201408 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset index 8422f8a7..665bc512 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF23.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c1a581bd6b07773550a66b223ddbf159b2b354c3d0be9c49fdcf704ce1b090c +oid sha256:d968ba779c0a08c5e29149afe3055046d287cc37dfe5946409ac83a062d0fc95 size 233871 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset index 83175dcc..e0e5fc91 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF24.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d50a5ffc3fbe9ddc0e671bc0aba633f21edf0ad70575b4b0ab61c7daa2c03e3f +oid sha256:c50495df45378664166ad5468b3b2f6f1229d1abfc385ea148c5ef8c3e129f5c size 243459 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset index cfdb0435..9cf119e2 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:784c85d3d80649ec757ee07cbe99d98f6488acd9e428524f67625928c76e3d59 +oid sha256:08b93cdc713cad71806aa5c7ea8bab313b47c15b92a24d9180ae0efc6e040648 size 223835 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset index 88ebab29..160a480e 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb29a34a7f3ce87cd020c3e96973787eae7e13aafa43cd67805fd52c8168772c +oid sha256:a9d69f271f131e122068d8e9e01c015d8bde01335387e8747da96f6a9524a56a size 154151 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset index b3315365..f50ed79a 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0cc947bdc905e4dbd729f6cad9f2439f02c5d2ec97feb7e81f11f204d5327d8 +oid sha256:de56af9d93500dd96005a6f362986c71431d04bb08cc95209d575302b059200c size 196683 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset index d9e2446e..1b6be2b3 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF6.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:124c83ecf291fe70581505746b6003214ee069b19d0bf3f15344d3725d5b35b3 +oid sha256:d795b0936261bd5a166c0e22670071610b45c08f4751017b6ddb2a89a66ab747 size 230592 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset index a6234e17..9fda58ed 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF7.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6946a1336673f93680fed45f0cf9ce3b674b6c761f819bae4fc3e698000502ef +oid sha256:7c06f98e8fe37c5fdda89a159aa06651d1f86291cfa291a4d69fdba21cb5a14e size 234019 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset index 1ca0c611..abad250e 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF8.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bf5b0fe472badda37b479f17431f96520f1255e527f96638b3e36ed24816a91 +oid sha256:75b42558116e853a22943f952546a557ff75e2cf8b4f8b0afa3c240187145618 size 224994 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset index cc9aa2e7..d4260014 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/IntroF9.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:368df35a657b9b190ad73d14d75e6eaab61187d37de7f2a94cb516e2d5fad769 +oid sha256:132738939e45cfe9982439bd1b391d363850cb7c803d405c9894683d7d591d75 size 251621 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset index efda48f0..037ee9ee 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/IntroCutscene/PlayersHomeShipImage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e6a8db373eb4fa31440f3ab4dc6b5e8f745540595237fd7b22fed4859aa8dc +oid sha256:2613e30fdd451c4c60be7acee8b6c0ca4ca11ac55b81c6a3649bc87e827b9e42 size 148252 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset index fd565c3c..272cca49 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/TempMainBountyIcon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f3368bb73bdc87d7c608943acc9ae6c8163e32ae29bfaba6701eb8e6270123f +oid sha256:d0aecd15ed5150cad733053745a0db554ffe01be74a9763eb0fb24f1a639b48f size 211777 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 14cd792b..bc3794e4 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae78f6c191dc883ac81ae0762000171837310d6ddd5ac62eb0bbd80b339a4d0e -size 43886 +oid sha256:f39b6a9b90b7aa2d74ad1276c7daf693ac57799f8a7ecb1abb31e7cdf93e0e52 +size 67690 diff --git a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset index 4c1d1f22..758ae3c4 100644 --- a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset +++ b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a60300e2d3a093d49cc47288fadddb35de6038282d0a4a9ede6d695cbd09b2e +oid sha256:fdeecfb1776cd87e96cf07286cefb2c0d19ab38bcdb878672972e227e8c50024 size 6303 diff --git a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset index 3ee6aff2..6051adc6 100644 --- a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset +++ b/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3cef6023803bb1cb16e24224bc11c30ba25dfd1aabb4067521f21f8c01cf3c8 -size 582279 +oid sha256:e272d7c78f6f03069c1262b5b64252c6992880d5135505b512715131aebc87bf +size 569790 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset index 49b8293c..76618f47 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c7959637d99242528a577c02b859fb548fa09c23d492edba47ee16bb993339c -size 1645357 +oid sha256:9b0dbb428642c1b0e58836ea2209e1582299c1f2e1da0862199dafa7dd308e3e +size 1645445 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset index 8785b31f..02659af3 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdb64cb291167601a4b386e10ecea4f3f9dfc775b6bd8ad229316fd4664eefd5 -size 2960186 +oid sha256:7f4f79671afa46c75ed303f899d08cc6ceeba8c196a609bf431987f6298e4492 +size 2960274 diff --git a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset index 5182b904..bcefe216 100644 --- a/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset +++ b/EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:645d5fe908bcd3c8b26ec3f63cb9a8e6a746190b0cfe073d130f85c6d720712d -size 352656 +oid sha256:f4a0db0198e019e1fe271f4c96b469b23505c66536b0f5db30d69abfb527c6d3 +size 352744 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h index da7ed6d9..14645877 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h @@ -10,9 +10,9 @@ struct FItemSize { GENERATED_BODY() - UPROPERTY(BlueprintReadOnly, Category = "ItemSize") + UPROPERTY(BlueprintReadWrite, Category = "ItemSize") int X; - UPROPERTY(BlueprintReadOnly, Category = "ItemSize") + UPROPERTY(BlueprintReadWrite, Category = "ItemSize") int Y; FItemSize(const int _X, const int _Y) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index ad4d2687..001e46f3 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -145,7 +145,7 @@ void UInventoryComponent::AddItemAt(UBaseItem* Item, const int TopLeftIndex) TileToCheck.X = i; TileToCheck.Y = j; if (!IsTileValid(TileToCheck)) return; - InventoryItems.Insert(Item, TileToIndex(TileToCheck)); + InventoryItems[TileToIndex(TileToCheck)] = Item; } } IsDirty = true; @@ -158,7 +158,7 @@ TMap UInventoryComponent::GetAllItems() { UBaseItem* Item = InventoryItems[i]; if (!IsValid(Item)) continue; - if (!Items.Contains(Item)) continue; + if (Items.Contains(Item)) continue; Items.Add(Item, IndexToTile(i)); } return Items; @@ -171,7 +171,7 @@ void UInventoryComponent::RemoveItem(UBaseItem* Item) { if (InventoryItems[i] == Item) { - InventoryItems.RemoveAt(i); + InventoryItems[i] = nullptr; IsDirty = true; } } @@ -183,7 +183,7 @@ void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location, FRotator bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const { - if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.Y < Columns && InventoryTile.Y < Rows) + if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) { return true; } From 50791b67c3f38b708b4c70ed74d3856f0a45430f Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 26 Oct 2023 10:52:42 +0100 Subject: [PATCH 04/28] Bugfix Able to Place Items Outside of Grid --- EndlessVendetta/Content/Inventory/M_Base_Rev.uasset | 3 +++ EndlessVendetta/Content/Inventory/MyBaseItem.uasset | 4 ++-- .../Source/EndlessVendetta/Inventory/BaseItem.cpp | 7 +++++++ .../Source/EndlessVendetta/Inventory/BaseItem.h | 6 +++++- .../EndlessVendetta/Inventory/InventoryComponent.cpp | 4 ++-- 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 EndlessVendetta/Content/Inventory/M_Base_Rev.uasset diff --git a/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset b/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset new file mode 100644 index 00000000..01f423f1 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddc0bd83ded6fbd643a6e2f17d8733c45f6c257ab625118ba77d639104f004b9 +size 18207 diff --git a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset index 758ae3c4..f708989d 100644 --- a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset +++ b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdeecfb1776cd87e96cf07286cefb2c0d19ab38bcdb878672972e227e8c50024 -size 6303 +oid sha256:d2c73a557df51957bac0873e8c8144c354801a6f68e7882c23e403940ac9d7e1 +size 6587 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp index b79e1425..d2987dcf 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.cpp @@ -3,6 +3,13 @@ #include "BaseItem.h" + +void UBaseItem::PostInitProperties() +{ + Super::PostInitProperties(); + ItemSize = FItemSize(DefaultItemSize.X, DefaultItemSize.Y); +} + void UBaseItem::RotateItem() { if (CurrentItemRotation == Horizontal) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h index 14645877..39d040bf 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/BaseItem.h @@ -51,7 +51,9 @@ public: UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") FText Description; UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") - FItemSize ItemSize = FItemSize(); + FVector2D DefaultItemSize = FVector2D(1); + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") + FItemSize ItemSize; UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") UMaterialInterface* ItemTexture; UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") @@ -63,6 +65,8 @@ public: UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") bool bIsRotated = false; + virtual void PostInitProperties() override; + UFUNCTION(BlueprintCallable, Category = "Item") void RotateItem(); UFUNCTION(BlueprintCallable, Category = "Item") diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index 001e46f3..b086643f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -109,7 +109,7 @@ bool UInventoryComponent::IsRoomAvailable(UBaseItem* Item, const int TopLeftInde if (!IsTileValid(TileToCheck)) return false; TTuple ItemAtIndex = GetItemAtIndex(TileToIndex(TileToCheck)); if (ItemAtIndex.Get<1>()) return false; - if (IsValid(ItemAtIndex.Get<0>())) return true; + if (IsValid(ItemAtIndex.Get<0>())) return false; } } return true; @@ -183,7 +183,7 @@ void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location, FRotator bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const { - if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) + if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.X < Columns && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) { return true; } From 2553f471e5eccaacc3e2cbe2a889bcf0a94c78d3 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 26 Oct 2023 11:27:03 +0100 Subject: [PATCH 05/28] Updated Inventory for Cleanup --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset | 4 ++-- EndlessVendetta/Content/Inventory/M_Base_Rev.uasset | 3 --- EndlessVendetta/Content/Inventory/M_Base_Rot.uasset | 3 +++ EndlessVendetta/Content/Inventory/MyBaseItem.uasset | 2 +- EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset | 3 +++ EndlessVendetta/Content/Inventory/UI_Inventory.uasset | 3 --- EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset | 3 --- EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset | 3 --- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Source/EndlessVendetta/Inventory/InventoryComponent.cpp | 2 +- .../Source/EndlessVendetta/Inventory/InventoryComponent.h | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 EndlessVendetta/Content/Inventory/M_Base_Rev.uasset create mode 100644 EndlessVendetta/Content/Inventory/M_Base_Rot.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset create mode 100644 EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_Inventory.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset delete mode 100644 EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index bc3794e4..bd336f47 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f39b6a9b90b7aa2d74ad1276c7daf693ac57799f8a7ecb1abb31e7cdf93e0e52 -size 67690 +oid sha256:e682a957f3ebb1f435625e280cf61ebd7af0d8fb7d052e424d8c629c6b55c0f6 +size 44055 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset index 096f7b65..0422e8b5 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_PC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:652c5f873867461d6bff66634c30ab364f7f1ef3f45551c75b7c484e4af0d44d -size 108896 +oid sha256:64c5c7438cb4287bc4df51b9393981eb8155dc5f14525c600d6725960dce6bfd +size 108419 diff --git a/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset b/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset deleted file mode 100644 index 01f423f1..00000000 --- a/EndlessVendetta/Content/Inventory/M_Base_Rev.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddc0bd83ded6fbd643a6e2f17d8733c45f6c257ab625118ba77d639104f004b9 -size 18207 diff --git a/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset b/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset new file mode 100644 index 00000000..ad45269b --- /dev/null +++ b/EndlessVendetta/Content/Inventory/M_Base_Rot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dc387e928b76f39cdbad7961e09b77c848b2d6df0348a0f4052bdc98976a659 +size 18207 diff --git a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset index f708989d..024d162f 100644 --- a/EndlessVendetta/Content/Inventory/MyBaseItem.uasset +++ b/EndlessVendetta/Content/Inventory/MyBaseItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2c73a557df51957bac0873e8c8144c354801a6f68e7882c23e403940ac9d7e1 +oid sha256:789627d1177e0ef93075f0ca5a5b27156b16dfce514a80c543108f133a70b7d2 size 6587 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset new file mode 100644 index 00000000..e0960292 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc2d597e4dd0c95915c34a213b9a299bef8d337b839b2a8b9618a9a63d26732c +size 84945 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset new file mode 100644 index 00000000..fc14eb3f --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_InventoryGrid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cce77e4317282a52477d49365a307a4673915f14b6013ee32ed2ef26800fa37 +size 563097 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset b/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset new file mode 100644 index 00000000..c6979830 --- /dev/null +++ b/EndlessVendetta/Content/Inventory/UI/UI_ItemWidget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffcc3dbb5d6cafefa035c2e86c1fe4579fee9ce62abced4d4d86216caaf620f2 +size 147282 diff --git a/EndlessVendetta/Content/Inventory/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI_Inventory.uasset deleted file mode 100644 index 29548ed8..00000000 --- a/EndlessVendetta/Content/Inventory/UI_Inventory.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:461387a0016e4548f6916377de335db4cc9b40fa795d6a25b7b8247279b3002f -size 87922 diff --git a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset b/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset deleted file mode 100644 index 6051adc6..00000000 --- a/EndlessVendetta/Content/Inventory/UI_InventoryGrid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e272d7c78f6f03069c1262b5b64252c6992880d5135505b512715131aebc87bf -size 569790 diff --git a/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset b/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset deleted file mode 100644 index 6773c468..00000000 --- a/EndlessVendetta/Content/Inventory/UI_ItemWidget.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d6849ec4eed10578619d45a3633b4d8540ce11c4b56ef00bfca43fe2429b480 -size 148756 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 205b9bf5..a88e02c4 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:974625bb42aeaaaec3c16d60fcf02f3a750f9bd6a87103075fcc1fc854eeadf0 -size 456337 +oid sha256:b745061f359dd7b8358b5673eda5a1d3dd75f1c17b6f70c73e177d10a0c3ebf0 +size 456284 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index b086643f..df0b4bc6 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -177,7 +177,7 @@ void UInventoryComponent::RemoveItem(UBaseItem* Item) } } -void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location, FRotator Rotation) +void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location) { } diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index 5ba7ba28..f8a4a44f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -60,7 +60,7 @@ public: UFUNCTION(BlueprintCallable, Category="Inventory") void RemoveItem(class UBaseItem* Item); UFUNCTION(BlueprintCallable, Category="Inventory") - void SpawnItem(class UBaseItem* Item, FVector Location, FRotator Rotation); + void SpawnItem(class UBaseItem* Item, FVector Location); private: bool IsTileValid(const FInventoryTile InventoryTile) const; From c794a905da45ffde2274adbf3a84bf2ca9ddd9e3 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 26 Oct 2023 11:59:50 +0100 Subject: [PATCH 06/28] Updated Inventory Component for Resising Functionality --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset | 4 ++-- .../EndlessVendetta/Inventory/InventoryComponent.cpp | 7 +++++++ .../Source/EndlessVendetta/Inventory/InventoryComponent.h | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index bd336f47..2e7c893c 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e682a957f3ebb1f435625e280cf61ebd7af0d8fb7d052e424d8c629c6b55c0f6 -size 44055 +oid sha256:21f83334caec77bd5102f683752229d6f53c6e3f6b0b362f4a00171573bd502b +size 50118 diff --git a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset index e0960292..3b397eac 100644 --- a/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset +++ b/EndlessVendetta/Content/Inventory/UI/UI_Inventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc2d597e4dd0c95915c34a213b9a299bef8d337b839b2a8b9618a9a63d26732c -size 84945 +oid sha256:02676d43ab06d6fe84a89f2c8c147415615e84ab3474cb59e75888dae53f5711 +size 96823 diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp index df0b4bc6..2d09885f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.cpp @@ -181,6 +181,13 @@ void UInventoryComponent::SpawnItem(UBaseItem* Item, FVector Location) { } +void UInventoryComponent::UpdateInventorySize_Implementation(const int _Columns, const int _Rows) +{ + Columns = _Columns; + Rows = _Rows; + InventoryItems.SetNum(Columns * Rows); +} + bool UInventoryComponent::IsTileValid(const FInventoryTile InventoryTile) const { if (InventoryTile.X >= 0 && InventoryTile.Y >= 0 && InventoryTile.X < Columns && InventoryTile.Y < Columns && InventoryTile.Y <= Rows) diff --git a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h index f8a4a44f..813a181b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h +++ b/EndlessVendetta/Source/EndlessVendetta/Inventory/InventoryComponent.h @@ -49,7 +49,6 @@ public: bool IsRoomAvailable(class UBaseItem* Item, const int TopLeftIndex); UFUNCTION(BlueprintCallable, Category="Inventory") FInventoryTile IndexToTile(const int Index) const; - //UFUNCTION(BlueprintCallable, Category="Inventory") TTuple GetItemAtIndex(const int Index); UFUNCTION(BlueprintCallable, Category="Inventory") int TileToIndex(const FInventoryTile InventoryTile) const; @@ -61,6 +60,9 @@ public: void RemoveItem(class UBaseItem* Item); UFUNCTION(BlueprintCallable, Category="Inventory") void SpawnItem(class UBaseItem* Item, FVector Location); + UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Exec, Category = "Inventory") + void UpdateInventorySize(const int _Columns, const int _Rows); + virtual void UpdateInventorySize_Implementation(const int _Columns, const int _Rows); private: bool IsTileValid(const FInventoryTile InventoryTile) const; From 848430aebd59571c7efcc0e4c143086c01eb32c8 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 26 Oct 2023 15:49:11 +0100 Subject: [PATCH 07/28] Finished Creating Sniper Weapon --- .../BaseWeapons/Snipers/BaseSniper.uasset | 4 +- .../BaseWeapons/WBP_AmmoCount.uasset | 4 +- .../7/VS/TBSU6BHEHN191N9FG8A6XN.uasset | 3 + .../WeaponSystem/BaseWeaponClass.h | 11 +-- .../WeaponSystem/SniperClass.cpp | 68 +++++++++++++++++-- .../WeaponSystem/SniperClass.h | 8 ++- 6 files changed, 82 insertions(+), 16 deletions(-) create mode 100644 EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/7/VS/TBSU6BHEHN191N9FG8A6XN.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset index 410bc4c2..dec79762 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d4a7e220c05cd641cf8f6465c767efb4bf895ca9ac7d473530dff9daeecac55 -size 124137 +oid sha256:d5625ec21d5212c05429ac81906d5aa5e6ee935ee0bcbcdd16477cbd64165c16 +size 125077 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index ff0850c9..8506b4d5 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4aef926e64cc0bd15cd6df6c9683311954a37d3a4576cd79a564efe16ef7920d -size 64353 +oid sha256:12a2bf04dd00e6b7507070952dc3382734b02f049bd6a73a24f066b802071ca6 +size 64438 diff --git a/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/7/VS/TBSU6BHEHN191N9FG8A6XN.uasset b/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/7/VS/TBSU6BHEHN191N9FG8A6XN.uasset new file mode 100644 index 00000000..34849915 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/7/VS/TBSU6BHEHN191N9FG8A6XN.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b166a03dba174d55220b56cde59bb17914ac485c6b2b4055d1c99ad6d6d3da7 +size 6183 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 1de19d01..531048b8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -7,6 +7,7 @@ #include "Components/ArrowComponent.h" #include "Kismet/KismetMathLibrary.h" #include "EndlessVendetta/InteractionInterface.h" +#include "Engine/EngineTypes.h" #include "BaseWeaponClass.generated.h" class AEndlessVendettaCharacter; @@ -54,7 +55,11 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; void ReloadTimer(); - + + float currentPitch; + + UPROPERTY(EditAnywhere) + float BulletDistance; UPROPERTY(EditAnywhere, BlueprintReadWrite) FString WeaponName; @@ -177,14 +182,10 @@ protected: private: - UPROPERTY(EditAnywhere) - float BulletDistance; - float originalMagnitude; float originalMaxAngleLeft; float originalMaxAngleRight; float originalMinMultiplier; - float currentPitch; }; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp index b357df11..9ace82f6 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp @@ -2,7 +2,10 @@ #include "SniperClass.h" -#include "EndlessVendettaCharacter.h" +#include "EndlessVendetta/EndlessVendettaCharacter.h" +#include "EndlessVendetta/AI/AICharacter.h" +#include "Engine/DamageEvents.h" +#include "Kismet/GameplayStatics.h" // Sets default values ASniperClass::ASniperClass() @@ -15,24 +18,77 @@ ASniperClass::ASniperClass() void ASniperClass::BeginPlay() { Super::BeginPlay(); - } // Called every frame void ASniperClass::Tick(float DeltaTime) { - Super::Tick(DeltaTime); + ApplyRecoil(DeltaTime); + recoilMagnitude = 1; + if(endlessVendettaChar->bIsPlayerMoving == false ) + { + recoilResultPitch = 0; + recoilMagnitude = -1; + } + if (currentPitch < 0 && bStopShooting) + { + float increment = currentPitch * DeltaTime * 8; + currentPitch -= increment; + playerInWorld->AddControllerPitchInput(-increment); + } } void ASniperClass::Fire() { - + if(currentAmmoCount > 0 && !bSingleShotOnly) + { + bSingleShotOnly = true; + //do damage fallof based off distance + traceStart = GunStartArrow->GetComponentLocation(); + traceEnd = traceStart + (GunStartArrow->GetForwardVector() * BulletDistance); + if (GetWorldTimerManager().IsTimerActive(timerHandle)) return; + GetWorld()->LineTraceSingleByChannel(outHit, traceStart, traceEnd, ECC_Visibility, collisionParams); + DrawDebugLine(this->GetWorld(), traceStart, traceEnd, FColor::Black , false, 0.2f, 0U, 0.2f); + playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1); + currentAmmoCount -= 1; + bulletCountShoot += 1; + bStopShooting = false; + GenerateRecoilVector(); + ApplyRecoil(UGameplayStatics::GetWorldDeltaSeconds(this->GetWorld())); + this->GetWorld()->GetTimerManager().SetTimer(SniperTimerHandle, this, &ASniperClass::StopFire, FireRate, false); + if (outHit.bBlockingHit) + { + UE_LOG(LogTemp, Display, TEXT("Hit: %s"), *outHit.GetActor()->GetName()); + if (!Cast(outHit.GetActor())) return; + Cast(outHit.GetActor())->TakeDamage(WeaponDamage, FPointDamageEvent(), GetWorld()->GetFirstPlayerController(), this); + } + } + else if(currentAmmoCount <= 0) + { + UE_LOG(LogTemp, Display, TEXT("No ammo, Ammo count: %d"), currentAmmoCount); + } } void ASniperClass::ApplyRecoil(float DeltaTime) { - if (endlessVendettaChar->bIsPlayerMoving) + if (recoilTime < 0.3) { - UE_LOG(LogTemp, Display, TEXT("playerMovingIsTrue")); + float amplitude = RecoilCurve->GetFloatValue(recoilTime); //get current value of curve in time + recoilTime += DeltaTime; + + playerInWorld->AddControllerPitchInput(GetRecoilPitch(amplitude, recoilTime)); + + currentPitch += GetRecoilPitch(amplitude,recoilTime); + + playerInWorld->AddControllerPitchInput(FMath::RandRange(-5 * DeltaTime, 5* DeltaTime)); + GunStartArrow->AddRelativeRotation(FRotator(-GetRecoilPitch(amplitude, recoilTime), 0, 0)); + playerInWorld->AddControllerYawInput(GetRecoilYaw(amplitude, recoilTime)); + + UpdateSamples(amplitude, recoilTime); } } + +void ASniperClass::StopFire() +{ + bSingleShotOnly = false; +} diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.h index 1b590477..721020b1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.h @@ -4,7 +4,6 @@ #include "CoreMinimal.h" #include "BaseWeaponClass.h" -#include "EndlessVendettaCharacter.h" #include "SniperClass.generated.h" /** @@ -27,10 +26,17 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; +private: + + bool bSingleShotOnly; + FTimerHandle SniperTimerHandle; + protected: virtual void Fire() override; virtual void ApplyRecoil(float DeltaTime) override; + + void StopFire(); }; From 6c8e5276f9e39019174683b5d8df3854866da9de Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 26 Oct 2023 15:50:25 +0100 Subject: [PATCH 08/28] Updating Magazine Size Back To Default --- .../Blueprints/BaseWeapons/Snipers/BaseSniper.uasset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset index dec79762..34390329 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5625ec21d5212c05429ac81906d5aa5e6ee935ee0bcbcdd16477cbd64165c16 +oid sha256:c4edd4b9c090f7fd40cb88de61fd3f0a2cf27d5b2e959e8a1189e705df6a9707 size 125077 From 8678376ba6199663b8c5d7420a67823dbc9626de Mon Sep 17 00:00:00 2001 From: MH261677 Date: Thu, 26 Oct 2023 16:00:46 +0100 Subject: [PATCH 09/28] Added Shotgun Base Weapon --- .../Shotguns/BP_BaseShotgun.uasset | 3 +++ .../5/1H/2QRFI3J5JT02V2G1QP4P99.uasset | 3 +++ .../6/TX/BTC9S0W28D5I25IOL56715.uasset | 4 ++-- .../WeaponSystem/ShotgunClass.cpp | 10 +++++++++ .../WeaponSystem/ShotgunClass.h | 21 +++++++++++++++++++ 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset create mode 100644 EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/5/1H/2QRFI3J5JT02V2G1QP4P99.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.h diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset new file mode 100644 index 00000000..ca208dae --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:329bb4534943e949f235c44d9782f62012b4e728fa4a566615a718a2ae0f1bde +size 124581 diff --git a/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/5/1H/2QRFI3J5JT02V2G1QP4P99.uasset b/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/5/1H/2QRFI3J5JT02V2G1QP4P99.uasset new file mode 100644 index 00000000..39871f58 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/5/1H/2QRFI3J5JT02V2G1QP4P99.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56271e75ce388bac1e70abc1085fcf019d41a311ac70ff84ed3f7bbec53aa6ec +size 6426 diff --git a/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/6/TX/BTC9S0W28D5I25IOL56715.uasset b/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/6/TX/BTC9S0W28D5I25IOL56715.uasset index fa64ab8e..01662c33 100644 --- a/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/6/TX/BTC9S0W28D5I25IOL56715.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/FirstPerson/Maps/GunMechanicTester/6/TX/BTC9S0W28D5I25IOL56715.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39162e6e995a0f6846b1a806d1fa532ddc0af51fc910ab83b5c988fc591f91ff -size 4768 +oid sha256:132a3e687f7729d821313a19996f7ec6d6e423a6fc5adb3035cc427c8333d7f3 +size 4742 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp new file mode 100644 index 00000000..266ae616 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp @@ -0,0 +1,10 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "ShotgunClass.h" + +AShotgunClass::AShotgunClass() +{ + // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; +} diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.h new file mode 100644 index 00000000..8bf23c16 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.h @@ -0,0 +1,21 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "BaseWeaponClass.h" +#include "ShotgunClass.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API AShotgunClass : public ABaseWeaponClass +{ + GENERATED_BODY() + +public: + // Sets default values for this actor's properties + AShotgunClass(); + +}; From ce5bde5f3481ec43c1ded6dff71eaf616ed99ecc Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 28 Oct 2023 14:21:58 +0100 Subject: [PATCH 10/28] Added Checkpoint Completion Confirmation UI --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset | 3 +++ EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.png | 3 +++ .../Content/FirstPerson/BluryOrangeHUDOutline.uasset | 3 +++ EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Pine.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Walnut.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- .../Source/EndlessVendetta/BountySystem/CheckpointClass.h | 3 ++- .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 3 +++ 11 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.png create mode 100644 EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 14cd792b..431eaebc 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae78f6c191dc883ac81ae0762000171837310d6ddd5ac62eb0bbd80b339a4d0e -size 43886 +oid sha256:1f998c8a790f08cf0e28a50b1dbe80deab4d914497b53b24d7c9d3a5e4c2784b +size 51467 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset new file mode 100644 index 00000000..3ef7c033 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_CheckpointCompleted.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:845fc89fb83a130aea8498c87ed41fadd3de14e00ac010bcd5843b5a19c29f8f +size 58154 diff --git a/EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.png b/EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.png new file mode 100644 index 00000000..bde1e40f --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b2e2cb02f945bc07f0c011c7a5381c6c6dd004a700c77cfdad6e4f7cecc64dc +size 135953 diff --git a/EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.uasset b/EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.uasset new file mode 100644 index 00000000..2c5487a6 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/BluryOrangeHUDOutline.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70a1e8adb61b189a8a9551e3104fda9ef0734eb0bfbffedc540d6b18dde1cc17 +size 91110 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 205b9bf5..21ed3d2d 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:974625bb42aeaaaec3c16d60fcf02f3a750f9bd6a87103075fcc1fc854eeadf0 -size 456337 +oid sha256:4addc94eb00b8cfff06f1cf21febb2afa189d10a376e0b773013a2bea1c31b70 +size 456336 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..9a1faba7 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:fc3fc160627e9cb03cfa900bfa334561b0d7d22be21f5d273d86435f4538222d +size 66790690 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index 6f0b0367..eafee70c 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25bf6d863adc48d1d3786062e9a29cd63d979fa716e5df6829d5bc55f6c28af4 -size 31298 +oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 +size 31142 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index ed52f264..2e926194 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea0d0b05164ae24c5f4f95ad5f3b59019e8d5b8da047c478486048c88bfe708f -size 20633 +oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 +size 20495 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index a752812e..bf2e4391 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a4fe459ab35cb3c9ee04e4d070f0c2864db92fb1dc63eb53380fb4d3cc91613 -size 53268 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 3086ca39..9c0fa9bf 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "WaypointActor.h" +#include "EndlessVendetta/EndlessVendettaCharacter.h" #include "GameFramework/Actor.h" #include "CheckpointClass.generated.h" @@ -33,7 +34,7 @@ protected: UFUNCTION(BlueprintCallable, Category = "Checkpoint") void BroadcastCompletion() { - UE_LOG(LogTemp, Warning, TEXT("Completed Checkpoint")); + Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->CheckpointCompletedUI(); CompletedCheckpoint.Broadcast(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index a3d099ce..1f82fd2d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -177,4 +177,7 @@ public: void EquipSecondary(); void WeaponSwitcher(AActor* Outhit); + + UFUNCTION(BlueprintImplementableEvent) + void CheckpointCompletedUI(); }; From 54dc93ded017f47ed892e9698eedcd40ab6e8caf Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 28 Oct 2023 14:31:32 +0100 Subject: [PATCH 11/28] Reduced Target Amount for Both Firing Ranges --- .../TutorialFacility/Checkpoints/BP_CQCRange.uasset | 3 +++ .../TutorialFacility/Checkpoints/BP_LongRange.uasset | 3 +++ .../TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_CQCRange.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_LongRange.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_CQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_CQCRange.uasset new file mode 100644 index 00000000..857b3740 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_CQCRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11b576c026267200d7fd27692a546054b7374aca9f8f27c768a33463f121b517 +size 100970 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_LongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_LongRange.uasset new file mode 100644 index 00000000..2f02371c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_LongRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e36749adcb26155cc5778616c16725b1b07791a69e13d915c60637c0c298454 +size 112834 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset index 88d79855..a9cc0e6f 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21c430ea55778c7514d18bacaebfb42b5f0d288be8e324f32c025f61cd83e1ab -size 144113 +oid sha256:43d7ee43bc719045255002dcc02a74860889783dcea8744b7268ca6e1a40ba11 +size 150538 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset index 24ea5bf8..eea40c3a 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eeba76adf00d39df5a039526f6f975901d037f4a78489fc3fe6f34e8b485c20c -size 152984 +oid sha256:e9d57713699f78805d886d31b3766ff4851c417d6642edad60c218edd9c50faf +size 157487 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 21ed3d2d..873ae127 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:4addc94eb00b8cfff06f1cf21febb2afa189d10a376e0b773013a2bea1c31b70 +oid sha256:c152ddec69cad0b0d36c68ed61d9b6ff315cf5c47de4fd5b8411439754d87b88 size 456336 From 3b5a2b61192930df40d5f569e471c7e466e6c8ff Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 28 Oct 2023 14:41:42 +0100 Subject: [PATCH 12/28] Adjusted Parkour Areas Final Jump --- .../TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset index eea40c3a..eac101b5 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9d57713699f78805d886d31b3766ff4851c417d6642edad60c218edd9c50faf -size 157487 +oid sha256:5fab63c70404d783d490b959d5a59076b65e935ffb44fe9a90681236ba83efaa +size 157565 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset index 76d3c2c3..e90385ac 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4098d28d58e506d1cf7d0b06e91c078a8cc5e25eb3176f39fc97bf80bd9334e3 -size 38819 +oid sha256:83c9bd092e97c3b7a89a9a920bb278d742d93d13a439c3a8afaed1fbc62287de +size 38434 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 873ae127..d8038530 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:c152ddec69cad0b0d36c68ed61d9b6ff315cf5c47de4fd5b8411439754d87b88 -size 456336 +oid sha256:80d409292ad4439737a74a463d528e19c92b5f2673d56712ca2778019a9ad7f6 +size 459303 From c53b7c7988c610e58da415a685ee31bafec32b32 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Sat, 28 Oct 2023 17:36:54 +0100 Subject: [PATCH 13/28] Updated Base Gadget Class to Include UI Info --- .../Checkpoints/BP_CQCRange.uasset | 3 - .../Checkpoints/BP_LongRange.uasset | 3 - .../CP_ElimTutorialTarget.uasset | 3 + .../CP_EnterBountySimulationFacility.uasset | 3 + .../CP_ExitBountySimulationFacility.uasset | 3 + .../Checkpoints/CP_CheckOutCQCRange.uasset | 3 - .../Checkpoints/CP_CheckOutLongRange.uasset | 3 - .../Checkpoints/CP_ElimTutorialTarget.uasset | 3 - .../CP_EnterBountySimulationFacility.uasset | 3 - .../CP_ExitBountySimulationFacility.uasset | 3 - .../FiringRanges/BP_CQCRange.uasset | 3 + .../FiringRanges/BP_LongRange.uasset | 3 + .../FiringRanges/CP_CheckOutCQCRange.uasset | 3 + .../FiringRanges/CP_CheckOutLongRange.uasset | 3 + .../GadgetTutorial/BP_GadgetTutorial.uasset | 3 + .../MB_TutorialFacility.uasset | 4 +- .../OverloadModule/CG_OverloadModule.uasset | 4 +- .../CombatGadgets/OverloadModule/OM_Icon.png | 3 + .../OverloadModule/OM_Icon.uasset | 3 + .../RingModule/RG_RingModule.uasset | 4 +- .../ReconGadgets/RingModule/RM_Icon.png | 3 + .../ReconGadgets/RingModule/RM_Icon.uasset | 3 + .../VisionLink/RG_VisionLink.uasset | 4 +- .../ReconGadgets/VisionLink/VL_Icon.png | 3 + .../ReconGadgets/VisionLink/VL_Icon.uasset | 3 + .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +- .../EndlessVendetta/GadgetSystem/GadgetBase.h | 25 +++++ .../GadgetTutorial/GadgetTutorialStation.cpp | 101 ++++++++++++++++++ .../GadgetTutorial/GadgetTutorialStation.h | 68 ++++++++++++ 29 files changed, 245 insertions(+), 30 deletions(-) delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_CQCRange.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_LongRange.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_EnterBountySimulationFacility.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ExitBountySimulationFacility.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/BP_CQCRange.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/BP_LongRange.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset create mode 100644 EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/OM_Icon.png create mode 100644 EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/OM_Icon.uasset create mode 100644 EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RM_Icon.png create mode 100644 EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RM_Icon.uasset create mode 100644 EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/VL_Icon.png create mode 100644 EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/VL_Icon.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_CQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_CQCRange.uasset deleted file mode 100644 index 857b3740..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_CQCRange.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11b576c026267200d7fd27692a546054b7374aca9f8f27c768a33463f121b517 -size 100970 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_LongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_LongRange.uasset deleted file mode 100644 index 2f02371c..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_LongRange.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e36749adcb26155cc5778616c16725b1b07791a69e13d915c60637c0c298454 -size 112834 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset new file mode 100644 index 00000000..5883a4f1 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:727b8060f6720e1de8c6cc5aa95de4e3d2c18b4b6df469c5f1661679379f3054 +size 143152 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset new file mode 100644 index 00000000..3521b8ff --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae808ffd2860b39caf2e3f45d99a2c4f2a1132080068bc782f9a478883a00aa6 +size 73431 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset new file mode 100644 index 00000000..478f5860 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_ExitBountySimulationFacility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e7b67b89169f8856643fa54ad3ee70088d8e57278dda3eae8a67cebae80fc4d +size 49564 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset deleted file mode 100644 index a9cc0e6f..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutCQCRange.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43d7ee43bc719045255002dcc02a74860889783dcea8744b7268ca6e1a40ba11 -size 150538 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset deleted file mode 100644 index eac101b5..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_CheckOutLongRange.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fab63c70404d783d490b959d5a59076b65e935ffb44fe9a90681236ba83efaa -size 157565 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset deleted file mode 100644 index c8253e8c..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffa702b546f8a0b423c1cd0620bcbc0716ce9da63658323d6c72c1d0075e1af7 -size 145032 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_EnterBountySimulationFacility.uasset deleted file mode 100644 index 1e8d35f8..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_EnterBountySimulationFacility.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92908322c75ce1234362b21ada25476a28ee631859d30ad89df3ad654e205737 -size 77065 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ExitBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ExitBountySimulationFacility.uasset deleted file mode 100644 index b341ac54..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ExitBountySimulationFacility.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd59f86788932ea7c2a0b171debaff99a819b2d5f94276320b95c1a5825991a7 -size 52271 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/BP_CQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/BP_CQCRange.uasset new file mode 100644 index 00000000..942a2ae0 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/BP_CQCRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96f0a512c232f3f8d44a79dde7fd6da8d34a02581ac068f010f9ffdaf7bba755 +size 101077 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/BP_LongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/BP_LongRange.uasset new file mode 100644 index 00000000..12a9aaa2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/BP_LongRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8f3d90b13b51423a6cba2d48c8b722b3659b7a14f4bcb6ac730a20df8339b1a +size 112942 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset new file mode 100644 index 00000000..7ea56986 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36ce86af4f5aea5d620295cd12b2ace3d2fe8cb3f79176981f904c77eb61294a +size 147943 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset new file mode 100644 index 00000000..b63a939b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:840b5c9edd522548cd3b4b52a3c8a4a90a18f452ef07db4c7de688e130745888 +size 156457 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset new file mode 100644 index 00000000..4763481d --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ec223a4fa2f994a882c313b35e5f7f2314e2f8a974c0fcb16b0959c4509a8e9 +size 22424 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index 65570157..338f7298 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8214ccde8a67cce0be6384a7fc9023213826c75b0d455bde7d395b2b5c3c4be1 -size 15494 +oid sha256:c6aa4cb4c59963b7874f9a41cd74af7512b6895a4aa337d9440de85b32ce3adb +size 15541 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/CG_OverloadModule.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/CG_OverloadModule.uasset index 918f8800..b6136e8d 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:54c29d51176ad4d6f3709487c680854c3f65197fd77c3fdf909aacebf0012925 -size 109955 +oid sha256:3986954492ecb336baf2a23fdc7005cffddb10af130b3f9af9a679f5c052b709 +size 110442 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/OM_Icon.png b/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/OM_Icon.png new file mode 100644 index 00000000..75c24735 --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/OM_Icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5edf9d42aa5282afec2532e9e5998f185722431e0a28318194705b15b38dfd14 +size 225535 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/OM_Icon.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/OM_Icon.uasset new file mode 100644 index 00000000..9f2d7e12 --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/CombatGadgets/OverloadModule/OM_Icon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f275cf27038f08969c74d019dc74731cd60776e4e9ce940a5ef083740934f7e8 +size 244041 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset index 0ed980f6..8f215cce 100644 --- a/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d874ac6c73fe2ee1d7f1024877b2f448df3daf631d5dafbf4e23804549fa652 -size 108456 +oid sha256:b412ab348368172b66065bc5a41820dd96efe68260518a5d47a63216b343c3ba +size 108251 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RM_Icon.png b/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RM_Icon.png new file mode 100644 index 00000000..b99788f0 --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RM_Icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dbb36f50568ec3e11397930be8509d0e2132f0fbd1c67c235cb6539bb90736f +size 15138 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RM_Icon.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RM_Icon.uasset new file mode 100644 index 00000000..e8226353 --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RM_Icon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31f38b67634e9abe78242aac142e76eafee10d6101d5189f13a941b1a9bffb4d +size 27381 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset index f0c43d86..68f69959 100644 --- a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f40722ce6381c0b65978b90489e162c36b1335524162d4b112fe22a6d382fc24 -size 108529 +oid sha256:27d39fdab60fb9511fcfe760ba9180190bdbe16c5f1f62357f88de13800d47b7 +size 108912 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/VL_Icon.png b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/VL_Icon.png new file mode 100644 index 00000000..d40a89cc --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/VL_Icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:163d14a68f1e9ec9560929fb14cd1f1a9fae3eaaceb55729ba8bd94926f9ac1a +size 7315 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/VL_Icon.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/VL_Icon.uasset new file mode 100644 index 00000000..c4a60031 --- /dev/null +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/VL_Icon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95440712c856cd34fe77906b6c4fc85647181e6d06277829c741e41167abae08 +size 20322 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 9a1faba7..866d592f 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:fc3fc160627e9cb03cfa900bfa334561b0d7d22be21f5d273d86435f4538222d +oid sha256:bb9e2bad3be7351df336b7d68ea591f059abe8dc84cd11bfd10dd3bc41003b15 size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h index a0b65dce..943c5761 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h @@ -53,6 +53,16 @@ protected: UPROPERTY(EditDefaultsOnly, Category = "Gadget") UInputAction* ActivateAction; + UPROPERTY(EditDefaultsOnly, Category = "Gadget") + UTexture2D* GadgetIcon; + + UPROPERTY(EditDefaultsOnly, Category = "Gadget") + FString GadgetDesc; + + UPROPERTY(EditDefaultsOnly, Category = "Gadget") + FString GadgetName; + + // Used by child classes to run custom gadget behaviour virtual void Activate(); @@ -84,6 +94,21 @@ public: { return GadgetRotation; } + + UTexture2D* GetGadgetIcon() + { + return IsValid(GadgetIcon) ? GadgetIcon : nullptr; + } + + FString GetGadgetDesc() + { + return GadgetDesc; + } + + FString GetGadgetName() + { + return GadgetName; + } // Sets default values for this actor's properties AGadgetBase(); diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp new file mode 100644 index 00000000..661a1a5f --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp @@ -0,0 +1,101 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "GadgetTutorialStation.h" + +#include "Blueprint/UserWidget.h" + +// Sets default values +AGadgetTutorialStation::AGadgetTutorialStation() +{ + // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; + +} + +// Called when the game starts or when spawned +void AGadgetTutorialStation::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void AGadgetTutorialStation::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + +} + +void AGadgetTutorialStation::Interact() +{ + // opens up pick gadget widget + if (GadgetsArray.IsEmpty()) return; + + FInputModeUIOnly InputMode; + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + + PickGadgetWidget = CreateWidget(GetWorld(), PickGadgetWidgetClass); + PickGadgetWidget->AddToViewport(3); + + PlayerController->SetInputMode(InputMode); + PlayerController->bShowMouseCursor = true; + PlayerController->bEnableClickEvents = true; + PlayerController->bEnableMouseOverEvents = true; +} + +void AGadgetTutorialStation::InteractPrompt() +{ + +} + +FGadgetInfo AGadgetTutorialStation::NextGadget() +{ + FGadgetInfo GadgetInfo; + // Either wrap around to the beginning or increment gadget index + GadgetIndex = GadgetIndex >= GadgetsArray.Num() - 1 ? 0 : GadgetIndex + 1; + + GadgetInfo.GadgetIcon = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetIcon(); + GadgetInfo.GadgetDesc = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetDesc(); + GadgetInfo.GadgetName = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetName(); + return GadgetInfo; +} + +FGadgetInfo AGadgetTutorialStation::PreviousGadget() +{ + FGadgetInfo GadgetInfo; + // Either wrap around to the end or decrement gadget index + GadgetIndex = GadgetIndex <= 0 ? GadgetsArray.Num() - 1 : GadgetIndex - 1; + + GadgetInfo.GadgetIcon = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetIcon(); + GadgetInfo.GadgetDesc = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetDesc(); + GadgetInfo.GadgetName = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetName(); + return GadgetInfo; +} + +void AGadgetTutorialStation::SelectGadget() +{ + // Give Player the gadget + // Despawn current gadgetRange + // Spawn in the correct gadget range for the gadget + + UE_LOG(LogTemp, Warning, TEXT("Gadget Selected: %s"), *GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetName()); +} + +void AGadgetTutorialStation::CloseWidget() +{ + // close the widget + if (IsValid(PickGadgetWidget)) PickGadgetWidget->RemoveFromParent(); + + CollectGarbage(RF_PendingKill); + + FInputModeGameOnly InputMode; + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(InputMode); + PlayerController->bShowMouseCursor = false; + PlayerController->bEnableClickEvents = false; + PlayerController->bEnableMouseOverEvents = false; +} + + + diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h new file mode 100644 index 00000000..711576f8 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h @@ -0,0 +1,68 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "EndlessVendetta/GadgetSystem/GadgetBase.h" +#include "EndlessVendetta/InteractionInterface.h" +#include "GameFramework/Actor.h" +#include "GadgetTutorialStation.generated.h" + +USTRUCT(BlueprintType) +struct FGadgetInfo +{ + GENERATED_BODY() + + UPROPERTY(BlueprintReadWrite, Category = "Gadget") + UTexture2D* GadgetIcon; + + UPROPERTY(BlueprintReadWrite, Category = "Gadget") + FString GadgetDesc; + + UPROPERTY(BlueprintReadWrite, Category = "Gadget") + FString GadgetName; +}; + +UCLASS() +class ENDLESSVENDETTA_API AGadgetTutorialStation : public AActor, public IInteractionInterface +{ + GENERATED_BODY() + + UPROPERTY(EditDefaultsOnly, Category = "Gadgets") + TArray> GadgetsArray; + + UPROPERTY(EditDefaultsOnly, Category = "Gadgets") + TSubclassOf PickGadgetWidgetClass; + + int GadgetIndex = 0; + + UUserWidget* PickGadgetWidget; + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + + void Interact() override;\ + + void InteractPrompt() override; + + UFUNCTION(BlueprintCallable) + FGadgetInfo NextGadget(); + + UFUNCTION(BlueprintCallable) + FGadgetInfo PreviousGadget(); + + UFUNCTION(BlueprintCallable) + void SelectGadget(); + + UFUNCTION(BlueprintCallable) + void CloseWidget(); + +public: + // Sets default values for this actor's properties + AGadgetTutorialStation(); + + // Called every frame + virtual void Tick(float DeltaTime) override; + +}; From 6a14693826eaf127ebb2e3670ef4bc3a6f6324f5 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Mon, 30 Oct 2023 18:00:41 +0000 Subject: [PATCH 14/28] Implemented UGadgetMenu and it's Functionality --- .../GadgetTutorial/BP_GadgetTutorial.uasset | 4 +- .../GadgetTutorial/WBP_GadgetMenu.uasset | 3 ++ .../Content/Levels/TrainingFacility.umap | 4 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +- EndlessVendetta/EndlessVendetta.uproject | 3 +- .../GadgetTutorial/GadgetTutorialStation.cpp | 21 +++++--- .../GadgetTutorial/GadgetTutorialStation.h | 24 +++------ .../UserWidgets/GadgetMenu.cpp | 5 ++ .../EndlessVendetta/UserWidgets/GadgetMenu.h | 50 +++++++++++++++++++ 9 files changed, 85 insertions(+), 31 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/UserWidgets/GadgetMenu.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/UserWidgets/GadgetMenu.h diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset index 4763481d..64604dec 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ec223a4fa2f994a882c313b35e5f7f2314e2f8a974c0fcb16b0959c4509a8e9 -size 22424 +oid sha256:99736a10befa7b16850c07090ed7d29a0c63d5d4181cacdf73f855190c61c1dd +size 16928 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset new file mode 100644 index 00000000..69d96971 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/WBP_GadgetMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:810d2dfb5cf17a33620f773ada8e2d7972ad795139900d78e326fdae5af35239 +size 119297 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index d8038530..5e05a85b 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:80d409292ad4439737a74a463d528e19c92b5f2673d56712ca2778019a9ad7f6 -size 459303 +oid sha256:46c1dbc7d35d69ea66831390e74563f3dc3dfbdcdc2c09fa0887195d6c231104 +size 460293 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 866d592f..72280a3b 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:bb9e2bad3be7351df336b7d68ea591f059abe8dc84cd11bfd10dd3bc41003b15 +oid sha256:d607b449f6cba630df205824ffa12e8dba978263858fcc7a0f6089612f21f28b size 66790690 diff --git a/EndlessVendetta/EndlessVendetta.uproject b/EndlessVendetta/EndlessVendetta.uproject index 1a1190f2..340e263e 100644 --- a/EndlessVendetta/EndlessVendetta.uproject +++ b/EndlessVendetta/EndlessVendetta.uproject @@ -11,7 +11,8 @@ "AdditionalDependencies": [ "Engine", "AIModule", - "CoreUObject" + "CoreUObject", + "UMG" ] } ], diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp index 661a1a5f..03742753 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp @@ -29,19 +29,24 @@ void AGadgetTutorialStation::Tick(float DeltaTime) void AGadgetTutorialStation::Interact() { - // opens up pick gadget widget if (GadgetsArray.IsEmpty()) return; + // Setup Widget so it can be seen and interacted with FInputModeUIOnly InputMode; APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); - PickGadgetWidget = CreateWidget(GetWorld(), PickGadgetWidgetClass); PickGadgetWidget->AddToViewport(3); - PlayerController->SetInputMode(InputMode); PlayerController->bShowMouseCursor = true; PlayerController->bEnableClickEvents = true; PlayerController->bEnableMouseOverEvents = true; + + // Set up gadget menu's behaviours + GadgetMenu = Cast(PickGadgetWidget); + GadgetMenu->CloseMenuDelegate.AddDynamic(this, &AGadgetTutorialStation::CloseWidget); + GadgetMenu->NextGadgetDelegate.AddDynamic(this, &AGadgetTutorialStation::NextGadget); + GadgetMenu->PreviousGadgetDelegate.AddDynamic(this, &AGadgetTutorialStation::PreviousGadget); + GadgetMenu->SelectGadgetDelegate.AddDynamic(this, &AGadgetTutorialStation::SelectGadget); } void AGadgetTutorialStation::InteractPrompt() @@ -49,7 +54,7 @@ void AGadgetTutorialStation::InteractPrompt() } -FGadgetInfo AGadgetTutorialStation::NextGadget() +void AGadgetTutorialStation::NextGadget() { FGadgetInfo GadgetInfo; // Either wrap around to the beginning or increment gadget index @@ -58,10 +63,11 @@ FGadgetInfo AGadgetTutorialStation::NextGadget() GadgetInfo.GadgetIcon = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetIcon(); GadgetInfo.GadgetDesc = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetDesc(); GadgetInfo.GadgetName = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetName(); - return GadgetInfo; + + GadgetMenu->UpdateDisplayedGadget(GadgetInfo); } -FGadgetInfo AGadgetTutorialStation::PreviousGadget() +void AGadgetTutorialStation::PreviousGadget() { FGadgetInfo GadgetInfo; // Either wrap around to the end or decrement gadget index @@ -70,7 +76,8 @@ FGadgetInfo AGadgetTutorialStation::PreviousGadget() GadgetInfo.GadgetIcon = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetIcon(); GadgetInfo.GadgetDesc = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetDesc(); GadgetInfo.GadgetName = GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetName(); - return GadgetInfo; + + GadgetMenu->UpdateDisplayedGadget(GadgetInfo); } void AGadgetTutorialStation::SelectGadget() diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h index 711576f8..95a0ebce 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h @@ -5,24 +5,10 @@ #include "CoreMinimal.h" #include "EndlessVendetta/GadgetSystem/GadgetBase.h" #include "EndlessVendetta/InteractionInterface.h" +#include "EndlessVendetta/UserWidgets/GadgetMenu.h" #include "GameFramework/Actor.h" #include "GadgetTutorialStation.generated.h" -USTRUCT(BlueprintType) -struct FGadgetInfo -{ - GENERATED_BODY() - - UPROPERTY(BlueprintReadWrite, Category = "Gadget") - UTexture2D* GadgetIcon; - - UPROPERTY(BlueprintReadWrite, Category = "Gadget") - FString GadgetDesc; - - UPROPERTY(BlueprintReadWrite, Category = "Gadget") - FString GadgetName; -}; - UCLASS() class ENDLESSVENDETTA_API AGadgetTutorialStation : public AActor, public IInteractionInterface { @@ -32,12 +18,14 @@ class ENDLESSVENDETTA_API AGadgetTutorialStation : public AActor, public IIntera TArray> GadgetsArray; UPROPERTY(EditDefaultsOnly, Category = "Gadgets") - TSubclassOf PickGadgetWidgetClass; + TSubclassOf PickGadgetWidgetClass; int GadgetIndex = 0; UUserWidget* PickGadgetWidget; + UGadgetMenu* GadgetMenu; + protected: // Called when the game starts or when spawned virtual void BeginPlay() override; @@ -47,10 +35,10 @@ protected: void InteractPrompt() override; UFUNCTION(BlueprintCallable) - FGadgetInfo NextGadget(); + void NextGadget(); UFUNCTION(BlueprintCallable) - FGadgetInfo PreviousGadget(); + void PreviousGadget(); UFUNCTION(BlueprintCallable) void SelectGadget(); diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/GadgetMenu.cpp b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/GadgetMenu.cpp new file mode 100644 index 00000000..d9db8748 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/GadgetMenu.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "GadgetMenu.h" + diff --git a/EndlessVendetta/Source/EndlessVendetta/UserWidgets/GadgetMenu.h b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/GadgetMenu.h new file mode 100644 index 00000000..e09b9377 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/UserWidgets/GadgetMenu.h @@ -0,0 +1,50 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Blueprint/UserWidget.h" +#include "GadgetMenu.generated.h" + +USTRUCT(BlueprintType) +struct FGadgetInfo +{ + GENERATED_BODY() + + UPROPERTY(BlueprintReadWrite, Category = "Gadget") + UTexture2D* GadgetIcon; + + UPROPERTY(BlueprintReadWrite, Category = "Gadget") + FString GadgetDesc; + + UPROPERTY(BlueprintReadWrite, Category = "Gadget") + FString GadgetName; +}; + + +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FCloseMenu); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FNextGadget); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FPreviousGadget); +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FSelectGadget); + +UCLASS() +class ENDLESSVENDETTA_API UGadgetMenu : public UUserWidget +{ + GENERATED_BODY() + +public: + UPROPERTY(BlueprintCallable) + FCloseMenu CloseMenuDelegate; + + UPROPERTY(BlueprintCallable) + FCloseMenu NextGadgetDelegate; + + UPROPERTY(BlueprintCallable) + FCloseMenu PreviousGadgetDelegate; + + UPROPERTY(BlueprintCallable) + FCloseMenu SelectGadgetDelegate; + + UFUNCTION(BlueprintImplementableEvent) + void UpdateDisplayedGadget(FGadgetInfo GadgetInfo); +}; From d705e610709550ef01a0d3723f44857d056f2807 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 1 Nov 2023 21:18:18 +0000 Subject: [PATCH 15/28] Implemented Gadget Switching Workbench --- .../Checkpoints/CP_ParkourTutorial.uasset | 4 +-- .../GadgetTutorial/BP_GadgetTutorial.uasset | 4 +-- .../GadgetTutorial/BP_Recon.uasset | 3 ++ .../GadgetTutorial/BP_ReconWorkbench.uasset | 3 ++ .../Content/Gadgets/GM_GadgetManager.uasset | 4 +-- .../Content/Levels/TrainingFacility.umap | 4 +-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 +-- .../Props/MaterialSphere.uasset | 4 +-- .../EndlessVendettaCharacter.cpp | 32 ++++++++++++++----- .../EndlessVendettaCharacter.h | 2 ++ .../EndlessVendetta/GadgetSystem/GadgetBase.h | 10 ++++++ .../GadgetSystem/GadgetManager.cpp | 28 +++++++++------- .../GadgetSystem/GadgetManager.h | 26 ++++++++++++++- .../GadgetTutorial/GadgetTutorialStation.cpp | 9 ++++-- .../GadgetTutorial/GadgetTutorialStation.h | 3 ++ 15 files changed, 105 insertions(+), 35 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_Recon.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_ReconWorkbench.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset index e90385ac..5d9c77b0 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ParkourTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83c9bd092e97c3b7a89a9a920bb278d742d93d13a439c3a8afaed1fbc62287de -size 38434 +oid sha256:760080e3e99953e11230e2d0611fe20c01daa1e6ea7ef3dd4c5923beb8fbc6a9 +size 38487 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset index 64604dec..35556abe 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_GadgetTutorial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99736a10befa7b16850c07090ed7d29a0c63d5d4181cacdf73f855190c61c1dd -size 16928 +oid sha256:0c9c1c5174be17340a5c1af17f65ebad2f56450fb8194dd1aee554d703ac68ed +size 2754 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_Recon.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_Recon.uasset new file mode 100644 index 00000000..6f1b328e --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_Recon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86a649d86566076f0904ef7792d413399eedea9e074a4d60603396c5ea3734fb +size 2763 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_ReconWorkbench.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_ReconWorkbench.uasset new file mode 100644 index 00000000..7efaf4aa --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_ReconWorkbench.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aca420300ee672cc466a648e1630d1fe57242f3f601751620e4d4336652b2a3f +size 23371 diff --git a/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset b/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset index 53e55580..3a71ffb5 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:f89312e222f9d5b588d790390162f6293435c25439f77609ac1ecb532f103499 -size 22674 +oid sha256:e05b0025b98476924070ad8a2492e16ce32fb434b63e82b53a509c63f6e0962a +size 22228 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 5e05a85b..54c7d2b2 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:46c1dbc7d35d69ea66831390e74563f3dc3dfbdcdc2c09fa0887195d6c231104 -size 460293 +oid sha256:5865096b570bd55d2eb3055389ccd4c7f9db407bb3f830746a5736a47d34253a +size 607074 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 72280a3b..0f990580 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:d607b449f6cba630df205824ffa12e8dba978263858fcc7a0f6089612f21f28b -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 56bddfc9..bf29e55a 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 -size 47333 +oid sha256:36cd87b4220e1e08e73ba8c88cc787df6058fcd0cdf7ced1c255ba99da2cc189 +size 47710 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 3cfc910d..78f3e155 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -60,8 +60,7 @@ void AEndlessVendettaCharacter::BeginPlay() GadgetManagerActor->AttachToComponent(GetRootComponent(), AttachmentRules); for (UActorComponent* PlayersCamera : GetComponentsByTag(UCameraComponent::StaticClass(), FName("PlayersCamera"))) { - UE_LOG(LogTemp, Warning, TEXT("An actor component with PlayersCamera tag has been found")); - GadgetManager->SpawnGadgets(Cast(PlayersCamera)); + GadgetManager->SpawnGadgetsOnBeginPlay(Cast(PlayersCamera)); break; } } @@ -181,6 +180,8 @@ float AEndlessVendettaCharacter::TakeDamage(const float DamageAmount, FDamageEve void AEndlessVendettaCharacter::ToggleRecon() { + if (!GadgetManager->IsValidReconGadget()) return; + if (IsValid(PrimaryWeapon)) EquipPrimary(); if (IsValid(SecondaryWeapon)) EquipSecondary(); @@ -190,7 +191,7 @@ void AEndlessVendettaCharacter::ToggleRecon() return; } - if (GadgetManager->IsCombatEquipped() && !GadgetManager->TryToUnequipCombat()) + if (GadgetManager->IsValidCombatGadget() && GadgetManager->IsCombatEquipped() && !GadgetManager->TryToUnequipCombat()) { // Do nothing if combat is equipped and can't be unequipped at this moment return; @@ -201,6 +202,8 @@ void AEndlessVendettaCharacter::ToggleRecon() void AEndlessVendettaCharacter::ToggleCombat() { + if(!GadgetManager->IsValidCombatGadget()) return; + if (IsValid(PrimaryWeapon)) EquipPrimary(); if (IsValid(SecondaryWeapon)) EquipSecondary(); @@ -210,7 +213,7 @@ void AEndlessVendettaCharacter::ToggleCombat() return; } - if (GadgetManager->IsReconEquipped() && !GadgetManager->TryToUnequipRecon()) + if (GadgetManager->IsValidReconGadget() && GadgetManager->IsReconEquipped() && !GadgetManager->TryToUnequipRecon()) { // Do nothing if recon is equipped and can't be unequipped at the moment return; @@ -235,8 +238,8 @@ void AEndlessVendettaCharacter::EquipPrimary() if (IsValid(SecondaryWeapon)) EquipSecondary(); - if (GadgetManager->IsReconEquipped() && !GadgetManager->TryToUnequipRecon()) return; - if (GadgetManager->IsCombatEquipped() && !GadgetManager->TryToUnequipCombat()) return; + if (GadgetManager->IsValidReconGadget() && GadgetManager->IsReconEquipped() && !GadgetManager->TryToUnequipRecon()) return; + if (GadgetManager->IsValidCombatGadget() && GadgetManager->IsCombatEquipped() && !GadgetManager->TryToUnequipCombat()) return; FActorSpawnParameters spawnParams; @@ -267,8 +270,8 @@ void AEndlessVendettaCharacter::EquipSecondary() if (IsValid(PrimaryWeapon)) EquipPrimary(); - if (GadgetManager->IsReconEquipped() && !GadgetManager->TryToUnequipRecon()) return; - if (GadgetManager->IsCombatEquipped() && !GadgetManager->TryToUnequipCombat()) return; + if (GadgetManager->IsValidReconGadget() && GadgetManager->IsReconEquipped() && !GadgetManager->TryToUnequipRecon()) return; + if (GadgetManager->IsValidCombatGadget() && GadgetManager->IsCombatEquipped() && !GadgetManager->TryToUnequipCombat()) return; FActorSpawnParameters spawnParams; @@ -417,3 +420,16 @@ bool AEndlessVendettaCharacter::GetHasRifle() { return bHasRifle; } + +void AEndlessVendettaCharacter::UpdateGadgetType(TSubclassOf NewGadgetClass) +{ + if (NewGadgetClass.GetDefaultObject()->IsA(AReconGadget::StaticClass()) && GadgetManager->CantReplaceReconGadget()) return; + if (NewGadgetClass.GetDefaultObject()->IsA(ACombatGadget::StaticClass()) && GadgetManager->CantReplaceCombatGadget()) return; + + for (UActorComponent* PlayersCamera : GetComponentsByTag(UCameraComponent::StaticClass(), FName("PlayersCamera"))) + { + GadgetManager->SpawnGadget(NewGadgetClass, Cast(PlayersCamera)); + break; + } +} + diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 1f82fd2d..9fbc6e82 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -180,4 +180,6 @@ public: UFUNCTION(BlueprintImplementableEvent) void CheckpointCompletedUI(); + + void UpdateGadgetType(TSubclassOf NewGadgetClass); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h index 943c5761..05b4e8ef 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h @@ -109,6 +109,16 @@ public: { return GadgetName; } + + bool IsUnequippableInUse() + { + return UnequippableWhenInUse; + } + + bool IsInUse() + { + return GadgetInUse; + } // Sets default values for this actor's properties AGadgetBase(); diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.cpp index 8f7c6aa0..8978f40d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.cpp @@ -25,23 +25,27 @@ void AGadgetManager::Tick(float DeltaTime) } -void AGadgetManager::SpawnGadgets(USceneComponent* PlayersCameraComponent) +void AGadgetManager::SpawnGadgetsOnBeginPlay(USceneComponent* PlayersCameraComponent) { - if (!IsValid(ReconClass) || !IsValid(CombatClass)) UE_LOG(LogTemp, Fatal, TEXT("Recon or Combat class hasn't been set")); + if (IsValid(ReconClass)) SpawnGadget(ReconClass, PlayersCameraComponent); + if (IsValid(CombatClass)) SpawnGadget(CombatClass, PlayersCameraComponent); +} +void AGadgetManager::SpawnGadget(TSubclassOf GadgetClass, USceneComponent* PlayersCameraComponent) +{ FActorSpawnParameters SpawnParams; SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; const FAttachmentTransformRules AttachmentRules(EAttachmentRule::SnapToTarget, true); - AActor* SpawnedActor = GetWorld()->SpawnActor(ReconClass, GetActorLocation(), GetActorRotation(), SpawnParams); - ReconGadget = Cast(SpawnedActor); - SpawnedActor->AttachToComponent(PlayersCameraComponent, AttachmentRules); - SpawnedActor->SetActorRelativeLocation(ReconGadget->GetUnequippedOffset()); - SpawnedActor->SetActorRelativeRotation(ReconGadget->GetGadgetSpawnRotation()); + AActor* SpawnedActor = GetWorld()->SpawnActor(GadgetClass, GetActorLocation(), GetActorRotation(), SpawnParams); + + if (SpawnedActor->IsA(AReconGadget::StaticClass())) ReconGadget = Cast(SpawnedActor); + else if (SpawnedActor->IsA(ACombatGadget::StaticClass())) CombatGadget = Cast(SpawnedActor); + else UE_LOG(LogTemp, Fatal, TEXT("Passed sub class of gadget base is neither a combat or recon gadget, check the gadget class you're passing through or contact Rafal")); - SpawnedActor = GetWorld()->SpawnActor(CombatClass, GetActorLocation(), GetActorRotation(), SpawnParams); - CombatGadget = Cast(SpawnedActor); - SpawnedActor->AttachToComponent(PlayersCameraComponent, AttachmentRules); - SpawnedActor->SetActorRelativeLocation(CombatGadget->GetUnequippedOffset()); - SpawnedActor->SetActorRelativeRotation(CombatGadget->GetGadgetSpawnRotation()); + AGadgetBase* BaseGadget = Cast(SpawnedActor); + BaseGadget->AttachToComponent(PlayersCameraComponent, AttachmentRules); + BaseGadget->SetActorRelativeLocation(BaseGadget->GetUnequippedOffset()); + BaseGadget->SetActorRelativeRotation(BaseGadget->GetGadgetSpawnRotation()); } + diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.h index 686b2516..176331a9 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.h @@ -26,7 +26,9 @@ protected: virtual void BeginPlay() override; public: - void SpawnGadgets(USceneComponent* PlayersCameraComponent); + void SpawnGadgetsOnBeginPlay(USceneComponent* PlayersCameraComponent); + + void SpawnGadget(TSubclassOf GadgetClass, USceneComponent* PlayersCameraComponent); // Sets default values for this actor's properties AGadgetManager(); @@ -34,6 +36,16 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; + bool IsValidReconGadget() + { + return IsValid(ReconGadget); + } + + bool IsValidCombatGadget() + { + return IsValid(CombatGadget); + } + void EquipRecon() { ReconGadget->Equip(); @@ -66,4 +78,16 @@ public: return false; } + bool CantReplaceReconGadget() + { + // Cant be replaced if it exists, and is either in use whilst being unequippable in use, or equipped and cant be unequipped + return IsValidReconGadget() && (ReconGadget->IsInUse() && ReconGadget->IsUnequippableInUse() || IsReconEquipped() && !TryToUnequipRecon()); + } + + bool CantReplaceCombatGadget() + { + // Cant be replaced if it exists, and is either in use whilst being unequippable in use, or equipped and cant be unequipped + return IsValidCombatGadget() && (CombatGadget->IsInUse() && CombatGadget->IsUnequippableInUse() || IsCombatEquipped() && !TryToUnequipCombat()); + } + }; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp index 03742753..a5178b5c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp @@ -17,7 +17,8 @@ AGadgetTutorialStation::AGadgetTutorialStation() void AGadgetTutorialStation::BeginPlay() { Super::BeginPlay(); - + + EndlessVendettaCharacter = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); } // Called every frame @@ -47,6 +48,9 @@ void AGadgetTutorialStation::Interact() GadgetMenu->NextGadgetDelegate.AddDynamic(this, &AGadgetTutorialStation::NextGadget); GadgetMenu->PreviousGadgetDelegate.AddDynamic(this, &AGadgetTutorialStation::PreviousGadget); GadgetMenu->SelectGadgetDelegate.AddDynamic(this, &AGadgetTutorialStation::SelectGadget); + + // Runs Update Display Gadget at the end which overrides the default stand in gadget info + NextGadget(); } void AGadgetTutorialStation::InteractPrompt() @@ -86,7 +90,8 @@ void AGadgetTutorialStation::SelectGadget() // Despawn current gadgetRange // Spawn in the correct gadget range for the gadget - UE_LOG(LogTemp, Warning, TEXT("Gadget Selected: %s"), *GadgetsArray[GadgetIndex]->GetDefaultObject()->GetGadgetName()); + EndlessVendettaCharacter->UpdateGadgetType(GadgetsArray[GadgetIndex]); + } void AGadgetTutorialStation::CloseWidget() diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h index 95a0ebce..34bba0ba 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "EndlessVendetta/EndlessVendettaCharacter.h" #include "EndlessVendetta/GadgetSystem/GadgetBase.h" #include "EndlessVendetta/InteractionInterface.h" #include "EndlessVendetta/UserWidgets/GadgetMenu.h" @@ -14,6 +15,8 @@ class ENDLESSVENDETTA_API AGadgetTutorialStation : public AActor, public IIntera { GENERATED_BODY() + AEndlessVendettaCharacter* EndlessVendettaCharacter; + UPROPERTY(EditDefaultsOnly, Category = "Gadgets") TArray> GadgetsArray; From 8694b8746b09f3efae0c4b8addab658d86175c59 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 1 Nov 2023 21:52:47 +0000 Subject: [PATCH 16/28] Implemented Base Gadget Tutorial Class --- .../EndlessVendettaCharacter.cpp | 7 ++-- .../EndlessVendettaCharacter.h | 3 +- .../EndlessVendetta/GadgetSystem/GadgetBase.h | 5 +++ .../GadgetTutorial/BaseGadgetTutorial.cpp | 32 +++++++++++++++++ .../GadgetTutorial/BaseGadgetTutorial.h | 35 +++++++++++++++++++ .../GadgetTutorial/GadgetTutorialStation.cpp | 15 +++++--- .../GadgetTutorial/GadgetTutorialStation.h | 3 ++ 7 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 78f3e155..132d9d03 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -421,15 +421,16 @@ bool AEndlessVendettaCharacter::GetHasRifle() return bHasRifle; } -void AEndlessVendettaCharacter::UpdateGadgetType(TSubclassOf NewGadgetClass) +bool AEndlessVendettaCharacter::UpdateGadgetType(TSubclassOf NewGadgetClass) { - if (NewGadgetClass.GetDefaultObject()->IsA(AReconGadget::StaticClass()) && GadgetManager->CantReplaceReconGadget()) return; - if (NewGadgetClass.GetDefaultObject()->IsA(ACombatGadget::StaticClass()) && GadgetManager->CantReplaceCombatGadget()) return; + if (NewGadgetClass.GetDefaultObject()->IsA(AReconGadget::StaticClass()) && GadgetManager->CantReplaceReconGadget()) return false; + if (NewGadgetClass.GetDefaultObject()->IsA(ACombatGadget::StaticClass()) && GadgetManager->CantReplaceCombatGadget()) return false; for (UActorComponent* PlayersCamera : GetComponentsByTag(UCameraComponent::StaticClass(), FName("PlayersCamera"))) { GadgetManager->SpawnGadget(NewGadgetClass, Cast(PlayersCamera)); break; } + return true; } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 9fbc6e82..6eca7b5f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -181,5 +181,6 @@ public: UFUNCTION(BlueprintImplementableEvent) void CheckpointCompletedUI(); - void UpdateGadgetType(TSubclassOf NewGadgetClass); + // Returns true if successfully changed to a new gadget, can fail if the target gadget to replace is being used + bool UpdateGadgetType(TSubclassOf NewGadgetClass); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h index 05b4e8ef..44cd254b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetBase.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "EnhancedInputSubsystemInterface.h" +#include "GadgetTutorial/BaseGadgetTutorial.h" #include "GameFramework/Actor.h" #include "GadgetBase.generated.h" @@ -119,6 +120,10 @@ public: { return GadgetInUse; } + + UPROPERTY(EditDefaultsOnly, Category = "Gadget") + TSubclassOf GadgetTutorialClass; + // Sets default values for this actor's properties AGadgetBase(); diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp new file mode 100644 index 00000000..d40f6b97 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp @@ -0,0 +1,32 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "BaseGadgetTutorial.h" + +// Sets default values +ABaseGadgetTutorial::ABaseGadgetTutorial() +{ + // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; + +} + +// Called when the game starts or when spawned +void ABaseGadgetTutorial::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void ABaseGadgetTutorial::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + +} + +void ABaseGadgetTutorial::DestroyTutorial() +{ + UE_LOG(LogTemp, Warning, TEXT("Destroyed Tutorial")); + Destroy(); +} diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h new file mode 100644 index 00000000..862ed99b --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h @@ -0,0 +1,35 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Actor.h" +#include "BaseGadgetTutorial.generated.h" + +UCLASS() +class ENDLESSVENDETTA_API ABaseGadgetTutorial : public AActor +{ + GENERATED_BODY() + + UPROPERTY(EditDefaultsOnly, Category = "Gadget Tutorial") + FTransform SpawnTransform; + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Sets default values for this actor's properties + ABaseGadgetTutorial(); + + // Called every frame + virtual void Tick(float DeltaTime) override; + + virtual void DestroyTutorial(); + + FTransform GetSpawnTransform() + { + return SpawnTransform; + } + +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp index a5178b5c..6bb620d4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp @@ -86,12 +86,17 @@ void AGadgetTutorialStation::PreviousGadget() void AGadgetTutorialStation::SelectGadget() { - // Give Player the gadget - // Despawn current gadgetRange - // Spawn in the correct gadget range for the gadget + // Eventually expand to give player feedback of being denied if changing gadgets fails + if (!EndlessVendettaCharacter->UpdateGadgetType(GadgetsArray[GadgetIndex])) return; - EndlessVendettaCharacter->UpdateGadgetType(GadgetsArray[GadgetIndex]); - + if (IsValid(CurrentGadgetTutorial)) CurrentGadgetTutorial->DestroyTutorial(); + + FActorSpawnParameters SpawnParams; + SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; + TSubclassOf GadgetTutorialToSpawnInClass = GadgetsArray[GadgetIndex]->GetDefaultObject()->GadgetTutorialClass; + FTransform SpawnTransform = GadgetTutorialToSpawnInClass->GetDefaultObject()->GetSpawnTransform(); + AActor* GadgetTutorialActor = GetWorld()->SpawnActor(GadgetTutorialToSpawnInClass, SpawnTransform.GetLocation(), SpawnTransform.GetRotation().Rotator(), SpawnParams); + CurrentGadgetTutorial = Cast(GadgetTutorialActor); } void AGadgetTutorialStation::CloseWidget() diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h index 34bba0ba..c44e494d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "BaseGadgetTutorial.h" #include "EndlessVendetta/EndlessVendettaCharacter.h" #include "EndlessVendetta/GadgetSystem/GadgetBase.h" #include "EndlessVendetta/InteractionInterface.h" @@ -29,6 +30,8 @@ class ENDLESSVENDETTA_API AGadgetTutorialStation : public AActor, public IIntera UGadgetMenu* GadgetMenu; + ABaseGadgetTutorial* CurrentGadgetTutorial; + protected: // Called when the game starts or when spawned virtual void BeginPlay() override; From 7ee592f1f04d721bf4461b5b5568f23c2cc7d171 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 2 Nov 2023 02:27:04 +0000 Subject: [PATCH 17/28] Implemented Vision Link Gadget Tutorial --- .../BP_InfiniteHealthEnemy.uasset | 3 + .../GadgetTutorial/BP_ReconWorkbench.uasset | 4 +- .../GadgetTutorial/GadgetTutorialIcon.png | 3 + .../GadgetTutorial/GadgetTutorialIcon.uasset | 3 + .../Recon/BP_ReconWorkbench.uasset | 3 + .../GadgetTutorial/Recon/GT_VisionLink.uasset | 3 + .../VisionLink/RG_VisionLink.uasset | 4 +- .../Content/Levels/TrainingFacility.umap | 4 +- .../Architecture/Floor_400x400.uasset | 4 +- .../Props/MaterialSphere.uasset | 4 +- .../BountySystem/WaypointActor.h | 4 +- .../EndlessVendettaCharacter.cpp | 4 +- .../EndlessVendettaCharacter.h | 5 +- .../GadgetSystem/GadgetManager.h | 20 ++++-- .../GadgetTutorial/BaseGadgetTutorial.cpp | 13 +++- .../GadgetTutorial/BaseGadgetTutorial.h | 25 ++++--- .../GadgetTutorial/GadgetTutorialStation.cpp | 4 +- .../GadgetTutorial/GadgetTutorialStation.h | 3 + .../GadgetTutorial/VisionLinkTutorial.cpp | 71 +++++++++++++++++++ .../GadgetTutorial/VisionLinkTutorial.h | 60 ++++++++++++++++ 20 files changed, 211 insertions(+), 33 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_InfiniteHealthEnemy.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/GadgetTutorialIcon.png create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/GadgetTutorialIcon.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/BP_ReconWorkbench.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.h diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_InfiniteHealthEnemy.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_InfiniteHealthEnemy.uasset new file mode 100644 index 00000000..3ac4ffc8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_InfiniteHealthEnemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff0184855d0b831ff073d507262a1297f3fd676f49a4ec28ded918fbb8896069 +size 42127 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_ReconWorkbench.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_ReconWorkbench.uasset index 7efaf4aa..546a248e 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_ReconWorkbench.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/BP_ReconWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aca420300ee672cc466a648e1630d1fe57242f3f601751620e4d4336652b2a3f -size 23371 +oid sha256:191a1e2ab132262fdd234e16a45508f0bff1cc081c977e49cffba1c4017bb052 +size 2801 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/GadgetTutorialIcon.png b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/GadgetTutorialIcon.png new file mode 100644 index 00000000..befb3dc2 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/GadgetTutorialIcon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d45db118dff139dba8afcbb4bccae0415e6ce9522753bc8dc321947309b987a4 +size 39589 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/GadgetTutorialIcon.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/GadgetTutorialIcon.uasset new file mode 100644 index 00000000..1f6752b4 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/GadgetTutorialIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1aee6585c4133154fec11fcd690c3526714b66b588b9376faa7747e52abf4dea +size 39732 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/BP_ReconWorkbench.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/BP_ReconWorkbench.uasset new file mode 100644 index 00000000..20b5b980 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/BP_ReconWorkbench.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e7084fab6eb5149aef1ebd8b44303477718dd4b17e59faea6c7800ed62e0847 +size 23596 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset new file mode 100644 index 00000000..d37bf461 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dfc52ea68790fe41a2183cebf9f3f1760c3cd066efe8459f7f116673f524040 +size 212777 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset index 68f69959..bf676207 100644 --- a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27d39fdab60fb9511fcfe760ba9180190bdbe16c5f1f62357f88de13800d47b7 -size 108912 +oid sha256:f33dd03b39415d19a4fe13c124542d77eb6517c16ad6bc19177c5acb82fd82a2 +size 109451 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 54c7d2b2..a07f09a6 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:5865096b570bd55d2eb3055389ccd4c7f9db407bb3f830746a5736a47d34253a -size 607074 +oid sha256:eccb9b1edb192ea701130918efac376eee57496ac65768f76a09f95c956d84e6 +size 607443 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..334ef1da 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:f92f2966cca96beb70e0aa05ba91f070f4fe6a57eae07edd60e1ee68138c0f10 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index bf29e55a..56bddfc9 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36cd87b4220e1e08e73ba8c88cc787df6058fcd0cdf7ced1c255ba99da2cc189 -size 47710 +oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 +size 47333 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h index 0dba8a7b..cc9b5e6a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h @@ -19,10 +19,10 @@ class ENDLESSVENDETTA_API AWaypointActor : public AActor float ScalingY_Intercept; UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") - float MaxDist = 8000.f; + float MaxDist = 16000.f; UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") - float ScaleAtMaxDist = 8.f; + float ScaleAtMaxDist = 4.f; UPROPERTY(EditDefaultsOnly, Category = "Waypoint Scaling") float MinDist = 900.f; diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 132d9d03..3761ba79 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -423,8 +423,8 @@ bool AEndlessVendettaCharacter::GetHasRifle() bool AEndlessVendettaCharacter::UpdateGadgetType(TSubclassOf NewGadgetClass) { - if (NewGadgetClass.GetDefaultObject()->IsA(AReconGadget::StaticClass()) && GadgetManager->CantReplaceReconGadget()) return false; - if (NewGadgetClass.GetDefaultObject()->IsA(ACombatGadget::StaticClass()) && GadgetManager->CantReplaceCombatGadget()) return false; + if (NewGadgetClass.GetDefaultObject()->IsA(AReconGadget::StaticClass()) && GadgetManager->ReconCantBeSwitchedOut()) return false; + if (NewGadgetClass.GetDefaultObject()->IsA(ACombatGadget::StaticClass()) && GadgetManager->CombatCantBeSwitchedOut()) return false; for (UActorComponent* PlayersCamera : GetComponentsByTag(UCameraComponent::StaticClass(), FName("PlayersCamera"))) { diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 6eca7b5f..9995a4f5 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -87,10 +87,11 @@ protected: UPROPERTY(EditDefaultsOnly, Category = "Gadget") TSubclassOf GadgetManagerClass; - AGadgetManager* GadgetManager; + public: - int Money = 2000; + int Money = 2000; + AGadgetManager* GadgetManager; bool bIsReloading = false; /** Look Input Action */ diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.h index 176331a9..d533215f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.h @@ -78,16 +78,24 @@ public: return false; } - bool CantReplaceReconGadget() + bool ReconInUse() { - // Cant be replaced if it exists, and is either in use whilst being unequippable in use, or equipped and cant be unequipped - return IsValidReconGadget() && (ReconGadget->IsInUse() && ReconGadget->IsUnequippableInUse() || IsReconEquipped() && !TryToUnequipRecon()); + return IsValidReconGadget() && ReconGadget->IsInUse(); } - bool CantReplaceCombatGadget() + bool CombatInUse() { - // Cant be replaced if it exists, and is either in use whilst being unequippable in use, or equipped and cant be unequipped - return IsValidCombatGadget() && (CombatGadget->IsInUse() && CombatGadget->IsUnequippableInUse() || IsCombatEquipped() && !TryToUnequipCombat()); + return IsValidCombatGadget() && CombatGadget->IsInUse(); + } + + bool ReconCantBeSwitchedOut() + { + return IsValidReconGadget() && (ReconGadget->IsInUse() || (ReconGadget->Equipped && !TryToUnequipRecon())); + } + + bool CombatCantBeSwitchedOut() + { + return IsValidCombatGadget() && (CombatGadget->IsInUse() || (CombatGadget->Equipped && !TryToUnequipCombat())); } }; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp index d40f6b97..4f70168f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp @@ -8,6 +8,7 @@ ABaseGadgetTutorial::ABaseGadgetTutorial() { // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; + bAllowTickBeforeBeginPlay = false; } @@ -25,8 +26,18 @@ void ABaseGadgetTutorial::Tick(float DeltaTime) } +void ABaseGadgetTutorial::SpawnNewWaypoint(FVector Loc, FString Desc) +{ + if (IsValid(WaypointActor)) WaypointActor->Destroy(); + + FActorSpawnParameters SpawnParams; + SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; + WaypointActor = Cast(GetWorld()->SpawnActor(WaypointClass, Loc, GetActorRotation(), SpawnParams)); + WaypointActor->SetupWaypoint(WaypointIcon, Desc); +} + + void ABaseGadgetTutorial::DestroyTutorial() { - UE_LOG(LogTemp, Warning, TEXT("Destroyed Tutorial")); Destroy(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h index 862ed99b..55a29f02 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h @@ -3,33 +3,42 @@ #pragma once #include "CoreMinimal.h" +#include "EndlessVendetta/BountySystem/WaypointActor.h" #include "GameFramework/Actor.h" #include "BaseGadgetTutorial.generated.h" +DECLARE_DYNAMIC_MULTICAST_DELEGATE(FCompletedGadgetTutorial) + UCLASS() class ENDLESSVENDETTA_API ABaseGadgetTutorial : public AActor { GENERATED_BODY() - UPROPERTY(EditDefaultsOnly, Category = "Gadget Tutorial") - FTransform SpawnTransform; - protected: + UPROPERTY(EditDefaultsOnly, Category = "Gadget Tutorial") + TSubclassOf WaypointClass; + + AWaypointActor* WaypointActor; + + UPROPERTY(EditDefaultsOnly, Category = "Gadget Tutorial") + UTexture2D* WaypointIcon; + + void SpawnNewWaypoint(FVector Loc, FString Desc); + + // Called when the game starts or when spawned virtual void BeginPlay() override; public: // Sets default values for this actor's properties ABaseGadgetTutorial(); + + FCompletedGadgetTutorial CompletedGadgetTutorial; // Called every frame virtual void Tick(float DeltaTime) override; virtual void DestroyTutorial(); - - FTransform GetSpawnTransform() - { - return SpawnTransform; - } + }; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp index 6bb620d4..0adb8cb0 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp @@ -94,8 +94,8 @@ void AGadgetTutorialStation::SelectGadget() FActorSpawnParameters SpawnParams; SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; TSubclassOf GadgetTutorialToSpawnInClass = GadgetsArray[GadgetIndex]->GetDefaultObject()->GadgetTutorialClass; - FTransform SpawnTransform = GadgetTutorialToSpawnInClass->GetDefaultObject()->GetSpawnTransform(); - AActor* GadgetTutorialActor = GetWorld()->SpawnActor(GadgetTutorialToSpawnInClass, SpawnTransform.GetLocation(), SpawnTransform.GetRotation().Rotator(), SpawnParams); + if (!IsValid(GadgetTutorialToSpawnInClass)) return; + AActor* GadgetTutorialActor = GetWorld()->SpawnActor(GadgetTutorialToSpawnInClass, GadgetTutorialSpawnTransform.GetLocation(), GadgetTutorialSpawnTransform.GetRotation().Rotator(), SpawnParams); CurrentGadgetTutorial = Cast(GadgetTutorialActor); } diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h index c44e494d..f59f4fc7 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.h @@ -24,6 +24,9 @@ class ENDLESSVENDETTA_API AGadgetTutorialStation : public AActor, public IIntera UPROPERTY(EditDefaultsOnly, Category = "Gadgets") TSubclassOf PickGadgetWidgetClass; + UPROPERTY(EditDefaultsOnly, Category = "Gadgets") + FTransform GadgetTutorialSpawnTransform; + int GadgetIndex = 0; UUserWidget* PickGadgetWidget; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.cpp new file mode 100644 index 00000000..61032a67 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.cpp @@ -0,0 +1,71 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "VisionLinkTutorial.h" + +#include "EndlessVendetta/EndlessVendettaCharacter.h" +#include "EndlessVendetta/GadgetSystem/GadgetManager.h" +#include "Kismet/KismetMathLibrary.h" + +void AVisionLinkTutorial::BeginPlay() +{ + Super::BeginPlay(); + SpawnEnemiesAndSetupDefaults(); + SpawnNewWaypoint(GoToAreaWaypointLoc, GoToAreaWaypointDesc); + SetActorTickInterval(0.2); +} + +void AVisionLinkTutorial::Tick(float DeltaSeconds) +{ + Super::Tick(DeltaSeconds); + + if (!PlayerInTutorialZone) + { + if (PlayerWasInTutZone) SpawnNewWaypoint(GoToAreaWaypointLoc, GoToAreaWaypointDesc); + PlayerWasInTutZone = false; + return; + } + + if (!PlayerWasInTutZone) SpawnNewWaypoint(LookAtTargetWaypointLoc, LookAtTargetWaypointDesc); + PlayerWasInTutZone = true; + + // Check if players recon gadget (vision link) is in active + APawn* PlayerPawn = GetWorld()->GetFirstPlayerController()->GetPawn(); + AEndlessVendettaCharacter* EndlessVendettaCharacter = Cast(PlayerPawn); + AGadgetManager* GadgetManager = EndlessVendettaCharacter->GadgetManager; + if (!GadgetManager->ReconInUse()) return; + + // Check if the player is roughly looking at their target + FRotator LookAtRot = UKismetMathLibrary::FindLookAtRotation(PlayerPawn->GetActorLocation(), TargetLoc); + FRotator PlayersRotator = PlayerPawn->GetActorRotation(); + // Keep all yaw values between -180 and 180 to simplify the comparison + float DesiredtYaw = LookAtRot.Yaw - (LookAtRot.Yaw > 180 ? 360 : 0); + float PlayersYaw = PlayersRotator.Yaw - (PlayersRotator.Yaw > 180 ? 360 : 0); + // Do nothing if players yaw is off by more than 45 degrees + if (FMath::Abs(DesiredtYaw - PlayersYaw) > 45) return; + + + SpawnNewWaypoint(ResultWaypointLoc, ResultWaypointDesc); + FTimerHandle TimerHandle; + GetWorld()->GetTimerManager().SetTimer(TimerHandle, this, &AVisionLinkTutorial::FinishedTutorial, 7.5); + SetActorTickEnabled(false); +} + + + +void AVisionLinkTutorial::DestroyTutorial() +{ + if (IsValid(WaypointActor)) WaypointActor->Destroy(); + DespawnEnemies(); + Super::DestroyTutorial(); +} + +void AVisionLinkTutorial::FinishedTutorial() +{ + if (IsValid(WaypointActor)) WaypointActor->Destroy(); + CompletedGadgetTutorial.Broadcast(); +} + + + + diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.h new file mode 100644 index 00000000..48bbbd99 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.h @@ -0,0 +1,60 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "BaseGadgetTutorial.h" +#include "VisionLinkTutorial.generated.h" + +UCLASS() +class ENDLESSVENDETTA_API AVisionLinkTutorial : public ABaseGadgetTutorial +{ + GENERATED_BODY() + + bool PlayerInTutorialZone = false; + + bool PlayerWasInTutZone = false; + + void BeginPlay() override; + + void Tick(float DeltaSeconds) override; + + void DestroyTutorial() override; + +protected: + UPROPERTY(EditDefaultsOnly) + FString GoToAreaWaypointDesc; + UPROPERTY(EditDefaultsOnly) + FString LookAtTargetWaypointDesc; + UPROPERTY(EditDefaultsOnly) + FString ResultWaypointDesc; + + UPROPERTY(BlueprintReadWrite) + FVector GoToAreaWaypointLoc; + UPROPERTY(BlueprintReadWrite) + FVector LookAtTargetWaypointLoc; + UPROPERTY(BlueprintReadWrite) + FVector ResultWaypointLoc; + + UPROPERTY(BlueprintReadWrite) + FVector TargetLoc; + + // Spawns enemies, sets up waypoint locs, and target loc + UFUNCTION(BlueprintImplementableEvent) + void SpawnEnemiesAndSetupDefaults(); + UFUNCTION(BlueprintImplementableEvent) + void DespawnEnemies(); + + UFUNCTION(BlueprintCallable) + void PlayerEnteredTutorialZone() + { + PlayerInTutorialZone = true; + } + UFUNCTION(BlueprintCallable) + void PlayerLeftTutorialZone() + { + PlayerInTutorialZone = false; + } + + void FinishedTutorial(); +}; From 971e28bb618d0ed62e3e25676169b28f41f5f976 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Thu, 2 Nov 2023 18:57:01 +0000 Subject: [PATCH 18/28] Implemented Ring Module Gadget Tutorial --- .../GadgetTutorial/Recon/GT_RingModule.uasset | 3 ++ .../GadgetTutorial/Recon/GT_VisionLink.uasset | 4 +-- .../BountySystem/Waypoint/BP_Waypoint.uasset | 4 +-- .../RingModule/RG_RingModule.uasset | 4 +-- .../VisionLink/RG_VisionLink.uasset | 4 +-- .../Content/Levels/TrainingFacility.umap | 2 +- .../Architecture/Floor_400x400.uasset | 4 +-- .../Particles/P_Ambient_Dust.uasset | 4 +-- .../GadgetTutorial/BaseGadgetTutorial.cpp | 18 +++++----- .../GadgetTutorial/BaseGadgetTutorial.h | 25 ++++++++----- .../GadgetTutorial/RingModuleTutorial.cpp | 27 ++++++++++++++ .../GadgetTutorial/RingModuleTutorial.h | 35 +++++++++++++++++++ .../GadgetTutorial/VisionLinkTutorial.cpp | 22 ++---------- .../GadgetTutorial/VisionLinkTutorial.h | 14 ++------ 14 files changed, 109 insertions(+), 61 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/RingModuleTutorial.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/RingModuleTutorial.h diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset new file mode 100644 index 00000000..80344912 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:935f7575eb8438f8e3320206e83e54c726aacd8ba9dae894dcea2dfdeca4cb70 +size 130514 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset index d37bf461..782c77cd 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dfc52ea68790fe41a2183cebf9f3f1760c3cd066efe8459f7f116673f524040 -size 212777 +oid sha256:0caa776d680dfb23ead998fcd2fbc0c7a46ecf2ff4edff73e98c3e152a79088d +size 213629 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset index 090002c9..ba8534c6 100644 --- a/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset +++ b/EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25a58a287c0b4dc77f3e9bd3bde9fc9b9077deb1189e141c9e6161e75ff9d593 -size 49378 +oid sha256:04143e23cb9403f9ae001e7ab261a6c90a890df16f81eb00c35ae1e7305ed249 +size 49046 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset index 8f215cce..e5b9faad 100644 --- a/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b412ab348368172b66065bc5a41820dd96efe68260518a5d47a63216b343c3ba -size 108251 +oid sha256:163e6c220966ca84c1c7e3f9ae176fe99bb0f7b8b364403ad5cf42f0272a87f0 +size 108688 diff --git a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset index bf676207..aea6e927 100644 --- a/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset +++ b/EndlessVendetta/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f33dd03b39415d19a4fe13c124542d77eb6517c16ad6bc19177c5acb82fd82a2 -size 109451 +oid sha256:576cf6674035552a043dab60a2173beec40cf65683d138ad0df40f66fd48370b +size 108618 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index a07f09a6..a76d9058 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:eccb9b1edb192ea701130918efac376eee57496ac65768f76a09f95c956d84e6 +oid sha256:4c448a399e03e820c5867766611f78910e2811b96a3370f79410574bbaaf7279 size 607443 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 334ef1da..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:f92f2966cca96beb70e0aa05ba91f070f4fe6a57eae07edd60e1ee68138c0f10 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..a5d257ad 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d -size 43456 +oid sha256:d287a8505cfb16ecf61e3f10562beda389f49bbcddbbc25f28aeaa5d1afe5f6c +size 53268 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp index 4f70168f..c19db9e1 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.cpp @@ -2,6 +2,7 @@ #include "BaseGadgetTutorial.h" +#include "EndlessVendetta/EndlessVendettaCharacter.h" // Sets default values ABaseGadgetTutorial::ABaseGadgetTutorial() @@ -16,14 +17,8 @@ ABaseGadgetTutorial::ABaseGadgetTutorial() void ABaseGadgetTutorial::BeginPlay() { Super::BeginPlay(); - -} - -// Called every frame -void ABaseGadgetTutorial::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); - + SetupTutorial(); + SetActorTickInterval(0.2); } void ABaseGadgetTutorial::SpawnNewWaypoint(FVector Loc, FString Desc) @@ -36,8 +31,15 @@ void ABaseGadgetTutorial::SpawnNewWaypoint(FVector Loc, FString Desc) WaypointActor->SetupWaypoint(WaypointIcon, Desc); } +void ABaseGadgetTutorial::FinishedTutorial() +{ + if (IsValid(WaypointActor)) WaypointActor->Destroy(); + CompletedGadgetTutorial.Broadcast(); +} void ABaseGadgetTutorial::DestroyTutorial() { + if (IsValid(WaypointActor)) WaypointActor->Destroy(); + DespawnEnemies(); Destroy(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h index 55a29f02..48965d8b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h @@ -15,30 +15,37 @@ class ENDLESSVENDETTA_API ABaseGadgetTutorial : public AActor GENERATED_BODY() protected: + AWaypointActor* WaypointActor; + UPROPERTY(EditDefaultsOnly, Category = "Gadget Tutorial") TSubclassOf WaypointClass; - - AWaypointActor* WaypointActor; UPROPERTY(EditDefaultsOnly, Category = "Gadget Tutorial") UTexture2D* WaypointIcon; - void SpawnNewWaypoint(FVector Loc, FString Desc); - - // Called when the game starts or when spawned virtual void BeginPlay() override; + + void SpawnNewWaypoint(FVector Loc, FString Desc); + // Stops tutorial clues from appearing and broadcasts completion + void FinishedTutorial(); + + // Spawns Enemies, sets waypoint locations, etc... + UFUNCTION(BlueprintImplementableEvent) + void SetupTutorial(); + + // Destroy's enemies and other separate spawned in elements by this tutorial class + UFUNCTION(BlueprintImplementableEvent) + void DespawnEnemies(); + public: // Sets default values for this actor's properties ABaseGadgetTutorial(); FCompletedGadgetTutorial CompletedGadgetTutorial; - - // Called every frame - virtual void Tick(float DeltaTime) override; - virtual void DestroyTutorial(); + void DestroyTutorial(); }; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/RingModuleTutorial.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/RingModuleTutorial.cpp new file mode 100644 index 00000000..af94b353 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/RingModuleTutorial.cpp @@ -0,0 +1,27 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "RingModuleTutorial.h" +#include "EndlessVendetta/EndlessVendettaCharacter.h" + + +void ARingModuleTutorial::BeginPlay() +{ + Super::BeginPlay(); + GadgetManager = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->GadgetManager; + SpawnNewWaypoint(HackTargetWaypointLoc, HackTargetWaypointDesc); +} + +void ARingModuleTutorial::Tick(float DeltaSeconds) +{ + Super::Tick(DeltaSeconds); + + if (!GadgetManager->ReconInUse()) return; + + SpawnNewWaypoint(ResultWaypointLoc, ResultWaypointDesc); + SetActorTickEnabled(false); + FTimerHandle TimerHandle; + GetWorld()->GetTimerManager().SetTimer(TimerHandle, this, &ARingModuleTutorial::FinishedTutorial, 7.5); +} + + diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/RingModuleTutorial.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/RingModuleTutorial.h new file mode 100644 index 00000000..e4726f63 --- /dev/null +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/RingModuleTutorial.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 "RingModuleTutorial.generated.h" + +/** + * + */ +UCLASS() +class ENDLESSVENDETTA_API ARingModuleTutorial : 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; + +}; diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.cpp index 61032a67..5791ef3e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.cpp @@ -4,15 +4,13 @@ #include "VisionLinkTutorial.h" #include "EndlessVendetta/EndlessVendettaCharacter.h" -#include "EndlessVendetta/GadgetSystem/GadgetManager.h" #include "Kismet/KismetMathLibrary.h" void AVisionLinkTutorial::BeginPlay() { Super::BeginPlay(); - SpawnEnemiesAndSetupDefaults(); + GadgetManager = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->GadgetManager; SpawnNewWaypoint(GoToAreaWaypointLoc, GoToAreaWaypointDesc); - SetActorTickInterval(0.2); } void AVisionLinkTutorial::Tick(float DeltaSeconds) @@ -30,12 +28,10 @@ void AVisionLinkTutorial::Tick(float DeltaSeconds) PlayerWasInTutZone = true; // Check if players recon gadget (vision link) is in active - APawn* PlayerPawn = GetWorld()->GetFirstPlayerController()->GetPawn(); - AEndlessVendettaCharacter* EndlessVendettaCharacter = Cast(PlayerPawn); - AGadgetManager* GadgetManager = EndlessVendettaCharacter->GadgetManager; if (!GadgetManager->ReconInUse()) return; // Check if the player is roughly looking at their target + APawn* PlayerPawn = GetWorld()->GetFirstPlayerController()->GetPawn(); FRotator LookAtRot = UKismetMathLibrary::FindLookAtRotation(PlayerPawn->GetActorLocation(), TargetLoc); FRotator PlayersRotator = PlayerPawn->GetActorRotation(); // Keep all yaw values between -180 and 180 to simplify the comparison @@ -53,19 +49,5 @@ void AVisionLinkTutorial::Tick(float DeltaSeconds) -void AVisionLinkTutorial::DestroyTutorial() -{ - if (IsValid(WaypointActor)) WaypointActor->Destroy(); - DespawnEnemies(); - Super::DestroyTutorial(); -} - -void AVisionLinkTutorial::FinishedTutorial() -{ - if (IsValid(WaypointActor)) WaypointActor->Destroy(); - CompletedGadgetTutorial.Broadcast(); -} - - diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.h index 48bbbd99..5876dad0 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/VisionLinkTutorial.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "BaseGadgetTutorial.h" +#include "EndlessVendetta/GadgetSystem/GadgetManager.h" #include "VisionLinkTutorial.generated.h" UCLASS() @@ -11,16 +12,15 @@ class ENDLESSVENDETTA_API AVisionLinkTutorial : public ABaseGadgetTutorial { GENERATED_BODY() - bool PlayerInTutorialZone = false; + AGadgetManager* GadgetManager; + bool PlayerInTutorialZone = false; bool PlayerWasInTutZone = false; void BeginPlay() override; void Tick(float DeltaSeconds) override; - void DestroyTutorial() override; - protected: UPROPERTY(EditDefaultsOnly) FString GoToAreaWaypointDesc; @@ -38,12 +38,6 @@ protected: UPROPERTY(BlueprintReadWrite) FVector TargetLoc; - - // Spawns enemies, sets up waypoint locs, and target loc - UFUNCTION(BlueprintImplementableEvent) - void SpawnEnemiesAndSetupDefaults(); - UFUNCTION(BlueprintImplementableEvent) - void DespawnEnemies(); UFUNCTION(BlueprintCallable) void PlayerEnteredTutorialZone() @@ -55,6 +49,4 @@ protected: { PlayerInTutorialZone = false; } - - void FinishedTutorial(); }; From e78cc479894094ff17997ff7011ca6ebb35df022 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 13:22:30 +0000 Subject: [PATCH 19/28] Fixed Gadgets not Despawning After Being Switched Out --- .../EndlessVendetta/GadgetSystem/GadgetManager.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.cpp index 8978f40d..94a5dad4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetManager.cpp @@ -39,8 +39,16 @@ void AGadgetManager::SpawnGadget(TSubclassOf GadgetClass, USceneCom AActor* SpawnedActor = GetWorld()->SpawnActor(GadgetClass, GetActorLocation(), GetActorRotation(), SpawnParams); - if (SpawnedActor->IsA(AReconGadget::StaticClass())) ReconGadget = Cast(SpawnedActor); - else if (SpawnedActor->IsA(ACombatGadget::StaticClass())) CombatGadget = Cast(SpawnedActor); + if (SpawnedActor->IsA(AReconGadget::StaticClass())) + { + if (IsValid(ReconGadget)) ReconGadget->Destroy(); + ReconGadget = Cast(SpawnedActor); + } + else if (SpawnedActor->IsA(ACombatGadget::StaticClass())) + { + if (IsValid(CombatGadget)) CombatGadget->Destroy(); + CombatGadget = Cast(SpawnedActor); + } else UE_LOG(LogTemp, Fatal, TEXT("Passed sub class of gadget base is neither a combat or recon gadget, check the gadget class you're passing through or contact Rafal")); AGadgetBase* BaseGadget = Cast(SpawnedActor); From 7ac557f166d7643aaac92b36736d86978071f2cf Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 13:35:26 +0000 Subject: [PATCH 20/28] Implemented Recon Tutorial Checkpoint --- .../Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset | 3 +++ .../BountySystem/TutorialFacility/MB_TutorialFacility.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 2 +- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- .../GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h | 1 + 6 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset new file mode 100644 index 00000000..c32db353 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_ReconTraining.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52fa6f6a84ca059b3f9b57959ee3cfa352d0feb833b8a5d1603bae568c4d4d7d +size 46993 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index 338f7298..336c9774 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6aa4cb4c59963b7874f9a41cd74af7512b6895a4aa337d9440de85b32ce3adb -size 15541 +oid sha256:a21d5f3921a735e797578ab06266f54661f08b7a14e61c228808526e61a68a49 +size 15750 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index a76d9058..06e03585 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:4c448a399e03e820c5867766611f78910e2811b96a3370f79410574bbaaf7279 +oid sha256:411f0eb2c6c498f4ae4d4cda2cbb7f538a48635c1c360af105450536ef274b13 size 607443 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..444c1727 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:9024e1d847357d4cdf585e615ef2924a4cbf4795b0458184d195c379105134d4 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index a5d257ad..bf2e4391 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d287a8505cfb16ecf61e3f10562beda389f49bbcddbbc25f28aeaa5d1afe5f6c -size 53268 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h index 48965d8b..a27a2839 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/BaseGadgetTutorial.h @@ -43,6 +43,7 @@ public: // Sets default values for this actor's properties ABaseGadgetTutorial(); + UPROPERTY(BlueprintAssignable) FCompletedGadgetTutorial CompletedGadgetTutorial; void DestroyTutorial(); From 61117272ef5700600090c04c9d92949e5fccd314 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 13:49:00 +0000 Subject: [PATCH 21/28] Added Go Downstairs Checkpoint --- .../Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset | 3 +++ .../BountySystem/TutorialFacility/MB_TutorialFacility.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset new file mode 100644 index 00000000..a545465a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/CP_GoDownstairs.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0cfa2881e250992ba5cc2fff1a9597d00531cb2732df8405f6b53d76ab675a7 +size 38882 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index 336c9774..016491ca 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a21d5f3921a735e797578ab06266f54661f08b7a14e61c228808526e61a68a49 -size 15750 +oid sha256:048322d39b1408197f5be2f6b1c3958d213958f114992822cbb7fb1eba78f4f7 +size 15957 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 06e03585..c8231a23 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:411f0eb2c6c498f4ae4d4cda2cbb7f538a48635c1c360af105450536ef274b13 +oid sha256:ec2d9cddf84ce12c2afd9105364ee6405766ac7f23a19f7b6a515699a18c35b1 size 607443 From 345e5acd086e11a4f45f66edbc74a625afc7f9c7 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 15:11:14 +0000 Subject: [PATCH 22/28] Implemented Overload Module Gadget Tutorial --- .../Combat/BP_CombatWorkbench.uasset | 3 ++ .../Combat/GT_OverloadModule.uasset | 3 ++ .../OverloadModule/CG_OverloadModule.uasset | 4 +-- .../Content/Levels/TrainingFacility.umap | 4 +-- .../Architecture/Floor_400x400.uasset | 4 +-- .../Blueprints/Blueprint_CeilingLight.uasset | 4 +-- .../GadgetTutorial/OverloadModuleTutorial.cpp | 25 +++++++++++++ .../GadgetTutorial/OverloadModuleTutorial.h | 35 +++++++++++++++++++ 8 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/BP_CombatWorkbench.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/OverloadModuleTutorial.cpp create mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/OverloadModuleTutorial.h 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; + +}; From 31b190208b175042d0a569f7aeaee64b8624b6be Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 15:36:14 +0000 Subject: [PATCH 23/28] Added Combat Gadget Training Checkpoint --- .../Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset | 4 ++-- .../Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset | 4 ++-- .../GadgetTutorial/Combat/CP_CombatTraining.uasset | 3 +++ .../BountySystem/TutorialFacility/MB_TutorialFacility.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset index 7ea56986..0fdaf894 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutCQCRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36ce86af4f5aea5d620295cd12b2ace3d2fe8cb3f79176981f904c77eb61294a -size 147943 +oid sha256:5fccc1eabe3bc902abe338f8980b6f249f2578be80c1c8096a5232a132ba42c6 +size 148461 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset index b63a939b..8ed828fc 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/FiringRanges/CP_CheckOutLongRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:840b5c9edd522548cd3b4b52a3c8a4a90a18f452ef07db4c7de688e130745888 -size 156457 +oid sha256:76ea44d21affaf349e16f27cb6cb3684c9c14ae417f1096846b45711de2a8a3e +size 156411 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset new file mode 100644 index 00000000..af179740 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/CP_CombatTraining.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f7376ac38e90dacafa36fd1b16bbf2227d0b577ba5ad53d43ce0d8df47bbf07 +size 46961 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index 016491ca..cb2b0984 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:048322d39b1408197f5be2f6b1c3958d213958f114992822cbb7fb1eba78f4f7 -size 15957 +oid sha256:17c4b44e520c4e0bfcb9402573227a1382c842a553fbd29fe8bdc073e4a33c0d +size 16169 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index b2e83cdc..9566a3a0 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:08b525ee32d982c27c00a940ff67fc86f358c5ddfb953a60bd68ccfebef74e10 -size 610106 +oid sha256:7b02bd2add6bcf3e28073e73be7d6153e14cb2c46c3af0220510b850c94baf57 +size 610132 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 5644bcb6..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:ec208781a00b8b13eae265ead16ff015629316c1fef6e53fdf91e042fccfd021 -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 56bddfc9..d858a4f2 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 -size 47333 +oid sha256:21fcc08b19e05006e4b7b00ee346dcc9109c16e861111162e9979a2f1bc8f38c +size 47710 From c522a39410f32b23ab0303c0d5d44c8f86e25b0a Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 16:19:53 +0000 Subject: [PATCH 24/28] Updated PickUpWeapon Checkpoint To Include Actual Pickupable Weapons --- .../BountySimulation/CP_EnterBountySimulationFacility.uasset | 4 ++-- .../TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset | 4 ++-- .../BountySystem/TutorialFacility/MB_TutorialFacility.uasset | 2 +- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset index 3521b8ff..a42c2499 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BountySimulation/CP_EnterBountySimulationFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae808ffd2860b39caf2e3f45d99a2c4f2a1132080068bc782f9a478883a00aa6 -size 73431 +oid sha256:09f78d33c2a88b48b438f3382f6db685a54203b9036a09f80f768b17e0c9d77d +size 74030 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset index 4fb55c0f..9d450f09 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:142e42343ef7f5787e23c1d1681e6126c45ef7d93c53b7dc91512ec54e3820ec -size 30032 +oid sha256:285081531c73e061d3e6bc5def297852b57b5e3622c3e947cc0b8ceed5752f85 +size 61443 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index cb2b0984..24c72606 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17c4b44e520c4e0bfcb9402573227a1382c842a553fbd29fe8bdc073e4a33c0d +oid sha256:f832cb5ec5d4dfc2edd473b4cfd0ac80019547d5f2d1125b4a71942de584bb76 size 16169 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 9566a3a0..dd91bb32 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:7b02bd2add6bcf3e28073e73be7d6153e14cb2c46c3af0220510b850c94baf57 -size 610132 +oid sha256:f2f2fc1c70fab74da6d68febd45bea94d52ebee5b599aedc349f2c659fb99ac6 +size 607294 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..42f1a156 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:9c561da89693076d151056bb2b438a07cf65b6d88521a2a9a6d935e735ce13dc +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index d858a4f2..56bddfc9 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21fcc08b19e05006e4b7b00ee346dcc9109c16e861111162e9979a2f1bc8f38c -size 47710 +oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 +size 47333 From d43053febe158b51a65a823fcba652c5630dca7b Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 16:46:20 +0000 Subject: [PATCH 25/28] Fixed Checkpoint Confirmation UI Being Overriden Post Merge --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../Content/StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 2e7c893c..8e4ecbd1 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21f83334caec77bd5102f683752229d6f53c6e3f6b0b362f4a00171573bd502b -size 50118 +oid sha256:722ad362b974f8cd884e1852c963e27f75f4ed6f285759adbd3c3571b1f477c0 +size 57740 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 42f1a156..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:9c561da89693076d151056bb2b438a07cf65b6d88521a2a9a6d935e735ce13dc -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..2368c7db 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:a67b567c3b8189b35a39aff29b16b399e54c04801b2df417e73578a630f026c3 +size 43745 From 384db6c241343ae334520cf17e2c63a6fcdb5327 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 17:00:27 +0000 Subject: [PATCH 26/28] Enabled Hidden In Game Settings for Example Areas in All Gadget Tutorials --- .../GadgetTutorial/Combat/GT_OverloadModule.uasset | 4 ++-- .../Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset | 4 ++-- .../Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset | 4 ++-- .../StarterContent/Blueprints/Blueprint_CeilingLight.uasset | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset index cc9ef05e..00e68a24 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6efb4e0830f54b67f16f914ed3089a120ba27610b5483c3b316cacc5ba397f63 -size 128490 +oid sha256:78b31bab14e954676ba284008883efc5cb8e38e6a409c28398ca0dd1b2728d44 +size 127154 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset index 80344912..2abaff57 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:935f7575eb8438f8e3320206e83e54c726aacd8ba9dae894dcea2dfdeca4cb70 -size 130514 +oid sha256:ebdb0c50533782ed9c0032b9a6c024f3caa7e9b6edc55382f07290a31f9de193 +size 127075 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset index 782c77cd..2ca83102 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_VisionLink.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0caa776d680dfb23ead998fcd2fbc0c7a46ecf2ff4edff73e98c3e152a79088d -size 213629 +oid sha256:535cd7f074418223d517abe6748a7c40749000dcfa9ecb5e17d7d1c378b5360e +size 214724 diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index 2368c7db..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:a67b567c3b8189b35a39aff29b16b399e54c04801b2df417e73578a630f026c3 -size 43745 +oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 +size 158206 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..2fb1db9f 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d -size 43456 +oid sha256:a9258d613d6e6c5ee7942fb18d59fcaa0c732d91827a10b3b068d1255dd4f271 +size 53268 From 368a68a7e20d106dd98a16828b14de305b2f7085 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 17:32:59 +0000 Subject: [PATCH 27/28] Fixed Crashes Caused By Destroying InValid Characters For Some Gadget Tutorials --- .../GadgetTutorial/Combat/GT_OverloadModule.uasset | 4 ++-- .../Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../Content/StarterContent/Particles/P_Ambient_Dust.uasset | 2 +- .../GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset index 00e68a24..7ab35daf 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Combat/GT_OverloadModule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78b31bab14e954676ba284008883efc5cb8e38e6a409c28398ca0dd1b2728d44 -size 127154 +oid sha256:c3f7370adadacaa691397522121b6c975e922c007eba7b08420598f3cb906fdb +size 143122 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset index 2abaff57..c361a44b 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/GadgetTutorial/Recon/GT_RingModule.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebdb0c50533782ed9c0032b9a6c024f3caa7e9b6edc55382f07290a31f9de193 -size 127075 +oid sha256:029257b219ada12742b0a16af98a8904c477cd27345d9997c9a3fc79d1327117 +size 144242 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index dd91bb32..96d1e37e 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:f2f2fc1c70fab74da6d68febd45bea94d52ebee5b599aedc349f2c659fb99ac6 -size 607294 +oid sha256:62157039ed6eedf1be5cc14450e620e5df74fac88d040047ee7ad0f45f5adb60 +size 607293 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index 2fb1db9f..212caa8d 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9258d613d6e6c5ee7942fb18d59fcaa0c732d91827a10b3b068d1255dd4f271 +oid sha256:48387baadfbb75fbde16ef54415b0e3c8d56fa91b73c4e6acc410ee9d83c1456 size 53268 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp index 0adb8cb0..5da28ffc 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp @@ -88,7 +88,7 @@ void AGadgetTutorialStation::SelectGadget() { // Eventually expand to give player feedback of being denied if changing gadgets fails if (!EndlessVendettaCharacter->UpdateGadgetType(GadgetsArray[GadgetIndex])) return; - + if (IsValid(CurrentGadgetTutorial)) CurrentGadgetTutorial->DestroyTutorial(); FActorSpawnParameters SpawnParams; From 06a3dd04ad55db770485dfc018475fa193b92db6 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 3 Nov 2023 17:57:50 +0000 Subject: [PATCH 28/28] Updated List of Maps to Include in Build to Include New Miami Map --- EndlessVendetta/Config/DefaultGame.ini | 102 ++++++++++++++++++ .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 +- .../Particles/P_Ambient_Dust.uasset | 4 +- 3 files changed, 106 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Config/DefaultGame.ini b/EndlessVendetta/Config/DefaultGame.ini index b8c1ba99..90035037 100644 --- a/EndlessVendetta/Config/DefaultGame.ini +++ b/EndlessVendetta/Config/DefaultGame.ini @@ -8,3 +8,105 @@ ProjectID=F76B45A3432BFC257E879A9C2ADA0BA9 [StartupActions] bAddPacks=True InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent") + +[/Script/UnrealEd.ProjectPackagingSettings] +Build=IfProjectHasCode +BuildConfiguration=PPBC_Development +BuildTarget= +LaunchOnTarget= +StagingDirectory=(Path="") +FullRebuild=False +ForDistribution=False +IncludeDebugFiles=False +BlueprintNativizationMethod=Disabled +bIncludeNativizedAssetsInProjectGeneration=False +bExcludeMonolithicEngineHeadersInNativizedCode=False +UsePakFile=True +bUseIoStore=True +bUseZenStore=False +bMakeBinaryConfig=False +bGenerateChunks=False +bGenerateNoChunks=False +bChunkHardReferencesOnly=False +bForceOneChunkPerFile=False +MaxChunkSize=0 +bBuildHttpChunkInstallData=False +HttpChunkInstallDataDirectory=(Path="") +WriteBackMetadataToAssetRegistry=Disabled +bCompressed=True +PackageCompressionFormat=Oodle +bForceUseProjectCompressionFormatIgnoreHardwareOverride=False +PackageAdditionalCompressionOptions= +PackageCompressionMethod=Kraken +PackageCompressionLevel_DebugDevelopment=4 +PackageCompressionLevel_TestShipping=5 +PackageCompressionLevel_Distribution=7 +PackageCompressionMinBytesSaved=1024 +PackageCompressionMinPercentSaved=5 +bPackageCompressionEnableDDC=False +PackageCompressionMinSizeToConsiderDDC=0 +HttpChunkInstallDataVersion= +IncludePrerequisites=True +IncludeAppLocalPrerequisites=False +bShareMaterialShaderCode=True +bDeterministicShaderCodeOrder=False +bSharedMaterialNativeLibraries=True +ApplocalPrerequisitesDirectory=(Path="") +IncludeCrashReporter=False +InternationalizationPreset=English +-CulturesToStage=en ++CulturesToStage=en +LocalizationTargetCatchAllChunkId=0 +bCookAll=False +bCookMapsOnly=False +bSkipEditorContent=False +bSkipMovies=False +-IniKeyDenylist=KeyStorePassword +-IniKeyDenylist=KeyPassword +-IniKeyDenylist=rsa.privateexp +-IniKeyDenylist=rsa.modulus +-IniKeyDenylist=rsa.publicexp +-IniKeyDenylist=aes.key +-IniKeyDenylist=SigningPublicExponent +-IniKeyDenylist=SigningModulus +-IniKeyDenylist=SigningPrivateExponent +-IniKeyDenylist=EncryptionKey +-IniKeyDenylist=DevCenterUsername +-IniKeyDenylist=DevCenterPassword +-IniKeyDenylist=IOSTeamID +-IniKeyDenylist=SigningCertificate +-IniKeyDenylist=MobileProvision +-IniKeyDenylist=IniKeyDenylist +-IniKeyDenylist=IniSectionDenylist ++IniKeyDenylist=KeyStorePassword ++IniKeyDenylist=KeyPassword ++IniKeyDenylist=rsa.privateexp ++IniKeyDenylist=rsa.modulus ++IniKeyDenylist=rsa.publicexp ++IniKeyDenylist=aes.key ++IniKeyDenylist=SigningPublicExponent ++IniKeyDenylist=SigningModulus ++IniKeyDenylist=SigningPrivateExponent ++IniKeyDenylist=EncryptionKey ++IniKeyDenylist=DevCenterUsername ++IniKeyDenylist=DevCenterPassword ++IniKeyDenylist=IOSTeamID ++IniKeyDenylist=SigningCertificate ++IniKeyDenylist=MobileProvision ++IniKeyDenylist=IniKeyDenylist ++IniKeyDenylist=IniSectionDenylist +-IniSectionDenylist=HordeStorageServers +-IniSectionDenylist=StorageServers ++IniSectionDenylist=HordeStorageServers ++IniSectionDenylist=StorageServers ++MapsToCook=(FilePath="/Game/Levels/TrainingFacility") ++MapsToCook=(FilePath="/Game/Levels/NewMiamiTemp") ++DirectoriesToAlwaysCook=(Path="/Interchange/Functions") ++DirectoriesToAlwaysCook=(Path="/Interchange/gltf") ++DirectoriesToAlwaysCook=(Path="/Interchange/Materials") ++DirectoriesToAlwaysCook=(Path="/Interchange/Pipelines") ++DirectoriesToAlwaysCook=(Path="/Interchange/Utilities") +PerPlatformBuildConfig=() +PerPlatformTargetFlavorName=() +PerPlatformBuildTarget=() + diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..01ef90dd 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:479415deb30dc3169834a58430518a6b98de76ff65126ff206518fc37474b73f +size 66790690 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index 212caa8d..bf2e4391 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48387baadfbb75fbde16ef54415b0e3c8d56fa91b73c4e6acc410ee9d83c1456 -size 53268 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456