diff options
Diffstat (limited to 'server/src/game.rs')
| -rw-r--r-- | server/src/game.rs | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/server/src/game.rs b/server/src/game.rs index f91e42d0..16f40a6d 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -49,49 +49,9 @@ impl Game { players: Default::default(), tiles: Default::default(), }; - for x in -5..5 { - for y in -5..5 { - g.tiles - .insert(IVec2 { x, y }, gamedata.get_tile("floor").unwrap().into()); - } + for (&p, &t) in &gamedata.initial_map { + g.tiles.insert(p, t.into()); } - for x in -5..5 { - g.tiles.insert( - IVec2 { x, y: -5 }, - gamedata.get_tile("counter").unwrap().into(), - ); - g.tiles.insert( - IVec2 { x, y: 4 }, - gamedata.get_tile("table").unwrap().into(), - ); - } - for y in -5..5 { - g.tiles.insert( - IVec2 { x: -5, y }, - gamedata.get_tile("table").unwrap().into(), - ); - g.tiles.insert( - IVec2 { x: 4, y }, - gamedata.get_tile("table").unwrap().into(), - ); - } - - g.tiles.extend( - [ - ([1, 4], "pan"), - ([2, 4], "pan"), - ([-1, 4], "oven"), - ([-2, 4], "oven"), - ([-5, 2], "sink"), - ([-5, 3], "dirty-plate-spawn"), - ([4, 0], "flour-spawn"), - ([4, 1], "tomato-spawn"), - ([4, 2], "raw-steak-spawn"), - ([4, -4], "trash"), - ] - .map(|(k, v)| (IVec2::from_array(k), gamedata.get_tile(v).unwrap().into())), - ); - g } |