Remove ComposedItem, to be replaced with PartiallyComposedItem

src/Dodge/Item/Grammar.hs

@@ -4,7 +4,6 @@ module Dodge.Item.Grammar (
     invAdj,
     invRootMap,
     invRootTrees,
-    pciToCI,
     basePCI,
     allInvLocs,
 ) where
@@ -51,9 +50,10 @@ useBreakListsLinkTest llist rlist = LTest ltest rtest
         return $ LUpdate linktype (set _3 (useBreakListsLinkTest llist (tail xs))) id
 
 itemToBreakLists ::
-    ComposedItem ->
+    Item ->
+    ItemStructuralFunction ->
     ([(ItemStructuralFunction, ComposeLinkType)], [(ItemStructuralFunction, ComposeLinkType)])
-itemToBreakLists ci = case (itm ^. itType, ci ^. cItemFunction) of
+itemToBreakLists itm itmf = case (itm ^. itType, itmf) of
     (HELD TORCH, _) -> (getAmmoLinks itm, [])
     (_, WeaponPlatformSF) ->
         ( getAmmoLinks itm
@@ -75,8 +75,6 @@ itemToBreakLists ci = case (itm ^. itType, ci ^. cItemFunction) of
     (ATTACH BULLETSYNTH, _) 
         -> ([(AmmoMagSF ElectricalAmmo, AmmoInLink 0 ElectricalAmmo)],[])
     _ -> ([], [])
-  where
-    itm = ci ^. cItem
 
 getAmmoLinks :: Item -> [(ItemStructuralFunction, ComposeLinkType)]
 getAmmoLinks itm =
@@ -102,9 +100,6 @@ itemToFunction itm = case itm ^. itType of
     EQUIP{} -> EquipmentPlatformSF
     _ -> UncomposableIsolateSF
 
-pciToCI :: PartiallyComposedItem -> ComposedItem
-pciToCI (x, y, _) = CItem x y
-
 basePCI :: Item -> PartiallyComposedItem
 basePCI itm = case _itType itm of
     _ -> (itm, itemToFunction itm, itemBaseConnections itm)
@@ -112,7 +107,7 @@ basePCI itm = case _itType itm of
 itemBaseConnections :: Item -> LinkTest
 itemBaseConnections itm = case _itType itm of
     HELD LASER -> laserLinkTest itm
-    _ -> uncurry useBreakL $ itemToBreakLists (CItem itm (itemToFunction itm))
+    _ -> uncurry useBreakL $ itemToBreakLists itm (itemToFunction itm)
 
 laserLinkTest :: Item -> LinkTest
 laserLinkTest itm = LTest (llleft itm) (llright itm)
@@ -121,19 +116,18 @@ llleft :: Item -> PartiallyComposedItem -> Maybe LinkUpdate
 llleft itm =
     _tryLeftLink
         . uncurry useBreakL
-        . itemToBreakLists
-        $ CItem itm WeaponTargetingSF
+        $ itemToBreakLists itm WeaponTargetingSF
 
 llright :: Item -> PartiallyComposedItem -> Maybe LinkUpdate
 llright itm pci = case pci ^. _1 . itType of
     CRAFT TRANSFORMER -> Just (toLasgunUpdate itm)
-    _ -> _tryRightLink (uncurry useBreakL $ itemToBreakLists (CItem itm WeaponTargetingSF)) pci
+    _ -> _tryRightLink (uncurry useBreakL $ itemToBreakLists itm WeaponTargetingSF) pci
 
 toLasgunUpdate :: Item -> LinkUpdate
 toLasgunUpdate itm =
     LUpdate
         (ILink FunctionChangeLink orientAttachment)
-        (\(par, _, _) -> (par, WeaponPlatformSF, uncurry useBreakL $ itemToBreakLists (CItem itm WeaponPlatformSF)))
+        (\(par, _, _) -> (par, WeaponPlatformSF, uncurry useBreakL $ itemToBreakLists itm WeaponPlatformSF))
         (\(chi, _, up) -> (chi, FunctionChangeSF, up))
 
 --itemLinkTestLeft :: Item -> PartiallyComposedItem -> Maybe LinkUpdate
@@ -221,16 +215,23 @@ invTrees' = IM.unions . map (ldtToIM getindex . fmap (^. _1)) . map (fmap (\(x,
             i ^? itLocation . ilInvID
 
 -- returns an intmap with trees for (only!) root items, indexed by inventory position
-invRootTrees :: IM.IntMap Item -> IM.IntMap (LabelDoubleTree ItemLink ComposedItem)
-invRootTrees = IM.fromDistinctAscList . reverse . map (getid . fmap (\(x, y, _) -> CItem x y)) . invLDT
+invRootTrees :: IM.IntMap Item -> IM.IntMap (LabelDoubleTree ItemLink PartiallyComposedItem)
+invRootTrees = IM.fromDistinctAscList . reverse . map (getid) . invLDT
   where
-    getid :: LabelDoubleTree ItemLink ComposedItem -> (Int, LabelDoubleTree ItemLink ComposedItem)
-    getid t = (t ^?! ldtValue . cItem . itLocation . ilInvID, t)
+    getid :: LabelDoubleTree ItemLink PartiallyComposedItem 
+        -> (Int, LabelDoubleTree ItemLink PartiallyComposedItem)
+    getid t = (t ^?! ldtValue . _1 . itLocation . ilInvID, t)
 
 -- returns an intmap with indents and locations for all items
-allInvLocs :: IM.IntMap Item -> IM.IntMap (Int, LocationLDT ItemLink ComposedItem)
+allInvLocs :: IM.IntMap Item -> IM.IntMap (Int, LocationLDT ItemLink PartiallyComposedItem)
 allInvLocs inv = foldMap (f . LocLDT TopLDT) (IM.elems (invRootTrees inv)) mempty
   where
     f t = cldtPropagateFold h h g 0 t id
     h x _ _ _ = x + 1
-    g x ldt = (.) (IM.insert (ldt ^?! locLDT . ldtValue . cItem . itLocation . ilInvID) (x, ldt))
+    g :: Int -> LocationLDT ItemLink PartiallyComposedItem 
+        -> (IM.IntMap (Int,  LocationLDT ItemLink PartiallyComposedItem) 
+            -> IM.IntMap (Int,  LocationLDT ItemLink PartiallyComposedItem))
+        -> IM.IntMap (Int,  LocationLDT ItemLink PartiallyComposedItem) 
+        -> IM.IntMap (Int,  LocationLDT ItemLink PartiallyComposedItem) 
+    g x ldt = (.) (IM.insert (ldt ^?! locLDT . ldtValue . _1 . itLocation . ilInvID) 
+        (x, ldt))