diff --git a/arenas/normal1.tscn b/arenas/normal1.tscn
index d15d44c..43ab367 100644
--- a/arenas/normal1.tscn
+++ b/arenas/normal1.tscn
@@ -275,75 +275,75 @@ end = NodePath("../../anchors/anchor2")
[node name="anchors" type="Node2D" parent="."]
[node name="anchor" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 540, 1500 )
+position = Vector2( 540, 1440 )
[node name="anchor2" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 300, 1380 )
+position = Vector2( 300, 1320 )
[node name="anchor3" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 540, 1260 )
+position = Vector2( 540, 1200 )
anchor_type = "attack_start"
[node name="anchor4" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 780, 1380 )
+position = Vector2( 780, 1320 )
[node name="anchor5" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 180, 1200 )
+position = Vector2( 180, 1140 )
[node name="anchor6" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 900, 1200 )
+position = Vector2( 900, 1140 )
[node name="anchor7" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 540, 960 )
+position = Vector2( 540, 900 )
[node name="anchor8" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 360, 1080 )
+position = Vector2( 360, 1020 )
[node name="anchor9" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 720, 1080 )
+position = Vector2( 720, 1020 )
[node name="anchor10" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 120, 960 )
+position = Vector2( 120, 900 )
[node name="anchor11" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 960, 960 )
+position = Vector2( 960, 900 )
[node name="anchor12" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 780, 300 )
+position = Vector2( 780, 240 )
[node name="anchor13" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 300, 300 )
+position = Vector2( 300, 240 )
[node name="anchor14" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 900, 480 )
+position = Vector2( 900, 420 )
[node name="anchor15" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 180, 480 )
+position = Vector2( 180, 420 )
[node name="anchor16" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 540, 180 )
+position = Vector2( 540, 120 )
[node name="anchor17" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 960, 720 )
+position = Vector2( 960, 660 )
[node name="anchor18" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 120, 720 )
+position = Vector2( 120, 660 )
[node name="anchor19" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 720, 600 )
+position = Vector2( 720, 540 )
[node name="anchor20" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 540, 420 )
+position = Vector2( 540, 360 )
anchor_type = "defend_start"
[node name="anchor21" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 360, 600 )
+position = Vector2( 360, 540 )
[node name="anchor22" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 540, 720 )
+position = Vector2( 540, 660 )
[node name="anchor23" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 300, 840 )
+position = Vector2( 300, 780 )
[node name="anchor24" parent="anchors" instance=ExtResource( 1 )]
-position = Vector2( 780, 840 )
+position = Vector2( 780, 780 )
diff --git a/theme/fonts/daggersquare.tres b/theme/fonts/daggersquare.tres
index 7cd73a8..b5b2f1c 100644
--- a/theme/fonts/daggersquare.tres
+++ b/theme/fonts/daggersquare.tres
@@ -4,4 +4,5 @@
[resource]
size = 40
+use_filter = true
font_data = ExtResource( 1 )
diff --git a/units/hud.png b/units/hud.png
index 7673312..4008381 100644
Binary files a/units/hud.png and b/units/hud.png differ
diff --git a/units/hud.svg b/units/hud.svg
index e30b5f6..1f53bd8 100644
--- a/units/hud.svg
+++ b/units/hud.svg
@@ -11,8 +11,8 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="300"
- height="45"
- viewBox="0 0 300 45.000002"
+ height="55"
+ viewBox="0 0 300 55.000002"
version="1.1"
id="svg3027"
inkscape:version="0.92.4 (f8dce91, 2019-08-02)"
@@ -132,12 +132,12 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="4"
- inkscape:cx="148.49118"
- inkscape:cy="41.051492"
+ inkscape:zoom="5.6568542"
+ inkscape:cx="77.104047"
+ inkscape:cy="39.166538"
inkscape:document-units="px"
inkscape:current-layer="layer2"
- showgrid="false"
+ showgrid="true"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1056"
@@ -149,7 +149,12 @@
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
- fit-margin-bottom="0" />
+ fit-margin-bottom="0"
+ inkscape:snap-global="true">
+
+
@@ -166,28 +171,20 @@
inkscape:groupmode="layer"
id="layer2"
inkscape:label="back"
- transform="translate(41.952795,16.807916)">
+ transform="translate(41.952795,26.807916)">
-
+ sodipodi:nodetypes="ccccccccc" />
-
+ d="m 232.13419,-9.4467317 2.63427,5.3716119 5.84213,-1.2895929 -2.55726,5.40869743 4.65076,3.76351537 -5.82312,1.3729236 -0.0427,5.9826203 -4.70405,-3.6966902 -4.70405,3.6966892 -0.0427,-5.98262 -5.82312,-1.3729234 4.65076,-3.76351577 -2.55726,-5.40869703 5.84213,1.289593 z"
+ inkscape:transform-center-y="-2.7104304"
+ inkscape:transform-center-x="1.4195404e-05" />
+
+ transform="translate(41.952795,26.807916)">
diff --git a/units/points.gd b/units/points.gd
index 55ff0df..8ba40bc 100644
--- a/units/points.gd
+++ b/units/points.gd
@@ -23,13 +23,11 @@ func set_move(val):
func set_hull(val):
hull = val
- if has_node("hud/hull"):
- $hud/hull.text = String(val)
+ update_life()
func set_shield(val):
shield = val
- if has_node("hud/shield"):
- $hud/shield.text = String(val)
+ update_life()
func set_damage(val):
damage = val
@@ -49,3 +47,7 @@ func set_from(other):
set_shield(other.shield)
set_damage(other.damage)
set_enemy(other.enemy)
+
+func update_life():
+ if has_node("hud/life"):
+ $hud/life.text = String(hull) + ((" +" + String(shield)) if shield else "")
diff --git a/units/points.tscn b/units/points.tscn
index 70b4b72..70cd41c 100644
--- a/units/points.tscn
+++ b/units/points.tscn
@@ -24,11 +24,11 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
-margin_left = -250.635
-margin_top = -47.0
-margin_right = -210.635
-margin_bottom = 2.0
-custom_colors/font_color = Color( 0.858824, 0.937255, 0.976471, 1 )
+margin_left = -258.899
+margin_top = -52.2704
+margin_right = -218.899
+margin_bottom = -3.27041
+custom_colors/font_color = Color( 0.976471, 0.968627, 0.858824, 1 )
text = "0"
align = 1
valign = 1
@@ -36,32 +36,15 @@ __meta__ = {
"_edit_use_anchors_": false
}
-[node name="hull" type="Label" parent="hud"]
+[node name="life" type="Label" parent="hud"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
-margin_left = -185.889
-margin_top = -47.3972
-margin_right = -145.889
-margin_bottom = 1.60278
-custom_colors/font_color = Color( 0.858824, 0.937255, 0.976471, 1 )
-text = "0"
-align = 1
-valign = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="shield" type="Label" parent="hud"]
-anchor_left = 0.5
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-margin_left = -122.334
-margin_top = -47.0
-margin_right = -82.3343
-margin_bottom = 2.0
+margin_left = -197.264
+margin_top = -52.2704
+margin_right = -99.2635
+margin_bottom = -3.27041
custom_colors/font_color = Color( 0.858824, 0.937255, 0.976471, 1 )
text = "0"
align = 1
@@ -75,11 +58,11 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
-margin_left = -57.1911
-margin_top = -47.0
-margin_right = -17.1911
-margin_bottom = 2.0
-custom_colors/font_color = Color( 0.858824, 0.937255, 0.976471, 1 )
+margin_left = -80.4546
+margin_top = -52.2704
+margin_right = -40.4546
+margin_bottom = -3.27041
+custom_colors/font_color = Color( 0.917647, 0.701961, 0.67451, 1 )
text = "0"
align = 1
valign = 1