more stuff

scripts/Base.cs

@@ -2,11 +2,13 @@ using System;
 using Godot;
 using NodeWar;
 using NodeWar.Scripts;
+using NodeWar.scripts.components;
 
 public partial class Base : Area2D
 {
 	private ProgressBar _progressBar;
-	private ProgressBar _healthBar;
+	public HealthComponent HealthComponent;
+
 	private Node2D _selection;
 	private Node2D _gfx;
 
@@ -16,12 +18,6 @@ public partial class Base : Area2D
 	[Export]
 	public Faction Faction = Faction.Neutral;
 
-	[Export]
-	public float Health { get; set; } = 50;
-
-	[Export]
-	public float MaxHealth { get; set; } = 50;
-
 	private float _buildSpeed = 28;
 	private float _buildProgress = 0;
 	private float _maxBuildProgress = 100;
@@ -34,15 +30,15 @@ public partial class Base : Area2D
 		MouseEntered += OnMouseEntered;
 		MouseExited += OnMouseExited;
 
-		_healthBar = GetNode<ProgressBar>("HealthBar");
+		HealthComponent = GetNode<HealthComponent>("HealthComponent");
 		_progressBar = GetNode<ProgressBar>("ProgressBar");
 		_selection = GetNode<Node2D>("Selection");
 		_gfx = GetNode<Node2D>("Gfx");
 
 		_selection.Visible = false;
 		_progressBar.MaxValue = _maxBuildProgress;
-		_healthBar.MaxValue = MaxHealth;
-		_healthBar.Value = Health;
+		HealthComponent.MaxHealth = 100;
+		HealthComponent.Health = 100;
 
 		UpdateColor();
 	}
@@ -59,6 +55,7 @@ public partial class Base : Area2D
 			var pip = _pipScene.Instantiate<Pip>();
 
 			GetParent().AddChild(pip);
+			pip.Faction = Faction;
 			pip.GlobalPosition = GlobalPosition;
 			pip.Target = GetTree().GetFirstNodeInGroup("enemyBase") as Base;
 		}
@@ -88,7 +85,6 @@ public partial class Base : Area2D
 	private void UpdateProgressBars()
 	{
 		_progressBar.Value = _buildProgress;
-		_healthBar.Value = Health;
 	}
 
 	private void OnMouseExited()

scripts/Pip.cs

@@ -1,3 +1,4 @@
+using System;
 using Godot;
 
 namespace NodeWar.Scripts;
@@ -13,8 +14,20 @@ public partial class Pip : Area2D
 	[Export]
 	public float Speed { get; set; } = 100;
 
+	private Sprite2D _gfx;
+
 	public override void _Ready()
 	{
+		_gfx = GetNode<Sprite2D>("Gfx");
+
+		_gfx.Modulate = Faction switch
+		{
+			Faction.Neutral => Colors.Gray,
+			Faction.Player => Colors.DarkGreen,
+			Faction.Computer => Colors.DarkRed,
+			_ => throw new ArgumentOutOfRangeException(),
+		};
+
 		AreaEntered += OnAreaEntered;
 	}
 
@@ -31,7 +44,7 @@ public partial class Pip : Area2D
 	{
 		if (body is Base { Faction: Faction.Computer } enteredBase)
 		{
-			enteredBase.Health -= 1;
+			enteredBase.HealthComponent.TakeDamage(1);
 			QueueFree();
 		}
 	}

scripts/components/HealthComponent.cs

@@ -0,0 +1,60 @@
+using System.Threading.Tasks;
+using Godot;
+
+namespace NodeWar.scripts.components;
+
+public partial class HealthComponent : ProgressBar
+{
+	[Export]
+	public Sprite2D Gfx { get; set; }
+
+	[Export]
+	public float Health { get; set; } = 100;
+
+	[Export]
+	public float MaxHealth { get; set; } = 100;
+
+	[Signal]
+	public delegate float HealthChangedEventHandler(float oldHealth, float newHealth);
+
+	public void TakeDamage(float damage)
+	{
+		Health -= damage;
+		EmitSignal(SignalName.HealthChanged, Health + damage, Health);
+
+		if (Health <= 0)
+		{
+			Die();
+			return;
+		}
+
+		if (Gfx != null)
+		{
+			var originalColor = Gfx.Modulate;
+
+			Gfx.Modulate = new Color(10, 10, 10);
+
+			GetTree().CreateTimer(0.1f).Timeout += () =>
+			{
+				Gfx.Modulate = originalColor;
+			};
+		}
+	}
+
+	public void Die()
+	{
+		GD.Print("I am dying!");
+		GetParent().QueueFree();
+	}
+
+	public override void _Ready()
+	{
+		Value = Health;
+		MaxValue = MaxHealth;
+	}
+
+	public override void _Process(double delta)
+	{
+		Value = Health;
+	}
+}

scripts/components/HealthComponent.cs.uid

@@ -0,0 +1 @@
+uid://b26j7cq2pgk6q

scripts/components/health_component.tscn

@@ -0,0 +1,29 @@
+[gd_scene format=3 uid="uid://dn6jqa3wj40ir"]
+
+[ext_resource type="Script" uid="uid://b26j7cq2pgk6q" path="res://scripts/components/HealthComponent.cs" id="1_kkm8u"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_21bcp"]
+bg_color = Color(0.4249828, 0.6869066, 0, 1)
+corner_radius_top_left = 6
+corner_radius_top_right = 6
+corner_radius_bottom_right = 6
+corner_radius_bottom_left = 6
+
+[node name="HealthComponent" type="ProgressBar" unique_id=1360050278]
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -13.5
+offset_top = -64.0
+offset_right = 13.5
+offset_bottom = 64.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_styles/fill = SubResource("StyleBoxFlat_21bcp")
+max_value = 10.0
+value = 5.36
+fill_mode = 3
+show_percentage = false
+script = ExtResource("1_kkm8u")