Move interact verb/action to HUD

Instead of showing text over the object in the world, show it on the HUD
at the bottom of the screen, in place of the "Interact" label.

Show a bouncing red arrow above the currently-targetted interactable
entity. Show nothing above interactable entities that are not currently
targetted, but define an "idle" animation for this case so that we could
in theory change this later just by adjusting the animation.

Define the arrow position with a Marker2D attached to the InteractArea.
Migrate all existing interact_label_position values to a new Marker2D
node on each - these will not all be correct, but some of them might be.
Manually adjust some, including the tricky case of the Stella tortoise.
(Doing this by moving a Marker2D around in the editor is so much easier
than when I did it by editing Vector2 values by hand!)

Make all InteractArea nodes visible. (In a number of cases we previously
hid them to reduce the visual clutter, but this would hide the arrow.)

At runtime, if no Marker2D is provided, place one 64px
above the InteractArea node - better than nothing.

Add a sound effect that plays when the interaction target changes.
Adjust the logic in character_sight.gd to only emit
interact_area_changed if it actually does change, to avoid annoying
extra clicks when the player moves in such a way that a second object is
in range but the best object hasn't changed.

Resolves #2114

Author: wjt

scenes/game_elements/characters/npcs/talker/talker.tscn

@@ -28,18 +28,21 @@ flip_h = true
 rotation = -1.5708
 shape = SubResource("CapsuleShape2D_3vyb7")
 
-[node name="InteractArea" type="Area2D" parent="." unique_id=1202156030]
+[node name="InteractArea" type="Area2D" parent="." unique_id=1202156030 node_paths=PackedStringArray("marker")]
 unique_name_in_owner = true
 collision_layer = 32
 collision_mask = 0
 script = ExtResource("3_c0xhn")
-interact_label_position = Vector2(0, -100)
+marker = NodePath("Marker")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="InteractArea" unique_id=792948505]
 position = Vector2(0, -29)
 shape = SubResource("RectangleShape2D_3eksq")
 debug_color = Color(0.600391, 0.54335, 0, 0.42)
 
+[node name="Marker" type="Marker2D" parent="InteractArea" unique_id=609991529]
+position = Vector2(0, -100)
+
 [node name="TalkBehavior" type="Node" parent="." unique_id=131616442 node_paths=PackedStringArray("interact_area")]
 unique_name_in_owner = true
 script = ExtResource("4_t2xbo")

scenes/game_elements/characters/player/components/player_interaction.gd

@@ -3,8 +3,9 @@
 class_name PlayerInteraction
 extends Node2D
 
-## Emitted when [method can_interact] will return a different value.
-signal can_interact_changed
+## Emitted when the entity the player is able to interact with changes (possibly
+## to nothing).
+signal interact_action_changed
 
 ## The character that gains interaction.
 ## [br][br]
@@ -14,8 +15,6 @@ signal can_interact_changed
 	set = _set_character
 
 @onready var character_sight: CharacterSight = %CharacterSight
-@onready var interact_marker: Marker2D = %InteractMarker
-@onready var interact_label: FixedSizeLabel = %InteractLabel
 
 @onready var player: Player = self.owner as Player
 
@@ -25,10 +24,15 @@ func _set_character(new_character: CharacterBody2D) -> void:
 	update_configuration_warnings()
 
 
-## Returns [code]true[/code] if the character is currently able to interact with
-## something in the environment.
-func can_interact() -> bool:
-	return character_sight.interact_area != null
+## Returns the human-readable text of [member character]'s current interact
+## action (e.g. [code]"Talk"[/code]), or [code]""[/code] (empty string) if
+## [member character] cannot currently interact with anything. Use [signal
+## interact_action_changed] to monitor for changes.
+func get_interact_action() -> String:
+	if character_sight.interact_area != null:
+		var action := character_sight.interact_area.action
+		return action if action else tr("Interact")
+	return ""
 
 
 func _is_interacting() -> bool:
@@ -47,14 +51,6 @@ func _ready() -> void:
 	_on_character_sight_interact_area_changed()
 
 
-func _process(_delta: float) -> void:
-	if not character_sight.interact_area:
-		return
-	interact_marker.global_position = (
-		character_sight.interact_area.get_global_interact_label_position()
-	)
-
-
 func _unhandled_input(_event: InputEvent) -> void:
 	if _is_interacting():
 		return
@@ -68,7 +64,6 @@ func _unhandled_input(_event: InputEvent) -> void:
 
 		get_viewport().set_input_as_handled()
 		character_sight.monitoring = false
-		interact_label.visible = false
 		interact_area.interaction_ended.connect(_on_interaction_ended, CONNECT_ONE_SHOT)
 		interact_area.start_interaction(player, character_sight.is_looking_from_right)
 
@@ -81,13 +76,4 @@ func _on_interaction_ended() -> void:
 
 
 func _on_character_sight_interact_area_changed() -> void:
-	if _is_interacting():
-		return
-
-	if not character_sight.interact_area:
-		interact_label.visible = false
-	else:
-		interact_label.visible = true
-		interact_label.label_text = character_sight.interact_area.action
-
-	can_interact_changed.emit()
+	interact_action_changed.emit()

scenes/game_elements/characters/player/player.tscn

@@ -8,7 +8,6 @@
 [ext_resource type="Script" uid="uid://bpu6jo4kvehlg" path="res://scenes/game_elements/characters/player/components/player_interaction.gd" id="3_dqkch"]
 [ext_resource type="Script" uid="uid://qro4uo83ba8f" path="res://scenes/game_elements/characters/player/components/player_sprite.gd" id="3_qlg0r"]
 [ext_resource type="Script" uid="uid://necvar42rnih" path="res://scenes/game_elements/props/character_sight/character_sight.gd" id="6_3in67"]
-[ext_resource type="PackedScene" uid="uid://yfpfno276rol" path="res://scenes/game_elements/props/fixed_size_label/fixed_size_label.tscn" id="6_h17s1"]
 [ext_resource type="Script" uid="uid://e78f8iq448e1" path="res://scenes/game_elements/characters/player/components/animation_player.gd" id="7_0owmy"]
 [ext_resource type="AudioStream" uid="uid://cx6jv2cflrmqu" path="res://assets/third_party/sounds/characters/player/Foot.ogg" id="11_blfj0"]
 [ext_resource type="Texture2D" uid="uid://dxaq5piwxqnht" path="res://scenes/game_elements/characters/player/components/dust.png" id="12_3in67"]
@@ -420,22 +419,6 @@ position = Vector2(47, -30)
 shape = SubResource("RectangleShape2D_blfj0")
 debug_color = Color(0.600391, 0.54335, 0, 0.42)
 
-[node name="InteractMarker" type="Marker2D" parent="PlayerInteraction" unique_id=439387414]
-unique_name_in_owner = true
-position = Vector2(-1, -116)
-
-[node name="InteractLabel" parent="PlayerInteraction/InteractMarker" unique_id=554498577 instance=ExtResource("6_h17s1")]
-unique_name_in_owner = true
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-offset_left = 1.0
-offset_top = 11.0
-offset_right = 1.0
-offset_bottom = 11.0
-grow_horizontal = 2
-grow_vertical = 2
-
 [node name="PlayerRepel" parent="." unique_id=1324972992 instance=ExtResource("12_tnibl")]
 unique_name_in_owner = true
 position = Vector2(0, -24)

scenes/game_elements/props/character_sight/character_sight.gd

@@ -76,10 +76,15 @@ func _process(_delta: float) -> void:
 
 
 func _on_area_entered(_area: Area2D) -> void:
-	interact_area = _get_best_interact_area()
-	interact_area_changed.emit()
+	_update_interact_area()
 
 
 func _on_area_exited(_area: Area2D) -> void:
-	interact_area = _get_best_interact_area()
-	interact_area_changed.emit()
+	_update_interact_area()
+
+
+func _update_interact_area() -> void:
+	var best := _get_best_interact_area()
+	if interact_area != best:
+		interact_area = best
+		interact_area_changed.emit()

scenes/game_elements/props/checkpoint/checkpoint.tscn

@@ -24,12 +24,12 @@ sprite_frames = ExtResource("4_3xcwf")
 animation = &"idle"
 autoplay = "idle"
 
-[node name="InteractArea" type="Area2D" parent="." unique_id=2037902510]
+[node name="InteractArea" type="Area2D" parent="." unique_id=2037902510 node_paths=PackedStringArray("marker")]
 unique_name_in_owner = true
 collision_layer = 0
 collision_mask = 0
 script = ExtResource("4_bjlxs")
-interact_label_position = Vector2(0, -128)
+marker = NodePath("Marker")
 disabled = true
 action = "Admire"
 metadata/_custom_type_script = "uid://du8wfijr35r35"
@@ -39,6 +39,9 @@ position = Vector2(1, -4)
 shape = SubResource("CircleShape2D_3xcwf")
 debug_color = Color(0.600391, 0.54335, 0, 0.42)
 
+[node name="Marker" type="Marker2D" parent="InteractArea" unique_id=1178774098]
+position = Vector2(0, -128)
+
 [node name="TalkBehavior" type="Node" parent="." unique_id=487856562 node_paths=PackedStringArray("interact_area")]
 unique_name_in_owner = true
 script = ExtResource("5_3xcwf")

scenes/game_elements/props/collectible_item/collectible_item.tscn

@@ -94,6 +94,18 @@ tracks/6/keys = {
 "update": 0,
 "values": [0.0]
 }
+tracks/7/type = "value"
+tracks/7/imported = false
+tracks/7/enabled = true
+tracks/7/path = NodePath("InteractArea:disabled")
+tracks/7/interp = 1
+tracks/7/loop_wrap = true
+tracks/7/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [false]
+}
 
 [sub_resource type="Animation" id="Animation_7ff3m"]
 resource_name = "collected"
@@ -197,6 +209,18 @@ tracks/7/keys = {
 "update": 0,
 "values": [0.0, 0.0, -12.0]
 }
+tracks/8/type = "value"
+tracks/8/imported = false
+tracks/8/enabled = true
+tracks/8/path = NodePath("InteractArea:disabled")
+tracks/8/interp = 1
+tracks/8/loop_wrap = true
+tracks/8/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [true]
+}
 
 [sub_resource type="Animation" id="Animation_qy0vu"]
 resource_name = "reveal"
@@ -277,18 +301,21 @@ height = 28.0
 [node name="CollectibleItem" type="Node2D" unique_id=327991066]
 script = ExtResource("1_7ff3m")
 
-[node name="InteractArea" type="Area2D" parent="." unique_id=1327503985]
+[node name="InteractArea" type="Area2D" parent="." unique_id=1327503985 node_paths=PackedStringArray("marker")]
 collision_layer = 32
 collision_mask = 0
 script = ExtResource("2_1kegn")
-interact_label_position = Vector2(0, -71)
+marker = NodePath("Marker")
 action = "Collect"
 metadata/_custom_type_script = "uid://du8wfijr35r35"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="InteractArea" unique_id=1121983883]
 shape = SubResource("CircleShape2D_ghwae")
 debug_color = Color(0.600391, 0.54335, 0, 0.42)
 
+[node name="Marker" type="Marker2D" parent="InteractArea" unique_id=1961850851]
+position = Vector2(0, -48)
+
 [node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1869284545]
 libraries/ = SubResource("AnimationLibrary_8dm1m")
 

scenes/game_elements/props/eternal_loom/eternal_loom.tscn

@@ -542,14 +542,13 @@ position = Vector2(-1.5, 32)
 shape = SubResource("RectangleShape2D_uojly")
 debug_color = Color(0, 0.588235, 0.698039, 0.419608)
 
-[node name="InteractArea" type="Area2D" parent="." unique_id=1735004807]
+[node name="InteractArea" type="Area2D" parent="." unique_id=1735004807 node_paths=PackedStringArray("marker")]
 unique_name_in_owner = true
-visible = false
 position = Vector2(0, 55)
 collision_layer = 32
 collision_mask = 0
 script = ExtResource("3_mjlja")
-interact_label_position = Vector2(0, 45)
+marker = NodePath("Marker")
 action = "Use Eternal Loom"
 metadata/_custom_type_script = "uid://du8wfijr35r35"
 
@@ -558,6 +557,9 @@ position = Vector2(0, 120)
 shape = SubResource("RectangleShape2D_uhynt")
 debug_color = Color(0.600391, 0.54335, 0, 0.42)
 
+[node name="Marker" type="Marker2D" parent="InteractArea" unique_id=556753843]
+position = Vector2(0, -152)
+
 [node name="TalkBehavior" type="Node" parent="." unique_id=562216088 node_paths=PackedStringArray("interact_area")]
 unique_name_in_owner = true
 script = ExtResource("4_eq7jh")

scenes/game_elements/props/interact_area/interact_area.gd

@@ -20,20 +20,26 @@ signal interaction_ended
 ## Emitted when characters start or stop seeing this area for interaction.
 signal observers_changed
 
-const EXAMPLE_INTERACTION_FONT = preload("uid://c3bb7lmvdqc5e")
-const EXAMPLE_INTERACTION_FONT_SIZE = 34
+const INDICATOR_SCENE := preload("uid://d252j2mhya0kq")
 
-## Vector2 that approximates the position in which the interact label would
-## appear when a player is close.
-@export_custom(PROPERTY_HINT_RANGE, "-200,200,1,suffix:px,or_greater,or_less")
-var interact_label_position: Vector2:
+## Position at which to show an arrow when this area is being observed. This
+## should generally be centred, slightly above the visible extents of the parent
+## object.
+@export var marker: Marker2D:
 	set(new_value):
-		interact_label_position = new_value
-		queue_redraw()
+		if marker and _indicator:
+			marker.remove_child(_indicator)
+		marker = new_value
+		if marker and _indicator:
+			marker.add_child(_indicator)
+
 @export var disabled: bool = false:
 	set(new_value):
 		disabled = new_value
 		set_collision_layer_value(Enums.CollisionLayers.INTERACTABLE, not disabled)
+		if _indicator:
+			_indicator.visible = not disabled
+
 @export var action: String = "Talk"
 
 ## Whether this area is being observed by one or more characters.
@@ -43,6 +49,8 @@ var is_being_observed: bool:
 
 var _observers: Array[CharacterSight] = []
 
+var _indicator: Node2D
+
 
 func start_interaction(player: Player, from_right: bool) -> void:
 	interaction_started.emit(player, from_right)
@@ -52,10 +60,6 @@ func end_interaction() -> void:
 	interaction_ended.emit()
 
 
-func get_global_interact_label_position() -> Vector2:
-	return to_global(interact_label_position)
-
-
 ## A [CharacterSight] calls this when it starts seeing this area.
 func add_observer(character_sight: CharacterSight) -> void:
 	_observers.append(character_sight)
@@ -78,32 +82,19 @@ func _ready() -> void:
 	# Initialise interactable bit in collision_layer
 	disabled = disabled
 
+	if not marker and not Engine.is_editor_hint():
+		marker = Marker2D.new()
+		marker.name = "Marker"
+		# Vaguely sensible default position
+		marker.position = Vector2(0, -64)
+		add_child(marker)
+
+	_indicator = INDICATOR_SCENE.instantiate()
+	if marker:
+		marker.add_child(_indicator)
+
+	observers_changed.connect(_on_observers_changed)
+
 
-func _draw() -> void:
-	if not Engine.is_editor_hint():
-		return
-
-	var string_size := EXAMPLE_INTERACTION_FONT.get_string_size(
-		action, HORIZONTAL_ALIGNMENT_LEFT, -1, EXAMPLE_INTERACTION_FONT_SIZE
-	)
-	var draw_position := (
-		interact_label_position - Vector2(string_size.x, -string_size.y * 2.0) / 2.0
-	)
-	draw_string(
-		EXAMPLE_INTERACTION_FONT,
-		draw_position,
-		action,
-		HORIZONTAL_ALIGNMENT_LEFT,
-		-1,
-		EXAMPLE_INTERACTION_FONT_SIZE
-	)
-	draw_string_outline(
-		EXAMPLE_INTERACTION_FONT,
-		draw_position,
-		action,
-		HORIZONTAL_ALIGNMENT_LEFT,
-		-1,
-		EXAMPLE_INTERACTION_FONT_SIZE,
-		1,
-		Color.BLACK
-	)
+func _on_observers_changed() -> void:
+	_indicator.bouncing = is_being_observed

scenes/game_elements/props/interact_area/interact_indicator.gd

@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: The Threadbare Authors
+# SPDX-License-Identifier: MPL-2.0
+extends Node2D
+
+var bouncing := false:
+	set = set_bouncing
+
+@onready var animation_player: AnimationPlayer = %AnimationPlayer
+
+
+func set_bouncing(new_value: bool) -> void:
+	bouncing = new_value
+	if animation_player:
+		animation_player.play(&"bounce" if new_value else &"idle")
+
+
+func _ready() -> void:
+	set_bouncing(bouncing)

scenes/game_elements/props/interact_area/interact_indicator.gd.uid

@@ -0,0 +1 @@
+uid://darg2a58q4hrn