Tweak mouseover display to (partially) work during filtering

ghcidOutput

@@ -1 +1 @@
-All good (594 modules, at 09:49:37)
+All good (594 modules, at 20:51:58)

src/Dodge/DisplayInventory.hs

@@ -142,22 +142,6 @@ updateDisplaySections w cfig =
         else id
     cr = you w
 
---    filtpair i itms filtdescription mstr =
---        ( (i, filtsis)
---        , (i + 1, itms')
---        )
---      where
---        filtsis = fromMaybe mempty $ do
---            str <- mstr
---            return $
---                IM.singleton
---                    0
---                    (SelectionInfo [filtdescription ++ "FILTER: " ++ str, numfiltitems] 2 True white 0)
---        itms' = fromMaybe itms $ do
---            str <- mstr
---            return $ IM.filter (plainRegex str) itms
---        numfiltitems = "  " ++ show (length itms - length itms') ++ " FILTERED"
-
 filterSectionsPair ::
     String -> -- string at the end of the input
     (String -> SelectionItem a -> Bool) ->
@@ -176,7 +160,7 @@ filterSectionsPair endstr filtfn itms filtdescription mfilt =
             IM.singleton
                 0
                 $ SelectionInfo
-                    [filtdescription ++ " FILTER:" ++ str ++ endstr, numfiltitems]
+                    [filtdescription ++ " FILTER/" ++ str ++ endstr, numfiltitems]
                     2
                     True
                     white

src/Dodge/Render/HUD.hs

@@ -105,10 +105,10 @@ getRootItemBounds i inv = do
 
 drawDIMouseOver :: World -> Picture
 drawDIMouseOver w = fromMaybe mempty $ do
-    (_, i) <- w ^? hud . hudElement . subInventory . nsMouseOver . _Just
+    (j, i) <- w ^? hud . hudElement . subInventory . nsMouseOver . _Just
     sss <- w ^? hud . hudElement . diSections
     let idp = invDisplayParams w
-    return . color (withAlpha 0.2 white) $ selSecDrawCursorAt 15 idp curs sss (0, i)
+    return . color (withAlpha 0.2 white) $ selSecDrawCursorAt 15 idp curs sss (j, i)
   where
     curs = BackdropCursor
 

src/Dodge/SelectionSections.hs

@@ -203,7 +203,8 @@ inverseSelSecYint yint sss = do
         then inverseSelSecYint (yint - l) othersss
         else do
             let ls = L.postscan (L.premap _siHeight L.sum) (_ssItems ss)
-            j <- L.fold (L.findIndex (\x -> x - _ssOffset ss > yint)) ls
+            --j <- L.fold (L.findIndex (\x -> x - _ssOffset ss > yint)) ls
+            (j,_) <- L.fold (L.find (\(_,x) -> x - _ssOffset ss > yint)) $ IM.toList ls
             return (i, j)
 
 inverseSelSecYintXPosCheck ::

src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs

@@ -1,4 +1,4 @@
--- generated at 2022-07-14 22:58:49.919236742 UTC
+-- generated at 2024-11-03 10:36:18.238246608 UTC
 module Dodge.SoundLogic.ExternallyGeneratedSounds where
 import Sound.Data
 soundToVol :: SoundID -> Float
@@ -40,70 +40,74 @@ soundToVol v = case _getSoundID v of
     34 -> 1000
     35 -> 1000
     36 -> 40
-    37 -> 2000
+    37 -> 400
-    38 -> 100
+    38 -> 2000
-    39 -> 50
+    39 -> 100
-    40 -> 2000
+    40 -> 50
-    41 -> 50
+    41 -> 2000
-    42 -> 1000
+    42 -> 50
-    43 -> 8000
+    43 -> 1000
-    44 -> 2000
+    44 -> 8000
     45 -> 2000
-    46 -> 1000
+    46 -> 2000
-    47 -> 2000
+    47 -> 1000
-    48 -> 100
+    48 -> 2000
-    49 -> 40
+    49 -> 100
     50 -> 40
-    51 -> 2000
+    51 -> 40
-    52 -> 100
+    52 -> 2000
-    53 -> 500
+    53 -> 100
-    54 -> 40
+    54 -> 500
-    55 -> 300
+    55 -> 40
     56 -> 300
-    57 -> 2000
+    57 -> 300
-    58 -> 1000
+    58 -> 2000
     59 -> 1000
     60 -> 1000
     61 -> 1000
     62 -> 1000
-    63 -> 40
+    63 -> 1000
-    64 -> 50
+    64 -> 40
-    65 -> 1000
+    65 -> 50
-    66 -> 500
+    66 -> 1000
     67 -> 500
-    68 -> 100
+    68 -> 500
-    69 -> 1000
+    69 -> 100
-    70 -> 20
+    70 -> 1000
-    71 -> 500
+    71 -> 20
-    72 -> 300
+    72 -> 500
-    73 -> 200
+    73 -> 300
-    74 -> 500
+    74 -> 200
-    75 -> 1000
+    75 -> 500
     76 -> 1000
-    77 -> 500
+    77 -> 200
-    78 -> 100
+    78 -> 1000
-    79 -> 1000
+    79 -> 2000
-    80 -> 2000
+    80 -> 500
-    81 -> 2000
+    81 -> 100
-    82 -> 500
+    82 -> 1000
     83 -> 2000
-    84 -> 100
+    84 -> 2000
-    85 -> 300
+    85 -> 500
-    86 -> 1000
+    86 -> 2000
-    87 -> 200
+    87 -> 100
-    88 -> 100
+    88 -> 300
     89 -> 1000
-    90 -> 2000
+    90 -> 200
-    91 -> 1000
+    91 -> 100
-    92 -> 100
+    92 -> 1000
-    93 -> 200
+    93 -> 2000
-    94 -> 500
+    94 -> 1000
     95 -> 100
-    96 -> 2000
+    96 -> 200
-    97 -> 2000
+    97 -> 500
-    98 -> 2000
+    98 -> 100
-    99 -> 100
+    99 -> 2000
-    100 -> 200
+    100 -> 2000
+    101 -> 2000
+    102 -> 200
+    103 -> 100
+    104 -> 200
     _ -> 50
 soundToOnomato :: SoundID -> String
 soundToOnomato v = case _getSoundID v of
@@ -144,70 +148,74 @@ soundToOnomato v = case _getSoundID v of
     34 -> "TRWNG"
     35 -> "CRASH"
     36 -> "TAPTIP"
-    37 -> "CHUGUGUG"
+    37 -> "CRNKCRNKCRNK"
-    38 -> "SKWLL"
+    38 -> "CHUGUGUG"
-    39 -> "HSSS"
+    39 -> "SKWLL"
-    40 -> "BOOM"
+    40 -> "HSSS"
-    41 -> "HSS"
+    41 -> "BOOM"
-    42 -> "TAKH"
+    42 -> "HSS"
-    43 -> "RINGGG"
+    43 -> "TAKH"
-    44 -> "CRH"
+    44 -> "RINGGG"
-    45 -> "UGGAUGGA"
+    45 -> "CRH"
-    46 -> "CRUMPLE"
+    46 -> "UGGAUGGA"
-    47 -> "CREUH"
+    47 -> "CRUMPLE"
-    48 -> "SMACK"
+    48 -> "CREUH"
-    49 -> "CLICK"
+    49 -> "SMACK"
-    50 -> "TIPTOP"
+    50 -> "CLICK"
-    51 -> "CRUH"
+    51 -> "TIPTOP"
-    52 -> "CHNKCHNKCHUNK"
+    52 -> "CRUH"
-    53 -> "CLKCLK"
+    53 -> "CHNKCHNKCHUNK"
-    54 -> "TIPTAP"
+    54 -> "CLKCLK"
-    55 -> "TNKTNKTNK"
+    55 -> "TIPTAP"
-    56 -> "CHPCHPCHP"
+    56 -> "TNKTNKTNK"
-    57 -> "SCREE"
+    57 -> "CHPCHPCHP"
-    58 -> "DHDHL"
+    58 -> "SCREE"
-    59 -> "BRAP"
+    59 -> "DHDHL"
-    60 -> "CRSK"
+    60 -> "BRAP"
-    61 -> "CRNKL"
+    61 -> "CRSK"
-    62 -> "TRNKL"
+    62 -> "CRNKL"
-    63 -> "TAPP"
+    63 -> "TRNKL"
-    64 -> "SHUHP"
+    64 -> "TAPP"
-    65 -> "CRUMBL"
+    65 -> "SHUHP"
-    66 -> "DEDEDUM"
+    66 -> "CRUMBL"
-    67 -> "TAK"
+    67 -> "DEDEDUM"
-    68 -> "SPLRT"
+    68 -> "TAK"
-    69 -> "CRISH"
+    69 -> "SPLRT"
-    70 -> "SWSH"
+    70 -> "CRISH"
-    71 -> "BIPBIPBIP"
+    71 -> "SWSH"
-    72 -> "BEP"
+    72 -> "BIPBIPBIP"
-    73 -> "CRSKRL"
+    73 -> "BEP"
-    74 -> "KRTNKL"
+    74 -> "CRSKRL"
-    75 -> "CRSNK"
+    75 -> "KRTNKL"
-    76 -> "TTRKL"
+    76 -> "CRSNK"
-    77 -> "DUDURAH"
+    77 -> "SHTCK"
-    78 -> "KKSQWL"
+    78 -> "TTRKL"
-    79 -> "CRMPL"
+    79 -> "UGGAUGGA"
-    80 -> "CHUGUGUG"
+    80 -> "DUDURAH"
-    81 -> "BANG"
+    81 -> "KKSQWL"
-    82 -> "DEDA"
+    82 -> "CRMPL"
-    83 -> "WHSSH"
+    83 -> "CHUGUGUG"
-    84 -> "HNH"
+    84 -> "BANG"
-    85 -> "BWAH"
+    85 -> "DEDA"
-    86 -> "CRUNK"
+    86 -> "WHSSH"
-    87 -> "SQWLTCH"
+    87 -> "HNH"
-    88 -> "DRR"
+    88 -> "BWAH"
-    89 -> "TRNKL"
+    89 -> "CRUNK"
-    90 -> "BRAP"
+    90 -> "SQWLTCH"
-    91 -> "BLPCHCH"
+    91 -> "DRR"
-    92 -> "SKLE"
+    92 -> "TRNKL"
-    93 -> "ZMM"
+    93 -> "BRAP"
-    94 -> "WRRR"
+    94 -> "BLPCHCH"
-    95 -> "FWUMP"
+    95 -> "SKLE"
-    96 -> "BRAHCHCH"
+    96 -> "ZMM"
-    97 -> "BRPBRPBRP"
+    97 -> "WRRR"
-    98 -> "WE-OH"
+    98 -> "FWUMP"
-    99 -> "FHP"
+    99 -> "BRAHCHCH"
-    100 -> "QWLPH"
+    100 -> "BRPBRPBRP"
+    101 -> "WE-OH"
+    102 -> "THCK"
+    103 -> "FHP"
+    104 -> "QWLPH"
     _ -> error "unitialised sound"
 soundPathList :: [String]
 soundPathList =
@@ -248,6 +256,7 @@ soundPathList =
     , "metal7.TRWNG.1000.wav"
     , "stone1.CRASH.1000.wav"
     , "twoStep1.TAPTIP.40.wav"
+    , "wrench1.CRNKCRNKCRNK.400.wav"
     , "seagullChatter.CHUGUGUG.2000.wav"
     , "blood4.SKWLL.100.wav"
     , "foamSprayLoop.HSSS.50.wav"
@@ -287,7 +296,9 @@ soundPathList =
     , "gut6.CRSKRL.200.wav"
     , "smallGlass2.KRTNKL.500.wav"
     , "glassShat1.CRSNK.1000.wav"
+    , "disconnectItem.SHTCK.200.wav"
     , "metal5.TTRKL.1000.wav"
+    , "seagullBarkTransformed.UGGAUGGA.2000.wav"
     , "eject.DUDURAH.500.wav"
     , "blood3.KKSQWL.100.wav"
     , "stone2.CRMPL.1000.wav"
@@ -310,6 +321,7 @@ soundPathList =
     , "shotgun.BRAHCHCH.2000.wav"
     , "mini.BRPBRPBRP.2000.wav"
     , "seagullWhistle.WE-OH.2000.wav"
+    , "connectItem.THCK.200.wav"
     , "whiteNoiseFadeIn.FHP.100.wav"
     , "gut1.QWLPH.200.wav"
     ]
@@ -387,131 +399,139 @@ stone1S :: SoundID
 stone1S = SoundID 35
 twoStep1S :: SoundID
 twoStep1S = SoundID 36
+wrench1S :: SoundID
+wrench1S = SoundID 37
 seagullChatterS :: SoundID
-seagullChatterS = SoundID 37
+seagullChatterS = SoundID 38
 blood4S :: SoundID
-blood4S = SoundID 38
+blood4S = SoundID 39
 foamSprayLoopS :: SoundID
-foamSprayLoopS = SoundID 39
+foamSprayLoopS = SoundID 40
 explosionS :: SoundID
-explosionS = SoundID 40
+explosionS = SoundID 41
 foamSprayFadeOutS :: SoundID
-foamSprayFadeOutS = SoundID 41
+foamSprayFadeOutS = SoundID 42
 tap2S :: SoundID
-tap2S = SoundID 42
+tap2S = SoundID 43
 tinitusS :: SoundID
-tinitusS = SoundID 43
+tinitusS = SoundID 44
 seagullCry1S :: SoundID
-seagullCry1S = SoundID 44
+seagullCry1S = SoundID 45
 seagullBarkS :: SoundID
-seagullBarkS = SoundID 45
+seagullBarkS = SoundID 46
 stone3S :: SoundID
-stone3S = SoundID 46
+stone3S = SoundID 47
 seagullCry2S :: SoundID
-seagullCry2S = SoundID 47
+seagullCry2S = SoundID 48
 hit1S :: SoundID
-hit1S = SoundID 48
+hit1S = SoundID 49
 click1S :: SoundID
-click1S = SoundID 49
+click1S = SoundID 50
 twoStepSlowS :: SoundID
-twoStepSlowS = SoundID 50
+twoStepSlowS = SoundID 51
 seagullCryS :: SoundID
-seagullCryS = SoundID 51
+seagullCryS = SoundID 52
 crankSlowS :: SoundID
-crankSlowS = SoundID 52
+crankSlowS = SoundID 53
 primeS :: SoundID
-primeS = SoundID 53
+primeS = SoundID 54
 twoStepS :: SoundID
-twoStepS = SoundID 54
+twoStepS = SoundID 55
 reloadS :: SoundID
-reloadS = SoundID 55
+reloadS = SoundID 56
 reload1S :: SoundID
-reload1S = SoundID 56
+reload1S = SoundID 57
 tone440sawtoothS :: SoundID
-tone440sawtoothS = SoundID 57
+tone440sawtoothS = SoundID 58
 metal3S :: SoundID
-metal3S = SoundID 58
+metal3S = SoundID 59
 tap3S :: SoundID
-tap3S = SoundID 59
+tap3S = SoundID 60
 glassShat4S :: SoundID
-glassShat4S = SoundID 60
+glassShat4S = SoundID 61
 glassShat2S :: SoundID
-glassShat2S = SoundID 61
+glassShat2S = SoundID 62
 metal1S :: SoundID
-metal1S = SoundID 62
+metal1S = SoundID 63
 foot3S :: SoundID
-foot3S = SoundID 63
+foot3S = SoundID 64
 pickUpS :: SoundID
-pickUpS = SoundID 64
+pickUpS = SoundID 65
 stone5S :: SoundID
-stone5S = SoundID 65
+stone5S = SoundID 66
 dededumS :: SoundID
-dededumS = SoundID 66
+dededumS = SoundID 67
 tap1S :: SoundID
-tap1S = SoundID 67
+tap1S = SoundID 68
 blood1S :: SoundID
-blood1S = SoundID 68
+blood1S = SoundID 69
 metal4S :: SoundID
-metal4S = SoundID 69
+metal4S = SoundID 70
 knifeS :: SoundID
-knifeS = SoundID 70
+knifeS = SoundID 71
 computerBeepingS :: SoundID
-computerBeepingS = SoundID 71
+computerBeepingS = SoundID 72
 tone440S :: SoundID
-tone440S = SoundID 72
+tone440S = SoundID 73
 gut6S :: SoundID
-gut6S = SoundID 73
+gut6S = SoundID 74
 smallGlass2S :: SoundID
-smallGlass2S = SoundID 74
+smallGlass2S = SoundID 75
 glassShat1S :: SoundID
-glassShat1S = SoundID 75
+glassShat1S = SoundID 76
+disconnectItemS :: SoundID
+disconnectItemS = SoundID 77
 metal5S :: SoundID
-metal5S = SoundID 76
+metal5S = SoundID 78
+seagullBarkTransformedS :: SoundID
+seagullBarkTransformedS = SoundID 79
 ejectS :: SoundID
-ejectS = SoundID 77
+ejectS = SoundID 80
 blood3S :: SoundID
-blood3S = SoundID 78
+blood3S = SoundID 81
 stone2S :: SoundID
-stone2S = SoundID 79
+stone2S = SoundID 82
 seagullChatter1S :: SoundID
-seagullChatter1S = SoundID 80
+seagullChatter1S = SoundID 83
 bangS :: SoundID
-bangS = SoundID 81
+bangS = SoundID 84
 dedaS :: SoundID
-dedaS = SoundID 82
+dedaS = SoundID 85
 missileLaunchS :: SoundID
-missileLaunchS = SoundID 83
+missileLaunchS = SoundID 86
 gruntS :: SoundID
-gruntS = SoundID 84
+gruntS = SoundID 87
 sineRaisePitchOneSecS :: SoundID
-sineRaisePitchOneSecS = SoundID 85
+sineRaisePitchOneSecS = SoundID 88
 metal2S :: SoundID
-metal2S = SoundID 86
+metal2S = SoundID 89
 gut5S :: SoundID
-gut5S = SoundID 87
+gut5S = SoundID 90
 slideDoorS :: SoundID
-slideDoorS = SoundID 88
+slideDoorS = SoundID 91
 metal6S :: SoundID
-metal6S = SoundID 89
+metal6S = SoundID 92
 autoGunS :: SoundID
-autoGunS = SoundID 90
+autoGunS = SoundID 93
 oldMachineBootS :: SoundID
-oldMachineBootS = SoundID 91
+oldMachineBootS = SoundID 94
 blood6S :: SoundID
-blood6S = SoundID 92
+blood6S = SoundID 95
 buzzS :: SoundID
-buzzS = SoundID 93
+buzzS = SoundID 96
 fireLoudS :: SoundID
-fireLoudS = SoundID 94
+fireLoudS = SoundID 97
 tap4S :: SoundID
-tap4S = SoundID 95
+tap4S = SoundID 98
 shotgunS :: SoundID
-shotgunS = SoundID 96
+shotgunS = SoundID 99
 miniS :: SoundID
-miniS = SoundID 97
+miniS = SoundID 100
 seagullWhistleS :: SoundID
-seagullWhistleS = SoundID 98
+seagullWhistleS = SoundID 101
+connectItemS :: SoundID
+connectItemS = SoundID 102
 whiteNoiseFadeInS :: SoundID
-whiteNoiseFadeInS = SoundID 99
+whiteNoiseFadeInS = SoundID 103
 gut1S :: SoundID
-gut1S = SoundID 100
+gut1S = SoundID 104

src/Dodge/TestString.hs

@@ -23,7 +23,9 @@ import qualified IntMapHelp as IM
 testStringInit :: Universe -> [String]
 testStringInit u = [show $ u ^? uvWorld . hud . hudElement . diSelection . _Just
     , show $ u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crManipulation . manObject
-    , show . fmap (fmap _siPictures) $ u ^? uvWorld . hud . hudElement . diSections . ix (-1) . ssItems
+    , show $ u ^? uvWorld . hud . hudElement . subInventory . nsMouseOver . _Just
+    , show $ fmap fst $ IM.lookupMin =<< (u ^? uvWorld . hud . hudElement . diSections . ix 0 . ssItems) 
+--    , show . fmap (fmap _siPictures) $ u ^? uvWorld . hud . hudElement . diSections . ix (-1) . ssItems
         ]
 --    <> [[toEnum (i+j * 32) | i <- [0..31]] | j <- [0..7]]
 --    <> map show (IM.elems (L.postscan (L.premap _siHeight L.sum)

src/Dodge/Update/Input/InGame.hs

@@ -2,6 +2,7 @@ module Dodge.Update.Input.InGame (
     updateUseInputInGame,
 ) where
 
+import Dodge.SoundLogic
 import Control.Applicative
 import qualified Data.IntMap.Strict as IM
 import Data.List (sort)
@@ -310,8 +311,6 @@ toggleTweakInv w = case w ^? hud . hudElement . subInventory of
   where
     thepointer = hud . hudElement . subInventory
 
---    mi = 0 <$ (yourSelectedItem w >>= (^? itTweaks . tweakParams . ix 0))
-
 tryCombine ::
     IM.IntMap (SelectionSection CombinableItem) ->
     Maybe (Int, Int) ->
@@ -320,9 +319,11 @@ tryCombine ::
 tryCombine sss msel 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 $
         snd (createItemYou it (foldr (destroyInvItem 0) w (sort is)))
             & cWorld . lWorld . creatures . ix 0 . crHammerPosition .~ HammerDown
+            & soundStart InventorySound p wrench1S Nothing
 
 maybeExitCombine :: Universe -> Universe
 maybeExitCombine u

tags

@@ -3410,14 +3410,14 @@ attachOnward'	src/Dodge/Tree/Compose.hs	98;"	f
 attachTree	src/Dodge/Tree/Compose.hs	38;"	f
 attentionViewPoint	src/Dodge/Creature/ReaderUpdate.hs	66;"	f
 attribSize	src/Shader/Compile.hs	306;"	f
-augInvDirectSelect	src/Dodge/Inventory.hs	219;"	f
+augInvDirectSelect	src/Dodge/Inventory.hs	220;"	f
 augmentedHUD	src/Dodge/Item/Scope.hs	47;"	f
 autoAmr	src/Dodge/Item/Held/Rod.hs	51;"	f
-autoBS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	350;"	f
+autoBS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	362;"	f
 autoCrit	src/Dodge/Creature/AutoCrit.hs	13;"	f
 autoDetector	src/Dodge/Item/Weapon/Radar.hs	11;"	f
 autoEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	18;"	f
-autoGunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	496;"	f
+autoGunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	514;"	f
 autoPistol	src/Dodge/Item/Held/Stick.hs	51;"	f
 autoRadarEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	39;"	f
 autoRifle	src/Dodge/Item/Held/Cane.hs	68;"	f
@@ -3432,9 +3432,9 @@ backpackShape	src/Dodge/Item/Draw/SPic.hs	94;"	f
 backspaceInputted	src/Dodge/Update/Input/Text.hs	25;"	f
 bangCone	src/Dodge/Item/Held/Cone.hs	11;"	f
 bangConeShape	src/Dodge/Item/Draw/SPic.hs	235;"	f
-bangEchoS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	370;"	f
+bangEchoS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	382;"	f
 bangRod	src/Dodge/Item/Held/Rod.hs	18;"	f
-bangS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	478;"	f
+bangS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	496;"	f
 bangStick	src/Dodge/Item/Held/Stick.hs	17;"	f
 barPP	src/Dodge/Room/Foreground.hs	236;"	f
 barrel	src/Dodge/Creature/Inanimate.hs	17;"	f
@@ -3483,14 +3483,14 @@ blockPillar	src/Dodge/Room/Pillar.hs	17;"	f
 blockedCorridor	src/Dodge/Room/RoadBlock.hs	71;"	f
 blockedCorridorCloseBlocks	src/Dodge/Room/RoadBlock.hs	78;"	f
 blockingLoad	src/Dodge/Concurrent.hs	38;"	f
-blood1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	452;"	f
+blood1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	466;"	f
-blood2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	352;"	f
+blood2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	364;"	f
-blood3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	472;"	f
+blood3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	490;"	f
-blood4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	392;"	f
+blood4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	406;"	f
-blood5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	380;"	f
+blood5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	392;"	f
-blood6S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	500;"	f
+blood6S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	518;"	f
-blood7S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	342;"	f
+blood7S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	354;"	f
-blood8S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	330;"	f
+blood8S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	342;"	f
 blowTorch	src/Dodge/Item/Held/SprayGuns.hs	51;"	f
 blue	src/Color.hs	16;"	f
 blunderbuss	src/Dodge/Item/Held/Cone.hs	29;"	f
@@ -3527,7 +3527,7 @@ bulletSynthesizer	src/Dodge/Item/Ammo.hs	124;"	f
 bulletTargetingModule	src/Dodge/Item/Scope.hs	41;"	f
 bulletWeapons	src/Dodge/Combine/Combinations.hs	246;"	f
 burstRifle	src/Dodge/Item/Held/Cane.hs	74;"	f
-buzzS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
+buzzS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	520;"	f
 calcSmoothScroll	src/Dodge/SmoothScroll.hs	7;"	f
 calcTexCoord	src/Tile.hs	19;"	f
 canSee	src/Dodge/Base/Collide.hs	228;"	f
@@ -3546,9 +3546,9 @@ centroidNum	src/Geometry/Polygon.hs	133;"	f
 chainCreatureUpdates	src/Dodge/Creature/ChainUpdates.hs	6;"	f
 chainLinkOrientation	src/Dodge/Creature/State.hs	183;"	f
 chainPairs	src/Geometry.hs	363;"	f
-changeSwapClose	src/Dodge/Inventory.hs	158;"	f
+changeSwapClose	src/Dodge/Inventory.hs	159;"	f
-changeSwapSel	src/Dodge/Inventory.hs	150;"	f
+changeSwapSel	src/Dodge/Inventory.hs	151;"	f
-changeSwapWith	src/Dodge/Inventory.hs	213;"	f
+changeSwapWith	src/Dodge/Inventory.hs	214;"	f
 charToTuple	src/Picture/Base.hs	317;"	f
 charToTupleGrad	src/Picture/Text.hs	18;"	f
 chargeIfEquipped	src/Dodge/ItEffect.hs	54;"	f
@@ -3599,7 +3599,7 @@ cleanupHalted	src/Sound.hs	116;"	f
 cleatLabel	src/Dodge/Cleat.hs	30;"	f
 cleatOnward	src/Dodge/Cleat.hs	24;"	f
 cleatSide	src/Dodge/Cleat.hs	27;"	f
-click1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	414;"	f
+click1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	428;"	f
 clickDetector	src/Dodge/Item/Held/Utility.hs	36;"	f
 clickGetCreature	src/Dodge/Debug.hs	83;"	f
 clipV	src/Geometry/Vector.hs	47;"	f
@@ -3647,7 +3647,7 @@ combineInventoryExtra	src/Dodge/Render/HUD.hs	294;"	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
+combineS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	356;"	f
 combineTree	src/Dodge/Tree/Compose.hs	66;"	f
 commandColor	src/Dodge/Terminal.hs	130;"	f
 commandFutureLines	src/Dodge/Terminal.hs	253;"	f
@@ -3659,9 +3659,10 @@ compactDrawTree	src/Dodge/LevelGen.hs	85;"	f
 compileAndCheckShader	src/Shader/Compile.hs	277;"	f
 composeNode	src/Dodge/Tree/Compose.hs	76;"	f
 composeTree	src/Dodge/Tree/Compose.hs	46;"	f
-computerBeepingS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	458;"	f
+computerBeepingS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	472;"	f
 conEffects	src/Dodge/Concurrent.hs	17;"	f
 concBall	src/Dodge/WorldEvent/SpawnParticle.hs	27;"	f
+connectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	532;"	f
 connectionBlurb	src/Dodge/Terminal.hs	100;"	f
 connectionBlurbLines	src/Dodge/Terminal.hs	45;"	f
 constructEdges	src/Polyhedra.hs	34;"	f
@@ -3711,7 +3712,7 @@ crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	47;"	f
 crUpdateItemLocations	src/Dodge/Inventory/Location.hs	41;"	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
+crankSlowS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	434;"	f
 createArc	src/Dodge/Tesla/Arc.hs	67;"	f
 createBarrelSpark	src/Dodge/Spark.hs	44;"	f
 createFlIt	src/Dodge/Placement/PlaceSpot.hs	180;"	f
@@ -3827,10 +3828,10 @@ decreaseAwareness	src/Dodge/Creature/Perception.hs	118;"	f
 decreaseToNothing'	src/Dodge/Base/Arithmetic.hs	7;"	f
 decreaseToZero	src/Dodge/Base/Arithmetic.hs	4;"	f
 decrementTimer	src/Sound.hs	101;"	f
-dedaS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	480;"	f
+dedaS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	498;"	f
-dededaS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	324;"	f
+dededaS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	336;"	f
-dededumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	448;"	f
+dededumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	462;"	f
-dedumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	316;"	f
+dedumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	328;"	f
 defDamageMaterial	src/Dodge/Material/Damage.hs	17;"	f
 defLSPic	src/Dodge/LightSource/Draw.hs	11;"	f
 defSPic	src/Dodge/Item/Draw/SPic.hs	241;"	f
@@ -3925,7 +3926,7 @@ denormalEdges	src/Polyhedra.hs	136;"	f
 destroyAt	src/Dodge/Bullet.hs	201;"	f
 destroyBlock	src/Dodge/Block.hs	56;"	f
 destroyDoor	src/Dodge/Block.hs	85;"	f
-destroyInvItem	src/Dodge/Inventory.hs	44;"	f
+destroyInvItem	src/Dodge/Inventory.hs	45;"	f
 destroyLS	src/Dodge/LightSource.hs	91;"	f
 destroyLSFlashAt	src/Dodge/LightSource.hs	101;"	f
 destroyMachine	src/Dodge/Machine/Destroy.hs	12;"	f
@@ -3950,11 +3951,12 @@ dirtColor	src/Dodge/Block/Debris.hs	160;"	f
 dirtDebris	src/Dodge/Block/Debris.hs	154;"	f
 dirtPoly	src/Dodge/Room/RoadBlock.hs	74;"	f
 dirtWallDamage	src/Dodge/Wall/DamageEffect.hs	103;"	f
+disconnectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	482;"	f
 disconnectTerminal	src/Dodge/Terminal.hs	215;"	f
 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	198;"	f
+displayFreeSlots	src/Dodge/DisplayInventory.hs	179;"	f
 displayTerminal	src/Dodge/Render/HUD.hs	331;"	f
 displayTerminalLineString	src/Dodge/Update.hs	426;"	f
 dist	src/Geometry/Vector.hs	179;"	f
@@ -4013,7 +4015,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	165;"	f
+doRegexInput	src/Dodge/Update/Input/InGame.hs	166;"	f
 doRoomInPlacements	src/Dodge/Layout.hs	97;"	f
 doRoomOutPlacements	src/Dodge/Layout.hs	107;"	f
 doRoomPlacements	src/Dodge/Layout.hs	122;"	f
@@ -4179,8 +4181,8 @@ ebFlicker	src/Dodge/EnergyBall.hs	94;"	f
 edgeFormatting	src/Dodge/Combine/Graph.hs	118;"	f
 edgeToPic	src/Dodge/Debug/Picture.hs	393;"	f
 effectWhileAttached	src/Dodge/ItEffect.hs	27;"	f
-ejectS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	470;"	f
+ejectS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	488;"	f
-elecCrackleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	362;"	f
+elecCrackleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	374;"	f
 elephantGun	src/Dodge/Item/Held/Rod.hs	38;"	f
 emptyCorridor	src/Dodge/Room/BlinkAcross.hs	22;"	f
 emptyTrie	src/SimpleTrie.hs	16;"	f
@@ -4188,7 +4190,7 @@ encircle	src/Dodge/Creature/Boid.hs	115;"	f
 encircleCloseP	src/Dodge/Creature/Boid.hs	35;"	f
 encircleDistP	src/Dodge/Creature/Boid.hs	21;"	f
 encircleP	src/Dodge/Creature/Boid.hs	27;"	f
-enterCombineInv	src/Dodge/DisplayInventory.hs	290;"	f
+enterCombineInv	src/Dodge/DisplayInventory.hs	271;"	f
 eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	6;"	f
 equipAllocString	src/Dodge/Render/HUD.hs	260;"	f
@@ -4219,7 +4221,7 @@ expireAndDamage	src/Dodge/Bullet.hs	183;"	f
 expireAndDamageFL	src/Dodge/Flame.hs	48;"	f
 explodeShell	src/Dodge/Projectile/Update.hs	154;"	f
 explosionFlashAt	src/Dodge/WorldEvent/Flash.hs	56;"	f
-explosionS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	396;"	f
+explosionS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	410;"	f
 explosiveBarrel	src/Dodge/Creature/Inanimate.hs	29;"	f
 extTrigLitPos	src/Dodge/Placement/Instance/Button.hs	84;"	f
 extendAway	src/Dodge/Placement/Instance/LightSource.hs	196;"	f
@@ -4237,7 +4239,7 @@ fdiv	src/ShortShow.hs	27;"	f
 feet	src/Dodge/Creature/Picture.hs	51;"	f
 ffoldM	src/Framebuffer/Update.hs	79;"	f
 filter3	src/FoldableHelp.hs	76;"	f
-filterSectionsPair	src/Dodge/DisplayInventory.hs	164;"	f
+filterSectionsPair	src/Dodge/DisplayInventory.hs	145;"	f
 findBlips	src/Dodge/RadarSweep.hs	44;"	f
 findBoundDists	src/Dodge/Update/Camera.hs	235;"	f
 findClosePoint	src/Dodge/LevelGen/StaticWalls.hs	155;"	f
@@ -4249,8 +4251,8 @@ findReverseEdgeList	src/Polyhedra.hs	57;"	f
 findWallFreeDropPoint	src/Dodge/FloorItem.hs	47;"	f
 findWallsInPolygon	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	78;"	f
 findWithIx	src/ListHelp.hs	123;"	f
-fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
+fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	522;"	f
-fireS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	332;"	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	18;"	f
@@ -4287,16 +4289,16 @@ flockToPointUsing'	src/Dodge/Creature/Boid.hs	227;"	f
 floorItemPickupInfo	src/Dodge/Render/HUD.hs	189;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	119;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
-foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	398;"	f
+foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
-foamSprayLoopS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	394;"	f
+foamSprayLoopS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	408;"	f
 foldCr	src/Dodge/Creature/State.hs	44;"	f
 foldPairs	src/ListHelp.hs	37;"	f
 foldrWhileArb	src/ListHelp.hs	110;"	f
 followImpulse	src/Dodge/Creature/Impulse.hs	37;"	f
 followImpulses	src/Dodge/Creature/Impulse.hs	31;"	f
-foot1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	348;"	f
+foot1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	360;"	f
-foot2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	364;"	f
+foot2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	376;"	f
-foot3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	442;"	f
+foot3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	456;"	f
 footstepSideEffect	src/Dodge/Creature/State/WalkCycle.hs	25;"	f
 forbidFlee	src/Dodge/Creature/Boid.hs	42;"	f
 forceElements	src/StrictHelp.hs	10;"	f
@@ -4308,7 +4310,7 @@ 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
-fridgeHumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	358;"	f
+fridgeHumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	370;"	f
 fromEdgeTuple	src/Dodge/Path/Translate.hs	5;"	f
 fromJust'	src/MaybeHelp.hs	24;"	f
 fromListL	src/DoubleStack.hs	7;"	f
@@ -4382,10 +4384,10 @@ glNamedBufferSubDataH	src/Shader/Bind.hs	53;"	f
 glassDebris	src/Dodge/Block/Debris.hs	169;"	f
 glassLesson	src/Dodge/Room/GlassLesson.hs	23;"	f
 glassLessonRunPast	src/Dodge/Room/GlassLesson.hs	68;"	f
-glassShat1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	466;"	f
+glassShat1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	480;"	f
-glassShat2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	438;"	f
+glassShat2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	452;"	f
-glassShat3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	326;"	f
+glassShat3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	338;"	f
-glassShat4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	436;"	f
+glassShat4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	450;"	f
 glassSwitchBack	src/Dodge/Room/Room.hs	70;"	f
 glassSwitchBackCrits	src/Dodge/Room/Room.hs	99;"	f
 glassWallDamage	src/Dodge/Wall/DamageEffect.hs	48;"	f
@@ -4409,14 +4411,14 @@ gridPoints'	src/Grid.hs	79;"	f
 gridPoints''	src/Grid.hs	74;"	f
 gridPointsOff	src/Grid.hs	62;"	f
 groupSplitItemAmounts	src/Dodge/Combine.hs	49;"	f
-gruntS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	484;"	f
+gruntS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
 guardDisconnectedID	src/Dodge/Update/Scroll.hs	74;"	f
-gut1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	516;"	f
+gut1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	536;"	f
-gut2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	376;"	f
+gut2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	388;"	f
-gut3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	356;"	f
+gut3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	368;"	f
-gut4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	336;"	f
+gut4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	348;"	f
-gut5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	490;"	f
+gut5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	508;"	f
-gut6S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	462;"	f
+gut6S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	476;"	f
 hackOutline	src/Dodge/Render/Outline.hs	5;"	f
 halfHeight	src/Dodge/Base/Window.hs	48;"	f
 halfWidth	src/Dodge/Base/Window.hs	48;"	f
@@ -4444,7 +4446,7 @@ headLampShape	src/Dodge/Item/Draw/SPic.hs	381;"	f
 headMap	src/Dodge/DoubleTree.hs	170;"	f
 heal	src/Dodge/Item/Consumable.hs	17;"	f
 heal25	src/Dodge/Item/Consumable.hs	14;"	f
-healS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	354;"	f
+healS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	366;"	f
 healthAnalyserByDoor	src/Dodge/Room/LasTurret.hs	72;"	f
 healthTest	src/Dodge/Room/LasTurret.hs	93;"	f
 heavyBulDams	src/Dodge/Item/Weapon/Bullet.hs	38;"	f
@@ -4463,9 +4465,9 @@ hiToFloat	src/Dodge/Room/Modify/Girder.hs	171;"	f
 highBar	src/Dodge/Room/Foreground.hs	89;"	f
 highDiagonalMesh	src/Dodge/Room/Foreground.hs	35;"	f
 highMesh	src/Dodge/Room/Foreground.hs	25;"	f
-hit1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
+hit1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	426;"	f
 hitEffFromBul	src/Dodge/Bullet.hs	145;"	f
-hitS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	382;"	f
+hitS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	394;"	f
 holdForm	src/Dodge/Creature/Boid.hs	136;"	f
 holsterWeapon	src/Dodge/Creature/Volition.hs	14;"	f
 homingDrawType	src/Dodge/Projectile/Create.hs	12;"	f
@@ -4521,9 +4523,9 @@ insertAt	src/Padding.hs	60;"	f
 insertIMInZone	src/Dodge/Base.hs	59;"	f
 insertInTrie	src/SimpleTrie.hs	23;"	f
 insertNewKey	src/IntMapHelp.hs	64;"	f
-insertOneS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	368;"	f
+insertOneS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	380;"	f
 insertOver	src/ListHelp.hs	47;"	f
-insertS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	318;"	f
+insertS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	330;"	f
 insertWall	src/Dodge/Placement/PlaceSpot/Block.hs	122;"	f
 insertWallInZones	src/Dodge/Wall/Zone.hs	20;"	f
 insertWalls	src/Dodge/Placement/PlaceSpot/Block.hs	117;"	f
@@ -4550,7 +4552,7 @@ interweave	src/Justify.hs	17;"	f
 intsToPos	src/Dodge/Room/Modify/Girder.hs	160;"	f
 invAdj	src/Dodge/Item/Grammar.hs	186;"	f
 invCursorParams	src/Dodge/ListDisplayParams.hs	38;"	f
-invDimColor	src/Dodge/DisplayInventory.hs	192;"	f
+invDimColor	src/Dodge/DisplayInventory.hs	173;"	f
 invDisplayParams	src/Dodge/ListDisplayParams.hs	32;"	f
 invHead	src/Dodge/Render/HUD.hs	367;"	f
 invLDT	src/Dodge/Item/Grammar.hs	169;"	f
@@ -4582,7 +4584,7 @@ isAmmoIntLink	src/Dodge/HeldUse.hs	206;"	f
 isAnimate	src/Dodge/Creature/Test.hs	138;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	105;"	f
 isElectrical	src/Dodge/Data/Damage.hs	42;"	f
-isFilteringInv	src/Dodge/DisplayInventory.hs	145;"	f
+isFilteringInv	src/Dodge/Inventory.hs	259;"	f
 isFrictionless	src/Dodge/Creature/State.hs	341;"	f
 isGas	src/Dodge/Euse.hs	64;"	f
 isInLnk	src/Dodge/PlacementSpot.hs	160;"	f
@@ -4656,7 +4658,7 @@ keyCardRoomRunPast	src/Dodge/Room/LasTurret.hs	57;"	f
 keyCardRunPastRand	src/Dodge/LockAndKey.hs	37;"	f
 keyPic	src/Dodge/Item/Draw/SPic.hs	397;"	f
 keyholeCorridor	src/Dodge/Room/Corridor.hs	39;"	f
-knifeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	456;"	f
+knifeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	470;"	f
 lConnect	src/Dodge/Render/Connectors.hs	41;"	f
 lConnectMulti	src/Dodge/Render/Connectors.hs	50;"	f
 lShape	src/Dodge/Placement/Instance/LightSource.hs	77;"	f
@@ -4723,7 +4725,7 @@ listConfig	src/Dodge/Menu.hs	199;"	f
 listControls	src/Dodge/Menu.hs	212;"	f
 listCursorChooseBorderScale	src/Dodge/Render/List.hs	118;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	188;"	f
-listSelectionColorPicture	src/Dodge/DisplayInventory.hs	282;"	f
+listSelectionColorPicture	src/Dodge/DisplayInventory.hs	263;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
 llleft	src/Dodge/Item/Grammar.hs	105;"	f
 llright	src/Dodge/Item/Grammar.hs	112;"	f
@@ -4858,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	327;"	f
+maybeExitCombine	src/Dodge/Update/Input/InGame.hs	328;"	f
 maybeOpenTerminal	src/Dodge/Update.hs	116;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	111;"	f
@@ -4896,13 +4898,13 @@ merge	src/ListHelp.hs	83;"	f
 mergeBy	src/ListHelp.hs	86;"	f
 mergeOn	src/ListHelp.hs	93;"	f
 mergeSound	src/Sound.hs	58;"	f
-metal1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	440;"	f
+metal1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	454;"	f
-metal2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	488;"	f
+metal2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	506;"	f
-metal3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	432;"	f
+metal3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	446;"	f
-metal4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	454;"	f
+metal4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	468;"	f
-metal5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	468;"	f
+metal5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	484;"	f
-metal6S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	494;"	f
+metal6S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	512;"	f
-metal7S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	384;"	f
+metal7S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	396;"	f
 metalDebris	src/Dodge/Block/Debris.hs	163;"	f
 mglCreate	src/GLHelp.hs	8;"	f
 mglDelete	src/GLHelp.hs	14;"	f
@@ -4915,19 +4917,19 @@ midWall	src/Dodge/Placement/Instance/Wall.hs	27;"	f
 minAndMax	src/FoldableHelp.hs	109;"	f
 minCrIXOn	src/Dodge/Zoning/Creature.hs	45;"	f
 minOn	src/FoldableHelp.hs	35;"	f
-mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	322;"	f
+mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	334;"	f
 miniGunCrit	src/Dodge/Creature.hs	62;"	f
 miniGunX	src/Dodge/Item/Held/Cane.hs	83;"	f
 miniGunXPict	src/Dodge/Item/Draw/SPic.hs	306;"	f
 miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	301;"	f
-miniS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	510;"	f
+miniS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	528;"	f
 miniTree2	src/Dodge/Room/Room.hs	106;"	f
 minimumOn	src/FoldlHelp.hs	12;"	f
 mirrorV3xz	src/Dodge/Creature/HandPos.hs	52;"	f
 mirrorXAxis	src/Geometry/Polygon.hs	49;"	f
 mirrorxz	src/Picture/Base.hs	335;"	f
 mirroryz	src/Picture/Base.hs	340;"	f
-missileLaunchS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	482;"	f
+missileLaunchS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	500;"	f
 mixAngles	src/Geometry.hs	205;"	f
 mixColors	src/Color.hs	86;"	f
 mixColorsFrac	src/Color.hs	82;"	f
@@ -5028,7 +5030,7 @@ numSubElements	src/Shader/Parameters.hs	39;"	f
 numTraversable	src/TreeHelp.hs	183;"	f
 obstacleColor	src/Dodge/Debug/Picture.hs	227;"	f
 obstructPathsCrossing	src/Dodge/Path.hs	138;"	f
-oldMachineBootS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	498;"	f
+oldMachineBootS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	516;"	f
 onEquipWristShield	src/Dodge/Euse.hs	83;"	f
 onRemoveWristShield	src/Dodge/Euse.hs	92;"	f
 onXY	src/Geometry/Vector3D.hs	130;"	f
@@ -5087,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	262;"	f
+pauseGame	src/Dodge/Update/Input/InGame.hs	263;"	f
 pauseMenu	src/Dodge/Menu.hs	53;"	f
 pauseMenuOptions	src/Dodge/Menu.hs	58;"	f
 pauseSound	src/Dodge/SoundLogic.hs	41;"	f
@@ -5112,7 +5114,7 @@ picAtCrPos1	src/Dodge/Render/ShapePicture.hs	62;"	f
 picFormat	src/Polyhedra.hs	23;"	f
 picMap	src/Picture/Base.hs	67;"	f
 pickUpItem	src/Dodge/Inventory/Add.hs	89;"	f
-pickUpS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	444;"	f
+pickUpS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	458;"	f
 pincerP	src/Dodge/Creature/Boid.hs	60;"	f
 pincerP'	src/Dodge/Creature/Boid.hs	93;"	f
 pincerP''	src/Dodge/Creature/Boid.hs	103;"	f
@@ -5144,7 +5146,7 @@ placeSpotRoomRand	src/Dodge/Placement/PlaceSpot.hs	89;"	f
 placeSpotUsingLink	src/Dodge/Placement/PlaceSpot.hs	70;"	f
 placeString	src/Dodge/Render/MenuScreen.hs	54;"	f
 placeWallPoly	src/Dodge/Placement/PlaceSpot.hs	162;"	f
-plainRegex	src/Dodge/DisplayInventory.hs	195;"	f
+plainRegex	src/Dodge/DisplayInventory.hs	176;"	f
 plateCraft	src/Dodge/Item/Craftable.hs	45;"	f
 playIfFree	src/Sound.hs	136;"	f
 playPositionalSoundQueue	src/Sound.hs	144;"	f
@@ -5255,7 +5257,7 @@ prependTwo	src/Geometry.hs	165;"	f
 pressedMBEffectsTopInventory	src/Dodge/Creature/YourControl.hs	163;"	f
 prettyDT	src/Dodge/DoubleTree.hs	179;"	f
 prettyLDT	src/Dodge/DoubleTree.hs	183;"	f
-primeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	422;"	f
+primeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	436;"	f
 printColumnTitles	src/Dodge/Tree/Shift.hs	142;"	f
 printColumns	src/Dodge/Tree/Shift.hs	132;"	f
 printInfo	src/Dodge/Tree/Shift.hs	145;"	f
@@ -5374,11 +5376,11 @@ refract	src/Dodge/Item/Weapon/LaserPath.hs	40;"	f
 refreshOptionsSelectionList	src/Dodge/Menu/Option.hs	34;"	f
 regexCombs	src/Dodge/DisplayInventory.hs	63;"	f
 regexIn	src/Regex.hs	4;"	f
-regexList	src/Dodge/DisplayInventory.hs	330;"	f
+regexList	src/Dodge/DisplayInventory.hs	311;"	f
 regexList	src/Regex.hs	7;"	f
-reload1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	428;"	f
+reload1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	442;"	f
 reloadLevelStart	src/Dodge/Save.hs	71;"	f
-reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	426;"	f
+reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	440;"	f
 rememberSounds	src/Dodge/Creature/Perception.hs	177;"	f
 remoteScreen	src/Dodge/Item/Scope.hs	50;"	f
 remoteShellShape	src/Dodge/Projectile/Draw.hs	42;"	f
@@ -5431,7 +5433,7 @@ rightPad	src/Padding.hs	22;"	f
 rightPadNoSquash	src/Padding.hs	26;"	f
 rlPosDir	src/Dodge/RoomLink.hs	94;"	f
 rmInLinks	src/Dodge/RoomLink.hs	138;"	f
-rmInvItem	src/Dodge/Inventory.hs	57;"	f
+rmInvItem	src/Dodge/Inventory.hs	58;"	f
 rmLinksOfType	src/Dodge/RoomLink.hs	135;"	f
 rmOutLinks	src/Dodge/RoomLink.hs	138;"	f
 roomC	src/Dodge/Room/Room.hs	38;"	f
@@ -5524,8 +5526,8 @@ screenPolygon	src/Dodge/Base/Window.hs	17;"	f
 screenPolygonBord	src/Dodge/Base/Window.hs	27;"	f
 screenPosAbs	src/Dodge/ScreenPos.hs	15;"	f
 screenToWorldPos	src/Dodge/Base/Coordinate.hs	53;"	f
-scrollAugInvSel	src/Dodge/Inventory.hs	227;"	f
+scrollAugInvSel	src/Dodge/Inventory.hs	228;"	f
-scrollAugNextInSection	src/Dodge/Inventory.hs	240;"	f
+scrollAugNextInSection	src/Dodge/Inventory.hs	241;"	f
 scrollCommandStrings	src/Dodge/Update/Scroll.hs	137;"	f
 scrollCommands	src/Dodge/Update/Scroll.hs	134;"	f
 scrollDebugInfoInt	src/Dodge/Debug.hs	47;"	f
@@ -5534,14 +5536,15 @@ scrollSelectionSections	src/Dodge/SelectionSections.hs	29;"	f
 scrollTimeBack	src/Dodge/Update.hs	200;"	f
 scrollTimeForward	src/Dodge/Update.hs	220;"	f
 scrollWatch	src/Dodge/Item/Weapon/Utility.hs	30;"	f
-seagullBarkS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	406;"	f
+seagullBarkS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	420;"	f
-seagullChatter1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	476;"	f
+seagullBarkTransformedS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	486;"	f
-seagullChatterS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	390;"	f
+seagullChatter1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	494;"	f
-seagullCry1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	404;"	f
+seagullChatterS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	404;"	f
-seagullCry2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	410;"	f
+seagullCry1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	418;"	f
-seagullCryS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	418;"	f
+seagullCry2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	424;"	f
-seagullWhistle1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	360;"	f
+seagullCryS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	432;"	f
-seagullWhistleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	512;"	f
+seagullWhistle1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	372;"	f
+seagullWhistleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	530;"	f
 searchIfDamaged	src/Dodge/Creature/ReaderUpdate.hs	203;"	f
 secondColumnParams	src/Dodge/ListDisplayParams.hs	45;"	f
 seedStartMenu	src/Dodge/Menu.hs	79;"	f
@@ -5556,7 +5559,7 @@ selSecSelSize	src/Dodge/SelectionSections.hs	175;"	f
 selSecYint	src/Dodge/SelectionSections.hs	184;"	f
 selectCreatureDebugItem	src/Dodge/Debug.hs	39;"	f
 selectUse	src/Dodge/SelectUse.hs	11;"	f
-selectedCloseObject	src/Dodge/Inventory.hs	251;"	f
+selectedCloseObject	src/Dodge/Inventory.hs	252;"	f
 sensAboveDoor	src/Dodge/Room/SensorDoor.hs	63;"	f
 sensInsideDoor	src/Dodge/Room/SensorDoor.hs	69;"	f
 senseDamage	src/Dodge/Machine/Update.hs	134;"	f
@@ -5674,7 +5677,7 @@ shootersRoom1	src/Dodge/Room/Room.hs	305;"	f
 shootingRange	src/Dodge/Room/Room.hs	332;"	f
 shortPoint2	src/Dodge/ShortShow.hs	4;"	f
 shortShow	src/ShortShow.hs	10;"	f
-shotgunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	508;"	f
+shotgunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	526;"	f
 shoulderHeight	src/Dodge/Item/HeldOffset.hs	61;"	f
 shoulderSH	src/Dodge/Creature/Picture.hs	137;"	f
 shoulderSP	src/Dodge/Creature/HandPos.hs	196;"	f
@@ -5684,9 +5687,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
@@ -5697,8 +5700,8 @@ sigmoid	src/Dodge/Base.hs	129;"	f
 simpleCrSprings	src/Dodge/Update.hs	746;"	f
 simpleDamFL	src/Dodge/Flame.hs	41;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	250;"	f
-sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	486;"	f
+sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
-sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	340;"	f
+sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	352;"	f
 singleAmmo	src/Dodge/Default/Item.hs	44;"	f
 singleBlock	src/Dodge/Placement/Instance/Wall.hs	30;"	f
 singleDT	src/Dodge/DoubleTree.hs	9;"	f
@@ -5708,8 +5711,8 @@ 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
-skwareFadeTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	366;"	f
+skwareFadeTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	378;"	f
-slideDoorS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	492;"	f
+slideDoorS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	510;"	f
 slideWindow	src/ListHelp.hs	80;"	f
 slowDoorRoom	src/Dodge/Room/LongDoor.hs	152;"	f
 slowDoorRoomRunPast	src/Dodge/Room/LongDoor.hs	169;"	f
@@ -5717,10 +5720,10 @@ smallBattery	src/Dodge/Item/Ammo.hs	90;"	f
 smallBranch	src/Dodge/Tree/GenerateStructure.hs	32;"	f
 smallChaseCrit	src/Dodge/Creature/ChaseCrit.hs	16;"	f
 smallDrawTree	src/Dodge/LevelGen.hs	88;"	f
-smallGlass1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	338;"	f
+smallGlass1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	350;"	f
-smallGlass2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	464;"	f
+smallGlass2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	478;"	f
-smallGlass3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	372;"	f
+smallGlass3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	384;"	f
-smallGlass4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	334;"	f
+smallGlass4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	346;"	f
 smallPillar	src/Dodge/Room/Pillar.hs	32;"	f
 smallRoom	src/Dodge/Room/RunPast.hs	31;"	f
 smg	src/Dodge/Item/Held/Stick.hs	65;"	f
@@ -5735,15 +5738,15 @@ soundIsClose	src/Dodge/Creature/Perception.hs	183;"	f
 soundMenu	src/Dodge/Menu.hs	137;"	f
 soundMenuOptions	src/Dodge/Menu.hs	140;"	f
 soundMultiFrom	src/Dodge/SoundLogic.hs	173;"	f
-soundPathList	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	212;"	f
+soundPathList	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	220;"	f
 soundPic	src/Dodge/Debug/Picture.hs	306;"	f
 soundStart	src/Dodge/SoundLogic.hs	112;"	f
-soundToOnomato	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	108;"	f
+soundToOnomato	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	112;"	f
 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	265;"	f
+spaceAction	src/Dodge/Update/Input/InGame.hs	266;"	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
@@ -5807,11 +5810,11 @@ startRoom	src/Dodge/Room/Start.hs	52;"	f
 startSeedGame	src/Dodge/StartNewGame.hs	20;"	f
 startSeedGameConc	src/Dodge/StartNewGame.hs	27;"	f
 statsModifier	src/Dodge/Creature/Info.hs	14;"	f
-stone1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	386;"	f
+stone1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	398;"	f
-stone2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	474;"	f
+stone2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	492;"	f
-stone3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	408;"	f
+stone3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	422;"	f
-stone4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	346;"	f
+stone4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	358;"	f
-stone5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	446;"	f
+stone5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	460;"	f
 stoneDebris	src/Dodge/Block/Debris.hs	137;"	f
 stoneWallDamage	src/Dodge/Wall/DamageEffect.hs	24;"	f
 stopAllSounds	src/Sound.hs	124;"	f
@@ -5831,7 +5834,7 @@ subMap	src/TreeHelp.hs	118;"	f
 subZipWith	src/Dodge/Placement/Instance/Wall.hs	115;"	f
 swapInOutLinks	src/Dodge/RoomLink.hs	80;"	f
 swapIndices	src/ListHelp.hs	50;"	f
-swapInvItems	src/Dodge/Inventory.hs	175;"	f
+swapInvItems	src/Dodge/Inventory.hs	176;"	f
 swarmCrit	src/Dodge/Creature/SwarmCrit.hs	10;"	f
 swarmUsingCenter	src/Dodge/Creature/Boid.hs	171;"	f
 switchDoor	src/Dodge/Placement/Instance/Door.hs	96;"	f
@@ -5852,11 +5855,11 @@ tankShape	src/Dodge/Placement/Instance/Tank.hs	22;"	f
 tankSquareDec	src/Dodge/Placement/Instance/Tank.hs	15;"	f
 tanksPipesRoom	src/Dodge/Room/Tanks.hs	92;"	f
 tanksRoom	src/Dodge/Room/Tanks.hs	100;"	f
-tap1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	450;"	f
+tap1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	464;"	f
-tap2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	400;"	f
+tap2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	414;"	f
-tap3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	434;"	f
+tap3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	448;"	f
-tap4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	506;"	f
+tap4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	524;"	f
-tapQuietS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	328;"	f
+tapQuietS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	340;"	f
 targCorner	src/Dodge/Targeting/Draw.hs	28;"	f
 targetCursorPic	src/Dodge/Targeting/Draw.hs	34;"	f
 targetYouCognizant	src/Dodge/Creature/ChooseTarget.hs	13;"	f
@@ -5865,7 +5868,7 @@ targetYouWhenCognizant	src/Dodge/Creature/ReaderUpdate.hs	194;"	f
 targetYouWhenCognizant	src/Dodge/Creature/SetTarget.hs	9;"	f
 targetingScope	src/Dodge/Item/Scope.hs	22;"	f
 telRoomLev	src/Dodge/Room/Teleport.hs	14;"	f
-teleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	378;"	f
+teleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	390;"	f
 teleportModule	src/Dodge/Item/Craftable.hs	30;"	f
 termButton	src/Dodge/Placement/Instance/Terminal.hs	51;"	f
 termSoundLine	src/Dodge/Terminal.hs	109;"	f
@@ -5912,7 +5915,7 @@ timeFlowUpdate	src/Dodge/Update.hs	163;"	f
 timeModule	src/Dodge/Item/Craftable.hs	33;"	f
 timerTLS	src/Dodge/LightSource/Update.hs	22;"	f
 tinMag	src/Dodge/Item/Ammo.hs	27;"	f
-tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	402;"	f
+tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	416;"	f
 titleOptionsMenu	src/Dodge/Menu.hs	99;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	102;"	f
 tlsTimeRadColPos	src/Dodge/LightSource.hs	69;"	f
@@ -5935,16 +5938,16 @@ toggleCombineInv	src/Dodge/DisplayInventory.hs	28;"	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	289;"	f
+toggleMap	src/Dodge/Update/Input/InGame.hs	290;"	f
-toggleTweakInv	src/Dodge/Update/Input/InGame.hs	304;"	f
+toggleTweakInv	src/Dodge/Update/Input/InGame.hs	305;"	f
 togglesToEffects	src/Dodge/Terminal.hs	245;"	f
-tone440S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	460;"	f
+tone440S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	474;"	f
-tone440sawtoothS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	430;"	f
+tone440sawtoothS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	444;"	f
-tone440sawtoothquietS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	320;"	f
+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	70;"	f
@@ -6007,7 +6010,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	315;"	f
+tryCombine	src/Dodge/Update/Input/InGame.hs	314;"	f
 tryGetChannel	src/Sound.hs	96;"	f
 tryGetRootAttachedFromInvID	src/Dodge/Inventory/Location.hs	19;"	f
 tryGetRootItemInvID	src/Dodge/Inventory/Location.hs	28;"	f
@@ -6028,9 +6031,9 @@ twists	src/Dodge/Creature/Test.hs	103;"	f
 twoFlat	src/Dodge/Creature/Test.hs	100;"	f
 twoFlatHRot	src/Dodge/Item/HeldOffset.hs	73;"	f
 twoRoomPoss	src/Dodge/PlacementSpot.hs	147;"	f
-twoStep1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	388;"	f
+twoStep1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	400;"	f
-twoStepS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	424;"	f
+twoStepS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	438;"	f
-twoStepSlowS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	416;"	f
+twoStepSlowS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	430;"	f
 ubyteSize	src/Shader/Parameters.hs	13;"	f
 uncurryV	src/Geometry/Data.hs	46;"	f
 unfoldrMID	src/MonadHelp.hs	33;"	f
@@ -6053,7 +6056,7 @@ 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	200;"	f
+updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	201;"	f
 updateBarrel	src/Dodge/Barreloid.hs	45;"	f
 updateBarreloid	src/Dodge/Barreloid.hs	13;"	f
 updateBounds	src/Dodge/Update/Camera.hs	245;"	f
@@ -6061,7 +6064,7 @@ updateBulVel	src/Dodge/Bullet.hs	50;"	f
 updateBullet	src/Dodge/Bullet.hs	28;"	f
 updateBullets	src/Dodge/Update.hs	527;"	f
 updateCamera	src/Dodge/Update/Camera.hs	31;"	f
-updateCloseObjects	src/Dodge/Inventory.hs	116;"	f
+updateCloseObjects	src/Dodge/Inventory.hs	117;"	f
 updateCloud	src/Dodge/Update.hs	712;"	f
 updateClouds	src/Dodge/Update.hs	556;"	f
 updateCombinePositioning	src/Dodge/DisplayInventory.hs	35;"	f
@@ -6076,7 +6079,7 @@ updateDistortion	src/Dodge/Distortion.hs	5;"	f
 updateDistortions	src/Dodge/Update.hs	517;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	46;"	f
 updateEnergyBalls	src/Dodge/Update.hs	544;"	f
-updateEnterRegex	src/Dodge/Update/Input/InGame.hs	241;"	f
+updateEnterRegex	src/Dodge/Update/Input/InGame.hs	242;"	f
 updateExpBarrel	src/Dodge/Barreloid.hs	19;"	f
 updateFBOTO	src/Framebuffer/Update.hs	97;"	f
 updateFBOTO3	src/Framebuffer/Update.hs	131;"	f
@@ -6090,20 +6093,20 @@ updateHumanoid	src/Dodge/Humanoid.hs	12;"	f
 updateIMl	src/Dodge/Update.hs	486;"	f
 updateIMl'	src/Dodge/Update.hs	491;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	70;"	f
-updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	139;"	f
+updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	140;"	f
 updateInstantBullets	src/Dodge/Update.hs	633;"	f
 updateInv	src/Dodge/Creature/State.hs	152;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	81;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	268;"	f
 updateItemWithOrientation	src/Dodge/Creature/State.hs	194;"	f
-updateKeyInGame	src/Dodge/Update/Input/InGame.hs	133;"	f
+updateKeyInGame	src/Dodge/Update/Input/InGame.hs	134;"	f
-updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	122;"	f
+updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	123;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
 updateLaser	src/Dodge/Laser/Update.hs	13;"	f
 updateLasers	src/Dodge/Update.hs	415;"	f
 updateLightSources	src/Dodge/Update.hs	520;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
-updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	159;"	f
+updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	160;"	f
 updateMIM	src/Dodge/Update.hs	646;"	f
 updateMachine	src/Dodge/Machine/Update.hs	16;"	f
 updateMouseInventorySelection	src/Dodge/Update.hs	299;"	f
@@ -6116,8 +6119,8 @@ updatePastWorlds	src/Dodge/Update.hs	403;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
 updatePosEvents	src/Dodge/Update.hs	553;"	f
 updatePreload	src/Preload/Update.hs	20;"	f
-updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	97;"	f
+updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	98;"	f
-updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	100;"	f
+updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	101;"	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
@@ -6131,8 +6134,8 @@ updateRootItemID	src/Dodge/Inventory/Location.hs	34;"	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	225;"	f
+updateSection	src/Dodge/DisplayInventory.hs	206;"	f
-updateSectionsPositioning	src/Dodge/DisplayInventory.hs	204;"	f
+updateSectionsPositioning	src/Dodge/DisplayInventory.hs	185;"	f
 updateSeenWalls	src/Dodge/Update.hs	664;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
 updateShockwaves	src/Dodge/Update.hs	538;"	f
@@ -6151,7 +6154,7 @@ updateUniverse	src/Dodge/Update.hs	69;"	f
 updateUniverseFirst	src/Dodge/Update.hs	80;"	f
 updateUniverseLast	src/Dodge/Update.hs	126;"	f
 updateUniverseMid	src/Dodge/Update.hs	147;"	f
-updateUseInputInGame	src/Dodge/Update/Input/InGame.hs	32;"	f
+updateUseInputInGame	src/Dodge/Update/Input/InGame.hs	33;"	f
 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
@@ -6262,8 +6265,8 @@ weaponUnderCrits	src/Dodge/Room/Room.hs	154;"	f
 wedgeGeom	src/Dodge/Base.hs	47;"	f
 wedgeOfThickness	src/Dodge/Picture.hs	9;"	f
 white	src/Color.hs	26;"	f
-whiteNoiseFadeInS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	514;"	f
+whiteNoiseFadeInS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	534;"	f
-whiteNoiseFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	374;"	f
+whiteNoiseFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	386;"	f
 wiToFloat	src/Dodge/Room/Modify/Girder.hs	168;"	f
 winConfig	appDodge/Main.hs	57;"	f
 windowLine	src/Dodge/Placement/Instance/Wall.hs	48;"	f
@@ -6294,6 +6297,7 @@ worldPosToScreen	src/Dodge/Base/Coordinate.hs	28;"	f
 worldSPic	src/Dodge/Render/ShapePicture.hs	23;"	f
 worldToGenWorld	src/Dodge/LevelGen/LevelStructure.hs	14;"	f
 wpAdd	src/Dodge/Room/RezBox.hs	137;"	f
+wrench1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	402;"	f
 wristArmour	src/Dodge/Item/Equipment.hs	47;"	f
 wristInvisibility	src/Dodge/Item/Equipment.hs	119;"	f
 writeConfig	src/Dodge/Menu.hs	159;"	f