Add newtype to floor item ids

ghcidOutput

@@ -1 +1 @@
-All good (619 modules, at 14:32:19)
+All good (620 modules, at 22:36:40)

src/Dodge/Creature/Action.hs

@@ -12,7 +12,6 @@ module Dodge.Creature.Action (
     blinkActionFail,
     unsafeBlinkAction,
     sizeSelf,
-    copyInvItemToFloor,
     youDropItem,
     pickUpItem,
 --    pickUpItemID,
@@ -170,19 +169,16 @@ setMinInvSize n cr = cWorld . lWorld . creatures . ix (_crID cr) . crInvCapacity
 --    newSelKey = fromMaybe 0 $ findIndex ((== crSel cr) . fst) pairs
 --    newInv = IM.fromAscList $ zip [0 ..] $ map snd pairs
 
---dropUnselected :: Creature -> World -> World
---dropUnselected cr w =
---    foldr (dropItem cr) w . IM.keys $
---        crSel cr `IM.delete` _crInv cr
-
 dropExcept :: Creature -> Int -> World -> World
 dropExcept cr invid w =
     foldr (dropItem cr) w . IM.keys $
         invid `IM.delete` _crInv cr
 
 dropItem :: Creature -> Int -> World -> World
-dropItem cr invid = rmInvItem (_crID cr) invid . copyInvItemToFloor cr invid -- . mayberemoveequip
-
+dropItem cr invid = rmInvItem (_crID cr) invid . 
+    copyItemToFloor (_crPos cr) itm -- . mayberemoveequip
+  where
+    itm = fromMaybe (error "dropItem cannot find item") $ cr ^? crInv . ix invid
 -- the following should be done in rmInvItem
 --    mayberemoveequip = case _crLeftInvSel cr of
 --        Just i | i == invid -> creatures . ix cid . crLeftInvSel .~ Nothing
@@ -205,12 +201,6 @@ youDropItem w = fromMaybe w $ do
         it <- yourSelectedItem w
         return $ it ^. itCurseStatus /= Uncursed
 
--- | Copy an inventory item to the floor.
-copyInvItemToFloor :: Creature -> Int -> World -> World
-copyInvItemToFloor cr i =
-    copyItemToFloor (_crPos cr) $
-        _crInv cr IM.! i
-
 sizeSelf :: Float -> Creature -> World -> Maybe World
 sizeSelf x cr w
     | not (crOnWall cr1 w) =

src/Dodge/Creature/State.hs

@@ -226,7 +226,7 @@ useEquipment cr i = useE (_eeUse (_equipEffect $ _itUse itm)) itm cr
 
 -- a map updating all inventory items
 updateInv :: Creature -> World -> World
-updateInv cr = cWorld . lWorld . creatures . ix (_crID cr) . crInv %~ IM.mapWithKey (itemUpdate cr)
+updateInv cr = cWorld . lWorld . creatures . ix (_crID cr) . crInv %~ IM.map itemUpdate
 
 -- a loop going over equipped items
 equipmentEffects :: Creature -> World -> World
@@ -259,14 +259,14 @@ itemInvSideEffect _ _
 --  where
 --    attachoff = it ^?! itDimension . dimAttachPos
 
-itemUpdate :: Creature -> Int -> Item -> Item
-itemUpdate cr i =
+itemUpdate :: Item -> Item
+itemUpdate =
     updateAutoRecharge
         . (itUse %~ useUpdate)
-        . (itLocation .~ InInv (_crID cr) i itmisselected itmisroot)
-  where
-    itmisroot = Just i == (cr ^? crManipulation . manObject . inInventory . imRootItem)
-    itmisselected = Just i == (cr ^? crManipulation . manObject . inInventory . imSelectedItem)
+--        . (itLocation .~ InInv (_crID cr) i itmisselected itmisroot)
+--  where
+--    itmisroot = Just i == (cr ^? crManipulation . manObject . inInventory . imRootItem)
+--    itmisselected = Just i == (cr ^? crManipulation . manObject . inInventory . imSelectedItem)
 
 updateAutoRecharge :: Item -> Item
 updateAutoRecharge it = case it ^? itUse . leftConsumption of

src/Dodge/Data/FloorItem.hs

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

src/Dodge/Data/Item.hs

@@ -30,6 +30,9 @@ import Dodge.Data.Item.Use
 import Dodge.Data.Item.Location
 import Data.Set (Set)
 
+data ItID = ItID
+    deriving (Eq,Ord,Show,Read)
+
 data Item = Item
     { _itUse :: ItemUse
     , _itType :: ItemType
@@ -57,5 +60,6 @@ _itUseAimStance :: Item -> AimStance
 _itUseAimStance = _aimStance . _heldAim . _itUse
 
 makeLenses ''Item
+deriveJSON defaultOptions ''ItID
 deriveJSON defaultOptions ''ItemAttachment
 deriveJSON defaultOptions ''Item

src/Dodge/Data/Item/Location.hs

@@ -2,18 +2,34 @@
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE EmptyDataDeriving #-}
 module Dodge.Data.Item.Location where
 
 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
+data FloorInt = FloorInt
+  deriving (Eq,Ord,Show,Read)
+-- should use these..
+data InvInt = InvInt
+  deriving (Eq,Ord,Show,Read)
+data TurretInt
+  deriving (Eq,Ord,Show,Read)
+data CrInt = CrInt
+  deriving (Eq,Ord,Show,Read)
 
 data ItemLocation
     = InInv {_ilCrID :: Int, _ilInvID :: Int, _ilIsRoot :: Bool, _ilIsSelected :: Bool}
     | OnTurret {_ilTuID :: Int}
-    | OnFloor {_ilFlID :: Int}
+    | OnFloor {_ilFlID :: NewInt FloorInt}
     | InVoid
     deriving (Eq, Show, Ord, Read) --Generic, Flat)
 
 makeLenses ''ItemLocation
+deriveJSON defaultOptions ''InvInt
+deriveJSON defaultOptions ''FloorInt
 deriveJSON defaultOptions ''ItemLocation

src/Dodge/Data/LWorld.hs

@@ -47,6 +47,7 @@ module Dodge.Data.LWorld (
     module Dodge.Data.WorldEffect,
 ) where
 
+import NewInt
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -128,7 +129,7 @@ data LWorld = LWorld
     , _blocks :: IM.IntMap Block
     , _coordinates :: IM.IntMap Point2
     , _triggers :: IM.IntMap Bool
-    , _floorItems :: IM.IntMap FloorItem
+    , _floorItems :: NewIntMap FloorInt FloorItem
     , _modifications :: IM.IntMap Modification
     , _worldEvents :: [WdWd]
     , _delayedEvents :: [(Int, WdWd)]

src/Dodge/Default/World.hs

@@ -1,5 +1,6 @@
 module Dodge.Default.World where
 
+import NewInt
 import Control.Lens
 import Data.Graph.Inductive.Graph hiding ((&))
 import qualified Data.Map as M
@@ -125,7 +126,7 @@ defaultLWorld =
         , _doors = IM.empty
         , _coordinates = IM.empty
         , _triggers = IM.empty
-        , _floorItems = IM.empty
+        , _floorItems = NIntMap IM.empty
         , _worldEvents = []
         , _delayedEvents = []
         , _pressPlates = IM.empty

src/Dodge/FloorItem.hs

@@ -3,8 +3,10 @@ module Dodge.FloorItem (
     copyItemToFloorID,
 ) where
 
+import NewInt
 import Control.Lens
 import Data.Maybe
+import Data.Monoid
 import Dodge.Base
 import Dodge.Data.World
 import Geometry
@@ -16,24 +18,22 @@ copyItemToFloor :: Point2 -> Item -> World -> World
 copyItemToFloor pos it = snd . copyItemToFloorID pos it
 
 -- | Copy an item to the floor, returns the floor item's id.
-copyItemToFloorID :: Point2 -> Item -> World -> (Int, World)
+copyItemToFloorID :: Point2 -> Item -> World -> (NewInt FloorInt, World)
 copyItemToFloorID pos it w =
-    (,) flid $
+    (,) (NInt flid) $
         w'
-            & cWorld . lWorld . floorItems %~ IM.insert flid theflit
-            & updateLocation
+            & cWorld . lWorld . floorItems . unNIntMap %~ IM.insert flid theflit
+            & cWorld . lWorld . itemLocations . ix (_itID it) .~ OnFloor (NInt flid)
   where
     (p', w') = findWallFreeDropPoint (_dimRad $ _itDimension it) pos w
     rot = fst . randomR (- pi, pi) $ _randGen w
-    updateLocation = cWorld . lWorld . itemLocations . ix (_itID it) .~ OnFloor flid
-    flid = IM.newKey $ _floorItems (_lWorld (_cWorld w))
+    flid = IM.newKey . _unNIntMap . _floorItems . _lWorld $ _cWorld w
     theflit =
         FlIt
-            -- { _flIt = it & itUse . useAmount %~ const 1
             { _flIt = it
             , _flItPos = p'
             , _flItRot = rot
-            , _flItID = flid
+            , _flItID = NInt flid
             }
 
 cardinalVectors :: [Point2]
@@ -46,12 +46,12 @@ cardinalVectors =
 
 findWallFreeDropPoint :: Float -> Point2 -> World -> (Point2, World)
 findWallFreeDropPoint r p w =
-    ( head $ mapMaybe f cardinalVectors ++ [p]
-    , w{_randGen = g}
+    ( fromMaybe p . getFirst $ foldMap f cardinalVectors
+    , w & randGen .~ g
     )
   where
-    f q = testOnWall r $ p +.+ rotateV rot (10 *.* q)
-    testOnWall r' q
-        | circOnSomeWall q r' w = Nothing
-        | otherwise = Just q
+    f q = testOnWall $ p +.+ rotateV rot (10 *.* q)
+    testOnWall q
+        | circOnSomeWall q r w = mempty
+        | otherwise = pure q
     (rot, g) = randomR (0, 2 * pi) $ _randGen w

src/Dodge/Inventory.hs

@@ -13,6 +13,7 @@ module Dodge.Inventory (
     module Dodge.Inventory.RBList
 ) where
 
+import NewInt
 import Dodge.Inventory.Location
 import Dodge.Inventory.RBList
 import Control.Applicative
@@ -195,10 +196,12 @@ updateCloseObjects w =
             . filter ((/=) BtNoLabel . _btState)
             . IM.elems
             $ w ^. cWorld . lWorld . buttons
-    currentClose = filt $ map Left (IM.elems $ w ^. cWorld . lWorld . floorItems) ++ activeButtons
+    currentClose = filt $ map Left (IM.elems $ w ^. cWorld . lWorld . floorItems . unNIntMap) 
+        ++ activeButtons
     oldClose = filt $ mapMaybe updatebyid $ w ^. hud . closeObjects
     oldCloseFiltered = intersectBy closeObjEq oldClose currentClose
-    updatebyid (Left flid) = fmap Left $ w ^? cWorld . lWorld . floorItems . ix (_flItID flid)
+    updatebyid (Left flid) = fmap Left $ w ^? cWorld . lWorld . floorItems . unNIntMap 
+        . ix (_unNInt $ _flItID flid)
     updatebyid (Right btid) = fmap Right $ w ^? cWorld . lWorld . buttons . ix (_btID btid)
 
 changeSwapSel :: Int -> World -> World

src/Dodge/Inventory/Add.hs

@@ -5,6 +5,7 @@ module Dodge.Inventory.Add (
     pickUpItem,
 ) where
 
+import NewInt
 import Dodge.SoundLogic
 import Dodge.Inventory.Location
 --import Dodge.Item.Grammar
@@ -18,9 +19,9 @@ import Dodge.FloorItem
 import Dodge.Inventory.CheckSlots
 import qualified IntMapHelp as IM
 
-tryPutItemIDInInv :: Int -> Int -> World -> Maybe (Int, World)
+tryPutItemIDInInv :: Int -> NewInt FloorInt -> World -> Maybe (Int, World)
 tryPutItemIDInInv cid flitid w = do
-    flit <- w ^? cWorld . lWorld . floorItems . ix flitid
+    flit <- w ^? cWorld . lWorld . floorItems . unNIntMap . ix (_unNInt flitid)
     tryPutItemInInv cid flit w
 
 -- | Pick up a specific item.
@@ -32,7 +33,7 @@ tryPutItemInInv cid flit w = case maybeInvSlot of
             ( i
             , w
                 & updateItLocation i
-                & cWorld . lWorld . floorItems %~ IM.delete (_flItID flit)
+                & cWorld . lWorld . floorItems . unNIntMap %~ IM.delete (_unNInt $ _flItID flit)
                 -- & cWorld . lWorld . creatures . ix cid . crInv %~ IM.insert i it
                 & cWorld . lWorld . creatures . ix cid . crInv . at i ?~ it
                 & setInvPosFromSS

src/Dodge/Item/Location.hs

@@ -6,6 +6,7 @@ module Dodge.Item.Location (
     pointerYourRootItem,
 ) where
 
+import NewInt
 import Control.Lens
 import Data.Maybe
 import Dodge.Data.World
@@ -14,7 +15,7 @@ getItem :: Int -> World -> Maybe Item
 getItem itid w = do
     itpos <- w ^? cWorld . lWorld . itemLocations . ix itid
     case itpos of
-        OnFloor flitid -> w ^? cWorld . lWorld . floorItems . ix flitid . flIt
+        OnFloor flitid -> w ^? cWorld . lWorld . floorItems . unNIntMap . ix (_unNInt flitid) . flIt
         InInv {_ilCrID = cid, _ilInvID = invid} 
             -> w ^? cWorld . lWorld . creatures . ix cid . crInv . ix invid
         OnTurret mcid -> w ^? cWorld . lWorld . machines . ix mcid . mcType . _McTurret . tuWeapon
@@ -28,7 +29,7 @@ pointerToItemLocation ::
     f World
 pointerToItemLocation InInv {_ilCrID = cid, _ilInvID = invid} 
         = cWorld . lWorld . creatures . ix cid . crInv . ix invid
-pointerToItemLocation (OnFloor flid) = cWorld . lWorld . floorItems . ix flid . flIt
+pointerToItemLocation (OnFloor flid) = cWorld . lWorld . floorItems . unNIntMap . ix (_unNInt flid) . flIt
 pointerToItemLocation _ = const pure
 
 pointerYourSelectedItem :: Applicative a => (Item -> a Item) -> World -> a World

src/Dodge/Item/Location/Initialize.hs

@@ -3,6 +3,7 @@ module Dodge.Item.Location.Initialize
     , initItemLocations
     )
     where
+import NewInt
 import Dodge.Data.LWorld
 import Control.Lens
 import qualified IntMapHelp as IM
@@ -17,9 +18,9 @@ initCrsItemLocations w = w' & creatures .~ newcreatures
     (w', newcreatures) = mapAccumR initCrItemLocations w (w ^. creatures)
 
 initFlItemsLocations :: LWorld -> LWorld
-initFlItemsLocations w = w' & floorItems .~ newfloorItems
+initFlItemsLocations w = w' & floorItems .~ NIntMap newfloorItems
   where
-    (w', newfloorItems) = mapAccumR initFlItemLocation w (w ^. floorItems)
+    (w', newfloorItems) = mapAccumR initFlItemLocation w (w ^. floorItems . unNIntMap)
 
 initTusItemLocations :: LWorld -> LWorld
 initTusItemLocations w = w' & machines .~ newmachines

src/Dodge/Placement/PlaceSpot.hs

@@ -5,6 +5,7 @@ module Dodge.Placement.PlaceSpot (
     placeSpot,
 ) where
 
+import NewInt
 import Color
 import Control.Lens
 import Control.Monad.State
@@ -99,7 +100,8 @@ 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 -> plNewUpID (cWorld . lWorld . floorItems) flItID (createFlIt p rot itm) w
+    PutFlIt itm -> plNewUpID (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
     PutDecoration pic -> plNewID (cWorld . lWorld . decorations) (shiftDec p rot pic) w

src/Dodge/RadarSweep.hs

@@ -3,6 +3,7 @@ module Dodge.RadarSweep
     , updateRadarSweep
     ) where
 
+import NewInt
 import Color
 import Data.Maybe
 import Dodge.Data.World
@@ -72,7 +73,7 @@ crBlips p r = IM.elems . IM.filter f . fmap _crPos . IM.filter g . _creatures .
     g cr = _crID cr /= 0
 
 itemBlips :: Point2 -> Float -> World -> [Point2]
-itemBlips p r = IM.elems . IM.filter f . fmap _flItPos . _floorItems . _lWorld . _cWorld
+itemBlips p r = IM.elems . IM.filter f . fmap _flItPos . _unNIntMap . _floorItems . _lWorld . _cWorld
   where
     f q = dist p q <= r && dist p q > r - 4
 

src/Dodge/Render/ShapePicture.hs

@@ -2,6 +2,7 @@ module Dodge.Render.ShapePicture (
     worldSPic,
 ) where
 
+import NewInt
 import Dodge.Render.List
 import Control.Lens
 import Control.Monad (guard)
@@ -30,7 +31,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 floorItemSPic (filtOn _flItPos (_unNIntMap . _floorItems))
         <> foldup btSPic (filtOn _btPos _buttons)
         <> foldup mcSPic (filtOn _mcPos _machines)
         <> aimDelaySweep w

src/Dodge/TestString.hs

@@ -20,19 +20,18 @@ import Dodge.Data.Universe
 import qualified IntMapHelp as IM
 
 testStringInit :: Universe -> [String]
-testStringInit _ = []
---testStringInit u = (topTestPart u
---    <>) $ map showh $ 
---    (IM.toList . IM.filter (\itloc -> itloc ^? ilCrID == Just 0) $ (u ^. uvWorld . cWorld . lWorld . itemLocations)) <> ( IM.elems $ fmap h (u ^?! uvWorld . cWorld . lWorld . creatures . ix 0 . crInv))
---  where
---    h itm = (_itID itm, _itLocation itm)
---    showh (x,(InInv a b c d)) = show x ++ "," ++ show a ++ "," ++ show b ++"," ++ show c ++"," ++ show d 
---    showh _ = ""
---
---topTestPart :: Universe -> [String]
---topTestPart u = [show $ u ^? uvWorld . hud . hudElement . diSections . sssExtra . sssSelPos
---    , maybe "" showManObj $ u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crManipulation . manObject
---    ]
+testStringInit u = (topTestPart u
+    <>) $ map showh $ 
+    (IM.toList . IM.filter (\itloc -> itloc ^? ilCrID == Just 0) $ (u ^. uvWorld . cWorld . lWorld . itemLocations)) <> ( IM.elems $ fmap h (u ^?! uvWorld . cWorld . lWorld . creatures . ix 0 . crInv))
+  where
+    h itm = (_itID itm, _itLocation itm)
+    showh (x,(InInv a b c d)) = show x ++ "," ++ show a ++ "," ++ show b ++"," ++ show c ++"," ++ show d 
+    showh _ = ""
+
+topTestPart :: Universe -> [String]
+topTestPart u = [show $ u ^? uvWorld . hud . hudElement . diSections . sssExtra . sssSelPos
+    , maybe "" showManObj $ u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crManipulation . manObject
+    ]
 
 showManObj :: ManipulatedObject -> String
 showManObj (InInventory SortInventory) = "SortInventory"

src/Dodge/TractorBeam/Update.hs

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

tags

@@ -297,8 +297,8 @@ Bullet	src/Dodge/Data/Bullet.hs	6;"	m
 Bullet	src/Dodge/Item/Weapon/Bullet.hs	1;"	m
 BulletAmmo	src/Dodge/Data/Ammo.hs	37;"	C
 BulletAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	39;"	C
-BulletBeltAttachment	src/Dodge/Data/Item.hs	51;"	C
-BulletClipAttachment	src/Dodge/Data/Item.hs	50;"	C
+BulletBeltAttachment	src/Dodge/Data/Item.hs	55;"	C
+BulletClipAttachment	src/Dodge/Data/Item.hs	54;"	C
 BulletEffect	src/Dodge/Data/Bullet.hs	36;"	t
 BulletGun	src/Dodge/Item/Held/BulletGun.hs	1;"	m
 BulletGuns	src/Dodge/Item/Weapon/BulletGuns.hs	1;"	m
@@ -498,6 +498,7 @@ CrGroupParams	src/Dodge/Data/CrGroupParams.hs	6;"	m
 CrGroupUpdate	src/Dodge/Data/CrGroupParams.hs	22;"	t
 CrGroupUpdate	src/Dodge/CrGroupUpdate.hs	1;"	m
 CrHitSound	src/Dodge/Data/SoundOrigin.hs	29;"	C
+CrID	src/Dodge/Data/Item/Location.hs	22;"	t
 CrID	src/Dodge/Data/CrWlID.hs	12;"	C
 CrImp	src/Dodge/Data/CreatureEffect.hs	23;"	t
 CrIsAiming	src/Dodge/Data/CreatureEffect.hs	41;"	C
@@ -935,7 +936,7 @@ FixedRate	src/Dodge/Data/Item/HeldDelay.hs	15;"	C
 FixedRate	src/Dodge/Data/Item/Use/Delay.hs	12;"	C
 FixedRate	src/Dodge/Data/Item/UseDelay.hs	12;"	C
 FixedSelectionWidth	src/Dodge/Data/SelectionList.hs	67;"	C
-FlIt	src/Dodge/Data/FloorItem.hs	14;"	C
+FlIt	src/Dodge/Data/FloorItem.hs	16;"	C
 FlItLayer	src/Dodge/Picture/Layer/Data.hs	10;"	C
 Flag	src/Dodge/Debug/Flag.hs	1;"	m
 Flame	src/Dodge/Data/Flame.hs	14;"	t
@@ -976,7 +977,8 @@ FlockArmourChaseAI	src/Dodge/Data/Creature/Misc.hs	58;"	C
 Floor	src/Data/Tile.hs	10;"	t
 Floor	src/Dodge/Floor.hs	2;"	m
 Floor	src/Shader/Poke/Floor.hs	1;"	m
-FloorItem	src/Dodge/Data/FloorItem.hs	14;"	t
+FloorID	src/Dodge/Data/Item/Location.hs	15;"	t
+FloorItem	src/Dodge/Data/FloorItem.hs	16;"	t
 FloorItem	src/Dodge/Data/FloorItem.hs	6;"	m
 FloorItem	src/Dodge/FloorItem.hs	1;"	m
 Flying	src/Dodge/Creature/Stance/Data.hs	27;"	C
@@ -1193,7 +1195,7 @@ ImpulsesList	src/Dodge/Data/ActionPlan.hs	97;"	C
 InDivineZone	src/Dodge/Data/Scenario.hs	22;"	C
 InDream	src/Dodge/Data/Scenario.hs	19;"	C
 InGame	src/Dodge/Update/Input/InGame.hs	1;"	m
-InInv	src/Dodge/Data/Item/Location.hs	12;"	C
+InInv	src/Dodge/Data/Item/Location.hs	26;"	C
 InInventory	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	21;"	C
 InLink	src/Dodge/Data/Room.hs	44;"	C
 InLink	src/Dodge/Room/Data.hs	44;"	C
@@ -1202,7 +1204,7 @@ InParallelUniverse	src/Dodge/Data/Scenario.hs	21;"	C
 InPlacement	src/Dodge/Data/GenWorld.hs	133;"	t
 InRealWorld	src/Dodge/Data/Scenario.hs	18;"	C
 InSimulation	src/Dodge/Data/Scenario.hs	20;"	C
-InVoid	src/Dodge/Data/Item/Location.hs	15;"	C
+InVoid	src/Dodge/Data/Item/Location.hs	29;"	C
 Inanimate	src/Dodge/Data/ActionPlan.hs	17;"	C
 Inanimate	src/Dodge/Creature/Inanimate.hs	5;"	m
 InanimateAI	src/Dodge/Data/Creature/Misc.hs	51;"	C
@@ -1241,6 +1243,7 @@ Intention	src/Dodge/Creature/Intention.hs	1;"	m
 Intersect	src/Geometry/Intersect.hs	5;"	m
 IntersectingRoomClipBoundaries	src/Dodge/Config/Data.hs	59;"	C
 IntersectingRoomClipBoundaries	src/Dodge/Data/Config.hs	105;"	C
+InvID	src/Dodge/Data/Item/Location.hs	18;"	t
 InvLayer	src/Dodge/Picture/Layer/Data.hs	12;"	C
 InvSel	src/Dodge/Data/Creature/InvSel.hs	13;"	t
 InvSel	src/Dodge/Data/LoadAction.hs	19;"	t
@@ -1275,6 +1278,7 @@ ItEffect	src/Dodge/Data/ItEffect.hs	5;"	m
 ItEffect	src/Dodge/ItEffect.hs	1;"	m
 ItFloorEffect	src/Dodge/Data/ItEffect.hs	46;"	t
 ItFloorEffect	src/Dodge/Data/Item/Effect.hs	31;"	t
+ItID	src/Dodge/Data/Item.hs	34;"	t
 ItInvEffect	src/Dodge/Data/ItEffect.hs	36;"	t
 ItInvEffect	src/Dodge/Data/Item/Effect.hs	19;"	t
 ItInvEffect	src/Dodge/Data/ItEffect.hs	13;"	C
@@ -1282,20 +1286,20 @@ ItInvEffectDrop	src/Dodge/Data/ItEffect.hs	29;"	C
 ItInvEffectID	src/Dodge/Data/ItEffect.hs	25;"	C
 ItRewindEffect	src/Dodge/Data/ItEffect.hs	17;"	C
 ItZoom	src/Dodge/Data/Item/Use.hs	190;"	t
-Item	src/Dodge/Data/Item.hs	33;"	t
+Item	src/Dodge/Data/Item.hs	37;"	t
 Item	src/Dodge/Base/Item.hs	1;"	m
 Item	src/Dodge/Data/Item.hs	6;"	m
 Item	src/Dodge/Default/Item.hs	1;"	m
 Item	src/Dodge/Item.hs	1;"	m
 ItemAmount	src/Dodge/Data/Item/Use/Amount.hs	4;"	m
 ItemAmount	src/Dodge/Data/ItemAmount.hs	4;"	m
-ItemAttachment	src/Dodge/Data/Item.hs	49;"	t
+ItemAttachment	src/Dodge/Data/Item.hs	53;"	t
 ItemBaseType	src/Dodge/Combine/Data.hs	81;"	t
 ItemBaseType	src/Dodge/Data/Item/Combine.hs	85;"	t
 ItemClust	src/Dodge/Combine/Graph.hs	18;"	C
 ItemDimension	src/Dodge/Data/Item/Misc.hs	13;"	t
 ItemFamily	src/Dodge/Item/Family.hs	3;"	t
-ItemLocation	src/Dodge/Data/Item/Location.hs	11;"	t
+ItemLocation	src/Dodge/Data/Item/Location.hs	25;"	t
 ItemModuleType	src/Dodge/Combine/Data.hs	197;"	t
 ItemModuleType	src/Dodge/Data/Item/Combine.hs	205;"	t
 ItemParams	src/Dodge/Data/Item/Params.hs	16;"	t
@@ -1463,7 +1467,7 @@ LoadableAmmo	src/Dodge/Data/Item/Consumption.hs	15;"	C
 Loading	src/Dodge/Menu/Loading.hs	1;"	m
 LoadingBaySS	src/Dodge/Data/Scenario.hs	93;"	C
 LoadingScreen	src/Dodge/Data/Universe.hs	69;"	C
-Location	src/Dodge/Data/Item/Location.hs	5;"	m
+Location	src/Dodge/Data/Item/Location.hs	6;"	m
 Location	src/Dodge/Inventory/Location.hs	1;"	m
 Location	src/Dodge/Item/Location.hs	1;"	m
 Lock	src/Dodge/Lock/Data.hs	8;"	t
@@ -1668,6 +1672,8 @@ MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
 MvWalking	src/Dodge/Data/Creature/Misc.hs	39;"	C
 NAILBOX	src/Dodge/Combine/Data.hs	52;"	C
 NAILBOX	src/Dodge/Data/Item/Combine.hs	58;"	C
+NInt	src/NewInt.hs	13;"	C
+NIntMap	src/NewInt.hs	16;"	C
 NOTDEFINED	src/Dodge/Combine/Data.hs	82;"	C
 NS	src/Dodge/Data/CardinalPoint.hs	14;"	C
 NSE	src/Dodge/Data/CardinalPoint.hs	12;"	C
@@ -1679,6 +1685,9 @@ NearGravityFlux	src/Dodge/Data/Scenario.hs	83;"	C
 NearSolar	src/Dodge/Data/Scenario.hs	82;"	C
 NearbyManipulation	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	26;"	t
 NewID	src/Dodge/Base/NewID.hs	1;"	m
+NewInt	src/NewInt.hs	13;"	t
+NewInt	src/NewInt.hs	5;"	m
+NewIntMap	src/NewInt.hs	16;"	t
 NewSideEffect	src/Dodge/Data/Universe.hs	61;"	C
 NextArcStep	src/Dodge/Data/ArcStep.hs	21;"	t
 Ngon	src/Dodge/Room/Ngon.hs	1;"	m
@@ -1808,7 +1817,7 @@ OnBack	src/Dodge/Equipment/Data.hs	20;"	C
 OnChest	src/Dodge/Data/Equipment/Misc.hs	22;"	C
 OnChest	src/Dodge/Equipment/Data.hs	19;"	C
 OnEdge	src/Dodge/Data/Room.hs	46;"	C
-OnFloor	src/Dodge/Data/Item/Location.hs	14;"	C
+OnFloor	src/Dodge/Data/Item/Location.hs	28;"	C
 OnHead	src/Dodge/Data/Equipment/Misc.hs	21;"	C
 OnHead	src/Dodge/Equipment/Data.hs	18;"	C
 OnLeftWrist	src/Dodge/Data/Equipment/Misc.hs	24;"	C
@@ -1820,7 +1829,7 @@ OnRightWrist	src/Dodge/Data/Equipment/Misc.hs	25;"	C
 OnRightWrist	src/Dodge/Equipment/Data.hs	22;"	C
 OnSpecial	src/Dodge/Data/Equipment/Misc.hs	27;"	C
 OnSpecial	src/Dodge/Equipment/Data.hs	24;"	C
-OnTurret	src/Dodge/Data/Item/Location.hs	13;"	C
+OnTurret	src/Dodge/Data/Item/Location.hs	27;"	C
 OnceSound	src/Dodge/Data/SoundOrigin.hs	15;"	C
 OneArgument	src/Dodge/Data/Terminal.hs	94;"	C
 OneHand	src/Dodge/Data/Item/Use.hs	185;"	C
@@ -1835,7 +1844,7 @@ OptionScreen	src/Dodge/Data/Universe.hs	78;"	C
 OptionScreenFlag	src/Dodge/Data/Universe.hs	68;"	t
 OptionType	src/Dodge/Menu/OptionType.hs	2;"	m
 OrAno	src/Dodge/Layout/Tree/Annotate.hs	22;"	C
-OutAction	src/Dodge/Creature/Action.hs	52;"	t
+OutAction	src/Dodge/Creature/Action.hs	51;"	t
 OutLink	src/Dodge/Data/Room.hs	43;"	C
 OutLink	src/Dodge/Room/Data.hs	43;"	C
 OutPlacement	src/Dodge/Data/GenWorld.hs	128;"	t
@@ -1983,7 +1992,7 @@ PosPl	src/Dodge/Room/Data.hs	45;"	C
 PosRooms	src/Dodge/Tree/Shift.hs	28;"	t
 Posture	src/Dodge/Creature/Stance/Data.hs	42;"	t
 Posture	src/Dodge/Data/Creature/Stance.hs	38;"	t
-PowerSourceAttachment	src/Dodge/Data/Item.hs	53;"	C
+PowerSourceAttachment	src/Dodge/Data/Item.hs	57;"	C
 PrWdLsId	src/Dodge/Data/Prop.hs	70;"	C
 PrWdLsLs	src/Dodge/Data/Prop.hs	69;"	t
 PrWdLsLs	src/Dodge/PrWdLsLs.hs	1;"	m
@@ -2272,7 +2281,7 @@ Scope	src/Dodge/Data/Item/Scope.hs	13;"	t
 Scope	src/Dodge/Item/Attachment/Data.hs	25;"	t
 Scope	src/Dodge/Data/Item/Scope.hs	6;"	m
 Scope	src/Dodge/Item/Scope.hs	1;"	m
-ScopeAttachment	src/Dodge/Data/Item.hs	49;"	C
+ScopeAttachment	src/Dodge/Data/Item.hs	53;"	C
 ScreenLayer	src/Dodge/Data/Universe.hs	77;"	t
 ScreenLayer	src/Dodge/Update/Input/ScreenLayer.hs	1;"	m
 ScreenPos	src/Dodge/Data/ScreenPos.hs	9;"	t
@@ -2448,7 +2457,7 @@ Stack	src/Dodge/Data/Item/Combine.hs	24;"	t
 Stance	src/Dodge/Creature/Stance/Data.hs	11;"	t
 Stance	src/Dodge/Data/Creature/Stance.hs	13;"	t
 Stance	src/Dodge/Data/Creature/Stance.hs	6;"	m
-StandAttachment	src/Dodge/Data/Item.hs	52;"	C
+StandAttachment	src/Dodge/Data/Item.hs	56;"	C
 StandaloneWall	src/Dodge/Data/Wall.hs	49;"	C
 Standing	src/Dodge/Creature/Stance/Data.hs	25;"	C
 Standing	src/Dodge/Data/Creature/Stance.hs	25;"	C
@@ -2695,6 +2704,7 @@ TurnTowardCr	src/Dodge/Data/CreatureEffect.hs	25;"	C
 Turret	src/Dodge/Data/Machine.hs	57;"	t
 Turret	src/Dodge/Placement/Instance/Turret.hs	1;"	m
 Turret	src/Dodge/Placements/Turret.hs	1;"	m
+TurretID	src/Dodge/Data/Item/Location.hs	20;"	t
 Turretoid	src/Dodge/Turretoid.hs	1;"	m
 Tweak	src/Dodge/Data/Item/Tweak.hs	6;"	m
 Tweak	src/Dodge/Tweak.hs	1;"	m
@@ -3362,10 +3372,10 @@ _fboHalf2	src/Data/Preload/Render.hs	32;"	f
 _fboLighting	src/Data/Preload/Render.hs	37;"	f
 _fboPos	src/Data/Preload/Render.hs	36;"	f
 _flColor	src/Dodge/Data/Flame.hs	16;"	f
-_flIt	src/Dodge/Data/FloorItem.hs	14;"	f
-_flItID	src/Dodge/Data/FloorItem.hs	14;"	f
-_flItPos	src/Dodge/Data/FloorItem.hs	14;"	f
-_flItRot	src/Dodge/Data/FloorItem.hs	14;"	f
+_flIt	src/Dodge/Data/FloorItem.hs	16;"	f
+_flItID	src/Dodge/Data/FloorItem.hs	16;"	f
+_flItPos	src/Dodge/Data/FloorItem.hs	16;"	f
+_flItRot	src/Dodge/Data/FloorItem.hs	16;"	f
 _flOriginalVel	src/Dodge/Data/Flame.hs	21;"	f
 _flPos	src/Dodge/Data/Flame.hs	17;"	f
 _flTimer	src/Dodge/Data/Flame.hs	19;"	f
@@ -3481,12 +3491,12 @@ _ieMID	src/Dodge/Data/ItEffect.hs	27;"	f
 _ieMID	src/Dodge/Data/ItEffect.hs	32;"	f
 _ieOnDrop	src/Dodge/Data/Item/Effect.hs	15;"	f
 _ieOnInsert	src/Dodge/Data/Item/Effect.hs	14;"	f
-_ilCrID	src/Dodge/Data/Item/Location.hs	12;"	f
-_ilFlID	src/Dodge/Data/Item/Location.hs	14;"	f
-_ilInvID	src/Dodge/Data/Item/Location.hs	12;"	f
-_ilIsRoot	src/Dodge/Data/Item/Location.hs	12;"	f
-_ilIsSelected	src/Dodge/Data/Item/Location.hs	12;"	f
-_ilTuID	src/Dodge/Data/Item/Location.hs	13;"	f
+_ilCrID	src/Dodge/Data/Item/Location.hs	26;"	f
+_ilFlID	src/Dodge/Data/Item/Location.hs	28;"	f
+_ilInvID	src/Dodge/Data/Item/Location.hs	26;"	f
+_ilIsRoot	src/Dodge/Data/Item/Location.hs	26;"	f
+_ilIsSelected	src/Dodge/Data/Item/Location.hs	26;"	f
+_ilTuID	src/Dodge/Data/Item/Location.hs	27;"	f
 _imRootItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	33;"	f
 _imSelectedItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	33;"	f
 _immediateEffect	src/Loop/Data.hs	9;"	f
@@ -3515,19 +3525,19 @@ _iselPos	src/Dodge/Data/Creature/Capability.hs	22;"	f
 _iselPos	src/Dodge/Data/Creature/InvSel.hs	14;"	f
 _iselPos	src/Dodge/Data/LoadAction.hs	19;"	f
 _ispCloseObject	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	28;"	f
-_itAttachments	src/Dodge/Data/Item.hs	45;"	f
-_itCurseStatus	src/Dodge/Data/Item.hs	41;"	f
-_itDimension	src/Dodge/Data/Item.hs	40;"	f
-_itEffect	src/Dodge/Data/Item.hs	38;"	f
-_itID	src/Dodge/Data/Item.hs	36;"	f
-_itInvSize	src/Dodge/Data/Item.hs	39;"	f
-_itLocation	src/Dodge/Data/Item.hs	37;"	f
-_itParams	src/Dodge/Data/Item.hs	44;"	f
-_itScope	src/Dodge/Data/Item.hs	43;"	f
-_itTweaks	src/Dodge/Data/Item.hs	42;"	f
-_itType	src/Dodge/Data/Item.hs	35;"	f
-_itUse	src/Dodge/Data/Item.hs	34;"	f
-_itUseAimStance	src/Dodge/Data/Item.hs	56;"	f
+_itAttachments	src/Dodge/Data/Item.hs	49;"	f
+_itCurseStatus	src/Dodge/Data/Item.hs	45;"	f
+_itDimension	src/Dodge/Data/Item.hs	44;"	f
+_itEffect	src/Dodge/Data/Item.hs	42;"	f
+_itID	src/Dodge/Data/Item.hs	40;"	f
+_itInvSize	src/Dodge/Data/Item.hs	43;"	f
+_itLocation	src/Dodge/Data/Item.hs	41;"	f
+_itParams	src/Dodge/Data/Item.hs	48;"	f
+_itScope	src/Dodge/Data/Item.hs	47;"	f
+_itTweaks	src/Dodge/Data/Item.hs	46;"	f
+_itType	src/Dodge/Data/Item.hs	39;"	f
+_itUse	src/Dodge/Data/Item.hs	38;"	f
+_itUseAimStance	src/Dodge/Data/Item.hs	60;"	f
 _itemLocations	src/Dodge/Data/LWorld.hs	100;"	f
 _iyBase	src/Dodge/Combine/Data.hs	13;"	f
 _iyBase	src/Dodge/Data/Item/Combine.hs	17;"	f
@@ -4179,6 +4189,8 @@ _tweakVal	src/Dodge/Data/Item/Tweak.hs	30;"	f
 _unCombEdge	src/Dodge/Combine/Graph.hs	29;"	f
 _unCombNode	src/Dodge/Combine/Graph.hs	22;"	f
 _unFBO	src/Shader/Data.hs	57;"	f
+_unNInt	src/NewInt.hs	13;"	f
+_unNIntMap	src/NewInt.hs	16;"	f
 _unPrimitiveMode	src/Shader/Data.hs	99;"	f
 _unPutCrit	src/Dodge/Data/GenWorld.hs	32;"	f
 _unRandomPlacement	src/Dodge/Data/GenWorld.hs	86;"	f
@@ -4401,7 +4413,7 @@ allVisibleWalls	src/Dodge/Base/Collide.hs	131;"	f
 alongSegBy	src/Geometry.hs	43;"	f
 ammoCheckI	src/Dodge/Item/Weapon/TriggerType.hs	145;"	f
 ammoComposedItem	src/Dodge/Item/Grammar.hs	45;"	f
-ammoTweakStrings	src/Dodge/Render/HUD.hs	285;"	f
+ammoTweakStrings	src/Dodge/Render/HUD.hs	288;"	f
 amr	src/Dodge/Item/Held/Rod.hs	46;"	f
 amr	src/Dodge/Item/Weapon/BulletGun/Rod.hs	56;"	f
 anItemFindPulse	src/Dodge/Item/Weapon/UseEffect.hs	25;"	f
@@ -4657,7 +4669,7 @@ canSeeIndirect	src/Dodge/Base/Collide.hs	235;"	f
 caneStickSoundChoice	src/Dodge/HeldUse.hs	440;"	f
 cardList	src/Dodge/Base/CardinalPoint.hs	6;"	f
 cardVec	src/Dodge/Base/CardinalPoint.hs	9;"	f
-cardinalVectors	src/Dodge/FloorItem.hs	39;"	f
+cardinalVectors	src/Dodge/FloorItem.hs	38;"	f
 cartePosToScreen	src/Dodge/Base/Coordinate.hs	37;"	f
 cenLasTur	src/Dodge/Room/LasTurret.hs	24;"	f
 centerText	src/Picture/Base.hs	184;"	f
@@ -4740,7 +4752,7 @@ clipZoom	src/Dodge/Update/Camera.hs	220;"	f
 clockCycle	src/Dodge/Clock.hs	9;"	f
 closeObjEq	src/Dodge/Inventory/CloseObject.hs	12;"	f
 closeObjPos	src/Dodge/Inventory/CloseObject.hs	7;"	f
-closeObjectInfo	src/Dodge/Render/HUD.hs	111;"	f
+closeObjectInfo	src/Dodge/Render/HUD.hs	114;"	f
 closeObjectToSelectionItem	src/Dodge/Inventory/SelectionList.hs	66;"	f
 closeObjectToTextPictures	src/Dodge/Inventory/SelectionList.hs	81;"	f
 closestCreatureID	src/Dodge/Debug.hs	91;"	f
@@ -4785,7 +4797,7 @@ combineAwareness	src/Dodge/Creature/Perception.hs	109;"	f
 combineBeamBeams	src/Dodge/Update.hs	475;"	f
 combineBeams	src/Dodge/Update.hs	466;"	f
 combineFloors	src/Dodge/Room/Procedural.hs	171;"	f
-combineInventoryExtra	src/Dodge/Render/HUD.hs	198;"	f
+combineInventoryExtra	src/Dodge/Render/HUD.hs	201;"	f
 combineItemListYouX	src/Dodge/Combine.hs	41;"	f
 combineList	src/Dodge/Combine.hs	44;"	f
 combineListInfo	src/Dodge/Combine.hs	57;"	f
@@ -4819,9 +4831,8 @@ contToIDCont	src/Dodge/LevelGen/PlacementHelper.hs	57;"	f
 convexHull	src/Geometry/Polygon.hs	91;"	f
 convexHullSafe	src/Geometry/Polygon.hs	96;"	f
 convexPolysOverlap	src/Geometry/ConvexPoly.hs	50;"	f
-copyInvItemToFloor	src/Dodge/Creature/Action.hs	209;"	f
-copyItemToFloor	src/Dodge/FloorItem.hs	15;"	f
-copyItemToFloorID	src/Dodge/FloorItem.hs	19;"	f
+copyItemToFloor	src/Dodge/FloorItem.hs	16;"	f
+copyItemToFloorID	src/Dodge/FloorItem.hs	20;"	f
 corDoor	src/Dodge/Room/Room.hs	378;"	f
 cornerList	src/Preload/Render.hs	194;"	f
 corpseOrGib	src/Dodge/Creature/State.hs	99;"	f
@@ -4868,9 +4879,9 @@ crSpring	src/Dodge/Update.hs	643;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	72;"	f
 crToBox'	src/Dodge/Creature/ShadowBox.hs	10;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/FindRoot.hs	29;"	f
-crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	37;"	f
+crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	39;"	f
 crUpdateItemLocations	src/Dodge/Inventory/FindRoot.hs	23;"	f
-crUpdateItemLocations	src/Dodge/Inventory/Location.hs	31;"	f
+crUpdateItemLocations	src/Dodge/Inventory/Location.hs	33;"	f
 crZoneOfPoint	src/Dodge/Base/Zone.hs	54;"	f
 crZoneSize	src/Dodge/Zoning/Creature.hs	39;"	f
 craftInfo	src/Dodge/Item/Info.hs	154;"	f
@@ -5159,7 +5170,7 @@ displayControls	src/Dodge/Menu.hs	206;"	f
 displayEnergyBallType	src/Dodge/Module/Info.hs	19;"	f
 displayFrameTicks	src/Dodge/Render/Picture.hs	33;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	159;"	f
-displayTerminal	src/Dodge/Render/HUD.hs	228;"	f
+displayTerminal	src/Dodge/Render/HUD.hs	231;"	f
 displayTerminalLineString	src/Dodge/Update.hs	325;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
@@ -5286,7 +5297,7 @@ drawCircFlare	src/Dodge/Flare.hs	25;"	f
 drawCloud	src/Dodge/Cloud/Draw.hs	6;"	f
 drawCloudWith	src/Dodge/Cloud/Draw.hs	12;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
-drawCombineInventory	src/Dodge/Render/HUD.hs	75;"	f
+drawCombineInventory	src/Dodge/Render/HUD.hs	78;"	f
 drawConcurrentMessage	src/Dodge/Render/Picture.hs	58;"	f
 drawCorpse	src/Dodge/Corpse/Draw.hs	6;"	f
 drawCrInfo	src/Dodge/Debug/Picture.hs	341;"	f
@@ -5301,7 +5312,7 @@ drawDoubleLampCover	src/Dodge/LightSources/Lamp.hs	139;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	86;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	8;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	173;"	f
-drawExamineInventory	src/Dodge/Render/HUD.hs	81;"	f
+drawExamineInventory	src/Dodge/Render/HUD.hs	84;"	f
 drawFarWallDetect	src/Dodge/Debug/Picture.hs	232;"	f
 drawFlame	src/Dodge/Flame/Draw.hs	7;"	f
 drawFlamelet	src/Dodge/EnergyBall/Draw.hs	23;"	f
@@ -5342,7 +5353,7 @@ drawPointLabel	src/Dodge/Render/Label.hs	13;"	f
 drawProjectile	src/Dodge/Projectile/Draw.hs	10;"	f
 drawProp	src/Dodge/Prop/Draw.hs	15;"	f
 drawProp'	src/Dodge/Prop/Draw.hs	12;"	f
-drawRBOptions	src/Dodge/Render/HUD.hs	129;"	f
+drawRBOptions	src/Dodge/Render/HUD.hs	132;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	7;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	27;"	f
 drawSelectionCursor	src/Dodge/Render/List.hs	40;"	f
@@ -5356,7 +5367,7 @@ drawShell	src/Dodge/Projectile/Draw.hs	17;"	f
 drawShockwave	src/Dodge/Shockwave/Draw.hs	7;"	f
 drawSpark	src/Dodge/Spark/Draw.hs	6;"	f
 drawStaticBall	src/Dodge/EnergyBall/Draw.hs	14;"	f
-drawSubInventory	src/Dodge/Render/HUD.hs	67;"	f
+drawSubInventory	src/Dodge/Render/HUD.hs	70;"	f
 drawSweep	src/Dodge/Render/ShapePicture.hs	51;"	f
 drawSwitch	src/Dodge/Button/Draw.hs	15;"	f
 drawSwitchWire	src/Dodge/LevelGen/Switch.hs	28;"	f
@@ -5382,12 +5393,13 @@ drawZoneCol	src/Dodge/Debug/Picture.hs	115;"	f
 drawZoneNearPointCursor	src/Dodge/Debug/Picture.hs	247;"	f
 droneLauncher	src/Dodge/Item/Weapon/Drone.hs	11;"	f
 dropByState	src/Dodge/Creature/State.hs	158;"	f
-dropExcept	src/Dodge/Creature/Action.hs	178;"	f
-dropItem	src/Dodge/Creature/Action.hs	183;"	f
+dropExcept	src/Dodge/Creature/Action.hs	172;"	f
+dropItem	src/Dodge/Creature/Action.hs	177;"	f
 dropItemKey	src/Dodge/Config/KeyConfig.hs	24;"	f
 drumMag	src/Dodge/Item/Ammo.hs	36;"	f
 dtIL	src/Dodge/DoubleTree.hs	22;"	f
-dtToAdjRootParent	src/Dodge/DoubleTree.hs	64;"	f
+dtToAdjRootParent	src/Dodge/DoubleTree.hs	65;"	f
+dtToAdjRootParentEither	src/Dodge/DoubleTree.hs	71;"	f
 dtToAdjacency	src/Dodge/DoubleTree.hs	29;"	f
 dtToLRAdj	src/Dodge/DoubleTree.hs	43;"	f
 dtToLRAdjEither	src/Dodge/DoubleTree.hs	53;"	f
@@ -5438,7 +5450,7 @@ errorPointInPolygon	src/Geometry.hs	49;"	f
 escapeKey	src/Dodge/Config/KeyConfig.hs	23;"	f
 evaluateRandPS	src/Dodge/Placement/PlaceSpot.hs	137;"	f
 evenOddSplit	src/Dodge/Base.hs	138;"	f
-examineInventoryExtra	src/Dodge/Render/HUD.hs	178;"	f
+examineInventoryExtra	src/Dodge/Render/HUD.hs	181;"	f
 exitTerminalSubInv	src/Dodge/Terminal.hs	223;"	f
 expandLine	src/Dodge/Base/Zone.hs	106;"	f
 expandLine	src/Dodge/Picture.hs	30;"	f
@@ -5481,7 +5493,7 @@ findIndex	src/IntMapHelp.hs	84;"	f
 findItemSlot	src/Dodge/Inventory/CheckSlots.hs	25;"	f
 findReverseEdge	src/Polyhedra.hs	49;"	f
 findReverseEdgeList	src/Polyhedra.hs	56;"	f
-findWallFreeDropPoint	src/Dodge/FloorItem.hs	47;"	f
+findWallFreeDropPoint	src/Dodge/FloorItem.hs	46;"	f
 findWallsInPolygon	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	78;"	f
 findWithIx	src/ListHelp.hs	123;"	f
 fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
@@ -5533,7 +5545,7 @@ flockPointTargetR	src/Dodge/Creature/Boid.hs	266;"	f
 flockToPointUsing	src/Dodge/Creature/Boid.hs	214;"	f
 flockToPointUsing'	src/Dodge/Creature/Boid.hs	227;"	f
 floorHun	src/Dodge/Base/Zone.hs	40;"	f
-floorItemPickupInfo	src/Dodge/Render/HUD.hs	116;"	f
+floorItemPickupInfo	src/Dodge/Render/HUD.hs	119;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	159;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSpray	src/Dodge/SoundLogic/Synonyms.hs	27;"	f
@@ -5703,7 +5715,7 @@ hatCombinations	src/Dodge/Combine/Combinations.hs	33;"	f
 head	src/DoubleStack.hs	14;"	f
 headLamp	src/Dodge/Item/Equipment.hs	118;"	f
 headLampShape	src/Dodge/Item/Draw/SPic.hs	494;"	f
-headMap	src/Dodge/DoubleTree.hs	97;"	f
+headMap	src/Dodge/DoubleTree.hs	109;"	f
 heal	src/Dodge/Item/Consumable.hs	17;"	f
 heal25	src/Dodge/Item/Consumable.hs	14;"	f
 healS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	354;"	f
@@ -5827,22 +5839,21 @@ intersectSegsSeg	src/Geometry/Intersect.hs	232;"	f
 intervalList	src/Geometry.hs	315;"	f
 interweave	src/Justify.hs	17;"	f
 intsToPos	src/Dodge/Room/Modify/Girder.hs	160;"	f
-invAdj	src/Dodge/Item/Grammar.hs	98;"	f
-invAdj'	src/Dodge/Item/Grammar.hs	109;"	f
+invAdj'	src/Dodge/Item/Grammar.hs	104;"	f
 invDimColor	src/Dodge/DisplayInventory.hs	140;"	f
 invDimColor	src/Dodge/Inventory/Color.hs	4;"	f
 invDisplayParams	src/Dodge/ListDisplayParams.hs	29;"	f
-invHead	src/Dodge/Render/HUD.hs	293;"	f
-invIndentIM	src/Dodge/Item/Grammar.hs	121;"	f
+invHead	src/Dodge/Render/HUD.hs	296;"	f
+invIndentIM	src/Dodge/Item/Grammar.hs	114;"	f
 invLDT	src/Dodge/Item/Grammar.hs	91;"	f
 invSelectionItem	src/Dodge/Inventory/SelectionList.hs	35;"	f
 invSelectionItem'	src/Dodge/Inventory/SelectionList.hs	17;"	f
 invShiftPointBy	src/Dodge/ShiftPoint.hs	8;"	f
 invSideEff	src/Dodge/Creature/State.hs	236;"	f
 invSize	src/Dodge/Inventory/CheckSlots.hs	40;"	f
-invTrees	src/Dodge/Item/Grammar.hs	124;"	f
-inventoryExtra	src/Dodge/Render/HUD.hs	186;"	f
-inventoryExtraH	src/Dodge/Render/HUD.hs	190;"	f
+invTrees	src/Dodge/Item/Grammar.hs	117;"	f
+inventoryExtra	src/Dodge/Render/HUD.hs	189;"	f
+inventoryExtraH	src/Dodge/Render/HUD.hs	193;"	f
 inventoryX	src/Dodge/Creature.hs	115;"	f
 inverseShockwaveAt	src/Dodge/WorldEvent/Shockwave.hs	43;"	f
 invertEncircleDistP	src/Dodge/Creature/Boid.hs	13;"	f
@@ -5970,7 +5981,7 @@ lasTunnel	src/Dodge/Room/LasTurret.hs	124;"	f
 lasTunnelRunPast	src/Dodge/Room/LasTurret.hs	165;"	f
 lasTurret	src/Dodge/Placement/Instance/Turret.hs	23;"	f
 lasTurret	src/Dodge/Placements/Turret.hs	29;"	f
-lastMap	src/Dodge/DoubleTree.hs	101;"	f
+lastMap	src/Dodge/DoubleTree.hs	113;"	f
 latchkey	src/Dodge/Item/Held/Utility.hs	23;"	f
 latchkey	src/Dodge/Item/PassKey.hs	14;"	f
 launcher	src/Dodge/Item/Held/Launcher.hs	12;"	f
@@ -5981,10 +5992,10 @@ launcherX	src/Dodge/Item/Held/Launcher.hs	48;"	f
 layerNum	src/Picture/Data.hs	31;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
 ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	90;"	f
-ldtIL	src/Dodge/DoubleTree.hs	76;"	f
+ldtIL	src/Dodge/DoubleTree.hs	88;"	f
 ldtToDT	src/Dodge/DoubleTree.hs	13;"	f
-ldtToIM	src/Dodge/DoubleTree.hs	70;"	f
-ldtToIndentList	src/Dodge/DoubleTree.hs	73;"	f
+ldtToIM	src/Dodge/DoubleTree.hs	82;"	f
+ldtToIndentList	src/Dodge/DoubleTree.hs	85;"	f
 left	src/DoubleStack.hs	16;"	f
 leftInfo	src/Dodge/Item/Info.hs	109;"	f
 leftIsParentCombine	src/Dodge/Item/Grammar.hs	57;"	f
@@ -6027,7 +6038,7 @@ litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	120;"	f
 lnkEff	src/Dodge/Layout/Tree/Shift.hs	55;"	f
-lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	271;"	f
+lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	274;"	f
 lnkPosDir	src/Dodge/RoomLink.hs	97;"	f
 loadConfig	src/LoadConfig.hs	22;"	f
 loadDodgeConfig	src/Dodge/Config/Load.hs	9;"	f
@@ -6467,14 +6478,14 @@ penWalls	src/Dodge/WorldEvent/HitEffect.hs	38;"	f
 penetrate	src/Dodge/Particle/HitEffect/Penetrate.hs	12;"	f
 perMat	src/MatrixHelper.hs	49;"	f
 perceptionUpdate	src/Dodge/Creature/Perception.hs	22;"	f
-performAction	src/Dodge/Creature/Action.hs	98;"	f
+performAction	src/Dodge/Creature/Action.hs	97;"	f
 performAction	src/Dodge/Creature/Rationality.hs	96;"	f
-performActions	src/Dodge/Creature/Action.hs	44;"	f
+performActions	src/Dodge/Creature/Action.hs	43;"	f
 performActions	src/Dodge/Creature/Rationality.hs	83;"	f
 performActionsR	src/Dodge/Creature/Rationality.hs	90;"	f
-performAimAt	src/Dodge/Creature/Action.hs	54;"	f
-performPathTo	src/Dodge/Creature/Action.hs	67;"	f
-performTurnToA	src/Dodge/Creature/Action.hs	85;"	f
+performAimAt	src/Dodge/Creature/Action.hs	53;"	f
+performPathTo	src/Dodge/Creature/Action.hs	66;"	f
+performTurnToA	src/Dodge/Creature/Action.hs	84;"	f
 perspectiveMatrixb	src/MatrixHelper.hs	11;"	f
 pesNearCirc	src/Dodge/Zoning/Pathing.hs	43;"	f
 pesNearPoint	src/Dodge/Zoning/Pathing.hs	33;"	f
@@ -6486,7 +6497,7 @@ picMap	src/Picture/Base.hs	67;"	f
 pickUpItem	src/Dodge/Inventory/Add.hs	67;"	f
 pickUpS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	444;"	f
 pickUpSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
-picsToSelectable	src/Dodge/Render/HUD.hs	346;"	f
+picsToSelectable	src/Dodge/Render/HUD.hs	349;"	f
 pictureOnEquip	src/Dodge/Item/Equipment/Shape.hs	9;"	f
 pincerP	src/Dodge/Creature/Boid.hs	60;"	f
 pincerP'	src/Dodge/Creature/Boid.hs	93;"	f
@@ -6641,8 +6652,8 @@ prependTwo	src/Geometry.hs	165;"	f
 pressedMBEffects	src/Dodge/Update/UsingInput.hs	27;"	f
 pressedMBEffectsNoInventory	src/Dodge/Update/UsingInput.hs	40;"	f
 pressedMBEffectsTopInventory	src/Dodge/Creature/YourControl.hs	206;"	f
-prettyDT	src/Dodge/DoubleTree.hs	106;"	f
-prettyLDT	src/Dodge/DoubleTree.hs	110;"	f
+prettyDT	src/Dodge/DoubleTree.hs	118;"	f
+prettyLDT	src/Dodge/DoubleTree.hs	122;"	f
 primeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	422;"	f
 printColumnTitles	src/Dodge/Tree/Shift.hs	142;"	f
 printColumns	src/Dodge/Tree/Shift.hs	132;"	f
@@ -7014,9 +7025,9 @@ secondColumnParams	src/Dodge/ListDisplayParams.hs	42;"	f
 seedStartMenu	src/Dodge/Menu.hs	79;"	f
 seedStartOptions	src/Dodge/Menu.hs	82;"	f
 segOnCirc	src/Geometry.hs	116;"	f
-selNumPos	src/Dodge/Render/HUD.hs	358;"	f
+selNumPos	src/Dodge/Render/HUD.hs	361;"	f
 selSecDrawCursor	src/Dodge/Render/List.hs	87;"	f
-selSecSelCol	src/Dodge/Render/HUD.hs	377;"	f
+selSecSelCol	src/Dodge/Render/HUD.hs	380;"	f
 selSecSelSize	src/Dodge/SelectionSections.hs	124;"	f
 selSecYint	src/Dodge/SelectionSections.hs	127;"	f
 selectCreatureDebugItem	src/Dodge/Debug.hs	38;"	f
@@ -7051,13 +7062,13 @@ setHotkey	src/Dodge/Hotkey.hs	38;"	f
 setInLinks	src/Dodge/RoomLink.hs	51;"	f
 setInLinksByType	src/Dodge/RoomLink.hs	54;"	f
 setInLinksPD	src/Dodge/RoomLink.hs	74;"	f
-setInvPosFromSS	src/Dodge/Inventory/Location.hs	48;"	f
+setInvPosFromSS	src/Dodge/Inventory/Location.hs	50;"	f
 setItemCharge	src/Dodge/ItEffect.hs	36;"	f
 setLayer	src/Picture/Base.hs	139;"	f
 setLinkType	src/Dodge/RoomLink.hs	60;"	f
 setLinkTypePD	src/Dodge/RoomLink.hs	67;"	f
 setLocalPS	src/Dodge/Placements/Spot.hs	21;"	f
-setMinInvSize	src/Dodge/Creature/Action.hs	151;"	f
+setMinInvSize	src/Dodge/Creature/Action.hs	150;"	f
 setMusicVolume	src/Sound.hs	161;"	f
 setMvPos	src/Dodge/Creature/ReaderUpdate.hs	51;"	f
 setOldPos	src/Dodge/Update.hs	349;"	f
@@ -7223,7 +7234,7 @@ singleton	src/DoubleStack.hs	11;"	f
 singletonTrie	src/SimpleTrie.hs	14;"	f
 sizeFBOs	src/Framebuffer/Update.hs	22;"	f
 sizeModule	src/Dodge/Item/Craftable.hs	38;"	f
-sizeSelf	src/Dodge/Creature/Action.hs	214;"	f
+sizeSelf	src/Dodge/Creature/Action.hs	204;"	f
 sizeZoneOfPoint	src/Dodge/Base/Zone.hs	43;"	f
 skwareFadeTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	366;"	f
 skwareFadeTwoSecSound	src/Dodge/SoundLogic/Synonyms.hs	35;"	f
@@ -7452,7 +7463,7 @@ textJustifyLeft	src/Picture/Base.hs	208;"	f
 textJustifyRight	src/Picture/Base.hs	198;"	f
 textNum	src/Picture/Data.hs	53;"	f
 textRight	src/Picture/Base.hs	203;"	f
-textSelItems	src/Dodge/Render/HUD.hs	343;"	f
+textSelItems	src/Dodge/Render/HUD.hs	346;"	f
 textVMirror	src/Picture/Base.hs	216;"	f
 tflat2	src/Picture/Data.hs	80;"	f
 tflat3	src/Picture/Data.hs	83;"	f
@@ -7620,9 +7631,9 @@ turnTo	src/Dodge/Movement/Turn.hs	4;"	f
 turnTo	src/Dodge/Placements/Turret.hs	71;"	f
 turnToAmount	src/Dodge/Movement/Turn.hs	15;"	f
 turretItemOffset	src/Dodge/Item/HeldOffset.hs	14;"	f
-tweakItems	src/Dodge/Render/HUD.hs	282;"	f
+tweakItems	src/Dodge/Render/HUD.hs	285;"	f
 tweakPhaseV	src/Dodge/Tweak.hs	21;"	f
-tweakString	src/Dodge/Render/HUD.hs	290;"	f
+tweakString	src/Dodge/Render/HUD.hs	293;"	f
 tweakTractionPower	src/Dodge/Tweak.hs	14;"	f
 tweenAngles	src/Geometry/Vector.hs	184;"	f
 twinSlowDoorChasers	src/Dodge/Room/LongDoor.hs	78;"	f
@@ -7736,7 +7747,7 @@ updateRadarSweeps	src/Dodge/Update.hs	445;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	105;"	f
 updateRootItemID	src/Dodge/Inventory/FindRoot.hs	16;"	f
-updateRootItemID	src/Dodge/Inventory/Location.hs	24;"	f
+updateRootItemID	src/Dodge/Inventory/Location.hs	26;"	f
 updateScopeZoom	src/Dodge/Update/Camera.hs	129;"	f
 updateScopeZoom'	src/Dodge/Update/Camera.hs	134;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
@@ -7986,9 +7997,9 @@ yV2	src/Geometry/Vector.hs	203;"	f
 yellow	src/Color.hs	17;"	f
 you	src/Dodge/Base/You.hs	18;"	f
 youBox'	src/Dodge/Creature/ShadowBox.hs	8;"	f
-youDropItem	src/Dodge/Creature/Action.hs	192;"	f
+youDropItem	src/Dodge/Creature/Action.hs	188;"	f
 youSil	src/Dodge/Creature/ShadowBox.hs	15;"	f
-yourAugmentedItem	src/Dodge/Render/HUD.hs	123;"	f
+yourAugmentedItem	src/Dodge/Render/HUD.hs	126;"	f
 yourControl	src/Dodge/Creature/YourControl.hs	22;"	f
 yourDefaultSpeed	src/Dodge/Default/Creature.hs	134;"	f
 yourDefaultStrideLength	src/Dodge/Default/Creature.hs	137;"	f