Refactor floor items, removing ids (not fully checked)

src/Dodge/Base/NewID.hs

@@ -10,11 +10,7 @@ plNewID l x w = (i,w & l #%~ IM.insert i x)
     i = IM.newKey $ w ^# l
 
 -- | place an new object into an intmap and update its id
-plNewUpID :: ALens' b (IM.IntMap a)
+plNewUpID :: ALens' b (IM.IntMap a) -> ALens' a Int -> a -> b -> (Int,b)
-    -> ALens' a Int
-    -> a
-    -> b
-    -> (Int,b)
 plNewUpID l li x w = (i,w & l #%~ IM.insert i (x & li #~ i))
   where
     i = IM.newKey $ w ^# l

src/Dodge/Data/FloorItem.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.FloorItem where
 
-import NewInt
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -13,7 +12,7 @@ import Dodge.Data.Item
 import Geometry.Data
 
 
-data FloorItem = FlIt {_flIt :: Item, _flItPos :: Point2, _flItRot :: Float, _flItID :: NewInt FloorInt}
+data FloorItem = FlIt {_flIt :: Item, _flItPos :: Point2, _flItRot :: Float}--, _flItID :: NewInt FloorInt}
     --deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''FloorItem

src/Dodge/Data/HUD.hs

@@ -44,7 +44,7 @@ data HUD = HUD
     , _carteCenter :: Point2
     , _carteZoom :: Float
     , _carteRot :: Float
-    , _closeItems :: [NewInt FloorInt]
+    , _closeItems :: [NewInt ItmInt]
     , _closeButtons :: [Int]
     }
 

src/Dodge/Data/Item/Location.hs

@@ -9,7 +9,6 @@ import Dodge.Data.Equipment.Misc
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import NewInt
 
 -- it would be nice to have these as empty types, but I'm not sure how to get
 -- aeson to handle that
@@ -35,7 +34,7 @@ data ItemLocation
         , _ilEquipSite :: Maybe EquipSite
         }
     | OnTurret {_ilTuID :: Int}
-    | OnFloor {_ilFlID :: NewInt FloorInt}
+    | OnFloor-- {_ilFlID :: NewInt FloorInt}
     | InVoid
     deriving (Eq, Show, Ord, Read) --Generic, Flat)
 

src/Dodge/Data/LWorld.hs

@@ -131,7 +131,7 @@ data LWorld = LWorld
     , _blocks :: IM.IntMap Block
     , _coordinates :: IM.IntMap Point2
     , _triggers :: IM.IntMap Bool
-    , _floorItems :: NewIntMap FloorInt FloorItem
+    , _floorItems :: IM.IntMap FloorItem
     , _modifications :: IM.IntMap Modification
     , _worldEvents :: [WdWd]
     , _delayedEvents :: [(Int, WdWd)]

src/Dodge/Default.hs

@@ -25,7 +25,7 @@ defaultEquipment :: Item
 defaultEquipment = defaultHeldItem & itUse .~ UseNothing
 
 defaultFlIt :: FloorItem
-defaultFlIt = FlIt{_flItRot = 0, _flIt = defaultHeldItem, _flItPos = V2 0 0, _flItID = 0}
+defaultFlIt = FlIt{_flItRot = 0, _flIt = defaultHeldItem, _flItPos = V2 0 0}
 
 defaultMachine :: Machine
 defaultMachine =

src/Dodge/Default/World.hs

@@ -1,6 +1,4 @@
-module Dodge.Default.World (
+module Dodge.Default.World (defaultWorld) where
-    defaultWorld,
-) where
 
 import Data.Graph.Inductive.Graph hiding ((&))
 import qualified Data.Map as M
@@ -8,7 +6,6 @@ import Dodge.Data.World
 import Geometry.Data
 import Geometry.Polygon
 import qualified IntMapHelp as IM
-import NewInt
 import System.Random
 
 defaultInput :: Input
@@ -87,7 +84,6 @@ defaultCWorld =
         { _lWorld = defaultLWorld
         , _cwGen = defaultCWGen
         , _cClock = 0
---        , _seenWalls = mempty
         , _pathGraph = Data.Graph.Inductive.Graph.empty
         , _cwTiles = mempty
         , _numberFloorVerxs = 0
@@ -133,7 +129,7 @@ defaultLWorld =
         , _doors = IM.empty
         , _coordinates = IM.empty
         , _triggers = IM.empty
-        , _floorItems = NIntMap IM.empty
+        , _floorItems = mempty
         , _worldEvents = []
         , _delayedEvents = []
         , _pressPlates = IM.empty
@@ -156,7 +152,7 @@ defaultLWorld =
         , _imHotkeys = mempty
         , _lAimPos = 0
         , _lInvLock = False
-        , _respawnPos = (V2 20 20, pi/2)
+        , _respawnPos = (V2 20 20, pi / 2)
         }
 
 defaultHUD :: HUD
@@ -176,7 +172,6 @@ defaultDisplayInventory =
         { _subInventory = NoSubInventory
         , _diSections = mempty
         , _diSelection = Just (1, 0, mempty)
---        , _diSelectionExtra = mempty
         , _diInvFilter = mempty
         , _diCloseFilter = mempty
         }

src/Dodge/DisplayInventory.hs

@@ -9,6 +9,7 @@ module Dodge.DisplayInventory (
     toggleCombineInv,
 ) where
 
+import NewInt
 import Control.Applicative
 import Control.Lens
 import Control.Monad
@@ -158,7 +159,7 @@ updateDisplaySections w cfig =
     cr = you w
     closeitms =
         IM.fromDistinctAscList . zip [0 ..] $
-            mapMaybe (closeItemToSelectionItem w) (w ^. hud . closeItems)
+            mapMaybe (closeItemToSelectionItem w) (map _unNInt $ w ^. hud . closeItems)
     invitems =
         IM.map
             (uncurry (invSelectionItem w))

src/Dodge/FloorItem.hs

@@ -16,28 +16,25 @@ import System.Random
 
 -- | Copy an item to the floor.
 copyItemToFloor :: Point2 -> Item -> World -> World
-copyItemToFloor pos it = snd . copyItemToFloorID pos it
+copyItemToFloor pos it = copyItemToFloorID pos it
 
 -- | Copy an item to the floor, returns the floor item's id.
-copyItemToFloorID :: Point2 -> Item -> World -> (NewInt FloorInt, World)
+copyItemToFloorID :: Point2 -> Item -> World -> World
 copyItemToFloorID pos it w =
-    (,) (NInt flid) $
         w'
-            & cWorld . lWorld . floorItems . unNIntMap %~ IM.insert flid theflit
+            & cWorld . lWorld . floorItems %~ IM.insert (_unNInt $ _itID it) theflit
-            & cWorld . lWorld . itemLocations %~ IM.insert (_unNInt $ _itID it) (OnFloor $ NInt flid)
+            & cWorld . lWorld . itemLocations %~ IM.insert (_unNInt $ _itID it) OnFloor
-            & hud . closeItems %~ (NInt flid:) 
+            & hud . closeItems %~ (_itID it:) 
 --            & hud . hudElement . diSections . ix 3 . ssOffset .~ 0
                 -- ensures dropped item is at the top of the close item selection list
   where
     (p', w') = findWallFreeDropPoint (_dimRad $ itDim it) pos w
     rot = fst . randomR (- pi, pi) $ _randGen w
-    flid = IM.newKey . _unNIntMap . _floorItems . _lWorld $ _cWorld w
     theflit =
         FlIt
-            { _flIt = it & itLocation .~ OnFloor (NInt flid)
+            { _flIt = it & itLocation .~ OnFloor
             , _flItPos = p'
             , _flItRot = rot
-            , _flItID = NInt flid
             }
 
 cardinalVectors :: [Point2]

src/Dodge/Inventory.hs

@@ -66,9 +66,9 @@ destroyItem itid w = case w ^? cWorld . lWorld . itemLocations . ix itid of
     Nothing -> error $ "Tried to destroy item that does not exist; item id: " ++ show itid
     Just InInv{_ilCrID = cid, _ilInvID = invid} -> destroyInvItem cid invid w
     Just OnTurret{} -> error "need to write code for destroying items on turrets"
-    Just (OnFloor (NInt i)) ->
+    Just OnFloor ->
         w & cWorld . lWorld . itemLocations . at itid .~ Nothing
-            & cWorld . lWorld . floorItems . unNIntMap . at i .~ Nothing
+            & cWorld . lWorld . floorItems . at itid .~ Nothing
     Just InVoid -> w & cWorld . lWorld . itemLocations . at itid .~ Nothing
 
 -- note rmInvItem does not fully destroy the item, other updates to the item
@@ -125,7 +125,7 @@ updateCloseObjects w =
     g oldbts = intersect oldbts cbts `union` cbts
     f olditems = intersect olditems citems `union` citems
     lw = w ^. cWorld . lWorld
-    citems = lw^..floorItems . unNIntMap . each . filtered (isclose . _flItPos) . to _flItID
+    citems = lw^..floorItems . each . filtered (isclose . _flItPos) . to (_itID . _flIt)
     isclose x = dist y x < 40 && hasButtonLOS y x w
     y = _crPos $ you w
     cbts = lw^..buttons . each . filtered canpress . filtered (isclose . _btPos) . to _btID

src/Dodge/Inventory/Add.hs

@@ -23,9 +23,9 @@ import Dodge.FloorItem
 import Dodge.Inventory.CheckSlots
 import qualified IntMapHelp as IM
 
-tryPutFloorItemIDInInv :: Int -> NewInt FloorInt -> World -> Maybe (Int, World)
+tryPutFloorItemIDInInv :: Int -> Int -> World -> Maybe (Int, World)
-tryPutFloorItemIDInInv cid flitid w = do
+tryPutFloorItemIDInInv cid i w = do
-    flit <- w ^? cWorld . lWorld . floorItems . unNIntMap . ix (_unNInt flitid)
+    flit <- w ^? cWorld . lWorld . floorItems . ix i
     tryPutItemInInv cid flit w
 
 -- not sure why we have the cid here, this will probably only work for cid == 0
@@ -46,7 +46,7 @@ tryPutItemInInv cid flit w = case maybeInvSlot of
         Just
             ( i
             , w
-                & cWorld . lWorld . floorItems . unNIntMap %~ IM.delete (_unNInt $ _flItID flit)
+                & cWorld . lWorld . floorItems %~ IM.delete (flit ^. flIt . itID . unNInt)
                 & cWorld . lWorld . creatures . ix cid . crInv %~ IM.insert i it
                 & updateItLocation i
                 -- I forget whether using "at" rather than "IM.insert" here caused problems
@@ -93,14 +93,14 @@ tryPutItemInInv cid flit w = case maybeInvSlot of
 --    return (Just i, w')
 
 createItemYou :: Item -> World -> (ItemLocation, World)
-createItemYou itm w = fromMaybe (OnFloor flid, w') $ do
+createItemYou itm w = fromMaybe (OnFloor, w') $ do
-    (invid, w'') <- tryPutFloorItemIDInInv 0 flid w'
+    (invid, w'') <- tryPutFloorItemIDInInv 0 itid w'
     itloc <- w'' ^? cWorld . lWorld . creatures . ix 0 . crInv . ix invid . itLocation
     return (itloc, w'')
   where
     itid = IM.newKey $ w ^. cWorld . lWorld . itemLocations
     pos = w ^?! cWorld . lWorld . creatures . ix 0 . crPos
-    (flid,w') = copyItemToFloorID pos (itm & itID .~ NInt itid) w
+    w' = copyItemToFloorID pos (itm & itID .~ NInt itid) w
     
 
 -- | Pick up a specific item.

src/Dodge/Inventory/SelectionList.hs

@@ -202,9 +202,9 @@ hotkeyToChar = \case
     Hotkey9 -> '9'
     Hotkey0 -> '0'
 
-closeItemToSelectionItem :: World -> NewInt FloorInt -> Maybe (SelectionItem ())
+closeItemToSelectionItem :: World -> Int -> Maybe (SelectionItem ())
-closeItemToSelectionItem w (NInt i) = do
+closeItemToSelectionItem w i = do
-    e <- w ^? cWorld . lWorld . floorItems . unNIntMap . ix i
+    e <- w ^? cWorld . lWorld . floorItems . ix i
     let (pics, col) = closeItemToTextPictures e
     return
         SelItem

src/Dodge/Item/Location.hs

@@ -1,6 +1,6 @@
 module Dodge.Item.Location (
     pointerToItemID,
-    pointerToItemLocation,
+    --pointerToItemLocation,
     pointerToItem,
     pointerYourSelectedItem,
     pointerYourRootItem,
@@ -11,42 +11,41 @@ import Control.Lens
 import Data.Maybe
 import Dodge.Data.World
 
-pointerToItemLocation ::
+--pointerToItemLocation ::
-    Applicative f =>
+--    Applicative f =>
-    ItemLocation ->
+--    ItemLocation ->
-    (Item -> f Item) ->
+--    (Item -> f Item) ->
-    World ->
+--    World ->
-    f World
+--    f World
-pointerToItemLocation InInv {_ilCrID = cid, _ilInvID = invid} 
+--pointerToItemLocation InInv {_ilCrID = cid, _ilInvID = invid} 
-        = cWorld . lWorld . creatures . ix cid . crInv . ix invid
+--        = cWorld . lWorld . creatures . ix cid . crInv . ix invid
-pointerToItemLocation (OnFloor flid) = cWorld . lWorld . floorItems . unNIntMap . ix (_unNInt flid) . flIt
+--pointerToItemLocation (OnFloor) = \f w -> 
-pointerToItemLocation _ = const pure
+----    cWorld . lWorld . floorItems . ix (_unNInt flid) . flIt
+--pointerToItemLocation _ = const pure
 
 pointerYourSelectedItem :: Applicative a => (Item -> a Item) -> World -> a World
 pointerYourSelectedItem f w = fromMaybe (pure w) $ do
     itinvid <- w ^? cWorld . lWorld . creatures . ix 0 . crManipulation . manObject . imSelectedItem
-    Just $ pointerToItemLocation (InInv 0 itinvid True True True Nothing) f w
+    Just $ (cWorld . lWorld . creatures . ix 0 . crInv . ix itinvid) f w
     -- note the ilIsRoot/Selected/Attached booleans are irrelevant
 
 pointerYourRootItem :: Applicative a => (Item -> a Item) -> World -> a World
 pointerYourRootItem f w = fromMaybe (pure w) $ do
     itinvid <- w ^? cWorld . lWorld . creatures . ix 0 . crManipulation . manObject . imRootSelectedItem
-    Just $ pointerToItemLocation (InInv 0 itinvid True True True Nothing) f w
+    Just $ (cWorld . lWorld . creatures . ix 0 . crInv . ix itinvid) f w
 
-pointerToItem ::
+pointerToItem :: Applicative f => Item -> (Item -> f Item) -> World -> f World
-    Applicative f =>
+pointerToItem x = case x ^. itLocation of
-    Item ->
+    OnFloor -> cWorld . lWorld . floorItems . ix (x ^. itID . unNInt) . flIt
-    (Item -> f Item) ->
+    OnTurret tid -> cWorld . lWorld . machines . ix tid . mcType . mctTurret . tuWeapon
-    World ->
+    InInv cid invid _ _ _ _ -> cWorld . lWorld . creatures . ix cid . crInv . ix invid
-    f World
+    InVoid -> const pure
-pointerToItem = pointerToItemLocation . _itLocation
 
-pointerToItemID :: 
+pointerToItemID :: Applicative f => NewInt ItmInt -> (Item -> f Item) -> World -> f World
-    Applicative f =>
-    NewInt ItmInt ->
-    (Item -> f Item) ->
-    World ->
-    f World
 pointerToItemID itid f w = fromMaybe (pure w) $ do
     itloc <- w ^? cWorld . lWorld . itemLocations . ix (_unNInt itid)
-    return $ pointerToItemLocation itloc f w
+    return $ (\x -> x f w) $ case itloc of
+        OnFloor -> cWorld . lWorld . floorItems . ix (_unNInt itid) . flIt
+        OnTurret tid -> cWorld . lWorld . machines . ix tid . mcType . mctTurret . tuWeapon
+        InInv cid invid _ _ _ _ -> cWorld . lWorld . creatures . ix cid . crInv . ix invid
+        InVoid -> const pure

src/Dodge/Item/Location/Initialize.hs

@@ -10,17 +10,18 @@ import qualified IntMapHelp as IM
 import Data.Traversable
 
 initItemLocations :: LWorld -> LWorld
-initItemLocations = initCrsItemLocations . initFlItemsLocations . initTusItemLocations
+--initItemLocations = initCrsItemLocations . initFlItemsLocations . initTusItemLocations
+initItemLocations = initCrsItemLocations . initTusItemLocations
 
 initCrsItemLocations :: LWorld -> LWorld
 initCrsItemLocations w = w' & creatures .~ newcreatures
   where
     (w', newcreatures) = mapAccumR initCrItemLocations w (w ^. creatures)
 
-initFlItemsLocations :: LWorld -> LWorld
+--initFlItemsLocations :: LWorld -> LWorld
-initFlItemsLocations w = w' & floorItems .~ NIntMap newfloorItems
+--initFlItemsLocations w = w' & floorItems .~ newfloorItems
-  where
+--  where
-    (w', newfloorItems) = mapAccumR initFlItemLocation w (w ^. floorItems . unNIntMap)
+--    (w', newfloorItems) = mapAccumR initFlItemLocation w (w ^. floorItems)
 
 initTusItemLocations :: LWorld -> LWorld
 initTusItemLocations w = w' & machines .~ newmachines
@@ -54,14 +55,14 @@ initCrItemLocation cr invid w it = (w & itemLocations . at locid ?~ loc
             }
 
 
-initFlItemLocation :: LWorld -> FloorItem -> (LWorld, FloorItem)
+--initFlItemLocation :: LWorld -> FloorItem -> (LWorld, FloorItem)
-initFlItemLocation w flit = (w & itemLocations . at locid ?~ loc
+--initFlItemLocation w flit = (w & itemLocations . at locid ?~ loc
-    , flit & flIt . itID .~ NInt locid
+--    , flit & flIt . itID .~ NInt locid
-        & flIt . itLocation .~ loc
+--        & flIt . itLocation .~ loc
-    )
+--    )
-  where
+--  where
-    locid = IM.newKey (w ^. itemLocations )
+--    locid = IM.newKey (w ^. itemLocations )
-    loc = OnFloor (_flItID flit)
+--    loc = OnFloor (_flItID flit)
 
 initTuItemLocation :: LWorld -> Machine -> (LWorld, Machine)
 initTuItemLocation w mc = case mc ^? mcType . _McTurret . tuWeapon of

src/Dodge/Placement/PlaceSpot.hs

@@ -2,9 +2,7 @@
 {- | deals with placement of objects within the world
  after they have had their coordinates set by the layout
 -}
-module Dodge.Placement.PlaceSpot (
+module Dodge.Placement.PlaceSpot (placeSpot) where
-    placeSpot,
-) where
 
 import Color
 import LensHelp
@@ -22,7 +20,6 @@ import Dodge.Placement.Shift
 import Dodge.ShiftPoint
 import Geometry
 import qualified IntMapHelp as IM
-import NewInt
 import System.Random
 
 -- when placing a placement, we update the world and the room and assign an id
@@ -111,12 +108,15 @@ placeSpotID' ps pt w = case pt of
     PutProp prp -> plNewUpID (cWorld . lWorld . props) prID (mvProp p rot prp) w
     PutButton bt -> plNewUpID (cWorld . lWorld . buttons) btID (mvButton p rot bt) w
     PutTerminal tm -> plNewUpID (cWorld . lWorld . terminals) tmID tm w
-    PutFlIt itm ->
+    PutFlIt itm -> let i = IM.newKey (w ^. cWorld . lWorld . itemLocations)
-        plNewUpID
+        in (i, w & cWorld . lWorld . itemLocations . at i ?~ OnFloor
-            (cWorld . lWorld . floorItems . unNIntMap)
+            & cWorld . lWorld . floorItems . at i ?~ createFlIt p rot itm
-            (flItID . unNInt)
+            )
-            (createFlIt p rot itm)
+--        plNewUpID
-            w
+--            (cWorld . lWorld . floorItems . unNIntMap)
+--            (flItID . unNInt)
+--            (createFlIt p rot itm)
+--            w
     PutCrit cr -> plNewUpID (cWorld . lWorld . creatures) crID (mvCr p rot cr) w
     PutForeground fs -> plNewUpID (cWorld . lWorld . foregroundShapes) fsID (mvFS p rot fs) w
     PutMachine pps mc wl -> plMachine (map doShift pps) mc wl p rot w
@@ -180,7 +180,7 @@ mvButton p a = (btRot +~ a) . (btPos %~ ((p +.+) . rotateV a))
 
 {- Creates a floor item at a given point.-}
 createFlIt :: Point2 -> Float -> Item -> FloorItem
-createFlIt p rot itm = FlIt{_flItPos = p, _flItRot = rot, _flItID = 0, _flIt = itm}
+createFlIt p rot itm = FlIt{_flItPos = p, _flItRot = rot, _flIt = itm}
 
 mvPP :: Point2 -> Float -> PressPlate -> PressPlate
 mvPP p rot pp = pp{_ppPos = p, _ppRot = rot}

src/Dodge/Projectile/Update.hs

@@ -163,9 +163,9 @@ destroyProjectile mitid pjid w =
         & removelink
   where
     removelink = fromMaybe id $ do
-        itid <- fmap _unNInt mitid
+        itid <- mitid
-        loc <- w ^? cWorld . lWorld . itemLocations . ix itid
+--        loc <- w ^? cWorld . lWorld . itemLocations . ix itid
-        return $ pointerToItemLocation loc . itUse . uaParams . apProjectiles %~ delete pjid
+        return $ pointerToItemID itid . itUse . uaParams . apProjectiles %~ delete pjid
 
 trySpin :: Projectile -> World -> World
 trySpin pj = fromMaybe id $ do

src/Dodge/RadarSweep.hs

@@ -91,7 +91,7 @@ crBlips p r = (,mempty) . IM.elems . IM.filter f . fmap _crPos . IM.filter g . _
     g cr = _crID cr /= 0
 
 itemBlips :: Point2 -> Float -> World -> ([Point2], S.Set (Point2, Point2))
-itemBlips p r = (,mempty) . IM.elems . IM.filter f . fmap _flItPos . _unNIntMap . _floorItems . _lWorld . _cWorld
+itemBlips p r = (,mempty) . IM.elems . IM.filter f . fmap _flItPos . _floorItems . _lWorld . _cWorld
   where
     f q = dist p q <= r && dist p q > r - 4
 

src/Dodge/Render/HUD.hs

@@ -234,7 +234,7 @@ yourAugmentedItem f x g w = case you w ^? crManipulation . manObject of
     Just (SelectedItem i _ _) -> f $ yourInv w ^?! ix i
     Just (SelCloseItem i) -> fromMaybe x $ do
         j <- w ^? hud . closeItems . ix i . unNInt
-        flit <- w ^? cWorld . lWorld . floorItems . unNIntMap . ix j
+        flit <- w ^? cWorld . lWorld . floorItems . ix j
         return . g $ Left flit
     Just (SelCloseButton i) -> fromMaybe x $ do
         j <- w ^? hud . closeButtons . ix i

src/Dodge/Render/ShapePicture.hs

@@ -13,7 +13,6 @@ import Dodge.RadarBlip
 import Dodge.Render.Picture
 import Geometry
 import qualified IntMapHelp as IM
-import NewInt
 import Picture
 import Shape
 import ShapePicture
@@ -30,7 +29,7 @@ worldSPic cfig u =
         <> foldup (shiftDraw _fsPos _fsDir (const _fsSPic)) (filtOn _fsPos _foregroundShapes)
         <> foldup (shiftDraw' _cpPos _cpDir _cpSPic) (filtOn _cpPos _corpses)
         <> foldup drawCreature (filtOn _crPos _creatures)
-        <> foldup floorItemSPic (filtOn _flItPos (_unNIntMap . _floorItems))
+        <> foldup floorItemSPic (filtOn _flItPos (_floorItems))
         <> foldup btSPic (filtOn _btPos _buttons)
         <> foldup (mcSPic (u ^. uvWorld . cWorld . lWorld)) (filtOn _mcPos _machines)
         <> foldMap' drawChasm (u ^. uvWorld . cWorld . chasms)

src/Dodge/SelectedClose.hs

@@ -17,7 +17,7 @@ getSelectedCloseObj w = do
     case i of
         3 -> do
             NInt k <- w ^? hud . closeItems . ix j
-            fmap Left $ w ^? cWorld . lWorld . floorItems . unNIntMap . ix k
+            fmap Left $ w ^? cWorld . lWorld . floorItems . ix k
         5 -> do
             k <- w ^? hud . closeButtons . ix j
             fmap Right $ w ^? cWorld . lWorld . buttons . ix k

src/Dodge/Terminal.hs

@@ -64,7 +64,7 @@ getCommand w tm = \case
     TCSensorInfo -> sensorCommand w tm
 
 damageCodeCommand :: World -> Terminal -> PTE.TrieMap Char (PTE.TrieMap Char [TerminalLine])
-damageCodeCommand w tm 
+damageCodeCommand w _ 
     = PTE.singleton "DAMAGECODE" $ PTE.fromList $ mapMaybe f [minBound ..]
   where
     f :: SensorType -> Maybe (String, [TerminalLine])

src/Dodge/TractorBeam/Update.hs

@@ -1,6 +1,5 @@
-module Dodge.TractorBeam.Update where
+module Dodge.TractorBeam.Update (updateTractorBeam) where
 
-import NewInt
 import Control.Lens
 import Dodge.Data.World
 import Geometry
@@ -12,7 +11,7 @@ updateTractorBeam w pj
     | otherwise =
         ( w
             & cWorld . lWorld . creatures %~ IM.map (tractCr pullVel pos outpos)
-            & cWorld . lWorld . floorItems . unNIntMap %~ IM.map (tractFlIt pullVel pos outpos)
+            & cWorld . lWorld . floorItems %~ IM.map (tractFlIt pullVel pos outpos)
         , Just (pj & tbTime -~ 1)
         )
   where

src/Dodge/Update/Input/InGame.hs

@@ -150,7 +150,7 @@ tryPickupSelected k mpos w = do
   where
     g i = do
         NInt j <- w ^? hud . closeItems . ix i
-        w ^? cWorld . lWorld . floorItems . unNIntMap . ix j
+        w ^? cWorld . lWorld . floorItems . ix j
 
 updateMouseReleaseInGame :: World -> World
 updateMouseReleaseInGame w = case w ^. input . mouseContext of
@@ -531,7 +531,7 @@ getCloseObj w = getSelectedCloseObj w <|> topcitem <|> topcbut
         k' <- (w ^? hud . hudElement . diSections . ix 3 . ssItems) 
             >>= (fmap fst . IM.lookupMin)
         NInt k <- w ^? hud . closeItems . ix k'
-        Left <$> w ^? cWorld . lWorld . floorItems . unNIntMap . ix k
+        Left <$> w ^? cWorld . lWorld . floorItems . ix k
     topcbut = do
         k <- w ^? hud . closeButtons . ix 0
         Right <$> w ^? cWorld . lWorld . buttons . ix k