From d8b228e0201816829da4d2a20ca05f4c375b11cf Mon Sep 17 00:00:00 2001
From: baz <bazzadobs@live.co.uk>
Date: Mon, 11 Mar 2024 22:04:35 +0000
Subject: [PATCH] Checfk if all keys have been collected in
 LevelEndTriggerVolume

---
 Source/Nakatomi/LevelEndTriggerVolume.cpp | 16 ++++++++++------
 Source/Nakatomi/NakatomiLevelManager.cpp  | 12 +++++++++++-
 Source/Nakatomi/NakatomiLevelManager.h    |  8 +++++++-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Source/Nakatomi/LevelEndTriggerVolume.cpp b/Source/Nakatomi/LevelEndTriggerVolume.cpp
index caf67e3..9fb2f1f 100644
--- a/Source/Nakatomi/LevelEndTriggerVolume.cpp
+++ b/Source/Nakatomi/LevelEndTriggerVolume.cpp
@@ -24,16 +24,20 @@ void ALevelEndTriggerVolume::OnOverlapBegin(UPrimitiveComponent* OverlappedCompo
 								   UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
 								   const FHitResult& SweepResult)
 {
-	// TODO: Add extra functionality!
-	if (Cast<APlayerCharacter>(OtherActor))
+	UNakatomiGameInstance* gameInstance = Cast<UNakatomiGameInstance>(UGameplayStatics::GetGameInstance(GetWorld()));
+	if (gameInstance)
 	{
-		GetCollisionComponent()->OnComponentBeginOverlap.Clear();
+		int CollectedLevelKeysCount = gameInstance->GetCurrentLevelManager()->GetCollectedLevelKeysCount();
+		int InitialLevelKeysCount = gameInstance->GetCurrentLevelManager()->GetInitialLevelKeysCount();
 		
-		if (auto gameInstance = Cast<UNakatomiGameInstance>(UGameplayStatics::GetGameInstance(GetWorld())))
+		// TODO: Add extra checks!
+		if (Cast<APlayerCharacter>(OtherActor) && CollectedLevelKeysCount == InitialLevelKeysCount)
 		{
+			GetCollisionComponent()->OnComponentBeginOverlap.Clear();
+
 			gameInstance->GetCurrentLevelManager()->LoadNextLevel();
+
+			this->Destroy();
 		}
-		
-		this->Destroy();
 	}
 }
diff --git a/Source/Nakatomi/NakatomiLevelManager.cpp b/Source/Nakatomi/NakatomiLevelManager.cpp
index 41a8400..afafc0a 100644
--- a/Source/Nakatomi/NakatomiLevelManager.cpp
+++ b/Source/Nakatomi/NakatomiLevelManager.cpp
@@ -29,10 +29,20 @@ void UNakatomiLevelManager::LoadNextLevel()
 
 void UNakatomiLevelManager::IncrementInitialLevelKeys()
 {
-	LevelKeys++;
+	InitialLevelKeys++;
 }
 
 void UNakatomiLevelManager::IncrementCollectedLevelKeys()
 {
 	CollectedLevelKeys++;
 }
+
+int UNakatomiLevelManager::GetInitialLevelKeysCount()
+{
+	return InitialLevelKeys;
+}
+
+int UNakatomiLevelManager::GetCollectedLevelKeysCount()
+{
+	return CollectedLevelKeys
+}
diff --git a/Source/Nakatomi/NakatomiLevelManager.h b/Source/Nakatomi/NakatomiLevelManager.h
index 7fa4493..db14fde 100644
--- a/Source/Nakatomi/NakatomiLevelManager.h
+++ b/Source/Nakatomi/NakatomiLevelManager.h
@@ -19,7 +19,7 @@ private:
 	UPROPERTY(EditDefaultsOnly, Meta = (AllowPrivateAccess = "true"))
 	TSoftObjectPtr<UWorld> NextLevel;
 
-	int LevelKeys = 0;
+	int InitialLevelKeys = 0;
 
 	int CollectedLevelKeys = 0;
 	
@@ -32,6 +32,12 @@ public:
 
 	UFUNCTION()
 	void IncrementCollectedLevelKeys();
+
+	UFUNCTION()
+	int GetInitialLevelKeysCount();
+
+	UFUNCTION()
+	int GetCollectedLevelKeysCount();
 	
 private: