From da57792207a52a1fb9aad9a7668dfeaea56d01c6 Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Thu, 1 Feb 2024 16:40:49 +0000
Subject: [PATCH] Bugfix Accidently Landing at LZ when Pressing F on Other
 Objects

---
 .../.idea.EndlessVendetta/.idea/workspace.xml      | 14 ++++++++++++--
 .../ApartmentBounty/CP_ElimTImothyHuntsmer.uasset  |  3 +++
 .../ApartmentBounty/MB_Apartment.uasset            |  4 ++--
 .../ApartmentBounty/OWCP_Apartment.uasset          |  4 ++--
 .../ControlsTutorial/Bounty/OWCP_Training.uasset   |  4 ++--
 .../BountySimulation/CP_ElimTutorialTarget.uasset  |  4 ++--
 EndlessVendetta/Content/Levels/Apartment_hit.umap  |  4 ++--
 .../BountySystem/CheckpointClass.cpp               |  4 +++-
 .../EndlessVendetta/BountySystem/CheckpointClass.h |  2 ++
 .../Source/EndlessVendetta/SpaceShip/SpaceShip.cpp |  6 +++++-
 10 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 EndlessVendetta/Content/BountySystem/ApartmentBounty/CP_ElimTImothyHuntsmer.uasset

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 22d6f8ba..c7122f6d 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -7,7 +7,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="" />
+    <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/BountySystem/ApartmentBounty/OWCP_Apartment.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Levels/Apartment_hit.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/Apartment_hit.umap" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/CheckpointClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/BountySystem/CheckpointClass.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/SpaceShip/SpaceShip.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/SpaceShip/SpaceShip.cpp" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -129,7 +139,7 @@
       <workItem from="1706203836052" duration="7461000" />
       <workItem from="1706626387819" duration="5432000" />
       <workItem from="1706711852868" duration="19944000" />
-      <workItem from="1706799696925" duration="1378000" />
+      <workItem from="1706799696925" duration="3439000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/CP_ElimTImothyHuntsmer.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CP_ElimTImothyHuntsmer.uasset
new file mode 100644
index 00000000..dcde058f
--- /dev/null
+++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/CP_ElimTImothyHuntsmer.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f56fcbf6bb0f0a1241275e1a3338f698f588e40b787abc4ccf7607de32e911df
+size 57693
diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/MB_Apartment.uasset
index bfce5907..96dc5870 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:b3961e22842e8bb12c11a7a3e55793f49209fbdecbcb861ef0296af14b5c36b0
-size 23374
+oid sha256:b660e3da651b47390d53bd8d9007ec3d7b82bceaf97d1a266239be3c2f50c593
+size 23693
diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset
index 7a36f7e0..69c1e83d 100644
--- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset
+++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/OWCP_Apartment.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d9166bbded21f9f0972c11067858db21c9157ff4b5acbbb1113348f9ae065e7
-size 27092
+oid sha256:f671cf047ef64679d0a306f563a38958bb751c78b68c615d63c539ec1cf84b92
+size 24453
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset
index e89aa1e7..2ed776b6 100644
--- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/OWCP_Training.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e717b215281004fe89c222daa442d2ac163443e08a7b66f485f8cf43d4adddee
-size 24792
+oid sha256:f6f9debd6a0a8ef030b539f4e5a09d27bfd0c840cf7ae6ee680612eede4e454f
+size 24209
diff --git a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset
index 14e38669..4af01071 100644
--- a/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset
+++ b/EndlessVendetta/Content/BountySystem/Legacy/TutorialFacility/Checkpoints/BountySimulation/CP_ElimTutorialTarget.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85d97a29077065fb44f823e797cb17d01f9ea71773db0d63bb70cdecd75c5e6c
-size 140715
+oid sha256:2be049b806cbf608d0062def11a2c31313a7c8fa7db8a235361060540e67d810
+size 139491
diff --git a/EndlessVendetta/Content/Levels/Apartment_hit.umap b/EndlessVendetta/Content/Levels/Apartment_hit.umap
index 3699de65..8551227f 100644
--- a/EndlessVendetta/Content/Levels/Apartment_hit.umap
+++ b/EndlessVendetta/Content/Levels/Apartment_hit.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa51241ae1af23456e7f888143053bb9725a7b23a368ba22605845f0c9990797
-size 234051
+oid sha256:748793e0cc4b8fbf915db957bfb4ca5e02cc4134a5969053f3e4f336e0a7e0eb
+size 235491
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp
index 0c9d0313..b2938653 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp
@@ -20,7 +20,7 @@ void ACheckpointClass::BeginPlay()
 
 void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle)
 {
-	if (!IsValid(WaypointActorClass)) return;
+	if (!IsValid(WaypointActorClass) || HideWaypoint) return;
 
 	BountyTitle = CurrentBountyTitle;
 	FActorSpawnParameters SpawnParams;
@@ -31,6 +31,8 @@ void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle)
 
 void ACheckpointClass::UpdateCheckpointWaypoint(FVector WaypointNewLoc)
 {
+	if (HideWaypoint) return;
+	
 	FActorSpawnParameters SpawnParams;
  	SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
 	if (WaypointActor) WaypointActor->Destroy();
diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h
index 7a9ada47..09462ebf 100644
--- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h
+++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h
@@ -29,6 +29,8 @@ class ENDLESSVENDETTA_API ACheckpointClass : public AActor
 	FTransform CheckpointSpawnTransform;
 	UPROPERTY(EditDefaultsOnly, Category = "Checkpoint")
 	TSubclassOf<AWaypointActor> WaypointActorClass;
+	UPROPERTY(EditDefaultsOnly, Category = "Checkpoint")
+	bool HideWaypoint = false;
 
 	AWaypointActor* WaypointActor;
 	// ----------------------------------------
diff --git a/EndlessVendetta/Source/EndlessVendetta/SpaceShip/SpaceShip.cpp b/EndlessVendetta/Source/EndlessVendetta/SpaceShip/SpaceShip.cpp
index 735a6222..35dbc267 100644
--- a/EndlessVendetta/Source/EndlessVendetta/SpaceShip/SpaceShip.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/SpaceShip/SpaceShip.cpp
@@ -24,7 +24,11 @@ void ASpaceShip::SightCheck()
 	FVector LT_End = LT_Start + (SeatComponent->GetForwardVector() * 500000);
 	GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams);
 	ALandingZone* LZ = Cast<ALandingZone>(OutHit.GetActor());
-	if (!IsValid(LZ)) return;
+	if (!IsValid(LZ))
+	{
+		Potential_LZ = nullptr;
+		return;
+	}
 	Potential_LZ = LZ;
 	LZ->SuggestLandingWidget();
 }