diff --git a/src/Dodge/Inventory/SelectionList.hs b/src/Dodge/Inventory/SelectionList.hs index 2aec75535..24b4d5601 100644 --- a/src/Dodge/Inventory/SelectionList.hs +++ b/src/Dodge/Inventory/SelectionList.hs @@ -49,15 +49,31 @@ invSelectionItem w indent loc = pics = itemDisplay w cr ci itemDisplay :: World -> Creature -> ComposedItem -> [String] -itemDisplay w cr ci = - zipWithDefaults - id - (leftPad 15 ' ') - itemDisplayPad +itemDisplay w cr ci = f (basicItemDisplay itm) (itemNumberDisplay w cr ci) + `g` anyhotkey where itm = ci ^. _1 + NInt itid = itm ^. itID + f (x:xs) (y:_) = itemDisplayPad x y : xs + f xs _ = xs + g (x:xs) (y:_) = (rightPad 15 ' ' x ++ y) : xs + g xs _ = xs +-- anyhotkey = [" [E]"] + anyhotkey = maybe [] ((:[]) . hotkeyToString) + (w ^? cWorld . lWorld . imHotkeys . unNIntMap . ix itid) + +--itemDisplay :: World -> Creature -> ComposedItem -> [String] +--itemDisplay w cr ci = +-- zipWithDefaults +-- id +-- (leftPad 15 ' ') +-- itemDisplayPad +-- (basicItemDisplay itm) +-- (itemNumberDisplay w cr ci) +-- where +-- itm = ci ^. _1 zipWithDefaults :: (a -> c) -> (b -> c) -> (a -> b -> c) -> [a] -> [b] -> [c] zipWithDefaults f g h = go @@ -74,6 +90,28 @@ itemDisplayPad ls rs -- this can change, but probably won't when (say) dropped and then picked up -- again -- that is to say, it should not change based on functional positioning +--itemNumberDisplay :: World -> Creature -> ComposedItem -> String +--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 +-- = "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 +-- | UseAttach (APProjectiles x) <- ci ^. _1 . itUse = show x +-- | UseScope OpticScope{_opticZoom = x} <- ci ^. _1 . itUse = shortShow x +-- | Just t <- ci ^? _1 . itType . ibtIntroScanType = introScanDisplay cr t +-- | otherwise = mempty + itemNumberDisplay :: World -> Creature -> ComposedItem -> [String] itemNumberDisplay w cr ci | Just x <- ci ^? _1 . itUse . uInt = [show x] @@ -91,7 +129,6 @@ itemNumberDisplay w cr ci ["!TARG!"] | Just x <- ci ^? _1 . itConsumables . magLoadStatus . iaLoaded = [shortShow x] | UseAttach (APInt i) <- ci ^. _1 . itUse = [show i] --- | UseAttach (APLinkProjectile i) <- ci ^. _1 . itUse = [show i] | UseAttach (APProjectiles x) <- ci ^. _1 . itUse = [show x] | UseScope OpticScope{_opticZoom = x} <- ci ^. _1 . itUse = [shortShow x] | Just t <- ci ^? _1 . itType . ibtIntroScanType = [introScanDisplay cr t] diff --git a/tags b/tags index e92eff1e2..8fe73e78f 100644 --- a/tags +++ b/tags @@ -511,7 +511,7 @@ Dirt src/Dodge/Data/Material.hs 11;" C DisasterType src/Dodge/Data/Scenario.hs 24;" t Display src/Dodge/Item/Display.hs 2;" m DisplayInventory src/Dodge/Data/HUD.hs 19;" C -DisplayInventory src/Dodge/DisplayInventory.hs 6;" m +DisplayInventory src/Dodge/DisplayInventory.hs 7;" m DisplayTerminal src/Dodge/Data/HUD.hs 42;" C Distortion src/Dodge/Data/Distortion.hs 12;" t Distortion src/Dodge/Data/Distortion.hs 6;" m @@ -3405,7 +3405,7 @@ ammoMagSPic src/Dodge/Item/Draw/SPic.hs 123;" f amr src/Dodge/Item/Held/Rod.hs 44;" f analyser src/Dodge/Placement/Instance/Analyser.hs 12;" f analyserByDoor src/Dodge/Room/LasTurret.hs 76;" f -andOrRegex src/Dodge/DisplayInventory.hs 84;" f +andOrRegex src/Dodge/DisplayInventory.hs 83;" f angleBetween src/Geometry.hs 159;" f angleVV src/Geometry/Vector.hs 57;" f angleVV3 src/Geometry/Vector3D.hs 122;" f @@ -3516,7 +3516,7 @@ basicBulDams src/Dodge/Item/Weapon/Bullet.hs 23;" f basicCrPict src/Dodge/Creature/Picture.hs 26;" f basicCrShape src/Dodge/Creature/Picture.hs 34;" f basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f -basicItemDisplay src/Dodge/Item/Display.hs 44;" f +basicItemDisplay src/Dodge/Item/Display.hs 21;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMachineUpdate src/Dodge/Machine.hs 13;" f basicMuzFlare src/Dodge/HeldUse.hs 313;" f @@ -3617,7 +3617,7 @@ chaseCritAwarenessUpdate src/Dodge/Creature/Perception.hs 69;" f chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 112;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 30;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 43;" f -checkCombineSelectionExists src/Dodge/DisplayInventory.hs 106;" f +checkCombineSelectionExists src/Dodge/DisplayInventory.hs 105;" f checkConnection src/Dodge/Inventory/Swap.hs 64;" f checkDeath src/Dodge/Creature/State.hs 78;" f checkEndGame src/Dodge/Update.hs 703;" f @@ -3625,7 +3625,7 @@ checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 16;" f -checkInventorySelectionExists src/Dodge/DisplayInventory.hs 99;" f +checkInventorySelectionExists src/Dodge/DisplayInventory.hs 98;" f checkTermDist src/Dodge/Update.hs 311;" f checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f @@ -3667,9 +3667,9 @@ 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 78;" f -closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 63;" f -closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 92;" f +closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 161;" f +closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 146;" f +closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 175;" f closeObjectInfo src/Dodge/Render/HUD.hs 223;" f closestCreatureID src/Dodge/Debug.hs 116;" f closestPointOnLine src/Geometry/Intersect.hs 251;" f @@ -3689,7 +3689,7 @@ colCrsWalls src/Dodge/WallCreatureCollisions.hs 17;" f colSpark src/Dodge/Spark.hs 47;" f colSparkRandDir src/Dodge/Spark.hs 101;" f collectDamageTypes src/Dodge/Damage.hs 32;" f -collectInvItems src/Dodge/Update/Input/InGame.hs 308;" f +collectInvItems src/Dodge/Update/Input/InGame.hs 310;" f collideCircWalls src/Dodge/Base/Collide.hs 158;" f collidePoint src/Dodge/Base/Collide.hs 49;" f collidePointTestFilter src/Dodge/Base/Collide.hs 93;" f @@ -3723,7 +3723,7 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f conEffects src/Dodge/Concurrent.hs 13;" f concBall src/Dodge/WorldEvent/SpawnParticle.hs 27;" f -concurrentIS src/Dodge/Update/Input/InGame.hs 300;" f +concurrentIS src/Dodge/Update/Input/InGame.hs 302;" f connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f connectionBlurb src/Dodge/Terminal.hs 102;" f connectionBlurbLines src/Dodge/Terminal.hs 47;" f @@ -4008,10 +4008,9 @@ disconnectTerminal src/Dodge/Terminal.hs 217;" f displayConfig src/Dodge/Menu.hs 196;" f displayControls src/Dodge/Menu.hs 206;" f displayFrameTicks src/Dodge/Render/Picture.hs 39;" f -displayFreeSlots src/Dodge/DisplayInventory.hs 221;" f -displayIndents src/Dodge/DisplayInventory.hs 121;" f -displayPulse src/Dodge/Item/Display.hs 136;" f -displaySectionsSizes src/Dodge/DisplayInventory.hs 116;" f +displayFreeSlots src/Dodge/DisplayInventory.hs 207;" f +displayIndents src/Dodge/DisplayInventory.hs 115;" f +displayPulse src/Dodge/Inventory/SelectionList.hs 120;" f displayTerminalLineString src/Dodge/Update.hs 447;" f dist src/Geometry/Vector.hs 179;" f dist3 src/Geometry/Vector3D.hs 101;" f @@ -4053,7 +4052,7 @@ doDebugTestF6 src/Dodge/Update/Input/DebugTest.hs 40;" f doDebugTestF7 src/Dodge/Update/Input/DebugTest.hs 48;" f doDebugTestF8 src/Dodge/Update/Input/DebugTest.hs 56;" f doDrWdWd src/Dodge/DrWdWd.hs 16;" f -doDrag src/Dodge/Update/Input/InGame.hs 105;" f +doDrag src/Dodge/Update/Input/InGame.hs 106;" f doDrawing src/Dodge/Render.hs 35;" f doDrawing' src/Dodge/Render.hs 46;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f @@ -4085,13 +4084,13 @@ doPropUpdates src/Dodge/Prop/Update.hs 36;" f doQuickload src/Dodge/Save.hs 82;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 7;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 455;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 457;" f doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f doRoomShift src/Dodge/Room/Link.hs 33;" f doScopeZoom src/Dodge/Update/Scroll.hs 82;" f -doSectionSize src/Dodge/DisplayInventory.hs 243;" f +doSectionSize src/Dodge/DisplayInventory.hs 226;" f doSideEffects appDodge/Main.hs 120;" f doStep src/Dodge/ArcStep.hs 9;" f doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 164;" f @@ -4213,8 +4212,8 @@ drawRadarSweep src/Dodge/RadarSweep/Draw.hs 14;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 37;" f drawReturn src/Dodge/Render/Picture.hs 123;" f drawRootCursor src/Dodge/Render/HUD.hs 71;" f -drawSSCursor src/Dodge/SelectionSections/Draw.hs 32;" f -drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 43;" f +drawSSCursor src/Dodge/SelectionSections/Draw.hs 34;" f +drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 45;" f drawSelect src/Dodge/Render/Picture.hs 209;" f drawSelectionList src/Dodge/Render/List.hs 35;" f drawSelectionListBackground src/Dodge/Render/List.hs 51;" f @@ -4281,9 +4280,9 @@ 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 -endCombineRegex src/Dodge/Update/Input/InGame.hs 271;" f -endRegex src/Dodge/Update/Input/InGame.hs 258;" f -enterCombineInv src/Dodge/DisplayInventory.hs 355;" f +endCombineRegex src/Dodge/Update/Input/InGame.hs 273;" f +endRegex src/Dodge/Update/Input/InGame.hs 260;" f +enterCombineInv src/Dodge/DisplayInventory.hs 341;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 5;" f eqSiteToPositions src/Dodge/Inventory/RBList.hs 75;" f @@ -4332,7 +4331,7 @@ fdiv src/ShortShow.hs 26;" f feet src/Dodge/Creature/Picture.hs 53;" f ffoldM src/Framebuffer/Update.hs 79;" f filter3 src/FoldableHelp.hs 76;" f -filterSectionsPair src/Dodge/DisplayInventory.hs 190;" f +filterSectionsPair src/Dodge/DisplayInventory.hs 176;" f findBlips src/Dodge/RadarSweep.hs 62;" f findBoundDists src/Dodge/Update/Camera.hs 205;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f @@ -4444,7 +4443,7 @@ getAttachedSFLink src/Dodge/HeldUse.hs 364;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 112;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulletType src/Dodge/HeldUse.hs 471;" f -getCloseObj src/Dodge/Update/Input/InGame.hs 550;" f +getCloseObj src/Dodge/Update/Input/InGame.hs 552;" f getCommands src/Dodge/Terminal.hs 117;" f getCommandsHelp src/Dodge/Terminal.hs 75;" f getCrDexterity src/Dodge/Creature/Statistics.hs 11;" f @@ -4572,7 +4571,7 @@ holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 47;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 70;" f -hotkeyToString src/Dodge/Inventory/SelectionList.hs 43;" f +hotkeyToString src/Dodge/Inventory/SelectionList.hs 126;" f humanoidAIList src/Dodge/Humanoid.hs 181;" f iShape src/Dodge/Placement/Instance/LightSource.hs 73;" f icosahedronPoints src/Polyhedra/Geodesic.hs 12;" f @@ -4643,19 +4642,19 @@ 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/Item/Display.hs 131;" f +introScanDisplay src/Dodge/Inventory/SelectionList.hs 115;" 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 invDP src/Dodge/ListDisplayParams.hs 30;" f -invDimColor src/Dodge/DisplayInventory.hs 215;" f +invDimColor src/Dodge/DisplayInventory.hs 201;" f invHead src/Dodge/Render/HUD.hs 404;" f invItemLocUpdate src/Dodge/Creature/State.hs 178;" f invLDT src/Dodge/Item/Grammar.hs 269;" f invRootItemEffs src/Dodge/Creature/State.hs 171;" f invRootMap src/Dodge/Item/Grammar.hs 278;" f invRootTrees src/Dodge/Item/Grammar.hs 299;" f -invSelectionItem src/Dodge/Inventory/SelectionList.hs 22;" f +invSelectionItem src/Dodge/Inventory/SelectionList.hs 26;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f invSideEff src/Dodge/Creature/State.hs 165;" f invSize src/Dodge/Inventory/CheckSlots.hs 25;" f @@ -4676,7 +4675,7 @@ isCognizant src/Dodge/Creature/Perception.hs 105;" f isConnected src/Dodge/Inventory/Swap.hs 74;" f isElectrical src/Dodge/Data/Damage.hs 42;" f isFrictionless src/Dodge/Creature/State.hs 439;" f -isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 189;" f +isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 190;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f isLHS src/Geometry/LHS.hs 8;" f @@ -4699,13 +4698,13 @@ isotriBWH src/Geometry/Polygon.hs 20;" f itDim src/Dodge/Item/InvSize.hs 21;" f itInvHeight src/Dodge/Item/InvSize.hs 11;" f itemBaseConnections src/Dodge/Item/Grammar.hs 186;" f -itemBaseName src/Dodge/Item/Display.hs 56;" f +itemBaseName src/Dodge/Item/Display.hs 44;" f itemBlips src/Dodge/RadarSweep.hs 93;" f 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/Item/Display.hs 21;" f -itemDisplayPad src/Dodge/Item/Display.hs 39;" f +itemDisplay src/Dodge/Inventory/SelectionList.hs 51;" f +itemDisplayPad src/Dodge/Inventory/SelectionList.hs 84;" f itemEquipPict src/Dodge/Item/Draw.hs 16;" f itemFromAmmoMag src/Dodge/Item.hs 39;" f itemFromAttachType src/Dodge/Item.hs 48;" f @@ -4714,13 +4713,13 @@ itemFromEquipType src/Dodge/Item.hs 63;" f itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemInfo src/Dodge/Item/Info.hs 14;" f itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f -itemNumberDisplay src/Dodge/Item/Display.hs 108;" f +itemNumberDisplay src/Dodge/Inventory/SelectionList.hs 92;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f itemSPic src/Dodge/Item/Draw/SPic.hs 34;" f itemScan src/Dodge/Item/Scope.hs 62;" f itemScroll src/Dodge/Update/Scroll.hs 47;" f -itemString src/Dodge/Item/Display.hs 52;" f +itemString src/Dodge/Item/Display.hs 40;" f itemToBreakLists src/Dodge/Item/Grammar.hs 59;" f itemToFunction src/Dodge/Item/Grammar.hs 138;" f itemTreeSPic src/Dodge/Item/Draw/SPic.hs 22;" f @@ -4810,7 +4809,7 @@ listConfig src/Dodge/Menu.hs 199;" f listControls src/Dodge/Menu.hs 212;" f listCursorChooseBorderScale src/Dodge/Render/List.hs 135;" f listGuard src/Dodge/Creature/ReaderUpdate.hs 188;" f -listSelectionColorPicture src/Dodge/DisplayInventory.hs 338;" f +listSelectionColorPicture src/Dodge/DisplayInventory.hs 326;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f llleft src/Dodge/Item/Grammar.hs 195;" f llright src/Dodge/Item/Grammar.hs 201;" f @@ -4946,11 +4945,11 @@ maybeClearPath src/Dodge/Block.hs 75;" f maybeClearPaths src/Dodge/Block.hs 72;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 584;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 586;" f maybeOpenTerminal src/Dodge/Update.hs 122;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 116;" f -maybeWarmupStatus src/Dodge/Item/Display.hs 142;" f +maybeWarmupStatus src/Dodge/Item/Display.hs 29;" f mcApplyDamage src/Dodge/Machine/Update.hs 108;" f mcKillBut src/Dodge/Machine/Destroy.hs 34;" f mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f @@ -5123,7 +5122,7 @@ optionScreenUpdate src/Dodge/Update/Input/ScreenLayer.hs 41;" f optionValueOffset src/Dodge/Menu/Option.hs 89;" f optionsOptions src/Dodge/Menu.hs 108;" f optionsToSelections src/Dodge/Menu/Option.hs 51;" f -orRegex src/Dodge/DisplayInventory.hs 87;" f +orRegex src/Dodge/DisplayInventory.hs 86;" f orange src/Color.hs 25;" f orderAround3 src/Geometry/Vector3D.hs 105;" f orderAroundFirst src/Geometry/Polygon.hs 82;" f @@ -5166,7 +5165,7 @@ parseNum src/Dodge/Debug/Terminal.hs 75;" f pathConnected src/Dodge/Room/CheckConsistency.hs 14;" f pathEdgeObstructed src/Dodge/Path.hs 43;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 537;" f +pauseGame src/Dodge/Update/Input/InGame.hs 539;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f @@ -5224,7 +5223,7 @@ placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 89;" f placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 70;" f placeString src/Dodge/Render/MenuScreen.hs 64;" f placeWallPoly src/Dodge/Placement/PlaceSpot.hs 162;" f -plainRegex src/Dodge/DisplayInventory.hs 218;" f +plainRegex src/Dodge/DisplayInventory.hs 204;" f playIfFree src/Sound.hs 136;" f playPositionalSoundQueue src/Sound.hs 144;" f playSoundAndUpdate src/Sound.hs 54;" f @@ -5459,8 +5458,8 @@ reflectInParam src/Geometry.hs 247;" f reflectLaserAlong src/Dodge/Item/Weapon/LaserPath.hs 13;" f refract src/Dodge/Item/Weapon/LaserPath.hs 40;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 39;" f -regexCombs src/Dodge/DisplayInventory.hs 73;" f -regexList src/Dodge/DisplayInventory.hs 346;" f +regexCombs src/Dodge/DisplayInventory.hs 71;" f +regexList src/Dodge/DisplayInventory.hs 332;" f reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 448;" f reloadLevelStart src/Dodge/Save.hs 71;" f reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 446;" f @@ -5627,8 +5626,8 @@ seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 378;" f seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 540;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 203;" f secondColumnParams src/Dodge/ListDisplayParams.hs 43;" f -sectionsDesiredLines src/Dodge/DisplayInventory.hs 227;" f -sectionsSizes src/Dodge/DisplayInventory.hs 232;" f +sectionsDesiredLines src/Dodge/DisplayInventory.hs 213;" f +sectionsSizes src/Dodge/DisplayInventory.hs 216;" f seedStartMenu src/Dodge/Menu.hs 79;" f seedStartOptions src/Dodge/Menu.hs 82;" f segOnCirc src/Geometry.hs 116;" f @@ -5676,7 +5675,7 @@ setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f setRBCreatureTargeting src/Dodge/Creature/State.hs 408;" f -setSelWhileDragging src/Dodge/Update/Input/InGame.hs 344;" f +setSelWhileDragging src/Dodge/Update/Input/InGame.hs 346;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 85;" f setShaderSource src/Shader/Compile.hs 290;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5727,9 +5726,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftDraw src/Dodge/Render/ShapePicture.hs 67;" f shiftDraw' src/Dodge/Render/ShapePicture.hs 73;" f shiftInBy src/Dodge/PlacementSpot.hs 236;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 318;" f -shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 357;" f -shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 351;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 320;" f +shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 359;" f +shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 353;" f shiftLinkBy src/Dodge/Room/Link.hs 87;" f shiftPSBy src/Dodge/Placement/Shift.hs 12;" f shiftPathBy src/Dodge/Room/Link.hs 92;" f @@ -5762,11 +5761,11 @@ shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 536;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 81;" f shoulderSH src/Dodge/Creature/Picture.hs 139;" f shoulderSP src/Dodge/Creature/HandPos.hs 170;" f -showAttachItem src/Dodge/Item/Display.hs 86;" f -showEquipItem src/Dodge/Item/Display.hs 100;" f +showAttachItem src/Dodge/Item/Display.hs 74;" f +showEquipItem src/Dodge/Item/Display.hs 88;" f showInt src/Dodge/Item/Info.hs 67;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f -showInventoryPathing src/Dodge/Item/Display.hs 80;" f +showInventoryPathing src/Dodge/Item/Display.hs 68;" f showManObj src/Dodge/TestString.hs 76;" f showTerminalError src/Dodge/Debug/Terminal.hs 78;" f showTimeFlow src/Dodge/TestString.hs 99;" f @@ -5830,7 +5829,7 @@ soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 98;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 48;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 85;" f -spaceAction src/Dodge/Update/Input/InGame.hs 540;" f +spaceAction src/Dodge/Update/Input/InGame.hs 542;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 190;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 183;" f spanLS src/Dodge/Placement/Instance/LightSource.hs 175;" f @@ -5887,7 +5886,7 @@ stackText src/Picture/Base.hs 188;" f stackedInventory src/Dodge/Creature.hs 304;" f startCr src/Dodge/Creature.hs 91;" f startCrafts src/Dodge/Room/Start.hs 92;" f -startDrag src/Dodge/Update/Input/InGame.hs 283;" f +startDrag src/Dodge/Update/Input/InGame.hs 285;" f startInvList src/Dodge/Creature.hs 110;" f startInventory src/Dodge/Creature.hs 113;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f @@ -6026,7 +6025,7 @@ toTopLeft src/Dodge/Render/List.hs 219;" f toV2 src/Geometry/Data.hs 36;" f toV3 src/Geometry/Data.hs 38;" f toV4 src/Geometry/Data.hs 40;" f -toggleCombineInv src/Dodge/DisplayInventory.hs 349;" f +toggleCombineInv src/Dodge/DisplayInventory.hs 335;" f toggleCommand src/Dodge/Terminal.hs 196;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 94;" f toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 132;" f @@ -6102,13 +6101,13 @@ truncate src/Polyhedra/Geodesic.hs 38;" f trunkDepth src/TreeHelp.hs 161;" f tryAttachItems src/Dodge/Item/Grammar.hs 22;" f tryClickUse src/Dodge/Creature/YourControl.hs 177;" f -tryCombine src/Dodge/Update/Input/InGame.hs 574;" f -tryDropSelected src/Dodge/Update/Input/InGame.hs 123;" f +tryCombine src/Dodge/Update/Input/InGame.hs 576;" f +tryDropSelected src/Dodge/Update/Input/InGame.hs 124;" f tryGetChannel src/Sound.hs 96;" f tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f tryGetRootItemInvID src/Dodge/Inventory/Location.hs 29;" f tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 36;" f -tryPickupSelected src/Dodge/Update/Input/InGame.hs 130;" f +tryPickupSelected src/Dodge/Update/Input/InGame.hs 131;" f tryPlay src/Sound.hs 83;" f tryPutFloorItemIDInInv src/Dodge/Inventory/Add.hs 26;" f tryPutItemInInv src/Dodge/Inventory/Add.hs 42;" f @@ -6156,7 +6155,7 @@ updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla.hs 91;" f updateArc src/Dodge/Tesla/Arc.hs 100;" f updateAttachedItems src/Dodge/Creature/State.hs 265;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 489;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 491;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 25;" f @@ -6175,46 +6174,46 @@ updateCreatureGroups src/Dodge/Update.hs 516;" f updateCreatureSoundPositions src/Dodge/Update.hs 492;" f updateDebugMessageOffset src/Dodge/Update.hs 91;" f updateDelayedEvents src/Dodge/Update.hs 794;" f -updateDisplaySections src/Dodge/DisplayInventory.hs 127;" f +updateDisplaySections src/Dodge/DisplayInventory.hs 121;" f updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortions src/Dodge/Update.hs 537;" f updateEnergyBall src/Dodge/EnergyBall.hs 45;" f updateEnergyBalls src/Dodge/Update.hs 563;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 516;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 518;" f updateExpBarrel src/Dodge/Barreloid.hs 19;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 70;" f updateFlames src/Dodge/Update.hs 560;" f updateFloatingCamera src/Dodge/Update/Camera.hs 32;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 374;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 367;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 376;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 369;" f updateGusts src/Dodge/Update.hs 714;" f updateHeldRootItem src/Dodge/Creature/State.hs 259;" f updateHumanoid src/Dodge/Humanoid.hs 13;" f updateIMl src/Dodge/Update.hs 506;" f updateIMl' src/Dodge/Update.hs 511;" f updateInGameCamera src/Dodge/Update/Camera.hs 76;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 435;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 437;" f updateInv src/Dodge/Creature/State.hs 160;" f -updateInventoryPositioning src/Dodge/DisplayInventory.hs 92;" f +updateInventoryPositioning src/Dodge/DisplayInventory.hs 91;" f updateItemTargeting src/Dodge/Creature/State.hs 377;" f updateItemWithOrientation src/Dodge/Creature/State.hs 285;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 429;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 417;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 431;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 419;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 13;" f updateLasers src/Dodge/Update.hs 436;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 449;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 451;" f updateMachine src/Dodge/Machine/Update.hs 19;" f updateMagnets src/Dodge/Update.hs 307;" f -updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 195;" f +updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 196;" f updateMouseContext src/Dodge/Update.hs 319;" f updateMouseContextGame src/Dodge/Update.hs 324;" f -updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 95;" f -updateMouseInGame src/Dodge/Update/Input/InGame.hs 85;" f -updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 156;" f +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 157;" f updateMovement src/Dodge/Creature/State.hs 429;" f updateObjCatMaybes src/Dodge/Update.hs 528;" f updateObjMapMaybe src/Dodge/Update.hs 521;" f @@ -6235,8 +6234,8 @@ updateRenderSplit appDodge/Main.hs 108;" f updateRootItemID src/Dodge/Inventory/Location.hs 35;" f updateScopeZoom src/Dodge/Update/Scroll.hs 70;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f -updateSection src/Dodge/DisplayInventory.hs 292;" f -updateSectionsPositioning src/Dodge/DisplayInventory.hs 269;" f +updateSection src/Dodge/DisplayInventory.hs 274;" f +updateSectionsPositioning src/Dodge/DisplayInventory.hs 252;" f updateSeenWalls src/Dodge/Update.hs 683;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f updateShockwaves src/Dodge/Update.hs 557;" f @@ -6256,7 +6255,7 @@ updateUniverse src/Dodge/Update.hs 70;" f updateUniverseFirst src/Dodge/Update.hs 82;" f updateUniverseLast src/Dodge/Update.hs 132;" f updateUniverseMid src/Dodge/Update.hs 154;" f -updateUseInputInGame src/Dodge/Update/Input/InGame.hs 41;" f +updateUseInputInGame src/Dodge/Update/Input/InGame.hs 42;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 21;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 12;" f updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f @@ -6434,7 +6433,7 @@ zipArcs src/Dodge/Tesla.hs 103;" f zipArcs src/Dodge/Tesla/Arc.hs 110;" f zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 118;" f -zipWithDefaults src/Dodge/Item/Display.hs 32;" f +zipWithDefaults src/Dodge/Inventory/SelectionList.hs 77;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f zoneClouds src/Dodge/Update.hs 444;" f zoneCreature src/Dodge/Zoning/Creature.hs 53;" f