Cleanup

src/Dodge/Item/Display.hs

@@ -72,19 +72,19 @@ showEquipItem eit = case eit of
 
 itemNumberDisplay :: Creature -> ComposedItem -> [String]
 itemNumberDisplay cr ci = case (ci ^. _2, itm ^?! itUse, itm ^. itType) of
-    (_,_,EQUIP WRIST_ECG) -> [displayPulse $ cr ^?! crType . avatarPulse . pulseProgress]
-    (WeaponTargetingSF,_,_) 
+    _ | EQUIP WRIST_ECG <- itm ^. itType
+            -> [displayPulse $ cr ^?! crType . avatarPulse . pulseProgress]
+--    (_,_,EQUIP WRIST_ECG) -> [displayPulse $ cr ^?! crType . avatarPulse . pulseProgress]
+--    (WeaponTargetingSF,_,_) 
+    _ | WeaponTargetingSF <- ci ^. _2
         -> [maybe "" (const "!TARG!") (itm ^? itTargeting . itTgPos . _Just)]
     _ | hasammo -> [maybe "" shortShow 
         $ itm ^? itConsumables . magLoadStatus . iaLoaded]
-    (_,UseHeld{},_) -> []
---    (_,UseHotkey{_leftConsumption=lc},_) -> [showAutoRechargeProgress lc]
-    (_,UseEquip{},_) -> mempty
-    (_,UseNothing,_) -> []
-    (_,UseAttach (APInt i),_) -> [show i]
-    (_,UseAttach {},_) -> []
-    (_,UseScope OpticScope {_opticZoom = x},_) -> [shortShow x]
-    (_,UseBulletMod {},_) -> mempty
+    --(_,UseAttach (APInt i),_) -> [show i]
+    _ | UseAttach (APInt i) <- itm ^. itUse -> [show i]
+    _ | UseScope OpticScope {_opticZoom = x} <- itm ^. itUse -> [shortShow x]
+--    (_,UseScope OpticScope {_opticZoom = x},_) -> [shortShow x]
+    (_,_,_) -> mempty
   where
     itm = ci ^. _1
     hasammo = isJust $ itm ^? itConsumables . magLoadStatus . iaLoaded

src/Dodge/Item/Held/Utility.hs

@@ -29,9 +29,7 @@ torch =
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos . _x .~ 10
         & itAmmoSlots .~ singleAmmo ElectricalAmmo
 
-{- |
-Sends out pulses that display walls.
--}
+{- | Sends out pulses that display walls.  -}
 detector :: Detector -> Item
 detector dt =
     defaultHeldItem