Simplify lasers

data/dodge.config.json

@@ -9,7 +9,7 @@
   "_graphics_cloud_shadows": true,
   "_graphics_distortion_resolution": "FullRes",
   "_graphics_distortions": true,
-  "_graphics_downsize_resolution": "SixteenthRes",
+  "_graphics_downsize_resolution": "EighthRes",
   "_graphics_num_shadow_casters": "NumShadowCasters20",
   "_graphics_shadow_rendering": "GeoObjShads",
   "_graphics_shadow_size": "Typical",

src/Dodge/Data/LWorld.hs

@@ -114,7 +114,7 @@ data LWorld = LWorld
     , _teslaArcs :: [TeslaArc]
     , _shockwaves :: [Shockwave]
     , _lasers :: [LaserStart]
-    , _lasersToDraw :: [Laser]
+--    , _lasersToDraw :: [Laser]
     , _linearShockwaves :: IM.IntMap LinearShockwave
     , _tractorBeams :: [TractorBeam]
     , _walls :: IM.IntMap Wall

src/Dodge/Data/Laser.hs

@@ -27,16 +27,16 @@ data LaserStart = LaserStart
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data Laser = Laser
+--data Laser = Laser
-    { _lzColor :: Color
+--    { _lzColor :: Color
-    , _lzPoints :: [Point2]
+--    , _lzPoints :: [Point2]
-    , _lzType :: LaserType
+--    , _lzType :: LaserType
-    }
+--    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-makeLenses ''Laser
+--makeLenses ''Laser
 makeLenses ''LaserStart
 makeLenses ''LaserType
 deriveJSON defaultOptions ''LaserType
 deriveJSON defaultOptions ''LaserStart
-deriveJSON defaultOptions ''Laser
+--deriveJSON defaultOptions ''Laser

src/Dodge/Default/World.hs

@@ -118,7 +118,7 @@ defaultLWorld =
           _teslaArcs = []
         , _shockwaves = []
         , _lasers = []
-        , _lasersToDraw = []
+--        , _lasersToDraw = []
         , _tractorBeams = mempty
         , _linearShockwaves = mempty
         , _walls = IM.empty

src/Dodge/Draw.hs

@@ -9,7 +9,6 @@ module Dodge.Draw (
     module Dodge.Button.Draw,
     module Dodge.EnergyBall.Draw,
     module Dodge.Flame.Draw,
-    module Dodge.Laser.Draw,
     module Dodge.LightSource.Draw,
     module Dodge.LinearShockwave.Draw,
     module Dodge.Machine.Draw,
@@ -30,7 +29,6 @@ import Dodge.Bullet.Draw
 import Dodge.Button.Draw
 import Dodge.EnergyBall.Draw
 import Dodge.Flame.Draw
-import Dodge.Laser.Draw
 import Dodge.LightSource.Draw
 import Dodge.LinearShockwave.Draw
 import Dodge.Machine.Draw

src/Dodge/Laser/Draw.hs

@@ -1,12 +0,0 @@
-module Dodge.Laser.Draw where
-
-import Dodge.Data.Laser
-import Picture
-
-drawLaser :: Laser -> Picture
-drawLaser pt =
-    setLayer BloomNoZWrite $
-             setDepth 19.5 . color (brightX 10 1 col) $ thickLine 3 ps
-  where
-    col = _lzColor pt
-    ps = _lzPoints pt

src/Dodge/Laser/Update.hs

@@ -1,22 +1,28 @@
-module Dodge.Laser.Update 
+module Dodge.Laser.Update (
-    ( updateLaser
+    updateLaser,
 ) where
 
-import Dodge.Item.Location
 import Control.Lens
 --import Data.Maybe
 import Dodge.Data.World
+import Dodge.Item.Location
 import Dodge.Item.Weapon.LaserPath
 import Dodge.WorldEvent.Damage
 import Geometry
+import Picture.Base
 
-updateLaser :: World -> LaserStart -> (World, Laser)
+updateLaser :: World -> LaserStart -> (World, Picture)
 updateLaser w pt =
     ( case _lpType pt of
-        DamageLaser dam -> damThingHitWith 
+        DamageLaser dam ->
-            (\p1 p2 p3 -> Damage LASERING dam p1 p2 p3 NoDamageEffect) sp xp thHit w
+            damThingHitWith
+                (\p1 p2 p3 -> Damage LASERING dam p1 p2 p3 NoDamageEffect)
+                sp
+                xp
+                thHit
+                w
         TargetingLaser itid -> w & pointerToItemID itid . itTargeting . itTgPos ?~ last ps
-    , Laser{_lzPoints = sp : ps, _lzColor = _lpColor pt, _lzType = _lpType pt}
+    , drawLaser (_lpColor pt) (sp : ps)
     )
   where
     phasev = _lpPhaseV pt
@@ -24,3 +30,10 @@ updateLaser w pt =
     dir = _lpDir pt
     xp = sp +.+ 800 *.* unitVectorAtAngle dir
     (thHit, ps) = reflectLaserAlong phasev sp xp w
+
+drawLaser :: Color -> [Point2] -> Picture
+drawLaser col =
+    setLayer BloomNoZWrite
+        . setDepth 19.5
+        . color (brightX 10 1 col)
+        . thickLine 3

src/Dodge/ListDisplayParams.hs

@@ -3,7 +3,7 @@ module Dodge.ListDisplayParams (
     invCursorParams,
     secondColumnParams,
     subInvX,
-    optionListDisplayParams,
+    menuDisplayParams,
 ) where
 
 import Control.Lens
@@ -51,8 +51,8 @@ subInvX = 10 * fromIntegral topInvW + 70
 topInvW :: Int
 topInvW = 15
 
-optionListDisplayParams :: ListDisplayParams
+menuDisplayParams :: ListDisplayParams
-optionListDisplayParams =
+menuDisplayParams =
     defaultListDisplayParams
         & ldpPos . spPixelOff .~ V2 11 (-70)
         & ldpScale .~ 2

src/Dodge/Menu/Option.hs

@@ -24,8 +24,7 @@ initializeOptionMenu title ops pmo u =
         , _scPositionedMenuOption = pmo
         , _scOptionFlag = NormalOptions
         , _scSelectionList = optionsToSelections 10 u ops pmo
-        , _scAvailableLines = getAvailableListLines optionListDisplayParams (u ^. uvConfig)
+        , _scAvailableLines = getAvailableListLines menuDisplayParams (u ^. uvConfig)
---        , _scListDisplayParams = optionListDisplayParams
         , _scDisplayTime = 0
         }
 

src/Dodge/Render/MenuScreen.hs

@@ -3,20 +3,20 @@ module Dodge.Render.MenuScreen (
     drawMenuScreen,
 ) where
 
-import Dodge.ListDisplayParams
-import Dodge.ScreenPos
-import Dodge.Data.CardinalPoint
 import Control.Lens
-import Dodge.Render.List
 import Dodge.Base.Window
+import Dodge.Data.CardinalPoint
 import Dodge.Data.SelectionList
 import Dodge.Data.Universe
+import Dodge.ListDisplayParams
+import Dodge.Render.List
+import Dodge.ScreenPos
 import Picture
 
 drawMenuScreen :: Configuration -> Maybe Int -> ScreenLayer -> Picture
 drawMenuScreen cfig spos screen = case screen of
     OptionScreen{_scTitle = titf, _scSelectionList = slist} ->
-        drawOptions optionListDisplayParams cfig titf spos slist
+        drawOptions cfig titf spos slist
     InputScreen inputstr help -> drawInputMenu cfig ('>' : inputstr) help
 
 drawInputMenu ::
@@ -33,22 +33,18 @@ drawInputMenu cfig title footer =
         , drawFooterText cfig red footer
         ]
 
-drawOptions ::
+drawOptions :: Configuration -> String -> Maybe Int -> [SelectionItem a] -> Picture
-    ListDisplayParams ->
+drawOptions cfig title msel sl =
-    Configuration ->
-    -- | Title
-    String ->
-    Maybe Int ->
-    [SelectionItem a] ->
-    Picture
-drawOptions ldps cfig title msel sl =
     darkenBackground cfig
         <> drawTitle cfig title
-        <> drawSelectionList ldps cfig sl
+        <> drawSelectionList menuDisplayParams cfig sl
-        <> translateScreenPos cfig (ldps ^. ldpPos) (drawCursorAt
+        <> translateScreenPos
+            cfig
+            (menuDisplayParams ^. ldpPos)
+            ( drawCursorAt
                 msel
                 sl
-                ldps
+                menuDisplayParams
                 50
                 (BoundaryCursor [North, South])
             )

src/Dodge/Render/ShapePicture.hs

@@ -87,7 +87,7 @@ extraPics cfig u =
         <> foldMap drawTractorBeam (_tractorBeams lw)
         <> foldMap drawLinearShockwave (_linearShockwaves lw)
         <> foldMap drawShockwave (_shockwaves lw)
-        <> foldMap drawLaser (_lasersToDraw lw)
+--        <> foldMap drawLaser (_lasersToDraw lw)
         <> foldMap drawTeslaArc (_teslaArcs lw)
         <> foldMap drawRadarSweep (_radarSweeps lw)
         <> foldMap drawFlame (_flames lw)

src/Dodge/Update.hs

@@ -370,12 +370,8 @@ getMenuMouseContext :: ScreenLayer -> Universe -> MouseContext
 getMenuMouseContext screen u = case screen ^. scOptions of
     [] -> NoMouseContext
     _ -> fromMaybe MouseMenuCursor $ do
-        let ymax = maybe 0 length $ screen ^? scSelectionList
+        ymax <- length <$> screen ^? scSelectionList
-        yi <-
+        yi <- ldpVerticalSelection (u ^. uvConfig) menuDisplayParams (u ^. uvWorld . input . mousePos)
-            ldpVerticalSelection
-                (u ^. uvConfig)
-                optionListDisplayParams
-                (u ^. uvWorld . input . mousePos)
         guard (yi >= 0 && yi < ymax)
         return $ case u ^? uvScreenLayers . _head . scSelectionList . ix yi . siIsSelectable of
             Just True -> MouseMenuClick yi
@@ -406,9 +402,9 @@ advanceScrollAmount =
         . (uvWorld . input . smoothScrollAmount %~ advanceSmoothScroll)
 
 updatePastWorlds :: World -> World
-updatePastWorlds w = w & pastWorlds %~ (forceFoldable . take 100 . ((w ^. cWorld . lWorld) :))
+updatePastWorlds w = w 
+    & pastWorlds %~ (forceFoldable . take 100 . ((w ^. cWorld . lWorld) :))
 
---updatePastWorlds w = w & pastWorlds %~ (forceFoldable . take 600 . ((w ^. cWorld . lWorld) :))
 
 doWorldEvents :: World -> World
 doWorldEvents w =
@@ -421,7 +417,7 @@ updateLasers :: World -> World
 updateLasers w =
     w'
         & cWorld . lWorld . lasers .~ []
-        & cWorld . lWorld . lasersToDraw .~ ls
+        & cWorld . lWorld . flares <>~ concat ls
   where
     (w', ls) = mapAccumR updateLaser w (w ^. cWorld . lWorld . lasers)
 

src/Dodge/Update/Input/ScreenLayer.hs

@@ -85,4 +85,4 @@ ldpVerticalSelection cfig ldp (V2 _ y)
 
 setSelectionListRestriction :: Configuration -> ScreenLayer -> ScreenLayer
 setSelectionListRestriction cfig = 
-    scAvailableLines %~ const (getAvailableListLines optionListDisplayParams cfig)
+    scAvailableLines .~ getAvailableListLines menuDisplayParams cfig

tags

@@ -907,14 +907,14 @@ Input	src/Dodge/Data/Input.hs	6;"	m
 Input	src/Dodge/Event/Input.hs	3;"	m
 Input	src/Dodge/Update/Input.hs	1;"	m
 InputFocus	src/Dodge/InputFocus.hs	1;"	m
-InputScreen	src/Dodge/Data/Universe.hs	91;"	C
+InputScreen	src/Dodge/Data/Universe.hs	90;"	C
 Inspect_wall	src/Dodge/Data/Config.hs	91;"	C
 Instance	src/Dodge/Item/Instance.hs	1;"	m
 Instance	src/Dodge/Placement/Instance.hs	1;"	m
 Institution	src/Dodge/Data/Scenario.hs	42;"	t
 Int2	src/Geometry/Data.hs	18;"	t
 IntAnno	src/Dodge/Annotation/Data.hs	17;"	C
-IntID	src/Dodge/Data/Universe.hs	112;"	t
+IntID	src/Dodge/Data/Universe.hs	111;"	t
 IntImp	src/Dodge/Data/CreatureEffect.hs	20;"	t
 IntMapHelp	src/IntMapHelp.hs	8;"	m
 Intention	src/Dodge/Data/Creature.hs	76;"	t
@@ -944,7 +944,7 @@ ItEffect	src/Dodge/Data/Item/Effect.hs	16;"	t
 ItEffect	src/Dodge/ItEffect.hs	2;"	m
 ItID	src/Dodge/Data/Item.hs	29;"	t
 ItInvEffect	src/Dodge/Data/Item/Effect.hs	23;"	t
-ItTargeting	src/Dodge/Data/Item.hs	55;"	C
+ItTargeting	src/Dodge/Data/Item.hs	61;"	C
 ItZoom	src/Dodge/Data/Item/Use.hs	197;"	t
 Item	src/Dodge/Data/Item.hs	41;"	t
 Item	src/Dodge/Data/Item.hs	4;"	m
@@ -957,9 +957,12 @@ ItemLink	src/Dodge/Data/ComposedItem.hs	71;"	t
 ItemLocation	src/Dodge/Data/Item/Location.hs	28;"	t
 ItemParams	src/Dodge/Data/Item/Params.hs	13;"	t
 ItemParams	src/Dodge/Tesla/ItemParams.hs	1;"	m
+ItemScroll	src/Dodge/Data/Item.hs	55;"	t
+ItemScrollInt	src/Dodge/Data/Item.hs	57;"	C
+ItemScrollIntRange	src/Dodge/Data/Item.hs	58;"	C
 ItemScrollTimeFlow	src/Dodge/Data/World.hs	60;"	C
 ItemStructuralFunction	src/Dodge/Data/ComposedItem.hs	39;"	t
-ItemTargeting	src/Dodge/Data/Item.hs	54;"	t
+ItemTargeting	src/Dodge/Data/Item.hs	60;"	t
 ItemType	src/Dodge/Data/Item/Combine.hs	15;"	t
 ItemUse	src/Dodge/Data/Item/Use.hs	33;"	t
 ItemUseToggle	src/Dodge/Data/Item/Effect.hs	30;"	C
@@ -1100,9 +1103,9 @@ MICROCHIP	src/Dodge/Data/Item/Combine.hs	69;"	C
 MICROPHONE	src/Dodge/Data/Item/Combine.hs	81;"	C
 MINIDISPLAY	src/Dodge/Data/Item/Combine.hs	74;"	C
 MINIGUNX	src/Dodge/Data/Item/Combine.hs	148;"	C
-MODBlockedString	src/Dodge/Data/Universe.hs	98;"	C
+MODBlockedString	src/Dodge/Data/Universe.hs	97;"	C
-MODString	src/Dodge/Data/Universe.hs	97;"	C
+MODString	src/Dodge/Data/Universe.hs	96;"	C
-MODStringOption	src/Dodge/Data/Universe.hs	99;"	C
+MODStringOption	src/Dodge/Data/Universe.hs	98;"	C
 MOTOR	src/Dodge/Data/Item/Combine.hs	61;"	C
 MP2Ac	src/Dodge/Data/CreatureEffect.hs	56;"	t
 MP2NoAction	src/Dodge/Data/CreatureEffect.hs	56;"	C
@@ -1166,8 +1169,8 @@ Memory	src/Dodge/Data/Creature/Memory.hs	13;"	t
 Memory	src/Dodge/Creature/Memory.hs	1;"	m
 Memory	src/Dodge/Data/Creature/Memory.hs	6;"	m
 Menu	src/Dodge/Menu.hs	1;"	m
-MenuOption	src/Dodge/Data/Universe.hs	101;"	t
+MenuOption	src/Dodge/Data/Universe.hs	100;"	t
-MenuOptionDisplay	src/Dodge/Data/Universe.hs	96;"	t
+MenuOptionDisplay	src/Dodge/Data/Universe.hs	95;"	t
 MenuScreen	src/Dodge/Render/MenuScreen.hs	2;"	m
 MetaBranch	src/Dodge/Data/MetaTree.hs	16;"	t
 MetaBranch	src/Dodge/Tree/Compose/Data.hs	10;"	t
@@ -1274,7 +1277,8 @@ NoHeldUseEffect	src/Dodge/Data/Item/Use.hs	56;"	C
 NoHoming	src/Dodge/Data/Projectile.hs	47;"	C
 NoIntImp	src/Dodge/Data/CreatureEffect.hs	20;"	C
 NoInvEffect	src/Dodge/Data/Item/Effect.hs	24;"	C
-NoItTargeting	src/Dodge/Data/Item.hs	54;"	C
+NoItTargeting	src/Dodge/Data/Item.hs	60;"	C
+NoItemScroll	src/Dodge/Data/Item.hs	56;"	C
 NoLightFlare	src/Dodge/Data/Item/Use.hs	135;"	C
 NoLighting	src/Dodge/Data/Config.hs	104;"	C
 NoMouseContext	src/Dodge/Data/Input.hs	22;"	C
@@ -1989,8 +1993,8 @@ ToContinueStart	src/Sound/Data.hs	28;"	C
 ToPlaySound	src/Sound/Data.hs	39;"	t
 ToStart	src/Sound/Data.hs	27;"	C
 ToStop	src/Sound/Data.hs	29;"	C
-Toggle	src/Dodge/Data/Universe.hs	102;"	C
+Toggle	src/Dodge/Data/Universe.hs	101;"	C
-Toggle2	src/Dodge/Data/Universe.hs	106;"	C
+Toggle2	src/Dodge/Data/Universe.hs	105;"	C
 ToggleExamine	src/Dodge/ToggleExamine.hs	1;"	m
 ToggleSF	src/Dodge/Data/ComposedItem.hs	65;"	C
 TopDecoration	src/Dodge/Placement/TopDecoration.hs	1;"	m
@@ -2058,7 +2062,7 @@ Update	src/Dodge/Projectile/Update.hs	4;"	m
 Update	src/Dodge/Prop/Update.hs	1;"	m
 Update	src/Dodge/Shockwave/Update.hs	1;"	m
 Update	src/Dodge/TractorBeam/Update.hs	1;"	m
-Update	src/Dodge/Update.hs	7;"	m
+Update	src/Dodge/Update.hs	8;"	m
 Update	src/Framebuffer/Update.hs	6;"	m
 Update	src/Preload/Update.hs	3;"	m
 Use	src/Dodge/Data/Item/Use.hs	6;"	m
@@ -2658,7 +2662,6 @@ _input	src/Dodge/Data/World.hs	42;"	f
 _intelligence	src/Dodge/Data/Creature/Misc.hs	23;"	f
 _ipPlacement	src/Dodge/Data/GenWorld.hs	132;"	f
 _ipPlacementID	src/Dodge/Data/GenWorld.hs	133;"	f
-_isLooping	src/Sound/Data.hs	19;"	f
 _ispCloseButton	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	31;"	f
 _ispCloseItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	29;"	f
 _itAmmoSlots	src/Dodge/Data/Item.hs	50;"	f
@@ -2667,14 +2670,18 @@ _itEffect	src/Dodge/Data/Item.hs	48;"	f
 _itID	src/Dodge/Data/Item.hs	46;"	f
 _itLocation	src/Dodge/Data/Item.hs	47;"	f
 _itParams	src/Dodge/Data/Item.hs	51;"	f
+_itScroll	src/Dodge/Data/Item.hs	52;"	f
 _itTargeting	src/Dodge/Data/Item.hs	49;"	f
-_itTgActive	src/Dodge/Data/Item.hs	58;"	f
+_itTgActive	src/Dodge/Data/Item.hs	64;"	f
-_itTgID	src/Dodge/Data/Item.hs	57;"	f
+_itTgID	src/Dodge/Data/Item.hs	63;"	f
-_itTgPos	src/Dodge/Data/Item.hs	56;"	f
+_itTgPos	src/Dodge/Data/Item.hs	62;"	f
 _itType	src/Dodge/Data/Item.hs	45;"	f
 _itUse	src/Dodge/Data/Item.hs	42;"	f
 _itUseCondition	src/Dodge/Data/Item.hs	43;"	f
 _itemLocations	src/Dodge/Data/LWorld.hs	100;"	f
+_itsInt	src/Dodge/Data/Item.hs	57;"	f
+_itsMax	src/Dodge/Data/Item.hs	58;"	f
+_itsRangeInt	src/Dodge/Data/Item.hs	58;"	f
 _izFac	src/Dodge/Data/Item/Use.hs	200;"	f
 _izMax	src/Dodge/Data/Item/Use.hs	198;"	f
 _izMin	src/Dodge/Data/Item/Use.hs	199;"	f
@@ -2785,13 +2792,13 @@ _mdUpdate	src/Dodge/Data/Modification.hs	27;"	f
 _meleeTarget	src/Dodge/Data/ActionPlan.hs	187;"	f
 _mgField	src/Dodge/Data/Magnet.hs	25;"	f
 _mgPos	src/Dodge/Data/Magnet.hs	24;"	f
-_moEff	src/Dodge/Data/Universe.hs	103;"	f
+_moEff	src/Dodge/Data/Universe.hs	102;"	f
-_moEff1	src/Dodge/Data/Universe.hs	107;"	f
+_moEff1	src/Dodge/Data/Universe.hs	106;"	f
-_moEff2	src/Dodge/Data/Universe.hs	108;"	f
+_moEff2	src/Dodge/Data/Universe.hs	107;"	f
-_moString	src/Dodge/Data/Universe.hs	104;"	f
+_moString	src/Dodge/Data/Universe.hs	103;"	f
-_moString	src/Dodge/Data/Universe.hs	109;"	f
+_moString	src/Dodge/Data/Universe.hs	108;"	f
-_modOption	src/Dodge/Data/Universe.hs	99;"	f
+_modOption	src/Dodge/Data/Universe.hs	98;"	f
-_modString	src/Dodge/Data/Universe.hs	97;"	f
+_modString	src/Dodge/Data/Universe.hs	96;"	f
 _modifications	src/Dodge/Data/LWorld.hs	131;"	f
 _mouseButtons	src/Dodge/Data/Input.hs	48;"	f
 _mouseButtonsReleased	src/Dodge/Data/Input.hs	49;"	f
@@ -3023,10 +3030,9 @@ _rsRad	src/Dodge/Data/RadarSweep.hs	21;"	f
 _rsSource	src/Dodge/Data/RadarSweep.hs	26;"	f
 _rsTimer	src/Dodge/Data/RadarSweep.hs	23;"	f
 _scAvailableLines	src/Dodge/Data/Universe.hs	87;"	f
-_scDisplayTime	src/Dodge/Data/Universe.hs	89;"	f
+_scDisplayTime	src/Dodge/Data/Universe.hs	88;"	f
-_scFooter	src/Dodge/Data/Universe.hs	93;"	f
+_scFooter	src/Dodge/Data/Universe.hs	92;"	f
-_scInput	src/Dodge/Data/Universe.hs	92;"	f
+_scInput	src/Dodge/Data/Universe.hs	91;"	f
-_scListDisplayParams	src/Dodge/Data/Universe.hs	88;"	f
 _scOffset	src/Dodge/Data/Universe.hs	83;"	f
 _scOptionFlag	src/Dodge/Data/Universe.hs	85;"	f
 _scOptions	src/Dodge/Data/Universe.hs	82;"	f
@@ -3106,6 +3112,7 @@ _soundAngDist	src/Sound/Data.hs	53;"	f
 _soundChannel	src/Sound/Data.hs	52;"	f
 _soundChunkID	src/Sound/Data.hs	57;"	f
 _soundData	src/Data/Preload.hs	12;"	f
+_soundIsLooping	src/Sound/Data.hs	19;"	f
 _soundPos	src/Sound/Data.hs	54;"	f
 _soundStatus	src/Sound/Data.hs	51;"	f
 _soundTime	src/Sound/Data.hs	50;"	f
@@ -3373,14 +3380,14 @@ addPolyWall	src/Dodge/LevelGen/StaticWalls.hs	141;"	f
 addPolyWalls	src/Dodge/LevelGen/StaticWalls.hs	129;"	f
 addRandomGirderEW	src/Dodge/Room/Girder.hs	9;"	f
 addRandomGirderFrom	src/Dodge/Room/Girder.hs	16;"	f
-addSideEffect	src/Dodge/Concurrent.hs	30;"	f
+addSideEffect	src/Dodge/Concurrent.hs	29;"	f
 addSouthPillars	src/Dodge/Room/LongDoor.hs	88;"	f
 addTermSignal	src/Dodge/Event/Input.hs	34;"	f
 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	418;"	f
+advanceScrollAmount	src/Dodge/Update.hs	399;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	33;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	45;"	f
 aimDelaySweep	src/Dodge/Render/Picture.hs	239;"	f
@@ -3440,7 +3447,7 @@ applyToSubtree	src/TreeHelp.hs	70;"	f
 applyTorqueCME	src/Dodge/HeldUse.hs	213;"	f
 applyWorldConfig	src/Dodge/Config/Update.hs	38;"	f
 aquamarine	src/Color.hs	23;"	f
-arHUD	src/Dodge/Item/Scope.hs	122;"	f
+arHUD	src/Dodge/Item/Scope.hs	125;"	f
 arc	src/Picture/Base.hs	287;"	f
 arcFull	src/Picture/Arc.hs	11;"	f
 arcPart	src/Picture/Arc.hs	24;"	f
@@ -3527,7 +3534,7 @@ belowNumX	src/Dodge/Combine/Graph.hs	85;"	f
 beltMag	src/Dodge/Item/Ammo.hs	48;"	f
 bfsNodePoints	src/Dodge/Path.hs	58;"	f
 bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	216;"	f
-bgate	src/Dodge/Item/Scope.hs	93;"	f
+bgate	src/Dodge/Item/Scope.hs	94;"	f
 bindFBO	src/Render.hs	244;"	f
 black	src/Color.hs	27;"	f
 blank	src/Picture/Base.hs	59;"	f
@@ -3543,7 +3550,7 @@ blockLine	src/Dodge/Placement/Instance/Wall.hs	41;"	f
 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	36;"	f
+blockingLoad	src/Dodge/Concurrent.hs	35;"	f
 blood1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	474;"	f
 blood2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	370;"	f
 blood3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	498;"	f
@@ -3579,8 +3586,8 @@ bufferPokedVBO	src/Shader/Bind.hs	19;"	f
 bufferShaderLayers	src/Shader/Bind.hs	36;"	f
 bulletBeltBracer	src/Dodge/Item/Equipment.hs	109;"	f
 bulletBeltPack	src/Dodge/Item/Equipment.hs	91;"	f
-bulletModule	src/Dodge/Item/Scope.hs	105;"	f
+bulletModule	src/Dodge/Item/Scope.hs	108;"	f
-bulletPayloadModule	src/Dodge/Item/Scope.hs	119;"	f
+bulletPayloadModule	src/Dodge/Item/Scope.hs	122;"	f
 bulletSynthesizer	src/Dodge/Item/Ammo.hs	122;"	f
 bulletWeapons	src/Dodge/Combine/Combinations.hs	247;"	f
 burstRifle	src/Dodge/Item/Held/Cane.hs	83;"	f
@@ -3620,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	703;"	f
+checkEndGame	src/Dodge/Update.hs	687;"	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	311;"	f
+checkTermDist	src/Dodge/Update.hs	305;"	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
@@ -3649,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	756;"	f
+clClSpringVel	src/Dodge/Update.hs	740;"	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
@@ -3667,15 +3674,15 @@ clicker	src/Dodge/Item/Scope.hs	81;"	f
 clipV	src/Geometry/Vector.hs	47;"	f
 clipZoom	src/Dodge/Update/Camera.hs	185;"	f
 clockCycle	src/Dodge/Clock.hs	9;"	f
-closeButtonToSelectionItem	src/Dodge/Inventory/SelectionList.hs	133;"	f
+closeButtonToSelectionItem	src/Dodge/Inventory/SelectionList.hs	141;"	f
-closeItemToSelectionItem	src/Dodge/Inventory/SelectionList.hs	118;"	f
+closeItemToSelectionItem	src/Dodge/Inventory/SelectionList.hs	126;"	f
-closeItemToTextPictures	src/Dodge/Inventory/SelectionList.hs	147;"	f
+closeItemToTextPictures	src/Dodge/Inventory/SelectionList.hs	155;"	f
 closeObjectInfo	src/Dodge/Render/HUD.hs	223;"	f
 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	726;"	f
+cloudEffect	src/Dodge/Update.hs	710;"	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
@@ -3721,7 +3728,7 @@ 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	480;"	f
-conEffects	src/Dodge/Concurrent.hs	13;"	f
+conEffects	src/Dodge/Concurrent.hs	12;"	f
 concBall	src/Dodge/WorldEvent/SpawnParticle.hs	27;"	f
 concurrentIS	src/Dodge/Update/Input/InGame.hs	288;"	f
 connectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	542;"	f
@@ -3748,7 +3755,7 @@ crAwayFromPost	src/Dodge/Creature/Test.hs	77;"	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	774;"	f
+crCrSpring	src/Dodge/Update.hs	758;"	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
@@ -3768,7 +3775,7 @@ crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	22;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	85;"	f
 crSafeDistFromTarg	src/Dodge/Creature/Test.hs	67;"	f
 crSetRoots	src/Dodge/Inventory/Location.hs	48;"	f
-crSpring	src/Dodge/Update.hs	769;"	f
+crSpring	src/Dodge/Update.hs	753;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	72;"	f
 crUpdate	src/Dodge/Creature/State.hs	62;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	61;"	f
@@ -3833,7 +3840,7 @@ cycleEnum	src/Dodge/Menu/OptionType.hs	22;"	f
 cycleGT	src/IntMapHelp.hs	93;"	f
 cycleL	src/DoubleStack.hs	28;"	f
 cycleLT	src/IntMapHelp.hs	96;"	f
-cycleOptions	src/Dodge/Menu/Option.hs	78;"	f
+cycleOptions	src/Dodge/Menu/Option.hs	77;"	f
 cycleR	src/DoubleStack.hs	32;"	f
 cylinderIndices	src/Shader/Poke.hs	382;"	f
 cylinderOnSeg	src/Geometry.hs	125;"	f
@@ -3861,7 +3868,7 @@ damageWlCircle	src/Dodge/DamageCircle.hs	26;"	f
 dampField	src/Dodge/Magnet.hs	8;"	f
 damsToExpBarrel	src/Dodge/Barreloid.hs	50;"	f
 dark	src/Color.hs	108;"	f
-darkenBackground	src/Dodge/Render/MenuScreen.hs	55;"	f
+darkenBackground	src/Dodge/Render/MenuScreen.hs	52;"	f
 dbArg	src/Dodge/Base.hs	165;"	f
 dbArgChain	src/Dodge/Base.hs	170;"	f
 deZoneIX	src/Dodge/Zoning/Base.hs	87;"	f
@@ -3912,7 +3919,7 @@ defaultBangCane	src/Dodge/Item/Held/Cane.hs	20;"	f
 defaultBlock	src/Dodge/Default/Block.hs	5;"	f
 defaultBounds	src/Dodge/Data/Bounds.hs	20;"	f
 defaultBullet	src/Dodge/Item/Weapon/Bullet.hs	10;"	f
-defaultBulletWeapon	src/Dodge/Default/Item.hs	40;"	f
+defaultBulletWeapon	src/Dodge/Default/Item.hs	41;"	f
 defaultButton	src/Dodge/Default.hs	50;"	f
 defaultCWCam	src/Dodge/Default/World.hs	67;"	f
 defaultCWGen	src/Dodge/Default/World.hs	57;"	f
@@ -3921,7 +3928,7 @@ defaultChaseMvType	src/Dodge/Default/Creature.hs	108;"	f
 defaultClusterStatus	src/Dodge/Default/Room.hs	38;"	f
 defaultConfig	src/Dodge/Data/Config.hs	127;"	f
 defaultCorpse	src/Dodge/Corpse/Make.hs	29;"	f
-defaultCraftItem	src/Dodge/Default/Item.hs	34;"	f
+defaultCraftItem	src/Dodge/Default/Item.hs	35;"	f
 defaultCreature	src/Dodge/Default/Creature.hs	12;"	f
 defaultCreatureMemory	src/Dodge/Default/Creature.hs	67;"	f
 defaultCreatureSkin	src/Dodge/Default/Creature.hs	61;"	f
@@ -3945,7 +3952,7 @@ defaultInanimate	src/Dodge/Default/Creature.hs	64;"	f
 defaultInput	src/Dodge/Default/World.hs	14;"	f
 defaultIntention	src/Dodge/Default/Creature.hs	100;"	f
 defaultInvSize	src/Dodge/Default/Creature.hs	74;"	f
-defaultItEffect	src/Dodge/Default/Item.hs	47;"	f
+defaultItEffect	src/Dodge/Default/Item.hs	48;"	f
 defaultItZoom	src/Dodge/Default/Item/Use/AimParams.hs	32;"	f
 defaultLS	src/Dodge/Default/LightSource.hs	8;"	f
 defaultLWorld	src/Dodge/Default/World.hs	94;"	f
@@ -4010,8 +4017,8 @@ displayControls	src/Dodge/Menu.hs	206;"	f
 displayFrameTicks	src/Dodge/Render/Picture.hs	39;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	198;"	f
 displayIndents	src/Dodge/DisplayInventory.hs	110;"	f
-displayPulse	src/Dodge/Inventory/SelectionList.hs	92;"	f
+displayPulse	src/Dodge/Inventory/SelectionList.hs	100;"	f
-displayTerminalLineString	src/Dodge/Update.hs	447;"	f
+displayTerminalLineString	src/Dodge/Update.hs	428;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -4061,11 +4068,11 @@ doGravityPU	src/Dodge/Projectile/Update.hs	50;"	f
 doHeldUseEffect	src/Dodge/HeldUse.hs	126;"	f
 doInPlacements	src/Dodge/Layout.hs	92;"	f
 doIndividualPlacements	src/Dodge/Layout.hs	117;"	f
-doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	26;"	f
+doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	27;"	f
 doIntImp	src/Dodge/CreatureEffect.hs	24;"	f
 doInvEffect	src/Dodge/ItEffect.hs	12;"	f
 doItCrWdWd	src/Dodge/WorldEffect.hs	48;"	f
-doItemTimeScroll	src/Dodge/Update.hs	200;"	f
+doItemTimeScroll	src/Dodge/Update.hs	192;"	f
 doItmCrWdWd	src/Dodge/Euse.hs	27;"	f
 doLoop	src/Loop.hs	60;"	f
 doMCrAc	src/Dodge/CreatureEffect.hs	57;"	f
@@ -4089,7 +4096,7 @@ doRoomInPlacements	src/Dodge/Layout.hs	97;"	f
 doRoomOutPlacements	src/Dodge/Layout.hs	107;"	f
 doRoomPlacements	src/Dodge/Layout.hs	122;"	f
 doRoomShift	src/Dodge/Room/Link.hs	33;"	f
-doScopeZoom	src/Dodge/Update/Scroll.hs	82;"	f
+doScopeZoom	src/Dodge/Update/Scroll.hs	84;"	f
 doSectionSize	src/Dodge/DisplayInventory.hs	217;"	f
 doSideEffects	appDodge/Main.hs	120;"	f
 doStep	src/Dodge/ArcStep.hs	9;"	f
@@ -4100,7 +4107,7 @@ doTestDrawing	src/Dodge/Render.hs	42;"	f
 doTextInputOver	src/Dodge/Update/Input/Text.hs	15;"	f
 doTextInputOverUniverse	src/Dodge/Update/Input/Text.hs	12;"	f
 doThrust	src/Dodge/Projectile/Update.hs	149;"	f
-doTimeScroll	src/Dodge/Update.hs	205;"	f
+doTimeScroll	src/Dodge/Update.hs	197;"	f
 doTmTm	src/Dodge/TmTm.hs	6;"	f
 doTmWdWd	src/Dodge/WorldEffect.hs	99;"	f
 doWallRotate	src/Dodge/Update/Camera.hs	170;"	f
@@ -4110,7 +4117,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	150;"	f
-doWorldEvents	src/Dodge/Update.hs	429;"	f
+doWorldEvents	src/Dodge/Update.hs	409;"	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
@@ -4164,12 +4171,12 @@ drawExamineInventory	src/Dodge/Render/HUD.hs	195;"	f
 drawFarWallDetect	src/Dodge/Debug/Picture.hs	264;"	f
 drawFlame	src/Dodge/Flame/Draw.hs	7;"	f
 drawFlamelet	src/Dodge/EnergyBall/Draw.hs	26;"	f
-drawFooterText	src/Dodge/Render/MenuScreen.hs	75;"	f
+drawFooterText	src/Dodge/Render/MenuScreen.hs	72;"	f
 drawForceField	src/Dodge/Wall/Draw.hs	11;"	f
 drawGapPlus	src/Dodge/Render/Picture.hs	230;"	f
 drawGib	src/Dodge/Prop/Draw.hs	28;"	f
 drawHUD	src/Dodge/Render/HUD.hs	48;"	f
-drawInputMenu	src/Dodge/Render/MenuScreen.hs	21;"	f
+drawInputMenu	src/Dodge/Render/MenuScreen.hs	22;"	f
 drawInspectWall	src/Dodge/Debug/Picture.hs	239;"	f
 drawInspectWalls	src/Dodge/Debug/Picture.hs	227;"	f
 drawInventory	src/Dodge/Render/HUD.hs	55;"	f
@@ -4179,6 +4186,7 @@ drawJumpDown	src/Dodge/Render/Picture.hs	163;"	f
 drawLabCrossCol	src/Dodge/Render/Label.hs	8;"	f
 drawLampCover	src/Dodge/Prop/Draw.hs	44;"	f
 drawLaser	src/Dodge/Laser/Draw.hs	6;"	f
+drawLaser	src/Dodge/Laser/Update.hs	31;"	f
 drawLightSource	src/Dodge/LightSource/Draw.hs	7;"	f
 drawLinearShockwave	src/Dodge/LinearShockwave/Draw.hs	10;"	f
 drawList	src/Dodge/Render/List.hs	209;"	f
@@ -4192,13 +4200,13 @@ drawMapperInventory	src/Dodge/Render/HUD.hs	169;"	f
 drawMenuClick	src/Dodge/Render/Picture.hs	137;"	f
 drawMenuCursor	src/Dodge/Render/Picture.hs	150;"	f
 drawMenuOrHUD	src/Dodge/Render/Picture.hs	57;"	f
-drawMenuScreen	src/Dodge/Render/MenuScreen.hs	15;"	f
+drawMenuScreen	src/Dodge/Render/MenuScreen.hs	16;"	f
 drawMouseCursor	src/Dodge/Render/Picture.hs	73;"	f
 drawMouseOver	src/Dodge/Render/HUD.hs	103;"	f
 drawMousePosition	src/Dodge/Debug/Picture.hs	349;"	f
 drawMovingShape	src/Dodge/Prop/Draw.hs	67;"	f
 drawMovingShapeCol	src/Dodge/Prop/Draw.hs	73;"	f
-drawOptions	src/Dodge/Render/MenuScreen.hs	35;"	f
+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
@@ -4235,7 +4243,7 @@ drawTerminalDisplay	src/Dodge/Render/HUD.hs	363;"	f
 drawTeslaArc	src/Dodge/Tesla/Arc/Draw.hs	7;"	f
 drawTeslaArc	src/Dodge/Tesla/Draw.hs	9;"	f
 drawText	src/Picture/Base.hs	220;"	f
-drawTitle	src/Dodge/Render/MenuScreen.hs	58;"	f
+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
@@ -4266,7 +4274,7 @@ dtToLRAdj	src/Dodge/DoubleTree.hs	104;"	f
 dtToLRAdjEither	src/Dodge/DoubleTree.hs	114;"	f
 dtToRootIntMap'	src/Dodge/DoubleTree.hs	92;"	f
 dtToUpDownAdj	src/Dodge/DoubleTree.hs	96;"	f
-dummyMenuOption	src/Dodge/Menu/Option.hs	75;"	f
+dummyMenuOption	src/Dodge/Menu/Option.hs	74;"	f
 ebFlicker	src/Dodge/EnergyBall.hs	98;"	f
 edgeFormatting	src/Dodge/Combine/Graph.hs	130;"	f
 edgeToPic	src/Dodge/Debug/Picture.hs	431;"	f
@@ -4409,7 +4417,7 @@ fromV3	src/Geometry/Data.hs	43;"	f
 frontArmour	src/Dodge/Item/Equipment.hs	40;"	f
 fstV2	src/Geometry/Data.hs	50;"	f
 fuelPack	src/Dodge/Item/Equipment.hs	73;"	f
-functionalUpdate	src/Dodge/Update.hs	255;"	f
+functionalUpdate	src/Dodge/Update.hs	247;"	f
 fuseFunc	src/Dodge/Path.hs	150;"	f
 fusePairs	src/Dodge/Path.hs	153;"	f
 fusePoint	src/Dodge/LevelGen/StaticWalls.hs	158;"	f
@@ -4437,8 +4445,8 @@ geometryTests	test/Spec.hs	17;"	f
 geometryUnitTests	test/Spec.hs	22;"	f
 geqConstr	src/SameConstr.hs	21;"	f
 getAmmoLinks	src/Dodge/Item/Grammar.hs	132;"	f
-getArguments	src/Dodge/Update/Scroll.hs	176;"	f
+getArguments	src/Dodge/Update/Scroll.hs	178;"	f
-getArguments'	src/Dodge/Update/Scroll.hs	164;"	f
+getArguments'	src/Dodge/Update/Scroll.hs	166;"	f
 getAttachedSFLink	src/Dodge/HeldUse.hs	364;"	f
 getAutoSpringLinks	src/Dodge/Item/Grammar.hs	112;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
@@ -4458,7 +4466,7 @@ getLaserDamage	src/Dodge/HeldUse.hs	307;"	f
 getLaserPhaseV	src/Dodge/HeldUse.hs	304;"	f
 getLinksOfType	src/Dodge/RoomLink.hs	39;"	f
 getMaxLinesTM	src/Dodge/Terminal/Type.hs	11;"	f
-getMenuMouseContext	src/Dodge/Update.hs	376;"	f
+getMenuMouseContext	src/Dodge/Update.hs	369;"	f
 getNodePos	src/Dodge/Path.hs	31;"	f
 getPJStabiliser	src/Dodge/HeldUse.hs	693;"	f
 getPretty	src/AesonHelp.hs	8;"	f
@@ -4472,7 +4480,7 @@ getTiles	src/Dodge/Layout.hs	208;"	f
 getViewpoints	src/Dodge/Viewpoints.hs	29;"	f
 getWallSPic	src/Dodge/Render/Walls.hs	51;"	f
 getWindowSize	src/Dodge/WindowSize.hs	5;"	f
-gimbal	src/Dodge/Item/Scope.hs	141;"	f
+gimbal	src/Dodge/Item/Scope.hs	144;"	f
 girder	src/Dodge/Room/Foreground.hs	211;"	f
 girderV	src/Dodge/Room/Foreground.hs	182;"	f
 girderV'	src/Dodge/Room/Foreground.hs	157;"	f
@@ -4492,7 +4500,6 @@ glauncherPic	src/Dodge/Item/Draw/SPic.hs	384;"	f
 glushortSize	src/Shader/Parameters.hs	25;"	f
 goToPostStrat	src/Dodge/Creature/Strategy.hs	10;"	f
 goToTarget	src/Dodge/Creature/ReaderUpdate.hs	136;"	f
-gotoTerminal	src/Dodge/Update.hs	127;"	f
 grahamEliminate	src/Geometry/Polygon.hs	125;"	f
 grahamScan	src/Geometry/Polygon.hs	116;"	f
 grapeCannon	src/Dodge/Item/Held/Cone.hs	36;"	f
@@ -4515,7 +4522,7 @@ gut3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	374;"	f
 gut4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	354;"	f
 gut5S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	518;"	f
 gut6S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	484;"	f
-gyroscope	src/Dodge/Item/Scope.hs	144;"	f
+gyroscope	src/Dodge/Item/Scope.hs	147;"	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
@@ -4530,7 +4537,7 @@ handleMouseWheelEvent	src/Dodge/Event/Input.hs	58;"	f
 handleResizeEvent	src/Dodge/Event.hs	53;"	f
 handleTextInput	src/Dodge/Event/Input.hs	18;"	f
 handleWindowMoveEvent	src/Dodge/Event.hs	44;"	f
-hardQuit	src/Dodge/Concurrent.hs	33;"	f
+hardQuit	src/Dodge/Concurrent.hs	32;"	f
 hasButtonLOS	src/Dodge/Base/Collide.hs	210;"	f
 hasCaneGunDim	src/Dodge/Item/InvSize.hs	48;"	f
 hasFrontArmour	src/Dodge/Creature/Test.hs	110;"	f
@@ -4571,7 +4578,7 @@ holsterWeapon	src/Dodge/Creature/Volition.hs	14;"	f
 homingModule	src/Dodge/Item/Scope.hs	47;"	f
 horPipe	src/Dodge/Placement/Instance/Pipe.hs	9;"	f
 hotkeyToScancode	src/Dodge/Creature/YourControl.hs	70;"	f
-hotkeyToString	src/Dodge/Inventory/SelectionList.hs	98;"	f
+hotkeyToString	src/Dodge/Inventory/SelectionList.hs	106;"	f
 humanoidAIList	src/Dodge/Humanoid.hs	181;"	f
 iShape	src/Dodge/Placement/Instance/LightSource.hs	73;"	f
 icosahedronPoints	src/Polyhedra/Geodesic.hs	12;"	f
@@ -4605,7 +4612,7 @@ initialWorld	src/Dodge/Initialisation.hs	16;"	f
 initialisePlaying	src/Sound.hs	76;"	f
 initializeGLState	src/Preload/Render.hs	213;"	f
 initializeOptionMenu	src/Dodge/Menu/Option.hs	17;"	f
-initializeOptionMenuBO	src/Dodge/Menu/Option.hs	33;"	f
+initializeOptionMenuBO	src/Dodge/Menu/Option.hs	32;"	f
 initializeTexture2D	src/Framebuffer/Update.hs	221;"	f
 inorderNumberTree	src/TreeHelp.hs	189;"	f
 inputFocusI	src/Dodge/InputFocus.hs	13;"	f
@@ -4642,7 +4649,7 @@ intersectSegsSeg	src/Geometry/Intersect.hs	232;"	f
 intervalList	src/Geometry.hs	329;"	f
 interweave	src/Justify.hs	17;"	f
 introScan	src/Dodge/Item/Scope.hs	56;"	f
-introScanDisplay	src/Dodge/Inventory/SelectionList.hs	87;"	f
+introScanDisplay	src/Dodge/Inventory/SelectionList.hs	95;"	f
 intsToPos	src/Dodge/Room/Modify/Girder.hs	160;"	f
 invAdj	src/Dodge/Item/Grammar.hs	289;"	f
 invCursorParams	src/Dodge/ListDisplayParams.hs	36;"	f
@@ -4684,7 +4691,7 @@ isLeftOfA	src/Geometry.hs	195;"	f
 isNothing'	src/MaybeHelp.hs	33;"	f
 isOnSeg	src/Geometry.hs	254;"	f
 isOutLnk	src/Dodge/PlacementSpot.hs	164;"	f
-isOverTerminalScreen	src/Dodge/Update.hs	397;"	f
+isOverTerminalScreen	src/Dodge/Update.hs	380;"	f
 isPutID	src/Dodge/Placement/Instance/Wall.hs	129;"	f
 isRHS	src/Geometry/LHS.hs	24;"	f
 isUnusedLnk	src/Dodge/PlacementSpot.hs	61;"	f
@@ -4704,7 +4711,7 @@ itemCombinations	src/Dodge/Combine/Combinations.hs	55;"	f
 itemCombinationsEdges	src/Dodge/Combine/Graph.hs	60;"	f
 itemDetectorEffect	src/Dodge/HeldUse.hs	370;"	f
 itemDisplay	src/Dodge/Inventory/SelectionList.hs	42;"	f
-itemDisplayPad	src/Dodge/Inventory/SelectionList.hs	61;"	f
+itemDisplayPad	src/Dodge/Inventory/SelectionList.hs	69;"	f
 itemEquipPict	src/Dodge/Item/Draw.hs	16;"	f
 itemFromAmmoMag	src/Dodge/Item.hs	39;"	f
 itemFromAttachType	src/Dodge/Item.hs	48;"	f
@@ -4713,12 +4720,13 @@ itemFromEquipType	src/Dodge/Item.hs	63;"	f
 itemFromHeldType	src/Dodge/Item/Held.hs	25;"	f
 itemInfo	src/Dodge/Item/Info.hs	14;"	f
 itemInvColor	src/Dodge/Item/InventoryColor.hs	9;"	f
-itemNumberDisplay	src/Dodge/Inventory/SelectionList.hs	66;"	f
+itemNumberDisplay	src/Dodge/Inventory/SelectionList.hs	74;"	f
 itemRooms	src/Dodge/LockAndKey.hs	39;"	f
 itemRotTreeSPic	src/Dodge/Item/Draw/SPic.hs	27;"	f
 itemSPic	src/Dodge/Item/Draw/SPic.hs	34;"	f
 itemScan	src/Dodge/Item/Scope.hs	62;"	f
-itemScroll	src/Dodge/Update/Scroll.hs	47;"	f
+itemScroll	src/Dodge/Update/Scroll.hs	49;"	f
+itemScrollDisplay	src/Dodge/Inventory/SelectionList.hs	63;"	f
 itemString	src/Dodge/Item/Display.hs	36;"	f
 itemToBreakLists	src/Dodge/Item/Grammar.hs	59;"	f
 itemToFunction	src/Dodge/Item/Grammar.hs	138;"	f
@@ -4732,7 +4740,7 @@ itmUsageInfo	src/Dodge/Item/Info.hs	222;"	f
 jShape	src/Dodge/Placement/Instance/LightSource.hs	85;"	f
 jaggedShape	src/Dodge/Block/Debris.hs	191;"	f
 joinItemsInList	src/Dodge/Item/Grammar.hs	259;"	f
-joystick	src/Dodge/Item/Scope.hs	137;"	f
+joystick	src/Dodge/Item/Scope.hs	140;"	f
 jps0'	src/Dodge/LevelGen/PlacementHelper.hs	60;"	f
 jps0PushPS	src/Dodge/LevelGen/PlacementHelper.hs	63;"	f
 jsps	src/Dodge/LevelGen/PlacementHelper.hs	36;"	f
@@ -4770,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	72;"	f
+ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	73;"	f
 ldtIL	src/Dodge/DoubleTree.hs	149;"	f
 ldtPropagate	src/Dodge/DoubleTree.hs	20;"	f
 ldtPropagateFold	src/Dodge/DoubleTree.hs	29;"	f
@@ -4824,6 +4832,7 @@ loadSaveSlot	src/Dodge/Save.hs	74;"	f
 loadSeed	src/Dodge/LoadSeed.hs	7;"	f
 loadSound	src/Dodge/SoundLogic/LoadSound.hs	11;"	f
 loadSounds	src/Dodge/SoundLogic/LoadSound.hs	16;"	f
+loadingScreen	src/Dodge/Concurrent.hs	56;"	f
 loadingScreen	src/Dodge/Menu/Loading.hs	8;"	f
 loadme	src/Dodge/Debug/Terminal.hs	138;"	f
 locGoHelp	src/Dodge/DoubleTree.hs	220;"	f
@@ -4934,7 +4943,7 @@ makeTypeCraft	src/Dodge/Item/Craftable.hs	18;"	f
 makeTypeCraftNum	src/Dodge/Item/Craftable.hs	12;"	f
 mapOverlay	src/Dodge/Render/HUD/Carte.hs	24;"	f
 mapper	src/Dodge/Item/Scope.hs	69;"	f
-markWallSeen	src/Dodge/Update.hs	688;"	f
+markWallSeen	src/Dodge/Update.hs	672;"	f
 maxDamageType	src/Dodge/Damage.hs	37;"	f
 maxShowX	src/Dodge/Combine/Graph.hs	49;"	f
 maxViewDistance	src/Dodge/Viewpoints.hs	26;"	f
@@ -4946,7 +4955,7 @@ maybeClearPaths	src/Dodge/Block.hs	72;"	f
 maybeDestroyBlock	src/Dodge/Wall/Damage.hs	26;"	f
 maybeDestroyDoor	src/Dodge/Wall/Damage.hs	31;"	f
 maybeExitCombine	src/Dodge/Update/Input/InGame.hs	533;"	f
-maybeOpenTerminal	src/Dodge/Update.hs	122;"	f
+maybeOpenConsole	src/Dodge/Update.hs	123;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	116;"	f
 maybeWarmupStatus	src/Dodge/Item/Display.hs	26;"	f
@@ -4976,7 +4985,8 @@ memoCylinderIndices	src/Shader/Poke.hs	323;"	f
 memoFlatIndices	src/Shader/Poke.hs	311;"	f
 memoTopPrismEdgeIndices	src/Shader/Poke.hs	329;"	f
 memoTopPrismIndices	src/Shader/Poke.hs	317;"	f
-menuOptionToSelectionItem	src/Dodge/Menu/Option.hs	94;"	f
+menuDisplayParams	src/Dodge/ListDisplayParams.hs	54;"	f
+menuOptionToSelectionItem	src/Dodge/Menu/Option.hs	93;"	f
 merge	src/ListHelp.hs	83;"	f
 mergeBy	src/ListHelp.hs	86;"	f
 mergeOn	src/ListHelp.hs	93;"	f
@@ -5029,11 +5039,11 @@ 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	58;"	f
+mouseClickOptionsList	src/Dodge/Update/Input/ScreenLayer.hs	59;"	f
 mouseCursorType	src/Dodge/Render/Picture.hs	80;"	f
 mouseWorldPos	src/Dodge/Base/Coordinate.hs	48;"	f
 moveBullet	src/Dodge/Bullet.hs	204;"	f
-moveCombineSel	src/Dodge/Update/Scroll.hs	112;"	f
+moveCombineSel	src/Dodge/Update/Scroll.hs	114;"	f
 moveHammerUp	src/Dodge/Hammer.hs	5;"	f
 moveInverseShockwave	src/Dodge/Shockwave/Update.hs	53;"	f
 moveLSThen	src/Dodge/Placement/Instance/LightSource.hs	30;"	f
@@ -5059,7 +5069,7 @@ muzFlareAt	src/Dodge/HeldUse.hs	280;"	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	717;"	f
+mvGust	src/Dodge/Update.hs	701;"	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
@@ -5095,7 +5105,7 @@ normalizeAnglePi	src/Dodge/Base.hs	154;"	f
 normalizeColor	src/Color.hs	76;"	f
 normalizeV	src/Geometry/Vector.hs	43;"	f
 normalizeV3	src/Geometry/Vector3D.hs	84;"	f
-nullCommand	src/Dodge/Update/Scroll.hs	167;"	f
+nullCommand	src/Dodge/Update/Scroll.hs	169;"	f
 numColor	src/Color.hs	128;"	f
 numDrawableVertices	src/Shader/Parameters.hs	34;"	f
 numGLushort	src/Shader/Parameters.hs	29;"	f
@@ -5114,14 +5124,14 @@ onEquipWristShield	src/Dodge/Euse.hs	56;"	f
 onRemoveWristShield	src/Dodge/Euse.hs	65;"	f
 onXY	src/Geometry/Vector3D.hs	130;"	f
 oneH	src/Dodge/Creature/Test.hs	95;"	f
+openConsole	src/Dodge/Update.hs	128;"	f
 openCursorAt	src/Dodge/Render/HUD/Carte.hs	54;"	f
-optionListDisplayParams	src/Dodge/ListDisplayParams.hs	54;"	f
 optionMenu	src/Dodge/Menu.hs	105;"	f
-optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	50;"	f
+optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	51;"	f
-optionScreenUpdate	src/Dodge/Update/Input/ScreenLayer.hs	41;"	f
+optionScreenUpdate	src/Dodge/Update/Input/ScreenLayer.hs	42;"	f
-optionValueOffset	src/Dodge/Menu/Option.hs	89;"	f
+optionValueOffset	src/Dodge/Menu/Option.hs	88;"	f
 optionsOptions	src/Dodge/Menu.hs	108;"	f
-optionsToSelections	src/Dodge/Menu/Option.hs	51;"	f
+optionsToSelections	src/Dodge/Menu/Option.hs	50;"	f
 orRegex	src/Dodge/DisplayInventory.hs	81;"	f
 orange	src/Color.hs	25;"	f
 orderAround3	src/Geometry/Vector3D.hs	105;"	f
@@ -5169,7 +5179,7 @@ pauseGame	src/Dodge/Update/Input/InGame.hs	499;"	f
 pauseMenu	src/Dodge/Menu.hs	53;"	f
 pauseMenuOptions	src/Dodge/Menu.hs	58;"	f
 pauseSound	src/Dodge/SoundLogic.hs	41;"	f
-pauseTime	src/Dodge/Update.hs	189;"	f
+pauseTime	src/Dodge/Update.hs	180;"	f
 peZoneSize	src/Dodge/Zoning/Pathing.hs	46;"	f
 pedestalRoom	src/Dodge/Room/Containing.hs	50;"	f
 penThing	src/Dodge/Bullet.hs	233;"	f
@@ -5221,7 +5231,7 @@ placeSpotID	src/Dodge/Placement/PlaceSpot.hs	100;"	f
 placeSpotID'	src/Dodge/Placement/PlaceSpot.hs	106;"	f
 placeSpotRoomRand	src/Dodge/Placement/PlaceSpot.hs	89;"	f
 placeSpotUsingLink	src/Dodge/Placement/PlaceSpot.hs	70;"	f
-placeString	src/Dodge/Render/MenuScreen.hs	64;"	f
+placeString	src/Dodge/Render/MenuScreen.hs	61;"	f
 placeWallPoly	src/Dodge/Placement/PlaceSpot.hs	162;"	f
 plainRegex	src/Dodge/DisplayInventory.hs	195;"	f
 playIfFree	src/Sound.hs	136;"	f
@@ -5322,7 +5332,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	117;"	f
-ppEvents	src/Dodge/Update.hs	680;"	f
+ppEvents	src/Dodge/Update.hs	664;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5457,15 +5467,15 @@ reflectIn	src/Geometry.hs	139;"	f
 reflectInParam	src/Geometry.hs	247;"	f
 reflectLaserAlong	src/Dodge/Item/Weapon/LaserPath.hs	13;"	f
 refract	src/Dodge/Item/Weapon/LaserPath.hs	40;"	f
-refreshOptionsSelectionList	src/Dodge/Menu/Option.hs	39;"	f
+refreshOptionsSelectionList	src/Dodge/Menu/Option.hs	38;"	f
 regexCombs	src/Dodge/DisplayInventory.hs	71;"	f
 regexList	src/Dodge/DisplayInventory.hs	314;"	f
 reload1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	448;"	f
 reloadLevelStart	src/Dodge/Save.hs	71;"	f
 reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	446;"	f
 rememberSounds	src/Dodge/Creature/Perception.hs	177;"	f
-remoteDetonator	src/Dodge/Item/Scope.hs	132;"	f
+remoteDetonator	src/Dodge/Item/Scope.hs	135;"	f
-remoteScreen	src/Dodge/Item/Scope.hs	127;"	f
+remoteScreen	src/Dodge/Item/Scope.hs	130;"	f
 removeAmmoFromMag	src/Dodge/HeldUse.hs	458;"	f
 removeDot	src/ShortShow.hs	29;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
@@ -5608,13 +5618,13 @@ screenPosAbs	src/Dodge/ScreenPos.hs	15;"	f
 screenToWorldPos	src/Dodge/Base/Coordinate.hs	53;"	f
 scrollAugInvSel	src/Dodge/Inventory.hs	187;"	f
 scrollAugNextInSection	src/Dodge/Inventory.hs	200;"	f
-scrollCommandStrings	src/Dodge/Update/Scroll.hs	159;"	f
+scrollCommandStrings	src/Dodge/Update/Scroll.hs	161;"	f
-scrollCommands	src/Dodge/Update/Scroll.hs	156;"	f
+scrollCommands	src/Dodge/Update/Scroll.hs	158;"	f
 scrollDebugInfoInt	src/Dodge/Debug.hs	71;"	f
-scrollRBOption	src/Dodge/Update/Scroll.hs	150;"	f
+scrollRBOption	src/Dodge/Update/Scroll.hs	152;"	f
 scrollSelectionSections	src/Dodge/SelectionSections.hs	26;"	f
-scrollTimeBack	src/Dodge/Update.hs	215;"	f
+scrollTimeBack	src/Dodge/Update.hs	207;"	f
-scrollTimeForward	src/Dodge/Update.hs	237;"	f
+scrollTimeForward	src/Dodge/Update.hs	230;"	f
 seagullBarkS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	426;"	f
 seagullBarkTransformedS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	494;"	f
 seagullChatter1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
@@ -5640,7 +5650,7 @@ selSecSelSize	src/Dodge/SelectionSections.hs	180;"	f
 selSecYint	src/Dodge/SelectionSections.hs	189;"	f
 selectCreatureDebugItem	src/Dodge/Debug.hs	55;"	f
 selectUse	src/Dodge/SelectUse.hs	11;"	f
-selectedItemScroll	src/Dodge/Update/Scroll.hs	41;"	f
+selectedItemScroll	src/Dodge/Update/Scroll.hs	43;"	f
 sensAboveDoor	src/Dodge/Room/SensorDoor.hs	63;"	f
 sensInsideDoor	src/Dodge/Room/SensorDoor.hs	69;"	f
 senseDamage	src/Dodge/Machine/Update.hs	154;"	f
@@ -5653,7 +5663,7 @@ sentinelAI	src/Dodge/Creature/SentinelAI.hs	20;"	f
 sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	83;"	f
 sentinelFireType	src/Dodge/Creature/SentinelAI.hs	50;"	f
 setChannelPos	src/Sound.hs	149;"	f
-setClickWorldPos	src/Dodge/Update.hs	97;"	f
+setClickWorldPos	src/Dodge/Update.hs	98;"	f
 setClusterID	src/Dodge/Combine/Graph.hs	115;"	f
 setCrPosture	src/Dodge/Creature/YourControl.hs	172;"	f
 setDepth	src/Picture/Base.hs	128;"	f
@@ -5670,13 +5680,13 @@ setLinkTypePD	src/Dodge/RoomLink.hs	67;"	f
 setMinInvSize	src/Dodge/Creature/Action.hs	145;"	f
 setMusicVolume	src/Sound.hs	161;"	f
 setMvPos	src/Dodge/Creature/ReaderUpdate.hs	51;"	f
-setOldPos	src/Dodge/Update.hs	471;"	f
+setOldPos	src/Dodge/Update.hs	452;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
 setRBCreatureTargeting	src/Dodge/Creature/State.hs	408;"	f
 setSelWhileDragging	src/Dodge/Update/Input/InGame.hs	332;"	f
-setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	85;"	f
+setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	86;"	f
 setShaderSource	src/Shader/Compile.hs	290;"	f
 setShadowLimits	src/Dodge/Shadows.hs	11;"	f
 setSoundVolume	src/Sound.hs	156;"	f
@@ -5717,7 +5727,7 @@ shatterGunSPic	src/Dodge/Item/Draw/SPic.hs	294;"	f
 shatterWall	src/Dodge/Item/Weapon/Shatter.hs	26;"	f
 shellCollisionCheck	src/Dodge/Projectile/Update.hs	85;"	f
 shellMag	src/Dodge/Item/Ammo.hs	61;"	f
-shellModule	src/Dodge/Item/Scope.hs	111;"	f
+shellModule	src/Dodge/Item/Scope.hs	114;"	f
 shellShape	src/Dodge/Projectile/Draw.hs	34;"	f
 shellTrailCloud	src/Dodge/WorldEvent/Cloud.hs	65;"	f
 shieldWall	src/Dodge/Euse.hs	87;"	f
@@ -5776,12 +5786,12 @@ 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	765;"	f
+simpleCrSprings	src/Dodge/Update.hs	749;"	f
 simpleDamFL	src/Dodge/Flame.hs	40;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	514;"	f
 sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	358;"	f
-singleAmmo	src/Dodge/Default/Item.hs	37;"	f
+singleAmmo	src/Dodge/Default/Item.hs	38;"	f
 singleBlock	src/Dodge/Placement/Instance/Wall.hs	30;"	f
 singleDT	src/Dodge/DoubleTree.hs	9;"	f
 singleLDT	src/Dodge/DoubleTree.hs	12;"	f
@@ -5808,7 +5818,7 @@ smallPillar	src/Dodge/Room/Pillar.hs	32;"	f
 smallRoom	src/Dodge/Room/RunPast.hs	31;"	f
 smg	src/Dodge/Item/Held/Stick.hs	72;"	f
 smokeCloudAt	src/Dodge/WorldEvent/Cloud.hs	41;"	f
-smokeReducer	src/Dodge/Item/Scope.hs	150;"	f
+smokeReducer	src/Dodge/Item/Scope.hs	153;"	f
 sndV2	src/Geometry/Data.hs	52;"	f
 sniperRifle	src/Dodge/Item/Held/Rod.hs	54;"	f
 someCrits	src/Dodge/LockAndKey.hs	120;"	f
@@ -5966,7 +5976,7 @@ terminalReturnEffect	src/Dodge/Terminal.hs	276;"	f
 terminalSPic	src/Dodge/Machine/Draw.hs	29;"	f
 terminalScreenGlow	src/Dodge/Machine/Update.hs	34;"	f
 terminalShape	src/Dodge/Machine/Draw.hs	32;"	f
-terminalWheelEvent	src/Dodge/Update/Scroll.hs	122;"	f
+terminalWheelEvent	src/Dodge/Update/Scroll.hs	124;"	f
 teslaGun	src/Dodge/Item/Held/BatteryGuns.hs	21;"	f
 teslaGunPic	src/Dodge/Item/Draw/SPic.hs	401;"	f
 teslaParams	src/Dodge/Item/Held/BatteryGuns.hs	37;"	f
@@ -6002,7 +6012,7 @@ threeLineDecoration	src/Dodge/Placement/TopDecoration.hs	61;"	f
 tileTexCoords	src/Tile.hs	11;"	f
 tilesFromRooms	src/Dodge/Layout.hs	205;"	f
 tilesToLine	src/Shader/AuxAddition.hs	66;"	f
-timeFlowUpdate	src/Dodge/Update.hs	176;"	f
+timeFlowUpdate	src/Dodge/Update.hs	167;"	f
 timeScroller	src/Dodge/Item/Held/Utility.hs	88;"	f
 timeScroller	src/Dodge/Item/Weapon/Utility.hs	47;"	f
 timeStopper	src/Dodge/Item/Held/Utility.hs	82;"	f
@@ -6012,7 +6022,7 @@ tinMag	src/Dodge/Item/Ammo.hs	27;"	f
 tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	422;"	f
 titleOptionsMenu	src/Dodge/Menu.hs	99;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	102;"	f
-tmUpdate	src/Dodge/Update.hs	451;"	f
+tmUpdate	src/Dodge/Update.hs	432;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
@@ -6132,9 +6142,9 @@ twoStep1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	406;"	f
 twoStepS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	444;"	f
 twoStepSlowS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	436;"	f
 ubyteSize	src/Shader/Parameters.hs	13;"	f
-ugate	src/Dodge/Item/Scope.hs	99;"	f
+ugate	src/Dodge/Item/Scope.hs	101;"	f
 uncurryV	src/Geometry/Data.hs	46;"	f
-underBarrelSlot	src/Dodge/Item/Scope.hs	147;"	f
+underBarrelSlot	src/Dodge/Item/Scope.hs	150;"	f
 unfoldrMID	src/MonadHelp.hs	33;"	f
 unitVectorAtAngle	src/Geometry/Vector.hs	100;"	f
 unlockInv	src/Dodge/Inventory/Lock.hs	12;"	f
@@ -6158,41 +6168,41 @@ updateAttachedItems	src/Dodge/Creature/State.hs	265;"	f
 updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	451;"	f
 updateBarrel	src/Dodge/Barreloid.hs	45;"	f
 updateBarreloid	src/Dodge/Barreloid.hs	13;"	f
-updateBaseWheelEvent	src/Dodge/Update/Scroll.hs	25;"	f
+updateBaseWheelEvent	src/Dodge/Update/Scroll.hs	27;"	f
 updateBounds	src/Dodge/Update/Camera.hs	215;"	f
 updateBulVel	src/Dodge/Bullet.hs	61;"	f
 updateBullet	src/Dodge/Bullet.hs	22;"	f
-updateBullets	src/Dodge/Update.hs	544;"	f
+updateBullets	src/Dodge/Update.hs	526;"	f
 updateCamera	src/Dodge/Update/Camera.hs	27;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	110;"	f
-updateCloud	src/Dodge/Update.hs	731;"	f
+updateCloud	src/Dodge/Update.hs	715;"	f
-updateClouds	src/Dodge/Update.hs	575;"	f
+updateClouds	src/Dodge/Update.hs	559;"	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	516;"	f
+updateCreatureGroups	src/Dodge/Update.hs	498;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	492;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	474;"	f
-updateDebugMessageOffset	src/Dodge/Update.hs	91;"	f
+updateDebugMessageOffset	src/Dodge/Update.hs	92;"	f
-updateDelayedEvents	src/Dodge/Update.hs	794;"	f
+updateDelayedEvents	src/Dodge/Update.hs	778;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	537;"	f
+updateDistortions	src/Dodge/Update.hs	519;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	45;"	f
-updateEnergyBalls	src/Dodge/Update.hs	563;"	f
+updateEnergyBalls	src/Dodge/Update.hs	547;"	f
 updateEnterRegex	src/Dodge/Update/Input/InGame.hs	478;"	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	560;"	f
+updateFlames	src/Dodge/Update.hs	544;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	32;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	362;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	355;"	f
-updateGusts	src/Dodge/Update.hs	714;"	f
+updateGusts	src/Dodge/Update.hs	698;"	f
 updateHeldRootItem	src/Dodge/Creature/State.hs	259;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
-updateIMl	src/Dodge/Update.hs	506;"	f
+updateIMl	src/Dodge/Update.hs	488;"	f
-updateIMl'	src/Dodge/Update.hs	511;"	f
+updateIMl'	src/Dodge/Update.hs	493;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	76;"	f
 updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	398;"	f
 updateInv	src/Dodge/Creature/State.hs	160;"	f
@@ -6202,67 +6212,67 @@ updateItemWithOrientation	src/Dodge/Creature/State.hs	285;"	f
 updateKeyInGame	src/Dodge/Update/Input/InGame.hs	392;"	f
 updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	380;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
-updateLaser	src/Dodge/Laser/Update.hs	13;"	f
+updateLaser	src/Dodge/Laser/Update.hs	16;"	f
-updateLasers	src/Dodge/Update.hs	436;"	f
+updateLasers	src/Dodge/Update.hs	416;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
 updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	411;"	f
 updateMachine	src/Dodge/Machine/Update.hs	19;"	f
-updateMagnets	src/Dodge/Update.hs	307;"	f
+updateMagnets	src/Dodge/Update.hs	300;"	f
 updateMouseClickInGame	src/Dodge/Update/Input/InGame.hs	195;"	f
-updateMouseContext	src/Dodge/Update.hs	319;"	f
+updateMouseContext	src/Dodge/Update.hs	313;"	f
-updateMouseContextGame	src/Dodge/Update.hs	324;"	f
+updateMouseContextGame	src/Dodge/Update.hs	318;"	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	156;"	f
 updateMovement	src/Dodge/Creature/State.hs	429;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	528;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	510;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	521;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	503;"	f
-updatePastWorlds	src/Dodge/Update.hs	424;"	f
+updatePastWorlds	src/Dodge/Update.hs	404;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	572;"	f
+updatePosEvents	src/Dodge/Update.hs	556;"	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	540;"	f
+updateRadarBlips	src/Dodge/Update.hs	522;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	39;"	f
-updateRadarSweeps	src/Dodge/Update.hs	566;"	f
+updateRadarSweeps	src/Dodge/Update.hs	550;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	108;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	35;"	f
-updateScopeZoom	src/Dodge/Update/Scroll.hs	70;"	f
+updateScopeZoom	src/Dodge/Update/Scroll.hs	72;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
 updateSection	src/Dodge/DisplayInventory.hs	264;"	f
 updateSectionsPositioning	src/Dodge/DisplayInventory.hs	243;"	f
-updateSeenWalls	src/Dodge/Update.hs	683;"	f
+updateSeenWalls	src/Dodge/Update.hs	667;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
-updateShockwaves	src/Dodge/Update.hs	557;"	f
+updateShockwaves	src/Dodge/Update.hs	541;"	f
 updateSingleNodes	src/TreeHelp.hs	97;"	f
 updateSound	src/Sound.hs	71;"	f
 updateSounds	src/Sound.hs	66;"	f
 updateSpark	src/Dodge/Spark.hs	19;"	f
-updateSparks	src/Dodge/Update.hs	569;"	f
+updateSparks	src/Dodge/Update.hs	553;"	f
 updateTempLightSource	src/Dodge/LightSource/Update.hs	7;"	f
 updateTeslaArc	src/Dodge/Tesla.hs	23;"	f
 updateTeslaArc	src/Dodge/Tesla/Arc.hs	23;"	f
-updateTeslaArcs	src/Dodge/Update.hs	551;"	f
+updateTeslaArcs	src/Dodge/Update.hs	535;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	554;"	f
+updateTractorBeams	src/Dodge/Update.hs	538;"	f
 updateTurret	src/Dodge/Machine/Update.hs	49;"	f
 updateUniverse	src/Dodge/Update.hs	70;"	f
 updateUniverseFirst	src/Dodge/Update.hs	82;"	f
-updateUniverseLast	src/Dodge/Update.hs	132;"	f
+updateUniverseLast	src/Dodge/Update.hs	133;"	f
-updateUniverseMid	src/Dodge/Update.hs	154;"	f
+updateUniverseMid	src/Dodge/Update.hs	155;"	f
 updateUseInputInGame	src/Dodge/Update/Input/InGame.hs	42;"	f
-updateUseInputOnScreen	src/Dodge/Update/Input/ScreenLayer.hs	21;"	f
+updateUseInputOnScreen	src/Dodge/Update/Input/ScreenLayer.hs	22;"	f
 updateWalkCycle	src/Dodge/Creature/State/WalkCycle.hs	12;"	f
 updateWallDamages	src/Dodge/Update/WallDamage.hs	10;"	f
-updateWheelEvent	src/Dodge/Update/Scroll.hs	17;"	f
+updateWheelEvent	src/Dodge/Update/Scroll.hs	18;"	f
-updateWheelEvents	src/Dodge/Update.hs	411;"	f
+updateWheelEvents	src/Dodge/Update.hs	394;"	f
-updateWorldEventFlag	src/Dodge/Update.hs	116;"	f
+updateWorldEventFlag	src/Dodge/Update.hs	117;"	f
-updateWorldEventFlags	src/Dodge/Update.hs	104;"	f
+updateWorldEventFlags	src/Dodge/Update.hs	105;"	f
 upperBody	src/Dodge/Creature/Picture.hs	135;"	f
 upperBox	src/Shape.hs	155;"	f
 upperBoxHalf	src/Shape.hs	221;"	f
@@ -6434,9 +6444,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	444;"	f
+zoneClouds	src/Dodge/Update.hs	425;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	53;"	f
-zoneCreatures	src/Dodge/Update.hs	488;"	f
+zoneCreatures	src/Dodge/Update.hs	469;"	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
@@ -6456,7 +6466,7 @@ zonesAroundPoint	src/Dodge/Zoning/Base.hs	90;"	f
 zonesExtract	src/Dodge/Zoning/Base.hs	55;"	f
 zoomFloatingCamera	src/Dodge/Update/Camera.hs	68;"	f
 zoomFromItem	src/Dodge/Update/Camera.hs	181;"	f
-zoomInLongGun	src/Dodge/Update/Scroll.hs	96;"	f
+zoomInLongGun	src/Dodge/Update/Scroll.hs	98;"	f
-zoomOutLongGun	src/Dodge/Update/Scroll.hs	104;"	f
+zoomOutLongGun	src/Dodge/Update/Scroll.hs	106;"	f
 zoomScope	src/Dodge/Item/Scope.hs	32;"	f
-zoomSpeed	src/Dodge/Update/Scroll.hs	93;"	f
+zoomSpeed	src/Dodge/Update/Scroll.hs	95;"	f