Cleanup, merge modules

src/Dodge/Data/GenWorld.hs

@@ -76,15 +76,12 @@ data PlacementSpot
         }
 
 -- TODO attempt to unify/simplify this union type
-data Placement
-    = Placement
-        { _plOrder :: Int
-        , _plSpot :: PlacementSpot
-        , _plType :: PSType
-        , _plMID :: Maybe Int
-        , _plIDCont :: World -> Placement -> Maybe Placement
-        }
---    | RandomPlacement {_unRandomPlacement :: State StdGen Placement}
+data Placement = Placement
+    { _plSpot :: PlacementSpot
+    , _plType :: PSType
+    , _plMID :: Maybe Int
+    , _plIDCont :: World -> Placement -> Maybe Placement
+    }
 
 {- The '_rmPolys' lists which polygons should be cut out to form the indestructible walls of the room.
 Link pairs contain a position and rotation to attach to another room;
@@ -107,9 +104,9 @@ 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 :: [InPlacement]
+    , -- note that in placements form a list: multiple InPlacements can use the same id
+      _rmOutPmnt :: IM.IntMap Placement
     , _rmBound :: [[Point2]]
     , _rmFloor :: Floor
     , _rmName :: String
@@ -126,8 +123,6 @@ data Room = Room
     , _rmClusterStatus :: ClusterStatus
     }
 
---data OutPlacement = OutPlacement { _opPlacement :: Placement }
-
 data InPlacement = InPlacement
     { _ipPlacement :: World -> [Placement] -> Placement
     , _ipPlacementID :: Int