From 4716dd92ac24a8a4b290a48d02d5033297c27568 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Fri, 22 Nov 2024 10:27:30 -0700 Subject: [PATCH] Tweaked ball quantity display scaling, curve gauge speed --- src/game/game.tscn | 1 + src/ui/shot_hud/ball_selector/ball_icon.tscn | 26 +++++++++----------- src/ui/shot_hud/shot_hud.tscn | 1 + 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/game/game.tscn b/src/game/game.tscn index 00c28d2..979f165 100644 --- a/src/game/game.tscn +++ b/src/game/game.tscn @@ -184,6 +184,7 @@ stretch = true script = ExtResource("3_rmm5i") [node name="Viewport" type="SubViewport" parent="RootControl/Rumbler/ViewportContainer"] +unique_name_in_owner = true handle_input_locally = false msaa_3d = 3 screen_space_aa = 1 diff --git a/src/ui/shot_hud/ball_selector/ball_icon.tscn b/src/ui/shot_hud/ball_selector/ball_icon.tscn index 7a92367..e931765 100644 --- a/src/ui/shot_hud/ball_selector/ball_icon.tscn +++ b/src/ui/shot_hud/ball_selector/ball_icon.tscn @@ -15,8 +15,8 @@ grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 4 script = ExtResource("1_p0p8j") -quantity = -1 -unlimited = true +text = "BALLTYPE" +quantity = 18 [node name="BallLabel" type="Label" parent="."] unique_name_in_owner = true @@ -35,34 +35,30 @@ grow_vertical = 2 theme_override_constants/outline_size = 10 theme_override_fonts/font = ExtResource("2_bu42i") theme_override_font_sizes/font_size = 25 +text = "BALLTYPE" horizontal_alignment = 2 [node name="QuantityContainer" type="HBoxContainer" parent="BallLabel"] unique_name_in_owner = true -visible = false +clip_contents = true layout_mode = 1 anchors_preset = -1 -anchor_left = 1.0 -anchor_top = 0.8 -anchor_right = 1.0 -anchor_bottom = 0.8 -grow_horizontal = 2 +anchor_left = 1.1 +anchor_top = 0.4 +anchor_right = 1.1 +anchor_bottom = 0.4 grow_vertical = 2 theme_override_constants/separation = 0 [node name="Label" type="Label" parent="BallLabel/QuantityContainer"] layout_mode = 2 -size_flags_horizontal = 8 -size_flags_vertical = 8 theme_type_variation = &"QuantityLabel" -theme_override_font_sizes/font_size = 22 +theme_override_font_sizes/font_size = 40 text = "×" [node name="QuantityLabel" type="Label" parent="BallLabel/QuantityContainer"] unique_name_in_owner = true layout_mode = 2 -size_flags_horizontal = 8 -size_flags_vertical = 8 theme_type_variation = &"QuantityLabel" -theme_override_font_sizes/font_size = 22 -text = "-1" +theme_override_font_sizes/font_size = 40 +text = "18" diff --git a/src/ui/shot_hud/shot_hud.tscn b/src/ui/shot_hud/shot_hud.tscn index 803d4d5..17bbc7e 100644 --- a/src/ui/shot_hud/shot_hud.tscn +++ b/src/ui/shot_hud/shot_hud.tscn @@ -727,6 +727,7 @@ unique_name_in_owner = true libraries = { "": SubResource("AnimationLibrary_dicse") } +speed_scale = 0.9 [node name="ClubSelector" parent="." instance=ExtResource("2_1hdub")] unique_name_in_owner = true