Implement zipper for attachment trees

src/Dodge/Item/Grammar.hs

@@ -5,6 +5,7 @@ module Dodge.Item.Grammar (
     invIndentIM,
     invAdj,
     invRootMap,
+    invRootTrees,
 ) where
 
 import Control.Applicative
@@ -54,13 +55,14 @@ itemToBreakLists itm = case itm ^. itType of
             , (AmmoEffectSF atype, AmmoEffectLink)
             , (RemoteScreenSF, RemoteScreenLink)
             ],[])
+    TARGETING TARGETLASER -> (getAmmoLinks itm ++ [(AugmentedHUDSF,AugmentedHUDLink)],[])
     TARGETING{} -> ([(AugmentedHUDSF,AugmentedHUDLink)],[])
     _ -> ([],[])
 
 getAmmoLinks :: Item -> [(ItemStructuralFunction, ComposeLinkType)]
 getAmmoLinks itm = map
                 (\(i, a) -> (AmmoMagSF a,AmmoInLink i a))
-                (IM.toList $ itm ^. itUse . heldAmmoTypes)
+                (IM.toList $ itm ^. itAmmoSlots)
 
 itemToFunction :: Item -> ItemStructuralFunction
 itemToFunction itm = case itm ^. itType of
@@ -160,14 +162,21 @@ invIndentIM =
         . map (bimap _iatType (\(x, y, _) -> (x, y)))
         . invLDT
 
--- returns an intmap with trees for all root items
+-- returns an intmap with trees for all items
 invTrees :: IM.IntMap Item -> IM.IntMap (LabelDoubleTree ComposeLinkType Item)
 invTrees = fmap (first _iatType) . invTrees'
 
--- returns an intmap with trees for all root items
+-- returns an intmap with trees for all items
 invTrees' :: IM.IntMap Item -> IM.IntMap (LabelDoubleTree ItemLink Item)
 invTrees' = IM.unions . map (ldtToIM getindex . fmap (^. _1)) . map (fmap (\(x, y, _) -> (x, y))) . invLDT
   where
     getindex i =
         fromMaybe (error "in invTrees try to get non-inventory item tree") $
             i ^? itLocation . ilInvID
+
+-- returns an intmap with trees for root items, indexed by inventory position
+invRootTrees :: IM.IntMap Item -> IM.IntMap (LabelDoubleTree ItemLink ComposedItem)
+invRootTrees = IM.fromAscList . reverse . map (getid . fmap (\(x, y, _) ->  (x, y))) . invLDT
+  where
+    getid :: LabelDoubleTree ItemLink ComposedItem -> (Int,LabelDoubleTree ItemLink ComposedItem)
+    getid t = (t ^?! ldtValue . _1 . itLocation . ilInvID, t)