Start removing tweakables

ghcidOutput

@@ -1 +1,50 @@
-All good (609 modules, at 13:12:14)
+/home/justin/Haskell/loop/src/Dodge/Render/HUD.hs:317:1-10: warning: [-Wunused-top-binds]
+    Defined but not used: ‘tweakItems’
+    |
+317 | tweakItems = textSelItems . ammoTweakStrings
+    | ^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Render/HUD.hs:320:1-16: warning: [-Wunused-top-binds]
+    Defined but not used: ‘ammoTweakStrings’
+    |
+320 | ammoTweakStrings _ = []-- case it ^? _Just . itTweaks . tweakParams of
+    | ^^^^^^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Render/HUD.hs:326:1-11: warning: [-Wunused-top-binds]
+    Defined but not used: ‘tweakString’
+    |
+326 | tweakString tp = rightPad 12 ' ' (show $ _tweakType tp) ++ " " ++ showTweak tp
+    | ^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Render/HUD.hs:379:1-12: warning: [-Wunused-top-binds]
+    Defined but not used: ‘textSelItems’
+    |
+379 | textSelItems = map (picsToSelectable . (: []))
+    | ^^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Render/HUD.hs:382:1-16: warning: [-Wunused-top-binds]
+    Defined but not used: ‘picsToSelectable’
+    |
+382 | picsToSelectable pics =
+    | ^^^^^^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Update/Scroll.hs:15:1-18: warning: [-Wunused-imports]
+    The import of ‘Dodge.Tweak’ is redundant
+   |
+15 | import Dodge.Tweak
+   | ^^^^^^^^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Update/Input/InGame.hs:9:1-21: warning: [-Wunused-imports]
+    The import of ‘Dodge.Base.You’ is redundant
+  |
+9 | import Dodge.Base.You
+  | ^^^^^^^^^^^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Item/Held/BatteryGuns.hs:19:1-33: warning: [-Wunused-imports]
+    The qualified import of ‘IntMapHelp’ is redundant
+   |
+19 | import qualified IntMapHelp as IM
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Item/Held/BatteryGuns.hs:79:1-11: warning: [-Wunused-top-binds]
+    Defined but not used: ‘lasGunTweak’
+   |
+79 | lasGunTweak =
+   | ^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/Item/Held/BatteryGuns.hs:102:1-15: warning: [-Wunused-top-binds]
+    Defined but not used: ‘tractorGunTweak’
+    |
+102 | tractorGunTweak =
+    | ^^^^^^^^^^^^^^^

src/Dodge/Data/HUD.hs

@@ -22,7 +22,7 @@ data HUDElement
 
 data SubInventory
     = NoSubInventory
-    | ExamineInventory {_subInvMSel :: Maybe Int}
+    | ExamineInventory -- {_subInvMSel :: Maybe Int}
     | CombineInventory
         { _ciCombinations :: IntMap (SelectionItem CombinableItem)
         , _ciSections :: SelectionSections CombinableItem

src/Dodge/Data/Item.hs

@@ -41,7 +41,7 @@ data Item = Item
     , _itInvSize :: Int
     , _itDimension :: ItemDimension
     , _itCurseStatus :: CurseStatus
-    , _itTweaks :: ItemTweaks
+--    , _itTweaks :: ItemTweaks
     , _itParams :: ItemParams
     , _itAttachments :: Set ItemAttachment
     }

src/Dodge/Default/Item.hs

@@ -30,7 +30,7 @@ defaultHeldItem = Item
         , _itDimension = defaultItemDimension
         , _itUse = defaultHeldUse
         , _itParams = NoParams
-        , _itTweaks = NoTweaks
+--        , _itTweaks = NoTweaks
 --        , _itScope = NoScope
         , _itAttachments = mempty
         }

src/Dodge/Item/Held/BatteryGuns.hs

@@ -61,10 +61,10 @@ lasGun =
                 , _lasCycle = 0
                 , _lasDamage = 11
                 }
-        & itTweaks
+--        & itTweaks
-            .~ Tweakable
+--            .~ Tweakable
-                { _tweakParams = IM.fromList [(0, lasGunTweak)]
+--                { _tweakParams = IM.fromList [(0, lasGunTweak)]
-                }
+--                }
         & itDimension . dimRad .~ 10
         & itDimension . dimCenter .~ V3 15 0 0
 --        & itUse . heldUse .~ HeldLaser --shootLaser
@@ -87,10 +87,10 @@ tractorGun :: Item
 tractorGun =
     lasGun
         & itParams .~ Attracting{_attractionPower = 1}
-        & itTweaks
+--        & itTweaks
-            .~ Tweakable
+--            .~ Tweakable
-                { _tweakParams = IM.fromList [(0, tractorGunTweak)]
+--                { _tweakParams = IM.fromList [(0, tractorGunTweak)]
-                }
+--                }
         & itUse . heldDelay .~ NoDelay
         & itUse . heldAim . aimWeight .~ 6
         & itUse . heldAim . aimRange .~ 1

src/Dodge/Item/Held/Launcher.hs

@@ -18,10 +18,10 @@ launcher =
                 , _shellSpinAmount = 2
                 , _shellThrustDelay = 20
                 }
-        & itTweaks
+--        & itTweaks
-            .~ Tweakable
+--            .~ Tweakable
-                { _tweakParams = basicAmPjMoves
+--                { _tweakParams = basicAmPjMoves
-                }
+--                }
         & itInvSize .~ 3
         & itDimension . dimRad .~ 9
         & itDimension . dimCenter .~ V3 10 0 0

src/Dodge/Render/HUD.hs

@@ -71,7 +71,8 @@ drawSubInventory :: SubInventory -> Configuration -> World -> Picture
 drawSubInventory subinv cfig w = case subinv of
     LockedInventory -> mempty -- topInvCursor col cursPos cfig w
     NoSubInventory -> drawRBOptions cfig w
-    ExamineInventory mtweaki -> drawExamineInventory cfig mtweaki w
+    --ExamineInventory mtweaki -> drawExamineInventory cfig mtweaki w
+    ExamineInventory -> drawExamineInventory cfig w
     DisplayTerminal tid -> displayTerminal tid cfig (w ^. cWorld . lWorld)
     CombineInventory{_ciSections = sss} -> drawCombineInventory cfig sss w
 
@@ -80,16 +81,46 @@ drawCombineInventory cfig sss w =
     invHead cfig "COMBINE"
         <> drawSelectionSections sss secondColumnParams cfig
         <> combineInventoryExtra sss cfig w
+--drawExamineInventory :: Configuration -> Maybe Int -> World -> Picture
+--drawExamineInventory cfig mtweaki w =
+--    invHead cfig "EXAMINE"
+--        <> examineInventoryExtra mtweaki cfig
+--        <> drawSelectionList
+--            secondColumnParams
+--            cfig
+--            ( defaultSelectionList & slItems .~ tweakItems itm
+--                ++ map
+--                    f
+--                    ( makeParagraph 55 $
+--                        yourAugmentedItem
+--                            itemInfo
+--                            (yourInfo (you w))
+--                            (closeObjectInfo (crNumFreeSlots (you w)))
+--                            w
+--                    )
+--            )
+--  where
+--    itm = yourSelectedItem w
+--    f str =
+--        SelectionItem
+--            { _siPictures = [str]
+--            , _siHeight = 1
+--            , _siIsSelectable = True
+--            , _siColor = white
+--            , _siOffX = 0
+--            , _siPayload = ()
+--            }
 
-drawExamineInventory :: Configuration -> Maybe Int -> World -> Picture
+drawExamineInventory :: Configuration -> World -> Picture
-drawExamineInventory cfig mtweaki w =
+drawExamineInventory cfig w =
     invHead cfig "EXAMINE"
-        <> examineInventoryExtra mtweaki cfig
+--        <> examineInventoryExtra mtweaki cfig
         <> drawSelectionList
             secondColumnParams
             cfig
-            ( defaultSelectionList & slItems .~ tweakItems itm
+            ( defaultSelectionList & slItems .~ -- tweakItems itm
-                ++ map
+              --  ++ 
+                    map
                     f
                     ( makeParagraph 55 $
                         yourAugmentedItem
@@ -100,7 +131,7 @@ drawExamineInventory cfig mtweaki w =
                     )
             )
   where
-    itm = yourSelectedItem w
+--    itm = yourSelectedItem w
     f str =
         SelectionItem
             { _siPictures = [str]
@@ -178,13 +209,13 @@ drawRBOptions cfig w = fromMaybe mempty $ do
         itm <- you w ^? crInv . ix j
         return $ itemBaseName itm
 
-examineInventoryExtra :: Maybe Int -> Configuration -> Picture
+--examineInventoryExtra :: Maybe Int -> Configuration -> Picture
-examineInventoryExtra mtweaki cfig = fromMaybe mempty $ do
+--examineInventoryExtra mtweaki cfig = fromMaybe mempty $ do
-    tweaki <- mtweaki
+--    tweaki <- mtweaki
-    return $
+--    return $
-        toTopLeft cfig $
+--        toTopLeft cfig $
-            translate subInvX (-71) $
+--            translate subInvX (-71) $
-                listCursorChooseBorderScale 0 1 [North, South, West] tweaki 0 white 10 1
+--                listCursorChooseBorderScale 0 1 [North, South, West] tweaki 0 white 10 1
 
 inventoryExtra :: SelectionSections () ->  Configuration -> World 
     -> IM.IntMap (Maybe (Int,Int),[Int],[Int]) -> Picture
@@ -286,9 +317,10 @@ tweakItems :: Maybe Item -> [SelectionItem ()]
 tweakItems = textSelItems . ammoTweakStrings
 
 ammoTweakStrings :: Maybe Item -> [String]
-ammoTweakStrings it = case it ^? _Just . itTweaks . tweakParams of
+ammoTweakStrings _ = []-- case it ^? _Just . itTweaks . tweakParams of
-    Just l -> map tweakString $ IM.elems l
+--ammoTweakStrings it = case it ^? _Just . itTweaks . tweakParams of
-    _ -> ["NOT TWEAKABLE"]
+--    Just l -> map tweakString $ IM.elems l
+--    _ -> ["NOT TWEAKABLE"]
 
 tweakString :: TweakParam -> String
 tweakString tp = rightPad 12 ' ' (show $ _tweakType tp) ++ " " ++ showTweak tp

src/Dodge/Update/Input/InGame.hs

@@ -244,10 +244,10 @@ toggleMap u = case u ^. uvWorld . hud . hudElement of
 toggleTweakInv :: World -> World
 toggleTweakInv w = case w ^? hud . hudElement . subInventory of
     Just ExamineInventory{} -> w & thepointer .~ NoSubInventory
-    _ -> w & thepointer .~ ExamineInventory mi
+    _ -> w & thepointer .~ ExamineInventory -- mi
   where
     thepointer = hud . hudElement . subInventory
-    mi = 0 <$ (yourSelectedItem w >>= (^? itTweaks . tweakParams . ix 0))
+--    mi = 0 <$ (yourSelectedItem w >>= (^? itTweaks . tweakParams . ix 0))
 
 tryCombine :: SelectionSections CombinableItem -> World -> World
 tryCombine sss w = fromMaybe w $ do

src/Dodge/Update/Scroll.hs

@@ -36,11 +36,12 @@ updateWheelEvent yi w = case w ^. hud . hudElement of
         | lbDown -> w & wCam . camZoom +~ y
         | invKeyDown -> changeSwapSel yi w
         | otherwise -> scrollAugInvSel yi w
-    DisplayInventory{_subInventory = ExamineInventory mi}
+    --DisplayInventory{_subInventory = ExamineInventory mi} -> w
-        | invKeyDown && rbDown -> w & moveTweakSel yi
+    DisplayInventory{_subInventory = ExamineInventory} -> w
-        | invKeyDown -> scrollAugInvSel yi w
+--        | invKeyDown && rbDown -> w & moveTweakSel yi
-        | rbDown -> w & changeTweakParam mi yi
+--        | invKeyDown -> scrollAugInvSel yi w
-        | otherwise -> w & moveTweakSel yi
+--        | rbDown -> w & changeTweakParam mi yi
+--        | otherwise -> w & moveTweakSel yi
     DisplayInventory{_subInventory = CombineInventory{}} -> w & moveCombineSel yi
     DisplayInventory{_subInventory = DisplayTerminal tmid} -> terminalWheelEvent yi tmid w
     _ -> w
@@ -62,10 +63,10 @@ moveCombineSel yi =
     )
         . (worldEventFlags . at CombineInventoryChange ?~ ())
 
-moveSubSel :: Int -> Int -> World -> World
+--moveSubSel :: Int -> Int -> World -> World
-moveSubSel yi maxyi =
+--moveSubSel yi maxyi =
-    hud . hudElement . subInventory . subInvMSel . _Just
+--    hud . hudElement . subInventory . subInvMSel . _Just
-        %~ ((`mod` maxyi) . subtract yi)
+--        %~ ((`mod` maxyi) . subtract yi)
 
 guardDisconnectedID :: Int -> World -> World -> World
 guardDisconnectedID tmid w w' = case w ^? cWorld . lWorld . terminals . ix tmid . tmStatus of
@@ -110,22 +111,22 @@ scrollRBOption dy ymax
     | dy > 0 = max 0 . subtract dy
     | otherwise = id
 
-moveTweakSel :: Int -> World -> World
+--moveTweakSel :: Int -> World -> World
-moveTweakSel i w = case yourSelectedItem w ^? _Just . itTweaks . tweakParams of
+--moveTweakSel i w = case yourSelectedItem w ^? _Just . itTweaks . tweakParams of
-    Just l -> moveSubSel i (length l) w
+--    Just l -> moveSubSel i (length l) w
-    _ -> w
+--    _ -> w
 
-changeTweakParam :: Maybe Int -> Int -> World -> World
+--changeTweakParam :: Maybe Int -> Int -> World -> World
-changeTweakParam mi i w = fromMaybe w $ do
+--changeTweakParam mi i w = fromMaybe w $ do
-    curpos <- you w ^? crManipulation . manObject . imSelectedItem
+--    curpos <- you w ^? crManipulation . manObject . imSelectedItem
-    paramid <- mi
+--    paramid <- mi
-    params <- yourSelectedItem w ^? _Just . itTweaks . tweakParams . ix paramid
+--    params <- yourSelectedItem w ^? _Just . itTweaks . tweakParams . ix paramid
-    let x = (_tweakVal params + i) `mod` _tweakMax params
+--    let x = (_tweakVal params + i) `mod` _tweakMax params
-    return $
+--    return $
-        w & cWorld . lWorld . creatures . ix 0 . crInv . ix curpos
+--        w & cWorld . lWorld . creatures . ix 0 . crInv . ix curpos
-            %~ ( (itTweaks . tweakParams . ix paramid . tweakVal .~ x)
+--            %~ ( (itTweaks . tweakParams . ix paramid . tweakVal .~ x)
-                    . doTweak (_tweakType params) x
+--                    . doTweak (_tweakType params) x
-               )
+--               )
 
 scrollCommands :: Terminal -> [TerminalCommand]
 scrollCommands = (nullCommand :) . _tmScrollCommands

tags

@@ -3501,7 +3501,6 @@ _itID	src/Dodge/Data/Item.hs	38;"	f
 _itInvSize	src/Dodge/Data/Item.hs	41;"	f
 _itLocation	src/Dodge/Data/Item.hs	39;"	f
 _itParams	src/Dodge/Data/Item.hs	45;"	f
-_itTweaks	src/Dodge/Data/Item.hs	44;"	f
 _itType	src/Dodge/Data/Item.hs	37;"	f
 _itUse	src/Dodge/Data/Item.hs	36;"	f
 _itUseAimStance	src/Dodge/Data/Item.hs	57;"	f
@@ -4038,7 +4037,6 @@ _strideAmount	src/Dodge/Creature/Stance/Data.hs	22;"	f
 _strideAmount	src/Dodge/Data/Creature/Stance.hs	22;"	f
 _strideLength	src/Dodge/Creature/Stance/Data.hs	14;"	f
 _strideLength	src/Dodge/Data/Creature/Stance.hs	16;"	f
-_subInvMSel	src/Dodge/Data/HUD.hs	25;"	f
 _subInventory	src/Dodge/Data/HUD.hs	18;"	f
 _subParams	src/Dodge/Data/Item/Params.hs	43;"	f
 _swColor	src/Dodge/Data/Shockwave.hs	18;"	f
@@ -4375,7 +4373,7 @@ allHotkeys	src/Dodge/Creature/YourControl.hs	52;"	f
 allVisibleWalls	src/Dodge/Base/Collide.hs	131;"	f
 alongSegBy	src/Geometry.hs	43;"	f
 ammoComposedItem	src/Dodge/Item/Grammar.hs	60;"	f
-ammoTweakStrings	src/Dodge/Render/HUD.hs	288;"	f
+ammoTweakStrings	src/Dodge/Render/HUD.hs	318;"	f
 amr	src/Dodge/Item/Held/Rod.hs	46;"	f
 amr	src/Dodge/Item/Weapon/BulletGun/Rod.hs	56;"	f
 anItemFindPulse	src/Dodge/Item/Weapon/UseEffect.hs	25;"	f
@@ -4640,7 +4638,6 @@ changeSwapClose	src/Dodge/Inventory.hs	230;"	f
 changeSwapInv	src/Dodge/Inventory.hs	246;"	f
 changeSwapSel	src/Dodge/Inventory.hs	222;"	f
 changeSwapWith	src/Dodge/Inventory.hs	281;"	f
-changeTweakParam	src/Dodge/Update/Scroll.hs	118;"	f
 changeZonedWall	src/Dodge/LevelGen/MoveDoor.hs	33;"	f
 charFiringStratI	src/Dodge/Item/Attachment.hs	15;"	f
 charToPhaseV	src/Dodge/Item/Weapon/Laser.hs	36;"	f
@@ -4705,7 +4702,7 @@ clipZoom	src/Dodge/Update/Camera.hs	219;"	f
 clockCycle	src/Dodge/Clock.hs	9;"	f
 closeObjEq	src/Dodge/Inventory/CloseObject.hs	12;"	f
 closeObjPos	src/Dodge/Inventory/CloseObject.hs	7;"	f
-closeObjectInfo	src/Dodge/Render/HUD.hs	114;"	f
+closeObjectInfo	src/Dodge/Render/HUD.hs	144;"	f
 closeObjectToSelectionItem	src/Dodge/Inventory/SelectionList.hs	65;"	f
 closeObjectToTextPictures	src/Dodge/Inventory/SelectionList.hs	80;"	f
 closestCreatureID	src/Dodge/Debug.hs	91;"	f
@@ -4721,7 +4718,6 @@ clsNearRect	src/Dodge/Zoning/Cloud.hs	15;"	f
 clsNearSeg	src/Dodge/Zoning/Cloud.hs	12;"	f
 clusterFormatting	src/Dodge/Combine/Graph.hs	112;"	f
 clusterFunc	src/Dodge/Combine/Graph.hs	106;"	f
-cmm	src/Dodge/Combine.hs	60;"	f
 cogRaised	src/Dodge/Creature/Perception.hs	101;"	f
 colCrWall	src/Dodge/WallCreatureCollisions.hs	26;"	f
 colCrsWalls	src/Dodge/WallCreatureCollisions.hs	17;"	f
@@ -4750,10 +4746,9 @@ combineAwareness	src/Dodge/Creature/Perception.hs	109;"	f
 combineBeamBeams	src/Dodge/Update.hs	479;"	f
 combineBeams	src/Dodge/Update.hs	470;"	f
 combineFloors	src/Dodge/Room/Procedural.hs	171;"	f
-combineInventoryExtra	src/Dodge/Render/HUD.hs	201;"	f
+combineInventoryExtra	src/Dodge/Render/HUD.hs	231;"	f
-combineItemListYouX	src/Dodge/Combine.hs	35;"	f
+combineItemListYouX	src/Dodge/Combine.hs	34;"	f
-combineList	src/Dodge/Combine.hs	38;"	f
+combineList	src/Dodge/Combine.hs	37;"	f
-combineListInfo	src/Dodge/Combine.hs	51;"	f
 combineRooms	src/Dodge/Room/Procedural.hs	151;"	f
 combineS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	344;"	f
 combineTree	src/Dodge/Tree/Compose.hs	66;"	f
@@ -5119,8 +5114,8 @@ displayConfig	src/Dodge/Menu.hs	196;"	f
 displayControls	src/Dodge/Menu.hs	206;"	f
 displayEnergyBallType	src/Dodge/Module/Info.hs	19;"	f
 displayFrameTicks	src/Dodge/Render/Picture.hs	33;"	f
-displayFreeSlots	src/Dodge/DisplayInventory.hs	159;"	f
+displayFreeSlots	src/Dodge/DisplayInventory.hs	158;"	f
-displayTerminal	src/Dodge/Render/HUD.hs	231;"	f
+displayTerminal	src/Dodge/Render/HUD.hs	261;"	f
 displayTerminalLineString	src/Dodge/Update.hs	327;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
@@ -5247,7 +5242,7 @@ drawCircFlare	src/Dodge/Flare.hs	25;"	f
 drawCloud	src/Dodge/Cloud/Draw.hs	6;"	f
 drawCloudWith	src/Dodge/Cloud/Draw.hs	12;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
-drawCombineInventory	src/Dodge/Render/HUD.hs	78;"	f
+drawCombineInventory	src/Dodge/Render/HUD.hs	79;"	f
 drawConcurrentMessage	src/Dodge/Render/Picture.hs	58;"	f
 drawCorpse	src/Dodge/Corpse/Draw.hs	6;"	f
 drawCrInfo	src/Dodge/Debug/Picture.hs	341;"	f
@@ -5262,7 +5257,7 @@ drawDoubleLampCover	src/Dodge/LightSources/Lamp.hs	139;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	86;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	8;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	174;"	f
-drawExamineInventory	src/Dodge/Render/HUD.hs	84;"	f
+drawExamineInventory	src/Dodge/Render/HUD.hs	114;"	f
 drawFarWallDetect	src/Dodge/Debug/Picture.hs	232;"	f
 drawFlame	src/Dodge/Flame/Draw.hs	7;"	f
 drawFlamelet	src/Dodge/EnergyBall/Draw.hs	23;"	f
@@ -5303,7 +5298,7 @@ drawPointLabel	src/Dodge/Render/Label.hs	13;"	f
 drawProjectile	src/Dodge/Projectile/Draw.hs	12;"	f
 drawProp	src/Dodge/Prop/Draw.hs	15;"	f
 drawProp'	src/Dodge/Prop/Draw.hs	12;"	f
-drawRBOptions	src/Dodge/Render/HUD.hs	132;"	f
+drawRBOptions	src/Dodge/Render/HUD.hs	162;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	7;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	29;"	f
 drawSelectionCursor	src/Dodge/Render/List.hs	40;"	f
@@ -5371,7 +5366,7 @@ encircle	src/Dodge/Creature/Boid.hs	115;"	f
 encircleCloseP	src/Dodge/Creature/Boid.hs	35;"	f
 encircleDistP	src/Dodge/Creature/Boid.hs	21;"	f
 encircleP	src/Dodge/Creature/Boid.hs	27;"	f
-enterCombineInv	src/Dodge/DisplayInventory.hs	254;"	f
+enterCombineInv	src/Dodge/DisplayInventory.hs	253;"	f
 eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	6;"	f
 equipAimSpeed	src/Dodge/Creature/Action/Movement.hs	109;"	f
@@ -5395,7 +5390,7 @@ errorPointInPolygon	src/Geometry.hs	49;"	f
 escapeKey	src/Dodge/Config/KeyConfig.hs	23;"	f
 evaluateRandPS	src/Dodge/Placement/PlaceSpot.hs	139;"	f
 evenOddSplit	src/Dodge/Base.hs	138;"	f
-examineInventoryExtra	src/Dodge/Render/HUD.hs	181;"	f
+examineInventoryExtra	src/Dodge/Render/HUD.hs	211;"	f
 exitTerminalSubInv	src/Dodge/Terminal.hs	223;"	f
 expandLine	src/Dodge/Base/Zone.hs	106;"	f
 expandLine	src/Dodge/Picture.hs	30;"	f
@@ -5465,7 +5460,7 @@ flameWall	src/Dodge/Item/Weapon/SprayGuns.hs	54;"	f
 flamerPic	src/Dodge/Item/Draw/SPic.hs	419;"	f
 flareCircleAt	src/Dodge/WorldEvent/Flash.hs	46;"	f
 flatItemCombinations	src/Dodge/Combine/Combinations.hs	49;"	f
-flatLookupItems	src/Dodge/Combine.hs	30;"	f
+flatLookupItems	src/Dodge/Combine.hs	29;"	f
 flatShield	src/Dodge/Item/Held/Utility.hs	9;"	f
 flatShieldEquipSPic	src/Dodge/Item/Draw/SPic.hs	492;"	f
 flatV2	src/Picture/Data.hs	65;"	f
@@ -5489,7 +5484,7 @@ flockPointTargetR	src/Dodge/Creature/Boid.hs	266;"	f
 flockToPointUsing	src/Dodge/Creature/Boid.hs	214;"	f
 flockToPointUsing'	src/Dodge/Creature/Boid.hs	227;"	f
 floorHun	src/Dodge/Base/Zone.hs	40;"	f
-floorItemPickupInfo	src/Dodge/Render/HUD.hs	119;"	f
+floorItemPickupInfo	src/Dodge/Render/HUD.hs	149;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	163;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSpray	src/Dodge/SoundLogic/Synonyms.hs	27;"	f
@@ -5555,8 +5550,8 @@ geometryQuickCheckTests	test/Spec.hs	55;"	f
 geometryTests	test/Spec.hs	17;"	f
 geometryUnitTests	test/Spec.hs	22;"	f
 geqConstr	src/SameConstr.hs	21;"	f
-getArguments	src/Dodge/Update/Scroll.hs	150;"	f
+getArguments	src/Dodge/Update/Scroll.hs	151;"	f
-getArguments'	src/Dodge/Update/Scroll.hs	138;"	f
+getArguments'	src/Dodge/Update/Scroll.hs	139;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	11;"	f
 getBulletTrajectory	src/Dodge/HeldUse.hs	290;"	f
 getBulletType	src/Dodge/HeldUse.hs	265;"	f
@@ -5622,9 +5617,9 @@ gridPoints	src/Grid.hs	67;"	f
 gridPoints'	src/Grid.hs	79;"	f
 gridPoints''	src/Grid.hs	74;"	f
 gridPointsOff	src/Grid.hs	62;"	f
-groupSplitItemAmounts	src/Dodge/Combine.hs	25;"	f
+groupSplitItemAmounts	src/Dodge/Combine.hs	24;"	f
 gruntS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	484;"	f
-guardDisconnectedID	src/Dodge/Update/Scroll.hs	70;"	f
+guardDisconnectedID	src/Dodge/Update/Scroll.hs	71;"	f
 gut1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	516;"	f
 gut2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	376;"	f
 gut3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	356;"	f
@@ -5785,10 +5780,10 @@ intervalList	src/Geometry.hs	315;"	f
 interweave	src/Justify.hs	17;"	f
 intsToPos	src/Dodge/Room/Modify/Girder.hs	160;"	f
 invAdj	src/Dodge/Item/Grammar.hs	143;"	f
-invDimColor	src/Dodge/DisplayInventory.hs	140;"	f
+invDimColor	src/Dodge/DisplayInventory.hs	139;"	f
 invDimColor	src/Dodge/Inventory/Color.hs	4;"	f
 invDisplayParams	src/Dodge/ListDisplayParams.hs	29;"	f
-invHead	src/Dodge/Render/HUD.hs	296;"	f
+invHead	src/Dodge/Render/HUD.hs	327;"	f
 invIndentIM	src/Dodge/Item/Grammar.hs	155;"	f
 invLDT	src/Dodge/Item/Grammar.hs	114;"	f
 invRootMap	src/Dodge/Item/Grammar.hs	132;"	f
@@ -5798,13 +5793,13 @@ invShiftPointBy	src/Dodge/ShiftPoint.hs	8;"	f
 invSideEff	src/Dodge/Creature/State.hs	242;"	f
 invSize	src/Dodge/Inventory/CheckSlots.hs	41;"	f
 invTrees	src/Dodge/Item/Grammar.hs	160;"	f
-inventoryExtra	src/Dodge/Render/HUD.hs	189;"	f
+inventoryExtra	src/Dodge/Render/HUD.hs	219;"	f
-inventoryExtraH	src/Dodge/Render/HUD.hs	193;"	f
+inventoryExtraH	src/Dodge/Render/HUD.hs	223;"	f
 inventoryX	src/Dodge/Creature.hs	115;"	f
 inverseShockwaveAt	src/Dodge/WorldEvent/Shockwave.hs	43;"	f
 invertEncircleDistP	src/Dodge/Creature/Boid.hs	13;"	f
 invertIntMap	src/Multiset.hs	61;"	f
-invertInventoryToMap	src/Dodge/Combine.hs	19;"	f
+invertInventoryToMap	src/Dodge/Combine.hs	18;"	f
 invisibleChaseCrit	src/Dodge/Creature/ChaseCrit.hs	25;"	f
 invisibleWall	src/Dodge/Placement/Instance/Wall.hs	16;"	f
 isAmmoIntLink	src/Dodge/HeldUse.hs	177;"	f
@@ -5979,12 +5974,12 @@ listConfig	src/Dodge/Menu.hs	199;"	f
 listControls	src/Dodge/Menu.hs	212;"	f
 listCursorChooseBorderScale	src/Dodge/Render/List.hs	105;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	188;"	f
-listSelectionColorPicture	src/Dodge/DisplayInventory.hs	246;"	f
+listSelectionColorPicture	src/Dodge/DisplayInventory.hs	245;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	120;"	f
 lnkEff	src/Dodge/Layout/Tree/Shift.hs	55;"	f
-lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	274;"	f
+lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	304;"	f
 lnkPosDir	src/Dodge/RoomLink.hs	97;"	f
 loadConfig	src/LoadConfig.hs	22;"	f
 loadDodgeConfig	src/Dodge/Config/Load.hs	9;"	f
@@ -6243,7 +6238,7 @@ mouseOverSelectionList	src/Dodge/Update/Input/ScreenLayer.hs	73;"	f
 mousePlus	src/Dodge/Render/Picture.hs	86;"	f
 mouseWorldPos	src/Dodge/Base/Coordinate.hs	48;"	f
 moveBullet	src/Dodge/Bullet.hs	193;"	f
-moveCombineSel	src/Dodge/Update/Scroll.hs	58;"	f
+moveCombineSel	src/Dodge/Update/Scroll.hs	59;"	f
 moveDoorToward	src/Dodge/LevelGen/MoveDoor.hs	22;"	f
 moveDownKey	src/Dodge/Config/KeyConfig.hs	19;"	f
 moveHammerUp	src/Dodge/Hammer.hs	5;"	f
@@ -6258,10 +6253,8 @@ moveRoomBy	src/Dodge/Room/Link.hs	53;"	f
 moveSelectionMapSelection	src/SelectionIntMap.hs	47;"	f
 moveSelectionMapStep	src/SelectionIntMap.hs	38;"	f
 moveShockwave	src/Dodge/Shockwave/Update.hs	17;"	f
-moveSubSel	src/Dodge/Update/Scroll.hs	65;"	f
 moveTeslaArc	src/Dodge/Particle/TeslaArc.hs	20;"	f
 moveToSideFirstOutLink	src/Dodge/Room/Warning.hs	56;"	f
-moveTweakSel	src/Dodge/Update/Scroll.hs	113;"	f
 moveUpKey	src/Dodge/Config/KeyConfig.hs	18;"	f
 moveWall	src/Dodge/Wall/Move.hs	29;"	f
 moveWallID	src/Dodge/Wall/Move.hs	24;"	f
@@ -6330,7 +6323,7 @@ normalizeAnglePi	src/Dodge/Base.hs	132;"	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	141;"	f
+nullCommand	src/Dodge/Update/Scroll.hs	142;"	f
 numColor	src/Color.hs	124;"	f
 numDrawableElements	src/Shader/Parameters.hs	32;"	f
 numGLushort	src/Shader/Parameters.hs	28;"	f
@@ -6439,7 +6432,7 @@ picMap	src/Picture/Base.hs	67;"	f
 pickUpItem	src/Dodge/Inventory/Add.hs	89;"	f
 pickUpS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	444;"	f
 pickUpSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
-picsToSelectable	src/Dodge/Render/HUD.hs	349;"	f
+picsToSelectable	src/Dodge/Render/HUD.hs	380;"	f
 pictureOnEquip	src/Dodge/Item/Equipment/Shape.hs	9;"	f
 pincerP	src/Dodge/Creature/Boid.hs	60;"	f
 pincerP'	src/Dodge/Creature/Boid.hs	93;"	f
@@ -6479,7 +6472,7 @@ placeSpotRoomRand	src/Dodge/Placement/PlaceSpot.hs	79;"	f
 placeSpotUsingLink	src/Dodge/Placement/PlaceSpot.hs	60;"	f
 placeString	src/Dodge/Render/MenuScreen.hs	54;"	f
 placeWallPoly	src/Dodge/Placement/PlaceSpot.hs	156;"	f
-plainRegex	src/Dodge/DisplayInventory.hs	156;"	f
+plainRegex	src/Dodge/DisplayInventory.hs	155;"	f
 plateCraft	src/Dodge/Item/Craftable.hs	46;"	f
 playIfFree	src/Sound.hs	136;"	f
 playPositionalSoundQueue	src/Sound.hs	144;"	f
@@ -6942,10 +6935,10 @@ screenPolygonBord	src/Dodge/Base/Window.hs	27;"	f
 screenPosAbs	src/Dodge/ScreenPos.hs	15;"	f
 screenToWorldPos	src/Dodge/Base/Coordinate.hs	53;"	f
 scrollAugInvSel	src/Dodge/Inventory.hs	287;"	f
-scrollCommandStrings	src/Dodge/Update/Scroll.hs	133;"	f
+scrollCommandStrings	src/Dodge/Update/Scroll.hs	134;"	f
-scrollCommands	src/Dodge/Update/Scroll.hs	130;"	f
+scrollCommands	src/Dodge/Update/Scroll.hs	131;"	f
 scrollDebugInfoInt	src/Dodge/Debug.hs	46;"	f
-scrollRBOption	src/Dodge/Update/Scroll.hs	107;"	f
+scrollRBOption	src/Dodge/Update/Scroll.hs	108;"	f
 scrollSelectionSections	src/Dodge/SelectionSections.hs	17;"	f
 scrollTimeBack	src/Dodge/Update.hs	197;"	f
 scrollTimeForward	src/Dodge/Update.hs	216;"	f
@@ -6963,9 +6956,9 @@ secondColumnParams	src/Dodge/ListDisplayParams.hs	42;"	f
 seedStartMenu	src/Dodge/Menu.hs	79;"	f
 seedStartOptions	src/Dodge/Menu.hs	82;"	f
 segOnCirc	src/Geometry.hs	116;"	f
-selNumPos	src/Dodge/Render/HUD.hs	361;"	f
+selNumPos	src/Dodge/Render/HUD.hs	392;"	f
 selSecDrawCursor	src/Dodge/Render/List.hs	87;"	f
-selSecSelCol	src/Dodge/Render/HUD.hs	380;"	f
+selSecSelCol	src/Dodge/Render/HUD.hs	411;"	f
 selSecSelSize	src/Dodge/SelectionSections.hs	124;"	f
 selSecYint	src/Dodge/SelectionSections.hs	127;"	f
 selectCreatureDebugItem	src/Dodge/Debug.hs	38;"	f
@@ -7372,7 +7365,7 @@ terminalColor	src/Dodge/Placement/Instance/Terminal.hs	66;"	f
 terminalReturnEffect	src/Dodge/Terminal/ReturnEffect.hs	10;"	f
 terminalSPic	src/Dodge/Machine/Draw.hs	28;"	f
 terminalShape	src/Dodge/Machine/Draw.hs	31;"	f
-terminalWheelEvent	src/Dodge/Update/Scroll.hs	75;"	f
+terminalWheelEvent	src/Dodge/Update/Scroll.hs	76;"	f
 teslaBeamCombine	src/Dodge/Beam.hs	48;"	f
 teslaGun	src/Dodge/Item/Held/BatteryGuns.hs	27;"	f
 teslaGunPic	src/Dodge/Item/Draw/SPic.hs	451;"	f
@@ -7390,7 +7383,7 @@ textJustifyLeft	src/Picture/Base.hs	208;"	f
 textJustifyRight	src/Picture/Base.hs	198;"	f
 textNum	src/Picture/Data.hs	53;"	f
 textRight	src/Picture/Base.hs	203;"	f
-textSelItems	src/Dodge/Render/HUD.hs	346;"	f
+textSelItems	src/Dodge/Render/HUD.hs	377;"	f
 textVMirror	src/Picture/Base.hs	216;"	f
 tflat2	src/Picture/Data.hs	80;"	f
 tflat3	src/Picture/Data.hs	83;"	f
@@ -7557,9 +7550,9 @@ turnTo	src/Dodge/Movement/Turn.hs	4;"	f
 turnTo	src/Dodge/Placements/Turret.hs	71;"	f
 turnToAmount	src/Dodge/Movement/Turn.hs	15;"	f
 turretItemOffset	src/Dodge/Item/HeldOffset.hs	14;"	f
-tweakItems	src/Dodge/Render/HUD.hs	285;"	f
+tweakItems	src/Dodge/Render/HUD.hs	315;"	f
 tweakPhaseV	src/Dodge/Tweak.hs	21;"	f
-tweakString	src/Dodge/Render/HUD.hs	293;"	f
+tweakString	src/Dodge/Render/HUD.hs	324;"	f
 tweakTractionPower	src/Dodge/Tweak.hs	14;"	f
 tweenAngles	src/Geometry/Vector.hs	184;"	f
 twinSlowDoorChasers	src/Dodge/Room/LongDoor.hs	78;"	f
@@ -7638,7 +7631,7 @@ updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	108;"	f
 updateInstantBullets	src/Dodge/Update.hs	535;"	f
 updateInv	src/Dodge/Creature/State.hs	234;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	87;"	f
-updateInventorySectionItems	src/Dodge/DisplayInventory.hs	144;"	f
+updateInventorySectionItems	src/Dodge/DisplayInventory.hs	143;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	269;"	f
 updateKeyInGame	src/Dodge/Update/Input/InGame.hs	102;"	f
 updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	91;"	f
@@ -7677,8 +7670,8 @@ updateRootItemID	src/Dodge/Inventory/Location.hs	41;"	f
 updateScopeZoom	src/Dodge/Update/Camera.hs	128;"	f
 updateScopeZoom'	src/Dodge/Update/Camera.hs	133;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
-updateSection	src/Dodge/DisplayInventory.hs	186;"	f
+updateSection	src/Dodge/DisplayInventory.hs	185;"	f
-updateSectionsPositioning	src/Dodge/DisplayInventory.hs	165;"	f
+updateSectionsPositioning	src/Dodge/DisplayInventory.hs	164;"	f
 updateSeenWalls	src/Dodge/Update.hs	566;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
 updateShockwaves	src/Dodge/Update.hs	440;"	f
@@ -7912,7 +7905,7 @@ you	src/Dodge/Base/You.hs	18;"	f
 youBox'	src/Dodge/Creature/ShadowBox.hs	8;"	f
 youDropItem	src/Dodge/Creature/Action.hs	188;"	f
 youSil	src/Dodge/Creature/ShadowBox.hs	15;"	f
-yourAugmentedItem	src/Dodge/Render/HUD.hs	126;"	f
+yourAugmentedItem	src/Dodge/Render/HUD.hs	156;"	f
 yourControl	src/Dodge/Creature/YourControl.hs	22;"	f
 yourDefaultSpeed	src/Dodge/Default/Creature.hs	134;"	f
 yourDefaultStrideLength	src/Dodge/Default/Creature.hs	137;"	f