Updated observation logic

Source/NakedDesire/Stats/StatsManager.cpp

@@ -3,6 +3,16 @@
 
 #include "StatsManager.h"
 
+#include "NakedDesire/Player/NakedDesireCharacter.h"
+
+namespace
+{
+	// Max raw exposure one observer can read at once: Boobs + Ass + Genitals fully exposed, equal
+	// weights (GDD §7.1 — per-part weighting is uniform for now). Normalizes per-observer exposure
+	// to [0,1] so EmbarrassmentGainRate reads as "gain/sec at full exposure, single close observer".
+	constexpr float MaxObservedExposure = 3.0f;
+}
+
 UStatsManager::UStatsManager()
 {
 	PrimaryComponentTick.bCanEverTick = true;
@@ -12,7 +22,9 @@ UStatsManager::UStatsManager()
 void UStatsManager::BeginPlay()
 {
 	Super::BeginPlay();
-	
+
+	OwnerCharacter = Cast<ANakedDesireCharacter>(GetOwner());
+
 	EmbarrassmentUpdate.Broadcast(Embarrassment, MaxEmbarrassment);
 	StaminaUpdate.Broadcast(Stamina, MaxStamina);
 	EnergyUpdate.Broadcast(Energy, MaxEnergy);
@@ -23,21 +35,63 @@ void UStatsManager::TickComponent(float DeltaTime, enum ELevelTick TickType,
 {
 	DecreaseEnergy(0.9f);
 
-	if (ObserverCount > 0)
-	{
-		// TODO (#05): replace 0.0f with ClothingManager->GetEffectiveCoverage() when that lands.
-		constexpr float CoverageWeight = 0.0f;
-		IncreaseEmbarrassment(EmbarrassmentGainRate * (1.0f - CoverageWeight) * DeltaTime);
-	}
+	const float ExposureRate = ComputeObservedExposureRate();
+	if (ExposureRate > 0.0f)
+		IncreaseEmbarrassment(EmbarrassmentGainRate * ExposureRate * DeltaTime);
 	else
-	{
 		DecreaseEmbarrassment(EmbarrassmentDecayRate * DeltaTime);
-	}
 }
 
-void UStatsManager::SetObserved(const bool bObserved, const float CoverageWeight)
+float UStatsManager::ComputeObservedExposureRate()
 {
-	ObserverCount = FMath::Max(0, bObserved ? ObserverCount + 1 : ObserverCount - 1);
+	if (!OwnerCharacter)
+		return 0.0f;
+
+	// Sum each active observer's normalized exposure, re-traced live so redressing / exposing
+	// updates the rate immediately even while the observer set is unchanged.
+	float SumNormalizedExposure = 0.0f;
+	int32 ActiveObservers = 0;
+
+	for (int32 i = Observers.Num() - 1; i >= 0; --i)
+	{
+		AActor* Observer = Observers[i].Get();
+		if (!Observer)
+		{
+			Observers.RemoveAtSwap(i);
+			continue;
+		}
+
+		const float Exposure = OwnerCharacter->GetObservedExposureFrom(Observer->GetActorLocation(), Observer);
+		if (Exposure > 0.0f)
+		{
+			SumNormalizedExposure += Exposure / MaxObservedExposure;
+			++ActiveObservers;
+		}
+	}
+
+	if (ActiveObservers == 0)
+		return 0.0f;
+
+	// Mean per-observer exposure, then a saturating crowd multiplier (diminishing returns).
+	const float MeanExposure = SumNormalizedExposure / ActiveObservers;
+	const float DensityMultiplier = 1.0f + ObserverDensityScale * FMath::Loge(static_cast<float>(ActiveObservers));
+	return MeanExposure * DensityMultiplier;
+}
+
+void UStatsManager::Init(UClothingManager* InClothingManager)
+{
+	ClothingManager = InClothingManager;
+}
+
+void UStatsManager::SetObserved(const bool bObserved, AActor* Observer)
+{
+	if (!Observer)
+		return;
+
+	if (bObserved)
+		Observers.AddUnique(Observer);
+	else
+		Observers.Remove(Observer);
 }
 
 void UStatsManager::IncreaseEmbarrassment(const float Amount)

Source/NakedDesire/Stats/StatsManager.h

@@ -6,6 +6,8 @@
 #include "Components/ActorComponent.h"
 #include "StatsManager.generated.h"
 
+class UClothingManager;
+class ANakedDesireCharacter;
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FAttributeUpdateSignature, float, CurrentValue, float, MaxValue);
 
 
@@ -19,8 +21,6 @@ class NAKEDDESIRE_API UStatsManager : public UActorComponent
 	float Energy = 1000.0f;
 	float MaxEnergy = 1000.0f;
 
-	int32 ObserverCount = 0;
-
 public:
 	UStatsManager();
 
@@ -30,17 +30,22 @@ public:
 	UPROPERTY(EditDefaultsOnly, Category = "Embarrassment")
 	float EmbarrassmentDecayRate = 1.0f;
 
-protected:
+	// Crowd scaling: N active observers multiply embarrassment gain by 1 + ObserverDensityScale * ln(N).
+	// A single observer (N=1) is the x1 baseline; extra observers add with diminishing returns.
+	UPROPERTY(EditDefaultsOnly, Category = "Embarrassment")
+	float ObserverDensityScale = 0.5f;
+
 	virtual void BeginPlay() override;
 	virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+	void Init(UClothingManager* InClothingManager);
 
-public:
 	float Stamina = 100.0f;
 	float MaxStamina = 100.0f;
 
-	// Called by NPCAIController when sight is gained or lost.
-	// CoverageWeight: fraction of body covered [0..1]; pass 0.0f until #05 (GetEffectiveCoverage) lands.
-	void SetObserved(bool bObserved, float CoverageWeight = 0.0f);
+	// Called by NPCAIController when an NPC gains or loses sight of the player. Observer is the
+	// observing pawn; its live location is re-traced each tick to weight embarrassment by the
+	// body parts that observer can actually see (GDD §7.1).
+	void SetObserved(bool bObserved, AActor* Observer);
 
 	UFUNCTION(BlueprintCallable)
 	void IncreaseEmbarrassment(float Amount);
@@ -58,4 +63,19 @@ public:
 	
 	UPROPERTY(BlueprintAssignable)
 	FAttributeUpdateSignature EnergyUpdate;
+	
+private:
+	// Re-traces every current observer against the player's live coverage and returns the
+	// normalized embarrassment-gain factor (0 when nothing revealing is currently observed).
+	float ComputeObservedExposureRate();
+
+	UPROPERTY()
+	TObjectPtr<UClothingManager> ClothingManager;
+
+	UPROPERTY()
+	TObjectPtr<ANakedDesireCharacter> OwnerCharacter;
+
+	// NPCs currently perceiving the player (added/removed via SetObserved). Weak so a destroyed
+	// observer drops out without dangling; stale entries are compacted during the tick.
+	TArray<TWeakObjectPtr<AActor>> Observers;
 };