From 31078af97462eed2a1c17f66fd916b325c8b6fab Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Sat, 3 May 2025 15:21:50 +0200 Subject: [PATCH] Refactor HUD and Marketplace scene structure; update node paths and styling --- objects/hud.tscn | 39 ++++++++++++++++++++------------------- objects/marketplace.tscn | 40 ++++++++++++++++++++-------------------- objects/pause_menu.tscn | 12 +++--------- scenes/test.tscn | 6 +++--- 4 files changed, 46 insertions(+), 51 deletions(-) diff --git a/objects/hud.tscn b/objects/hud.tscn index 0dd3c19..b3727d4 100644 --- a/objects/hud.tscn +++ b/objects/hud.tscn @@ -4,9 +4,8 @@ [ext_resource type="Script" uid="uid://c3pde84b3kdco" path="res://scripts/hud.gd" id="1_ueofj"] [ext_resource type="FontFile" uid="uid://xm0vbusjr7b7" path="res://fonts/PressStart2P-Regular.ttf" id="1_ygmwt"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_aa3sf"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_mmcdi"] bg_color = Color(0, 0, 0, 1) -corner_detail = 1 [sub_resource type="Theme" id="Theme_auu2b"] default_font = ExtResource("1_ygmwt") @@ -27,34 +26,36 @@ grow_vertical = 2 size_flags_horizontal = 4 size_flags_vertical = 4 script = ExtResource("1_ueofj") -coins_label = NodePath("Panel/PanelContainer/Coins label") -health_progressbar = NodePath("Panel/PanelContainer/ProgressBar") -lives_label = NodePath("Panel/PanelContainer/Lives") +coins_label = NodePath("PanelContainer/MarginContainer/HBoxContainer/Coins label") +health_progressbar = NodePath("PanelContainer/MarginContainer/HBoxContainer/ProgressBar") +lives_label = NodePath("PanelContainer/MarginContainer/HBoxContainer/Lives") -[node name="Panel" type="Panel" parent="."] +[node name="PanelContainer" type="PanelContainer" parent="."] layout_mode = 1 anchors_preset = 10 anchor_right = 1.0 offset_bottom = 16.0 grow_horizontal = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_aa3sf") +theme_override_styles/panel = SubResource("StyleBoxFlat_mmcdi") -[node name="PanelContainer" type="HBoxContainer" parent="Panel"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_constants/separation = 10 +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] +layout_mode = 2 +theme_override_constants/margin_left = 8 +theme_override_constants/margin_top = 8 +theme_override_constants/margin_right = 8 +theme_override_constants/margin_bottom = 8 -[node name="Health Label" type="Label" parent="Panel/PanelContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer"] +layout_mode = 2 +theme_override_constants/separation = 8 + +[node name="Health Label" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer"] layout_mode = 2 text = "Health" label_settings = ExtResource("1_4dsh5") uppercase = true -[node name="ProgressBar" type="ProgressBar" parent="Panel/PanelContainer"] +[node name="ProgressBar" type="ProgressBar" parent="PanelContainer/MarginContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 1 @@ -65,13 +66,13 @@ step = 0.1 value = 60.0 show_percentage = false -[node name="Lives" type="Label" parent="Panel/PanelContainer"] +[node name="Lives" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer"] layout_mode = 2 text = "Lives 3" label_settings = ExtResource("1_4dsh5") uppercase = true -[node name="Coins label" type="Label" parent="Panel/PanelContainer"] +[node name="Coins label" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer"] layout_mode = 2 text = "Coins 33" label_settings = ExtResource("1_4dsh5") diff --git a/objects/marketplace.tscn b/objects/marketplace.tscn index 93794f5..2aa7dc0 100644 --- a/objects/marketplace.tscn +++ b/objects/marketplace.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=11 format=3 uid="uid://dlm2ri562fynd"] +[gd_scene load_steps=10 format=3 uid="uid://dlm2ri562fynd"] -[ext_resource type="LabelSettings" uid="uid://rvn5ivivfvv6" path="res://resources/ui/hud_label_settings.tres" id="1_7r0u8"] [ext_resource type="Script" uid="uid://duifmqjarjpuv" path="res://scripts/marketplace.gd" id="1_ncpyg"] [ext_resource type="FontFile" uid="uid://xm0vbusjr7b7" path="res://fonts/PressStart2P-Regular.ttf" id="2_ho1tm"] [ext_resource type="Script" uid="uid://bya240e627ti6" path="res://scripts/resources/skill_data.gd" id="2_pg4mc"] @@ -10,10 +9,10 @@ [ext_resource type="Resource" uid="uid://cx5fsbexblp60" path="res://resources/skills/ice_brick.tres" id="6_6665y"] [ext_resource type="Resource" uid="uid://d3bjre2etov1n" path="res://resources/skills/magnetic.tres" id="7_ukny6"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_c56bj"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ode10"] bg_color = Color(0, 0, 0, 1) -[node name="Marketplace" type="Control" node_paths=PackedStringArray("grid")] +[node name="Marketplace" type="Control" node_paths=PackedStringArray("root", "grid")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -21,38 +20,39 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_ncpyg") +root = NodePath(".") skill_data = Array[ExtResource("2_pg4mc")]([ExtResource("3_bk5yi"), ExtResource("4_tx0n3"), ExtResource("5_fqx8e"), ExtResource("6_6665y"), ExtResource("7_ukny6")]) -grid = NodePath("Panel/VBoxContainer/GridContainer") +grid = NodePath("PanelContainer/MarginContainer/VBoxContainer/GridContainer") font = ExtResource("2_ho1tm") -[node name="Panel" type="Panel" parent="."] +[node name="PanelContainer" type="PanelContainer" parent="."] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_c56bj") +theme_override_styles/panel = SubResource("StyleBoxFlat_ode10") -[node name="VBoxContainer" type="VBoxContainer" parent="Panel"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_constants/separation = 8 +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] +layout_mode = 2 +theme_override_constants/margin_left = 8 +theme_override_constants/margin_top = 8 +theme_override_constants/margin_right = 8 +theme_override_constants/margin_bottom = 8 -[node name="Label" type="Label" parent="Panel/VBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 text = "marketplace" -label_settings = ExtResource("1_7r0u8") horizontal_alignment = 1 +vertical_alignment = 1 +justification_flags = 162 uppercase = true -[node name="GridContainer" type="GridContainer" parent="Panel/VBoxContainer"] +[node name="GridContainer" type="GridContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 -theme_override_constants/h_separation = 8 -theme_override_constants/v_separation = 8 columns = 2 diff --git a/objects/pause_menu.tscn b/objects/pause_menu.tscn index f23c9e4..75d10a9 100644 --- a/objects/pause_menu.tscn +++ b/objects/pause_menu.tscn @@ -23,15 +23,9 @@ exit_to_menu_button = NodePath("PanelContainer/MarginContainer/VBoxContainer/Exi [node name="PanelContainer" type="PanelContainer" parent="."] layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -209.0 -offset_top = -128.0 -offset_right = 209.0 -offset_bottom = 128.0 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_g4ivv") diff --git a/scenes/test.tscn b/scenes/test.tscn index 0c2764a..424dbd7 100644 --- a/scenes/test.tscn +++ b/scenes/test.tscn @@ -574,15 +574,15 @@ position = Vector2(873, -577) [node name="HUD" parent="CanvasLayer" instance=ExtResource("1_gbpkv")] -[node name="Marketplace" parent="CanvasLayer" node_paths=PackedStringArray("root", "skill_unlocker", "components_to_disable") instance=ExtResource("20_ss8k0")] +[node name="Marketplace" parent="CanvasLayer" node_paths=PackedStringArray("skill_unlocker", "components_to_disable") instance=ExtResource("20_ss8k0")] visible = false custom_minimum_size = Vector2(480, 240) -offset_top = 16.0 -root = NodePath(".") +offset_top = 32.0 skill_unlocker = NodePath("../../Brick Player/SkillUnlockerComponent") components_to_disable = [NodePath("../../Brick Player")] [node name="Pause menu" parent="CanvasLayer" instance=ExtResource("25_j7bvy")] +visible = false [node name="Killzone" parent="." instance=ExtResource("20_8a4vc")] position = Vector2(0, 990)