Refactor hud, align properly

Author: tom95

comet/Arrow.svg.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Arrow.svg-45e3c82569d9080f75efd5e39fa5cdac.stex"
+
+[deps]
+
+source_file="res://comet/Arrow.svg"
+source_md5="2e57f099d49df2d8e3ca5ac79f610d38"
+
+dest_files=[ "res://.import/Arrow.svg-45e3c82569d9080f75efd5e39fa5cdac.stex" ]
+dest_md5="8bd816b2aa65bbb3d3386d01aa1ad083"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

game/game.gd

@@ -4,6 +4,8 @@ func _ready():
 	for i in range(1,10):
 		spawn_chicken(i)
 
+	$level/spaceship.connect("health_changed", $hud_layer/hud, "set_health_percentage")
+
 func spawn_chicken(id):
 	var chicken = preload("res://spr_chickenWing.tscn").instance()
 	#chicken.position = pos

game/game.tscn

@@ -5,7 +5,7 @@
 [ext_resource path="res://game/background.png" type="Texture" id=3]
 [ext_resource path="res://level_heist/level_heist.tscn" type="PackedScene" id=4]
 
-[node name="game" type="Node2D" index="0"]
+[node name="game" type="Node2D"]
 
 script = ExtResource( 1 )
 

hud/hud.gd

@@ -0,0 +1,4 @@
+extends Control
+
+func set_health_percentage(val):
+	$health_bar/health_bar_background.rect_scale = Vector2(val, 1)

hud/hud.tscn

@@ -1,69 +1,47 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://fonts/Cousine-Bold.ttf" type="DynamicFontData" id=1]
-
-[sub_resource type="DynamicFont" id=1]
-
-size = 60
-use_mipmaps = false
-use_filter = false
-font_data = ExtResource( 1 )
-_sections_unfolded = [ "Extra Spacing", "Font/fallback", "Settings" ]
+[ext_resource path="res://hud/hud.gd" type="Script" id=1]
+[ext_resource path="res://fonts/Cousine-Bold.ttf" type="DynamicFontData" id=2]
 
 [sub_resource type="DynamicFont" id=2]
 
 size = 60
 use_mipmaps = false
 use_filter = false
-font_data = ExtResource( 1 )
+font_data = ExtResource( 2 )
 _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ]
 
-[node name="hud" type="Node2D"]
-
-position = Vector2( 349, 218.5 )
-_sections_unfolded = [ "Transform" ]
-
-[node name="health" type="Label" parent="." index="0"]
+[node name="hud" type="Control" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 438.0
-margin_top = -193.0
-margin_right = 654.0
-margin_bottom = -124.0
+anchor_right = 1.0
+anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
-mouse_filter = 2
+mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
-size_flags_vertical = 0
-custom_fonts/font = SubResource( 1 )
-text = "999 HP"
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-_sections_unfolded = [ "Focus", "Material", "Mouse", "Rect", "Size Flags", "Theme", "Visibility", "custom_fonts", "custom_styles" ]
+size_flags_vertical = 1
+script = ExtResource( 1 )
+_sections_unfolded = [ "Rect", "Transform" ]
 
-[node name="health_bar" type="ColorRect" parent="." index="1"]
+[node name="health_bar" type="ColorRect" parent="." index="0"]
 
-anchor_left = 1.0
-anchor_top = 0.0
-anchor_right = 1.0
-anchor_bottom = 0.0
-margin_left = -400.0
-margin_top = -180.0
-margin_right = 350.0
-margin_bottom = -150.0
+anchor_left = 0.0
+anchor_top = 1.0
+anchor_right = 0.0
+anchor_bottom = 1.0
+margin_top = -30.0
+margin_right = 750.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 color = Color( 1, 0, 0, 0.613255 )
-_sections_unfolded = [ "Anchor", "Margin" ]
+_sections_unfolded = [ "Anchor", "Margin", "Rect" ]
 
 [node name="health_bar_background" type="ColorRect" parent="health_bar" index="0"]
 
@@ -80,18 +58,16 @@ mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 color = Color( 1, 1, 1, 0.187843 )
-_sections_unfolded = [ "Anchor", "Margin" ]
+_sections_unfolded = [ "Anchor", "Margin", "Rect" ]
 
-[node name="easter_eggs" type="Label" parent="." index="2"]
+[node name="easter_eggs" type="Label" parent="." index="1"]
 
-anchor_left = 0.0
+anchor_left = 1.0
 anchor_top = 0.0
-anchor_right = 0.0
+anchor_right = 1.0
 anchor_bottom = 0.0
-margin_left = 370.0
-margin_top = -130.0
-margin_right = 658.0
-margin_bottom = -61.0
+margin_left = -288.0
+margin_bottom = 69.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2

spaceship.gd

@@ -2,12 +2,15 @@ extends RigidBody2D
 
 var tween
 
+signal health_changed(percentage)
+
 var torque = 5000
 var speed = 200
 var handling = 20
 var fire_intervall = 0.6
-# Remaining space ship health
-var health = 10000000000.0
+
+const MAX_HEALTH = 200
+var health = MAX_HEALTH
 
 # Whether or not the player is still alive
 var alive = true
@@ -32,9 +35,9 @@ func take_proportional_damage(damage, other_velocity):
 func set_health(new_health):
 	health = new_health
 	# TODO Do something when spaceship is dead.
-	get_node('/root/game/hud_layer/hud/health').text = str(ceil(health)) + ' HP'
-	get_node('/root/game/hud_layer/hud/health_bar').margin_right = 7.5*health - 400
-
+	
+	emit_signal("health_changed", new_health / MAX_HEALTH)
+	
 	if health == 0 and alive:
 		die()