Tweak display, scrolling of item values

src/Dodge/Creature/State.hs

@@ -328,7 +328,7 @@ shineTargetLaser cr itmtree (p, q) w = fromMaybe (w & pointittarg . itTgPos .~ N
                 . iaLoaded
                 -~ x
             & cWorld . lWorld . lasers
-                .:~ LaserStart
+                .:~ Laser
                     { _lpPhaseV = 1
                     , _lpDir = _crDir cr + argV (Q.qToV2 q)
                     , _lpPos = pos

src/Dodge/Data/CWorld.hs

@@ -19,14 +19,13 @@ import Data.Aeson.TH
 import Dodge.GameRoom
 import Geometry.ConvexPoly
 import Dodge.Data.Camera
-import qualified Data.IntSet as IS
 import Data.Graph.Inductive
 
 data CWorld = CWorld
     { _lWorld :: LWorld
     , _cwGen :: CWGen
     , _cClock :: Int
-    , _seenWalls :: IS.IntSet
+--    , _seenWalls :: IS.IntSet
     , _cwTiles :: [Tile]
     , _pathGraph :: Gr Point2 PathEdge
     , _numberFloorVerxs :: Int

src/Dodge/Data/Item/Use.hs

@@ -72,8 +72,7 @@ data TriggerType = AutoTrigger | HammerTrigger
     deriving (Eq, Show, Read)
 
 data AttachParams
-    = APProjectiles
+    = APProjectiles {_apProjectiles :: [Int]}
-        {_apProjectiles :: [Int]}
     | APInt {_apInt :: Int}
     | APNothing
     deriving (Eq, Show, Read)

src/Dodge/Data/LWorld.hs

@@ -113,7 +113,7 @@ data LWorld = LWorld
     , _flares :: Picture  -- picture drawn for one frame
     , _teslaArcs :: [TeslaArc]
     , _shockwaves :: [Shockwave]
-    , _lasers :: [LaserStart]
+    , _lasers :: [Laser]
 --    , _lasersToDraw :: [Laser]
     , _linearShockwaves :: IM.IntMap LinearShockwave
     , _tractorBeams :: [TractorBeam]

src/Dodge/Data/Laser.hs

@@ -18,7 +18,7 @@ data LaserType
     | TargetingLaser {_laserEmmiter :: NewInt ItmInt}
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data LaserStart = LaserStart
+data Laser = Laser
     { _lpPhaseV :: Float
     , _lpPos :: Point2
     , _lpDir :: Float
@@ -27,16 +27,7 @@ data LaserStart = LaserStart
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
---data Laser = Laser
+makeLenses ''Laser
---    { _lzColor :: Color
---    , _lzPoints :: [Point2]
---    , _lzType :: LaserType
---    }
---    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
---makeLenses ''Laser
-makeLenses ''LaserStart
 makeLenses ''LaserType
 deriveJSON defaultOptions ''LaserType
-deriveJSON defaultOptions ''LaserStart
+deriveJSON defaultOptions ''Laser
---deriveJSON defaultOptions ''Laser

src/Dodge/Default/World.hs

@@ -85,7 +85,7 @@ defaultCWorld =
         { _lWorld = defaultLWorld
         , _cwGen = defaultCWGen
         , _cClock = 0
-        , _seenWalls = mempty
+--        , _seenWalls = mempty
         , _pathGraph = Data.Graph.Inductive.Graph.empty
         , _cwTiles = mempty
         , _numberFloorVerxs = 0

src/Dodge/Equipment/Text.hs

@@ -11,3 +11,4 @@ eqPosText ep = case ep of
     OnRightWrist -> "R.WRIST"
     OnLegs -> "LEGS"
     OnSpecial -> "EQUIPPED"
+

src/Dodge/HeldUse.hs

@@ -430,7 +430,7 @@ shootLaser itmtree cr mz w =
     w
         & randGen .~ g
         & cWorld . lWorld . lasers
-            .:~ LaserStart
+            .:~ Laser
                 { _lpType = getLaserDamage itmtree
                 , _lpPhaseV = getLaserPhaseV itmtree
                 , _lpPos = pos
@@ -445,9 +445,9 @@ shootLaser itmtree cr mz w =
     (a, g) = randomR (- inacc, inacc) $ _randGen w
     inacc = _mzInaccuracy mz
 
-lasRayAt :: Color -> Int -> Float -> Point2 -> Float -> LaserStart
+lasRayAt :: Color -> Int -> Float -> Point2 -> Float -> Laser
 lasRayAt col dam phasev pos dir =
-    LaserStart
+    Laser
         { _lpType = DamageLaser dam
         , _lpPhaseV = phasev
         , _lpPos = pos

src/Dodge/Inventory/SelectionList.hs

@@ -47,24 +47,61 @@ itemDisplay w cr ci = f
   where
     itm = ci ^. _1
     NInt itid = itm ^. itID
-    f (x:xs) (y:_) = itemDisplayPad x y : xs
+    --f (x:xs) (y:_) = itemDisplayPad x y : xs
+    f (x:xs) (y:_) = (x ++ ' ': y) : xs
     f xs _ = xs
-    g (x:xs) (y:_) = (rightPad 15 ' ' x ++ y) : xs
+    --g (x:xs) (y:_) = (rightPad 15 ' ' x ++ y) : xs
+    g (x:xs) (y:_) = (x ++ y) : xs
     g xs _ = xs
-    anyextra = maybeToList (anyhotkey <> anyequippos <> anyscroll)
+    anyextra = maybeToList (anyscroll <> anyhotkey <> anyequippos)
     anyhotkey = fmap hotkeyToString
         (w ^? cWorld . lWorld . imHotkeys . unNIntMap . ix itid)
-    anyequippos = fmap
+    anyequippos = do
-        (rightPad 8 ' ' . (' ' :) . eqPosText) 
+        _ <- ci ^? _1 . itUse . uequipEffect
-        (ci ^? _1 . itLocation . ilEquipSite . _Just)
+        epText <$> ci ^? _1 . itLocation . ilEquipSite
-    anyscroll = fmap absurround $ itemScrollDisplay =<< (ci ^? _1 . itScroll)
+    anyscroll = fmap absurround $ itemScrollDisplay =<< (ci ^? _1)
-    absurround str = '<' : str ++ ">"
+    absurround str = " <" ++ str ++ ">"
 
-itemScrollDisplay :: ItemScroll -> Maybe String
+epText :: Maybe EquipSite -> [Char]
-itemScrollDisplay = \case
+epText (Just ep) = ' ' : rightPad 8 ' ' ('@' : eqPosText ep)
-    NoItemScroll -> Nothing
+epText Nothing = " @NOT.EQP"
-    ItemScrollInt i -> Just $ show i
+--epText Nothing = " ¬EQUIPED"
-    ItemScrollIntRange _ i -> Just $ show i
+
+itemIntegralValue :: Item -> Maybe (Either Int String)
+itemIntegralValue itm
+    | Just x <- itm ^? itUse . uInt = Just (Left x)
+    | Just x <- itm ^? itUse . useToggle = Just (Right $ show x)
+    | isJust $ itm ^? itTargeting . itTgPos . _Just = Just $ Right "!TARGETING"
+    | Just x <- itm ^? itConsumables . magLoadStatus . iaLoaded = Just $ Left x
+    | UseAttach (APInt i) <- itm ^. itUse = Just $ Left i
+    | UseAttach (APProjectiles x) <- itm ^. itUse = Just . Right $ show x
+    | otherwise = mempty
+
+introScanValue :: Creature -> IntroScanType -> Either Int String
+introScanValue cr = \case
+    HEALTH -> Left $ cr ^. crHP
+    MAXHEALTH -> Left $ cr ^. crMaxHP
+
+itemExternalValue :: Item -> World -> Creature -> Maybe (Either Int String)
+itemExternalValue itm w cr
+    | EQUIP WRIST_ECG <- itm ^. itType = Just . Right .
+        displayPulse $ cr ^?! crType . avatarPulse . pulseProgress
+    | Just t <- itm ^? itType . ibtIntroScanType = Just $ introScanValue cr t
+    | ITEMSCAN <- itm ^. itType
+    , Just ExamineInventory <- w ^? hud . hudElement . subInventory
+        = Just (Right "ON")
+    | otherwise = mempty
+
+itemScrollDisplay :: Item -> Maybe String
+itemScrollDisplay itm
+    | HELD ALTERIFLE <- itm ^. itType = Just $
+        case itm ^? itUse . heldAim . aimMuzzles . ix 0 . mzAmmoSlot of
+            Just 0 -> "L"
+            _ -> "R"
+    | UseScope OpticScope{_opticZoom = x} <- itm ^. itUse = Just $ shortShow x
+    | ItemScrollInt i <- itm ^. itScroll = Just $ show i
+    | ItemScrollIntRange _ i  <- itm ^. itScroll = Just $ show i
+    | otherwise = Nothing
 
 itemDisplayPad :: [Char] -> String -> [Char]
 itemDisplayPad ls rs
@@ -76,19 +113,13 @@ itemNumberDisplay w cr ci
     | Just x <- ci ^? _1 . itUse . uInt = [show x]
     | Just x <- ci ^? _1 . itUse . useToggle = [show x]
     | ITEMSCAN <- ci ^. _1 . itType
-    , Just ExamineInventory <- w ^? hud . hudElement . subInventory
+    , Just ExamineInventory <- w ^? hud . hudElement . subInventory = ["ACTIVE"]
-        = ["ACTIVE"]
     | EQUIP WRIST_ECG <- ci ^. _1 . itType =
         [displayPulse $ cr ^?! crType . avatarPulse . pulseProgress]
-    | HELD ALTERIFLE <- ci ^. _1 . itType = 
-        case ci ^? _1 . itUse . heldAim . aimMuzzles . ix 0 . mzAmmoSlot of
-            Just 0 -> ["/"]
-            _ -> ["\\"]
     | isJust $ ci ^? _1 . itTargeting . itTgPos . _Just = ["!TARG!"]
     | Just x <- ci ^? _1 . itConsumables . magLoadStatus . iaLoaded = [shortShow x]
-    | UseAttach (APInt i) <- ci ^. _1 . itUse = [show i]
+    | Just i <- ci ^? _1 . itUse . uaParams . apInt = [show i]
-    | UseAttach (APProjectiles x) <- ci ^. _1 . itUse = [show x]
+    | Just x <- ci ^? _1 . itUse . uaParams . apProjectiles = [show x]
-    | UseScope OpticScope{_opticZoom = x} <- ci ^. _1 . itUse = [shortShow x]
     | Just t <- ci ^? _1 . itType . ibtIntroScanType = [introScanDisplay cr t]
     | otherwise = mempty
 
@@ -104,24 +135,27 @@ displayPulse x = take 5 $ drop y "----^-----"
     y = min 5 $ x `div` 3
 
 hotkeyToString :: Hotkey -> String
-hotkeyToString x = case x of
+hotkeyToString x = " [" ++  hotkeyToChar x : "]"
-    HotkeyQ -> "[Q]"
+
-    HotkeyE -> "[E]"
+hotkeyToChar :: Hotkey -> Char
-    HotkeyR -> "[R]"
+hotkeyToChar = \case
-    HotkeyZ -> "[Z]"
+    HotkeyQ -> 'Q'
-    HotkeyX -> "[X]"
+    HotkeyE -> 'E'
-    HotkeyC -> "[C]"
+    HotkeyR -> 'R'
-    HotkeyV -> "[V]"
+    HotkeyZ -> 'Z'
-    Hotkey1 -> "[1]"
+    HotkeyX -> 'X'
-    Hotkey2 -> "[2]"
+    HotkeyC -> 'C'
-    Hotkey3 -> "[3]"
+    HotkeyV -> 'V'
-    Hotkey4 -> "[4]"
+    Hotkey1 -> '1'
-    Hotkey5 -> "[5]"
+    Hotkey2 -> '2'
-    Hotkey6 -> "[6]"
+    Hotkey3 -> '3'
-    Hotkey7 -> "[7]"
+    Hotkey4 -> '4'
-    Hotkey8 -> "[8]"
+    Hotkey5 -> '5'
-    Hotkey9 -> "[9]"
+    Hotkey6 -> '6'
-    Hotkey0 -> "[0]"
+    Hotkey7 -> '7'
+    Hotkey8 -> '8'
+    Hotkey9 -> '9'
+    Hotkey0 -> '0'
 
 closeItemToSelectionItem :: World -> NewInt FloorInt -> Maybe (SelectionItem ())
 closeItemToSelectionItem w (NInt i) = do

src/Dodge/Laser/Update.hs

@@ -11,7 +11,7 @@ import Dodge.WorldEvent.Damage
 import Geometry
 import Picture.Base
 
-updateLaser :: World -> LaserStart -> (World, Picture)
+updateLaser :: World -> Laser -> (World, Picture)
 updateLaser w pt =
     ( case _lpType pt of
         DamageLaser dam ->

src/Dodge/Render/HUD/Carte.hs

@@ -1,73 +1,73 @@
 module Dodge.Render.HUD.Carte (
-    drawCarte,
+--    drawCarte,
 ) where
 
-import Control.Lens
+----import Control.Lens
-import Dodge.Base
+--import Dodge.Base
-import Dodge.Data.Config
+--import Dodge.Data.Config
-import Dodge.Data.World
+--import Dodge.Data.World
-import Dodge.Render.List
+--import Dodge.Render.List
-import Geometry
+--import Geometry
-import qualified IntMapHelp as IM
+--import qualified IntMapHelp as IM
-import Picture
+--import Picture
-
+--
-drawCarte :: Configuration -> World -> Picture
+----drawCarte :: Configuration -> World -> Picture
-drawCarte cfig w =
+----drawCarte cfig w =
-    fold $
+----    fold $
-        toTopLeft cfig (renderListAt 0 0 locs) :
+----        toTopLeft cfig (renderListAt 0 0 locs) :
-        mapOverlay w
+----        mapOverlay w
-            ++ [mainListCursor white iPos cfig]
+----            ++ [mainListCursor white iPos cfig]
-  where
+----  where
-    iPos = w ^. cWorld . lWorld . selLocation
+----    iPos = w ^. cWorld . lWorld . selLocation
-    locs = map (\(_, s) -> (s, white)) . IM.elems . _seenLocations . _lWorld $ _cWorld w
+----    locs = map (\(_, s) -> (s, white)) . IM.elems . _seenLocations . _lWorld $ _cWorld w
-
+--
-mapOverlay :: World -> [Picture]
+----mapOverlay :: World -> [Picture]
-mapOverlay w =
+----mapOverlay w =
-    (color (withAlpha 0.5 black) . polygon $ reverse $ rectNSWE 1 (-1) 1 (-1)) :
+----    (color (withAlpha 0.5 black) . polygon $ reverse $ rectNSWE 1 (-1) 1 (-1)) :
-    [foldMap (drawMapWall (w ^. hud)) $ IM.restrictKeys (lw ^. walls) (w ^. cWorld . seenWalls)]
+----    [foldMap (drawMapWall (w ^. hud)) $ IM.restrictKeys (lw ^. walls) (w ^. cWorld . seenWalls)]
-  where
+----  where
-    lw = w ^. cWorld . lWorld
+----    lw = w ^. cWorld . lWorld
-
+--
---(mapMaybe (mapWall cfig (w ^. hud)) . IM.elems $ w ^. cWorld . lWorld . walls)
+----(mapMaybe (mapWall cfig (w ^. hud)) . IM.elems $ w ^. cWorld . lWorld . walls)
-
+--
-drawMapWall :: HUD -> Wall -> Picture
+--drawMapWall :: HUD -> Wall -> Picture
-drawMapWall thehud wl = color c . polygon $ map (cartePosToScreen thehud) [x, x +.+ n2, y +.+ n2, y]
+--drawMapWall thehud wl = color c . polygon $ map (cartePosToScreen thehud) [x, x +.+ n2, y +.+ n2, y]
-  where
-    t = normalizeV (y -.- x)
-    n2 = 20 *.* vNormal t
-    (x, y) = _wlLine wl
-    c = _wlColor wl
-
---mapWall :: Configuration -> HUD -> Wall -> Maybe Picture
---mapWall cfig thehud wl
---    | _wlSeen wl = Just . color c . polygon $ map (cartePosToScreen cfig thehud) [x, x +.+ n2, y +.+ n2, y]
---    | otherwise  = Nothing
 --  where
 --    t = normalizeV (y -.- x)
 --    n2 = 20 *.* vNormal t
 --    (x, y) = _wlLine wl
 --    c = _wlColor wl
-
+--
-mainListCursor :: Color -> Int -> Configuration -> Picture
+----mapWall :: Configuration -> HUD -> Wall -> Maybe Picture
-mainListCursor c = openCursorAt 120 c 5 0
+----mapWall cfig thehud wl
-
+----    | _wlSeen wl = Just . color c . polygon $ map (cartePosToScreen cfig thehud) [x, x +.+ n2, y +.+ n2, y]
-openCursorAt ::
+----    | otherwise  = Nothing
-    -- | Width
+----  where
-    Float ->
+----    t = normalizeV (y -.- x)
-    Color ->
+----    n2 = 20 *.* vNormal t
-    -- | x offset
+----    (x, y) = _wlLine wl
-    Float ->
+----    c = _wlColor wl
-    -- | y offset
+--
-    Float ->
+--mainListCursor :: Color -> Int -> Configuration -> Picture
-    -- | y offset (discrete)
+--mainListCursor c = openCursorAt 120 c 5 0
-    Int ->
+--
-    Configuration ->
+--openCursorAt ::
-    Picture
+--    -- | Width
-openCursorAt wth col xoff yoff yint w =
+--    Float ->
-    translate (xoff - halfWidth w) (halfHeight w - (20 * fromIntegral yint + yoff) - 20) $
+--    Color ->
-        lineCol
+--    -- | x offset
-            [ (V2 wth 12.5, withAlpha 0 col)
+--    Float ->
-            , (V2 0 12.5, col)
+--    -- | y offset
-            , (V2 0 (-7.5), col)
+--    Float ->
-            , (V2 wth (-7.5), withAlpha 0 col)
+--    -- | y offset (discrete)
-            ]
+--    Int ->
+--    Configuration ->
+--    Picture
+--openCursorAt wth col xoff yoff yint w =
+--    translate (xoff - halfWidth w) (halfHeight w - (20 * fromIntegral yint + yoff) - 20) $
+--        lineCol
+--            [ (V2 wth 12.5, withAlpha 0 col)
+--            , (V2 0 12.5, col)
+--            , (V2 0 (-7.5), col)
+--            , (V2 wth (-7.5), withAlpha 0 col)
+--            ]

src/Dodge/Update.hs

@@ -284,7 +284,7 @@ functionalUpdate u =
         . over (uvWorld . cWorld . lWorld . creatures) (fmap setOldPos)
         . over uvWorld updateCreatureGroups
         . over uvWorld updateWallDamages
-        . over uvWorld updateSeenWalls
+--        . over uvWorld updateSeenWalls
         . over uvWorld checkTermDist
         . over uvWorld updateRBList
         . over uvWorld updateCloseObjects
@@ -414,19 +414,17 @@ doWorldEvents w =
         (w ^. cWorld . lWorld . worldEvents)
 
 updateLasers :: World -> World
-updateLasers w =
+updateLasers w = w' & cWorld . lWorld . flares <>~ concat ls
-    w'
-        & cWorld . lWorld . lasers .~ []
-        & cWorld . lWorld . flares <>~ concat ls
   where
-    (w', ls) = mapAccumR updateLaser w (w ^. cWorld . lWorld . lasers)
+    (w', ls) = mapAccumR updateLaser 
+        (w & cWorld . lWorld . lasers .~ [])
+        (w ^. cWorld . lWorld . lasers)
 
 zoneClouds :: World -> World
 zoneClouds w = w & clZoning .~ foldl' (flip zoneCloud) mempty (w ^. cWorld . lWorld . clouds)
 
 displayTerminalLineString :: TerminalLineString -> World -> (String, Color)
-displayTerminalLineString tls = case tls of
+displayTerminalLineString (TerminalLineConst str col) = const (str, col)
-    TerminalLineConst str col -> const (str, col)
 
 tmUpdate :: Terminal -> World -> World
 tmUpdate tm w = case w ^? cWorld . lWorld . terminals . ix (_tmID tm) . tmFutureLines . ix 0 of
@@ -523,9 +521,7 @@ updateRadarBlips = updateObjMapMaybe radarBlips updateRadarBlip
 
 -- if changing, make sure that bullets can still spawn new bullets
 updateBullets :: World -> World
-updateBullets w =
+updateBullets w = w' & cWorld . lWorld . bullets <>~ catMaybes ps
-    w'
-        & cWorld . lWorld . bullets %~ (++ catMaybes ps)
   where
     (w', ps) =
         mapAccumR updateBullet (w & cWorld . lWorld . bullets .~ []) $
@@ -632,44 +628,15 @@ updateClouds = updateObjCatMaybes clouds updateCloud
 --    Just
 --    (intersectSegSegss x y ass)
 --intersectSegsSegss _ _ = Nothing
---updateInstantBullets :: World -> World
---updateInstantBullets w = case w ^. cWorld . lWorld . instantBullets of
---    [] -> w
---    ps ->
---        let (w', ps') = mapAccumR updateBullet (w & cWorld . lWorld . instantBullets .~ []) ps
---         in updateInstantBullets $ w' & cWorld . lWorld . bullets .++~ catMaybes ps'
-
---updateInstantParticles :: World -> World
---updateInstantParticles w = case _instantParticles w of
---    [] -> w
---    ps -> let (w',ps') = mapAccumR (\a b -> _ptUpdate b a b) (w {_instantParticles=[]}) ps
---        in updateInstantParticles $ w' & particles .++~ catMaybes ps'
-
---updateMIM :: ASetter' World (IM.IntMap a) -> (a -> a -> Maybe a) -> World -> World
---updateMIM f up = f %~ IM.mapMaybe (dbArg up)
-
--- Note that this updates the randgen
---updateCreatures :: World -> World
---updateCreatures w = appEndo f $ w
---    & creatures .~ IM.mapMaybe id m
---    & randGen   .~ newg
---  where
---    ((f,newg),m) = mapAccumR crUp (Endo id,_randGen w) (_creatures w)
---    crUp (f',g) cr = ((f' <> f'',g'), cr')
---      where
---        (f'',cr') = _crUpdate cr cr (w & randGen .~ g)
---        (_,g') = genWord8 g
 
 ppEvents :: World -> World
 ppEvents w = IM.foldl' (flip $ \pp -> doPressPlateEvent (_ppEvent pp) pp) w $ w ^. cWorld . lWorld . pressPlates
 
-updateSeenWalls :: World -> World
+--updateSeenWalls :: World -> World
-updateSeenWalls w = alaf Endo foldMap (markWallSeen . _wlID . snd) (allVisibleWalls w) w
+--updateSeenWalls w = alaf Endo foldMap (markWallSeen . _wlID . snd) (allVisibleWalls w) w
 
---updateSeenWalls w = foldl' markWallSeen w (map (_wlID . snd) $ allVisibleWalls w)
+--markWallSeen :: Int -> World -> World
-
+--markWallSeen i = cWorld . seenWalls . at i ?~ ()
-markWallSeen :: Int -> World -> World
-markWallSeen i = cWorld . seenWalls . at i ?~ ()
 
 --markWallSeen :: World -> Int -> World
 --markWallSeen w i = w & cWorld . seenWalls . at i ?~ ()
@@ -685,9 +652,7 @@ markWallSeen i = cWorld . seenWalls . at i ?~ ()
 
 checkEndGame :: Universe -> Universe
 checkEndGame uv = case w ^? timeFlow . deathDelay of
-    Just x
+    Just x | x < 0 -> uv & uvScreenLayers .~ [gameOverMenu uv]
-        | x < 0 ->
-            uv & uvScreenLayers .~ [gameOverMenu uv]
     Just _ -> uv & uvWorld . timeFlow . deathDelay -~ 1
     _ | _crHP (you w) < 1 -> uv & uvWorld . timeFlow .~ DeathTime 50
     _ -> uv

src/Dodge/Update/Scroll.hs

@@ -2,6 +2,7 @@ module Dodge.Update.Scroll (
     updateWheelEvent,
 ) where
 
+import Padding
 import Control.Monad
 import qualified Data.Map.Strict as M
 import Data.Maybe
@@ -48,24 +49,18 @@ selectedItemScroll yi w = do
 
 itemScroll :: Int -> Int -> Item -> World -> World
 itemScroll yi invid itm w
-    | isJust $ itm ^? itUse . uInt =
+    | isJust $ itm ^? itUse . uInt = w & itmlens . itUse . uInt +~ yi
-        w
+    | Just xs <- itm ^? itUse . uaParams . apProjectiles = w
-            & cWorld . lWorld . creatures . ix 0 . crInv . ix invid
+        & itmlens . itUse . uaParams . apProjectiles .~ rotateList yi xs
-                . itUse
-                . uInt
-                +~ yi
     | ATTACH ZOOMSCOPE <- itm ^. itType = updateScopeZoom invid w
     | HELD ALTERIFLE <- itm ^. itType
       , yi /= 0 =
         w
-            & cWorld . lWorld . creatures . ix 0 . crInv . ix invid
+            & itmlens . itUse . heldAim . aimMuzzles . ix 0 . mzAmmoSlot
-                . itUse
-                . heldAim
-                . aimMuzzles
-                . ix 0
-                . mzAmmoSlot
                 %~ ((`mod` 2) . (+ 1))
     | otherwise = w
+  where
+    itmlens = cWorld . lWorld . creatures . ix 0 . crInv . ix invid
 
 -- note that your _crInvLock does not apply to this TODO check that this is what
 -- is wanted

src/Padding.hs

@@ -7,7 +7,8 @@ module Padding
     , midPadL
     , rotU
     , rotD
-    , rotListAt
+--    , rotListAt
+    , rotateList
     , insertAt
     )
     where
@@ -45,13 +46,19 @@ rotD :: [a] -> [a]
 rotD [] = []
 rotD xs = last xs : init xs
 
-rotListAt :: Eq a => a -> [a] -> [a]
+rotateList :: Int -> [a] -> [a]
-rotListAt x' xs = f x' xs []
+rotateList i xs
-  where
+    | i >= 0 = let (ys,zs) = splitAt i xs
-    f x (y:ys) zs
+        in zs ++ ys
-        | y == x    = y:ys ++ zs
+    | otherwise = reverse . rotateList (-i) $ reverse xs
-        | otherwise = f x ys (y:zs)
+
-    f _ [] zs = zs
+--rotListAt :: Eq a => a -> [a] -> [a]
+--rotListAt x' xs = f x' xs []
+--  where
+--    f x (y:ys) zs
+--        | y == x    = y:ys ++ zs
+--        | otherwise = f x ys (y:zs)
+--    f _ [] zs = zs
 
 insertAt :: Int -> a -> [a] -> [a]
 insertAt i x xs = let (ys,zs) = splitAt i xs in ys ++ [x] ++ zs

tags

@@ -14,7 +14,7 @@
 .:~	src/LensHelp.hs	14;"	o
 :!:	src/FoldlHelp.hs	10;"	C
 <$>	src/Dodge/Data/ActionPlan.hs	203;"	o
-<$>	src/Dodge/Data/CWorld.hs	49;"	o
+<$>	src/Dodge/Data/CWorld.hs	48;"	o
 <$>	src/Dodge/Data/Camera.hs	39;"	o
 <$>	src/Dodge/Data/Creature.hs	88;"	o
 <$>	src/Dodge/Data/LWorld.hs	159;"	o
@@ -25,8 +25,8 @@ ALTERIFLE	src/Dodge/Data/Item/Combine.hs	151;"	C
 AMMOMAG	src/Dodge/Data/Item/Combine.hs	20;"	C
 AMR	src/Dodge/Data/Item/Combine.hs	156;"	C
 ANTIMATTER	src/Dodge/Data/Item/Combine.hs	66;"	C
-APInt	src/Dodge/Data/Item/Use.hs	77;"	C
+APInt	src/Dodge/Data/Item/Use.hs	76;"	C
-APNothing	src/Dodge/Data/Item/Use.hs	78;"	C
+APNothing	src/Dodge/Data/Item/Use.hs	77;"	C
 APProjectiles	src/Dodge/Data/Item/Use.hs	75;"	C
 AQUAMARINE	src/Color/Data.hs	24;"	C
 ARHUD	src/Dodge/Data/Item/Combine.hs	33;"	C
@@ -46,9 +46,9 @@ Add	src/Dodge/Inventory/Add.hs	1;"	m
 AddGoal	src/Dodge/Data/ActionPlan.hs	45;"	C
 AesonHelp	src/AesonHelp.hs	1;"	m
 AimAt	src/Dodge/Data/ActionPlan.hs	84;"	C
-AimParams	src/Dodge/Data/Item/Use.hs	121;"	t
+AimParams	src/Dodge/Data/Item/Use.hs	120;"	t
 AimParams	src/Dodge/Default/Item/Use/AimParams.hs	1;"	m
-AimStance	src/Dodge/Data/Item/Use.hs	190;"	t
+AimStance	src/Dodge/Data/Item/Use.hs	189;"	t
 Aiming	src/Dodge/Data/Creature/Stance.hs	39;"	C
 AirFiltrationSS	src/Dodge/Data/Scenario.hs	95;"	C
 Airlock	src/Dodge/Room/Airlock.hs	4;"	m
@@ -65,10 +65,10 @@ AmmoMagSF	src/Dodge/Data/ComposedItem.hs	51;"	C
 AmmoMagType	src/Dodge/Data/Item/Combine.hs	103;"	t
 AmmoModLink	src/Dodge/Data/ComposedItem.hs	19;"	C
 AmmoModifierSF	src/Dodge/Data/ComposedItem.hs	57;"	C
-AmmoParams	src/Dodge/Data/Item/Use.hs	114;"	t
+AmmoParams	src/Dodge/Data/Item/Use.hs	113;"	t
 AmmoPayloadLink	src/Dodge/Data/ComposedItem.hs	21;"	C
 AmmoPayloadSF	src/Dodge/Data/ComposedItem.hs	59;"	C
-AmmoPerShot	src/Dodge/Data/Item/Use.hs	164;"	t
+AmmoPerShot	src/Dodge/Data/Item/Use.hs	163;"	t
 AmmoTargetingLink	src/Dodge/Data/ComposedItem.hs	20;"	C
 AmmoTargetingSF	src/Dodge/Data/ComposedItem.hs	58;"	C
 AmmoType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	24;"	t
@@ -146,7 +146,7 @@ Base	src/Picture/Base.hs	4;"	m
 BasicBeamDraw	src/Dodge/Data/Beam.hs	34;"	C
 BasicBulletTrajectory	src/Dodge/Data/Bullet.hs	50;"	C
 BasicBulletTrajectoryType	src/Dodge/Data/Bullet.hs	57;"	C
-BasicFlare	src/Dodge/Data/Item/Use.hs	134;"	C
+BasicFlare	src/Dodge/Data/Item/Use.hs	133;"	C
 BatteryGuns	src/Dodge/Item/Held/BatteryGuns.hs	1;"	m
 BatteryGuns	src/Dodge/Item/Weapon/BatteryGuns.hs	1;"	m
 Beam	src/Dodge/Data/Beam.hs	18;"	t
@@ -156,7 +156,7 @@ BeamCombine	src/Dodge/Data/Beam.hs	47;"	C
 BeamCombineType	src/Dodge/Data/Beam.hs	38;"	t
 BeamDraw	src/Dodge/Data/Beam.hs	33;"	t
 BeamDrawColor	src/Dodge/Data/Beam.hs	35;"	C
-BeamShooterParams	src/Dodge/Data/Item/Use.hs	95;"	C
+BeamShooterParams	src/Dodge/Data/Item/Use.hs	94;"	C
 BeamSimple	src/Dodge/Data/Beam.hs	50;"	C
 BeamType	src/Dodge/Data/Beam.hs	46;"	t
 BecomePowerful	src/Dodge/Data/Scenario.hs	9;"	C
@@ -228,9 +228,9 @@ BulletMod	src/Dodge/Data/Item/BulletMod.hs	10;"	t
 BulletMod	src/Dodge/Data/Item/BulletMod.hs	3;"	m
 BulletModEffect	src/Dodge/Data/Item/BulletMod.hs	12;"	C
 BulletModPayload	src/Dodge/Data/Item/BulletMod.hs	11;"	C
-BulletParams	src/Dodge/Data/Item/Use.hs	115;"	C
+BulletParams	src/Dodge/Data/Item/Use.hs	114;"	C
 BulletPayload	src/Dodge/Data/Bullet.hs	41;"	t
-BulletShooterParams	src/Dodge/Data/Item/Use.hs	99;"	C
+BulletShooterParams	src/Dodge/Data/Item/Use.hs	98;"	C
 BulletTrajectory	src/Dodge/Data/Bullet.hs	49;"	t
 BulletTrajectoryType	src/Dodge/Data/Bullet.hs	56;"	t
 Button	src/Dodge/Data/Button.hs	48;"	t
@@ -259,8 +259,8 @@ CREATUREDETECTOR	src/Dodge/Data/Item/Combine.hs	182;"	C
 CREATURESENSOR	src/Dodge/Data/Item/Combine.hs	83;"	C
 CRUSHING	src/Dodge/Data/Damage/Type.hs	16;"	C
 CUTTING	src/Dodge/Data/Damage/Type.hs	14;"	C
-CWGen	src/Dodge/Data/CWorld.hs	35;"	t
+CWGen	src/Dodge/Data/CWorld.hs	34;"	t
-CWorld	src/Dodge/Data/CWorld.hs	25;"	t
+CWorld	src/Dodge/Data/CWorld.hs	24;"	t
 CWorld	src/Dodge/Data/CWorld.hs	6;"	m
 CYAN	src/Color/Data.hs	19;"	C
 CamControl	src/Dodge/Data/Camera.hs	18;"	t
@@ -496,7 +496,7 @@ DefaultCrGroupUpdate	src/Dodge/Data/CrGroupParams.hs	22;"	C
 DefaultDrawButton	src/Dodge/Data/Button.hs	17;"	C
 DefaultDrawSwitch	src/Dodge/Data/Button.hs	18;"	C
 DefaultForceField	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	35;"	C
-DefaultHeldParams	src/Dodge/Data/Item/Use.hs	82;"	C
+DefaultHeldParams	src/Dodge/Data/Item/Use.hs	81;"	C
 DefaultLightSourceDraw	src/Dodge/Data/LightSource.hs	13;"	C
 DefaultRoomType	src/Dodge/Data/Room.hs	31;"	C
 DefaultTerminal	src/Dodge/Data/Terminal.hs	55;"	C
@@ -686,7 +686,7 @@ FlameBeamCombine	src/Dodge/Data/Beam.hs	39;"	C
 FlameSound	src/Dodge/Data/SoundOrigin.hs	27;"	C
 Flamer	src/Dodge/Data/SoundOrigin.hs	25;"	C
 Flank	src/Dodge/Data/ActionPlan.hs	177;"	C
-FlareType	src/Dodge/Data/Item/Use.hs	132;"	t
+FlareType	src/Dodge/Data/Item/Use.hs	131;"	t
 FlashBall	src/Dodge/Data/Bullet.hs	32;"	C
 FlatFaces	src/Shape/Data.hs	17;"	C
 FlatShieldParams	src/Dodge/Data/Item/Params.hs	17;"	C
@@ -756,8 +756,8 @@ GasAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	30;"	C
 GasCloud	src/Dodge/Data/Cloud.hs	31;"	C
 GasCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	41;"	t
 GasFuel	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	38;"	t
-GasParams	src/Dodge/Data/Item/Use.hs	117;"	C
+GasParams	src/Dodge/Data/Item/Use.hs	116;"	C
-GasSprayParams	src/Dodge/Data/Item/Use.hs	83;"	C
+GasSprayParams	src/Dodge/Data/Item/Use.hs	82;"	C
 GenCr	src/Dodge/Data/Creature/State.hs	31;"	C
 GenFloat	src/Dodge/Data/GenFloat.hs	11;"	t
 GenFloat	src/Dodge/Data/GenFloat.hs	5;"	m
@@ -825,12 +825,12 @@ HammerUp	src/Dodge/Data/Hammer.hs	20;"	C
 HandPos	src/Dodge/Creature/HandPos.hs	1;"	m
 HardQuit	src/Dodge/Data/Universe.hs	68;"	C
 HasHammer	src/Dodge/Data/Hammer.hs	14;"	C
-HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	137;"	C
+HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	136;"	C
 Held	src/Dodge/Item/Held.hs	1;"	m
 HeldDelay	src/Dodge/Data/Item/HeldDelay.hs	6;"	m
 HeldItemType	src/Dodge/Data/Item/Combine.hs	136;"	t
 HeldOffset	src/Dodge/Item/HeldOffset.hs	1;"	m
-HeldParams	src/Dodge/Data/Item/Use.hs	81;"	t
+HeldParams	src/Dodge/Data/Item/Use.hs	80;"	t
 HeldPlatformSF	src/Dodge/Data/ComposedItem.hs	41;"	C
 HeldScroll	src/Dodge/HeldScroll.hs	1;"	m
 HeldUse	src/Dodge/Data/Item/HeldUse.hs	6;"	m
@@ -945,7 +945,7 @@ 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	61;"	C
-ItZoom	src/Dodge/Data/Item/Use.hs	197;"	t
+ItZoom	src/Dodge/Data/Item/Use.hs	196;"	t
 Item	src/Dodge/Data/Item.hs	41;"	t
 Item	src/Dodge/Data/Item.hs	4;"	m
 Item	src/Dodge/Default/Item.hs	1;"	m
@@ -1012,13 +1012,12 @@ Lampoid	src/Dodge/Data/Creature/Misc.hs	83;"	C
 Lampoid	src/Dodge/Lampoid.hs	1;"	m
 Large	src/Shape/Data.hs	29;"	C
 LasBeamCombine	src/Dodge/Data/Beam.hs	40;"	C
-LasGunFlare	src/Dodge/Data/Item/Use.hs	138;"	C
+LasGunFlare	src/Dodge/Data/Item/Use.hs	137;"	C
 LasSound	src/Dodge/Data/SoundOrigin.hs	28;"	C
 LasTurret	src/Dodge/Room/LasTurret.hs	1;"	m
-Laser	src/Dodge/Data/Laser.hs	30;"	t
+Laser	src/Dodge/Data/Laser.hs	21;"	t
 Laser	src/Dodge/Data/Laser.hs	6;"	m
 LaserPath	src/Dodge/Item/Weapon/LaserPath.hs	1;"	m
-LaserStart	src/Dodge/Data/Laser.hs	21;"	t
 LaserType	src/Dodge/Data/Laser.hs	16;"	t
 Launcher	src/Dodge/Item/Held/Launcher.hs	1;"	m
 LauncherAI	src/Dodge/Data/Creature/Misc.hs	54;"	C
@@ -1184,7 +1183,7 @@ Metapysics	src/Dodge/Data/Scenario.hs	17;"	t
 Military	src/Dodge/Data/Scenario.hs	45;"	C
 Mine	src/Dodge/Data/Scenario.hs	64;"	C
 MiniGunAI	src/Dodge/Data/Creature/Misc.hs	58;"	C
-MiniGunFlare	src/Dodge/Data/Item/Use.hs	136;"	C
+MiniGunFlare	src/Dodge/Data/Item/Use.hs	135;"	C
 Misc	src/Dodge/Data/Creature/Misc.hs	6;"	m
 Misc	src/Dodge/Data/Equipment/Misc.hs	6;"	m
 Misc	src/Dodge/Data/Item/Misc.hs	6;"	m
@@ -1217,23 +1216,23 @@ Multiset	src/Multiset.hs	4;"	m
 Music	src/Music.hs	1;"	m
 MusicData	src/Music.hs	7;"	t
 Mute	src/Dodge/Data/Creature/Misc.hs	28;"	C
-Muzzle	src/Dodge/Data/Item/Use.hs	169;"	t
+Muzzle	src/Dodge/Data/Item/Use.hs	168;"	t
-MuzzleBlink	src/Dodge/Data/Item/Use.hs	157;"	C
+MuzzleBlink	src/Dodge/Data/Item/Use.hs	156;"	C
-MuzzleDetector	src/Dodge/Data/Item/Use.hs	156;"	C
+MuzzleDetector	src/Dodge/Data/Item/Use.hs	155;"	C
-MuzzleEffect	src/Dodge/Data/Item/Use.hs	142;"	t
+MuzzleEffect	src/Dodge/Data/Item/Use.hs	141;"	t
 MuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	5;"	m
-MuzzleGLauncher	src/Dodge/Data/Item/Use.hs	148;"	C
+MuzzleGLauncher	src/Dodge/Data/Item/Use.hs	147;"	C
-MuzzleLaser	src/Dodge/Data/Item/Use.hs	144;"	C
+MuzzleLaser	src/Dodge/Data/Item/Use.hs	143;"	C
-MuzzleNozzle	src/Dodge/Data/Item/Use.hs	149;"	C
+MuzzleNozzle	src/Dodge/Data/Item/Use.hs	148;"	C
-MuzzleRLauncher	src/Dodge/Data/Item/Use.hs	147;"	C
+MuzzleRLauncher	src/Dodge/Data/Item/Use.hs	146;"	C
-MuzzleRewind	src/Dodge/Data/Item/Use.hs	159;"	C
+MuzzleRewind	src/Dodge/Data/Item/Use.hs	158;"	C
-MuzzleScroller	src/Dodge/Data/Item/Use.hs	161;"	C
+MuzzleScroller	src/Dodge/Data/Item/Use.hs	160;"	C
-MuzzleShatter	src/Dodge/Data/Item/Use.hs	155;"	C
+MuzzleShatter	src/Dodge/Data/Item/Use.hs	154;"	C
-MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	143;"	C
+MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	142;"	C
-MuzzleStopper	src/Dodge/Data/Item/Use.hs	160;"	C
+MuzzleStopper	src/Dodge/Data/Item/Use.hs	159;"	C
-MuzzleTesla	src/Dodge/Data/Item/Use.hs	145;"	C
+MuzzleTesla	src/Dodge/Data/Item/Use.hs	144;"	C
-MuzzleTractor	src/Dodge/Data/Item/Use.hs	146;"	C
+MuzzleTractor	src/Dodge/Data/Item/Use.hs	145;"	C
-MuzzleUnsafeBlink	src/Dodge/Data/Item/Use.hs	158;"	C
+MuzzleUnsafeBlink	src/Dodge/Data/Item/Use.hs	157;"	C
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
 MvWalking	src/Dodge/Data/Creature/Misc.hs	39;"	C
@@ -1256,7 +1255,7 @@ NewSideEffect	src/Dodge/Data/Universe.hs	63;"	C
 NextArcStep	src/Dodge/Data/ArcStep.hs	21;"	t
 Ngon	src/Dodge/Room/Ngon.hs	1;"	m
 NoAction	src/Dodge/Data/ActionPlan.hs	152;"	C
-NoAmmoParams	src/Dodge/Data/Item/Use.hs	118;"	C
+NoAmmoParams	src/Dodge/Data/Item/Use.hs	117;"	C
 NoArguments	src/Dodge/Data/Terminal.hs	91;"	C
 NoBeamCombine	src/Dodge/Data/Beam.hs	43;"	C
 NoConcurrentEffect	src/Loop/Data.hs	7;"	C
@@ -1271,7 +1270,7 @@ NoDropEffect	src/Dodge/Data/Item/Effect.hs	34;"	C
 NoEquipParams	src/Dodge/Data/Item/Use/Equipment.hs	36;"	C
 NoEscapeMenuOption	src/Dodge/Data/Universe.hs	77;"	C
 NoFaction	src/Dodge/Data/Creature/State.hs	40;"	C
-NoFlare	src/Dodge/Data/Item/Use.hs	133;"	C
+NoFlare	src/Dodge/Data/Item/Use.hs	132;"	C
 NoHammer	src/Dodge/Data/Hammer.hs	13;"	C
 NoHeldUseEffect	src/Dodge/Data/Item/Use.hs	56;"	C
 NoHoming	src/Dodge/Data/Projectile.hs	47;"	C
@@ -1279,7 +1278,7 @@ NoIntImp	src/Dodge/Data/CreatureEffect.hs	20;"	C
 NoInvEffect	src/Dodge/Data/Item/Effect.hs	24;"	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
+NoLightFlare	src/Dodge/Data/Item/Use.hs	134;"	C
 NoLighting	src/Dodge/Data/Config.hs	104;"	C
 NoMouseContext	src/Dodge/Data/Input.hs	22;"	C
 NoMvType	src/Dodge/Data/Creature/Misc.hs	38;"	C
@@ -1360,7 +1359,7 @@ OnSpecial	src/Dodge/Data/Equipment/Misc.hs	28;"	C
 OnTurret	src/Dodge/Data/Item/Location.hs	37;"	C
 OnceSound	src/Dodge/Data/SoundOrigin.hs	16;"	C
 OneArgument	src/Dodge/Data/Terminal.hs	92;"	C
-OneHand	src/Dodge/Data/Item/Use.hs	194;"	C
+OneHand	src/Dodge/Data/Item/Use.hs	193;"	C
 OnwardCluster	src/Dodge/Data/RoomCluster.hs	14;"	C
 OnwardList	src/Dodge/Annotation/Data.hs	16;"	C
 Opacity	src/Dodge/Data/Wall.hs	40;"	t
@@ -1498,7 +1497,7 @@ Procedural	src/Dodge/Room/Procedural.hs	2;"	m
 Projectile	src/Dodge/Data/Projectile.hs	17;"	t
 Projectile	src/Dodge/Data/Projectile.hs	6;"	m
 Projectile	src/Dodge/Projectile.hs	1;"	m
-ProjectileParams	src/Dodge/Data/Item/Use.hs	116;"	C
+ProjectileParams	src/Dodge/Data/Item/Use.hs	115;"	C
 ProjectileStabiliserLink	src/Dodge/Data/ComposedItem.hs	32;"	C
 ProjectileStabiliserSF	src/Dodge/Data/ComposedItem.hs	63;"	C
 ProjectileType	src/Dodge/Data/Projectile.hs	35;"	t
@@ -1957,7 +1956,7 @@ TeslaArc	src/Dodge/Data/TeslaArc.hs	15;"	t
 TeslaArc	src/Dodge/Data/TeslaArc.hs	6;"	m
 TeslaBall	src/Dodge/Data/Bullet.hs	31;"	C
 TeslaBeamCombine	src/Dodge/Data/Beam.hs	41;"	C
-TeslaGunFlare	src/Dodge/Data/Item/Use.hs	139;"	C
+TeslaGunFlare	src/Dodge/Data/Item/Use.hs	138;"	C
 Test	src/Dodge/Creature/Test.hs	8;"	m
 Test	src/Dodge/Event/Test.hs	1;"	m
 Test	src/Picture/Test.hs	1;"	m
@@ -2029,9 +2028,9 @@ Turret	src/Dodge/Data/Machine.hs	57;"	t
 Turret	src/Dodge/Placement/Instance/Turret.hs	1;"	m
 TurretInt	src/Dodge/Data/Item/Location.hs	21;"	t
 TwistGoal	src/Dodge/Data/Scenario.hs	15;"	C
-TwoHandFlat	src/Dodge/Data/Item/Use.hs	193;"	C
+TwoHandFlat	src/Dodge/Data/Item/Use.hs	192;"	C
-TwoHandOver	src/Dodge/Data/Item/Use.hs	192;"	C
+TwoHandOver	src/Dodge/Data/Item/Use.hs	191;"	C
-TwoHandUnder	src/Dodge/Data/Item/Use.hs	191;"	C
+TwoHandUnder	src/Dodge/Data/Item/Use.hs	190;"	C
 Type	src/Dodge/Data/Damage/Type.hs	6;"	m
 Type	src/Dodge/Terminal/Type.hs	1;"	m
 Typical	src/Shape/Data.hs	36;"	C
@@ -2073,7 +2072,7 @@ UseBulletMod	src/Dodge/Data/Item/Use.hs	47;"	C
 UseCondition	src/Dodge/Data/Item/Use.hs	66;"	t
 UseDelay	src/Dodge/Data/Item/HeldDelay.hs	13;"	t
 UseEquip	src/Dodge/Data/Item/Use.hs	42;"	C
-UseExactly	src/Dodge/Data/Item/Use.hs	165;"	C
+UseExactly	src/Dodge/Data/Item/Use.hs	164;"	C
 UseFocus	src/Dodge/Data/Item/Use.hs	61;"	t
 UseFromLocation	src/Dodge/Data/Item/Use.hs	63;"	C
 UseFromRoot	src/Dodge/Data/Item/Use.hs	62;"	C
@@ -2090,7 +2089,7 @@ UseScope	src/Dodge/Data/Item/Use.hs	46;"	C
 UseSelf	src/Dodge/Data/ActionPlan.hs	157;"	C
 UseTarget	src/Dodge/Data/ActionPlan.hs	154;"	C
 UseToggle	src/Dodge/Data/Item/Use.hs	48;"	C
-UseUpTo	src/Dodge/Data/Item/Use.hs	166;"	C
+UseUpTo	src/Dodge/Data/Item/Use.hs	165;"	C
 UseableAnytime	src/Dodge/Data/Item/Use.hs	68;"	C
 UseableWhenAimed	src/Dodge/Data/Item/Use.hs	67;"	C
 UsedInLink	src/Dodge/Data/Room.hs	61;"	C
@@ -2213,13 +2212,13 @@ Zoning	src/Dodge/Zoning.hs	1;"	m
 __Just'	src/MaybeHelp.hs	13;"	f
 _actAction	src/Dodge/Data/ActionPlan.hs	81;"	f
 _actLabel	src/Dodge/Data/ActionPlan.hs	80;"	f
-_aimHandlePos	src/Dodge/Data/Item/Use.hs	127;"	f
+_aimHandlePos	src/Dodge/Data/Item/Use.hs	126;"	f
-_aimMuzzles	src/Dodge/Data/Item/Use.hs	128;"	f
+_aimMuzzles	src/Dodge/Data/Item/Use.hs	127;"	f
-_aimRange	src/Dodge/Data/Item/Use.hs	124;"	f
+_aimRange	src/Dodge/Data/Item/Use.hs	123;"	f
-_aimStance	src/Dodge/Data/Item/Use.hs	126;"	f
+_aimStance	src/Dodge/Data/Item/Use.hs	125;"	f
-_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	123;"	f
+_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	122;"	f
-_aimWeight	src/Dodge/Data/Item/Use.hs	122;"	f
+_aimWeight	src/Dodge/Data/Item/Use.hs	121;"	f
-_aimZoom	src/Dodge/Data/Item/Use.hs	125;"	f
+_aimZoom	src/Dodge/Data/Item/Use.hs	124;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	21;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	24;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	28;"	f
@@ -2231,14 +2230,14 @@ _allocRemoveID	src/Dodge/Data/RightButtonOptions.hs	34;"	f
 _allocSwapID	src/Dodge/Data/RightButtonOptions.hs	30;"	f
 _alphaDivideShader	src/Data/Preload/Render.hs	18;"	f
 _ambushTarget	src/Dodge/Data/ActionPlan.hs	178;"	f
-_ampBullet	src/Dodge/Data/Item/Use.hs	115;"	f
+_ampBullet	src/Dodge/Data/Item/Use.hs	114;"	f
-_ampCreateGas	src/Dodge/Data/Item/Use.hs	117;"	f
+_ampCreateGas	src/Dodge/Data/Item/Use.hs	116;"	f
-_ampPayload	src/Dodge/Data/Item/Use.hs	116;"	f
+_ampPayload	src/Dodge/Data/Item/Use.hs	115;"	f
 _apAction	src/Dodge/Data/ActionPlan.hs	20;"	f
 _apGoal	src/Dodge/Data/ActionPlan.hs	22;"	f
 _apImpulse	src/Dodge/Data/ActionPlan.hs	19;"	f
-_apInt	src/Dodge/Data/Item/Use.hs	77;"	f
+_apInt	src/Dodge/Data/Item/Use.hs	76;"	f
-_apProjectiles	src/Dodge/Data/Item/Use.hs	76;"	f
+_apProjectiles	src/Dodge/Data/Item/Use.hs	75;"	f
 _apStrategy	src/Dodge/Data/ActionPlan.hs	21;"	f
 _arLoaded	src/Dodge/Data/Item/Use/Consumption.hs	28;"	f
 _arMax	src/Dodge/Data/Item/Use/Consumption.hs	29;"	f
@@ -2312,12 +2311,12 @@ _buPayload	src/Dodge/Data/Bullet.hs	19;"	f
 _buPos	src/Dodge/Data/Bullet.hs	23;"	f
 _buVel	src/Dodge/Data/Bullet.hs	21;"	f
 _buWidth	src/Dodge/Data/Bullet.hs	25;"	f
-_bulGunSound	src/Dodge/Data/Item/Use.hs	89;"	f
+_bulGunSound	src/Dodge/Data/Item/Use.hs	88;"	f
-_bulGunSound	src/Dodge/Data/Item/Use.hs	96;"	f
+_bulGunSound	src/Dodge/Data/Item/Use.hs	95;"	f
-_bulGunSound	src/Dodge/Data/Item/Use.hs	106;"	f
+_bulGunSound	src/Dodge/Data/Item/Use.hs	105;"	f
 _bullets	src/Dodge/Data/LWorld.hs	106;"	f
 _buttons	src/Dodge/Data/LWorld.hs	135;"	f
-_cClock	src/Dodge/Data/CWorld.hs	28;"	f
+_cClock	src/Dodge/Data/CWorld.hs	27;"	f
 _cWorld	src/Dodge/Data/World.hs	36;"	f
 _camBoundBox	src/Dodge/Data/Camera.hs	31;"	f
 _camBoundDist	src/Dodge/Data/Camera.hs	32;"	f
@@ -2440,13 +2439,13 @@ _csSpState	src/Dodge/Data/Creature/State.hs	18;"	f
 _currentArc	src/Dodge/Data/Item/Params.hs	20;"	f
 _currentFoot	src/Dodge/Data/Creature/Stance.hs	23;"	f
 _cursSides	src/Dodge/Data/SelectionList.hs	20;"	f
-_cwGen	src/Dodge/Data/CWorld.hs	27;"	f
+_cwGen	src/Dodge/Data/CWorld.hs	26;"	f
-_cwTiles	src/Dodge/Data/CWorld.hs	30;"	f
+_cwTiles	src/Dodge/Data/CWorld.hs	29;"	f
-_cwgGameRooms	src/Dodge/Data/CWorld.hs	38;"	f
+_cwgGameRooms	src/Dodge/Data/CWorld.hs	37;"	f
-_cwgParams	src/Dodge/Data/CWorld.hs	36;"	f
+_cwgParams	src/Dodge/Data/CWorld.hs	35;"	f
-_cwgRoomClipping	src/Dodge/Data/CWorld.hs	39;"	f
+_cwgRoomClipping	src/Dodge/Data/CWorld.hs	38;"	f
-_cwgSeed	src/Dodge/Data/CWorld.hs	40;"	f
+_cwgSeed	src/Dodge/Data/CWorld.hs	39;"	f
-_cwgWorldBounds	src/Dodge/Data/CWorld.hs	37;"	f
+_cwgWorldBounds	src/Dodge/Data/CWorld.hs	36;"	f
 _cylinderSize	src/Shape/Data.hs	19;"	f
 _dePush	src/Dodge/Data/Damage.hs	23;"	f
 _dePushBack	src/Dodge/Data/Damage.hs	28;"	f
@@ -2577,7 +2576,7 @@ _fullscreenShader	src/Data/Preload/Render.hs	20;"	f
 _futureWorlds	src/Dodge/Data/World.hs	63;"	f
 _futureWorlds	src/Dodge/Data/World.hs	69;"	f
 _gameplay_rotate_to_wall	src/Dodge/Data/Config.hs	55;"	f
-_gasCreation	src/Dodge/Data/Item/Use.hs	84;"	f
+_gasCreation	src/Dodge/Data/Item/Use.hs	83;"	f
 _genPlacements	src/Dodge/Data/GenWorld.hs	25;"	f
 _genRooms	src/Dodge/Data/GenWorld.hs	26;"	f
 _getAttentiveTo	src/Dodge/Data/Creature/Perception.hs	61;"	f
@@ -2682,21 +2681,20 @@ _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
+_izFac	src/Dodge/Data/Item/Use.hs	199;"	f
-_izMax	src/Dodge/Data/Item/Use.hs	198;"	f
+_izMax	src/Dodge/Data/Item/Use.hs	197;"	f
-_izMin	src/Dodge/Data/Item/Use.hs	199;"	f
+_izMin	src/Dodge/Data/Item/Use.hs	198;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
 _lClock	src/Dodge/Data/LWorld.hs	143;"	f
 _lTestInt	src/Dodge/Data/LWorld.hs	145;"	f
 _lTestString	src/Dodge/Data/LWorld.hs	144;"	f
-_lWorld	src/Dodge/Data/CWorld.hs	26;"	f
+_lWorld	src/Dodge/Data/CWorld.hs	25;"	f
 _lampColor	src/Dodge/Data/Creature/Misc.hs	83;"	f
 _lampHeight	src/Dodge/Data/Creature/Misc.hs	83;"	f
 _lampLSID	src/Dodge/Data/Creature/Misc.hs	83;"	f
 _laserEmmiter	src/Dodge/Data/Laser.hs	18;"	f
 _laserTypeDamage	src/Dodge/Data/Laser.hs	17;"	f
 _lasers	src/Dodge/Data/LWorld.hs	116;"	f
-_lasersToDraw	src/Dodge/Data/LWorld.hs	117;"	f
 _ldpPos	src/Dodge/Data/SelectionList.hs	14;"	f
 _ldpScale	src/Dodge/Data/SelectionList.hs	15;"	f
 _ldpVerticalGap	src/Dodge/Data/SelectionList.hs	16;"	f
@@ -2735,9 +2733,6 @@ _lwID	src/Dodge/Data/LinearShockwave.hs	15;"	f
 _lwPoints	src/Dodge/Data/LinearShockwave.hs	16;"	f
 _lwPos	src/Dodge/Data/LinearShockwave.hs	14;"	f
 _lwTimer	src/Dodge/Data/LinearShockwave.hs	17;"	f
-_lzColor	src/Dodge/Data/Laser.hs	31;"	f
-_lzPoints	src/Dodge/Data/Laser.hs	32;"	f
-_lzType	src/Dodge/Data/Laser.hs	33;"	f
 _machines	src/Dodge/Data/LWorld.hs	123;"	f
 _magLoadStatus	src/Dodge/Data/Item.hs	35;"	f
 _magParams	src/Dodge/Data/Item.hs	36;"	f
@@ -2812,20 +2807,20 @@ _mtLabel	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtTree	src/Dodge/Data/MetaTree.hs	10;"	f
 _mtTree	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _musicData	src/Data/Preload.hs	13;"	f
-_muzVel	src/Dodge/Data/Item/Use.hs	100;"	f
+_muzVel	src/Dodge/Data/Item/Use.hs	99;"	f
 _mvAimSpeed	src/Dodge/Data/Creature/Misc.hs	44;"	f
 _mvSpeed	src/Dodge/Data/Creature/Misc.hs	39;"	f
 _mvToPoint	src/Dodge/Data/Creature.hs	78;"	f
 _mvTurnJit	src/Dodge/Data/Creature/Misc.hs	43;"	f
 _mvTurnRad	src/Dodge/Data/Creature/Misc.hs	42;"	f
-_mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	176;"	f
+_mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	175;"	f
-_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	173;"	f
+_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	172;"	f
-_mzEffect	src/Dodge/Data/Item/Use.hs	175;"	f
+_mzEffect	src/Dodge/Data/Item/Use.hs	174;"	f
-_mzFlareType	src/Dodge/Data/Item/Use.hs	174;"	f
+_mzFlareType	src/Dodge/Data/Item/Use.hs	173;"	f
-_mzFrame	src/Dodge/Data/Item/Use.hs	177;"	f
+_mzFrame	src/Dodge/Data/Item/Use.hs	176;"	f
-_mzInaccuracy	src/Dodge/Data/Item/Use.hs	172;"	f
+_mzInaccuracy	src/Dodge/Data/Item/Use.hs	171;"	f
-_mzPos	src/Dodge/Data/Item/Use.hs	170;"	f
+_mzPos	src/Dodge/Data/Item/Use.hs	169;"	f
-_mzRot	src/Dodge/Data/Item/Use.hs	171;"	f
+_mzRot	src/Dodge/Data/Item/Use.hs	170;"	f
 _newArcStep	src/Dodge/Data/Item/Params.hs	23;"	f
 _nodeMetaTree	src/Dodge/Data/MetaTree.hs	14;"	f
 _nodeMetaTree	src/Dodge/Tree/Compose/Data.hs	9;"	f
@@ -2834,11 +2829,11 @@ _nodeTree	src/Dodge/Tree/Compose/Data.hs	9;"	f
 _nodesSearched	src/Dodge/Data/Creature/Memory.hs	15;"	f
 _numLinkEW	src/Dodge/Data/Room.hs	33;"	f
 _numLinkNS	src/Dodge/Data/Room.hs	34;"	f
-_numberFloorVerxs	src/Dodge/Data/CWorld.hs	32;"	f
+_numberFloorVerxs	src/Dodge/Data/CWorld.hs	31;"	f
-_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	152;"	f
+_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	151;"	f
-_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	151;"	f
+_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	150;"	f
-_nzPressure	src/Dodge/Data/Item/Use.hs	150;"	f
+_nzPressure	src/Dodge/Data/Item/Use.hs	149;"	f
-_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	153;"	f
+_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	152;"	f
 _offPathFromEdges	src/Dodge/Data/Room.hs	74;"	f
 _oldMagnets	src/Dodge/Data/LWorld.hs	125;"	f
 _onPathFromEdges	src/Dodge/Data/Room.hs	73;"	f
@@ -2852,7 +2847,7 @@ _opticPos	src/Dodge/Data/Item/Scope.hs	16;"	f
 _opticZoom	src/Dodge/Data/Item/Scope.hs	19;"	f
 _partialAction	src/Dodge/Data/ActionPlan.hs	145;"	f
 _pastWorlds	src/Dodge/Data/World.hs	37;"	f
-_pathGraph	src/Dodge/Data/CWorld.hs	31;"	f
+_pathGraph	src/Dodge/Data/CWorld.hs	30;"	f
 _pathToPoint	src/Dodge/Data/ActionPlan.hs	89;"	f
 _peDist	src/Dodge/Data/PathGraph.hs	43;"	f
 _peEnd	src/Dodge/Data/PathGraph.hs	42;"	f
@@ -2964,8 +2959,8 @@ _pyFaces	src/Polyhedra/Data.hs	14;"	f
 _radarBlips	src/Dodge/Data/LWorld.hs	112;"	f
 _radarSweeps	src/Dodge/Data/LWorld.hs	107;"	f
 _randGen	src/Dodge/Data/World.hs	39;"	f
-_randomOffset	src/Dodge/Data/Item/Use.hs	87;"	f
+_randomOffset	src/Dodge/Data/Item/Use.hs	86;"	f
-_randomOffset	src/Dodge/Data/Item/Use.hs	104;"	f
+_randomOffset	src/Dodge/Data/Item/Use.hs	103;"	f
 _rateMax	src/Dodge/Data/Item/HeldDelay.hs	16;"	f
 _rateTimeLastUsed	src/Dodge/Data/Item/HeldDelay.hs	17;"	f
 _rbColor	src/Dodge/Data/RadarBlip.hs	15;"	f
@@ -2975,13 +2970,13 @@ _rbPos	src/Dodge/Data/RadarBlip.hs	19;"	f
 _rbRad	src/Dodge/Data/RadarBlip.hs	18;"	f
 _rbTime	src/Dodge/Data/RadarBlip.hs	16;"	f
 _rboBaseBloom	src/Data/Preload/Render.hs	38;"	f
-_recoil	src/Dodge/Data/Item/Use.hs	85;"	f
+_recoil	src/Dodge/Data/Item/Use.hs	84;"	f
-_recoil	src/Dodge/Data/Item/Use.hs	102;"	f
+_recoil	src/Dodge/Data/Item/Use.hs	101;"	f
 _renderData	src/Data/Preload.hs	11;"	f
 _reverseAmount	src/Dodge/Data/World.hs	62;"	f
 _reverseAmount	src/Dodge/Data/World.hs	68;"	f
 _reverseAmount	src/Dodge/Data/World.hs	72;"	f
-_rifling	src/Dodge/Data/Item/Use.hs	101;"	f
+_rifling	src/Dodge/Data/Item/Use.hs	100;"	f
 _rkHoming	src/Dodge/Data/Projectile.hs	40;"	f
 _rkSmoke	src/Dodge/Data/Projectile.hs	41;"	f
 _rlDir	src/Dodge/Data/Room.hs	26;"	f
@@ -3052,7 +3047,6 @@ _scurColor	src/Dodge/Data/SelectionList.hs	26;"	f
 _scurPos	src/Dodge/Data/SelectionList.hs	24;"	f
 _scurSize	src/Dodge/Data/SelectionList.hs	25;"	f
 _seenLocations	src/Dodge/Data/LWorld.hs	140;"	f
-_seenWalls	src/Dodge/Data/CWorld.hs	29;"	f
 _selLocation	src/Dodge/Data/LWorld.hs	141;"	f
 _sensAmount	src/Dodge/Data/Machine/Sensor.hs	19;"	f
 _sensDraw	src/Dodge/Data/Machine/Sensor.hs	21;"	f
@@ -3092,8 +3086,8 @@ _siWidth	src/Dodge/Data/SelectionList.hs	47;"	f
 _siWidth	src/Dodge/Data/SelectionList.hs	56;"	f
 _sideEffect	src/Loop/Data.hs	13;"	f
 _sideImpulses	src/Dodge/Data/ActionPlan.hs	170;"	f
-_sidePush	src/Dodge/Data/Item/Use.hs	88;"	f
+_sidePush	src/Dodge/Data/Item/Use.hs	87;"	f
-_sidePush	src/Dodge/Data/Item/Use.hs	105;"	f
+_sidePush	src/Dodge/Data/Item/Use.hs	104;"	f
 _silhouetteEBO	src/Data/Preload/Render.hs	27;"	f
 _skColor	src/Dodge/Data/Spark.hs	17;"	f
 _skDamageType	src/Dodge/Data/Spark.hs	21;"	f
@@ -3208,8 +3202,8 @@ _toPlaySoundVolume	src/Sound/Data.hs	43;"	f
 _toPlaySoundVolumeFraction	src/Sound/Data.hs	44;"	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
+_torqueAfter	src/Dodge/Data/Item/Use.hs	85;"	f
-_torqueAfter	src/Dodge/Data/Item/Use.hs	103;"	f
+_torqueAfter	src/Dodge/Data/Item/Use.hs	102;"	f
 _tractorBeams	src/Dodge/Data/LWorld.hs	119;"	f
 _trieChildren	src/SimpleTrie.hs	11;"	f
 _trieMVal	src/SimpleTrie.hs	10;"	f
@@ -3241,14 +3235,14 @@ _unST	src/Dodge/Tree/Compose/Data.hs	12;"	f
 _unTO	src/Shader/Data.hs	59;"	f
 _unputTerminal	src/Dodge/Data/GenWorld.hs	36;"	f
 _useAheadPos	src/Dodge/Data/ActionPlan.hs	161;"	f
-_useExactly	src/Dodge/Data/Item/Use.hs	165;"	f
+_useExactly	src/Dodge/Data/Item/Use.hs	164;"	f
 _useMapperLines	src/Dodge/Data/Item/Use.hs	50;"	f
 _useMapperPoints	src/Dodge/Data/Item/Use.hs	51;"	f
 _useMvTargetPos	src/Dodge/Data/ActionPlan.hs	164;"	f
 _useSelf	src/Dodge/Data/ActionPlan.hs	158;"	f
 _useTarget	src/Dodge/Data/ActionPlan.hs	155;"	f
 _useToggle	src/Dodge/Data/Item/Use.hs	48;"	f
-_useUpTo	src/Dodge/Data/Item/Use.hs	166;"	f
+_useUpTo	src/Dodge/Data/Item/Use.hs	165;"	f
 _uvCanContinue	src/Dodge/Data/Universe.hs	38;"	f
 _uvConfig	src/Dodge/Data/Universe.hs	36;"	f
 _uvDebug	src/Dodge/Data/Universe.hs	43;"	f
@@ -3300,10 +3294,10 @@ _walls	src/Dodge/Data/LWorld.hs	120;"	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
-_weaponInvLock	src/Dodge/Data/Item/Use.hs	92;"	f
+_weaponInvLock	src/Dodge/Data/Item/Use.hs	91;"	f
-_weaponInvLock	src/Dodge/Data/Item/Use.hs	109;"	f
+_weaponInvLock	src/Dodge/Data/Item/Use.hs	108;"	f
-_weaponRepeat	src/Dodge/Data/Item/Use.hs	93;"	f
+_weaponRepeat	src/Dodge/Data/Item/Use.hs	92;"	f
-_weaponRepeat	src/Dodge/Data/Item/Use.hs	110;"	f
+_weaponRepeat	src/Dodge/Data/Item/Use.hs	109;"	f
 _windowPosX	src/Dodge/Data/Config.hs	53;"	f
 _windowPosY	src/Dodge/Data/Config.hs	54;"	f
 _windowShader	src/Data/Preload/Render.hs	19;"	f
@@ -3627,7 +3621,7 @@ 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	687;"	f
+checkEndGame	src/Dodge/Update.hs	653;"	f
 checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
@@ -3656,7 +3650,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	740;"	f
+clClSpringVel	src/Dodge/Update.hs	704;"	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
@@ -3674,15 +3668,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	141;"	f
+closeButtonToSelectionItem	src/Dodge/Inventory/SelectionList.hs	175;"	f
-closeItemToSelectionItem	src/Dodge/Inventory/SelectionList.hs	126;"	f
+closeItemToSelectionItem	src/Dodge/Inventory/SelectionList.hs	160;"	f
-closeItemToTextPictures	src/Dodge/Inventory/SelectionList.hs	155;"	f
+closeItemToTextPictures	src/Dodge/Inventory/SelectionList.hs	189;"	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	710;"	f
+cloudEffect	src/Dodge/Update.hs	674;"	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
@@ -3755,7 +3749,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	758;"	f
+crCrSpring	src/Dodge/Update.hs	722;"	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
@@ -3775,7 +3769,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	753;"	f
+crSpring	src/Dodge/Update.hs	717;"	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
@@ -4017,8 +4011,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	100;"	f
+displayPulse	src/Dodge/Inventory/SelectionList.hs	131;"	f
-displayTerminalLineString	src/Dodge/Update.hs	428;"	f
+displayTerminalLineString	src/Dodge/Update.hs	426;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -4096,7 +4090,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	84;"	f
+doScopeZoom	src/Dodge/Update/Scroll.hs	78;"	f
 doSectionSize	src/Dodge/DisplayInventory.hs	217;"	f
 doSideEffects	appDodge/Main.hs	120;"	f
 doStep	src/Dodge/ArcStep.hs	9;"	f
@@ -4141,7 +4135,6 @@ drawBoundingBox	src/Dodge/Debug/Picture.hs	331;"	f
 drawBul	src/Dodge/Bullet/Draw.hs	9;"	f
 drawButton	src/Dodge/Button/Draw.hs	9;"	f
 drawCPUShadows	src/Dodge/Render/Shadow.hs	19;"	f
-drawCarte	src/Dodge/Render/HUD/Carte.hs	14;"	f
 drawCircCollisionTest	src/Dodge/Debug/Picture.hs	111;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
 drawCombFilter	src/Dodge/Render/Picture.hs	220;"	f
@@ -4186,7 +4179,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
+drawLaser	src/Dodge/Laser/Update.hs	34;"	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
@@ -4194,7 +4187,6 @@ drawListElement	src/Dodge/Render/List.hs	187;"	f
 drawListYgapScaleYoff	src/Dodge/Render/List.hs	95;"	f
 drawListYoff	src/Dodge/Render/List.hs	92;"	f
 drawMachine	src/Dodge/Machine/Draw.hs	17;"	f
-drawMapWall	src/Dodge/Render/HUD/Carte.hs	33;"	f
 drawMapperAR	src/Dodge/Targeting/Draw.hs	12;"	f
 drawMapperInventory	src/Dodge/Render/HUD.hs	169;"	f
 drawMenuClick	src/Dodge/Render/Picture.hs	137;"	f
@@ -4291,6 +4283,7 @@ encircleP	src/Dodge/Creature/Boid.hs	27;"	f
 endCombineRegex	src/Dodge/Update/Input/InGame.hs	265;"	f
 endRegex	src/Dodge/Update/Input/InGame.hs	252;"	f
 enterCombineInv	src/Dodge/DisplayInventory.hs	323;"	f
+epText	src/Dodge/Inventory/SelectionList.hs	65;"	f
 eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	5;"	f
 eqSiteToPositions	src/Dodge/Inventory/RBList.hs	75;"	f
@@ -4445,8 +4438,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	178;"	f
+getArguments	src/Dodge/Update/Scroll.hs	172;"	f
-getArguments'	src/Dodge/Update/Scroll.hs	166;"	f
+getArguments'	src/Dodge/Update/Scroll.hs	160;"	f
 getAttachedSFLink	src/Dodge/HeldUse.hs	364;"	f
 getAutoSpringLinks	src/Dodge/Item/Grammar.hs	112;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
@@ -4577,8 +4570,9 @@ holdForm	src/Dodge/Creature/Boid.hs	136;"	f
 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
+hotkeyToChar	src/Dodge/Inventory/SelectionList.hs	140;"	f
 hotkeyToScancode	src/Dodge/Creature/YourControl.hs	70;"	f
-hotkeyToString	src/Dodge/Inventory/SelectionList.hs	106;"	f
+hotkeyToString	src/Dodge/Inventory/SelectionList.hs	137;"	f
 humanoidAIList	src/Dodge/Humanoid.hs	181;"	f
 iShape	src/Dodge/Placement/Instance/LightSource.hs	73;"	f
 icosahedronPoints	src/Polyhedra/Geodesic.hs	12;"	f
@@ -4616,7 +4610,7 @@ 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
-insertAt	src/Padding.hs	56;"	f
+insertAt	src/Padding.hs	63;"	f
 insertIMInZone	src/Dodge/Base.hs	54;"	f
 insertInTrie	src/SimpleTrie.hs	23;"	f
 insertNewKey	src/IntMapHelp.hs	64;"	f
@@ -4649,7 +4643,8 @@ 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	95;"	f
+introScanDisplay	src/Dodge/Inventory/SelectionList.hs	126;"	f
+introScanValue	src/Dodge/Inventory/SelectionList.hs	80;"	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
@@ -4711,22 +4706,24 @@ 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	69;"	f
+itemDisplayPad	src/Dodge/Inventory/SelectionList.hs	106;"	f
 itemEquipPict	src/Dodge/Item/Draw.hs	16;"	f
+itemExternalValue	src/Dodge/Inventory/SelectionList.hs	85;"	f
 itemFromAmmoMag	src/Dodge/Item.hs	39;"	f
 itemFromAttachType	src/Dodge/Item.hs	48;"	f
 itemFromBase	src/Dodge/Item.hs	17;"	f
 itemFromEquipType	src/Dodge/Item.hs	63;"	f
 itemFromHeldType	src/Dodge/Item/Held.hs	25;"	f
 itemInfo	src/Dodge/Item/Info.hs	14;"	f
+itemIntegralValue	src/Dodge/Inventory/SelectionList.hs	70;"	f
 itemInvColor	src/Dodge/Item/InventoryColor.hs	9;"	f
-itemNumberDisplay	src/Dodge/Inventory/SelectionList.hs	74;"	f
+itemNumberDisplay	src/Dodge/Inventory/SelectionList.hs	111;"	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	49;"	f
-itemScrollDisplay	src/Dodge/Inventory/SelectionList.hs	63;"	f
+itemScrollDisplay	src/Dodge/Inventory/SelectionList.hs	95;"	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
@@ -4790,7 +4787,7 @@ ldtToIndentList	src/Dodge/DoubleTree.hs	146;"	f
 ldtToLoc	src/Dodge/DoubleTree.hs	187;"	f
 left	src/DoubleStack.hs	16;"	f
 leftIsParentCombine	src/Dodge/Item/Grammar.hs	231;"	f
-leftPad	src/Padding.hs	14;"	f
+leftPad	src/Padding.hs	15;"	f
 leftRightCombine	src/Dodge/Item/Grammar.hs	245;"	f
 legsSPic	src/Dodge/Item/Draw/SPic.hs	468;"	f
 liShape	src/Dodge/Placement/Instance/LightSource.hs	98;"	f
@@ -4877,7 +4874,6 @@ magenta	src/Color.hs	19;"	f
 main	appDodge/Main.hs	38;"	f
 main	bench/Bench.hs	15;"	f
 main	test/Spec.hs	12;"	f
-mainListCursor	src/Dodge/Render/HUD/Carte.hs	51;"	f
 makeArc	src/Picture/Base.hs	157;"	f
 makeAttach	src/Dodge/Item/Attach.hs	10;"	f
 makeBlip	src/Dodge/RadarSweep.hs	69;"	f
@@ -4941,9 +4937,7 @@ makeThinSmokeAt	src/Dodge/WorldEvent/Cloud.hs	57;"	f
 makeTileFromPoly	src/Tile.hs	34;"	f
 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	672;"	f
 maxDamageType	src/Dodge/Damage.hs	37;"	f
 maxShowX	src/Dodge/Combine/Graph.hs	49;"	f
 maxViewDistance	src/Dodge/Viewpoints.hs	26;"	f
@@ -5004,8 +4998,8 @@ mglCreate	src/GLHelp.hs	8;"	f
 mglDelete	src/GLHelp.hs	14;"	f
 midBarDecoration	src/Dodge/Placement/TopDecoration.hs	16;"	f
 midBounds	src/Dodge/Room/Foreground.hs	151;"	f
-midPad	src/Padding.hs	26;"	f
+midPad	src/Padding.hs	27;"	f
-midPadL	src/Padding.hs	32;"	f
+midPadL	src/Padding.hs	33;"	f
 midPoint	src/Geometry.hs	86;"	f
 midWall	src/Dodge/Placement/Instance/Wall.hs	27;"	f
 minAndMax	src/FoldableHelp.hs	109;"	f
@@ -5043,7 +5037,7 @@ 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	114;"	f
+moveCombineSel	src/Dodge/Update/Scroll.hs	108;"	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
@@ -5069,7 +5063,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	701;"	f
+mvGust	src/Dodge/Update.hs	665;"	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
@@ -5105,7 +5099,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	169;"	f
+nullCommand	src/Dodge/Update/Scroll.hs	163;"	f
 numColor	src/Color.hs	128;"	f
 numDrawableVertices	src/Shader/Parameters.hs	34;"	f
 numGLushort	src/Shader/Parameters.hs	29;"	f
@@ -5125,7 +5119,6 @@ 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
 optionMenu	src/Dodge/Menu.hs	105;"	f
 optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	51;"	f
 optionScreenUpdate	src/Dodge/Update/Input/ScreenLayer.hs	42;"	f
@@ -5332,7 +5325,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	664;"	f
+ppEvents	src/Dodge/Update.hs	632;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5521,8 +5514,8 @@ rhombus	src/Polyhedra.hs	72;"	f
 rifle	src/Dodge/Item/Held/Cane.hs	55;"	f
 right	src/DoubleStack.hs	16;"	f
 rightIsParentCombine	src/Dodge/Item/Grammar.hs	238;"	f
-rightPad	src/Padding.hs	18;"	f
+rightPad	src/Padding.hs	19;"	f
-rightPadNoSquash	src/Padding.hs	22;"	f
+rightPadNoSquash	src/Padding.hs	23;"	f
 rlPosDir	src/Dodge/RoomLink.hs	94;"	f
 rlauncherPic	src/Dodge/Item/Draw/SPic.hs	381;"	f
 rmInLinks	src/Dodge/RoomLink.hs	138;"	f
@@ -5550,16 +5543,16 @@ roomsContaining	src/Dodge/Room/Containing.hs	20;"	f
 roomsContaining'	src/Dodge/Room/Containing.hs	25;"	f
 rootNotrootEff	src/Dodge/ItEffect.hs	30;"	f
 rose	src/Color.hs	20;"	f
-rotD	src/Padding.hs	43;"	f
+rotD	src/Padding.hs	44;"	f
-rotListAt	src/Padding.hs	48;"	f
 rotMatr	src/MatrixHelper.hs	66;"	f
-rotU	src/Padding.hs	38;"	f
+rotU	src/Padding.hs	39;"	f
 rotate	src/Picture/Base.hs	153;"	f
 rotate3	src/Geometry/Vector3D.hs	48;"	f
 rotate3x	src/Geometry/Vector3D.hs	60;"	f
 rotate3y	src/Geometry/Vector3D.hs	66;"	f
 rotate3z	src/Geometry/Vector3D.hs	54;"	f
 rotateCamera	src/Dodge/Update/Camera.hs	138;"	f
+rotateList	src/Padding.hs	49;"	f
 rotateProp	src/Dodge/Prop/Update.hs	49;"	f
 rotateSH	src/Shape.hs	256;"	f
 rotateSHq	src/Shape.hs	165;"	f
@@ -5618,10 +5611,10 @@ 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	161;"	f
+scrollCommandStrings	src/Dodge/Update/Scroll.hs	155;"	f
-scrollCommands	src/Dodge/Update/Scroll.hs	158;"	f
+scrollCommands	src/Dodge/Update/Scroll.hs	152;"	f
 scrollDebugInfoInt	src/Dodge/Debug.hs	71;"	f
-scrollRBOption	src/Dodge/Update/Scroll.hs	152;"	f
+scrollRBOption	src/Dodge/Update/Scroll.hs	146;"	f
 scrollSelectionSections	src/Dodge/SelectionSections.hs	26;"	f
 scrollTimeBack	src/Dodge/Update.hs	207;"	f
 scrollTimeForward	src/Dodge/Update.hs	230;"	f
@@ -5680,7 +5673,7 @@ 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	452;"	f
+setOldPos	src/Dodge/Update.hs	449;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
@@ -5786,7 +5779,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	749;"	f
+simpleCrSprings	src/Dodge/Update.hs	713;"	f
 simpleDamFL	src/Dodge/Flame.hs	40;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	514;"	f
@@ -5976,7 +5969,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	124;"	f
+terminalWheelEvent	src/Dodge/Update/Scroll.hs	118;"	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
@@ -6022,7 +6015,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	432;"	f
+tmUpdate	src/Dodge/Update.hs	429;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
@@ -6172,37 +6165,37 @@ 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	526;"	f
+updateBullets	src/Dodge/Update.hs	523;"	f
 updateCamera	src/Dodge/Update/Camera.hs	27;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	110;"	f
-updateCloud	src/Dodge/Update.hs	715;"	f
+updateCloud	src/Dodge/Update.hs	679;"	f
-updateClouds	src/Dodge/Update.hs	559;"	f
+updateClouds	src/Dodge/Update.hs	554;"	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	498;"	f
+updateCreatureGroups	src/Dodge/Update.hs	495;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	474;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	471;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	92;"	f
-updateDelayedEvents	src/Dodge/Update.hs	778;"	f
+updateDelayedEvents	src/Dodge/Update.hs	742;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	519;"	f
+updateDistortions	src/Dodge/Update.hs	516;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	45;"	f
-updateEnergyBalls	src/Dodge/Update.hs	547;"	f
+updateEnergyBalls	src/Dodge/Update.hs	542;"	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	544;"	f
+updateFlames	src/Dodge/Update.hs	539;"	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	698;"	f
+updateGusts	src/Dodge/Update.hs	662;"	f
 updateHeldRootItem	src/Dodge/Creature/State.hs	259;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
-updateIMl	src/Dodge/Update.hs	488;"	f
+updateIMl	src/Dodge/Update.hs	485;"	f
-updateIMl'	src/Dodge/Update.hs	493;"	f
+updateIMl'	src/Dodge/Update.hs	490;"	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
@@ -6212,7 +6205,7 @@ 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	16;"	f
+updateLaser	src/Dodge/Laser/Update.hs	14;"	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
@@ -6225,41 +6218,40 @@ 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	510;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	507;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	503;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	500;"	f
 updatePastWorlds	src/Dodge/Update.hs	404;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	556;"	f
+updatePosEvents	src/Dodge/Update.hs	551;"	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	522;"	f
+updateRadarBlips	src/Dodge/Update.hs	519;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	39;"	f
-updateRadarSweeps	src/Dodge/Update.hs	550;"	f
+updateRadarSweeps	src/Dodge/Update.hs	545;"	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	72;"	f
+updateScopeZoom	src/Dodge/Update/Scroll.hs	66;"	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	667;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
-updateShockwaves	src/Dodge/Update.hs	541;"	f
+updateShockwaves	src/Dodge/Update.hs	536;"	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	553;"	f
+updateSparks	src/Dodge/Update.hs	548;"	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	535;"	f
+updateTeslaArcs	src/Dodge/Update.hs	530;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	538;"	f
+updateTractorBeams	src/Dodge/Update.hs	533;"	f
 updateTurret	src/Dodge/Machine/Update.hs	49;"	f
 updateUniverse	src/Dodge/Update.hs	70;"	f
 updateUniverseFirst	src/Dodge/Update.hs	82;"	f
@@ -6444,9 +6436,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	425;"	f
+zoneClouds	src/Dodge/Update.hs	423;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	53;"	f
-zoneCreatures	src/Dodge/Update.hs	469;"	f
+zoneCreatures	src/Dodge/Update.hs	466;"	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
@@ -6466,7 +6458,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	98;"	f
+zoomInLongGun	src/Dodge/Update/Scroll.hs	92;"	f
-zoomOutLongGun	src/Dodge/Update/Scroll.hs	106;"	f
+zoomOutLongGun	src/Dodge/Update/Scroll.hs	100;"	f
 zoomScope	src/Dodge/Item/Scope.hs	32;"	f
-zoomSpeed	src/Dodge/Update/Scroll.hs	95;"	f
+zoomSpeed	src/Dodge/Update/Scroll.hs	89;"	f