diff --git a/Systems/UI/Menu System/battle_menu.tscn b/Systems/UI/Menu System/battle_menu.tscn index 17ade00..7d434e6 100644 --- a/Systems/UI/Menu System/battle_menu.tscn +++ b/Systems/UI/Menu System/battle_menu.tscn @@ -20,8 +20,8 @@ anchor_right = 0.5 anchor_bottom = 0.5 offset_left = -100.0 offset_top = -86.0 -offset_right = 108.0 -offset_bottom = 184.0 +offset_right = 70.0 +offset_bottom = 145.0 grow_horizontal = 2 grow_vertical = 2 @@ -38,68 +38,80 @@ grow_horizontal = 2 text = "Battle Menu" horizontal_alignment = 1 -[node name="Attack" type="Button" parent="Panel"] +[node name="Panel" type="Panel" parent="Panel"] layout_mode = 1 -anchors_preset = 8 +anchors_preset = 5 anchor_left = 0.5 -anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -33.0 -offset_top = -85.0 -offset_right = 25.0 -offset_bottom = -54.0 +offset_left = -72.0 +offset_top = 45.0 +offset_right = 75.0 +offset_bottom = 228.0 +grow_horizontal = 2 + +[node name="Attack" type="Button" parent="Panel/Panel"] +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -35.0 +offset_top = 6.0 +offset_right = 35.0 +offset_bottom = 37.0 grow_horizontal = 2 -grow_vertical = 2 text = "Attack " -[node name="Defend" type="Button" parent="Panel"] +[node name="Tech" type="Button" parent="Panel/Panel"] layout_mode = 1 -anchors_preset = 8 +anchors_preset = 5 anchor_left = 0.5 -anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -36.5 -offset_top = -35.0 -offset_right = 28.5 -offset_bottom = -4.0 +offset_left = -35.0 +offset_top = 41.0 +offset_right = 35.0 +offset_bottom = 72.0 grow_horizontal = 2 -grow_vertical = 2 -text = "Defend" +text = "Tech" -[node name="Tech" type="Button" parent="Panel"] +[node name="Defend" type="Button" parent="Panel/Panel"] layout_mode = 1 -anchors_preset = 8 +anchors_preset = 5 anchor_left = 0.5 -anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -26.5 -offset_top = 15.0 -offset_right = 18.5 -offset_bottom = 46.0 +offset_left = -35.0 +offset_top = 76.0 +offset_right = 35.0 +offset_bottom = 107.0 grow_horizontal = 2 -grow_vertical = 2 -text = "Tech" +text = "Defend" -[node name="Item" type="Button" parent="Panel"] +[node name="Item" type="Button" parent="Panel/Panel"] layout_mode = 1 -anchors_preset = 8 +anchors_preset = 5 anchor_left = 0.5 -anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -26.0 -offset_top = 65.0 -offset_right = 18.0 -offset_bottom = 96.0 +offset_left = -35.5 +offset_top = 111.0 +offset_right = 34.5 +offset_bottom = 142.0 grow_horizontal = 2 -grow_vertical = 2 text = "Item" -[connection signal="pressed" from="Panel/Attack" to="." method="_on_attack_pressed"] -[connection signal="pressed" from="Panel/Defend" to="." method="_on_defend_pressed"] -[connection signal="pressed" from="Panel/Tech" to="." method="_on_tech_pressed"] -[connection signal="pressed" from="Panel/Item" to="." method="_on_item_pressed"] +[node name="Rest" type="Button" parent="Panel/Panel"] +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -35.5 +offset_top = 146.0 +offset_right = 34.5 +offset_bottom = 177.0 +grow_horizontal = 2 +text = "Rest" + +[connection signal="pressed" from="Panel/Panel/Attack" to="." method="_on_attack_pressed"] +[connection signal="pressed" from="Panel/Panel/Tech" to="." method="_on_tech_pressed"] +[connection signal="pressed" from="Panel/Panel/Defend" to="." method="_on_defend_pressed"] +[connection signal="pressed" from="Panel/Panel/Item" to="." method="_on_item_pressed"] +[connection signal="pressed" from="Panel/Panel/Rest" to="." method="_on_item_pressed"] diff --git a/Test Scenes/player.tscn b/Test Scenes/player.tscn index 4a642ac..74c4aca 100644 --- a/Test Scenes/player.tscn +++ b/Test Scenes/player.tscn @@ -29,18 +29,18 @@ texture = ExtResource("1_d15px") script = ExtResource("2_8b3bs") [node name="battle_menu" parent="." instance=ExtResource("3_ubnwv")] -offset_left = -64.0 -offset_top = 184.0 -offset_right = -64.0 -offset_bottom = 161.0 +offset_left = -49.0 +offset_top = 126.0 +offset_right = -49.0 +offset_bottom = 103.0 [node name="ATB" type="TextureProgressBar" parent="battle_menu"] layout_mode = 0 offset_left = -36.0 -offset_top = -68.0 +offset_top = -57.575 offset_right = 234.0 -offset_bottom = -18.0 -scale = Vector2(0.762202, 0.60304) +offset_bottom = -7.575 +scale = Vector2(0.63, 0.403) value = 50.0 texture_under = ExtResource("4_afpwe") texture_progress = ExtResource("5_5mhew") @@ -53,9 +53,9 @@ anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 offset_left = -36.0 -offset_top = 132.0 -offset_right = 44.0 -offset_bottom = 170.0 +offset_top = 93.0 +offset_right = 6.0 +offset_bottom = 119.0 grow_horizontal = 2 grow_vertical = 0 @@ -66,12 +66,13 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -103.0 -offset_top = -21.5 -offset_right = 103.0 -offset_bottom = 21.5 +offset_left = -85.0 +offset_top = -13.0 +offset_right = 85.0 +offset_bottom = 13.0 grow_horizontal = 2 grow_vertical = 2 +theme_override_font_sizes/font_size = 10 horizontal_alignment = 1 vertical_alignment = 1