From 6c3c023ed950c7437ffc3274400e3445d6057d54 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 1 Sep 2025 10:26:43 +0100 Subject: [PATCH] Sum attached held items to determine strength effect --- src/Dodge/Creature/Statistics.hs | 8 +- tags | 210 +++++++++++++++---------------- 2 files changed, 110 insertions(+), 108 deletions(-) diff --git a/src/Dodge/Creature/Statistics.hs b/src/Dodge/Creature/Statistics.hs index 3b7fc6b67..8eaaadfd7 100644 --- a/src/Dodge/Creature/Statistics.hs +++ b/src/Dodge/Creature/Statistics.hs @@ -12,7 +12,9 @@ import NewInt import Dodge.Data.LWorld import Data.Maybe --import qualified IntMapHelp as IM +import qualified Data.IntMap.Strict as IM import LensHelp +import qualified Data.IntSet as IS crDexterity :: Creature -> Int crDexterity cr = case cr ^. crType of @@ -65,9 +67,9 @@ crCurrentEquipment lw = fmap f . _crEquipment strFromHeldItem :: LWorld -> Creature -> Int strFromHeldItem lw cr = fromMaybe 0 $ do Aiming {} <- cr ^? crStance . posture - i <- cr ^? crManipulation . manObject . imRootSelectedItem - j <- cr ^? crInv . ix i - fmap (negate . itemWeight) $ lw ^? items . ix j + is <- cr ^? crManipulation . manObject . imAttachedItems + let js = IM.elems $ IM.restrictKeys (cr ^. crInv . unNIntMap) is + return . negate . sum . fmap itemWeight $ IM.restrictKeys (lw ^. items) $ IS.fromList js itemWeight :: Item -> Int itemWeight it = case it ^. itType of diff --git a/tags b/tags index 1c265af07..5e4210ed5 100644 --- a/tags +++ b/tags @@ -2571,7 +2571,7 @@ aShape src/Dodge/Placement/Instance/LightSource.hs 107;" f aSound src/Dodge/SoundLogic.hs 74;" f aTreeStrut src/Dodge/Tree/GenerateStructure.hs 42;" f accessTerminal src/Dodge/WorldEffect.hs 53;" f -activateDetonator src/Dodge/Creature/Impulse/UseItem.hs 61;" f +activateDetonator src/Dodge/Creature/Impulse/UseItem.hs 62;" f activeTargetCursorPic src/Dodge/Targeting/Draw.hs 31;" f addArmour src/Dodge/Creature.hs 84;" f addBranchAt src/Dodge/Tree/GenerateStructure.hs 18;" f @@ -2654,11 +2654,11 @@ applyPiercingDamage src/Dodge/Creature/Damage.hs 22;" f applyPosition src/Sound.hs 111;" f applyRecoil src/Dodge/HeldUse.hs 451;" f applyResFactor src/Dodge/Data/Config.hs 110;" f -applySetTerminalString src/Dodge/Debug/Terminal.hs 81;" f +applySetTerminalString src/Dodge/Debug/Terminal.hs 83;" f applySidePush src/Dodge/HeldUse.hs 551;" f applySoundCME src/Dodge/HeldUse.hs 441;" f applyTerminalCommand src/Dodge/Debug/Terminal.hs 28;" f -applyTerminalCommandArguments src/Dodge/Debug/Terminal.hs 42;" f +applyTerminalCommandArguments src/Dodge/Debug/Terminal.hs 44;" f applyTerminalString src/Dodge/Debug/Terminal.hs 22;" f applyToNode src/TreeHelp.hs 64;" f applyToRandomNode src/TreeHelp.hs 150;" f @@ -2744,7 +2744,7 @@ basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f basicItemDisplay src/Dodge/Item/Display.hs 23;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMachineUpdate src/Dodge/Machine.hs 13;" f -basicMuzFlare src/Dodge/HeldUse.hs 704;" f +basicMuzFlare src/Dodge/HeldUse.hs 706;" f battery src/Dodge/Item/Ammo.hs 63;" f batteryPack src/Dodge/Item/Equipment.hs 46;" f belowNumX src/Dodge/Combine/Graph.hs 86;" f @@ -2858,7 +2858,7 @@ checkCombineSelectionExists src/Dodge/DisplayInventory.hs 102;" f checkConnection src/Dodge/Inventory/Swap.hs 65;" f checkDeath src/Dodge/Creature/Update.hs 68;" f checkDeath' src/Dodge/Creature/Update.hs 71;" f -checkEndGame src/Dodge/Update.hs 778;" f +checkEndGame src/Dodge/Update.hs 775;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f @@ -2890,7 +2890,7 @@ circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f clAlt src/Dodge/Cloud.hs 5;" f -clClSpringVel src/Dodge/Update.hs 851;" f +clClSpringVel src/Dodge/Update.hs 848;" f clColor src/Shader/Poke/Cloud.hs 35;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 166;" f @@ -2909,7 +2909,7 @@ click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" 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 228;" f +clipZoom src/Dodge/Update/Camera.hs 230;" f clockCycle src/Dodge/Clock.hs 9;" f closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 223;" f closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 208;" f @@ -2919,7 +2919,7 @@ closestCreatureID src/Dodge/Debug.hs 116;" f closestPointOnLine src/Geometry/Intersect.hs 281;" f closestPointOnLineParam src/Geometry/Intersect.hs 297;" f closestPointOnSeg src/Geometry/Intersect.hs 312;" f -cloudEffect src/Dodge/Update.hs 803;" f +cloudEffect src/Dodge/Update.hs 800;" f cloudPoisonDamage src/Dodge/Update/Cloud.hs 10;" f clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f @@ -2961,7 +2961,7 @@ combineRooms src/Dodge/Room/Procedural.hs 152;" f combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f combineTree src/Dodge/Tree/Compose.hs 66;" f commandColor src/Dodge/Terminal.hs 134;" f -commonPrefix src/Dodge/Debug/Terminal.hs 146;" f +commonPrefix src/Dodge/Debug/Terminal.hs 148;" f comp src/Quaternion.hs 65;" f compactDraw src/Dodge/LevelGen.hs 93;" f compactDraw' src/Dodge/LevelGen.hs 104;" f @@ -2998,9 +2998,9 @@ crAwayFromPost src/Dodge/Creature/Test.hs 82;" f crBlips src/Dodge/RadarSweep.hs 87;" f crCamouflage src/Dodge/Creature/Picture.hs 33;" f crCanSeeCr src/Dodge/Creature/Test.hs 51;" f -crCrSpring src/Dodge/Update.hs 880;" f -crCurrentEquipment src/Dodge/Creature/Statistics.hs 60;" f -crDexterity src/Dodge/Creature/Statistics.hs 17;" f +crCrSpring src/Dodge/Update.hs 877;" f +crCurrentEquipment src/Dodge/Creature/Statistics.hs 62;" f +crDexterity src/Dodge/Creature/Statistics.hs 19;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 38;" f crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 52;" f crHasTarget src/Dodge/Creature/Test.hs 64;" f @@ -3009,7 +3009,7 @@ crHit src/Dodge/WorldEvent/ThingsHit.hs 86;" f crIXsNearCirc src/Dodge/Zoning/Creature.hs 32;" f crIXsNearPoint src/Dodge/Zoning/Creature.hs 14;" f crInAimStance src/Dodge/Creature/Test.hs 90;" f -crIntelligence src/Dodge/Creature/Statistics.hs 37;" f +crIntelligence src/Dodge/Creature/Statistics.hs 39;" f crIsAiming src/Dodge/Creature/Test.hs 59;" f crIsArmouredFrom src/Dodge/Creature/Test.hs 105;" f crMass src/Dodge/Creature/Mass.hs 5;" f @@ -3026,9 +3026,9 @@ crRad src/Dodge/Creature/Radius.hs 7;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 72;" f crSetRoots src/Dodge/Inventory/Location.hs 55;" f crShape src/Dodge/Creature/Shape.hs 8;" f -crSpring src/Dodge/Update.hs 875;" f +crSpring src/Dodge/Update.hs 872;" f crStratConMatches src/Dodge/Creature/Test.hs 77;" f -crStrength src/Dodge/Creature/Statistics.hs 27;" f +crStrength src/Dodge/Creature/Statistics.hs 29;" f crUpdate' src/Dodge/Creature/Update.hs 57;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 66;" f crUpdateItemLocations src/Dodge/Inventory/Location.hs 48;" f @@ -3045,16 +3045,16 @@ createHeadLamp src/Dodge/Euse.hs 55;" f createItemYou src/Dodge/Inventory/Add.hs 60;" f createLightMap src/Render.hs 26;" f createPathGrid src/Dodge/Room/Path.hs 21;" f -createProjectile src/Dodge/HeldUse.hs 1315;" f -createProjectileR src/Dodge/HeldUse.hs 1264;" f +createProjectile src/Dodge/HeldUse.hs 1308;" f +createProjectileR src/Dodge/HeldUse.hs 1257;" f createShell src/Dodge/Projectile/Create.hs 21;" f createShieldWall src/Dodge/Item/BackgroundEffect.hs 39;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f createWall src/Dodge/Wall/Create.hs 8;" f creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 11;" f -creatureShootLaser src/Dodge/HeldUse.hs 813;" f -creatureShootPulseBall src/Dodge/HeldUse.hs 890;" f -creatureShootPulseLaser src/Dodge/HeldUse.hs 857;" f +creatureShootLaser src/Dodge/HeldUse.hs 815;" f +creatureShootPulseBall src/Dodge/HeldUse.hs 892;" f +creatureShootPulseLaser src/Dodge/HeldUse.hs 859;" f creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 53;" f creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 74;" f creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 63;" f @@ -3227,7 +3227,7 @@ detV src/Geometry/Vector.hs 93;" f detector src/Dodge/Item/Held/Utility.hs 27;" f detectorColor src/Dodge/Item/Draw/SPic.hs 465;" f detectorInfo src/Dodge/Item/Info.hs 225;" f -determineProjectileTracking src/Dodge/HeldUse.hs 1235;" f +determineProjectileTracking src/Dodge/HeldUse.hs 1228;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f did src/Dodge/Item/InvSize.hs 54;" f diffAngles src/Geometry.hs 208;" f @@ -3289,7 +3289,7 @@ doDrag src/Dodge/Update/Input/InGame.hs 126;" f doDrawing src/Dodge/Render.hs 34;" f doDrawing' src/Dodge/Render.hs 45;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f -doGenFloat src/Dodge/HeldUse.hs 1191;" f +doGenFloat src/Dodge/HeldUse.hs 1184;" f doGravityPU src/Dodge/Projectile/Update.hs 36;" f doHeldUseEffect src/Dodge/HeldUse.hs 343;" f doInPlacements src/Dodge/Layout.hs 92;" f @@ -3327,7 +3327,7 @@ doTextInputOverUniverse src/Dodge/Update/Input/Text.hs 12;" f doThrust src/Dodge/Projectile/Update.hs 182;" f doTimeScroll src/Dodge/Update.hs 208;" f doTmWdWd src/Dodge/WorldEffect.hs 88;" f -doWallRotate src/Dodge/Update/Camera.hs 218;" f +doWallRotate src/Dodge/Update/Camera.hs 220;" f doWdBl src/Dodge/WorldBool.hs 10;" f doWdCrBl src/Dodge/CreatureEffect.hs 37;" f doWdCrCr src/Dodge/CreatureEffect.hs 12;" f @@ -3483,7 +3483,7 @@ drawZoneCol src/Dodge/Debug/Picture.hs 147;" f drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 284;" f dropAll src/Dodge/Creature/Update.hs 119;" f dropExcept src/Dodge/Creature/Action.hs 167;" f -dropInventoryPath src/Dodge/HeldUse.hs 1403;" f +dropInventoryPath src/Dodge/HeldUse.hs 1396;" f dropItem src/Dodge/Creature/Action.hs 174;" f dropper src/Dodge/Item/Scope.hs 76;" f drumMag src/Dodge/Item/Ammo.hs 34;" f @@ -3505,7 +3505,7 @@ dtToRootIntMap' src/Dodge/DoubleTree.hs 153;" f dtToUpDownAdj src/Dodge/DoubleTree.hs 158;" f dummyMenuOption src/Dodge/Menu/Option.hs 74;" f dustColor src/Shader/Poke/Cloud.hs 71;" f -dustSpringVel src/Dodge/Update.hs 862;" f +dustSpringVel src/Dodge/Update.hs 859;" f ebColor src/Dodge/EnergyBall.hs 77;" f ebDamage src/Dodge/EnergyBall.hs 85;" f ebEffect src/Dodge/EnergyBall.hs 45;" f @@ -3544,7 +3544,7 @@ equipSiteInfo src/Dodge/Item/Info.hs 254;" f equipSitePQ src/Dodge/Creature/HandPos.hs 26;" f equipType src/Dodge/Data/EquipType.hs 10;" f equipmentDesignation src/Dodge/Inventory/RBList.hs 52;" f -equipmentStrValue src/Dodge/Creature/Statistics.hs 54;" f +equipmentStrValue src/Dodge/Creature/Statistics.hs 56;" f errorAngleVV src/Geometry.hs 60;" f errorClosestPointOnLine src/Geometry.hs 72;" f errorClosestPointOnLineParam src/Geometry.hs 78;" f @@ -3573,14 +3573,14 @@ extraWeaponLinksBelow src/Dodge/Item/Grammar.hs 99;" f extractRoomPos src/Dodge/RoomPos.hs 6;" f faceEdges src/Polyhedra.hs 65;" f facesToVF src/Polyhedra/Geodesic.hs 69;" f -farWallDistDirection src/Dodge/Update/Camera.hs 239;" f +farWallDistDirection src/Dodge/Update/Camera.hs 241;" f fdiv src/ShortShow.hs 37;" f feet src/Dodge/Creature/Picture.hs 51;" f ffoldM src/Framebuffer/Update.hs 79;" f filter3 src/FoldableHelp.hs 76;" f filterSectionsPair src/Dodge/DisplayInventory.hs 165;" f findBlips src/Dodge/RadarSweep.hs 62;" f -findBoundDists src/Dodge/Update/Camera.hs 246;" f +findBoundDists src/Dodge/Update/Camera.hs 248;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f findClosePoint src/Dodge/LevelGen/StaticWalls/Deprecated.hs 74;" f findIndex src/IntMapHelp.hs 85;" f @@ -3606,7 +3606,7 @@ flameThrower src/Dodge/Item/Held/SprayGuns.hs 64;" f flameTorrent src/Dodge/Item/Held/SprayGuns.hs 32;" f flameWall src/Dodge/Item/Held/SprayGuns.hs 48;" f flamerPic src/Dodge/Item/Draw/SPic.hs 406;" f -flareCircleAt src/Dodge/HeldUse.hs 685;" f +flareCircleAt src/Dodge/HeldUse.hs 687;" f flatItemCombinations src/Dodge/Combine/Combinations.hs 51;" f flatLookupItems src/Dodge/Combine.hs 38;" f flatShield src/Dodge/Item/Held/Utility.hs 17;" f @@ -3672,7 +3672,7 @@ gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomsFromRooms src/Dodge/Layout.hs 158;" f gameplayMenu src/Dodge/Menu.hs 134;" f gameplayMenuOptions src/Dodge/Menu.hs 137;" f -gasType src/Dodge/HeldUse.hs 1148;" f +gasType src/Dodge/HeldUse.hs 1141;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f generateGraphs src/Dodge/LevelGen.hs 40;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f @@ -3683,36 +3683,36 @@ geometryQuickCheckTests test/Spec.hs 55;" f geometryTests test/Spec.hs 17;" f geometryUnitTests test/Spec.hs 22;" f geqConstr src/SameConstr.hs 21;" f -getAimZoom src/Dodge/Update/Camera.hs 141;" f +getAimZoom src/Dodge/Update/Camera.hs 143;" f getAmmoLinks src/Dodge/Item/Grammar.hs 104;" f -getAttachedSFLink src/Dodge/HeldUse.hs 759;" f +getAttachedSFLink src/Dodge/HeldUse.hs 761;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 85;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 170;" f -getBulletType src/Dodge/HeldUse.hs 930;" f +getBulletType src/Dodge/HeldUse.hs 924;" f getCloseObj src/Dodge/Update/Input/InGame.hs 531;" f getCommand src/Dodge/Terminal.hs 55;" f getCommands src/Dodge/Terminal.hs 52;" f -getCrMoveSpeed src/Dodge/Creature/Statistics.hs 48;" f +getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f getDistortions src/Dodge/Render.hs 435;" f -getGrenadeHitEffect src/Dodge/HeldUse.hs 1303;" f +getGrenadeHitEffect src/Dodge/HeldUse.hs 1296;" f getInventoryPath src/Dodge/Inventory/Path.hs 9;" f getItemValue src/Dodge/Inventory/SelectionList.hs 147;" f -getLaserColor src/Dodge/HeldUse.hs 701;" f -getLaserDamage src/Dodge/HeldUse.hs 698;" f -getLaserPhaseV src/Dodge/HeldUse.hs 695;" f +getLaserColor src/Dodge/HeldUse.hs 703;" f +getLaserDamage src/Dodge/HeldUse.hs 700;" f +getLaserPhaseV src/Dodge/HeldUse.hs 697;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 9;" f getMenuMouseContext src/Dodge/Update.hs 391;" f getNodePos src/Dodge/Path.hs 31;" f -getPJStabiliser src/Dodge/HeldUse.hs 1290;" f +getPJStabiliser src/Dodge/HeldUse.hs 1283;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 6;" f getRootItemBounds src/Dodge/Render/HUD.hs 96;" f getRootItemInvID src/Dodge/Inventory/Location.hs 35;" f getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f getSmoothScrollValue src/Dodge/SmoothScroll.hs 21;" f -getSplitString src/Dodge/Debug/Terminal.hs 126;" f +getSplitString src/Dodge/Debug/Terminal.hs 128;" f getTiles src/Dodge/Layout.hs 208;" f getViewpoints src/Dodge/Viewpoints.hs 29;" f getVolleyBurst src/Dodge/HeldUse.hs 125;" f @@ -3793,7 +3793,7 @@ healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 75;" f healthTest src/Dodge/Room/LasTurret.hs 95;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f heldAimStance src/Dodge/Item/AimStance.hs 24;" f -heldAimZoom src/Dodge/Update/Camera.hs 147;" f +heldAimZoom src/Dodge/Update/Camera.hs 149;" f heldEffect src/Dodge/HeldUse.hs 59;" f heldEffectMuzzles src/Dodge/HeldUse.hs 130;" f heldHandlePos src/Dodge/Item/HeldOffset.hs 90;" f @@ -3801,11 +3801,11 @@ heldInfo src/Dodge/Item/Info.hs 92;" f heldItemAmmoSlots src/Dodge/Item/AmmoSlots.hs 19;" f heldItemBulkiness src/Dodge/Creature/YourControl.hs 193;" f heldItemInvLock src/Dodge/HeldUse.hs 434;" f -heldItemMuzVel src/Dodge/HeldUse.hs 1027;" f +heldItemMuzVel src/Dodge/HeldUse.hs 1021;" f heldItemMuzzles src/Dodge/HeldUse.hs 182;" f -heldItemRifling src/Dodge/HeldUse.hs 1070;" f +heldItemRifling src/Dodge/HeldUse.hs 1064;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 247;" f -heldItemWeight src/Dodge/Creature/Statistics.hs 78;" f +heldItemWeight src/Dodge/Creature/Statistics.hs 80;" f heldPositionInfo src/Dodge/Item/Info.hs 241;" f heldTorqueAmount src/Dodge/HeldUse.hs 578;" f heldTriggerType src/Dodge/BaseTriggerType.hs 27;" f @@ -3917,7 +3917,7 @@ invertIntMap src/Multiset.hs 67;" f invertInventoryToMap src/Dodge/Combine.hs 56;" f invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 21;" f invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f -isAmmoIntLink src/Dodge/HeldUse.hs 711;" f +isAmmoIntLink src/Dodge/HeldUse.hs 713;" f isAnimate src/Dodge/Creature/Test.hs 130;" f isCognizant src/Dodge/Creature/Perception.hs 106;" f isConnected src/Dodge/Inventory/Swap.hs 76;" f @@ -3939,7 +3939,7 @@ isRHS src/Geometry/LHS.hs 24;" f isUnusedLnk src/Dodge/PlacementSpot.hs 62;" f isUnusedLnkType src/Dodge/PlacementSpot.hs 196;" f isUsedLnkUnplaced src/Dodge/PlacementSpot.hs 182;" f -isValidCommand src/Dodge/Debug/Terminal.hs 131;" f +isValidCommand src/Dodge/Debug/Terminal.hs 133;" f isVowel src/StringHelp.hs 8;" f isWalkable src/Dodge/Base/Collide.hs 317;" f isoMatrix src/MatrixHelper.hs 30;" f @@ -3959,7 +3959,7 @@ itemBlips src/Dodge/RadarSweep.hs 93;" f itemBulkiness src/Dodge/Creature/YourControl.hs 187;" f itemCombinations src/Dodge/Combine/Combinations.hs 56;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 61;" f -itemDetectorEffect src/Dodge/HeldUse.hs 765;" f +itemDetectorEffect src/Dodge/HeldUse.hs 767;" f itemDisplay src/Dodge/Inventory/SelectionList.hs 50;" f itemEquipPict src/Dodge/Item/Draw.hs 17;" f itemExternalValue src/Dodge/Inventory/SelectionList.hs 85;" f @@ -3985,7 +3985,7 @@ itemString src/Dodge/Item/Display.hs 56;" f itemToFunction src/Dodge/Item/Grammar.hs 107;" f itemTreeSPic src/Dodge/Item/Draw/SPic.hs 24;" f itemTriggerType src/Dodge/BaseTriggerType.hs 16;" f -itemWeight src/Dodge/Creature/Statistics.hs 72;" f +itemWeight src/Dodge/Creature/Statistics.hs 74;" f iterateUntil src/MonadHelp.hs 23;" f iterateWhile src/MonadHelp.hs 30;" f itmBaseInfo src/Dodge/Item/Info.hs 30;" f @@ -4089,7 +4089,7 @@ loadSeed src/Dodge/LoadSeed.hs 7;" f loadSound src/Dodge/SoundLogic/LoadSound.hs 11;" f loadSounds src/Dodge/SoundLogic/LoadSound.hs 18;" f loadingScreen src/Dodge/Concurrent.hs 56;" f -loadme src/Dodge/Debug/Terminal.hs 139;" f +loadme src/Dodge/Debug/Terminal.hs 141;" f locDTGoHelp src/Dodge/DoubleTree.hs 348;" f locDTGoLeft src/Dodge/DoubleTree.hs 329;" f locDTGoRight src/Dodge/DoubleTree.hs 334;" f @@ -4115,7 +4115,7 @@ longBlockedCorridor src/Dodge/Room/RoadBlock.hs 58;" f longCrit src/Dodge/Creature.hs 70;" f longRoom src/Dodge/Room/LongRoom.hs 22;" f longRoomRunPast src/Dodge/Room/LongRoom.hs 48;" f -longestCommonPrefix src/Dodge/Debug/Terminal.hs 142;" f +longestCommonPrefix src/Dodge/Debug/Terminal.hs 144;" f lookupTrie src/SimpleTrie.hs 30;" f loopPairs src/ListHelp.hs 30;" f lootRoom src/Dodge/Room/Treasure.hs 58;" f @@ -4133,7 +4133,7 @@ machineAddSound src/Dodge/Machine.hs 49;" f machinePistol src/Dodge/Item/Held/Stick.hs 52;" f machineUpdateDeathEff src/Dodge/Machine.hs 34;" f machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f -magAmmoParams src/Dodge/HeldUse.hs 951;" f +magAmmoParams src/Dodge/HeldUse.hs 945;" f magAmmoType src/Dodge/Item/MagAmmoType.hs 11;" f magShield src/Dodge/Item/Equipment.hs 27;" f magV src/Geometry/Vector.hs 171;" f @@ -4148,7 +4148,7 @@ makeAttach src/Dodge/Item/Attach.hs 10;" f makeBlip src/Dodge/RadarSweep.hs 69;" f makeBlockDebris src/Dodge/Block/Debris.hs 34;" f makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f -makeBullet src/Dodge/HeldUse.hs 1008;" f +makeBullet src/Dodge/HeldUse.hs 1002;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 128;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 7;" f @@ -4170,7 +4170,7 @@ makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 11;" f makeGrid src/Grid.hs 46;" f makeIntInterval src/Dodge/Zoning/Base.hs 35;" f makeMovingEB src/Dodge/EnergyBall.hs 60;" f -makeMuzzleFlare src/Dodge/HeldUse.hs 646;" f +makeMuzzleFlare src/Dodge/HeldUse.hs 648;" f makeParagraph src/Justify.hs 6;" f makePathBetween src/Dodge/Path.hs 35;" f makePathBetweenPs src/Dodge/Path.hs 54;" f @@ -4223,11 +4223,11 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 131;" f mcSPic src/Dodge/Render/ShapePicture.hs 134;" f mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 94;" f mcSensorUpdate src/Dodge/Machine/Update.hs 126;" f -mcShootAuto src/Dodge/HeldUse.hs 1202;" f -mcShootLaser src/Dodge/HeldUse.hs 1195;" f +mcShootAuto src/Dodge/HeldUse.hs 1195;" f +mcShootLaser src/Dodge/HeldUse.hs 1188;" f mcTriggerVal src/Dodge/Machine/Update.hs 100;" f mcTypeUpdate src/Dodge/Machine/Update.hs 28;" f -mcUseHeld src/Dodge/HeldUse.hs 1113;" f +mcUseHeld src/Dodge/HeldUse.hs 1107;" f mcUseItem src/Dodge/Machine/Update.hs 85;" f megaBattery src/Dodge/Item/Ammo.hs 55;" f megaShellMag src/Dodge/Item/Ammo.hs 44;" f @@ -4317,11 +4317,11 @@ multiArrow src/Picture/Composite.hs 11;" f multiLookupTrie src/SimpleTrie.hs 57;" f multiLookupTrieI src/SimpleTrie.hs 66;" f muout src/Dodge/RoomLink.hs 129;" f -muzFlareAt src/Dodge/HeldUse.hs 672;" f +muzFlareAt src/Dodge/HeldUse.hs 674;" f mvButton src/Dodge/Placement/PlaceSpot.hs 187;" f mvCr src/Dodge/Placement/PlaceSpot.hs 193;" f mvFS src/Dodge/Placement/PlaceSpot.hs 196;" f -mvGust src/Dodge/Update.hs 794;" f +mvGust src/Dodge/Update.hs 791;" f mvLS src/Dodge/Placement/PlaceSpot.hs 253;" f mvP src/Dodge/Wall/Move.hs 54;" f mvPP src/Dodge/Placement/PlaceSpot.hs 190;" f @@ -4424,8 +4424,8 @@ pairsToGraph src/Dodge/Path.hs 110;" f pairsToIncidence src/Dodge/Graph.hs 20;" f pairsToSCC src/Dodge/Graph.hs 32;" f paletteToColor src/Color.hs 58;" f -parseItem src/Dodge/Debug/Terminal.hs 60;" f -parseNum src/Dodge/Debug/Terminal.hs 75;" f +parseItem src/Dodge/Debug/Terminal.hs 62;" f +parseNum src/Dodge/Debug/Terminal.hs 77;" f pathConnected src/Dodge/Room/CheckConsistency.hs 14;" f pathEdgeObstructed src/Dodge/Path.hs 43;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f @@ -4591,7 +4591,7 @@ powlistUpToN src/Multiset.hs 23;" f powlistUpToN' src/Multiset.hs 12;" f powlistUpToN'' src/Multiset.hs 31;" f ppDraw src/Dodge/Render/ShapePicture.hs 119;" f -ppEvents src/Dodge/Update.hs 757;" f +ppEvents src/Dodge/Update.hs 754;" f ppLevelReset src/Dodge/PressPlate.hs 13;" f preCritStart src/Dodge/Room/Start.hs 83;" f prePos src/Quaternion.hs 68;" f @@ -4701,7 +4701,7 @@ randPeakedParam src/RandomHelp.hs 130;" f randProb src/RandomHelp.hs 68;" f randSpark src/Dodge/Spark.hs 69;" f randSparkExtraVel src/Dodge/Spark.hs 92;" f -randWallReflect src/Dodge/Update.hs 650;" f +randWallReflect src/Dodge/Update.hs 647;" f randomChallenges src/Dodge/Room/Start.hs 63;" f randomCompass src/Dodge/Layout.hs 59;" f randomFourCornerRoom src/Dodge/Room/Procedural.hs 266;" f @@ -4748,7 +4748,7 @@ rememberSounds src/Dodge/Creature/Perception.hs 178;" f remoteDetonator src/Dodge/Item/Scope.hs 144;" f remoteScreen src/Dodge/Item/Scope.hs 139;" f removeAimPosture src/Dodge/Creature/YourControl.hs 158;" f -removeAmmoFromMag src/Dodge/HeldUse.hs 919;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 920;" f removeDot src/ShortShow.hs 40;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f @@ -4836,7 +4836,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 195;" f +rotateCamera src/Dodge/Update/Camera.hs 197;" f rotateList src/Padding.hs 49;" f rotateProp src/Dodge/Prop/Update.hs 47;" f rotateSH src/Shape.hs 257;" f @@ -4844,7 +4844,7 @@ rotateSHq src/Shape.hs 166;" f rotateSHx src/Shape.hs 265;" f rotateSP src/ShapePicture.hs 57;" f rotateTo src/Polyhedra/Geodesic.hs 64;" f -rotateToOverlappingWall src/Dodge/Update/Camera.hs 207;" f +rotateToOverlappingWall src/Dodge/Update/Camera.hs 209;" f rotateToZ src/Quaternion.hs 39;" f rotateV src/Geometry/Vector.hs 105;" f rotateVAround src/Geometry/Vector.hs 112;" f @@ -4970,7 +4970,7 @@ setTargetMv src/Dodge/Creature/ReaderUpdate.hs 76;" f setTile src/Dodge/Layout.hs 68;" f setTiles src/Dodge/Layout.hs 65;" f setToggle src/Dodge/Prop/Update.hs 44;" f -setViewDistance src/Dodge/Update/Camera.hs 234;" f +setViewDistance src/Dodge/Update/Camera.hs 236;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 63;" f setViewport src/Dodge/Render.hs 440;" f setVol src/Dodge/Config/Update.hs 30;" f @@ -5032,16 +5032,16 @@ shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f shiftedGrid src/Grid.hs 25;" f shineTargetLaser src/Dodge/Creature/State.hs 200;" f shineTorch src/Dodge/Creature/State.hs 237;" f -shootBullet src/Dodge/HeldUse.hs 993;" f -shootBullets src/Dodge/HeldUse.hs 983;" f +shootBullet src/Dodge/HeldUse.hs 987;" f +shootBullets src/Dodge/HeldUse.hs 977;" f shootFirstMiss src/Dodge/Creature/Volition.hs 34;" f -shootLaser src/Dodge/HeldUse.hs 836;" f -shootPulseBall src/Dodge/HeldUse.hs 904;" f -shootPulseLaser src/Dodge/HeldUse.hs 877;" f +shootLaser src/Dodge/HeldUse.hs 838;" f +shootPulseBall src/Dodge/HeldUse.hs 906;" f +shootPulseLaser src/Dodge/HeldUse.hs 879;" f shootShatter src/Dodge/Item/Weapon/Shatter.hs 11;" f -shootTeslaArc src/Dodge/HeldUse.hs 1218;" f +shootTeslaArc src/Dodge/HeldUse.hs 1211;" f shootTillEmpty src/Dodge/Creature/Volition.hs 19;" f -shootTractorBeam src/Dodge/HeldUse.hs 792;" f +shootTractorBeam src/Dodge/HeldUse.hs 794;" f shootersRoom src/Dodge/Room/Room.hs 315;" f shootersRoom' src/Dodge/Room/Room.hs 280;" f shootersRoom1 src/Dodge/Room/Room.hs 305;" f @@ -5057,7 +5057,7 @@ showInt src/Dodge/Item/Info.hs 75;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f showInventoryPathing src/Dodge/Item/Display.hs 86;" f showManObj src/Dodge/TestString.hs 75;" f -showTerminalError src/Dodge/Debug/Terminal.hs 78;" f +showTerminalError src/Dodge/Debug/Terminal.hs 80;" f showTimeFlow src/Dodge/TestString.hs 98;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 142;" f shrinkVert src/Geometry/Polygon.hs 146;" f @@ -5066,7 +5066,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f shuffleRoomPos src/Dodge/Layout.hs 78;" f shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 151;" f -simpleCrSprings src/Dodge/Update.hs 871;" f +simpleCrSprings src/Dodge/Update.hs 868;" f simpleTermMessage src/Dodge/Terminal.hs 184;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f @@ -5191,8 +5191,8 @@ stopAllSounds src/Sound.hs 125;" f stopBulletAt src/Dodge/Bullet.hs 197;" f stopPushing src/Dodge/Block.hs 105;" f stopSoundFrom src/Dodge/SoundLogic.hs 220;" f -strFromEquipment src/Dodge/Creature/Statistics.hs 51;" f -strFromHeldItem src/Dodge/Creature/Statistics.hs 65;" f +strFromEquipment src/Dodge/Creature/Statistics.hs 53;" f +strFromHeldItem src/Dodge/Creature/Statistics.hs 67;" f strengthFactor src/Dodge/Creature/Impulse/Movement.hs 36;" f strictify src/MaybeHelp.hs 37;" f strideRot src/Dodge/Item/HeldOffset.hs 72;" f @@ -5319,10 +5319,10 @@ toV3 src/Geometry/Data.hs 57;" f toV4 src/Geometry/Data.hs 60;" f toggleCombineInv src/Dodge/DisplayInventory.hs 316;" f toggleCommands src/Dodge/Terminal.hs 97;" f -toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 66;" f -toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 104;" f +toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 67;" f +toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 105;" f toggleJust src/MaybeHelp.hs 41;" f -toggleMapperInv src/Dodge/Creature/Impulse/UseItem.hs 109;" f +toggleMapperInv src/Dodge/Creature/Impulse/UseItem.hs 110;" f tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 642;" f tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 664;" f tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 606;" f @@ -5338,7 +5338,7 @@ torqueCr src/Dodge/WorldEffect.hs 71;" f torso src/Dodge/Creature/Picture.hs 102;" f tractCr src/Dodge/TractorBeam/Update.hs 27;" f tractFlIt src/Dodge/TractorBeam/Update.hs 22;" f -tractorBeamAt src/Dodge/HeldUse.hs 804;" f +tractorBeamAt src/Dodge/HeldUse.hs 806;" f tractorGun src/Dodge/Item/Held/BatteryGuns.hs 53;" f tractorGunPic src/Dodge/Item/Draw/SPic.hs 449;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 32;" f @@ -5447,14 +5447,14 @@ updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 476;" f updateBarrel src/Dodge/Barreloid.hs 41;" f updateBarreloid src/Dodge/Barreloid.hs 15;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 34;" f -updateBounds src/Dodge/Update/Camera.hs 256;" f +updateBounds src/Dodge/Update/Camera.hs 258;" f updateBulVel src/Dodge/Bullet.hs 56;" f updateBullet src/Dodge/Bullet.hs 21;" f updateBullets src/Dodge/Update.hs 570;" f updateCamera src/Dodge/Update/Camera.hs 30;" f updateCloseObjects src/Dodge/Inventory.hs 114;" f -updateCloud src/Dodge/Update.hs 808;" f -updateClouds src/Dodge/Update.hs 676;" f +updateCloud src/Dodge/Update.hs 805;" f +updateClouds src/Dodge/Update.hs 673;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 39;" f updateCombineSections src/Dodge/DisplayInventory.hs 46;" f updateCreature src/Dodge/Creature/Update.hs 31;" f @@ -5464,25 +5464,25 @@ updateCreatureSoundPositions src/Dodge/Update.hs 518;" f updateDebris src/Dodge/Update.hs 577;" f updateDebrisChunk src/Dodge/Prop/Moving.hs 16;" f updateDebugMessageOffset src/Dodge/Update.hs 100;" f -updateDelayedEvents src/Dodge/Update.hs 900;" f +updateDelayedEvents src/Dodge/Update.hs 897;" f updateDisplaySections src/Dodge/DisplayInventory.hs 118;" f updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortions src/Dodge/Update.hs 563;" f updateDoor src/Dodge/Update.hs 326;" f -updateDust src/Dodge/Update.hs 832;" f -updateDusts src/Dodge/Update.hs 679;" f +updateDust src/Dodge/Update.hs 829;" f +updateDusts src/Dodge/Update.hs 676;" f updateEnergyBall src/Dodge/EnergyBall.hs 31;" f -updateEnergyBalls src/Dodge/Update.hs 667;" f +updateEnergyBalls src/Dodge/Update.hs 664;" f updateEnterRegex src/Dodge/Update/Input/InGame.hs 503;" f updateExpBarrel src/Dodge/Barreloid.hs 20;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 19;" f -updateFlames src/Dodge/Update.hs 664;" f +updateFlames src/Dodge/Update.hs 661;" f updateFloatingCamera src/Dodge/Update/Camera.hs 35;" f updateFunctionKey src/Dodge/Update/Input/InGame.hs 363;" f updateFunctionKeys src/Dodge/Update/Input/InGame.hs 359;" f -updateGusts src/Dodge/Update.hs 791;" f +updateGusts src/Dodge/Update.hs 788;" f updateHumanoid src/Dodge/Humanoid.hs 13;" f updateIMl src/Dodge/Update.hs 532;" f updateIMl' src/Dodge/Update.hs 537;" f @@ -5523,7 +5523,7 @@ updateRBList src/Dodge/Inventory/RBList.hs 22;" f updateRadarBlip src/Dodge/RadarBlip.hs 11;" f updateRadarBlips src/Dodge/Update.hs 566;" f updateRadarSweep src/Dodge/RadarSweep.hs 39;" f -updateRadarSweeps src/Dodge/Update.hs 670;" f +updateRadarSweeps src/Dodge/Update.hs 667;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 110;" f updateRightParentSF src/Dodge/Item/Grammar.hs 181;" f @@ -5533,16 +5533,16 @@ updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 263;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 242;" f updateShockwave src/Dodge/Shockwave/Update.hs 8;" f -updateShockwaves src/Dodge/Update.hs 661;" f +updateShockwaves src/Dodge/Update.hs 658;" f updateSingleNodes src/TreeHelp.hs 97;" f updateSound src/Sound.hs 72;" f updateSounds src/Sound.hs 67;" f updateSpark src/Dodge/Spark.hs 19;" f -updateSparks src/Dodge/Update.hs 673;" f +updateSparks src/Dodge/Update.hs 670;" f updateTeslaArc src/Dodge/Update.hs 587;" f updateTeslaArcs src/Dodge/Update.hs 584;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 8;" f -updateTractorBeams src/Dodge/Update.hs 658;" f +updateTractorBeams src/Dodge/Update.hs 655;" f updateTurret src/Dodge/Machine/Update.hs 50;" f updateUniverse src/Dodge/Update.hs 79;" f updateUniverseFirst src/Dodge/Update.hs 90;" f @@ -5575,21 +5575,21 @@ upperPrismPolySU src/Shape.hs 114;" f upperPrismPolyTS src/Shape.hs 120;" f upperRounded src/Shape.hs 185;" f useBulletPayload src/Dodge/Bullet.hs 114;" f -useGasParams src/Dodge/HeldUse.hs 1118;" f +useGasParams src/Dodge/HeldUse.hs 1112;" f useHotkey src/Dodge/Creature/YourControl.hs 76;" f -useInventoryPath src/Dodge/HeldUse.hs 1434;" f +useInventoryPath src/Dodge/HeldUse.hs 1427;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 19;" f -useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 25;" f +useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 26;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 259;" f -useLoadedAmmo src/Dodge/HeldUse.hs 714;" f +useLoadedAmmo src/Dodge/HeldUse.hs 716;" f useMagShield src/Dodge/Euse.hs 27;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 18;" f -useRewindGun src/Dodge/HeldUse.hs 1394;" f +useRewindGun src/Dodge/HeldUse.hs 1387;" f useRoomPosCond src/Dodge/PlacementSpot.hs 188;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 191;" f -useStopWatch src/Dodge/HeldUse.hs 1375;" f -useTimeScrollGun src/Dodge/HeldUse.hs 1383;" f +useStopWatch src/Dodge/HeldUse.hs 1368;" f +useTimeScrollGun src/Dodge/HeldUse.hs 1376;" f useUnusedLnk src/Dodge/PlacementSpot.hs 179;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 207;" f usedRoomLinkPoss src/Dodge/PlacementSpot.hs 214;" f @@ -5601,7 +5601,7 @@ vNormaly src/Geometry/Vector3D.hs 72;" f vShape src/Dodge/Placement/Instance/LightSource.hs 113;" f vToL src/MatrixHelper.hs 46;" f vToQuat src/Quaternion.hs 46;" f -validTerminalCommands src/Dodge/Debug/Terminal.hs 134;" f +validTerminalCommands src/Dodge/Debug/Terminal.hs 136;" f vasTightStride src/Shader/Compile.hs 297;" f vecBetweenSpeed src/Dodge/Base.hs 146;" f vecTurnTo src/Dodge/Movement/Turn.hs 19;" f @@ -5615,7 +5615,7 @@ verticalWire src/Dodge/Wire.hs 24;" f vgunMuzzles src/Dodge/HeldUse.hs 333;" f viewBoundaries src/Dodge/Debug/Picture.hs 309;" f viewClipBounds src/Dodge/Debug/Picture.hs 318;" f -viewDistanceFromItems src/Dodge/Update/Camera.hs 192;" f +viewDistanceFromItems src/Dodge/Update/Camera.hs 194;" f viewTarget src/Dodge/Creature/ReaderUpdate.hs 146;" f violet src/Color.hs 21;" f visibleWalls src/Dodge/Base/Collide.hs 207;" f @@ -5623,7 +5623,7 @@ visionCheck src/Dodge/Creature/Perception.hs 153;" f vocalizationTest src/Dodge/Creature/Vocalization.hs 42;" f volleyGun src/Dodge/Item/Held/Cane.hs 15;" f volleyGunShape src/Dodge/Item/Draw/SPic.hs 369;" f -walkNozzle src/Dodge/HeldUse.hs 780;" f +walkNozzle src/Dodge/HeldUse.hs 782;" f walkableNodeNear src/Dodge/Path.hs 48;" f wallBlips src/Dodge/RadarSweep.hs 98;" f wallBuffer src/Dodge/WallCreatureCollisions.hs 52;" f @@ -5632,7 +5632,7 @@ wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f wallToSurface src/Dodge/Base/Collide.hs 172;" f wallsFromRooms src/Dodge/Layout.hs 146;" f wallsToDraw src/Dodge/Render/Walls.hs 17;" f -warmupSound src/Dodge/HeldUse.hs 1428;" f +warmupSound src/Dodge/HeldUse.hs 1421;" f warningRooms src/Dodge/Room/Warning.hs 26;" f wasdAim src/Dodge/Creature/YourControl.hs 132;" f wasdDir src/Dodge/WASD.hs 17;" f