summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-06-08 14:09:42 +0200
committermetamuffin <metamuffin@disroot.org>2025-06-08 14:09:42 +0200
commitdc2d0509963afb2d0b23aeb8a9085ade5e5bba93 (patch)
treee2795febc5f78dfce075e0ce0f1832b4c24614f9
parent7bfc0993459686b83a2bed0d32e80dd6fc26e718 (diff)
downloadhurrycurry-dc2d0509963afb2d0b23aeb8a9085ade5e5bba93.tar
hurrycurry-dc2d0509963afb2d0b23aeb8a9085ade5e5bba93.tar.bz2
hurrycurry-dc2d0509963afb2d0b23aeb8a9085ade5e5bba93.tar.zst
client: consider non-interactable tiles with item for interact target; fix #298
-rw-r--r--client/player/controllable_player.gd3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd
index ce20a0a2..22d288f9 100644
--- a/client/player/controllable_player.gd
+++ b/client/player/controllable_player.gd
@@ -243,9 +243,10 @@ func get_interact_target() -> Vector2i:
var offset_cursor := interact_target_i + Vector2i(offset_x, offset_y)
var tile_name = game.map.get_tile_name(offset_cursor)
if tile_name == null: continue
+ var tile_instance = game.map.get_tile_instance(offset_cursor)
var tile_id: int = game.tile_index_by_name[tile_name]
- if game.tile_interact[tile_id]:
+ if game.tile_interact[tile_id] or tile_instance.item != null:
var tile_center := Vector2(offset_cursor) + Vector2(0.5, 0.5)
var cursor_tile_distance := (interact_target - tile_center).length()
var player_tile_distance := Vector2(