feat(player): extract HealthBar to its own scene

Author: olivierperez

objects/actors/player/Player.gd

@@ -2,11 +2,10 @@ class_name Player
 extends Actor
 
 @export var chestModifierSpeed: float = 0.7
-@export var maxHealth = 100
-var lifePoint = maxHealth
+@export var life = 100
 
 @onready var attackTimer = $AttackTimer
-@onready var healthbar = $HealthBar
+@onready var healthbar: HealthBar = $HealthBar
 @onready var animation_player: AnimationPlayer = $AnimationPlayer
 
 @export var weapon: Weapon
@@ -15,8 +14,7 @@ var hasChest = false
 func _ready() -> void:
 	if weapon == null:
 		weapon = StoreManager.player_weapon
-	healthbar.max_value = maxHealth
-	healthbar.value = maxHealth
+	healthbar.init(life)
 	attackTimer.wait_time = weapon.attack_speed
 
 func _input(event):
@@ -28,14 +26,14 @@ func _input(event):
 		attack()
 
 func apply_attack(force: int) -> void:
-	if lifePoint == 0:
+	if life <= 0:
 		return
 
-	lifePoint -= force
-	animation_player.play('Hit')
-	healthbar.value = lifePoint
+	life -= force
+	animation_player.play("Hit")
+	healthbar.value = life
 
-	if (lifePoint == 0):
+	if (life <= 0):
 		animation_player.play("Death")
 
 func get_speed():

objects/actors/player/Player.tscn

@@ -6,7 +6,7 @@
 [ext_resource type="Resource" uid="uid://r3i80a6v2w0y" path="res://resources/weapons/gun/Gun.tres" id="3_irbyu"]
 [ext_resource type="Texture2D" uid="uid://dw5vuo3agm77m" path="res://objects/actors/player/template.png" id="3_q5uec"]
 [ext_resource type="PackedScene" uid="uid://cxlkjx4h6gv5h" path="res://components/collector/Collector.tscn" id="5_q1uwo"]
-[ext_resource type="Script" path="res://objects/actors/player/HealthBar.gd" id="7_ot68h"]
+[ext_resource type="PackedScene" uid="uid://c5w6dv2r65qsd" path="res://objects/hud/HealthBar.tscn" id="7_svy1a"]
 
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_p4sxr"]
 properties/0/path = NodePath(".:position")
@@ -544,21 +544,6 @@ tracks/1/keys = {
 }]
 }
 
-[sub_resource type="Animation" id="Animation_fx0oj"]
-resource_name = "Hit"
-length = 0.4
-tracks/0/type = "bezier"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("AnimatedSprite:material:shader_parameter/flash_value")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"handle_modes": PackedInt32Array(0, 0, 0),
-"points": PackedFloat32Array(0, -0.2, 0, 0.2, 0, 1, -0.2, 0, 0.2, 0, 0, -0.2, 0, 0.2, 0),
-"times": PackedFloat32Array(0, 0.2, 0.4)
-}
-
 [sub_resource type="Animation" id="Animation_l1t87"]
 resource_name = "fade_away"
 tracks/0/type = "value"
@@ -588,6 +573,21 @@ tracks/1/keys = {
 }]
 }
 
+[sub_resource type="Animation" id="Animation_fx0oj"]
+resource_name = "Hit"
+length = 0.4
+tracks/0/type = "bezier"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("AnimatedSprite:material:shader_parameter/flash_value")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"handle_modes": PackedInt32Array(0, 0, 0),
+"points": PackedFloat32Array(0, -0.2, 0, 0.2, 0, 1, -0.2, 0, 0.2, 0, 0, -0.2, 0, 0.2, 0),
+"times": PackedFloat32Array(0, 0.2, 0.4)
+}
+
 [sub_resource type="Animation" id="Animation_tc2ku"]
 length = 0.001
 tracks/0/type = "value"
@@ -626,7 +626,7 @@ _data = {
 collision_mask = 7
 script = ExtResource("2_bhjnv")
 chestModifierSpeed = 0.7
-maxHealth = 100
+life = 100
 weapon = ExtResource("3_irbyu")
 
 [node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="." index="0"]
@@ -656,17 +656,6 @@ libraries = {
 "": SubResource("AnimationLibrary_mt86f")
 }
 
-[node name="HealthBar" type="ProgressBar" parent="." index="6"]
-modulate = Color(0.227451, 0.768627, 0.156863, 1)
-z_index = 10
-offset_left = -68.0
-offset_top = -60.0
-offset_right = 206.0
-offset_bottom = -33.0
-scale = Vector2(0.5, 0.5)
-mouse_filter = 2
-step = 1.0
-show_percentage = false
-script = ExtResource("7_ot68h")
+[node name="HealthBar" parent="." index="6" instance=ExtResource("7_svy1a")]
 
 [connection signal="on_collecting" from="Collector" to="." method="_on_collecting"]

objects/actors/player/HealthBar.gd objects/hud/HealthBar.gd

@@ -1,3 +1,4 @@
+class_name HealthBar
 extends ProgressBar
 
 var RED_COLOR = "e7001f"
@@ -11,4 +12,8 @@ func _process(delta):
 		modulate = ORANGE_COLOR
 	else:
 		modulate = GREEN_COLOR
+
+func init(maxHealth: int) -> void:
+	max_value = maxHealth
+	value = maxHealth
 

objects/hud/HealthBar.tscn

@@ -0,0 +1,16 @@
+[gd_scene load_steps=2 format=3 uid="uid://c5w6dv2r65qsd"]
+
+[ext_resource type="Script" path="res://objects/hud/HealthBar.gd" id="1_kbje0"]
+
+[node name="HealthBar" type="ProgressBar"]
+modulate = Color(0.227451, 0.768627, 0.156863, 1)
+z_index = 10
+offset_left = -68.0
+offset_top = -60.0
+offset_right = 206.0
+offset_bottom = -33.0
+scale = Vector2(0.5, 0.5)
+mouse_filter = 2
+step = 1.0
+show_percentage = false
+script = ExtResource("1_kbje0")