Add more information to Room Positions

src/Dodge/Data.hs

@@ -24,7 +24,9 @@ module Dodge.Data
     , module MaybeHelp
     , module Dodge.Data.ItemAmount
     , module Dodge.RoomCluster.Data
+    , module Dodge.Data.Room
     ) where
+import Dodge.Data.Room
 import Dodge.RoomCluster.Data
 import Dodge.Data.ItemAmount
 import Dodge.ShortShow
@@ -1426,7 +1428,8 @@ data PlacementSpot
 -- TODO attempt to unify/simplify this union type
 data Placement 
     = Placement
-        { _plSpot   :: PlacementSpot
+        { _plOrder  :: Int
+        , _plSpot   :: PlacementSpot
         , _plType   :: PSType
         , _plMID    :: Maybe Int
         , _plIDCont :: World -> Placement -> Maybe Placement 
@@ -1473,52 +1476,6 @@ data Room = Room
     , _rmType       :: RoomType
     , _rmClusterStatus :: ClusterStatus
     }
-data RoomLink = RoomLink
-    { _rlType   :: S.Set RoomLinkType
-    , _rlPos    :: Point2
-    , _rlDir    :: Float
-    } deriving (Eq,Ord)
-data RoomType = DefaultRoomType
-    | RectRoomType
-        { _numLinkEW :: Int
-        , _numLinkNS :: Int
-        , _linkGapEW :: Float
-        , _linkGapNS :: Float
-        , _rmWidth :: Float
-        , _rmHeight :: Float
-        }
-  deriving (Eq,Ord)
-data RoomLinkType
-    = OutLink
-    | InLink
-    | LabLink Int
-    | OnEdge CardinalPoint
-    | FromEdge CardinalPoint Int
-    | BlockedLink
-    deriving (Eq,Ord,Show)
-data CardinalPoint
-    = North
-    | East
-    | South
-    | West
-    deriving (Eq,Ord,Show)
-data RoomWire
-    = --RoomWire Point2 Float
-     WallWire Point2 Float Float
-
-data RPLinkStatus
-    = UsedOutLink 
-        { _rplsType :: S.Set RoomLinkType 
-        , _rplsChildNum :: Int
-        , _rplsOutRoomID :: Int
-        }
-    | UsedInLink  
-        { _rplsType :: S.Set RoomLinkType 
-        , _rplsInRoomID :: Int
-        }
-    | UnusedLink  { _rplsType :: S.Set RoomLinkType }
-    | NotLink
-  deriving (Eq,Ord,Show)
 data OutPlacement = OutPlacement
     { _opPlacement :: Placement
     , _opPlacementID :: Int
@@ -1527,21 +1484,6 @@ data InPlacement = InPlacement
     { _ipPlacement :: [Placement] -> Placement
     , _ipPlacementID :: Int
     }
-data RoomPos = RoomPos
-    { _rpPos :: Point2 
-    , _rpDir :: Float
-    , _rpType :: S.Set RoomPosType
-    , _rpLinkStatus :: RPLinkStatus
-    , _rpPlacementUse :: Int
-    }
-  deriving (Eq,Ord,Show)
-
-data RoomPosType 
-    = RoomPosOnPath
-    | RoomPosOffPath
-    | RoomPosExLink
-    | RoomPosLab Int
-  deriving (Eq,Ord,Show)
 
 makeLenses ''CreatureState
 makeLenses ''Damage
@@ -1621,7 +1563,3 @@ makeLenses ''RoomType
 makeLenses ''PSType
 makeLenses ''PlacementSpot
 makeLenses ''Placement
-makeLenses ''RoomLink
-makeLenses ''RoomPos
-makeLenses ''RoomPosType
-makeLenses ''RPLinkStatus