Continue hud/mouse refactor

ghcidOutput

@@ -1,57 +1,5 @@
-/home/justin/Haskell/loop/src/Dodge/Render/Picture.hs:100:1-19: warning: [-Wunused-top-binds]
+/home/justin/Haskell/loop/src/Dodge/Update.hs:416:9-12: warning: [-Wunused-matches]
-    Defined but not used: ‘determineTermCursor’
-    |
-100 | determineTermCursor tmid u = fromMaybe (drawPlus 5) $ do
-    | ^^^^^^^^^^^^^^^^^^^
-/home/justin/Haskell/loop/src/Dodge/Render/Picture.hs:100:21-24: warning: [-Wunused-matches]
     Defined but not used: ‘tmid’
     |
-100 | determineTermCursor tmid u = fromMaybe (drawPlus 5) $ do
+416 |         tmid <- w ^? hud . hudElement . subInventory . termID
-    |                     ^^^^
-/home/justin/Haskell/loop/src/Dodge/Render/Picture.hs:100:26: warning: [-Wunused-matches]
-    Defined but not used: ‘u’
-    |
-100 | determineTermCursor tmid u = fromMaybe (drawPlus 5) $ do
-    |                          ^
-/home/justin/Haskell/loop/src/Dodge/Render/Picture.hs:113:1-18: warning: [-Wunused-top-binds]
-    Defined but not used: ‘drawWireRectCursor’
-    |
-113 | drawWireRectCursor = scale 0.1 0.1 $ text [cWireRect]
-    | ^^^^^^^^^^^^^^^^^^
-/home/justin/Haskell/loop/src/Dodge/Update.hs:306:1-27: warning: [-Wunused-top-binds]
-    Defined but not used: ‘updateMouseInventoryEffects’
-    |
-306 | updateMouseInventoryEffects cfig w = w
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-/home/justin/Haskell/loop/src/Dodge/Update.hs:306:29-32: warning: [-Wunused-matches]
-    Defined but not used: ‘cfig’
-    |
-306 | updateMouseInventoryEffects cfig w = w
-    |                             ^^^^
-/home/justin/Haskell/loop/src/Dodge/Update.hs:419:9-12: warning: [-Wunused-matches]
-    Defined but not used: ‘tmid’
-    |
-419 |         tmid <- w ^? hud . hudElement . subInventory . termID
     |         ^^^^
-/home/justin/Haskell/loop/src/Dodge/Update/Input/InGame.hs:(121,24)-(128,71): warning: [GHC-62161] [-Wincomplete-patterns]
-    Pattern match(es) are non-exhaustive
-    In a case alternative:
-        Patterns of type ‘MouseContext’ not matched:
-            NoMouseContext
-            MouseAiming
-            OverInvSelect _
-            OverInvFilt _
-            ...
-    |
-121 |     trydocombination = case w ^. input . mouseContext of
-    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...
-/home/justin/Haskell/loop/src/Dodge/Update/Input/InGame.hs:126:26: warning: [-Wunused-matches]
-    Defined but not used: ‘i’
-    |
-126 |         OverCombCombine (i,j) -> (worldEventFlags . at InventoryChange ?~ ()) . maybeExitCombine $
-    |                          ^
-/home/justin/Haskell/loop/src/Dodge/Update/Input/InGame.hs:126:28: warning: [-Wunused-matches]
-    Defined but not used: ‘j’
-    |
-126 |         OverCombCombine (i,j) -> (worldEventFlags . at InventoryChange ?~ ()) . maybeExitCombine $
-    |                            ^

src/Dodge/Data/Input.hs

@@ -19,13 +19,16 @@ data PressType
 data MouseContext
     = NoMouseContext
     | MouseAiming
+    | MouseClick
     | OverInvSelect { _mcoInvSelect :: (Int,Int)}
     | OverInvFilt { _mcoInvFilt :: (Int,Int)}
     | OverCombSelect { _mcoCombSelect :: (Int,Int)}
     | OverCombCombine { _mcoCombCombine :: (Int,Int)}
     | OverCombFilter
+    | OverCombEscape
     | OverTerminalReturn
     | OverTerminalEscape
+    deriving (Show)
 
 data Input = Input
     { _mousePos :: Point2 -- in pixels, from the center of the screen

src/Dodge/Render/Picture.hs

@@ -2,7 +2,6 @@ module Dodge.Render.Picture (
     fixedCoordPictures,
 ) where
 
-import Dodge.CharacterEnums
 import Control.Lens
 import Control.Monad
 import Data.Maybe
@@ -79,14 +78,16 @@ drawMouseCursor u =
 
 mouseCursorType :: Universe -> Picture
 mouseCursorType u = case u ^. uvWorld . input . mouseContext of
-    NoMouseContext -> drawPlus 5
+    NoMouseContext -> drawEmptySet 5
     MouseAiming -> rotate a (drawPlus 5)
+    MouseClick -> drawPlus 5
     OverInvSelect {} -> drawSelect 5
     OverInvFilt {} -> drawCombFilter 5
     OverCombSelect {} -> drawSelect 5
     OverCombFilter {} -> drawCombFilterJump 5
     OverCombCombine {} -> drawGapPlus 5
-    OverTerminalReturn -> drawReturn
+    OverCombEscape -> rotate (pi/4) $ drawPlus 5
+    OverTerminalReturn -> drawReturn 5
     OverTerminalEscape -> rotate (pi/4) $ drawPlus 5
   where
     w = u ^. uvWorld
@@ -96,22 +97,22 @@ mouseCursorType u = case u ^. uvWorld . input . mouseContext of
             argV (mouseWorldPos (w ^. input) (w ^. wCam) -.- cpos)
                 - w ^. wCam . camRot
 
-determineTermCursor :: Int -> Universe -> Picture
+drawEmptySet :: Float -> Picture
-determineTermCursor tmid u = fromMaybe (drawPlus 5) $ do
+drawEmptySet x = fold
-    return drawReturn
+    [line [V2 x x,V2 (-x) (-x)]
-
+    ,circle x
-drawReturn :: Picture
-drawReturn = fold 
-    [line [V2 0 0, V2 3 3]
-    ,line [V2 0 0, V2 3 (-3)]
-    ,line [V2 0 0, V2 6 0]
-    ,line [V2 6 0, V2 6 10]
     ]
---drawReturn = scale 0.1 0.1 . translate (-50) (-100) $ text [toEnum 153]
 
-drawWireRectCursor :: Picture
+drawReturn :: Float -> Picture
-drawWireRectCursor = scale 0.1 0.1 $ text [cWireRect]
+drawReturn x = fold 
---drawReturn = text "ASDF"
+    [line [V2 0 0, V2 y y]
+    ,line [V2 0 0, V2 y (-y)]
+    ,line [V2 0 0, V2 (2*y) 0]
+    ,line [V2 (2*y) 0, V2 (2*y) (2*x)]
+    ]
+  where
+    y = 0.7 * x
+--drawReturn = scale 0.1 0.1 . translate (-50) (-100) $ text [toEnum 153]
 
 drawPlus :: Float -> Picture
 drawPlus x = fold [line [V2 (- x) 0, V2 x 0], line [V2 0 (- x), V2 0 x]]
@@ -121,13 +122,15 @@ drawCombFilterJump x = rotate (0.25*pi)
     $ fold [line [V2 0 0, V2 x 0], line [V2 0 0, V2 0 x]]
 
 drawSelect :: Float -> Picture
-drawSelect x = line 
+drawSelect x = polygonWire $ rectWH x (0.5 * x)
-    [ V2 x x
+--    line [V2 (-x) 0, V2 0 0]
-    , V2 0 x
+--drawSelect x = line 
-    , V2 0 (-x)
+--    [ V2 x x
-    , V2 x (-x)
+--    , V2 0 x
-    ] <> 
+--    , V2 0 (-x)
-    line [V2 (-x) 0, V2 0 0]
+--    , V2 x (-x)
+--    ] <> 
+--    line [V2 (-x) 0, V2 0 0]
 
 drawCombFilter :: Float -> Picture
 drawCombFilter x = rotate (0.25*pi) 

src/Dodge/Update.hs

@@ -301,9 +301,9 @@ checkTermDist w = fromMaybe w $ do
         w & hud . hudElement . subInventory
             .~ NoSubInventory MouseInvNothing
 
--- for other mouse effects, see yourControl
+---- for other mouse effects, see yourControl
-updateMouseInventoryEffects :: Configuration -> World -> World
+--updateMouseInventoryEffects :: Configuration -> World -> World
-updateMouseInventoryEffects cfig w = w
+--updateMouseInventoryEffects cfig w = w
 
 updateMouseInventorySelection :: Configuration -> World -> World
 updateMouseInventorySelection cfig w = fromMaybe w $ do
@@ -407,14 +407,11 @@ updateMouseContext cfig w =
         sss <- w ^? hud . hudElement . subInventory . ciSections
         msel <- w ^? hud . hudElement . subInventory . ciSelection . _Just
         let mpossel = inverseSelNumPos cfig secondColumnParams sss (w ^. input . mousePos)
-        case mpossel of
+        return $ case mpossel of
-            Nothing -> usecsel msel
+            Nothing -> OverCombEscape
-            Just (-1,_) -> return OverCombFilter
+            Just (-1,_) -> OverCombFilter
-            Just x | x == msel -> return $ OverCombCombine x
+            Just x | x == msel -> OverCombCombine x
-            Just x -> return $ OverCombSelect x
+            Just x -> OverCombSelect x
---        fmap OverCombCombine $ inverseSelNumPos cfig secondColumnParams sss (w ^. input . mousePos)
-    usecsel (-1,_) = return OverCombFilter
-    usecsel x = return $ OverCombCombine x
     overterm = do
         tmid <- w ^? hud . hudElement . subInventory . termID
         guard True

src/Dodge/Update/Input/InGame.hs

@@ -43,7 +43,7 @@ updateUseInputInGame u = updateFunctionKeys $ case u ^. uvWorld . hud . hudEleme
                 u & uvWorld . cWorld . lWorld . terminals . ix tmid . tmInput . tiFocus 
                     %~ const True
         CombineInventory{_ciSections = sss, _ciSelection = msel} 
-            | lbinitialpress -> u & uvWorld %~ updateCombineInvClick msel sss
+            | lbinitialpress -> u & uvWorld %~ updateCombineInvClick sss
             | inSubInvRegex (u ^. uvWorld) ->
                 u
                     & uvWorld . hud . hudElement . subInventory
@@ -103,11 +103,10 @@ updateFunctionKey uv sc InitialPress = case sc of
 updateFunctionKey uv _ _ = uv
 
 updateCombineInvClick ::
-    Maybe (Int, Int) ->
     IM.IntMap (SelectionSection CombinableItem) ->
     World ->
     World
-updateCombineInvClick msel sss w = fromMaybe trydocombination $ do
+updateCombineInvClick sss w = fromMaybe trydocombination $ do
     (i,j) <- w ^? input . mouseContext . mcoInvFilt
     guard $ i == 0
     str <- fmap (take 5) $ w 
@@ -123,9 +122,15 @@ updateCombineInvClick msel sss w = fromMaybe trydocombination $ do
                     & worldEventFlags . at CombineInventoryChange ?~ ()
         OverCombFilter -> w & hud . hudElement . subInventory . ciFilter .~ Nothing
                     & worldEventFlags . at CombineInventoryChange ?~ ()
-        OverCombCombine (i,j) -> (worldEventFlags . at InventoryChange ?~ ()) . maybeExitCombine $
+        OverCombCombine (i,j) -> 
-                tryCombine sss msel w
+            (worldEventFlags . at InventoryChange ?~ ()) . maybeExitCombine $
+                tryCombine sss (i,j) w
                     & worldEventFlags . at CombineInventoryChange ?~ ()
+        OverCombEscape -> w
+            & worldEventFlags . at InventoryChange ?~ ()
+            & hud . hudElement . subInventory .~ NoSubInventory MouseInvNothing
+        x -> error $ "while combining this mouse context should not be possible: "
+            ++ show x
  
 --        x@(Just (i,_)) 
 --            | x /= msel -> w & hud . hudElement . subInventory . ciSelection .~ x
@@ -352,11 +357,10 @@ toggleTweakInv w = case w ^? hud . hudElement . subInventory of
 
 tryCombine ::
     IM.IntMap (SelectionSection CombinableItem) ->
-    Maybe (Int, Int) ->
+    (Int, Int) ->
     World ->
     World
-tryCombine sss msel w = fromMaybe w $ do
+tryCombine sss (i,j) w = fromMaybe w $ do
-    (i, j) <- msel
     CombinableItem is it _ <- sss ^? ix i . ssItems . ix j . siPayload
     p <- w ^? cWorld . lWorld . creatures . ix 0 . crPos
     return $

tags

@@ -904,7 +904,7 @@ InheritFloor	src/Data/Tile.hs	11;"	C
 InitialPress	src/Dodge/Data/Input.hs	14;"	C
 Initialisation	src/Dodge/Initialisation.hs	1;"	m
 Initialize	src/Dodge/Item/Location/Initialize.hs	1;"	m
-Input	src/Dodge/Data/Input.hs	29;"	t
+Input	src/Dodge/Data/Input.hs	33;"	t
 Input	src/Dodge/Data/Input.hs	6;"	m
 Input	src/Dodge/Event/Input.hs	3;"	m
 Input	src/Dodge/Update/Input.hs	1;"	m
@@ -1192,6 +1192,7 @@ MountedObject	src/Dodge/Data/MountedObject.hs	11;"	t
 MountedObject	src/Dodge/Data/MountedObject.hs	6;"	m
 MountedProp	src/Dodge/Data/MountedObject.hs	13;"	C
 MouseAiming	src/Dodge/Data/Input.hs	21;"	C
+MouseClick	src/Dodge/Data/Input.hs	22;"	C
 MouseContext	src/Dodge/Data/Input.hs	19;"	t
 MouseInvDrag	src/Dodge/Data/HUD.hs	30;"	C
 MouseInvNothing	src/Dodge/Data/HUD.hs	31;"	C
@@ -1354,12 +1355,14 @@ OutLink	src/Dodge/Data/Room.hs	43;"	C
 OutPlacement	src/Dodge/Data/GenWorld.hs	126;"	t
 Outline	src/Dodge/Render/Outline.hs	1;"	m
 OutwardShockwave	src/Dodge/Data/Shockwave.hs	14;"	C
-OverCombCombine	src/Dodge/Data/Input.hs	24;"	C
+OverCombCombine	src/Dodge/Data/Input.hs	26;"	C
-OverCombFilter	src/Dodge/Data/Input.hs	25;"	C
+OverCombEscape	src/Dodge/Data/Input.hs	28;"	C
-OverCombSelect	src/Dodge/Data/Input.hs	23;"	C
+OverCombFilter	src/Dodge/Data/Input.hs	27;"	C
-OverInv	src/Dodge/Data/Input.hs	22;"	C
+OverCombSelect	src/Dodge/Data/Input.hs	25;"	C
-OverTerminalEscape	src/Dodge/Data/Input.hs	27;"	C
+OverInvFilt	src/Dodge/Data/Input.hs	24;"	C
-OverTerminalReturn	src/Dodge/Data/Input.hs	26;"	C
+OverInvSelect	src/Dodge/Data/Input.hs	23;"	C
+OverTerminalEscape	src/Dodge/Data/Input.hs	30;"	C
+OverTerminalReturn	src/Dodge/Data/Input.hs	29;"	C
 OverreachingAI	src/Dodge/Data/Scenario.hs	31;"	C
 Overstrung	src/Dodge/Data/Creature/Perception.hs	57;"	C
 P2Ac	src/Dodge/Data/CreatureEffect.hs	53;"	t
@@ -1851,15 +1854,15 @@ TORCH	src/Dodge/Data/Item/Combine.hs	163;"	C
 TRACTORGUN	src/Dodge/Data/Item/Combine.hs	156;"	C
 TRANSFORMER	src/Dodge/Data/Item/Combine.hs	42;"	C
 TRANSMITTER	src/Dodge/Data/Item/Combine.hs	48;"	C
-TSbackspace	src/Dodge/Data/Input.hs	49;"	C
+TSbackspace	src/Dodge/Data/Input.hs	53;"	C
-TSdelete	src/Dodge/Data/Input.hs	50;"	C
+TSdelete	src/Dodge/Data/Input.hs	54;"	C
-TSdown	src/Dodge/Data/Input.hs	55;"	C
+TSdown	src/Dodge/Data/Input.hs	59;"	C
-TSescape	src/Dodge/Data/Input.hs	47;"	C
+TSescape	src/Dodge/Data/Input.hs	51;"	C
-TSleft	src/Dodge/Data/Input.hs	52;"	C
+TSleft	src/Dodge/Data/Input.hs	56;"	C
-TSreturn	src/Dodge/Data/Input.hs	48;"	C
+TSreturn	src/Dodge/Data/Input.hs	52;"	C
-TSright	src/Dodge/Data/Input.hs	53;"	C
+TSright	src/Dodge/Data/Input.hs	57;"	C
-TStab	src/Dodge/Data/Input.hs	51;"	C
+TStab	src/Dodge/Data/Input.hs	55;"	C
-TSup	src/Dodge/Data/Input.hs	54;"	C
+TSup	src/Dodge/Data/Input.hs	58;"	C
 TUBE	src/Dodge/Data/Item/Combine.hs	29;"	C
 Tank	src/Dodge/Placement/Instance/Tank.hs	1;"	m
 Tanks	src/Dodge/Room/Tanks.hs	1;"	m
@@ -1873,7 +1876,7 @@ TargetingType	src/Dodge/Data/Item/Targeting.hs	11;"	t
 TeleSound	src/Dodge/Data/SoundOrigin.hs	35;"	C
 Teleport	src/Dodge/Room/Teleport.hs	2;"	m
 TempLightSource	src/Dodge/Data/LightSource.hs	42;"	t
-TermSignal	src/Dodge/Data/Input.hs	46;"	t
+TermSignal	src/Dodge/Data/Input.hs	50;"	t
 Terminal	src/Dodge/Data/Terminal.hs	32;"	t
 Terminal	src/Dodge/Data/Terminal.hs	6;"	m
 Terminal	src/Dodge/Debug/Terminal.hs	3;"	m
@@ -2320,8 +2323,8 @@ _cldtParent	src/Dodge/Data/DoubleTree.hs	48;"	f
 _cldtParent	src/Dodge/Data/DoubleTree.hs	57;"	f
 _cldtUp	src/Dodge/Data/DoubleTree.hs	46;"	f
 _cldtUp	src/Dodge/Data/DoubleTree.hs	54;"	f
-_clickPos	src/Dodge/Data/Input.hs	37;"	f
+_clickPos	src/Dodge/Data/Input.hs	41;"	f
-_clickWorldPos	src/Dodge/Data/Input.hs	39;"	f
+_clickWorldPos	src/Dodge/Data/Input.hs	43;"	f
 _closeObjects	src/Dodge/Data/HUD.hs	51;"	f
 _cloudEBO	src/Data/Preload/Render.hs	49;"	f
 _cloudShader	src/Data/Preload/Render.hs	48;"	f
@@ -2601,9 +2604,9 @@ _heldAim	src/Dodge/Data/Item/Use.hs	39;"	f
 _heldDelay	src/Dodge/Data/Item/Use.hs	37;"	f
 _heldHammer	src/Dodge/Data/Item/Use.hs	38;"	f
 _heldParams	src/Dodge/Data/Item/Use.hs	41;"	f
-_heldPos	src/Dodge/Data/Input.hs	38;"	f
+_heldPos	src/Dodge/Data/Input.hs	42;"	f
 _heldTriggerType	src/Dodge/Data/Item/Use.hs	42;"	f
-_heldWorldPos	src/Dodge/Data/Input.hs	40;"	f
+_heldWorldPos	src/Dodge/Data/Input.hs	44;"	f
 _hud	src/Dodge/Data/World.hs	47;"	f
 _hudElement	src/Dodge/Data/HUD.hs	47;"	f
 _humanoidAI	src/Dodge/Data/Creature/Misc.hs	69;"	f
@@ -2743,9 +2746,10 @@ _mcPos	src/Dodge/Data/Machine.hs	35;"	f
 _mcType	src/Dodge/Data/Machine.hs	40;"	f
 _mcWallIDs	src/Dodge/Data/Machine.hs	33;"	f
 _mcWidth	src/Dodge/Data/Machine.hs	44;"	f
-_mcoCombCombine	src/Dodge/Data/Input.hs	24;"	f
+_mcoCombCombine	src/Dodge/Data/Input.hs	26;"	f
-_mcoCombSelect	src/Dodge/Data/Input.hs	23;"	f
+_mcoCombSelect	src/Dodge/Data/Input.hs	25;"	f
-_mcoInv	src/Dodge/Data/Input.hs	22;"	f
+_mcoInvFilt	src/Dodge/Data/Input.hs	24;"	f
+_mcoInvSelect	src/Dodge/Data/Input.hs	23;"	f
 _mdBool	src/Dodge/Data/Modification.hs	21;"	f
 _mdExternalID	src/Dodge/Data/Modification.hs	17;"	f
 _mdExternalID1	src/Dodge/Data/Modification.hs	25;"	f
@@ -2771,10 +2775,10 @@ _moString	src/Dodge/Data/Universe.hs	107;"	f
 _modOption	src/Dodge/Data/Universe.hs	97;"	f
 _modString	src/Dodge/Data/Universe.hs	95;"	f
 _modifications	src/Dodge/Data/LWorld.hs	129;"	f
-_mouseButtons	src/Dodge/Data/Input.hs	34;"	f
+_mouseButtons	src/Dodge/Data/Input.hs	38;"	f
-_mouseContext	src/Dodge/Data/Input.hs	31;"	f
+_mouseContext	src/Dodge/Data/Input.hs	35;"	f
-_mouseMoving	src/Dodge/Data/Input.hs	32;"	f
+_mouseMoving	src/Dodge/Data/Input.hs	36;"	f
-_mousePos	src/Dodge/Data/Input.hs	30;"	f
+_mousePos	src/Dodge/Data/Input.hs	34;"	f
 _mtBranches	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtLabel	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtTree	src/Dodge/Tree/Compose/Data.hs	8;"	f
@@ -2879,7 +2883,7 @@ _prVel	src/Dodge/Data/Prop.hs	24;"	f
 _prVelZ	src/Dodge/Data/Prop.hs	27;"	f
 _preloadData	src/Dodge/Data/Universe.hs	32;"	f
 _pressPlates	src/Dodge/Data/LWorld.hs	132;"	f
-_pressedKeys	src/Dodge/Data/Input.hs	33;"	f
+_pressedKeys	src/Dodge/Data/Input.hs	37;"	f
 _previousArcEffect	src/Dodge/Data/Item/Params.hs	26;"	f
 _prjAcc	src/Dodge/Data/Projectile.hs	19;"	f
 _prjDir	src/Dodge/Data/Projectile.hs	20;"	f
@@ -3001,14 +3005,14 @@ _scPositionedMenuOption	src/Dodge/Data/Universe.hs	82;"	f
 _scSelectionList	src/Dodge/Data/Universe.hs	84;"	f
 _scTitle	src/Dodge/Data/Universe.hs	79;"	f
 _screenTextureVAO	src/Data/Preload/Render.hs	50;"	f
-_scrollAmount	src/Dodge/Data/Input.hs	35;"	f
+_scrollAmount	src/Dodge/Data/Input.hs	39;"	f
 _scrollItemID	src/Dodge/Data/World.hs	66;"	f
 _scrollItemID	src/Dodge/Data/World.hs	75;"	f
 _scrollItemID	src/Dodge/Data/World.hs	79;"	f
 _scrollSmoothing	src/Dodge/Data/World.hs	63;"	f
 _scrollSmoothing	src/Dodge/Data/World.hs	69;"	f
-_scrollTestFloat	src/Dodge/Data/Input.hs	42;"	f
+_scrollTestFloat	src/Dodge/Data/Input.hs	46;"	f
-_scrollTestInt	src/Dodge/Data/Input.hs	43;"	f
+_scrollTestInt	src/Dodge/Data/Input.hs	47;"	f
 _scurColor	src/Dodge/Data/SelectionList.hs	32;"	f
 _scurPos	src/Dodge/Data/SelectionList.hs	30;"	f
 _scurSize	src/Dodge/Data/SelectionList.hs	31;"	f
@@ -3064,7 +3068,7 @@ _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
 _slSelPos	src/Dodge/Data/SelectionList.hs	26;"	f
-_smoothScrollAmount	src/Dodge/Data/Input.hs	36;"	f
+_smoothScrollAmount	src/Dodge/Data/Input.hs	40;"	f
 _soundAngDist	src/Sound/Data.hs	53;"	f
 _soundChannel	src/Sound/Data.hs	52;"	f
 _soundChunkID	src/Sound/Data.hs	57;"	f
@@ -3119,7 +3123,7 @@ _termID	src/Dodge/Data/HUD.hs	44;"	f
 _terminals	src/Dodge/Data/LWorld.hs	123;"	f
 _teslaArcs	src/Dodge/Data/LWorld.hs	113;"	f
 _testFloat	src/Dodge/Data/World.hs	45;"	f
-_textInput	src/Dodge/Data/Input.hs	41;"	f
+_textInput	src/Dodge/Data/Input.hs	45;"	f
 _textureObject	src/Shader/Data.hs	95;"	f
 _tiFocus	src/Dodge/Data/Terminal.hs	21;"	f
 _tiSel	src/Dodge/Data/Terminal.hs	22;"	f
@@ -3340,10 +3344,10 @@ 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	428;"	f
+advanceScrollAmount	src/Dodge/Update.hs	427;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	29;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	45;"	f
-aimDelaySweep	src/Dodge/Render/Picture.hs	151;"	f
+aimDelaySweep	src/Dodge/Render/Picture.hs	154;"	f
 aimStanceInfo	src/Dodge/Item/Info.hs	210;"	f
 aimTurn	src/Dodge/Creature/YourControl.hs	143;"	f
 aimingMuzzleLength	src/Dodge/Creature/HandPos.hs	46;"	f
@@ -3585,7 +3589,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	715;"	f
+checkEndGame	src/Dodge/Update.hs	714;"	f
 checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
@@ -3612,7 +3616,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	768;"	f
+clClSpringVel	src/Dodge/Update.hs	767;"	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
@@ -3632,14 +3636,14 @@ 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	203;"	f
+closeObjectInfo	src/Dodge/Render/HUD.hs	204;"	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	738;"	f
+cloudEffect	src/Dodge/Update.hs	737;"	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
@@ -3668,7 +3672,7 @@ 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	313;"	f
+combineInventoryExtra	src/Dodge/Render/HUD.hs	314;"	f
 combineItemListYouX	src/Dodge/Combine.hs	33;"	f
 combineList	src/Dodge/Combine.hs	20;"	f
 combineRooms	src/Dodge/Room/Procedural.hs	152;"	f
@@ -3710,7 +3714,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	786;"	f
+crCrSpring	src/Dodge/Update.hs	785;"	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
@@ -3731,7 +3735,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	781;"	f
+crSpring	src/Dodge/Update.hs	780;"	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
@@ -3967,7 +3971,6 @@ detectorEffect	src/Dodge/Item/Weapon/Radar.hs	20;"	f
 detectorInfo	src/Dodge/Item/Info.hs	190;"	f
 determineInvSelCursorWidth	src/Dodge/ListDisplayParams.hs	56;"	f
 determineProjectileTracking	src/Dodge/HeldUse.hs	485;"	f
-determineTermCursor	src/Dodge/Render/Picture.hs	98;"	f
 diagonalLinesRect	src/Dodge/Room/Foreground.hs	52;"	f
 diffAngles	src/Geometry.hs	196;"	f
 difference	src/Geometry.hs	130;"	f
@@ -3982,9 +3985,9 @@ disconnectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	482;"	f
 disconnectTerminal	src/Dodge/Terminal.hs	218;"	f
 displayConfig	src/Dodge/Menu.hs	196;"	f
 displayControls	src/Dodge/Menu.hs	206;"	f
-displayFrameTicks	src/Dodge/Render/Picture.hs	40;"	f
+displayFrameTicks	src/Dodge/Render/Picture.hs	39;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	197;"	f
-displayTerminalLineString	src/Dodge/Update.hs	457;"	f
+displayTerminalLineString	src/Dodge/Update.hs	456;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -4041,7 +4044,7 @@ doPropUpdates	src/Dodge/Prop/Update.hs	36;"	f
 doQuickload	src/Dodge/Save.hs	82;"	f
 doQuicksave	src/Dodge/Save.hs	77;"	f
 doRandImpulse	src/Dodge/RandImpulse.hs	7;"	f
-doRegexInput	src/Dodge/Update/Input/InGame.hs	205;"	f
+doRegexInput	src/Dodge/Update/Input/InGame.hs	207;"	f
 doRoomInPlacements	src/Dodge/Layout.hs	97;"	f
 doRoomOutPlacements	src/Dodge/Layout.hs	107;"	f
 doRoomPlacements	src/Dodge/Layout.hs	122;"	f
@@ -4068,7 +4071,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	439;"	f
+doWorldEvents	src/Dodge/Update.hs	438;"	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
@@ -4095,10 +4098,10 @@ drawCPUShadows	src/Dodge/Render/Shadow.hs	19;"	f
 drawCarte	src/Dodge/Render/HUD/Carte.hs	14;"	f
 drawCircFlare	src/Dodge/Flare.hs	25;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
-drawCombFilter	src/Dodge/Render/Picture.hs	132;"	f
+drawCombFilter	src/Dodge/Render/Picture.hs	135;"	f
-drawCombFilterJump	src/Dodge/Render/Picture.hs	118;"	f
+drawCombFilterJump	src/Dodge/Render/Picture.hs	120;"	f
-drawCombineInventory	src/Dodge/Render/HUD.hs	162;"	f
+drawCombineInventory	src/Dodge/Render/HUD.hs	163;"	f
-drawConcurrentMessage	src/Dodge/Render/Picture.hs	63;"	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
 drawCreature	src/Dodge/Render/ShapePicture.hs	41;"	f
@@ -4107,19 +4110,20 @@ drawCross	src/Dodge/Render/Label.hs	24;"	f
 drawCrossCol	src/Dodge/Render/Label.hs	21;"	f
 drawCursorAt	src/Dodge/Render/List.hs	66;"	f
 drawDDATest	src/Dodge/Debug/Picture.hs	256;"	f
-drawDISelections	src/Dodge/Render/HUD.hs	145;"	f
+drawDISelections	src/Dodge/Render/HUD.hs	146;"	f
 drawDoorPaths	src/Dodge/Debug/Picture.hs	217;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	81;"	f
+drawEmptySet	src/Dodge/Render/Picture.hs	100;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	8;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	140;"	f
-drawExamineInventory	src/Dodge/Render/HUD.hs	176;"	f
+drawExamineInventory	src/Dodge/Render/HUD.hs	177;"	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	65;"	f
 drawForceField	src/Dodge/Wall/Draw.hs	11;"	f
-drawGapPlus	src/Dodge/Render/Picture.hs	142;"	f
+drawGapPlus	src/Dodge/Render/Picture.hs	145;"	f
 drawGib	src/Dodge/Prop/Draw.hs	28;"	f
 drawHP	src/Dodge/Render/HUD.hs	56;"	f
 drawHUD	src/Dodge/Render/HUD.hs	48;"	f
@@ -4138,9 +4142,9 @@ drawListYgapScaleYoff	src/Dodge/Render/List.hs	94;"	f
 drawListYoff	src/Dodge/Render/List.hs	91;"	f
 drawMachine	src/Dodge/Machine/Draw.hs	16;"	f
 drawMapWall	src/Dodge/Render/HUD/Carte.hs	33;"	f
-drawMenuOrHUD	src/Dodge/Render/Picture.hs	58;"	f
+drawMenuOrHUD	src/Dodge/Render/Picture.hs	57;"	f
 drawMenuScreen	src/Dodge/Render/MenuScreen.hs	12;"	f
-drawMouseCursor	src/Dodge/Render/Picture.hs	74;"	f
+drawMouseCursor	src/Dodge/Render/Picture.hs	73;"	f
 drawMouseOver	src/Dodge/Render/HUD.hs	116;"	f
 drawMousePosition	src/Dodge/Debug/Picture.hs	319;"	f
 drawMovingShape	src/Dodge/Prop/Draw.hs	67;"	f
@@ -4150,19 +4154,19 @@ drawOptions	src/Dodge/Render/MenuScreen.hs	32;"	f
 drawPathBetween	src/Dodge/Debug/Picture.hs	168;"	f
 drawPathEdge	src/Dodge/Debug/Picture.hs	222;"	f
 drawPathing	src/Dodge/Debug/Picture.hs	384;"	f
-drawPlus	src/Dodge/Render/Picture.hs	115;"	f
+drawPlus	src/Dodge/Render/Picture.hs	117;"	f
 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	221;"	f
+drawRBOptions	src/Dodge/Render/HUD.hs	222;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	7;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	30;"	f
-drawReturn	src/Dodge/Render/Picture.hs	102;"	f
+drawReturn	src/Dodge/Render/Picture.hs	106;"	f
 drawRootCursor	src/Dodge/Render/HUD.hs	84;"	f
 drawSSCursor	src/Dodge/SelectionSections/Draw.hs	30;"	f
 drawSSMultiCursor	src/Dodge/SelectionSections/Draw.hs	41;"	f
-drawSelect	src/Dodge/Render/Picture.hs	122;"	f
+drawSelect	src/Dodge/Render/Picture.hs	124;"	f
 drawSelectionList	src/Dodge/Render/List.hs	33;"	f
 drawSelectionListBackground	src/Dodge/Render/List.hs	52;"	f
 drawSelectionSections	src/Dodge/SelectionSections/Draw.hs	17;"	f
@@ -4174,13 +4178,13 @@ 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	154;"	f
+drawSubInventory	src/Dodge/Render/HUD.hs	155;"	f
-drawSweep	src/Dodge/Render/Picture.hs	158;"	f
+drawSweep	src/Dodge/Render/Picture.hs	161;"	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	350;"	f
+drawTerminalDisplay	src/Dodge/Render/HUD.hs	351;"	f
 drawTeslaArc	src/Dodge/Tesla/Arc/Draw.hs	7;"	f
 drawText	src/Picture/Base.hs	220;"	f
 drawTitle	src/Dodge/Render/MenuScreen.hs	48;"	f
@@ -4194,7 +4198,6 @@ drawWallSearchRays	src/Dodge/Debug/Picture.hs	265;"	f
 drawWallsNearCursor	src/Dodge/Debug/Picture.hs	189;"	f
 drawWallsNearYou	src/Dodge/Debug/Picture.hs	180;"	f
 drawWeapon	src/Dodge/Creature/Volition.hs	14;"	f
-drawWireRectCursor	src/Dodge/Render/Picture.hs	111;"	f
 drawWlIDs	src/Dodge/Debug/Picture.hs	329;"	f
 drawZoneCol	src/Dodge/Debug/Picture.hs	117;"	f
 drawZoneNearPointCursor	src/Dodge/Debug/Picture.hs	249;"	f
@@ -4229,7 +4232,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	279;"	f
+equipAllocString	src/Dodge/Render/HUD.hs	280;"	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
@@ -4291,7 +4294,7 @@ fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	522;"	f
 fireS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	344;"	f
 firstBreather	src/Dodge/Room/Breather.hs	9;"	f
 firstWorldLoad	appDodge/Main.hs	78;"	f
-fixedCoordPictures	src/Dodge/Render/Picture.hs	19;"	f
+fixedCoordPictures	src/Dodge/Render/Picture.hs	18;"	f
 fixedSizePicClampArrow	src/Dodge/Picture/SizeInvariant.hs	57;"	f
 flDamageInArea	src/Dodge/Flame.hs	110;"	f
 flFlicker	src/Dodge/Flame.hs	124;"	f
@@ -4322,7 +4325,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	208;"	f
+floorItemPickupInfo	src/Dodge/Render/HUD.hs	209;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	119;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
@@ -4342,7 +4345,7 @@ forceField	src/Dodge/Wall/ForceField.hs	7;"	f
 forceFoldable	src/StrictHelp.hs	7;"	f
 forceSpine	src/StrictHelp.hs	4;"	f
 fourEmbossDecoration	src/Dodge/Placement/TopDecoration.hs	29;"	f
-fpsText	src/Dodge/Render/Picture.hs	48;"	f
+fpsText	src/Dodge/Render/Picture.hs	47;"	f
 fractionLoadedAmmo	src/Dodge/Item/Draw/SPic.hs	58;"	f
 frag	src/Shader/Data.hs	102;"	f
 freeShaderPointers'	src/Shader.hs	37;"	f
@@ -4401,7 +4404,7 @@ 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	136;"	f
+getMouseInvSel	src/Dodge/Render/HUD.hs	137;"	f
 getNodePos	src/Dodge/Path.hs	31;"	f
 getPretty	src/AesonHelp.hs	7;"	f
 getPrettyShort	src/AesonHelp.hs	10;"	f
@@ -4593,7 +4596,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	389;"	f
+invHead	src/Dodge/Render/HUD.hs	390;"	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
@@ -4604,8 +4607,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	288;"	f
+inventoryExtra	src/Dodge/Render/HUD.hs	289;"	f
-inventoryExtraH	src/Dodge/Render/HUD.hs	299;"	f
+inventoryExtraH	src/Dodge/Render/HUD.hs	300;"	f
 inventoryX	src/Dodge/Creature.hs	115;"	f
 inverseSelBoundaryDown	src/Dodge/SelectionSections.hs	256;"	f
 inverseSelBoundaryUp	src/Dodge/SelectionSections.hs	243;"	f
@@ -4771,7 +4774,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	378;"	f
+lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	379;"	f
 lnkPosDir	src/Dodge/RoomLink.hs	97;"	f
 loadDodgeConfig	src/Dodge/Config/Load.hs	9;"	f
 loadMusic	src/Dodge/SoundLogic/LoadSound.hs	21;"	f
@@ -4892,7 +4895,7 @@ 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	700;"	f
+markWallSeen	src/Dodge/Update.hs	699;"	f
 maxDamageType	src/Dodge/Damage.hs	37;"	f
 maxShowX	src/Dodge/Combine/Graph.hs	43;"	f
 maxViewDistance	src/Dodge/Viewpoints.hs	26;"	f
@@ -4903,7 +4906,7 @@ maybeClearPath	src/Dodge/Block.hs	77;"	f
 maybeClearPaths	src/Dodge/Block.hs	74;"	f
 maybeDestroyBlock	src/Dodge/Wall/Damage.hs	26;"	f
 maybeDestroyDoor	src/Dodge/Wall/Damage.hs	31;"	f
-maybeExitCombine	src/Dodge/Update/Input/InGame.hs	367;"	f
+maybeExitCombine	src/Dodge/Update/Input/InGame.hs	368;"	f
 maybeOpenTerminal	src/Dodge/Update.hs	121;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	111;"	f
@@ -4990,7 +4993,7 @@ 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	58;"	f
-mouseCursorType	src/Dodge/Render/Picture.hs	80;"	f
+mouseCursorType	src/Dodge/Render/Picture.hs	79;"	f
 mouseOverSelectionList	src/Dodge/Update/Input/ScreenLayer.hs	73;"	f
 mouseWorldPos	src/Dodge/Base/Coordinate.hs	48;"	f
 moveBullet	src/Dodge/Bullet.hs	193;"	f
@@ -5023,7 +5026,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	729;"	f
+mvGust	src/Dodge/Update.hs	728;"	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
@@ -5132,7 +5135,7 @@ parseNum	src/Dodge/Debug/Terminal.hs	73;"	f
 pathConnected	src/Dodge/Room/CheckConsistency.hs	14;"	f
 pathEdgeObstructed	src/Dodge/Path.hs	43;"	f
 pauseAndFloatCam	src/Dodge/Camera.hs	10;"	f
-pauseGame	src/Dodge/Update/Input/InGame.hs	302;"	f
+pauseGame	src/Dodge/Update/Input/InGame.hs	304;"	f
 pauseMenu	src/Dodge/Menu.hs	53;"	f
 pauseMenuOptions	src/Dodge/Menu.hs	58;"	f
 pauseSound	src/Dodge/SoundLogic.hs	41;"	f
@@ -5291,7 +5294,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	692;"	f
+ppEvents	src/Dodge/Update.hs	691;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5593,11 +5596,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	449;"	f
+selNumPos	src/Dodge/Render/HUD.hs	450;"	f
-selNumPosCardinal	src/Dodge/Render/HUD.hs	472;"	f
+selNumPosCardinal	src/Dodge/Render/HUD.hs	473;"	f
 selSecDrawCursor	src/Dodge/Render/List.hs	125;"	f
 selSecDrawCursorAt	src/Dodge/Render/List.hs	103;"	f
-selSecSelCol	src/Dodge/Render/HUD.hs	495;"	f
+selSecSelCol	src/Dodge/Render/HUD.hs	496;"	f
 selSecSelSize	src/Dodge/SelectionSections.hs	182;"	f
 selSecYint	src/Dodge/SelectionSections.hs	191;"	f
 selectCreatureDebugItem	src/Dodge/Debug.hs	39;"	f
@@ -5633,7 +5636,7 @@ 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	481;"	f
+setOldPos	src/Dodge/Update.hs	480;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
@@ -5740,7 +5743,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	777;"	f
+simpleCrSprings	src/Dodge/Update.hs	776;"	f
 simpleDamFL	src/Dodge/Flame.hs	41;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
@@ -5789,7 +5792,7 @@ soundToVol	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	4;"	f
 soundWithStatus	src/Dodge/SoundLogic.hs	98;"	f
 soundWithStatusVolume	src/Dodge/SoundLogic.hs	48;"	f
 southPillarsRoom	src/Dodge/Room/LongDoor.hs	85;"	f
-spaceAction	src/Dodge/Update/Input/InGame.hs	305;"	f
+spaceAction	src/Dodge/Update/Input/InGame.hs	307;"	f
 spanColLightBlackI	src/Dodge/Placement/Instance/LightSource.hs	186;"	f
 spanColLightI	src/Dodge/Placement/Instance/LightSource.hs	179;"	f
 spanLS	src/Dodge/Placement/Instance/LightSource.hs	171;"	f
@@ -5967,7 +5970,7 @@ 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	461;"	f
+tmUpdate	src/Dodge/Update.hs	460;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
@@ -5985,8 +5988,8 @@ toggleCombineInv	src/Dodge/DisplayInventory.hs	31;"	f
 toggleCommand	src/Dodge/Terminal.hs	197;"	f
 toggleEquipmentAt	src/Dodge/Creature/Impulse/UseItem.hs	79;"	f
 toggleJust	src/MaybeHelp.hs	41;"	f
-toggleMap	src/Dodge/Update/Input/InGame.hs	329;"	f
+toggleMap	src/Dodge/Update/Input/InGame.hs	331;"	f
-toggleTweakInv	src/Dodge/Update/Input/InGame.hs	344;"	f
+toggleTweakInv	src/Dodge/Update/Input/InGame.hs	346;"	f
 togglesToEffects	src/Dodge/Terminal.hs	248;"	f
 tone440S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	474;"	f
 tone440sawtoothS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	444;"	f
@@ -6057,7 +6060,7 @@ trunkDepth	src/TreeHelp.hs	161;"	f
 tryAssignHotkey	src/Dodge/Creature/YourControl.hs	85;"	f
 tryAttachBulletBelt	src/Dodge/Euse.hs	40;"	f
 tryChargeBattery	src/Dodge/Euse.hs	43;"	f
-tryCombine	src/Dodge/Update/Input/InGame.hs	353;"	f
+tryCombine	src/Dodge/Update/Input/InGame.hs	355;"	f
 tryGetChannel	src/Sound.hs	96;"	f
 tryGetRootAttachedFromInvID	src/Dodge/Inventory/Location.hs	20;"	f
 tryGetRootItemInvID	src/Dodge/Inventory/Location.hs	29;"	f
@@ -6103,82 +6106,82 @@ updateAllNodes	src/TreeHelp.hs	85;"	f
 updateArc	src/Dodge/Tesla/Arc.hs	86;"	f
 updateAttachedItems	src/Dodge/Creature/State.hs	173;"	f
 updateAutoRecharge	src/Dodge/Creature/State.hs	324;"	f
-updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	240;"	f
+updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	242;"	f
 updateBarrel	src/Dodge/Barreloid.hs	45;"	f
 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	558;"	f
+updateBullets	src/Dodge/Update.hs	557;"	f
 updateCamera	src/Dodge/Update/Camera.hs	31;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	124;"	f
-updateCloud	src/Dodge/Update.hs	743;"	f
+updateCloud	src/Dodge/Update.hs	742;"	f
-updateClouds	src/Dodge/Update.hs	587;"	f
+updateClouds	src/Dodge/Update.hs	586;"	f
 updateCombineInvClick	src/Dodge/Update/Input/InGame.hs	105;"	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	527;"	f
+updateCreatureGroups	src/Dodge/Update.hs	526;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	503;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	502;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	90;"	f
-updateDelayedEvents	src/Dodge/Update.hs	806;"	f
+updateDelayedEvents	src/Dodge/Update.hs	805;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	112;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	548;"	f
+updateDistortions	src/Dodge/Update.hs	547;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	46;"	f
-updateEnergyBalls	src/Dodge/Update.hs	575;"	f
+updateEnergyBalls	src/Dodge/Update.hs	574;"	f
-updateEnterRegex	src/Dodge/Update/Input/InGame.hs	281;"	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	572;"	f
+updateFlames	src/Dodge/Update.hs	571;"	f
 updateFlare	src/Dodge/Flare.hs	7;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	36;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	95;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	91;"	f
-updateGusts	src/Dodge/Update.hs	726;"	f
+updateGusts	src/Dodge/Update.hs	725;"	f
 updateHeldRootItem	src/Dodge/Creature/State.hs	167;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	12;"	f
-updateIMl	src/Dodge/Update.hs	517;"	f
+updateIMl	src/Dodge/Update.hs	516;"	f
-updateIMl'	src/Dodge/Update.hs	522;"	f
+updateIMl'	src/Dodge/Update.hs	521;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	70;"	f
-updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	184;"	f
+updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	186;"	f
-updateInstantBullets	src/Dodge/Update.hs	664;"	f
+updateInstantBullets	src/Dodge/Update.hs	663;"	f
 updateInv	src/Dodge/Creature/State.hs	152;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	85;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	268;"	f
 updateItemWithOrientation	src/Dodge/Creature/State.hs	194;"	f
-updateKeyInGame	src/Dodge/Update/Input/InGame.hs	178;"	f
+updateKeyInGame	src/Dodge/Update/Input/InGame.hs	180;"	f
-updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	167;"	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	446;"	f
+updateLasers	src/Dodge/Update.hs	445;"	f
-updateLightSources	src/Dodge/Update.hs	551;"	f
+updateLightSources	src/Dodge/Update.hs	550;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
-updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	199;"	f
+updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	201;"	f
-updateMIM	src/Dodge/Update.hs	677;"	f
+updateMIM	src/Dodge/Update.hs	676;"	f
 updateMachine	src/Dodge/Machine/Update.hs	18;"	f
 updateMouseContext	src/Dodge/Update.hs	390;"	f
 updateMouseInventoryEffects	src/Dodge/Update.hs	305;"	f
 updateMouseInventorySelection	src/Dodge/Update.hs	308;"	f
 updateMouseInventorySelection'	src/Dodge/Update.hs	313;"	f
 updateMovement	src/Dodge/Creature/State.hs	331;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	539;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	538;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	532;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	531;"	f
-updatePastWorlds	src/Dodge/Update.hs	434;"	f
+updatePastWorlds	src/Dodge/Update.hs	433;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	584;"	f
+updatePosEvents	src/Dodge/Update.hs	583;"	f
 updatePreload	src/Preload/Update.hs	20;"	f
-updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	142;"	f
+updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	144;"	f
-updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	145;"	f
+updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	147;"	f
 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	554;"	f
+updateRadarBlips	src/Dodge/Update.hs	553;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	25;"	f
-updateRadarSweeps	src/Dodge/Update.hs	578;"	f
+updateRadarSweeps	src/Dodge/Update.hs	577;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	106;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	35;"	f
@@ -6187,19 +6190,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	695;"	f
+updateSeenWalls	src/Dodge/Update.hs	694;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
-updateShockwaves	src/Dodge/Update.hs	569;"	f
+updateShockwaves	src/Dodge/Update.hs	568;"	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	581;"	f
+updateSparks	src/Dodge/Update.hs	580;"	f
 updateTempLightSource	src/Dodge/LightSource/Update.hs	7;"	f
 updateTeslaArc	src/Dodge/Tesla/Arc.hs	29;"	f
-updateTeslaArcs	src/Dodge/Update.hs	563;"	f
+updateTeslaArcs	src/Dodge/Update.hs	562;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	566;"	f
+updateTractorBeams	src/Dodge/Update.hs	565;"	f
 updateTurret	src/Dodge/Machine/Update.hs	47;"	f
 updateUniverse	src/Dodge/Update.hs	70;"	f
 updateUniverseFirst	src/Dodge/Update.hs	81;"	f
@@ -6210,7 +6213,7 @@ updateUseInputOnScreen	src/Dodge/Update/Input/ScreenLayer.hs	20;"	f
 updateWalkCycle	src/Dodge/Creature/State/WalkCycle.hs	12;"	f
 updateWallDamages	src/Dodge/Update/WallDamage.hs	10;"	f
 updateWheelEvent	src/Dodge/Update/Scroll.hs	20;"	f
-updateWheelEvents	src/Dodge/Update.hs	421;"	f
+updateWheelEvents	src/Dodge/Update.hs	420;"	f
 updateWorldEventFlag	src/Dodge/Update.hs	115;"	f
 updateWorldEventFlags	src/Dodge/Update.hs	103;"	f
 upperBody	src/Dodge/Creature/Picture.hs	133;"	f
@@ -6364,7 +6367,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	215;"	f
+yourAugmentedItem	src/Dodge/Render/HUD.hs	216;"	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
@@ -6382,9 +6385,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	454;"	f
+zoneClouds	src/Dodge/Update.hs	453;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	52;"	f
-zoneCreatures	src/Dodge/Update.hs	498;"	f
+zoneCreatures	src/Dodge/Update.hs	497;"	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