Remove ComposedItem, to be replaced with PartiallyComposedItem

src/Dodge/Item/Display.hs

@@ -13,11 +13,11 @@ import Dodge.Data.Creature
 import LensHelp
 import Padding
 
-itemDisplay :: Creature -> ComposedItem -> [String]
+itemDisplay :: Creature -> PartiallyComposedItem -> [String]
 itemDisplay cr ci =
     zipWithDefaults id (leftPad 15 ' ') itemDisplayPad (basicItemDisplay itm) (itemNumberDisplay cr ci)
   where
-    itm = _cItem ci
+    itm = ci ^. _1
 
 zipWithDefaults :: (a -> c) -> (b -> c) -> (a -> b -> c) -> [a] -> [b] -> [c]
 zipWithDefaults f g h = go
@@ -93,8 +93,8 @@ showAutoRechargeProgress lc = case lc of
 --  where
 --    ic = (itm ^?! itUse . heldConsumption . laSource)
 
-itemNumberDisplay :: Creature -> ComposedItem -> [String]
-itemNumberDisplay cr ci = case (ci ^. cItemFunction, itm ^?! itUse) of
+itemNumberDisplay :: Creature -> PartiallyComposedItem -> [String]
+itemNumberDisplay cr ci = case (ci ^. _2, itm ^?! itUse) of
     (WeaponTargetingSF,_) 
         -> [maybe "" (const "!TARG!") (itm ^? itTargeting . itTgPos . _Just)]
     (_,UseHeld{}) -> []
@@ -108,7 +108,7 @@ itemNumberDisplay cr ci = case (ci ^. cItemFunction, itm ^?! itUse) of
     (_,UseScope OpticScope {_opticZoom = x}) -> [shortShow x]
     (_,UseBulletMod {}) -> mempty
   where
-    itm = ci ^. cItem
+    itm = ci ^. _1
 
 showEquipmentNumber :: Creature -> Item -> [String]
 showEquipmentNumber _ itm = case _eeUse ee of