Reinstate genworld concept

This commit is contained in:
2022-07-25 09:49:55 +01:00
parent d62e14cdb5
commit 3354d108be
7 changed files with 58 additions and 47 deletions
+7 -2
View File
@@ -199,6 +199,11 @@ data Universe = Universe
, _uvConfig :: Configuration
, _uvTestString :: Universe -> [String]
}
data GenWorld = GenWorld
{ _gwWorld :: World
, _genPlacements :: IM.IntMap [(Placement,Int)]
, _genRooms :: IM.IntMap Room
}
data World = World
{ _keys :: S.Set Scancode
, _mouseButtons :: M.Map MouseButton Bool
@@ -290,8 +295,6 @@ data World = World
, _hammers :: M.Map WorldHammer HammerPosition
, _backspaceTimer :: Int
, _genParams :: GenParams
, _genPlacements :: IM.IntMap [(Placement,Int)]
, _genRooms :: IM.IntMap Room
, _deathDelay :: Maybe Int
, _testFloat :: Float
, _lLine :: (Point2,Point2)
@@ -497,6 +500,8 @@ makeLenses ''Nozzle
makeLenses ''Equipment
makeLenses ''ScreenLayer
makeLenses ''WorldBeams
makeLenses ''GenWorld
----- ROOM LENSES
makeLenses ''Room