From de6bbe7697d0195aa9434d042416a45bf3c79fc1 Mon Sep 17 00:00:00 2001 From: justin Date: Wed, 24 Dec 2025 20:10:03 +0000 Subject: [PATCH] Fix terminal mouse over positioning --- src/Dodge/ListDisplayParams.hs | 5 +- src/Dodge/Render/HUD.hs | 2 +- src/Dodge/Render/List.hs | 11 ++ src/Dodge/Update.hs | 22 ++-- tags | 212 ++++++++++++++++----------------- 5 files changed, 132 insertions(+), 120 deletions(-) diff --git a/src/Dodge/ListDisplayParams.hs b/src/Dodge/ListDisplayParams.hs index 2d956662e..b76d9d050 100644 --- a/src/Dodge/ListDisplayParams.hs +++ b/src/Dodge/ListDisplayParams.hs @@ -1,8 +1,8 @@ module Dodge.ListDisplayParams ( invDP, --- secDP, invCursorParams, secondColumnLDP, + terminalLDP, subInvX, menuLDP, ) where @@ -42,6 +42,9 @@ invCursorParams w = BoundaryCursor $ case w ^? hud . subInventory of secondColumnLDP :: LDParams secondColumnLDP = defaultLDP & ldpPos . spPixelOff .~ V2 subInvX (-20) +terminalLDP :: LDParams +terminalLDP = secondColumnLDP & ldpBorder ?~ (49, 16) + subInvX :: Float subInvX = 10 * fromIntegral topInvW + 170 diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs index a6dea3c13..c52e4d6c5 100644 --- a/src/Dodge/Render/HUD.hs +++ b/src/Dodge/Render/HUD.hs @@ -364,7 +364,7 @@ drawTerminalDisplay w cfig tid = fold $ do TerminalTextInput s -> (++ [(getPromptTM ++ s ++ [cFilledRect], white)]) TerminalPressTo s -> (++ [(s, white)]) return $ - drawSelectionList (secondColumnLDP & ldpBorder ?~ (49, 16)) cfig f + drawSelectionList terminalLDP cfig f <> drawTerminalCursorLink w cfig tm where -- <> tm ^. tmButtonID diff --git a/src/Dodge/Render/List.hs b/src/Dodge/Render/List.hs index f91c8a2b2..427fa8986 100644 --- a/src/Dodge/Render/List.hs +++ b/src/Dodge/Render/List.hs @@ -15,6 +15,7 @@ module Dodge.Render.List ( drawTitleBackground, -- should be renamed, made sensible drawCursorAt, drawLabelledList, + ldpRect, ) where import Data.Maybe @@ -47,6 +48,16 @@ drawSelectionList ldps cfig sl = (-5) (10 * sf * fromIntegral x) +ldpRect :: Config -> LDParams -> Maybe (Point2, Point2) -- (NW, SE) +ldpRect cfig ldp = do + (x,y) <- ldp ^? ldpBorder . _Just + return $ ( V2 (-5) 5 + , V2 (10 * sf * fromIntegral x) (negate $ (20 * sf + ygap) * fromIntegral y + 5) + ) & each +~ screenPosAbs cfig (ldp ^. ldpPos) + where + sf = ldp ^. ldpScale + ygap = ldp ^. ldpVerticalGap + drawTitleBackground :: Config -> Picture drawTitleBackground cfig = translateScreenPos cfig (fromTopLeft (V2 (subInvX - 5) 75)) diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index 188b0e003..8a2ab940d 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -3,6 +3,7 @@ module Dodge.Update (updateUniverse) where +import Dodge.Render.List import Data.Foldable import qualified Data.Set as S import Color @@ -399,19 +400,16 @@ getMenuMouseContext screen u = case screen ^. scOptions of return $ if t then MouseMenuClick yi else NoMouseContext isOverTerminalScreen :: Config -> Point2 -> Bool -isOverTerminalScreen cfig (V2 x y) = - x <= xmax - && x >= xmin - 5 - && y <= ymax + 5 - && y >= ymin +isOverTerminalScreen cfig (V2 x y) = fromMaybe False $ do + (V2 xmin ymax, V2 xmax ymin) <- ldpRect cfig terminalLDP + return $ x <= xmax && x >= xmin && y <= ymax && y >= ymin where - --ldp = secondColumnLDP - ldp = invDP - V2 xmin ymax = screenPosAbs cfig (ldp ^. ldpPos) - tsize = fromIntegral $ getMaxLinesTM + 1 - s = 5 + tsize * (20 * ldp ^. ldpScale + ldp ^. ldpVerticalGap) - ymin = ymax - s - xmax = xmin + 555 -- HACK drawSelectionListBackground +-- ldp = terminalLDP +-- V2 xmin ymax = screenPosAbs cfig (ldp ^. ldpPos) +-- tsize = fromIntegral $ getMaxLinesTM + 1 +-- s = 5 + tsize * (20 * ldp ^. ldpScale + ldp ^. ldpVerticalGap) +-- ymin = ymax - s +-- xmax = xmin + 555 -- HACK drawSelectionListBackground updateWheelEvents :: World -> World updateWheelEvents w = case w ^. input . scrollAmount of diff --git a/tags b/tags index 244d54fa6..b4ddf5bfd 100644 --- a/tags +++ b/tags @@ -2544,7 +2544,7 @@ addToTrunk src/TreeHelp.hs 157;" f addWarningTerminal src/Dodge/Room/Warning.hs 61;" f addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 81;" f -advanceScrollAmount src/Dodge/Update.hs 421;" f +advanceScrollAmount src/Dodge/Update.hs 418;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 33;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 60;" f aimDelaySweep src/Dodge/Render/Picture.hs 285;" f @@ -2795,7 +2795,7 @@ checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkConnection src/Dodge/Inventory/Swap.hs 66;" f checkDeath src/Dodge/Creature/Update.hs 70;" f checkDeath' src/Dodge/Creature/Update.hs 73;" f -checkEndGame src/Dodge/Update.hs 774;" f +checkEndGame src/Dodge/Update.hs 771;" f checkErrorGL src/Shader/Compile.hs 86;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f @@ -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 153;" f +chooseCursorBorders src/Dodge/Render/List.hs 142;" 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 225;" f +closeObjectInfo src/Dodge/Render/HUD.hs 224;" 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 333;" f +combineInventoryExtra src/Dodge/Render/HUD.hs 332;" f combineItemListYouX src/Dodge/Combine.hs 36;" f combineList src/Dodge/Combine.hs 21;" f combineRooms src/Dodge/Room/Procedural.hs 132;" f @@ -2927,7 +2927,7 @@ crAwayFromPost src/Dodge/Creature/Test.hs 85;" f crBlips src/Dodge/RadarSweep.hs 88;" f crCamouflage src/Dodge/Creature/Picture.hs 33;" f crCanSeeCr src/Dodge/Creature/Test.hs 52;" f -crCrSpring src/Dodge/Update.hs 884;" f +crCrSpring src/Dodge/Update.hs 881;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 62;" f crDexterity src/Dodge/Creature/Statistics.hs 19;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 39;" f @@ -2958,7 +2958,7 @@ crRad src/Dodge/Creature/Radius.hs 7;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 74;" f crSetRoots src/Dodge/Inventory/Location.hs 55;" f crShape src/Dodge/Creature/Shape.hs 8;" f -crSpring src/Dodge/Update.hs 881;" f +crSpring src/Dodge/Update.hs 878;" f crStratConMatches src/Dodge/Creature/Test.hs 80;" f crStrength src/Dodge/Creature/Statistics.hs 29;" f crUpdate src/Dodge/Creature/Update.hs 63;" 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 220;" f +dShadCol src/Dodge/Render/List.hs 209;" f damMatSideEffect src/Dodge/Material/Damage.hs 20;" f damThingHitWith src/Dodge/Damage.hs 72;" f damToExpBarrel src/Dodge/Barreloid.hs 53;" f @@ -3173,7 +3173,7 @@ displayFrameTicks src/Dodge/Render/Picture.hs 50;" f displayFreeSlots src/Dodge/DisplayInventory.hs 193;" f displayIndents src/Dodge/DisplayInventory.hs 110;" f displayPulse src/Dodge/Inventory/SelectionList.hs 182;" f -displayTerminalLineString src/Dodge/Update.hs 486;" f +displayTerminalLineString src/Dodge/Update.hs 483;" f dist src/Geometry/Vector.hs 185;" f dist3 src/Geometry/Vector3D.hs 101;" f distributeAmmoToItem src/Dodge/WorldEffect.hs 148;" f @@ -3233,7 +3233,7 @@ doPreload appDodge/Main.hs 132;" f doQuickload src/Dodge/Save.hs 83;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 7;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 447;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 448;" f doRoomPlacements src/Dodge/Layout.hs 104;" f doRoomShift src/Dodge/Room/Link.hs 33;" f doScopeZoom src/Dodge/Update/Scroll.hs 91;" f @@ -3251,7 +3251,7 @@ doWdBl src/Dodge/WorldBool.hs 10;" f doWdCrBl src/Dodge/CreatureEffect.hs 18;" f doWdP2f src/Dodge/WdP2f.hs 10;" f doWdWd src/Dodge/WorldEffect.hs 34;" f -doWorldEvents src/Dodge/Update.hs 430;" f +doWorldEvents src/Dodge/Update.hs 427;" f doWorldPos src/Dodge/WorldPos.hs 10;" f door src/Dodge/Room/Door.hs 13;" f doorBetween src/Dodge/Placement/Instance/Door.hs 38;" 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 187;" f +drawCombineInventory src/Dodge/Render/HUD.hs 186;" 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 80;" f +drawCursorAt src/Dodge/Render/List.hs 74;" 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 @@ -3303,12 +3303,12 @@ drawDrag src/Dodge/Render/Picture.hs 198;" f drawDragDrop src/Dodge/Render/Picture.hs 227;" f drawDragPickup src/Dodge/Render/Picture.hs 236;" f drawDragSelect src/Dodge/Render/Picture.hs 195;" f -drawDragSelected src/Dodge/Render/HUD.hs 141;" f -drawDragSelecting src/Dodge/Render/HUD.hs 159;" f +drawDragSelected src/Dodge/Render/HUD.hs 140;" f +drawDragSelecting src/Dodge/Render/HUD.hs 158;" 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 196;" f +drawExamineInventory src/Dodge/Render/HUD.hs 195;" 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 @@ -3321,28 +3321,28 @@ 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 61;" f -drawItemChildrenConnect src/Dodge/Render/HUD.hs 325;" f -drawItemConnections src/Dodge/Render/HUD.hs 318;" f +drawItemChildrenConnect src/Dodge/Render/HUD.hs 324;" f +drawItemConnections src/Dodge/Render/HUD.hs 317;" f drawJumpDown src/Dodge/Render/Picture.hs 190;" f drawLabCrossCol src/Dodge/Render/Label.hs 8;" f -drawLabelledList src/Dodge/Render/List.hs 210;" f +drawLabelledList src/Dodge/Render/List.hs 199;" 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 207;" f -drawListElement src/Dodge/Render/List.hs 184;" f -drawListYgapScaleYoff src/Dodge/Render/List.hs 99;" f -drawListYoff src/Dodge/Render/List.hs 96;" f +drawList src/Dodge/Render/List.hs 196;" f +drawListElement src/Dodge/Render/List.hs 173;" f +drawListYgapScaleYoff src/Dodge/Render/List.hs 93;" f +drawListYoff src/Dodge/Render/List.hs 90;" 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 178;" f +drawMapperInventory src/Dodge/Render/HUD.hs 177;" 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 drawMenuScreen src/Dodge/Render/MenuScreen.hs 18;" f drawMouseCursor src/Dodge/Render/Picture.hs 83;" f -drawMouseOver src/Dodge/Render/HUD.hs 112;" f +drawMouseOver src/Dodge/Render/HUD.hs 111;" f drawMousePosition src/Dodge/Debug/Picture.hs 376;" f drawOptions src/Dodge/Render/MenuScreen.hs 36;" f drawPathBetween src/Dodge/Debug/Picture.hs 202;" f @@ -3353,16 +3353,15 @@ 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 250;" f +drawRBOptions src/Dodge/Render/HUD.hs 249;" 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 83;" f +drawRootCursor src/Dodge/Render/HUD.hs 82;" f drawSSCursor src/Dodge/SelectionSections/Draw.hs 32;" f drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 38;" f drawSelect src/Dodge/Render/Picture.hs 255;" f -drawSelectionList src/Dodge/Render/List.hs 37;" f -drawSelectionListBackground src/Dodge/Render/List.hs 60;" f +drawSelectionList src/Dodge/Render/List.hs 35;" f drawSelectionSections src/Dodge/SelectionSections/Draw.hs 17;" f drawShaderLay src/Shader.hs 9;" f drawShadowsByImportance src/Dodge/Shadows.hs 8;" f @@ -3370,16 +3369,16 @@ drawShell src/Dodge/Projectile/Draw.hs 22;" f drawShockwave src/Dodge/Shockwave/Draw.hs 6;" f drawSpark src/Dodge/Spark/Draw.hs 7;" f drawStaticBall src/Dodge/EnergyBall/Draw.hs 28;" f -drawSubInventory src/Dodge/Render/HUD.hs 170;" f +drawSubInventory src/Dodge/Render/HUD.hs 169;" 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 384;" f -drawTerminalDisplay src/Dodge/Render/HUD.hs 350;" f +drawTerminalCursorLink src/Dodge/Render/HUD.hs 383;" f +drawTerminalDisplay src/Dodge/Render/HUD.hs 349;" 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 53;" f +drawTitleBackground src/Dodge/Render/List.hs 61;" 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 +3446,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 309;" f +equipAllocString src/Dodge/Render/HUD.hs 308;" 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 +3528,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 230;" f +floorItemPickupInfo src/Dodge/Render/HUD.hs 229;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 124;" f floorTo src/Geometry/Zone.hs 12;" f floorWire src/Dodge/Wire.hs 13;" f @@ -3573,7 +3572,7 @@ gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomsFromRooms src/Dodge/Layout.hs 149;" f gameplayMenu src/Dodge/Menu.hs 154;" f gameplayMenuOptions src/Dodge/Menu.hs 157;" f -gasEffect src/Dodge/Update.hs 799;" f +gasEffect src/Dodge/Update.hs 796;" f gasType src/Dodge/HeldUse.hs 1107;" f gassesNearPoint src/Dodge/Zoning/Cloud.hs 12;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 23;" f @@ -3593,7 +3592,7 @@ getAutoSpringLinks src/Dodge/Item/Grammar.hs 85;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 173;" f getBulletType src/Dodge/HeldUse.hs 906;" f -getCloseObj src/Dodge/Update/Input/InGame.hs 533;" f +getCloseObj src/Dodge/Update/Input/InGame.hs 534;" f getCommand src/Dodge/Terminal.hs 52;" f getCommands src/Dodge/Terminal.hs 49;" f getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f @@ -3616,7 +3615,7 @@ getPJStabiliser src/Dodge/HeldUse.hs 1243;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 3;" f getRoomsFromInts src/Dodge/Room/Tutorial.hs 328;" f -getRootItemBounds src/Dodge/Render/HUD.hs 103;" f +getRootItemBounds src/Dodge/Render/HUD.hs 102;" f getRootItemInvID src/Dodge/Inventory/Location.hs 35;" f getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f getSmoothScrollValue src/Dodge/SmoothScroll.hs 21;" f @@ -3805,7 +3804,7 @@ invDP src/Dodge/ListDisplayParams.hs 31;" f invDT src/Dodge/Item/Grammar.hs 217;" f invDT' src/Dodge/Item/Grammar.hs 222;" f invDimColor src/Dodge/DisplayInventory.hs 187;" f -invHead src/Dodge/Render/HUD.hs 413;" f +invHead src/Dodge/Render/HUD.hs 412;" f invIMDT src/Dodge/Item/Grammar.hs 246;" f invIndents src/Dodge/Item/Grammar.hs 253;" f invItemEffs src/Dodge/Creature/State.hs 63;" f @@ -3950,6 +3949,7 @@ lastMap src/Dodge/DoubleTree.hs 253;" f latticeXsYs src/Grid.hs 24;" f launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f layoutLevelFromSeed src/Dodge/LevelGen.hs 40;" f +ldpRect src/Dodge/Render/List.hs 51;" f ldpSelection src/Dodge/Update/Input/ScreenLayer.hs 84;" f ldtIL src/Dodge/DoubleTree.hs 225;" f ldtPropagate src/Dodge/DoubleTree.hs 69;" f @@ -3995,12 +3995,12 @@ 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 132;" f +listCursorChooseBorderScale src/Dodge/Render/List.hs 121;" f listGuard src/Dodge/Creature/ReaderUpdate.hs 196;" f listSelectionColorPicture src/Dodge/DisplayInventory.hs 302;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f lmt src/MatrixHelper.hs 53;" f -lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 402;" f +lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 401;" f loadDodgeConfig src/Dodge/Config.hs 30;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f loadMuzzle src/Dodge/HeldUse.hs 630;" 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 74;" f +makeSelectionListPictures src/Dodge/Render/List.hs 68;" f makeShaderProgram src/Shader/Compile.hs 74;" f makeShaderVBO src/Shader/Compile.hs 24;" f makeShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 11;" f @@ -4127,7 +4127,7 @@ maybeBlockedPassage src/Dodge/Room/RezBox.hs 80;" f maybeClearLoadingScreen src/Dodge/StartNewGame.hs 58;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 59;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 64;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 562;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 563;" f maybeOpenConsole src/Dodge/Update.hs 126;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 116;" f @@ -4161,7 +4161,7 @@ memoCylinderIndices src/Shader/Poke.hs 323;" f memoFlatIndices src/Shader/Poke.hs 311;" f memoTopPrismEdgeIndices src/Shader/Poke.hs 329;" f memoTopPrismIndices src/Shader/Poke.hs 317;" f -menuLDP src/Dodge/ListDisplayParams.hs 51;" f +menuLDP src/Dodge/ListDisplayParams.hs 54;" f menuOptionToSelectionItem src/Dodge/Menu/Option.hs 91;" f merge src/ListHelp.hs 84;" f mergeBy src/ListHelp.hs 87;" f @@ -4245,7 +4245,7 @@ muzzleRandPos src/Dodge/HeldUse.hs 773;" f mvButton src/Dodge/Placement/PlaceSpot.hs 175;" f mvCr src/Dodge/Placement/PlaceSpot.hs 178;" f mvFS src/Dodge/Placement/PlaceSpot.hs 184;" f -mvGust src/Dodge/Update.hs 790;" f +mvGust src/Dodge/Update.hs 787;" f mvLS src/Dodge/Placement/PlaceSpot.hs 219;" f mvPointAlongAtSpeed src/Dodge/Base.hs 121;" f mvPointMeleeTarg src/Dodge/Creature/Boid.hs 327;" f @@ -4354,12 +4354,12 @@ passthroughLockKeyLists src/Dodge/Floor.hs 120;" f pathConnected src/Dodge/Room/CheckConsistency.hs 13;" f pathEdgeObstructed src/Dodge/Path.hs 66;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 525;" f +pauseGame src/Dodge/Update/Input/InGame.hs 526;" f pauseMenu src/Dodge/Menu.hs 59;" f pauseMenuOptions src/Dodge/Menu.hs 66;" f pauseSound src/Dodge/SoundLogic.hs 42;" f pauseTime src/Dodge/Update.hs 188;" f -pbFlicker src/Dodge/Update.hs 471;" f +pbFlicker src/Dodge/Update.hs 468;" f pbsHit src/Dodge/WorldEvent/ThingsHit.hs 97;" f peZoneSize src/Dodge/Zoning/Pathing.hs 49;" f pedestalRoom src/Dodge/Room/Containing.hs 50;" f @@ -4568,7 +4568,7 @@ rLauncher src/Dodge/Item/Held/Launcher.hs 14;" f rLauncherX src/Dodge/Item/Held/Launcher.hs 30;" f rToOnward src/Dodge/Cleat.hs 21;" f radToDeg src/Geometry/Vector.hs 123;" f -radiusSpring src/Dodge/Update.hs 870;" f +radiusSpring src/Dodge/Update.hs 867;" f randBlockBreakWeapon src/Dodge/Item/Random.hs 7;" f randC1 src/Dodge/Placement/Instance/Creature.hs 8;" f randDirPS src/Dodge/PlacementSpot.hs 56;" f @@ -4590,7 +4590,7 @@ randPeakedParam src/RandomHelp.hs 130;" f randProb src/RandomHelp.hs 68;" f randSpark src/Dodge/Spark.hs 69;" f randSparkExtraVel src/Dodge/Spark.hs 92;" f -randWallReflect src/Dodge/Update.hs 646;" f +randWallReflect src/Dodge/Update.hs 643;" f randomChallenges src/Dodge/Room/Start.hs 63;" f randomCompass src/Dodge/Layout.hs 60;" f randomFourCornerRoom src/Dodge/Room/Procedural.hs 246;" 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 189;" f +renderListAt src/Dodge/Render/List.hs 178;" f renderShadows src/Render.hs 119;" f replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 168;" f replacePutID src/Dodge/Placement/Instance/Wall.hs 81;" f @@ -4808,11 +4808,10 @@ sectionsSizes src/Dodge/DisplayInventory.hs 202;" f seedStartMenu src/Dodge/Menu.hs 87;" f 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 127;" f -selSecDrawCursorAt src/Dodge/Render/List.hs 108;" f -selSecSelCol src/Dodge/Render/HUD.hs 499;" f +selNumPos src/Dodge/Render/HUD.hs 461;" f +selNumPosCardinal src/Dodge/Render/HUD.hs 478;" f +selSecDrawCursor src/Dodge/Render/List.hs 102;" f +selSecSelCol src/Dodge/Render/HUD.hs 498;" f selSecSelSize src/Dodge/SelectionSections.hs 143;" f selSecYint src/Dodge/SelectionSections.hs 152;" f selectedItemScroll src/Dodge/Update/Scroll.hs 51;" f @@ -4845,7 +4844,7 @@ setLinkType src/Dodge/RoomLink.hs 78;" f setLinkTypePD src/Dodge/RoomLink.hs 85;" f setMusicVolume src/Sound.hs 163;" f setMvPos src/Dodge/Creature/ReaderUpdate.hs 58;" f -setOldPos src/Dodge/Update.hs 505;" f +setOldPos src/Dodge/Update.hs 502;" f setOutLinks src/Dodge/RoomLink.hs 50;" f setOutLinksByType src/Dodge/RoomLink.hs 75;" f setOutLinksPD src/Dodge/RoomLink.hs 95;" f @@ -4945,7 +4944,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f shuffleRoomPos src/Dodge/Layout.hs 82;" f shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 151;" f -simpleCrSprings src/Dodge/Update.hs 875;" f +simpleCrSprings src/Dodge/Update.hs 872;" f simpleTermMessage src/Dodge/Terminal.hs 164;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 720;" f sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 496;" f @@ -4998,7 +4997,7 @@ soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 85;" f -spaceAction src/Dodge/Update/Input/InGame.hs 528;" f +spaceAction src/Dodge/Update/Input/InGame.hs 529;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 173;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 166;" f spanLS src/Dodge/Placement/Instance/LightSource.hs 158;" f @@ -5047,8 +5046,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 102;" f -stackPicturesAtOff src/Dodge/Render/List.hs 105;" f +stackPicturesAt src/Dodge/Render/List.hs 96;" f +stackPicturesAtOff src/Dodge/Render/List.hs 99;" f stackText src/Picture/Base.hs 189;" f stackedInventory src/Dodge/Creature.hs 309;" f startCr src/Dodge/Creature.hs 90;" f @@ -5082,7 +5081,7 @@ strideRot src/Dodge/Item/HeldOffset.hs 71;" f stringToList src/Picture/Base.hs 317;" f stringToListGrad src/Picture/Text.hs 12;" f stripZ src/Geometry/Vector3D.hs 97;" f -subInvX src/Dodge/ListDisplayParams.hs 45;" f +subInvX src/Dodge/ListDisplayParams.hs 48;" f subMap src/TreeHelp.hs 119;" f subZipWith src/Dodge/Placement/Instance/Wall.hs 94;" f succB src/Dodge/Debug.hs 113;" f @@ -5127,6 +5126,7 @@ teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f termScreenColor src/Dodge/Terminal/Color.hs 8;" f termSoundLine src/Dodge/Terminal.hs 43;" f termTextColor src/Dodge/Terminal.hs 46;" f +terminalLDP src/Dodge/ListDisplayParams.hs 45;" f terminalReturnEffect src/Dodge/Terminal.hs 168;" f terminalSPic src/Dodge/Machine/Draw.hs 45;" f terminalScreenGlow src/Dodge/Machine/Update.hs 42;" f @@ -5187,7 +5187,7 @@ tlDoEffect src/Dodge/Terminal.hs 102;" f tlSetStatus src/Dodge/Terminal.hs 99;" f tmDistributeAmmo src/Dodge/WorldEffect.hs 117;" f tmDistributeLines src/Dodge/Room/Room.hs 449;" f -tmUpdate src/Dodge/Update.hs 489;" f +tmUpdate src/Dodge/Update.hs 486;" f toBinary src/Dodge/Inventory/SelectionList.hs 144;" f toBothLnk src/Dodge/RoomLink.hs 136;" f toClosestMultiple src/HelpNum.hs 3;" 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 224;" f +toTopLeft src/Dodge/Render/List.hs 213;" f toV2 src/Geometry/Data.hs 54;" f toV3 src/Geometry/Data.hs 57;" f toV4 src/Geometry/Data.hs 60;" f @@ -5210,7 +5210,7 @@ tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 704;" f tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f -topInvW src/Dodge/ListDisplayParams.hs 48;" f +topInvW src/Dodge/ListDisplayParams.hs 51;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f topTestPart src/Dodge/TestString.hs 50;" f @@ -5268,7 +5268,7 @@ truncate src/Polyhedra/Geodesic.hs 39;" f trunkDepth src/TreeHelp.hs 162;" f tryAttachItems src/Dodge/Item/Grammar.hs 34;" f tryClickUse src/Dodge/Creature/YourControl.hs 237;" f -tryCombine src/Dodge/Update/Input/InGame.hs 545;" f +tryCombine src/Dodge/Update/Input/InGame.hs 546;" f tryDrawToCapacitor src/Dodge/Creature/State.hs 151;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 138;" f tryGetChannel src/Sound.hs 98;" f @@ -5325,69 +5325,69 @@ unusedSpotNearInLink src/Dodge/PlacementSpot.hs 196;" f updateAimPos src/Dodge/Update.hs 310;" f updateAllNodes src/TreeHelp.hs 86;" f updateArc src/Dodge/Tesla.hs 44;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 478;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 479;" f updateBarrel src/Dodge/Barreloid.hs 44;" f updateBarreloid src/Dodge/Barreloid.hs 16;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 34;" f updateBounds src/Dodge/Update/Camera.hs 265;" f updateBulVel src/Dodge/Bullet.hs 57;" f updateBullet src/Dodge/Bullet.hs 22;" f -updateBullets src/Dodge/Update.hs 568;" f +updateBullets src/Dodge/Update.hs 565;" f updateCamera src/Dodge/Update/Camera.hs 31;" f updateCloseObjects src/Dodge/Inventory.hs 115;" f -updateCloud src/Dodge/Update.hs 803;" f -updateClouds src/Dodge/Update.hs 672;" f +updateCloud src/Dodge/Update.hs 800;" f +updateClouds src/Dodge/Update.hs 669;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 40;" f updateCombineSections src/Dodge/DisplayInventory.hs 47;" f updateCreature src/Dodge/Creature/Update.hs 32;" f updateCreature' src/Dodge/Creature/Update.hs 41;" f -updateCreatureGroups src/Dodge/Update.hs 540;" f -updateCreatureSoundPositions src/Dodge/Update.hs 519;" f -updateDebris src/Dodge/Update.hs 575;" f +updateCreatureGroups src/Dodge/Update.hs 537;" f +updateCreatureSoundPositions src/Dodge/Update.hs 516;" f +updateDebris src/Dodge/Update.hs 572;" f updateDebrisChunk src/Dodge/Prop/Moving.hs 16;" f updateDebugMessageOffset src/Dodge/Update.hs 95;" f -updateDelayedEvents src/Dodge/Update.hs 904;" f +updateDelayedEvents src/Dodge/Update.hs 901;" f updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f updateDistortion src/Dodge/Distortion.hs 8;" f -updateDistortions src/Dodge/Update.hs 561;" f +updateDistortions src/Dodge/Update.hs 558;" f updateDoor src/Dodge/Door.hs 22;" f updateDoors src/Dodge/Update.hs 315;" f -updateDust src/Dodge/Update.hs 850;" f -updateDusts src/Dodge/Update.hs 678;" f +updateDust src/Dodge/Update.hs 847;" f +updateDusts src/Dodge/Update.hs 675;" f updateEdge src/Dodge/Path.hs 43;" f updateEdgeWallObs src/Dodge/Update/WallDamage.hs 39;" f updateEdgesWall src/Dodge/Update/WallDamage.hs 23;" f updateEdgesWall' src/Dodge/Update/WallDamage.hs 36;" f updateEnergyBall src/Dodge/EnergyBall.hs 31;" f -updateEnergyBalls src/Dodge/Update.hs 663;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 505;" f +updateEnergyBalls src/Dodge/Update.hs 660;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 506;" f updateExpBarrel src/Dodge/Barreloid.hs 21;" f updateFlame src/Dodge/Flame.hs 19;" f -updateFlames src/Dodge/Update.hs 660;" f +updateFlames src/Dodge/Update.hs 657;" f updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f updateFunctionKey src/Dodge/Update/Input/InGame.hs 363;" f updateFunctionKeys src/Dodge/Update/Input/InGame.hs 359;" f -updateGas src/Dodge/Update.hs 825;" f -updateGasses src/Dodge/Update.hs 675;" f -updateGusts src/Dodge/Update.hs 787;" f -updateIMl src/Dodge/Update.hs 534;" f -updateIMl' src/Dodge/Update.hs 537;" f +updateGas src/Dodge/Update.hs 822;" f +updateGasses src/Dodge/Update.hs 672;" f +updateGusts src/Dodge/Update.hs 784;" f +updateIMl src/Dodge/Update.hs 531;" f +updateIMl' src/Dodge/Update.hs 534;" f updateInGameCamera src/Dodge/Update/Camera.hs 84;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 428;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 429;" f updateInt2Map src/Dodge/Zoning/Base.hs 94;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f updateItemTargeting src/Dodge/Creature/State.hs 260;" f updateKeyContinueTerminal src/Dodge/Update/Input/InGame.hs 396;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 422;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 423;" f updateKeysInGame src/Dodge/Update/Input/InGame.hs 83;" f updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 382;" f updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 405;" f updateLampoid src/Dodge/Lampoid.hs 13;" f updateLaser src/Dodge/Laser/Update.hs 11;" f -updateLasers src/Dodge/Update.hs 437;" f +updateLasers src/Dodge/Update.hs 434;" f updateLeftParentSF src/Dodge/Item/Grammar.hs 170;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 441;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 442;" f updateMachine src/Dodge/Machine/Update.hs 24;" f updateMagnets src/Dodge/Update.hs 318;" f updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 203;" f @@ -5396,20 +5396,20 @@ updateMouseContextGame src/Dodge/Update.hs 336;" f updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 96;" f updateMouseInGame src/Dodge/Update/Input/InGame.hs 86;" f updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 166;" f -updateObjCatMaybes src/Dodge/Update.hs 552;" f -updateObjMapMaybe src/Dodge/Update.hs 545;" f -updatePastWorlds src/Dodge/Update.hs 426;" f +updateObjCatMaybes src/Dodge/Update.hs 549;" f +updateObjMapMaybe src/Dodge/Update.hs 542;" f +updatePastWorlds src/Dodge/Update.hs 423;" f updatePreload src/Preload/Update.hs 21;" f updateProjectile src/Dodge/Projectile/Update.hs 26;" f updatePulse src/Dodge/Creature/Update.hs 123;" f -updatePulseBall src/Dodge/Update.hs 451;" f -updatePulseLaser src/Dodge/Update.hs 615;" f -updatePulseLasers src/Dodge/Update.hs 446;" f +updatePulseBall src/Dodge/Update.hs 448;" f +updatePulseLaser src/Dodge/Update.hs 612;" f +updatePulseLasers src/Dodge/Update.hs 443;" f updateRBList src/Dodge/Inventory/RBList.hs 22;" f updateRadarBlip src/Dodge/RadarBlip.hs 11;" f -updateRadarBlips src/Dodge/Update.hs 564;" f +updateRadarBlips src/Dodge/Update.hs 561;" f updateRadarSweep src/Dodge/RadarSweep.hs 40;" f -updateRadarSweeps src/Dodge/Update.hs 666;" f +updateRadarSweeps src/Dodge/Update.hs 663;" f updateRandNode src/TreeHelp.hs 109;" f updateRenderSplit appDodge/Main.hs 104;" f updateRightParentSF src/Dodge/Item/Grammar.hs 181;" f @@ -5419,16 +5419,16 @@ updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 259;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 238;" f updateShockwave src/Dodge/Shockwave/Update.hs 8;" f -updateShockwaves src/Dodge/Update.hs 657;" f +updateShockwaves src/Dodge/Update.hs 654;" f updateSingleNodes src/TreeHelp.hs 98;" f updateSound src/Sound.hs 72;" f updateSounds src/Sound.hs 67;" f updateSpark src/Dodge/Spark.hs 19;" f -updateSparks src/Dodge/Update.hs 669;" f -updateTeslaArc src/Dodge/Update.hs 585;" f -updateTeslaArcs src/Dodge/Update.hs 582;" f +updateSparks src/Dodge/Update.hs 666;" f +updateTeslaArc src/Dodge/Update.hs 582;" f +updateTeslaArcs src/Dodge/Update.hs 579;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f -updateTractorBeams src/Dodge/Update.hs 654;" f +updateTractorBeams src/Dodge/Update.hs 651;" f updateTurret src/Dodge/Machine/Update.hs 51;" f updateUniverse src/Dodge/Update.hs 74;" f updateUniverseFirst src/Dodge/Update.hs 85;" f @@ -5439,7 +5439,7 @@ updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 24;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 11;" f updateWallDamages src/Dodge/Update/WallDamage.hs 15;" f updateWheelEvent src/Dodge/Update/Scroll.hs 25;" f -updateWheelEvents src/Dodge/Update.hs 416;" f +updateWheelEvents src/Dodge/Update.hs 413;" f updateWorldEventFlag src/Dodge/Update.hs 120;" f updateWorldEventFlags src/Dodge/Update.hs 108;" f upperBody src/Dodge/Creature/Picture.hs 121;" 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 237;" f +yourAugmentedItem src/Dodge/Render/HUD.hs 236;" 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 @@ -5615,11 +5615,11 @@ zeroZ src/Geometry/Vector.hs 9;" f zipArcs src/Dodge/Tesla.hs 52;" f zipCount src/Dodge/Tree/Shift.hs 136;" f zoneCloud src/Dodge/Zoning/Cloud.hs 33;" f -zoneClouds src/Dodge/Update.hs 478;" f +zoneClouds src/Dodge/Update.hs 475;" f zoneCreature src/Dodge/Zoning/Creature.hs 56;" f -zoneCreatures src/Dodge/Update.hs 515;" f +zoneCreatures src/Dodge/Update.hs 512;" f zoneDust src/Dodge/Zoning/Cloud.hs 57;" f -zoneDusts src/Dodge/Update.hs 483;" f +zoneDusts src/Dodge/Update.hs 480;" f zoneExtract src/Dodge/Zoning/Base.hs 58;" f zoneGas src/Dodge/Zoning/Cloud.hs 36;" f zoneIncPe src/Dodge/Zoning/Pathing.hs 66;" f