diff options
Diffstat (limited to 'client/game.gd')
| -rw-r--r-- | client/game.gd | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/client/game.gd b/client/game.gd index c112eb37..f159077e 100644 --- a/client/game.gd +++ b/client/game.gd @@ -44,7 +44,7 @@ enum JoinState { JOINED, } -var player_id: float = -1 +var my_player_id: float = -1 var item_names: Array = [] var item_index_by_name: Dictionary = {} var tile_names: Array = [] @@ -86,7 +86,7 @@ func _ready(): func handle_packet(p): match p.type: - "joined": player_id = p.id + "joined": my_player_id = p.id "data": item_names = p["data"]["item_names"] tile_names = p["data"]["tile_names"] @@ -111,7 +111,7 @@ func handle_packet(p): data_updated.emit() "add_player": var player_instance: Player - if p.id == player_id: + if p.id == my_player_id: player_instance = ControllablePlayer.new(p.id, p.name, p.position, p.character, p.class, self) in_lobby_updated.connect(player_instance.onscreen_controls.in_lobby_updated) player_instance.onscreen_controls.in_lobby_updated(in_lobby) @@ -130,7 +130,7 @@ func handle_packet(p): if player.is_customer and player.current_item_message != null: tutorial_queue.erase(player.current_item_message) pinned_items.clear_item(p.id) - if p.id == player_id: + if p.id == my_player_id: set_join_state(JoinState.SPECTATING) follow_camera.target = $Center for h in player.hand: @@ -142,10 +142,10 @@ func handle_packet(p): "movement": var player_instance: Player = players[p.player] player_instance.update_position(p.pos, p.rot, p.boost) - if p.player == player_id: last_position = p.pos + if p.player == my_player_id: last_position = p.pos "movement_sync": - if not players.has(player_id): return - var player_instance: ControllablePlayer = players[player_id] + if not players.has(my_player_id): return + var player_instance: ControllablePlayer = players[my_player_id] player_instance.position_ = last_position "move_item": if "player" in p.from and "player" in p.to: @@ -240,7 +240,7 @@ func handle_packet(p): else: tutorial_running = true update_tutorial_running.emit(tutorial_running) - mp.send_chat(player_id, "/start-tutorial %s" % item_name) + mp.send_chat(my_player_id, "/start-tutorial %s" % item_name) elif "text" in p.message or "translation" in p.message: var data = TextMessage.new() data.timeout_initial = timeout_initial @@ -291,7 +291,7 @@ func handle_packet(p): if p.time_remaining != null: overlay.update(p.demands_failed, p.demands_completed, p.points, p.time_remaining) "tutorial_ended": - if p.player != player_id: return + if p.player != my_player_id: return tutorial_running = false update_tutorial_running.emit(tutorial_running) @@ -310,7 +310,7 @@ func handle_packet(p): if not tutorial_queue.is_empty() and not Global.get_setting("gameplay.tutorial_disabled"): tutorial_running = true update_tutorial_running.emit(tutorial_running) - mp.send_chat(player_id, "/start-tutorial %s" % tutorial_queue.pop_front()) + mp.send_chat(my_player_id, "/start-tutorial %s" % tutorial_queue.pop_front()) else: tutorial_queue.clear() "menu": @@ -327,7 +327,7 @@ func handle_packet(p): else: popup_message.display_server_msg(mstr) "server_hint": - if p.player != player_id: return + if p.player != my_player_id: return var message = p.get("message") var position_ = p.get("position") @@ -369,7 +369,7 @@ func toggle_join(): push_error("Join/Leave action already toggled.") JoinState.JOINED: set_join_state(JoinState.WAITING) - mp.send_leave(player_id) + mp.send_leave(my_player_id) func _process(delta): update_center() |