From 8d5e02916f016f9a9b114fab6538e179753dce55 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Wed, 28 Feb 2024 07:17:52 +0000 Subject: [PATCH] Quality of Life Changes --- .../BountySystem/CheckpointTips/WBP_CheckpointTip.uasset | 4 ++-- .../GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset | 4 ++-- .../GadgetRoom/BP_ReconWorkbench.uasset | 4 ++-- .../Content/FirstPerson/BP_InvisibleWall.uasset | 3 +++ .../Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset | 4 ++-- EndlessVendetta/Content/Levels/ControlTutorialLevel.umap | 4 ++-- .../Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset | 4 ++-- .../StarterContent/Architecture/Floor_400x400.uasset | 4 ++-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../EndlessVendetta/Characters/BountyHunterCharacter.cpp | 2 ++ .../EndlessVendetta/Characters/BountyHunterCharacter.h | 4 +++- .../Source/EndlessVendetta/EndlessVendettaCharacter.cpp | 2 +- .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 2 ++ .../GadgetTutorial/GadgetTutorialStation.cpp | 9 ++++++++- 15 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/BP_InvisibleWall.uasset diff --git a/EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset b/EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset index f9c9caf2..cccd327f 100644 --- a/EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset +++ b/EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:589ad499ba939572354532cd8b28455b66311ce122f4b1ffa5429204533b6d19 -size 101358 +oid sha256:4a16c306e6630af2f050fe008ffb65c1357efc97ff8bb5198c08af3cf660133f +size 75298 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset index 7a992806..872b8d92 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f58fe8846e4dfd57ddd385a05c04f0dfbbdf342829567375efd75e1aad361fc -size 92072 +oid sha256:47cf6d95ac9abb5c67a469b8f35dc6f4f93767468dc8108e42965e61da953fc0 +size 78163 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset index c6f71fc5..06a12a40 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11a7c980f59dd567c5f59e3963537536bd3f2dd69d43067ac1f84bf228e48983 -size 22967 +oid sha256:8c920f7603bc4462f25d8a6a37db628dd7d4748feb6edc4590fb31a1e1aa8fbe +size 23478 diff --git a/EndlessVendetta/Content/FirstPerson/BP_InvisibleWall.uasset b/EndlessVendetta/Content/FirstPerson/BP_InvisibleWall.uasset new file mode 100644 index 00000000..c5b599f1 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/BP_InvisibleWall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc3f4c85eb496e726ef63f72d501ca71d611ceaeebb4a1df96af79fc4439677a +size 24378 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 5a5b97f1..af4a1a55 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:4a8cd5f2950170a5c8d3f81f2ea301db959ec2dedd4c7cc4a0a9e56b589d092d -size 496806 +oid sha256:e8b83733768ef3271baa30614d3e4a246749ac356e07ec580833ce75e57fec2c +size 505083 diff --git a/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset b/EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset index dfbd9980..52f8a3b6 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:b0d2623bcccbe62806245c5b0a2cfe7eaa543ba59c5f29d2ae445682be9da437 -size 22662 +oid sha256:155010101037b146707ea0d9b3bb300aa442df9da327b4f415e1f962a18e419c +size 22228 diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap index 7ec56f15..2e4e26ad 100644 --- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap +++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80f2ef39b4b9633d0b514454868231fa60ea6d417aade784a86041309bc09d27 -size 3439790 +oid sha256:8571123ba2136f66d02dbad2091d91b063ee8386c9c49a15f81d49dcc1636bb7 +size 3326051 diff --git a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset index 68aacb61..f34acd1c 100644 --- a/EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset +++ b/EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c951e0463f5d3a69d541453c29dc46d346e1f6ca14bbbf2aa566165b19d6fe7f -size 30979 +oid sha256:413ef12803eaceed3148136fd079e0097fbf2c20403d74277c099c2ff9755917 +size 19867 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index 8189a07a..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:9da9c8dcb1bce8efd1ee551251b86b03bd93df5777624e26c1f33e11063bcff3 -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 0f990580..76f0e104 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:1d6a3357358f204926158bd4541a30ed2dbba9dd98c25f938967c465bf637c07 +size 66790690 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index 1156bcb3..d1d77131 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -122,6 +122,8 @@ void ABountyHunterCharacter::BeginPlay() SpawnMainBounty(GI); if (UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName) { + InOpenWorld = true; + SpawnBikeUI(); SpawnSideBounties(GI); FTransform SpawnTransfrom = GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave; SetActorTransform(SpawnTransfrom); diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index f0636f5d..bb36628b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -92,7 +92,9 @@ protected: // Called When Actor destroyed or Removed from Level virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; - + + UFUNCTION(BlueprintImplementableEvent) + void SpawnBikeUI(); public: // Used by Final Checkpoint to always load the Level set as the Open Level in here FString GetOpenWorldLevelName() diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 66473a96..c26ad3ca 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -745,7 +745,7 @@ void AEndlessVendettaCharacter::UpdateInventorySize(int Cols, int Rows) void AEndlessVendettaCharacter::HoldInteract() { - if (InPauseMenu) return; + if (InPauseMenu || !InOpenWorld) return; if (PlayerOnShip) { ExitShip(GetActorTransform()); diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index be4505c7..500fd572 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -32,6 +32,8 @@ protected: UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Mesh) USkeletalMeshComponent* Mesh1P; + bool InOpenWorld = false; + private: /** First person camera */ UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true")) diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp index 5da28ffc..f1bc712d 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp @@ -37,10 +37,12 @@ void AGadgetTutorialStation::Interact() APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); PickGadgetWidget = CreateWidget(GetWorld(), PickGadgetWidgetClass); PickGadgetWidget->AddToViewport(3); + DisableInput(PlayerController); PlayerController->SetInputMode(InputMode); PlayerController->bShowMouseCursor = true; PlayerController->bEnableClickEvents = true; PlayerController->bEnableMouseOverEvents = true; + EnableInput(PlayerController); // Set up gadget menu's behaviours GadgetMenu = Cast(PickGadgetWidget); @@ -94,9 +96,14 @@ void AGadgetTutorialStation::SelectGadget() FActorSpawnParameters SpawnParams; SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; TSubclassOf GadgetTutorialToSpawnInClass = GadgetsArray[GadgetIndex]->GetDefaultObject()->GadgetTutorialClass; - if (!IsValid(GadgetTutorialToSpawnInClass)) return; + if (!IsValid(GadgetTutorialToSpawnInClass)) + { + CloseWidget(); + return; + } AActor* GadgetTutorialActor = GetWorld()->SpawnActor(GadgetTutorialToSpawnInClass, GadgetTutorialSpawnTransform.GetLocation(), GadgetTutorialSpawnTransform.GetRotation().Rotator(), SpawnParams); CurrentGadgetTutorial = Cast(GadgetTutorialActor); + CloseWidget(); } void AGadgetTutorialStation::CloseWidget()