Cleanup

src/Dodge/Render/HUD.hs

@@ -80,12 +80,12 @@ subInventoryDisplay subinv cfig w = case subinv of
         , equipcursor -- the order is important, this should go on top of the other equipcursors
         , rboptions
         ]
-    TweakInventory -> pictures
+    TweakInventory mtweaki -> pictures
         --[ mCurs it cfig w
         [ selcursor' listCursorNESW
 --        , cursorsZ cfig curpos it
         , fromMaybe mempty $ do
-            tweaki <-  it ^? _Just . itTweaks . tweakSel
+            tweaki <-  mtweaki
                 -- consider moving this functionality out into a tweaks module
             tparam <- it ^? _Just . itTweaks . tweakParams . ix tweaki
             return $ lnkMidInvSel cfig w curpos tweaki
@@ -234,8 +234,8 @@ lnkMidInvSel cfig w lefti midi = winScale cfig
 combineCounts :: Configuration -> World -> [Int] -> Picture
 combineCounts cfig w = winScale cfig . foldMap f . group
   where
-    f (i:is) = case yourInv w ^? ix i . itConsumption of
-        Just ItemItselfConsumable{} -> color (selNumCol i w) $ uncurryV translate (selNumTextPos cfig w i) . scale 0.1 0.1 . text $ ('-': show (length is + 1))
+    f (i:is) = case yourInv w ^? ix i . itUse . useAmount of
+        Just _ -> color (selNumCol i w) $ uncurryV translate (selNumTextPos cfig w i) . scale 0.1 0.1 . text $ ('-': show (length is + 1))
         _ -> mempty
     f _ = mempty
 

src/Dodge/Render/ShapePicture.hs

@@ -27,7 +27,7 @@ import Dodge.Spark.Draw
 import Dodge.RadarBlip
 import Dodge.Flare
 import Dodge.ShortShow
-import Dodge.Config.Data
+import Dodge.Data.Config
 import Dodge.Render.InfoBox
 import Dodge.Debug.Picture
 import Dodge.Picture.SizeInvariant