From e6366f8fea3ecb0e982922733463b1fcd7fab6cd Mon Sep 17 00:00:00 2001 From: Jan Heemstra Date: Wed, 31 Mar 2021 23:22:12 +0200 Subject: [PATCH] implement correct behavior of Max Health attribute of Player --- Game/Assets/Characters/Default/Default.tscn | 2 +- Game/Classes/Player/Player.gd | 4 +++- Game/Classes/Player/Player.tscn | 2 +- Game/Classes/UI/Health.tscn | 3 +-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Game/Assets/Characters/Default/Default.tscn b/Game/Assets/Characters/Default/Default.tscn index f530145..3fa382e 100644 --- a/Game/Assets/Characters/Default/Default.tscn +++ b/Game/Assets/Characters/Default/Default.tscn @@ -14,7 +14,7 @@ script = ExtResource( 2 ) max_health = 90 [node name="Hand" parent="Camera" index="0"] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.399939, -0.559 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.395602, -0.559 ) [node name="WeaponBobAnimationTree" parent="Camera/Hand" index="0"] parameters/playback = SubResource( 1 ) diff --git a/Game/Classes/Player/Player.gd b/Game/Classes/Player/Player.gd index 93a1da2..3ec6417 100644 --- a/Game/Classes/Player/Player.gd +++ b/Game/Classes/Player/Player.gd @@ -309,7 +309,7 @@ master func kill(): func spawn(): is_dead = false - set_health(150) + set_health(max_health) velocity = Vector3() @@ -383,6 +383,8 @@ func set_local_player(): # Called when the node enters the scene tree for the first time. func _ready(): + $HUD/Health/HealthBar.max_value = max_health + # Set player class var path = get_script().get_path() diff --git a/Game/Classes/Player/Player.tscn b/Game/Classes/Player/Player.tscn index 7d42c79..9503e24 100644 --- a/Game/Classes/Player/Player.tscn +++ b/Game/Classes/Player/Player.tscn @@ -138,7 +138,7 @@ script = ExtResource( 8 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.53592, -0.0651628 ) [node name="Hand" type="Spatial" parent="Camera"] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.399017, -0.559 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.390011, -0.559 ) [node name="WeaponBobAnimationTree" type="AnimationTree" parent="Camera/Hand"] tree_root = SubResource( 12 ) diff --git a/Game/Classes/UI/Health.tscn b/Game/Classes/UI/Health.tscn index 7840e64..da203e9 100644 --- a/Game/Classes/UI/Health.tscn +++ b/Game/Classes/UI/Health.tscn @@ -22,8 +22,7 @@ __meta__ = { margin_right = 150.0 margin_bottom = 50.0 rect_min_size = Vector2( 150, 50 ) -max_value = 150.0 -value = 150.0 +value = 100.0 texture_under = ExtResource( 3 ) texture_over = ExtResource( 2 ) texture_progress = ExtResource( 1 )