Destroying mounted lights flashes, move equipment datatype

src/Dodge/Item/Weapon/Radar.hs

@@ -22,7 +22,7 @@ clickDetector dt = defaultWeapon
         ]
     & itUse . useAim . aimRange .~ 1
     & itUse . useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1}
-    & itType . iyBase .~ CLICKDETECTOR dt
+    & itType . iyBase .~ HELD (HELDDETECTOR dt)
 
 autoDetector :: Detector -> Item
 autoDetector dt = defaultEquipment
@@ -30,7 +30,7 @@ autoDetector dt = defaultEquipment
     & itUse . eqEq . eqUse  .~ autoEffect (detectorEffect dt) 100 click1S
     & itUse . eqEq . eqParams .~ EquipCounter 0
     & itUse . eqEq . eqViewDist ?~ 350
-    & itType . iyBase .~ AUTODETECTOR dt
+    & itType . iyBase .~ EQUIP (AUTODETECTOR dt)
 --    , _itEffect = autoRadarEffect
 
 detectorEffect :: Detector -> Item -> Creature -> World -> World

src/Dodge/Item/Weapon/Spawn.hs

@@ -22,7 +22,7 @@ spawnGun cr = defaultWeapon
         [ ammoCheckI
         , hammerCheckI
         ]
-    & itType . iyBase .~ SPAWNER
+    & itType . iyBase .~ LEFT SPAWNER
 spawnCrNextTo 
     :: Creature -- ^ Creature to spawn
     -> Creature -- ^ existing creature that will be spawned next to

src/Dodge/Item/Weapon/Utility.hs

@@ -33,7 +33,7 @@ rewindGun = defaultLeftItem
         & lUse .~ useRewindGun
         & eqEq . eqSite .~ GoesOnChest
     }
-    & itType . iyBase .~ REWINDER
+    & itType . iyBase .~ LEFT REWINDER
 rewindEffect :: Item -> Creature -> World -> World
 rewindEffect itm cr w 
     | Just invid == _crLeftInvSel cr = w & rewindWorlds %~ (take maxcharge . (w' : ))
@@ -68,7 +68,7 @@ shrinkGun = defaultLeftItem
 --    , _itFloorPict = shrinkGunPic
     , _itAttachment = AttachBool True
     }
-    & itType . iyBase .~ SHRINKER
+    & itType . iyBase .~ LEFT SHRINKER
 
 shrinkGunPic :: Item -> SPic
 shrinkGunPic _ = noPic $ colorSH violet $ upperPrismPoly 5 $ square 5
@@ -94,11 +94,11 @@ blinkGun = defaultLeftItem
         & eqEq . eqSite .~ GoesOnWrist
 --    , _itFloorPict = const . noPic . colorSH chartreuse $ upperPrismPoly 2 $ square 2
     }
-    & itType . iyBase .~ BLINKER
+    & itType . iyBase .~ LEFT BLINKER
 
 unsafeBlinkGun :: Item
 unsafeBlinkGun = blinkGun
-    & itType . iyBase .~ BLINKERUNSAFE
+    & itType . iyBase .~ LEFT BLINKERUNSAFE
     & itUse . lUse .~ hammerCheckL (shootL $ const unsafeBlinkAction)
     & itUse . eqEq . eqViewDist ?~ 400