Added NPC logic

PLAN.md

@@ -1,4 +1,4 @@
-# Development Plan
+  # Development Plan
 
 Working document for Naked Desire implementation. Tracks current state vs. the GDD (README.md) and the phased roadmap. Update this file as state changes — code is the source of truth, this file is the navigation chart.
 

Source/NakedDesire/NPC/NPC.cpp

@@ -2,8 +2,12 @@
 
 
 #include "NPC.h"
+
+#include "BrainComponent.h"
 #include "NPCTypeDefinition.h"
 #include "NPCAIController.h"
+#include "NPCTargetLocation.h"
+#include "BehaviorTree/BlackboardComponent.h"
 #include "Components/SkeletalMeshComponent.h"
 #include "GameFramework/CharacterMovementComponent.h"
 
@@ -58,15 +62,26 @@ void ANPC::ActivateFromPool(const FVector& Location, const FRotator& Rotation)
 		Move->SetComponentTickEnabled(true);
 		Move->SetMovementMode(MOVE_Walking);
 	}
-
-	OnActivatedFromPool();
+	
+	if (ANPCAIController* NPCController = Cast<ANPCAIController>(GetController()))
+	{
+		NPCController->RunCustomBehaviorTree();
+		NPCController->GetBlackboardComponent()->SetValueAsBool(TEXT("bHasReacted"), false);
+	}
 }
 
 void ANPC::DeactivateToPool()
 {
 	// Drop any active observation so a pooled-out NPC stops contributing to the player's embarrassment.
 	if (ANPCAIController* NPCController = Cast<ANPCAIController>(GetController()))
+	{
 		NPCController->ClearObservation();
+		if (UBrainComponent* Brain = NPCController->GetBrainComponent())
+		{
+			Brain->StopLogic(TEXT("Moved to pool"));
+		}
+		NPCController->ClearFocus(EAIFocusPriority::Default);
+	}
 
 	if (UCharacterMovementComponent* Move = GetCharacterMovement())
 	{
@@ -74,9 +89,12 @@ void ANPC::DeactivateToPool()
 		Move->DisableMovement();
 		Move->SetComponentTickEnabled(false);
 	}
+	
+	if (TargetLocationActor)
+	{
+		TargetLocationActor->Release(this);
+	}
 
 	SetActorHiddenInGame(true);
 	SetActorEnableCollision(false);
-
-	OnDeactivatedToPool();
 }

Source/NakedDesire/NPC/NPC.h

@@ -7,6 +7,7 @@
 #include "NPCType.h"
 #include "NPC.generated.h"
 
+class ANPCTargetLocation;
 class UNPCTypeDefinition;
 
 UCLASS()
@@ -44,9 +45,6 @@ public:
 	void DeactivateToPool();
 
 protected:
-	UFUNCTION(BlueprintImplementableEvent, Category = "NPC")
-	void OnActivatedFromPool();
-
-	UFUNCTION(BlueprintImplementableEvent, Category = "NPC")
-	void OnDeactivatedToPool();
+	UPROPERTY(BlueprintReadWrite, Category = "NPC")
+	TObjectPtr<ANPCTargetLocation> TargetLocationActor;
 };

Source/NakedDesire/NPC/NPCAIController.cpp

@@ -45,6 +45,11 @@ void ANPCAIController::ClearObservation()
 	}
 }
 
+void ANPCAIController::RunCustomBehaviorTree()
+{
+	RunBehaviorTree(BehaviorTreeAsset);
+}
+
 float ANPCAIController::GetObservationWeight() const
 {
 	if (const ANPC* NPC = Cast<ANPC>(GetPawn()))

Source/NakedDesire/NPC/NPCAIController.h

@@ -27,6 +27,7 @@ public:
 
 	// Clears any active observation of the player (used on un-possess and when the NPC is pooled out).
 	void ClearObservation();
+	void RunCustomBehaviorTree();
 
 protected:
 	UFUNCTION()

Source/NakedDesire/NPC/NPCTargetLocation.cpp

@@ -0,0 +1,29 @@
+// © 2025 Naked People Team. All Rights Reserved.
+
+
+#include "NPCTargetLocation.h"
+#include "NPC.h"
+
+
+ANPCTargetLocation::ANPCTargetLocation()
+{
+	PrimaryActorTick.bCanEverTick = false;
+}
+
+bool ANPCTargetLocation::TryClaim(ANPC* InClaimant)
+{
+	if (Claimant.IsValid() && Claimant.Get() != InClaimant)
+		return false;
+	
+	Claimant = InClaimant;
+	return true;
+}
+
+void ANPCTargetLocation::Release(ANPC* Requester)
+{
+	if (!Claimant.IsValid() || Claimant.Get() != Requester)
+		return;
+	
+	Claimant = nullptr;
+}
+

Source/NakedDesire/NPC/NPCTargetLocation.h

@@ -0,0 +1,31 @@
+// © 2025 Naked People Team. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
+#include "NPCTargetLocation.generated.h"
+
+class ANPC;
+
+UCLASS()
+class NAKEDDESIRE_API ANPCTargetLocation : public AActor
+{
+	GENERATED_BODY()
+
+public:
+	ANPCTargetLocation();
+	
+	UFUNCTION(BlueprintCallable)
+	bool TryClaim(ANPC* InClaimant);
+	
+	UFUNCTION(BlueprintPure)
+	bool IsClaimed() const { return Claimant.IsValid(); }
+
+	UFUNCTION(BlueprintCallable)
+	void Release(ANPC* Requester);
+
+private:
+	UPROPERTY()
+	TWeakObjectPtr<ANPC> Claimant = nullptr;
+};