Add subworlds

src/Swarm/Game/Scenario.hs

@@ -33,6 +33,7 @@ module Swarm.Game.Scenario (
   scenarioEntities,
   scenarioRecipes,
   scenarioKnown,
+  secenarioSubworlds,
   scenarioWorld,
   scenarioRobots,
   scenarioObjectives,
@@ -65,6 +66,7 @@ import Swarm.Game.Scenario.Objective.Validation
 import Swarm.Game.Scenario.RobotLookup
 import Swarm.Game.Scenario.Style
 import Swarm.Game.Scenario.Topography.Cell
+import Swarm.Game.Scenario.Topography.Subworld
 import Swarm.Game.Scenario.Topography.WorldDescription
 import Swarm.Language.Pipeline (ProcessedTerm)
 import Swarm.Util (failT)
@@ -91,6 +93,7 @@ data Scenario = Scenario
   , _scenarioEntities :: EntityMap
   , _scenarioRecipes :: [Recipe Entity]
   , _scenarioKnown :: [Text]
+  , _secenarioSubworlds :: [Subworld]
   , _scenarioWorld :: WorldDescription
   , _scenarioRobots :: [TRobot]
   , _scenarioObjectives :: [Objective]
@@ -110,6 +113,8 @@ instance FromJSONE EntityMap Scenario where
       Left x -> failT [x]
     -- extend ambient EntityMap with custom entities
 
+    subworlds <- v ..:? "subworlds" ..!= []
+
     withE em $ do
       -- parse 'known' entity names and make sure they exist
       known <- liftE (v .:? "known" .!= [])
@@ -133,6 +138,7 @@ instance FromJSONE EntityMap Scenario where
         <*> pure em
         <*> v ..:? "recipes" ..!= []
         <*> pure known
+        <*> pure subworlds
         <*> localE (,rsMap) (v ..: "world")
         <*> pure rs
         <*> (liftE (v .:? "objectives" .!= []) >>= validateObjectives)
@@ -178,6 +184,9 @@ scenarioRecipes :: Lens' Scenario [Recipe Entity]
 --   not have to scan them.
 scenarioKnown :: Lens' Scenario [Text]
 
+-- | The subworlds of the scenario.
+secenarioSubworlds :: Lens' Scenario [Subworld]
+
 -- | The starting world for the scenario.
 scenarioWorld :: Lens' Scenario WorldDescription
 

src/Swarm/Game/Scenario/Topography/Subworld.hs

@@ -0,0 +1,27 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+-- |
+-- SPDX-License-Identifier: BSD-3-Clause
+module Swarm.Game.Scenario.Topography.Subworld where
+
+import Data.Aeson
+import Swarm.Game.Entity
+import Swarm.Game.Scenario.Topography.Navigation.Portal
+import Swarm.Game.Scenario.RobotLookup
+import Swarm.Game.Scenario.Topography.WorldDescription
+import Swarm.Util.Yaml
+
+data Subworld = Subworld
+  { name :: SubworldName
+  , portals :: [Portal]
+  , world :: WorldDescription
+  }
+  deriving (Eq, Show)
+
+instance FromJSONE EntityMap Subworld where
+  parseJSONE = withObjectE "subworld" $ \v -> do
+    n <- liftE (v .: "name")
+    c <- liftE (v .: "connectivity")
+    let rsMap = buildRobotMap []
+    w <- localE (,rsMap) (v ..: "world")
+    return $ Subworld n c w

swarm.cabal

@@ -118,6 +118,7 @@ library
                       Swarm.Game.Scenario.Scoring.ConcreteMetrics
                       Swarm.Game.Scenario.Scoring.GenericMetrics
                       Swarm.Game.Scenario.Status
+                      Swarm.Game.Scenario.Topography.Subworld
                       Swarm.Game.Scenario.Style
                       Swarm.Game.Scenario.Topography.EntityFacade
                       Swarm.Game.Scenario.Topography.Navigation.Portal