diff options
| -rw-r--r-- | client/game.gd | 4 | ||||
| -rw-r--r-- | client/menu/lobby.gd | 11 | ||||
| -rw-r--r-- | client/multiplayer.gd | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/client/game.gd b/client/game.gd index f96398b2..98c8fd84 100644 --- a/client/game.gd +++ b/client/game.gd @@ -35,7 +35,7 @@ var tile_names: Array = [] var tile_index_by_name: Dictionary = {} var tile_collide: Array = [] var tile_interact: Array = [] -var maps: Dictionary = {} +var maps: Array = [] var in_lobby := false var is_replay := false var is_joined := false @@ -69,7 +69,7 @@ func _ready(): tile_names_: Array, tile_collide_: Array, tile_interact_: Array, - maps_: Dictionary + maps_: Array ): item_names = item_names_ tile_names = tile_names_ diff --git a/client/menu/lobby.gd b/client/menu/lobby.gd index 3d8401d0..d1b186f7 100644 --- a/client/menu/lobby.gd +++ b/client/menu/lobby.gd @@ -51,10 +51,10 @@ func initialize(): for c in map_list.get_children(): c.queue_free() var i := 0 - for m in game.maps.keys(): + for m in game.maps: var b = Button.new() - b.name = m - b.text = "%s (%d)" % [game.maps[m]["name"], game.maps[m]["players"]] + b.name = m[0] + b.text = "%s (%d)" % [m[1]["name"], m[1]["players"]] b.pressed.connect(select_map.bind(i)) b.focus_entered.connect(select_map.bind(i)) map_list.add_child(b) @@ -65,12 +65,11 @@ func select_map(i: int): if i >= map_count: return selected_map = i - var k = game.maps.keys()[i] - var map_data: Dictionary = game.maps[k] + var map_data: Dictionary = game.maps[i][1] map_name_label.text = map_data["name"] map_player_label.text = tr("%d players recommended") % map_data["players"] map_difficulty_label.text = difficulty_names[map_data["difficulty"] - 1] - selected_map_name = k + selected_map_name = game.maps[i][0] map_list.get_child(i).grab_focus() func update_players(player_list: Dictionary): diff --git a/client/multiplayer.gd b/client/multiplayer.gd index 095d3d7b..299db369 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -24,7 +24,7 @@ signal data( tile_names: Array[String], tile_collide: Array[String], tile_interact: Array[String], - map_names: Array[String] + maps: Array ) signal set_tile(tile: Vector2i, kind: int, neighbors: Array[String]) signal remove_tile(tile: Vector2i) |