From d2c793ec7632a5da8065fd52436cfd676cc96a7b Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 30 Sep 2025 02:08:54 +0200 Subject: Tile placeable items client side and interactable empty special case --- client/player/controllable_player.gd | 6 +++--- client/player/player.gd | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'client/player') diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index deb1f089..ec547c81 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -263,7 +263,7 @@ func update_interact_target_dir(): ) var tile = game.map.get_tile_instance(target_tile) if tile != null: - found_interact_target = game.get_tile_interactive(target_tile) + found_interact_target = game.get_tile_interactive(target_tile, hand) target_visual = tile.item_base.global_position else: found_interact_target = false @@ -276,7 +276,7 @@ func update_interact_target_fps(): ) var tile = game.map.get_tile_instance(target_tile) if tile != null: - found_interact_target = game.get_tile_interactive(target_tile) + found_interact_target = game.get_tile_interactive(target_tile, hand) target_visual = tile.item_base.global_position else: found_interact_target = false @@ -307,7 +307,7 @@ func update_interact_target_dirsnap(): var offset_cursor := interact_target_i + Vector2(offset_x, offset_y) var tile_center := Vector2(offset_cursor) + Vector2(0.5, 0.5) - if game.get_tile_interactive(offset_cursor): + if game.get_tile_interactive(offset_cursor, hand): var cursor_tile_distance := interact_target.distance_to(tile_center) var player_tile_distance := Vector2( movement_base.position.x - tile_center.x, diff --git a/client/player/player.gd b/client/player/player.gd index 0ca08742..828a4495 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -46,7 +46,7 @@ var clear_effect_timer: Timer = Timer.new() var is_despawning: bool = false -var hand = [null, null] +var hand = [] var hand_base var character_style: Dictionary var player_class: String @@ -69,6 +69,8 @@ func _init(_id: int, name_: String, pos: Vector2, character_style_: Dictionary, name = name_ username = name_ + for _x in range(Global.hand_count): hand.append(null) + add_child(movement_base) movement_base.add_child(character) position_ = pos -- cgit v1.2.3-70-g09d2