Cleanup

src/Dodge/Item/Equipment.hs

@@ -16,7 +16,6 @@ module Dodge.Item.Equipment
     ) where
 import Dodge.Data
 import Dodge.Item.Draw
-import Dodge.Item.Equipment.Shape
 import Dodge.Item.Equipment.Booster
 import Dodge.LightSource
 import Dodge.Default

src/Dodge/Item/Equipment/Shape.hs

@@ -1,18 +1,11 @@
 module Dodge.Item.Equipment.Shape where
 import Dodge.Data
 import Dodge.Creature.HandPos
-import Shape
 import ShapePicture
-import Geometry
 import LensHelp
 
 import Data.Maybe
 
---shapeForWrist :: Shape -> SPic
---shapeForWrist = noPic . translateSH (V3 0 4 (-4))
---
---spicForWrist :: SPic -> SPic
---spicForWrist = translateSP (V3 0 4 (-4))
 pictureOnEquip :: SPic -> Creature -> Item -> SPic
 pictureOnEquip sp cr itm = fromMaybe mempty $ do
     i <- itm ^? itPos . ipInvID

src/Dodge/Item/Weapon/Radar.hs

@@ -2,9 +2,6 @@ module Dodge.Item.Weapon.Radar where
 import Dodge.Data
 --import Dodge.Picture.Layer
 import Dodge.Default
---import Dodge.Item.Draw
---import Dodge.Item.Equipment
-import Dodge.Item.Equipment.Shape
 import Dodge.Item.Weapon.TriggerType
 import Dodge.Item.Weapon.ExtraEffect
 import Dodge.Item.Weapon.UseEffect
@@ -34,8 +31,6 @@ clickDetector dt = defaultWeapon
 
 autoDetector :: Detector -> Item
 autoDetector dt = defaultEquipment
-    { _itID = Nothing
-    } 
     & itUse . eqEq . eqSite .~ GoesOnWrist
     & itUse . eqEq . eqUse  .~ autoEffect (detectorEffect dt) 100 click1S
     & itUse . eqEq . eqParams .~ EquipCounter 0

src/Dodge/Item/Weapon/UseEffect.hs

@@ -74,8 +74,8 @@ itemBlips p r = IM.elems . IM.filter f . fmap _flItPos . _floorItems
 
 wallBlips :: Point2 -> Float -> World -> [Point2]
 wallBlips p r w = runIdentity . S.toList_ $ S.mapMaybe (uncurry (intersectCircSegFirst p r) . _wlLine)
-        $ S.map (over wlLine swp) (wlsInsideCirc p r w)
+    $ S.map (over wlLine swp) (wlsInsideCirc p r w)
-                      <> wlsInsideCirc p r w
+                  <> wlsInsideCirc p r w
   where
     swp (a,b) = (b,a)