Move to using RoomLink datatype

src/Dodge/LevelGen/Data.hs

@@ -7,6 +7,7 @@ import Geometry
 import Shape.Data
 import Data.Tile
 
+import qualified Data.Set as S
 import Control.Lens
 import Control.Monad.State
 import System.Random
@@ -62,29 +63,29 @@ Room bounds between a new room and previously placed rooms are checked during le
 assigning no bounds will allow rooms to overlap.
  -}
 data Room = Room
-    { _rmPolys  :: [ [Point2] ]
-    , _rmOutLinks  :: [(Point2,Float)] 
-    , _rmInLinks :: [(Point2,Float)]
+    { _rmPolys      :: [ [Point2] ]
+    , _rmOutLinks   :: [RoomLink] 
+    , _rmInLinks    :: [RoomLink]
         -- update the room when assigning the next link to an adjacent room with the head of of this list, return the tail
-    , _rmLinkEff :: [(Point2,Float) -> Room -> Room]
-    , _rmPos    :: [RoomPos]
-    , _rmPath   :: [(Point2, Point2)]
-    , _rmPmnts  :: [Placement]
+    , _rmLinkEff    :: [(Point2,Float) -> Room -> Room]
+    , _rmPos        :: [RoomPos]
+    , _rmPath       :: [(Point2, Point2)]
+    , _rmPmnts      :: [Placement]
     , _rmPartPmnt   :: Maybe ([Placement] -> Placement)
     , _rmExtPmnt    :: Maybe Placement
-    , _rmBound  :: [ [Point2] ]
-    , _rmFloor  :: [Tile]
-    , _rmName   :: String
-    , _rmShift  :: (Point2, Float)
+    , _rmBound      :: [ [Point2] ]
+    , _rmFloor      :: [Tile]
+    , _rmName       :: String
+    , _rmShift      :: (Point2, Float)
     , _rmViewpoints :: [Point2]
-    , _rmRandPSs :: [State StdGen (Point2,Float)]
+    , _rmRandPSs    :: [State StdGen (Point2,Float)]
     , _rmLabel      :: Maybe Int
     , _rmTakeFrom   :: Maybe Int
     , _rmStartWires :: IM.IntMap RoomWire
     , _rmEndWires   :: IM.IntMap RoomWire
     }
 data RoomLink = RoomLink
-    { _rlType   :: RoomLinkType
+    { _rlType   :: S.Set RoomLinkType
     , _rlPos    :: Point2
     , _rlDir    :: Float
     } deriving (Eq,Ord)
@@ -109,6 +110,7 @@ makeLenses ''Room
 makeLenses ''PSType
 makeLenses ''PlacementSpot
 makeLenses ''Placement
+makeLenses ''RoomLink
 
 spNoID :: PlacementSpot -> PSType -> Placement
 spNoID ps pst = Placement ps pst Nothing (const Nothing)