next commitHEADmain

1 files changed, 72 insertions, 12 deletions

diff --git a/stage/stage.tscn b/stage/stage.tscn
index 0490231..f18a23a 100644
--- a/stage/stage.tscn
+++ b/stage/stage.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=4 uid="uid://btphwdkbxijnr"]
+[gd_scene load_steps=11 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" uid="uid://do2ktbmxsqjvj" path="res://stage/stage.gd" id="1_ccrgc"]
@@ -8,6 +8,7 @@
 [ext_resource type="Texture2D" uid="uid://db0v50mdroaox" path="res://stage/assets/isometric-tile.png" id="5_h4sia"]
 [ext_resource type="Script" uid="uid://dydykm70ex0q0" path="res://stage/hud_main.gd" id="5_x0v28"]
 [ext_resource type="Script" uid="uid://bm0yvrdltu4n1" path="res://stage/hud_move_mode.gd" id="6_cxybx"]
+[ext_resource type="PackedScene" uid="uid://dqk3l801walv" path="res://stage/player_unit.tscn" id="6_h4sia"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_fwirk"]
 shader = ExtResource("4_u7g2e")
@@ -32,28 +33,48 @@ tile_set = ExtResource("1_0isyp")
 y_sort_enabled = true
 texture_filter = 1
 position = Vector2(0, -4)
-tile_map_data = PackedByteArray("AAAOAP//AQABAAYAAADw////AQADAAYAAAA=")
+tile_map_data = PackedByteArray("AAAOAP//AQABAAYAAADw////AQADAAYAAAANAP//AQABAAYAAAAMAP//AQABAAYAAAALAP//AQABAAYAAAAKAP//AQABAAYAAAAJAP//AQABAAYAAAAIAP//AQABAAYAAAAHAP//AQABAAYAAAAGAP//AQABAAYAAAAFAP//AQABAAYAAAAEAP//AQABAAYAAAADAP//AQABAAYAAAACAP//AQABAAYAAAABAP//AQABAAYAAAAAAP//AQABAAYAAAD/////AQABAAYAAAD+////AQABAAYAAAD9////AQADAAYAAAD8////AQADAAYAAAD7////AQADAAYAAAD6////AQADAAYAAAD5////AQADAAYAAAD4////AQADAAYAAAD3////AQADAAYAAAD2////AQADAAYAAAD1////AQADAAYAAAD0////AQADAAYAAADz////AQADAAYAAADy////AQADAAYAAADx////AQADAAYAAAA=")
 tile_set = ExtResource("1_0isyp")
 
 [node name="Camera2D" type="Camera2D" parent="."]
+position_smoothing_enabled = true
+position_smoothing_speed = 10.0
+drag_horizontal_enabled = true
+drag_vertical_enabled = true
+drag_left_margin = 0.1
+drag_top_margin = 0.1
+drag_right_margin = 0.1
+drag_bottom_margin = 0.1
 
-[node name="GridSelector" parent="." node_paths=PackedStringArray("stage", "ground_map", "floor_map") groups=["grid_selector"] instance=ExtResource("3_e6w2r")]
+[node name="RemoteSelector" type="Sprite2D" parent="."]
+unique_name_in_owner = true
+modulate = Color(0.92549, 0.92549, 0, 1)
+texture_filter = 1
+material = SubResource("ShaderMaterial_fwirk")
+texture = ExtResource("5_h4sia")
+
+[node name="GridSelector" parent="." node_paths=PackedStringArray("stage", "ground_map", "floor_map", "camera") instance=ExtResource("3_e6w2r")]
 unique_name_in_owner = true
 stage = NodePath("..")
 ground_map = NodePath("../Ground")
 floor_map = NodePath("../Floor")
-selection_collision_mask = 2
+camera = NodePath("../Camera2D")
+selection_collision_mask = 6
 placement_tile_source_id = 1
 placement_tile_atlas_coordinates = Vector2i(1, 6)
-range_select_current_range = 2
-range_select_collision_mask = 2
+range_select_current_range = 1
+range_select_collision_mask = 6
 
-[node name="RemoteSelector" type="Sprite2D" parent="."]
-unique_name_in_owner = true
-modulate = Color(0.92549, 0.92549, 0, 1)
-texture_filter = 1
-material = SubResource("ShaderMaterial_fwirk")
-texture = ExtResource("5_h4sia")
+[node name="PlayerUnit" parent="." instance=ExtResource("6_h4sia")]
+position = Vector2(-112, -68)
+max_hp = 3
+current_team = "2"
+
+[node name="PlayerUnit2" parent="." instance=ExtResource("6_h4sia")]
+position = Vector2(128, 52)
+direction = 0
+max_hp = 3
+current_team = "1"
 
 [node name="HUDUnit" type="CanvasLayer" parent="."]
 visible = false
@@ -106,6 +127,45 @@ text = "Roll"
 layout_mode = 2
 text = "End Turn"
 
+[node name="PanelContainer2" type="PanelContainer" parent="HUDMain"]
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="VBoxContainer" type="VBoxContainer" parent="HUDMain/PanelContainer2"]
+layout_mode = 2
+
+[node name="move" type="Label" parent="HUDMain/PanelContainer2/VBoxContainer"]
+layout_mode = 2
+text = "0"
+horizontal_alignment = 1
+
+[node name="attack" type="Label" parent="HUDMain/PanelContainer2/VBoxContainer"]
+layout_mode = 2
+text = "0"
+horizontal_alignment = 1
+
+[node name="defend" type="Label" parent="HUDMain/PanelContainer2/VBoxContainer"]
+layout_mode = 2
+text = "0"
+horizontal_alignment = 1
+
+[node name="ability" type="Label" parent="HUDMain/PanelContainer2/VBoxContainer"]
+layout_mode = 2
+text = "0"
+horizontal_alignment = 1
+
+[node name="PanelContainer3" type="PanelContainer" parent="HUDMain"]
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+offset_top = -40.0
+offset_right = 40.0
+grow_vertical = 0
+
+[node name="CurrentTurn" type="Label" parent="HUDMain/PanelContainer3"]
+layout_mode = 2
+text = "CurrentTurn"
+
 [node name="HUDMoveMode" type="CanvasLayer" parent="."]
 visible = false
 script = ExtResource("6_cxybx")