Cleanup

src/Dodge/Item/Display.hs

@@ -11,9 +11,6 @@ module Dodge.Item.Display (
 import ShortShow
 import Data.Maybe
 import Dodge.Data.Creature
---import Dodge.Item.Info
-import Dodge.Item.SlotsTaken
-import Dodge.Module
 import LensHelp
 import Padding
 
@@ -50,7 +47,7 @@ itemDisplayPad ls rs
 
 basicItemDisplay :: Item -> [String]
 basicItemDisplay itm =
-    Prelude.take (itSlotsTaken itm) $
+    Prelude.take (_itInvSize itm) $
         itemBaseName itm :
         --catMaybes [maybeWarmupStatus itm, maybeRateStatus itm]
         catMaybes [maybeWarmupStatus itm]
@@ -61,7 +58,7 @@ itemString :: Item -> String
 itemString = head . basicItemDisplay
 
 itemBaseName :: Item -> String
-itemBaseName itm = case _iyBase $ _itType itm of
+itemBaseName itm = case _itType itm of
     CRAFT str -> show str
     HELD hit -> case hit ^? xNum of
         Just i -> takeWhile (/= ' ') (show hit) ++ show i
@@ -87,7 +84,6 @@ showAttachItem t itm = case t of
 
 showEquipItem :: EquipItemType -> String
 showEquipItem eit = case eit of
-    TARGETINGHAT _ -> "TARG.HAT"
     _ -> show eit
 
 showAutoRechargeProgress :: LeftConsumption -> String