Reimplement dragging upwards with mouse

ghcidOutput

@@ -1,15 +1,10 @@
-/home/justin/Haskell/loop/src/Dodge/Update.hs:357:15: warning: [-Wunused-matches]
+/home/justin/Haskell/loop/src/Dodge/Update.hs:356:5-9: warning: [-Wunused-local-binds]
-    Defined but not used: ‘x’
+    Defined but not used: ‘mysel’
     |
-357 | shiftInvItems x w = w
+356 |     mysel = inverseSelSecYint (posSelSecYint cfig ldp (mpos ^. _y)) sss
-    |               ^
+    |     ^^^^^
-/home/justin/Haskell/loop/src/Dodge/Inventory/Location.hs:13:1-31: warning: [-Wunused-imports]
+/home/justin/Haskell/loop/src/Dodge/Update.hs:359:17-19: warning: [-Wunused-matches]
-    The import of ‘Dodge.Data.SelectionList’ is redundant
-   |
-13 | import Dodge.Data.SelectionList
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-/home/justin/Haskell/loop/src/Dodge/Inventory/Location.hs:75:9-11: warning: [-Wunused-matches]
     Defined but not used: ‘sss’
-   |
+    |
-75 |         sss <- w ^? hud . hudElement . diSections
+359 | shiftInvItemsUp sss (_,i) w = fromMaybe w $ do
-   |         ^^^
+    |                 ^^^

src/Dodge/Data/HUD.hs

@@ -17,16 +17,15 @@ data HUDElement
         { _subInventory :: SubInventory
         , _diSections :: SelectionSections ()
         , _diSelection :: Maybe (Int,Int)
+        , _diSelectionExtra :: Int
         }
     | DisplayCarte
 
 data MouseInventorySelection
-    = NoMouseSel
+    = MouseInvSelect
-    | MouseInvSelect
         {_misSelStart :: (Int, Int), _misMaybeEnd :: Maybe (Int, Int)}
-    | MouseInvChosen
+    | MouseInvDrag
-        { _misExtra :: Int
+    | MouseInvNothing
-        }
 
 data SubInventory
     = NoSubInventory

src/Dodge/Default/World.hs

@@ -162,11 +162,12 @@ defaultDisplayInventory :: HUDElement
 defaultDisplayInventory =
     DisplayInventory
         { _subInventory = NoSubInventory 
-            {_nsSelected = NoMouseSel
+            {_nsSelected = MouseInvNothing
             , _nsMouseOver = Just (0,3)
             }
         , _diSections = defaultInvSections
         , _diSelection = Just (1,0)
+        , _diSelectionExtra = 0
         }
 
 defaultSSSExtra :: SSSExtra

src/Dodge/DisplayInventory.hs

@@ -31,7 +31,7 @@ import Regex
 toggleCombineInv :: Universe -> Universe
 toggleCombineInv uv = case uv ^? uvWorld . hud . hudElement . subInventory of
     Just CombineInventory{} -> uv & uvWorld . hud . hudElement . subInventory 
-        .~ NoSubInventory NoMouseSel Nothing
+        .~ NoSubInventory MouseInvNothing Nothing
     _ -> uv & uvWorld %~ enterCombineInv (uv ^. uvConfig)
 
 updateCombinePositioning :: Universe -> Universe

src/Dodge/Inventory/Location.hs

@@ -10,7 +10,6 @@ import qualified Data.IntSet as IS
 import Data.Maybe
 import Dodge.Base.You
 import Dodge.Data.Item.Use.Consumption.LoadAction
-import Dodge.Data.SelectionList
 import Dodge.Data.World
 import Dodge.Item.Grammar
 import qualified IntMapHelp as IM
@@ -72,7 +71,6 @@ setInvPosFromSS w =
         & cWorld . lWorld . creatures . ix 0 . crManipulation . manObject .~ thesel
   where
     thesel = fromMaybe SelNothing $ do
-        sss <- w ^? hud . hudElement . diSections
         (i, j) <- w ^? hud . hudElement . diSelection . _Just
         case i of
             (-1) -> Just SortInventory

src/Dodge/Render/HUD.hs

@@ -6,9 +6,9 @@ module Dodge.Render.HUD (
     selNumPosCardinal, -- this shoud probably be pushed back here
 ) where
 
-import Dodge.SelectionSections
 import Control.Lens
 import Control.Monad
+import Data.List (sort)
 import qualified Data.Map.Strict as M
 import Data.Maybe
 import qualified Data.Vector as V
@@ -31,11 +31,11 @@ import Dodge.Render.Connectors
 import Dodge.Render.HUD.Carte
 import Dodge.Render.List
 import Dodge.ScreenPos
+import Dodge.SelectionSections
 import Dodge.SelectionSections.Draw
 import Geometry
 import qualified IntMapHelp as IM
 import Justify
-import Data.List (sort)
 import Picture
 import SDL (MouseButton (..))
 
@@ -60,7 +60,9 @@ drawInventory :: SelectionSections () -> World -> Configuration -> Picture
 drawInventory sss w cfig =
     drawSelectionSections sss (w ^? hud . hudElement . diSelection . _Just) ldp cfig
         <> iextra
-        <> translateScreenPos cfig (ldp ^. ldpPos)
+        <> translateScreenPos
+            cfig
+            (ldp ^. ldpPos)
             (drawDIMouseOver w)
         <> drawDISelections w cfig
         <> drawDISelections' w cfig
@@ -75,41 +77,39 @@ drawInventory sss w cfig =
 
 drawDIMouseOver :: World -> Picture
 drawDIMouseOver w = fromMaybe mempty $ do
-    (_,i) <- w ^? hud . hudElement . subInventory . nsMouseOver . _Just
+    (_, i) <- w ^? hud . hudElement . subInventory . nsMouseOver . _Just
     sss <- w ^? hud . hudElement . diSections
     let idp = invDisplayParams w
-    return . color (withAlpha 0.5 white) $ selSecDrawCursorAt (0,i) 10 idp sss
+    return . color (withAlpha 0.5 white) $ selSecDrawCursorAt (0, i) 10 idp sss
 
-getMouseInvSel :: World -> Maybe ((Int,Int),(Int,Int))
+getMouseInvSel :: World -> Maybe ((Int, Int), (Int, Int))
 getMouseInvSel w = case w ^? hud . hudElement . subInventory . nsSelected of
-    Just (MouseInvSelect s (Just e)) -> Just (s,e)
+    Just (MouseInvSelect s (Just e)) -> Just (s, e)
     _ -> Nothing
 
-getMouseInvSel' :: World -> Maybe ((Int,Int),(Int,Int))
+getMouseInvSel' :: World -> Maybe ((Int, Int), (Int, Int))
-getMouseInvSel' w = case w ^? hud . hudElement . subInventory . nsSelected of
+getMouseInvSel' w = do
-    Just (MouseInvChosen x) -> do
+    x <- w ^? hud . hudElement . diSelectionExtra
-        (i,j) <- w ^? hud . hudElement . diSelection . _Just
+    (i, j) <- w ^? hud . hudElement . diSelection . _Just
-        return ((i,j),(i,j+x))
+    return ((i, j), (i, j + x))
-    _ -> Nothing
 
 drawDISelections :: World -> Configuration -> Picture
 drawDISelections w cfig = fromMaybe mempty $ do
-    ((i,j),(a,b)) <- getMouseInvSel w
+    ((i, j), (a, b)) <- getMouseInvSel w
     sss <- w ^? hud . hudElement . diSections
     let idp = invDisplayParams w
     tp <- selNumPosCardinal NorthWest8 cfig idp sss i j
     bp <- selNumPosCardinal SouthWest8 cfig idp sss a b
-    return . color red . line $ sort [tp,bp]
+    return . color red . line $ sort [tp, bp]
 
 drawDISelections' :: World -> Configuration -> Picture
 drawDISelections' w cfig = fromMaybe mempty $ do
-    ((i,j),(a,b)) <- getMouseInvSel' w
+    ((i, j), (a, b)) <- getMouseInvSel' w
     sss <- w ^? hud . hudElement . diSections
     let idp = invDisplayParams w
     tp <- selNumPosCardinal NorthEast8 cfig idp sss i j
     bp <- selNumPosCardinal SouthEast8 cfig idp sss a b
-    return . color green . line $ sort [tp,bp]
+    return . color green . line $ sort [tp, bp]
-
 
 drawSubInventory :: SubInventory -> Configuration -> World -> Picture
 drawSubInventory subinv cfig w = case subinv of
@@ -246,9 +246,12 @@ inventoryExtraH sss cfig w i is = fromMaybe mempty $ do
   where
     snum = selNumPos cfig (invDisplayParams w) sss 0
 
-combineInventoryExtra :: SelectionSections CombinableItem 
+combineInventoryExtra ::
-    -> Maybe (Int,Int)
+    SelectionSections CombinableItem ->
-    -> Configuration -> World -> Picture
+    Maybe (Int, Int) ->
+    Configuration ->
+    World ->
+    Picture
 combineInventoryExtra sss msel cfig w = fromMaybe mempty $ do
     (i, j) <- msel
     cpos <- selSecYint i j sss
@@ -379,6 +382,7 @@ selNumPos ::
     Int ->
     Maybe Point2
 selNumPos = selNumPosCardinal West8
+
 --selNumPos cfig ldp sss i j = do
 --    ipos <- selSecYint i j sss
 --    size <- selSecSelSize i j sss
@@ -416,8 +420,5 @@ selNumPosCardinal card cfig ldp sss i j = do
     s = _ldpScale ldp
     ygap = _ldpVerticalGap ldp
 
-
-
-
 selSecSelCol :: Int -> Int -> SelectionSections a -> Maybe Color
 selSecSelCol i j sss = sss ^? sssSections . ix i . ssItems . ix j . siColor

src/Dodge/Terminal.hs

@@ -222,7 +222,8 @@ disconnectTerminal tm =
 
 exitTerminalSubInv :: World -> World
 exitTerminalSubInv w = case w ^? hud . hudElement . subInventory . termID of
-    Just _ -> w & hud . hudElement . subInventory .~ NoSubInventory NoMouseSel Nothing
+    Just _ -> w & hud . hudElement . subInventory 
+        .~ NoSubInventory MouseInvNothing Nothing
     _ -> w
 
 damageCodeCommand :: TerminalCommand

src/Dodge/Update.hs

@@ -292,7 +292,8 @@ checkTermDist w = fromMaybe w $ do
     btid <- w ^? cWorld . lWorld . terminals . ix tmid . tmButtonID
     btpos <- w ^? cWorld . lWorld . buttons . ix btid . btPos
     guard $ dist btpos (_crPos $ you w) > 40
-    return (w & hud . hudElement . subInventory .~ NoSubInventory NoMouseSel Nothing)
+    return $ w & hud . hudElement . subInventory 
+        .~ NoSubInventory MouseInvNothing Nothing
 
 updateMouseInventorySelection :: Configuration -> World -> World
 updateMouseInventorySelection cfig w = fromMaybe w $ do
@@ -311,28 +312,19 @@ updateMouseInventorySelection' sss cfig w
     | leftclickheld = case w ^? hud . hudElement . subInventory . nsSelected of
         Just MouseInvSelect{} ->
             w & hud . hudElement . subInventory . nsSelected . misMaybeEnd .~ msel
-        Just (MouseInvChosen x) -> shiftInvItems x w
+        Just MouseInvDrag -> fromMaybe w $ do
---            | maybe False (< ssel) $ inverseSelBoundaryUp cfig ldp sss mpos ->
+            sel <- w ^? hud . hudElement . diSelection . _Just
---                w
+            return $ w & shiftInvItems sel cfig mpos ldp sss
---                    & shiftInvItemsUp ssel esel (inverseSelBoundaryUp cfig ldp sss mpos)
+        _ -> w
---        Just (MouseInvChosen ssel esel)
---            | maybe False (> esel) $ inverseSelBoundaryDown cfig ldp sss mpos ->
---                w
---                    & shiftInvItemsDown ssel esel (inverseSelBoundaryDown cfig ldp sss mpos)
---        Just (MouseInvChosen{}) -> w
-        _ ->
-            w
-                & hud . hudElement . subInventory . nsSelected .~ NoMouseSel
     | otherwise = case w ^? hud . hudElement . subInventory . nsSelected of
         Just (MouseInvSelect ssel (Just esel)) ->
-            w
+            w & hud . hudElement . subInventory . nsSelected .~ MouseInvNothing
-                & hud . hudElement . subInventory . nsSelected
+                & hud . hudElement . diSelectionExtra 
-                  .~ MouseInvChosen (max (snd ssel) (snd esel) - min (snd ssel) (snd esel))
+                    .~ (max (snd ssel) (snd esel) - min (snd ssel) (snd esel))
                 & augInvDirectSelect (min ssel esel)
         Just (MouseInvSelect _ Nothing) ->
-            w
+            w & hud . hudElement . subInventory . nsSelected .~ MouseInvNothing
-                & hud . hudElement . subInventory . nsSelected .~ NoMouseSel
+        _ -> w & hud . hudElement . subInventory . nsSelected .~ MouseInvNothing
-        _ -> w
   where
     leftclickstart = w ^? input . mouseButtons . ix ButtonLeft == Just 0 && nobuttonright
     leftclickheld = ButtonLeft `M.member` (w ^. input . mouseButtons) && nobuttonright
@@ -345,16 +337,31 @@ updateMouseInventorySelection' sss cfig w
 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 . subInventory . nsSelected . misExtra
+    x <- w ^? hud . hudElement . diSelectionExtra
     guard $ i == a && b >= j && b <= j + x
-    return w
+    return $ setmichosen x w
   where
-    setmichosen x = hud . hudElement . subInventory . nsSelected .~ MouseInvChosen x
+    setmichosen x = (hud . hudElement . subInventory . nsSelected .~ MouseInvDrag)
+        . (hud . hudElement . diSelectionExtra .~ x)
 
---     & hud . hudElement . subInventory . nsSelected %~ startdrag p
+shiftInvItems :: (Int,Int) -> Configuration -> Point2 
+    -> ListDisplayParams
+    -> SelectionSections a 
+    -> World
+    -> World
+shiftInvItems topsel cfig mpos ldp sss w = case inverseSelBoundaryUp cfig ldp sss mpos of
+        Just p | p < topsel -> shiftInvItemsUp sss topsel w
+        _ -> w
+  where
+    mysel = inverseSelSecYint (posSelSecYint cfig ldp (mpos ^. _y)) sss
 
-shiftInvItems :: Int -> World -> World
+shiftInvItemsUp :: SelectionSections a -> (Int,Int) -> World -> World
-shiftInvItems x w = w
+shiftInvItemsUp sss (_,i) w = fromMaybe w $ do
+    x <- w ^? hud . hudElement . diSelectionExtra
+    return $ foldl' f w [i..i+x]  
+  where
+    f w' i' = swapInvItems g i' w'
+    g i' m = fmap fst $ IM.cycleLT i' m
 
 --shiftInvItemsUp :: (Int, Int) -> (Int, Int) -> Maybe (Int, Int) -> World -> World
 --shiftInvItemsUp (_, i) (_, j) Just{} w =

src/Dodge/Update/Input/InGame.hs

@@ -51,7 +51,7 @@ updateUseInputInGame u = case u ^. uvWorld . hud . hudElement of
         _
             | inInvRegex (u ^. uvWorld) ->
                 u & uvWorld . hud . hudElement %~ dodisplayregexinput (-1)
-    -- . diSections %~ doRegexInput (u ^. uvWorld . input) (-1)
+                    -- . diSections %~ doRegexInput (u ^. uvWorld . input) (-1)
                     & uvWorld . worldEventFlags . at InventoryChange ?~ ()
                     & uvWorld %~ setInvPosFromSS
         _
@@ -68,15 +68,17 @@ updateUseInputInGame u = case u ^. uvWorld . hud . hudElement of
     docombineregexinput ci = fromMaybe ci $ do
         sss <- ci ^? ciSections
         msel <- ci ^? ciSelection
-        let (sss',msel') = doRegexInput (u ^. uvWorld . input) (-1) sss msel
+        let (sss', msel') = doRegexInput (u ^. uvWorld . input) (-1) sss msel
-        return $ ci & ciSections .~ sss'
+        return $
-            & ciSelection .~ msel'
+            ci & ciSections .~ sss'
+                & ciSelection .~ msel'
     dodisplayregexinput x di = fromMaybe di $ do
         sss <- di ^? diSections
         msel <- di ^? diSelection
-        let (sss',msel') = doRegexInput (u ^. uvWorld . input) x sss msel
+        let (sss', msel') = doRegexInput (u ^. uvWorld . input) x sss msel
-        return $ di & diSections .~ sss'
+        return $
-            & diSelection .~ msel'
+            di & diSections .~ sss'
+                & diSelection .~ msel'
 
 updatePressedButtonsCarte :: World -> World
 updatePressedButtonsCarte w = updatePressedButtonsCarte' (_mouseButtons (_input w)) w
@@ -146,18 +148,25 @@ updateLongPressInGame uv sc = case sc of
     ScancodeSpace -> over uvWorld spaceAction uv
     _ -> uv
 
-doRegexInput :: Input -> Int -> SelectionSections a -> Maybe (Int,Int) 
+doRegexInput ::
-    -> (SelectionSections a, Maybe (Int,Int))
+    Input ->
+    Int ->
+    SelectionSections a ->
+    Maybe (Int, Int) ->
+    (SelectionSections a, Maybe (Int, Int))
 doRegexInput inp i sss msel
     | backspacetonothing || escapekey = endregex i 0
     | endkeys || endmouse = endregex (i + 1) (j -1)
-    | otherwise = (sss & doTextInputOver inp (sssExtra . sssFilters . ix i . _Just)
+    | otherwise =
-        , msel)
+        ( sss & doTextInputOver inp (sssExtra . sssFilters . ix i . _Just)
+        , msel
+        )
   where
     endregex a b =
-        (sss & sssExtra . sssFilters . ix i .~ Nothing
+        ( sss & sssExtra . sssFilters . ix i .~ Nothing
             & sssSections . ix i . ssItems .~ mempty
-        , msel & ssSetCursor (ssLookupDown a b) sss)
+        , msel & ssSetCursor (ssLookupDown a b) sss
+        )
     j = fromMaybe 0 $ do
         itms <- sss ^? sssSections . ix (i + 1) . ssItems
         fst <$> IM.lookupMin itms
@@ -247,9 +256,12 @@ spaceAction w = case w ^. hud . hudElement of
                 & worldEventFlags . at InventoryChange ?~ ()
         _ -> w
     DisplayInventory{_subInventory = DisplayTerminal{}} ->
-        w & hud . hudElement . subInventory .~ NoSubInventory NoMouseSel Nothing
+        w & hud . hudElement . subInventory
+            .~ NoSubInventory MouseInvNothing Nothing
             & worldEventFlags . at InventoryChange ?~ ()
-    _ -> w & hud . hudElement . subInventory .~ NoSubInventory NoMouseSel Nothing
+    _ ->
+        w & hud . hudElement . subInventory
+            .~ NoSubInventory MouseInvNothing Nothing
   where
     theLoc =
         doWorldPos
@@ -261,22 +273,24 @@ toggleMap u = case u ^. uvWorld . hud . hudElement of
     DisplayCarte ->
         u & uvWorld . hud . hudElement
             .~ DisplayInventory
-                { _subInventory = NoSubInventory NoMouseSel Nothing
+                { _subInventory = NoSubInventory MouseInvNothing Nothing
                 , _diSections = defaultInvSections
                 , _diSelection = Nothing
+                , _diSelectionExtra = 0
                 }
     _ -> u & uvWorld . hud . hudElement .~ DisplayCarte
 
 toggleTweakInv :: World -> World
 toggleTweakInv w = case w ^? hud . hudElement . subInventory of
-    Just ExamineInventory{} -> w & thepointer .~ NoSubInventory NoMouseSel Nothing
+    Just ExamineInventory{} -> w 
+            & thepointer .~ NoSubInventory MouseInvNothing Nothing
     _ -> w & thepointer .~ ExamineInventory -- mi
   where
     thepointer = hud . hudElement . subInventory
 
 --    mi = 0 <$ (yourSelectedItem w >>= (^? itTweaks . tweakParams . ix 0))
 
-tryCombine :: SelectionSections CombinableItem -> Maybe (Int,Int) -> World -> World
+tryCombine :: SelectionSections CombinableItem -> Maybe (Int, Int) -> World -> World
 tryCombine sss msel w = fromMaybe w $ do
     (i, j) <- msel
     CombinableItem is it _ <- sss ^? sssSections . ix i . ssItems . ix j . siPayload
@@ -287,4 +301,5 @@ tryCombine sss msel w = fromMaybe w $ do
 maybeExitCombine :: Universe -> Universe
 maybeExitCombine u
     | ButtonRight `M.member` (u ^. uvWorld . input . mouseButtons) = u
-    | otherwise = u & uvWorld . hud . hudElement . subInventory .~ NoSubInventory NoMouseSel Nothing
+    | otherwise = u & uvWorld . hud . hudElement . subInventory 
+        .~ NoSubInventory MouseInvNothing Nothing

tags

@@ -1184,8 +1184,8 @@ MountedLS	src/Dodge/Data/MountedObject.hs	12;"	C
 MountedObject	src/Dodge/Data/MountedObject.hs	11;"	t
 MountedObject	src/Dodge/Data/MountedObject.hs	6;"	m
 MountedProp	src/Dodge/Data/MountedObject.hs	13;"	C
-MouseInvChosen	src/Dodge/Data/HUD.hs	27;"	C
+MouseInvChosen	src/Dodge/Data/HUD.hs	26;"	C
-MouseInvSelect	src/Dodge/Data/HUD.hs	25;"	C
+MouseInvSelect	src/Dodge/Data/HUD.hs	24;"	C
 MouseInventorySelection	src/Dodge/Data/HUD.hs	23;"	t
 Mouse_position	src/Dodge/Data/Config.hs	73;"	C
 Move	src/Dodge/Data/ActionPlan.hs	28;"	C
@@ -1253,7 +1253,6 @@ NoIntImp	src/Dodge/Data/CreatureEffect.hs	20;"	C
 NoInvEffect	src/Dodge/Data/Item/Effect.hs	20;"	C
 NoItTargeting	src/Dodge/Data/Item.hs	44;"	C
 NoLighting	src/Dodge/Data/Config.hs	102;"	C
-NoMouseSel	src/Dodge/Data/HUD.hs	24;"	C
 NoMvType	src/Dodge/Data/Creature/Misc.hs	38;"	C
 NoNeedWeapon	src/Dodge/Room/NoNeedWeapon.hs	2;"	m
 NoObjShads	src/Dodge/Data/Config.hs	100;"	C
@@ -2741,9 +2740,10 @@ _mgField	src/Dodge/Data/Magnet.hs	25;"	f
 _mgID	src/Dodge/Data/Magnet.hs	22;"	f
 _mgPos	src/Dodge/Data/Magnet.hs	24;"	f
 _mgUpdate	src/Dodge/Data/Magnet.hs	23;"	f
-_misExtra	src/Dodge/Data/HUD.hs	28;"	f
+_misDragging	src/Dodge/Data/HUD.hs	28;"	f
-_misMaybeEnd	src/Dodge/Data/HUD.hs	26;"	f
+_misExtra	src/Dodge/Data/HUD.hs	27;"	f
-_misSelStart	src/Dodge/Data/HUD.hs	26;"	f
+_misMaybeEnd	src/Dodge/Data/HUD.hs	25;"	f
+_misSelStart	src/Dodge/Data/HUD.hs	25;"	f
 _moEff	src/Dodge/Data/Universe.hs	101;"	f
 _moEff1	src/Dodge/Data/Universe.hs	105;"	f
 _moEff2	src/Dodge/Data/Universe.hs	106;"	f
@@ -3326,7 +3326,7 @@ 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	397;"	f
+advanceScrollAmount	src/Dodge/Update.hs	385;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	29;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	45;"	f
 aimDelaySweep	src/Dodge/Render/ShapePicture.hs	56;"	f
@@ -3567,7 +3567,7 @@ chaseCritMv	src/Dodge/Creature/ReaderUpdate.hs	112;"	f
 chaseCritPerceptionUpdate	src/Dodge/Creature/Perception.hs	30;"	f
 chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	46;"	f
 checkDeath	src/Dodge/Creature/State.hs	75;"	f
-checkEndGame	src/Dodge/Update.hs	684;"	f
+checkEndGame	src/Dodge/Update.hs	672;"	f
 checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
@@ -3593,7 +3593,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	737;"	f
+clClSpringVel	src/Dodge/Update.hs	725;"	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
@@ -3613,14 +3613,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	158;"	f
+closeObjectInfo	src/Dodge/Render/HUD.hs	160;"	f
 closeObjectToSelectionItem	src/Dodge/Inventory/SelectionList.hs	54;"	f
 closeObjectToTextPictures	src/Dodge/Inventory/SelectionList.hs	69;"	f
 closestCreatureID	src/Dodge/Debug.hs	91;"	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	707;"	f
+cloudEffect	src/Dodge/Update.hs	695;"	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
@@ -3649,14 +3649,14 @@ 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	247;"	f
+combineInventoryExtra	src/Dodge/Render/HUD.hs	249;"	f
 combineItemListYouX	src/Dodge/Combine.hs	33;"	f
 combineList	src/Dodge/Combine.hs	20;"	f
 combineRooms	src/Dodge/Room/Procedural.hs	152;"	f
 combineS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	344;"	f
 combineTree	src/Dodge/Tree/Compose.hs	66;"	f
 commandColor	src/Dodge/Terminal.hs	130;"	f
-commandFutureLines	src/Dodge/Terminal.hs	252;"	f
+commandFutureLines	src/Dodge/Terminal.hs	253;"	f
 commandsCommand	src/Dodge/Terminal.hs	91;"	f
 commonPrefix	src/Dodge/Debug/Terminal.hs	143;"	f
 compactDraw	src/Dodge/LevelGen.hs	91;"	f
@@ -3690,7 +3690,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	755;"	f
+crCrSpring	src/Dodge/Update.hs	743;"	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
@@ -3710,11 +3710,11 @@ crNearPoint	src/Dodge/Creature/Test.hs	135;"	f
 crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	35;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	84;"	f
 crSafeDistFromTarg	src/Dodge/Creature/Test.hs	67;"	f
-crSpring	src/Dodge/Update.hs	750;"	f
+crSpring	src/Dodge/Update.hs	738;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	72;"	f
 crUpdate	src/Dodge/Creature/State.hs	62;"	f
-crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	50;"	f
+crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	49;"	f
-crUpdateItemLocations	src/Dodge/Inventory/Location.hs	44;"	f
+crUpdateItemLocations	src/Dodge/Inventory/Location.hs	43;"	f
 crZoneSize	src/Dodge/Zoning/Creature.hs	39;"	f
 craftInfo	src/Dodge/Item/Info.hs	135;"	f
 crankSlowS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	420;"	f
@@ -3785,7 +3785,7 @@ damThingHitWith	src/Dodge/WorldEvent/Damage.hs	10;"	f
 damToExpBarrel	src/Dodge/Barreloid.hs	57;"	f
 damageBlocksBy	src/Dodge/Wall/Damage.hs	36;"	f
 damageCircle	src/Dodge/DamageCircle.hs	12;"	f
-damageCodeCommand	src/Dodge/Terminal.hs	228;"	f
+damageCodeCommand	src/Dodge/Terminal.hs	229;"	f
 damageCrCircle	src/Dodge/DamageCircle.hs	33;"	f
 damageCrWl	src/Dodge/Damage.hs	23;"	f
 damageCrWlID	src/Dodge/Damage.hs	17;"	f
@@ -3963,8 +3963,8 @@ displayConfig	src/Dodge/Menu.hs	196;"	f
 displayControls	src/Dodge/Menu.hs	206;"	f
 displayFrameTicks	src/Dodge/Render/Picture.hs	33;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	148;"	f
-displayTerminal	src/Dodge/Render/HUD.hs	274;"	f
+displayTerminal	src/Dodge/Render/HUD.hs	278;"	f
-displayTerminalLineString	src/Dodge/Update.hs	426;"	f
+displayTerminalLineString	src/Dodge/Update.hs	414;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -4021,7 +4021,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	141;"	f
+doRegexInput	src/Dodge/Update/Input/InGame.hs	151;"	f
 doRoomInPlacements	src/Dodge/Layout.hs	97;"	f
 doRoomOutPlacements	src/Dodge/Layout.hs	107;"	f
 doRoomPlacements	src/Dodge/Layout.hs	122;"	f
@@ -4047,7 +4047,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	408;"	f
+doWorldEvents	src/Dodge/Update.hs	396;"	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
@@ -4091,7 +4091,7 @@ drawDoorPaths	src/Dodge/Debug/Picture.hs	217;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	81;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	8;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	140;"	f
-drawExamineInventory	src/Dodge/Render/HUD.hs	128;"	f
+drawExamineInventory	src/Dodge/Render/HUD.hs	130;"	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
@@ -4132,7 +4132,7 @@ 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	176;"	f
+drawRBOptions	src/Dodge/Render/HUD.hs	178;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	7;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	30;"	f
 drawSelectionCursor	src/Dodge/Render/List.hs	41;"	f
@@ -4198,7 +4198,7 @@ encircleP	src/Dodge/Creature/Boid.hs	27;"	f
 enterCombineInv	src/Dodge/DisplayInventory.hs	243;"	f
 eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	6;"	f
-equipAllocString	src/Dodge/Render/HUD.hs	219;"	f
+equipAllocString	src/Dodge/Render/HUD.hs	221;"	f
 equipInfo	src/Dodge/Item/Info.hs	103;"	f
 equipItemSPic	src/Dodge/Item/Draw/SPic.hs	65;"	f
 equipPosition	src/Dodge/Item/Draw.hs	29;"	f
@@ -4290,7 +4290,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	163;"	f
+floorItemPickupInfo	src/Dodge/Render/HUD.hs	165;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	165;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	398;"	f
@@ -4558,7 +4558,7 @@ intsToPos	src/Dodge/Room/Modify/Girder.hs	160;"	f
 invAdj	src/Dodge/Item/Grammar.hs	181;"	f
 invDimColor	src/Dodge/DisplayInventory.hs	142;"	f
 invDisplayParams	src/Dodge/ListDisplayParams.hs	29;"	f
-invHead	src/Dodge/Render/HUD.hs	310;"	f
+invHead	src/Dodge/Render/HUD.hs	314;"	f
 invLDT	src/Dodge/Item/Grammar.hs	165;"	f
 invRootMap	src/Dodge/Item/Grammar.hs	174;"	f
 invRootTrees	src/Dodge/Item/Grammar.hs	206;"	f
@@ -4569,8 +4569,8 @@ invSideEff	src/Dodge/Creature/State.hs	162;"	f
 invSize	src/Dodge/Inventory/CheckSlots.hs	41;"	f
 invTrees	src/Dodge/Item/Grammar.hs	194;"	f
 invTrees'	src/Dodge/Item/Grammar.hs	198;"	f
-inventoryExtra	src/Dodge/Render/HUD.hs	228;"	f
+inventoryExtra	src/Dodge/Render/HUD.hs	230;"	f
-inventoryExtraH	src/Dodge/Render/HUD.hs	239;"	f
+inventoryExtraH	src/Dodge/Render/HUD.hs	241;"	f
 inventoryX	src/Dodge/Creature.hs	115;"	f
 inverseSelBoundaryDown	src/Dodge/SelectionSections.hs	210;"	f
 inverseSelBoundaryUp	src/Dodge/SelectionSections.hs	197;"	f
@@ -4734,7 +4734,7 @@ llleft	src/Dodge/Item/Grammar.hs	105;"	f
 llright	src/Dodge/Item/Grammar.hs	108;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	121;"	f
-lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	299;"	f
+lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	303;"	f
 lnkPosDir	src/Dodge/RoomLink.hs	97;"	f
 loadDodgeConfig	src/Dodge/Config/Load.hs	9;"	f
 loadMusic	src/Dodge/SoundLogic/LoadSound.hs	21;"	f
@@ -4849,7 +4849,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	669;"	f
+markWallSeen	src/Dodge/Update.hs	657;"	f
 maxDamageType	src/Dodge/Damage.hs	37;"	f
 maxShowX	src/Dodge/Combine/Graph.hs	43;"	f
 maxViewDistance	src/Dodge/Viewpoints.hs	26;"	f
@@ -4860,7 +4860,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	279;"	f
+maybeExitCombine	src/Dodge/Update/Input/InGame.hs	300;"	f
 maybeOpenTerminal	src/Dodge/Update.hs	116;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	111;"	f
@@ -4981,7 +4981,7 @@ mvBullet	src/Dodge/Bullet.hs	33;"	f
 mvButton	src/Dodge/Placement/PlaceSpot.hs	181;"	f
 mvCr	src/Dodge/Placement/PlaceSpot.hs	191;"	f
 mvFS	src/Dodge/Placement/PlaceSpot.hs	194;"	f
-mvGust	src/Dodge/Update.hs	698;"	f
+mvGust	src/Dodge/Update.hs	686;"	f
 mvLS	src/Dodge/Placement/PlaceSpot.hs	222;"	f
 mvP	src/Dodge/Wall/Move.hs	54;"	f
 mvPP	src/Dodge/Placement/PlaceSpot.hs	188;"	f
@@ -5089,7 +5089,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	227;"	f
+pauseGame	src/Dodge/Update/Input/InGame.hs	244;"	f
 pauseMenu	src/Dodge/Menu.hs	53;"	f
 pauseMenuOptions	src/Dodge/Menu.hs	58;"	f
 pauseSound	src/Dodge/SoundLogic.hs	41;"	f
@@ -5248,7 +5248,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	162;"	f
-ppEvents	src/Dodge/Update.hs	661;"	f
+ppEvents	src/Dodge/Update.hs	649;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5549,11 +5549,11 @@ secondColumnParams	src/Dodge/ListDisplayParams.hs	42;"	f
 seedStartMenu	src/Dodge/Menu.hs	79;"	f
 seedStartOptions	src/Dodge/Menu.hs	82;"	f
 segOnCirc	src/Geometry.hs	116;"	f
-selNumPos	src/Dodge/Render/HUD.hs	370;"	f
+selNumPos	src/Dodge/Render/HUD.hs	374;"	f
-selNumPosCardinal	src/Dodge/Render/HUD.hs	392;"	f
+selNumPosCardinal	src/Dodge/Render/HUD.hs	396;"	f
 selSecDrawCursor	src/Dodge/Render/List.hs	104;"	f
 selSecDrawCursorAt	src/Dodge/Render/List.hs	88;"	f
-selSecSelCol	src/Dodge/Render/HUD.hs	418;"	f
+selSecSelCol	src/Dodge/Render/HUD.hs	422;"	f
 selSecSelSize	src/Dodge/SelectionSections.hs	135;"	f
 selSecYint	src/Dodge/SelectionSections.hs	144;"	f
 selectCreatureDebugItem	src/Dodge/Debug.hs	38;"	f
@@ -5581,7 +5581,7 @@ setHotkey	src/Dodge/Hotkey.hs	38;"	f
 setInLinks	src/Dodge/RoomLink.hs	51;"	f
 setInLinksByType	src/Dodge/RoomLink.hs	54;"	f
 setInLinksPD	src/Dodge/RoomLink.hs	74;"	f
-setInvPosFromSS	src/Dodge/Inventory/Location.hs	69;"	f
+setInvPosFromSS	src/Dodge/Inventory/Location.hs	68;"	f
 setItemCharge	src/Dodge/ItEffect.hs	39;"	f
 setLayer	src/Picture/Base.hs	139;"	f
 setLinkType	src/Dodge/RoomLink.hs	60;"	f
@@ -5589,7 +5589,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	450;"	f
+setOldPos	src/Dodge/Update.hs	438;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
@@ -5645,7 +5645,7 @@ shiftDec	src/Dodge/Placement/PlaceSpot.hs	151;"	f
 shiftDraw	src/Dodge/Render/ShapePicture.hs	107;"	f
 shiftDraw'	src/Dodge/Render/ShapePicture.hs	113;"	f
 shiftInBy	src/Dodge/PlacementSpot.hs	236;"	f
-shiftInvItems	src/Dodge/Update.hs	356;"	f
+shiftInvItems	src/Dodge/Update.hs	344;"	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
@@ -5695,9 +5695,9 @@ 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	746;"	f
+simpleCrSprings	src/Dodge/Update.hs	734;"	f
 simpleDamFL	src/Dodge/Flame.hs	41;"	f
-simpleTermMessage	src/Dodge/Terminal.hs	249;"	f
+simpleTermMessage	src/Dodge/Terminal.hs	250;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	486;"	f
 sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	340;"	f
 singleAmmo	src/Dodge/Default/Item.hs	44;"	f
@@ -5744,7 +5744,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	230;"	f
+spaceAction	src/Dodge/Update/Input/InGame.hs	247;"	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
@@ -5798,7 +5798,7 @@ stackText	src/Picture/Base.hs	188;"	f
 stackedInventory	src/Dodge/Creature.hs	282;"	f
 startCr	src/Dodge/Creature.hs	91;"	f
 startCrafts	src/Dodge/Room/Start.hs	92;"	f
-startDrag	src/Dodge/Update.hs	345;"	f
+startDrag	src/Dodge/Update.hs	335;"	f
 startInvList	src/Dodge/Creature.hs	109;"	f
 startInventory	src/Dodge/Creature.hs	112;"	f
 startNewGameInSlot	src/Dodge/StartNewGame.hs	15;"	f
@@ -5917,7 +5917,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	430;"	f
+tmUpdate	src/Dodge/Update.hs	418;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
@@ -5935,9 +5935,9 @@ toggleCombineInv	src/Dodge/DisplayInventory.hs	31;"	f
 toggleCommand	src/Dodge/Terminal.hs	194;"	f
 toggleEquipmentAt	src/Dodge/Creature/Impulse/UseItem.hs	75;"	f
 toggleJust	src/MaybeHelp.hs	41;"	f
-toggleMap	src/Dodge/Update/Input/InGame.hs	251;"	f
+toggleMap	src/Dodge/Update/Input/InGame.hs	271;"	f
-toggleTweakInv	src/Dodge/Update/Input/InGame.hs	262;"	f
+toggleTweakInv	src/Dodge/Update/Input/InGame.hs	282;"	f
-togglesToEffects	src/Dodge/Terminal.hs	244;"	f
+togglesToEffects	src/Dodge/Terminal.hs	245;"	f
 tone440S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	460;"	f
 tone440sawtoothS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	430;"	f
 tone440sawtoothquietS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	320;"	f
@@ -6007,10 +6007,10 @@ 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	271;"	f
+tryCombine	src/Dodge/Update/Input/InGame.hs	292;"	f
 tryGetChannel	src/Sound.hs	96;"	f
-tryGetRootAttachedFromInvID	src/Dodge/Inventory/Location.hs	20;"	f
+tryGetRootAttachedFromInvID	src/Dodge/Inventory/Location.hs	19;"	f
-tryGetRootItemInvID	src/Dodge/Inventory/Location.hs	29;"	f
+tryGetRootItemInvID	src/Dodge/Inventory/Location.hs	28;"	f
 tryMeleeAttack	src/Dodge/Creature/ReaderUpdate.hs	36;"	f
 tryPlay	src/Sound.hs	83;"	f
 tryPutFloorItemIDInInv	src/Dodge/Inventory/Add.hs	23;"	f
@@ -6053,99 +6053,99 @@ 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	167;"	f
+updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	184;"	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	527;"	f
+updateBullets	src/Dodge/Update.hs	515;"	f
 updateCamera	src/Dodge/Update/Camera.hs	31;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	114;"	f
-updateCloud	src/Dodge/Update.hs	712;"	f
+updateCloud	src/Dodge/Update.hs	700;"	f
-updateClouds	src/Dodge/Update.hs	556;"	f
+updateClouds	src/Dodge/Update.hs	544;"	f
 updateCombinePositioning	src/Dodge/DisplayInventory.hs	37;"	f
 updateCombineSections	src/Dodge/DisplayInventory.hs	42;"	f
 updateCreature	src/Dodge/Creature/Update.hs	10;"	f
-updateCreatureGroups	src/Dodge/Update.hs	496;"	f
+updateCreatureGroups	src/Dodge/Update.hs	484;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	472;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	460;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	89;"	f
-updateDelayedEvents	src/Dodge/Update.hs	775;"	f
+updateDelayedEvents	src/Dodge/Update.hs	763;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	92;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	517;"	f
+updateDistortions	src/Dodge/Update.hs	505;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	46;"	f
-updateEnergyBalls	src/Dodge/Update.hs	544;"	f
+updateEnergyBalls	src/Dodge/Update.hs	532;"	f
-updateEnterRegex	src/Dodge/Update/Input/InGame.hs	203;"	f
+updateEnterRegex	src/Dodge/Update/Input/InGame.hs	220;"	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	541;"	f
+updateFlames	src/Dodge/Update.hs	529;"	f
 updateFlare	src/Dodge/Flare.hs	7;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	36;"	f
-updateGusts	src/Dodge/Update.hs	695;"	f
+updateGusts	src/Dodge/Update.hs	683;"	f
 updateHeldRootItem	src/Dodge/Creature/State.hs	167;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	12;"	f
-updateIMl	src/Dodge/Update.hs	486;"	f
+updateIMl	src/Dodge/Update.hs	474;"	f
-updateIMl'	src/Dodge/Update.hs	491;"	f
+updateIMl'	src/Dodge/Update.hs	479;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	70;"	f
-updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	115;"	f
+updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	125;"	f
-updateInstantBullets	src/Dodge/Update.hs	633;"	f
+updateInstantBullets	src/Dodge/Update.hs	621;"	f
 updateInv	src/Dodge/Creature/State.hs	152;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	87;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	268;"	f
 updateItemWithOrientation	src/Dodge/Creature/State.hs	194;"	f
-updateKeyInGame	src/Dodge/Update/Input/InGame.hs	109;"	f
+updateKeyInGame	src/Dodge/Update/Input/InGame.hs	119;"	f
-updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	98;"	f
+updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	108;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
 updateLaser	src/Dodge/Laser/Update.hs	13;"	f
-updateLasers	src/Dodge/Update.hs	415;"	f
+updateLasers	src/Dodge/Update.hs	403;"	f
-updateLightSources	src/Dodge/Update.hs	520;"	f
+updateLightSources	src/Dodge/Update.hs	508;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
-updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	135;"	f
+updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	145;"	f
-updateMIM	src/Dodge/Update.hs	646;"	f
+updateMIM	src/Dodge/Update.hs	634;"	f
 updateMachine	src/Dodge/Machine/Update.hs	16;"	f
-updateMouseInventorySelection	src/Dodge/Update.hs	297;"	f
+updateMouseInventorySelection	src/Dodge/Update.hs	298;"	f
-updateMouseInventorySelection'	src/Dodge/Update.hs	303;"	f
+updateMouseInventorySelection'	src/Dodge/Update.hs	304;"	f
-updateMouseOverInventory	src/Dodge/Update.hs	381;"	f
+updateMouseOverInventory	src/Dodge/Update.hs	369;"	f
 updateMovement	src/Dodge/Creature/State.hs	331;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	508;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	496;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	501;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	489;"	f
-updatePastWorlds	src/Dodge/Update.hs	403;"	f
+updatePastWorlds	src/Dodge/Update.hs	391;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	553;"	f
+updatePosEvents	src/Dodge/Update.hs	541;"	f
 updatePreload	src/Preload/Update.hs	20;"	f
-updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	73;"	f
+updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	83;"	f
-updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	76;"	f
+updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	86;"	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	523;"	f
+updateRadarBlips	src/Dodge/Update.hs	511;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	25;"	f
-updateRadarSweeps	src/Dodge/Update.hs	547;"	f
+updateRadarSweeps	src/Dodge/Update.hs	535;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	106;"	f
-updateRootItemID	src/Dodge/Inventory/Location.hs	37;"	f
+updateRootItemID	src/Dodge/Inventory/Location.hs	36;"	f
 updateScopeZoom	src/Dodge/Update/Camera.hs	127;"	f
 updateScopeZoom'	src/Dodge/Update/Camera.hs	132;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
 updateSection	src/Dodge/DisplayInventory.hs	175;"	f
 updateSectionsPositioning	src/Dodge/DisplayInventory.hs	154;"	f
-updateSeenWalls	src/Dodge/Update.hs	664;"	f
+updateSeenWalls	src/Dodge/Update.hs	652;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
-updateShockwaves	src/Dodge/Update.hs	538;"	f
+updateShockwaves	src/Dodge/Update.hs	526;"	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	550;"	f
+updateSparks	src/Dodge/Update.hs	538;"	f
 updateTempLightSource	src/Dodge/LightSource/Update.hs	7;"	f
 updateTeslaArc	src/Dodge/Tesla/Arc.hs	29;"	f
-updateTeslaArcs	src/Dodge/Update.hs	532;"	f
+updateTeslaArcs	src/Dodge/Update.hs	520;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	535;"	f
+updateTractorBeams	src/Dodge/Update.hs	523;"	f
 updateTurret	src/Dodge/Machine/Update.hs	31;"	f
 updateUniverse	src/Dodge/Update.hs	69;"	f
 updateUniverseFirst	src/Dodge/Update.hs	80;"	f
@@ -6156,7 +6156,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	390;"	f
+updateWheelEvents	src/Dodge/Update.hs	378;"	f
 updateWorldEventFlag	src/Dodge/Update.hs	110;"	f
 updateWorldEventFlags	src/Dodge/Update.hs	101;"	f
 upperBody	src/Dodge/Creature/Picture.hs	133;"	f
@@ -6309,7 +6309,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	170;"	f
+yourAugmentedItem	src/Dodge/Render/HUD.hs	172;"	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
@@ -6326,9 +6326,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	423;"	f
+zoneClouds	src/Dodge/Update.hs	411;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	52;"	f
-zoneCreatures	src/Dodge/Update.hs	467;"	f
+zoneCreatures	src/Dodge/Update.hs	455;"	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