diff --git a/battle/BattleScene.tscn b/battle/BattleScene.tscn index ccfb796..b9ba702 100644 --- a/battle/BattleScene.tscn +++ b/battle/BattleScene.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://dy54m7dvjgqta"] +[gd_scene load_steps=5 format=3 uid="uid://dy54m7dvjgqta"] [ext_resource type="PackedScene" uid="uid://d1xyb0hdf1yeh" path="res://battle/fighter/BattleFighterScene.tscn" id="1_abr1f"] [ext_resource type="Script" uid="uid://dihfp05x6pktn" path="res://battle/BattleScene.gd" id="1_acaen"] [ext_resource type="PackedScene" uid="uid://ktmvnapibv2q" path="res://battle/ui/ActionBox.tscn" id="2_c3ndu"] +[ext_resource type="PackedScene" uid="uid://c4knowtushjly" path="res://battle/ui/BattleCursor.tscn" id="3_7s6t6"] [node name="BattleScene" type="Node3D" node_paths=PackedStringArray("actionBox")] script = ExtResource("1_acaen") @@ -26,6 +27,9 @@ offset_right = 40.0 offset_bottom = 12.0 text = "Battle" +[node name="BattleCursor" parent="UI" instance=ExtResource("3_7s6t6")] +layout_mode = 0 + [node name="Fighters" type="Node" parent="."] [node name="LeftTopBack" parent="Fighters" instance=ExtResource("1_abr1f")] diff --git a/battle/action/BattleAction.gd b/battle/action/BattleAction.gd index abafa42..8319229 100644 --- a/battle/action/BattleAction.gd +++ b/battle/action/BattleAction.gd @@ -18,5 +18,5 @@ func perform(params:Dictionary) -> void: assert(params.has("targets")) pass -func canFighterUse(fighter:BattleFighter) -> bool: +func canFighterUse(_fighter:BattleFighter) -> bool: return true \ No newline at end of file diff --git a/battle/fighter/BattleFighter.gd b/battle/fighter/BattleFighter.gd index 0e8be42..a282a2e 100644 --- a/battle/fighter/BattleFighter.gd +++ b/battle/fighter/BattleFighter.gd @@ -114,4 +114,4 @@ func canMakeDecision() -> bool: return status != Status.DEAD func canPlayerMakeDecision() -> bool: - return isPlayerControlled() && canMakeDecision() \ No newline at end of file + return isPlayerControlled() && canMakeDecision() diff --git a/battle/ui/BattleCursor.gd b/battle/ui/BattleCursor.gd new file mode 100644 index 0000000..1039337 --- /dev/null +++ b/battle/ui/BattleCursor.gd @@ -0,0 +1,11 @@ +class_name BattleCursor extends Control + +@export var cursor:PackedScene + +func setCursors(targets:Array[BattleSingleton.BattlePosition]) -> void: + clearCursors() + +func clearCursors() -> void: + # Clear all children (cursors). + for child in get_children(): + child.queue_free() \ No newline at end of file diff --git a/battle/ui/BattleCursor.gd.uid b/battle/ui/BattleCursor.gd.uid new file mode 100644 index 0000000..e3ed227 --- /dev/null +++ b/battle/ui/BattleCursor.gd.uid @@ -0,0 +1 @@ +uid://cwnf5vqn3nb57 diff --git a/battle/ui/BattleCursor.tscn b/battle/ui/BattleCursor.tscn new file mode 100644 index 0000000..0f986be --- /dev/null +++ b/battle/ui/BattleCursor.tscn @@ -0,0 +1,12 @@ +[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 +anchors_preset = 0 +offset_right = 11.0 +offset_bottom = 11.0 +script = ExtResource("1_wsiei") +cursor = ExtResource("2_6yv4v") diff --git a/battle/ui/BattleCursorCursor.tscn b/battle/ui/BattleCursorCursor.tscn new file mode 100644 index 0000000..2f5013f --- /dev/null +++ b/battle/ui/BattleCursorCursor.tscn @@ -0,0 +1,6 @@ +[gd_scene format=3 uid="uid://br2rs8skcn72l"] + +[node name="Control" type="ColorRect"] +offset_right = 8.0 +offset_bottom = 8.0 +color = Color(1, 0.478431, 1, 1)