next commit

1 files changed, 42 insertions, 12 deletions

diff --git a/stage/stage.tscn b/stage/stage.tscn
index adc5173..7a2c83a 100644
--- a/stage/stage.tscn
+++ b/stage/stage.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=4 uid="uid://btphwdkbxijnr"]
+[gd_scene load_steps=6 format=4 uid="uid://btphwdkbxijnr"]
 
 [ext_resource type="TileSet" uid="uid://dl0umywqpu3m8" path="res://stage/assets/tilemap.tres" id="1_0isyp"]
-[ext_resource type="Script" path="res://stage/stage.gd" id="1_ccrgc"]
+[ext_resource type="Script" uid="uid://do2ktbmxsqjvj" path="res://stage/stage.gd" id="1_ccrgc"]
 [ext_resource type="PackedScene" uid="uid://dfhnxccd41wo0" path="res://stage/grid_selector/grid_selector.tscn" id="3_e6w2r"]
-[ext_resource type="Script" path="res://stage/hud.gd" id="4_cu7bb"]
+[ext_resource type="Script" uid="uid://dp6j6hjfrx2l4" path="res://stage/hud_unit.gd" id="4_e13a1"]
+[ext_resource type="Script" uid="uid://dydykm70ex0q0" path="res://stage/hud_main.gd" id="5_x0v28"]
 
 [node name="Stage" type="Node2D"]
 y_sort_enabled = true
@@ -19,7 +20,7 @@ tile_set = ExtResource("1_0isyp")
 y_sort_enabled = true
 texture_filter = 1
 position = Vector2(0, -4)
-tile_map_data = PackedByteArray("AAANAP//AQABAAYAAADx////AQADAAYAAAA=")
+tile_map_data = PackedByteArray("AAAOAP//AQABAAYAAADw////AQADAAYAAAA=")
 tile_set = ExtResource("1_0isyp")
 
 [node name="Camera2D" type="Camera2D" parent="."]
@@ -29,15 +30,18 @@ unique_name_in_owner = true
 stage = NodePath("..")
 ground_map = NodePath("../Ground")
 floor_map = NodePath("../Floor")
-selection_collision_mask = 2
 current_team = "1"
+selection_collision_mask = 2
 placement_tile_source_id = 1
 placement_tile_atlas_coordinates = Vector2i(1, 6)
+range_select_current_range = 2
+range_select_collision_mask = 2
 
-[node name="HUD" type="CanvasLayer" parent="."]
-script = ExtResource("4_cu7bb")
+[node name="HUDUnit" type="CanvasLayer" parent="."]
+visible = false
+script = ExtResource("4_e13a1")
 
-[node name="PanelContainer" type="PanelContainer" parent="HUD"]
+[node name="PanelContainer" type="PanelContainer" parent="HUDUnit"]
 anchors_preset = 1
 anchor_left = 1.0
 anchor_right = 1.0
@@ -45,18 +49,44 @@ offset_left = -40.0
 offset_bottom = 40.0
 grow_horizontal = 0
 
-[node name="VBoxContainer" type="VBoxContainer" parent="HUD/PanelContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="HUDUnit/PanelContainer"]
 layout_mode = 2
 theme_override_constants/separation = 0
 
-[node name="Button" type="Button" parent="HUD/PanelContainer/VBoxContainer"]
+[node name="Button" type="Button" parent="HUDUnit/PanelContainer/VBoxContainer"]
 layout_mode = 2
 text = "Move"
 
-[node name="Button2" type="Button" parent="HUD/PanelContainer/VBoxContainer"]
+[node name="Button2" type="Button" parent="HUDUnit/PanelContainer/VBoxContainer"]
+layout_mode = 2
+text = "Attack"
+
+[node name="Button3" type="Button" parent="HUDUnit/PanelContainer/VBoxContainer"]
 layout_mode = 2
 text = "Status"
 
+[node name="HUDMain" type="CanvasLayer" parent="."]
+script = ExtResource("5_x0v28")
+
+[node name="PanelContainer" type="PanelContainer" parent="HUDMain"]
+anchors_preset = 1
+anchor_left = 1.0
+anchor_right = 1.0
+offset_left = -40.0
+offset_bottom = 31.0
+grow_horizontal = 0
+
+[node name="VBoxContainer" type="VBoxContainer" parent="HUDMain/PanelContainer"]
+layout_mode = 2
+theme_override_constants/separation = 0
+
+[node name="Button" type="Button" parent="HUDMain/PanelContainer/VBoxContainer"]
+layout_mode = 2
+text = "Roll"
+
 [connection signal="move_mode_confirmed" from="GridSelector" to="." method="_on_grid_selector_move_mode_confirmed"]
 [connection signal="placed_tiles" from="GridSelector" to="." method="_on_grid_selector_placed_tiles"]
-[connection signal="pressed" from="HUD/PanelContainer/VBoxContainer/Button" to="HUD" method="_on_button_pressed"]
+[connection signal="range_select_confirmed" from="GridSelector" to="." method="_on_grid_selector_range_select_confirmed"]
+[connection signal="pressed" from="HUDUnit/PanelContainer/VBoxContainer/Button" to="HUDUnit" method="_on_button_pressed"]
+[connection signal="pressed" from="HUDUnit/PanelContainer/VBoxContainer/Button2" to="HUDUnit" method="_on_button_2_pressed"]
+[connection signal="pressed" from="HUDMain/PanelContainer/VBoxContainer/Button" to="HUDMain" method="_on_button_pressed"]