Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
MaddoScientisto 2025-03-18 21:05:12 +01:00
commit 77b89a8fbc
25 changed files with 799 additions and 56 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=29 format=3 uid="uid://dkwi1hu1bixoe"]
[gd_scene load_steps=33 format=3 uid="uid://dkwi1hu1bixoe"]
[ext_resource type="Script" uid="uid://baf6pxbvhqmjk" path="res://Scripts/Hud.cs" id="1_m0hb0"]
[ext_resource type="FontFile" uid="uid://ccm3u37q1hvux" path="res://fonts/Xolonium-Regular.ttf" id="2_0xmx2"]
@ -19,7 +19,11 @@
[ext_resource type="Texture2D" uid="uid://cihsd5rw8i5xm" path="res://Sprites/UI/ShieldBar_Foreground.png" id="13_j6myr"]
[ext_resource type="StyleBox" uid="uid://24hh6h4juk3r" path="res://Resources/Styles/PixelStyleBoxRed_SquareBackground.tres" id="13_sjdna"]
[ext_resource type="Script" uid="uid://cwd3sksjqpuy3" path="res://Scripts/Utils/FpsCounterLabel.cs" id="15_x61tu"]
[ext_resource type="Texture2D" uid="uid://duwiasewxvcb5" path="res://Sprites/Items/Icicle_Gun.png" id="19_h6xwv"]
[ext_resource type="Texture2D" uid="uid://c8fr1ea20odaw" path="res://Sprites/Items/Heart_Extend.png" id="19_j6myr"]
[ext_resource type="Texture2D" uid="uid://cid62phhew3ep" path="res://Sprites/UI/StatusSprite02.png" id="19_n0pka"]
[ext_resource type="Texture2D" uid="uid://8n23xie4kore" path="res://Sprites/Items/Shield_Pickup.png" id="22_5cvcb"]
[ext_resource type="Texture2D" uid="uid://cvc0x4bbnhusw" path="res://Sprites/Items/Ice_Crystal_Shield.png" id="22_jefn6"]
[sub_resource type="LabelSettings" id="LabelSettings_a7f6n"]
font = ExtResource("2_0xmx2")
@ -271,53 +275,74 @@ theme = ExtResource("9_sx5r0")
theme_override_styles/panel = ExtResource("13_sjdna")
metadata/_tab_index = 4
[node name="HBoxContainer" type="HBoxContainer" parent="InventoryMenu/Status"]
[node name="MarginContainer" type="MarginContainer" parent="InventoryMenu/Status"]
layout_mode = 2
theme_override_constants/margin_left = 32
theme_override_constants/margin_right = 32
[node name="HBoxContainer" type="HBoxContainer" parent="InventoryMenu/Status/MarginContainer"]
layout_mode = 2
alignment = 1
[node name="VBoxContainer2" type="VBoxContainer" parent="InventoryMenu/Status/HBoxContainer"]
[node name="VBoxContainer2" type="VBoxContainer" parent="InventoryMenu/Status/MarginContainer/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 2
alignment = 1
[node name="Button" type="Button" parent="InventoryMenu/Status/HBoxContainer/VBoxContainer2"]
[node name="Button" type="Button" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer2"]
layout_mode = 2
text = "9 Gun"
text = "IC-9
"
icon = ExtResource("19_h6xwv")
[node name="VBoxContainer" type="VBoxContainer" parent="InventoryMenu/Status/HBoxContainer"]
[node name="VBoxContainer3" type="VBoxContainer" parent="InventoryMenu/Status/MarginContainer/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 10
alignment = 1
[node name="Shield" type="Button" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3"]
layout_mode = 2
theme_override_constants/line_spacing = -4
text = "Ice
Crystal"
icon = ExtResource("22_jefn6")
alignment = 0
[node name="HBoxContainer" type="HBoxContainer" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3"]
layout_mode = 2
[node name="HealthExtensions" type="Button" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3/HBoxContainer"]
layout_mode = 2
text = "x2"
icon = ExtResource("19_j6myr")
alignment = 0
[node name="ShieldExtensions" type="Button" parent="InventoryMenu/Status/MarginContainer/HBoxContainer/VBoxContainer3/HBoxContainer"]
layout_mode = 2
text = "x1"
icon = ExtResource("22_5cvcb")
alignment = 0
[node name="VBoxContainer" type="VBoxContainer" parent="InventoryMenu/Status"]
custom_minimum_size = Vector2(96, 0)
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 3
[node name="Label" type="Label" parent="InventoryMenu/Status/HBoxContainer/VBoxContainer"]
[node name="Label" type="Label" parent="InventoryMenu/Status/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 0
text = "Cirno"
text = "CIRNO"
label_settings = SubResource("LabelSettings_bkqle")
[node name="TextureRect" type="TextureRect" parent="InventoryMenu/Status/HBoxContainer/VBoxContainer"]
[node name="TextureRect" type="TextureRect" parent="InventoryMenu/Status/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
texture = ExtResource("19_n0pka")
expand_mode = 1
stretch_mode = 3
[node name="VBoxContainer3" type="VBoxContainer" parent="InventoryMenu/Status/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 0
alignment = 1
[node name="Button" type="Button" parent="InventoryMenu/Status/HBoxContainer/VBoxContainer3"]
layout_mode = 2
text = "Plasma
Shield"
[node name="Button2" type="Button" parent="InventoryMenu/Status/HBoxContainer/VBoxContainer3"]
layout_mode = 2
text = "Fission
Battery"
[node name="FPS" type="Label" parent="."]
z_index = 10
z_as_relative = false