diff --git a/src/Dodge/Inventory.hs b/src/Dodge/Inventory.hs index 88835bbd7..dd56ab34f 100644 --- a/src/Dodge/Inventory.hs +++ b/src/Dodge/Inventory.hs @@ -271,9 +271,9 @@ invSetSelection sel w = w & hud . diSelection ?~ sel & worldEventFlags . at InventoryChange ?~ () - & crUpdateItemLocations +-- & crUpdateItemLocations & setInvPosFromSS -- is this necessary here? - & crUpdateItemLocations +-- & crUpdateItemLocations invSetSelectionPos :: Int -> Int -> World -> World invSetSelectionPos i j = invSetSelection (Sel i j) diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 37c5c4064..cbf4fb3c3 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -309,12 +309,6 @@ startDrag (a, b) w = setcontext $ fromMaybe (invSetSelection (Sel a b) w & hud.d where setcontext = input . mouseContext .~ OverInvDrag a (Just (a, b)) --- startDrag (a, b) w = setcontext $ case w ^? hud . diSelection . _Just of --- Just (Sel i _ xs) | i == a && b `IS.member` xs -> w --- _ -> invSetSelection (Sel a b mempty) w --- where --- setcontext = input . mouseContext .~ OverInvDrag a (Just (a, b)) - shiftInvItems :: Config -> Int -> -- recurse limit diff --git a/tags b/tags index 9fe704de1..588adecb9 100644 --- a/tags +++ b/tags @@ -2643,7 +2643,7 @@ advanceScrollAmount src/Dodge/Update.hs 502;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 33;" f aimDelaySweep src/Dodge/Render/Picture.hs 291;" f aimStanceInfo src/Dodge/Item/Info.hs 243;" f -aimTurn src/Dodge/Creature/YourControl.hs 155;" f +aimTurn src/Dodge/Creature/YourControl.hs 150;" f airlock src/Dodge/Room/Airlock.hs 28;" f airlock0 src/Dodge/Room/Airlock.hs 78;" f airlock90 src/Dodge/Room/Airlock.hs 201;" f @@ -2739,7 +2739,7 @@ axisInt src/Geometry/Intersect.hs 248;" f azure src/Color.hs 49;" f bQuadToF src/Geometry/Bezier.hs 37;" f bQuadToLine src/Geometry/Bezier.hs 30;" f -backPQ src/Dodge/Creature/HandPos.hs 185;" f +backPQ src/Dodge/Creature/HandPos.hs 183;" f backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 784;" f backpackCombinations src/Dodge/Combine/Combinations.hs 27;" f backpackShape src/Dodge/Item/Draw/SPic.hs 189;" f @@ -2879,10 +2879,10 @@ centerVaultRoom src/Dodge/Room/Procedural.hs 271;" f centroid src/Geometry/Polygon.hs 192;" f centroidNum src/Geometry/Polygon.hs 195;" f chainPairs src/Geometry.hs 360;" f -changeSwapOther src/Dodge/Inventory.hs 237;" f -changeSwapSel src/Dodge/Inventory.hs 206;" f -changeSwapSelSet src/Dodge/Inventory.hs 141;" f -changeSwapWith src/Dodge/Inventory.hs 274;" f +changeSwapOther src/Dodge/Inventory.hs 233;" f +changeSwapSel src/Dodge/Inventory.hs 202;" f +changeSwapSelSet src/Dodge/Inventory.hs 137;" f +changeSwapWith src/Dodge/Inventory.hs 264;" f charToTuple src/Picture/Base.hs 312;" f charToTupleGrad src/Picture/Text.hs 18;" f chartreuse src/Color.hs 51;" f @@ -2896,7 +2896,7 @@ chasmSpitTerminal src/Dodge/Room/Tutorial.hs 348;" f chasmTestCliffPush src/Dodge/Creature/State/WalkCycle.hs 126;" f chasmWallToSurface src/Dodge/Base/Collide.hs 133;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 102;" f -checkConnection src/Dodge/Inventory/Swap.hs 78;" f +checkConnection src/Dodge/Inventory/Swap.hs 74;" f checkDeath src/Dodge/Creature/Update.hs 461;" f checkDeath' src/Dodge/Creature/Update.hs 464;" f checkEndGame src/Dodge/Update.hs 892;" f @@ -2910,7 +2910,7 @@ checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f checkWallRight src/Dodge/LevelGen/StaticWalls/Deprecated.hs 59;" f chemFuelPouch src/Dodge/Item/Ammo.hs 81;" f -chestPQ src/Dodge/Creature/HandPos.hs 182;" f +chestPQ src/Dodge/Creature/HandPos.hs 180;" f chooseCursorBorders src/Dodge/Render/List.hs 141;" f chooseEquipPosition src/Dodge/Inventory/RBList.hs 42;" f chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 178;" f @@ -2944,11 +2944,11 @@ cleatSide src/Dodge/Cleat.hs 27;" f click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 844;" f clicker src/Dodge/Item/Scope.hs 88;" f clipV src/Geometry/Vector.hs 48;" f -clipZoom src/Dodge/Update/Camera.hs 241;" f +clipZoom src/Dodge/Update/Camera.hs 235;" f clipboardCr src/Dodge/Debug.hs 91;" f clockCycle src/Dodge/Clock.hs 7;" f closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 237;" f -closeItemDist src/Dodge/Inventory.hs 138;" f +closeItemDist src/Dodge/Inventory.hs 134;" f closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 221;" f closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 260;" f closeObjectInfo src/Dodge/Render/HUD.hs 221;" f @@ -2966,7 +2966,7 @@ cognizantVoc src/Dodge/Creature/Perception.hs 68;" f colCrWall src/Dodge/WallCreatureCollisions.hs 27;" f colCrsWalls src/Dodge/WallCreatureCollisions.hs 19;" f collectDamageTypes src/Dodge/Damage.hs 54;" f -collectInvItems src/Dodge/Inventory.hs 196;" f +collectInvItems src/Dodge/Inventory.hs 192;" f collide3 src/Dodge/Base/Collide.hs 142;" f collide3Chasm src/Dodge/Base/Collide.hs 126;" f collide3Chasms src/Dodge/Base/Collide.hs 118;" f @@ -2986,7 +2986,7 @@ combinationsOf src/Multiset.hs 46;" f combinationsTrie src/Dodge/Combine.hs 44;" f combineAwareness src/Dodge/Creature/Perception.hs 119;" f combineFloors src/Dodge/Room/Procedural.hs 154;" f -combineInventoryExtra src/Dodge/Render/HUD.hs 337;" f +combineInventoryExtra src/Dodge/Render/HUD.hs 335;" f combineItemListYouX src/Dodge/Combine.hs 36;" f combineList src/Dodge/Combine.hs 21;" f combineRooms src/Dodge/Room/Procedural.hs 134;" f @@ -3008,12 +3008,12 @@ compressionScale src/Dodge/Creature/State/WalkCycle.hs 69;" f compressor src/Dodge/Item/Ammo.hs 74;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 716;" f conEffects src/Dodge/Concurrent.hs 12;" f -concurrentIS src/Dodge/Inventory.hs 188;" f +concurrentIS src/Dodge/Inventory.hs 184;" f connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 802;" f constructEdges src/Polyhedra.hs 31;" f constructEdgesList src/Polyhedra.hs 40;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 58;" f -continueTerminal src/Dodge/Update/Input/InGame.hs 405;" f +continueTerminal src/Dodge/Update/Input/InGame.hs 400;" f convexHull src/Geometry/Polygon.hs 150;" f convexHullSafe src/Geometry/Polygon.hs 172;" f convexPolysOverlap src/Geometry/ConvexPoly.hs 48;" f @@ -3050,8 +3050,8 @@ crIXsNearPoint src/Dodge/Zoning/Creature.hs 15;" f crImpulsesOnCognizant src/Dodge/Creature/Perception.hs 58;" f crInAimStance src/Dodge/Creature/Test.hs 87;" f crIsAiming src/Dodge/Creature/Test.hs 57;" f -crIsArmouredFrom src/Dodge/Creature/Test.hs 104;" f -crLeftHandWall src/Dodge/Creature/HandPos.hs 95;" f +crIsArmouredFrom src/Dodge/Creature/Test.hs 103;" f +crLeftHandWall src/Dodge/Creature/HandPos.hs 94;" f crMass src/Dodge/Creature/Mass.hs 5;" f crMaterial src/Dodge/Creature/Material.hs 8;" f crMaxHP src/Dodge/Creature/MaxHP.hs 6;" f @@ -3063,23 +3063,23 @@ crMvByNoStride src/Dodge/Creature/Impulse/Movement.hs 36;" f crMvForward src/Dodge/Creature/Impulse/Movement.hs 88;" f crMvForward' src/Dodge/Creature/Impulse/Movement.hs 67;" f crMvType src/Dodge/Creature/MoveType.hs 7;" f -crNearPoint src/Dodge/Creature/Test.hs 126;" f +crNearPoint src/Dodge/Creature/Test.hs 125;" f crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 25;" f crOnSeg src/Dodge/WorldEvent/ThingsHit.hs 249;" f crOnSeg' src/Dodge/Creature/State/WalkCycle.hs 145;" f crPainEffect src/Dodge/Creature/State.hs 50;" f crPathing src/Dodge/Creature/Action.hs 127;" f crRad src/Dodge/Creature/Radius.hs 7;" f -crRightHandWall src/Dodge/Creature/HandPos.hs 77;" f +crRightHandWall src/Dodge/Creature/HandPos.hs 76;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 71;" f -crSetRoots src/Dodge/Inventory/Location.hs 57;" f +crSetRoots src/Dodge/Inventory/Location.hs 39;" f crShape src/Dodge/Creature/Shape.hs 8;" f crSpring src/Dodge/Update.hs 1001;" f crStratConMatches src/Dodge/Creature/Test.hs 77;" f crStrength src/Dodge/Creature/Statistics.hs 30;" f crUpdate src/Dodge/Creature/Update.hs 454;" f -crUpdateInvidLocations src/Dodge/Inventory/Location.hs 68;" f -crUpdateItemLocations src/Dodge/Inventory/Location.hs 50;" f +crUpdateInvidLocations src/Dodge/Inventory/Location.hs 50;" f +crUpdateItemLocations src/Dodge/Inventory/Location.hs 32;" f crVocalResetTime src/Dodge/Creature/Vocalization.hs 69;" f crWalk src/Dodge/Creature/Impulse/Movement.hs 32;" f crWalkAbsolute src/Dodge/Creature/Impulse/Movement.hs 47;" f @@ -3329,7 +3329,7 @@ divideLine src/Geometry.hs 248;" f divideLineExact src/Geometry.hs 276;" f divideLineOddNumPoints src/Geometry.hs 261;" f dmType src/Dodge/Damage.hs 38;" f -doAimTwist src/Dodge/Creature/YourControl.hs 135;" f +doAimTwist src/Dodge/Creature/YourControl.hs 130;" f doAnyEquipmentEffect src/Dodge/Creature/State.hs 169;" f doBackspace src/Dodge/Update/Input/Text.hs 31;" f doBarrelSpin src/Dodge/Projectile/Update.hs 169;" f @@ -3357,7 +3357,7 @@ doDebugTestF8 src/Dodge/Update/Input/DebugTest.hs 59;" f doDoorLerp src/Dodge/Door/DoorLerp.hs 8;" f doDoorMount src/Dodge/Door.hs 32;" f doDrag src/Dodge/Update/Input/InGame.hs 136;" f -doDragSelect src/Dodge/Update/Input/InGame.hs 214;" f +doDragSelect src/Dodge/Update/Input/InGame.hs 215;" f doDrawing src/Dodge/Render.hs 33;" f doDrawing' src/Dodge/Render.hs 44;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f @@ -3367,19 +3367,19 @@ doHeldUseEffect src/Dodge/HeldUse.hs 379;" f doInPlacements src/Dodge/Layout.hs 106;" f doIndividualPlacements src/Dodge/Layout.hs 118;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 38;" f -doItemTimeScroll src/Dodge/Update.hs 230;" f +doItemTimeScroll src/Dodge/Update.hs 231;" f doLoop src/Loop.hs 60;" f doMagnetBuBu src/Dodge/Bullet.hs 35;" f doModificationEffect src/Dodge/ModificationEffect.hs 7;" f -doMouseWarping src/Dodge/Update.hs 165;" f +doMouseWarping src/Dodge/Update.hs 166;" f doPreload appDodge/Main.hs 133;" f doQuickload src/Dodge/Save.hs 83;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 8;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 458;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 453;" f doRoomPlacements src/Dodge/Layout.hs 121;" f doRoomShift src/Dodge/Room/Link.hs 34;" f -doScopeZoom src/Dodge/Update/Scroll.hs 92;" f +doScopeZoom src/Dodge/Update/Scroll.hs 90;" f doSectionSize src/Dodge/DisplayInventory.hs 216;" f doSideEffects appDodge/Main.hs 118;" f doSlimeRadChange src/Dodge/Creature/Update.hs 299;" f @@ -3388,9 +3388,9 @@ doTestDrawing src/Dodge/Render.hs 40;" f doTextInputOver src/Dodge/Update/Input/Text.hs 15;" f doTextInputOverUniverse src/Dodge/Update/Input/Text.hs 12;" f doThrust src/Dodge/Projectile/Update.hs 132;" f -doTimeScroll src/Dodge/Update.hs 235;" f +doTimeScroll src/Dodge/Update.hs 236;" f doTmWdWd src/Dodge/WorldEffect.hs 102;" f -doWallRotate src/Dodge/Update/Camera.hs 238;" f +doWallRotate src/Dodge/Update/Camera.hs 232;" f doWdBl src/Dodge/WorldBool.hs 10;" f doWdCrBl src/Dodge/CreatureEffect.hs 18;" f doWdP2f src/Dodge/WdP2f.hs 10;" f @@ -3469,8 +3469,8 @@ drawInputMenu src/Dodge/Render/MenuScreen.hs 33;" f drawInspectWall src/Dodge/Debug/Picture.hs 256;" f drawInspectWalls src/Dodge/Debug/Picture.hs 244;" f drawInventory src/Dodge/Render/HUD.hs 60;" f -drawItemChildrenConnect src/Dodge/Render/HUD.hs 330;" f -drawItemConnections src/Dodge/Render/HUD.hs 323;" f +drawItemChildrenConnect src/Dodge/Render/HUD.hs 328;" f +drawItemConnections src/Dodge/Render/HUD.hs 321;" f drawJumpDown src/Dodge/Render/Picture.hs 192;" f drawLabCrossCol src/Dodge/Render/Label.hs 8;" f drawLabelledList src/Dodge/Render/List.hs 198;" f @@ -3525,8 +3525,8 @@ drawSubInventory src/Dodge/Render/HUD.hs 166;" f drawSwitch src/Dodge/Button/Draw.hs 18;" f drawSwitchWire src/Dodge/LevelGen/Switch.hs 24;" f drawTargetingAR src/Dodge/Targeting/Draw.hs 20;" f -drawTerminalCursorLink src/Dodge/Render/HUD.hs 393;" f -drawTerminalDisplay src/Dodge/Render/HUD.hs 354;" f +drawTerminalCursorLink src/Dodge/Render/HUD.hs 391;" f +drawTerminalDisplay src/Dodge/Render/HUD.hs 352;" f drawTeslaArc src/Dodge/Tesla/Draw.hs 9;" f drawText src/Picture/Base.hs 224;" f drawTitle src/Dodge/Render/MenuScreen.hs 49;" f @@ -3548,7 +3548,7 @@ drawZoneCol src/Dodge/Debug/Picture.hs 149;" f drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 286;" f dropAll src/Dodge/Creature/Update.hs 546;" f dropInventoryPath src/Dodge/HeldUse.hs 1380;" f -dropItem src/Dodge/Creature/Action.hs 179;" f +dropItem src/Dodge/Creature/Action.hs 163;" f dropper src/Dodge/Item/Scope.hs 82;" f drumMag src/Dodge/Item/Ammo.hs 31;" f dsZoneSize src/Dodge/Zoning/Cloud.hs 51;" f @@ -3588,8 +3588,8 @@ encircleCloseP src/Dodge/Creature/Boid.hs 38;" f encircleDistP src/Dodge/Creature/Boid.hs 24;" f encircleP src/Dodge/Creature/Boid.hs 30;" f endArcPos src/Dodge/Tesla.hs 87;" f -endCombineRegex src/Dodge/Update/Input/InGame.hs 293;" f -endRegex src/Dodge/Update/Input/InGame.hs 287;" f +endCombineRegex src/Dodge/Update/Input/InGame.hs 294;" f +endRegex src/Dodge/Update/Input/InGame.hs 288;" f energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 742;" f enterCombineInv src/Dodge/DisplayInventory.hs 322;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f @@ -3597,12 +3597,12 @@ epText src/Dodge/Inventory/SelectionList.hs 74;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 5;" f eqTypeToSites src/Dodge/Inventory/RBList.hs 78;" f -equipAllocString src/Dodge/Render/HUD.hs 314;" f -equipAttachPos src/Dodge/Item/Draw.hs 31;" f +equipAllocString src/Dodge/Render/HUD.hs 312;" f +equipAttachPos src/Dodge/Item/Draw.hs 30;" f equipBackgroundEffect src/Dodge/Euse.hs 22;" f equipInfo src/Dodge/Item/Info.hs 140;" f equipItemSPic src/Dodge/Item/Draw/SPic.hs 160;" f -equipPosition src/Dodge/Item/Draw.hs 39;" f +equipPosition src/Dodge/Item/Draw.hs 38;" f equipSiteInfo src/Dodge/Item/Info.hs 252;" f equipSitePQ src/Dodge/Creature/HandPos.hs 33;" f equipType src/Dodge/Data/EquipType.hs 10;" f @@ -3623,7 +3623,7 @@ expandPolyByFixed src/Dodge/LevelGen/StaticWalls.hs 97;" f expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 191;" f -explodeShell src/Dodge/Projectile/Update.hs 272;" f +explodeShell src/Dodge/Projectile/Update.hs 265;" f explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 746;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 79;" f @@ -3634,14 +3634,14 @@ extraWeaponLinksBelow src/Dodge/Item/Grammar.hs 104;" f extractRoomPos src/Dodge/RoomPos.hs 6;" f faceEdges src/Polyhedra.hs 62;" f facesToVF src/Polyhedra/Geodesic.hs 70;" f -farWallDistDirection src/Dodge/Update/Camera.hs 252;" f +farWallDistDirection src/Dodge/Update/Camera.hs 246;" f fdiv src/ShortShow.hs 41;" f feedSlime src/Dodge/Update.hs 1081;" f feet src/Dodge/Creature/Picture.hs 226;" f filter3 src/FoldableHelp.hs 76;" f filterSectionsPair src/Dodge/DisplayInventory.hs 161;" f findBlips src/Dodge/RadarSweep.hs 63;" f -findBoundDists src/Dodge/Update/Camera.hs 259;" f +findBoundDists src/Dodge/Update/Camera.hs 253;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f findClosePoint src/Dodge/LevelGen/StaticWalls/Deprecated.hs 74;" f findIndex src/IntMapHelp.hs 86;" f @@ -3713,7 +3713,7 @@ fromV3 src/Geometry/Data.hs 63;" f frontArmour src/Dodge/Item/Equipment.hs 32;" f fstV2 src/Geometry/Data.hs 70;" f fuelPack src/Dodge/Item/Equipment.hs 44;" f -functionalUpdate src/Dodge/Update.hs 278;" f +functionalUpdate src/Dodge/Update.hs 279;" f fusePoint src/Dodge/LevelGen/StaticWalls.hs 158;" f fuseSlimes src/Dodge/Update.hs 1095;" f fuseWall src/Dodge/LevelGen/StaticWalls.hs 165;" f @@ -3741,14 +3741,14 @@ geometryQuickCheckTests test/Spec.hs 59;" f geometryTests test/Spec.hs 19;" f geometryUnitTests test/Spec.hs 25;" f geqConstr src/SameConstr.hs 21;" f -getAimZoom src/Dodge/Update/Camera.hs 159;" f +getAimZoom src/Dodge/Update/Camera.hs 153;" f getAmmoLinks src/Dodge/Item/Grammar.hs 109;" f getAttachedSFLink src/Dodge/HeldUse.hs 806;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 90;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 175;" f getBulletType src/Dodge/HeldUse.hs 945;" f -getCloseObj src/Dodge/Update/Input/InGame.hs 578;" f +getCloseObj src/Dodge/Update/Input/InGame.hs 563;" f getCommand src/Dodge/Terminal.hs 61;" f getCommands src/Dodge/Terminal.hs 58;" f getCrMoveSpeed src/Dodge/Creature/Statistics.hs 56;" f @@ -3772,7 +3772,6 @@ getPromptTM src/Dodge/Terminal/Type.hs 3;" f getRoomFromID src/Dodge/Room/Modify.hs 31;" f getRoomsFromInts src/Dodge/Room/Tutorial.hs 611;" f getRootItemBounds src/Dodge/Render/HUD.hs 98;" f -getRootItemInvID src/Dodge/Inventory/Location.hs 36;" f getSelectedCloseObj src/Dodge/SelectedClose.hs 18;" f getSmoothScrollValue src/Dodge/SmoothScroll.hs 21;" f getSplitString src/Dodge/Debug/Terminal.hs 129;" f @@ -3844,7 +3843,7 @@ handleResizeEvent src/Dodge/Event.hs 53;" f handleTextInput src/Dodge/Event/Input.hs 19;" f handleWindowMoveEvent src/Dodge/Event.hs 44;" f hardQuit src/Dodge/Concurrent.hs 32;" f -hasAutoDoorBody src/Dodge/Creature/Test.hs 136;" f +hasAutoDoorBody src/Dodge/Creature/Test.hs 135;" f hasButtonLOS src/Dodge/Base/Collide.hs 316;" f hasCaneGunDim src/Dodge/Item/InvSize.hs 48;" f hasLOS src/Dodge/Base/Collide.hs 309;" f @@ -3854,25 +3853,25 @@ head src/DoubleStack.hs 14;" f headLamp src/Dodge/Item/Equipment.hs 68;" f headLampShape src/Dodge/Item/Draw/SPic.hs 426;" f headMap src/Dodge/DoubleTree.hs 118;" f -headPQ src/Dodge/Creature/HandPos.hs 176;" f +headPQ src/Dodge/Creature/HandPos.hs 174;" f healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 674;" f healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 109;" f healthTest src/Dodge/Room/LasTurret.hs 129;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 24;" f heldAimStance src/Dodge/Item/AimStance.hs 28;" f -heldAimZoom src/Dodge/Update/Camera.hs 165;" f +heldAimZoom src/Dodge/Update/Camera.hs 159;" f heldEffect src/Dodge/HeldUse.hs 64;" f heldEffectMuzzles src/Dodge/HeldUse.hs 135;" f heldHandlePos src/Dodge/Item/HeldOffset.hs 96;" f heldInfo src/Dodge/Item/Info.hs 92;" f heldItemAmmoSlots src/Dodge/Item/AmmoSlots.hs 20;" f -heldItemBulkiness src/Dodge/Creature/YourControl.hs 169;" f +heldItemBulkiness src/Dodge/Creature/YourControl.hs 163;" f heldItemInvLock src/Dodge/HeldUse.hs 469;" f heldItemMuzVel src/Dodge/HeldUse.hs 1031;" f heldItemMuzzles src/Dodge/HeldUse.hs 198;" f heldItemRifling src/Dodge/HeldUse.hs 1073;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 236;" f -heldItemWeight src/Dodge/Creature/Statistics.hs 87;" f +heldItemWeight src/Dodge/Creature/Statistics.hs 86;" f heldPositionInfo src/Dodge/Item/Info.hs 240;" f heldTorqueAmount src/Dodge/HeldUse.hs 611;" f heldTriggerType src/Dodge/BaseTriggerType.hs 28;" f @@ -3891,7 +3890,7 @@ holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 50;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToChar src/Dodge/Inventory/SelectionList.hs 201;" f -hotkeyToScancode src/Dodge/Creature/YourControl.hs 64;" f +hotkeyToScancode src/Dodge/Creature/YourControl.hs 62;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 198;" f hoverCrit src/Dodge/Creature/ChaseCrit.hs 83;" f hoverCritHoverSound src/Dodge/Creature/Update.hs 437;" f @@ -3969,15 +3968,15 @@ invDP src/Dodge/ListDisplayParams.hs 32;" f invDT src/Dodge/Item/Grammar.hs 227;" f invDT' src/Dodge/Item/Grammar.hs 232;" f invDimColor src/Dodge/DisplayInventory.hs 191;" f -invHead src/Dodge/Render/HUD.hs 423;" f +invHead src/Dodge/Render/HUD.hs 421;" f invIMDT src/Dodge/Item/Grammar.hs 256;" f invIndents src/Dodge/Item/Grammar.hs 263;" f invItemEffs src/Dodge/Creature/State.hs 91;" f invItemLocUpdate src/Dodge/Creature/State.hs 99;" f invRootMap src/Dodge/Item/Grammar.hs 237;" f invSelectionItem src/Dodge/Inventory/SelectionList.hs 33;" f -invSetSelection src/Dodge/Inventory.hs 279;" f -invSetSelectionPos src/Dodge/Inventory.hs 288;" f +invSetSelection src/Dodge/Inventory.hs 269;" f +invSetSelectionPos src/Dodge/Inventory.hs 278;" f invShiftPointBy src/Dodge/ShiftPoint.hs 17;" f invSize src/Dodge/Inventory/CheckSlots.hs 33;" f inventoryX src/Dodge/Creature.hs 103;" f @@ -3993,10 +3992,10 @@ invertInventoryToMap src/Dodge/Combine.hs 57;" f invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 29;" f invisibleWall src/Dodge/Placement/Instance/Wall.hs 27;" f isAmmoIntLink src/Dodge/HeldUse.hs 738;" f -isAnimate src/Dodge/Creature/Test.hs 129;" f +isAnimate src/Dodge/Creature/Test.hs 128;" f isBee src/Dodge/TestString.hs 45;" f isCognizant src/Dodge/Creature/Perception.hs 115;" f -isConnected src/Dodge/Inventory/Swap.hs 89;" f +isConnected src/Dodge/Inventory/Swap.hs 85;" f isCornerLink src/Dodge/RoomLink.hs 66;" f isFlyable src/Dodge/WorldEvent/ThingsHit.hs 232;" f isInLnk src/Dodge/PlacementSpot.hs 163;" f @@ -4033,7 +4032,7 @@ itemBaseName src/Dodge/Item/Display.hs 60;" f itemBaseStance src/Dodge/Item/AimStance.hs 22;" f itemBelowAttachables src/Dodge/Item/Grammar.hs 54;" f itemBlips src/Dodge/RadarSweep.hs 94;" f -itemBulkiness src/Dodge/Creature/YourControl.hs 163;" f +itemBulkiness src/Dodge/Creature/YourControl.hs 157;" f itemCombinations src/Dodge/Combine/Combinations.hs 56;" f itemDetectorEffect src/Dodge/HeldUse.hs 812;" f itemDisplay src/Dodge/Inventory/SelectionList.hs 54;" f @@ -4053,7 +4052,7 @@ itemRooms src/Dodge/LockAndKey.hs 40;" f itemRotTreeSPic src/Dodge/Item/Draw/SPicTree.hs 16;" f itemSPic src/Dodge/Item/Draw/SPic.hs 17;" f itemScan src/Dodge/Item/Scope.hs 68;" f -itemScroll src/Dodge/Update/Scroll.hs 58;" f +itemScroll src/Dodge/Update/Scroll.hs 56;" f itemScrollDisplay src/Dodge/Inventory/SelectionList.hs 137;" f itemScrollValue src/Dodge/Inventory/SelectionList.hs 164;" f itemShapeMax src/Dodge/Item/Orientation.hs 68;" f @@ -4066,7 +4065,7 @@ itemString src/Dodge/Item/Display.hs 56;" f itemToFunction src/Dodge/Item/Grammar.hs 112;" f itemTreeSPic src/Dodge/Item/Draw/SPicTree.hs 13;" f itemTriggerType src/Dodge/BaseTriggerType.hs 16;" f -itemWeight src/Dodge/Creature/Statistics.hs 81;" f +itemWeight src/Dodge/Creature/Statistics.hs 80;" f iterateUntil src/MonadHelp.hs 23;" f iterateWhile src/MonadHelp.hs 30;" f itmBaseInfo src/Dodge/Item/Info.hs 30;" f @@ -4126,13 +4125,13 @@ leaveResetQuitTerminal src/Dodge/WorldEffect.hs 164;" f led src/Dodge/Item/Held/Utility.hs 23;" f left src/DoubleStack.hs 16;" f leftChildList src/Dodge/Item/Grammar.hs 195;" f -leftHandPQ src/Dodge/Creature/HandPos.hs 119;" f +leftHandPQ src/Dodge/Creature/HandPos.hs 118;" f leftIsParentCombine src/Dodge/Item/Grammar.hs 172;" f leftPad src/Padding.hs 15;" f leftRightCombine src/Dodge/Item/Grammar.hs 207;" f -leftWristPQ src/Dodge/Creature/HandPos.hs 148;" f -legPQ src/Dodge/Creature/HandPos.hs 154;" f -legPQ' src/Dodge/Creature/HandPos.hs 159;" f +leftWristPQ src/Dodge/Creature/HandPos.hs 146;" f +legPQ src/Dodge/Creature/HandPos.hs 152;" f +legPQ' src/Dodge/Creature/HandPos.hs 157;" f legsSPic src/Dodge/Item/Draw/SPic.hs 451;" f lerpP2A src/Dodge/ShiftPoint.hs 14;" f liShape src/Dodge/Placement/Instance/LightSource.hs 86;" f @@ -4160,7 +4159,7 @@ listGuard src/Dodge/Creature/ReaderUpdate.hs 287;" f listSelectionColorPicture src/Dodge/DisplayInventory.hs 300;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f lmt src/MatrixHelper.hs 53;" f -lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 412;" f +lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 410;" f loadAmmoTut src/Dodge/Room/Tutorial.hs 475;" f loadDodgeConfig src/Dodge/Config.hs 30;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f @@ -4287,8 +4286,8 @@ maybeBlockedPassage src/Dodge/Room/RezBox.hs 80;" f maybeClearLoadingScreen src/Dodge/StartNewGame.hs 58;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 136;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 141;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 614;" f -maybeOpenConsole src/Dodge/Update.hs 135;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 599;" f +maybeOpenConsole src/Dodge/Update.hs 136;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 135;" f maybeTakeStep src/Dodge/Creature/State/WalkCycle.hs 156;" f @@ -4386,13 +4385,13 @@ mouseCursorType src/Dodge/Render/Picture.hs 90;" f mouseWorldPos src/Dodge/Base/Coordinate.hs 39;" f mouseWorldPosW src/Dodge/Base/Coordinate.hs 42;" f moveBullet src/Dodge/Bullet.hs 200;" f -moveCombineSel src/Dodge/Update/Scroll.hs 122;" f +moveCombineSel src/Dodge/Update/Scroll.hs 120;" f moveInverseShockwave src/Dodge/Shockwave/Update.hs 31;" f movePenBullet src/Dodge/Bullet.hs 206;" f -moveProjectile src/Dodge/Projectile/Update.hs 247;" f +moveProjectile src/Dodge/Projectile/Update.hs 240;" f moveRoomBy src/Dodge/Room/Link.hs 57;" f moveShockwave src/Dodge/Shockwave/Update.hs 13;" f -moveStuckGrenade src/Dodge/Projectile/Update.hs 226;" f +moveStuckGrenade src/Dodge/Projectile/Update.hs 219;" f moveToSideNthOutLink src/Dodge/Room/Warning.hs 106;" f moveWall src/Dodge/Wall/Move.hs 23;" f moveWallID src/Dodge/Wall/Move.hs 18;" f @@ -4406,13 +4405,13 @@ multGunCrit src/Dodge/Creature.hs 68;" f multiArrow src/Picture/Composite.hs 11;" f multiLookupTrie src/SimpleTrie.hs 57;" f multiLookupTrieI src/SimpleTrie.hs 66;" f -multiSelScroll src/Dodge/Inventory.hs 213;" f -multiSelScroll' src/Dodge/Inventory.hs 220;" f +multiSelScroll src/Dodge/Inventory.hs 209;" f +multiSelScroll' src/Dodge/Inventory.hs 216;" f muout src/Dodge/RoomLink.hs 144;" f muzFlareAt src/Dodge/HeldUse.hs 702;" f muzzlePos src/Dodge/HeldUse.hs 787;" f muzzleRandPos src/Dodge/HeldUse.hs 796;" f -muzzleWallCheck src/Dodge/Update.hs 351;" f +muzzleWallCheck src/Dodge/Update.hs 352;" f mvButton src/Dodge/Placement/PlaceSpot.hs 170;" f mvCr src/Dodge/Placement/PlaceSpot.hs 173;" f mvFS src/Dodge/Placement/PlaceSpot.hs 176;" f @@ -4474,9 +4473,9 @@ obstructPathsCrossing src/Dodge/Path.hs 153;" f oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f onEquipWristShield src/Dodge/Euse.hs 89;" f onRemoveWristShield src/Dodge/Euse.hs 79;" f -oneH src/Dodge/Creature/Test.hs 92;" f +oneH src/Dodge/Creature/Test.hs 91;" f oneSmooth src/Dodge/Creature/Picture.hs 223;" f -openConsole src/Dodge/Update.hs 140;" f +openConsole src/Dodge/Update.hs 141;" f optionMenu src/Dodge/Menu.hs 110;" f optionScreenDefaultEffect src/Dodge/Update/Input/ScreenLayer.hs 62;" f optionScreenUpdate src/Dodge/Update/Input/ScreenLayer.hs 53;" f @@ -4529,11 +4528,11 @@ passthroughLockKeyLists src/Dodge/Room/Tutorial.hs 693;" f pathConnected src/Dodge/Room/CheckConsistency.hs 13;" f pathEdgeObstructed src/Dodge/Path.hs 87;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 570;" f +pauseGame src/Dodge/Update/Input/InGame.hs 555;" f pauseMenu src/Dodge/Menu.hs 57;" f pauseMenuOptions src/Dodge/Menu.hs 64;" f pauseSound src/Dodge/SoundLogic.hs 42;" f -pauseTime src/Dodge/Update.hs 219;" f +pauseTime src/Dodge/Update.hs 220;" f pbFlicker src/Dodge/Update.hs 572;" f pbsHit src/Dodge/WorldEvent/ThingsHit.hs 144;" f peZoneSize src/Dodge/Zoning/Pathing.hs 49;" f @@ -4591,9 +4590,9 @@ pointIsInCone src/Geometry.hs 375;" f pointIsOnScreen src/Dodge/Base/Window.hs 60;" f pointTowardsImpulse src/Dodge/Path.hs 120;" f pointTowardsImpulse' src/Dodge/Path.hs 123;" f -pointerToItem src/Dodge/Item/Location.hs 42;" f -pointerToItemID src/Dodge/Item/Location.hs 45;" f -pointerYourRootItem src/Dodge/Item/Location.hs 35;" f +pointerToItem src/Dodge/Item/Location.hs 38;" f +pointerToItemID src/Dodge/Item/Location.hs 41;" f +pointerYourRootItem src/Dodge/Item/Location.hs 32;" f pointerYourSelectedItem src/Dodge/Item/Location.hs 26;" f pointsToPoly src/Geometry/ConvexPoly.hs 37;" f poisonSPic src/Dodge/Creature/Update.hs 542;" f @@ -4713,7 +4712,7 @@ pushOutFromCorners src/Dodge/WallCreatureCollisions.hs 124;" f pushOutFromWall' src/Dodge/WallCreatureCollisions.hs 113;" f pushR src/DoubleStack.hs 24;" f pushScreen src/Dodge/Menu/PushPop.hs 9;" f -pushYouOutFromWalls src/Dodge/Update.hs 345;" f +pushYouOutFromWalls src/Dodge/Update.hs 346;" f putAutoDoor src/Dodge/Placement/Instance/Door.hs 64;" f putBlockN src/Dodge/Placement/Instance/Wall.hs 120;" f putBlockRect src/Dodge/Placement/Instance/Wall.hs 111;" f @@ -4881,11 +4880,11 @@ rightHandPQ src/Dodge/Creature/HandPos.hs 64;" f rightIsParentCombine src/Dodge/Item/Grammar.hs 183;" f rightPad src/Padding.hs 19;" f rightPadNoSquash src/Padding.hs 23;" f -rightWristPQ src/Dodge/Creature/HandPos.hs 116;" f +rightWristPQ src/Dodge/Creature/HandPos.hs 115;" f rlPosDir src/Dodge/RoomLink.hs 112;" f rlauncherPic src/Dodge/Item/Draw/SPic.hs 402;" f rmInLinks src/Dodge/RoomLink.hs 153;" f -rmInvItem src/Dodge/Inventory.hs 84;" f +rmInvItem src/Dodge/Inventory.hs 85;" f rmLinksOfType src/Dodge/RoomLink.hs 150;" f rmOutLinks src/Dodge/RoomLink.hs 153;" f roomC src/Dodge/Room/Room.hs 54;" f @@ -4918,7 +4917,7 @@ rotate src/Picture/Base.hs 145;" f rotate3x src/Geometry/Vector3D.hs 61;" f rotate3y src/Geometry/Vector3D.hs 67;" f rotate3z src/Geometry/Vector3D.hs 55;" f -rotateCamera src/Dodge/Update/Camera.hs 212;" f +rotateCamera src/Dodge/Update/Camera.hs 206;" f rotateList src/Padding.hs 49;" f rotateSH src/Shape.hs 259;" f rotateSHq src/Shape.hs 159;" f @@ -4926,7 +4925,7 @@ rotateSHx src/Shape.hs 267;" f rotateSP src/ShapePicture.hs 57;" f rotateTo src/Polyhedra/Geodesic.hs 65;" f rotateTo8 src/Dodge/Update/Camera/Rotate.hs 6;" f -rotateToOverlappingWall src/Dodge/Update/Camera.hs 226;" f +rotateToOverlappingWall src/Dodge/Update/Camera.hs 220;" f rotateToZ src/Quaternion.hs 38;" f rotateV src/Geometry/Vector.hs 114;" f rotateVAround src/Geometry/Vector.hs 121;" f @@ -4969,7 +4968,7 @@ scaleMat src/MatrixHelper.hs 71;" f scaleMatrix src/MatrixHelper.hs 68;" f scaleSH src/Shape.hs 271;" f scalp src/Dodge/Creature/Picture.hs 401;" f -scancodeToHotkey src/Dodge/Creature/YourControl.hs 84;" f +scancodeToHotkey src/Dodge/Creature/YourControl.hs 82;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f scorchSPic src/Dodge/Creature/Update.hs 539;" f screenBox src/Dodge/Base/Window.hs 54;" f @@ -4977,12 +4976,12 @@ screenPolygon src/Dodge/Base/Window.hs 18;" f screenPolygonBord src/Dodge/Base/Window.hs 28;" f screenPosAbs src/Dodge/ScreenPos.hs 16;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 45;" f -scrollAugInvSel src/Dodge/Inventory.hs 291;" f -scrollAugNextInSection src/Dodge/Inventory.hs 306;" f -scrollRBOption src/Dodge/Update/Scroll.hs 142;" f +scrollAugInvSel src/Dodge/Inventory.hs 281;" f +scrollAugNextInSection src/Dodge/Inventory.hs 296;" f +scrollRBOption src/Dodge/Update/Scroll.hs 140;" f scrollSelectionSections src/Dodge/SelectionSections.hs 30;" f -scrollTimeBack src/Dodge/Update.hs 245;" f -scrollTimeForward src/Dodge/Update.hs 262;" f +scrollTimeBack src/Dodge/Update.hs 246;" f +scrollTimeForward src/Dodge/Update.hs 263;" f seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 644;" f @@ -5000,14 +4999,14 @@ seedStartMenu src/Dodge/Menu.hs 85;" f seedStartOptions src/Dodge/Menu.hs 88;" f segOnCirc src/Geometry.hs 113;" f segmentArea src/Dodge/Creature/Update.hs 355;" f -selNumPos src/Dodge/Render/HUD.hs 472;" f -selNumPosCardinal src/Dodge/Render/HUD.hs 489;" f +selNumPos src/Dodge/Render/HUD.hs 470;" f +selNumPosCardinal src/Dodge/Render/HUD.hs 487;" f selSecDrawCursor src/Dodge/Render/List.hs 101;" f -selSecSelCol src/Dodge/Render/HUD.hs 509;" f +selSecSelCol src/Dodge/Render/HUD.hs 507;" f selSecSelSize src/Dodge/SelectionSections.hs 178;" f selSecYint src/Dodge/SelectionSections.hs 187;" f -selectedItemScroll src/Dodge/Update/Scroll.hs 51;" f -selectionSet src/Dodge/Update/Input/InGame.hs 161;" f +selectedItemScroll src/Dodge/Update/Scroll.hs 50;" f +selectionSet src/Dodge/Update/Input/InGame.hs 162;" f semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 846;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 68;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 77;" f @@ -5030,7 +5029,7 @@ setFallback src/Dodge/PlacementSpot.hs 127;" f setInLinks src/Dodge/RoomLink.hs 52;" f setInLinksByType src/Dodge/RoomLink.hs 73;" f setInLinksPD src/Dodge/RoomLink.hs 93;" f -setInvPosFromSS src/Dodge/Inventory/Location.hs 90;" f +setInvPosFromSS src/Dodge/Inventory/Location.hs 67;" f setLayer src/Picture/Base.hs 131;" f setLinkType src/Dodge/RoomLink.hs 79;" f setLinkTypePD src/Dodge/RoomLink.hs 86;" f @@ -5042,7 +5041,7 @@ setOutLinksByType src/Dodge/RoomLink.hs 76;" f setOutLinksPD src/Dodge/RoomLink.hs 96;" f setPixelOffsetBounded src/Dodge/Update/Input/InGame.hs 123;" f setRBCreatureTargeting src/Dodge/Creature/State.hs 318;" f -setSelWhileDragging src/Dodge/Update/Input/InGame.hs 349;" f +setSelWhileDragging src/Dodge/Update/Input/InGame.hs 344;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 93;" f setShaderSource src/Shader/Compile.hs 121;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5051,7 +5050,7 @@ setSoundVolume src/Sound.hs 159;" f setTile src/Dodge/Layout.hs 78;" f setTiles src/Dodge/Layout.hs 68;" f setTreeInts src/Dodge/Room/Tutorial.hs 118;" f -setViewDistance src/Dodge/Update/Camera.hs 247;" f +setViewDistance src/Dodge/Update/Camera.hs 241;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 70;" f setViewport src/Dodge/Render.hs 453;" f setVol src/Dodge/Config.hs 47;" f @@ -5085,9 +5084,9 @@ shiftByV2 src/Dodge/PlacementSpot.hs 257;" f shiftChildren src/Dodge/Tree/Compose.hs 45;" f shiftDraw src/Dodge/Render/ShapePicture.hs 111;" f shiftInBy src/Dodge/PlacementSpot.hs 254;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 317;" f -shiftInvItemsDown src/Dodge/Inventory.hs 172;" f -shiftInvItemsUp src/Dodge/Inventory.hs 182;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 312;" f +shiftInvItemsDown src/Dodge/Inventory.hs 168;" f +shiftInvItemsUp src/Dodge/Inventory.hs 178;" f shiftLinkBy src/Dodge/Room/Link.hs 89;" f shiftPSBy src/Dodge/Placement/Shift.hs 12;" f shiftPathBy src/Dodge/Room/Link.hs 94;" f @@ -5099,8 +5098,8 @@ shiftRelativeToPS src/Dodge/Placement/Shift.hs 18;" f shiftRoomBy src/Dodge/Room/Link.hs 38;" f shiftRoomShiftBy src/Dodge/Room/Link.hs 83;" f shiftRoomShiftToLink src/Dodge/Room/Link.hs 74;" f -shiftSetDown src/Dodge/Inventory.hs 165;" f -shiftSetUp src/Dodge/Inventory.hs 159;" f +shiftSetDown src/Dodge/Inventory.hs 161;" f +shiftSetUp src/Dodge/Inventory.hs 155;" f shiftTile src/Dodge/Room/Link.hs 49;" f shineTargetLaser src/Dodge/Creature/State.hs 229;" f shineTorch src/Dodge/Creature/State.hs 266;" f @@ -5127,10 +5126,10 @@ showEquipItem src/Dodge/Item/Display.hs 109;" f showInt src/Dodge/Item/Info.hs 75;" f showIntsString src/Dodge/Tree/Compose.hs 130;" f showInventoryPathing src/Dodge/Item/Display.hs 87;" f -showManObj src/Dodge/TestString.hs 129;" f +showManObj src/Dodge/TestString.hs 131;" f showMuzzlePositions src/Dodge/Debug.hs 320;" f showTerminalError src/Dodge/Debug/Terminal.hs 80;" f -showTimeFlow src/Dodge/TestString.hs 145;" f +showTimeFlow src/Dodge/TestString.hs 147;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 198;" f shrinkVert src/Geometry/Polygon.hs 202;" f shuffle src/RandomHelp.hs 68;" f @@ -5219,7 +5218,7 @@ soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 89;" f spPos src/ShapePicture/Data.hs 11;" f -spaceAction src/Dodge/Update/Input/InGame.hs 573;" f +spaceAction src/Dodge/Update/Input/InGame.hs 558;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 162;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 155;" f spanLS src/Dodge/Placement/Instance/LightSource.hs 147;" f @@ -5283,7 +5282,7 @@ stackedInventory src/Dodge/Creature.hs 318;" f startCr src/Dodge/Creature.hs 83;" f startCrafts src/Dodge/Room/Start.hs 94;" f startDeathTimer src/Dodge/Creature/Update.hs 495;" f -startDrag src/Dodge/Update/Input/InGame.hs 302;" f +startDrag src/Dodge/Update/Input/InGame.hs 303;" f startInvList src/Dodge/Creature.hs 97;" f startInventory src/Dodge/Creature.hs 100;" f startNewGameInSlot src/Dodge/StartNewGame.hs 16;" f @@ -5319,15 +5318,15 @@ subMap src/TreeHelp.hs 121;" f subZipWith src/Dodge/Placement/Instance/Wall.hs 94;" f subtree src/TreeHelp.hs 72;" f succB src/Dodge/Debug.hs 174;" f -swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 61;" f +swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 57;" f swapInOutLinks src/Dodge/RoomLink.hs 99;" f swapIndices src/ListHelp.hs 50;" f swapInvItems src/Dodge/Inventory/Swap.hs 23;" f -swapItemWith src/Dodge/Inventory.hs 261;" f -swapSelSet src/Dodge/Inventory.hs 146;" f +swapItemWith src/Dodge/Inventory.hs 253;" f +swapSelSet src/Dodge/Inventory.hs 142;" f swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f swarmUsingCenter src/Dodge/Creature/Boid.hs 174;" f -symmetricDifference src/Dodge/Update/Input/InGame.hs 226;" f +symmetricDifference src/Dodge/Update/Input/InGame.hs 227;" f t src/ShortShow.hs 48;" f tEast src/Dodge/Room/Corridor.hs 96;" f tToBTree src/Dodge/Tree/Compose.hs 93;" f @@ -5369,7 +5368,7 @@ terminalReturnLocal src/Dodge/Terminal.hs 283;" f terminalSPic src/Dodge/Machine/Draw.hs 44;" f terminalScreenGlow src/Dodge/Machine/Update.hs 42;" f terminalShape src/Dodge/Machine/Draw.hs 47;" f -terminalWheelEvent src/Dodge/Update/Scroll.hs 132;" f +terminalWheelEvent src/Dodge/Update/Scroll.hs 130;" f teslaCoil src/Dodge/Item/Held/BatteryGuns.hs 12;" f teslaGunPic src/Dodge/Item/Draw/SPic.hs 414;" f teslaParams src/Dodge/Item/Held/BatteryGuns.hs 18;" f @@ -5408,11 +5407,11 @@ thingsHitZ' src/Dodge/WorldEvent/ThingsHit.hs 65;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 67;" f throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 862;" f throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 820;" f -throwItem src/Dodge/Creature/Action.hs 227;" f +throwItem src/Dodge/Creature/Action.hs 207;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 221;" f tilesToLine src/Shader/AuxAddition.hs 66;" f -timeFlowUpdate src/Dodge/Update.hs 205;" f +timeFlowUpdate src/Dodge/Update.hs 206;" f timeScroller src/Dodge/Item/Held/Utility.hs 42;" f timeStopper src/Dodge/Item/Held/Utility.hs 39;" f tinMag src/Dodge/Item/Ammo.hs 24;" f @@ -5459,7 +5458,7 @@ tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 714;" f topInvW src/Dodge/ListDisplayParams.hs 56;" f topPrismEdgeIndices src/Shader/Poke.hs 344;" f topPrismIndices src/Shader/Poke.hs 419;" f -topTestPart src/Dodge/TestString.hs 123;" f +topTestPart src/Dodge/TestString.hs 126;" f torchShape src/Dodge/Item/Draw/SPic.hs 278;" f torqueAmount src/Dodge/HeldUse.hs 606;" f torqueCr src/Dodge/WorldEffect.hs 85;" f @@ -5479,7 +5478,7 @@ translate3 src/Picture/Base.hs 112;" f translateFloatingCamera src/Dodge/Update/Camera.hs 51;" f translateFloatingCameraKeys src/Dodge/Update/Camera.hs 69;" f translateH src/Picture/Base.hs 104;" f -translatePointToLeftHand src/Dodge/Creature/HandPos.hs 142;" f +translatePointToLeftHand src/Dodge/Creature/HandPos.hs 140;" f translatePointToRightHand src/Dodge/Creature/HandPos.hs 43;" f translateSH src/Shape.hs 247;" f translateSHxy src/Shape.hs 251;" f @@ -5489,10 +5488,10 @@ translateSPxy src/ShapePicture.hs 45;" f translateSPz src/ShapePicture.hs 49;" f translateScreenPos src/Dodge/ScreenPos.hs 12;" f translateToES src/Dodge/Creature/HandPos.hs 30;" f -translateToLeftHand src/Dodge/Creature/HandPos.hs 145;" f -translateToLeftLeg src/Dodge/Creature/HandPos.hs 151;" f -translateToRightHand src/Dodge/Creature/HandPos.hs 113;" f -translateToRightLeg src/Dodge/Creature/HandPos.hs 173;" f +translateToLeftHand src/Dodge/Creature/HandPos.hs 143;" f +translateToLeftLeg src/Dodge/Creature/HandPos.hs 149;" f +translateToRightHand src/Dodge/Creature/HandPos.hs 112;" f +translateToRightLeg src/Dodge/Creature/HandPos.hs 171;" f translateXY src/Polyhedra.hs 23;" f trapTBH src/Geometry/Polygon.hs 22;" f trapezionBWHW src/Geometry/Polygon.hs 34;" f @@ -5512,15 +5511,15 @@ truncFaces src/Polyhedra/Geodesic.hs 54;" f truncate src/Polyhedra/Geodesic.hs 39;" f trunkDepth src/TreeHelp.hs 164;" f tryAttachItems src/Dodge/Item/Grammar.hs 35;" f -tryClickUse src/Dodge/Creature/YourControl.hs 211;" f -tryCombine src/Dodge/Update/Input/InGame.hs 590;" f +tryClickUse src/Dodge/Creature/YourControl.hs 205;" f +tryCombine src/Dodge/Update/Input/InGame.hs 575;" f tryDrawToCapacitor src/Dodge/Creature/State.hs 179;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 147;" f tryEvadeSideways src/Dodge/Creature/Action.hs 104;" f tryGetChannel src/Sound.hs 99;" f -tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 23;" f +tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 21;" f tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 42;" f -tryPickupSelected src/Dodge/Update/Input/InGame.hs 173;" f +tryPickupSelected src/Dodge/Update/Input/InGame.hs 174;" f tryPlay src/Sound.hs 85;" f tryPutItemInInv src/Dodge/Inventory/Add.hs 25;" f tryPutItemInInvAt src/Dodge/Inventory/Add.hs 67;" f @@ -5541,11 +5540,11 @@ tutorialMessage1 src/Dodge/Room/Tutorial.hs 673;" f tweenAngles src/Geometry/Vector.hs 198;" f twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 83;" f twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 39;" f -twists src/Dodge/Creature/Test.hs 98;" f -twoFlat src/Dodge/Creature/Test.hs 95;" f +twistAmount src/Dodge/Creature/YourControl.hs 135;" f +twists src/Dodge/Creature/Test.hs 97;" f +twoFlat src/Dodge/Creature/Test.hs 94;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 87;" f -twoHandOffY src/Dodge/Creature/HandPos.hs 132;" f -twoHandTwistAmount src/Dodge/Creature/YourControl.hs 140;" f +twoHandOffY src/Dodge/Creature/HandPos.hs 130;" f twoRoomPoss src/Dodge/PlacementSpot.hs 148;" f twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f @@ -5573,14 +5572,14 @@ updateAggroBee src/Dodge/Creature/Update.hs 129;" f updateAimPos src/Dodge/Update.hs 401;" f updateAllNodes src/TreeHelp.hs 88;" f updateArc src/Dodge/Tesla.hs 44;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 489;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 484;" f updateBarrel src/Dodge/Barreloid.hs 43;" f updateBarreloid src/Dodge/Barreloid.hs 16;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 30;" f updateBeeCrit src/Dodge/Creature/Update.hs 115;" f updateBeeFromPheremones src/Dodge/Creature/Update.hs 107;" f updateBeePheremone src/Dodge/Update.hs 788;" f -updateBounds src/Dodge/Update/Camera.hs 269;" f +updateBounds src/Dodge/Update/Camera.hs 263;" f updateBulVel src/Dodge/Bullet.hs 57;" f updateBullet src/Dodge/Bullet.hs 22;" f updateBullets src/Dodge/Update.hs 674;" f @@ -5590,7 +5589,7 @@ updateCamera src/Dodge/Update/Camera.hs 34;" f updateCarriage src/Dodge/Creature/State/WalkCycle.hs 22;" f updateCarriage' src/Dodge/Creature/State/WalkCycle.hs 27;" f updateChaseCrit src/Dodge/Creature/Update.hs 371;" f -updateCloseObjects src/Dodge/Inventory.hs 115;" f +updateCloseObjects src/Dodge/Inventory.hs 111;" f updateCloud src/Dodge/Update.hs 921;" f updateClouds src/Dodge/Update.hs 785;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 42;" f @@ -5617,14 +5616,14 @@ updateEdgesWall src/Dodge/Update/WallDamage.hs 23;" f updateEdgesWall' src/Dodge/Update/WallDamage.hs 36;" f updateEnergyBall src/Dodge/EnergyBall.hs 32;" f updateEnergyBalls src/Dodge/Update.hs 776;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 534;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 519;" f updateExpBarrel src/Dodge/Barreloid.hs 21;" f updateFlame src/Dodge/Flame.hs 19;" f updateFlames src/Dodge/Update.hs 773;" f updateFloatingCamera src/Dodge/Update/Camera.hs 39;" f updateFoodSearchChaseCrit src/Dodge/Creature/Update.hs 381;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 366;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 362;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 361;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 357;" f updateGas src/Dodge/Update.hs 943;" f updateGusts src/Dodge/Update.hs 905;" f updateHiveCrit src/Dodge/Creature/Update.hs 82;" f @@ -5632,30 +5631,30 @@ updateHoverCrit src/Dodge/Humanoid.hs 25;" f updateIMl src/Dodge/Update.hs 640;" f updateIMl' src/Dodge/Update.hs 643;" f updateInGameCamera src/Dodge/Update/Camera.hs 87;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 439;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 434;" f updateInt2Map src/Dodge/Zoning/Base.hs 94;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 88;" f updateItemTargeting src/Dodge/Creature/State.hs 288;" f -updateKeyContinueTerminal src/Dodge/Update/Input/InGame.hs 399;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 433;" f +updateKeyContinueTerminal src/Dodge/Update/Input/InGame.hs 394;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 428;" f updateKeysInGame src/Dodge/Update/Input/InGame.hs 81;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 385;" f -updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 408;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 380;" f +updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 403;" f updateLampoid src/Dodge/Lampoid.hs 13;" f updateLaser src/Dodge/Laser/Update.hs 12;" f updateLasers src/Dodge/Update.hs 518;" f updateLeftParentSF src/Dodge/Item/Grammar.hs 179;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLivingCreature src/Dodge/Creature/Update.hs 61;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 452;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 447;" f updateMachine src/Dodge/Machine/Update.hs 24;" f updateMagnets src/Dodge/Update.hs 409;" f -updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 229;" f +updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 230;" f updateMouseContext src/Dodge/Update.hs 422;" f updateMouseContextGame src/Dodge/Update.hs 427;" f updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 94;" f updateMouseInGame src/Dodge/Update/Input/InGame.hs 84;" f -updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 198;" f +updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 199;" f updateObjCatMaybes src/Dodge/Update.hs 658;" f updateObjMapMaybe src/Dodge/Update.hs 651;" f updatePastWorlds src/Dodge/Update.hs 507;" f @@ -5675,8 +5674,7 @@ updateRadarSweeps src/Dodge/Update.hs 779;" f updateRandNode src/TreeHelp.hs 111;" f updateRenderSplit appDodge/Main.hs 104;" f updateRightParentSF src/Dodge/Item/Grammar.hs 190;" f -updateRootItemID src/Dodge/Inventory/Location.hs 42;" f -updateScopeZoom src/Dodge/Update/Scroll.hs 80;" f +updateScopeZoom src/Dodge/Update/Scroll.hs 78;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 262;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 242;" f @@ -5696,8 +5694,8 @@ updateTractorBeams src/Dodge/Update.hs 767;" f updateTurret src/Dodge/Machine/Update.hs 55;" f updateUniverse src/Dodge/Update.hs 83;" f updateUniverseFirst src/Dodge/Update.hs 94;" f -updateUniverseLast src/Dodge/Update.hs 145;" f -updateUniverseMid src/Dodge/Update.hs 187;" f +updateUniverseLast src/Dodge/Update.hs 146;" f +updateUniverseMid src/Dodge/Update.hs 188;" f updateUseInputInGame src/Dodge/Update/Input/InGame.hs 49;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 24;" f updateVocTimer src/Dodge/Humanoid.hs 39;" f @@ -5727,7 +5725,7 @@ upperPrismPolyTS src/Shape.hs 112;" f upperRounded src/Shape.hs 178;" f useBulletPayload src/Dodge/Bullet.hs 117;" f useGasParams src/Dodge/HeldUse.hs 1120;" f -useHotkey src/Dodge/Creature/YourControl.hs 59;" f +useHotkey src/Dodge/Creature/YourControl.hs 57;" f useInventoryPath src/Dodge/HeldUse.hs 1411;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 19;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 26;" f @@ -5765,7 +5763,7 @@ verticalPipe src/Dodge/Placement/Instance/Pipe.hs 6;" f verticalWire src/Dodge/Wire.hs 23;" f vgunMuzzles src/Dodge/HeldUse.hs 369;" f viewClipBounds src/Dodge/Debug/Picture.hs 350;" f -viewDistanceFromItems src/Dodge/Update/Camera.hs 209;" f +viewDistanceFromItems src/Dodge/Update/Camera.hs 203;" f viewGameRoomBoundaries src/Dodge/Debug/Picture.hs 332;" f viewRoomBoundaries src/Dodge/Debug/Picture.hs 341;" f viewTarget src/Dodge/Creature/ReaderUpdate.hs 253;" f @@ -5787,11 +5785,11 @@ wallsToDraw src/Dodge/Render/Walls.hs 18;" f warmupSound src/Dodge/HeldUse.hs 1405;" f warningRooms src/Dodge/Room/Warning.hs 34;" f warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 910;" f -wasdAim src/Dodge/Creature/YourControl.hs 118;" f +wasdAim src/Dodge/Creature/YourControl.hs 116;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f -wasdMovement src/Dodge/Creature/YourControl.hs 143;" f -wasdWithAiming src/Dodge/Creature/YourControl.hs 108;" f +wasdMovement src/Dodge/Creature/YourControl.hs 138;" f +wasdWithAiming src/Dodge/Creature/YourControl.hs 106;" f watchCombinations src/Dodge/Combine/Combinations.hs 16;" f watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 276;" f weaponBehindPillar src/Dodge/Room/Room.hs 200;" f @@ -5868,14 +5866,14 @@ yIntercepts src/Dodge/Zoning/Base.hs 78;" f yV2 src/Geometry/Vector.hs 213;" f yellow src/Color.hs 44;" f you src/Dodge/Base/You.hs 17;" f -youDropItem src/Dodge/Creature/Action.hs 208;" f +youDropItem src/Dodge/Creature/Action.hs 192;" f yourAugmentedItem src/Dodge/Render/HUD.hs 233;" f yourControl src/Dodge/Creature/YourControl.hs 26;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 108;" f yourInfo src/Dodge/Creature/Info.hs 10;" f -yourInv src/Dodge/Base/You.hs 40;" f -yourRootItem src/Dodge/Base/You.hs 28;" f -yourRootItemDT src/Dodge/Base/You.hs 35;" f +yourInv src/Dodge/Base/You.hs 37;" f +yourRootItem src/Dodge/Base/You.hs 26;" f +yourRootItemDT src/Dodge/Base/You.hs 32;" f yourSelectedItem src/Dodge/Base/You.hs 20;" f yourStatsInfo src/Dodge/Creature/Info.hs 27;" f zChasm src/Dodge/Room/Tutorial.hs 203;" f @@ -5914,7 +5912,7 @@ zoneWall src/Dodge/Zoning/Wall.hs 64;" f zonesAroundPoint src/Dodge/Zoning/Base.hs 98;" f zonesExtract src/Dodge/Zoning/Base.hs 62;" f zoomFloatingCamera src/Dodge/Update/Camera.hs 79;" f -zoomInLongGun src/Dodge/Update/Scroll.hs 106;" f -zoomOutLongGun src/Dodge/Update/Scroll.hs 114;" f +zoomInLongGun src/Dodge/Update/Scroll.hs 104;" f +zoomOutLongGun src/Dodge/Update/Scroll.hs 112;" f zoomScope src/Dodge/Item/Scope.hs 32;" f -zoomSpeed src/Dodge/Update/Scroll.hs 103;" f +zoomSpeed src/Dodge/Update/Scroll.hs 101;" f