Cursor work

battle/ui/BattleCursor.gd

@@ -1,23 +0,0 @@
-class_name BattleCursor extends Control
-
-@export var cursor:PackedScene
-
-func setCursors(battleScene:BattleScene, targets:Array[BattleSingleton.BattlePosition]) -> void:
-  clearCursors()
-
-  for target in targets:
-    var fighterScene = battleScene.getFighterSceneAtPosition(target)
-    if fighterScene == null:
-      continue
-
-    var cursorInstance = cursor.instantiate()
-    add_child(cursorInstance)
-
-    # Convert world position to screen space
-    var screenPos = battleScene.get_viewport().get_camera_3d().unproject_position(fighterScene.global_transform.origin)
-    cursorInstance.position = screenPos
-
-func clearCursors() -> void:
-  # Clear all children (cursors).
-  for child in get_children():
-    child.queue_free()

battle/ui/BattleCursor.gd.uid

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

battle/ui/BattleCursor.tscn

@@ -1,11 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://c4knowtushjly"]
-
-[ext_resource type="Script" uid="uid://cwnf5vqn3nb57" path="res://battle/ui/BattleCursor.gd" id="1_wsiei"]
-[ext_resource type="PackedScene" uid="uid://br2rs8skcn72l" path="res://battle/ui/BattleCursorCursor.tscn" id="2_6yv4v"]
-
-[node name="BattleCursor" type="Control"]
-layout_mode = 3
-size_flags_horizontal = 0
-size_flags_vertical = 0
-script = ExtResource("1_wsiei")
-cursor = ExtResource("2_6yv4v")

battle/ui/action/ActionBox.gd

@@ -33,8 +33,6 @@ func getAction(fighter:BattleFighter) -> Action:
   btnAttack.disabled = fighter.movePrimary == null || !fighter.movePrimary.canFighterUse(fighter)
   btnMagic.disabled = fighter.movesMagical.size() == 0
   btnItem.disabled = false # TODO: check if items available?
-  
-  # TODO: Update cursor position to first enabled button
 
   var act = await action
   return act

battle/ui/action/ActionBox.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://ktmvnapibv2q"]
 
-[ext_resource type="Script" uid="uid://27274005hbgh" path="res://battle/ui/ActionBox.gd" id="1_w5s71"]
+[ext_resource type="Script" uid="uid://27274005hbgh" path="res://battle/ui/action/ActionBox.gd" id="1_w5s71"]
 
 [node name="ActionBox" type="GridContainer" node_paths=PackedStringArray("btnAttack", "btnMagic", "btnItem", "btnBack")]
 anchors_preset = 3

battle/ui/action/BattleCursorIcon.gd

@@ -0,0 +1,56 @@
+class_name BattleCursorIcon extends ColorRect
+
+# How often to blink in milliseconds.
+const BLINK_RATE := 100
+
+enum Mode {
+  INACTIVE,
+  ACTIVE,
+  BLINKING
+}
+
+@export var battlePosition:BattleSingleton.BattlePosition = BattleSingleton.BattlePosition.LEFT_TOP_BACK:
+  get():
+    return battlePosition
+
+  set(value):
+    battlePosition = value
+    _updatePosition()
+
+@export var mode:Mode = Mode.INACTIVE
+
+func _ready() -> void:
+  _updatePosition()
+
+func _process(delta: float) -> void:
+  if mode == Mode.INACTIVE:
+    self.visible = false
+    return
+  elif mode == Mode.ACTIVE:
+    self.visible = true
+  elif mode == Mode.BLINKING:
+    self.visible = Time.get_ticks_msec() % (BLINK_RATE * 2) < BLINK_RATE
+
+func _updatePosition() -> void:
+  # Walk up the tree until BattleScene is found.
+  var battleScene:BattleScene = null
+  var currentNode:Node = self
+  while currentNode != null:
+    if currentNode is BattleScene:
+      battleScene = currentNode
+      break
+    currentNode = currentNode.get_parent()
+  
+  if battleScene == null:
+    push_error("BattleCursorIcon could not find BattleScene in parent nodes.")
+    return
+
+  var targetFighter:BattleFighterScene = battleScene.getFighterSceneAtPosition(battlePosition)
+  if targetFighter == null:
+    push_error("No BattleFighter found at battlePosition %s" % str(battlePosition))
+    return
+
+  # Convert the target fighter's global position to screen space position.
+  var viewport:Viewport = get_viewport()
+  var screenPos:Vector2 = viewport.get_camera_3d().unproject_position(targetFighter.global_transform.origin)
+  self.position = screenPos

battle/ui/action/BattleCursorIcon.gd.uid

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

battle/ui/action/BattleCursorIcon.tscn

@@ -1,7 +1,9 @@
-[gd_scene format=3 uid="uid://br2rs8skcn72l"]
+[gd_scene load_steps=2 format=3 uid="uid://br2rs8skcn72l"]
+
+[ext_resource type="Script" uid="uid://c2lye3hasxnkj" path="res://battle/ui/action/BattleCursorIcon.gd" id="1_cpfvx"]
 
 [node name="Control" type="ColorRect"]
-anchors_preset = 8
+anchors_preset = -1
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
@@ -13,3 +15,4 @@ offset_bottom = 4.0
 grow_horizontal = 2
 grow_vertical = 2
 color = Color(1, 0.478431, 1, 1)
+script = ExtResource("1_cpfvx")