diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index e4f7e293d..120678ded 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -324,8 +324,6 @@ updateMouseContextGame cfig u = case u ^. uvWorld . input . mouseContext of OverInvDragSelect{} -> u _ -> u & uvWorld . input . mouseContext --- .~ fromMaybe aimcontext (overinv <|> overcomb <|> overterm) --- .~ fromMaybe aimcontext (overinv <|> overcomb <|> overterm <|> isrotatedrag) .~ fromMaybe aimcontext (isrotatedrag <|> overinv <|> overcomb <|> overterm) where w = u ^. uvWorld diff --git a/src/Dodge/Update/Camera.hs b/src/Dodge/Update/Camera.hs index 0f6305dfa..c6b8193cc 100644 --- a/src/Dodge/Update/Camera.hs +++ b/src/Dodge/Update/Camera.hs @@ -137,14 +137,11 @@ viewDistanceFromItems _ = 1 rotateCamera :: Configuration -> World -> World rotateCamera cfig w - | Just ltime <- pkeys ^? ix SDL.ButtonLeft - , Just rtime <- pkeys ^? ix SDL.ButtonRight - , rtime > 0 - , ltime > rtime + | MouseGameRotate <- w ^. input . mouseContext , Just rotation <- angleBetween (w ^. input . mousePos) <$> (w ^. input . heldPos . at SDL.ButtonRight) = - w & wCam . camRot -~ rotation + w & wCam . camRot -~ rotation | _gameplay_rotate_to_wall cfig , isNothing $ pkeys ^? ix SDL.ButtonRight = rotateToOverlappingWall w diff --git a/tags b/tags index 023230806..b950f022b 100644 --- a/tags +++ b/tags @@ -275,7 +275,7 @@ Camera src/Dodge/Data/Camera.hs 23;" t Camera src/Dodge/Camera.hs 1;" m Camera src/Dodge/Data/Camera.hs 5;" m Camera src/Dodge/Update/Camera.hs 4;" m -CameraScrollTimeFlow src/Dodge/Data/World.hs 66;" C +CameraScrollTimeFlow src/Dodge/Data/World.hs 67;" C CamouflageStatus src/Dodge/Data/CamouflageStatus.hs 11;" t CamouflageStatus src/Dodge/Data/CamouflageStatus.hs 6;" m Cane src/Dodge/Item/Held/Cane.hs 1;" m @@ -478,7 +478,7 @@ Data src/Shader/Data.hs 6;" m Data src/Shape/Data.hs 9;" m Data src/ShapePicture/Data.hs 1;" m Data src/Sound/Data.hs 6;" m -DeathTime src/Dodge/Data/World.hs 57;" C +DeathTime src/Dodge/Data/World.hs 58;" C Debris src/Dodge/Block/Debris.hs 1;" m Debug src/Dodge/Debug.hs 2;" m DebugBool src/Dodge/Data/Config.hs 66;" t @@ -962,7 +962,7 @@ ItemReduceWarmTime src/Dodge/Data/Item/Effect.hs 33;" C ItemScroll src/Dodge/Data/Item.hs 55;" t ItemScrollInt src/Dodge/Data/Item.hs 57;" C ItemScrollIntRange src/Dodge/Data/Item.hs 58;" C -ItemScrollTimeFlow src/Dodge/Data/World.hs 60;" C +ItemScrollTimeFlow src/Dodge/Data/World.hs 61;" C ItemSetWarmTime src/Dodge/Data/Item/Effect.hs 34;" C ItemStructuralFunction src/Dodge/Data/ComposedItem.hs 39;" t ItemTargeting src/Dodge/Data/Item.hs 60;" t @@ -1304,7 +1304,7 @@ NodeTree src/Dodge/Data/MetaTree.hs 13;" C NodeTree src/Dodge/Tree/Compose/Data.hs 9;" C NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 84;" C NormalOptions src/Dodge/Data/Universe.hs 70;" C -NormalTimeFlow src/Dodge/Data/World.hs 59;" C +NormalTimeFlow src/Dodge/Data/World.hs 60;" C North src/Dodge/Data/CardinalPoint.hs 4;" C North8 src/Dodge/Data/CardinalPoint.hs 11;" C NorthEast8 src/Dodge/Data/CardinalPoint.hs 12;" C @@ -1431,7 +1431,7 @@ PathTo src/Dodge/Data/ActionPlan.hs 88;" C Pathing src/Dodge/Data/Config.hs 76;" C Pathing src/Dodge/Zoning/Pathing.hs 1;" m Patrol src/Dodge/Data/ActionPlan.hs 180;" C -PausedTimeFlow src/Dodge/Data/World.hs 75;" C +PausedTimeFlow src/Dodge/Data/World.hs 76;" C Payload src/Dodge/Data/Payload.hs 11;" t Payload src/Dodge/Data/Payload.hs 6;" m Payload src/Dodge/Payload.hs 2;" m @@ -1634,7 +1634,7 @@ ResourceFailure src/Dodge/Data/Scenario.hs 29;" C RetailFacility src/Dodge/Data/Scenario.hs 67;" C RetiredProjectile src/Dodge/Data/Projectile.hs 44;" C Revenge src/Dodge/Data/Scenario.hs 6;" C -RewindLeftClick src/Dodge/Data/World.hs 71;" C +RewindLeftClick src/Dodge/Data/World.hs 72;" C RezBaySS src/Dodge/Data/Scenario.hs 105;" C RezBox src/Dodge/Room/RezBox.hs 1;" m RightButtonOptions src/Dodge/Data/RightButtonOptions.hs 13;" t @@ -1975,7 +1975,7 @@ Tile src/Data/Tile.hs 3;" m Tile src/Dodge/Tile.hs 1;" m Tile src/Tile.hs 2;" m Tiled src/Data/Tile.hs 13;" C -TimeFlowStatus src/Dodge/Data/World.hs 56;" t +TimeFlowStatus src/Dodge/Data/World.hs 57;" t Tiny src/Shape/Data.hs 32;" C TmId src/Dodge/Data/Terminal.hs 61;" C TmTm src/Dodge/Data/Terminal.hs 60;" t @@ -2455,7 +2455,7 @@ _dePushBack src/Dodge/Data/Damage.hs 28;" f _dePushExp src/Dodge/Data/Damage.hs 24;" f _dePushRadius src/Dodge/Data/Damage.hs 25;" f _deTorque src/Dodge/Data/Damage.hs 27;" f -_deathDelay src/Dodge/Data/World.hs 58;" f +_deathDelay src/Dodge/Data/World.hs 59;" f _debugInfo src/Dodge/Data/Universe.hs 52;" f _debugInt src/Dodge/Data/Universe.hs 60;" f _debugMInt src/Dodge/Data/Universe.hs 59;" f @@ -2576,8 +2576,8 @@ _fsPos src/Dodge/Data/ForegroundShape.hs 16;" f _fsRad src/Dodge/Data/ForegroundShape.hs 18;" f _fsSPic src/Dodge/Data/ForegroundShape.hs 19;" f _fullscreenShader src/Data/Preload/Render.hs 20;" f -_futureWorlds src/Dodge/Data/World.hs 63;" f -_futureWorlds src/Dodge/Data/World.hs 69;" f +_futureWorlds src/Dodge/Data/World.hs 64;" f +_futureWorlds src/Dodge/Data/World.hs 70;" f _gameplay_rotate_to_wall src/Dodge/Data/Config.hs 55;" f _gasCreation src/Dodge/Data/Item/Use.hs 84;" f _genPlacements src/Dodge/Data/GenWorld.hs 25;" f @@ -2976,9 +2976,9 @@ _rboBaseBloom src/Data/Preload/Render.hs 38;" f _recoil src/Dodge/Data/Item/Use.hs 85;" f _recoil src/Dodge/Data/Item/Use.hs 102;" f _renderData src/Data/Preload.hs 11;" f -_reverseAmount src/Dodge/Data/World.hs 62;" f -_reverseAmount src/Dodge/Data/World.hs 68;" f -_reverseAmount src/Dodge/Data/World.hs 72;" f +_reverseAmount src/Dodge/Data/World.hs 63;" f +_reverseAmount src/Dodge/Data/World.hs 69;" f +_reverseAmount src/Dodge/Data/World.hs 73;" f _rifling src/Dodge/Data/Item/Use.hs 101;" f _rkHoming src/Dodge/Data/Projectile.hs 41;" f _rkSmoke src/Dodge/Data/Projectile.hs 42;" f @@ -3039,11 +3039,11 @@ _scSelectionList src/Dodge/Data/Universe.hs 86;" f _scTitle src/Dodge/Data/Universe.hs 81;" f _screenTextureVAO src/Data/Preload/Render.hs 50;" f _scrollAmount src/Dodge/Data/Input.hs 51;" f -_scrollItemID src/Dodge/Data/World.hs 64;" f -_scrollItemID src/Dodge/Data/World.hs 73;" f -_scrollItemID src/Dodge/Data/World.hs 77;" f -_scrollSmoothing src/Dodge/Data/World.hs 61;" f -_scrollSmoothing src/Dodge/Data/World.hs 67;" f +_scrollItemID src/Dodge/Data/World.hs 65;" f +_scrollItemID src/Dodge/Data/World.hs 74;" f +_scrollItemID src/Dodge/Data/World.hs 78;" f +_scrollSmoothing src/Dodge/Data/World.hs 62;" f +_scrollSmoothing src/Dodge/Data/World.hs 68;" f _scrollTestFloat src/Dodge/Data/Input.hs 58;" f _scrollTestInt src/Dodge/Data/Input.hs 59;" f _scurColor src/Dodge/Data/SelectionList.hs 26;" f @@ -3171,7 +3171,7 @@ _tileTangentPos src/Data/Tile.hs 17;" f _tileZero src/Data/Tile.hs 16;" f _tiles src/Data/Tile.hs 13;" f _timeFlow src/Dodge/Data/World.hs 38;" f -_timeFlowCharge src/Dodge/Data/World.hs 76;" f +_timeFlowCharge src/Dodge/Data/World.hs 77;" f _tlEffect src/Dodge/Data/Terminal.hs 78;" f _tlPause src/Dodge/Data/Terminal.hs 69;" f _tlPause src/Dodge/Data/Terminal.hs 73;" f @@ -3236,6 +3236,7 @@ _unRandomPlacement src/Dodge/Data/GenWorld.hs 84;" f _unST src/Dodge/Data/MetaTree.hs 18;" f _unST src/Dodge/Tree/Compose/Data.hs 12;" f _unTO src/Shader/Data.hs 59;" f +_unpauseClock src/Dodge/Data/World.hs 54;" f _unputTerminal src/Dodge/Data/GenWorld.hs 36;" f _useAheadPos src/Dodge/Data/ActionPlan.hs 161;" f _useExactly src/Dodge/Data/Item/Use.hs 165;" f @@ -3391,7 +3392,7 @@ advanceSmoothScroll src/Dodge/SmoothScroll.hs 33;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 44;" f aimDelaySweep src/Dodge/Render/Picture.hs 265;" f aimStanceInfo src/Dodge/Item/Info.hs 235;" f -aimTurn src/Dodge/Creature/YourControl.hs 161;" f +aimTurn src/Dodge/Creature/YourControl.hs 160;" f aimingWeaponHandlePos src/Dodge/Item/HeldOffset.hs 69;" f aimingWeaponZeroPos src/Dodge/Item/HeldOffset.hs 63;" f airlock src/Dodge/Room/Airlock.hs 19;" f @@ -3478,7 +3479,6 @@ attachOnward' src/Dodge/Tree/Compose.hs 98;" f attachTree src/Dodge/Tree/Compose.hs 38;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 66;" f attribSize src/Shader/Compile.hs 306;" f -augInvDirectSelect src/Dodge/Inventory.hs 179;" f autoAmr src/Dodge/Item/Held/Rod.hs 49;" f autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 368;" f autoCrit src/Dodge/Creature/AutoCrit.hs 12;" f @@ -3613,9 +3613,9 @@ centroidNum src/Geometry/Polygon.hs 133;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f chainLinkOrientation src/Dodge/Creature/State.hs 275;" f chainPairs src/Geometry.hs 359;" f -changeSwapOther src/Dodge/Inventory.hs 138;" f -changeSwapSel src/Dodge/Inventory.hs 131;" f -changeSwapWith src/Dodge/Inventory.hs 172;" f +changeSwapOther src/Dodge/Inventory.hs 139;" f +changeSwapSel src/Dodge/Inventory.hs 132;" f +changeSwapWith src/Dodge/Inventory.hs 173;" f charToTuple src/Picture/Base.hs 317;" f charToTupleGrad src/Picture/Text.hs 18;" f chartreuse src/Color.hs 24;" f @@ -3672,7 +3672,7 @@ click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 434;" f clickGetCreature src/Dodge/Debug.hs 107;" f clicker src/Dodge/Item/Scope.hs 82;" f clipV src/Geometry/Vector.hs 47;" f -clipZoom src/Dodge/Update/Camera.hs 186;" f +clipZoom src/Dodge/Update/Camera.hs 180;" f clockCycle src/Dodge/Clock.hs 9;" f closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 217;" f closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 202;" f @@ -3696,7 +3696,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 296;" f +collectInvItems src/Dodge/Update/Input/InGame.hs 298;" 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 @@ -3730,7 +3730,7 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f conEffects src/Dodge/Concurrent.hs 12;" f concBall src/Dodge/WorldEvent/SpawnParticle.hs 27;" f -concurrentIS src/Dodge/Update/Input/InGame.hs 288;" f +concurrentIS src/Dodge/Update/Input/InGame.hs 290;" f connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f connectionBlurb src/Dodge/Terminal.hs 102;" f connectionBlurbLines src/Dodge/Terminal.hs 47;" f @@ -3918,9 +3918,9 @@ defaultBounds src/Dodge/Data/Bounds.hs 20;" f defaultBullet src/Dodge/Item/Weapon/Bullet.hs 10;" f defaultBulletWeapon src/Dodge/Default/Item.hs 41;" f defaultButton src/Dodge/Default.hs 50;" f -defaultCWCam src/Dodge/Default/World.hs 67;" f -defaultCWGen src/Dodge/Default/World.hs 57;" f -defaultCWorld src/Dodge/Default/World.hs 82;" f +defaultCWCam src/Dodge/Default/World.hs 68;" f +defaultCWGen src/Dodge/Default/World.hs 58;" f +defaultCWorld src/Dodge/Default/World.hs 83;" f defaultChaseMvType src/Dodge/Default/Creature.hs 108;" f defaultClusterStatus src/Dodge/Default/Room.hs 38;" f defaultConfig src/Dodge/Data/Config.hs 127;" f @@ -3932,7 +3932,7 @@ defaultCreatureSkin src/Dodge/Default/Creature.hs 61;" f defaultCrystalWall src/Dodge/Default/Wall.hs 40;" f defaultDirtBlock src/Dodge/Default/Block.hs 19;" f defaultDirtWall src/Dodge/Default/Wall.hs 61;" f -defaultDisplayInventory src/Dodge/Default/World.hs 168;" f +defaultDisplayInventory src/Dodge/Default/World.hs 169;" f defaultDoor src/Dodge/Default/Door.hs 29;" f defaultDoorWall src/Dodge/Default/Wall.hs 32;" f defaultDrawButton src/Dodge/Button/Draw.hs 28;" f @@ -3941,7 +3941,7 @@ defaultEquipUse src/Dodge/Default/Item/Use.hs 21;" f defaultEquipment src/Dodge/Default.hs 25;" f defaultFlIt src/Dodge/Default.hs 29;" f defaultForeground src/Dodge/Default/ForegroundShape.hs 5;" f -defaultHUD src/Dodge/Default/World.hs 157;" f +defaultHUD src/Dodge/Default/World.hs 158;" f defaultHeldItem src/Dodge/Default/Item.hs 16;" f defaultHeldUse src/Dodge/Default/Item/Use.hs 26;" f defaultImpulsive src/Dodge/Humanoid.hs 190;" f @@ -3952,7 +3952,7 @@ defaultInvSize src/Dodge/Default/Creature.hs 74;" f defaultItEffect src/Dodge/Default/Item.hs 48;" f defaultItZoom src/Dodge/Default/Item/Use/AimParams.hs 32;" f defaultLS src/Dodge/Default/LightSource.hs 8;" f -defaultLWorld src/Dodge/Default/World.hs 94;" f +defaultLWorld src/Dodge/Default/World.hs 95;" f defaultLeftLoadable src/Dodge/Default/Item/Use/Consumption.hs 8;" f defaultListDisplayParams src/Dodge/ListDisplayParams.hs 18;" f defaultMachine src/Dodge/Default.hs 32;" f @@ -3980,7 +3980,7 @@ deleteWallIDs src/Dodge/Wall/Delete.hs 28;" f denormalEdges src/Polyhedra.hs 136;" f destroyBlock src/Dodge/Block.hs 56;" f destroyDoor src/Dodge/Block.hs 83;" f -destroyInvItem src/Dodge/Inventory.hs 39;" f +destroyInvItem src/Dodge/Inventory.hs 40;" f destroyLS src/Dodge/LightSource.hs 32;" f destroyLSFlashAt src/Dodge/LightSource.hs 42;" f destroyMachine src/Dodge/Machine/Destroy.hs 12;" f @@ -4025,7 +4025,7 @@ divideLineExact src/Geometry.hs 275;" f divideLineOddNumPoints src/Geometry.hs 260;" f doAfterPlacement src/Dodge/Layout.hs 86;" f doAfterPlacements src/Dodge/Layout.hs 83;" f -doAimTwist src/Dodge/Creature/YourControl.hs 134;" f +doAimTwist src/Dodge/Creature/YourControl.hs 135;" f doAnyEquipmentEffect src/Dodge/Creature/State.hs 189;" f doArcStep src/Dodge/Tesla/Arc.hs 135;" f doBackspace src/Dodge/Update/Input/Text.hs 31;" f @@ -4055,7 +4055,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 107;" f doDrawing src/Dodge/Render.hs 35;" f doDrawing' src/Dodge/Render.hs 46;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f @@ -4087,7 +4087,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 417;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 419;" f doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f @@ -4106,7 +4106,7 @@ doThrust src/Dodge/Projectile/Update.hs 149;" f doTimeScroll src/Dodge/Update.hs 200;" f doTmTm src/Dodge/TmTm.hs 6;" f doTmWdWd src/Dodge/WorldEffect.hs 99;" f -doWallRotate src/Dodge/Update/Camera.hs 171;" f +doWallRotate src/Dodge/Update/Camera.hs 166;" f doWdBl src/Dodge/WorldBool.hs 10;" f doWdCrBl src/Dodge/CreatureEffect.hs 37;" f doWdCrCr src/Dodge/CreatureEffect.hs 12;" f @@ -4283,8 +4283,8 @@ encircleCloseP src/Dodge/Creature/Boid.hs 35;" f encircleDistP src/Dodge/Creature/Boid.hs 21;" f encircleP src/Dodge/Creature/Boid.hs 27;" f endArcPos src/Dodge/Tesla.hs 87;" f -endCombineRegex src/Dodge/Update/Input/InGame.hs 265;" f -endRegex src/Dodge/Update/Input/InGame.hs 252;" f +endCombineRegex src/Dodge/Update/Input/InGame.hs 267;" f +endRegex src/Dodge/Update/Input/InGame.hs 254;" f enterCombineInv src/Dodge/DisplayInventory.hs 323;" f epText src/Dodge/Inventory/SelectionList.hs 73;" f eqConstr src/SameConstr.hs 17;" f @@ -4329,14 +4329,14 @@ fadeTLS src/Dodge/LightSource/Update.hs 14;" f fallSmallBounce src/Dodge/Prop/Moving.hs 28;" f fallSmallBounce' src/Dodge/Prop/Moving.hs 33;" f fallSmallBounceDamage src/Dodge/Prop/Moving.hs 11;" f -farWallDistDirection src/Dodge/Update/Camera.hs 197;" f +farWallDistDirection src/Dodge/Update/Camera.hs 191;" f 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 167;" f findBlips src/Dodge/RadarSweep.hs 62;" f -findBoundDists src/Dodge/Update/Camera.hs 206;" f +findBoundDists src/Dodge/Update/Camera.hs 198;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f findClosePoint src/Dodge/LevelGen/StaticWalls/Deprecated.hs 74;" f findIndex src/IntMapHelp.hs 85;" f @@ -4446,7 +4446,7 @@ getAttachedSFLink src/Dodge/HeldUse.hs 365;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 112;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulletType src/Dodge/HeldUse.hs 472;" f -getCloseObj src/Dodge/Update/Input/InGame.hs 512;" f +getCloseObj src/Dodge/Update/Input/InGame.hs 514;" f getCommands src/Dodge/Terminal.hs 117;" f getCommandsHelp src/Dodge/Terminal.hs 75;" f getCrDexterity src/Dodge/Creature/Statistics.hs 11;" f @@ -4575,7 +4575,7 @@ holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 48;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToChar src/Dodge/Inventory/SelectionList.hs 182;" f -hotkeyToScancode src/Dodge/Creature/YourControl.hs 69;" f +hotkeyToScancode src/Dodge/Creature/YourControl.hs 70;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 179;" f humanoidAIList src/Dodge/Humanoid.hs 181;" f iShape src/Dodge/Placement/Instance/LightSource.hs 73;" f @@ -4659,6 +4659,8 @@ 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 30;" f +invSetSelection src/Dodge/Inventory.hs 180;" f +invSetSelectionPos src/Dodge/Inventory.hs 188;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f invSideEff src/Dodge/Creature/State.hs 165;" f invSize src/Dodge/Inventory/CheckSlots.hs 25;" f @@ -4679,7 +4681,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 191;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f isLHS src/Geometry/LHS.hs 8;" f @@ -4949,7 +4951,7 @@ 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 533;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 535;" f maybeOpenConsole src/Dodge/Update.hs 125;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 116;" f @@ -5050,7 +5052,7 @@ moveWall src/Dodge/Wall/Move.hs 29;" f moveWallID src/Dodge/Wall/Move.hs 24;" f moveWallIDToward src/Dodge/Wall/Move.hs 47;" f moveWallIDUnsafe src/Dodge/Wall/Move.hs 19;" f -moveZoomCamera src/Dodge/Update/Camera.hs 89;" f +moveZoomCamera src/Dodge/Update/Camera.hs 84;" f mtTopLabels src/Dodge/Tree/Compose.hs 49;" f mtUnderLabels src/Dodge/Tree/Compose.hs 52;" f muchWlDustAt src/Dodge/Wall/Dust.hs 15;" f @@ -5172,7 +5174,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 499;" f +pauseGame src/Dodge/Update/Input/InGame.hs 501;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f @@ -5474,7 +5476,7 @@ reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 446;" f rememberSounds src/Dodge/Creature/Perception.hs 177;" f remoteDetonator src/Dodge/Item/Scope.hs 145;" f remoteScreen src/Dodge/Item/Scope.hs 140;" f -removeAimPosture src/Dodge/Creature/YourControl.hs 143;" f +removeAimPosture src/Dodge/Creature/YourControl.hs 142;" f removeAmmoFromMag src/Dodge/HeldUse.hs 459;" f removeDot src/ShortShow.hs 29;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f @@ -5525,7 +5527,7 @@ rightPadNoSquash src/Padding.hs 23;" f rlPosDir src/Dodge/RoomLink.hs 94;" f rlauncherPic src/Dodge/Item/Draw/SPic.hs 382;" f rmInLinks src/Dodge/RoomLink.hs 138;" f -rmInvItem src/Dodge/Inventory.hs 60;" f +rmInvItem src/Dodge/Inventory.hs 61;" f rmLinksOfType src/Dodge/RoomLink.hs 135;" f rmOutLinks src/Dodge/RoomLink.hs 138;" f roomC src/Dodge/Room/Room.hs 38;" f @@ -5557,7 +5559,7 @@ rotate3 src/Geometry/Vector3D.hs 48;" f rotate3x src/Geometry/Vector3D.hs 60;" f rotate3y src/Geometry/Vector3D.hs 66;" f rotate3z src/Geometry/Vector3D.hs 54;" f -rotateCamera src/Dodge/Update/Camera.hs 143;" f +rotateCamera src/Dodge/Update/Camera.hs 138;" f rotateList src/Padding.hs 49;" f rotateProp src/Dodge/Prop/Update.hs 49;" f rotateSH src/Shape.hs 256;" f @@ -5565,7 +5567,7 @@ rotateSHq src/Shape.hs 165;" f rotateSHx src/Shape.hs 264;" f rotateSP src/ShapePicture.hs 57;" f rotateTo src/Polyhedra/Geodesic.hs 64;" f -rotateToOverlappingWall src/Dodge/Update/Camera.hs 160;" f +rotateToOverlappingWall src/Dodge/Update/Camera.hs 155;" f rotateToZ src/Quaternion.hs 34;" f rotateV src/Geometry/Vector.hs 105;" f rotateVAround src/Geometry/Vector.hs 112;" f @@ -5608,7 +5610,7 @@ scaleMat src/MatrixHelper.hs 59;" f scaleMatrix src/MatrixHelper.hs 56;" f scaleSH src/Shape.hs 268;" f scalp src/Dodge/Creature/Picture.hs 96;" f -scancodeToHotkey src/Dodge/Creature/YourControl.hs 89;" f +scancodeToHotkey src/Dodge/Creature/YourControl.hs 90;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f scorchSPic src/Dodge/Creature/State.hs 118;" f screenBox src/Dodge/Base/Window.hs 53;" f @@ -5616,8 +5618,8 @@ screenPolygon src/Dodge/Base/Window.hs 17;" f screenPolygonBord src/Dodge/Base/Window.hs 27;" f screenPosAbs src/Dodge/ScreenPos.hs 15;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 53;" f -scrollAugInvSel src/Dodge/Inventory.hs 187;" f -scrollAugNextInSection src/Dodge/Inventory.hs 200;" f +scrollAugInvSel src/Dodge/Inventory.hs 199;" f +scrollAugNextInSection src/Dodge/Inventory.hs 212;" f scrollCommandStrings src/Dodge/Update/Scroll.hs 159;" f scrollCommands src/Dodge/Update/Scroll.hs 156;" f scrollDebugInfoInt src/Dodge/Debug.hs 71;" f @@ -5662,7 +5664,7 @@ sensorSPic src/Dodge/Machine/Draw.hs 70;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f -setAimPosture src/Dodge/Creature/YourControl.hs 131;" f +setAimPosture src/Dodge/Creature/YourControl.hs 132;" f setChannelPos src/Sound.hs 149;" f setClickWorldPos src/Dodge/Update.hs 100;" f setClusterID src/Dodge/Combine/Graph.hs 115;" f @@ -5685,7 +5687,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 332;" f +setSelWhileDragging src/Dodge/Update/Input/InGame.hs 334;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 86;" f setShaderSource src/Shader/Compile.hs 290;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5694,7 +5696,7 @@ setTargetMv src/Dodge/Creature/ReaderUpdate.hs 74;" f setTile src/Dodge/Layout.hs 68;" f setTiles src/Dodge/Layout.hs 65;" f setToggle src/Dodge/Prop/Update.hs 46;" f -setViewDistance src/Dodge/Update/Camera.hs 192;" f +setViewDistance src/Dodge/Update/Camera.hs 186;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 61;" f setViewport src/Dodge/Render.hs 388;" f setVol src/Dodge/Config/Update.hs 30;" f @@ -5736,9 +5738,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftDraw src/Dodge/Render/ShapePicture.hs 65;" f shiftDraw' src/Dodge/Render/ShapePicture.hs 71;" f shiftInBy src/Dodge/PlacementSpot.hs 236;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 306;" f -shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 345;" f -shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 339;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 308;" f +shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 347;" f +shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 341;" 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 @@ -5776,9 +5778,9 @@ showEquipItem src/Dodge/Item/Display.hs 102;" f showInt src/Dodge/Item/Info.hs 67;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f showInventoryPathing src/Dodge/Item/Display.hs 82;" f -showManObj src/Dodge/TestString.hs 78;" f +showManObj src/Dodge/TestString.hs 66;" f showTerminalError src/Dodge/Debug/Terminal.hs 78;" f -showTimeFlow src/Dodge/TestString.hs 101;" f +showTimeFlow src/Dodge/TestString.hs 89;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 136;" f shrinkVert src/Geometry/Polygon.hs 140;" f shuffle src/RandomHelp.hs 49;" f @@ -5839,7 +5841,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 502;" f +spaceAction src/Dodge/Update/Input/InGame.hs 504;" 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 @@ -5896,7 +5898,7 @@ stackText src/Picture/Base.hs 188;" f stackedInventory src/Dodge/Creature.hs 308;" f startCr src/Dodge/Creature.hs 91;" f startCrafts src/Dodge/Room/Start.hs 92;" f -startDrag src/Dodge/Update/Input/InGame.hs 277;" f +startDrag src/Dodge/Update/Input/InGame.hs 279;" f startInvList src/Dodge/Creature.hs 110;" f startInventory src/Dodge/Creature.hs 113;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f @@ -5933,7 +5935,7 @@ swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 55;" f swapInOutLinks src/Dodge/RoomLink.hs 80;" f swapIndices src/ListHelp.hs 50;" f swapInvItems src/Dodge/Inventory/Swap.hs 20;" f -swapItemWith src/Dodge/Inventory.hs 161;" f +swapItemWith src/Dodge/Inventory.hs 162;" f swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f swarmUsingCenter src/Dodge/Creature/Boid.hs 171;" f switchDoor src/Dodge/Placement/Instance/Door.hs 96;" f @@ -6052,7 +6054,7 @@ tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 338;" 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 74;" f +topTestPart src/Dodge/TestString.hs 62;" f torch src/Dodge/Item/Held/Utility.hs 33;" f torchShape src/Dodge/Item/Draw/SPic.hs 264;" f torqueCr src/Dodge/WorldEffect.hs 67;" f @@ -6069,8 +6071,8 @@ transMat src/MatrixHelper.hs 73;" f transToHandle src/Dodge/Item/HeldOffset.hs 21;" f translate src/Picture/Base.hs 116;" f translate3 src/Picture/Base.hs 120;" f -translateFloatingCamera src/Dodge/Update/Camera.hs 48;" f -translateFloatingCameraKeys src/Dodge/Update/Camera.hs 65;" f +translateFloatingCamera src/Dodge/Update/Camera.hs 43;" f +translateFloatingCameraKeys src/Dodge/Update/Camera.hs 60;" f translateH src/Picture/Base.hs 112;" f translatePointToHead src/Dodge/Creature/HandPos.hs 147;" f translatePointToLeftHand src/Dodge/Creature/HandPos.hs 75;" f @@ -6113,14 +6115,14 @@ truncFaces src/Polyhedra/Geodesic.hs 53;" f 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 168;" f -tryCombine src/Dodge/Update/Input/InGame.hs 523;" f -tryDropSelected src/Dodge/Update/Input/InGame.hs 123;" f +tryClickUse src/Dodge/Creature/YourControl.hs 167;" f +tryCombine src/Dodge/Update/Input/InGame.hs 525;" f +tryDropSelected src/Dodge/Update/Input/InGame.hs 125;" 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 132;" f tryPlay src/Sound.hs 83;" f tryPutFloorItemIDInInv src/Dodge/Inventory/Add.hs 26;" f tryPutItemInInv src/Dodge/Inventory/Add.hs 42;" f @@ -6139,7 +6141,7 @@ twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 28;" f twists src/Dodge/Creature/Test.hs 103;" f twoFlat src/Dodge/Creature/Test.hs 100;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 92;" f -twoHandTwistAmount src/Dodge/Creature/YourControl.hs 146;" f +twoHandTwistAmount src/Dodge/Creature/YourControl.hs 145;" f twoRoomPoss src/Dodge/PlacementSpot.hs 147;" f twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 406;" f twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f @@ -6169,17 +6171,16 @@ updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla.hs 44;" f updateArc src/Dodge/Tesla/Arc.hs 100;" f updateAttachedItems src/Dodge/Creature/State.hs 265;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 451;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 453;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 28;" f -updateBounds src/Dodge/Update/Camera.hs 216;" f +updateBounds src/Dodge/Update/Camera.hs 208;" f updateBulVel src/Dodge/Bullet.hs 53;" f updateBullet src/Dodge/Bullet.hs 21;" f updateBullets src/Dodge/Update.hs 536;" f -updateCamera src/Dodge/Update/Camera.hs 25;" f -updateCamera' src/Dodge/Update/Camera.hs 32;" f -updateCloseObjects src/Dodge/Inventory.hs 110;" f +updateCamera src/Dodge/Update/Camera.hs 27;" f +updateCloseObjects src/Dodge/Inventory.hs 111;" f updateCloud src/Dodge/Update.hs 735;" f updateClouds src/Dodge/Update.hs 610;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 37;" f @@ -6194,40 +6195,40 @@ updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortions src/Dodge/Update.hs 529;" f updateEnergyBall src/Dodge/EnergyBall.hs 45;" f updateEnergyBalls src/Dodge/Update.hs 598;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 478;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 480;" 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 595;" f -updateFloatingCamera src/Dodge/Update/Camera.hs 37;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 362;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 355;" f +updateFloatingCamera src/Dodge/Update/Camera.hs 32;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 364;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 357;" f updateGusts src/Dodge/Update.hs 718;" f updateHeldRootItem src/Dodge/Creature/State.hs 259;" f updateHumanoid src/Dodge/Humanoid.hs 13;" f updateIMl src/Dodge/Update.hs 498;" f updateIMl' src/Dodge/Update.hs 503;" f -updateInGameCamera src/Dodge/Update/Camera.hs 81;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 398;" f +updateInGameCamera src/Dodge/Update/Camera.hs 76;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 400;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f updateItemTargeting src/Dodge/Creature/State.hs 377;" f updateItemWithOrientation src/Dodge/Creature/State.hs 285;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 392;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 380;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 394;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 382;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 14;" f updateLasers src/Dodge/Update.hs 429;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 411;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 413;" f updateMachine src/Dodge/Machine/Update.hs 19;" f updateMagnets src/Dodge/Update.hs 303;" f -updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 195;" f +updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 197;" f updateMouseContext src/Dodge/Update.hs 316;" f updateMouseContextGame src/Dodge/Update.hs 321;" 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 +updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 158;" f updateMovement src/Dodge/Creature/State.hs 429;" f updateObjCatMaybes src/Dodge/Update.hs 520;" f updateObjMapMaybe src/Dodge/Update.hs 513;" f @@ -6301,7 +6302,7 @@ useC src/Dodge/Cuse.hs 8;" f useC' src/Dodge/Cuse.hs 13;" f useE src/Dodge/Euse.hs 34;" f useGasParams src/Dodge/HeldUse.hs 568;" f -useHotkey src/Dodge/Creature/YourControl.hs 64;" f +useHotkey src/Dodge/Creature/YourControl.hs 65;" f useInventoryPath src/Dodge/HeldUse.hs 811;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 20;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 27;" f @@ -6345,7 +6346,7 @@ verticalPipe src/Dodge/Placement/Instance/Pipe.hs 6;" f verticalWire src/Dodge/Wire.hs 24;" f viewBoundaries src/Dodge/Debug/Picture.hs 304;" f viewClipBounds src/Dodge/Debug/Picture.hs 313;" f -viewDistanceFromItems src/Dodge/Update/Camera.hs 140;" f +viewDistanceFromItems src/Dodge/Update/Camera.hs 135;" f viewTarget src/Dodge/Creature/ReaderUpdate.hs 144;" f violet src/Color.hs 21;" f visibleWalls src/Dodge/Base/Collide.hs 123;" f @@ -6363,11 +6364,11 @@ wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f wallsFromRooms src/Dodge/Layout.hs 146;" f wallsToDraw src/Dodge/Render/Walls.hs 17;" f warningRooms src/Dodge/Room/Warning.hs 27;" f -wasdAim src/Dodge/Creature/YourControl.hs 120;" f +wasdAim src/Dodge/Creature/YourControl.hs 121;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f -wasdMovement src/Dodge/Creature/YourControl.hs 149;" f -wasdWithAiming src/Dodge/Creature/YourControl.hs 113;" f +wasdMovement src/Dodge/Creature/YourControl.hs 148;" f +wasdWithAiming src/Dodge/Creature/YourControl.hs 114;" f watchCombinations src/Dodge/Combine/Combinations.hs 15;" f watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 177;" f weakenMatS src/Dodge/Material/Sound.hs 18;" f @@ -6466,8 +6467,8 @@ zonePn src/Dodge/Zoning/Pathing.hs 30;" f zoneWall src/Dodge/Zoning/Wall.hs 65;" f zonesAroundPoint src/Dodge/Zoning/Base.hs 90;" f zonesExtract src/Dodge/Zoning/Base.hs 55;" f -zoomFloatingCamera src/Dodge/Update/Camera.hs 73;" f -zoomFromItem src/Dodge/Update/Camera.hs 182;" f +zoomFloatingCamera src/Dodge/Update/Camera.hs 68;" f +zoomFromItem src/Dodge/Update/Camera.hs 176;" f zoomInLongGun src/Dodge/Update/Scroll.hs 96;" f zoomOutLongGun src/Dodge/Update/Scroll.hs 104;" f zoomScope src/Dodge/Item/Scope.hs 33;" f