Cleanup, fix broken records in LeftUse

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -17,11 +17,11 @@ import Sound.Data
 
 autoEffect :: (Item -> Creature -> World -> World) -> Int -> SoundID -> Item -> Creature -> World -> World
 autoEffect eff t sid itm cr w
-    | _eparamInt (_eeParams (_equipEffect $ _itUse itm)) < 1 =
+    | _eparamInt (_eeParams (_uequipEffect $ _itUse itm)) < 1 =
         eff itm cr w
             & cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix (_ilInvID $ _itLocation itm)
                 . itUse
-                . equipEffect
+                . uequipEffect
                 . eeParams
                 . eparamInt
                 .~ t
@@ -30,7 +30,7 @@ autoEffect eff t sid itm cr w
         w
             & cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix (_ilInvID $ _itLocation itm)
                 . itUse
-                . equipEffect
+                . uequipEffect
                 . eeParams
                 . eparamInt
                 -~ 1

src/Dodge/Item/Weapon/Radar.hs

@@ -1,4 +1,7 @@
-module Dodge.Item.Weapon.Radar where
+module Dodge.Item.Weapon.Radar 
+    ( autoDetector
+    , detectorEffect
+    ) where
 
 import Control.Lens
 import Dodge.Data.World
@@ -8,14 +11,12 @@ import Dodge.RadarSweep
 autoDetector :: Detector -> Item
 autoDetector dt =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnWrist
-        & itUse . equipEffect . eeUse .~ EDetector dt --autoEffect (detectorEffect dt) 100 click1S
-        & itUse . equipEffect . eeParams .~ EquipCounter 0
-        & itUse . equipEffect . eeViewDist ?~ 350
+        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeUse .~ EDetector dt --autoEffect (detectorEffect dt) 100 click1S
+        & itUse . uequipEffect . eeParams .~ EquipCounter 0
+        & itUse . uequipEffect . eeViewDist ?~ 350
         & itType .~ EQUIP (AUTODETECTOR dt)
 
---    , _itEffect = autoRadarEffect
-
 detectorEffect :: Detector -> Item -> Creature -> World -> World
 detectorEffect dt = case dt of
     ITEMDETECTOR -> const (aRadarPulse ObItem)

src/Dodge/Item/Weapon/Utility.hs

@@ -17,7 +17,7 @@ stopWatch =
         & itUse
             .~ ( defaultLeftUse
                     & leftUse .~ LTimePause
-                    & equipEffect . eeSite .~ GoesOnWrist
+                    & uequipEffect . eeSite .~ GoesOnWrist
                )
         & itEffect . ieInv .~ ChargeIfEquipped
         & itEffect . ieOnDrop .~ SetCharge 0
@@ -53,9 +53,8 @@ blinkGun =
     defaultLeftItem
         { _itUse =
             defaultLeftUse
-                & leftUse .~ LBlink --hammerCheckL (shootL $ const blinkAction)
-                & equipEffect . eeSite .~ GoesOnWrist
-                --    , _itFloorPict = const . noPic . colorSH chartreuse $ upperPrismPoly 2 $ square 2
+                & leftUse .~ LBlink
+                & uequipEffect . eeSite .~ GoesOnWrist
         }
         & itType .~ LEFT BLINKER
 
@@ -63,26 +62,5 @@ unsafeBlinkGun :: Item
 unsafeBlinkGun =
     blinkGun
         & itType .~ LEFT BLINKERUNSAFE
-        & itUse . leftUse .~ LUnsafeBlink --hammerCheckL (shootL $ const unsafeBlinkAction)
-        & itUse . equipEffect . eeViewDist ?~ 400
-
-
--- grapGun = defaultGun
---     { _itName = "grapGun"
---     , _itIdentity = GrapGun
---     , _wpMaxAmmo = 1
---     , _wpLoadedAmmo = 1
---     , _wpReloadTime = 40
---     , _wpReloadState = 0
---     , _itUseRate = 10
---     , _itUseTime = 0
---     , _itUse = grapFire
---     , _wpSpread = 0.002
---     , _wpRange = 20
---     , _wpIsAuto = False
---     , _itFloorPict = onLayer FlItLayer $ polygon [(-4,-4),(-4,4),(4,4),(4,0),(0,0),(0,-4)]
---     , _itAmount = 1
---     , _itMaxStack = 1
---     , _itAimingSpeed = 1
---     , _itAimingRange = 0.5
---     }
+        & itUse . leftUse .~ LUnsafeBlink
+        & itUse . uequipEffect . eeViewDist ?~ 400