diff --git a/scripts/components/CollectableComponent.cs b/scripts/components/CollectableComponent.cs index 378cbc9..2a925af 100644 --- a/scripts/components/CollectableComponent.cs +++ b/scripts/components/CollectableComponent.cs @@ -9,14 +9,20 @@ namespace Mr.BrickAdventures.scripts.components; public partial class CollectableComponent : Node { private bool _hasFadeAway = false; - + [Export] public Area2D Area2D { get; set; } [Export] public CollisionShape2D CollisionShape { get; set; } [Export] public CollectableResource Data { get; set; } - [Export] public AudioStreamPlayer2D Sfx {get; set; } - + [Export] public AudioStreamPlayer2D Sfx { get; set; } + [Signal] public delegate void CollectedEventHandler(float amount, CollectableType type, Node2D body); - + + /// + /// Delegate for checking if collection should be allowed. + /// Return false to prevent collection. + /// + public Func CanCollect { get; set; } + private FloatingTextManager _floatingTextManager; public override void _Ready() @@ -25,10 +31,10 @@ public partial class CollectableComponent : Node Area2D.BodyEntered += OnArea2DBodyEntered; else GD.PushError("Collectable node missing Area2D node."); - + if (Owner.HasNode("FadeAwayComponent")) _hasFadeAway = true; - + _floatingTextManager = GetNode("/root/FloatingTextManager"); } @@ -38,6 +44,9 @@ public partial class CollectableComponent : Node { if (!body.HasNode("CanPickUpComponent")) return; + // Allow components to veto collection (e.g., full health for potions) + if (CanCollect != null && !CanCollect(body)) return; + if (Owner is Node2D ownerNode) { switch (Data.Type) @@ -53,13 +62,13 @@ public partial class CollectableComponent : Node break; } } - + EmitSignalCollected(Data.Amount, Data.Type, body); CollisionShape?.CallDeferred("set_disabled", true); Sfx?.Play(); if (_hasFadeAway) return; - + if (Sfx != null) await ToSignal(Sfx, AudioStreamPlayer2D.SignalName.Finished); Owner.QueueFree(); diff --git a/scripts/components/HealComponent.cs b/scripts/components/HealComponent.cs index fbc977a..db021b2 100644 --- a/scripts/components/HealComponent.cs +++ b/scripts/components/HealComponent.cs @@ -16,16 +16,27 @@ public partial class HealComponent : Node GD.PushError("HealComponent: Collectable is not set."); return; } - + + // Register check to prevent collecting when at full health + Collectable.CanCollect = CanCollectHealth; Collectable.Collected += OnCollected; } + private bool CanCollectHealth(Node2D body) + { + var healthComponent = body.GetNodeOrNull("HealthComponent"); + if (healthComponent == null) return true; // Allow collection if no health component + + // Prevent collection if already at full health + return healthComponent.Health < healthComponent.MaxHealth; + } + private void OnCollected(float amount, CollectableType type, Node2D body) { if (type != CollectableType.Health) return; if (Collectable == null) return; - + var healthComponent = body.GetNodeOrNull("HealthComponent"); if (healthComponent == null) return; @@ -34,14 +45,14 @@ public partial class HealComponent : Node { PlayHealFx(); } - + Owner.QueueFree(); } private void PlayHealFx() { if (HealFx == null) return; - + HealFx.Restart(); HealFx.Emitting = true; }