Separate placement spot from placement type

src/Dodge/LevelGen/Data.hs

@@ -31,19 +31,19 @@ data PSType = PutCrit {_unPutCrit :: Creature}
 data PlacementSpot = PS
     { _psPos :: Point2
     , _psRot :: Float
-    , _psType :: PSType
     }
 data Placement = Placement 
     { _placementSpot :: PlacementSpot
+    , _psType :: PSType
     , _idPlacement :: Int -> Maybe Placement 
     }
   | PlacementPos Point3 (Point3 -> Placement)
 
 sPS :: Point2 -> Float -> PSType -> Placement
-sPS p a pt = Placement (PS p a pt) (const Nothing)
+sPS p a pt = Placement (PS p a) pt (const Nothing)
 
 jsps :: Point2 -> Float -> PSType -> Maybe Placement
-jsps p a pst = Just $ Placement (PS p a pst) $ const Nothing
+jsps p a pst = Just $ Placement (PS p a) pst $ const Nothing
 
 jsps0 :: PSType -> Maybe Placement
 jsps0 pst = Just $ sPS (V2 0 0) 0 pst
@@ -52,19 +52,19 @@ sps0 :: PSType -> Placement
 sps0 = sPS (V2 0 0) 0
 
 jspsJ :: Point2 -> Float -> PSType -> Placement -> Maybe Placement
-jspsJ p a pst plm = Just $ Placement (PS p a pst) $ \_ -> Just plm
+jspsJ p a pst plm = Just $ Placement (PS p a) pst $ \_ -> Just plm
 
 jsps0J :: PSType -> Placement -> Maybe Placement
-jsps0J pst plm = Just $ Placement (PS (V2 0 0) 0 pst) $ \_ -> Just plm
+jsps0J pst plm = Just $ Placement (PS (V2 0 0) 0) pst $ \_ -> Just plm
 
 ps0 :: PSType -> (Int -> Maybe Placement) -> Placement
-ps0 pst = Placement (PS (V2 0 0) 0 pst)
+ps0 pst = Placement (PS (V2 0 0) 0) pst
 
 jps0 :: PSType -> (Int -> Maybe Placement) -> Maybe Placement
-jps0 pst = Just . Placement (PS (V2 0 0) 0 pst)
+jps0 pst = Just . Placement (PS (V2 0 0) 0) pst
 
 ps0j :: PSType -> Placement -> Placement
-ps0j pst plmnt = Placement (PS (V2 0 0) 0 pst) (const $ Just plmnt)
+ps0j pst plmnt = Placement (PS (V2 0 0) 0) pst (const $ Just plmnt)
 
 makeLenses ''PSType
 makeLenses ''PlacementSpot