From 04ba9fcce219a4883063188d0c09f2c9755b7af9 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 6 Jan 2025 12:57:20 +0000 Subject: [PATCH] Tweak ordering of projectile movement --- src/Dodge/Projectile/Update.hs | 33 ++--- tags | 227 ++++++++++++++++----------------- 2 files changed, 127 insertions(+), 133 deletions(-) diff --git a/src/Dodge/Projectile/Update.hs b/src/Dodge/Projectile/Update.hs index 18a593e37..f402a82a7 100644 --- a/src/Dodge/Projectile/Update.hs +++ b/src/Dodge/Projectile/Update.hs @@ -25,9 +25,8 @@ import RandomHelp updateProjectile :: Projectile -> World -> World updateProjectile pj w = (cWorld . lWorld . projectiles . ix (pj ^. pjID) . pjTimer -~ 1) + . shellCollisionCheck pj . pjMovement pj - . shellCollisionCheck - pj . doGravityPU pj $ foldl' (flip $ upProjectile pj) w (_pjUpdates pj) @@ -43,8 +42,6 @@ upProjectile pj pu = case pu of | act st et -> pjRemoteSetDirection (pj ^? pjType . rkHoming) pj | otherwise -> id where - -- ApplyGravityPU -> applyGravityPU pj - time = _pjTimer pj act st et = time <= st && time >= et @@ -91,15 +88,13 @@ shellCollisionCheck pj w | RetiredProjectile <- pj ^. pjType , time <= 0 = destroyProjectile (pj ^. pjScreenID) (_pjID pj) w - | time <= 0 = g + | time <= 0 = explodeShell pj w | RetiredProjectile <- pj ^. pjType = w - | Just thit <- thingHit oldPos (oldPos + _pjVel pj) w = tryShellBounce thit pj w - -- | anythingHitCirc 2 oldPos (oldPos + _pjVel pj) w = g + | Just thit <- thingHit oldpos (oldpos + _pjVel pj) w = tryShellBounce thit pj w | otherwise = w where - g = explodeShell pj w time = _pjTimer pj - oldPos = _pjPos pj + oldpos = _pjPos pj -- note this doesn't take into account moving walls, which may break the -- bouncing in some way @@ -111,17 +106,17 @@ tryShellBounce (p, Right wl) pj w w & cWorld . lWorld . projectiles . ix (_pjID pj) . pjType .~ Grenade (GStuckWall (wl ^. wlStructure)) - -- & cWorld . lWorld . projectiles . ix (_pjID pj) . pjUpdates %~ delete ApplyGravityPU & soundOriginIDsAt (ShellSound (pj ^. pjID)) [slapS, slap1S] (pj ^. pjPos) - | Just x <- pj ^? pjType . gnHitEffect . bounceTolerance = - if abs (dotV (pj ^. pjVel) (vNormal hitline)) < x - then - w - & cWorld . lWorld . projectiles . ix (_pjID pj) . pjVel - %~ reflectIn hitline - & cWorld . lWorld . projectiles . ix (_pjID pj) . pjPos .~ p - & soundStart (ShellSound (pj ^. pjID)) (pj ^. pjPos) click1S Nothing - else explodeShell pj w + | Just x <- pj ^? pjType . gnHitEffect . bounceTolerance + , abs (dotV (pj ^. pjVel) (vNormal hitline)) < x = + w + & cWorld . lWorld . projectiles . ix (_pjID pj) . pjVel + %~ reflectIn hitline + & cWorld . lWorld . projectiles . ix (_pjID pj) . pjPos + .~ p - normalizeV (pj ^. pjVel) + & soundStart (ShellSound (pj ^. pjID)) (pj ^. pjPos) click1S Nothing + | isJust $ pj ^? pjType . gnHitEffect . bounceTolerance = + explodeShell pj w where hitline = normalizeV $ uncurry (-) $ _wlLine wl tryShellBounce (p, Left cr) pj w diff --git a/tags b/tags index 8fe73e78f..cb5478aeb 100644 --- a/tags +++ b/tags @@ -509,9 +509,9 @@ DestroyItem src/Dodge/Data/Scenario.hs 7;" C Detector src/Dodge/Data/Item/Combine.hs 180;" t Dirt src/Dodge/Data/Material.hs 11;" C DisasterType src/Dodge/Data/Scenario.hs 24;" t -Display src/Dodge/Item/Display.hs 2;" m +Display src/Dodge/Item/Display.hs 3;" m DisplayInventory src/Dodge/Data/HUD.hs 19;" C -DisplayInventory src/Dodge/DisplayInventory.hs 7;" m +DisplayInventory src/Dodge/DisplayInventory.hs 6;" m DisplayTerminal src/Dodge/Data/HUD.hs 42;" C Distortion src/Dodge/Data/Distortion.hs 12;" t Distortion src/Dodge/Data/Distortion.hs 6;" m @@ -1427,7 +1427,7 @@ Patrol src/Dodge/Data/ActionPlan.hs 180;" C PausedTimeFlow src/Dodge/Data/World.hs 75;" C Payload src/Dodge/Data/Payload.hs 11;" t Payload src/Dodge/Data/Payload.hs 6;" m -Payload src/Dodge/Payload.hs 1;" m +Payload src/Dodge/Payload.hs 2;" m PenetrateBullet src/Dodge/Data/Bullet.hs 38;" C Perception src/Dodge/Data/Creature/Perception.hs 32;" t Perception src/Dodge/Creature/Perception.hs 2;" m @@ -1717,8 +1717,8 @@ SelectUse src/Dodge/SelectUse.hs 1;" m Select_creature src/Dodge/Data/Config.hs 94;" C SelectedClose src/Dodge/SelectedClose.hs 1;" m SelectedItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 22;" C -SelectionInfo src/Dodge/Data/SelectionList.hs 54;" C -SelectionItem src/Dodge/Data/SelectionList.hs 44;" t +SelectionInfo src/Dodge/Data/SelectionList.hs 53;" C +SelectionItem src/Dodge/Data/SelectionList.hs 43;" t SelectionList src/Dodge/Data/SelectionList.hs 4;" m SelectionList src/Dodge/Inventory/SelectionList.hs 3;" m SelectionList src/Dodge/SelectionList.hs 1;" m @@ -2078,7 +2078,7 @@ UseInt src/Dodge/Data/Item/Use.hs 44;" C UseInvItem src/Dodge/Data/WorldEffect.hs 36;" C UseItem src/Dodge/Data/ActionPlan.hs 37;" C UseItem src/Dodge/Creature/Impulse/UseItem.hs 3;" m -UseItemWidth src/Dodge/Data/SelectionList.hs 42;" C +UseItemWidth src/Dodge/Data/SelectionList.hs 41;" C UseMapper src/Dodge/Data/Item/Use.hs 49;" C UseMvTargetPos src/Dodge/Data/ActionPlan.hs 163;" C UseNothing src/Dodge/Data/Item/Use.hs 45;" C @@ -3071,19 +3071,19 @@ _shapeHalfSize src/Shape/Data.hs 18;" f _shapeShader src/Data/Preload/Render.hs 25;" f _shellPayload src/Dodge/Data/Item/Combine.hs 100;" f _shockwaves src/Dodge/Data/LWorld.hs 115;" f -_siColor src/Dodge/Data/SelectionList.hs 50;" f -_siColor src/Dodge/Data/SelectionList.hs 59;" f -_siHeight src/Dodge/Data/SelectionList.hs 47;" f -_siHeight src/Dodge/Data/SelectionList.hs 56;" f -_siIsSelectable src/Dodge/Data/SelectionList.hs 49;" f -_siIsSelectable src/Dodge/Data/SelectionList.hs 58;" f -_siOffX src/Dodge/Data/SelectionList.hs 51;" f -_siOffX src/Dodge/Data/SelectionList.hs 60;" f -_siPayload src/Dodge/Data/SelectionList.hs 52;" f -_siPictures src/Dodge/Data/SelectionList.hs 46;" f -_siPictures src/Dodge/Data/SelectionList.hs 55;" f -_siWidth src/Dodge/Data/SelectionList.hs 48;" f -_siWidth src/Dodge/Data/SelectionList.hs 57;" f +_siColor src/Dodge/Data/SelectionList.hs 49;" f +_siColor src/Dodge/Data/SelectionList.hs 58;" f +_siHeight src/Dodge/Data/SelectionList.hs 46;" f +_siHeight src/Dodge/Data/SelectionList.hs 55;" f +_siIsSelectable src/Dodge/Data/SelectionList.hs 48;" f +_siIsSelectable src/Dodge/Data/SelectionList.hs 57;" f +_siOffX src/Dodge/Data/SelectionList.hs 50;" f +_siOffX src/Dodge/Data/SelectionList.hs 59;" f +_siPayload src/Dodge/Data/SelectionList.hs 51;" f +_siPictures src/Dodge/Data/SelectionList.hs 45;" f +_siPictures src/Dodge/Data/SelectionList.hs 54;" f +_siWidth src/Dodge/Data/SelectionList.hs 47;" f +_siWidth src/Dodge/Data/SelectionList.hs 56;" f _sideEffect src/Loop/Data.hs 13;" f _sideImpulses src/Dodge/Data/ActionPlan.hs 170;" f _sidePush src/Dodge/Data/Item/Use.hs 88;" f @@ -3405,7 +3405,7 @@ ammoMagSPic src/Dodge/Item/Draw/SPic.hs 123;" f amr src/Dodge/Item/Held/Rod.hs 44;" f analyser src/Dodge/Placement/Instance/Analyser.hs 12;" f analyserByDoor src/Dodge/Room/LasTurret.hs 76;" f -andOrRegex src/Dodge/DisplayInventory.hs 83;" f +andOrRegex src/Dodge/DisplayInventory.hs 78;" f angleBetween src/Geometry.hs 159;" f angleVV src/Geometry/Vector.hs 57;" f angleVV3 src/Geometry/Vector3D.hs 122;" f @@ -3416,7 +3416,7 @@ applyCME src/Dodge/HeldUse.hs 161;" f applyCreatureDamage src/Dodge/Creature/Damage.hs 14;" f applyDamageEffect src/Dodge/Creature/Damage.hs 31;" f applyEventIO src/Loop.hs 89;" f -applyGravityPU src/Dodge/Projectile/Update.hs 57;" f +applyGravityPU src/Dodge/Projectile/Update.hs 54;" f applyIndividualDamage src/Dodge/Creature/Damage.hs 49;" f applyIndividualDamage' src/Dodge/Creature/Damage.hs 52;" f applyInvLock src/Dodge/HeldUse.hs 176;" f @@ -3516,7 +3516,7 @@ basicBulDams src/Dodge/Item/Weapon/Bullet.hs 23;" f basicCrPict src/Dodge/Creature/Picture.hs 26;" f basicCrShape src/Dodge/Creature/Picture.hs 34;" f basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f -basicItemDisplay src/Dodge/Item/Display.hs 21;" f +basicItemDisplay src/Dodge/Item/Display.hs 19;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMachineUpdate src/Dodge/Machine.hs 13;" f basicMuzFlare src/Dodge/HeldUse.hs 313;" f @@ -3617,7 +3617,7 @@ chaseCritAwarenessUpdate src/Dodge/Creature/Perception.hs 69;" f chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 112;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 30;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 43;" f -checkCombineSelectionExists src/Dodge/DisplayInventory.hs 105;" f +checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkConnection src/Dodge/Inventory/Swap.hs 64;" f checkDeath src/Dodge/Creature/State.hs 78;" f checkEndGame src/Dodge/Update.hs 703;" f @@ -3625,7 +3625,7 @@ checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 16;" f -checkInventorySelectionExists src/Dodge/DisplayInventory.hs 98;" f +checkInventorySelectionExists src/Dodge/DisplayInventory.hs 93;" f checkTermDist src/Dodge/Update.hs 311;" f checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f @@ -3667,9 +3667,9 @@ clicker src/Dodge/Item/Scope.hs 81;" f clipV src/Geometry/Vector.hs 47;" f clipZoom src/Dodge/Update/Camera.hs 185;" f clockCycle src/Dodge/Clock.hs 9;" f -closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 161;" f -closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 146;" f -closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 175;" f +closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 133;" f +closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 118;" f +closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 147;" f closeObjectInfo src/Dodge/Render/HUD.hs 223;" f closestCreatureID src/Dodge/Debug.hs 116;" f closestPointOnLine src/Geometry/Intersect.hs 251;" f @@ -3689,7 +3689,7 @@ colCrsWalls src/Dodge/WallCreatureCollisions.hs 17;" f colSpark src/Dodge/Spark.hs 47;" f colSparkRandDir src/Dodge/Spark.hs 101;" f collectDamageTypes src/Dodge/Damage.hs 32;" f -collectInvItems src/Dodge/Update/Input/InGame.hs 310;" f +collectInvItems src/Dodge/Update/Input/InGame.hs 296;" f collideCircWalls src/Dodge/Base/Collide.hs 158;" f collidePoint src/Dodge/Base/Collide.hs 49;" f collidePointTestFilter src/Dodge/Base/Collide.hs 93;" f @@ -3723,7 +3723,7 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f conEffects src/Dodge/Concurrent.hs 13;" f concBall src/Dodge/WorldEvent/SpawnParticle.hs 27;" f -concurrentIS src/Dodge/Update/Input/InGame.hs 302;" f +concurrentIS src/Dodge/Update/Input/InGame.hs 288;" f connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f connectionBlurb src/Dodge/Terminal.hs 102;" f connectionBlurbLines src/Dodge/Terminal.hs 47;" f @@ -3985,7 +3985,7 @@ destroyMatS src/Dodge/Material/Sound.hs 7;" f destroyMcType src/Dodge/Machine/Destroy.hs 21;" f destroyMount src/Dodge/Block.hs 102;" f destroyMounts src/Dodge/Block.hs 99;" f -destroyProjectile src/Dodge/Projectile/Update.hs 143;" f +destroyProjectile src/Dodge/Projectile/Update.hs 137;" f detV src/Geometry/Vector.hs 93;" f detector src/Dodge/Item/Held/Utility.hs 41;" f detectorColor src/Dodge/Item/Draw/SPic.hs 444;" f @@ -4008,9 +4008,9 @@ disconnectTerminal src/Dodge/Terminal.hs 217;" f displayConfig src/Dodge/Menu.hs 196;" f displayControls src/Dodge/Menu.hs 206;" f displayFrameTicks src/Dodge/Render/Picture.hs 39;" f -displayFreeSlots src/Dodge/DisplayInventory.hs 207;" f -displayIndents src/Dodge/DisplayInventory.hs 115;" f -displayPulse src/Dodge/Inventory/SelectionList.hs 120;" f +displayFreeSlots src/Dodge/DisplayInventory.hs 198;" f +displayIndents src/Dodge/DisplayInventory.hs 110;" f +displayPulse src/Dodge/Inventory/SelectionList.hs 92;" f displayTerminalLineString src/Dodge/Update.hs 447;" f dist src/Geometry/Vector.hs 179;" f dist3 src/Geometry/Vector3D.hs 101;" f @@ -4052,12 +4052,12 @@ 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 106;" f +doDrag src/Dodge/Update/Input/InGame.hs 105;" f doDrawing src/Dodge/Render.hs 35;" f doDrawing' src/Dodge/Render.hs 46;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f doGenFloat src/Dodge/HeldUse.hs 595;" f -doGravityPU src/Dodge/Projectile/Update.hs 51;" f +doGravityPU src/Dodge/Projectile/Update.hs 48;" f doHeldUseEffect src/Dodge/HeldUse.hs 126;" f doInPlacements src/Dodge/Layout.hs 92;" f doIndividualPlacements src/Dodge/Layout.hs 117;" f @@ -4084,13 +4084,13 @@ doPropUpdates src/Dodge/Prop/Update.hs 36;" f doQuickload src/Dodge/Save.hs 82;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 7;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 457;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 417;" f doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f doRoomShift src/Dodge/Room/Link.hs 33;" f doScopeZoom src/Dodge/Update/Scroll.hs 82;" f -doSectionSize src/Dodge/DisplayInventory.hs 226;" f +doSectionSize src/Dodge/DisplayInventory.hs 217;" f doSideEffects appDodge/Main.hs 120;" f doStep src/Dodge/ArcStep.hs 9;" f doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 164;" f @@ -4099,7 +4099,7 @@ doTerminalCommandEffect src/Dodge/Terminal.hs 135;" f doTestDrawing src/Dodge/Render.hs 42;" 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 153;" f +doThrust src/Dodge/Projectile/Update.hs 147;" f doTimeScroll src/Dodge/Update.hs 205;" f doTmTm src/Dodge/TmTm.hs 6;" f doTmWdWd src/Dodge/WorldEffect.hs 99;" f @@ -4212,12 +4212,12 @@ drawRadarSweep src/Dodge/RadarSweep/Draw.hs 14;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 37;" f drawReturn src/Dodge/Render/Picture.hs 123;" f drawRootCursor src/Dodge/Render/HUD.hs 71;" f -drawSSCursor src/Dodge/SelectionSections/Draw.hs 34;" f -drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 45;" f +drawSSCursor src/Dodge/SelectionSections/Draw.hs 35;" f +drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 46;" f drawSelect src/Dodge/Render/Picture.hs 209;" f drawSelectionList src/Dodge/Render/List.hs 35;" f drawSelectionListBackground src/Dodge/Render/List.hs 51;" f -drawSelectionSections src/Dodge/SelectionSections/Draw.hs 17;" f +drawSelectionSections src/Dodge/SelectionSections/Draw.hs 16;" f drawSensor src/Dodge/Machine/Draw.hs 24;" f drawShader src/Shader.hs 27;" f drawShaderLay src/Shader.hs 16;" f @@ -4280,9 +4280,9 @@ encircle src/Dodge/Creature/Boid.hs 115;" f encircleCloseP src/Dodge/Creature/Boid.hs 35;" f encircleDistP src/Dodge/Creature/Boid.hs 21;" f encircleP src/Dodge/Creature/Boid.hs 27;" f -endCombineRegex src/Dodge/Update/Input/InGame.hs 273;" f -endRegex src/Dodge/Update/Input/InGame.hs 260;" f -enterCombineInv src/Dodge/DisplayInventory.hs 341;" f +endCombineRegex src/Dodge/Update/Input/InGame.hs 265;" f +endRegex src/Dodge/Update/Input/InGame.hs 252;" f +enterCombineInv src/Dodge/DisplayInventory.hs 323;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 5;" f eqSiteToPositions src/Dodge/Inventory/RBList.hs 75;" f @@ -4310,7 +4310,7 @@ expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 195;" f expireAndDamageFL src/Dodge/Flame.hs 47;" f -explodeShell src/Dodge/Projectile/Update.hs 233;" f +explodeShell src/Dodge/Projectile/Update.hs 227;" f explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 416;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 29;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 84;" f @@ -4331,7 +4331,7 @@ fdiv src/ShortShow.hs 26;" f feet src/Dodge/Creature/Picture.hs 53;" f ffoldM src/Framebuffer/Update.hs 79;" f filter3 src/FoldableHelp.hs 76;" f -filterSectionsPair src/Dodge/DisplayInventory.hs 176;" f +filterSectionsPair src/Dodge/DisplayInventory.hs 167;" f findBlips src/Dodge/RadarSweep.hs 62;" f findBoundDists src/Dodge/Update/Camera.hs 205;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f @@ -4443,7 +4443,7 @@ getAttachedSFLink src/Dodge/HeldUse.hs 364;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 112;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulletType src/Dodge/HeldUse.hs 471;" f -getCloseObj src/Dodge/Update/Input/InGame.hs 552;" f +getCloseObj src/Dodge/Update/Input/InGame.hs 512;" f getCommands src/Dodge/Terminal.hs 117;" f getCommandsHelp src/Dodge/Terminal.hs 75;" f getCrDexterity src/Dodge/Creature/Statistics.hs 11;" f @@ -4571,7 +4571,7 @@ holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 47;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 70;" f -hotkeyToString src/Dodge/Inventory/SelectionList.hs 126;" f +hotkeyToString src/Dodge/Inventory/SelectionList.hs 98;" f humanoidAIList src/Dodge/Humanoid.hs 181;" f iShape src/Dodge/Placement/Instance/LightSource.hs 73;" f icosahedronPoints src/Polyhedra/Geodesic.hs 12;" f @@ -4609,7 +4609,7 @@ initializeOptionMenuBO src/Dodge/Menu/Option.hs 33;" f initializeTexture2D src/Framebuffer/Update.hs 221;" f inorderNumberTree src/TreeHelp.hs 189;" f inputFocusI src/Dodge/InputFocus.hs 13;" f -insertAt src/Padding.hs 60;" f +insertAt src/Padding.hs 56;" f insertIMInZone src/Dodge/Base.hs 54;" f insertInTrie src/SimpleTrie.hs 23;" f insertNewKey src/IntMapHelp.hs 64;" f @@ -4642,19 +4642,19 @@ intersectSegsSeg src/Geometry/Intersect.hs 232;" f intervalList src/Geometry.hs 329;" f interweave src/Justify.hs 17;" f introScan src/Dodge/Item/Scope.hs 56;" f -introScanDisplay src/Dodge/Inventory/SelectionList.hs 115;" f +introScanDisplay src/Dodge/Inventory/SelectionList.hs 87;" f intsToPos src/Dodge/Room/Modify/Girder.hs 160;" f invAdj src/Dodge/Item/Grammar.hs 289;" f invCursorParams src/Dodge/ListDisplayParams.hs 36;" f invDP src/Dodge/ListDisplayParams.hs 30;" f -invDimColor src/Dodge/DisplayInventory.hs 201;" f +invDimColor src/Dodge/DisplayInventory.hs 192;" f invHead src/Dodge/Render/HUD.hs 404;" f invItemLocUpdate src/Dodge/Creature/State.hs 178;" f invLDT src/Dodge/Item/Grammar.hs 269;" f invRootItemEffs src/Dodge/Creature/State.hs 171;" f invRootMap src/Dodge/Item/Grammar.hs 278;" f invRootTrees src/Dodge/Item/Grammar.hs 299;" f -invSelectionItem src/Dodge/Inventory/SelectionList.hs 26;" f +invSelectionItem src/Dodge/Inventory/SelectionList.hs 25;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f invSideEff src/Dodge/Creature/State.hs 165;" f invSize src/Dodge/Inventory/CheckSlots.hs 25;" f @@ -4675,7 +4675,7 @@ isCognizant src/Dodge/Creature/Perception.hs 105;" f isConnected src/Dodge/Inventory/Swap.hs 74;" f isElectrical src/Dodge/Data/Damage.hs 42;" f isFrictionless src/Dodge/Creature/State.hs 439;" f -isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 190;" f +isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 189;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f isLHS src/Geometry/LHS.hs 8;" f @@ -4698,13 +4698,13 @@ isotriBWH src/Geometry/Polygon.hs 20;" f itDim src/Dodge/Item/InvSize.hs 21;" f itInvHeight src/Dodge/Item/InvSize.hs 11;" f itemBaseConnections src/Dodge/Item/Grammar.hs 186;" f -itemBaseName src/Dodge/Item/Display.hs 44;" f +itemBaseName src/Dodge/Item/Display.hs 40;" f itemBlips src/Dodge/RadarSweep.hs 93;" f itemCombinations src/Dodge/Combine/Combinations.hs 55;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 60;" f itemDetectorEffect src/Dodge/HeldUse.hs 370;" f -itemDisplay src/Dodge/Inventory/SelectionList.hs 51;" f -itemDisplayPad src/Dodge/Inventory/SelectionList.hs 84;" f +itemDisplay src/Dodge/Inventory/SelectionList.hs 42;" f +itemDisplayPad src/Dodge/Inventory/SelectionList.hs 61;" f itemEquipPict src/Dodge/Item/Draw.hs 16;" f itemFromAmmoMag src/Dodge/Item.hs 39;" f itemFromAttachType src/Dodge/Item.hs 48;" f @@ -4713,13 +4713,13 @@ itemFromEquipType src/Dodge/Item.hs 63;" f itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemInfo src/Dodge/Item/Info.hs 14;" f itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f -itemNumberDisplay src/Dodge/Inventory/SelectionList.hs 92;" f +itemNumberDisplay src/Dodge/Inventory/SelectionList.hs 66;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f itemSPic src/Dodge/Item/Draw/SPic.hs 34;" f itemScan src/Dodge/Item/Scope.hs 62;" f itemScroll src/Dodge/Update/Scroll.hs 47;" f -itemString src/Dodge/Item/Display.hs 40;" f +itemString src/Dodge/Item/Display.hs 36;" f itemToBreakLists src/Dodge/Item/Grammar.hs 59;" f itemToFunction src/Dodge/Item/Grammar.hs 138;" f itemTreeSPic src/Dodge/Item/Draw/SPic.hs 22;" f @@ -4809,7 +4809,7 @@ listConfig src/Dodge/Menu.hs 199;" f listControls src/Dodge/Menu.hs 212;" f listCursorChooseBorderScale src/Dodge/Render/List.hs 135;" f listGuard src/Dodge/Creature/ReaderUpdate.hs 188;" f -listSelectionColorPicture src/Dodge/DisplayInventory.hs 326;" f +listSelectionColorPicture src/Dodge/DisplayInventory.hs 308;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f llleft src/Dodge/Item/Grammar.hs 195;" f llright src/Dodge/Item/Grammar.hs 201;" f @@ -4914,7 +4914,7 @@ makeShaderUsingVAO src/Shader/Compile.hs 146;" f makeShaderUsingVBO src/Shader/Compile.hs 69;" f makeShaderVBO src/Shader/Compile.hs 32;" f makeShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 12;" f -makeShrapnelAt src/Dodge/Payload.hs 23;" f +makeShrapnelAt src/Dodge/Payload.hs 24;" f makeSourcedShader src/Shader/Compile.hs 167;" f makeStartCloudAt src/Dodge/WorldEvent/Cloud.hs 60;" f makeStaticBall src/Dodge/WorldEvent/SpawnParticle.hs 22;" f @@ -4945,11 +4945,11 @@ maybeClearPath src/Dodge/Block.hs 75;" f maybeClearPaths src/Dodge/Block.hs 72;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 586;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 533;" f maybeOpenTerminal src/Dodge/Update.hs 122;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 116;" f -maybeWarmupStatus src/Dodge/Item/Display.hs 29;" f +maybeWarmupStatus src/Dodge/Item/Display.hs 26;" f mcApplyDamage src/Dodge/Machine/Update.hs 108;" f mcKillBut src/Dodge/Machine/Destroy.hs 34;" f mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f @@ -4994,8 +4994,8 @@ mglCreate src/GLHelp.hs 8;" f mglDelete src/GLHelp.hs 14;" f midBarDecoration src/Dodge/Placement/TopDecoration.hs 16;" f midBounds src/Dodge/Room/Foreground.hs 151;" f -midPad src/Padding.hs 30;" f -midPadL src/Padding.hs 36;" f +midPad src/Padding.hs 26;" f +midPadL src/Padding.hs 32;" f midPoint src/Geometry.hs 86;" f midWall src/Dodge/Placement/Instance/Wall.hs 27;" f minAndMax src/FoldableHelp.hs 109;" f @@ -5122,7 +5122,7 @@ optionScreenUpdate src/Dodge/Update/Input/ScreenLayer.hs 41;" f optionValueOffset src/Dodge/Menu/Option.hs 89;" f optionsOptions src/Dodge/Menu.hs 108;" f optionsToSelections src/Dodge/Menu/Option.hs 51;" f -orRegex src/Dodge/DisplayInventory.hs 86;" f +orRegex src/Dodge/DisplayInventory.hs 81;" f orange src/Color.hs 25;" f orderAround3 src/Geometry/Vector3D.hs 105;" f orderAroundFirst src/Geometry/Polygon.hs 82;" f @@ -5165,7 +5165,7 @@ parseNum src/Dodge/Debug/Terminal.hs 75;" f pathConnected src/Dodge/Room/CheckConsistency.hs 14;" f pathEdgeObstructed src/Dodge/Path.hs 43;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 539;" f +pauseGame src/Dodge/Update/Input/InGame.hs 499;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f @@ -5200,8 +5200,8 @@ pipe src/Dodge/Item/Craftable.hs 32;" f pistol src/Dodge/Item/Held/Stick.hs 42;" f pistolCrit src/Dodge/Creature/PistolCrit.hs 12;" f pistolerRoom src/Dodge/Room/Room.hs 321;" f -pjMovement src/Dodge/Projectile/Update.hs 213;" f -pjRemoteSetDirection src/Dodge/Projectile/Update.hs 198;" f +pjMovement src/Dodge/Projectile/Update.hs 207;" f +pjRemoteSetDirection src/Dodge/Projectile/Update.hs 192;" f plBlock src/Dodge/Placement/PlaceSpot/Block.hs 18;" f plDoor src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 22;" f plLineBlock src/Dodge/Placement/PlaceSpot/Block.hs 50;" f @@ -5223,7 +5223,7 @@ placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 89;" f placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 70;" f placeString src/Dodge/Render/MenuScreen.hs 64;" f placeWallPoly src/Dodge/Placement/PlaceSpot.hs 162;" f -plainRegex src/Dodge/DisplayInventory.hs 204;" f +plainRegex src/Dodge/DisplayInventory.hs 195;" f playIfFree src/Sound.hs 136;" f playPositionalSoundQueue src/Sound.hs 144;" f playSoundAndUpdate src/Sound.hs 54;" f @@ -5459,7 +5459,7 @@ reflectLaserAlong src/Dodge/Item/Weapon/LaserPath.hs 13;" f refract src/Dodge/Item/Weapon/LaserPath.hs 40;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 39;" f regexCombs src/Dodge/DisplayInventory.hs 71;" f -regexList src/Dodge/DisplayInventory.hs 332;" f +regexList src/Dodge/DisplayInventory.hs 314;" f reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 448;" f reloadLevelStart src/Dodge/Save.hs 71;" f reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 446;" f @@ -5511,8 +5511,8 @@ rhombus src/Polyhedra.hs 72;" f rifle src/Dodge/Item/Held/Cane.hs 55;" f right src/DoubleStack.hs 16;" f rightIsParentCombine src/Dodge/Item/Grammar.hs 238;" f -rightPad src/Padding.hs 22;" f -rightPadNoSquash src/Padding.hs 26;" f +rightPad src/Padding.hs 18;" f +rightPadNoSquash src/Padding.hs 22;" f rlPosDir src/Dodge/RoomLink.hs 94;" f rlauncherPic src/Dodge/Item/Draw/SPic.hs 381;" f rmInLinks src/Dodge/RoomLink.hs 138;" f @@ -5540,10 +5540,10 @@ roomsContaining src/Dodge/Room/Containing.hs 20;" f roomsContaining' src/Dodge/Room/Containing.hs 25;" f rootNotrootEff src/Dodge/ItEffect.hs 30;" f rose src/Color.hs 20;" f -rotD src/Padding.hs 47;" f -rotListAt src/Padding.hs 52;" f +rotD src/Padding.hs 43;" f +rotListAt src/Padding.hs 48;" f rotMatr src/MatrixHelper.hs 66;" f -rotU src/Padding.hs 42;" f +rotU src/Padding.hs 38;" f rotate src/Picture/Base.hs 153;" f rotate3 src/Geometry/Vector3D.hs 48;" f rotate3x src/Geometry/Vector3D.hs 60;" f @@ -5626,8 +5626,8 @@ seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 378;" f seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 540;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 203;" f secondColumnParams src/Dodge/ListDisplayParams.hs 43;" f -sectionsDesiredLines src/Dodge/DisplayInventory.hs 213;" f -sectionsSizes src/Dodge/DisplayInventory.hs 216;" f +sectionsDesiredLines src/Dodge/DisplayInventory.hs 204;" f +sectionsSizes src/Dodge/DisplayInventory.hs 207;" f seedStartMenu src/Dodge/Menu.hs 79;" f seedStartOptions src/Dodge/Menu.hs 82;" f segOnCirc src/Geometry.hs 116;" f @@ -5675,7 +5675,7 @@ setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f setRBCreatureTargeting src/Dodge/Creature/State.hs 408;" f -setSelWhileDragging src/Dodge/Update/Input/InGame.hs 346;" f +setSelWhileDragging src/Dodge/Update/Input/InGame.hs 332;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 85;" f setShaderSource src/Shader/Compile.hs 290;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5715,7 +5715,7 @@ shardShape src/Dodge/Block/Debris.hs 181;" f shatterGun src/Dodge/Item/Held/Weapons.hs 8;" f shatterGunSPic src/Dodge/Item/Draw/SPic.hs 294;" f shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f -shellCollisionCheck src/Dodge/Projectile/Update.hs 86;" f +shellCollisionCheck src/Dodge/Projectile/Update.hs 83;" f shellMag src/Dodge/Item/Ammo.hs 61;" f shellModule src/Dodge/Item/Scope.hs 111;" f shellShape src/Dodge/Projectile/Draw.hs 34;" f @@ -5726,9 +5726,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftDraw src/Dodge/Render/ShapePicture.hs 67;" f shiftDraw' src/Dodge/Render/ShapePicture.hs 73;" f shiftInBy src/Dodge/PlacementSpot.hs 236;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 320;" f -shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 359;" f -shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 353;" 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 shiftLinkBy src/Dodge/Room/Link.hs 87;" f shiftPSBy src/Dodge/Placement/Shift.hs 12;" f shiftPathBy src/Dodge/Room/Link.hs 92;" f @@ -5761,11 +5761,11 @@ shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 536;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 81;" f shoulderSH src/Dodge/Creature/Picture.hs 139;" f shoulderSP src/Dodge/Creature/HandPos.hs 170;" f -showAttachItem src/Dodge/Item/Display.hs 74;" f -showEquipItem src/Dodge/Item/Display.hs 88;" f +showAttachItem src/Dodge/Item/Display.hs 70;" f +showEquipItem src/Dodge/Item/Display.hs 84;" f showInt src/Dodge/Item/Info.hs 67;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f -showInventoryPathing src/Dodge/Item/Display.hs 68;" f +showInventoryPathing src/Dodge/Item/Display.hs 64;" f showManObj src/Dodge/TestString.hs 76;" f showTerminalError src/Dodge/Debug/Terminal.hs 78;" f showTimeFlow src/Dodge/TestString.hs 99;" f @@ -5829,7 +5829,7 @@ soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 98;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 48;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 85;" f -spaceAction src/Dodge/Update/Input/InGame.hs 542;" f +spaceAction src/Dodge/Update/Input/InGame.hs 502;" 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 @@ -5886,7 +5886,7 @@ stackText src/Picture/Base.hs 188;" f stackedInventory src/Dodge/Creature.hs 304;" f startCr src/Dodge/Creature.hs 91;" f startCrafts src/Dodge/Room/Start.hs 92;" f -startDrag src/Dodge/Update/Input/InGame.hs 285;" f +startDrag src/Dodge/Update/Input/InGame.hs 277;" f startInvList src/Dodge/Creature.hs 110;" f startInventory src/Dodge/Creature.hs 113;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f @@ -6025,7 +6025,7 @@ toTopLeft src/Dodge/Render/List.hs 219;" f toV2 src/Geometry/Data.hs 36;" f toV3 src/Geometry/Data.hs 38;" f toV4 src/Geometry/Data.hs 40;" f -toggleCombineInv src/Dodge/DisplayInventory.hs 335;" f +toggleCombineInv src/Dodge/DisplayInventory.hs 317;" f toggleCommand src/Dodge/Terminal.hs 196;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 94;" f toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 132;" f @@ -6101,20 +6101,20 @@ truncate src/Polyhedra/Geodesic.hs 38;" f trunkDepth src/TreeHelp.hs 161;" f tryAttachItems src/Dodge/Item/Grammar.hs 22;" f tryClickUse src/Dodge/Creature/YourControl.hs 177;" f -tryCombine src/Dodge/Update/Input/InGame.hs 576;" f -tryDropSelected src/Dodge/Update/Input/InGame.hs 124;" f +tryCombine src/Dodge/Update/Input/InGame.hs 523;" f +tryDropSelected src/Dodge/Update/Input/InGame.hs 123;" 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 131;" f +tryPickupSelected src/Dodge/Update/Input/InGame.hs 130;" f tryPlay src/Sound.hs 83;" f tryPutFloorItemIDInInv src/Dodge/Inventory/Add.hs 26;" f tryPutItemInInv src/Dodge/Inventory/Add.hs 42;" f tryPutItemInInvAt src/Dodge/Inventory/Add.hs 32;" f trySeedFromClipboard src/Dodge/Menu.hs 88;" f -tryShellBounce src/Dodge/Projectile/Update.hs 106;" f -trySpinByCID src/Dodge/Projectile/Update.hs 180;" f +tryShellBounce src/Dodge/Projectile/Update.hs 101;" f +trySpinByCID src/Dodge/Projectile/Update.hs 174;" f trySynthBullet src/Dodge/Creature/State.hs 203;" f tryUseParent src/Dodge/Creature/State.hs 196;" f turnTo src/Dodge/Movement/Turn.hs 4;" f @@ -6150,12 +6150,12 @@ unusedOffPathAwayFromLink src/Dodge/PlacementSpot.hs 133;" f unusedSpotAwayFromInLink src/Dodge/PlacementSpot.hs 139;" f unusedSpotAwayFromLink src/Dodge/PlacementSpot.hs 122;" f unusedSpotNearInLink src/Dodge/PlacementSpot.hs 191;" f -upProjectile src/Dodge/Projectile/Update.hs 34;" f +upProjectile src/Dodge/Projectile/Update.hs 33;" f updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla.hs 91;" f updateArc src/Dodge/Tesla/Arc.hs 100;" f updateAttachedItems src/Dodge/Creature/State.hs 265;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 491;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 451;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 25;" f @@ -6167,53 +6167,53 @@ updateCamera src/Dodge/Update/Camera.hs 27;" f updateCloseObjects src/Dodge/Inventory.hs 110;" f updateCloud src/Dodge/Update.hs 731;" f updateClouds src/Dodge/Update.hs 575;" f -updateCombinePositioning src/Dodge/DisplayInventory.hs 41;" f -updateCombineSections src/Dodge/DisplayInventory.hs 48;" f +updateCombinePositioning src/Dodge/DisplayInventory.hs 37;" f +updateCombineSections src/Dodge/DisplayInventory.hs 44;" f updateCreature src/Dodge/Creature/Update.hs 13;" f updateCreatureGroups src/Dodge/Update.hs 516;" f updateCreatureSoundPositions src/Dodge/Update.hs 492;" f updateDebugMessageOffset src/Dodge/Update.hs 91;" f updateDelayedEvents src/Dodge/Update.hs 794;" f -updateDisplaySections src/Dodge/DisplayInventory.hs 121;" f +updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortions src/Dodge/Update.hs 537;" f updateEnergyBall src/Dodge/EnergyBall.hs 45;" f updateEnergyBalls src/Dodge/Update.hs 563;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 518;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 478;" f updateExpBarrel src/Dodge/Barreloid.hs 19;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 70;" f updateFlames src/Dodge/Update.hs 560;" f updateFloatingCamera src/Dodge/Update/Camera.hs 32;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 376;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 369;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 362;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 355;" f updateGusts src/Dodge/Update.hs 714;" f updateHeldRootItem src/Dodge/Creature/State.hs 259;" f updateHumanoid src/Dodge/Humanoid.hs 13;" f updateIMl src/Dodge/Update.hs 506;" f updateIMl' src/Dodge/Update.hs 511;" f updateInGameCamera src/Dodge/Update/Camera.hs 76;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 437;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 398;" f updateInv src/Dodge/Creature/State.hs 160;" f -updateInventoryPositioning src/Dodge/DisplayInventory.hs 91;" 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 431;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 419;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 392;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 380;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 13;" f updateLasers src/Dodge/Update.hs 436;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 451;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 411;" f updateMachine src/Dodge/Machine/Update.hs 19;" f updateMagnets src/Dodge/Update.hs 307;" f -updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 196;" f +updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 195;" f updateMouseContext src/Dodge/Update.hs 319;" f updateMouseContextGame src/Dodge/Update.hs 324;" f -updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 96;" f -updateMouseInGame src/Dodge/Update/Input/InGame.hs 86;" f -updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 157;" f +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 updateMovement src/Dodge/Creature/State.hs 429;" f updateObjCatMaybes src/Dodge/Update.hs 528;" f updateObjMapMaybe src/Dodge/Update.hs 521;" f @@ -6234,8 +6234,8 @@ updateRenderSplit appDodge/Main.hs 108;" f updateRootItemID src/Dodge/Inventory/Location.hs 35;" f updateScopeZoom src/Dodge/Update/Scroll.hs 70;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f -updateSection src/Dodge/DisplayInventory.hs 274;" f -updateSectionsPositioning src/Dodge/DisplayInventory.hs 252;" f +updateSection src/Dodge/DisplayInventory.hs 264;" f +updateSectionsPositioning src/Dodge/DisplayInventory.hs 243;" f updateSeenWalls src/Dodge/Update.hs 683;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f updateShockwaves src/Dodge/Update.hs 557;" f @@ -6297,7 +6297,7 @@ useLoadedAmmo src/Dodge/HeldUse.hs 324;" f useLocation src/Dodge/Creature/Impulse/UseItem.hs 66;" f useMagShield src/Dodge/Euse.hs 46;" f useNormalCamera src/Dodge/Camera.hs 6;" f -usePayload src/Dodge/Payload.hs 17;" f +usePayload src/Dodge/Payload.hs 18;" f useRewindGun src/Dodge/HeldUse.hs 777;" f useRewindGun src/Dodge/Luse.hs 40;" f useRoomPosCond src/Dodge/PlacementSpot.hs 178;" f @@ -6433,7 +6433,6 @@ zipArcs src/Dodge/Tesla.hs 103;" f zipArcs src/Dodge/Tesla/Arc.hs 110;" f zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 118;" f -zipWithDefaults src/Dodge/Inventory/SelectionList.hs 77;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f zoneClouds src/Dodge/Update.hs 444;" f zoneCreature src/Dodge/Zoning/Creature.hs 53;" f