diff options
Diffstat (limited to 'client/multiplayer.gd')
| -rw-r--r-- | client/multiplayer.gd | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/client/multiplayer.gd b/client/multiplayer.gd index b3ce6217..d42e500b 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -45,8 +45,8 @@ signal set_tile_item(tile: Vector2i, item: int) signal remove_tile_item(tile: Vector2i) signal set_player_item(player: int, item: int) signal remove_player_item(player: int) -signal set_tile_progress(tile: Vector2i, progress: float, warn: bool) -signal set_player_progress(player: int, progress: float, warn: bool) +signal set_tile_progress(tile: Vector2i, position: float, speed: float, warn: bool) +signal set_player_progress(player: int, position: float, speed: float, warn: bool) signal set_tile_finished(tile: Vector2i, warn: bool) signal set_player_finished(player: int, warn: bool) signal set_ingame(state: bool, lobby: bool) @@ -58,7 +58,7 @@ signal connection_closed(reason: String) signal show_rating(stars: int, points: int) signal show_book() # TODO: Connect this -const VERSION_MAJOR: int = 5 +const VERSION_MAJOR: int = 6 const VERSION_MINOR: int = 0 var connected := false @@ -160,31 +160,27 @@ func handle_packet(bytes: PackedByteArray): put_item.emit(from_player, pos_to_vec2i(to_tile)) elif from_tile != null and to_tile != null: pass_item_tile.emit(pos_to_vec2i(from_tile), pos_to_vec2i(to_tile)) - "set_active": - push_warning("set_active is deprecated") - var tile = pos_to_vec2i(decoded["tile"]) - var warn = decoded["warn"] - var progress = decoded.get("progress") - if progress != null: - set_tile_progress.emit(tile, progress, warn) - else: - set_tile_finished.emit(tile, warn) "set_progress": + var warn: bool = decoded["warn"] + var position: float = decoded["position"] + var speed: float = decoded["speed"] var item: Dictionary = decoded["item"] var tile = item.get("tile") var player = item.get("player") - var warn = decoded["warn"] - var progress = decoded.get("progress") - if progress != null: - if tile != null: - set_tile_progress.emit(pos_to_vec2i(tile), progress, warn) - else: - set_player_progress.emit(player, progress, warn) + + if tile != null: + set_tile_progress.emit(pos_to_vec2i(tile), position, speed, warn) else: - if tile != null: - set_tile_finished.emit(pos_to_vec2i(tile), warn) - else: - set_player_finished.emit(player, warn) + set_player_progress.emit(player, position, speed, warn) + "clear_progress": + var item: Dictionary = decoded["item"] + var tile = item.get("tile") + var player = item.get("player") + + if tile != null: + set_tile_finished.emit(pos_to_vec2i(tile)) + else: + set_player_finished.emit(player) "set_tile_item": push_warning("set_tile_item is deprecated") var tile = pos_to_vec2i(decoded["tile"]) |