Simplify room out/in placements
This commit is contained in:
@@ -105,9 +105,8 @@ data Room = Room
|
||||
, _rmPos :: [RoomPos]
|
||||
, _rmPath :: S.Set (Point2, Point2)
|
||||
, _rmPmnts :: [Placement]
|
||||
, _rmInPmnt :: [InPlacement]
|
||||
, -- note that in placements form a list: multiple InPlacements can use the same id
|
||||
_rmOutPmnt :: IM.IntMap Placement
|
||||
, _rmInPmnt :: [GenWorld -> Placement]
|
||||
, _rmOutPmnt :: IM.IntMap Placement
|
||||
, _rmBound :: [[Point2]]
|
||||
, _rmFloor :: Floor
|
||||
, _rmName :: String
|
||||
@@ -124,11 +123,6 @@ data Room = Room
|
||||
, _rmClusterStatus :: ClusterStatus
|
||||
}
|
||||
|
||||
data InPlacement = InPlacement
|
||||
{ _ipPlacement :: GenWorld -> [Placement] -> Placement
|
||||
, _ipPlacementID :: Int
|
||||
}
|
||||
|
||||
makeLenses ''GenWorld
|
||||
makeLenses ''Room
|
||||
makeLenses ''RoomType
|
||||
|
||||
Reference in New Issue
Block a user