Cleanup

src/Dodge/Render/HUD.hs

@@ -51,28 +51,26 @@ import Picture
 import SDL (MouseButton (..))
 
 drawHUD :: Config -> World -> Picture
-drawHUD cfig w = case w ^. hud of
+drawHUD cfig w =
-    --    DisplayCarte -> drawCarte cfig w
+    drawInventory sections w cfig subinv
-    HUD{_diSections = sections, _subInventory = subinv} ->
+        <> drawSubInventory subinv cfig w
-        drawInventory sections w cfig subinv
+  where
-            <> drawSubInventory subinv cfig w
+    sections = w ^. hud . diSections
+    subinv = w ^. hud . subInventory
 
 drawInventory :: IMSS () -> World -> Config -> SubInventory -> Picture
 drawInventory sss w cfig = \case
-    DisplayTerminal {} ->
+    DisplayTerminal{} ->
         drawSelectionSections sss invDP cfig
---            <> drawSSCursor sss invDP curs cfig (f $ w ^? hud . diSelection . _Just)
---            <> drawRootCursor w sss (f $ w ^? hud . diSelection . _Just) invDP cfig
             <> itemconnections
             <> drawMouseOver cfig w
     _ ->
         drawSelectionSections sss invDP cfig
-            <> drawSSCursor sss invDP curs cfig (f $ w ^? hud . diSelection . _Just)
+            <> drawSSCursor sss invDP curs cfig (w ^. hud . diSelection)
-            <> drawRootCursor w sss (f $ w ^? hud . diSelection . _Just) invDP cfig
+            <> drawRootCursor w sss (w ^. hud . diSelection) invDP cfig
             <> itemconnections
             <> drawMouseOver cfig w
   where
-    f = fmap (\(Sel x y _) -> (x, y))
     curs = invCursorParams w
     itemconnections = fromMaybe mempty $ do
         inv' <- w ^? cWorld . lWorld . creatures . ix 0 . crInv
@@ -82,11 +80,12 @@ drawInventory sss w cfig = \case
             _ -> return . drawItemConnections sss cfig $ invAdj inv
 
 drawRootCursor ::
-    World -> IMSS () -> Maybe (Int, Int) -> LDParams -> Config -> Picture
+    World -> IMSS () -> Maybe Selection -> LDParams -> Config -> Picture
 drawRootCursor w sss msel ldp cfig = fromMaybe mempty $ do
     cr <- w ^? cWorld . lWorld . creatures . ix 0
     guard $ crIsAiming cr
-    (i, j) <- msel
+    i <- msel ^? _Just . slSec
+    j <- msel ^? _Just . slInt
     guard $ i == 0
     inv' <- w ^? cWorld . lWorld . creatures . ix 0 . crInv
     let inv = fmap (\k -> w ^?! cWorld . lWorld . items . ix k) inv'
@@ -124,7 +123,7 @@ drawMouseOver cfig w =
             . translateScreenPos cfig (invDP ^. ldpPos)
             . color (0.3 *^ white)
             --            . color white
-            $ selSecDrawCursorAt invDP curs sss (j, i)
+            $ selSecDrawCursorAt invDP curs sss (Sel j i mempty)
     --    curs = BoundaryCursor [West]
     curs = BackdropCursor
     combinvsel = do
@@ -136,7 +135,7 @@ drawMouseOver cfig w =
         return
             . translateScreenPos cfig (idp ^. ldpPos)
             . color (0.3 * white)
-            $ selSecDrawCursorAt idp curs sss (j, i)
+            $ selSecDrawCursorAt idp curs sss (Sel j i mempty)
 
 drawDragSelected :: Config -> World -> Maybe Picture
 drawDragSelected cfig w = do
@@ -149,7 +148,7 @@ drawDragSelected cfig w = do
                )
     Sel i _ _ <- w ^? hud . diSelection . _Just
     sss <- w ^? hud . diSections
-    let f x = (selSecDrawCursorAt invDP BackdropCursor sss (i, x) <>)
+    let f x = (selSecDrawCursorAt invDP BackdropCursor sss (Sel i x mempty) <>)
     return
         . translateScreenPos cfig (invDP ^. ldpPos)
         . color (0.2 *^ white)
@@ -160,7 +159,7 @@ drawDragSelecting :: Config -> World -> Maybe Picture
 drawDragSelecting cfig w = do
     OverInvDragSelect (Just (i, j)) (Just b) <- w ^? input . mouseContext
     sss <- w ^? hud . diSections
-    let f x = selSecDrawCursorAt invDP BackdropCursor sss (i, x)
+    let f x = selSecDrawCursorAt invDP BackdropCursor sss (Sel i x mempty)
     return
         . translateScreenPos cfig (invDP ^. ldpPos)
         . color (0.2 *^ white)
@@ -171,7 +170,7 @@ drawSubInventory :: SubInventory -> Config -> World -> Picture
 drawSubInventory subinv cfig w = case subinv of
     NoSubInventory{} -> drawRBOptions cfig w
     ExamineInventory -> drawExamineInventory cfig w
-    DisplayTerminal tid -> (drawTerminalDisplay w cfig tid)
+    DisplayTerminal tid -> drawTerminalDisplay w cfig tid
     CombineInventory{_ciSections = sss} -> drawCombineInventory cfig sss w
     MapperInventory _ _ itid -> drawMapperInventory itid w
 
@@ -191,9 +190,7 @@ drawCombineInventory cfig sss w =
         <> combineInventoryExtra sss msel cfig w
   where
     curs = BoundaryCursor [North, South, West]
-    msel =
+    msel = w ^? hud . subInventory . ciSelection . _Just
-        (\(Sel x y _) -> (x, y))
-            <$> (w ^? hud . subInventory . ciSelection . _Just)
 
 drawExamineInventory :: Config -> World -> Picture
 drawExamineInventory cfig w =
@@ -332,10 +329,10 @@ drawItemChildrenConnect sss cfig i is = fromMaybe mempty $ do
   where
     snum = selNumPos cfig invDP sss 0
 
-combineInventoryExtra ::
+combineInventoryExtra :: IMSS CombItem -> Maybe Selection -> Config -> World -> Picture
-    IMSS CombItem -> Maybe (Int, Int) -> Config -> World -> Picture
 combineInventoryExtra sss msel cfig w = fold $ do
-    (i, j) <- msel
+    i <- msel ^? _Just . slSec
+    j <- msel ^? _Just . slInt
     si <- sss ^? ix i . ssItems . ix j
     let col = _siColor si
     lnks <- si ^? siPayload . _Just . ciInvIDs
@@ -347,7 +344,7 @@ combineInventoryExtra sss msel cfig w = fold $ do
                 invDP
                 (BoundaryCursor [North, South, East, West])
                 (w ^. hud . diSections)
-                (Just (0, i))
+                (Just (Sel 0 i mempty))
 
 drawTerminalDisplay :: World -> Config -> Int -> Picture
 drawTerminalDisplay w cfig tid = fold $ do
@@ -397,7 +394,7 @@ drawTerminalCursorLink w cfig tm = fold $ do
                 invDP
                 (BoundaryCursor [North, South, East, West])
                 (w ^. hud . diSections)
-                (Just (5, j))
+                (Just (Sel 5 j mempty))
             )
             <> lConnectCol (lp + V2 155 0) rp lcol white white
 

src/Dodge/Render/List.hs

@@ -19,6 +19,7 @@ module Dodge.Render.List (
     drawLabelledList,
 ) where
 
+import Dodge.Data.HUD
 import qualified Data.IntMap.Strict as IM
 import Data.Maybe
 import Dodge.Base.Window
@@ -105,8 +106,10 @@ stackPicturesAtOff :: Int -> [Picture] -> Picture
 stackPicturesAtOff i = mconcat . zipWith (drawListElement 10 1 0) [i, i - 1 ..]
 
 selSecDrawCursorAt ::
-    LDParams -> CursorDisplay -> IM.IntMap (SelSection a) -> (Int, Int) -> Picture
+    LDParams -> CursorDisplay -> IM.IntMap (SelSection a) -> Selection -> Picture
-selSecDrawCursorAt ldp curs sss (i, j) = fold $ do
+selSecDrawCursorAt ldp curs sss sel = fold $ do
+    let i = sel ^. slSec
+        j = sel ^. slInt
     yint <- selSecYint i j sss
     sindent <- sss ^? ix i . ssIndent
     si <- sss ^? ix i . ssItems . ix j
@@ -122,8 +125,8 @@ selSecDrawCursorAt ldp curs sss (i, j) = fold $ do
             (_siHeight si)
 
 selSecDrawCursor ::
-    LDParams -> CursorDisplay -> IM.IntMap (SelSection a) -> Maybe (Int, Int) -> Picture
+    LDParams -> CursorDisplay -> IM.IntMap (SelSection a) -> Maybe Selection -> Picture
-selSecDrawCursor ldp curs = maybe mempty . selSecDrawCursorAt ldp curs
+selSecDrawCursor ldp cd = maybe mempty . selSecDrawCursorAt ldp cd
 
 -- displays a cursor that should match up to list text pictures
 listCursorChooseBorderScale ::

src/Dodge/SelectionSections/Draw.hs

@@ -4,6 +4,7 @@ module Dodge.SelectionSections.Draw (
     drawSSMultiCursor,
 ) where
 
+import Dodge.Data.HUD
 import Control.Lens
 import qualified Data.IntMap.Strict as IM
 import Dodge.Data.Config
@@ -29,7 +30,7 @@ drawSelectionSections sss ldp cfig =
             )
 
 drawSSCursor ::
-    IM.IntMap (SelSection a) -> LDParams -> CursorDisplay -> Config -> Maybe (Int, Int) -> Picture
+    IM.IntMap (SelSection a) -> LDParams -> CursorDisplay -> Config -> Maybe Selection -> Picture
 drawSSCursor sss ldp curs cfig =
     translateScreenPos cfig (ldp ^. ldpPos) .
         selSecDrawCursor ldp curs sss

tags

@@ -2807,7 +2807,7 @@ checkWallRight	src/Dodge/LevelGen/StaticWalls.hs	54;"	f
 checkWallRight	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	59;"	f
 chemFuelPouch	src/Dodge/Item/Ammo.hs	75;"	f
 chestPQ	src/Dodge/Creature/HandPos.hs	124;"	f
-chooseCursorBorders	src/Dodge/Render/List.hs	150;"	f
+chooseCursorBorders	src/Dodge/Render/List.hs	153;"	f
 chooseEquipPosition	src/Dodge/Inventory/RBList.hs	41;"	f
 chooseFootSound	src/Dodge/Creature/State/WalkCycle.hs	35;"	f
 chooseFreeSite	src/Dodge/Inventory/RBList.hs	47;"	f
@@ -2845,7 +2845,7 @@ clockCycle	src/Dodge/Clock.hs	7;"	f
 closeButtonToSelectionItem	src/Dodge/Inventory/SelectionList.hs	227;"	f
 closeItemToSelectionItem	src/Dodge/Inventory/SelectionList.hs	211;"	f
 closeItemToTextPictures	src/Dodge/Inventory/SelectionList.hs	248;"	f
-closeObjectInfo	src/Dodge/Render/HUD.hs	228;"	f
+closeObjectInfo	src/Dodge/Render/HUD.hs	225;"	f
 closestPointOnLine	src/Geometry/Intersect.hs	272;"	f
 closestPointOnLineParam	src/Geometry/Intersect.hs	288;"	f
 closestPointOnSeg	src/Geometry/Intersect.hs	303;"	f
@@ -2882,7 +2882,7 @@ combinationsOf	src/Multiset.hs	46;"	f
 combinationsTrie	src/Dodge/Combine.hs	44;"	f
 combineAwareness	src/Dodge/Creature/Perception.hs	109;"	f
 combineFloors	src/Dodge/Room/Procedural.hs	152;"	f
-combineInventoryExtra	src/Dodge/Render/HUD.hs	339;"	f
+combineInventoryExtra	src/Dodge/Render/HUD.hs	333;"	f
 combineItemListYouX	src/Dodge/Combine.hs	36;"	f
 combineList	src/Dodge/Combine.hs	21;"	f
 combineRooms	src/Dodge/Room/Procedural.hs	132;"	f
@@ -3025,7 +3025,7 @@ cylinderIndices	src/Shader/Poke.hs	382;"	f
 cylinderOnSeg	src/Geometry.hs	122;"	f
 cylinderPoly	src/Shape.hs	83;"	f
 cylinderRoundIndices	src/Shader/Poke.hs	389;"	f
-dShadCol	src/Dodge/Render/List.hs	217;"	f
+dShadCol	src/Dodge/Render/List.hs	220;"	f
 damMatSideEffect	src/Dodge/Material/Damage.hs	20;"	f
 damThingHitWith	src/Dodge/Damage.hs	72;"	f
 damToExpBarrel	src/Dodge/Barreloid.hs	53;"	f
@@ -3284,7 +3284,7 @@ drawCircCollisionTest	src/Dodge/Debug/Picture.hs	118;"	f
 drawCliff	src/Dodge/Render/ShapePicture.hs	57;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
 drawCombFilter	src/Dodge/Render/Picture.hs	267;"	f
-drawCombineInventory	src/Dodge/Render/HUD.hs	188;"	f
+drawCombineInventory	src/Dodge/Render/HUD.hs	187;"	f
 drawConcurrentMessage	src/Dodge/Render/Picture.hs	72;"	f
 drawCoord	src/Dodge/Debug/Picture.hs	386;"	f
 drawCountMod	src/Shader.hs	20;"	f
@@ -3294,7 +3294,7 @@ drawCreature	src/Dodge/Render/ShapePicture.hs	73;"	f
 drawCreatureDisplayTexts	src/Dodge/Debug/Picture.hs	199;"	f
 drawCross	src/Dodge/Render/Label.hs	24;"	f
 drawCrossCol	src/Dodge/Render/Label.hs	21;"	f
-drawCursorAt	src/Dodge/Render/List.hs	79;"	f
+drawCursorAt	src/Dodge/Render/List.hs	80;"	f
 drawCursorByTerminalStatus	src/Dodge/Render/Picture.hs	137;"	f
 drawDDATest	src/Dodge/Debug/Picture.hs	303;"	f
 drawDamSensor	src/Dodge/Machine/Draw.hs	36;"	f
@@ -3308,7 +3308,7 @@ drawDragSelecting	src/Dodge/Render/HUD.hs	159;"	f
 drawEmptySet	src/Dodge/Render/Picture.hs	151;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	7;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	128;"	f
-drawExamineInventory	src/Dodge/Render/HUD.hs	199;"	f
+drawExamineInventory	src/Dodge/Render/HUD.hs	196;"	f
 drawExplosiveBall	src/Dodge/EnergyBall/Draw.hs	15;"	f
 drawFarWallDetect	src/Dodge/Debug/Picture.hs	270;"	f
 drawFlame	src/Dodge/Flame/Draw.hs	8;"	f
@@ -3320,23 +3320,23 @@ drawHUD	src/Dodge/Render/HUD.hs	53;"	f
 drawInputMenu	src/Dodge/Render/MenuScreen.hs	33;"	f
 drawInspectWall	src/Dodge/Debug/Picture.hs	255;"	f
 drawInspectWalls	src/Dodge/Debug/Picture.hs	243;"	f
-drawInventory	src/Dodge/Render/HUD.hs	60;"	f
+drawInventory	src/Dodge/Render/HUD.hs	61;"	f
-drawItemChildrenConnect	src/Dodge/Render/HUD.hs	331;"	f
+drawItemChildrenConnect	src/Dodge/Render/HUD.hs	325;"	f
-drawItemConnections	src/Dodge/Render/HUD.hs	321;"	f
+drawItemConnections	src/Dodge/Render/HUD.hs	318;"	f
 drawJumpDown	src/Dodge/Render/Picture.hs	190;"	f
 drawLabCrossCol	src/Dodge/Render/Label.hs	8;"	f
-drawLabelledList	src/Dodge/Render/List.hs	207;"	f
+drawLabelledList	src/Dodge/Render/List.hs	210;"	f
 drawLaser	src/Dodge/Laser/Update.hs	29;"	f
 drawLightSource	src/Dodge/LightSource/Draw.hs	7;"	f
 drawLinearShockwave	src/Dodge/LinearShockwave/Draw.hs	10;"	f
-drawList	src/Dodge/Render/List.hs	204;"	f
+drawList	src/Dodge/Render/List.hs	207;"	f
-drawListElement	src/Dodge/Render/List.hs	181;"	f
+drawListElement	src/Dodge/Render/List.hs	184;"	f
-drawListYgapScaleYoff	src/Dodge/Render/List.hs	98;"	f
+drawListYgapScaleYoff	src/Dodge/Render/List.hs	99;"	f
-drawListYoff	src/Dodge/Render/List.hs	95;"	f
+drawListYoff	src/Dodge/Render/List.hs	96;"	f
 drawLoadingScreen	src/Dodge/Render/MenuScreen.hs	24;"	f
 drawMachine	src/Dodge/Machine/Draw.hs	17;"	f
 drawMapperAR	src/Dodge/Targeting/Draw.hs	12;"	f
-drawMapperInventory	src/Dodge/Render/HUD.hs	179;"	f
+drawMapperInventory	src/Dodge/Render/HUD.hs	178;"	f
 drawMenuClick	src/Dodge/Render/Picture.hs	166;"	f
 drawMenuCursor	src/Dodge/Render/Picture.hs	178;"	f
 drawMenuOrHUD	src/Dodge/Render/Picture.hs	67;"	f
@@ -3353,17 +3353,17 @@ drawPointLabel	src/Dodge/Render/Label.hs	13;"	f
 drawProjectile	src/Dodge/Projectile/Draw.hs	13;"	f
 drawPulseBall	src/Dodge/Render/ShapePicture.hs	65;"	f
 drawQuitTerminal	src/Dodge/Render/Picture.hs	145;"	f
-drawRBOptions	src/Dodge/Render/HUD.hs	253;"	f
+drawRBOptions	src/Dodge/Render/HUD.hs	250;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	14;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	38;"	f
 drawReturn	src/Dodge/Render/Picture.hs	154;"	f
-drawRootCursor	src/Dodge/Render/HUD.hs	79;"	f
+drawRootCursor	src/Dodge/Render/HUD.hs	83;"	f
-drawSSCursor	src/Dodge/SelectionSections/Draw.hs	31;"	f
+drawSSCursor	src/Dodge/SelectionSections/Draw.hs	32;"	f
-drawSSMultiCursor	src/Dodge/SelectionSections/Draw.hs	37;"	f
+drawSSMultiCursor	src/Dodge/SelectionSections/Draw.hs	38;"	f
 drawSelect	src/Dodge/Render/Picture.hs	255;"	f
-drawSelectionList	src/Dodge/Render/List.hs	36;"	f
+drawSelectionList	src/Dodge/Render/List.hs	37;"	f
-drawSelectionListBackground	src/Dodge/Render/List.hs	59;"	f
+drawSelectionListBackground	src/Dodge/Render/List.hs	60;"	f
-drawSelectionSections	src/Dodge/SelectionSections/Draw.hs	16;"	f
+drawSelectionSections	src/Dodge/SelectionSections/Draw.hs	17;"	f
 drawShaderLay	src/Shader.hs	9;"	f
 drawShadowsByImportance	src/Dodge/Shadows.hs	8;"	f
 drawShell	src/Dodge/Projectile/Draw.hs	22;"	f
@@ -3374,12 +3374,12 @@ drawSubInventory	src/Dodge/Render/HUD.hs	170;"	f
 drawSwitch	src/Dodge/Button/Draw.hs	16;"	f
 drawSwitchWire	src/Dodge/LevelGen/Switch.hs	24;"	f
 drawTargetingAR	src/Dodge/Targeting/Draw.hs	20;"	f
-drawTerminalCursorLink	src/Dodge/Render/HUD.hs	389;"	f
+drawTerminalCursorLink	src/Dodge/Render/HUD.hs	384;"	f
-drawTerminalDisplay	src/Dodge/Render/HUD.hs	356;"	f
+drawTerminalDisplay	src/Dodge/Render/HUD.hs	350;"	f
 drawTeslaArc	src/Dodge/Tesla/Draw.hs	9;"	f
 drawText	src/Picture/Base.hs	224;"	f
 drawTitle	src/Dodge/Render/MenuScreen.hs	49;"	f
-drawTitleBackground	src/Dodge/Render/List.hs	52;"	f
+drawTitleBackground	src/Dodge/Render/List.hs	53;"	f
 drawTractorBeam	src/Dodge/TractorBeam/Draw.hs	7;"	f
 drawTurret	src/Dodge/Machine/Draw.hs	92;"	f
 drawVerticalDoubleArrow	src/Dodge/Render/Picture.hs	210;"	f
@@ -3447,7 +3447,7 @@ epText	src/Dodge/Inventory/SelectionList.hs	79;"	f
 eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	5;"	f
 eqTypeToSites	src/Dodge/Inventory/RBList.hs	77;"	f
-equipAllocString	src/Dodge/Render/HUD.hs	312;"	f
+equipAllocString	src/Dodge/Render/HUD.hs	309;"	f
 equipAttachPos	src/Dodge/Item/Draw.hs	30;"	f
 equipBackgroundEffect	src/Dodge/Euse.hs	14;"	f
 equipInfo	src/Dodge/Item/Info.hs	141;"	f
@@ -3529,7 +3529,7 @@ flockACC	src/Dodge/Creature/ReaderUpdate.hs	96;"	f
 flockArmourChaseCrit	src/Dodge/Creature/ArmourChase.hs	14;"	f
 flockChaseTarget	src/Dodge/Creature/Boid.hs	188;"	f
 flockPointTarget	src/Dodge/Creature/Boid.hs	204;"	f
-floorItemPickupInfo	src/Dodge/Render/HUD.hs	233;"	f
+floorItemPickupInfo	src/Dodge/Render/HUD.hs	230;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	124;"	f
 floorTo	src/Geometry/Zone.hs	12;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
@@ -3995,7 +3995,7 @@ linksDAGToPath	src/Dodge/Room/Path.hs	13;"	f
 linksOnPath	src/Dodge/Room/CheckConsistency.hs	6;"	f
 listConfig	src/Dodge/Menu.hs	234;"	f
 listControls	src/Dodge/Menu.hs	246;"	f
-listCursorChooseBorderScale	src/Dodge/Render/List.hs	129;"	f
+listCursorChooseBorderScale	src/Dodge/Render/List.hs	132;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	196;"	f
 listSelectionColorPicture	src/Dodge/DisplayInventory.hs	302;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
@@ -4095,7 +4095,7 @@ makePathBetween	src/Dodge/Path.hs	63;"	f
 makePathBetweenPs	src/Dodge/Path.hs	87;"	f
 makePathUsing	src/Dodge/Path.hs	51;"	f
 makePoisonExplosionAt	src/Dodge/WorldEvent/Explosion.hs	24;"	f
-makeSelectionListPictures	src/Dodge/Render/List.hs	73;"	f
+makeSelectionListPictures	src/Dodge/Render/List.hs	74;"	f
 makeShaderProgram	src/Shader/Compile.hs	74;"	f
 makeShaderVBO	src/Shader/Compile.hs	24;"	f
 makeShockwaveAt	src/Dodge/WorldEvent/Shockwave.hs	11;"	f
@@ -4649,7 +4649,7 @@ renderInfoListAt	src/Dodge/Render/InfoBox.hs	18;"	f
 renderInfoListsAt	src/Dodge/Render/InfoBox.hs	45;"	f
 renderLayer	src/Render.hs	224;"	f
 renderLightingNoShadows	src/Render.hs	51;"	f
-renderListAt	src/Dodge/Render/List.hs	186;"	f
+renderListAt	src/Dodge/Render/List.hs	189;"	f
 renderShadows	src/Render.hs	119;"	f
 replaceNullWith	src/Dodge/Creature/ReaderUpdate.hs	168;"	f
 replacePutID	src/Dodge/Placement/Instance/Wall.hs	81;"	f
@@ -4810,9 +4810,9 @@ seedStartOptions	src/Dodge/Menu.hs	90;"	f
 segOnCirc	src/Geometry.hs	113;"	f
 selNumPos	src/Dodge/Render/HUD.hs	462;"	f
 selNumPosCardinal	src/Dodge/Render/HUD.hs	479;"	f
-selSecDrawCursor	src/Dodge/Render/List.hs	124;"	f
+selSecDrawCursor	src/Dodge/Render/List.hs	127;"	f
-selSecDrawCursorAt	src/Dodge/Render/List.hs	107;"	f
+selSecDrawCursorAt	src/Dodge/Render/List.hs	108;"	f
-selSecSelCol	src/Dodge/Render/HUD.hs	506;"	f
+selSecSelCol	src/Dodge/Render/HUD.hs	499;"	f
 selSecSelSize	src/Dodge/SelectionSections.hs	143;"	f
 selSecYint	src/Dodge/SelectionSections.hs	152;"	f
 selectedItemScroll	src/Dodge/Update/Scroll.hs	51;"	f
@@ -5047,8 +5047,8 @@ ssScrollMinOnFail	src/Dodge/SelectionSections.hs	44;"	f
 ssScrollUsing	src/Dodge/SelectionSections.hs	37;"	f
 ssSetCursor	src/Dodge/SelectionSections.hs	59;"	f
 ssfold	src/FoldableHelp.hs	105;"	f
-stackPicturesAt	src/Dodge/Render/List.hs	101;"	f
+stackPicturesAt	src/Dodge/Render/List.hs	102;"	f
-stackPicturesAtOff	src/Dodge/Render/List.hs	104;"	f
+stackPicturesAtOff	src/Dodge/Render/List.hs	105;"	f
 stackText	src/Picture/Base.hs	189;"	f
 stackedInventory	src/Dodge/Creature.hs	309;"	f
 startCr	src/Dodge/Creature.hs	90;"	f
@@ -5196,7 +5196,7 @@ toFloatVAs	src/Shader/Compile.hs	66;"	f
 toLabel	src/Dodge/Cleat.hs	16;"	f
 toMultiset	src/Multiset.hs	64;"	f
 toOnward	src/Dodge/Tree/Compose.hs	101;"	f
-toTopLeft	src/Dodge/Render/List.hs	221;"	f
+toTopLeft	src/Dodge/Render/List.hs	224;"	f
 toV2	src/Geometry/Data.hs	54;"	f
 toV3	src/Geometry/Data.hs	57;"	f
 toV4	src/Geometry/Data.hs	60;"	f
@@ -5599,7 +5599,7 @@ yV2	src/Geometry/Vector.hs	205;"	f
 yellow	src/Color.hs	44;"	f
 you	src/Dodge/Base/You.hs	13;"	f
 youDropItem	src/Dodge/Creature/Action.hs	177;"	f
-yourAugmentedItem	src/Dodge/Render/HUD.hs	240;"	f
+yourAugmentedItem	src/Dodge/Render/HUD.hs	237;"	f
 yourControl	src/Dodge/Creature/YourControl.hs	28;"	f
 yourDefaultStrideLength	src/Dodge/Default/Creature.hs	110;"	f
 yourInfo	src/Dodge/Creature/Info.hs	10;"	f