Hlint, cleanup

src/Dodge/Creature/HandPos.hs

@@ -61,8 +61,12 @@ rightHandPQ cr
     | oneH cr = (V3 11 (-3) 20, Q.qID)
     | twists cr = (V3 0 5 20, Q.qz (-1)) `Q.comp` (V3 4 (-10) 0, Q.qID)
     | twoFlat cr = (V3 4 (-8) 12, Q.qID)
+--    | wl <- crRightHandWall cr = (0, Q.qID)
     | otherwise = (handWalkingPos LeftForward (-8) cr, Q.qID)
 
+--crRightHandWall :: IM.IntMap Wall -> Creature -> Wall
+--crRightHandWall wls cr
+
 translateToRightHand :: Creature -> SPic -> SPic
 translateToRightHand = overPosSP . translatePointToRightHand
 

src/Dodge/Data/GenWorld.hs

@@ -36,7 +36,7 @@ data PSType
         , _putMachineMachine :: Machine
         , _putMachineMaybeItem :: Maybe Item
         }
-    | PutLS LightSource
+    | PutLS {_putLS :: LightSource}
     | PutButton {_putButton :: Button}
     | PutProp Prop
     | PutTerminal {_unputTerminal :: Terminal}

src/Dodge/Placement/Instance/Button.hs

@@ -119,7 +119,7 @@ putLitButOnPosExtTrig' col thePS cnt =
                             <&> plSpot
                                 .~ _plSpot plmnt
   where
-    buteff i j = SetTriggerAndSetLSCol True i (V3 0 0.5 0) j
+    buteff i = SetTriggerAndSetLSCol True i (V3 0 0.5 0)
     shp = fmap (fmap $ colorSH col) aShape
     trigid tp = fromJust $ _plMID tp
     ls = lsColPosRad (V3 0.5 0 0) (V3 0 0 50) 50

src/Dodge/Placement/Instance/LightSource.hs

@@ -18,6 +18,7 @@ module Dodge.Placement.Instance.LightSource (
     mntLightLnkCond',
     spanLS,
     mntLightLnkShape,
+    spanColLightI,
 ) where
 
 import Color

src/Dodge/Placement/PlaceSpot/TriggerDoor.hs

@@ -30,7 +30,7 @@ plDoor dr wl gw =
     lerposa = doDoorLerp dr (dr ^. drLerp)
     addWalls =
         insertStructureWalls
-            (\x -> DoorPart x isauto)
+            (`DoorPart` isauto)
             wl
             (map fst pps & each %~ shiftPointBy lerposa)
             drid

src/Dodge/Room/LongDoor.hs

@@ -181,7 +181,7 @@ slowCrushRoom = do
     dr1 = dr
         & drOnePos .~ (V2 145 (-40), 0)
         & drZeroPos .~ (V2 145 50, 0)
-    apos edge = (rprBool (t edge) & psSelect . mapped . mapped . _Just . _1 %~ f)
+    apos edge = rprBool (t edge) & psSelect . mapped . mapped . _Just . _1 %~ f
     f ps = case ps of
         PS _ r -> ps & psRot +~ pi & psPos +~ rotateV r (V2 0 (-5))
         _ -> ps
@@ -191,7 +191,7 @@ slowCrushRoom = do
 
 pushCaverns :: RandomGen g => State g Room
 pushCaverns = do
-    rm <- shuffleLinks =<< removeLights <$> roomRectAutoLights 250 100
+    rm <- shuffleLinks . removeLights =<< roomRectAutoLights 250 100
     iside <- takeOne [North,South]
     oside <- takeOne [North,South]
     crs <- takeOne [[] ]
@@ -199,10 +199,14 @@ pushCaverns = do
             [ [MountedLight (V3 55 0 50) 200 0.5 , MountedSPic (noPic $ aBar 55 [V2 10 0,V2 60 0])]
             , [MountedLight (V3 20 0 50) 200 0.5 , MountedSPic (noPic $ aBar 55 [V2 10 0,V2 22 0])]
             , [MountedLight (V3 30 45 50) 200 0.5 , MountedSPic (noPic $ aBar 55 [V2 10 45,V2 32 45])]
-            , [MountedLight (V3 55 45 50) 200 0.5 
+            , [MountedLight (V3 20 45 50) 200 0.5 
                 , MountedSPic (noPic $ aBar 55 [V2 10 45,V2 60 45])
                 , MountedSPic (noPic $ aBar 55 [V2 10 (-45),V2 60 (-45)])]
             ]
+    let lts = [spanColLightI (V3 0.5 0 0) 40 (V2 5 (g iside)) (V2 10 (g iside - dorot' iside 10))
+                & plType . putLS . lsParam . lsRad .~ 30
+            ,spanColLightI (V3 0.5 0 0) 40 (V2 245 (g oside)) (V2 240 (g oside - dorot' oside 10))
+                & plType . putLS . lsParam . lsRad .~ 30]
     return $ rm
         & rmPolys <>~ [dorot iside (trapTBH 20 10 10) & each +~ V2 20 (g iside) 
             ,dorot oside (trapTBH 20 10 10) & each +~ V2 230 (g oside)]
@@ -222,11 +226,16 @@ pushCaverns = do
                     & drMounts .~ (l & each . moPos . _xy %~ rotateV pi)) defaultDoorWall)
         , psPtPl (spos (slinks West $ cardReverse iside) f') (lowBlock Stone (greyN 0.5) 10 $ rectWH 20 10)
         , psPtPl (spos (slinks East $ cardReverse oside) f') (lowBlock Stone (greyN 0.5) 10 $ rectWH 20 10)
-        ] <> crs
+        ] 
+        <> lts
+        <> crs
   where
     dorot = \case
         North -> id
         _ -> fmap negate
+    dorot' = \case
+        North -> id
+        _ -> negate
     slinks x y s = (FromEdge x 0 `S.member` s) && OnEdge y `S.member` s
     dr = defaultDoor
         & drUpdate .~ DoorLerp 0.005
@@ -242,7 +251,7 @@ pushCaverns = do
     f' ps = case ps of
         PS _ r -> ps & psRot +~ pi & psPos +~ rotateV r (V2 0 10)
         _ -> ps
-    spos h f'' = (rprBool (t' h) & psSelect . mapped . mapped . _Just . _1 %~ f'')
+    spos h f'' = rprBool (t' h) & psSelect . mapped . mapped . _Just . _1 %~ f''
     t' h rp _ = case _rpType rp of
         UnusedLink s -> h s
         _ -> False
@@ -292,7 +301,7 @@ slowCrush90 = do
     f ps = case ps of
         PS _ r -> ps & psRot +~ pi & psPos +~ rotateV r (V2 0 (-5))
         _ -> ps
-    spos h = (rprBool (t' h) & psSelect . mapped . mapped . _Just . _1 %~ f)
+    spos h = rprBool (t' h) & psSelect . mapped . mapped . _Just . _1 %~ f
     t' h rp _ = case _rpType rp of
         UnusedLink s -> h s
         _ -> False

src/Dodge/Update.hs

@@ -958,7 +958,7 @@ radiusSpring r a b
 simpleCrSprings :: World -> World
 simpleCrSprings w =
     IM.foldl' (flip crSpring) w $
-        IM.filter (canSpring) $ w ^. cWorld . lWorld . creatures
+        IM.filter canSpring $ w ^. cWorld . lWorld . creatures
 
 -- note that this may in rare cases not push creatures away from each other
 crSpring :: Creature -> World -> World
@@ -979,13 +979,10 @@ crCrSpring c1 c2
     | id1 == id2 = id
     | vec == V2 0 0 = id
     | diff >= comRad = id
-    | otherwise =
-        ( cWorld . lWorld . creatures
-            %~ ( (ix id1 . crPos . _xy +~ overlap c2)
-                    . (ix id2 . crPos . _xy -~ overlap c1)
-               )
-        )
+    | otherwise = cWorld . lWorld . creatures %~ ( olap c1 c2 . olap c2 c1)
+        
   where
+    olap a b = ix (a ^. crID) . crPos . _xy +~ overlap b
     id1 = _crID c1
     id2 = _crID c2
     vec = c1 ^. crPos . _xy - c2 ^. crPos . _xy