Use NewIntMap InvInt for crInv

src/Dodge/Inventory/Swap.hs

@@ -3,6 +3,7 @@ module Dodge.Inventory.Swap (
     swapAnyExtraSelection
 ) where
 
+import NewInt
 import Dodge.SoundLogic
 import Dodge.Item.Grammar
 import Dodge.Base.You
@@ -43,13 +44,13 @@ swapInvItems f i w = fromMaybe w $ do
             & checkConnection InventoryConnectSound connectItemS i k
   where
     updatecreature k =
-        (crInv %~ IM.safeSwapKeys i k)
-            . (crManipulation . manObject . imSelectedItem .~ k)
+        (crInv . unNIntMap %~ IM.safeSwapKeys i k)
+            . (crManipulation . manObject . imSelectedItem .~ NInt k)
             . swapSite i k
             . swapSite k i
     cr = you w
-    swapSite a b = case cr ^? crInv . ix a >>= \k -> w ^? cWorld . lWorld . items . ix k . itLocation . ilEquipSite . _Just of
-        Just epos -> crEquipment . ix epos .~ b
+    swapSite a b = case cr ^? crInv . ix (NInt a) >>= \k -> w ^? cWorld . lWorld . items . ix k . itLocation . ilEquipSite . _Just of
+        Just epos -> crEquipment . ix epos .~ NInt b
         Nothing -> id
 
 swapAnyExtraSelection :: Int -> Int -> World -> World