From 8253658aa03294fba2a43ba287ca1870a2b6b4cb Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 14 Aug 2024 13:05:45 +0200 Subject: sort maps in data packet --- server/protocol/src/lib.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'server/protocol/src') diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs index 72eeb0c7..06cc9552 100644 --- a/server/protocol/src/lib.rs +++ b/server/protocol/src/lib.rs @@ -21,10 +21,7 @@ use bincode::{ }; use glam::{IVec2, Vec2}; use serde::{Deserialize, Serialize}; -use std::{ - collections::{HashMap, HashSet}, - fmt::Display, -}; +use std::{collections::HashSet, fmt::Display}; pub use glam; @@ -64,9 +61,9 @@ pub struct DemandIndex(pub usize); #[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode)] pub struct MapMetadata { - name: String, - players: usize, - difficulty: i32, + pub name: String, + pub players: usize, + pub difficulty: i32, } #[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode)] @@ -85,7 +82,8 @@ pub struct Gamedata { pub tile_names: Vec, pub tile_collide: Vec, pub tile_interact: Vec, - pub maps: HashMap, + pub maps: Vec<(String, MapMetadata)>, + pub bot_algos: Vec, pub recipes: Vec, pub demands: Vec, } -- cgit v1.2.3-70-g09d2