From 72e445efed119f5759ca06b6b81c5b03b3b16e33 Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <34179rs@gmail.com>
Date: Tue, 10 Oct 2023 18:47:33 +0100
Subject: [PATCH] Reverted Return To Ship Checkpoint Functionality

Revert back to a bounty being completed when no more checkpoints exist for it, rather than having an uncompletable return to ship cp which is ignored when considering completion requirements
---
 EndlessVendetta/Content/BountySystem/BountyDirector.uasset  | 4 ++--
 EndlessVendetta/Content/BountySystem/CC_ReturnToShip.uasset | 3 ---
 .../TestBounties/Test_Bounty1/BC_TestBounty1.uasset         | 4 ++--
 .../TestBounties/Test_Bounty2/BC_TestBounty2.uasset         | 4 ++--
 .../StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 2 +-
 .../C/N1/E7M6U3RRQJ0NKZWADRZU2F.uasset                      | 2 +-
 .../Source/EndlessVendetta/BountySystem/BountyClass.cpp     | 2 +-
 .../Source/EndlessVendetta/BountySystem/BountyClass.h       | 6 ------
 .../Source/EndlessVendetta/BountySystem/SideBountyClass.cpp | 3 +--
 9 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 EndlessVendetta/Content/BountySystem/CC_ReturnToShip.uasset

diff --git a/EndlessVendetta/Content/BountySystem/BountyDirector.uasset b/EndlessVendetta/Content/BountySystem/BountyDirector.uasset
index 864d575c..abfc1024 100644
--- a/EndlessVendetta/Content/BountySystem/BountyDirector.uasset
+++ b/EndlessVendetta/Content/BountySystem/BountyDirector.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8364b58c763904adb7b727800d9e1d2de027a9793f82db94c34cfa3ef32be588
-size 43410
+oid sha256:095a379c23e9c3e8d2b07f5b2036d1588931675bee26a2010492c88371620daa
+size 42288
diff --git a/EndlessVendetta/Content/BountySystem/CC_ReturnToShip.uasset b/EndlessVendetta/Content/BountySystem/CC_ReturnToShip.uasset
deleted file mode 100644
index 610c41ad..00000000
--- a/EndlessVendetta/Content/BountySystem/CC_ReturnToShip.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ff74658b687ff7bf8619b0b1cc1a4c086dee8fb5d7cd21fa820a7272b602721
-size 13616
diff --git a/EndlessVendetta/Content/BountySystem/TestBounties/Test_Bounty1/BC_TestBounty1.uasset b/EndlessVendetta/Content/BountySystem/TestBounties/Test_Bounty1/BC_TestBounty1.uasset
index 3afe0b52..a8e574e8 100644
--- a/EndlessVendetta/Content/BountySystem/TestBounties/Test_Bounty1/BC_TestBounty1.uasset
+++ b/EndlessVendetta/Content/BountySystem/TestBounties/Test_Bounty1/BC_TestBounty1.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e59c8ac9357ddb7da324f75e67b79e1dc430da18acb4638a82a7f6a0bb228f5
-size 26624
+oid sha256:72c5dfd7d5c28c07bf90a5870537b16857a6f499d52fee718053eaffd1ae65ca
+size 26471
diff --git a/EndlessVendetta/Content/BountySystem/TestBounties/Test_Bounty2/BC_TestBounty2.uasset b/EndlessVendetta/Content/BountySystem/TestBounties/Test_Bounty2/BC_TestBounty2.uasset
index 885ca38f..f0364734 100644
--- a/EndlessVendetta/Content/BountySystem/TestBounties/Test_Bounty2/BC_TestBounty2.uasset
+++ b/EndlessVendetta/Content/BountySystem/TestBounties/Test_Bounty2/BC_TestBounty2.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42dfa3a8b7f8c66bbdf4f9875672f9efc2501e7aee9e28f0dfbd72a1259b0493
-size 22778
+oid sha256:02a0727628be7a72134a3148e042f64691e43b299dd349c9246c034a40c4f798
+size 22625
diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
index 9819ebfd..0c9d4e26 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:a23fd0e2dcb1d9ef6281f8b224a2fac4c24819434c765688132505ba1439ff83
+oid sha256:9a25fb0509937f11c2ef9e1e717d9d14d1d41e26352da8353f1181fd19aa5c0d
 size 66790690
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/BountySystemTestLevel/C/N1/E7M6U3RRQJ0NKZWADRZU2F.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/BountySystemTestLevel/C/N1/E7M6U3RRQJ0NKZWADRZU2F.uasset
index a396b15f..08f07fda 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/BountySystemTestLevel/C/N1/E7M6U3RRQJ0NKZWADRZU2F.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/BountySystemTestLevel/C/N1/E7M6U3RRQJ0NKZWADRZU2F.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04de015b0bb32939230883654ad41bf7054c369134749aeb11e98f963a1c0a09
+oid sha256:444ddcb2a79ffd12016502dc9f588c06ea0a5e07e033556a698f2cb3249c0d58
 size 4464
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp
index d1df86ae..a115427a 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp
@@ -61,7 +61,7 @@ void ABountyClass::IncrementBountyCheckpoint()
 	}
 
 	// Bounty Completion Condition
-	if (BountyCheckpoints.Num() <= MinCPsRequiredForCompletion)
+	if (BountyCheckpoints.Num() <= 1)
 	{
 		Completed = true;
 		BountyCheckpoints[0]->Active = false;
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h
index 8b910cc1..48ecb257 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.h
@@ -39,12 +39,6 @@ protected:
 	
 	bool Completed = false;
 	
-	/**
-	 * Default is 2 as final step in most Bounties is to return to ship,
-	 * which can't be completed. Change to 1 if that's not the case.
-	 */
-	int MinCPsRequiredForCompletion = 2;
-
 	// Spawned in Checkpoints for this Bounty
 	TArray<ACheckpointClass*> BountyCheckpoints;
 
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp
index b104f604..d28c84e6 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/SideBountyClass.cpp
@@ -6,8 +6,7 @@
 void ASideBountyClass::BeginPlay()
 {
 	Super::BeginPlay();
-
-	MinCPsRequiredForCompletion = 1;
+	
 }
 
 void ASideBountyClass::IncrementBountyCheckpoint()