From 971ed07da92a597d04a80df404a24a423cf3cde0 Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Thu, 1 Feb 2024 15:47:46 +0000
Subject: [PATCH] Bugfix Loading into Incomplete Tutorial Loads the Player into
 Open World Instead of Tutorial Level

---
 .../.idea.EndlessVendetta/.idea/workspace.xml | 24 ++-----------------
 .../Gameplay/MainMenuPlayerController.uasset  |  4 ++--
 .../Source/EndlessVendetta/EVGameInstance.cpp |  6 ++---
 .../Source/EndlessVendetta/EVGameInstance.h   |  2 +-
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index e65ed336..22d6f8ba 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -7,27 +7,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" 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/BountySystem/ApartmentBounty/MB_Apartment.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset" 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/Gadgets/CombatGadgets/OverloadModule/CG_OverloadModule.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Gadgets/CombatGadgets/OverloadModule/CG_OverloadModule.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Gadgets/ReconGadgets/RingModule/RG_RingModule.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Gadgets/ReconGadgets/VisionLink/RG_VisionLink.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" 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/Levels/TempOpenWorld.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/TempOpenWorld.umap" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/StarterContent/Architecture/Floor_400x400.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Architecture/Floor_400x400.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/BountyClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/BountyClass.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/MainBountyClass.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/MainBountyClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/MainBountyClass.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/SideBountyClass.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/EVGameInstance.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/MainSaveGameClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/MainSaveGameClass.h" afterDir="false" />
-    </list>
+    <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -149,7 +129,7 @@
       <workItem from="1706203836052" duration="7461000" />
       <workItem from="1706626387819" duration="5432000" />
       <workItem from="1706711852868" duration="19944000" />
-      <workItem from="1706799696925" duration="703000" />
+      <workItem from="1706799696925" duration="1378000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset
index 142ba9c9..c9047e60 100644
--- a/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset
+++ b/EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb2866d4ceb699f5ab8a45d5fe54ca1d4c7110cd78fde174771b73e6a9bc2253
-size 108722
+oid sha256:3be7dbbcdd1961057cca4f605b514d0d627ebe068e0f5255eecb7ae4be051610
+size 117724
diff --git a/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp
index 663ed63e..719e7fbd 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp
@@ -14,11 +14,11 @@ void UEVGameInstance::CreateNewSaveGameInstance()
 	UGameplayStatics::SaveGameToSlot(MainSaveGameInstanceRef, "MainSave", 0);
 }
 
-void UEVGameInstance::LoadSaveGameInstance()
+int UEVGameInstance::LoadSaveGameInstance()
 {
-	if (!UGameplayStatics::DoesSaveGameExist("MainSave", 0)) return;
-	UE_LOG(LogTemp, Warning, TEXT("Loading Game Save into GI"));
+	if (!UGameplayStatics::DoesSaveGameExist("MainSave", 0)) return 0;
 	MainSaveGameInstanceRef = Cast<UMainSaveGameClass>(UGameplayStatics::LoadGameFromSlot("MainSave", 0));
+	return MainSaveGameInstanceRef->CurrentMainBountyIndexSave;
 }
 
 void UEVGameInstance::OnStart()
diff --git a/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h
index 208cf308..91c39f97 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h
+++ b/EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h
@@ -27,7 +27,7 @@ public:
 	void CreateNewSaveGameInstance();
 
 	UFUNCTION(BlueprintCallable)
-	void LoadSaveGameInstance();
+	int LoadSaveGameInstance();
 		
 protected:
 	virtual void OnStart() override;