From 6fbd4208748f859177b02175cbb84ce857ae2c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Mon, 24 Feb 2020 01:02:11 +0100 Subject: [PATCH] Testing a new unit hud look --- arenas/normal1.tscn | 48 ++++++++++----------- theme/fonts/daggersquare.tres | 1 + units/hud.png | Bin 4104 -> 5076 bytes units/hud.svg | 77 ++++++++++++++++------------------ units/points.gd | 10 +++-- units/points.tscn | 47 +++++++-------------- 6 files changed, 83 insertions(+), 100 deletions(-) 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 7673312963262ec1d435b7788edb3ee19e2c9d30..40083818e3593a80bfc1211370e127d26f39d9fb 100644 GIT binary patch delta 5027 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 B?S}vW 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" /> + 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