From f9a4f42821df40b451bd9a25ee7668d79ca8320d Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sun, 18 Jan 2026 11:44:34 -0600 Subject: [PATCH] idk --- battle/BattleScene.gd | 3 + battle/BattleScene.tscn | 177 +++++++++++++++++++--------------------- 2 files changed, 88 insertions(+), 92 deletions(-) diff --git a/battle/BattleScene.gd b/battle/BattleScene.gd index 1990951..a4d6cd9 100644 --- a/battle/BattleScene.gd +++ b/battle/BattleScene.gd @@ -131,6 +131,9 @@ func _getTargets(fighter:BattleFighter, move:BattleAction) -> Array[BattleFighte cursor.mode = BattleCursorIcon.Mode.ACTIVE else: cursor.mode = BattleCursorIcon.Mode.INACTIVE + + # Handle movement + # TODO: Allow movement here, wait for selection, etc. # Wait 1 second for now and select all possible targets diff --git a/battle/BattleScene.tscn b/battle/BattleScene.tscn index f90ce63..4d3145b 100644 --- a/battle/BattleScene.tscn +++ b/battle/BattleScene.tscn @@ -9,7 +9,7 @@ script = ExtResource("1_acaen") actionBox = NodePath("UI/ActionBox") battleFighterScenes = NodePath("Fighters") -cursorScenes = NodePath("UI/Cursors") +cursorScenes = NodePath("") metadata/_custom_type_script = "uid://dihfp05x6pktn" [node name="UI" type="Control" parent="."] @@ -32,10 +32,10 @@ text = "Battle" [node name="Cursors" type="Control" parent="UI"] anchors_preset = 0 offset_right = 40.0 -offset_bottom = 40.0 +offset_bottom = 44.0 [node name="LeftTopBack" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 +layout_mode = 2 anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 @@ -43,155 +43,148 @@ anchor_right = 0.0 anchor_bottom = 0.0 offset_left = 0.0 offset_top = 0.0 -offset_right = 8.0 -offset_bottom = 8.0 +offset_right = 0.0 +offset_bottom = 0.0 grow_horizontal = 1 grow_vertical = 1 [node name="LeftTopFront" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 +layout_mode = 2 anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -offset_left = 0.0 +offset_left = 4.0 offset_top = 0.0 -offset_right = 8.0 -offset_bottom = 8.0 +offset_bottom = 0.0 grow_horizontal = 1 grow_vertical = 1 battlePosition = 1 +[node name="RightTopFront" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] +layout_mode = 2 +anchors_preset = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +offset_left = 8.0 +offset_top = 0.0 +offset_right = 8.0 +offset_bottom = 0.0 +grow_horizontal = 1 +grow_vertical = 1 +battlePosition = 7 + +[node name="RightTopBack" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] +layout_mode = 2 +anchors_preset = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +offset_left = 12.0 +offset_top = 0.0 +offset_right = 12.0 +offset_bottom = 0.0 +grow_horizontal = 1 +grow_vertical = 1 +battlePosition = 6 + [node name="LeftMiddleBack" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 +layout_mode = 2 anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 -offset_bottom = 8.0 +offset_top = 4.0 +offset_right = 0.0 grow_horizontal = 1 grow_vertical = 1 battlePosition = 2 [node name="LeftMiddleFront" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 +layout_mode = 2 anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 -offset_bottom = 8.0 +offset_left = 4.0 +offset_top = 4.0 grow_horizontal = 1 grow_vertical = 1 battlePosition = 3 +[node name="RightMiddleFront" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] +layout_mode = 2 +anchors_preset = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +offset_left = 8.0 +offset_top = 4.0 +offset_right = 8.0 +grow_horizontal = 1 +grow_vertical = 1 +battlePosition = 9 + +[node name="RightMiddleBack" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] +layout_mode = 2 +anchors_preset = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +offset_left = 12.0 +offset_top = 4.0 +offset_right = 12.0 +grow_horizontal = 1 +grow_vertical = 1 +battlePosition = 8 + [node name="LeftBottomBack" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 +layout_mode = 2 anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 +offset_top = 8.0 +offset_right = 0.0 offset_bottom = 8.0 grow_horizontal = 1 grow_vertical = 1 battlePosition = 4 [node name="LeftBottomFront" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 +layout_mode = 2 anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 +offset_left = 4.0 +offset_top = 8.0 offset_bottom = 8.0 grow_horizontal = 1 grow_vertical = 1 battlePosition = 5 -[node name="RightTopFront" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 -anchors_preset = 0 -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 -offset_bottom = 8.0 -grow_horizontal = 1 -grow_vertical = 1 -battlePosition = 7 - -[node name="RightTopBack" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 -anchors_preset = 0 -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 -offset_bottom = 8.0 -grow_horizontal = 1 -grow_vertical = 1 -battlePosition = 6 - -[node name="RightMiddleFront" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 -anchors_preset = 0 -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 -offset_bottom = 8.0 -grow_horizontal = 1 -grow_vertical = 1 -battlePosition = 9 - -[node name="RightMiddleBack" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 -anchors_preset = 0 -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 -offset_bottom = 8.0 -grow_horizontal = 1 -grow_vertical = 1 -battlePosition = 8 - [node name="RightBottomFront" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 +layout_mode = 2 anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -offset_left = 0.0 -offset_top = 0.0 +offset_left = 8.0 +offset_top = 8.0 offset_right = 8.0 offset_bottom = 8.0 grow_horizontal = 1 @@ -199,15 +192,15 @@ grow_vertical = 1 battlePosition = 11 [node name="RightBottomBack" parent="UI/Cursors" instance=ExtResource("3_7s6t6")] -layout_mode = 0 +layout_mode = 2 anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 8.0 +offset_left = 12.0 +offset_top = 8.0 +offset_right = 12.0 offset_bottom = 8.0 grow_horizontal = 1 grow_vertical = 1