update

scripts/enemy/enemy.gd

@@ -13,7 +13,6 @@ func _ready() -> void:
   spawn_position = global_position
   add_to_group("enemies")
   EventBus.entity_died.connect(_on_entity_died)
-  EventBus.damage_dealt.connect(_on_damage_dealt)
 
 func _on_entity_died(entity: Node) -> void:
   if entity == self:
@@ -27,15 +26,14 @@ func _physics_process(delta: float) -> void:
     velocity.y -= gravity * delta
   move_and_slide()
 
-func _on_damage_dealt(attacker: Node, damage_target: Node, _amount: float) -> void:
-  if damage_target == self and attacker.name == "Player":
-    _engage(attacker)
-
 func _engage(new_target: Node3D) -> void:
   if state == State.CHASE or state == State.ATTACK:
     return
   target = new_target
   state = State.CHASE
+  var aggro: Node = get_node_or_null("EnemyAggro")
+  if aggro:
+    aggro.add_aggro(new_target, 1.0)
   _alert_nearby()
 
 func _alert_nearby() -> void:

scripts/enemy/enemy_aggro.gd

@@ -0,0 +1,51 @@
+extends Node
+
+const AGGRO_DECAY := 1.0
+var aggro_table: Dictionary = {}
+
+@onready var enemy: CharacterBody3D = get_parent()
+
+func _ready() -> void:
+  EventBus.damage_dealt.connect(_on_damage_dealt)
+  EventBus.entity_died.connect(_on_entity_died)
+
+func _process(delta: float) -> void:
+  for player in aggro_table.keys():
+    aggro_table[player] -= AGGRO_DECAY * delta
+    if aggro_table[player] <= 0:
+      aggro_table.erase(player)
+  var top_target: Node = _get_top_target()
+  if top_target and top_target != enemy.target:
+    enemy.target = top_target
+    if enemy.state == enemy.State.IDLE or enemy.state == enemy.State.RETURN:
+      enemy.state = enemy.State.CHASE
+
+func _on_damage_dealt(attacker: Node, target: Node, amount: float) -> void:
+  if target != enemy:
+    return
+  var multiplier := 1.0
+  var player_class: Node = attacker.get_node_or_null("PlayerClass")
+  if player_class and player_class.current_class == 0:
+    multiplier = 2.0
+  add_aggro(attacker, amount * multiplier)
+
+func _on_entity_died(entity: Node) -> void:
+  aggro_table.erase(entity)
+
+func add_aggro(player: Node, amount: float) -> void:
+  if player in aggro_table:
+    aggro_table[player] += amount
+  else:
+    aggro_table[player] = amount
+
+func _get_top_target() -> Node:
+  var top: Node = null
+  var top_val := 0.0
+  for player in aggro_table:
+    if is_instance_valid(player) and aggro_table[player] > top_val:
+      top_val = aggro_table[player]
+      top = player
+  return top
+
+func has_aggro_on(player: Node) -> bool:
+  return _get_top_target() == player

scripts/enemy/enemy_aggro.gd.uid

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

scripts/enemy/enemy_healthbar.gd

@@ -6,17 +6,29 @@ extends Sprite3D
 @onready var border: ColorRect = $SubViewport/Border
 @onready var health: Node = get_parent().get_node("Health")
 @onready var shield: Node = get_parent().get_node("Shield")
+@onready var enemy: CharacterBody3D = get_parent()
+
+var style_normal: StyleBoxFlat
+var style_aggro: StyleBoxFlat
 
 func _ready() -> void:
   texture = viewport.get_texture()
   health_bar.max_value = health.max_health
   shield_bar.max_value = shield.max_shield
   border.visible = false
+  style_normal = health_bar.get_theme_stylebox("fill").duplicate()
+  style_aggro = style_normal.duplicate()
+  style_aggro.bg_color = Color(0.2, 0.4, 0.9, 1)
   EventBus.target_changed.connect(_on_target_changed)
 
 func _process(_delta: float) -> void:
   health_bar.value = health.current_health
   shield_bar.value = shield.current_shield
+  var player: Node = get_tree().get_first_node_in_group("player")
+  if player and enemy.target == player:
+    health_bar.add_theme_stylebox_override("fill", style_aggro)
+  else:
+    health_bar.add_theme_stylebox_override("fill", style_normal)
 
 func _on_target_changed(_player: Node, target: Node) -> void:
   border.visible = (target == get_parent())