Start keeping track of item equip status internally (partially done)

src/Dodge/Item/Display.hs

@@ -84,19 +84,20 @@ itemNumberDisplay cr ci = case (ci ^. _2, itm ^?! itUse, itm ^. itType) of
     (_,_,EQUIP WRIST_ECG) -> [displayPulse $ cr ^?! crType . avatarPulse . pulseProgress]
     (WeaponTargetingSF,_,_) 
         -> [maybe "" (const "!TARG!") (itm ^? itTargeting . itTgPos . _Just)]
+    _ | hasammo -> [maybe "" shortShow 
+        $ itm ^? itConsumables . magLoadStatus . iaLoaded]
     (_,UseHeld{},_) -> []
     (_,UseHotkey{_leftConsumption=lc},_) -> [showAutoRechargeProgress lc]
     (_,UseEquip{},_) -> showEquipmentNumber cr itm
-    (_,UseCraft,_) -> []
+    (_,UseNothing,_) -> []
     (_,UseConsume {},_) -> []
     (_,UseAttach (APInt i),_) -> [show i]
     (_,UseAttach {},_) -> []
-    (_,UseAmmoMag {},_) -> [maybe "" shortShow 
-        $ itm ^? itConsumables . magLoadStatus . iaLoaded]
     (_,UseScope OpticScope {_opticZoom = x},_) -> [shortShow x]
     (_,UseBulletMod {},_) -> mempty
   where
     itm = ci ^. _1
+    hasammo = isJust $ itm ^? itConsumables . magLoadStatus . iaLoaded
 
 displayPulse :: Int -> String
 displayPulse 0 = "*****"
@@ -106,7 +107,7 @@ displayPulse x = take 5 $ drop y "----^-----"
 
 showEquipmentNumber :: Creature -> Item -> [String]
 showEquipmentNumber _ itm = case _eeUse ee of
-    EFuelSource x _ -> [show x]
+--    EFuelSource x _ -> [show x]
     EAmmoSource{_euseAmmoAmount = x} -> [show x]--showAmmoSource cr itm
     EBatterySource{_euseBatteryAmount = x} -> [show x]
     _ -> [""]