Cleanup

src/Dodge/Placement/PlaceSpot.hs

@@ -1,12 +1,12 @@
+{-# LANGUAGE LambdaCase #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+
 {- | deals with placement of objects within the world
  after they have had their coordinates set by the layout
 -}
 module Dodge.Placement.PlaceSpot (placeSpot) where
 
-import NewInt
 import Color
-import LensHelp
 import Control.Monad.State
 import Data.Bifunctor
 import Data.Foldable
@@ -21,6 +21,8 @@ import Dodge.Placement.Shift
 import Dodge.ShiftPoint
 import Geometry
 import qualified IntMapHelp as IM
+import LensHelp
+import NewInt
 import System.Random
 
 -- when placing a placement, we update the world and the room and assign an id
@@ -109,17 +111,21 @@ placeSpotID' ps pt w = case pt of
     PutProp prp -> plNewUpID (cWorld . lWorld . props) prID (mvProp p rot prp) w
     PutButton bt -> plNewUpID (cWorld . lWorld . buttons) btID (mvButton p rot bt) w
     PutTerminal tm -> plNewUpID (cWorld . lWorld . terminals) tmID tm w
-    PutFlIt itm -> let i = IM.newKey (w ^. cWorld . lWorld . items)
-        in (i, w
-            & cWorld . lWorld . floorItems . at i ?~ createFlIt p rot 
-            & cWorld . lWorld . items . at i ?~ (itm & itID .~ NInt i
-                & itLocation .~ OnFloor)
+    PutFlIt itm ->
+        let i = IM.newKey (w ^. cWorld . lWorld . items)
+         in ( i
+            , w
+                & cWorld . lWorld . floorItems . at i ?~ FlIt p rot
+                & cWorld . lWorld . items . at i
+                    ?~ ( itm & itID .~ NInt i
+                            & itLocation .~ OnFloor
+                       )
             )
---        plNewUpID
---            (cWorld . lWorld . floorItems . unNIntMap)
---            (flItID . unNInt)
---            (createFlIt p rot itm)
---            w
+    --        plNewUpID
+    --            (cWorld . lWorld . floorItems . unNIntMap)
+    --            (flItID . unNInt)
+    --            (createFlIt p rot itm)
+    --            w
     PutCrit cr -> plNewUpID (cWorld . lWorld . creatures) crID (mvCr p rot cr) 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
@@ -181,10 +187,6 @@ mvProp p a = (prRot +~ a) . (prPos %~ ((p +.+) . rotateV a))
 mvButton :: Point2 -> Float -> Button -> Button
 mvButton p a = (btRot +~ a) . (btPos %~ ((p +.+) . rotateV a))
 
-{- Creates a floor item at a given point.-}
-createFlIt :: Point2 -> Float -> FloorItem
-createFlIt p rot = FlIt{_flItPos = p, _flItRot = rot}
-
 mvPP :: Point2 -> Float -> PressPlate -> PressPlate
 mvPP p rot pp = pp{_ppPos = p, _ppRot = rot}
 
@@ -194,8 +196,9 @@ mvCr p rot cr = cr{_crPos = p, _crOldPos = p, _crDir = rot}
 mvFS :: Point2 -> Float -> ForegroundShape -> ForegroundShape
 mvFS p a = (fsDir +~ a) . (fsPos %~ ((p +.+) . rotateV a))
 
-plMachine :: [Point2] -> Machine -> Wall -> Maybe Item -> Point2 -> Float -> World -> (Int, World)
-plMachine wallpoly mc wl mitm = case mitm of
+plMachine ::
+    [Point2] -> Machine -> Wall -> Maybe Item -> Point2 -> Float -> World -> (Int, World)
+plMachine wallpoly mc wl = \case
     Nothing -> plMachine' wallpoly mc wl
     Just itm -> plTurret wallpoly mc wl itm
 
@@ -207,15 +210,20 @@ plTurret wallpoly mc wl itm p rot gw =
         & cWorld . lWorld . items . at itid ?~ itm'
     )
   where
-    itm' = itm & itID .~ NInt itid
-        & itLocation .~ OnTurret mcid
+    itm' =
+        itm & itID .~ NInt itid
+            & itLocation .~ OnTurret mcid
     itid = IM.newKey $ gw ^. cWorld . lWorld . items
     col = _mcColor mc
     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 = p, _mcDir = rot, _mcID = mcid, _mcWallIDs = wlids}
-        & mcType . mctTurret . tuWeapon .~ itid)
+    addMc =
+        IM.insert
+            mcid
+            ( mc{_mcPos = p, _mcDir = rot, _mcID = mcid, _mcWallIDs = wlids}
+                & mcType . mctTurret . tuWeapon .~ itid
+            )
 
 plMachine' :: [Point2] -> Machine -> Wall -> Point2 -> Float -> World -> (Int, World)
 plMachine' wallpoly mc wl p rot gw =