Remove consumable records

src/Dodge/Item/Draw/SPic.hs

@@ -5,6 +5,7 @@ module Dodge.Item.Draw.SPic (
     itemTreeSPic,
 ) where
 
+import Dodge.Item.MaxAmmo
 import Color
 import Data.Maybe
 import Data.Strict.Tuple
@@ -131,11 +132,15 @@ ammoMagSPic it = \case
     _ -> noPic $ upperPrismPolyTS 1 (rectNSWE 0 (- y) (-1) 1)
   where
     y = fromIntegral y' * 0.3
-    y' = fromMaybe 0 $ it ^? itConsumables . magLoadStatus . iaLoaded
-    am = fractionLoadedAmmo (it ^?! itConsumables . magLoadStatus)
+    y' = fromMaybe 0 $ it ^. itConsumables
+    am = fractionLoadedAmmo it -- (it ^?! itConsumables . magLoadStatus)
+
+fractionLoadedAmmo :: Item -> Float
+fractionLoadedAmmo itm = fromMaybe 0 $ do
+    m <- maxAmmo itm
+    return $ fromIntegral (itm ^?! itConsumables . _Just) 
+        / fromIntegral m
 
-fractionLoadedAmmo :: ReloadStatus -> Float
-fractionLoadedAmmo rs = fromIntegral (_iaLoaded rs) / fromIntegral (_iaMax rs)
 --
 --fractionLoadedAmmo2 :: ReloadStatus -> Float
 --fractionLoadedAmmo2 rs =