Use NewIntMap InvInt for crInv

src/Dodge/Inventory.hs

@@ -39,7 +39,7 @@ import NewInt
 
 -- should consider never fully destroying items, but assigning a flag saying how
 -- they were moved from play
-destroyInvItem :: Int -> Int -> World -> World
+destroyInvItem :: Int -> NewInt InvInt -> World -> World
 destroyInvItem cid invid w =
     rmInvItem cid invid w & removeitloc
         & removeithotkey
@@ -58,7 +58,9 @@ destroyAllInvItems :: Creature -> World -> World
 destroyAllInvItems cr w =
     foldl' (flip $ destroyInvItem (cr ^. crID)) w
         . reverse
+        . fmap NInt
         . IM.keys
+        . _unNIntMap
         $ cr ^. crInv
 
 destroyItem :: Int -> World -> World
@@ -73,7 +75,7 @@ destroyItem itid w = case w ^? cWorld . lWorld . items . ix itid . itLocation of
 
 -- note rmInvItem does not fully destroy the item, other updates to the item
 -- location are required
-rmInvItem :: Int -> Int -> World -> World
+rmInvItem :: Int -> NewInt InvInt -> World -> World
 rmInvItem cid invid w =
     w
         & dounequipfunction --the ordering of these is
@@ -95,7 +97,7 @@ rmInvItem cid invid w =
         | otherwise =
             pointcid . crManipulation . manObject . imSelectedItem %~ g
     cr = w ^?! cWorld . lWorld . creatures . ix cid
-    itid = _crInv cr IM.! invid
+    itid = _crInv cr ^?! ix invid
     itm = w ^?! cWorld . lWorld . items . ix itid
     dounequipfunction = effectOnRemove itm cr
     --  fromMaybe id $ do
@@ -110,13 +112,13 @@ rmInvItem cid invid w =
                     . ilEquipSite
                     . _Just
         return $ pointcid . crEquipment . at epos .~ Nothing
-    maxk = fmap fst $ IM.lookupMax $ cr ^. crInv
+    maxk = fmap fst $ IM.lookupMax $ _unNIntMap $ cr ^. crInv
     f inv =
-        let (xs, ys) = IM.split invid inv
-         in xs `IM.union` IM.mapKeysMonotonic (subtract 1) ys
+        let (xs, ys) = IM.split (_unNInt invid) $ _unNIntMap inv
+         in NIntMap $ xs `IM.union` IM.mapKeysMonotonic (subtract 1) ys
     -- the following might not work if a non-player creature drops their last item
     g x
-        | x > invid || Just x == maxk = max 0 $ x - 1
+        | x > invid || Just x == fmap NInt maxk = max 0 $ x - 1
         | otherwise = x
 
 updateCloseObjects :: World -> World