From 7c694149c27f4354b4445f130ac32dee6aaf7c3a Mon Sep 17 00:00:00 2001 From: Zenny Date: Thu, 7 Aug 2025 23:25:58 -0700 Subject: [PATCH] Modify UI placement, fix debug menu --- .../src/enemy/state/EnemyLogic.g.puml | 2 +- Zennysoft.Game.Ma/src/game/Game.tscn | 5 +- .../dungeon/rooms/Set A/18. Corridor A.tscn | 6 -- Zennysoft.Game.Ma/src/menu/DebugMenu.tscn | 6 +- Zennysoft.Game.Ma/src/player/Player.tscn | 1 - .../src/ui/in_game_ui/InGameUI.cs | 4 +- .../src/ui/in_game_ui/InGameUI.tscn | 73 +++++++++++------- .../src/ui/in_game_ui/InventoryMessageUI.cs | 42 +++++++++++ .../ui/in_game_ui/InventoryMessageUI.cs.uid | 1 + .../src/ui/in_game_ui/InventoryMessageUI.tscn | 21 ++++++ .../src/ui/player_ui/PlayerInfoUI.cs | 31 -------- .../src/ui/player_ui/PlayerInfoUI.tscn | 75 +++++++++---------- 12 files changed, 156 insertions(+), 111 deletions(-) create mode 100644 Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.cs create mode 100644 Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.cs.uid create mode 100644 Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.tscn diff --git a/Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml b/Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml index 33157ae0..2a0f6da0 100644 --- a/Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml +++ b/Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml @@ -2,9 +2,9 @@ state "EnemyLogic State" as Zennysoft_Game_Ma_EnemyLogic_State { state "Alive" as Zennysoft_Game_Ma_EnemyLogic_State_Alive { state "Activated" as Zennysoft_Game_Ma_EnemyLogic_State_Activated { + state "Patrolling" as Zennysoft_Game_Ma_EnemyLogic_State_Patrolling state "Attacking" as Zennysoft_Game_Ma_EnemyLogic_State_Attacking state "FollowPlayer" as Zennysoft_Game_Ma_EnemyLogic_State_FollowPlayer - state "Patrolling" as Zennysoft_Game_Ma_EnemyLogic_State_Patrolling } state "Idle" as Zennysoft_Game_Ma_EnemyLogic_State_Idle } diff --git a/Zennysoft.Game.Ma/src/game/Game.tscn b/Zennysoft.Game.Ma/src/game/Game.tscn index 6673d763..afcb59bc 100644 --- a/Zennysoft.Game.Ma/src/game/Game.tscn +++ b/Zennysoft.Game.Ma/src/game/Game.tscn @@ -83,10 +83,11 @@ script = ExtResource("1_ytcii") [node name="SubViewportContainer" type="SubViewportContainer" parent="."] material = SubResource("ShaderMaterial_e75a2") -custom_minimum_size = Vector2(1280, 720) +custom_minimum_size = Vector2(1440, 1080) anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_right = -480.0 grow_horizontal = 2 grow_vertical = 2 stretch = true @@ -94,7 +95,7 @@ stretch = true [node name="SubViewport" type="SubViewport" parent="SubViewportContainer"] transparent_bg = true handle_input_locally = false -size = Vector2i(1920, 1080) +size = Vector2i(1440, 1080) render_target_update_mode = 4 [node name="PauseContainer" type="Node3D" parent="SubViewportContainer/SubViewport"] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/18. Corridor A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/18. Corridor A.tscn index 57632fdd..0d82c049 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/18. Corridor A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/18. Corridor A.tscn @@ -13,18 +13,15 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jhg27"] resource_name = "WALL.007" -shading_mode = 1 albedo_texture = ExtResource("2_jmyyj") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_04fvv"] resource_name = "CEILNG.007" cull_mode = 2 -shading_mode = 1 albedo_texture = ExtResource("3_d7rg7") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nngve"] resource_name = "FLOOR.007" -shading_mode = 1 albedo_texture = ExtResource("4_7fcpj") [sub_resource type="ArrayMesh" id="ArrayMesh_hnpmi"] @@ -108,13 +105,11 @@ shadow_mesh = SubResource("ArrayMesh_hnpmi") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lsgue"] resource_name = "Material.014" cull_mode = 2 -shading_mode = 1 albedo_texture = ExtResource("6_liffc") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_btu5w"] resource_name = "Material.015" cull_mode = 2 -shading_mode = 1 albedo_texture = ExtResource("7_3kayh") [sub_resource type="ArrayMesh" id="ArrayMesh_mfebi"] @@ -454,7 +449,6 @@ albedo_color = Color(1, 1, 1, 0) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1huxf"] resource_name = "BOTTOM TRIM.007" -shading_mode = 1 albedo_texture = ExtResource("5_qnt5r") [sub_resource type="ArrayMesh" id="ArrayMesh_7a87o"] diff --git a/Zennysoft.Game.Ma/src/menu/DebugMenu.tscn b/Zennysoft.Game.Ma/src/menu/DebugMenu.tscn index cd0890c4..e3e63ea6 100644 --- a/Zennysoft.Game.Ma/src/menu/DebugMenu.tscn +++ b/Zennysoft.Game.Ma/src/menu/DebugMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://8f3dk16nj0dn"] +[gd_scene load_steps=25 format=3 uid="uid://8f3dk16nj0dn"] [ext_resource type="Script" uid="uid://l1v4ppubryd3" path="res://src/ui/pause_menu/PauseDebugMenu.cs" id="1_a7f7f"] [ext_resource type="FontFile" uid="uid://dp1k143v7cppw" path="res://src/ui/fonts/Lust_Sans_Regular.otf" id="1_dan2i"] @@ -21,8 +21,6 @@ [ext_resource type="PackedScene" uid="uid://boqjebx7yuiqy" path="res://src/enemy/enemy_types/11. Palan/Palan.tscn" id="19_gq2v4"] [ext_resource type="PackedScene" uid="uid://5s7c4dsb1wwk" path="res://src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeaven.tscn" id="20_hd5x0"] [ext_resource type="PackedScene" uid="uid://b3giib0jp3uod" path="res://src/enemy/enemy_types/13. gold sproingy/GoldSproingy.tscn" id="21_q6ugg"] -[ext_resource type="PackedScene" uid="uid://2wibfnu2jvlv" path="res://src/enemy/enemy_types/14. horse_head/HorseFace.tscn" id="22_b68ey"] -[ext_resource type="PackedScene" uid="uid://6dnsw37d1uw4" path="res://src/enemy/enemy_types/15. ox_face/OxFace.tscn" id="23_cbsio"] [sub_resource type="Theme" id="Theme_0tcdw"] default_font = ExtResource("3_k06jx") @@ -116,5 +114,5 @@ focus_neighbor_bottom = NodePath(".") theme_override_styles/normal = SubResource("StyleBoxFlat_1ctjd") [node name="EnemyDatabase" parent="." instance=ExtResource("5_274g5")] -EnemyList = Array[PackedScene]([ExtResource("6_ue0ua"), ExtResource("7_gidvx"), ExtResource("8_m457y"), ExtResource("9_i65lo"), ExtResource("10_ct6et"), ExtResource("11_fk1r1"), ExtResource("12_yh23m"), ExtResource("13_tns3g"), ExtResource("14_fmyye"), ExtResource("15_1f6di"), ExtResource("16_r6xvd"), ExtResource("17_bmukk"), ExtResource("18_6mn3f"), ExtResource("19_gq2v4"), ExtResource("20_hd5x0"), ExtResource("21_q6ugg"), ExtResource("22_b68ey"), ExtResource("23_cbsio")]) +EnemyList = Array[PackedScene]([ExtResource("6_ue0ua"), ExtResource("7_gidvx"), ExtResource("8_m457y"), ExtResource("9_i65lo"), ExtResource("10_ct6et"), ExtResource("11_fk1r1"), ExtResource("12_yh23m"), ExtResource("13_tns3g"), ExtResource("14_fmyye"), ExtResource("15_1f6di"), ExtResource("16_r6xvd"), ExtResource("17_bmukk"), ExtResource("18_6mn3f"), ExtResource("19_gq2v4"), ExtResource("20_hd5x0"), ExtResource("21_q6ugg")]) SpawnRate = PackedFloat32Array() diff --git a/Zennysoft.Game.Ma/src/player/Player.tscn b/Zennysoft.Game.Ma/src/player/Player.tscn index 489322d6..7d7f90b3 100644 --- a/Zennysoft.Game.Ma/src/player/Player.tscn +++ b/Zennysoft.Game.Ma/src/player/Player.tscn @@ -543,7 +543,6 @@ flip_v = true [node name="Camera3D" type="Camera3D" parent="Camera"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.003, 1.4569, 0.482136) cull_mask = 1048569 -fov = 45.0 near = 0.001 [node name="player_model" type="Node3D" parent="Camera"] diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.cs b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.cs index 4487ce23..69c66994 100644 --- a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.cs +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.cs @@ -22,6 +22,8 @@ public partial class InGameUI : Control, IInGameUI [Node] public IPlayerInfoUI PlayerInfoUI { get; set; } = default!; + [Node] public InventoryMessageUI InventoryMessageUI { get; set; } = default!; + [Node] public IUseTeleportPrompt UseTeleportPrompt { get; set; } = default!; [Node] public IDebugMenu DebugMenu { get; set; } = default!; @@ -43,7 +45,7 @@ public partial class InGameUI : Control, IInGameUI InGameUILogicBinding = InGameUILogic.Bind(); InGameUILogicBinding - .Handle((in InGameUILogic.Output.AnnounceMessageOnMainScreen output) => { PlayerInfoUI.DisplayMessage(output.Message); }) + .Handle((in InGameUILogic.Output.AnnounceMessageOnMainScreen output) => { InventoryMessageUI.DisplayMessage(output.Message); }) .Handle((in InGameUILogic.Output.AnnounceMessageInInventory output) => { InventoryMenu.DisplayMessage(output.Message); }) .Handle((in InGameUILogic.Output.RemoveItemFromInventory output) => { InventoryMenu.RemoveItem(output.Item); }) .Handle((in InGameUILogic.Output.DisplayMinimap _) => { MiniMap.SetProcessUnhandledInput(true); MiniMap.Show(); }) diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn index 33121902..28f7c057 100644 --- a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn @@ -1,70 +1,64 @@ -[gd_scene load_steps=8 format=3 uid="uid://b1muxus5qdbeu"] +[gd_scene load_steps=9 format=3 uid="uid://b1muxus5qdbeu"] [ext_resource type="Script" uid="uid://dlq2mkhl4pe7a" path="res://src/ui/in_game_ui/InGameUI.cs" id="1_sc13i"] [ext_resource type="PackedScene" uid="uid://bwbofurcvf3yh" path="res://src/minimap/Minimap.tscn" id="2_6sfje"] [ext_resource type="PackedScene" uid="uid://dlj8qdg1c5048" path="res://src/ui/inventory_menu/InventoryMenu.tscn" id="3_4vcdl"] [ext_resource type="PackedScene" uid="uid://dxl8il8f13c2x" path="res://src/ui/player_ui/PlayerInfoUI.tscn" id="4_46s5l"] [ext_resource type="PackedScene" uid="uid://bea2waybmgd6u" path="res://src/ui/teleport_prompt/UseTeleportPrompt.tscn" id="5_h1hgq"] +[ext_resource type="PackedScene" uid="uid://x0f1ol50nnp3" path="res://src/ui/in_game_ui/InventoryMessageUI.tscn" id="6_y26qy"] [ext_resource type="Script" uid="uid://dj6oqler47dqf" path="res://src/utils/FpsCounter.cs" id="7_c6o8j"] [ext_resource type="PackedScene" uid="uid://8f3dk16nj0dn" path="res://src/menu/DebugMenu.tscn" id="7_llomk"] [node name="InGameUI" type="Control"] process_mode = 3 -custom_minimum_size = Vector2(1920, 1080) layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_right = 8.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_sc13i") [node name="HBoxContainer" type="HBoxContainer" parent="."] -custom_minimum_size = Vector2(1920, 1080) layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_right = 20.0 grow_horizontal = 2 grow_vertical = 2 theme_override_constants/separation = 0 -[node name="ColorRect" type="ColorRect" parent="HBoxContainer"] -custom_minimum_size = Vector2(260, 0) -layout_mode = 2 -color = Color(0.172833, 0.172833, 0.172833, 1) - [node name="SubViewportContainer" type="SubViewportContainer" parent="HBoxContainer"] layout_mode = 2 +size_flags_horizontal = 3 [node name="SubViewport" type="SubViewport" parent="HBoxContainer/SubViewportContainer"] transparent_bg = true handle_input_locally = false -size = Vector2i(1400, 1080) +size = Vector2i(1440, 1080) render_target_update_mode = 4 +[node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/SubViewportContainer/SubViewport"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/margin_left = 25 +theme_override_constants/margin_top = 40 + +[node name="InventoryMessageUI" parent="HBoxContainer/SubViewportContainer/SubViewport/MarginContainer" instance=ExtResource("6_y26qy")] +unique_name_in_owner = true +layout_mode = 2 + [node name="CenterContainer" type="CenterContainer" parent="HBoxContainer/SubViewportContainer/SubViewport"] custom_minimum_size = Vector2(1440, 1080) anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_right = 8.0 grow_horizontal = 2 grow_vertical = 2 -[node name="PlayerInfoUI" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("4_46s5l")] -unique_name_in_owner = true -custom_minimum_size = Vector2(1440, 1080) -layout_mode = 2 - -[node name="MiniMap" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("2_6sfje")] -unique_name_in_owner = true -visible = false -custom_minimum_size = Vector2(1440, 1080) -layout_mode = 2 - [node name="InventoryMenu" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("3_4vcdl")] unique_name_in_owner = true process_mode = 3 @@ -87,7 +81,34 @@ visible = false custom_minimum_size = Vector2(1440, 1080) layout_mode = 2 -[node name="ColorRect2" type="ColorRect" parent="HBoxContainer"] -custom_minimum_size = Vector2(260, 0) +[node name="Panel" type="ColorRect" parent="HBoxContainer"] +custom_minimum_size = Vector2(480, 0) layout_mode = 2 -color = Color(0.172549, 0.172549, 0.172549, 1) +color = Color(0.192157, 0.27451, 0.258824, 1) + +[node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/Panel"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/margin_left = 25 +theme_override_constants/margin_top = 25 + +[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/Panel/MarginContainer"] +layout_mode = 2 + +[node name="PlayerInfoUI" parent="HBoxContainer/Panel/MarginContainer/VBoxContainer" instance=ExtResource("4_46s5l")] +unique_name_in_owner = true +layout_mode = 2 +size_flags_vertical = 3 + +[node name="MiniMap" parent="HBoxContainer/Panel/MarginContainer/VBoxContainer" instance=ExtResource("2_6sfje")] +unique_name_in_owner = true +visible = false +layout_mode = 2 + +[node name="Sigil Marker" type="ReferenceRect" parent="HBoxContainer/Panel/MarginContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.cs b/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.cs new file mode 100644 index 00000000..b974cf19 --- /dev/null +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.cs @@ -0,0 +1,42 @@ +using Chickensoft.AutoInject; +using Chickensoft.Introspection; +using Godot; + +namespace Zennysoft.Game.Ma; + +[Meta(typeof(IAutoNode))] +public partial class InventoryMessageUI : Control +{ + public override void _Notification(int what) => this.Notify(what); + + [Node] public Control MessageBox { get; set; } = default!; + + private LabelSettings _labelSettings { get; set; } + + public void OnResolved() + { + _labelSettings = GD.Load("res://src/ui/label_settings/InventoryFullAlertLabelSetting.tres"); + } + + public async void DisplayInventoryFullMessage(string rejectedItemName) + { + var newLabel = new Label() { Text = $"Could not pick up {rejectedItemName}.", LabelSettings = _labelSettings }; + MessageBox.AddChild(newLabel); + + GetTree().CreateTimer(3f).Timeout += () => + { + MessageBox.RemoveChild(newLabel); + }; + } + + public async void DisplayMessage(string message) + { + var newLabel = new Label() { Text = message, LabelSettings = _labelSettings }; + MessageBox.AddChild(newLabel); + + GetTree().CreateTimer(3f).Timeout += () => + { + MessageBox.RemoveChild(newLabel); + }; + } +} \ No newline at end of file diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.cs.uid b/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.cs.uid new file mode 100644 index 00000000..3a536276 --- /dev/null +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.cs.uid @@ -0,0 +1 @@ +uid://c1oik3knsrita diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.tscn b/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.tscn new file mode 100644 index 00000000..54507861 --- /dev/null +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InventoryMessageUI.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=2 format=3 uid="uid://x0f1ol50nnp3"] + +[ext_resource type="Script" uid="uid://c1oik3knsrita" path="res://src/ui/in_game_ui/InventoryMessageUI.cs" id="1_gwlh3"] + +[node name="InventoryMessageUI" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("1_gwlh3") + +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="."] +layout_mode = 1 +offset_right = 34.0 +offset_bottom = 23.0 + +[node name="MessageBox" type="VBoxContainer" parent="AspectRatioContainer"] +unique_name_in_owner = true +layout_mode = 2 diff --git a/Zennysoft.Game.Ma/src/ui/player_ui/PlayerInfoUI.cs b/Zennysoft.Game.Ma/src/ui/player_ui/PlayerInfoUI.cs index ada3aeea..2bfd43b0 100644 --- a/Zennysoft.Game.Ma/src/ui/player_ui/PlayerInfoUI.cs +++ b/Zennysoft.Game.Ma/src/ui/player_ui/PlayerInfoUI.cs @@ -8,8 +8,6 @@ namespace Zennysoft.Game.Ma; public interface IPlayerInfoUI : IControl { - public void DisplayMessage(string message); - public void Activate(); } @@ -18,8 +16,6 @@ public partial class PlayerInfoUI : Control, IPlayerInfoUI { public override void _Notification(int what) => this.Notify(what); - private LabelSettings _labelSettings { get; set; } - #region Nodes [Node] public VBoxContainer PlayerInfo { get; set; } = default!; @@ -32,11 +28,6 @@ public partial class PlayerInfoUI : Control, IPlayerInfoUI [Dependency] public IPlayer Player => this.DependOn(); - public void OnResolved() - { - _labelSettings = GD.Load("res://src/ui/label_settings/InventoryFullAlertLabelSetting.tres"); - } - public void Activate() { Player.Stats.CurrentHP.Sync += CurrentHP_Sync; @@ -72,26 +63,4 @@ public partial class PlayerInfoUI : Control, IPlayerInfoUI { HPNumber.Text = $"{obj}/{Player.Stats.MaximumHP.Value}"; } - - public async void DisplayInventoryFullMessage(string rejectedItemName) - { - var newLabel = new Label() { Text = $"Could not pick up {rejectedItemName}.", LabelSettings = _labelSettings }; - PlayerInfo.AddChild(newLabel); - - GetTree().CreateTimer(3f).Timeout += () => - { - PlayerInfo.RemoveChild(newLabel); - }; - } - - public async void DisplayMessage(string message) - { - var newLabel = new Label() { Text = message, LabelSettings = _labelSettings }; - PlayerInfo.AddChild(newLabel); - - GetTree().CreateTimer(3f).Timeout += () => - { - PlayerInfo.RemoveChild(newLabel); - }; - } } diff --git a/Zennysoft.Game.Ma/src/ui/player_ui/PlayerInfoUI.tscn b/Zennysoft.Game.Ma/src/ui/player_ui/PlayerInfoUI.tscn index 979cf88b..17ee486e 100644 --- a/Zennysoft.Game.Ma/src/ui/player_ui/PlayerInfoUI.tscn +++ b/Zennysoft.Game.Ma/src/ui/player_ui/PlayerInfoUI.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=5 format=3 uid="uid://dxl8il8f13c2x"] +[gd_scene load_steps=4 format=3 uid="uid://dxl8il8f13c2x"] -[ext_resource type="Texture2D" uid="uid://hg2kraa5nrnl" path="res://src/ui/textures/blank level symbol.png" id="1_78qrq"] [ext_resource type="Script" uid="uid://b65cbirtijlii" path="res://src/ui/player_ui/PlayerInfoUI.cs" id="1_d8yyu"] [ext_resource type="LabelSettings" uid="uid://ca1q6yu8blwxf" path="res://src/ui/label_settings/InventoryMainTextBold.tres" id="2_aa7fx"] [ext_resource type="LabelSettings" uid="uid://dupifadnagodp" path="res://src/ui/label_settings/MainTextRegular.tres" id="3_xdjh1"] @@ -15,86 +14,84 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_d8yyu") -[node name="MarginContainer" type="MarginContainer" parent="."] +[node name="AspectRatio" type="AspectRatioContainer" parent="."] layout_mode = 1 -anchors_preset = 9 -anchor_bottom = 1.0 -offset_right = 426.0 -grow_vertical = 2 -theme_override_constants/margin_left = 32 -theme_override_constants/margin_top = 20 +offset_right = 266.0 +offset_bottom = 177.0 -[node name="PlayerInfo" type="VBoxContainer" parent="MarginContainer"] +[node name="PlayerInfo" type="VBoxContainer" parent="AspectRatio"] unique_name_in_owner = true layout_mode = 2 -[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/PlayerInfo"] +[node name="HBoxContainer" type="HBoxContainer" parent="AspectRatio/PlayerInfo"] layout_mode = 2 -[node name="CenterContainer" type="CenterContainer" parent="MarginContainer/PlayerInfo/HBoxContainer"] +[node name="CenterContainer" type="CenterContainer" parent="AspectRatio/PlayerInfo/HBoxContainer"] layout_mode = 2 -[node name="TextureRect" type="TextureRect" parent="MarginContainer/PlayerInfo/HBoxContainer/CenterContainer"] -custom_minimum_size = Vector2(128, 128) -layout_mode = 2 -size_flags_vertical = 3 -texture = ExtResource("1_78qrq") -expand_mode = 1 -stretch_mode = 4 - -[node name="LevelNumber" type="Label" parent="MarginContainer/PlayerInfo/HBoxContainer/CenterContainer"] -unique_name_in_owner = true -custom_minimum_size = Vector2(80, 80) -layout_mode = 2 -text = "99" -label_settings = ExtResource("2_aa7fx") -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="VBox" type="VBoxContainer" parent="MarginContainer/PlayerInfo/HBoxContainer"] +[node name="VBox" type="VBoxContainer" parent="AspectRatio/PlayerInfo/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 theme_override_constants/separation = 15 -[node name="HBox" type="HBoxContainer" parent="MarginContainer/PlayerInfo/HBoxContainer/VBox"] +[node name="HP Box" type="HBoxContainer" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox"] layout_mode = 2 size_flags_horizontal = 3 -[node name="HP" type="Label" parent="MarginContainer/PlayerInfo/HBoxContainer/VBox/HBox"] +[node name="HP" type="Label" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox/HP Box"] layout_mode = 2 text = "HP: " label_settings = ExtResource("2_aa7fx") -[node name="ReferenceRect" type="ReferenceRect" parent="MarginContainer/PlayerInfo/HBoxContainer/VBox/HBox"] +[node name="ReferenceRect" type="ReferenceRect" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox/HP Box"] custom_minimum_size = Vector2(30, 0) layout_mode = 2 border_width = 0.0 -[node name="HPNumber" type="Label" parent="MarginContainer/PlayerInfo/HBoxContainer/VBox/HBox"] +[node name="HPNumber" type="Label" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox/HP Box"] unique_name_in_owner = true layout_mode = 2 text = "222/222" label_settings = ExtResource("3_xdjh1") -[node name="HBox2" type="HBoxContainer" parent="MarginContainer/PlayerInfo/HBoxContainer/VBox"] +[node name="VT Box" type="HBoxContainer" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox"] layout_mode = 2 -[node name="VT" type="Label" parent="MarginContainer/PlayerInfo/HBoxContainer/VBox/HBox2"] +[node name="VT" type="Label" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox/VT Box"] layout_mode = 2 text = "VT:" label_settings = ExtResource("2_aa7fx") -[node name="ReferenceRect" type="ReferenceRect" parent="MarginContainer/PlayerInfo/HBoxContainer/VBox/HBox2"] +[node name="ReferenceRect" type="ReferenceRect" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox/VT Box"] custom_minimum_size = Vector2(30, 0) layout_mode = 2 border_width = 0.0 -[node name="VTNumber" type="Label" parent="MarginContainer/PlayerInfo/HBoxContainer/VBox/HBox2"] +[node name="VTNumber" type="Label" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox/VT Box"] unique_name_in_owner = true layout_mode = 2 text = "444/444" label_settings = ExtResource("3_xdjh1") -[node name="TextureButton" type="TextureButton" parent="MarginContainer"] +[node name="Level Box" type="HBoxContainer" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox"] layout_mode = 2 + +[node name="LevelNumber" type="Label" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox/Level Box"] +unique_name_in_owner = true +layout_mode = 2 +text = "LVL. 08" +label_settings = ExtResource("2_aa7fx") +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="EXP Box" type="HBoxContainer" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox"] +layout_mode = 2 + +[node name="EXPNumber" type="Label" parent="AspectRatio/PlayerInfo/HBoxContainer/VBox/EXP Box"] +unique_name_in_owner = true +layout_mode = 2 +text = "XP 901/2002" +label_settings = ExtResource("2_aa7fx") +horizontal_alignment = 1 +vertical_alignment = 1