Refactor floor items to use centralised items intmap

src/Dodge/Render/HUD.hs

@@ -217,9 +217,9 @@ drawExamineInventory cfig w =
             , _siPayload = Nothing
             }
 
-closeObjectInfo :: Int -> Either FloorItem Button -> String
+closeObjectInfo :: Int -> Either Item Button -> String
 closeObjectInfo n x = case x of
-    Left FlIt{_flIt = itm} -> itemInfo itm ++ " It is on the floor" ++ floorItemPickupInfo n itm
+    Left itm -> itemInfo itm ++ " It is on the floor" ++ floorItemPickupInfo n itm
     Right _ -> "Some sort of switch or button."
 
 floorItemPickupInfo :: Int -> Item -> String
@@ -229,12 +229,12 @@ floorItemPickupInfo n itm
 
 -- note the use of ^?!
 -- it is probably desirable for this to crash hard for now
-yourAugmentedItem :: (Item -> a) -> a -> (Either FloorItem Button -> a) -> World -> a
+yourAugmentedItem :: (Item -> a) -> a -> (Either Item Button -> a) -> World -> a
 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 . ix j
+        flit <- w ^? cWorld . lWorld . items . ix j
         return . g $ Left flit
     Just (SelCloseButton i) -> fromMaybe x $ do
         j <- w ^? hud . closeButtons . ix i

src/Dodge/Render/ShapePicture.hs

@@ -29,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 (_floorItems))
+        <> foldup (Prelude.uncurry floorItemSPic) (IM.intersectionWith (,) (u^.uvWorld.cWorld.lWorld.items) (filtOn _flItPos (_floorItems)))
         <> foldup btSPic (filtOn _btPos _buttons)
         <> foldup (mcSPic (u ^. uvWorld . cWorld . lWorld)) (filtOn _mcPos _machines)
         <> foldMap' drawChasm (u ^. uvWorld . cWorld . chasms)
@@ -117,12 +117,12 @@ extraPics cfig u =
 ppDraw :: PressPlate -> Picture
 ppDraw c = uncurryV translate (_ppPos c) $ rotate (_ppRot c) (_ppPict c)
 
-floorItemSPic :: FloorItem -> SPic
-floorItemSPic flit =
+floorItemSPic :: Item -> FloorItem -> SPic
+floorItemSPic itm flit =
     uncurryV translateSPxy (_flItPos flit) $
         rotateSP
             (_flItRot flit)
-            (itemSPic $ _flIt flit)
+            (itemSPic $ itm)
 
 btSPic :: Button -> SPic
 btSPic bt =