Use NewIntMap InvInt for crInv

src/Dodge/Creature/Impulse/UseItem.hs

@@ -2,6 +2,7 @@
 
 module Dodge.Creature.Impulse.UseItem (useItem) where
 
+import NewInt
 import Control.Lens
 import Data.Maybe
 import Dodge.Data.ComposedItem
@@ -13,7 +14,7 @@ import Dodge.HeldUse
 import Dodge.Inventory
 import Dodge.Item.Grammar
 import Dodge.Item.Location
-import qualified IntMapHelp as IM
+--import qualified IntMapHelp as IM
 
 useItem :: Int -> Int -> World -> Maybe World
 useItem invid pt w = fmap (worldEventFlags . at InventoryChange ?~ ()) $ do
@@ -62,7 +63,7 @@ activateDetonator det = fromMaybe id $ do
     pjid <- det ^? dtValue . _1 . itUse . uaParams . apProjectiles . ix 0
     return $ cWorld . lWorld . projectiles . ix pjid . pjTimer .~ 0
 
-toggleEquipmentAt :: Int -> Creature -> World -> World
+toggleEquipmentAt :: NewInt InvInt -> Creature -> World -> World
 toggleEquipmentAt invid cr w = case getEquipmentAllocation invid w of
     DoNotMoveEquipment -> w
     PutOnEquipment{_allocNewPos = newp} ->
@@ -94,11 +95,12 @@ toggleEquipmentAt invid cr w = case getEquipmentAllocation invid w of
             & toitems . ix itid . itLocation . ilEquipSite .~ Nothing
             & onremove itm cr
   where
-    invidtoitid i = _crInv cr IM.! i
+    invidtoitid :: NewInt InvInt -> Int
+    invidtoitid i = cr ^?! crInv . ix i -- _crInv cr IM.! i
     toitems = cWorld . lWorld . items
-    itid = _crInv cr IM.! invid
+    itid = invidtoitid invid
     crpoint = cWorld . lWorld . creatures . ix (_crID cr)
-    itmat i = w ^?! cWorld . lWorld . items . ix (_crInv cr IM.! i)
+    itmat i = w ^?! cWorld . lWorld . items . ix (invidtoitid i)
     itm = itmat invid
     onequip itm' = effectOnEquip itm'
     onremove itm' = effectOnRemove itm'