diff options
Diffstat (limited to 'src/json.rs')
| -rw-r--r-- | src/json.rs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/json.rs b/src/json.rs index a7d7759..82fc9fc 100644 --- a/src/json.rs +++ b/src/json.rs @@ -104,14 +104,19 @@ impl JsonState { Ok(GameState { status: GameStatus::Continue, players: [self.player.to_player()?, self.opponent.to_player()], - obstacles: Rc::new( + muds: Rc::new( self.world_map .iter() .flatten() - .filter(|cell| { - cell.surface_object == JsonSurfaceObject::Mud - || cell.surface_object == JsonSurfaceObject::OilSpill - }) + .filter(|cell| cell.surface_object == JsonSurfaceObject::Mud) + .map(|cell| cell.position.to_position()) + .collect(), + ), + oil_spills: Rc::new( + self.world_map + .iter() + .flatten() + .filter(|cell| cell.surface_object == JsonSurfaceObject::OilSpill) .map(|cell| cell.position.to_position()) .collect(), ), |