From 79bc3b2ddf2cabb9a1532127147b7f6473c9acd7 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 25 Nov 2024 18:29:01 +0000 Subject: [PATCH] Update single selection to be under mouse while dragging --- ghcidOutput | 2 +- src/Dodge/Update/Input/InGame.hs | 9 +- tags | 184 +++++++++++++++---------------- 3 files changed, 101 insertions(+), 94 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index 897dce813..103998d4e 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (594 modules, at 18:13:44) +All good (594 modules, at 18:28:59) diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 8bdf7e3c9..4000690ed 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -280,7 +280,7 @@ shiftInvItems :: IM.IntMap (SelectionItem a) -> World -> World -shiftInvItems k x ab bn xs ss w = fromMaybe w $ do +shiftInvItems k x ab bn xs ss w = setSelWhileDragging . fromMaybe w $ do let xk = fst x guard $ xk == k || xk + 1 == k || xk -1 == k (maxi,_) <- IS.maxView xs @@ -295,6 +295,13 @@ shiftInvItems k x ab bn xs ss w = fromMaybe w $ do guard $ Just (k,maxi+1) < bn return $ shiftInvItemsDown k xs w +setSelWhileDragging :: World -> World +setSelWhileDragging w = fromMaybe w $ do + (i,_,xs) <- w ^? hud . hudElement . diSelection . _Just + (k,j) <- w ^? input . mouseContext . mcoMaybeSelect . _Just + guard $ i == k && j `IS.member` xs + return $ w & hud . hudElement . diSelection . _Just . _2 .~ j + shiftInvItemsUp :: Int -> IS.IntSet -> World -> World shiftInvItemsUp j is w = IS.foldl' f w is where diff --git a/tags b/tags index 02dd61008..09e904945 100644 --- a/tags +++ b/tags @@ -3347,7 +3347,7 @@ addToTrunk src/TreeHelp.hs 156;" f addWarningTerminal src/Dodge/Room/Warning.hs 37;" f addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 77;" f -advanceScrollAmount src/Dodge/Update.hs 403;" f +advanceScrollAmount src/Dodge/Update.hs 404;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f aimDelaySweep src/Dodge/Render/Picture.hs 233;" f @@ -3589,9 +3589,9 @@ chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 112;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 30;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 46;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 101;" f -checkConnection src/Dodge/Inventory/Swap.hs 81;" f +checkConnection src/Dodge/Inventory/Swap.hs 80;" f checkDeath src/Dodge/Creature/State.hs 75;" f -checkEndGame src/Dodge/Update.hs 690;" f +checkEndGame src/Dodge/Update.hs 691;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f @@ -3618,7 +3618,7 @@ circle src/Picture/Base.hs 180;" f circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f -clClSpringVel src/Dodge/Update.hs 743;" f +clClSpringVel src/Dodge/Update.hs 744;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 166;" f @@ -3646,7 +3646,7 @@ closestCreatureID src/Dodge/Debug.hs 92;" f closestPointOnLine src/Geometry/Intersect.hs 251;" f closestPointOnLineParam src/Geometry/Intersect.hs 267;" f closestPointOnSeg src/Geometry/Intersect.hs 282;" f -cloudEffect src/Dodge/Update.hs 713;" f +cloudEffect src/Dodge/Update.hs 714;" f cloudPoisonDamage src/Dodge/Update/Cloud.hs 9;" f clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f @@ -3660,7 +3660,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 234;" f +collectInvItems src/Dodge/Update/Input/InGame.hs 264;" f collideCircWalls src/Dodge/Base/Collide.hs 149;" f collidePoint src/Dodge/Base/Collide.hs 48;" f collidePointTestFilter src/Dodge/Base/Collide.hs 93;" f @@ -3694,7 +3694,7 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f conEffects src/Dodge/Concurrent.hs 13;" f concBall src/Dodge/WorldEvent/SpawnParticle.hs 27;" f -concurrentIS src/Dodge/Update/Input/InGame.hs 226;" f +concurrentIS src/Dodge/Update/Input/InGame.hs 256;" f connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f connectionBlurb src/Dodge/Terminal.hs 102;" f connectionBlurbLines src/Dodge/Terminal.hs 47;" f @@ -3718,7 +3718,7 @@ crAdd src/Dodge/Room/RezBox.hs 104;" f crAwayFromPost src/Dodge/Creature/Test.hs 77;" f crBlips src/Dodge/RadarSweep.hs 69;" f crCanSeeCr src/Dodge/Creature/Test.hs 48;" f -crCrSpring src/Dodge/Update.hs 761;" f +crCrSpring src/Dodge/Update.hs 762;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 28;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 37;" f crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 51;" f @@ -3739,7 +3739,7 @@ crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 24;" f crOnWall src/Dodge/WallCreatureCollisions.hs 84;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 67;" f crSetRoots src/Dodge/Inventory/Location.hs 48;" f -crSpring src/Dodge/Update.hs 756;" f +crSpring src/Dodge/Update.hs 757;" f crStratConMatches src/Dodge/Creature/Test.hs 72;" f crUpdate src/Dodge/Creature/State.hs 62;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 61;" f @@ -3986,7 +3986,7 @@ displayFrameTicks src/Dodge/Render/Picture.hs 39;" f displayFreeSlots src/Dodge/DisplayInventory.hs 211;" f displayIndents src/Dodge/DisplayInventory.hs 119;" f displaySectionsSizes src/Dodge/DisplayInventory.hs 114;" f -displayTerminalLineString src/Dodge/Update.hs 432;" f +displayTerminalLineString src/Dodge/Update.hs 433;" f dist src/Geometry/Vector.hs 179;" f dist3 src/Geometry/Vector3D.hs 101;" f divTo src/Geometry/Zone.hs 6;" f @@ -4043,7 +4043,7 @@ 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 365;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 395;" f doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f @@ -4070,7 +4070,7 @@ doWdCrCr src/Dodge/CreatureEffect.hs 12;" f doWdP2f src/Dodge/WdP2f.hs 12;" f doWdWd src/Dodge/WorldEffect.hs 26;" f doWeaponRepetitions src/Dodge/HeldUse.hs 56;" f -doWorldEvents src/Dodge/Update.hs 414;" f +doWorldEvents src/Dodge/Update.hs 415;" f doWorldPos src/Dodge/WorldPos.hs 7;" f door src/Dodge/Room/Door.hs 13;" f doorBetween src/Dodge/Placement/Instance/Door.hs 39;" f @@ -4610,9 +4610,9 @@ invTrees' src/Dodge/Item/Grammar.hs 202;" f inventoryExtra src/Dodge/Render/HUD.hs 300;" f inventoryExtraH src/Dodge/Render/HUD.hs 311;" f inventoryX src/Dodge/Creature.hs 115;" f -inverseSelNumPos src/Dodge/SelectionSections.hs 224;" f -inverseSelSecYint src/Dodge/SelectionSections.hs 197;" f -inverseSelSecYintXPosCheck src/Dodge/SelectionSections.hs 208;" f +inverseSelNumPos src/Dodge/SelectionSections.hs 228;" f +inverseSelSecYint src/Dodge/SelectionSections.hs 201;" f +inverseSelSecYintXPosCheck src/Dodge/SelectionSections.hs 212;" f inverseShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 43;" f invertEncircleDistP src/Dodge/Creature/Boid.hs 13;" f invertIntMap src/IntMapHelp.hs 99;" f @@ -4623,7 +4623,7 @@ invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f isAmmoIntLink src/Dodge/HeldUse.hs 206;" f isAnimate src/Dodge/Creature/Test.hs 136;" f isCognizant src/Dodge/Creature/Perception.hs 105;" f -isConnected src/Dodge/Inventory/Swap.hs 91;" f +isConnected src/Dodge/Inventory/Swap.hs 90;" f isElectrical src/Dodge/Data/Damage.hs 42;" f isFrictionless src/Dodge/Creature/State.hs 341;" f isGas src/Dodge/Euse.hs 64;" f @@ -4635,7 +4635,7 @@ isLeftOfA src/Geometry.hs 181;" f isNothing' src/MaybeHelp.hs 33;" f isOnSeg src/Geometry.hs 240;" f isOutLnk src/Dodge/PlacementSpot.hs 164;" f -isOverTerminalScreen src/Dodge/Update.hs 381;" f +isOverTerminalScreen src/Dodge/Update.hs 382;" f isPutID src/Dodge/Placement/Instance/Wall.hs 129;" f isRHS src/Geometry/LHS.hs 24;" f isUnusedLnk src/Dodge/PlacementSpot.hs 61;" f @@ -4892,7 +4892,7 @@ makeTlsTimeRadColPos src/Dodge/LightSource.hs 88;" f makeTypeCraft src/Dodge/Item/Craftable.hs 13;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 7;" f mapOverlay src/Dodge/Render/HUD/Carte.hs 24;" f -markWallSeen src/Dodge/Update.hs 675;" f +markWallSeen src/Dodge/Update.hs 676;" f maxDamageType src/Dodge/Damage.hs 37;" f maxShowX src/Dodge/Combine/Graph.hs 49;" f maxViewDistance src/Dodge/Viewpoints.hs 26;" f @@ -4903,7 +4903,7 @@ maybeClearPath src/Dodge/Block.hs 77;" f maybeClearPaths src/Dodge/Block.hs 74;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 541;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 571;" f maybeOpenTerminal src/Dodge/Update.hs 123;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 111;" f @@ -5019,7 +5019,7 @@ mvBullet src/Dodge/Bullet.hs 33;" f mvButton src/Dodge/Placement/PlaceSpot.hs 176;" f mvCr src/Dodge/Placement/PlaceSpot.hs 186;" f mvFS src/Dodge/Placement/PlaceSpot.hs 189;" f -mvGust src/Dodge/Update.hs 704;" f +mvGust src/Dodge/Update.hs 705;" f mvLS src/Dodge/Placement/PlaceSpot.hs 217;" f mvP src/Dodge/Wall/Move.hs 54;" f mvPP src/Dodge/Placement/PlaceSpot.hs 183;" f @@ -5128,7 +5128,7 @@ parseNum src/Dodge/Debug/Terminal.hs 73;" 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 461;" f +pauseGame src/Dodge/Update/Input/InGame.hs 491;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f @@ -5275,7 +5275,7 @@ polysToPic src/Polyhedra.hs 130;" f popScreen src/Dodge/Menu/PushPop.hs 6;" f posEventEffect src/Dodge/PosEvent.hs 16;" f posRms src/Dodge/Tree/Shift.hs 44;" f -posSelSecYint src/Dodge/SelectionSections.hs 180;" f +posSelSecYint src/Dodge/SelectionSections.hs 184;" f positionRoomsFromTree src/Dodge/Tree/Shift.hs 35;" f postGenerationProcessing src/Dodge/LevelGen.hs 33;" f postUniverseLoadSideEffect src/Dodge/WorldLoad.hs 11;" f @@ -5288,7 +5288,7 @@ powlistUpToN src/Multiset.hs 23;" f powlistUpToN' src/Multiset.hs 12;" f powlistUpToN'' src/Multiset.hs 31;" f ppDraw src/Dodge/Render/ShapePicture.hs 116;" f -ppEvents src/Dodge/Update.hs 667;" f +ppEvents src/Dodge/Update.hs 668;" f ppLevelReset src/Dodge/PressPlate.hs 13;" f preCritStart src/Dodge/Room/Start.hs 82;" f preloadRender src/Preload/Render.hs 30;" f @@ -5592,14 +5592,14 @@ sectionsSizes src/Dodge/DisplayInventory.hs 222;" f seedStartMenu src/Dodge/Menu.hs 79;" f seedStartOptions src/Dodge/Menu.hs 82;" f segOnCirc src/Geometry.hs 116;" f -selCloseObj src/Dodge/Update/Input/InGame.hs 484;" f +selCloseObj src/Dodge/Update/Input/InGame.hs 514;" f selNumPos src/Dodge/Render/HUD.hs 438;" f selNumPosCardinal src/Dodge/Render/HUD.hs 461;" f selSecDrawCursor src/Dodge/Render/List.hs 130;" f selSecDrawCursorAt src/Dodge/Render/List.hs 108;" f selSecSelCol src/Dodge/Render/HUD.hs 486;" f -selSecSelSize src/Dodge/SelectionSections.hs 176;" f -selSecYint src/Dodge/SelectionSections.hs 185;" f +selSecSelSize src/Dodge/SelectionSections.hs 180;" f +selSecYint src/Dodge/SelectionSections.hs 189;" f selectCreatureDebugItem src/Dodge/Debug.hs 39;" f selectUse src/Dodge/SelectUse.hs 10;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 63;" f @@ -5632,7 +5632,7 @@ setLinkTypePD src/Dodge/RoomLink.hs 67;" f setMinInvSize src/Dodge/Creature/Action.hs 149;" f setMusicVolume src/Sound.hs 161;" f setMvPos src/Dodge/Creature/ReaderUpdate.hs 51;" f -setOldPos src/Dodge/Update.hs 456;" f +setOldPos src/Dodge/Update.hs 457;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f @@ -5687,9 +5687,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftDraw src/Dodge/Render/ShapePicture.hs 66;" f shiftDraw' src/Dodge/Render/ShapePicture.hs 72;" f shiftInBy src/Dodge/PlacementSpot.hs 236;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 244;" f -shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 274;" f -shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 268;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 274;" f +shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 304;" f +shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 298;" 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 @@ -5739,7 +5739,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f shuffleRoomPos src/Dodge/Layout.hs 78;" f shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 129;" f -simpleCrSprings src/Dodge/Update.hs 752;" f +simpleCrSprings src/Dodge/Update.hs 753;" f simpleDamFL src/Dodge/Flame.hs 41;" f simpleTermMessage src/Dodge/Terminal.hs 253;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f @@ -5788,7 +5788,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 464;" f +spaceAction src/Dodge/Update/Input/InGame.hs 494;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 186;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 179;" f spanLS src/Dodge/Placement/Instance/LightSource.hs 171;" f @@ -5822,18 +5822,18 @@ square src/Geometry/Polygon.hs 46;" f squareDecoration src/Dodge/Placement/TopDecoration.hs 41;" f squashIntersectCirclePoint src/Dodge/WallCreatureCollisions.hs 110;" f squashNormalizeV src/Geometry/Vector.hs 146;" f -ssLookupDown src/Dodge/SelectionSections.hs 95;" f -ssLookupGE' src/Dodge/SelectionSections.hs 169;" f -ssLookupGT src/Dodge/SelectionSections.hs 152;" f -ssLookupGT' src/Dodge/SelectionSections.hs 162;" f -ssLookupLE' src/Dodge/SelectionSections.hs 140;" f -ssLookupLT src/Dodge/SelectionSections.hs 120;" f -ssLookupLT' src/Dodge/SelectionSections.hs 130;" f -ssLookupMax src/Dodge/SelectionSections.hs 81;" f -ssLookupMaxInSection src/Dodge/SelectionSections.hs 113;" f -ssLookupMin src/Dodge/SelectionSections.hs 147;" f -ssLookupNextMax src/Dodge/SelectionSections.hs 104;" f -ssLookupUp src/Dodge/SelectionSections.hs 86;" f +ssLookupDown src/Dodge/SelectionSections.hs 99;" f +ssLookupGE' src/Dodge/SelectionSections.hs 173;" f +ssLookupGT src/Dodge/SelectionSections.hs 156;" f +ssLookupGT' src/Dodge/SelectionSections.hs 166;" f +ssLookupLE' src/Dodge/SelectionSections.hs 144;" f +ssLookupLT src/Dodge/SelectionSections.hs 124;" f +ssLookupLT' src/Dodge/SelectionSections.hs 134;" f +ssLookupMax src/Dodge/SelectionSections.hs 85;" f +ssLookupMaxInSection src/Dodge/SelectionSections.hs 117;" f +ssLookupMin src/Dodge/SelectionSections.hs 151;" f +ssLookupNextMax src/Dodge/SelectionSections.hs 108;" f +ssLookupUp src/Dodge/SelectionSections.hs 90;" f ssScrollMinOnFail src/Dodge/SelectionSections.hs 57;" f ssScrollUsing src/Dodge/SelectionSections.hs 47;" f ssSetCursor src/Dodge/SelectionSections.hs 72;" f @@ -5844,7 +5844,7 @@ stackText src/Picture/Base.hs 188;" f stackedInventory src/Dodge/Creature.hs 281;" f startCr src/Dodge/Creature.hs 91;" f startCrafts src/Dodge/Room/Start.hs 92;" f -startDrag src/Dodge/Update/Input/InGame.hs 205;" f +startDrag src/Dodge/Update/Input/InGame.hs 215;" f startInvList src/Dodge/Creature.hs 109;" f startInventory src/Dodge/Creature.hs 112;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f @@ -5874,10 +5874,10 @@ stripZ src/Geometry/Vector3D.hs 97;" f subInvX src/Dodge/ListDisplayParams.hs 50;" f subMap src/TreeHelp.hs 118;" f subZipWith src/Dodge/Placement/Instance/Wall.hs 115;" f -swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 72;" f +swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 71;" f swapInOutLinks src/Dodge/RoomLink.hs 80;" f swapIndices src/ListHelp.hs 50;" f -swapInvItems src/Dodge/Inventory/Swap.hs 21;" f +swapInvItems src/Dodge/Inventory/Swap.hs 20;" f swapItemWith src/Dodge/Inventory.hs 174;" f swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f swarmUsingCenter src/Dodge/Creature/Boid.hs 171;" f @@ -5968,7 +5968,7 @@ titleOptionsMenu src/Dodge/Menu.hs 99;" f titleOptionsNoWrite src/Dodge/Menu.hs 102;" f tlsTimeRadColPos src/Dodge/LightSource.hs 69;" f tlsTimeRadFunPos src/Dodge/LightSource.hs 26;" f -tmUpdate src/Dodge/Update.hs 436;" f +tmUpdate src/Dodge/Update.hs 437;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 148;" f @@ -5985,8 +5985,8 @@ toggleCombineInv src/Dodge/DisplayInventory.hs 35;" f toggleCommand src/Dodge/Terminal.hs 196;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 79;" f toggleJust src/MaybeHelp.hs 41;" f -toggleMap src/Dodge/Update/Input/InGame.hs 505;" f -toggleTweakInv src/Dodge/Update/Input/InGame.hs 518;" f +toggleMap src/Dodge/Update/Input/InGame.hs 535;" f +toggleTweakInv src/Dodge/Update/Input/InGame.hs 548;" f togglesToEffects src/Dodge/Terminal.hs 248;" f tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 474;" f tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f @@ -6057,7 +6057,7 @@ trunkDepth src/TreeHelp.hs 161;" f tryAssignHotkey src/Dodge/Creature/YourControl.hs 85;" f tryAttachBulletBelt src/Dodge/Euse.hs 40;" f tryChargeBattery src/Dodge/Euse.hs 43;" f -tryCombine src/Dodge/Update/Input/InGame.hs 527;" f +tryCombine src/Dodge/Update/Input/InGame.hs 557;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 108;" f tryGetChannel src/Sound.hs 96;" f tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f @@ -6106,82 +6106,82 @@ updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla/Arc.hs 86;" f updateAttachedItems src/Dodge/Creature/State.hs 173;" f updateAutoRecharge src/Dodge/Creature/State.hs 324;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 399;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 429;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBounds src/Dodge/Update/Camera.hs 245;" f updateBulVel src/Dodge/Bullet.hs 50;" f updateBullet src/Dodge/Bullet.hs 28;" f -updateBullets src/Dodge/Update.hs 533;" f +updateBullets src/Dodge/Update.hs 534;" f updateCamera src/Dodge/Update/Camera.hs 31;" f updateCloseObjects src/Dodge/Inventory.hs 113;" f -updateCloud src/Dodge/Update.hs 718;" f -updateClouds src/Dodge/Update.hs 562;" f +updateCloud src/Dodge/Update.hs 719;" f +updateClouds src/Dodge/Update.hs 563;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 40;" f updateCombineSections src/Dodge/DisplayInventory.hs 46;" f updateCreature src/Dodge/Creature/Update.hs 10;" f -updateCreatureGroups src/Dodge/Update.hs 502;" f -updateCreatureSoundPositions src/Dodge/Update.hs 478;" f +updateCreatureGroups src/Dodge/Update.hs 503;" f +updateCreatureSoundPositions src/Dodge/Update.hs 479;" f updateDebugMessageOffset src/Dodge/Update.hs 92;" f -updateDelayedEvents src/Dodge/Update.hs 781;" f +updateDelayedEvents src/Dodge/Update.hs 782;" f updateDisplaySections src/Dodge/DisplayInventory.hs 126;" f updateDistortion src/Dodge/Distortion.hs 5;" f -updateDistortions src/Dodge/Update.hs 523;" f +updateDistortions src/Dodge/Update.hs 524;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f -updateEnergyBalls src/Dodge/Update.hs 550;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 440;" f +updateEnergyBalls src/Dodge/Update.hs 551;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 470;" 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 71;" f -updateFlames src/Dodge/Update.hs 547;" f +updateFlames src/Dodge/Update.hs 548;" f updateFlare src/Dodge/Flare.hs 7;" f updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 291;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 284;" f -updateGusts src/Dodge/Update.hs 701;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 321;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 314;" f +updateGusts src/Dodge/Update.hs 702;" f updateHeldRootItem src/Dodge/Creature/State.hs 167;" f updateHumanoid src/Dodge/Humanoid.hs 12;" f -updateIMl src/Dodge/Update.hs 492;" f -updateIMl' src/Dodge/Update.hs 497;" f +updateIMl src/Dodge/Update.hs 493;" f +updateIMl' src/Dodge/Update.hs 498;" f updateInGameCamera src/Dodge/Update/Camera.hs 70;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 344;" f -updateInstantBullets src/Dodge/Update.hs 639;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 374;" f +updateInstantBullets src/Dodge/Update.hs 640;" f updateInv src/Dodge/Creature/State.hs 152;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f updateItemTargeting src/Dodge/Creature/State.hs 268;" f updateItemWithOrientation src/Dodge/Creature/State.hs 194;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 338;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 326;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 368;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 356;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 13;" f -updateLasers src/Dodge/Update.hs 421;" f -updateLightSources src/Dodge/Update.hs 526;" f +updateLasers src/Dodge/Update.hs 422;" f +updateLightSources src/Dodge/Update.hs 527;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 359;" f -updateMIM src/Dodge/Update.hs 652;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 389;" f +updateMIM src/Dodge/Update.hs 653;" f updateMachine src/Dodge/Machine/Update.hs 19;" f -updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 158;" f +updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 165;" f updateMouseContext src/Dodge/Update.hs 311;" f updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 90;" f updateMouseInGame src/Dodge/Update/Input/InGame.hs 82;" f updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 137;" f updateMovement src/Dodge/Creature/State.hs 331;" f -updateObjCatMaybes src/Dodge/Update.hs 514;" f -updateObjMapMaybe src/Dodge/Update.hs 507;" f -updatePastWorlds src/Dodge/Update.hs 409;" f +updateObjCatMaybes src/Dodge/Update.hs 515;" f +updateObjMapMaybe src/Dodge/Update.hs 508;" f +updatePastWorlds src/Dodge/Update.hs 410;" f updatePosEvent src/Dodge/PosEvent.hs 11;" f -updatePosEvents src/Dodge/Update.hs 559;" f +updatePosEvents src/Dodge/Update.hs 560;" f updatePreload src/Preload/Update.hs 20;" f -updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 301;" f -updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 304;" f +updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 331;" f +updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 334;" f updateProjectile src/Dodge/Projectile/Update.hs 23;" f updateProp src/Dodge/Prop/Update.hs 11;" f updateRBList src/Dodge/Inventory/RBList.hs 16;" f updateRadarBlip src/Dodge/RadarBlip.hs 8;" f -updateRadarBlips src/Dodge/Update.hs 529;" f +updateRadarBlips src/Dodge/Update.hs 530;" f updateRadarSweep src/Dodge/RadarSweep.hs 25;" f -updateRadarSweeps src/Dodge/Update.hs 553;" f +updateRadarSweeps src/Dodge/Update.hs 554;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 106;" f updateRootItemID src/Dodge/Inventory/Location.hs 35;" f @@ -6190,19 +6190,19 @@ updateScopeZoom' src/Dodge/Update/Camera.hs 132;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 286;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 259;" f -updateSeenWalls src/Dodge/Update.hs 670;" f +updateSeenWalls src/Dodge/Update.hs 671;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f -updateShockwaves src/Dodge/Update.hs 544;" f +updateShockwaves src/Dodge/Update.hs 545;" f updateSingleNodes src/TreeHelp.hs 97;" f updateSound src/Sound.hs 71;" f updateSounds src/Sound.hs 66;" f updateSpark src/Dodge/Spark.hs 19;" f -updateSparks src/Dodge/Update.hs 556;" f +updateSparks src/Dodge/Update.hs 557;" f updateTempLightSource src/Dodge/LightSource/Update.hs 7;" f updateTeslaArc src/Dodge/Tesla/Arc.hs 29;" f -updateTeslaArcs src/Dodge/Update.hs 538;" f +updateTeslaArcs src/Dodge/Update.hs 539;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f -updateTractorBeams src/Dodge/Update.hs 541;" f +updateTractorBeams src/Dodge/Update.hs 542;" f updateTurret src/Dodge/Machine/Update.hs 47;" f updateUniverse src/Dodge/Update.hs 71;" f updateUniverseFirst src/Dodge/Update.hs 83;" f @@ -6213,7 +6213,7 @@ 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 updateWheelEvent src/Dodge/Update/Scroll.hs 19;" f -updateWheelEvents src/Dodge/Update.hs 396;" f +updateWheelEvents src/Dodge/Update.hs 397;" f updateWorldEventFlag src/Dodge/Update.hs 117;" f updateWorldEventFlags src/Dodge/Update.hs 105;" f upperBody src/Dodge/Creature/Picture.hs 133;" f @@ -6385,9 +6385,9 @@ zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 118;" f zipWithDefaults src/Dodge/Item/Display.hs 21;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f -zoneClouds src/Dodge/Update.hs 429;" f +zoneClouds src/Dodge/Update.hs 430;" f zoneCreature src/Dodge/Zoning/Creature.hs 52;" f -zoneCreatures src/Dodge/Update.hs 473;" f +zoneCreatures src/Dodge/Update.hs 474;" f zoneExtract src/Dodge/Zoning/Base.hs 50;" f zoneMonoid src/Dodge/Zoning/Base.hs 80;" f zoneOfCirc src/Dodge/Zoning/Base.hs 22;" f