Incomplete work on mouse interaction with filtered inventory

ghcidOutput

@@ -1 +1 @@
-All good (594 modules, at 21:29:46)
+All good (594 modules, at 23:43:04)

src/Dodge/Data/Input.hs

@@ -23,6 +23,8 @@ data MouseContext
     | MouseMenuClick {_mcoMenuClick :: Int}
     | MouseMenuCursor
     | OverInvDrag {_mcoDragPos :: Maybe Int}
+    | OverInvFiltDrag
+    | OverInvFiltDragDrop
     | OverInvDragSelect { _mcoSelStart :: (Int,Int), _mcoSelEnd :: Maybe (Int,Int) }
     | OverInvSelect { _mcoInvSelect :: (Int,Int)}
     | OverInvFilt { _mcoInvFilt :: (Int,Int)}

src/Dodge/Render/Picture.hs

@@ -86,6 +86,8 @@ mouseCursorType u = case u ^. uvWorld . input . mouseContext of
     MouseInGame -> drawPlus 5
     OverInvDrag (Just _) -> drawDrag 5
     OverInvDrag Nothing -> drawDragDrop 5
+    OverInvFiltDrag -> drawFiltDrag 5
+    OverInvFiltDragDrop -> drawFiltDragDrop 5
     OverInvDragSelect {} -> drawDragSelect 5
     OverInvSelect {} -> drawSelect 5
     OverInvFilt {} -> drawCombFilter 5
@@ -156,16 +158,48 @@ drawDragSelect :: Float -> Picture
 drawDragSelect x = polygonWire $ rectWH (0.5 * x) x
 
 drawDrag :: Float -> Picture
-drawDrag x = line [V2 0 x,V2 0 (-x)]
+drawDrag x = line [V2 0 y,V2 0 z]
+    <> line [V2 0 (-y),V2 0 (-z)]
+    <> line [V2 (-w) (z-w), V2 0 z, V2 w (z-w)]
+    <> line [V2 (-w) (w-z), V2 0 (-z), V2 w (w-z)]
+    <> drawSelect 5
+  where
+    z = 1.5 * x
+    y = 0.5 * x
+    w = 0.3 * x
 
 drawDragDrop :: Float -> Picture
-drawDragDrop x = line [V2 (-x) x,V2 0 x,V2 0 (-x)]
-    <> line [V2 (-y) (y-x), V2 0 (-x), V2 y (y-x)] 
+drawDragDrop x = 
+    line (fmap (+V2 z (-x)) [V2 (-x) x,V2 0 x,V2 0 (-x)])
+    <> line (fmap (+V2 z (-x)) [V2 (-y) (y-x), V2 0 (-x), V2 y (y-x)])
+    <> drawSelect 5
   where
+    z = 1.5 * x
     y = 0.7 * x
 
+drawFiltDrag :: Float -> Picture
+drawFiltDrag x = polygonWire
+    [ V2 0 y
+    , V2 x y
+    , V2 0 (-y)
+    , V2 (-x) (-y)
+    ]
+  where
+    y = 0.5 * x
+
+drawFiltDragDrop :: Float -> Picture
+drawFiltDragDrop x = polygonWire
+    [ V2 0 y
+    , V2 x y
+    , V2 0 (-y)
+    , V2 (-x) (-y)
+    ] <> line [V2 (-x) x,V2 0 x,V2 0 (-x)]
+    <> line [V2 (-y) (y-x), V2 0 (-x), V2 y (y-x)]
+  where
+    y = 0.5 * x
+
 drawSelect :: Float -> Picture
-drawSelect x = polygonWire $ rectWH x (0.5 * x)
+drawSelect x = polygonWire $ rectWH (0.5 * x) (0.5 * x)
 --    line [V2 (-x) 0, V2 0 0]
 --drawSelect x = line 
 --    [ V2 x x

src/Dodge/TestString.hs

@@ -22,7 +22,8 @@ import qualified IntMapHelp as IM
 
 testStringInit :: Universe -> [String]
 testStringInit u = [show $
-    u ^? uvWorld . hud . hudElement . diSelectionExtra] 
+    u ^? uvWorld . input . mouseContext . mcoSelEnd
+    ] 
 --    fmap show $ u ^.. uvWorld . cWorld . lWorld . creatures . ix 0 . crInv . each . itLocation . ilIsRoot
 --    , show . fmap (fmap _siPictures) $ u ^? uvWorld . hud . hudElement . diSections . ix (-1) . ssItems
 --    <> [[toEnum (i+j * 32) | i <- [0..31]] | j <- [0..7]]

src/Dodge/Update.hs

@@ -304,56 +304,10 @@ checkTermDist w = fromMaybe w $ do
         w & hud . hudElement . subInventory
             .~ NoSubInventory --MouseInvNothing
 
----- for other mouse effects, see yourControl
---updateMouseInventoryEffects :: Configuration -> World -> World
---updateMouseInventoryEffects cfig w = w
-
---updateMouseInventorySelection :: Configuration -> World -> World
---updateMouseInventorySelection cfig w = fromMaybe w $ do
---    sss <- w ^? hud . hudElement . diSections
---    return $ updateMouseInventorySelection' sss cfig w
-
---updateMouseInventorySelection' ::
---    IM.IntMap (SelectionSection a) ->
---    Configuration ->
---    World ->
---    World
---updateMouseInventorySelection' sss cfig w
---    | leftclickstart = w
-----   case msel of
-----        Nothing -> fromMaybe w $ do
-----            ysel <- inverseSelSecYint (posSelSecYint cfig ldp (mpos ^. _y)) sss
-----            return $
-----                w & input . mouseContext
-----                    .~ OverInvDragSelect ysel Nothing
-----        Just p -> w --startDrag p w
---    | leftclickheld = case w ^? input . mouseContext of
-----        Just OverInvDragSelect{} ->
-----            w & input . mouseContext . mcoSelEnd .~ msel
-----        Just OverInvDrag -> fromMaybe w $ do
-----            sel <- w ^? hud . hudElement . diSelection . _Just
-----            x <- w ^? hud . hudElement . diSelectionExtra
-----            return $ w & shiftInvItems sel x cfig mpos ldp sss
---        _ -> w
---    | otherwise = w
-----    | otherwise = case w ^? input . mouseContext of
-----        Just (OverInvDragSelect ssel (Just esel)) ->
-----            w & input . mouseContext .~ MouseInGame
-----                & hud . hudElement . diSelectionExtra
-----                    .~ (max (snd ssel) (snd esel) - min (snd ssel) (snd esel))
-----                & augInvDirectSelect (min ssel esel)
-----        _ -> w-- & hud . hudElement . subInventory . nsSelected .~ MouseInvNothing
---  where
---    leftclickstart = w ^? input . mouseButtons . ix ButtonLeft == Just 0 && nobuttonright
---    leftclickheld = ButtonLeft `M.member` (w ^. input . mouseButtons) && nobuttonright
---    nobuttonright = not $ ButtonRight `M.member` (w ^. input . mouseButtons)
---    mpos = w ^. input . mousePos
---    ldp = invDisplayParams w
---    msel = inverseSelNumPos cfig ldp sss (w ^. input . mousePos)
-
-
 updateMouseContext :: Configuration -> Universe -> Universe
 updateMouseContext cfig u = case u ^. uvWorld . input . mouseContext of
+    OverInvFiltDrag -> u & uvWorld . input . mouseContext .~ invfiltdrag
+    OverInvFiltDragDrop -> u & uvWorld . input . mouseContext .~ invfiltdrag
     OverInvDrag {} -> u & uvWorld . input . mouseContext .~ invdrag
     OverInvDragSelect{} -> u
     _ -> u & uvWorld . input . mouseContext
@@ -387,6 +341,10 @@ updateMouseContext cfig u = case u ^. uvWorld . input . mouseContext of
         sss <- w ^? hud . hudElement . diSections
         (0,j) <- inverseSelNumPos cfig (invDisplayParams w) sss mpos
         return $ OverInvDrag $ Just j
+    invfiltdrag = fromMaybe OverInvFiltDragDrop $ do
+        sss <- w ^? hud . hudElement . diSections
+        (0,_) <- inverseSelNumPos cfig (invDisplayParams w) sss mpos
+        return $ OverInvFiltDrag
     overinv = do
         sss <- w ^? hud . hudElement . diSections
         selpos <- inverseSelNumPos cfig (invDisplayParams w) sss mpos

src/Dodge/Update/Input/InGame.hs

@@ -39,12 +39,7 @@ updateUseInputInGame u = updateFunctionKeys $ case u ^. uvWorld . hud . hudEleme
     DisplayCarte -> over uvWorld updatePressedButtonsCarte u
     DisplayInventory{_subInventory = si} -> case si of
         DisplayTerminal tmid -> updateKeysInTerminal tmid u
---            | lbinitialpress ->
---                u & uvWorld
---                    %~ doTerminalEffectLB (w ^?! cWorld . lWorld . terminals . ix tmid)
---            | otherwise -> updateKeysInTerminal tmid u
         CombineInventory{_ciSections = sss, _ciSelection = msel}
---            | lbinitialpress -> u & uvWorld %~ updateCombineInvClick sss
             | inSubInvRegex (u ^. uvWorld) ->
                 u
                     & uvWorld . hud . hudElement . subInventory
@@ -123,6 +118,8 @@ dropSelected w = fromMaybe w $ do
 
 updateMouseReleaseInGame :: World -> World
 updateMouseReleaseInGame w = case w ^. input . mouseContext of 
+    OverInvFiltDrag -> w & input . mouseContext .~ MouseInGame
+    OverInvFiltDragDrop -> w & input . mouseContext .~ MouseInGame
     OverInvDrag mpos -> fromMaybe (dropSelected w & input . mouseContext .~ MouseInGame) $ do
             j <- mpos
             return $ w & input . mouseContext .~ OverInvSelect (0,j)
@@ -178,11 +175,13 @@ updateMouseClickInGame cfig w = case w ^. input . mouseContext of
     mpos = w ^. input . mousePos
 
 startDrag :: (Int, Int) -> World -> World
-startDrag (a, b) w = fromMaybe (augInvDirectSelect (a, b) $ setmichosen 0 w) $ do
-    (i, j) <- w ^? hud . hudElement . diSelection . _Just
-    x <- w ^? hud . hudElement . diSelectionExtra
-    guard $ i == a && b >= j && b <= j + x
-    return $ setmichosen x w
+startDrag (a, b) w = case w ^? hud . hudElement . diInvFilter . _Just of
+    Just {} -> w & input . mouseContext .~ OverInvFiltDrag
+    _ -> fromMaybe (augInvDirectSelect (a, b) $ setmichosen 0 w) $ do
+        (i, j) <- w ^? hud . hudElement . diSelection . _Just
+        x <- w ^? hud . hudElement . diSelectionExtra
+        guard $ i == a && b >= j && b <= j + x
+        return $ setmichosen x w
   where
     setmichosen x =
         (input . mouseContext .~ OverInvDrag (Just b))

tags

@@ -905,7 +905,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	37;"	t
+Input	src/Dodge/Data/Input.hs	39;"	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
@@ -1354,16 +1354,18 @@ 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	30;"	C
-OverCombEscape	src/Dodge/Data/Input.hs	32;"	C
-OverCombFilter	src/Dodge/Data/Input.hs	31;"	C
-OverCombSelect	src/Dodge/Data/Input.hs	29;"	C
+OverCombCombine	src/Dodge/Data/Input.hs	32;"	C
+OverCombEscape	src/Dodge/Data/Input.hs	34;"	C
+OverCombFilter	src/Dodge/Data/Input.hs	33;"	C
+OverCombSelect	src/Dodge/Data/Input.hs	31;"	C
 OverInvDrag	src/Dodge/Data/Input.hs	25;"	C
-OverInvDragSelect	src/Dodge/Data/Input.hs	26;"	C
-OverInvFilt	src/Dodge/Data/Input.hs	28;"	C
-OverInvSelect	src/Dodge/Data/Input.hs	27;"	C
-OverTerminalEscape	src/Dodge/Data/Input.hs	34;"	C
-OverTerminalReturn	src/Dodge/Data/Input.hs	33;"	C
+OverInvDragSelect	src/Dodge/Data/Input.hs	28;"	C
+OverInvFilt	src/Dodge/Data/Input.hs	30;"	C
+OverInvFiltDrag	src/Dodge/Data/Input.hs	26;"	C
+OverInvFiltDragDrop	src/Dodge/Data/Input.hs	27;"	C
+OverInvSelect	src/Dodge/Data/Input.hs	29;"	C
+OverTerminalEscape	src/Dodge/Data/Input.hs	36;"	C
+OverTerminalReturn	src/Dodge/Data/Input.hs	35;"	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
@@ -1854,15 +1856,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	58;"	C
-TSdelete	src/Dodge/Data/Input.hs	59;"	C
-TSdown	src/Dodge/Data/Input.hs	64;"	C
-TSescape	src/Dodge/Data/Input.hs	56;"	C
-TSleft	src/Dodge/Data/Input.hs	61;"	C
-TSreturn	src/Dodge/Data/Input.hs	57;"	C
-TSright	src/Dodge/Data/Input.hs	62;"	C
-TStab	src/Dodge/Data/Input.hs	60;"	C
-TSup	src/Dodge/Data/Input.hs	63;"	C
+TSbackspace	src/Dodge/Data/Input.hs	60;"	C
+TSdelete	src/Dodge/Data/Input.hs	61;"	C
+TSdown	src/Dodge/Data/Input.hs	66;"	C
+TSescape	src/Dodge/Data/Input.hs	58;"	C
+TSleft	src/Dodge/Data/Input.hs	63;"	C
+TSreturn	src/Dodge/Data/Input.hs	59;"	C
+TSright	src/Dodge/Data/Input.hs	64;"	C
+TStab	src/Dodge/Data/Input.hs	62;"	C
+TSup	src/Dodge/Data/Input.hs	65;"	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
@@ -1876,7 +1878,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	55;"	t
+TermSignal	src/Dodge/Data/Input.hs	57;"	t
 Terminal	src/Dodge/Data/Terminal.hs	31;"	t
 Terminal	src/Dodge/Data/Terminal.hs	6;"	m
 Terminal	src/Dodge/Debug/Terminal.hs	3;"	m
@@ -2323,8 +2325,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	46;"	f
-_clickWorldPos	src/Dodge/Data/Input.hs	48;"	f
+_clickPos	src/Dodge/Data/Input.hs	48;"	f
+_clickWorldPos	src/Dodge/Data/Input.hs	50;"	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
@@ -2604,9 +2606,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	47;"	f
+_heldPos	src/Dodge/Data/Input.hs	49;"	f
 _heldTriggerType	src/Dodge/Data/Item/Use.hs	42;"	f
-_heldWorldPos	src/Dodge/Data/Input.hs	49;"	f
+_heldWorldPos	src/Dodge/Data/Input.hs	51;"	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
@@ -2746,15 +2748,15 @@ _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	30;"	f
-_mcoCombSelect	src/Dodge/Data/Input.hs	29;"	f
+_mcoCombCombine	src/Dodge/Data/Input.hs	32;"	f
+_mcoCombSelect	src/Dodge/Data/Input.hs	31;"	f
 _mcoDragPos	src/Dodge/Data/Input.hs	25;"	f
-_mcoInvFilt	src/Dodge/Data/Input.hs	28;"	f
-_mcoInvSelect	src/Dodge/Data/Input.hs	27;"	f
+_mcoInvFilt	src/Dodge/Data/Input.hs	30;"	f
+_mcoInvSelect	src/Dodge/Data/Input.hs	29;"	f
 _mcoMenuClick	src/Dodge/Data/Input.hs	23;"	f
-_mcoSelEnd	src/Dodge/Data/Input.hs	26;"	f
-_mcoSelStart	src/Dodge/Data/Input.hs	26;"	f
-_mcoTermID	src/Dodge/Data/Input.hs	33;"	f
+_mcoSelEnd	src/Dodge/Data/Input.hs	28;"	f
+_mcoSelStart	src/Dodge/Data/Input.hs	28;"	f
+_mcoTermID	src/Dodge/Data/Input.hs	35;"	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
@@ -2778,11 +2780,11 @@ _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	42;"	f
-_mouseButtonsReleased	src/Dodge/Data/Input.hs	43;"	f
-_mouseContext	src/Dodge/Data/Input.hs	39;"	f
-_mouseMoving	src/Dodge/Data/Input.hs	40;"	f
-_mousePos	src/Dodge/Data/Input.hs	38;"	f
+_mouseButtons	src/Dodge/Data/Input.hs	44;"	f
+_mouseButtonsReleased	src/Dodge/Data/Input.hs	45;"	f
+_mouseContext	src/Dodge/Data/Input.hs	41;"	f
+_mouseMoving	src/Dodge/Data/Input.hs	42;"	f
+_mousePos	src/Dodge/Data/Input.hs	40;"	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
@@ -2886,7 +2888,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	41;"	f
+_pressedKeys	src/Dodge/Data/Input.hs	43;"	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
@@ -3008,14 +3010,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	44;"	f
+_scrollAmount	src/Dodge/Data/Input.hs	46;"	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	51;"	f
-_scrollTestInt	src/Dodge/Data/Input.hs	52;"	f
+_scrollTestFloat	src/Dodge/Data/Input.hs	53;"	f
+_scrollTestInt	src/Dodge/Data/Input.hs	54;"	f
 _scurColor	src/Dodge/Data/SelectionList.hs	27;"	f
 _scurPos	src/Dodge/Data/SelectionList.hs	25;"	f
 _scurSize	src/Dodge/Data/SelectionList.hs	26;"	f
@@ -3069,7 +3071,7 @@ _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
-_smoothScrollAmount	src/Dodge/Data/Input.hs	45;"	f
+_smoothScrollAmount	src/Dodge/Data/Input.hs	47;"	f
 _soundAngDist	src/Sound/Data.hs	53;"	f
 _soundChannel	src/Sound/Data.hs	52;"	f
 _soundChunkID	src/Sound/Data.hs	57;"	f
@@ -3124,7 +3126,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	50;"	f
+_textInput	src/Dodge/Data/Input.hs	52;"	f
 _textureObject	src/Shader/Data.hs	95;"	f
 _tiSel	src/Dodge/Data/Terminal.hs	21;"	f
 _tiText	src/Dodge/Data/Terminal.hs	20;"	f
@@ -3343,10 +3345,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	442;"	f
+advanceScrollAmount	src/Dodge/Update.hs	399;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	29;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	45;"	f
-aimDelaySweep	src/Dodge/Render/Picture.hs	197;"	f
+aimDelaySweep	src/Dodge/Render/Picture.hs	228;"	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
@@ -3587,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	729;"	f
+checkEndGame	src/Dodge/Update.hs	686;"	f
 checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
@@ -3614,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	782;"	f
+clClSpringVel	src/Dodge/Update.hs	739;"	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
@@ -3641,7 +3643,7 @@ 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	752;"	f
+cloudEffect	src/Dodge/Update.hs	709;"	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
@@ -3711,7 +3713,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	800;"	f
+crCrSpring	src/Dodge/Update.hs	757;"	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
@@ -3732,7 +3734,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	795;"	f
+crSpring	src/Dodge/Update.hs	752;"	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
@@ -3983,7 +3985,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	471;"	f
+displayTerminalLineString	src/Dodge/Update.hs	428;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -4040,7 +4042,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	295;"	f
+doRegexInput	src/Dodge/Update/Input/InGame.hs	301;"	f
 doRoomInPlacements	src/Dodge/Layout.hs	97;"	f
 doRoomOutPlacements	src/Dodge/Layout.hs	107;"	f
 doRoomPlacements	src/Dodge/Layout.hs	122;"	f
@@ -4066,7 +4068,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	453;"	f
+doWorldEvents	src/Dodge/Update.hs	410;"	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
@@ -4093,8 +4095,8 @@ 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	178;"	f
-drawCombFilterJump	src/Dodge/Render/Picture.hs	151;"	f
+drawCombFilter	src/Dodge/Render/Picture.hs	209;"	f
+drawCombFilterJump	src/Dodge/Render/Picture.hs	153;"	f
 drawCombineInventory	src/Dodge/Render/HUD.hs	185;"	f
 drawConcurrentMessage	src/Dodge/Render/Picture.hs	62;"	f
 drawCorpse	src/Dodge/Corpse/Draw.hs	6;"	f
@@ -4107,22 +4109,24 @@ drawCursorAt	src/Dodge/Render/List.hs	70;"	f
 drawDDATest	src/Dodge/Debug/Picture.hs	256;"	f
 drawDoorPaths	src/Dodge/Debug/Picture.hs	217;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	81;"	f
-drawDrag	src/Dodge/Render/Picture.hs	158;"	f
-drawDragDrop	src/Dodge/Render/Picture.hs	161;"	f
+drawDrag	src/Dodge/Render/Picture.hs	160;"	f
+drawDragDrop	src/Dodge/Render/Picture.hs	171;"	f
 drawDragSelect	src/Dodge/Render/HUD.hs	159;"	f
-drawDragSelect	src/Dodge/Render/Picture.hs	155;"	f
+drawDragSelect	src/Dodge/Render/Picture.hs	157;"	f
 drawDragSelected	src/Dodge/Render/HUD.hs	147;"	f
-drawEmptySet	src/Dodge/Render/Picture.hs	106;"	f
+drawEmptySet	src/Dodge/Render/Picture.hs	108;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	8;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	140;"	f
 drawExamineInventory	src/Dodge/Render/HUD.hs	199;"	f
 drawFarWallDetect	src/Dodge/Debug/Picture.hs	234;"	f
+drawFiltDrag	src/Dodge/Render/Picture.hs	177;"	f
+drawFiltDragDrop	src/Dodge/Render/Picture.hs	187;"	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	74;"	f
 drawForceField	src/Dodge/Wall/Draw.hs	11;"	f
-drawGapPlus	src/Dodge/Render/Picture.hs	188;"	f
+drawGapPlus	src/Dodge/Render/Picture.hs	219;"	f
 drawGib	src/Dodge/Prop/Draw.hs	28;"	f
 drawHP	src/Dodge/Render/HUD.hs	53;"	f
 drawHUD	src/Dodge/Render/HUD.hs	45;"	f
@@ -4141,8 +4145,8 @@ drawListYgapScaleYoff	src/Dodge/Render/List.hs	98;"	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	126;"	f
-drawMenuCursor	src/Dodge/Render/Picture.hs	139;"	f
+drawMenuClick	src/Dodge/Render/Picture.hs	128;"	f
+drawMenuCursor	src/Dodge/Render/Picture.hs	141;"	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
@@ -4155,7 +4159,7 @@ drawOptions	src/Dodge/Render/MenuScreen.hs	35;"	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	123;"	f
+drawPlus	src/Dodge/Render/Picture.hs	125;"	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
@@ -4163,11 +4167,11 @@ drawProp'	src/Dodge/Prop/Draw.hs	12;"	f
 drawRBOptions	src/Dodge/Render/HUD.hs	243;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	7;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	30;"	f
-drawReturn	src/Dodge/Render/Picture.hs	112;"	f
+drawReturn	src/Dodge/Render/Picture.hs	114;"	f
 drawRootCursor	src/Dodge/Render/HUD.hs	77;"	f
 drawSSCursor	src/Dodge/SelectionSections/Draw.hs	30;"	f
 drawSSMultiCursor	src/Dodge/SelectionSections/Draw.hs	41;"	f
-drawSelect	src/Dodge/Render/Picture.hs	167;"	f
+drawSelect	src/Dodge/Render/Picture.hs	198;"	f
 drawSelectionList	src/Dodge/Render/List.hs	35;"	f
 drawSelectionListBackground	src/Dodge/Render/List.hs	51;"	f
 drawSelectionSections	src/Dodge/SelectionSections/Draw.hs	17;"	f
@@ -4180,7 +4184,7 @@ 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	177;"	f
-drawSweep	src/Dodge/Render/Picture.hs	204;"	f
+drawSweep	src/Dodge/Render/Picture.hs	235;"	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
@@ -4205,7 +4209,8 @@ drawZoneNearPointCursor	src/Dodge/Debug/Picture.hs	249;"	f
 droneLauncher	src/Dodge/Item/Weapon/Drone.hs	11;"	f
 dropByState	src/Dodge/Creature/State.hs	118;"	f
 dropExcept	src/Dodge/Creature/Action.hs	172;"	f
-dropItem	src/Dodge/Creature/Action.hs	177;"	f
+dropItem	src/Dodge/Creature/Action.hs	178;"	f
+dropSelected	src/Dodge/Update/Input/InGame.hs	112;"	f
 drumMag	src/Dodge/Item/Ammo.hs	48;"	f
 dtIL	src/Dodge/DoubleTree.hs	75;"	f
 dtToAdjRootParent	src/Dodge/DoubleTree.hs	126;"	f
@@ -4636,7 +4641,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	420;"	f
+isOverTerminalScreen	src/Dodge/Update.hs	377;"	f
 isPutID	src/Dodge/Placement/Instance/Wall.hs	129;"	f
 isRHS	src/Geometry/LHS.hs	24;"	f
 isUnusedLnk	src/Dodge/PlacementSpot.hs	61;"	f
@@ -4893,7 +4898,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	714;"	f
+markWallSeen	src/Dodge/Update.hs	671;"	f
 maxDamageType	src/Dodge/Damage.hs	37;"	f
 maxShowX	src/Dodge/Combine/Graph.hs	49;"	f
 maxViewDistance	src/Dodge/Viewpoints.hs	26;"	f
@@ -4904,7 +4909,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	457;"	f
+maybeExitCombine	src/Dodge/Update/Input/InGame.hs	463;"	f
 maybeOpenTerminal	src/Dodge/Update.hs	123;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	111;"	f
@@ -5020,7 +5025,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	743;"	f
+mvGust	src/Dodge/Update.hs	700;"	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
@@ -5129,7 +5134,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	392;"	f
+pauseGame	src/Dodge/Update/Input/InGame.hs	398;"	f
 pauseMenu	src/Dodge/Menu.hs	53;"	f
 pauseMenuOptions	src/Dodge/Menu.hs	58;"	f
 pauseSound	src/Dodge/SoundLogic.hs	41;"	f
@@ -5288,7 +5293,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	706;"	f
+ppEvents	src/Dodge/Update.hs	663;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5630,7 +5635,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	495;"	f
+setOldPos	src/Dodge/Update.hs	452;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
@@ -5685,9 +5690,9 @@ shiftChildren	src/Dodge/Tree/Compose.hs	43;"	f
 shiftDraw	src/Dodge/Render/ShapePicture.hs	66;"	f
 shiftDraw'	src/Dodge/Render/ShapePicture.hs	72;"	f
 shiftInBy	src/Dodge/PlacementSpot.hs	236;"	f
-shiftInvItems	src/Dodge/Update/Input/InGame.hs	184;"	f
-shiftInvItemsDown	src/Dodge/Update/Input/InGame.hs	205;"	f
-shiftInvItemsUp	src/Dodge/Update/Input/InGame.hs	199;"	f
+shiftInvItems	src/Dodge/Update/Input/InGame.hs	190;"	f
+shiftInvItemsDown	src/Dodge/Update/Input/InGame.hs	211;"	f
+shiftInvItemsUp	src/Dodge/Update/Input/InGame.hs	205;"	f
 shiftLinkBy	src/Dodge/Room/Link.hs	87;"	f
 shiftPSBy	src/Dodge/Placement/Shift.hs	12;"	f
 shiftPathBy	src/Dodge/Room/Link.hs	92;"	f
@@ -5727,9 +5732,9 @@ showEquipItem	src/Dodge/Item/Display.hs	68;"	f
 showEquipmentNumber	src/Dodge/Item/Display.hs	110;"	f
 showInt	src/Dodge/Item/Info.hs	31;"	f
 showIntsString	src/Dodge/Tree/Compose.hs	129;"	f
-showManObj	src/Dodge/TestString.hs	47;"	f
+showManObj	src/Dodge/TestString.hs	48;"	f
 showTerminalError	src/Dodge/Debug/Terminal.hs	76;"	f
-showTimeFlow	src/Dodge/TestString.hs	94;"	f
+showTimeFlow	src/Dodge/TestString.hs	95;"	f
 shrinkPolyOnEdges	src/Geometry/Polygon.hs	136;"	f
 shrinkVert	src/Geometry/Polygon.hs	140;"	f
 shuffle	src/RandomHelp.hs	49;"	f
@@ -5737,7 +5742,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	791;"	f
+simpleCrSprings	src/Dodge/Update.hs	748;"	f
 simpleDamFL	src/Dodge/Flame.hs	41;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
@@ -5750,7 +5755,7 @@ singleton	src/DoubleStack.hs	11;"	f
 singletonTrie	src/SimpleTrie.hs	19;"	f
 sizeFBOs	src/Framebuffer/Update.hs	22;"	f
 sizeModule	src/Dodge/Item/Craftable.hs	36;"	f
-sizeSelf	src/Dodge/Creature/Action.hs	197;"	f
+sizeSelf	src/Dodge/Creature/Action.hs	201;"	f
 skwareFadeTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	378;"	f
 slideDoorS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	510;"	f
 slideWindow	src/ListHelp.hs	80;"	f
@@ -5786,7 +5791,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	395;"	f
+spaceAction	src/Dodge/Update/Input/InGame.hs	401;"	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
@@ -5843,7 +5848,7 @@ stackText	src/Picture/Base.hs	188;"	f
 stackedInventory	src/Dodge/Creature.hs	281;"	f
 startCr	src/Dodge/Creature.hs	91;"	f
 startCrafts	src/Dodge/Room/Start.hs	92;"	f
-startDrag	src/Dodge/Update/Input/InGame.hs	173;"	f
+startDrag	src/Dodge/Update/Input/InGame.hs	177;"	f
 startInvList	src/Dodge/Creature.hs	109;"	f
 startInventory	src/Dodge/Creature.hs	112;"	f
 startNewGameInSlot	src/Dodge/StartNewGame.hs	15;"	f
@@ -5965,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	475;"	f
+tmUpdate	src/Dodge/Update.hs	432;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
@@ -5982,8 +5987,8 @@ toggleCombineInv	src/Dodge/DisplayInventory.hs	31;"	f
 toggleCommand	src/Dodge/Terminal.hs	196;"	f
 toggleEquipmentAt	src/Dodge/Creature/Impulse/UseItem.hs	79;"	f
 toggleJust	src/MaybeHelp.hs	41;"	f
-toggleMap	src/Dodge/Update/Input/InGame.hs	419;"	f
-toggleTweakInv	src/Dodge/Update/Input/InGame.hs	434;"	f
+toggleMap	src/Dodge/Update/Input/InGame.hs	425;"	f
+toggleTweakInv	src/Dodge/Update/Input/InGame.hs	440;"	f
 togglesToEffects	src/Dodge/Terminal.hs	248;"	f
 tone440S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	474;"	f
 tone440sawtoothS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	444;"	f
@@ -5991,7 +5996,7 @@ tone440sawtoothquietS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	332;"	f
 topInvW	src/Dodge/ListDisplayParams.hs	53;"	f
 topPrismEdgeIndices	src/Shader/Poke.hs	327;"	f
 topPrismIndices	src/Shader/Poke.hs	402;"	f
-topTestPart	src/Dodge/TestString.hs	43;"	f
+topTestPart	src/Dodge/TestString.hs	44;"	f
 torch	src/Dodge/Item/Held/Utility.hs	26;"	f
 torchShape	src/Dodge/Item/Draw/SPic.hs	213;"	f
 torqueCr	src/Dodge/WorldEffect.hs	69;"	f
@@ -6054,7 +6059,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	443;"	f
+tryCombine	src/Dodge/Update/Input/InGame.hs	449;"	f
 tryGetChannel	src/Sound.hs	96;"	f
 tryGetRootAttachedFromInvID	src/Dodge/Inventory/Location.hs	20;"	f
 tryGetRootItemInvID	src/Dodge/Inventory/Location.hs	29;"	f
@@ -6100,82 +6105,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	330;"	f
+updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	336;"	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	572;"	f
+updateBullets	src/Dodge/Update.hs	529;"	f
 updateCamera	src/Dodge/Update/Camera.hs	31;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	124;"	f
-updateCloud	src/Dodge/Update.hs	757;"	f
-updateClouds	src/Dodge/Update.hs	601;"	f
+updateCloud	src/Dodge/Update.hs	714;"	f
+updateClouds	src/Dodge/Update.hs	558;"	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	541;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	517;"	f
+updateCreatureGroups	src/Dodge/Update.hs	498;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	474;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	92;"	f
-updateDelayedEvents	src/Dodge/Update.hs	820;"	f
+updateDelayedEvents	src/Dodge/Update.hs	777;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	112;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	562;"	f
+updateDistortions	src/Dodge/Update.hs	519;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	46;"	f
-updateEnergyBalls	src/Dodge/Update.hs	589;"	f
-updateEnterRegex	src/Dodge/Update/Input/InGame.hs	371;"	f
+updateEnergyBalls	src/Dodge/Update.hs	546;"	f
+updateEnterRegex	src/Dodge/Update/Input/InGame.hs	377;"	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	586;"	f
+updateFlames	src/Dodge/Update.hs	543;"	f
 updateFlare	src/Dodge/Flare.hs	7;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	36;"	f
-updateFunctionKey	src/Dodge/Update/Input/InGame.hs	222;"	f
-updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	215;"	f
-updateGusts	src/Dodge/Update.hs	740;"	f
+updateFunctionKey	src/Dodge/Update/Input/InGame.hs	228;"	f
+updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	221;"	f
+updateGusts	src/Dodge/Update.hs	697;"	f
 updateHeldRootItem	src/Dodge/Creature/State.hs	167;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	12;"	f
-updateIMl	src/Dodge/Update.hs	531;"	f
-updateIMl'	src/Dodge/Update.hs	536;"	f
+updateIMl	src/Dodge/Update.hs	488;"	f
+updateIMl'	src/Dodge/Update.hs	493;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	70;"	f
-updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	274;"	f
-updateInstantBullets	src/Dodge/Update.hs	678;"	f
+updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	280;"	f
+updateInstantBullets	src/Dodge/Update.hs	635;"	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	268;"	f
-updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	257;"	f
+updateKeyInGame	src/Dodge/Update/Input/InGame.hs	274;"	f
+updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	263;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
 updateLaser	src/Dodge/Laser/Update.hs	13;"	f
-updateLasers	src/Dodge/Update.hs	460;"	f
-updateLightSources	src/Dodge/Update.hs	565;"	f
+updateLasers	src/Dodge/Update.hs	417;"	f
+updateLightSources	src/Dodge/Update.hs	522;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
-updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	289;"	f
-updateMIM	src/Dodge/Update.hs	691;"	f
+updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	295;"	f
+updateMIM	src/Dodge/Update.hs	648;"	f
 updateMachine	src/Dodge/Machine/Update.hs	19;"	f
-updateMouseClickInGame	src/Dodge/Update/Input/InGame.hs	129;"	f
-updateMouseContext	src/Dodge/Update.hs	355;"	f
-updateMouseHeldInGame	src/Dodge/Update/Input/InGame.hs	100;"	f
-updateMouseInGame	src/Dodge/Update/Input/InGame.hs	92;"	f
-updateMouseReleaseInGame	src/Dodge/Update/Input/InGame.hs	116;"	f
+updateMouseClickInGame	src/Dodge/Update/Input/InGame.hs	133;"	f
+updateMouseContext	src/Dodge/Update.hs	307;"	f
+updateMouseHeldInGame	src/Dodge/Update/Input/InGame.hs	95;"	f
+updateMouseInGame	src/Dodge/Update/Input/InGame.hs	87;"	f
+updateMouseReleaseInGame	src/Dodge/Update/Input/InGame.hs	119;"	f
 updateMovement	src/Dodge/Creature/State.hs	331;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	553;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	546;"	f
-updatePastWorlds	src/Dodge/Update.hs	448;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	510;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	503;"	f
+updatePastWorlds	src/Dodge/Update.hs	405;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	598;"	f
+updatePosEvents	src/Dodge/Update.hs	555;"	f
 updatePreload	src/Preload/Update.hs	20;"	f
-updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	232;"	f
-updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	235;"	f
+updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	238;"	f
+updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	241;"	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	568;"	f
+updateRadarBlips	src/Dodge/Update.hs	525;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	25;"	f
-updateRadarSweeps	src/Dodge/Update.hs	592;"	f
+updateRadarSweeps	src/Dodge/Update.hs	549;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	106;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	35;"	f
@@ -6184,19 +6189,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	709;"	f
+updateSeenWalls	src/Dodge/Update.hs	666;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
-updateShockwaves	src/Dodge/Update.hs	583;"	f
+updateShockwaves	src/Dodge/Update.hs	540;"	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	595;"	f
+updateSparks	src/Dodge/Update.hs	552;"	f
 updateTempLightSource	src/Dodge/LightSource/Update.hs	7;"	f
 updateTeslaArc	src/Dodge/Tesla/Arc.hs	29;"	f
-updateTeslaArcs	src/Dodge/Update.hs	577;"	f
+updateTeslaArcs	src/Dodge/Update.hs	534;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	580;"	f
+updateTractorBeams	src/Dodge/Update.hs	537;"	f
 updateTurret	src/Dodge/Machine/Update.hs	47;"	f
 updateUniverse	src/Dodge/Update.hs	71;"	f
 updateUniverseFirst	src/Dodge/Update.hs	83;"	f
@@ -6207,7 +6212,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	435;"	f
+updateWheelEvents	src/Dodge/Update.hs	392;"	f
 updateWorldEventFlag	src/Dodge/Update.hs	117;"	f
 updateWorldEventFlags	src/Dodge/Update.hs	105;"	f
 upperBody	src/Dodge/Creature/Picture.hs	133;"	f
@@ -6360,7 +6365,7 @@ yIntercepts'	src/Dodge/Zoning/Base.hs	74;"	f
 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
+youDropItem	src/Dodge/Creature/Action.hs	187;"	f
 yourAugmentedItem	src/Dodge/Render/HUD.hs	237;"	f
 yourControl	src/Dodge/Creature/YourControl.hs	22;"	f
 yourDefaultSpeed	src/Dodge/Default/Creature.hs	134;"	f
@@ -6379,9 +6384,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	468;"	f
+zoneClouds	src/Dodge/Update.hs	425;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	52;"	f
-zoneCreatures	src/Dodge/Update.hs	512;"	f
+zoneCreatures	src/Dodge/Update.hs	469;"	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