Cleanup, merge modules

src/Dodge/Placement/PlaceSpot.hs

@@ -36,12 +36,8 @@ placeSpot (w, rm) plmnt = case plmnt of
   where
     shift = _rmShift rm
 
-placePlainPSSpot ::
-    GenWorld ->
-    Room ->
-    Placement ->
-    DPoint2 ->
-    ((GenWorld, Room), [Placement])
+placePlainPSSpot 
+    :: GenWorld -> Room -> Placement -> DPoint2 -> ((GenWorld, Room), [Placement])
 placePlainPSSpot w rm plmnt shift =
     let (i, w') = placeSpotID (shiftPSBy shift (_plSpot plmnt)) (_plType plmnt) w
         newplmnt = plmnt & plMID ?~ i
@@ -106,7 +102,8 @@ placeSpotID' ps pt w = case pt of
                        )
             )
     PutCrit cr -> plNewUpID (cWorld . lWorld . creatures) crID (mvCr p rot cr) w
-    PutForeground fs -> plNewUpID (cWorld . lWorld . foregroundShapes) fsID (mvFS p rot fs) w
+    PutForeground fs -> plNewUpID (cWorld . lWorld . foregroundShapes) fsID 
+        (mvFS p rot fs) w
     PutMachine pps mc wl mitm -> plMachine (map doShift pps) mc wl mitm p rot w
     PutLS ls -> plNewUpID (cWorld . lWorld . lightSources) lsID (mvLS p' rot ls) w
     PutPPlate pp -> plNewUpID (cWorld . lWorld . pressPlates) ppID (mvPP p rot pp) w
@@ -138,12 +135,6 @@ evaluateRandPS rgen ps w = placeSpotID' ps evaluatedType (set randGen g w)
   where
     (evaluatedType, g) = runState rgen (_randGen w)
 
---placeWallPoly :: [Point2] -> Wall -> World -> World
---placeWallPoly ps wl = -- rmCrossPaths .
---    over walls (placeWalls ps wl)
-----  where
-----    rmCrossPaths w = foldr (uncurry obstructPathsCrossing) w $ loopPairs ps
-
 -- this function is the reason for the warning suppression
 -- remove the warning suppression if it changes
 placeWallPoly :: [Point2] -> Wall -> World -> World
@@ -212,11 +203,11 @@ plMachine' wallpoly mc wl p rot gw =
     mcid = IM.newKey $ gw ^. cWorld . lWorld . machines
     wlid = IM.newKey $ gw ^. cWorld . lWorld . walls
     wlids = IS.fromList [wlid .. wlid + length wallpoly - 1]
-    --addMc = IM.insert mcid (mc {_mcPos = centroid wallpoly,_mcDir = rot,_mcID = mcid, _mcWallIDs = wlids})
     addMc = IM.insert mcid (mc{_mcPos = p, _mcDir = rot, _mcID = mcid, _mcWallIDs = wlids})
 
 -- TODO correctly remove/shift pathfinding lines (removePathsCrossing)
-placeMachineWalls :: Wall -> Color -> [Point2] -> Int -> Int -> IM.IntMap Wall -> IM.IntMap Wall
+placeMachineWalls 
+    :: Wall -> Color -> [Point2] -> Int -> Int -> IM.IntMap Wall -> IM.IntMap Wall
 placeMachineWalls wl col poly mcid wlid = flip (foldr f) $ zip [wlid ..] $ loopPairs poly
   where
     f (wid, l) = IM.insert wid baseWall{_wlID = wid, _wlLine = l}
@@ -227,7 +218,6 @@ placeMachineWalls wl col poly mcid wlid = flip (foldr f) $ zip [wlid ..] $ loopP
             & wlTouchThrough .~ True
 
 mvLS :: Point3 -> Float -> LightSource -> LightSource
-mvLS (V3 x y z) rot ls =
-    ls & lsParam . lsPos .~ V3 x y z +.+.+ startPos
+mvLS (V3 x y z) rot ls = ls & lsParam . lsPos .~ V3 x y z +.+.+ startPos
   where
     startPos = onXY (rotateV rot) $ _lsPos (_lsParam ls)