diff options
| author | metamuffin <metamuffin@noreply.codeberg.org> | 2024-12-25 19:05:05 +0000 | 
|---|---|---|
| committer | metamuffin <metamuffin@noreply.codeberg.org> | 2024-12-25 19:05:05 +0000 | 
| commit | cc6b50debb9d5b740adbe6f803755413c972659a (patch) | |
| tree | b34a0a5669707992f1334f88a1959d5b1e120415 /server/src/data | |
| parent | 2ceeea0e5fc245602618ec47f6ff1f91a094e130 (diff) | |
| parent | 53cf167c08986caf346957d1f357cefaee1bd6b5 (diff) | |
| download | hurrycurry-cc6b50debb9d5b740adbe6f803755413c972659a.tar hurrycurry-cc6b50debb9d5b740adbe6f803755413c972659a.tar.bz2 hurrycurry-cc6b50debb9d5b740adbe6f803755413c972659a.tar.zst  | |
Merge pull request 'Two-handed players' (#236) from two-handed into master
Reviewed-on: https://codeberg.org/hurrycurry/hurrycurry/pulls/236
Diffstat (limited to 'server/src/data')
| -rw-r--r-- | server/src/data/mod.rs | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/server/src/data/mod.rs b/server/src/data/mod.rs index 57051fe9..64f40217 100644 --- a/server/src/data/mod.rs +++ b/server/src/data/mod.rs @@ -73,6 +73,7 @@ pub struct MapDecl {      walkable: Vec<String>,      chef_spawn: char,      customer_spawn: char, +    #[serde(default)] hand_count: Option<usize>,      #[serde(default)] entities: Vec<EntityDecl>,      #[serde(default)] tile_entities: HashMap<char, EntityDecl>,      #[serde(default)] score_baseline: i64, @@ -314,6 +315,7 @@ pub fn build_data(              item_names,              demands,              tile_names, +            hand_count: map_in.hand_count.unwrap_or(1),          },          Serverdata {              initial_map,  |