Nest fields in CWorld

src/Dodge/Data/CWorld.hs

@@ -184,15 +184,11 @@ data CWorld = CWorld
     , _seenLocations :: IM.IntMap (WdP2, String)
     , _selLocation :: Int
     , _distortions :: [Distortion]
-    , _worldBounds :: Bounds
-    , _gameRooms :: [GameRoom] -- consider using an IntMap
-    , _roomClipping :: [ConvexPoly]
     , _maybeWorld :: Maybe' CWorld
     , _rewindWorlds :: [CWorld]
     , _worldClock :: Int
-    , _genParams :: GenParams
     , _deathDelay :: Maybe Int
-    , _cwSeed :: Int
+    , _cwGen :: CWGen
     }
 
 data CWGen = CWGen
@@ -200,6 +196,7 @@ data CWGen = CWGen
     , _cwgWorldBounds :: Bounds
     , _cwgGameRooms :: [GameRoom] -- consider using an IntMap
     , _cwgRoomClipping :: [ConvexPoly]
+    , _cwgSeed :: Int
     }
 
 data WorldBeams = WorldBeams
@@ -213,9 +210,11 @@ data WorldBeams = WorldBeams
 deriveJSON defaultOptions ''CWorld
 deriveJSON defaultOptions ''WorldBeams
 deriveJSON defaultOptions ''CWCam
+deriveJSON defaultOptions ''CWGen
 makeLenses ''CWorld
 makeLenses ''WorldBeams
 makeLenses ''CWCam
+makeLenses ''CWGen
 -- $($(derive [d|
 --     instance Deriving (Store CWorld)
 --     |]))