update bot
This commit is contained in:
@@ -76,7 +76,7 @@ func grab_item(grid_position: Vector2i) -> bool:
|
||||
|
||||
# Update UI immediately for responsiveness
|
||||
var main = player.get_tree().get_root().get_node_or_null("Main")
|
||||
if main and main.ui_manager:
|
||||
if main and main.ui_manager and not (player.is_bot or player.is_in_group("Bots")):
|
||||
main.ui_manager.update_playerboard_ui()
|
||||
|
||||
# Check if goal is completed after grabbing
|
||||
@@ -87,7 +87,7 @@ func grab_item(grid_position: Vector2i) -> bool:
|
||||
# HOST/SERVER: Broadcast to all clients
|
||||
main.rpc("sync_grid_item", cell.x, cell.y, cell.z, -1)
|
||||
# Use main's RPC which properly looks up player by ID on each client
|
||||
var peer_id = player.get_multiplayer_authority()
|
||||
var peer_id = player.name.to_int()
|
||||
main.rpc("sync_playerboard", peer_id, player.playerboard)
|
||||
player.has_performed_action = true
|
||||
player.consume_action_points(1)
|
||||
@@ -144,7 +144,7 @@ func _execute_grab(grid_pos: Vector2i, cell: Vector3i, item_id: int):
|
||||
player.playerboard[target_slot] = item_id
|
||||
|
||||
# 3c. Broadcast the new playerboard state to all clients
|
||||
var peer_id = player.get_multiplayer_authority()
|
||||
var peer_id = player.name.to_int()
|
||||
main.rpc("sync_playerboard", peer_id, player.playerboard)
|
||||
|
||||
# 3d. Check if goal is completed (SERVER-SIDE - this triggers goal regeneration for clients!)
|
||||
@@ -326,7 +326,7 @@ func auto_put_item() -> bool:
|
||||
|
||||
# Update UI immediately for responsiveness
|
||||
var main = player.get_tree().get_root().get_node_or_null("Main")
|
||||
if main and main.ui_manager:
|
||||
if main and main.ui_manager and not (player.is_bot or player.is_in_group("Bots")):
|
||||
main.ui_manager.update_playerboard_ui()
|
||||
main.ui_manager.current_action_state = main.ui_manager.ActionState.NONE
|
||||
|
||||
@@ -364,9 +364,10 @@ func arrange_playerboard_item(slot_index: int):
|
||||
# Highlight valid adjacent slots
|
||||
for adj_slot in adjacent_slots:
|
||||
if player.playerboard[adj_slot] == -1: # Only highlight empty adjacent slots
|
||||
var adj_slot_ui = main.ui_manager.playerboard_ui.get_child(adj_slot)
|
||||
if adj_slot_ui.get_child_count() > 2:
|
||||
adj_slot_ui.get_child(2).show()
|
||||
if not (player.is_bot or player.is_in_group("Bots")):
|
||||
var adj_slot_ui = main.ui_manager.playerboard_ui.get_child(adj_slot)
|
||||
if adj_slot_ui.get_child_count() > 2:
|
||||
adj_slot_ui.get_child(2).show()
|
||||
player.action_manager.highlighted_cells.append(adj_slot)
|
||||
|
||||
# Connect to slot click signals
|
||||
@@ -403,8 +404,9 @@ func handle_slot_clicked(slot_index: int):
|
||||
selected_playerboard_slot = -1
|
||||
|
||||
# Update the visual representation
|
||||
main.ui_manager.update_playerboard_ui()
|
||||
main.ui_manager.current_action_state = main.ui_manager.ActionState.NONE
|
||||
if not (player.is_bot or player.is_in_group("Bots")):
|
||||
main.ui_manager.update_playerboard_ui()
|
||||
main.ui_manager.current_action_state = main.ui_manager.ActionState.NONE
|
||||
|
||||
# =============================================================================
|
||||
# Helper Functions
|
||||
@@ -594,7 +596,7 @@ func can_move_to_target_playerboard_slot() -> bool:
|
||||
|
||||
func _update_playerboard_slot_visual(slot_index: int):
|
||||
var main = player.get_tree().get_root().get_node_or_null("Main")
|
||||
if not main or not main.playerboard_ui:
|
||||
if not main or not main.playerboard_ui or (player.is_bot or player.is_in_group("Bots")):
|
||||
return
|
||||
|
||||
var slot = main.playerboard_ui.get_child(slot_index)
|
||||
@@ -608,7 +610,7 @@ func _update_playerboard_slot_visual(slot_index: int):
|
||||
|
||||
func _highlight_adjacent_playerboard_slots():
|
||||
var main = player.get_tree().get_root().get_node_or_null("Main")
|
||||
if not main or not main.playerboard_ui:
|
||||
if not main or not main.playerboard_ui or (player.is_bot or player.is_in_group("Bots")):
|
||||
return
|
||||
|
||||
for i in range(25):
|
||||
|
||||
Reference in New Issue
Block a user