diff options
author | nokoe <nokoe@mailbox.org> | 2024-06-23 13:13:05 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-06-23 19:32:37 +0200 |
commit | 78696ae1a7a31b597984aa783253c1b00a043291 (patch) | |
tree | 5f41313726058204298c35caba1cc75163fa6568 /client/scripts | |
parent | b9804603ca520fad268060ac802cec6f27d60782 (diff) | |
download | hurrycurry-78696ae1a7a31b597984aa783253c1b00a043291.tar hurrycurry-78696ae1a7a31b597984aa783253c1b00a043291.tar.bz2 hurrycurry-78696ae1a7a31b597984aa783253c1b00a043291.tar.zst |
allow interaction even though tile is not interactive
Diffstat (limited to 'client/scripts')
-rw-r--r-- | client/scripts/controllable_player.gd | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/client/scripts/controllable_player.gd b/client/scripts/controllable_player.gd index 4cedbdbb..fa22ba02 100644 --- a/client/scripts/controllable_player.gd +++ b/client/scripts/controllable_player.gd @@ -77,16 +77,13 @@ func interact(): var tile_idx = str(target) var t: Floor = game.map.tile_by_pos.get(tile_idx) if t != null: + game.marker.set_interactive(Multiplayer.get_tile_interactive(target)) game.marker.visible = true game.marker_target = t.item_base.global_position - if Multiplayer.get_tile_interactive(target): - game.marker.set_interactive(true) - if Input.is_action_just_pressed("interact"): - Multiplayer.send_interact(target, true) - t.interact() - elif Input.is_action_just_released("interact"): - Multiplayer.send_interact(target, false) - else: - game.marker.set_interactive(false) + if Input.is_action_just_pressed("interact"): + Multiplayer.send_interact(target, true) + t.interact() + elif Input.is_action_just_released("interact"): + Multiplayer.send_interact(target, false) else: game.marker.visible = false |