From 162d9c85a4e526a903af8fd1e51a560a546ab03d Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Sat, 3 Feb 2024 16:00:11 +0000
Subject: [PATCH] Setup Pause Menu Input

---
 .../.idea.EndlessVendetta/.idea/workspace.xml | 26 ++++++++++-------
 .../Blueprints/BP_FirstPersonCharacter.uasset |  4 +--
 .../Input/Actions/IA_PauseMenu.uasset         |  3 ++
 .../FirstPerson/Input/IMC_Default.uasset      |  4 +--
 .../Content/Levels/MainMenuLevel.umap         |  4 +--
 .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset  |  2 +-
 .../BountySystem/BountyDirector.cpp           |  8 ++---
 .../Characters/BountyHunterCharacter.cpp      | 29 ++++++++++++++++++-
 .../Characters/BountyHunterCharacter.h        | 14 +++++++++
 .../Characters/MyVICharacterBase.cpp          |  1 +
 .../EndlessVendettaCharacter.cpp              | 16 ++++++----
 .../EndlessVendettaCharacter.h                |  7 +++--
 12 files changed, 87 insertions(+), 31 deletions(-)
 create mode 100644 EndlessVendetta/Content/FirstPerson/Input/Actions/IA_PauseMenu.uasset

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 3a72e6ff..1de7075c 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -8,14 +8,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="dfa3053d-1d51-4dad-9270-4c17e086f627" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Input/IMC_Default.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Input/IMC_Default.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Levels/MainMenuLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/MainMenuLevel.umap" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/DialogueSystemEditor/DialogueSystemEditor.Build.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Source/DialogueSystemEditor/DialogueSystemEditor.Build.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta.Target.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta.Target.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueEdge.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueRootNode.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueTree.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/DialogueSystem/DialogueTree.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/BountyDirector.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/BountyDirector.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/Characters/BountyHunterCharacter.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/Characters/BountyHunterCharacter.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendettaCharacter.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,10 +31,10 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "customColor": "",
-  "associatedIndex": 7
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 7
+}</component>
   <component name="ProjectId" id="2bp7o8dmlHZgRsYmVepgy7lbmpM" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -42,7 +45,7 @@
     "C++ Project.EndlessVendetta.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "TempBuildSetup",
+    "git-widget-placeholder": "PauseMenu",
     "ignore.virus.scanning.warn.message": "true",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -131,6 +134,7 @@
       <option name="presentableId" value="Default" />
       <updated>1706900339638</updated>
       <workItem from="1706900342753" duration="2652000" />
+      <workItem from="1706972179014" duration="2867000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
index 46367c77..87769752 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:f8ca10fde945fbab4c1f76b326cd5808c53a338dedd01c73be8ae655552aa31c
-size 474080
+oid sha256:792083b0481d20b15498d36fcd01b2d9c2432b02ad13ecd5c5b1f2a74e090c07
+size 470474
diff --git a/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_PauseMenu.uasset b/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_PauseMenu.uasset
new file mode 100644
index 00000000..ff5e76ee
--- /dev/null
+++ b/EndlessVendetta/Content/FirstPerson/Input/Actions/IA_PauseMenu.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4842d868797342521c825cffe86759dfe8c0f8b1454ed9ad82aa0d0effe0dcc
+size 1375
diff --git a/EndlessVendetta/Content/FirstPerson/Input/IMC_Default.uasset b/EndlessVendetta/Content/FirstPerson/Input/IMC_Default.uasset
index 4764655f..44532cbd 100644
--- a/EndlessVendetta/Content/FirstPerson/Input/IMC_Default.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Input/IMC_Default.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8576231cc54d32ecfa8c00c7570ec51bb9d741dabc85bc0b4ef684bbc8209d04
-size 19248
+oid sha256:18776bd43f9773369a4532239c8f5959f11cb148a259a46bcc2f3859741e1d41
+size 20504
diff --git a/EndlessVendetta/Content/Levels/MainMenuLevel.umap b/EndlessVendetta/Content/Levels/MainMenuLevel.umap
index d2321b53..50ae49e0 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:1c86b9618ce0418f07d9a359900fa7815818fc8e5f0a1956b2bfb87a4452fe01
-size 306418
+oid sha256:15bdb4a6b7b73c3abed62d2af28bf942b4011d09abcb972641ae60a7006fee97
+size 306352
diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
index 8720c67f..9448c30c 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:2948a0f047ea3d4c550459ad2641ce7a098433ea2c165c572d9816ad798fd473
+oid sha256:ca1beae53ef79c87fdba45d8ebf8e6c0ad7085e4a3ee3b9c4e64745c27b171f2
 size 66790690
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp
index 7d884ef8..834c7fb5 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyDirector.cpp
@@ -188,10 +188,10 @@ void ABountyDirector::BuyEnemyRadio()
 
 void ABountyDirector::BuyFavours()
 {
-	if (PlayerChar->Money < FavourCost) return;
-	PlayerChar->Money -= FavourCost;
-	Favours++;
-	PC_Display->UpdateFavourCount(Favours);
+	// if (PlayerChar->Money < FavourCost) return;
+	// PlayerChar->Money -= FavourCost;
+	// Favours++;
+	// PC_Display->UpdateFavourCount(Favours);
 }
 
 // ----------- PC Display ---------------
diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
index 9d24e93b..372a0db4 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
@@ -3,6 +3,7 @@
 
 #include "BountyHunterCharacter.h"
 #include "Kismet/GameplayStatics.h"
+#include "EnhancedInputComponent.h"
 
 void ABountyHunterCharacter::SpawnMainBounty()
 {
@@ -52,8 +53,34 @@ void ABountyHunterCharacter::BeginPlay()
 	Super::BeginPlay();
 }
 
+void ABountyHunterCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent)
+{
+	if (UEnhancedInputComponent* EnhancedInputComponent = CastChecked<UEnhancedInputComponent>(PlayerInputComponent))
+	{
+		EnhancedInputComponent->BindAction(PauseMenuAction, ETriggerEvent::Started, this, &ABountyHunterCharacter::TogglePauseMenu);
+	}
+	
+	UE_LOG(LogTemp, Warning, TEXT("Setup player input on bounty hunter character"));
+
+	Super::SetupPlayerInputComponent(PlayerInputComponent);
+}
+
+void ABountyHunterCharacter::TogglePauseMenu()
+{
+	bool bOpenNewPauseMenu = !IsValid(PauseMenu);
+	FInputModeUIOnly UIOnly;
+	FInputModeGameOnly GameOnly;
+	APlayerController* PC = Cast<APlayerController>(GetController());
+
+	InPauseMenu = bOpenNewPauseMenu;
+	PC->SetIgnoreMoveInput(bOpenNewPauseMenu);
+	PC->SetIgnoreLookInput(bOpenNewPauseMenu);
+	PC->SetShowMouseCursor(bOpenNewPauseMenu);
+	PauseMenu = bOpenNewPauseMenu ? CreateWidget<UPauseMenuClass>(GetWorld(), PauseMenuWidgetClass) : nullptr;
+	if (bOpenNewPauseMenu) PauseMenu->AddToViewport(50);
+}
+
 void ABountyHunterCharacter::Tick(float DeltaTime)
 {
 	Super::Tick(DeltaTime);
 }
-
diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
index 27be1e7f..6df7bca2 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
@@ -7,6 +7,7 @@
 #include "EndlessVendetta/EVGameInstance.h"
 #include "EndlessVendetta/MainSaveGameClass.h"
 #include "EndlessVendetta/BountySystem/MainBountyClass.h"
+#include "EndlessVendetta/PauseMenu/PauseMenuClass.h"
 #include "BountyHunterCharacter.generated.h"
 
 /**
@@ -31,6 +32,14 @@ class ENDLESSVENDETTA_API ABountyHunterCharacter : public AEndlessVendettaCharac
 	// Name of open world, so that the correct bounties can be spawned based on level
 	UPROPERTY(EditDefaultsOnly, Category = "Bounty Hunter")
 	FString OpenWorldLevelName = "ControlTutorialLevel";
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true"))
+	UInputAction* PauseMenuAction;
+
+	UPROPERTY(EditDefaultsOnly, Category = PauseMenu)
+	TSubclassOf<UPauseMenuClass> PauseMenuWidgetClass;
+
+	UPauseMenuClass* PauseMenu;
 	
 protected:
 
@@ -52,6 +61,11 @@ protected:
 	// Called When Player Spawns
 	virtual void BeginPlay() override;
 
+	// Overridden to Setup up Pause Menu Inputs
+	virtual void SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) override;
+
+	void TogglePauseMenu();
+
 	// Called every frame
 	virtual void Tick(float DeltaTime) override;
 public:
diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/MyVICharacterBase.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/MyVICharacterBase.cpp
index 93d83d2f..f4f1f85e 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/MyVICharacterBase.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/MyVICharacterBase.cpp
@@ -70,6 +70,7 @@ void AMyVICharacterBase::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& O
 
 void AMyVICharacterBase::Jump()
 {
+	if (PlayerOnShip || InPauseMenu) return;
 	// If missing critical components then jump and exit
 	if (!VaultComponent || !GetCharacterMovement())
 	{
diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
index 4bf27204..f0412376 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
@@ -216,10 +216,12 @@ void AEndlessVendettaCharacter::SetupPlayerInputComponent(class UInputComponent*
 		//Interacting
 		EnhancedInputComponent->BindAction(InteractAction, ETriggerEvent::Started, this, &AEndlessVendettaCharacter::Interact);
 	}
+	UE_LOG(LogTemp, Warning, TEXT("Setup player input on EV character"));
 }
 
 void AEndlessVendettaCharacter::Interact()
 {
+	if (InPauseMenu) return;
 	if (bIsInDialogue)
 	{
 		Cast<UAC_PlayerDialogueInterpreter>(GetComponentByClass(UAC_PlayerDialogueInterpreter::StaticClass()))->NextDialogue();
@@ -257,7 +259,7 @@ void AEndlessVendettaCharacter::Interact()
 
 void AEndlessVendettaCharacter::SetCrouch()
 {
-	if (PlayerOnShip) return;
+	if (PlayerOnShip || InPauseMenu) return;
 	Crouch();
 }
 
@@ -301,7 +303,7 @@ float AEndlessVendettaCharacter::TakeDamage(const float DamageAmount, FDamageEve
 
 void AEndlessVendettaCharacter::ToggleRecon()
 {
-	if (PlayerOnShip) return;
+	if (PlayerOnShip || InPauseMenu) return;
 	if (!GadgetManager->IsValidReconGadget()) return;
 
 	if (IsValid(PrimaryWeapon)) EquipPrimary();
@@ -324,7 +326,7 @@ void AEndlessVendettaCharacter::ToggleRecon()
 
 void AEndlessVendettaCharacter::ToggleCombat()
 {
-	if (PlayerOnShip) return;
+	if (PlayerOnShip || InPauseMenu) return;
 	if (!GadgetManager->IsValidCombatGadget()) return;
 
 	if (IsValid(PrimaryWeapon)) EquipPrimary();
@@ -349,7 +351,7 @@ void AEndlessVendettaCharacter::ToggleCombat()
 //When 1 is pressed it calls EquipPrimary
 void AEndlessVendettaCharacter::EquipPrimary()
 {
-	if (PlayerOnShip) return;
+	if (PlayerOnShip || InPauseMenu) return;
 	if (!IsValid(PrimaryWeaponClass)) return;
 	FActorSpawnParameters spawnParams;
 	spawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
@@ -421,7 +423,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
 void AEndlessVendettaCharacter::EquipSecondary()
 {
 	if (!IsValid(SecondaryWeaponClass)) return;
-	if (PlayerOnShip) return;
+	if (PlayerOnShip || InPauseMenu) return;
 	FActorSpawnParameters spawnParams;
 	spawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
 	FAttachmentTransformRules AttachmentRules(EAttachmentRule::SnapToTarget, true);
@@ -518,6 +520,7 @@ void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit)
 //Calls the fire function in the baseWeaponClass
 void AEndlessVendettaCharacter::FireCaller()
 {
+	if (InPauseMenu) return;
 	if (IsValid(PrimaryWeapon) && !bIsReloading)
 	{
 		PrimaryWeapon->Fire();
@@ -542,6 +545,7 @@ void AEndlessVendettaCharacter::StopFire()
 
 void AEndlessVendettaCharacter::GunRightClick()
 {
+	if (InPauseMenu) return;
 	if (IsValid(PrimaryWeapon) && !bIsScoped)
 	{
 		bIsScoped = true;
@@ -578,6 +582,7 @@ void AEndlessVendettaCharacter::StopGunRightClick()
 
 void AEndlessVendettaCharacter::GunReload()
 {
+	if (InPauseMenu) return;
 	if (IsValid(PrimaryWeapon))
 	{
 		PrimaryWeapon->ReloadTimer();
@@ -617,6 +622,7 @@ void AEndlessVendettaCharacter::Move(const FInputActionValue& Value)
 
 void AEndlessVendettaCharacter::Sprint()
 {
+	if (InPauseMenu) return;
 	bIsPlayerSprinting = true;
 	if (bIsPlayerSprinting)
 	{
diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
index a01cbd6c..d10af7b2 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
+++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
@@ -133,6 +133,8 @@ protected:
 	virtual void BeginPlay() override;
 	virtual void Tick(float DeltaTime) override;
 
+	bool InPauseMenu = false;
+	
 	UPROPERTY(EditDefaultsOnly, Category = "Gadget")
 	TSubclassOf<AGadgetManager> GadgetManagerClass;
 
@@ -145,7 +147,6 @@ protected:
 	void PlayFadeScreen();
 
 public:
-	int Money = 2000;
 	AGadgetManager* GadgetManager;
 	bool bIsReloading = false;
 
@@ -269,11 +270,11 @@ public:
 
 	// Space Ship
 private:
-	bool PlayerOnShip = false;
 	UPROPERTY(EditDefaultsOnly, Category = "Space Ship")
 	TSubclassOf<ASpaceShip> SpaceShipClass;
 	ASpaceShip* SpaceShip;
-
+protected:
+	bool PlayerOnShip = false;
 public:
 	void ExitShip(FTransform ExitLoc);
 	void EnterShip(FTransform TakeoffLoc);