Fix close floor item bug

2025-08-23 23:00:19 +01:00
parent fcccd63844
commit 7336177edf
9 changed files with 214 additions and 200 deletions
@@ -1,6 +1,12 @@
 Seed: 7114951007332849727
 Room layout (compact): 
-0,1,2,3
+0,1,2,3,4,5,6
+|
+- 7,8
+|
+- 9,10
+|
+11,12,13,14

 Layout with room names:
 Corridor-0
@@ -10,4 +16,26 @@ Corridor-0
 defaultRoom-2
 |
 autoRect-3
+|
+autoDoor-4
+|
+Corridor-5
+|
+doorToggle-6gon-6
+|
+- triggerDoorRoom-7
+|  |
+|  autoRect-8
+|
+- triggerDoorRoom-9
+|  |
+|  autoRect-10
+|
+Corridor-11
+|
+6gon-12
+|
+defaultRoom-13
+|
+autoRect-14

@@ -1,4 +1,4 @@
 Generating level with seed 7114951007332849727

 After 1 attempt(s), Successful generation of level with seed 7114951007332849727
-4 rooms in total
+15 rooms in total
@@ -3,13 +3,11 @@ Seed: 7114951007332849727
 |
 1:TutDrop
 |
-2:TutStartRez
+2:corDoor
 |
-3:corDoor
+3:DoorTest
 |
-4:DoorTest
-|
-5:TutDrop
+4:TutDrop

 0:0:teststart

@@ -23,33 +21,29 @@ Seed: 7114951007332849727
 |
 1:0:2:autoRect

-2:0:TutStartRez
+2:0:corDoor

-2:0:0:tutRezBox
-
-3:0:corDoor
-
-3:0:0:autoDoor
+2:0:0:autoDoor
 |
-3:0:1:Corridor
+2:0:1:Corridor

-4:0:DoorTest
+3:0:DoorTest

-4:0:0:doorToggle-6gon
+3:0:0:doorToggle-6gon
 |
-+- 4:0:1:triggerDoorRoom
+- 3:0:1:triggerDoorRoom
 |  |
-|  4:0:2:autoRect
+|  3:0:2:autoRect
 |
-+- 4:0:3:triggerDoorRoom
+- 3:0:3:triggerDoorRoom
 |  |
-|  4:0:4:autoRect
+|  3:0:4:autoRect
 |
-4:0:5:Corridor
+3:0:5:Corridor

-5:0:6gon
+4:0:6gon
 |
-5:1:defaultRoom
+4:1:defaultRoom
 |
-5:2:autoRect
+4:2:autoRect

@@ -1,27 +1,21 @@
 module Dodge.Inventory.Add (
    tryPutItemInInv,
-    --createPutItem,
-    --createAndSelectItem,
    createItemYou,
    pickUpItem,
    pickUpItemAt,
 ) where

-import Dodge.Inventory.Swap
-import Control.Monad
-import NewInt
-import Dodge.SoundLogic
-import Dodge.Inventory.Location
--import Dodge.Item.Grammar
 import Control.Lens
+import Control.Monad
 import Data.Maybe
--import Dodge.Base.You
--import Dodge.Combine.Module
--import Dodge.Data.SelectionList
 import Dodge.Data.World
 import Dodge.FloorItem
 import Dodge.Inventory.CheckSlots
+import Dodge.Inventory.Location
+import Dodge.Inventory.Swap
+import Dodge.SoundLogic
 import qualified IntMapHelp as IM
+import NewInt

 tryPutFloorItemIDInInv :: Int -> Int -> World -> Maybe (Int, World)
 tryPutFloorItemIDInInv cid i w = do
@@ -31,49 +25,48 @@ tryPutFloorItemIDInInv cid i w = do
 -- not sure why we have the cid here, this will probably only work for cid == 0
 tryPutItemInInvAt :: Int -> Int -> FloorItem -> World -> Maybe World
 tryPutItemInInvAt i cid flit w = do
-    (j,w') <- tryPutItemInInv cid flit w
+    (j, w') <- tryPutItemInInv cid flit w
    guard (i <= j)
-    return $ foldr f w' [i+1..j]
+    return $ foldr f w' [i + 1 .. j]
  where
-    f j = swapInvItems (\_ _ -> Just (j-1)) j
-    
+    f j = swapInvItems (\_ _ -> Just (j -1)) j

 -- | Pick up a specific item.
 tryPutItemInInv :: Int -> FloorItem -> World -> Maybe (Int, World)
-tryPutItemInInv cid flit w = case maybeInvSlot of
-    Nothing -> Nothing
-    Just i ->
-        Just
-            ( i
-            , w
-                & 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
-                -- & cWorld . lWorld . creatures . ix cid . crInv . at i ?~ it
-                -- note item locations are updated twice: first for the ilInvID,
-                -- second for the root/selected item bools
-                & cWorld . lWorld %~ crUpdateItemLocations cid
-                & setInvPosFromSS
-                & updateselectionextra
-                & cWorld . lWorld %~ crUpdateItemLocations cid
-            )
+tryPutItemInInv cid flit w = do
+    i <- checkInvSlotsYou it w
+    Just
+        ( i
+        , w
+            & 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
+            -- & cWorld . lWorld . creatures . ix cid . crInv . at i ?~ it
+            -- note item locations are updated twice: first for the ilInvID,
+            -- second for the root/selected item bools
+            & cWorld . lWorld %~ crUpdateItemLocations cid
+            & setInvPosFromSS
+            & updateselectionextra
+            & cWorld . lWorld %~ crUpdateItemLocations cid
+        )
  where
-    updateselectionextra | cid == 0 
-            = hud . hudElement . diSelection . _Just . _3 %~ const mempty
+    updateselectionextra
+        | cid == 0 =
+            hud . hudElement . diSelection . _Just . _3 %~ const mempty
        | otherwise = id
    it = _flIt flit
-    maybeInvSlot = checkInvSlotsYou it w
    -- not sure if the following is necessary
-    updateItLocation invid w' = w' & cWorld . lWorld . itemLocations . ix (_unNInt $ _itID it) 
-        .~ InInv 
-            {_ilCrID = cid
-            , _ilInvID = invid
-            , _ilIsRoot = False
-            , _ilIsSelected = False
-            , _ilIsAttached = False
-            , _ilEquipSite = Nothing
-            }
+    updateItLocation invid w' =
+        w' & cWorld . lWorld . itemLocations . ix (_unNInt $ _itID it)
+            .~ InInv
+                { _ilCrID = cid
+                , _ilInvID = invid
+                , _ilIsRoot = False
+                , _ilIsSelected = False
+                , _ilIsAttached = False
+                , _ilEquipSite = Nothing
+                }

 ---- should select the item on the floor if no inventory space?
 --createAndSelectItem :: Item -> World -> World
@@ -82,7 +75,7 @@ tryPutItemInInv cid flit w = case maybeInvSlot of
 --        w'
 --            & hud . hudElement . diSections . sssExtra . sssSelPos ?~ (0, i)
 --            & cWorld . lWorld . creatures . ix 0 . crManipulation . manObject
--                .~  InInventory (SelectedItem i 
+--                .~  InInventory (SelectedItem i
 --                    $ fromMaybe (error "no root item1!") $ tryGetRootItemInvID i (you w))
 --    (Nothing, w') -> w'

@@ -101,7 +94,6 @@ createItemYou itm w = fromMaybe (OnFloor, w') $ do
    itid = IM.newKey $ w ^. cWorld . lWorld . itemLocations
    pos = w ^?! cWorld . lWorld . creatures . ix 0 . crPos
    w' = copyItemToFloorID pos (itm & itID .~ NInt itid) w
-    

 -- | Pick up a specific item.
 pickUpItem :: Int -> FloorItem -> World -> World
@@ -4,6 +4,7 @@
 -}
 module Dodge.Placement.PlaceSpot (placeSpot) where

+import NewInt
 import Color
 import LensHelp
 import Control.Monad.State
@@ -110,7 +111,8 @@ placeSpotID' ps pt w = case pt of
    PutTerminal tm -> plNewUpID (cWorld . lWorld . terminals) tmID tm w
    PutFlIt itm -> let i = IM.newKey (w ^. cWorld . lWorld . itemLocations)
        in (i, w & cWorld . lWorld . itemLocations . at i ?~ OnFloor
-            & cWorld . lWorld . floorItems . at i ?~ createFlIt p rot itm
+            & cWorld . lWorld . floorItems . at i ?~ createFlIt p rot 
+                (itm & itID .~ NInt i)
            )
 --        plNewUpID
 --            (cWorld . lWorld . floorItems . unNIntMap)
@@ -45,7 +45,7 @@ tutAnoTree =
    OnwardList $
        [ AnTree $ return $ tToBTree "teststart" $ return $ cleatOnward corridor
        , AnTree $ tutDrop
-        , AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
+--        , AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
        , AnTree corDoor
        , AnTree $ tutRooms
        , AnTree $ tutDrop
@@ -57,7 +57,7 @@ tutDrop :: State LayoutVars (MetaTree Room String)
 tutDrop = do
    x <- shuffleLinks $ roomNgon 6 100
    y <- decontamRoom
-    return $ tToBTree "TutDrop" $ treePost [x,y,roomRectAutoLinks 40 100]
+    return $ tToBTree "TutDrop" $ treePost [x,y,cleatOnward $ roomRectAutoLinks 40 100]

 tutRooms :: State LayoutVars (MetaTree Room String)
 tutRooms = do
@@ -26,9 +26,12 @@ import Control.Lens
 import Dodge.Data.Universe
 import qualified IntMapHelp as IM
 import qualified Data.Map.Strict as M
+import NewInt

 testStringInit :: Universe -> [String]
-testStringInit _ = []
+testStringInit u = map show (IM.keys $ u ^. uvWorld . cWorld . lWorld . itemLocations)
+    <> map show (IM.keys $ u ^. uvWorld . cWorld . lWorld . floorItems)
+    <> map show (u ^. uvWorld . hud . closeItems)
 -- map shortShow (u ^.. uvWorld . cWorld . lWorld . debris . each . to g)
 --  where
 --    g db = (pz,z,norm v)
@@ -270,7 +270,7 @@ CrGroupUpdate	src/Dodge/Data/CrGroupParams.hs	22;"	t
 CrHitSound	src/Dodge/Data/SoundOrigin.hs	32;"	C
 CrID	src/Dodge/Data/CrWlID.hs	12;"	C
 CrImp	src/Dodge/Data/CreatureEffect.hs	23;"	t
-CrInt	src/Dodge/Data/Item/Location.hs	23;"	t
+CrInt	src/Dodge/Data/Item/Location.hs	22;"	t
 CrIsAiming	src/Dodge/Data/CreatureEffect.hs	41;"	C
 CrIsAnimate	src/Dodge/Data/CreatureEffect.hs	42;"	C
 CrMouth	src/Dodge/Data/SoundOrigin.hs	18;"	C
@@ -445,7 +445,7 @@ FireSpark	src/Dodge/Data/Spark.hs	22;"	C
 Fixated	src/Dodge/Data/Creature/Perception.hs	62;"	C
 FixedCoordLayer	src/Picture/Data.hs	28;"	C
 FixedSelectionWidth	src/Dodge/Data/SelectionList.hs	40;"	C
-FlIt	src/Dodge/Data/FloorItem.hs	16;"	C
+FlIt	src/Dodge/Data/FloorItem.hs	15;"	C
 Flame	src/Dodge/Data/Flame.hs	13;"	t
 FlameBeamCombine	src/Dodge/Data/Beam.hs	39;"	C
 FlameSound	src/Dodge/Data/SoundOrigin.hs	28;"	C
@@ -472,8 +472,8 @@ FloatLessCheck	src/Dodge/Data/FloatFunction.hs	14;"	C
 Floating	src/Dodge/Data/Creature/Stance.hs	26;"	C
 FlockArmourChaseAI	src/Dodge/Data/Creature/Misc.hs	48;"	C
 Floor	src/Data/Tile.hs	11;"	t
-FloorInt	src/Dodge/Data/Item/Location.hs	16;"	t
-FloorItem	src/Dodge/Data/FloorItem.hs	16;"	t
+FloorInt	src/Dodge/Data/Item/Location.hs	15;"	t
+FloorItem	src/Dodge/Data/FloorItem.hs	15;"	t
 Flying	src/Dodge/Data/Creature/Stance.hs	27;"	C
 FollowImpulses	src/Dodge/Data/ActionPlan.hs	182;"	C
 FootForward	src/Dodge/Data/Creature/Stance.hs	31;"	t
@@ -587,13 +587,13 @@ ImpulseUseTargetCID	src/Dodge/Data/ActionPlan.hs	49;"	C
 ImpulsesList	src/Dodge/Data/ActionPlan.hs	97;"	C
 InDivineZone	src/Dodge/Data/Scenario.hs	22;"	C
 InDream	src/Dodge/Data/Scenario.hs	19;"	C
-InInv	src/Dodge/Data/Item/Location.hs	29;"	C
+InInv	src/Dodge/Data/Item/Location.hs	28;"	C
 InLink	src/Dodge/Data/Room.hs	44;"	C
 InParallelUniverse	src/Dodge/Data/Scenario.hs	21;"	C
 InPlacement	src/Dodge/Data/GenWorld.hs	134;"	t
 InRealWorld	src/Dodge/Data/Scenario.hs	18;"	C
 InSimulation	src/Dodge/Data/Scenario.hs	20;"	C
-InVoid	src/Dodge/Data/Item/Location.hs	39;"	C
+InVoid	src/Dodge/Data/Item/Location.hs	38;"	C
 Inanimate	src/Dodge/Data/ActionPlan.hs	17;"	C
 InanimateAI	src/Dodge/Data/Creature/Misc.hs	41;"	C
 IncendiaryBall	src/Dodge/Data/EnergyBall/Type.hs	13;"	C
@@ -609,7 +609,7 @@ Intention	src/Dodge/Data/Creature.hs	68;"	t
 IntersectingRoomClipBoundaries	src/Dodge/Data/Config.hs	107;"	C
 IntroScanSF	src/Dodge/Data/ComposedItem.hs	21;"	C
 IntroScanType	src/Dodge/Data/Item/Combine.hs	45;"	t
-InvInt	src/Dodge/Data/Item/Location.hs	19;"	t
+InvInt	src/Dodge/Data/Item/Location.hs	18;"	t
 InventoryChange	src/Dodge/Data/World.hs	31;"	C
 InventoryConnectSound	src/Dodge/Data/SoundOrigin.hs	14;"	C
 InventoryPathing	src/Dodge/Data/Item/Combine.hs	39;"	t
@@ -627,7 +627,7 @@ ItTargeting	src/Dodge/Data/Item.hs	57;"	C
 Item	src/Dodge/Data/Item.hs	39;"	t
 ItemClust	src/Dodge/Combine/Graph.hs	21;"	C
 ItemDimension	src/Dodge/Data/Item/Misc.hs	13;"	t
-ItemLocation	src/Dodge/Data/Item/Location.hs	28;"	t
+ItemLocation	src/Dodge/Data/Item/Location.hs	27;"	t
 ItemParamID	src/Dodge/Data/Item/Params.hs	26;"	C
 ItemParams	src/Dodge/Data/Item/Params.hs	14;"	t
 ItemSF	src/Dodge/Data/ComposedItem.hs	12;"	t
@@ -638,7 +638,7 @@ ItemScrollTimeFlow	src/Dodge/Data/World.hs	62;"	C
 ItemTargeting	src/Dodge/Data/Item.hs	56;"	t
 ItemType	src/Dodge/Data/Item/Combine.hs	16;"	t
 ItemUse	src/Dodge/Data/Item/Use.hs	30;"	t
-ItmInt	src/Dodge/Data/Item/Location.hs	25;"	t
+ItmInt	src/Dodge/Data/Item/Location.hs	24;"	t
 JOYSTICK	src/Dodge/Data/Item/Combine.hs	96;"	C
 JUMPLEGS	src/Dodge/Data/Item/Combine.hs	132;"	C
 JoinClust	src/Dodge/Combine/Graph.hs	22;"	C
@@ -935,13 +935,13 @@ ObjectType	src/Dodge/Data/ObjectType.hs	11;"	t
 OnBack	src/Dodge/Data/Equipment/Misc.hs	24;"	C
 OnChest	src/Dodge/Data/Equipment/Misc.hs	23;"	C
 OnEdge	src/Dodge/Data/Room.hs	46;"	C
-OnFloor	src/Dodge/Data/Item/Location.hs	38;"	C
+OnFloor	src/Dodge/Data/Item/Location.hs	37;"	C
 OnHead	src/Dodge/Data/Equipment/Misc.hs	22;"	C
 OnLeftWrist	src/Dodge/Data/Equipment/Misc.hs	25;"	C
 OnLegs	src/Dodge/Data/Equipment/Misc.hs	27;"	C
 OnRightWrist	src/Dodge/Data/Equipment/Misc.hs	26;"	C
 OnSpecial	src/Dodge/Data/Equipment/Misc.hs	28;"	C
-OnTurret	src/Dodge/Data/Item/Location.hs	37;"	C
+OnTurret	src/Dodge/Data/Item/Location.hs	36;"	C
 OnceSound	src/Dodge/Data/SoundOrigin.hs	16;"	C
 OneHand	src/Dodge/Data/AimStance.hs	9;"	C
 OnwardCluster	src/Dodge/Data/RoomCluster.hs	13;"	C
@@ -1399,7 +1399,7 @@ TurnToPoint	src/Dodge/Data/ActionPlan.hs	91;"	C
 TurnToward	src/Dodge/Data/ActionPlan.hs	33;"	C
 TurnTowardCr	src/Dodge/Data/CreatureEffect.hs	25;"	C
 Turret	src/Dodge/Data/Machine.hs	57;"	t
-TurretInt	src/Dodge/Data/Item/Location.hs	21;"	t
+TurretInt	src/Dodge/Data/Item/Location.hs	20;"	t
 TwistGoal	src/Dodge/Data/Scenario.hs	15;"	C
 TwoHandFlat	src/Dodge/Data/AimStance.hs	8;"	C
 TwoHandOver	src/Dodge/Data/AimStance.hs	7;"	C
@@ -1846,10 +1846,9 @@ _fboHalf1	src/Data/Preload/Render.hs	31;"	f
 _fboHalf2	src/Data/Preload/Render.hs	32;"	f
 _fboLighting	src/Data/Preload/Render.hs	37;"	f
 _fboPos	src/Data/Preload/Render.hs	36;"	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
+_flIt	src/Dodge/Data/FloorItem.hs	15;"	f
+_flItPos	src/Dodge/Data/FloorItem.hs	15;"	f
+_flItRot	src/Dodge/Data/FloorItem.hs	15;"	f
 _flPos	src/Dodge/Data/Flame.hs	15;"	f
 _flTimer	src/Dodge/Data/Flame.hs	14;"	f
 _flVel	src/Dodge/Data/Flame.hs	16;"	f
@@ -1921,14 +1920,13 @@ _ibtHeld	src/Dodge/Data/Item/Combine.hs	17;"	f
 _ibtIntroScanType	src/Dodge/Data/Item/Combine.hs	33;"	f
 _ibtPathing	src/Dodge/Data/Item/Combine.hs	29;"	f
 _ibtTargeting	src/Dodge/Data/Item/Combine.hs	22;"	f
-_ilCrID	src/Dodge/Data/Item/Location.hs	30;"	f
-_ilEquipSite	src/Dodge/Data/Item/Location.hs	35;"	f
-_ilFlID	src/Dodge/Data/Item/Location.hs	38;"	f
-_ilInvID	src/Dodge/Data/Item/Location.hs	31;"	f
-_ilIsAttached	src/Dodge/Data/Item/Location.hs	34;"	f
-_ilIsRoot	src/Dodge/Data/Item/Location.hs	32;"	f
-_ilIsSelected	src/Dodge/Data/Item/Location.hs	33;"	f
-_ilTuID	src/Dodge/Data/Item/Location.hs	37;"	f
+_ilCrID	src/Dodge/Data/Item/Location.hs	29;"	f
+_ilEquipSite	src/Dodge/Data/Item/Location.hs	34;"	f
+_ilInvID	src/Dodge/Data/Item/Location.hs	30;"	f
+_ilIsAttached	src/Dodge/Data/Item/Location.hs	33;"	f
+_ilIsRoot	src/Dodge/Data/Item/Location.hs	31;"	f
+_ilIsSelected	src/Dodge/Data/Item/Location.hs	32;"	f
+_ilTuID	src/Dodge/Data/Item/Location.hs	36;"	f
 _imAttachedItems	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	25;"	f
 _imHotkeys	src/Dodge/Data/LWorld.hs	151;"	f
 _imRootSelectedItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	24;"	f
@@ -2630,7 +2628,7 @@ anRoom	src/Dodge/Floor.hs	130;"	f
 analyser	src/Dodge/Placement/Instance/Analyser.hs	10;"	f
 analyserByDoor	src/Dodge/Room/LasTurret.hs	93;"	f
 analyserByNthLink	src/Dodge/Room/LasTurret.hs	78;"	f
-andOrRegex	src/Dodge/DisplayInventory.hs	78;"	f
+andOrRegex	src/Dodge/DisplayInventory.hs	79;"	f
 angleBetween	src/Geometry.hs	161;"	f
 angleVV	src/Geometry/Vector.hs	57;"	f
 angleVV3	src/Geometry/Vector3D.hs	122;"	f
@@ -2717,7 +2715,7 @@ bangS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	668;"	f
 bangStick	src/Dodge/Item/Held/Stick.hs	15;"	f
 barPP	src/Dodge/Room/Foreground.hs	236;"	f
 barrel	src/Dodge/Creature/Inanimate.hs	17;"	f
-barrelShape	src/Dodge/Render/ShapePicture.hs	68;"	f
+barrelShape	src/Dodge/Render/ShapePicture.hs	67;"	f
 baseAMRShape	src/Dodge/Item/Draw/SPic.hs	418;"	f
 baseBlockPane	src/Dodge/Placement/Instance/Wall.hs	86;"	f
 baseCI	src/Dodge/Item/Grammar.hs	157;"	f
@@ -2800,7 +2798,7 @@ branchRectWith	src/Dodge/Room/Branch.hs	15;"	f
 branchWith	src/Dodge/Room/Room.hs	67;"	f
 bright	src/Color.hs	120;"	f
 brightX	src/Color.hs	116;"	f
-btSPic	src/Dodge/Render/ShapePicture.hs	128;"	f
+btSPic	src/Dodge/Render/ShapePicture.hs	127;"	f
 btText	src/Dodge/Inventory/SelectionList.hs	234;"	f
 bufferEBO	src/Shader/Bind.hs	28;"	f
 bufferPokedVBO	src/Shader/Bind.hs	19;"	f
@@ -2825,7 +2823,7 @@ capacitor	src/Dodge/Item/Ammo.hs	69;"	f
 cardEightVec	src/Dodge/Base/CardinalPoint.hs	16;"	f
 cardList	src/Dodge/Base/CardinalPoint.hs	6;"	f
 cardVec	src/Dodge/Base/CardinalPoint.hs	9;"	f
-cardinalVectors	src/Dodge/FloorItem.hs	43;"	f
+cardinalVectors	src/Dodge/FloorItem.hs	40;"	f
 cartePosToScreen	src/Dodge/Base/Coordinate.hs	37;"	f
 cdtPropagateFold	src/Dodge/DoubleTree.hs	406;"	f
 cenLasTur	src/Dodge/Room/LasTurret.hs	24;"	f
@@ -2849,7 +2847,7 @@ chaseCritPerceptionUpdate	src/Dodge/Creature/Perception.hs	31;"	f
 chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	37;"	f
 chasmTest	src/Dodge/Creature/Update.hs	121;"	f
 chasmWallToSurface	src/Dodge/Base/Collide.hs	110;"	f
-checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	100;"	f
+checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	101;"	f
 checkConnection	src/Dodge/Inventory/Swap.hs	64;"	f
 checkDeath	src/Dodge/Creature/Update.hs	67;"	f
 checkDeath'	src/Dodge/Creature/Update.hs	70;"	f
@@ -2858,7 +2856,7 @@ checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
 checkInvSlotsYou	src/Dodge/Inventory/CheckSlots.hs	17;"	f
-checkInventorySelectionExists	src/Dodge/DisplayInventory.hs	93;"	f
+checkInventorySelectionExists	src/Dodge/DisplayInventory.hs	94;"	f
 checkTermDist	src/Dodge/Update.hs	334;"	f
 checkWallLeft	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	29;"	f
 checkWallRight	src/Dodge/LevelGen/StaticWalls.hs	54;"	f
@@ -2955,7 +2953,7 @@ combineList	src/Dodge/Combine.hs	20;"	f
 combineRooms	src/Dodge/Room/Procedural.hs	152;"	f
 combineS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	480;"	f
 combineTree	src/Dodge/Tree/Compose.hs	66;"	f
-commandColor	src/Dodge/Terminal.hs	136;"	f
+commandColor	src/Dodge/Terminal.hs	137;"	f
 commonPrefix	src/Dodge/Debug/Terminal.hs	146;"	f
 comp	src/Quaternion.hs	65;"	f
 compactDraw	src/Dodge/LevelGen.hs	93;"	f
@@ -3041,7 +3039,7 @@ createFlIt	src/Dodge/Placement/PlaceSpot.hs	182;"	f
 createForceField	src/Dodge/ForceField.hs	7;"	f
 createGas	src/Dodge/Gas.hs	8;"	f
 createHeadLamp	src/Dodge/Euse.hs	55;"	f
-createItemYou	src/Dodge/Inventory/Add.hs	95;"	f
+createItemYou	src/Dodge/Inventory/Add.hs	88;"	f
 createLightMap	src/Render.hs	26;"	f
 createPathGrid	src/Dodge/Room/Path.hs	21;"	f
 createProjectile	src/Dodge/HeldUse.hs	1322;"	f
@@ -3071,7 +3069,7 @@ crsNearRect	src/Dodge/Zoning/Creature.hs	38;"	f
 crsNearSeg	src/Dodge/Zoning/Creature.hs	23;"	f
 crystalLine	src/Dodge/Placement/Instance/Wall.hs	55;"	f
 cubeShape	src/Dodge/Block/Debris.hs	103;"	f
-cullPoint	src/Dodge/Render/ShapePicture.hs	90;"	f
+cullPoint	src/Dodge/Render/ShapePicture.hs	89;"	f
 cullPretty	src/AesonHelp.hs	14;"	f
 cutPoly	src/Dodge/LevelGen/StaticWalls.hs	77;"	f
 cutWall	src/Dodge/LevelGen/StaticWalls.hs	124;"	f
@@ -3137,7 +3135,7 @@ debugMenuOptions	src/Dodge/Menu.hs	122;"	f
 debugOn	src/Dodge/Data/Config.hs	151;"	f
 debugSelectCreatureList	src/Dodge/Debug.hs	86;"	f
 debugSelectCreatureMessage	src/Dodge/Debug.hs	77;"	f
-decodeSensorType	src/Dodge/Terminal.hs	78;"	f
+decodeSensorType	src/Dodge/Terminal.hs	79;"	f
 decomposeSelfTree	src/Dodge/Tree/Compose.hs	60;"	f
 decomposeTree	src/Dodge/Tree/Compose.hs	57;"	f
 decontamRoom	src/Dodge/Room/Airlock.hs	25;"	f
@@ -3160,9 +3158,9 @@ defaultBlock	src/Dodge/Default/Block.hs	5;"	f
 defaultBounds	src/Dodge/Data/Bounds.hs	20;"	f
 defaultBullet	src/Dodge/Item/Weapon/Bullet.hs	10;"	f
 defaultButton	src/Dodge/Default.hs	48;"	f
-defaultCWCam	src/Dodge/Default/World.hs	69;"	f
-defaultCWGen	src/Dodge/Default/World.hs	59;"	f
-defaultCWorld	src/Dodge/Default/World.hs	84;"	f
+defaultCWCam	src/Dodge/Default/World.hs	66;"	f
+defaultCWGen	src/Dodge/Default/World.hs	56;"	f
+defaultCWorld	src/Dodge/Default/World.hs	81;"	f
 defaultChaseMvType	src/Dodge/Creature/MoveType.hs	25;"	f
 defaultClusterStatus	src/Dodge/Default/Room.hs	38;"	f
 defaultConfig	src/Dodge/Data/Config.hs	127;"	f
@@ -3173,20 +3171,20 @@ defaultCreatureMemory	src/Dodge/Default/Creature.hs	65;"	f
 defaultCrystalWall	src/Dodge/Default/Wall.hs	47;"	f
 defaultDirtBlock	src/Dodge/Default/Block.hs	19;"	f
 defaultDirtWall	src/Dodge/Default/Wall.hs	68;"	f
-defaultDisplayInventory	src/Dodge/Default/World.hs	173;"	f
+defaultDisplayInventory	src/Dodge/Default/World.hs	169;"	f
 defaultDoor	src/Dodge/Default/Door.hs	29;"	f
 defaultDoorWall	src/Dodge/Default/Wall.hs	39;"	f
 defaultDrawButton	src/Dodge/Button/Draw.hs	29;"	f
 defaultEquipment	src/Dodge/Default.hs	24;"	f
 defaultFlIt	src/Dodge/Default.hs	27;"	f
 defaultForeground	src/Dodge/Default/ForegroundShape.hs	5;"	f
-defaultHUD	src/Dodge/Default/World.hs	162;"	f
+defaultHUD	src/Dodge/Default/World.hs	158;"	f
 defaultHeldItem	src/Dodge/Default/Item.hs	9;"	f
 defaultInanimate	src/Dodge/Default/Creature.hs	62;"	f
-defaultInput	src/Dodge/Default/World.hs	14;"	f
+defaultInput	src/Dodge/Default/World.hs	11;"	f
 defaultIntention	src/Dodge/Default/Creature.hs	98;"	f
 defaultInvSize	src/Dodge/Default/Creature.hs	72;"	f
-defaultLWorld	src/Dodge/Default/World.hs	98;"	f
+defaultLWorld	src/Dodge/Default/World.hs	94;"	f
 defaultListDisplayParams	src/Dodge/ListDisplayParams.hs	18;"	f
 defaultMachine	src/Dodge/Default.hs	30;"	f
 defaultMachineWall	src/Dodge/Default/Wall.hs	55;"	f
@@ -3201,7 +3199,7 @@ defaultTerminal	src/Dodge/Default/Terminal.hs	10;"	f
 defaultVision	src/Dodge/Default/Creature.hs	85;"	f
 defaultWall	src/Dodge/Default/Wall.hs	17;"	f
 defaultWindow	src/Dodge/Default/Wall.hs	85;"	f
-defaultWorld	src/Dodge/Default/World.hs	34;"	f
+defaultWorld	src/Dodge/Default/World.hs	31;"	f
 degToRad	src/Geometry/Vector.hs	117;"	f
 deleteIMInZone	src/Dodge/Base.hs	70;"	f
 deleteWall	src/Dodge/Wall/Delete.hs	21;"	f
@@ -3241,8 +3239,8 @@ disconnectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	650;"	f
 displayConfig	src/Dodge/Menu.hs	213;"	f
 displayControls	src/Dodge/Menu.hs	223;"	f
 displayFrameTicks	src/Dodge/Render/Picture.hs	46;"	f
-displayFreeSlots	src/Dodge/DisplayInventory.hs	199;"	f
-displayIndents	src/Dodge/DisplayInventory.hs	110;"	f
+displayFreeSlots	src/Dodge/DisplayInventory.hs	200;"	f
+displayIndents	src/Dodge/DisplayInventory.hs	111;"	f
 displayPulse	src/Dodge/Inventory/SelectionList.hs	176;"	f
 displayTerminalLineString	src/Dodge/Update.hs	496;"	f
 dist	src/Geometry/Vector.hs	190;"	f
@@ -3318,7 +3316,7 @@ doRoomOutPlacements	src/Dodge/Layout.hs	107;"	f
 doRoomPlacements	src/Dodge/Layout.hs	122;"	f
 doRoomShift	src/Dodge/Room/Link.hs	33;"	f
 doScopeZoom	src/Dodge/Update/Scroll.hs	88;"	f
-doSectionSize	src/Dodge/DisplayInventory.hs	218;"	f
+doSectionSize	src/Dodge/DisplayInventory.hs	219;"	f
 doSideEffects	appDodge/Main.hs	120;"	f
 doStrategyActions	src/Dodge/Creature/ReaderUpdate.hs	166;"	f
 doTestDrawing	src/Dodge/Render.hs	41;"	f
@@ -3363,9 +3361,9 @@ drawBoundingBox	src/Dodge/Debug/Picture.hs	336;"	f
 drawBullet	src/Dodge/Bullet/Draw.hs	9;"	f
 drawButton	src/Dodge/Button/Draw.hs	10;"	f
 drawCPUShadows	src/Dodge/Render/Shadow.hs	19;"	f
-drawChasm	src/Dodge/Render/ShapePicture.hs	44;"	f
+drawChasm	src/Dodge/Render/ShapePicture.hs	43;"	f
 drawCircCollisionTest	src/Dodge/Debug/Picture.hs	116;"	f
-drawCliff	src/Dodge/Render/ShapePicture.hs	47;"	f
+drawCliff	src/Dodge/Render/ShapePicture.hs	46;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
 drawCombFilter	src/Dodge/Render/Picture.hs	268;"	f
 drawCombineInventory	src/Dodge/Render/HUD.hs	176;"	f
@@ -3373,7 +3371,7 @@ drawConcurrentMessage	src/Dodge/Render/Picture.hs	69;"	f
 drawCoord	src/Dodge/Debug/Picture.hs	364;"	f
 drawCorpse	src/Dodge/Corpse/Draw.hs	6;"	f
 drawCrInfo	src/Dodge/Debug/Picture.hs	385;"	f
-drawCreature	src/Dodge/Render/ShapePicture.hs	61;"	f
+drawCreature	src/Dodge/Render/ShapePicture.hs	60;"	f
 drawCreatureDisplayTexts	src/Dodge/Debug/Picture.hs	197;"	f
 drawCross	src/Dodge/Render/Label.hs	24;"	f
 drawCrossCol	src/Dodge/Render/Label.hs	21;"	f
@@ -3437,7 +3435,7 @@ drawPlus	src/Dodge/Render/Picture.hs	160;"	f
 drawPointLabel	src/Dodge/Render/Label.hs	13;"	f
 drawProjectile	src/Dodge/Projectile/Draw.hs	13;"	f
 drawProp	src/Dodge/Prop/Draw.hs	26;"	f
-drawPulseBall	src/Dodge/Render/ShapePicture.hs	53;"	f
+drawPulseBall	src/Dodge/Render/ShapePicture.hs	52;"	f
 drawQuitTerminal	src/Dodge/Render/Picture.hs	133;"	f
 drawRBOptions	src/Dodge/Render/HUD.hs	245;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	14;"	f
@@ -3529,7 +3527,7 @@ endArcPos	src/Dodge/Tesla.hs	87;"	f
 endCombineRegex	src/Dodge/Update/Input/InGame.hs	261;"	f
 endRegex	src/Dodge/Update/Input/InGame.hs	252;"	f
 energyReleaseS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	592;"	f
-enterCombineInv	src/Dodge/DisplayInventory.hs	324;"	f
+enterCombineInv	src/Dodge/DisplayInventory.hs	325;"	f
 epText	src/Dodge/Inventory/SelectionList.hs	76;"	f
 eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	5;"	f
@@ -3565,7 +3563,7 @@ explosiveBarrel	src/Dodge/Creature/Inanimate.hs	25;"	f
 extTrigLitPos	src/Dodge/Placement/Instance/Button.hs	84;"	f
 extendAway	src/Dodge/Placement/Instance/LightSource.hs	200;"	f
 extendConeToScreenEdge	src/Dodge/Debug/Picture.hs	82;"	f
-extraPics	src/Dodge/Render/ShapePicture.hs	95;"	f
+extraPics	src/Dodge/Render/ShapePicture.hs	94;"	f
 extraWeaponLinks	src/Dodge/Item/Grammar.hs	89;"	f
 extraWeaponLinksBelow	src/Dodge/Item/Grammar.hs	98;"	f
 extractRoomPos	src/Dodge/RoomPos.hs	6;"	f
@@ -3576,7 +3574,7 @@ fdiv	src/ShortShow.hs	26;"	f
 feet	src/Dodge/Creature/Picture.hs	49;"	f
 ffoldM	src/Framebuffer/Update.hs	79;"	f
 filter3	src/FoldableHelp.hs	76;"	f
-filterSectionsPair	src/Dodge/DisplayInventory.hs	167;"	f
+filterSectionsPair	src/Dodge/DisplayInventory.hs	168;"	f
 findBlips	src/Dodge/RadarSweep.hs	62;"	f
 findBoundDists	src/Dodge/Update/Camera.hs	241;"	f
 findClosePoint	src/Dodge/LevelGen/StaticWalls.hs	155;"	f
@@ -3584,7 +3582,7 @@ findClosePoint	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	74;"	f
 findIndex	src/IntMapHelp.hs	85;"	f
 findReverseEdge	src/Polyhedra.hs	50;"	f
 findReverseEdgeList	src/Polyhedra.hs	57;"	f
-findWallFreeDropPoint	src/Dodge/FloorItem.hs	51;"	f
+findWallFreeDropPoint	src/Dodge/FloorItem.hs	48;"	f
 findWallsInPolygon	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	78;"	f
 findWithIx	src/ListHelp.hs	123;"	f
 fireFadeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	552;"	f
@@ -3624,7 +3622,7 @@ flockPointTargetR	src/Dodge/Creature/Boid.hs	267;"	f
 flockToPointUsing	src/Dodge/Creature/Boid.hs	215;"	f
 flockToPointUsing'	src/Dodge/Creature/Boid.hs	228;"	f
 floorItemPickupInfo	src/Dodge/Render/HUD.hs	225;"	f
-floorItemSPic	src/Dodge/Render/ShapePicture.hs	121;"	f
+floorItemSPic	src/Dodge/Render/ShapePicture.hs	120;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	558;"	f
 foamSprayLoopS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	554;"	f
@@ -3808,7 +3806,7 @@ heldItemWeight	src/Dodge/Creature/Statistics.hs	72;"	f
 heldPositionInfo	src/Dodge/Item/Info.hs	241;"	f
 heldTorqueAmount	src/Dodge/HeldUse.hs	584;"	f
 heldTriggerType	src/Dodge/BaseTriggerType.hs	27;"	f
-helpPara	src/Dodge/Terminal.hs	112;"	f
+helpPara	src/Dodge/Terminal.hs	113;"	f
 helpPoly3D	src/Polyhedra.hs	125;"	f
 heron	src/Geometry.hs	221;"	f
 hiToFloat	src/Dodge/Room/Modify/Girder.hs	171;"	f
@@ -3836,19 +3834,17 @@ inSegArea	src/Geometry/Intersect.hs	328;"	f
 inTextInputFocus	src/Dodge/InputFocus.hs	8;"	f
 incidenceToFunction	src/Dodge/Graph.hs	26;"	f
 indefiniteExceptions	src/StringHelp.hs	29;"	f
-initCrItemLocation	src/Dodge/Item/Location/Initialize.hs	41;"	f
-initCrItemLocations	src/Dodge/Item/Location/Initialize.hs	35;"	f
-initCrsItemLocations	src/Dodge/Item/Location/Initialize.hs	15;"	f
-initFlItemLocation	src/Dodge/Item/Location/Initialize.hs	57;"	f
-initFlItemsLocations	src/Dodge/Item/Location/Initialize.hs	20;"	f
+initCrItemLocation	src/Dodge/Item/Location/Initialize.hs	42;"	f
+initCrItemLocations	src/Dodge/Item/Location/Initialize.hs	36;"	f
+initCrsItemLocations	src/Dodge/Item/Location/Initialize.hs	16;"	f
 initItemLocations	src/Dodge/Item/Location/Initialize.hs	12;"	f
 initOrNull	src/ListHelp.hs	43;"	f
-initSpecificCrItemLocations	src/Dodge/Item/Location/Initialize.hs	30;"	f
+initSpecificCrItemLocations	src/Dodge/Item/Location/Initialize.hs	31;"	f
 initTexture2DArray	src/Shader/AuxAddition.hs	31;"	f
 initTexture2DArrayData	src/Shader/AuxAddition.hs	46;"	f
 initTexture2DArraySquare	src/Shader/AuxAddition.hs	16;"	f
-initTuItemLocation	src/Dodge/Item/Location/Initialize.hs	66;"	f
-initTusItemLocations	src/Dodge/Item/Location/Initialize.hs	25;"	f
+initTuItemLocation	src/Dodge/Item/Location/Initialize.hs	67;"	f
+initTusItemLocations	src/Dodge/Item/Location/Initialize.hs	26;"	f
 initWallZoning	src/Dodge/Wall/Zone.hs	12;"	f
 initialAnoTree	src/Dodge/Floor.hs	35;"	f
 initialRoomTree	src/Dodge/Floor.hs	22;"	f
@@ -3903,7 +3899,7 @@ invCursorParams	src/Dodge/ListDisplayParams.hs	36;"	f
 invDP	src/Dodge/ListDisplayParams.hs	30;"	f
 invDT	src/Dodge/Item/Grammar.hs	215;"	f
 invDT'	src/Dodge/Item/Grammar.hs	220;"	f
-invDimColor	src/Dodge/DisplayInventory.hs	193;"	f
+invDimColor	src/Dodge/DisplayInventory.hs	194;"	f
 invHead	src/Dodge/Render/HUD.hs	398;"	f
 invIMDT	src/Dodge/Item/Grammar.hs	248;"	f
 invIndents	src/Dodge/Item/Grammar.hs	255;"	f
@@ -4026,7 +4022,7 @@ lShape	src/Dodge/Placement/Instance/LightSource.hs	76;"	f
 lamp	src/Dodge/Creature/Lamp.hs	21;"	f
 lampCover	src/Dodge/Placement/Instance/LightSource/Cover.hs	8;"	f
 lampCoverWhen	src/Dodge/Placement/Instance/LightSource/Cover.hs	19;"	f
-lampCrSPic	src/Dodge/Render/ShapePicture.hs	73;"	f
+lampCrSPic	src/Dodge/Render/ShapePicture.hs	72;"	f
 lasCenSensEdge	src/Dodge/Room/LasTurret.hs	115;"	f
 lasGunPic	src/Dodge/Item/Draw/SPic.hs	424;"	f
 lasPulseS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	526;"	f
@@ -4082,7 +4078,7 @@ listConfig	src/Dodge/Menu.hs	216;"	f
 listControls	src/Dodge/Menu.hs	228;"	f
 listCursorChooseBorderScale	src/Dodge/Render/List.hs	135;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	190;"	f
-listSelectionColorPicture	src/Dodge/DisplayInventory.hs	309;"	f
+listSelectionColorPicture	src/Dodge/DisplayInventory.hs	310;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	121;"	f
@@ -4159,8 +4155,8 @@ makeBullet	src/Dodge/HeldUse.hs	1021;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	128;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	7;"	f
-makeColorTermLine	src/Dodge/Terminal.hs	133;"	f
-makeColorTermPara	src/Dodge/Terminal.hs	130;"	f
+makeColorTermLine	src/Dodge/Terminal.hs	134;"	f
+makeColorTermPara	src/Dodge/Terminal.hs	131;"	f
 makeCorpse	src/Dodge/Corpse/Make.hs	13;"	f
 makeDebris	src/Dodge/Block/Debris.hs	45;"	f
 makeDebrisDirected	src/Dodge/Block/Debris.hs	48;"	f
@@ -4196,8 +4192,8 @@ makeSourcedShader	src/Shader/Compile.hs	167;"	f
 makeSpark	src/Dodge/Spark.hs	45;"	f
 makeSubmenuOption	src/Dodge/Menu/OptionType.hs	19;"	f
 makeSwitch	src/Dodge/LevelGen/Switch.hs	38;"	f
-makeTermLine	src/Dodge/Terminal.hs	118;"	f
-makeTermPara	src/Dodge/Terminal.hs	127;"	f
+makeTermLine	src/Dodge/Terminal.hs	119;"	f
+makeTermPara	src/Dodge/Terminal.hs	128;"	f
 makeTeslaArc	src/Dodge/Tesla.hs	29;"	f
 makeTeslaExplosionAt	src/Dodge/WorldEvent/Explosion.hs	40;"	f
 makeTileFromPoly	src/Tile.hs	34;"	f
@@ -4228,7 +4224,7 @@ mcKillTerm	src/Dodge/Machine/Destroy.hs	27;"	f
 mcPlaySound	src/Dodge/Machine/Update.hs	104;"	f
 mcProxTest	src/Dodge/Machine/Update.hs	152;"	f
 mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	130;"	f
-mcSPic	src/Dodge/Render/ShapePicture.hs	133;"	f
+mcSPic	src/Dodge/Render/ShapePicture.hs	132;"	f
 mcSensorTriggerUpdate	src/Dodge/Machine/Update.hs	93;"	f
 mcSensorUpdate	src/Dodge/Machine/Update.hs	125;"	f
 mcShootAuto	src/Dodge/HeldUse.hs	1209;"	f
@@ -4394,7 +4390,7 @@ optionScreenUpdate	src/Dodge/Update/Input/ScreenLayer.hs	43;"	f
 optionValueOffset	src/Dodge/Menu/Option.hs	88;"	f
 optionsOptions	src/Dodge/Menu.hs	111;"	f
 optionsToSelections	src/Dodge/Menu/Option.hs	50;"	f
-orRegex	src/Dodge/DisplayInventory.hs	81;"	f
+orRegex	src/Dodge/DisplayInventory.hs	82;"	f
 orange	src/Color.hs	25;"	f
 orderAround3	src/Geometry/Vector3D.hs	105;"	f
 orderAroundFirst	src/Geometry/Polygon.hs	88;"	f
@@ -4461,8 +4457,8 @@ pesNearRect	src/Dodge/Zoning/Pathing.hs	40;"	f
 pesNearSeg	src/Dodge/Zoning/Pathing.hs	37;"	f
 picFormat	src/Polyhedra.hs	23;"	f
 picMap	src/Picture/Base.hs	67;"	f
-pickUpItem	src/Dodge/Inventory/Add.hs	107;"	f
-pickUpItemAt	src/Dodge/Inventory/Add.hs	113;"	f
+pickUpItem	src/Dodge/Inventory/Add.hs	99;"	f
+pickUpItemAt	src/Dodge/Inventory/Add.hs	105;"	f
 pickUpS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	624;"	f
 pincerP	src/Dodge/Creature/Boid.hs	61;"	f
 pincerP'	src/Dodge/Creature/Boid.hs	94;"	f
@@ -4478,24 +4474,24 @@ plBlock	src/Dodge/Placement/PlaceSpot/Block.hs	18;"	f
 plDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	22;"	f
 plLineBlock	src/Dodge/Placement/PlaceSpot/Block.hs	50;"	f
 plMachine	src/Dodge/Placement/PlaceSpot.hs	194;"	f
-plNew	src/Dodge/Base/NewID.hs	23;"	f
+plNew	src/Dodge/Base/NewID.hs	19;"	f
 plNewID	src/Dodge/Base/NewID.hs	7;"	f
 plNewUpID	src/Dodge/Base/NewID.hs	13;"	f
-plNewUsing	src/Dodge/Base/NewID.hs	31;"	f
+plNewUsing	src/Dodge/Base/NewID.hs	27;"	f
 plRRpt	src/Dodge/LevelGen/PlacementHelper.hs	33;"	f
 plSlideDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	78;"	f
 placeMachineWalls	src/Dodge/Placement/PlaceSpot.hs	209;"	f
-placePickOne	src/Dodge/Placement/PlaceSpot.hs	43;"	f
-placePlainPSSpot	src/Dodge/Placement/PlaceSpot.hs	55;"	f
-placeRandomPlacement	src/Dodge/Placement/PlaceSpot.hs	46;"	f
-placeSpot	src/Dodge/Placement/PlaceSpot.hs	31;"	f
-placeSpotID	src/Dodge/Placement/PlaceSpot.hs	101;"	f
-placeSpotID'	src/Dodge/Placement/PlaceSpot.hs	107;"	f
-placeSpotRoomRand	src/Dodge/Placement/PlaceSpot.hs	90;"	f
-placeSpotUsingLink	src/Dodge/Placement/PlaceSpot.hs	71;"	f
+placePickOne	src/Dodge/Placement/PlaceSpot.hs	40;"	f
+placePlainPSSpot	src/Dodge/Placement/PlaceSpot.hs	52;"	f
+placeRandomPlacement	src/Dodge/Placement/PlaceSpot.hs	43;"	f
+placeSpot	src/Dodge/Placement/PlaceSpot.hs	28;"	f
+placeSpotID	src/Dodge/Placement/PlaceSpot.hs	98;"	f
+placeSpotID'	src/Dodge/Placement/PlaceSpot.hs	104;"	f
+placeSpotRoomRand	src/Dodge/Placement/PlaceSpot.hs	87;"	f
+placeSpotUsingLink	src/Dodge/Placement/PlaceSpot.hs	68;"	f
 placeString	src/Dodge/Render/MenuScreen.hs	61;"	f
 placeWallPoly	src/Dodge/Placement/PlaceSpot.hs	164;"	f
-plainRegex	src/Dodge/DisplayInventory.hs	196;"	f
+plainRegex	src/Dodge/DisplayInventory.hs	197;"	f
 playIfFree	src/Sound.hs	137;"	f
 playPositionalSoundQueue	src/Sound.hs	145;"	f
 playSoundAndUpdate	src/Sound.hs	54;"	f
@@ -4525,11 +4521,10 @@ pointInPolygon	src/Geometry/Polygon.hs	66;"	f
 pointIsInCone	src/Geometry.hs	378;"	f
 pointIsOnScreen	src/Dodge/Base/Window.hs	59;"	f
 pointTowardsImpulse	src/Dodge/Path.hs	63;"	f
-pointerToItem	src/Dodge/Item/Location.hs	36;"	f
+pointerToItem	src/Dodge/Item/Location.hs	37;"	f
 pointerToItemID	src/Dodge/Item/Location.hs	44;"	f
-pointerToItemLocation	src/Dodge/Item/Location.hs	14;"	f
-pointerYourRootItem	src/Dodge/Item/Location.hs	31;"	f
-pointerYourSelectedItem	src/Dodge/Item/Location.hs	25;"	f
+pointerYourRootItem	src/Dodge/Item/Location.hs	32;"	f
+pointerYourSelectedItem	src/Dodge/Item/Location.hs	26;"	f
 pointsToPoly	src/Geometry/ConvexPoly.hs	39;"	f
 poisonSPic	src/Dodge/Creature/Update.hs	114;"	f
 poisonSprayer	src/Dodge/Item/Held/SprayGuns.hs	17;"	f
@@ -4598,7 +4593,7 @@ powlist	src/Multiset.hs	61;"	f
 powlistUpToN	src/Multiset.hs	23;"	f
 powlistUpToN'	src/Multiset.hs	12;"	f
 powlistUpToN''	src/Multiset.hs	31;"	f
-ppDraw	src/Dodge/Render/ShapePicture.hs	118;"	f
+ppDraw	src/Dodge/Render/ShapePicture.hs	117;"	f
 ppEvents	src/Dodge/Update.hs	769;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	83;"	f
@@ -4681,7 +4676,7 @@ qToV2	src/Quaternion.hs	56;"	f
 qToV3	src/Quaternion.hs	53;"	f
 quarterRoomSquare	src/Dodge/Room/Procedural.hs	213;"	f
 quarterRoomTri	src/Dodge/Room/Procedural.hs	177;"	f
-quitCommand	src/Dodge/Terminal.hs	115;"	f
+quitCommand	src/Dodge/Terminal.hs	116;"	f
 qz	src/Quaternion.hs	71;"	f
 rLauncher	src/Dodge/Item/Held/Launcher.hs	14;"	f
 rLauncherX	src/Dodge/Item/Held/Launcher.hs	30;"	f
@@ -4747,8 +4742,8 @@ reflectLaserAlong	src/Dodge/Item/Weapon/LaserPath.hs	16;"	f
 reflectPulseLaserAlong	src/Dodge/Item/Weapon/LaserPath.hs	69;"	f
 refract	src/Dodge/Item/Weapon/LaserPath.hs	43;"	f
 refreshOptionsSelectionList	src/Dodge/Menu/Option.hs	38;"	f
-regexCombs	src/Dodge/DisplayInventory.hs	71;"	f
-regexList	src/Dodge/DisplayInventory.hs	315;"	f
+regexCombs	src/Dodge/DisplayInventory.hs	72;"	f
+regexList	src/Dodge/DisplayInventory.hs	316;"	f
 reload1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	602;"	f
 reloadLevelStart	src/Dodge/Save.hs	71;"	f
 reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	600;"	f
@@ -4921,8 +4916,8 @@ seagullWhistle1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
 seagullWhistleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	718;"	f
 searchIfDamaged	src/Dodge/Creature/ReaderUpdate.hs	205;"	f
 secondColumnParams	src/Dodge/ListDisplayParams.hs	43;"	f
-sectionsDesiredLines	src/Dodge/DisplayInventory.hs	205;"	f
-sectionsSizes	src/Dodge/DisplayInventory.hs	208;"	f
+sectionsDesiredLines	src/Dodge/DisplayInventory.hs	206;"	f
+sectionsSizes	src/Dodge/DisplayInventory.hs	209;"	f
 seedStartMenu	src/Dodge/Menu.hs	82;"	f
 seedStartOptions	src/Dodge/Menu.hs	85;"	f
 segOnCirc	src/Geometry.hs	114;"	f
@@ -4938,8 +4933,8 @@ selectedItemScroll	src/Dodge/Update/Scroll.hs	50;"	f
 sensAboveDoor	src/Dodge/Room/SensorDoor.hs	52;"	f
 sensInsideDoor	src/Dodge/Room/SensorDoor.hs	58;"	f
 senseDamage	src/Dodge/Machine/Update.hs	160;"	f
-sensorCommand	src/Dodge/Terminal.hs	84;"	f
-sensorReqToString	src/Dodge/Terminal.hs	91;"	f
+sensorCommand	src/Dodge/Terminal.hs	85;"	f
+sensorReqToString	src/Dodge/Terminal.hs	92;"	f
 sensorRoom	src/Dodge/Room/SensorDoor.hs	25;"	f
 sensorRoomRunPast	src/Dodge/Room/SensorDoor.hs	45;"	f
 sensorSPic	src/Dodge/Machine/Draw.hs	70;"	f
@@ -5019,8 +5014,8 @@ shellShape	src/Dodge/Projectile/Draw.hs	35;"	f
 shieldWall	src/Dodge/Item/BackgroundEffect.hs	77;"	f
 shiftByV2	src/Dodge/PlacementSpot.hs	254;"	f
 shiftChildren	src/Dodge/Tree/Compose.hs	43;"	f
-shiftDraw	src/Dodge/Render/ShapePicture.hs	78;"	f
-shiftDraw'	src/Dodge/Render/ShapePicture.hs	84;"	f
+shiftDraw	src/Dodge/Render/ShapePicture.hs	77;"	f
+shiftDraw'	src/Dodge/Render/ShapePicture.hs	83;"	f
 shiftInBy	src/Dodge/PlacementSpot.hs	251;"	f
 shiftInvItems	src/Dodge/Update/Input/InGame.hs	299;"	f
 shiftInvItemsDown	src/Dodge/Update/Input/InGame.hs	338;"	f
@@ -5063,9 +5058,9 @@ showEquipItem	src/Dodge/Item/Display.hs	107;"	f
 showInt	src/Dodge/Item/Info.hs	75;"	f
 showIntsString	src/Dodge/Tree/Compose.hs	129;"	f
 showInventoryPathing	src/Dodge/Item/Display.hs	86;"	f
-showManObj	src/Dodge/TestString.hs	64;"	f
+showManObj	src/Dodge/TestString.hs	65;"	f
 showTerminalError	src/Dodge/Debug/Terminal.hs	78;"	f
-showTimeFlow	src/Dodge/TestString.hs	87;"	f
+showTimeFlow	src/Dodge/TestString.hs	88;"	f
 shrinkPolyOnEdges	src/Geometry/Polygon.hs	142;"	f
 shrinkVert	src/Geometry/Polygon.hs	146;"	f
 shuffle	src/RandomHelp.hs	49;"	f
@@ -5074,7 +5069,7 @@ shuffleRoomPos	src/Dodge/Layout.hs	78;"	f
 shuffleTail	src/RandomHelp.hs	59;"	f
 sigmoid	src/Dodge/Base.hs	151;"	f
 simpleCrSprings	src/Dodge/Update.hs	883;"	f
-simpleTermMessage	src/Dodge/Terminal.hs	186;"	f
+simpleTermMessage	src/Dodge/Terminal.hs	187;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	680;"	f
 sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	472;"	f
 singleAmmo	src/Dodge/Item/AmmoSlots.hs	62;"	f
@@ -5222,8 +5217,8 @@ t	src/ShortShow.hs	33;"	f
 tEast	src/Dodge/Room/Corridor.hs	90;"	f
 tToBTree	src/Dodge/Tree/Compose.hs	92;"	f
 tWest	src/Dodge/Room/Corridor.hs	115;"	f
-tabComplete	src/Dodge/Terminal.hs	139;"	f
-tabComplete'	src/Dodge/Terminal.hs	145;"	f
+tabComplete	src/Dodge/Terminal.hs	140;"	f
+tabComplete'	src/Dodge/Terminal.hs	146;"	f
 takeN	src/RandomHelp.hs	44;"	f
 takeNMore	src/RandomHelp.hs	41;"	f
 takeOne	src/RandomHelp.hs	22;"	f
@@ -5254,7 +5249,7 @@ termScreenColor	src/Dodge/Terminal/Color.hs	10;"	f
 termSoundLine	src/Dodge/Terminal.hs	49;"	f
 termTextColor	src/Dodge/Terminal.hs	52;"	f
 terminalColor	src/Dodge/Placement/Instance/Terminal.hs	70;"	f
-terminalReturnEffect	src/Dodge/Terminal.hs	190;"	f
+terminalReturnEffect	src/Dodge/Terminal.hs	191;"	f
 terminalSPic	src/Dodge/Machine/Draw.hs	29;"	f
 terminalScreenGlow	src/Dodge/Machine/Update.hs	35;"	f
 terminalShape	src/Dodge/Machine/Draw.hs	32;"	f
@@ -5308,8 +5303,8 @@ tingS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	574;"	f
 tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	566;"	f
 titleOptionsMenu	src/Dodge/Menu.hs	102;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	105;"	f
-tlDoEffect	src/Dodge/Terminal.hs	124;"	f
-tlSetStatus	src/Dodge/Terminal.hs	121;"	f
+tlDoEffect	src/Dodge/Terminal.hs	125;"	f
+tlSetStatus	src/Dodge/Terminal.hs	122;"	f
 tmUpdate	src/Dodge/Update.hs	499;"	f
 toBinary	src/Dodge/Inventory/SelectionList.hs	138;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
@@ -5323,8 +5318,8 @@ toTopLeft	src/Dodge/Render/List.hs	219;"	f
 toV2	src/Geometry/Data.hs	54;"	f
 toV3	src/Geometry/Data.hs	57;"	f
 toV4	src/Geometry/Data.hs	60;"	f
-toggleCombineInv	src/Dodge/DisplayInventory.hs	318;"	f
-toggleCommands	src/Dodge/Terminal.hs	99;"	f
+toggleCombineInv	src/Dodge/DisplayInventory.hs	319;"	f
+toggleCommands	src/Dodge/Terminal.hs	100;"	f
 toggleEquipmentAt	src/Dodge/Creature/Impulse/UseItem.hs	65;"	f
 toggleExamineInv	src/Dodge/Creature/Impulse/UseItem.hs	103;"	f
 toggleJust	src/MaybeHelp.hs	41;"	f
@@ -5336,18 +5331,18 @@ tone440sawtoothquietS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	448;"	f
 topInvW	src/Dodge/ListDisplayParams.hs	51;"	f
 topPrismEdgeIndices	src/Shader/Poke.hs	335;"	f
 topPrismIndices	src/Shader/Poke.hs	410;"	f
-topTestPart	src/Dodge/TestString.hs	60;"	f
+topTestPart	src/Dodge/TestString.hs	61;"	f
 torch	src/Dodge/Item/Held/Utility.hs	23;"	f
 torchShape	src/Dodge/Item/Draw/SPic.hs	290;"	f
 torqueAmount	src/Dodge/HeldUse.hs	579;"	f
 torqueCr	src/Dodge/WorldEffect.hs	70;"	f
 torso	src/Dodge/Creature/Picture.hs	100;"	f
-tractCr	src/Dodge/TractorBeam/Update.hs	28;"	f
-tractFlIt	src/Dodge/TractorBeam/Update.hs	23;"	f
+tractCr	src/Dodge/TractorBeam/Update.hs	27;"	f
+tractFlIt	src/Dodge/TractorBeam/Update.hs	22;"	f
 tractorBeamAt	src/Dodge/HeldUse.hs	815;"	f
 tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	53;"	f
 tractorGunPic	src/Dodge/Item/Draw/SPic.hs	449;"	f
-tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
+tractorPullPos	src/Dodge/TractorBeam/Update.hs	32;"	f
 tractorSPic	src/Dodge/TractorBeam/Draw.hs	10;"	f
 tranRot	src/Picture/Base.hs	124;"	f
 transMat	src/MatrixHelper.hs	73;"	f
@@ -5405,9 +5400,9 @@ tryGetRootItemInvID	src/Dodge/Inventory/Location.hs	29;"	f
 tryMeleeAttack	src/Dodge/Creature/ReaderUpdate.hs	38;"	f
 tryPickupSelected	src/Dodge/Update/Input/InGame.hs	129;"	f
 tryPlay	src/Sound.hs	84;"	f
-tryPutFloorItemIDInInv	src/Dodge/Inventory/Add.hs	26;"	f
-tryPutItemInInv	src/Dodge/Inventory/Add.hs	42;"	f
-tryPutItemInInvAt	src/Dodge/Inventory/Add.hs	32;"	f
+tryPutFloorItemIDInInv	src/Dodge/Inventory/Add.hs	20;"	f
+tryPutItemInInv	src/Dodge/Inventory/Add.hs	35;"	f
+tryPutItemInInvAt	src/Dodge/Inventory/Add.hs	26;"	f
 trySeedFromClipboard	src/Dodge/Menu.hs	91;"	f
 trySpin	src/Dodge/Projectile/Update.hs	170;"	f
 trySynthBullet	src/Dodge/Creature/State.hs	165;"	f
@@ -5467,8 +5462,8 @@ updateCamera	src/Dodge/Update/Camera.hs	30;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	120;"	f
 updateCloud	src/Dodge/Update.hs	820;"	f
 updateClouds	src/Dodge/Update.hs	688;"	f
-updateCombinePositioning	src/Dodge/DisplayInventory.hs	37;"	f
-updateCombineSections	src/Dodge/DisplayInventory.hs	44;"	f
+updateCombinePositioning	src/Dodge/DisplayInventory.hs	38;"	f
+updateCombineSections	src/Dodge/DisplayInventory.hs	45;"	f
 updateCreature	src/Dodge/Creature/Update.hs	30;"	f
 updateCreature'	src/Dodge/Creature/Update.hs	38;"	f
 updateCreatureGroups	src/Dodge/Update.hs	554;"	f
@@ -5477,7 +5472,7 @@ updateDebris	src/Dodge/Update.hs	589;"	f
 updateDebrisChunk	src/Dodge/Prop/Moving.hs	16;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	100;"	f
 updateDelayedEvents	src/Dodge/Update.hs	912;"	f
-updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
+updateDisplaySections	src/Dodge/DisplayInventory.hs	117;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
 updateDistortions	src/Dodge/Update.hs	575;"	f
 updateDoor	src/Dodge/Update.hs	326;"	f
@@ -5501,7 +5496,7 @@ updateIMl'	src/Dodge/Update.hs	549;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	79;"	f
 updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	417;"	f
 updateInt2Map	src/Dodge/Zoning/Base.hs	92;"	f
-updateInventoryPositioning	src/Dodge/DisplayInventory.hs	86;"	f
+updateInventoryPositioning	src/Dodge/DisplayInventory.hs	87;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	259;"	f
 updateKeyContinueTerminal	src/Dodge/Update/Input/InGame.hs	386;"	f
 updateKeyInGame	src/Dodge/Update/Input/InGame.hs	411;"	f
@@ -5542,8 +5537,8 @@ updateRightParentSF	src/Dodge/Item/Grammar.hs	180;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	35;"	f
 updateScopeZoom	src/Dodge/Update/Scroll.hs	76;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
-updateSection	src/Dodge/DisplayInventory.hs	265;"	f
-updateSectionsPositioning	src/Dodge/DisplayInventory.hs	244;"	f
+updateSection	src/Dodge/DisplayInventory.hs	266;"	f
+updateSectionsPositioning	src/Dodge/DisplayInventory.hs	245;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	8;"	f
 updateShockwaves	src/Dodge/Update.hs	673;"	f
 updateSingleNodes	src/TreeHelp.hs	97;"	f
@@ -5553,7 +5548,7 @@ updateSpark	src/Dodge/Spark.hs	19;"	f
 updateSparks	src/Dodge/Update.hs	685;"	f
 updateTeslaArc	src/Dodge/Update.hs	599;"	f
 updateTeslaArcs	src/Dodge/Update.hs	596;"	f
-updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
+updateTractorBeam	src/Dodge/TractorBeam/Update.hs	8;"	f
 updateTractorBeams	src/Dodge/Update.hs	670;"	f
 updateTurret	src/Dodge/Machine/Update.hs	50;"	f
 updateUniverse	src/Dodge/Update.hs	79;"	f
@@ -5704,7 +5699,7 @@ wlsNearRect	src/Dodge/Zoning/Wall.hs	46;"	f
 wlsNearSeg	src/Dodge/Zoning/Wall.hs	42;"	f
 wordsBy	src/ListHelp.hs	116;"	f
 worldPosToScreen	src/Dodge/Base/Coordinate.hs	28;"	f
-worldSPic	src/Dodge/Render/ShapePicture.hs	22;"	f
+worldSPic	src/Dodge/Render/ShapePicture.hs	21;"	f
 worldToGenWorld	src/Dodge/LevelGen/LevelStructure.hs	14;"	f
 wpAdd	src/Dodge/Room/RezBox.hs	148;"	f
 wrench1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	546;"	f