From 0fb6c3ec260e39c7ed0c9fe625ef9ee14017ad21 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 25 Nov 2024 22:41:39 +0000 Subject: [PATCH] Improve mouse cursor on pickup --- src/Dodge/Render/Picture.hs | 6 +- src/Dodge/Update/Input/InGame.hs | 13 ++- tags | 163 ++++++++++++++++--------------- 3 files changed, 92 insertions(+), 90 deletions(-) diff --git a/src/Dodge/Render/Picture.hs b/src/Dodge/Render/Picture.hs index 629ccfa26..9a596065d 100644 --- a/src/Dodge/Render/Picture.hs +++ b/src/Dodge/Render/Picture.hs @@ -88,9 +88,11 @@ mouseCursorType u = case u ^. uvWorld . input . mouseContext of OverInvDrag 0 Nothing _ _ -> drawDragDrop 5 OverInvDrag 0 (Just (0,_)) _ _ -> drawDrag 5 OverInvDrag 0 _ _ _ -> drawEmptySet 5 --- OverInvDrag 0 _ -> drawDragDrop 5 OverInvDrag 3 (Just (3,_)) _ _ -> drawDrag 5 - OverInvDrag 3 _ _ _ -> drawDragPickup 5 + OverInvDrag 3 (Just (0,_)) _ _ -> drawDragPickup 5 + OverInvDrag 3 (Just (1,_)) _ _ -> drawDragPickup 5 + OverInvDrag 3 Nothing _ _ -> drawDragPickup 5 + OverInvDrag 3 _ _ _ -> drawEmptySet 5 OverInvDrag {} -> drawEmptySet 5 OverInvDragSelect {} -> drawDragSelect 5 OverInvSelect {} -> drawSelect 5 diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 2dd1685db..0f6e62450 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -115,7 +115,7 @@ tryDropSelected mpos w = do tryPickupSelected :: Int -> Maybe (Int,Int) -> World -> Maybe World tryPickupSelected k mpos w = do guard $ k == 3 - guard $ maybe True (\(i,_) -> i == 0) mpos + guard $ maybe True (\(i,_) -> i == 0 || i == 1) mpos cr <- w ^? cWorld . lWorld . creatures . ix 0 let nfreeslots = crNumFreeSlots cr xs <- w ^? hud . hudElement . diSelection . _Just . _3 @@ -123,11 +123,11 @@ tryPickupSelected k mpos w = do let slotsneeded = alaf Sum foldMap (_itInvSize . _flIt) itmstopickup guard $ nfreeslots >= slotsneeded return $ case mpos of - Nothing -> foldl' (flip $ pickUpItem 0) w itmstopickup - & hud . hudElement . diSelection . _Just . _3 %~ const mempty - Just (_,j) -> foldr (pickUpItemAt j 0) w itmstopickup + Just (0,j) -> foldr (pickUpItemAt j 0) w itmstopickup & hud . hudElement . diSelection ?~ (0,j , IS.fromDistinctAscList [j..j+IS.size xs-1]) + _ -> foldl' (flip $ pickUpItem 0) w itmstopickup + & hud . hudElement . diSelection . _Just . _3 %~ const mempty where g i = do NInt j <- w ^? hud . closeItems . ix i @@ -182,8 +182,7 @@ updateMouseClickInGame cfig w = case w ^. input . mouseContext of OverInvSelect x -> startDrag x cfig w OverTerminalReturn tmid -> terminalReturnEffect tmid w OverTerminalEscape -> - w - & hud . hudElement . subInventory .~ NoSubInventory --MouseInvNothing + w & hud . hudElement . subInventory .~ NoSubInventory OverCombSelect x -> w & hud . hudElement . subInventory . ciSelection ?~ f x & worldEventFlags . at CombineInventoryChange ?~ () @@ -199,7 +198,7 @@ updateMouseClickInGame cfig w = case w ^. input . mouseContext of OverCombEscape -> w & worldEventFlags . at InventoryChange ?~ () - & hud . hudElement . subInventory .~ NoSubInventory --MouseInvNothing + & hud . hudElement . subInventory .~ NoSubInventory OverInvFilt (i, j) -> fromMaybe w $ do guard $ i == 0 str <- diff --git a/tags b/tags index 172b772af..3ac9211f7 100644 --- a/tags +++ b/tags @@ -886,7 +886,7 @@ ImpulseUseTargetCID src/Dodge/Data/ActionPlan.hs 49;" C ImpulsesList src/Dodge/Data/ActionPlan.hs 97;" C InDivineZone src/Dodge/Data/Scenario.hs 22;" C InDream src/Dodge/Data/Scenario.hs 19;" C -InGame src/Dodge/Update/Input/InGame.hs 1;" m +InGame src/Dodge/Update/Input/InGame.hs 2;" m InInv src/Dodge/Data/Item/Location.hs 28;" C InLink src/Dodge/Data/Room.hs 44;" C InParallelUniverse src/Dodge/Data/Scenario.hs 21;" C @@ -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 411;" f +advanceScrollAmount src/Dodge/Update.hs 408;" 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 @@ -3591,7 +3591,7 @@ chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 46;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 101;" f checkConnection src/Dodge/Inventory/Swap.hs 80;" f checkDeath src/Dodge/Creature/State.hs 75;" f -checkEndGame src/Dodge/Update.hs 698;" f +checkEndGame src/Dodge/Update.hs 695;" 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 751;" f +clClSpringVel src/Dodge/Update.hs 748;" 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 721;" f +cloudEffect src/Dodge/Update.hs 718;" 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 236;" f +collectInvItems src/Dodge/Update/Input/InGame.hs 245;" 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 228;" f +concurrentIS src/Dodge/Update/Input/InGame.hs 237;" 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 769;" f +crCrSpring src/Dodge/Update.hs 766;" 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 764;" f +crSpring src/Dodge/Update.hs 761;" 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 440;" f +displayTerminalLineString src/Dodge/Update.hs 437;" 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 375;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 384;" 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 422;" f +doWorldEvents src/Dodge/Update.hs 419;" 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 @@ -4408,6 +4408,7 @@ getLaserDamage src/Dodge/HeldUse.hs 193;" f getLaserPhaseV src/Dodge/HeldUse.hs 190;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 11;" f +getMenuMouseContext src/Dodge/Update.hs 365;" f getNodePos src/Dodge/Path.hs 31;" f getPretty src/AesonHelp.hs 7;" f getPrettyShort src/AesonHelp.hs 10;" f @@ -4627,6 +4628,7 @@ 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 +isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 163;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f isLHS src/Geometry/LHS.hs 8;" f @@ -4635,7 +4637,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 389;" f +isOverTerminalScreen src/Dodge/Update.hs 386;" 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 +4894,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 683;" f +markWallSeen src/Dodge/Update.hs 680;" 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 +4905,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 551;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 560;" f maybeOpenTerminal src/Dodge/Update.hs 123;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 111;" f @@ -5019,7 +5021,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 712;" f +mvGust src/Dodge/Update.hs 709;" 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 +5130,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 471;" f +pauseGame src/Dodge/Update/Input/InGame.hs 480;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f @@ -5288,7 +5290,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 675;" f +ppEvents src/Dodge/Update.hs 672;" f ppLevelReset src/Dodge/PressPlate.hs 13;" f preCritStart src/Dodge/Room/Start.hs 82;" f preloadRender src/Preload/Render.hs 30;" f @@ -5592,7 +5594,7 @@ 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 494;" f +selCloseObj src/Dodge/Update/Input/InGame.hs 503;" f selNumPos src/Dodge/Render/HUD.hs 443;" f selNumPosCardinal src/Dodge/Render/HUD.hs 466;" f selSecDrawCursor src/Dodge/Render/List.hs 130;" f @@ -5632,12 +5634,12 @@ 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 464;" f +setOldPos src/Dodge/Update.hs 461;" f 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 292;" f -setSelWhileDragging src/Dodge/Update/Input/InGame.hs 271;" f +setSelWhileDragging src/Dodge/Update/Input/InGame.hs 280;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 104;" f setShaderSource src/Shader/Compile.hs 290;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5688,9 +5690,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 246;" f -shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 284;" f -shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 278;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 255;" f +shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 293;" f +shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 287;" 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 @@ -5740,7 +5742,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 760;" f +simpleCrSprings src/Dodge/Update.hs 757;" f simpleDamFL src/Dodge/Flame.hs 41;" f simpleTermMessage src/Dodge/Terminal.hs 253;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f @@ -5789,7 +5791,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 474;" f +spaceAction src/Dodge/Update/Input/InGame.hs 483;" 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 @@ -5845,7 +5847,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 212;" f +startDrag src/Dodge/Update/Input/InGame.hs 221;" f startInvList src/Dodge/Creature.hs 109;" f startInventory src/Dodge/Creature.hs 112;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f @@ -5969,7 +5971,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 444;" f +tmUpdate src/Dodge/Update.hs 441;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 148;" f @@ -5986,8 +5988,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 515;" f -toggleTweakInv src/Dodge/Update/Input/InGame.hs 528;" f +toggleMap src/Dodge/Update/Input/InGame.hs 524;" f +toggleTweakInv src/Dodge/Update/Input/InGame.hs 537;" f togglesToEffects src/Dodge/Terminal.hs 248;" f tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 474;" f tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f @@ -6058,13 +6060,13 @@ 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 537;" f -tryDropSelected src/Dodge/Update/Input/InGame.hs 107;" f +tryCombine src/Dodge/Update/Input/InGame.hs 546;" f +tryDropSelected src/Dodge/Update/Input/InGame.hs 108;" 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 114;" f +tryPickupSelected src/Dodge/Update/Input/InGame.hs 115;" f tryPlay src/Sound.hs 83;" f tryPutFloorItemIDInInv src/Dodge/Inventory/Add.hs 26;" f tryPutItemInInv src/Dodge/Inventory/Add.hs 42;" f @@ -6107,84 +6109,83 @@ 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 409;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 418;" 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 541;" f +updateBullets src/Dodge/Update.hs 538;" f updateCamera src/Dodge/Update/Camera.hs 31;" f updateCloseObjects src/Dodge/Inventory.hs 113;" f -updateCloud src/Dodge/Update.hs 726;" f -updateClouds src/Dodge/Update.hs 570;" f +updateCloud src/Dodge/Update.hs 723;" f +updateClouds src/Dodge/Update.hs 567;" 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 510;" f -updateCreatureSoundPositions src/Dodge/Update.hs 486;" f +updateCreatureGroups src/Dodge/Update.hs 507;" f +updateCreatureSoundPositions src/Dodge/Update.hs 483;" f updateDebugMessageOffset src/Dodge/Update.hs 92;" f -updateDelayedEvents src/Dodge/Update.hs 789;" f +updateDelayedEvents src/Dodge/Update.hs 786;" f updateDisplaySections src/Dodge/DisplayInventory.hs 126;" f updateDistortion src/Dodge/Distortion.hs 5;" f -updateDistortions src/Dodge/Update.hs 531;" f +updateDistortions src/Dodge/Update.hs 528;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f -updateEnergyBalls src/Dodge/Update.hs 558;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 450;" f +updateEnergyBalls src/Dodge/Update.hs 555;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 459;" 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 555;" f +updateFlames src/Dodge/Update.hs 552;" f updateFlare src/Dodge/Flare.hs 7;" f updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 301;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 294;" f -updateGusts src/Dodge/Update.hs 709;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 310;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 303;" f +updateGusts src/Dodge/Update.hs 706;" f updateHeldRootItem src/Dodge/Creature/State.hs 167;" f updateHumanoid src/Dodge/Humanoid.hs 12;" f -updateIMl src/Dodge/Update.hs 500;" f -updateIMl' src/Dodge/Update.hs 505;" f +updateIMl src/Dodge/Update.hs 497;" f +updateIMl' src/Dodge/Update.hs 502;" f updateInGameCamera src/Dodge/Update/Camera.hs 70;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 354;" f -updateInstantBullets src/Dodge/Update.hs 647;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 363;" f +updateInstantBullets src/Dodge/Update.hs 644;" 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 348;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 336;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 357;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 345;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 13;" f -updateLasers src/Dodge/Update.hs 429;" f -updateLightSources src/Dodge/Update.hs 534;" f +updateLasers src/Dodge/Update.hs 426;" f +updateLightSources src/Dodge/Update.hs 531;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 369;" f -updateMIM src/Dodge/Update.hs 660;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 378;" f +updateMIM src/Dodge/Update.hs 657;" f updateMachine src/Dodge/Machine/Update.hs 19;" f -updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 162;" f -updateMouseContext src/Dodge/Update.hs 311;" f -updateMouseContextGame src/Dodge/Update.hs 317;" f -updateMouseContextMenu src/Dodge/Update.hs 368;" f -updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 89;" f -updateMouseInGame src/Dodge/Update/Input/InGame.hs 81;" f -updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 135;" f +updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 169;" f +updateMouseContext src/Dodge/Update.hs 309;" f +updateMouseContextGame src/Dodge/Update.hs 314;" 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 136;" f updateMovement src/Dodge/Creature/State.hs 331;" f -updateObjCatMaybes src/Dodge/Update.hs 522;" f -updateObjMapMaybe src/Dodge/Update.hs 515;" f -updatePastWorlds src/Dodge/Update.hs 417;" f +updateObjCatMaybes src/Dodge/Update.hs 519;" f +updateObjMapMaybe src/Dodge/Update.hs 512;" f +updatePastWorlds src/Dodge/Update.hs 414;" f updatePosEvent src/Dodge/PosEvent.hs 11;" f -updatePosEvents src/Dodge/Update.hs 567;" f +updatePosEvents src/Dodge/Update.hs 564;" f updatePreload src/Preload/Update.hs 20;" f -updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 311;" f -updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 314;" f +updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 320;" f +updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 323;" 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 537;" f +updateRadarBlips src/Dodge/Update.hs 534;" f updateRadarSweep src/Dodge/RadarSweep.hs 25;" f -updateRadarSweeps src/Dodge/Update.hs 561;" f +updateRadarSweeps src/Dodge/Update.hs 558;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 106;" f updateRootItemID src/Dodge/Inventory/Location.hs 35;" f @@ -6193,30 +6194,30 @@ 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 678;" f +updateSeenWalls src/Dodge/Update.hs 675;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f -updateShockwaves src/Dodge/Update.hs 552;" f +updateShockwaves src/Dodge/Update.hs 549;" 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 564;" f +updateSparks src/Dodge/Update.hs 561;" f updateTempLightSource src/Dodge/LightSource/Update.hs 7;" f updateTeslaArc src/Dodge/Tesla/Arc.hs 29;" f -updateTeslaArcs src/Dodge/Update.hs 546;" f +updateTeslaArcs src/Dodge/Update.hs 543;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f -updateTractorBeams src/Dodge/Update.hs 549;" f +updateTractorBeams src/Dodge/Update.hs 546;" f updateTurret src/Dodge/Machine/Update.hs 47;" f updateUniverse src/Dodge/Update.hs 71;" f updateUniverseFirst src/Dodge/Update.hs 83;" f updateUniverseLast src/Dodge/Update.hs 133;" f updateUniverseMid src/Dodge/Update.hs 155;" f -updateUseInputInGame src/Dodge/Update/Input/InGame.hs 38;" f +updateUseInputInGame src/Dodge/Update/Input/InGame.hs 39;" 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 updateWheelEvent src/Dodge/Update/Scroll.hs 19;" f -updateWheelEvents src/Dodge/Update.hs 404;" f +updateWheelEvents src/Dodge/Update.hs 401;" f updateWorldEventFlag src/Dodge/Update.hs 117;" f updateWorldEventFlags src/Dodge/Update.hs 105;" f upperBody src/Dodge/Creature/Picture.hs 133;" f @@ -6388,9 +6389,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 437;" f +zoneClouds src/Dodge/Update.hs 434;" f zoneCreature src/Dodge/Zoning/Creature.hs 52;" f -zoneCreatures src/Dodge/Update.hs 481;" f +zoneCreatures src/Dodge/Update.hs 478;" 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