Skip to content

Commit aaadd6c

Browse files
LifeHckrQuinn-Hub
andauthored
Update Health Bars (#196)
* Update: Health Bar Color Attempt Changelog -> Flipped and adjusted the health gradient -> Health Bar now tints and eventually turns red when the bar is low. -> Needs more polish as tinting the color gradient isn't ideal. * Change HP Gradient By a Step Directly changing modulate for this causes issue with other modulate effects * Added HP Over and Under Sprites * Tweak Resource Uniqueness * Update HealthBar_Under.png * Added NPB Sprites --------- Co-authored-by: Quinn-Hub <56490493+Quinn-Hub@users.noreply.github.com>
1 parent 39488e8 commit aaadd6c

16 files changed

+256
-48
lines changed
557 Bytes
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://bi4tbiovlm2g1"
6+
path="res://.godot/imported/PlacementBar_Over.png-722f7fd710d92c69b5dce0436cfc0371.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Scenes/BattleDirector/Assets/PlacementBar_Over.png"
14+
dest_files=["res://.godot/imported/PlacementBar_Over.png-722f7fd710d92c69b5dce0436cfc0371.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
203 Bytes
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://gcst7q2acsqm"
6+
path="res://.godot/imported/PlacementBar_Under.png-84ec66c19986e47bfef867136a8b52d0.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Scenes/BattleDirector/Assets/PlacementBar_Under.png"
14+
dest_files=["res://.godot/imported/PlacementBar_Under.png-84ec66c19986e47bfef867136a8b52d0.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

Scenes/BattleDirector/NotePlacementBar.tscn

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@
22

33
[ext_resource type="Script" uid="uid://gj666xe815py" path="res://Scenes/BattleDirector/Scripts/NotePlacementBar.cs" id="1_456es"]
44
[ext_resource type="Texture2D" uid="uid://cnyr5usjdv0ni" path="res://Scenes/BattleDirector/Assets/NoteQueue_Frame.png" id="2_3tw16"]
5+
[ext_resource type="Texture2D" uid="uid://gcst7q2acsqm" path="res://Scenes/BattleDirector/Assets/PlacementBar_Under.png" id="2_5a8x5"]
56
[ext_resource type="Texture2D" uid="uid://c3chrsxrulapd" path="res://Classes/Notes/Assets/Note_PlayerBasic.png" id="3_6ylx6"]
7+
[ext_resource type="Texture2D" uid="uid://bi4tbiovlm2g1" path="res://Scenes/BattleDirector/Assets/PlacementBar_Over.png" id="3_kb2co"]
68
[ext_resource type="Texture2D" uid="uid://caw70lr5e1yiq" path="res://Classes/Notes/Assets/Note_PlayerDouble.png" id="4_6w8ha"]
79

8-
[sub_resource type="Gradient" id="Gradient_0u6yv"]
9-
colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
10-
11-
[sub_resource type="GradientTexture2D" id="GradientTexture2D_hhds4"]
12-
gradient = SubResource("Gradient_0u6yv")
13-
width = 34
14-
height = 100
15-
1610
[sub_resource type="Gradient" id="Gradient_xvck1"]
1711
offsets = PackedFloat32Array(0)
1812
colors = PackedColorArray(0, 0, 0, 1)
@@ -65,14 +59,32 @@ _currentComboMultText = NodePath("CurrentCombo")
6559
_currentNote = NodePath("NoteQueueSprite/CurrentNote")
6660
_nextNote = NodePath("NoteQueueSprite/NextNote")
6761

62+
[node name="CurrentCombo" type="TextEdit" parent="."]
63+
z_as_relative = false
64+
custom_minimum_size = Vector2(80, 35)
65+
layout_mode = 0
66+
offset_right = 80.0
67+
offset_bottom = 35.0
68+
mouse_filter = 2
69+
theme_override_font_sizes/font_size = 32
70+
text = " x1"
71+
context_menu_enabled = false
72+
shortcut_keys_enabled = false
73+
selecting_enabled = false
74+
deselect_on_focus_loss_enabled = false
75+
drag_and_drop_selection_enabled = false
76+
virtual_keyboard_enabled = false
77+
middle_mouse_paste_enabled = false
78+
6879
[node name="PlacementBar" type="TextureProgressBar" parent="."]
6980
layout_mode = 0
7081
offset_left = 41.0
7182
offset_top = 33.0
7283
offset_right = 75.0
7384
offset_bottom = 133.0
7485
fill_mode = 3
75-
texture_under = SubResource("GradientTexture2D_hhds4")
86+
texture_under = ExtResource("2_5a8x5")
87+
texture_over = ExtResource("3_kb2co")
7688
texture_progress = SubResource("GradientTexture2D_0bqho")
7789
texture_progress_offset = Vector2(1, 1)
7890

@@ -101,23 +113,6 @@ initial_velocity_max = 50.0
101113
scale_amount_max = 2.0
102114
color = Color(1, 1, 0.0745098, 1)
103115

104-
[node name="CurrentCombo" type="TextEdit" parent="."]
105-
z_as_relative = false
106-
custom_minimum_size = Vector2(80, 35)
107-
layout_mode = 0
108-
offset_right = 80.0
109-
offset_bottom = 35.0
110-
mouse_filter = 2
111-
theme_override_font_sizes/font_size = 32
112-
text = " x1"
113-
context_menu_enabled = false
114-
shortcut_keys_enabled = false
115-
selecting_enabled = false
116-
deselect_on_focus_loss_enabled = false
117-
drag_and_drop_selection_enabled = false
118-
virtual_keyboard_enabled = false
119-
middle_mouse_paste_enabled = false
120-
121116
[node name="NoteQueueSprite" type="Sprite2D" parent="."]
122117
position = Vector2(23, 66)
123118
rotation = -1.5708

Scenes/Puppets/Enemies/BossBlood/Boss1.tscn

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=9 format=3 uid="uid://bi5iqbwpsd381"]
1+
[gd_scene load_steps=11 format=3 uid="uid://bi5iqbwpsd381"]
22

33
[ext_resource type="Script" uid="uid://bpyrrnhvisxgv" path="res://Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs" id="1_qj2oj"]
44
[ext_resource type="PackedScene" uid="uid://cdoguwlxehbpg" path="res://Scenes/Puppets/StatusContainer.tscn" id="2_b8x7h"]
@@ -23,6 +23,16 @@ scale_min = 4.0
2323
scale_max = 4.0
2424
turbulence_noise_strength = 14.2
2525

26+
[sub_resource type="Gradient" id="Gradient_b8x7h"]
27+
offsets = PackedFloat32Array(0.0227273, 1)
28+
colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
29+
30+
[sub_resource type="GradientTexture2D" id="GradientTexture2D_i20fw"]
31+
resource_local_to_scene = true
32+
gradient = SubResource("Gradient_b8x7h")
33+
width = 100
34+
height = 18
35+
2636
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "_statusContainer")]
2737
script = ExtResource("1_qj2oj")
2838
HealthBar = NodePath("ProgressBar")
@@ -52,3 +62,4 @@ offset_left = -50.0
5262
offset_top = 32.0
5363
offset_right = 50.0
5464
offset_bottom = 52.0
65+
texture_progress = SubResource("GradientTexture2D_i20fw")

Scenes/Puppets/Enemies/EnemyPuppet.tscn

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
[gd_scene load_steps=4 format=3 uid="uid://cwm0n2wu851nx"]
1+
[gd_scene load_steps=6 format=3 uid="uid://cwm0n2wu851nx"]
22

33
[ext_resource type="Script" uid="uid://bnfo57c070cll" path="res://Scenes/Puppets/Scripts/PuppetTemplate.cs" id="1_kgmh0"]
44
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="1_sxlrs"]
55
[ext_resource type="PackedScene" uid="uid://cdoguwlxehbpg" path="res://Scenes/Puppets/StatusContainer.tscn" id="3_hguc7"]
66

7+
[sub_resource type="Gradient" id="Gradient_hguc7"]
8+
offsets = PackedFloat32Array(0.0227273, 1)
9+
colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
10+
11+
[sub_resource type="GradientTexture2D" id="GradientTexture2D_545vi"]
12+
resource_local_to_scene = true
13+
gradient = SubResource("Gradient_hguc7")
14+
width = 100
15+
height = 18
16+
717
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "_statusContainer")]
818
script = ExtResource("1_kgmh0")
919
HealthBar = NodePath("ProgressBar")
@@ -15,7 +25,8 @@ _statusContainer = NodePath("StatusContainer")
1525
[node name="ProgressBar" parent="." instance=ExtResource("1_sxlrs")]
1626
offset_left = -50.0
1727
offset_top = 32.0
18-
offset_right = 50.0
28+
offset_right = 52.0
1929
offset_bottom = 52.0
30+
texture_progress = SubResource("GradientTexture2D_545vi")
2031

2132
[node name="StatusContainer" parent="." instance=ExtResource("3_hguc7")]

Scenes/Puppets/Enemies/Parasifly/Parasifly.tscn

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
1-
[gd_scene load_steps=5 format=3 uid="uid://uvlux4t6h5de"]
1+
[gd_scene load_steps=7 format=3 uid="uid://uvlux4t6h5de"]
22

33
[ext_resource type="Script" uid="uid://btaqgieybx0ep" path="res://Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs" id="1_ci2ca"]
44
[ext_resource type="PackedScene" uid="uid://cdoguwlxehbpg" path="res://Scenes/Puppets/StatusContainer.tscn" id="2_dq3sr"]
55
[ext_resource type="Texture2D" uid="uid://pngu3pw1pu4o" path="res://Scenes/Puppets/Enemies/Parasifly/Assets/Parasifly.png" id="2_g4o48"]
66
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="3_f74ri"]
77

8+
[sub_resource type="Gradient" id="Gradient_dq3sr"]
9+
resource_local_to_scene = true
10+
offsets = PackedFloat32Array(0.0227273, 1)
11+
colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
12+
13+
[sub_resource type="GradientTexture2D" id="GradientTexture2D_eectw"]
14+
resource_local_to_scene = true
15+
gradient = SubResource("Gradient_dq3sr")
16+
width = 100
17+
height = 18
18+
819
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "_statusContainer")]
920
script = ExtResource("1_ci2ca")
1021
HealthBar = NodePath("ProgressBar")
@@ -22,3 +33,4 @@ offset_left = -50.0
2233
offset_top = 32.0
2334
offset_right = 50.0
2435
offset_bottom = 52.0
36+
texture_progress = SubResource("GradientTexture2D_eectw")

Scenes/Puppets/Enemies/TheGWS/GWS.tscn

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1-
[gd_scene load_steps=5 format=3 uid="uid://d1puw6fvmkrb5"]
1+
[gd_scene load_steps=7 format=3 uid="uid://d1puw6fvmkrb5"]
22

33
[ext_resource type="Script" uid="uid://3axgcdtdevtx" path="res://Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs" id="1_dlike"]
44
[ext_resource type="Texture2D" uid="uid://ci0a2h2eatjht" path="res://Scenes/Puppets/Enemies/TheGWS/Assets/GhostWolfSnake.png" id="2_77v4w"]
55
[ext_resource type="PackedScene" uid="uid://cdoguwlxehbpg" path="res://Scenes/Puppets/StatusContainer.tscn" id="2_c7cx1"]
66
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="3_mr0it"]
77

8+
[sub_resource type="Gradient" id="Gradient_c7cx1"]
9+
offsets = PackedFloat32Array(0.0227273, 1)
10+
colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
11+
12+
[sub_resource type="GradientTexture2D" id="GradientTexture2D_c0jk6"]
13+
resource_local_to_scene = true
14+
gradient = SubResource("Gradient_c7cx1")
15+
width = 100
16+
height = 18
17+
818
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "_statusContainer")]
919
script = ExtResource("1_dlike")
1020
HealthBar = NodePath("ProgressBar")
@@ -24,3 +34,4 @@ offset_left = -50.0
2434
offset_top = 32.0
2535
offset_right = 50.0
2636
offset_bottom = 52.0
37+
texture_progress = SubResource("GradientTexture2D_c0jk6")

Scenes/Puppets/HealthBar.tscn

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
[gd_scene load_steps=6 format=3 uid="uid://bgomxovxs7sr8"]
22

33
[ext_resource type="Script" uid="uid://d24uqauywe5j5" path="res://Scenes/Puppets/Scripts/HealthBar.cs" id="1_b1t4i"]
4+
[ext_resource type="Texture2D" uid="uid://0whvo6xa10it" path="res://Scenes/Puppets/HealthBar_Under.png" id="1_qp5i6"]
5+
[ext_resource type="Texture2D" uid="uid://btia5s3c7owi1" path="res://Scenes/Puppets/HealthBar_Over.png" id="2_r2mkj"]
46

5-
[sub_resource type="Gradient" id="Gradient_ve5ki"]
6-
colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
7-
8-
[sub_resource type="GradientTexture2D" id="GradientTexture2D_ti0cv"]
9-
gradient = SubResource("Gradient_ve5ki")
10-
width = 100
11-
height = 20
12-
13-
[sub_resource type="Gradient" id="Gradient_soqhm"]
7+
[sub_resource type="Gradient" id="Gradient_qp5i6"]
8+
resource_local_to_scene = true
9+
offsets = PackedFloat32Array(0.0227273, 1)
1410
colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
1511

16-
[sub_resource type="GradientTexture2D" id="GradientTexture2D_r4hau"]
17-
gradient = SubResource("Gradient_soqhm")
18-
width = 96
19-
height = 16
12+
[sub_resource type="GradientTexture2D" id="GradientTexture2D_r2mkj"]
13+
resource_local_to_scene = true
14+
gradient = SubResource("Gradient_qp5i6")
15+
width = 100
16+
height = 18
2017

2118
[node name="ProgressBar" type="TextureProgressBar"]
2219
offset_right = 100.0
2320
offset_bottom = 20.0
24-
texture_under = SubResource("GradientTexture2D_ti0cv")
25-
texture_progress = SubResource("GradientTexture2D_r4hau")
26-
texture_progress_offset = Vector2(2, 2)
21+
value = 100.0
22+
texture_under = ExtResource("1_qp5i6")
23+
texture_over = ExtResource("2_r2mkj")
24+
texture_progress = SubResource("GradientTexture2D_r2mkj")
25+
texture_progress_offset = Vector2(1, 1)
2726
script = ExtResource("1_b1t4i")

0 commit comments

Comments
 (0)