Add mouse support for Interactions

Author: food-please

maps/town/runner.dch

@@ -1,6 +1,7 @@
 {
 "@path": "res://addons/dialogic/Resources/character.gd",
 "@subpath": NodePath(""),
+"_translation_id": "",
 "color": Color(1, 1, 1, 1),
 "custom_info": {
 "sound_mood_default": "",

project.godot

@@ -19,7 +19,7 @@ config/icon="res://icon.svg"
 
 Camera="*res://src/field/field_camera.gd"
 Dialogic="*res://addons/dialogic/Other/DialogicGameHandler.gd"
-FieldEvents="*res://src/common/globals/global_field_events.gd"
+FieldEvents="*res://src/common/field_events.gd"
 Music="*res://src/common/music/music_player.tscn"
 
 [dialogic]

src/common/globals/directions.gd src/common/directions.gdsrc/common/globals/directions.gd renamed to src/common/directions.gd

@@ -184,7 +184,6 @@ region_enabled = true
 region_rect = Rect2(17, 119, 16, 16)
 
 [node name="BlockingArea" type="Area2D" parent="Area2D/ClosedDoor" index="0"]
-collision_layer = 2
 collision_mask = 0
 monitoring = false
 

src/common/globals/global_field_events.gd src/common/field_events.gdsrc/common/globals/global_field_events.gd renamed to src/common/field_events.gd

@@ -2,14 +2,6 @@ extends Node2D
 
 const PLAYER_CONTROLLER: = preload("res://src/field/gamepieces/controllers/player_controller.tscn")
 
-## The physics layers which will be used to search for gamepiece objects.
-## Please see the project properties for the specific physics layers. [b]All[/b] collision shapes
-## matching the mask will be checked regardless of position in the scene tree.
-@export_flags_2d_physics var gamepiece_mask: = 0
-
-## The physics layers which will be used to search for terrain obejcts.
-@export_flags_2d_physics var terrain_mask: = 0
-
 @export var opening_cutscene: Cutscene
 
 @export var focused_game_piece: Gamepiece = null:
@@ -48,8 +40,6 @@ func set_focused_game_piece(value: Gamepiece) -> void:
 
 	if focused_game_piece:
 		var new_controller = PLAYER_CONTROLLER.instantiate()
-		new_controller.gamepiece_mask = gamepiece_mask
-		new_controller.terrain_mask = terrain_mask
 
 		focused_game_piece.add_child(new_controller)
 		new_controller.is_active = true

src/field/cutscenes/templates/doors/door.tscn

@@ -22,8 +22,9 @@ const BLOCKING_PROPERTY: = "blocks_movement"
 ## containing any terrain collider will not be included for pathfinding.
 @export_flags_2d_physics var terrain_mask: = 0x1
 
-## Colliders matching the following mask will be used to determine which cells are blocked by other
-## gamepieces.
+## The physics layers which will be used to search for gamepiece-related objects.
+## Please see the project properties for the specific physics layers. [b]All[/b] collision shapes
+## matching the mask will be checked regardless of position in the scene tree.
 @export_flags_2d_physics var gamepiece_mask: = 0
 
 # Some controllers may be needed during cutscenes. In this case, they will not be paused.
@@ -119,9 +120,12 @@ func _get_configuration_warnings() -> PackedStringArray:
 	return warnings
 
 
-func travel_to_cell(destination: Vector2i) -> void:
+func travel_to_cell(destination: Vector2i, allow_adjacent_cells: = false) -> void:
 	_update_changed_cells()
 	_waypoints = pathfinder.get_path_cells(_gamepiece.cell, destination)
+	# No path could be found to the destination. If allowed, search for a path to an adjacent cell.
+	if _waypoints.size() <= 1 and allow_adjacent_cells:
+		_waypoints = pathfinder.get_path_cells_to_adjacent_cell(_gamepiece.cell, destination)
 
 	# Only follow a valid path with a length greater than 0 (more than one waypoint).
 	if _waypoints.size() > 1:
@@ -130,6 +134,9 @@ func travel_to_cell(destination: Vector2i) -> void:
 		_current_waypoint = _waypoints.pop_front()
 
 		_gamepiece.travel_to_cell(_current_waypoint)
+	
+	else:
+		_waypoints.clear()
 
 
 ## Returns true if a given cell is occupied by something that has a collider matching 

src/field/field.gd

@@ -15,9 +15,9 @@ var is_active: = false:
 		set_process_input(is_active)
 		set_process_unhandled_input(is_active)
 
-# Keep track of the target of a path. Used to face/interact with the object at a path's end.
+# Keep track of a targeted interaction. Used to face & interact with the object at a path's end.
 # It is reset on cancelling the move path or continuing movement via arrows/gamepad directions.
-var _target: Gamepiece = null
+var _target: Interaction = null
 
 @onready var _interaction_searcher: = $InteractionSearcher as Area2D
 @onready var _player_collision: = $PlayerCollision as Area2D
@@ -67,6 +67,8 @@ func set_is_paused(paused: bool) -> void:
 func _physics_process(_delta: float) -> void:
 	var move_dir: = _get_move_direction()
 	if move_dir:
+		_target = null
+		
 		if not _gamepiece.is_moving():
 			var target_cell: = Vector2i.ZERO
 
@@ -141,25 +143,37 @@ func _on_gamepiece_arrived() -> void:
 	super._on_gamepiece_arrived()
 
 	if _target:
-		var distance_to_target: = _target.position - _gamepiece.position
+		var distance_to_target: = _target.global_position/_target.global_scale - _gamepiece.position
 		_gamepiece.direction = distance_to_target
 
-		# TODO: Interactions go here.
-		
+		_target.run()
 		_target = null
 
 
 func _on_cell_selected(cell: Vector2i) -> void:
-	if not _gamepiece.is_moving():
+	if is_active and not _gamepiece.is_moving():
 		# Don't move to the cell the focus is standing on. May want to open inventory.
 		if cell == _gamepiece.cell:
 			return
 
 		# We'll want different behaviour depending on what's underneath the cursor.
-		# If there is an interactable, blocking object beneath the cursor, we'll walk *next* to 
-		# the cell.
+		var collisions: = get_collisions(cell)
 
-		# If the cell beneath the cursor is empty the focus can follow a path to the cell.
-		travel_to_cell(cell)
+		# If there is an interaction underneath the cursor the player's gamepiece should flag the
+		# target and move to an adjacent cell.
+		if not collisions.is_empty():
+			for collision: Dictionary in collisions:
+				if collision.collider.owner is Interaction:
+					_target = collision.collider.owner
+					break
+		
+		# The following method will move to an empty cell OR adjacent to a blocked cell that has
+		# an interaction located on it.
+		travel_to_cell(cell, _target != null)
 		if not _waypoints.is_empty():
 			FieldEvents.player_path_set.emit(_gamepiece, _waypoints.back())
+		
+		# There is no path but there is a target, which means that the player is standing right next
+		# to the target interaction.
+		elif _target:
+			_on_gamepiece_arrived()

src/field/gamepieces/controllers/gamepiece_controller.gd

@@ -10,6 +10,7 @@ radius = 6.0
 
 [node name="PlayerController" type="Node2D"]
 script = ExtResource("1_i2bab")
+gamepiece_mask = 18
 
 [node name="PlayerCollision" type="Area2D" parent="."]
 collision_layer = 4

src/field/gamepieces/controllers/player_controller.gd

@@ -311,8 +311,6 @@ size = Vector2(15, 15)
 [node name="Gameboard" type="Node2D" node_paths=PackedStringArray("opening_cutscene", "focused_game_piece")]
 scale = Vector2(5, 5)
 script = ExtResource("2_bkxev")
-gamepiece_mask = 2
-terrain_mask = 1
 opening_cutscene = NodePath("OpeningCutscene")
 focused_game_piece = NodePath("Terrain/Gamepieces/Player")
 gameboard = ExtResource("6_kd8tv")
@@ -435,7 +433,7 @@ timeline = ExtResource("24_grnqa")
 emote = 0
 
 [node name="Smith" parent="Terrain/Gamepieces/Town" instance=ExtResource("11_yntrj")]
-position = Vector2(136, 88)
+position = Vector2(152, 120)
 gameboard = ExtResource("6_kd8tv")
 blocks_movement = true
 metadata/_edit_group_ = true
@@ -499,6 +497,7 @@ metadata/_edit_group_ = true
 metadata/_edit_lock_ = true
 
 [node name="Interaction" parent="Terrain/Gamepieces/Town/Door" instance=ExtResource("19_sa6jd")]
+position = Vector2(0, -8)
 script = ExtResource("34_xtrml")
 
 [node name="InteractionPopup" parent="Terrain/Gamepieces/Town/Door/Interaction" instance=ExtResource("34_qs25x")]