Cleanup

src/Dodge/Menu.hs

@@ -4,12 +4,11 @@ module Dodge.Menu (
     splashMenu,
 ) where
 
-import Dodge.Base.Coordinate
-import Geometry
 import Control.Monad
 import qualified Data.Aeson.Encode.Pretty as AEP
 import Data.ByteString.Lazy.Char8 (unpack)
 import Data.Maybe
+import Dodge.Base.Coordinate
 import Dodge.Concurrent
 import Dodge.Config.Update
 import Dodge.Data.Universe
@@ -19,13 +18,14 @@ import Dodge.Menu.PushPop
 import Dodge.Save
 import Dodge.SoundLogic
 import Dodge.StartNewGame
+import Geometry
 import LensHelp
 import MaybeHelp
 import Padding
 import Preload.Update
+import qualified SDL as SDL
 import System.Clipboard
 import Text.Read
-import qualified SDL as SDL
 
 splashMenu :: Universe -> ScreenLayer
 splashMenu u =
@@ -35,17 +35,17 @@ splashMenu u =
 splashMenuOptions :: [MenuOption]
 splashMenuOptions =
     [ Toggle (loadSaveSlot (SaveSlotNum 0)) displaycontinue
-    , Toggle (startNewGameInSlot 0) (opText "NEW WITH RANDOM SEED")
+    , Toggle (startNewGameInSlot 0) (otext "NEW WITH RANDOM SEED")
     , Toggle reloadLevelStart (displaywhenseed "NEW WITH LAST SEED")
-    , Toggle (pushScreen $ seedStartMenu "START FROM SEED") (opText "NEW WITH SPECIFIC SEED")
+    , Toggle (pushScreen $ seedStartMenu "START FROM SEED") (otext "NEW WITH SPECIFIC SEED")
-    , Toggle (pushScreen optionMenu) (opText "OPTIONS")
+    , Toggle (pushScreen optionMenu) (otext "OPTIONS")
-    , Toggle (pushScreen displayControls) (opText "VIEW CONTROLS")
+    , Toggle (pushScreen displayControls) (otext "VIEW CONTROLS")
-    , Toggle (pushScreen displayConfig) (opText "VIEW CONFIG")
+    , Toggle (pushScreen displayConfig) (otext "VIEW CONFIG")
     , Toggle id (displaywhenseed "VIEW LAST SEED")
-    , Toggle hardQuit (opText "QUIT")
+    , Toggle hardQuit (otext "QUIT")
     ]
   where
-    opText = const . MODString
+    otext = const . MODString
     displaycontinue u
         | _uvCanContinue u = MODString "CONTINUE"
         | otherwise = MODBlockedString "CONTINUE"
@@ -60,16 +60,16 @@ pauseMenu =
 
 pauseMenuOptions :: [MenuOption]
 pauseMenuOptions =
-    [ Toggle (startNewGameInSlot 0) (opText "NEW GAME")
+    [ Toggle (startNewGameInSlot 0) (otext "NEW GAME")
-    , Toggle reloadLevelStart (opText "RESTART")
+    , Toggle reloadLevelStart (otext "RESTART")
-    , Toggle (pushScreen $ seedStartMenu "START FROM SEED") (opText "NEW FROM SEED")
+    , Toggle (pushScreen $ seedStartMenu "START FROM SEED") (otext "NEW FROM SEED")
-    , Toggle (pushScreen optionMenu) (opText "OPTIONS")
+    , Toggle (pushScreen optionMenu) (otext "OPTIONS")
-    , Toggle (pushScreen displayControls) (opText "VIEW CONTROLS")
+    , Toggle (pushScreen displayControls) (otext "VIEW CONTROLS")
-    , Toggle id (opText "VIEW CURRENT SEED")
+    , Toggle id (otext "VIEW CURRENT SEED")
-    , Toggle saveQuit (opText "SAVE AND QUIT")
+    , Toggle saveQuit (otext "SAVE AND QUIT")
     ]
   where
-    opText = const . MODString
+    otext = const . MODString
 
 saveQuit :: Universe -> Universe
 saveQuit u = u & addSideEffect (saveQuitConc u) "SAVING"
@@ -193,17 +193,21 @@ gameOverMenu u =
 --charToScode = Scancode . fromIntegral . (\x -> x - 61) . fromEnum
 
 unpause :: Universe -> Universe
-unpause u' = resumeSound . set uvScreenLayers []
+unpause u' =
-    . set (uvWorld . input . mousePos) (u' ^. uvWorld . cWorld . lWorld . lAimPos)
+    resumeSound . set uvScreenLayers []
-    $ over uvIOEffects (\f u -> SDL.warpMouse SDL.WarpCurrentFocus (SDL.P (SDL.V2 x' y')) >> f u)
+        . set (uvWorld . input . mousePos) (u' ^. uvWorld . cWorld . lWorld . lAimPos)
-    u'
+        $ over
+            uvIOEffects
+            (\f u -> SDL.warpMouse SDL.WarpCurrentFocus (SDL.P (SDL.V2 x' y')) >> f u)
+            u'
   where
     cfig = u' ^. uvConfig
     x' = round $ x + 0.5 * windowXFloat cfig
     y' = round $ 0.5 * windowYFloat cfig - y
-    V2 x y = worldPosToScreen (u' ^. uvWorld . wCam) 
+    V2 x y =
-        (u' ^. uvWorld . cWorld . lWorld . lAimPos)
+        worldPosToScreen
-    
+            (u' ^. uvWorld . wCam)
+            (u' ^. uvWorld . cWorld . lWorld . lAimPos)
 
 -- note that this won't update after it is first loaded
 displayConfig :: Universe -> ScreenLayer
@@ -217,27 +221,28 @@ listConfig =
         . _uvConfig
 
 displayControls :: Universe -> ScreenLayer
---displayControls = const $ ColumnsScreen "CONTROLS" listControls
 displayControls =
     titleOptionsNoWrite "CONTROLS" $
         map (Toggle id . const . uncurry MODStringOption) listControls
 
 listControls :: [(String, String)]
 listControls =
-    [ ("w|a|s|d", "MOVEMENT")
+    [ ("w|a|s|d", "MOVE")
     , ("<rmb>", "AIM")
-    , ("<rmb>&<lmb>", "SHOOT/USE/EQUIP SELECTED")
+    , ("<rmb>&<lmb>", "USE SELECTED")
---    , ("<lmb>", "USE EQUIPPED")
+    , ("<lmb>&<rmb>", "ROTATE")
     , ("<wheelscroll>", "SELECT ITEM")
     , ("<space>", "PICKUP ITEM")
     , ("f", "DROP ITEM")
-    , ("q|e|0-9", "USE EQUIPMENT")
+    , ("<ctrl>+<wheelscroll>", "SWAP ITEMS")
+    , ("<shift>&q|e|0-9", "SET HOTKEY")
+    , ("q|e|0-9", "USE HOTKEY")
     , ("c", "COMBINE ITEMS")
-    , ("x", "EXAMINE ITEMS")
+--    , ("x", "EXAMINE ITEMS")
-    , ("m", "DISPLAY MAP")
+--    , ("m", "DISPLAY MAP")
-    , ("c|<esc>", "PAUSE AND DISPLAY MENU")
+    , ("p|<esc>", "PAUSE")
-    , ("<F1>", "USE NORMAL CAMERA")
+    , ("<F1>", "NORMAL CAMERA")
-    , ("<F2>", "PAUSE AND FLOAT CAMERA")
+    , ("<F2>", "DEBUG CAMERA")
     , ("<F5>", "QUICKSAVE")
     , ("<F9>", "QUICKLOAD")
     ]

tags

@@ -17,7 +17,7 @@
 <$>	src/Dodge/Data/CWorld.hs	45;"	o
 <$>	src/Dodge/Data/Camera.hs	39;"	o
 <$>	src/Dodge/Data/Creature.hs	88;"	o
-<$>	src/Dodge/Data/LWorld.hs	179;"	o
+<$>	src/Dodge/Data/LWorld.hs	180;"	o
 <$>	src/Dodge/Data/Terminal.hs	127;"	o
 ABSOLUTE	src/Dodge/Data/Item/Combine.hs	38;"	C
 AIUNIT	src/Dodge/Data/Item/Combine.hs	73;"	C
@@ -83,7 +83,7 @@ ArbitraryImpulseEffect	src/Dodge/Data/ActionPlan.hs	48;"	C
 ArbitraryImpulseFunction	src/Dodge/Data/ActionPlan.hs	46;"	C
 Arc	src/Dodge/Tesla/Arc.hs	1;"	m
 Arc	src/Picture/Arc.hs	1;"	m
-ArcNodeType	src/Dodge/Data/LWorld.hs	159;"	t
+ArcNodeType	src/Dodge/Data/LWorld.hs	160;"	t
 ArcShad	src/Picture/Data.hs	38;"	C
 ArcStep	src/Dodge/Data/ArcStep.hs	14;"	t
 ArcStep	src/Dodge/ArcStep.hs	1;"	m
@@ -376,7 +376,7 @@ Corridor	src/Dodge/Room/Corridor.hs	3;"	m
 Cosmic	src/Dodge/Data/Scenario.hs	74;"	C
 Cover	src/Dodge/Placement/Instance/LightSource/Cover.hs	1;"	m
 CrAc	src/Dodge/Data/CreatureEffect.hs	48;"	t
-CrArcNode	src/Dodge/Data/LWorld.hs	164;"	C
+CrArcNode	src/Dodge/Data/LWorld.hs	165;"	C
 CrBl	src/Dodge/Data/CreatureEffect.hs	39;"	t
 CrCanShoot	src/Dodge/Data/CreatureEffect.hs	40;"	C
 CrFleeFromTarget	src/Dodge/Data/CreatureEffect.hs	50;"	C
@@ -979,7 +979,7 @@ JoinClust	src/Dodge/Combine/Graph.hs	21;"	C
 JoystickLink	src/Dodge/Data/ComposedItem.hs	25;"	C
 JoystickSF	src/Dodge/Data/ComposedItem.hs	53;"	C
 Just'	src/MaybeHelp.hs	13;"	C
-JustStartedPlaying	src/Sound/Data.hs	25;"	C
+JustStartedPlaying	src/Sound/Data.hs	24;"	C
 Justify	src/Justify.hs	1;"	m
 KEYCARD	src/Dodge/Data/Item/Combine.hs	176;"	C
 Kill	src/Dodge/Data/ActionPlan.hs	198;"	C
@@ -1459,10 +1459,10 @@ PlacementSpot	src/Dodge/PlacementSpot.hs	2;"	m
 PlacementUsingPos	src/Dodge/Data/GenWorld.hs	83;"	C
 PlainBarrel	src/Dodge/Data/Creature/Misc.hs	87;"	C
 PlantNurserySS	src/Dodge/Data/Scenario.hs	96;"	C
-PlayStatus	src/Sound/Data.hs	24;"	t
+PlayStatus	src/Sound/Data.hs	23;"	t
 PlayerFaction	src/Dodge/Data/Creature/State.hs	42;"	C
 PlayerGoal	src/Dodge/Data/Scenario.hs	3;"	t
-Playing	src/Sound/Data.hs	26;"	C
+Playing	src/Sound/Data.hs	25;"	C
 Point2	src/Geometry/Data.hs	19;"	t
 Point3	src/Geometry/Data.hs	25;"	t
 Point4	src/Geometry/Data.hs	29;"	t
@@ -1807,17 +1807,16 @@ SonicGuns	src/Dodge/Item/Weapon/SonicGuns.hs	1;"	m
 SortCloseButton	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	30;"	C
 SortCloseItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	28;"	C
 SortInventory	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	21;"	C
-Sound	src/Sound/Data.hs	50;"	t
+Sound	src/Sound/Data.hs	45;"	t
 Sound	src/Dodge/Material/Sound.hs	1;"	m
 Sound	src/Dodge/WorldEvent/Sound.hs	1;"	m
 Sound	src/Sound.hs	11;"	m
-SoundData	src/Sound/Data.hs	36;"	t
+SoundID	src/Sound/Data.hs	32;"	t
-SoundID	src/Sound/Data.hs	33;"	t
 SoundLogic	src/Dodge/SoundLogic.hs	7;"	m
 SoundOrigin	src/Dodge/Data/SoundOrigin.hs	12;"	t
 SoundOrigin	src/Dodge/Data/SoundOrigin.hs	6;"	m
 SoundStart	src/Dodge/Data/WorldEffect.hs	30;"	C
-SoundStatus	src/Sound/Data.hs	17;"	t
+SoundStatus	src/Sound/Data.hs	16;"	t
 South	src/Dodge/Data/CardinalPoint.hs	6;"	C
 South8	src/Dodge/Data/CardinalPoint.hs	15;"	C
 SouthEast8	src/Dodge/Data/CardinalPoint.hs	14;"	C
@@ -1990,11 +1989,11 @@ TmWdWdDisconnectTerminal	src/Dodge/Data/WorldEffect.hs	76;"	C
 TmWdWdDoDeathTriggers	src/Dodge/Data/WorldEffect.hs	79;"	C
 TmWdWdTermSound	src/Dodge/Data/WorldEffect.hs	78;"	C
 TmWdWdfromWdWd	src/Dodge/Data/WorldEffect.hs	77;"	C
-ToContinueStart	src/Sound/Data.hs	28;"	C
+ToContinueStart	src/Sound/Data.hs	27;"	C
-ToPlaySound	src/Sound/Data.hs	40;"	t
+ToPlaySound	src/Sound/Data.hs	35;"	t
-ToStart	src/Sound/Data.hs	27;"	C
+ToStart	src/Sound/Data.hs	26;"	C
-ToStartMenu	src/Sound/Data.hs	30;"	C
+ToStartMenu	src/Sound/Data.hs	29;"	C
-ToStop	src/Sound/Data.hs	29;"	C
+ToStop	src/Sound/Data.hs	28;"	C
 Toggle	src/Dodge/Data/Universe.hs	103;"	C
 Toggle2	src/Dodge/Data/Universe.hs	107;"	C
 ToggleExamine	src/Dodge/ToggleExamine.hs	1;"	m
@@ -2135,7 +2134,7 @@ Wall	src/Dodge/Default/Wall.hs	1;"	m
 Wall	src/Dodge/Placement/Instance/Wall.hs	1;"	m
 Wall	src/Dodge/Wall.hs	1;"	m
 Wall	src/Dodge/Zoning/Wall.hs	1;"	m
-WallArcNode	src/Dodge/Data/LWorld.hs	160;"	C
+WallArcNode	src/Dodge/Data/LWorld.hs	161;"	C
 WallCreatureCollisions	src/Dodge/WallCreatureCollisions.hs	2;"	m
 WallDamage	src/Dodge/Update/WallDamage.hs	1;"	m
 WallDraw	src/Dodge/Data/Wall.hs	47;"	t
@@ -2331,7 +2330,7 @@ _camRot	src/Dodge/Data/Camera.hs	25;"	f
 _camViewDistance	src/Dodge/Data/Camera.hs	30;"	f
 _camViewFrom	src/Dodge/Data/Camera.hs	29;"	f
 _camZoom	src/Dodge/Data/Camera.hs	26;"	f
-_canID	src/Dodge/Data/LWorld.hs	165;"	f
+_canID	src/Dodge/Data/LWorld.hs	166;"	f
 _carriage	src/Dodge/Data/Creature/Stance.hs	14;"	f
 _carteCenter	src/Dodge/Data/HUD.hs	46;"	f
 _carteRot	src/Dodge/Data/HUD.hs	48;"	f
@@ -2585,7 +2584,7 @@ _genRooms	src/Dodge/Data/GenWorld.hs	26;"	f
 _getAttentiveTo	src/Dodge/Data/Creature/Perception.hs	61;"	f
 _getFixated	src/Dodge/Data/Creature/Perception.hs	62;"	f
 _getItAmount	src/Dodge/Data/Item/Use/Consumption.hs	39;"	f
-_getSoundID	src/Sound/Data.hs	33;"	f
+_getSoundID	src/Sound/Data.hs	32;"	f
 _gfConstant	src/Dodge/Data/GenFloat.hs	11;"	f
 _gfMax	src/Dodge/Data/GenFloat.hs	12;"	f
 _gfMin	src/Dodge/Data/GenFloat.hs	12;"	f
@@ -2689,6 +2688,7 @@ _izFac	src/Dodge/Data/Item/Use.hs	197;"	f
 _izMax	src/Dodge/Data/Item/Use.hs	195;"	f
 _izMin	src/Dodge/Data/Item/Use.hs	196;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
+_lAimPos	src/Dodge/Data/LWorld.hs	150;"	f
 _lClock	src/Dodge/Data/LWorld.hs	145;"	f
 _lTestInt	src/Dodge/Data/LWorld.hs	147;"	f
 _lTestString	src/Dodge/Data/LWorld.hs	146;"	f
@@ -2716,7 +2716,6 @@ _lightsUBO	src/Data/Preload/Render.hs	40;"	f
 _linearShockwaves	src/Dodge/Data/LWorld.hs	120;"	f
 _linkGapEW	src/Dodge/Data/Room.hs	35;"	f
 _linkGapNS	src/Dodge/Data/Room.hs	36;"	f
-_loadedChunks	src/Sound/Data.hs	37;"	f
 _loadedMusic	src/Music.hs	8;"	f
 _locLDT	src/Dodge/Data/DoubleTree.hs	69;"	f
 _locLdtContext	src/Dodge/Data/DoubleTree.hs	68;"	f
@@ -2890,7 +2889,7 @@ _plMID	src/Dodge/Data/GenWorld.hs	80;"	f
 _plOrder	src/Dodge/Data/GenWorld.hs	77;"	f
 _plSpot	src/Dodge/Data/GenWorld.hs	78;"	f
 _plType	src/Dodge/Data/GenWorld.hs	79;"	f
-_playStatus	src/Sound/Data.hs	18;"	f
+_playStatus	src/Sound/Data.hs	17;"	f
 _playingSounds	src/Dodge/Data/World.hs	41;"	f
 _pnZoning	src/Dodge/Data/World.hs	50;"	f
 _posEvents	src/Dodge/Data/LWorld.hs	110;"	f
@@ -3105,16 +3104,16 @@ _skinLower	src/Dodge/Data/Creature/Misc.hs	79;"	f
 _skinUpper	src/Dodge/Data/Creature/Misc.hs	72;"	f
 _skinUpper	src/Dodge/Data/Creature/Misc.hs	78;"	f
 _smoothScrollAmount	src/Dodge/Data/Input.hs	52;"	f
-_soundAngDist	src/Sound/Data.hs	54;"	f
+_soundAngDist	src/Sound/Data.hs	49;"	f
-_soundChannel	src/Sound/Data.hs	53;"	f
+_soundChannel	src/Sound/Data.hs	48;"	f
-_soundChunkID	src/Sound/Data.hs	58;"	f
+_soundChunkID	src/Sound/Data.hs	53;"	f
 _soundData	src/Data/Preload.hs	12;"	f
-_soundIsLooping	src/Sound/Data.hs	19;"	f
+_soundIsLooping	src/Sound/Data.hs	18;"	f
-_soundPos	src/Sound/Data.hs	55;"	f
+_soundPos	src/Sound/Data.hs	50;"	f
-_soundStatus	src/Sound/Data.hs	52;"	f
+_soundStatus	src/Sound/Data.hs	47;"	f
-_soundTime	src/Sound/Data.hs	51;"	f
+_soundTime	src/Sound/Data.hs	46;"	f
-_soundVolume	src/Sound/Data.hs	56;"	f
+_soundVolume	src/Sound/Data.hs	51;"	f
-_soundVolumeFraction	src/Sound/Data.hs	57;"	f
+_soundVolumeFraction	src/Sound/Data.hs	52;"	f
 _soundsToInvestigate	src/Dodge/Data/Creature/Memory.hs	14;"	f
 _spPixelOff	src/Dodge/Data/ScreenPos.hs	14;"	f
 _spScreenOff	src/Dodge/Data/ScreenPos.hs	13;"	f
@@ -3196,12 +3195,12 @@ _tmTitle	src/Dodge/Data/Terminal.hs	41;"	f
 _tmToggles	src/Dodge/Data/Terminal.hs	48;"	f
 _tmType	src/Dodge/Data/Terminal.hs	50;"	f
 _tmWriteCommands	src/Dodge/Data/Terminal.hs	44;"	f
-_toPlaySoundChunkID	src/Sound/Data.hs	46;"	f
+_toPlaySoundChunkID	src/Sound/Data.hs	41;"	f
-_toPlaySoundPos	src/Sound/Data.hs	43;"	f
+_toPlaySoundPos	src/Sound/Data.hs	38;"	f
-_toPlaySoundStatus	src/Sound/Data.hs	42;"	f
+_toPlaySoundStatus	src/Sound/Data.hs	37;"	f
-_toPlaySoundTime	src/Sound/Data.hs	41;"	f
+_toPlaySoundTime	src/Sound/Data.hs	36;"	f
-_toPlaySoundVolume	src/Sound/Data.hs	44;"	f
+_toPlaySoundVolume	src/Sound/Data.hs	39;"	f
-_toPlaySoundVolumeFraction	src/Sound/Data.hs	45;"	f
+_toPlaySoundVolumeFraction	src/Sound/Data.hs	40;"	f
 _toPlaySounds	src/Dodge/Data/World.hs	40;"	f
 _topBoxSize	src/Shape/Data.hs	17;"	f
 _torqueAfter	src/Dodge/Data/Item/Use.hs	86;"	f
@@ -3296,8 +3295,8 @@ _wallDamages	src/Dodge/Data/LWorld.hs	123;"	f
 _wallShader	src/Data/Preload/Render.hs	46;"	f
 _wallVBO	src/Data/Preload/Render.hs	45;"	f
 _walls	src/Dodge/Data/LWorld.hs	122;"	f
-_wanID	src/Dodge/Data/LWorld.hs	162;"	f
+_wanID	src/Dodge/Data/LWorld.hs	163;"	f
-_wanPos	src/Dodge/Data/LWorld.hs	161;"	f
+_wanPos	src/Dodge/Data/LWorld.hs	162;"	f
 _warmMax	src/Dodge/Data/Item/HeldDelay.hs	27;"	f
 _warmSound	src/Dodge/Data/Item/HeldDelay.hs	28;"	f
 _warmTime	src/Dodge/Data/Item/HeldDelay.hs	26;"	f
@@ -3388,12 +3387,12 @@ addToTrunk	src/TreeHelp.hs	156;"	f
 addWarningTerminal	src/Dodge/Room/Warning.hs	35;"	f
 addZ	src/Geometry/Vector3D.hs	89;"	f
 adjustIMZone	src/Dodge/Base.hs	81;"	f
-advanceScrollAmount	src/Dodge/Update.hs	410;"	f
+advanceScrollAmount	src/Dodge/Update.hs	415;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	33;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	44;"	f
-aimDelaySweep	src/Dodge/Render/Picture.hs	265;"	f
+aimDelaySweep	src/Dodge/Render/Picture.hs	264;"	f
 aimStanceInfo	src/Dodge/Item/Info.hs	235;"	f
-aimTurn	src/Dodge/Creature/YourControl.hs	160;"	f
+aimTurn	src/Dodge/Creature/YourControl.hs	159;"	f
 aimingWeaponHandlePos	src/Dodge/Item/HeldOffset.hs	69;"	f
 aimingWeaponZeroPos	src/Dodge/Item/HeldOffset.hs	63;"	f
 airlock	src/Dodge/Room/Airlock.hs	19;"	f
@@ -3628,13 +3627,13 @@ chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	43;"	f
 checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	100;"	f
 checkConnection	src/Dodge/Inventory/Swap.hs	64;"	f
 checkDeath	src/Dodge/Creature/State.hs	78;"	f
-checkEndGame	src/Dodge/Update.hs	707;"	f
+checkEndGame	src/Dodge/Update.hs	712;"	f
 checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
 checkInvSlotsYou	src/Dodge/Inventory/CheckSlots.hs	16;"	f
 checkInventorySelectionExists	src/Dodge/DisplayInventory.hs	93;"	f
-checkTermDist	src/Dodge/Update.hs	308;"	f
+checkTermDist	src/Dodge/Update.hs	313;"	f
 checkWallLeft	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	29;"	f
 checkWallRight	src/Dodge/LevelGen/StaticWalls.hs	54;"	f
 checkWallRight	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	59;"	f
@@ -3657,7 +3656,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	758;"	f
+clClSpringVel	src/Dodge/Update.hs	763;"	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
@@ -3683,7 +3682,7 @@ closestCreatureID	src/Dodge/Debug.hs	116;"	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	728;"	f
+cloudEffect	src/Dodge/Update.hs	733;"	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
@@ -3757,7 +3756,7 @@ crAwayFromPost	src/Dodge/Creature/Test.hs	79;"	f
 crBlips	src/Dodge/RadarSweep.hs	87;"	f
 crCamouflage	src/Dodge/Creature/Picture.hs	31;"	f
 crCanSeeCr	src/Dodge/Creature/Test.hs	48;"	f
-crCrSpring	src/Dodge/Update.hs	776;"	f
+crCrSpring	src/Dodge/Update.hs	781;"	f
 crCurrentEquipment	src/Dodge/Creature/Statistics.hs	26;"	f
 crDisplayAwareness	src/Dodge/Creature/Picture/Awareness.hs	37;"	f
 crDisplayVigilance	src/Dodge/Creature/Picture/Awareness.hs	51;"	f
@@ -3777,7 +3776,7 @@ crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	22;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	85;"	f
 crSafeDistFromTarg	src/Dodge/Creature/Test.hs	69;"	f
 crSetRoots	src/Dodge/Inventory/Location.hs	48;"	f
-crSpring	src/Dodge/Update.hs	771;"	f
+crSpring	src/Dodge/Update.hs	776;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	74;"	f
 crUpdate	src/Dodge/Creature/State.hs	62;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	61;"	f
@@ -3885,8 +3884,8 @@ debugEvent	src/Dodge/Debug.hs	26;"	f
 debugEvent'	src/Dodge/Debug.hs	34;"	f
 debugEvents	src/Dodge/Debug.hs	19;"	f
 debugList	src/Dodge/Debug.hs	103;"	f
-debugMenu	src/Dodge/Menu.hs	116;"	f
+debugMenu	src/Dodge/Menu.hs	119;"	f
-debugMenuOptions	src/Dodge/Menu.hs	119;"	f
+debugMenuOptions	src/Dodge/Menu.hs	122;"	f
 debugOn	src/Dodge/Data/Config.hs	151;"	f
 debugSelectCreatureList	src/Dodge/Debug.hs	86;"	f
 debugSelectCreatureMessage	src/Dodge/Debug.hs	77;"	f
@@ -3934,7 +3933,7 @@ defaultCreatureSkin	src/Dodge/Default/Creature.hs	61;"	f
 defaultCrystalWall	src/Dodge/Default/Wall.hs	40;"	f
 defaultDirtBlock	src/Dodge/Default/Block.hs	19;"	f
 defaultDirtWall	src/Dodge/Default/Wall.hs	61;"	f
-defaultDisplayInventory	src/Dodge/Default/World.hs	169;"	f
+defaultDisplayInventory	src/Dodge/Default/World.hs	165;"	f
 defaultDoor	src/Dodge/Default/Door.hs	29;"	f
 defaultDoorWall	src/Dodge/Default/Wall.hs	32;"	f
 defaultDrawButton	src/Dodge/Button/Draw.hs	28;"	f
@@ -3943,7 +3942,7 @@ defaultEquipUse	src/Dodge/Default/Item/Use.hs	21;"	f
 defaultEquipment	src/Dodge/Default.hs	25;"	f
 defaultFlIt	src/Dodge/Default.hs	29;"	f
 defaultForeground	src/Dodge/Default/ForegroundShape.hs	5;"	f
-defaultHUD	src/Dodge/Default/World.hs	158;"	f
+defaultHUD	src/Dodge/Default/World.hs	154;"	f
 defaultHeldItem	src/Dodge/Default/Item.hs	16;"	f
 defaultHeldUse	src/Dodge/Default/Item/Use.hs	26;"	f
 defaultImpulsive	src/Dodge/Humanoid.hs	190;"	f
@@ -4010,13 +4009,13 @@ dirtPoly	src/Dodge/Room/RoadBlock.hs	74;"	f
 dirtWallDamage	src/Dodge/Wall/DamageEffect.hs	103;"	f
 disconnectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	496;"	f
 disconnectTerminal	src/Dodge/Terminal.hs	217;"	f
-displayConfig	src/Dodge/Menu.hs	196;"	f
+displayConfig	src/Dodge/Menu.hs	213;"	f
-displayControls	src/Dodge/Menu.hs	206;"	f
+displayControls	src/Dodge/Menu.hs	223;"	f
-displayFrameTicks	src/Dodge/Render/Picture.hs	46;"	f
+displayFrameTicks	src/Dodge/Render/Picture.hs	45;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	198;"	f
 displayIndents	src/Dodge/DisplayInventory.hs	110;"	f
 displayPulse	src/Dodge/Inventory/SelectionList.hs	173;"	f
-displayTerminalLineString	src/Dodge/Update.hs	437;"	f
+displayTerminalLineString	src/Dodge/Update.hs	442;"	f
 dist	src/Geometry/Vector.hs	190;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -4027,7 +4026,7 @@ divideLineExact	src/Geometry.hs	275;"	f
 divideLineOddNumPoints	src/Geometry.hs	260;"	f
 doAfterPlacement	src/Dodge/Layout.hs	86;"	f
 doAfterPlacements	src/Dodge/Layout.hs	83;"	f
-doAimTwist	src/Dodge/Creature/YourControl.hs	135;"	f
+doAimTwist	src/Dodge/Creature/YourControl.hs	134;"	f
 doAnyEquipmentEffect	src/Dodge/Creature/State.hs	189;"	f
 doArcStep	src/Dodge/Tesla/Arc.hs	135;"	f
 doBackspace	src/Dodge/Update/Input/Text.hs	31;"	f
@@ -4066,7 +4065,7 @@ doGravityPU	src/Dodge/Projectile/Update.hs	50;"	f
 doHeldUseEffect	src/Dodge/HeldUse.hs	128;"	f
 doInPlacements	src/Dodge/Layout.hs	92;"	f
 doIndividualPlacements	src/Dodge/Layout.hs	117;"	f
-doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	27;"	f
+doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	28;"	f
 doIntImp	src/Dodge/CreatureEffect.hs	24;"	f
 doInvEffect	src/Dodge/ItEffect.hs	16;"	f
 doItCrWdWd	src/Dodge/WorldEffect.hs	48;"	f
@@ -4083,7 +4082,7 @@ doOutPlacements	src/Dodge/Layout.hs	102;"	f
 doP2Ac	src/Dodge/CreatureEffect.hs	69;"	f
 doP2Imp	src/Dodge/CreatureEffect.hs	33;"	f
 doPrWdLsLs	src/Dodge/PrWdLsLs.hs	8;"	f
-doPreload	appDodge/Main.hs	136;"	f
+doPreload	appDodge/Main.hs	135;"	f
 doPressPlateEvent	src/Dodge/PressPlate.hs	8;"	f
 doPropUpdates	src/Dodge/Prop/Update.hs	36;"	f
 doQuickload	src/Dodge/Save.hs	82;"	f
@@ -4096,7 +4095,7 @@ doRoomPlacements	src/Dodge/Layout.hs	122;"	f
 doRoomShift	src/Dodge/Room/Link.hs	33;"	f
 doScopeZoom	src/Dodge/Update/Scroll.hs	82;"	f
 doSectionSize	src/Dodge/DisplayInventory.hs	217;"	f
-doSideEffects	appDodge/Main.hs	121;"	f
+doSideEffects	appDodge/Main.hs	120;"	f
 doStep	src/Dodge/ArcStep.hs	9;"	f
 doStrategyActions	src/Dodge/Creature/ReaderUpdate.hs	164;"	f
 doTerminalBootProgram	src/Dodge/WorldEffect.hs	94;"	f
@@ -4115,7 +4114,7 @@ doWdCrCr	src/Dodge/CreatureEffect.hs	12;"	f
 doWdP2f	src/Dodge/WdP2f.hs	12;"	f
 doWdWd	src/Dodge/WorldEffect.hs	28;"	f
 doWeaponRepetitions	src/Dodge/HeldUse.hs	152;"	f
-doWorldEvents	src/Dodge/Update.hs	420;"	f
+doWorldEvents	src/Dodge/Update.hs	425;"	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
@@ -4130,7 +4129,7 @@ doublePairSet	src/Geometry.hs	165;"	f
 doubleTreeToIndentList	src/Dodge/DoubleTree.hs	72;"	f
 doubleV2	src/Geometry.hs	168;"	f
 drawARHUD	src/Dodge/Creature/State.hs	302;"	f
-drawAimSweep	src/Dodge/Render/Picture.hs	273;"	f
+drawAimSweep	src/Dodge/Render/Picture.hs	271;"	f
 drawAllShadows	src/Dodge/Shadows.hs	5;"	f
 drawBaseMachine	src/Dodge/Machine/Draw.hs	57;"	f
 drawBeam	src/Dodge/Beam/Draw.hs	6;"	f
@@ -4142,9 +4141,9 @@ drawButton	src/Dodge/Button/Draw.hs	9;"	f
 drawCPUShadows	src/Dodge/Render/Shadow.hs	19;"	f
 drawCircCollisionTest	src/Dodge/Debug/Picture.hs	111;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
-drawCombFilter	src/Dodge/Render/Picture.hs	245;"	f
+drawCombFilter	src/Dodge/Render/Picture.hs	244;"	f
 drawCombineInventory	src/Dodge/Render/HUD.hs	179;"	f
-drawConcurrentMessage	src/Dodge/Render/Picture.hs	69;"	f
+drawConcurrentMessage	src/Dodge/Render/Picture.hs	68;"	f
 drawCoord	src/Dodge/Debug/Picture.hs	359;"	f
 drawCorpse	src/Dodge/Corpse/Draw.hs	6;"	f
 drawCrInfo	src/Dodge/Debug/Picture.hs	380;"	f
@@ -4156,13 +4155,13 @@ drawCursorAt	src/Dodge/Render/List.hs	71;"	f
 drawDDATest	src/Dodge/Debug/Picture.hs	286;"	f
 drawDoorPaths	src/Dodge/Debug/Picture.hs	247;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	87;"	f
-drawDrag	src/Dodge/Render/Picture.hs	184;"	f
+drawDrag	src/Dodge/Render/Picture.hs	183;"	f
-drawDragDrop	src/Dodge/Render/Picture.hs	205;"	f
+drawDragDrop	src/Dodge/Render/Picture.hs	204;"	f
-drawDragPickup	src/Dodge/Render/Picture.hs	214;"	f
+drawDragPickup	src/Dodge/Render/Picture.hs	213;"	f
-drawDragSelect	src/Dodge/Render/Picture.hs	181;"	f
+drawDragSelect	src/Dodge/Render/Picture.hs	180;"	f
 drawDragSelected	src/Dodge/Render/HUD.hs	132;"	f
 drawDragSelecting	src/Dodge/Render/HUD.hs	149;"	f
-drawEmptySet	src/Dodge/Render/Picture.hs	125;"	f
+drawEmptySet	src/Dodge/Render/Picture.hs	124;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	10;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	142;"	f
 drawExamineInventory	src/Dodge/Render/HUD.hs	195;"	f
@@ -4171,7 +4170,7 @@ drawFlame	src/Dodge/Flame/Draw.hs	7;"	f
 drawFlamelet	src/Dodge/EnergyBall/Draw.hs	26;"	f
 drawFooterText	src/Dodge/Render/MenuScreen.hs	72;"	f
 drawForceField	src/Dodge/Wall/Draw.hs	11;"	f
-drawGapPlus	src/Dodge/Render/Picture.hs	256;"	f
+drawGapPlus	src/Dodge/Render/Picture.hs	255;"	f
 drawGib	src/Dodge/Prop/Draw.hs	31;"	f
 drawHUD	src/Dodge/Render/HUD.hs	48;"	f
 drawInputMenu	src/Dodge/Render/MenuScreen.hs	22;"	f
@@ -4180,7 +4179,7 @@ drawInspectWalls	src/Dodge/Debug/Picture.hs	227;"	f
 drawInventory	src/Dodge/Render/HUD.hs	55;"	f
 drawItemChildrenConnect	src/Dodge/Render/HUD.hs	326;"	f
 drawItemConnections	src/Dodge/Render/HUD.hs	316;"	f
-drawJumpDown	src/Dodge/Render/Picture.hs	176;"	f
+drawJumpDown	src/Dodge/Render/Picture.hs	175;"	f
 drawLabCrossCol	src/Dodge/Render/Label.hs	8;"	f
 drawLampCover	src/Dodge/Prop/Draw.hs	47;"	f
 drawLaser	src/Dodge/Laser/Draw.hs	6;"	f
@@ -4194,11 +4193,11 @@ drawListYoff	src/Dodge/Render/List.hs	92;"	f
 drawMachine	src/Dodge/Machine/Draw.hs	17;"	f
 drawMapperAR	src/Dodge/Targeting/Draw.hs	12;"	f
 drawMapperInventory	src/Dodge/Render/HUD.hs	169;"	f
-drawMenuClick	src/Dodge/Render/Picture.hs	148;"	f
+drawMenuClick	src/Dodge/Render/Picture.hs	147;"	f
-drawMenuCursor	src/Dodge/Render/Picture.hs	162;"	f
+drawMenuCursor	src/Dodge/Render/Picture.hs	161;"	f
-drawMenuOrHUD	src/Dodge/Render/Picture.hs	64;"	f
+drawMenuOrHUD	src/Dodge/Render/Picture.hs	63;"	f
 drawMenuScreen	src/Dodge/Render/MenuScreen.hs	16;"	f
-drawMouseCursor	src/Dodge/Render/Picture.hs	80;"	f
+drawMouseCursor	src/Dodge/Render/Picture.hs	79;"	f
 drawMouseOver	src/Dodge/Render/HUD.hs	103;"	f
 drawMousePosition	src/Dodge/Debug/Picture.hs	349;"	f
 drawMovingShape	src/Dodge/Prop/Draw.hs	73;"	f
@@ -4207,18 +4206,18 @@ drawOptions	src/Dodge/Render/MenuScreen.hs	36;"	f
 drawPathBetween	src/Dodge/Debug/Picture.hs	195;"	f
 drawPathEdge	src/Dodge/Debug/Picture.hs	252;"	f
 drawPathing	src/Dodge/Debug/Picture.hs	422;"	f
-drawPlus	src/Dodge/Render/Picture.hs	145;"	f
+drawPlus	src/Dodge/Render/Picture.hs	144;"	f
 drawPointLabel	src/Dodge/Render/Label.hs	13;"	f
 drawProjectile	src/Dodge/Projectile/Draw.hs	13;"	f
 drawProp	src/Dodge/Prop/Draw.hs	18;"	f
 drawRBOptions	src/Dodge/Render/HUD.hs	249;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	14;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	37;"	f
-drawReturn	src/Dodge/Render/Picture.hs	132;"	f
+drawReturn	src/Dodge/Render/Picture.hs	131;"	f
 drawRootCursor	src/Dodge/Render/HUD.hs	71;"	f
 drawSSCursor	src/Dodge/SelectionSections/Draw.hs	35;"	f
 drawSSMultiCursor	src/Dodge/SelectionSections/Draw.hs	46;"	f
-drawSelect	src/Dodge/Render/Picture.hs	233;"	f
+drawSelect	src/Dodge/Render/Picture.hs	232;"	f
 drawSelectionList	src/Dodge/Render/List.hs	35;"	f
 drawSelectionListBackground	src/Dodge/Render/List.hs	51;"	f
 drawSelectionSections	src/Dodge/SelectionSections/Draw.hs	16;"	f
@@ -4242,7 +4241,7 @@ drawTitle	src/Dodge/Render/MenuScreen.hs	55;"	f
 drawTitleBackground	src/Dodge/Render/List.hs	44;"	f
 drawTractorBeam	src/Dodge/TractorBeam/Draw.hs	7;"	f
 drawTurret	src/Dodge/Machine/Draw.hs	65;"	f
-drawVerticalDoubleArrow	src/Dodge/Render/Picture.hs	196;"	f
+drawVerticalDoubleArrow	src/Dodge/Render/Picture.hs	195;"	f
 drawVerticalLampCover	src/Dodge/Prop/Draw.hs	63;"	f
 drawWall	src/Dodge/Wall/Draw.hs	7;"	f
 drawWallFace	src/Dodge/Debug/Picture.hs	73;"	f
@@ -4350,8 +4349,8 @@ findWithIx	src/ListHelp.hs	123;"	f
 fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	540;"	f
 fireS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	356;"	f
 firstBreather	src/Dodge/Room/Breather.hs	9;"	f
-firstWorldLoad	appDodge/Main.hs	78;"	f
+firstWorldLoad	appDodge/Main.hs	77;"	f
-fixedCoordPictures	src/Dodge/Render/Picture.hs	18;"	f
+fixedCoordPictures	src/Dodge/Render/Picture.hs	17;"	f
 fixedSizePicClampArrow	src/Dodge/Picture/SizeInvariant.hs	57;"	f
 flDamageInArea	src/Dodge/Flame.hs	109;"	f
 flFlicker	src/Dodge/Flame.hs	123;"	f
@@ -4401,7 +4400,7 @@ forceField	src/Dodge/Wall/ForceField.hs	7;"	f
 forceFoldable	src/StrictHelp.hs	7;"	f
 forceSpine	src/StrictHelp.hs	4;"	f
 fourEmbossDecoration	src/Dodge/Placement/TopDecoration.hs	29;"	f
-fpsText	src/Dodge/Render/Picture.hs	54;"	f
+fpsText	src/Dodge/Render/Picture.hs	53;"	f
 fractionLoadedAmmo	src/Dodge/Item/Draw/SPic.hs	137;"	f
 frag	src/Shader/Data.hs	102;"	f
 freeShaderPointers'	src/Shader.hs	37;"	f
@@ -4424,12 +4423,12 @@ g	src/ShortShow.hs	33;"	f
 gLauncher	src/Dodge/Item/Held/Launcher.hs	30;"	f
 gRandify	src/Dodge/Randify.hs	11;"	f
 gadgetEffect	src/Dodge/HeldUse.hs	40;"	f
-gameOverMenu	src/Dodge/Menu.hs	184;"	f
+gameOverMenu	src/Dodge/Menu.hs	187;"	f
 gameRoomFromRoom	src/Dodge/Layout.hs	161;"	f
 gameRoomViewpoints	src/Dodge/Viewpoints.hs	35;"	f
 gameRoomsFromRooms	src/Dodge/Layout.hs	158;"	f
-gameplayMenu	src/Dodge/Menu.hs	131;"	f
+gameplayMenu	src/Dodge/Menu.hs	134;"	f
-gameplayMenuOptions	src/Dodge/Menu.hs	134;"	f
+gameplayMenuOptions	src/Dodge/Menu.hs	137;"	f
 gasCreate	src/Dodge/HeldUse.hs	622;"	f
 generateGenParams	src/Dodge/LevelGen/LevelStructure.hs	22;"	f
 generateGraphs	src/Dodge/LevelGen.hs	39;"	f
@@ -4465,7 +4464,7 @@ getLaserDamage	src/Dodge/HeldUse.hs	309;"	f
 getLaserPhaseV	src/Dodge/HeldUse.hs	306;"	f
 getLinksOfType	src/Dodge/RoomLink.hs	39;"	f
 getMaxLinesTM	src/Dodge/Terminal/Type.hs	11;"	f
-getMenuMouseContext	src/Dodge/Update.hs	380;"	f
+getMenuMouseContext	src/Dodge/Update.hs	385;"	f
 getNodePos	src/Dodge/Path.hs	31;"	f
 getPJStabiliser	src/Dodge/HeldUse.hs	723;"	f
 getPretty	src/AesonHelp.hs	8;"	f
@@ -4504,8 +4503,8 @@ grahamScan	src/Geometry/Polygon.hs	116;"	f
 grapeCannon	src/Dodge/Item/Held/Cone.hs	36;"	f
 graphToEdges	src/Dodge/Graph.hs	35;"	f
 graphToIncidence	src/Dodge/Graph.hs	40;"	f
-graphicsMenu	src/Dodge/Menu.hs	162;"	f
+graphicsMenu	src/Dodge/Menu.hs	165;"	f
-graphicsMenuOptions	src/Dodge/Menu.hs	165;"	f
+graphicsMenuOptions	src/Dodge/Menu.hs	168;"	f
 green	src/Color.hs	15;"	f
 greyN	src/Color.hs	124;"	f
 gridInPolygon	src/Grid.hs	12;"	f
@@ -4528,7 +4527,7 @@ halfWidth	src/Dodge/Base/Window.hs	48;"	f
 haltSound	src/Dodge/SoundLogic.hs	38;"	f
 hammerCheck	src/Dodge/HeldUse.hs	79;"	f
 handleEvent	src/Dodge/Event.hs	27;"	f
-handleHotkeys	src/Dodge/Creature/YourControl.hs	40;"	f
+handleHotkeys	src/Dodge/Creature/YourControl.hs	39;"	f
 handleKeyboardEvent	src/Dodge/Event/Input.hs	22;"	f
 handleMouseButtonEvent	src/Dodge/Event/Input.hs	63;"	f
 handleMouseMotionEvent	src/Dodge/Event/Input.hs	47;"	f
@@ -4577,7 +4576,7 @@ holsterWeapon	src/Dodge/Creature/Volition.hs	14;"	f
 homingModule	src/Dodge/Item/Scope.hs	48;"	f
 horPipe	src/Dodge/Placement/Instance/Pipe.hs	9;"	f
 hotkeyToChar	src/Dodge/Inventory/SelectionList.hs	182;"	f
-hotkeyToScancode	src/Dodge/Creature/YourControl.hs	70;"	f
+hotkeyToScancode	src/Dodge/Creature/YourControl.hs	69;"	f
 hotkeyToString	src/Dodge/Inventory/SelectionList.hs	179;"	f
 humanoidAIList	src/Dodge/Humanoid.hs	181;"	f
 iShape	src/Dodge/Placement/Instance/LightSource.hs	73;"	f
@@ -4692,7 +4691,7 @@ isLeftOfA	src/Geometry.hs	192;"	f
 isNothing'	src/MaybeHelp.hs	33;"	f
 isOnSeg	src/Geometry.hs	236;"	f
 isOutLnk	src/Dodge/PlacementSpot.hs	164;"	f
-isOverTerminalScreen	src/Dodge/Update.hs	391;"	f
+isOverTerminalScreen	src/Dodge/Update.hs	396;"	f
 isPutID	src/Dodge/Placement/Instance/Wall.hs	129;"	f
 isRHS	src/Geometry/LHS.hs	24;"	f
 isUnusedLnk	src/Dodge/PlacementSpot.hs	61;"	f
@@ -4779,7 +4778,7 @@ laserLinkTest	src/Dodge/Item/Grammar.hs	192;"	f
 lastMap	src/Dodge/DoubleTree.hs	174;"	f
 launcherCrit	src/Dodge/Creature/LauncherCrit.hs	12;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
-ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	73;"	f
+ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	74;"	f
 ldtIL	src/Dodge/DoubleTree.hs	149;"	f
 ldtPropagate	src/Dodge/DoubleTree.hs	20;"	f
 ldtPropagateFold	src/Dodge/DoubleTree.hs	29;"	f
@@ -4814,8 +4813,8 @@ lineUp	src/Dodge/Creature/Boid.hs	147;"	f
 linksAndPath	src/Dodge/Room/Path.hs	39;"	f
 linksAndPath'	src/Dodge/Room/Path.hs	44;"	f
 linksOnPath	src/Dodge/Room/CheckConsistency.hs	7;"	f
-listConfig	src/Dodge/Menu.hs	199;"	f
+listConfig	src/Dodge/Menu.hs	216;"	f
-listControls	src/Dodge/Menu.hs	212;"	f
+listControls	src/Dodge/Menu.hs	229;"	f
 listCursorChooseBorderScale	src/Dodge/Render/List.hs	135;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	188;"	f
 listSelectionColorPicture	src/Dodge/DisplayInventory.hs	308;"	f
@@ -4875,7 +4874,7 @@ magV	src/Geometry/Vector.hs	171;"	f
 magV3	src/Geometry/Vector3D.hs	78;"	f
 magazineCombinations	src/Dodge/Combine/Combinations.hs	42;"	f
 magenta	src/Color.hs	19;"	f
-main	appDodge/Main.hs	38;"	f
+main	appDodge/Main.hs	37;"	f
 main	bench/Bench.hs	15;"	f
 main	test/Spec.hs	12;"	f
 makeArc	src/Picture/Base.hs	157;"	f
@@ -5036,9 +5035,9 @@ mntLSOn	src/Dodge/Placement/Instance/LightSource.hs	54;"	f
 mntLight	src/Dodge/Placement/Instance/LightSource.hs	158;"	f
 mntLightLnkCond	src/Dodge/Placement/Instance/LightSource.hs	163;"	f
 modTo	src/Geometry/Zone.hs	10;"	f
-mouseClickOptionsList	src/Dodge/Update/Input/ScreenLayer.hs	59;"	f
+mouseClickOptionsList	src/Dodge/Update/Input/ScreenLayer.hs	60;"	f
-mouseCursorType	src/Dodge/Render/Picture.hs	87;"	f
+mouseCursorType	src/Dodge/Render/Picture.hs	86;"	f
-mouseWorldPos	src/Dodge/Base/Coordinate.hs	48;"	f
+mouseWorldPos'	src/Dodge/Base/Coordinate.hs	48;"	f
 moveBullet	src/Dodge/Bullet.hs	187;"	f
 moveCombineSel	src/Dodge/Update/Scroll.hs	112;"	f
 moveHammerUp	src/Dodge/Hammer.hs	5;"	f
@@ -5067,7 +5066,7 @@ muzFlareAt	src/Dodge/HeldUse.hs	282;"	f
 mvButton	src/Dodge/Placement/PlaceSpot.hs	176;"	f
 mvCr	src/Dodge/Placement/PlaceSpot.hs	186;"	f
 mvFS	src/Dodge/Placement/PlaceSpot.hs	189;"	f
-mvGust	src/Dodge/Update.hs	719;"	f
+mvGust	src/Dodge/Update.hs	724;"	f
 mvLS	src/Dodge/Placement/PlaceSpot.hs	217;"	f
 mvP	src/Dodge/Wall/Move.hs	54;"	f
 mvPP	src/Dodge/Placement/PlaceSpot.hs	183;"	f
@@ -5126,11 +5125,11 @@ onRemoveWristShield	src/Dodge/Euse.hs	65;"	f
 onXY	src/Geometry/Vector3D.hs	130;"	f
 oneH	src/Dodge/Creature/Test.hs	97;"	f
 openConsole	src/Dodge/Update.hs	129;"	f
-optionMenu	src/Dodge/Menu.hs	105;"	f
+optionMenu	src/Dodge/Menu.hs	108;"	f
-optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	51;"	f
+optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	52;"	f
-optionScreenUpdate	src/Dodge/Update/Input/ScreenLayer.hs	42;"	f
+optionScreenUpdate	src/Dodge/Update/Input/ScreenLayer.hs	43;"	f
 optionValueOffset	src/Dodge/Menu/Option.hs	88;"	f
-optionsOptions	src/Dodge/Menu.hs	108;"	f
+optionsOptions	src/Dodge/Menu.hs	111;"	f
 optionsToSelections	src/Dodge/Menu/Option.hs	50;"	f
 orRegex	src/Dodge/DisplayInventory.hs	81;"	f
 orange	src/Color.hs	25;"	f
@@ -5176,8 +5175,8 @@ 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	501;"	f
-pauseMenu	src/Dodge/Menu.hs	53;"	f
+pauseMenu	src/Dodge/Menu.hs	56;"	f
-pauseMenuOptions	src/Dodge/Menu.hs	58;"	f
+pauseMenuOptions	src/Dodge/Menu.hs	61;"	f
 pauseSound	src/Dodge/SoundLogic.hs	42;"	f
 pauseTime	src/Dodge/Update.hs	183;"	f
 peZoneSize	src/Dodge/Zoning/Pathing.hs	46;"	f
@@ -5237,7 +5236,7 @@ playIfFree	src/Sound.hs	137;"	f
 playPositionalSoundQueue	src/Sound.hs	145;"	f
 playSoundAndUpdate	src/Sound.hs	54;"	f
 playSoundQueue	src/Sound.hs	132;"	f
-playSoundUnlessRewinding	appDodge/Main.hs	114;"	f
+playSoundUnlessRewinding	appDodge/Main.hs	113;"	f
 plusDecoration	src/Dodge/Placement/TopDecoration.hs	35;"	f
 pmLineLoop	src/Shader/Data.hs	107;"	f
 pmLineStrip	src/Shader/Data.hs	107;"	f
@@ -5331,7 +5330,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	105;"	f
-ppEvents	src/Dodge/Update.hs	686;"	f
+ppEvents	src/Dodge/Update.hs	691;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5435,7 +5434,7 @@ randPeakedParam	src/RandomHelp.hs	130;"	f
 randProb	src/RandomHelp.hs	68;"	f
 randSpark	src/Dodge/Spark.hs	74;"	f
 randWallReflect	src/Dodge/Tesla/Arc.hs	57;"	f
-randWallReflect	src/Dodge/Update.hs	578;"	f
+randWallReflect	src/Dodge/Update.hs	583;"	f
 randomChallenges	src/Dodge/Room/Start.hs	62;"	f
 randomCompass	src/Dodge/Layout.hs	59;"	f
 randomFourCornerRoom	src/Dodge/Room/Procedural.hs	266;"	f
@@ -5477,7 +5476,7 @@ reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	452;"	f
 rememberSounds	src/Dodge/Creature/Perception.hs	177;"	f
 remoteDetonator	src/Dodge/Item/Scope.hs	145;"	f
 remoteScreen	src/Dodge/Item/Scope.hs	140;"	f
-removeAimPosture	src/Dodge/Creature/YourControl.hs	142;"	f
+removeAimPosture	src/Dodge/Creature/YourControl.hs	141;"	f
 removeAmmoFromMag	src/Dodge/HeldUse.hs	488;"	f
 removeDot	src/ShortShow.hs	29;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
@@ -5601,8 +5600,8 @@ safeSwapKeys	src/IntMapHelp.hs	77;"	f
 safeUncons	src/ListHelp.hs	72;"	f
 safeUpdateSingleNode	src/TreeHelp.hs	115;"	f
 saveConfig	src/Dodge/Config/Update.hs	20;"	f
-saveQuit	src/Dodge/Menu.hs	71;"	f
+saveQuit	src/Dodge/Menu.hs	74;"	f
-saveQuitConc	src/Dodge/Menu.hs	74;"	f
+saveQuitConc	src/Dodge/Menu.hs	77;"	f
 saveSlotPath	src/Dodge/Save.hs	63;"	f
 saveWorldInSlot	src/Dodge/Save.hs	68;"	f
 sawtoothFailS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	546;"	f
@@ -5612,14 +5611,14 @@ scaleMat	src/MatrixHelper.hs	59;"	f
 scaleMatrix	src/MatrixHelper.hs	56;"	f
 scaleSH	src/Shape.hs	268;"	f
 scalp	src/Dodge/Creature/Picture.hs	96;"	f
-scancodeToHotkey	src/Dodge/Creature/YourControl.hs	90;"	f
+scancodeToHotkey	src/Dodge/Creature/YourControl.hs	89;"	f
 scodeToChar	src/Dodge/ScodeToChar.hs	6;"	f
 scorchSPic	src/Dodge/Creature/State.hs	118;"	f
 screenBox	src/Dodge/Base/Window.hs	53;"	f
 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
+screenToWorldPos	src/Dodge/Base/Coordinate.hs	54;"	f
 scrollAugInvSel	src/Dodge/Inventory.hs	199;"	f
 scrollAugNextInSection	src/Dodge/Inventory.hs	212;"	f
 scrollCommandStrings	src/Dodge/Update/Scroll.hs	159;"	f
@@ -5642,8 +5641,8 @@ searchIfDamaged	src/Dodge/Creature/ReaderUpdate.hs	203;"	f
 secondColumnParams	src/Dodge/ListDisplayParams.hs	43;"	f
 sectionsDesiredLines	src/Dodge/DisplayInventory.hs	204;"	f
 sectionsSizes	src/Dodge/DisplayInventory.hs	207;"	f
-seedStartMenu	src/Dodge/Menu.hs	79;"	f
+seedStartMenu	src/Dodge/Menu.hs	82;"	f
-seedStartOptions	src/Dodge/Menu.hs	82;"	f
+seedStartOptions	src/Dodge/Menu.hs	85;"	f
 segOnCirc	src/Geometry.hs	113;"	f
 selNumPos	src/Dodge/Render/HUD.hs	453;"	f
 selNumPosCardinal	src/Dodge/Render/HUD.hs	476;"	f
@@ -5666,7 +5665,7 @@ sensorSPic	src/Dodge/Machine/Draw.hs	70;"	f
 sentinelAI	src/Dodge/Creature/SentinelAI.hs	20;"	f
 sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	83;"	f
 sentinelFireType	src/Dodge/Creature/SentinelAI.hs	50;"	f
-setAimPosture	src/Dodge/Creature/YourControl.hs	132;"	f
+setAimPosture	src/Dodge/Creature/YourControl.hs	131;"	f
 setChannelPos	src/Sound.hs	150;"	f
 setClickWorldPos	src/Dodge/Update.hs	99;"	f
 setClusterID	src/Dodge/Combine/Graph.hs	115;"	f
@@ -5684,13 +5683,13 @@ setLinkTypePD	src/Dodge/RoomLink.hs	67;"	f
 setMinInvSize	src/Dodge/Creature/Action.hs	145;"	f
 setMusicVolume	src/Sound.hs	162;"	f
 setMvPos	src/Dodge/Creature/ReaderUpdate.hs	51;"	f
-setOldPos	src/Dodge/Update.hs	460;"	f
+setOldPos	src/Dodge/Update.hs	465;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
 setRBCreatureTargeting	src/Dodge/Creature/State.hs	408;"	f
 setSelWhileDragging	src/Dodge/Update/Input/InGame.hs	334;"	f
-setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	86;"	f
+setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	87;"	f
 setShaderSource	src/Shader/Compile.hs	290;"	f
 setShadowLimits	src/Dodge/Shadows.hs	11;"	f
 setSoundVolume	src/Sound.hs	157;"	f
@@ -5790,7 +5789,7 @@ shuffleLinks	src/Dodge/Room/Link.hs	30;"	f
 shuffleRoomPos	src/Dodge/Layout.hs	78;"	f
 shuffleTail	src/RandomHelp.hs	59;"	f
 sigmoid	src/Dodge/Base.hs	151;"	f
-simpleCrSprings	src/Dodge/Update.hs	767;"	f
+simpleCrSprings	src/Dodge/Update.hs	772;"	f
 simpleDamFL	src/Dodge/Flame.hs	40;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	522;"	f
@@ -5830,8 +5829,8 @@ soundAngle	src/Dodge/SoundLogic.hs	163;"	f
 soundContinue	src/Dodge/SoundLogic.hs	131;"	f
 soundContinueVol	src/Dodge/SoundLogic.hs	145;"	f
 soundIsClose	src/Dodge/Creature/Perception.hs	183;"	f
-soundMenu	src/Dodge/Menu.hs	137;"	f
+soundMenu	src/Dodge/Menu.hs	140;"	f
-soundMenuOptions	src/Dodge/Menu.hs	140;"	f
+soundMenuOptions	src/Dodge/Menu.hs	143;"	f
 soundMultiFrom	src/Dodge/SoundLogic.hs	187;"	f
 soundOriginIDsAt	src/Dodge/WorldEvent/Sound.hs	18;"	f
 soundOriginsIDsAt	src/Dodge/WorldEvent/Sound.hs	13;"	f
@@ -5858,8 +5857,8 @@ spawnSmokeAtCursor	src/Dodge/WorldEvent/Cloud.hs	73;"	f
 spawnerCrit	src/Dodge/Creature.hs	55;"	f
 spawnerRoom	src/Dodge/Room/Room.hs	360;"	f
 speedLegs	src/Dodge/Item/Equipment.hs	152;"	f
-splashMenu	src/Dodge/Menu.hs	27;"	f
+splashMenu	src/Dodge/Menu.hs	30;"	f
-splashMenuOptions	src/Dodge/Menu.hs	32;"	f
+splashMenuOptions	src/Dodge/Menu.hs	35;"	f
 splashScreen	src/Dodge/Initialisation.hs	11;"	f
 splinterBlock	src/Dodge/Block.hs	30;"	f
 splitBezierquad	src/Geometry/Bezier.hs	15;"	f
@@ -6001,9 +6000,9 @@ textVMirror	src/Picture/Base.hs	216;"	f
 tflat2	src/Picture/Data.hs	60;"	f
 tflat3	src/Picture/Data.hs	64;"	f
 tflat4	src/Picture/Data.hs	68;"	f
-theCleanup	appDodge/Main.hs	75;"	f
+theCleanup	appDodge/Main.hs	74;"	f
 theColumns	src/Dodge/Tree/Shift.hs	139;"	f
-theUpdateStep	appDodge/Main.hs	106;"	f
+theUpdateStep	appDodge/Main.hs	105;"	f
 thickArc	src/Picture/Base.hs	298;"	f
 thickCircle	src/Picture/Base.hs	272;"	f
 thickLine	src/Picture/Base.hs	244;"	f
@@ -6026,9 +6025,9 @@ timeStopper	src/Dodge/Item/Weapon/Utility.hs	41;"	f
 timerTLS	src/Dodge/LightSource/Update.hs	22;"	f
 tinMag	src/Dodge/Item/Ammo.hs	27;"	f
 tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	428;"	f
-titleOptionsMenu	src/Dodge/Menu.hs	99;"	f
+titleOptionsMenu	src/Dodge/Menu.hs	102;"	f
-titleOptionsNoWrite	src/Dodge/Menu.hs	102;"	f
+titleOptionsNoWrite	src/Dodge/Menu.hs	105;"	f
-tmUpdate	src/Dodge/Update.hs	440;"	f
+tmUpdate	src/Dodge/Update.hs	445;"	f
 toBinary	src/Dodge/Inventory/SelectionList.hs	135;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
@@ -6118,7 +6117,7 @@ truncFaces	src/Polyhedra/Geodesic.hs	53;"	f
 truncate	src/Polyhedra/Geodesic.hs	38;"	f
 trunkDepth	src/TreeHelp.hs	161;"	f
 tryAttachItems	src/Dodge/Item/Grammar.hs	22;"	f
-tryClickUse	src/Dodge/Creature/YourControl.hs	167;"	f
+tryClickUse	src/Dodge/Creature/YourControl.hs	166;"	f
 tryCombine	src/Dodge/Update/Input/InGame.hs	526;"	f
 tryDropSelected	src/Dodge/Update/Input/InGame.hs	125;"	f
 tryGetChannel	src/Sound.hs	97;"	f
@@ -6130,7 +6129,7 @@ tryPlay	src/Sound.hs	84;"	f
 tryPutFloorItemIDInInv	src/Dodge/Inventory/Add.hs	26;"	f
 tryPutItemInInv	src/Dodge/Inventory/Add.hs	42;"	f
 tryPutItemInInvAt	src/Dodge/Inventory/Add.hs	32;"	f
-trySeedFromClipboard	src/Dodge/Menu.hs	88;"	f
+trySeedFromClipboard	src/Dodge/Menu.hs	91;"	f
 tryShellBounce	src/Dodge/Projectile/Update.hs	103;"	f
 trySpinByCID	src/Dodge/Projectile/Update.hs	178;"	f
 trySynthBullet	src/Dodge/Creature/State.hs	203;"	f
@@ -6144,7 +6143,7 @@ twinSlowDoorRoom	src/Dodge/Room/LongDoor.hs	28;"	f
 twists	src/Dodge/Creature/Test.hs	103;"	f
 twoFlat	src/Dodge/Creature/Test.hs	100;"	f
 twoFlatHRot	src/Dodge/Item/HeldOffset.hs	92;"	f
-twoHandTwistAmount	src/Dodge/Creature/YourControl.hs	145;"	f
+twoHandTwistAmount	src/Dodge/Creature/YourControl.hs	144;"	f
 twoRoomPoss	src/Dodge/PlacementSpot.hs	147;"	f
 twoStep1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
 twoStepS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	450;"	f
@@ -6157,7 +6156,7 @@ unfoldrMID	src/MonadHelp.hs	33;"	f
 unigate	src/Dodge/Item/Scope.hs	103;"	f
 unitVectorAtAngle	src/Geometry/Vector.hs	100;"	f
 unlockInv	src/Dodge/Inventory/Lock.hs	12;"	f
-unpause	src/Dodge/Menu.hs	192;"	f
+unpause	src/Dodge/Menu.hs	195;"	f
 unsafeBlinkAction	src/Dodge/Creature/Action/Blink.hs	55;"	f
 unsafeBlinker	src/Dodge/Item/Held/Utility.hs	67;"	f
 unsafeBlinker	src/Dodge/Item/Weapon/Utility.hs	27;"	f
@@ -6170,6 +6169,7 @@ unusedSpotAwayFromInLink	src/Dodge/PlacementSpot.hs	139;"	f
 unusedSpotAwayFromLink	src/Dodge/PlacementSpot.hs	122;"	f
 unusedSpotNearInLink	src/Dodge/PlacementSpot.hs	191;"	f
 upProjectile	src/Dodge/Projectile/Update.hs	35;"	f
+updateAimPos	src/Dodge/Update.hs	304;"	f
 updateAllNodes	src/TreeHelp.hs	85;"	f
 updateArc	src/Dodge/Tesla.hs	44;"	f
 updateArc	src/Dodge/Tesla/Arc.hs	100;"	f
@@ -6181,37 +6181,37 @@ updateBaseWheelEvent	src/Dodge/Update/Scroll.hs	28;"	f
 updateBounds	src/Dodge/Update/Camera.hs	203;"	f
 updateBulVel	src/Dodge/Bullet.hs	53;"	f
 updateBullet	src/Dodge/Bullet.hs	21;"	f
-updateBullets	src/Dodge/Update.hs	534;"	f
+updateBullets	src/Dodge/Update.hs	539;"	f
 updateCamera	src/Dodge/Update/Camera.hs	27;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	111;"	f
-updateCloud	src/Dodge/Update.hs	733;"	f
+updateCloud	src/Dodge/Update.hs	738;"	f
-updateClouds	src/Dodge/Update.hs	608;"	f
+updateClouds	src/Dodge/Update.hs	613;"	f
 updateCombinePositioning	src/Dodge/DisplayInventory.hs	37;"	f
 updateCombineSections	src/Dodge/DisplayInventory.hs	44;"	f
 updateCreature	src/Dodge/Creature/Update.hs	13;"	f
-updateCreatureGroups	src/Dodge/Update.hs	506;"	f
+updateCreatureGroups	src/Dodge/Update.hs	511;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	482;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	487;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	93;"	f
-updateDelayedEvents	src/Dodge/Update.hs	796;"	f
+updateDelayedEvents	src/Dodge/Update.hs	801;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	527;"	f
+updateDistortions	src/Dodge/Update.hs	532;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	45;"	f
-updateEnergyBalls	src/Dodge/Update.hs	596;"	f
+updateEnergyBalls	src/Dodge/Update.hs	601;"	f
 updateEnterRegex	src/Dodge/Update/Input/InGame.hs	480;"	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	70;"	f
-updateFlames	src/Dodge/Update.hs	593;"	f
+updateFlames	src/Dodge/Update.hs	598;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	32;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	364;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	357;"	f
-updateGusts	src/Dodge/Update.hs	716;"	f
+updateGusts	src/Dodge/Update.hs	721;"	f
 updateHeldRootItem	src/Dodge/Creature/State.hs	259;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
-updateIMl	src/Dodge/Update.hs	496;"	f
+updateIMl	src/Dodge/Update.hs	501;"	f
-updateIMl'	src/Dodge/Update.hs	501;"	f
+updateIMl'	src/Dodge/Update.hs	506;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	76;"	f
 updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	400;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	86;"	f
@@ -6221,63 +6221,63 @@ updateKeyInGame	src/Dodge/Update/Input/InGame.hs	394;"	f
 updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	382;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
 updateLaser	src/Dodge/Laser/Update.hs	14;"	f
-updateLasers	src/Dodge/Update.hs	427;"	f
+updateLasers	src/Dodge/Update.hs	432;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
 updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	413;"	f
 updateMachine	src/Dodge/Machine/Update.hs	19;"	f
-updateMagnets	src/Dodge/Update.hs	303;"	f
+updateMagnets	src/Dodge/Update.hs	308;"	f
 updateMouseClickInGame	src/Dodge/Update/Input/InGame.hs	197;"	f
-updateMouseContext	src/Dodge/Update.hs	316;"	f
+updateMouseContext	src/Dodge/Update.hs	321;"	f
-updateMouseContextGame	src/Dodge/Update.hs	321;"	f
+updateMouseContextGame	src/Dodge/Update.hs	326;"	f
 updateMouseHeldInGame	src/Dodge/Update/Input/InGame.hs	95;"	f
 updateMouseInGame	src/Dodge/Update/Input/InGame.hs	85;"	f
 updateMouseReleaseInGame	src/Dodge/Update/Input/InGame.hs	158;"	f
 updateMovement	src/Dodge/Creature/State.hs	429;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	518;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	523;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	511;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	516;"	f
-updatePastWorlds	src/Dodge/Update.hs	415;"	f
+updatePastWorlds	src/Dodge/Update.hs	420;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	605;"	f
+updatePosEvents	src/Dodge/Update.hs	610;"	f
 updatePreload	src/Preload/Update.hs	20;"	f
 updateProjectile	src/Dodge/Projectile/Update.hs	27;"	f
 updateProp	src/Dodge/Prop/Update.hs	11;"	f
 updatePulse	src/Dodge/Creature/Update.hs	22;"	f
 updateRBList	src/Dodge/Inventory/RBList.hs	16;"	f
 updateRadarBlip	src/Dodge/RadarBlip.hs	11;"	f
-updateRadarBlips	src/Dodge/Update.hs	530;"	f
+updateRadarBlips	src/Dodge/Update.hs	535;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	39;"	f
-updateRadarSweeps	src/Dodge/Update.hs	599;"	f
+updateRadarSweeps	src/Dodge/Update.hs	604;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
-updateRenderSplit	appDodge/Main.hs	109;"	f
+updateRenderSplit	appDodge/Main.hs	108;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	35;"	f
 updateScopeZoom	src/Dodge/Update/Scroll.hs	70;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
 updateSection	src/Dodge/DisplayInventory.hs	264;"	f
 updateSectionsPositioning	src/Dodge/DisplayInventory.hs	243;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
-updateShockwaves	src/Dodge/Update.hs	590;"	f
+updateShockwaves	src/Dodge/Update.hs	595;"	f
 updateSingleNodes	src/TreeHelp.hs	97;"	f
 updateSound	src/Sound.hs	72;"	f
 updateSounds	src/Sound.hs	67;"	f
 updateSpark	src/Dodge/Spark.hs	19;"	f
-updateSparks	src/Dodge/Update.hs	602;"	f
+updateSparks	src/Dodge/Update.hs	607;"	f
 updateTempLightSource	src/Dodge/LightSource/Update.hs	7;"	f
 updateTeslaArc	src/Dodge/Tesla/Arc.hs	23;"	f
-updateTeslaArc	src/Dodge/Update.hs	544;"	f
+updateTeslaArc	src/Dodge/Update.hs	549;"	f
-updateTeslaArcs	src/Dodge/Update.hs	541;"	f
+updateTeslaArcs	src/Dodge/Update.hs	546;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	587;"	f
+updateTractorBeams	src/Dodge/Update.hs	592;"	f
 updateTurret	src/Dodge/Machine/Update.hs	49;"	f
 updateUniverse	src/Dodge/Update.hs	72;"	f
 updateUniverseFirst	src/Dodge/Update.hs	83;"	f
 updateUniverseLast	src/Dodge/Update.hs	134;"	f
 updateUniverseMid	src/Dodge/Update.hs	156;"	f
 updateUseInputInGame	src/Dodge/Update/Input/InGame.hs	42;"	f
-updateUseInputOnScreen	src/Dodge/Update/Input/ScreenLayer.hs	22;"	f
+updateUseInputOnScreen	src/Dodge/Update/Input/ScreenLayer.hs	23;"	f
 updateWalkCycle	src/Dodge/Creature/State/WalkCycle.hs	12;"	f
 updateWallDamages	src/Dodge/Update/WallDamage.hs	10;"	f
 updateWheelEvent	src/Dodge/Update/Scroll.hs	19;"	f
-updateWheelEvents	src/Dodge/Update.hs	405;"	f
+updateWheelEvents	src/Dodge/Update.hs	410;"	f
 updateWorldEventFlag	src/Dodge/Update.hs	118;"	f
 updateWorldEventFlags	src/Dodge/Update.hs	106;"	f
 upperBody	src/Dodge/Creature/Picture.hs	135;"	f
@@ -6305,7 +6305,7 @@ useC	src/Dodge/Cuse.hs	8;"	f
 useC'	src/Dodge/Cuse.hs	13;"	f
 useE	src/Dodge/Euse.hs	34;"	f
 useGasParams	src/Dodge/HeldUse.hs	597;"	f
-useHotkey	src/Dodge/Creature/YourControl.hs	65;"	f
+useHotkey	src/Dodge/Creature/YourControl.hs	64;"	f
 useInventoryPath	src/Dodge/HeldUse.hs	841;"	f
 useItem	src/Dodge/Creature/Impulse/UseItem.hs	20;"	f
 useItemLoc	src/Dodge/Creature/Impulse/UseItem.hs	27;"	f
@@ -6367,11 +6367,11 @@ wallLine	src/Dodge/Placement/Instance/Wall.hs	71;"	f
 wallsFromRooms	src/Dodge/Layout.hs	146;"	f
 wallsToDraw	src/Dodge/Render/Walls.hs	17;"	f
 warningRooms	src/Dodge/Room/Warning.hs	27;"	f
-wasdAim	src/Dodge/Creature/YourControl.hs	121;"	f
+wasdAim	src/Dodge/Creature/YourControl.hs	120;"	f
 wasdDir	src/Dodge/WASD.hs	17;"	f
 wasdM	src/Dodge/WASD.hs	9;"	f
-wasdMovement	src/Dodge/Creature/YourControl.hs	148;"	f
+wasdMovement	src/Dodge/Creature/YourControl.hs	147;"	f
-wasdWithAiming	src/Dodge/Creature/YourControl.hs	114;"	f
+wasdWithAiming	src/Dodge/Creature/YourControl.hs	113;"	f
 watchCombinations	src/Dodge/Combine/Combinations.hs	15;"	f
 watchUpdateStrat	src/Dodge/Creature/ReaderUpdate.hs	177;"	f
 weakenMatS	src/Dodge/Material/Sound.hs	18;"	f
@@ -6387,7 +6387,7 @@ white	src/Color.hs	26;"	f
 whiteNoiseFadeInS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	554;"	f
 whiteNoiseFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	398;"	f
 wiToFloat	src/Dodge/Room/Modify/Girder.hs	168;"	f
-winConfig	appDodge/Main.hs	57;"	f
+winConfig	appDodge/Main.hs	56;"	f
 windowLine	src/Dodge/Placement/Instance/Wall.hs	48;"	f
 windowLineType	src/Dodge/Placement/Instance/Wall.hs	83;"	f
 windowXFloat	src/Dodge/Data/Config.hs	61;"	f
@@ -6419,7 +6419,7 @@ wpAdd	src/Dodge/Room/RezBox.hs	137;"	f
 wrench1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	414;"	f
 wristArmour	src/Dodge/Item/Equipment.hs	46;"	f
 wristInvisibility	src/Dodge/Item/Equipment.hs	158;"	f
-writeConfig	src/Dodge/Menu.hs	159;"	f
+writeConfig	src/Dodge/Menu.hs	162;"	f
 writeSaveSlot	src/Dodge/Save.hs	34;"	f
 xCylinder	src/Shape.hs	136;"	f
 xCylinderST	src/Shape.hs	133;"	f
@@ -6433,7 +6433,7 @@ yellow	src/Color.hs	17;"	f
 you	src/Dodge/Base/You.hs	12;"	f
 youDropItem	src/Dodge/Creature/Action.hs	190;"	f
 yourAugmentedItem	src/Dodge/Render/HUD.hs	235;"	f
-yourControl	src/Dodge/Creature/YourControl.hs	23;"	f
+yourControl	src/Dodge/Creature/YourControl.hs	22;"	f
 yourDefaultSpeed	src/Dodge/Default/Creature.hs	129;"	f
 yourDefaultStrideLength	src/Dodge/Default/Creature.hs	132;"	f
 yourInfo	src/Dodge/Creature/Info.hs	8;"	f
@@ -6450,9 +6450,9 @@ zipArcs	src/Dodge/Tesla/Arc.hs	110;"	f
 zipCount	src/Dodge/Tree/Shift.hs	129;"	f
 zipCountDown	src/Dodge/Room/Procedural.hs	118;"	f
 zoneCloud	src/Dodge/Zoning/Cloud.hs	27;"	f
-zoneClouds	src/Dodge/Update.hs	434;"	f
+zoneClouds	src/Dodge/Update.hs	439;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	53;"	f
-zoneCreatures	src/Dodge/Update.hs	477;"	f
+zoneCreatures	src/Dodge/Update.hs	482;"	f
 zoneExtract	src/Dodge/Zoning/Base.hs	51;"	f
 zoneMonoid	src/Dodge/Zoning/Base.hs	81;"	f
 zoneOfCirc	src/Dodge/Zoning/Base.hs	23;"	f