From ecdedfc58c83fe48ae1a9ab0b8d5c09218adf845 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sat, 19 Apr 2025 10:01:37 -0600 Subject: [PATCH] Using InputPrompt for interact prompt --- assets/text/text.csv | 2 ++ src/ui/elements/input_prompt/input_prompt.gd | 1 + .../elements/input_prompt/input_prompt.tscn | 7 +++--- src/ui/hud/player_hud.tscn | 24 ++++++++++++------- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/assets/text/text.csv b/assets/text/text.csv index a7e3a99..bd9c792 100644 --- a/assets/text/text.csv +++ b/assets/text/text.csv @@ -39,6 +39,8 @@ SETTINGS_AUDIO_HEADING,"Audio Settings" SETTINGS_CONTROLS,Controls SETTINGS_CONTROLS_HEADING,"Control Bindings" , +ACTION_HOLD_MODIFIER,Hold +, ACTION_move_forward,"Move forward" ACTION_move_left,"Move left" ACTION_move_back,"Move back" diff --git a/src/ui/elements/input_prompt/input_prompt.gd b/src/ui/elements/input_prompt/input_prompt.gd index 358e827..64c1e4e 100644 --- a/src/ui/elements/input_prompt/input_prompt.gd +++ b/src/ui/elements/input_prompt/input_prompt.gd @@ -31,6 +31,7 @@ const ACTION_HOLD_KEY := "ACTION_HOLD_MODIFIER" func _ready() -> void: + ProjectSettings.settings_changed.connect(_update) _update() diff --git a/src/ui/elements/input_prompt/input_prompt.tscn b/src/ui/elements/input_prompt/input_prompt.tscn index b7d4945..cd15323 100644 --- a/src/ui/elements/input_prompt/input_prompt.tscn +++ b/src/ui/elements/input_prompt/input_prompt.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=3 uid="uid://b47goj32i6sdh"] +[gd_scene load_steps=3 format=3 uid="uid://b47goj32i6sdh"] -[ext_resource type="Script" path="res://src/ui/elements/input_prompt/input_prompt.gd" id="1_qq6w5"] +[ext_resource type="Theme" uid="uid://doq7ay6f7dgfo" path="res://src/ui/menus/menu.theme" id="1_br7b0"] +[ext_resource type="Script" uid="uid://dn50ip335p7oh" path="res://src/ui/elements/input_prompt/input_prompt.gd" id="1_qq6w5"] [node name="InputPrompt" type="Label"] anchors_preset = 15 @@ -8,7 +9,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +theme = ExtResource("1_br7b0") theme_type_variation = &"InputPrompt" text = "❓ - ACTION_" script = ExtResource("1_qq6w5") -hold = null diff --git a/src/ui/hud/player_hud.tscn b/src/ui/hud/player_hud.tscn index d185a81..bae9d7b 100644 --- a/src/ui/hud/player_hud.tscn +++ b/src/ui/hud/player_hud.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://dq1x21tq06dud"] +[gd_scene load_steps=11 format=3 uid="uid://dq1x21tq06dud"] [ext_resource type="Theme" uid="uid://b07fevr214mmr" path="res://src/ui/hud/hud_theme.tres" id="1_lirk3"] [ext_resource type="Script" uid="uid://lrsv0185bfu" path="res://src/ui/hud/player_hud.gd" id="2_j6lpx"] [ext_resource type="Script" uid="uid://bdsv404evn4fk" path="res://src/ui/hud/interact_hud.gd" id="3_n6jee"] [ext_resource type="FontFile" uid="uid://qadtckvw0t3l" path="res://assets/fonts/fontawesome-free-6.7.2-desktop/otfs/Font Awesome 6 Free-Solid-900.otf" id="4_2q5it"] +[ext_resource type="PackedScene" uid="uid://b47goj32i6sdh" path="res://src/ui/elements/input_prompt/input_prompt.tscn" id="4_iwjh7"] [ext_resource type="Script" uid="uid://cjs2fen6jo0g0" path="res://src/ui/rumbler.gd" id="4_ud8na"] [sub_resource type="Animation" id="Animation_n6jee"] @@ -153,10 +154,17 @@ offset_right = 85.0 grow_horizontal = 2 grow_vertical = 0 -[node name="Label" type="Label" parent="InteractHUD/HBoxContainer"] +[node name="InputPrompt" parent="InteractHUD/HBoxContainer" instance=ExtResource("4_iwjh7")] layout_mode = 2 -text = "Press [E] to " -horizontal_alignment = 2 +theme_override_colors/font_color = Color(1, 1, 1, 1) +theme_override_constants/outline_size = 16 +text = "❓" +action = &"interact" +show_name = false + +[node name="Spacer" type="Label" parent="InteractHUD/HBoxContainer"] +layout_mode = 2 +text = " - " [node name="InteractVerb" type="Label" parent="InteractHUD/HBoxContainer"] unique_name_in_owner = true @@ -234,10 +242,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -396.518 -offset_top = -302.686 -offset_right = -396.518 -offset_bottom = -302.686 +offset_left = -398.862 +offset_top = -301.076 +offset_right = -398.862 +offset_bottom = -301.076 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("4_ud8na")