diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index aa29ae48..7a87fbdb 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -9,12 +9,14 @@ - + + + + + - - diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset index 30ecc43f..9874fb3c 100644 --- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset +++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c24d0e32c594435e5c24f57444e1a99c1c7e491256f16bf15f60f1a627928600 -size 23786 +oid sha256:3f54596b2946a99060351c9a805c70203868db194b24f94a9999bc72847cb197 +size 23998 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset index 11607e4e..abd6b8f7 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14fd53a50ee9b233156dd4e8ff06c7a92800afbe4934bb067d7fe94c28d2cdda -size 26131 +oid sha256:79ee7d751efb58c167bfd14d74bac82cb3c3b02094f86cd0ea000a807211d478 +size 26452 diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap index 50ae49e0..aa658f49 100644 --- a/EndlessVendetta/Content/Levels/MainMenuLevel.umap +++ b/EndlessVendetta/Content/Levels/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15bdb4a6b7b73c3abed62d2af28bf942b4011d09abcb972641ae60a7006fee97 -size 306352 +oid sha256:185acae34cc8b4ff2298ec48a4c697230e4665427a7dcb492e93494203b190dd +size 306304 diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap index b460c344..1247e23d 100644 --- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap +++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:513e7a005246865fbaac9bf4abda7bf0473776603585a01eea1bd278711dbfce -size 13864801 +oid sha256:9afe44b1d4908593e2d2ac009bb61efb016e69bf32f03198bb4bd8e51a54f0f6 +size 13864753 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..07261300 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:b7a9945596fb0a138326d2dfc6f85d5b8cf3a580077f398c6fa4c73ec468e2dd +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset index 24412998..5e3ff30e 100644 --- a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset +++ b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d2b0daf585d5c6052afc625471c8e235e09c7b6f76185220074287885b3fc06 -size 353648 +oid sha256:85c827023ee4b466228ec65e92b4b4a0415a106de041ac1c2cab481a2a5dfa8d +size 348532 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h index 1617dfe6..cb403d15 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/MainBountyClass.h @@ -23,6 +23,10 @@ class ENDLESSVENDETTA_API AMainBountyClass : public ABountyClass // Used to Store Ref for Bounty Tracking Functionality ACheckpointClass* OpenWorldcheckpoint; + // Used by Players Character to Determine where to Spawn in the Open World after Completing Main Bounty + UPROPERTY(EditDefaultsOnly, Category = "Bounty") + FTransform PlayerSpawnTransform; + protected: @@ -40,6 +44,11 @@ public: // Spawns the Single Checkpoint in the Open World for this Main Bounty void SpawnOpenWorldCheckpoint(); + // Used by Players Character to Determine where to Spawn in the Open World after Completing Main Bounty + FTransform GetPlayerSpawnTransform() + { + return PlayerSpawnTransform; + } diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index dd05262f..5df9d76b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -32,6 +32,10 @@ void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI) { // Collect rewards for bounty and move onto next UE_LOG(LogTemp, Warning, TEXT("Would be collecting reward for completing bounty %d"), CurrentMainBountyIndex); + + FTransform PostBountySpawnTransform = MainBountyClasses[CurrentMainBountyIndex]->GetDefaultObject()->GetPlayerSpawnTransform(); + SetActorTransform(PostBountySpawnTransform); + Cast(GetController())->SetControlRotation(PostBountySpawnTransform.GetRotation().Rotator()); CurrentMainBountyIndex = GI->MainSaveGameInstanceRef->CurrentMainBountyIndexSave; GI->MainSaveGameInstanceRef->LastMainBountyIndexInOpenWorld = CurrentMainBountyIndex; @@ -73,7 +77,7 @@ void ABountyHunterCharacter::SetupPlayerInputComponent(UInputComponent* PlayerIn void ABountyHunterCharacter::TogglePauseMenu() { - bool bOpenNewPauseMenu = !IsValid(PauseMenu); + const bool bOpenNewPauseMenu = !IsValid(PauseMenu); FInputModeUIOnly UIOnly; FInputModeGameOnly GameOnly; APlayerController* PC = Cast(GetController()); @@ -82,23 +86,15 @@ void ABountyHunterCharacter::TogglePauseMenu() PC->SetIgnoreMoveInput(bOpenNewPauseMenu); PC->SetIgnoreLookInput(bOpenNewPauseMenu); PC->SetShowMouseCursor(bOpenNewPauseMenu); - if (bOpenNewPauseMenu) - { - PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass); - PauseMenu->AddToViewport(50); - BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass); - PauseMenu->OpenNewTab(BountiesTab); - } - else + if (!bOpenNewPauseMenu) { PauseMenu->RemoveFromParent(); PauseMenu = nullptr; } -} - -void ABountyHunterCharacter::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); + PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass); + PauseMenu->AddToViewport(50); + BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass); + PauseMenu->OpenNewTab(BountiesTab); } void ABountyHunterCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason) diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index e628b489..2db3f625 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -76,9 +76,6 @@ protected: // Open or Close the Pause Menu, Defaults to Opening Bounty Tab void TogglePauseMenu(); - // Called every frame - virtual void Tick(float DeltaTime) override; - // Called When Actor destroyed or Removed from Level virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; public: