From 958542ac69400895976b63d52bdf01793d313d6f Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Sun, 4 Feb 2024 02:43:48 +0000
Subject: [PATCH] Created Pause Menu with WIP Tab Functionality

---
 .../.idea.EndlessVendetta/.idea/workspace.xml |  9 ++----
 .../Blueprints/BP_FirstPersonCharacter.uasset |  4 +--
 .../Content/PauseMenu/PauseMenuBackground.png |  3 ++
 .../PauseMenu/PauseMenuBackground.uasset      |  3 ++
 .../Content/PauseMenu/WBP_PauseMenu.uasset    |  3 ++
 .../Content/PauseMenu/WBP_TestMenuTab.uasset  |  3 ++
 .../Blueprints/Blueprint_CeilingLight.uasset  |  4 +--
 .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset  |  4 +--
 .../Characters/BountyHunterCharacter.cpp      | 14 +++++++--
 .../Characters/BountyHunterCharacter.h        | 10 ++++++
 .../PauseMenu/PauseMenuClass.cpp              |  5 +++
 .../PauseMenu/PauseMenuClass.h                | 31 +++++++++++++++++++
 12 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 EndlessVendetta/Content/PauseMenu/PauseMenuBackground.png
 create mode 100644 EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset
 create mode 100644 EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset
 create mode 100644 EndlessVendetta/Content/PauseMenu/WBP_TestMenuTab.uasset
 create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.cpp
 create mode 100644 EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 1de7075c..5cea6712 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -10,15 +10,10 @@
     <list default="true" id="dfa3053d-1d51-4dad-9270-4c17e086f627" name="Changes" comment="">
       <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/Blueprints/Blueprint_CeilingLight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset" 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$/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" />
@@ -134,7 +129,7 @@
       <option name="presentableId" value="Default" />
       <updated>1706900339638</updated>
       <workItem from="1706900342753" duration="2652000" />
-      <workItem from="1706972179014" duration="2867000" />
+      <workItem from="1706972179014" duration="11096000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
index 87769752..381bde7b 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:792083b0481d20b15498d36fcd01b2d9c2432b02ad13ecd5c5b1f2a74e090c07
-size 470474
+oid sha256:f1ecafab249f201ddeaf8e1c7b6631e183f9bf07d10e1f460002076e75795801
+size 470059
diff --git a/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.png b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.png
new file mode 100644
index 00000000..726c9d5f
--- /dev/null
+++ b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61ef847d33763aab89918e57f62122de8696c402bf1ce1e0cf110e4e68866255
+size 66163
diff --git a/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset
new file mode 100644
index 00000000..2cc1da9e
--- /dev/null
+++ b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f5ba48d09af24b7bd6d2265d08899b4e0237ac470f4b9d9326ed388289b5ce6
+size 47717
diff --git a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset
new file mode 100644
index 00000000..6f9bc650
--- /dev/null
+++ b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:336be313e00bf23335d5275ec65cc1c86bd7f339a66ef48608261e1aa503614f
+size 475108
diff --git a/EndlessVendetta/Content/PauseMenu/WBP_TestMenuTab.uasset b/EndlessVendetta/Content/PauseMenu/WBP_TestMenuTab.uasset
new file mode 100644
index 00000000..3447b252
--- /dev/null
+++ b/EndlessVendetta/Content/PauseMenu/WBP_TestMenuTab.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cf9c231c4b94dec2434c03af547e75968039b3ab03ce0e9d4518c94a86b1fa9
+size 32656
diff --git a/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/EndlessVendetta/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
index c5c3b84e..86db413e 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:7168545a49b33b45ea3aaf27166d03dec5630c5d99c893bfa265f5083dc33ef1
+size 43745
diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
index 9448c30c..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:ca1beae53ef79c87fdba45d8ebf8e6c0ad7085e4a3ee3b9c4e64745c27b171f2
-size 66790690
+oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d
+size 72364642
diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
index 372a0db4..7e60169a 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
@@ -76,8 +76,18 @@ void ABountyHunterCharacter::TogglePauseMenu()
 	PC->SetIgnoreMoveInput(bOpenNewPauseMenu);
 	PC->SetIgnoreLookInput(bOpenNewPauseMenu);
 	PC->SetShowMouseCursor(bOpenNewPauseMenu);
-	PauseMenu = bOpenNewPauseMenu ? CreateWidget<UPauseMenuClass>(GetWorld(), PauseMenuWidgetClass) : nullptr;
-	if (bOpenNewPauseMenu) PauseMenu->AddToViewport(50);
+	if (bOpenNewPauseMenu)
+	{
+		PauseMenu = CreateWidget<UPauseMenuClass>(GetWorld(), PauseMenuWidgetClass);
+		PauseMenu->AddToViewport(50);
+		BountiesTab = CreateWidget(GetWorld(), BountyTabWidgetClass);
+		PauseMenu->OpenNewTab(BountiesTab);
+	}
+	else
+	{
+		PauseMenu->RemoveFromParent();
+		PauseMenu = nullptr;
+	}
 }
 
 void ABountyHunterCharacter::Tick(float DeltaTime)
diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
index 6df7bca2..7b6df1db 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
@@ -33,15 +33,24 @@ class ENDLESSVENDETTA_API ABountyHunterCharacter : public AEndlessVendettaCharac
 	UPROPERTY(EditDefaultsOnly, Category = "Bounty Hunter")
 	FString OpenWorldLevelName = "ControlTutorialLevel";
 
+	// Input Action for Opening and Closing Pause Menu
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true"))
 	UInputAction* PauseMenuAction;
 
+	// Widget Class used to Spawn Pause Menu
 	UPROPERTY(EditDefaultsOnly, Category = PauseMenu)
 	TSubclassOf<UPauseMenuClass> PauseMenuWidgetClass;
 
+	// Reference to Pause Menu Widget
 	UPauseMenuClass* PauseMenu;
 	
 protected:
+	// Widget Class used to Spawn Bounties Tab Widget
+	UPROPERTY(EditDefaultsOnly, Category = "Pause Menu")
+	TSubclassOf<UUserWidget> BountyTabWidgetClass;
+	
+	// Reference to Bounty Tab Widget
+	UUserWidget* BountiesTab;
 
 	
 public:
@@ -64,6 +73,7 @@ protected:
 	// Overridden to Setup up Pause Menu Inputs
 	virtual void SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) override;
 
+	// Open or Close the Pause Menu, Defaults to Opening Bounty Tab
 	void TogglePauseMenu();
 
 	// Called every frame
diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.cpp b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.cpp
new file mode 100644
index 00000000..d45ab890
--- /dev/null
+++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.cpp
@@ -0,0 +1,5 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "PauseMenuClass.h"
+
diff --git a/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h
new file mode 100644
index 00000000..84acbe79
--- /dev/null
+++ b/EndlessVendetta/Source/EndlessVendetta/PauseMenu/PauseMenuClass.h
@@ -0,0 +1,31 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Blueprint/UserWidget.h"
+#include "PauseMenuClass.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class ENDLESSVENDETTA_API UPauseMenuClass : public UUserWidget
+{
+	GENERATED_BODY()
+// ------------------- ATTRIBUTES ------------------------------	
+
+protected:
+
+public:	
+
+// ------------------- METHODS ---------------------------------
+private:
+
+protected:
+
+public:
+	UFUNCTION(BlueprintImplementableEvent)
+	void OpenNewTab(UUserWidget* TabWidget);
+	
+};