Add depth clear/check to fixed layer pictures

ghcidOutput

@@ -1 +1 @@
-All good (594 modules, at 13:03:38)
+All good (594 modules, at 19:58:31)

src/Dodge/Render.hs

@@ -367,15 +367,16 @@ doDrawing' win pdata u = do
     -- draw the overlay
     --glBindFramebuffer GL_FRAMEBUFFER (pdata ^. fboOverlay ._1 . unFBO)
     glDepthFunc GL_ALWAYS
-    --glDepthFunc GL_GEQUAL
     glDepthMask GL_FALSE
-    --glDepthMask GL_TRUE
     glEnable GL_BLEND
     glBlendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
     renderLayer DebugLayer shadV pokeCounts
     glBindBufferBase GL_UNIFORM_BUFFER 0 (pdata ^. matUBO)
     withArray (scaleMatrix (2 / windowXFloat cfig) (2 / windowYFloat cfig))
         $ \ptr -> glNamedBufferSubData (pdata ^. matUBO) 0 64 ptr
+    glDepthFunc GL_GEQUAL
+    glDepthMask GL_TRUE
+    with (-1) $ \ptr -> glClearNamedFramebufferfv 0 GL_DEPTH 0 ptr
     renderLayer FixedCoordLayer shadV pokeCounts
     SDL.glSwapWindow win
 

src/Dodge/Render/HUD.hs

@@ -2,8 +2,6 @@
 
 module Dodge.Render.HUD (
     drawHUD,
-    selNumPos, -- this shoud probably be pushed back here
-    selNumPosCardinal, -- this shoud probably be pushed back here
 ) where
 
 import Control.Applicative

src/Dodge/Render/List.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE LambdaCase #-}
+
 module Dodge.Render.List (
     renderListAt,
     drawList,
@@ -17,13 +18,13 @@ module Dodge.Render.List (
     drawCursorAt,
 ) where
 
-import Dodge.ListDisplayParams
 import qualified Data.IntMap.Strict as IM
 import Data.Maybe
 import Dodge.Base.Window
 import Dodge.Data.CardinalPoint
 import Dodge.Data.Config
 import Dodge.Data.SelectionList
+import Dodge.ListDisplayParams
 import Dodge.ScreenPos
 import Dodge.SelectionSections
 import Geometry
@@ -39,22 +40,24 @@ drawSelectionList ldps cfig sl =
             (ldps ^. ldpScale)
             0
             (makeSelectionListPictures sl)
---            <> drawCursorAt
---                (sl ^. slSelPos)
---                (sl ^. slItems)
---                ldps
---                (BoundaryCursor [North, South])
 
 drawTitleBackground :: Configuration -> Picture
 drawTitleBackground cfig =
     translateScreenPos cfig (fromTopLeft (V2 (subInvX - 5) 75))
-    . polygon . reverse $ rectNSWE 70 0 0 560
+        . polygon
+        . reverse
+        $ rectNSWE 70 0 0 560
 
-drawSelectionListBackground :: ListDisplayParams -> Configuration ->
+drawSelectionListBackground ::
-    Int -- list length
+    ListDisplayParams ->
-    -> Picture
+    Configuration ->
-drawSelectionListBackground ldp cfig l = translateScreenPos cfig (ldp ^. ldpPos) .
+    Int -> -- list length
-    polygon . reverse $ rectNSWE 5 s (-5) e
+    Picture
+drawSelectionListBackground ldp cfig l =
+    translateScreenPos cfig (ldp ^. ldpPos)
+        . polygon
+        . reverse
+        $ rectNSWE 5 s (-5) e
   where
     s = - (5 + fromIntegral l * (20 * ldp ^. ldpScale + ldp ^. ldpVerticalGap))
     e = 555 -- HACK isOverTerminalScreen
@@ -191,7 +194,9 @@ drawListElement ygap s xint yint =
         . scale (s * 0.1) (s * 0.1)
 
 renderListAt :: Float -> Float -> [(String, Color)] -> Picture
-renderListAt tx ty = translate tx (- ty) . drawList . map (\(str, col) -> color col $ text str)
+renderListAt tx ty = translate tx (- ty) 
+    . drawList 
+    . map (\(str, col) -> color col $ text str)
 
 --inverseText :: String -> Color -> Picture
 --inverseText str col =

src/Dodge/Render/Picture.hs

@@ -74,6 +74,7 @@ drawMouseCursor :: Universe -> Picture
 drawMouseCursor u =
     uncurryV translate (u ^. uvWorld . input . mousePos)
         . color white
+        . setDepth 1
         $ mouseCursorType u
 
 mouseCursorType :: Universe -> Picture

src/Dodge/Update/Input/ScreenLayer.hs

@@ -37,14 +37,13 @@ doInputScreenInput s u =
         | ispressed ScancodeEscape = uvScreenLayers %~ tail
         | otherwise = id
 
+-- note mouse over handled by updateMouseContext
 optionScreenUpdate :: Universe -> Universe
 optionScreenUpdate u =
     (uvScreenLayers . ix 0 . scDisplayTime +~ 1)
         . refreshOptionsSelectionList
---        . mouseOverSelectionList
         . optionScreenDefaultEffect
         . mouseClickOptionsList
---        . menuWheelEvents
         . over (uvScreenLayers . _head) (setSelectionListRestriction (u ^. uvConfig))
         $ u
 
@@ -71,23 +70,6 @@ mouseClickOptionsList u = fromMaybe u $ do
                 return $ f u
             _ -> u
 
---mouseOverSelectionList :: Universe -> Universe
---mouseOverSelectionList u = fromMaybe u $ do
---    screen <- u ^? uvScreenLayers . ix 0
---    ldps <- screen ^? scListDisplayParams
---    let ymax = maybe 0 length $ screen ^? scSelectionList . slItems
---    yi <- ldpVerticalSelection (u ^. uvConfig) ldps (u ^. uvWorld . input . mousePos)
---    guard $ mmoving || (_scDisplayTime screen <= 1)
---    let myi = do
---            guard (yi >= 0 && yi < ymax && isselectable yi)
---            return yi
---    return $ u & uvScreenLayers . _head . scSelectionList . slSelPos .~ myi
---  where
---    isselectable yi =
---        fromMaybe False $
---            u ^? uvScreenLayers . _head . scSelectionList . slItems . ix yi . siIsSelectable
---    mmoving = u ^. uvWorld . input . mouseMoving
-
 ldpVerticalSelection :: Configuration -> ListDisplayParams -> Point2 -> Maybe Int
 ldpVerticalSelection cfig ldp (V2 _ y)
     | yupper == ylower = Just yupper

tags

@@ -328,9 +328,9 @@ Color	src/Dodge/Terminal/Color.hs	1;"	m
 Color8	src/Color/Data.hs	35;"	t
 ColorFaction	src/Dodge/Data/Creature/State.hs	41;"	C
 Comatose	src/Dodge/Data/Creature/Perception.hs	53;"	C
-CombClust	src/Dodge/Combine/Graph.hs	15;"	t
+CombClust	src/Dodge/Combine/Graph.hs	18;"	t
-CombEdge	src/Dodge/Combine/Graph.hs	28;"	t
+CombEdge	src/Dodge/Combine/Graph.hs	31;"	t
-CombNode	src/Dodge/Combine/Graph.hs	21;"	t
+CombNode	src/Dodge/Combine/Graph.hs	24;"	t
 CombinableItem	src/Dodge/Data/Combine.hs	5;"	t
 Combinations	src/Dodge/Combine/Combinations.hs	3;"	m
 Combine	src/Dodge/Combine.hs	2;"	m
@@ -408,7 +408,7 @@ CrWlID	src/Dodge/Data/CrWlID.hs	12;"	t
 CrWlID	src/Dodge/Data/CrWlID.hs	6;"	m
 Cr_awareness	src/Dodge/Data/Config.hs	72;"	C
 Cr_status	src/Dodge/Data/Config.hs	71;"	C
-CraftClust	src/Dodge/Combine/Graph.hs	16;"	C
+CraftClust	src/Dodge/Combine/Graph.hs	19;"	C
 CraftType	src/Dodge/Data/Item/Combine.hs	27;"	t
 Craftable	src/Dodge/Item/Craftable.hs	1;"	m
 Create	src/Dodge/Projectile/Create.hs	1;"	m
@@ -695,7 +695,7 @@ FetchItem	src/Dodge/Data/Scenario.hs	11;"	C
 Fixated	src/Dodge/Data/Creature/Perception.hs	62;"	C
 FixedCoordLayer	src/Picture/Data.hs	28;"	C
 FixedRate	src/Dodge/Data/Item/HeldDelay.hs	15;"	C
-FixedSelectionWidth	src/Dodge/Data/SelectionList.hs	47;"	C
+FixedSelectionWidth	src/Dodge/Data/SelectionList.hs	42;"	C
 FlIt	src/Dodge/Data/FloorItem.hs	16;"	C
 Flame	src/Dodge/Data/Flame.hs	14;"	t
 Flame	src/Dodge/Data/Flame.hs	6;"	m
@@ -804,7 +804,7 @@ GoesOnWrist	src/Dodge/Data/Equipment/Misc.hs	15;"	C
 Government	src/Dodge/Data/Scenario.hs	43;"	C
 GovernmentScope	src/Dodge/Data/Scenario.hs	49;"	t
 Grammar	src/Dodge/Item/Grammar.hs	1;"	m
-Graph	src/Dodge/Combine/Graph.hs	2;"	m
+Graph	src/Dodge/Combine/Graph.hs	3;"	m
 Graph	src/Dodge/Graph.hs	2;"	m
 GraphHelp	src/GraphHelp.hs	1;"	m
 GraphVizHelp	src/GraphVizHelp.hs	2;"	m
@@ -870,7 +870,7 @@ Humanoid	src/Dodge/Data/Creature/Misc.hs	65;"	C
 Humanoid	src/Dodge/Humanoid.hs	1;"	m
 HumanoidAI	src/Dodge/Data/Creature/Misc.hs	48;"	t
 ILink	src/Dodge/Data/ComposedItem.hs	52;"	C
-IMSS	src/Dodge/Data/SelectionList.hs	44;"	t
+IMSS	src/Dodge/Data/SelectionList.hs	39;"	t
 INVISIBILITYEQUIPMENT	src/Dodge/Data/Item/Combine.hs	105;"	C
 IRONBAR	src/Dodge/Data/Item/Combine.hs	57;"	C
 ITEMDETECTOR	src/Dodge/Data/Item/Combine.hs	169;"	C
@@ -951,7 +951,7 @@ Item	src/Dodge/Data/Item.hs	31;"	t
 Item	src/Dodge/Data/Item.hs	4;"	m
 Item	src/Dodge/Default/Item.hs	1;"	m
 Item	src/Dodge/Item.hs	3;"	m
-ItemClust	src/Dodge/Combine/Graph.hs	17;"	C
+ItemClust	src/Dodge/Combine/Graph.hs	20;"	C
 ItemDimension	src/Dodge/Data/Item/Misc.hs	13;"	t
 ItemLink	src/Dodge/Data/ComposedItem.hs	52;"	t
 ItemLocation	src/Dodge/Data/Item/Location.hs	27;"	t
@@ -965,7 +965,7 @@ ItemUse	src/Dodge/Data/Item/Use.hs	35;"	t
 ItmInt	src/Dodge/Data/Item/Location.hs	24;"	t
 JGK	src/Control/Foldl/JGK.hs	1;"	m
 JUMPLEGS	src/Dodge/Data/Item/Combine.hs	111;"	C
-JoinClust	src/Dodge/Combine/Graph.hs	18;"	C
+JoinClust	src/Dodge/Combine/Graph.hs	21;"	C
 Just'	src/MaybeHelp.hs	13;"	C
 JustStartedPlaying	src/Sound/Data.hs	25;"	C
 Justify	src/Justify.hs	1;"	m
@@ -1060,7 +1060,7 @@ LinkDecoration	src/Dodge/Debug/LinkDecoration.hs	1;"	m
 LinkTest	src/Dodge/Data/ComposedItem.hs	57;"	t
 LinkUpdate	src/Dodge/Data/ComposedItem.hs	62;"	t
 List	src/Dodge/Combine/List.hs	1;"	m
-List	src/Dodge/Render/List.hs	2;"	m
+List	src/Dodge/Render/List.hs	3;"	m
 ListDisplayParams	src/Dodge/Data/SelectionList.hs	13;"	t
 ListDisplayParams	src/Dodge/ListDisplayParams.hs	1;"	m
 ListHelp	src/ListHelp.hs	1;"	m
@@ -1679,7 +1679,7 @@ ScreenPos	src/Dodge/ScreenPos.hs	1;"	m
 Scroll	src/Dodge/Update/Scroll.hs	1;"	m
 ScrollValue	src/Dodge/ScrollValue.hs	1;"	m
 SecretCabal	src/Dodge/Data/Scenario.hs	44;"	C
-SectionCursor	src/Dodge/Data/SelectionList.hs	29;"	t
+SectionCursor	src/Dodge/Data/SelectionList.hs	24;"	t
 SeeAbove	src/Dodge/Data/Wall.hs	40;"	C
 SeeThrough	src/Dodge/Data/Wall.hs	39;"	C
 SelCloseObject	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	30;"	C
@@ -1687,16 +1687,15 @@ SelNothing	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	28;"	C
 SelectUse	src/Dodge/SelectUse.hs	1;"	m
 Select_creature	src/Dodge/Data/Config.hs	92;"	C
 SelectedItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	23;"	C
-SelectionInfo	src/Dodge/Data/SelectionList.hs	60;"	C
+SelectionInfo	src/Dodge/Data/SelectionList.hs	55;"	C
-SelectionItem	src/Dodge/Data/SelectionList.hs	51;"	t
+SelectionItem	src/Dodge/Data/SelectionList.hs	46;"	t
-SelectionList	src/Dodge/Data/SelectionList.hs	24;"	t
 SelectionList	src/Dodge/Data/SelectionList.hs	4;"	m
 SelectionList	src/Dodge/Default/SelectionList.hs	1;"	m
 SelectionList	src/Dodge/Inventory/SelectionList.hs	3;"	m
 SelectionList	src/Dodge/SelectionList.hs	1;"	m
-SelectionSection	src/Dodge/Data/SelectionList.hs	35;"	t
+SelectionSection	src/Dodge/Data/SelectionList.hs	30;"	t
 SelectionSections	src/Dodge/SelectionSections.hs	1;"	m
-SelectionWidth	src/Dodge/Data/SelectionList.hs	46;"	t
+SelectionWidth	src/Dodge/Data/SelectionList.hs	41;"	t
 SelfTree	src/Dodge/Tree/Compose/Data.hs	12;"	t
 Sensor	src/Dodge/Data/Machine/Sensor.hs	16;"	t
 Sensor	src/Dodge/Data/Machine/Sensor.hs	6;"	m
@@ -2040,7 +2039,7 @@ UseHeld	src/Dodge/Data/Item/Use.hs	36;"	C
 UseHotkey	src/Dodge/Data/Item/Use.hs	44;"	C
 UseItem	src/Dodge/Data/ActionPlan.hs	37;"	C
 UseItem	src/Dodge/Creature/Impulse/UseItem.hs	1;"	m
-UseMaxSelectionItemWidth	src/Dodge/Data/SelectionList.hs	49;"	C
+UseMaxSelectionItemWidth	src/Dodge/Data/SelectionList.hs	44;"	C
 UseMvTargetPos	src/Dodge/Data/ActionPlan.hs	163;"	C
 UseScope	src/Dodge/Data/Item/Use.hs	60;"	C
 UseSelf	src/Dodge/Data/ActionPlan.hs	157;"	C
@@ -2054,7 +2053,7 @@ VBO	src/Shader/Data.hs	81;"	t
 VF	src/Polyhedra/Data.hs	21;"	t
 VIOLET	src/Color/Data.hs	22;"	C
 VOLLEYGUN	src/Dodge/Data/Item/Combine.hs	139;"	C
-VariableSelectionWidth	src/Dodge/Data/SelectionList.hs	48;"	C
+VariableSelectionWidth	src/Dodge/Data/SelectionList.hs	43;"	C
 Vector	src/Geometry/Vector.hs	3;"	m
 Vector3D	src/Geometry/Vector3D.hs	2;"	m
 VertexAttribute	src/Shader/Data.hs	68;"	t
@@ -3017,9 +3016,9 @@ _scrollSmoothing	src/Dodge/Data/World.hs	63;"	f
 _scrollSmoothing	src/Dodge/Data/World.hs	69;"	f
 _scrollTestFloat	src/Dodge/Data/Input.hs	48;"	f
 _scrollTestInt	src/Dodge/Data/Input.hs	49;"	f
-_scurColor	src/Dodge/Data/SelectionList.hs	32;"	f
+_scurColor	src/Dodge/Data/SelectionList.hs	27;"	f
-_scurPos	src/Dodge/Data/SelectionList.hs	30;"	f
+_scurPos	src/Dodge/Data/SelectionList.hs	25;"	f
-_scurSize	src/Dodge/Data/SelectionList.hs	31;"	f
+_scurSize	src/Dodge/Data/SelectionList.hs	26;"	f
 _seenLocations	src/Dodge/Data/LWorld.hs	138;"	f
 _seenWalls	src/Dodge/Data/CWorld.hs	29;"	f
 _selLocation	src/Dodge/Data/LWorld.hs	139;"	f
@@ -3045,17 +3044,17 @@ _shapeHalfSize	src/Shape/Data.hs	18;"	f
 _shapeShader	src/Data/Preload/Render.hs	25;"	f
 _shockwaves	src/Dodge/Data/LWorld.hs	114;"	f
 _shrinkGunStatus	src/Dodge/Data/Item/Params.hs	18;"	f
-_siColor	src/Dodge/Data/SelectionList.hs	56;"	f
+_siColor	src/Dodge/Data/SelectionList.hs	51;"	f
-_siColor	src/Dodge/Data/SelectionList.hs	64;"	f
+_siColor	src/Dodge/Data/SelectionList.hs	59;"	f
-_siHeight	src/Dodge/Data/SelectionList.hs	54;"	f
+_siHeight	src/Dodge/Data/SelectionList.hs	49;"	f
-_siHeight	src/Dodge/Data/SelectionList.hs	62;"	f
+_siHeight	src/Dodge/Data/SelectionList.hs	57;"	f
-_siIsSelectable	src/Dodge/Data/SelectionList.hs	55;"	f
+_siIsSelectable	src/Dodge/Data/SelectionList.hs	50;"	f
-_siIsSelectable	src/Dodge/Data/SelectionList.hs	63;"	f
+_siIsSelectable	src/Dodge/Data/SelectionList.hs	58;"	f
-_siOffX	src/Dodge/Data/SelectionList.hs	57;"	f
+_siOffX	src/Dodge/Data/SelectionList.hs	52;"	f
-_siOffX	src/Dodge/Data/SelectionList.hs	65;"	f
+_siOffX	src/Dodge/Data/SelectionList.hs	60;"	f
-_siPayload	src/Dodge/Data/SelectionList.hs	58;"	f
+_siPayload	src/Dodge/Data/SelectionList.hs	53;"	f
-_siPictures	src/Dodge/Data/SelectionList.hs	53;"	f
+_siPictures	src/Dodge/Data/SelectionList.hs	48;"	f
-_siPictures	src/Dodge/Data/SelectionList.hs	61;"	f
+_siPictures	src/Dodge/Data/SelectionList.hs	56;"	f
 _sideEffect	src/Loop/Data.hs	13;"	f
 _sideImpulses	src/Dodge/Data/ActionPlan.hs	170;"	f
 _sidePush	src/Dodge/Data/Item/Use.hs	87;"	f
@@ -3070,7 +3069,6 @@ _skWidth	src/Dodge/Data/Spark.hs	20;"	f
 _skinHead	src/Dodge/Data/Creature/Misc.hs	66;"	f
 _skinLower	src/Dodge/Data/Creature/Misc.hs	68;"	f
 _skinUpper	src/Dodge/Data/Creature/Misc.hs	67;"	f
-_slItems	src/Dodge/Data/SelectionList.hs	25;"	f
 _smoothScrollAmount	src/Dodge/Data/Input.hs	42;"	f
 _soundAngDist	src/Sound/Data.hs	53;"	f
 _soundChannel	src/Sound/Data.hs	52;"	f
@@ -3086,12 +3084,12 @@ _spPixelOff	src/Dodge/Data/ScreenPos.hs	14;"	f
 _spScreenOff	src/Dodge/Data/ScreenPos.hs	13;"	f
 _sparks	src/Dodge/Data/LWorld.hs	110;"	f
 _spawnEBT	src/Dodge/Data/Bullet.hs	43;"	f
-_ssDescriptor	src/Dodge/Data/SelectionList.hs	41;"	f
+_ssDescriptor	src/Dodge/Data/SelectionList.hs	36;"	f
-_ssIndent	src/Dodge/Data/SelectionList.hs	40;"	f
+_ssIndent	src/Dodge/Data/SelectionList.hs	35;"	f
-_ssItems	src/Dodge/Data/SelectionList.hs	36;"	f
+_ssItems	src/Dodge/Data/SelectionList.hs	31;"	f
-_ssMinSize	src/Dodge/Data/SelectionList.hs	37;"	f
+_ssMinSize	src/Dodge/Data/SelectionList.hs	32;"	f
-_ssOffset	src/Dodge/Data/SelectionList.hs	38;"	f
+_ssOffset	src/Dodge/Data/SelectionList.hs	33;"	f
-_ssShownItems	src/Dodge/Data/SelectionList.hs	39;"	f
+_ssShownItems	src/Dodge/Data/SelectionList.hs	34;"	f
 _strength	src/Dodge/Data/Creature/Misc.hs	21;"	f
 _strideAmount	src/Dodge/Data/Creature/Stance.hs	22;"	f
 _strideLength	src/Dodge/Data/Creature/Stance.hs	16;"	f
@@ -3192,8 +3190,8 @@ _uaParams	src/Dodge/Data/Item/Use.hs	54;"	f
 _ubMod	src/Dodge/Data/Item/Use.hs	66;"	f
 _uequipEffect	src/Dodge/Data/Item/Use.hs	48;"	f
 _uequipEffect	src/Dodge/Data/Item/Use.hs	52;"	f
-_unCombEdge	src/Dodge/Combine/Graph.hs	28;"	f
+_unCombEdge	src/Dodge/Combine/Graph.hs	31;"	f
-_unCombNode	src/Dodge/Combine/Graph.hs	21;"	f
+_unCombNode	src/Dodge/Combine/Graph.hs	24;"	f
 _unFBO	src/Shader/Data.hs	57;"	f
 _unNInt	src/NewInt.hs	15;"	f
 _unNIntMap	src/NewInt.hs	18;"	f
@@ -3338,14 +3336,14 @@ addRandomGirderEW	src/Dodge/Room/Girder.hs	9;"	f
 addRandomGirderFrom	src/Dodge/Room/Girder.hs	16;"	f
 addRoomLinkDecorations	src/Dodge/Debug/LinkDecoration.hs	19;"	f
 addRoomPolyDecorations	src/Dodge/Debug/LinkDecoration.hs	14;"	f
-addSideEffect	src/Dodge/Concurrent.hs	32;"	f
+addSideEffect	src/Dodge/Concurrent.hs	30;"	f
 addSouthPillars	src/Dodge/Room/LongDoor.hs	88;"	f
 addTermSignal	src/Dodge/Event/Input.hs	34;"	f
 addToTrunk	src/TreeHelp.hs	156;"	f
 addWarningTerminal	src/Dodge/Room/Warning.hs	37;"	f
 addZ	src/Geometry/Vector3D.hs	89;"	f
 adjustIMZone	src/Dodge/Base.hs	77;"	f
-advanceScrollAmount	src/Dodge/Update.hs	469;"	f
+advanceScrollAmount	src/Dodge/Update.hs	468;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	29;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	45;"	f
 aimDelaySweep	src/Dodge/Render/Picture.hs	181;"	f
@@ -3490,7 +3488,7 @@ basicMuzFlare	src/Dodge/HeldUse.hs	199;"	f
 basicTerminal	src/Dodge/Terminal.hs	36;"	f
 battery	src/Dodge/Item/Ammo.hs	96;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	56;"	f
-belowNumX	src/Dodge/Combine/Graph.hs	76;"	f
+belowNumX	src/Dodge/Combine/Graph.hs	85;"	f
 beltMag	src/Dodge/Item/Ammo.hs	54;"	f
 bfsNodePoints	src/Dodge/Path.hs	58;"	f
 bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	216;"	f
@@ -3508,7 +3506,7 @@ blockLine	src/Dodge/Placement/Instance/Wall.hs	41;"	f
 blockPillar	src/Dodge/Room/Pillar.hs	17;"	f
 blockedCorridor	src/Dodge/Room/RoadBlock.hs	71;"	f
 blockedCorridorCloseBlocks	src/Dodge/Room/RoadBlock.hs	78;"	f
-blockingLoad	src/Dodge/Concurrent.hs	38;"	f
+blockingLoad	src/Dodge/Concurrent.hs	36;"	f
 blood1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	466;"	f
 blood2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	364;"	f
 blood3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	490;"	f
@@ -3546,7 +3544,6 @@ bufferPokedVBO	src/Shader/Bind.hs	19;"	f
 bufferShaderLayers	src/Shader/Bind.hs	36;"	f
 bulletBeltBracer	src/Dodge/Item/Equipment.hs	80;"	f
 bulletBeltPack	src/Dodge/Item/Equipment.hs	72;"	f
-bulletCombinations	src/Dodge/Combine/Graph.hs	34;"	f
 bulletModule	src/Dodge/Item/Scope.hs	35;"	f
 bulletPayloadModule	src/Dodge/Item/Scope.hs	44;"	f
 bulletSynthesizer	src/Dodge/Item/Ammo.hs	124;"	f
@@ -3590,7 +3587,7 @@ chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	46;"	f
 checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	99;"	f
 checkConnection	src/Dodge/Inventory.hs	233;"	f
 checkDeath	src/Dodge/Creature/State.hs	75;"	f
-checkEndGame	src/Dodge/Update.hs	756;"	f
+checkEndGame	src/Dodge/Update.hs	755;"	f
 checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
@@ -3601,7 +3598,7 @@ checkWallLeft	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	29;"	f
 checkWallRight	src/Dodge/LevelGen/StaticWalls.hs	54;"	f
 checkWallRight	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	59;"	f
 chemFuelPouch	src/Dodge/Item/Ammo.hs	110;"	f
-chooseCursorBorders	src/Dodge/Render/List.hs	157;"	f
+chooseCursorBorders	src/Dodge/Render/List.hs	160;"	f
 chooseEquipmentPosition	src/Dodge/Inventory/RBList.hs	36;"	f
 chooseFootSound	src/Dodge/Creature/State/WalkCycle.hs	39;"	f
 chooseFreeSite	src/Dodge/Inventory/RBList.hs	42;"	f
@@ -3617,7 +3614,7 @@ circle	src/Picture/Base.hs	180;"	f
 circleDecoration	src/Dodge/Placement/TopDecoration.hs	56;"	f
 circleSolid	src/Picture/Base.hs	164;"	f
 circleSolidCol	src/Picture/Base.hs	168;"	f
-clClSpringVel	src/Dodge/Update.hs	809;"	f
+clClSpringVel	src/Dodge/Update.hs	808;"	f
 clZoneSize	src/Dodge/Zone/Size.hs	3;"	f
 clZoneSize	src/Dodge/Zoning/Cloud.hs	21;"	f
 clampPath	src/Dodge/Room/Procedural.hs	166;"	f
@@ -3637,27 +3634,26 @@ clipZoom	src/Dodge/Update/Camera.hs	215;"	f
 clockCycle	src/Dodge/Clock.hs	9;"	f
 closeObjEq	src/Dodge/Inventory/CloseObject.hs	15;"	f
 closeObjPos	src/Dodge/Inventory/CloseObject.hs	10;"	f
-closeObjectInfo	src/Dodge/Render/HUD.hs	204;"	f
+closeObjectInfo	src/Dodge/Render/HUD.hs	200;"	f
 closeObjectToSelectionItem	src/Dodge/Inventory/SelectionList.hs	54;"	f
 closeObjectToTextPictures	src/Dodge/Inventory/SelectionList.hs	68;"	f
 closestCreatureID	src/Dodge/Debug.hs	92;"	f
 closestPointOnLine	src/Geometry/Intersect.hs	251;"	f
 closestPointOnLineParam	src/Geometry/Intersect.hs	267;"	f
 closestPointOnSeg	src/Geometry/Intersect.hs	282;"	f
-cloudEffect	src/Dodge/Update.hs	779;"	f
+cloudEffect	src/Dodge/Update.hs	778;"	f
 cloudPoisonDamage	src/Dodge/Update/Cloud.hs	9;"	f
 clsNearCirc	src/Dodge/Zoning/Cloud.hs	18;"	f
 clsNearPoint	src/Dodge/Zoning/Cloud.hs	9;"	f
 clsNearRect	src/Dodge/Zoning/Cloud.hs	15;"	f
 clsNearSeg	src/Dodge/Zoning/Cloud.hs	12;"	f
-clusterFormatting	src/Dodge/Combine/Graph.hs	112;"	f
+clusterFormatting	src/Dodge/Combine/Graph.hs	124;"	f
-clusterFunc	src/Dodge/Combine/Graph.hs	106;"	f
+clusterFunc	src/Dodge/Combine/Graph.hs	118;"	f
 cogRaised	src/Dodge/Creature/Perception.hs	101;"	f
 colCrWall	src/Dodge/WallCreatureCollisions.hs	26;"	f
 colCrsWalls	src/Dodge/WallCreatureCollisions.hs	17;"	f
 colSpark	src/Dodge/Spark.hs	47;"	f
 colSparkRandDir	src/Dodge/Spark.hs	101;"	f
-colStrToSelItem	src/Dodge/Menu/Option.hs	95;"	f
 collectDamageTypes	src/Dodge/Damage.hs	32;"	f
 collideCircWalls	src/Dodge/Base/Collide.hs	149;"	f
 collidePoint	src/Dodge/Base/Collide.hs	48;"	f
@@ -3667,13 +3663,13 @@ collisionDebugItem	src/Dodge/Debug.hs	31;"	f
 color	src/Picture/Base.hs	108;"	f
 colorLamp	src/Dodge/Creature/Lamp.hs	10;"	f
 colorSH	src/Shape.hs	235;"	f
-combinationsDotGraph	src/Dodge/Combine/Graph.hs	85;"	f
+combinationsDotGraph	src/Dodge/Combine/Graph.hs	94;"	f
-combinationsGraph	src/Dodge/Combine/Graph.hs	66;"	f
+combinationsGraph	src/Dodge/Combine/Graph.hs	73;"	f
 combinationsOf	src/Multiset.hs	46;"	f
 combinationsTrie	src/Dodge/Combine.hs	41;"	f
 combineAwareness	src/Dodge/Creature/Perception.hs	109;"	f
 combineFloors	src/Dodge/Room/Procedural.hs	172;"	f
-combineInventoryExtra	src/Dodge/Render/HUD.hs	314;"	f
+combineInventoryExtra	src/Dodge/Render/HUD.hs	310;"	f
 combineItemListYouX	src/Dodge/Combine.hs	33;"	f
 combineList	src/Dodge/Combine.hs	20;"	f
 combineRooms	src/Dodge/Room/Procedural.hs	152;"	f
@@ -3690,7 +3686,7 @@ compileAndCheckShader	src/Shader/Compile.hs	277;"	f
 composeNode	src/Dodge/Tree/Compose.hs	76;"	f
 composeTree	src/Dodge/Tree/Compose.hs	46;"	f
 computerBeepingS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	472;"	f
-conEffects	src/Dodge/Concurrent.hs	17;"	f
+conEffects	src/Dodge/Concurrent.hs	13;"	f
 concBall	src/Dodge/WorldEvent/SpawnParticle.hs	27;"	f
 connectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	532;"	f
 connectionBlurb	src/Dodge/Terminal.hs	103;"	f
@@ -3715,7 +3711,7 @@ crAdd	src/Dodge/Room/RezBox.hs	104;"	f
 crAwayFromPost	src/Dodge/Creature/Test.hs	77;"	f
 crBlips	src/Dodge/RadarSweep.hs	69;"	f
 crCanSeeCr	src/Dodge/Creature/Test.hs	48;"	f
-crCrSpring	src/Dodge/Update.hs	827;"	f
+crCrSpring	src/Dodge/Update.hs	826;"	f
 crCurrentEquipment	src/Dodge/Creature/Statistics.hs	28;"	f
 crDisplayAwareness	src/Dodge/Creature/Picture/Awareness.hs	37;"	f
 crDisplayVigilance	src/Dodge/Creature/Picture/Awareness.hs	51;"	f
@@ -3736,7 +3732,7 @@ crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	35;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	84;"	f
 crSafeDistFromTarg	src/Dodge/Creature/Test.hs	67;"	f
 crSetRoots	src/Dodge/Inventory/Location.hs	48;"	f
-crSpring	src/Dodge/Update.hs	822;"	f
+crSpring	src/Dodge/Update.hs	821;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	72;"	f
 crUpdate	src/Dodge/Creature/State.hs	62;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	61;"	f
@@ -3799,13 +3795,13 @@ cycleEnum	src/Dodge/Menu/OptionType.hs	22;"	f
 cycleGT	src/IntMapHelp.hs	93;"	f
 cycleL	src/DoubleStack.hs	28;"	f
 cycleLT	src/IntMapHelp.hs	96;"	f
-cycleOptions	src/Dodge/Menu/Option.hs	84;"	f
+cycleOptions	src/Dodge/Menu/Option.hs	78;"	f
 cycleR	src/DoubleStack.hs	32;"	f
 cylinderIndices	src/Shader/Poke.hs	374;"	f
 cylinderOnSeg	src/Geometry.hs	125;"	f
 cylinderPoly	src/Shape.hs	86;"	f
 cylinderRoundIndices	src/Shader/Poke.hs	381;"	f
-dShadCol	src/Dodge/Render/List.hs	214;"	f
+dShadCol	src/Dodge/Render/List.hs	217;"	f
 damThingHitWith	src/Dodge/WorldEvent/Damage.hs	10;"	f
 damToExpBarrel	src/Dodge/Barreloid.hs	57;"	f
 damageBlocksBy	src/Dodge/Wall/Damage.hs	36;"	f
@@ -3827,7 +3823,7 @@ damageWlCircle	src/Dodge/DamageCircle.hs	26;"	f
 dampField	src/Dodge/Magnet.hs	8;"	f
 damsToExpBarrel	src/Dodge/Barreloid.hs	50;"	f
 dark	src/Color.hs	108;"	f
-darkenBackground	src/Dodge/Render/MenuScreen.hs	53;"	f
+darkenBackground	src/Dodge/Render/MenuScreen.hs	54;"	f
 dbArg	src/Dodge/Base.hs	143;"	f
 dbArgChain	src/Dodge/Base.hs	148;"	f
 deZoneIX	src/Dodge/Zoning/Base.hs	86;"	f
@@ -3987,7 +3983,7 @@ displayConfig	src/Dodge/Menu.hs	196;"	f
 displayControls	src/Dodge/Menu.hs	206;"	f
 displayFrameTicks	src/Dodge/Render/Picture.hs	39;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	197;"	f
-displayTerminalLineString	src/Dodge/Update.hs	498;"	f
+displayTerminalLineString	src/Dodge/Update.hs	497;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -4071,7 +4067,7 @@ doWdCrCr	src/Dodge/CreatureEffect.hs	12;"	f
 doWdP2f	src/Dodge/WdP2f.hs	12;"	f
 doWdWd	src/Dodge/WorldEffect.hs	26;"	f
 doWeaponRepetitions	src/Dodge/HeldUse.hs	56;"	f
-doWorldEvents	src/Dodge/Update.hs	480;"	f
+doWorldEvents	src/Dodge/Update.hs	479;"	f
 doWorldPos	src/Dodge/WorldPos.hs	7;"	f
 door	src/Dodge/Room/Door.hs	13;"	f
 doorBetween	src/Dodge/Placement/Instance/Door.hs	39;"	f
@@ -4100,7 +4096,7 @@ drawCircFlare	src/Dodge/Flare.hs	25;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
 drawCombFilter	src/Dodge/Render/Picture.hs	162;"	f
 drawCombFilterJump	src/Dodge/Render/Picture.hs	147;"	f
-drawCombineInventory	src/Dodge/Render/HUD.hs	163;"	f
+drawCombineInventory	src/Dodge/Render/HUD.hs	160;"	f
 drawConcurrentMessage	src/Dodge/Render/Picture.hs	62;"	f
 drawCorpse	src/Dodge/Corpse/Draw.hs	6;"	f
 drawCrInfo	src/Dodge/Debug/Picture.hs	342;"	f
@@ -4108,38 +4104,38 @@ drawCreature	src/Dodge/Render/ShapePicture.hs	41;"	f
 drawCreatureDisplayTexts	src/Dodge/Debug/Picture.hs	165;"	f
 drawCross	src/Dodge/Render/Label.hs	24;"	f
 drawCrossCol	src/Dodge/Render/Label.hs	21;"	f
-drawCursorAt	src/Dodge/Render/List.hs	67;"	f
+drawCursorAt	src/Dodge/Render/List.hs	70;"	f
 drawDDATest	src/Dodge/Debug/Picture.hs	256;"	f
-drawDISelections	src/Dodge/Render/HUD.hs	146;"	f
+drawDISelections	src/Dodge/Render/HUD.hs	143;"	f
 drawDoorPaths	src/Dodge/Debug/Picture.hs	217;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	81;"	f
 drawEmptySet	src/Dodge/Render/Picture.hs	102;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	8;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	140;"	f
-drawExamineInventory	src/Dodge/Render/HUD.hs	177;"	f
+drawExamineInventory	src/Dodge/Render/HUD.hs	174;"	f
 drawFarWallDetect	src/Dodge/Debug/Picture.hs	234;"	f
 drawFlame	src/Dodge/Flame/Draw.hs	7;"	f
 drawFlamelet	src/Dodge/EnergyBall/Draw.hs	23;"	f
 drawFlare	src/Dodge/Flare.hs	12;"	f
-drawFooterText	src/Dodge/Render/MenuScreen.hs	73;"	f
+drawFooterText	src/Dodge/Render/MenuScreen.hs	74;"	f
 drawForceField	src/Dodge/Wall/Draw.hs	11;"	f
 drawGapPlus	src/Dodge/Render/Picture.hs	172;"	f
 drawGib	src/Dodge/Prop/Draw.hs	28;"	f
-drawHP	src/Dodge/Render/HUD.hs	56;"	f
+drawHP	src/Dodge/Render/HUD.hs	53;"	f
-drawHUD	src/Dodge/Render/HUD.hs	48;"	f
+drawHUD	src/Dodge/Render/HUD.hs	45;"	f
 drawInputMenu	src/Dodge/Render/MenuScreen.hs	21;"	f
 drawInspectWall	src/Dodge/Debug/Picture.hs	209;"	f
 drawInspectWalls	src/Dodge/Debug/Picture.hs	197;"	f
-drawInventory	src/Dodge/Render/HUD.hs	65;"	f
+drawInventory	src/Dodge/Render/HUD.hs	62;"	f
 drawLabCrossCol	src/Dodge/Render/Label.hs	8;"	f
 drawLampCover	src/Dodge/Prop/Draw.hs	44;"	f
 drawLaser	src/Dodge/Laser/Draw.hs	6;"	f
 drawLightSource	src/Dodge/LightSource/Draw.hs	7;"	f
 drawLinearShockwave	src/Dodge/LinearShockwave/Draw.hs	10;"	f
-drawList	src/Dodge/Render/List.hs	208;"	f
+drawList	src/Dodge/Render/List.hs	211;"	f
-drawListElement	src/Dodge/Render/List.hs	188;"	f
+drawListElement	src/Dodge/Render/List.hs	191;"	f
-drawListYgapScaleYoff	src/Dodge/Render/List.hs	95;"	f
+drawListYgapScaleYoff	src/Dodge/Render/List.hs	98;"	f
-drawListYoff	src/Dodge/Render/List.hs	92;"	f
+drawListYoff	src/Dodge/Render/List.hs	95;"	f
 drawMachine	src/Dodge/Machine/Draw.hs	17;"	f
 drawMapWall	src/Dodge/Render/HUD/Carte.hs	33;"	f
 drawMenuClick	src/Dodge/Render/Picture.hs	122;"	f
@@ -4147,7 +4143,7 @@ drawMenuCursor	src/Dodge/Render/Picture.hs	135;"	f
 drawMenuOrHUD	src/Dodge/Render/Picture.hs	57;"	f
 drawMenuScreen	src/Dodge/Render/MenuScreen.hs	15;"	f
 drawMouseCursor	src/Dodge/Render/Picture.hs	73;"	f
-drawMouseOver	src/Dodge/Render/HUD.hs	116;"	f
+drawMouseOver	src/Dodge/Render/HUD.hs	113;"	f
 drawMousePosition	src/Dodge/Debug/Picture.hs	319;"	f
 drawMovingShape	src/Dodge/Prop/Draw.hs	67;"	f
 drawMovingShapeCol	src/Dodge/Prop/Draw.hs	73;"	f
@@ -4161,16 +4157,16 @@ drawPointLabel	src/Dodge/Render/Label.hs	13;"	f
 drawProjectile	src/Dodge/Projectile/Draw.hs	13;"	f
 drawProp	src/Dodge/Prop/Draw.hs	15;"	f
 drawProp'	src/Dodge/Prop/Draw.hs	12;"	f
-drawRBOptions	src/Dodge/Render/HUD.hs	222;"	f
+drawRBOptions	src/Dodge/Render/HUD.hs	218;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	7;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	30;"	f
 drawReturn	src/Dodge/Render/Picture.hs	108;"	f
-drawRootCursor	src/Dodge/Render/HUD.hs	84;"	f
+drawRootCursor	src/Dodge/Render/HUD.hs	81;"	f
 drawSSCursor	src/Dodge/SelectionSections/Draw.hs	30;"	f
 drawSSMultiCursor	src/Dodge/SelectionSections/Draw.hs	41;"	f
 drawSelect	src/Dodge/Render/Picture.hs	151;"	f
-drawSelectionList	src/Dodge/Render/List.hs	34;"	f
+drawSelectionList	src/Dodge/Render/List.hs	35;"	f
-drawSelectionListBackground	src/Dodge/Render/List.hs	53;"	f
+drawSelectionListBackground	src/Dodge/Render/List.hs	51;"	f
 drawSelectionSections	src/Dodge/SelectionSections/Draw.hs	17;"	f
 drawSensor	src/Dodge/Machine/Draw.hs	24;"	f
 drawShader	src/Shader.hs	27;"	f
@@ -4180,17 +4176,17 @@ drawShell	src/Dodge/Projectile/Draw.hs	20;"	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	155;"	f
+drawSubInventory	src/Dodge/Render/HUD.hs	152;"	f
 drawSweep	src/Dodge/Render/Picture.hs	188;"	f
 drawSwitch	src/Dodge/Button/Draw.hs	15;"	f
 drawSwitchWire	src/Dodge/LevelGen/Switch.hs	28;"	f
 drawTargetLaser	src/Dodge/Particle/Draw.hs	6;"	f
 drawTargeting	src/Dodge/Targeting/Draw.hs	13;"	f
-drawTerminalDisplay	src/Dodge/Render/HUD.hs	351;"	f
+drawTerminalDisplay	src/Dodge/Render/HUD.hs	347;"	f
 drawTeslaArc	src/Dodge/Tesla/Arc/Draw.hs	7;"	f
 drawText	src/Picture/Base.hs	220;"	f
-drawTitle	src/Dodge/Render/MenuScreen.hs	56;"	f
+drawTitle	src/Dodge/Render/MenuScreen.hs	57;"	f
-drawTitleBackground	src/Dodge/Render/List.hs	48;"	f
+drawTitleBackground	src/Dodge/Render/List.hs	44;"	f
 drawTractorBeam	src/Dodge/TractorBeam/Draw.hs	7;"	f
 drawTurret	src/Dodge/Machine/Draw.hs	65;"	f
 drawVerticalLampCover	src/Dodge/Prop/Draw.hs	59;"	f
@@ -4217,9 +4213,9 @@ dtToLRAdj	src/Dodge/DoubleTree.hs	104;"	f
 dtToLRAdjEither	src/Dodge/DoubleTree.hs	114;"	f
 dtToRootIntMap'	src/Dodge/DoubleTree.hs	92;"	f
 dtToUpDownAdj	src/Dodge/DoubleTree.hs	96;"	f
-dummyMenuOption	src/Dodge/Menu/Option.hs	81;"	f
+dummyMenuOption	src/Dodge/Menu/Option.hs	75;"	f
 ebFlicker	src/Dodge/EnergyBall.hs	94;"	f
-edgeFormatting	src/Dodge/Combine/Graph.hs	118;"	f
+edgeFormatting	src/Dodge/Combine/Graph.hs	130;"	f
 edgeToPic	src/Dodge/Debug/Picture.hs	393;"	f
 effectWhileAttached	src/Dodge/ItEffect.hs	27;"	f
 ejectS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	488;"	f
@@ -4234,7 +4230,7 @@ encircleP	src/Dodge/Creature/Boid.hs	27;"	f
 enterCombineInv	src/Dodge/DisplayInventory.hs	281;"	f
 eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	6;"	f
-equipAllocString	src/Dodge/Render/HUD.hs	280;"	f
+equipAllocString	src/Dodge/Render/HUD.hs	276;"	f
 equipInfo	src/Dodge/Item/Info.hs	103;"	f
 equipItemSPic	src/Dodge/Item/Draw/SPic.hs	65;"	f
 equipPosition	src/Dodge/Item/Draw.hs	30;"	f
@@ -4327,7 +4323,7 @@ flockPointTarget	src/Dodge/Creature/Boid.hs	199;"	f
 flockPointTargetR	src/Dodge/Creature/Boid.hs	266;"	f
 flockToPointUsing	src/Dodge/Creature/Boid.hs	214;"	f
 flockToPointUsing'	src/Dodge/Creature/Boid.hs	227;"	f
-floorItemPickupInfo	src/Dodge/Render/HUD.hs	209;"	f
+floorItemPickupInfo	src/Dodge/Render/HUD.hs	205;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	119;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
@@ -4400,18 +4396,18 @@ getDamageCoding	src/Dodge/Terminal.hs	178;"	f
 getDistortions	src/Dodge/Render.hs	382;"	f
 getEquipmentAllocation	src/Dodge/Inventory/RBList.hs	47;"	f
 getItem	src/Dodge/Item/Location.hs	15;"	f
-getLDPWidth	src/Dodge/Render/List.hs	87;"	f
+getLDPWidth	src/Dodge/Render/List.hs	90;"	f
 getLaserColor	src/Dodge/HeldUse.hs	196;"	f
 getLaserDamage	src/Dodge/HeldUse.hs	193;"	f
 getLaserPhaseV	src/Dodge/HeldUse.hs	190;"	f
 getLinksOfType	src/Dodge/RoomLink.hs	39;"	f
 getMaxLinesTM	src/Dodge/Terminal/Type.hs	11;"	f
-getMouseInvSel	src/Dodge/Render/HUD.hs	137;"	f
+getMouseInvSel	src/Dodge/Render/HUD.hs	134;"	f
 getNodePos	src/Dodge/Path.hs	31;"	f
 getPretty	src/AesonHelp.hs	7;"	f
 getPrettyShort	src/AesonHelp.hs	10;"	f
 getPromptTM	src/Dodge/Terminal/Type.hs	8;"	f
-getRootItemBounds	src/Dodge/Render/HUD.hs	107;"	f
+getRootItemBounds	src/Dodge/Render/HUD.hs	104;"	f
 getSensor	src/Dodge/Terminal.hs	190;"	f
 getSmoothScrollValue	src/Dodge/SmoothScroll.hs	17;"	f
 getSplitString	src/Dodge/Debug/Terminal.hs	123;"	f
@@ -4477,7 +4473,7 @@ handleMouseWheelEvent	src/Dodge/Event/Input.hs	58;"	f
 handleResizeEvent	src/Dodge/Event.hs	53;"	f
 handleTextInput	src/Dodge/Event/Input.hs	18;"	f
 handleWindowMoveEvent	src/Dodge/Event.hs	44;"	f
-hardQuit	src/Dodge/Concurrent.hs	35;"	f
+hardQuit	src/Dodge/Concurrent.hs	33;"	f
 hasButtonLOS	src/Dodge/Base/Collide.hs	207;"	f
 hasFrontArmour	src/Dodge/Creature/Test.hs	110;"	f
 hasLOS	src/Dodge/Base/Collide.hs	200;"	f
@@ -4555,8 +4551,8 @@ initialRoomTree	src/Dodge/Floor.hs	19;"	f
 initialWorld	src/Dodge/Initialisation.hs	16;"	f
 initialisePlaying	src/Sound.hs	76;"	f
 initializeGLState	src/Preload/Render.hs	213;"	f
-initializeOptionMenu	src/Dodge/Menu/Option.hs	14;"	f
+initializeOptionMenu	src/Dodge/Menu/Option.hs	17;"	f
-initializeOptionMenuBO	src/Dodge/Menu/Option.hs	29;"	f
+initializeOptionMenuBO	src/Dodge/Menu/Option.hs	33;"	f
 initializeTexture2D	src/Framebuffer/Update.hs	221;"	f
 inorderNumberTree	src/TreeHelp.hs	189;"	f
 inputFocus	src/Dodge/InputFocus.hs	57;"	f
@@ -4596,7 +4592,7 @@ invAdj	src/Dodge/Item/Grammar.hs	188;"	f
 invCursorParams	src/Dodge/ListDisplayParams.hs	38;"	f
 invDimColor	src/Dodge/DisplayInventory.hs	191;"	f
 invDisplayParams	src/Dodge/ListDisplayParams.hs	32;"	f
-invHead	src/Dodge/Render/HUD.hs	388;"	f
+invHead	src/Dodge/Render/HUD.hs	384;"	f
 invLDT	src/Dodge/Item/Grammar.hs	171;"	f
 invRootMap	src/Dodge/Item/Grammar.hs	180;"	f
 invRootTrees	src/Dodge/Item/Grammar.hs	210;"	f
@@ -4607,8 +4603,8 @@ invSideEff	src/Dodge/Creature/State.hs	162;"	f
 invSize	src/Dodge/Inventory/CheckSlots.hs	41;"	f
 invTrees	src/Dodge/Item/Grammar.hs	198;"	f
 invTrees'	src/Dodge/Item/Grammar.hs	202;"	f
-inventoryExtra	src/Dodge/Render/HUD.hs	289;"	f
+inventoryExtra	src/Dodge/Render/HUD.hs	285;"	f
-inventoryExtraH	src/Dodge/Render/HUD.hs	300;"	f
+inventoryExtraH	src/Dodge/Render/HUD.hs	296;"	f
 inventoryX	src/Dodge/Creature.hs	115;"	f
 inverseSelBoundaryDown	src/Dodge/SelectionSections.hs	256;"	f
 inverseSelBoundaryUp	src/Dodge/SelectionSections.hs	243;"	f
@@ -4638,7 +4634,7 @@ isLeftOfA	src/Geometry.hs	181;"	f
 isNothing'	src/MaybeHelp.hs	33;"	f
 isOnSeg	src/Geometry.hs	240;"	f
 isOutLnk	src/Dodge/PlacementSpot.hs	164;"	f
-isOverTerminalScreen	src/Dodge/Update.hs	447;"	f
+isOverTerminalScreen	src/Dodge/Update.hs	446;"	f
 isPutID	src/Dodge/Placement/Instance/Wall.hs	129;"	f
 isRHS	src/Geometry/LHS.hs	24;"	f
 isUnusedLnk	src/Dodge/PlacementSpot.hs	61;"	f
@@ -4653,7 +4649,7 @@ itUseCharge	src/Dodge/Item/Weapon/TriggerType.hs	82;"	f
 itemBaseName	src/Dodge/Item/Display.hs	44;"	f
 itemBlips	src/Dodge/RadarSweep.hs	75;"	f
 itemCombinations	src/Dodge/Combine/Combinations.hs	54;"	f
-itemCombinationsEdges	src/Dodge/Combine/Graph.hs	54;"	f
+itemCombinationsEdges	src/Dodge/Combine/Graph.hs	60;"	f
 itemDetectorEffect	src/Dodge/HeldUse.hs	231;"	f
 itemDisplay	src/Dodge/Item/Display.hs	15;"	f
 itemDisplayPad	src/Dodge/Item/Display.hs	28;"	f
@@ -4727,7 +4723,7 @@ launcherCrit	src/Dodge/Creature/LauncherCrit.hs	12;"	f
 launcherPic	src/Dodge/Item/Draw/SPic.hs	331;"	f
 launcherX	src/Dodge/Item/Held/Launcher.hs	32;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
-ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	91;"	f
+ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	73;"	f
 ldtIL	src/Dodge/DoubleTree.hs	149;"	f
 ldtPropagate	src/Dodge/DoubleTree.hs	20;"	f
 ldtPropagateFold	src/Dodge/DoubleTree.hs	29;"	f
@@ -4767,7 +4763,7 @@ linksAndPath'	src/Dodge/Room/Path.hs	44;"	f
 linksOnPath	src/Dodge/Room/CheckConsistency.hs	7;"	f
 listConfig	src/Dodge/Menu.hs	199;"	f
 listControls	src/Dodge/Menu.hs	212;"	f
-listCursorChooseBorderScale	src/Dodge/Render/List.hs	136;"	f
+listCursorChooseBorderScale	src/Dodge/Render/List.hs	139;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	188;"	f
 listSelectionColorPicture	src/Dodge/DisplayInventory.hs	273;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
@@ -4775,7 +4771,7 @@ llleft	src/Dodge/Item/Grammar.hs	107;"	f
 llright	src/Dodge/Item/Grammar.hs	114;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	121;"	f
-lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	377;"	f
+lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	373;"	f
 lnkPosDir	src/Dodge/RoomLink.hs	97;"	f
 loadDodgeConfig	src/Dodge/Config/Load.hs	9;"	f
 loadMusic	src/Dodge/SoundLogic/LoadSound.hs	21;"	f
@@ -4784,7 +4780,7 @@ loadSaveSlot	src/Dodge/Save.hs	74;"	f
 loadSeed	src/Dodge/LoadSeed.hs	7;"	f
 loadSound	src/Dodge/SoundLogic/LoadSound.hs	11;"	f
 loadSounds	src/Dodge/SoundLogic/LoadSound.hs	16;"	f
-loadingScreen	src/Dodge/Menu/Loading.hs	7;"	f
+loadingScreen	src/Dodge/Menu/Loading.hs	8;"	f
 loadme	src/Dodge/Debug/Terminal.hs	136;"	f
 locGoHelp	src/Dodge/DoubleTree.hs	220;"	f
 locGoLeft	src/Dodge/DoubleTree.hs	209;"	f
@@ -4864,13 +4860,12 @@ makeGasCloud	src/Dodge/WorldEvent/SpawnParticle.hs	80;"	f
 makeGrid	src/Grid.hs	46;"	f
 makeIntInterval	src/Dodge/Zoning/Base.hs	33;"	f
 makeMuzzleFlare	src/Dodge/HeldUse.hs	145;"	f
-makeOptionsSelectionList	src/Dodge/Menu/Option.hs	46;"	f
 makeParagraph	src/Justify.hs	6;"	f
 makePathBetween	src/Dodge/Path.hs	35;"	f
 makePathBetweenPs	src/Dodge/Path.hs	54;"	f
 makePoisonExplosionAt	src/Dodge/WorldEvent/Explosion.hs	26;"	f
 makeRect	src/Grid.hs	82;"	f
-makeSelectionListPictures	src/Dodge/Render/List.hs	62;"	f
+makeSelectionListPictures	src/Dodge/Render/List.hs	65;"	f
 makeShaderEBO	src/Shader/Compile.hs	53;"	f
 makeShaderProgram	src/Shader/Compile.hs	241;"	f
 makeShaderUsingVAO	src/Shader/Compile.hs	146;"	f
@@ -4896,9 +4891,9 @@ makeTlsTimeRadColPos	src/Dodge/LightSource.hs	88;"	f
 makeTypeCraft	src/Dodge/Item/Craftable.hs	13;"	f
 makeTypeCraftNum	src/Dodge/Item/Craftable.hs	7;"	f
 mapOverlay	src/Dodge/Render/HUD/Carte.hs	24;"	f
-markWallSeen	src/Dodge/Update.hs	741;"	f
+markWallSeen	src/Dodge/Update.hs	740;"	f
 maxDamageType	src/Dodge/Damage.hs	37;"	f
-maxShowX	src/Dodge/Combine/Graph.hs	43;"	f
+maxShowX	src/Dodge/Combine/Graph.hs	49;"	f
 maxViewDistance	src/Dodge/Viewpoints.hs	26;"	f
 maybeBlockedPassage	src/Dodge/Room/RezBox.hs	69;"	f
 maybeClearDoorPath	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	71;"	f
@@ -4937,10 +4932,7 @@ memoCylinderIndices	src/Shader/Poke.hs	315;"	f
 memoFlatIndices	src/Shader/Poke.hs	303;"	f
 memoTopPrismEdgeIndices	src/Shader/Poke.hs	321;"	f
 memoTopPrismIndices	src/Shader/Poke.hs	309;"	f
-menuOptionToSelectionItem	src/Dodge/Menu/Option.hs	111;"	f
+menuOptionToSelectionItem	src/Dodge/Menu/Option.hs	105;"	f
-menuOptionToString	src/Dodge/Menu/Option.hs	138;"	f
-menuWheelEvents	src/Dodge/Update/Input/ScreenLayer.hs	104;"	f
-menuWheelStep	src/Dodge/Update/Input/ScreenLayer.hs	110;"	f
 merge	src/ListHelp.hs	83;"	f
 mergeBy	src/ListHelp.hs	86;"	f
 mergeOn	src/ListHelp.hs	93;"	f
@@ -4993,7 +4985,7 @@ mntLight	src/Dodge/Placement/Instance/LightSource.hs	154;"	f
 mntLightLnkCond	src/Dodge/Placement/Instance/LightSource.hs	159;"	f
 modTo	src/Geometry/Zone.hs	10;"	f
 mouseActionsCr	src/Dodge/Creature/YourControl.hs	153;"	f
-mouseClickOptionsList	src/Dodge/Update/Input/ScreenLayer.hs	59;"	f
+mouseClickOptionsList	src/Dodge/Update/Input/ScreenLayer.hs	58;"	f
 mouseCursorType	src/Dodge/Render/Picture.hs	79;"	f
 mouseWorldPos	src/Dodge/Base/Coordinate.hs	48;"	f
 moveBullet	src/Dodge/Bullet.hs	193;"	f
@@ -5026,7 +5018,7 @@ mvBullet	src/Dodge/Bullet.hs	33;"	f
 mvButton	src/Dodge/Placement/PlaceSpot.hs	176;"	f
 mvCr	src/Dodge/Placement/PlaceSpot.hs	186;"	f
 mvFS	src/Dodge/Placement/PlaceSpot.hs	189;"	f
-mvGust	src/Dodge/Update.hs	770;"	f
+mvGust	src/Dodge/Update.hs	769;"	f
 mvLS	src/Dodge/Placement/PlaceSpot.hs	217;"	f
 mvP	src/Dodge/Wall/Move.hs	54;"	f
 mvPP	src/Dodge/Placement/PlaceSpot.hs	183;"	f
@@ -5038,7 +5030,7 @@ mvProp	src/Dodge/Placement/PlaceSpot.hs	173;"	f
 mvPs	src/Dodge/Wall/Move.hs	58;"	f
 myIntersectLineLine	src/Geometry/Intersect.hs	177;"	f
 myIntersectSegSeg	src/Geometry/Intersect.hs	155;"	f
-myParams	src/Dodge/Combine/Graph.hs	91;"	f
+myParams	src/Dodge/Combine/Graph.hs	102;"	f
 nRays	src/Geometry.hs	170;"	f
 nRaysRad	src/Geometry.hs	174;"	f
 nearCollinear	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	19;"	f
@@ -5055,7 +5047,7 @@ nextInSectionSS	src/Dodge/SelectionSections.hs	40;"	f
 noPic	src/ShapePicture.hs	25;"	f
 noShape	src/ShapePicture.hs	29;"	f
 noclipCheck	src/Dodge/WallCreatureCollisions.hs	20;"	f
-nodeFormatting	src/Dodge/Combine/Graph.hs	133;"	f
+nodeFormatting	src/Dodge/Combine/Graph.hs	146;"	f
 normalGait	src/Dodge/Creature/State/WalkCycle.hs	19;"	f
 normalizeAngle	src/Geometry/Vector.hs	127;"	f
 normalizeAnglePi	src/Dodge/Base.hs	132;"	f
@@ -5084,11 +5076,11 @@ oneH	src/Dodge/Creature/Test.hs	95;"	f
 openCursorAt	src/Dodge/Render/HUD/Carte.hs	54;"	f
 optionListDisplayParams	src/Dodge/ListDisplayParams.hs	69;"	f
 optionMenu	src/Dodge/Menu.hs	105;"	f
-optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	51;"	f
+optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	50;"	f
-optionScreenUpdate	src/Dodge/Update/Input/ScreenLayer.hs	40;"	f
+optionScreenUpdate	src/Dodge/Update/Input/ScreenLayer.hs	41;"	f
-optionValueOffset	src/Dodge/Menu/Option.hs	106;"	f
+optionValueOffset	src/Dodge/Menu/Option.hs	100;"	f
 optionsOptions	src/Dodge/Menu.hs	108;"	f
-optionsToSelections	src/Dodge/Menu/Option.hs	59;"	f
+optionsToSelections	src/Dodge/Menu/Option.hs	51;"	f
 orRegex	src/Dodge/DisplayInventory.hs	80;"	f
 orange	src/Color.hs	25;"	f
 orderAround3	src/Geometry/Vector3D.hs	105;"	f
@@ -5190,7 +5182,7 @@ placeSpotID	src/Dodge/Placement/PlaceSpot.hs	100;"	f
 placeSpotID'	src/Dodge/Placement/PlaceSpot.hs	106;"	f
 placeSpotRoomRand	src/Dodge/Placement/PlaceSpot.hs	89;"	f
 placeSpotUsingLink	src/Dodge/Placement/PlaceSpot.hs	70;"	f
-placeString	src/Dodge/Render/MenuScreen.hs	62;"	f
+placeString	src/Dodge/Render/MenuScreen.hs	63;"	f
 placeWallPoly	src/Dodge/Placement/PlaceSpot.hs	162;"	f
 plainRegex	src/Dodge/DisplayInventory.hs	194;"	f
 plateCraft	src/Dodge/Item/Craftable.hs	45;"	f
@@ -5294,7 +5286,7 @@ powlistUpToN	src/Multiset.hs	23;"	f
 powlistUpToN'	src/Multiset.hs	12;"	f
 powlistUpToN''	src/Multiset.hs	31;"	f
 ppDraw	src/Dodge/Render/ShapePicture.hs	116;"	f
-ppEvents	src/Dodge/Update.hs	733;"	f
+ppEvents	src/Dodge/Update.hs	732;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5419,7 +5411,7 @@ reflectIn	src/Geometry.hs	139;"	f
 reflectInParam	src/Geometry.hs	233;"	f
 reflectLaserAlong	src/Dodge/Item/Weapon/LaserPath.hs	13;"	f
 refract	src/Dodge/Item/Weapon/LaserPath.hs	40;"	f
-refreshOptionsSelectionList	src/Dodge/Menu/Option.hs	34;"	f
+refreshOptionsSelectionList	src/Dodge/Menu/Option.hs	39;"	f
 regexCombs	src/Dodge/DisplayInventory.hs	67;"	f
 regexIn	src/Regex.hs	4;"	f
 regexList	src/Dodge/DisplayInventory.hs	324;"	f
@@ -5442,7 +5434,7 @@ renderInfoListAt	src/Dodge/Render/InfoBox.hs	17;"	f
 renderInfoListsAt	src/Dodge/Render/InfoBox.hs	44;"	f
 renderLayer	src/Render.hs	233;"	f
 renderLightingNoShadows	src/Render.hs	48;"	f
-renderListAt	src/Dodge/Render/List.hs	193;"	f
+renderListAt	src/Dodge/Render/List.hs	196;"	f
 renderShadows	src/Render.hs	117;"	f
 replaceNullWith	src/Dodge/Creature/ReaderUpdate.hs	160;"	f
 replacePutID	src/Dodge/Placement/Instance/Wall.hs	102;"	f
@@ -5596,11 +5588,11 @@ secondColumnParams	src/Dodge/ListDisplayParams.hs	45;"	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	448;"	f
+selNumPos	src/Dodge/Render/HUD.hs	444;"	f
-selNumPosCardinal	src/Dodge/Render/HUD.hs	471;"	f
+selNumPosCardinal	src/Dodge/Render/HUD.hs	467;"	f
-selSecDrawCursor	src/Dodge/Render/List.hs	126;"	f
+selSecDrawCursor	src/Dodge/Render/List.hs	129;"	f
-selSecDrawCursorAt	src/Dodge/Render/List.hs	104;"	f
+selSecDrawCursorAt	src/Dodge/Render/List.hs	107;"	f
-selSecSelCol	src/Dodge/Render/HUD.hs	494;"	f
+selSecSelCol	src/Dodge/Render/HUD.hs	490;"	f
 selSecSelSize	src/Dodge/SelectionSections.hs	182;"	f
 selSecYint	src/Dodge/SelectionSections.hs	191;"	f
 selectCreatureDebugItem	src/Dodge/Debug.hs	39;"	f
@@ -5619,7 +5611,7 @@ sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	83;"	f
 sentinelFireType	src/Dodge/Creature/SentinelAI.hs	50;"	f
 setChannelPos	src/Sound.hs	149;"	f
 setClickWorldPos	src/Dodge/Update.hs	98;"	f
-setClusterID	src/Dodge/Combine/Graph.hs	103;"	f
+setClusterID	src/Dodge/Combine/Graph.hs	115;"	f
 setDepth	src/Picture/Base.hs	128;"	f
 setDirPS	src/Dodge/PlacementSpot.hs	49;"	f
 setFallback	src/Dodge/PlacementSpot.hs	127;"	f
@@ -5636,12 +5628,12 @@ setLinkTypePD	src/Dodge/RoomLink.hs	67;"	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	522;"	f
+setOldPos	src/Dodge/Update.hs	521;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
 setRBCreatureTargeting	src/Dodge/Creature/State.hs	292;"	f
-setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	122;"	f
+setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	104;"	f
 setShaderSource	src/Shader/Compile.hs	290;"	f
 setShadowLimits	src/Dodge/Shadows.hs	11;"	f
 setSoundVolume	src/Sound.hs	156;"	f
@@ -5743,7 +5735,7 @@ shuffleLinks	src/Dodge/Room/Link.hs	30;"	f
 shuffleRoomPos	src/Dodge/Layout.hs	78;"	f
 shuffleTail	src/RandomHelp.hs	59;"	f
 sigmoid	src/Dodge/Base.hs	129;"	f
-simpleCrSprings	src/Dodge/Update.hs	818;"	f
+simpleCrSprings	src/Dodge/Update.hs	817;"	f
 simpleDamFL	src/Dodge/Flame.hs	41;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
@@ -5843,8 +5835,8 @@ ssScrollUsing	src/Dodge/SelectionSections.hs	51;"	f
 ssSetCursor	src/Dodge/SelectionSections.hs	72;"	f
 ssTryLookup	src/Dodge/SelectionSections.hs	81;"	f
 ssfold	src/FoldableHelp.hs	105;"	f
-stackPicturesAt	src/Dodge/Render/List.hs	98;"	f
+stackPicturesAt	src/Dodge/Render/List.hs	101;"	f
-stackPicturesAtOff	src/Dodge/Render/List.hs	101;"	f
+stackPicturesAtOff	src/Dodge/Render/List.hs	104;"	f
 stackText	src/Picture/Base.hs	188;"	f
 stackedInventory	src/Dodge/Creature.hs	281;"	f
 startCr	src/Dodge/Creature.hs	91;"	f
@@ -5971,17 +5963,16 @@ titleOptionsMenu	src/Dodge/Menu.hs	99;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	102;"	f
 tlsTimeRadColPos	src/Dodge/LightSource.hs	69;"	f
 tlsTimeRadFunPos	src/Dodge/LightSource.hs	26;"	f
-tmUpdate	src/Dodge/Update.hs	502;"	f
+tmUpdate	src/Dodge/Update.hs	501;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
-toCombNodeLabel	src/Dodge/Combine/Graph.hs	81;"	f
 toFloatVAs	src/Shader/Compile.hs	211;"	f
 toLabel	src/Dodge/Cleat.hs	16;"	f
 toLasgunUpdate	src/Dodge/Item/Grammar.hs	119;"	f
 toMultiset	src/Multiset.hs	64;"	f
 toOnward	src/Dodge/Tree/Compose.hs	101;"	f
-toTopLeft	src/Dodge/Render/List.hs	218;"	f
+toTopLeft	src/Dodge/Render/List.hs	221;"	f
 toV2	src/Geometry/Data.hs	36;"	f
 toV3	src/Geometry/Data.hs	38;"	f
 toV4	src/Geometry/Data.hs	40;"	f
@@ -6113,42 +6104,42 @@ updateBarreloid	src/Dodge/Barreloid.hs	13;"	f
 updateBounds	src/Dodge/Update/Camera.hs	245;"	f
 updateBulVel	src/Dodge/Bullet.hs	50;"	f
 updateBullet	src/Dodge/Bullet.hs	28;"	f
-updateBullets	src/Dodge/Update.hs	599;"	f
+updateBullets	src/Dodge/Update.hs	598;"	f
 updateCamera	src/Dodge/Update/Camera.hs	31;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	124;"	f
-updateCloud	src/Dodge/Update.hs	784;"	f
+updateCloud	src/Dodge/Update.hs	783;"	f
-updateClouds	src/Dodge/Update.hs	628;"	f
+updateClouds	src/Dodge/Update.hs	627;"	f
 updateCombineInvClick	src/Dodge/Update/Input/InGame.hs	102;"	f
 updateCombinePositioning	src/Dodge/DisplayInventory.hs	38;"	f
 updateCombineSections	src/Dodge/DisplayInventory.hs	44;"	f
 updateCreature	src/Dodge/Creature/Update.hs	10;"	f
-updateCreatureGroups	src/Dodge/Update.hs	568;"	f
+updateCreatureGroups	src/Dodge/Update.hs	567;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	544;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	543;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	92;"	f
-updateDelayedEvents	src/Dodge/Update.hs	847;"	f
+updateDelayedEvents	src/Dodge/Update.hs	846;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	112;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	589;"	f
+updateDistortions	src/Dodge/Update.hs	588;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	46;"	f
-updateEnergyBalls	src/Dodge/Update.hs	616;"	f
+updateEnergyBalls	src/Dodge/Update.hs	615;"	f
 updateEnterRegex	src/Dodge/Update/Input/InGame.hs	283;"	f
 updateExpBarrel	src/Dodge/Barreloid.hs	19;"	f
 updateFBOTO	src/Framebuffer/Update.hs	97;"	f
 updateFBOTO3	src/Framebuffer/Update.hs	131;"	f
 updateFlame	src/Dodge/Flame.hs	71;"	f
-updateFlames	src/Dodge/Update.hs	613;"	f
+updateFlames	src/Dodge/Update.hs	612;"	f
 updateFlare	src/Dodge/Flare.hs	7;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	36;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	92;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	88;"	f
-updateGusts	src/Dodge/Update.hs	767;"	f
+updateGusts	src/Dodge/Update.hs	766;"	f
 updateHeldRootItem	src/Dodge/Creature/State.hs	167;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	12;"	f
-updateIMl	src/Dodge/Update.hs	558;"	f
+updateIMl	src/Dodge/Update.hs	557;"	f
-updateIMl'	src/Dodge/Update.hs	563;"	f
+updateIMl'	src/Dodge/Update.hs	562;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	70;"	f
 updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	186;"	f
-updateInstantBullets	src/Dodge/Update.hs	705;"	f
+updateInstantBullets	src/Dodge/Update.hs	704;"	f
 updateInv	src/Dodge/Creature/State.hs	152;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	85;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	268;"	f
@@ -6157,21 +6148,21 @@ updateKeyInGame	src/Dodge/Update/Input/InGame.hs	180;"	f
 updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	169;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
 updateLaser	src/Dodge/Laser/Update.hs	13;"	f
-updateLasers	src/Dodge/Update.hs	487;"	f
+updateLasers	src/Dodge/Update.hs	486;"	f
-updateLightSources	src/Dodge/Update.hs	592;"	f
+updateLightSources	src/Dodge/Update.hs	591;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
 updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	201;"	f
-updateMIM	src/Dodge/Update.hs	718;"	f
+updateMIM	src/Dodge/Update.hs	717;"	f
 updateMachine	src/Dodge/Machine/Update.hs	19;"	f
 updateMouseContext	src/Dodge/Update.hs	391;"	f
 updateMouseInventorySelection	src/Dodge/Update.hs	309;"	f
 updateMouseInventorySelection'	src/Dodge/Update.hs	314;"	f
 updateMovement	src/Dodge/Creature/State.hs	331;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	580;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	579;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	573;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	572;"	f
-updatePastWorlds	src/Dodge/Update.hs	475;"	f
+updatePastWorlds	src/Dodge/Update.hs	474;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	625;"	f
+updatePosEvents	src/Dodge/Update.hs	624;"	f
 updatePreload	src/Preload/Update.hs	20;"	f
 updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	144;"	f
 updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	147;"	f
@@ -6179,9 +6170,9 @@ updateProjectile	src/Dodge/Projectile/Update.hs	23;"	f
 updateProp	src/Dodge/Prop/Update.hs	11;"	f
 updateRBList	src/Dodge/Inventory/RBList.hs	16;"	f
 updateRadarBlip	src/Dodge/RadarBlip.hs	8;"	f
-updateRadarBlips	src/Dodge/Update.hs	595;"	f
+updateRadarBlips	src/Dodge/Update.hs	594;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	25;"	f
-updateRadarSweeps	src/Dodge/Update.hs	619;"	f
+updateRadarSweeps	src/Dodge/Update.hs	618;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	106;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	35;"	f
@@ -6190,19 +6181,19 @@ updateScopeZoom'	src/Dodge/Update/Camera.hs	132;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
 updateSection	src/Dodge/DisplayInventory.hs	224;"	f
 updateSectionsPositioning	src/Dodge/DisplayInventory.hs	203;"	f
-updateSeenWalls	src/Dodge/Update.hs	736;"	f
+updateSeenWalls	src/Dodge/Update.hs	735;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
-updateShockwaves	src/Dodge/Update.hs	610;"	f
+updateShockwaves	src/Dodge/Update.hs	609;"	f
 updateSingleNodes	src/TreeHelp.hs	97;"	f
 updateSound	src/Sound.hs	71;"	f
 updateSounds	src/Sound.hs	66;"	f
 updateSpark	src/Dodge/Spark.hs	19;"	f
-updateSparks	src/Dodge/Update.hs	622;"	f
+updateSparks	src/Dodge/Update.hs	621;"	f
 updateTempLightSource	src/Dodge/LightSource/Update.hs	7;"	f
 updateTeslaArc	src/Dodge/Tesla/Arc.hs	29;"	f
-updateTeslaArcs	src/Dodge/Update.hs	604;"	f
+updateTeslaArcs	src/Dodge/Update.hs	603;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	607;"	f
+updateTractorBeams	src/Dodge/Update.hs	606;"	f
 updateTurret	src/Dodge/Machine/Update.hs	47;"	f
 updateUniverse	src/Dodge/Update.hs	71;"	f
 updateUniverseFirst	src/Dodge/Update.hs	83;"	f
@@ -6213,7 +6204,7 @@ updateUseInputOnScreen	src/Dodge/Update/Input/ScreenLayer.hs	21;"	f
 updateWalkCycle	src/Dodge/Creature/State/WalkCycle.hs	12;"	f
 updateWallDamages	src/Dodge/Update/WallDamage.hs	10;"	f
 updateWheelEvent	src/Dodge/Update/Scroll.hs	19;"	f
-updateWheelEvents	src/Dodge/Update.hs	462;"	f
+updateWheelEvents	src/Dodge/Update.hs	461;"	f
 updateWorldEventFlag	src/Dodge/Update.hs	117;"	f
 updateWorldEventFlags	src/Dodge/Update.hs	105;"	f
 upperBody	src/Dodge/Creature/Picture.hs	133;"	f
@@ -6367,7 +6358,7 @@ yV2	src/Geometry/Vector.hs	203;"	f
 yellow	src/Color.hs	17;"	f
 you	src/Dodge/Base/You.hs	18;"	f
 youDropItem	src/Dodge/Creature/Action.hs	184;"	f
-yourAugmentedItem	src/Dodge/Render/HUD.hs	216;"	f
+yourAugmentedItem	src/Dodge/Render/HUD.hs	212;"	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
@@ -6385,9 +6376,9 @@ zipCount	src/Dodge/Tree/Shift.hs	129;"	f
 zipCountDown	src/Dodge/Room/Procedural.hs	118;"	f
 zipWithDefaults	src/Dodge/Item/Display.hs	21;"	f
 zoneCloud	src/Dodge/Zoning/Cloud.hs	27;"	f
-zoneClouds	src/Dodge/Update.hs	495;"	f
+zoneClouds	src/Dodge/Update.hs	494;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	52;"	f
-zoneCreatures	src/Dodge/Update.hs	539;"	f
+zoneCreatures	src/Dodge/Update.hs	538;"	f
 zoneExtract	src/Dodge/Zoning/Base.hs	50;"	f
 zoneMonoid	src/Dodge/Zoning/Base.hs	80;"	f
 zoneOfCirc	src/Dodge/Zoning/Base.hs	22;"	f