Use NewIntMap InvInt for crInv

src/Dodge/Inventory/Location.hs

@@ -20,12 +20,13 @@ import qualified IntMapHelp as IM
 import NewInt
 
 -- assumes all item locations inside the items are correct
-tryGetRootAttachedFromInvID :: Int -> IM.IntMap Item -> Maybe (Int, IS.IntSet)
-tryGetRootAttachedFromInvID invid im = do
+tryGetRootAttachedFromInvID :: NewInt InvInt 
+    -> NewIntMap InvInt Item -> Maybe (Int, IS.IntSet)
+tryGetRootAttachedFromInvID (NInt invid) im = do
     let imroots = invRootMap im
         theroot = fromMaybe invid $ imroots ^? ix invid . _1 . _Just
     t <- imroots ^? ix theroot . _2
-    return (theroot, foldMap (IS.singleton . (^?! itLocation . ilInvID)) t)
+    return (theroot, foldMap (IS.singleton . (^?! itLocation . ilInvID . unNInt)) t)
 
 -- this assumes the creature inventory is well formed, specifically the
 -- location ids
@@ -37,9 +38,9 @@ tryGetRootItemInvID m i cr = do
 
 updateRootItemID :: IM.IntMap Item -> Creature -> Creature
 updateRootItemID m cr = fromMaybe cr $ do
-    i <- cr ^? crManipulation . manObject . imSelectedItem
+    i <- cr ^? crManipulation . manObject . imSelectedItem . unNInt
     j <- tryGetRootItemInvID m i cr
-    return $ cr & crManipulation . manObject . imRootSelectedItem .~ j
+    return $ cr & crManipulation . manObject . imRootSelectedItem .~ NInt j
 
 -- the following assumes that the crManipulation is correct
 crUpdateItemLocations :: Int -> LWorld -> LWorld
@@ -48,7 +49,7 @@ crUpdateItemLocations crid lw = fromMaybe lw $ do
     cinv <- lw ^? creatures . ix crid . crInv
     --let crinv = IM.restrictKeys  (lw ^. items) (IS.fromList $ IM.elems itids)
     let crinv = fmap (\k -> lw ^?! items . ix k) cinv
-    return $ crSetRoots crid $ IM.foldlWithKey' (crUpdateInvidLocations mo crid) lw crinv
+    return $ crSetRoots crid $ IM.foldlWithKey' (crUpdateInvidLocations mo crid) lw $ _unNIntMap crinv
 
 crSetRoots :: Int -> LWorld -> LWorld
 crSetRoots cid w = fromMaybe w $ do
@@ -61,19 +62,20 @@ crSetRoots cid w = fromMaybe w $ do
     f w' x = w'
         & items . ix (x ^. dtValue . _1 . itID . unNInt) . itLocation . ilIsRoot .~ True
 
-crUpdateInvidLocations :: ManipulatedObject -> Int -> LWorld -> Int -> Item -> LWorld
+crUpdateInvidLocations :: ManipulatedObject -> Int -> LWorld -> Int
+    -> Item -> LWorld
 crUpdateInvidLocations mo crid lw invid itm =
     lw
-        & creatures . ix crid . crInv . ix invid .~ itid -- . itLocation .~ newloc
+        & creatures . ix crid . crInv . ix (NInt invid) .~ itid -- . itLocation .~ newloc
         & items . ix itid .~ (itm & itLocation .~ newloc)
   where
     itid = itm ^. itID . unNInt
     newloc =
         InInv
             { _ilCrID = crid
-            , _ilInvID = invid
-            , _ilIsRoot = Just invid == mo ^? imRootSelectedItem
-            , _ilIsSelected = Just invid == mo ^? imSelectedItem
+            , _ilInvID = NInt invid
+            , _ilIsRoot = Just (NInt invid) == mo ^? imRootSelectedItem
+            , _ilIsSelected = Just (NInt invid) == mo ^? imSelectedItem
             , _ilIsAttached = invid `IS.member` (mo ^. imAttachedItems)
             , _ilEquipSite = do
                 lw ^? items . ix itid . itLocation . ilEquipSite . _Just
@@ -83,8 +85,7 @@ crUpdateInvidLocations mo crid lw invid itm =
 -- concern the player creature
 -- this might not work if the selpos is in the inventory but too large
 setInvPosFromSS :: World -> World
-setInvPosFromSS w =
-    w
+setInvPosFromSS w = w
         & cWorld . lWorld . creatures . ix 0 . crManipulation . manObject .~ thesel
   where
     thesel = fromMaybe SelNothing $ do
@@ -92,12 +93,12 @@ setInvPosFromSS w =
         case i of
             (-1) -> Just SortInventory
             0 -> do
-                (rootid, aset) <- tryGetRootAttachedFromInvID j (fmap (\k -> w ^?! cWorld . lWorld . items . ix k ) 
+                (rootid, aset) <- tryGetRootAttachedFromInvID (NInt j) (fmap (\k -> w ^?! cWorld . lWorld . items . ix k ) 
                     $ you w ^. crInv)
                 return
                     SelectedItem
-                        { _imSelectedItem = j
-                        , _imRootSelectedItem = rootid
+                        { _imSelectedItem = NInt j
+                        , _imRootSelectedItem = NInt rootid
                         , _imAttachedItems = aset
                         }
             1 -> Just SelNothing