diff --git a/Scenes/HUD/HUD.tscn b/Scenes/HUD/HUD.tscn index e8c4128e..ecbd5397 100644 --- a/Scenes/HUD/HUD.tscn +++ b/Scenes/HUD/HUD.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://dkwi1hu1bixoe"] +[gd_scene load_steps=31 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"] @@ -12,7 +12,11 @@ [ext_resource type="FontFile" uid="uid://coek1e2q257pq" path="res://fonts/at01.ttf" id="6_sk1eq"] [ext_resource type="Theme" uid="uid://dnsadvmunm76k" path="res://Resources/Styles/MainMenuButtons.tres" id="9_sx5r0"] [ext_resource type="Script" uid="uid://bobo5f4ud60qw" path="res://Scripts/UI/ItemsMenu.cs" id="10_oflr6"] +[ext_resource type="Texture2D" uid="uid://teydwmu6h04b" path="res://Sprites/UI/HealthBar.png" id="10_sjdna"] [ext_resource type="Script" uid="uid://com5b4ffsmj7s" path="res://Scripts/UI/InventoryMenu.cs" id="11_7pulb"] +[ext_resource type="Texture2D" uid="uid://b4itkpf7s61p3" path="res://Sprites/UI/HealthBar_Foreground.png" id="11_86ddi"] +[ext_resource type="Texture2D" uid="uid://bhmtp6i2g2f1c" path="res://Sprites/UI/ShieldBar.png" id="12_n0pka"] +[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="Texture2D" uid="uid://d4lqqgx8yvp5" path="res://Sprites/Portraits/Status_Cirno.png" id="15_bkqle"] [ext_resource type="Script" uid="uid://cwd3sksjqpuy3" path="res://Scripts/Utils/FpsCounterLabel.cs" id="15_x61tu"] @@ -52,23 +56,45 @@ animations = [{ "speed": 5.0 }] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_wu6au"] -bg_color = Color(0.437742, 0.0512416, 0.0286274, 1) -border_color = Color(0.197934, 0.0027957, 1.8049e-08, 1) -anti_aliasing = false +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_86ddi"] +texture = ExtResource("10_sjdna") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 +expand_margin_left = 1.0 +expand_margin_top = 1.0 +expand_margin_right = 1.0 +expand_margin_bottom = 1.0 +axis_stretch_horizontal = 2 +axis_stretch_vertical = 2 -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5f4mf"] -bg_color = Color(0.958101, 0.255223, 3.85046e-07, 1) -anti_aliasing = false +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_qpigx"] +texture = ExtResource("11_86ddi") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_crjx4"] -bg_color = Color(0.120626, 7.70092e-07, 0.682086, 1) -border_color = Color(0.197934, 0.0027957, 1.8049e-08, 1) -anti_aliasing = false +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_h6xwv"] +texture = ExtResource("12_n0pka") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 +expand_margin_left = 1.0 +expand_margin_top = 1.0 +expand_margin_right = 1.0 +expand_margin_bottom = 1.0 +axis_stretch_horizontal = 2 +axis_stretch_vertical = 2 -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rxnbp"] -bg_color = Color(0.338981, 0.507716, 0.996646, 1) -anti_aliasing = false +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_5cvcb"] +texture = ExtResource("13_j6myr") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 [sub_resource type="LabelSettings" id="LabelSettings_bkqle"] font_color = Color(0, 0.737255, 0.113725, 1) @@ -143,12 +169,13 @@ theme_override_constants/separation = 0 layout_mode = 2 [node name="HealthBar" type="ProgressBar" parent="VBoxContainer/HealthBarContainer"] -custom_minimum_size = Vector2(32, 8) +custom_minimum_size = Vector2(34, 8) layout_mode = 2 size_flags_vertical = 4 -theme_override_styles/background = SubResource("StyleBoxFlat_wu6au") -theme_override_styles/fill = SubResource("StyleBoxFlat_5f4mf") +theme_override_styles/background = SubResource("StyleBoxTexture_86ddi") +theme_override_styles/fill = SubResource("StyleBoxTexture_qpigx") value = 50.0 +rounded = true show_percentage = false [node name="HealthLabel" type="Label" parent="VBoxContainer/HealthBarContainer"] @@ -161,11 +188,11 @@ vertical_alignment = 1 layout_mode = 2 [node name="ShieldBar" type="ProgressBar" parent="VBoxContainer/ShieldBarContainer"] -custom_minimum_size = Vector2(32, 8) +custom_minimum_size = Vector2(34, 8) layout_mode = 2 size_flags_vertical = 4 -theme_override_styles/background = SubResource("StyleBoxFlat_crjx4") -theme_override_styles/fill = SubResource("StyleBoxFlat_rxnbp") +theme_override_styles/background = SubResource("StyleBoxTexture_h6xwv") +theme_override_styles/fill = SubResource("StyleBoxTexture_5cvcb") value = 50.0 show_percentage = false @@ -199,6 +226,7 @@ offset_right = 226.0 offset_bottom = 144.0 [node name="InventoryMenu" type="TabContainer" parent="."] +visible = false offset_left = 16.0 offset_top = 9.0 offset_right = 305.0 diff --git a/Sprites/UI/HealthBar.aseprite b/Sprites/UI/HealthBar.aseprite new file mode 100644 index 00000000..697aa97d --- /dev/null +++ b/Sprites/UI/HealthBar.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa554c24f0bd1e962ac387005b20a2f85d055e9c4e4b228ddb3e52ec6f40452e +size 752 diff --git a/Sprites/UI/HealthBar.png b/Sprites/UI/HealthBar.png new file mode 100644 index 00000000..2ce6541c --- /dev/null +++ b/Sprites/UI/HealthBar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:068a6e6b26cc82b5983e707fc4cd7d607ad0870549cb36056191f63345d8afb2 +size 137 diff --git a/Sprites/UI/HealthBar.png.import b/Sprites/UI/HealthBar.png.import new file mode 100644 index 00000000..d11ea324 --- /dev/null +++ b/Sprites/UI/HealthBar.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://teydwmu6h04b" +path="res://.godot/imported/HealthBar.png-9aa0c4f6e3210a309843a1dac5acb41d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/UI/HealthBar.png" +dest_files=["res://.godot/imported/HealthBar.png-9aa0c4f6e3210a309843a1dac5acb41d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/UI/HealthBar_Foreground.png b/Sprites/UI/HealthBar_Foreground.png new file mode 100644 index 00000000..9c52a327 --- /dev/null +++ b/Sprites/UI/HealthBar_Foreground.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fba12703c3e56661d617193adb76cb8361a90123829771eb9f7f90f610174f16 +size 112 diff --git a/Sprites/UI/HealthBar_Foreground.png.import b/Sprites/UI/HealthBar_Foreground.png.import new file mode 100644 index 00000000..f1cc07ba --- /dev/null +++ b/Sprites/UI/HealthBar_Foreground.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4itkpf7s61p3" +path="res://.godot/imported/HealthBar_Foreground.png-192ef0bb957e20550bd64f52c411a97c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/UI/HealthBar_Foreground.png" +dest_files=["res://.godot/imported/HealthBar_Foreground.png-192ef0bb957e20550bd64f52c411a97c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/UI/ShieldBar.aseprite b/Sprites/UI/ShieldBar.aseprite new file mode 100644 index 00000000..f5b3c436 --- /dev/null +++ b/Sprites/UI/ShieldBar.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c889dd52c5add838078f536a171ddebf3cdbf95e27d716d4be3fa4b7c2eb693e +size 754 diff --git a/Sprites/UI/ShieldBar.png b/Sprites/UI/ShieldBar.png new file mode 100644 index 00000000..af3eee1f --- /dev/null +++ b/Sprites/UI/ShieldBar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62d47a6db68ba90fed341a2ef1dbad975ee3924a0e7696f34d361fdaa2b656a9 +size 136 diff --git a/Sprites/UI/ShieldBar.png.import b/Sprites/UI/ShieldBar.png.import new file mode 100644 index 00000000..fa122bfe --- /dev/null +++ b/Sprites/UI/ShieldBar.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bhmtp6i2g2f1c" +path="res://.godot/imported/ShieldBar.png-386ac5e546c838e26ac4dba17a6188c9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/UI/ShieldBar.png" +dest_files=["res://.godot/imported/ShieldBar.png-386ac5e546c838e26ac4dba17a6188c9.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/UI/ShieldBar_Foreground.png b/Sprites/UI/ShieldBar_Foreground.png new file mode 100644 index 00000000..4c0ba86d --- /dev/null +++ b/Sprites/UI/ShieldBar_Foreground.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2c50136dde1f9d0484c636392f308706ee4e73c2db87763311dd8ca4a18caa1 +size 112 diff --git a/Sprites/UI/ShieldBar_Foreground.png.import b/Sprites/UI/ShieldBar_Foreground.png.import new file mode 100644 index 00000000..acc03a4f --- /dev/null +++ b/Sprites/UI/ShieldBar_Foreground.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cihsd5rw8i5xm" +path="res://.godot/imported/ShieldBar_Foreground.png-02ef755cbf92b5ab772235fa5a3cf11a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/UI/ShieldBar_Foreground.png" +dest_files=["res://.godot/imported/ShieldBar_Foreground.png-02ef755cbf92b5ab772235fa5a3cf11a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1