diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index 76e33b288..1e538635d 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -419,7 +419,8 @@ itemSidePush = \case applyInvLock :: Item -> Creature -> World -> World applyInvLock itm cr = case itemInvLock itm of - i | i > 0 && cid == 0 -> + i + | i > 0 && cid == 0 -> (cWorld . lWorld . delayedEvents .:~ (i, UnlockInv)) . lockInv _ -> id where @@ -619,26 +620,29 @@ heldTorqueAmount = \case -- fugly loadMuzzle :: LocationDT OItem -> Creature -> (Bool, World) -> Muzzle -> (Bool, World) -loadMuzzle loc cr (b, w) mz = maybe (b, w) (True,) $ do - case mz ^. mzAmmoSlot of - NoAmmoRequired -> return (useLoadedAmmo loc cr mz Nothing w) - as -> do - mag <- case as of - MagBelow mi _ -> find (isAmmoIntLink mi . (^. dtValue . _2)) (loc ^. locDT . dtLeft) - CapacitorSelf _ -> loc ^? locDT - CapacitorBelow _ -> - find - ((== PulseBallSF) . (^. dtValue . _2)) - (loc ^. locDT . dtLeft) - mid <- mag ^? dtValue . _1 . itID . unNInt - availableammo <- w ^? cWorld . lWorld . items . ix mid . itConsumables . _Just - let usedammo = case as ^?! aps of - UseUpTo x -> min x availableammo - UseExactly x - | x <= availableammo -> x - | otherwise -> 0 - guard $ usedammo > 0 - return $ useLoadedAmmo loc cr mz (Just (usedammo, mag)) w +loadMuzzle loc cr (b, w) mz = maybe (b, w) (True,) $ case mz ^. mzAmmoSlot of + NoAmmoRequired -> return (useLoadedAmmo loc cr mz Nothing w) + as -> do + mag <- case as of + MagBelow mi _ -> + find + (isAmmoIntLink mi . (^. dtValue . _2)) + (loc ^. locDT . dtLeft) + CapacitorSelf _ -> loc ^? locDT + CapacitorBelow _ -> + find + ((== PulseBallSF) . (^. dtValue . _2)) + (loc ^. locDT . dtLeft) + mid <- mag ^? dtValue . _1 . itID . unNInt + availableammo <- w ^? cWorld . lWorld . items . ix mid . itConsumables . _Just + let usedammo = case as ^?! aps of + UseUpTo x -> min x availableammo + UseExactly x + | x <= availableammo -> x + | otherwise -> 0 + guard $ usedammo > 0 + return $ useLoadedAmmo loc cr mz (Just (usedammo, mag)) $ + removeAmmoFromMag usedammo mid w makeMuzzleFlare :: Muzzle -> LocationDT OItem -> Creature -> World -> World makeMuzzleFlare mz loc cr = case mz ^. mzFlareType of @@ -716,7 +720,7 @@ useLoadedAmmo :: World -> World useLoadedAmmo loc cr mz m w = - removeAmmoFromMag m . makeMuzzleFlare mz loc cr $ case _mzEffect mz of + makeMuzzleFlare mz loc cr $ case _mzEffect mz of MuzzleShootBullet -> shootBullets loc cr (mz, x, magtree) w MuzzleLaser -> creatureShootLaser loc cr mz w MuzzlePulseLaser -> creatureShootPulseLaser loc cr mz w @@ -912,12 +916,8 @@ shootPulseBall p dir w = where i = IM.newKey $ w ^. cWorld . lWorld . pulseBalls ---removeAmmoFromMag :: Int -> Maybe Int -> Creature -> World -> World -removeAmmoFromMag :: Maybe (Int, DTree OItem) -> World -> World -removeAmmoFromMag m = fromMaybe id $ do - (x, magtree) <- m - magid <- magtree ^? dtValue . _1 . itID . unNInt - return $ +removeAmmoFromMag :: Int -> Int -> World -> World +removeAmmoFromMag x magid = cWorld . lWorld . items . ix magid . itConsumables diff --git a/tags b/tags index 6c09e7e0c..1c265af07 100644 --- a/tags +++ b/tags @@ -17,7 +17,7 @@ <$> src/Dodge/Data/Camera.hs 39;" o <$> src/Dodge/Data/Creature.hs 81;" o <$> src/Dodge/Data/LWorld.hs 184;" o -<$> src/Dodge/Data/Terminal.hs 71;" o +<$> src/Dodge/Data/Terminal.hs 70;" o ABSOLUTE src/Dodge/Data/Item/Combine.hs 40;" C AIUNIT src/Dodge/Data/Item/Combine.hs 75;" C ALTERIFLE src/Dodge/Data/Item/Combine.hs 155;" C @@ -2611,7 +2611,7 @@ addToTrunk src/TreeHelp.hs 156;" f addWarningTerminal src/Dodge/Room/Warning.hs 54;" f addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 81;" f -advanceScrollAmount src/Dodge/Update.hs 422;" f +advanceScrollAmount src/Dodge/Update.hs 421;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 33;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f aimDelaySweep src/Dodge/Render/Picture.hs 288;" f @@ -2652,11 +2652,11 @@ applyMagnetsToBul src/Dodge/Bullet.hs 31;" f applyPastDamages src/Dodge/Creature/State.hs 48;" f applyPiercingDamage src/Dodge/Creature/Damage.hs 22;" f applyPosition src/Sound.hs 111;" f -applyRecoil src/Dodge/HeldUse.hs 450;" f +applyRecoil src/Dodge/HeldUse.hs 451;" f applyResFactor src/Dodge/Data/Config.hs 110;" f applySetTerminalString src/Dodge/Debug/Terminal.hs 81;" f -applySidePush src/Dodge/HeldUse.hs 550;" f -applySoundCME src/Dodge/HeldUse.hs 440;" 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 applyTerminalString src/Dodge/Debug/Terminal.hs 22;" f @@ -2664,7 +2664,7 @@ applyToNode src/TreeHelp.hs 64;" f applyToRandomNode src/TreeHelp.hs 150;" f applyToSubforest src/TreeHelp.hs 77;" f applyToSubtree src/TreeHelp.hs 70;" f -applyTorqueCME src/Dodge/HeldUse.hs 561;" f +applyTorqueCME src/Dodge/HeldUse.hs 562;" f applyWorldConfig src/Dodge/Config/Update.hs 38;" f aquamarine src/Color.hs 23;" f arHUD src/Dodge/Item/Scope.hs 134;" 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 701;" f +basicMuzFlare src/Dodge/HeldUse.hs 704;" 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 @@ -2752,7 +2752,7 @@ beltMag src/Dodge/Item/Ammo.hs 39;" f bfsNodePoints src/Dodge/Path.hs 58;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 218;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 118;" f -bgunSound src/Dodge/HeldUse.hs 505;" f +bgunSound src/Dodge/HeldUse.hs 506;" f bindFBO src/Render.hs 245;" f bingate src/Dodge/Item/Scope.hs 109;" f black src/Color.hs 27;" 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 780;" f +checkEndGame src/Dodge/Update.hs 778;" 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 853;" f +clClSpringVel src/Dodge/Update.hs 851;" 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 @@ -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 805;" f +cloudEffect src/Dodge/Update.hs 803;" 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 @@ -2998,7 +2998,7 @@ 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 882;" f +crCrSpring src/Dodge/Update.hs 880;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 60;" f crDexterity src/Dodge/Creature/Statistics.hs 17;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 38;" f @@ -3026,7 +3026,7 @@ 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 877;" f +crSpring src/Dodge/Update.hs 875;" f crStratConMatches src/Dodge/Creature/Test.hs 77;" f crStrength src/Dodge/Creature/Statistics.hs 27;" f crUpdate' src/Dodge/Creature/Update.hs 57;" 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 1312;" f -createProjectileR src/Dodge/HeldUse.hs 1261;" f +createProjectile src/Dodge/HeldUse.hs 1315;" f +createProjectileR src/Dodge/HeldUse.hs 1264;" 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 810;" f -creatureShootPulseBall src/Dodge/HeldUse.hs 887;" f -creatureShootPulseLaser src/Dodge/HeldUse.hs 854;" f +creatureShootLaser src/Dodge/HeldUse.hs 813;" f +creatureShootPulseBall src/Dodge/HeldUse.hs 890;" f +creatureShootPulseLaser src/Dodge/HeldUse.hs 857;" 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 1232;" f +determineProjectileTracking src/Dodge/HeldUse.hs 1235;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f did src/Dodge/Item/InvSize.hs 54;" f diffAngles src/Geometry.hs 208;" f @@ -3244,7 +3244,7 @@ displayFrameTicks src/Dodge/Render/Picture.hs 46;" f displayFreeSlots src/Dodge/DisplayInventory.hs 197;" f displayIndents src/Dodge/DisplayInventory.hs 112;" f displayPulse src/Dodge/Inventory/SelectionList.hs 179;" f -displayTerminalLineString src/Dodge/Update.hs 486;" f +displayTerminalLineString src/Dodge/Update.hs 484;" f dist src/Geometry/Vector.hs 190;" f dist3 src/Geometry/Vector3D.hs 101;" f divTo src/Geometry/Zone.hs 6;" 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 1188;" f +doGenFloat src/Dodge/HeldUse.hs 1191;" f doGravityPU src/Dodge/Projectile/Update.hs 36;" f doHeldUseEffect src/Dodge/HeldUse.hs 343;" f doInPlacements src/Dodge/Layout.hs 92;" f @@ -3333,7 +3333,7 @@ doWdCrBl src/Dodge/CreatureEffect.hs 37;" f doWdCrCr src/Dodge/CreatureEffect.hs 12;" f doWdP2f src/Dodge/WdP2f.hs 12;" f doWdWd src/Dodge/WorldEffect.hs 27;" f -doWorldEvents src/Dodge/Update.hs 432;" f +doWorldEvents src/Dodge/Update.hs 430;" f doWorldPos src/Dodge/WorldPos.hs 7;" f door src/Dodge/Room/Door.hs 13;" f doorBetween src/Dodge/Placement/Instance/Door.hs 39;" f @@ -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 1400;" f +dropInventoryPath src/Dodge/HeldUse.hs 1403;" 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 864;" f +dustSpringVel src/Dodge/Update.hs 862;" f ebColor src/Dodge/EnergyBall.hs 77;" f ebDamage src/Dodge/EnergyBall.hs 85;" f ebEffect src/Dodge/EnergyBall.hs 45;" 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 682;" f +flareCircleAt src/Dodge/HeldUse.hs 685;" 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 1145;" f +gasType src/Dodge/HeldUse.hs 1148;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f generateGraphs src/Dodge/LevelGen.hs 40;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f @@ -3685,27 +3685,27 @@ geometryUnitTests test/Spec.hs 22;" f geqConstr src/SameConstr.hs 21;" f getAimZoom src/Dodge/Update/Camera.hs 141;" f getAmmoLinks src/Dodge/Item/Grammar.hs 104;" f -getAttachedSFLink src/Dodge/HeldUse.hs 756;" f +getAttachedSFLink src/Dodge/HeldUse.hs 759;" 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 927;" f +getBulletType src/Dodge/HeldUse.hs 930;" 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 getDistortions src/Dodge/Render.hs 435;" f -getGrenadeHitEffect src/Dodge/HeldUse.hs 1300;" f +getGrenadeHitEffect src/Dodge/HeldUse.hs 1303;" f getInventoryPath src/Dodge/Inventory/Path.hs 9;" f getItemValue src/Dodge/Inventory/SelectionList.hs 147;" f -getLaserColor src/Dodge/HeldUse.hs 698;" f -getLaserDamage src/Dodge/HeldUse.hs 695;" f -getLaserPhaseV src/Dodge/HeldUse.hs 692;" f +getLaserColor src/Dodge/HeldUse.hs 701;" f +getLaserDamage src/Dodge/HeldUse.hs 698;" f +getLaserPhaseV src/Dodge/HeldUse.hs 695;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 9;" f -getMenuMouseContext src/Dodge/Update.hs 392;" f +getMenuMouseContext src/Dodge/Update.hs 391;" f getNodePos src/Dodge/Path.hs 31;" f -getPJStabiliser src/Dodge/HeldUse.hs 1287;" f +getPJStabiliser src/Dodge/HeldUse.hs 1290;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 6;" f getRootItemBounds src/Dodge/Render/HUD.hs 96;" f @@ -3800,14 +3800,14 @@ heldHandlePos src/Dodge/Item/HeldOffset.hs 90;" f 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 433;" f -heldItemMuzVel src/Dodge/HeldUse.hs 1024;" f +heldItemInvLock src/Dodge/HeldUse.hs 434;" f +heldItemMuzVel src/Dodge/HeldUse.hs 1027;" f heldItemMuzzles src/Dodge/HeldUse.hs 182;" f -heldItemRifling src/Dodge/HeldUse.hs 1067;" f +heldItemRifling src/Dodge/HeldUse.hs 1070;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 247;" f heldItemWeight src/Dodge/Creature/Statistics.hs 78;" f heldPositionInfo src/Dodge/Item/Info.hs 241;" f -heldTorqueAmount src/Dodge/HeldUse.hs 577;" f +heldTorqueAmount src/Dodge/HeldUse.hs 578;" f heldTriggerType src/Dodge/BaseTriggerType.hs 27;" f helpPara src/Dodge/Terminal.hs 110;" f helpPoly3D src/Polyhedra.hs 125;" 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 708;" f +isAmmoIntLink src/Dodge/HeldUse.hs 711;" 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 @@ -3932,7 +3932,7 @@ isNHS src/Geometry/Intersect.hs 51;" f isNothing' src/MaybeHelp.hs 33;" f isOnSeg src/Geometry.hs 240;" f isOutLnk src/Dodge/PlacementSpot.hs 174;" f -isOverTerminalScreen src/Dodge/Update.hs 403;" f +isOverTerminalScreen src/Dodge/Update.hs 402;" f isPulseLaser src/Dodge/IsPulseLaser.hs 10;" f isPutID src/Dodge/Placement/Instance/Wall.hs 129;" f isRHS src/Geometry/LHS.hs 24;" 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 762;" f +itemDetectorEffect src/Dodge/HeldUse.hs 765;" 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 @@ -3971,7 +3971,7 @@ itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemInfo src/Dodge/Item/Info.hs 20;" f itemInternalValue src/Dodge/Item/Display.hs 34;" f itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f -itemInvLock src/Dodge/HeldUse.hs 428;" f +itemInvLock src/Dodge/HeldUse.hs 429;" f itemMuzzles src/Dodge/HeldUse.hs 161;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f @@ -4030,7 +4030,7 @@ laser src/Dodge/Item/Held/BatteryGuns.hs 34;" f lastMap src/Dodge/DoubleTree.hs 253;" f launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f layoutLevelFromSeed src/Dodge/LevelGen.hs 48;" f -ldpVerticalSelection src/Dodge/Update/Input/ScreenLayer.hs 74;" f +ldpSelection src/Dodge/Update/Input/ScreenLayer.hs 74;" f ldtIL src/Dodge/DoubleTree.hs 225;" f ldtPropagate src/Dodge/DoubleTree.hs 69;" f ldtPropagate' src/Dodge/DoubleTree.hs 60;" f @@ -4083,7 +4083,7 @@ lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 390;" f lnkPosDir src/Dodge/RoomLink.hs 97;" f loadDodgeConfig src/Dodge/Config/Load.hs 9;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f -loadMuzzle src/Dodge/HeldUse.hs 621;" f +loadMuzzle src/Dodge/HeldUse.hs 622;" f loadSaveSlot src/Dodge/Save.hs 74;" f loadSeed src/Dodge/LoadSeed.hs 7;" f loadSound src/Dodge/SoundLogic/LoadSound.hs 11;" 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 948;" f +magAmmoParams src/Dodge/HeldUse.hs 951;" 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 1005;" f +makeBullet src/Dodge/HeldUse.hs 1008;" 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 643;" f +makeMuzzleFlare src/Dodge/HeldUse.hs 646;" 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 1199;" f -mcShootLaser src/Dodge/HeldUse.hs 1192;" f +mcShootAuto src/Dodge/HeldUse.hs 1202;" f +mcShootLaser src/Dodge/HeldUse.hs 1195;" f mcTriggerVal src/Dodge/Machine/Update.hs 100;" f mcTypeUpdate src/Dodge/Machine/Update.hs 28;" f -mcUseHeld src/Dodge/HeldUse.hs 1110;" f +mcUseHeld src/Dodge/HeldUse.hs 1113;" 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 @@ -4239,7 +4239,7 @@ memoCylinderIndices src/Shader/Poke.hs 323;" f memoFlatIndices src/Shader/Poke.hs 311;" f memoTopPrismEdgeIndices src/Shader/Poke.hs 329;" f memoTopPrismIndices src/Shader/Poke.hs 317;" f -menuDisplayParams src/Dodge/ListDisplayParams.hs 54;" f +menuLDP src/Dodge/ListDisplayParams.hs 54;" f menuOptionToSelectionItem src/Dodge/Menu/Option.hs 93;" f merge src/ListHelp.hs 83;" f mergeBy src/ListHelp.hs 86;" 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 669;" f +muzFlareAt src/Dodge/HeldUse.hs 672;" 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 796;" f +mvGust src/Dodge/Update.hs 794;" 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 @@ -4434,7 +4434,7 @@ pauseMenu src/Dodge/Menu.hs 56;" f pauseMenuOptions src/Dodge/Menu.hs 61;" f pauseSound src/Dodge/SoundLogic.hs 42;" f pauseTime src/Dodge/Update.hs 191;" f -pbFlicker src/Dodge/Update.hs 473;" f +pbFlicker src/Dodge/Update.hs 471;" f pbsHit src/Dodge/WorldEvent/ThingsHit.hs 62;" f peZoneSize src/Dodge/Zoning/Pathing.hs 46;" f pedestalRoom src/Dodge/Room/Containing.hs 50;" 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 759;" f +ppEvents src/Dodge/Update.hs 757;" 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 652;" f +randWallReflect src/Dodge/Update.hs 650;" f randomChallenges src/Dodge/Room/Start.hs 63;" f randomCompass src/Dodge/Layout.hs 59;" f randomFourCornerRoom src/Dodge/Room/Procedural.hs 266;" f @@ -4718,7 +4718,7 @@ randsOnCirc src/RandomHelp.hs 127;" f randsSpread src/RandomHelp.hs 120;" f ratIntersectLineLine src/Geometry/Intersect.hs 225;" f readSaveSlot src/Dodge/Save.hs 45;" f -recoilAmount src/Dodge/HeldUse.hs 458;" f +recoilAmount src/Dodge/HeldUse.hs 459;" f rectNSWE src/Geometry/Polygon.hs 13;" f rectVV src/Geometry/Polygon.hs 38;" f rectWH src/Geometry/Polygon.hs 17;" 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 916;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 919;" f removeDot src/ShortShow.hs 40;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f @@ -4913,7 +4913,7 @@ seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 588;" f seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 205;" f -secondColumnParams src/Dodge/ListDisplayParams.hs 43;" f +secondColumnLDP src/Dodge/ListDisplayParams.hs 43;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 203;" f sectionsSizes src/Dodge/DisplayInventory.hs 206;" f seedStartMenu src/Dodge/Menu.hs 82;" f @@ -4956,7 +4956,7 @@ setLinkType src/Dodge/RoomLink.hs 60;" f setLinkTypePD src/Dodge/RoomLink.hs 67;" f setMusicVolume src/Sound.hs 162;" f setMvPos src/Dodge/Creature/ReaderUpdate.hs 53;" f -setOldPos src/Dodge/Update.hs 505;" f +setOldPos src/Dodge/Update.hs 503;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" 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 990;" f -shootBullets src/Dodge/HeldUse.hs 980;" f +shootBullet src/Dodge/HeldUse.hs 993;" f +shootBullets src/Dodge/HeldUse.hs 983;" f shootFirstMiss src/Dodge/Creature/Volition.hs 34;" f -shootLaser src/Dodge/HeldUse.hs 833;" f -shootPulseBall src/Dodge/HeldUse.hs 901;" f -shootPulseLaser src/Dodge/HeldUse.hs 874;" f +shootLaser src/Dodge/HeldUse.hs 836;" f +shootPulseBall src/Dodge/HeldUse.hs 904;" f +shootPulseLaser src/Dodge/HeldUse.hs 877;" f shootShatter src/Dodge/Item/Weapon/Shatter.hs 11;" f -shootTeslaArc src/Dodge/HeldUse.hs 1215;" f +shootTeslaArc src/Dodge/HeldUse.hs 1218;" f shootTillEmpty src/Dodge/Creature/Volition.hs 19;" f -shootTractorBeam src/Dodge/HeldUse.hs 789;" f +shootTractorBeam src/Dodge/HeldUse.hs 792;" 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 @@ -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 873;" f +simpleCrSprings src/Dodge/Update.hs 871;" f simpleTermMessage src/Dodge/Terminal.hs 184;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f @@ -5304,7 +5304,7 @@ titleOptionsMenu src/Dodge/Menu.hs 102;" f titleOptionsNoWrite src/Dodge/Menu.hs 105;" f tlDoEffect src/Dodge/Terminal.hs 122;" f tlSetStatus src/Dodge/Terminal.hs 119;" f -tmUpdate src/Dodge/Update.hs 489;" f +tmUpdate src/Dodge/Update.hs 487;" f toBinary src/Dodge/Inventory/SelectionList.hs 141;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f @@ -5333,12 +5333,12 @@ topPrismIndices src/Shader/Poke.hs 410;" f topTestPart src/Dodge/TestString.hs 71;" f torch src/Dodge/Item/Held/Utility.hs 23;" f torchShape src/Dodge/Item/Draw/SPic.hs 290;" f -torqueAmount src/Dodge/HeldUse.hs 572;" f +torqueAmount src/Dodge/HeldUse.hs 573;" f 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 801;" f +tractorBeamAt src/Dodge/HeldUse.hs 804;" 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 @@ -5450,42 +5450,42 @@ updateBaseWheelEvent src/Dodge/Update/Scroll.hs 34;" f updateBounds src/Dodge/Update/Camera.hs 256;" f updateBulVel src/Dodge/Bullet.hs 56;" f updateBullet src/Dodge/Bullet.hs 21;" f -updateBullets src/Dodge/Update.hs 572;" 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 810;" f -updateClouds src/Dodge/Update.hs 678;" f +updateCloud src/Dodge/Update.hs 808;" f +updateClouds src/Dodge/Update.hs 676;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 39;" f updateCombineSections src/Dodge/DisplayInventory.hs 46;" f updateCreature src/Dodge/Creature/Update.hs 31;" f updateCreature' src/Dodge/Creature/Update.hs 39;" f -updateCreatureGroups src/Dodge/Update.hs 544;" f -updateCreatureSoundPositions src/Dodge/Update.hs 520;" f -updateDebris src/Dodge/Update.hs 579;" f +updateCreatureGroups src/Dodge/Update.hs 542;" f +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 902;" f +updateDelayedEvents src/Dodge/Update.hs 900;" f updateDisplaySections src/Dodge/DisplayInventory.hs 118;" f updateDistortion src/Dodge/Distortion.hs 5;" f -updateDistortions src/Dodge/Update.hs 565;" f +updateDistortions src/Dodge/Update.hs 563;" f updateDoor src/Dodge/Update.hs 326;" f -updateDust src/Dodge/Update.hs 834;" f -updateDusts src/Dodge/Update.hs 681;" f +updateDust src/Dodge/Update.hs 832;" f +updateDusts src/Dodge/Update.hs 679;" f updateEnergyBall src/Dodge/EnergyBall.hs 31;" f -updateEnergyBalls src/Dodge/Update.hs 669;" f +updateEnergyBalls src/Dodge/Update.hs 667;" 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 666;" f +updateFlames src/Dodge/Update.hs 664;" 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 793;" f +updateGusts src/Dodge/Update.hs 791;" f updateHumanoid src/Dodge/Humanoid.hs 13;" f -updateIMl src/Dodge/Update.hs 534;" f -updateIMl' src/Dodge/Update.hs 539;" f +updateIMl src/Dodge/Update.hs 532;" f +updateIMl' src/Dodge/Update.hs 537;" f updateInGameCamera src/Dodge/Update/Camera.hs 79;" f updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 426;" f updateInt2Map src/Dodge/Zoning/Base.hs 92;" f @@ -5497,7 +5497,7 @@ updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 381;" f updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 403;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 11;" f -updateLasers src/Dodge/Update.hs 439;" f +updateLasers src/Dodge/Update.hs 437;" f updateLeftParentSF src/Dodge/Item/Grammar.hs 170;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLongPressInGame src/Dodge/Update/Input/InGame.hs 439;" f @@ -5509,21 +5509,21 @@ updateMouseContextGame src/Dodge/Update.hs 347;" 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 166;" f -updateObjCatMaybes src/Dodge/Update.hs 556;" f -updateObjMapMaybe src/Dodge/Update.hs 549;" f -updatePastWorlds src/Dodge/Update.hs 427;" f +updateObjCatMaybes src/Dodge/Update.hs 554;" f +updateObjMapMaybe src/Dodge/Update.hs 547;" f +updatePastWorlds src/Dodge/Update.hs 426;" f updatePreload src/Preload/Update.hs 20;" f updateProjectile src/Dodge/Projectile/Update.hs 27;" f updateProp src/Dodge/Prop/Update.hs 11;" f updatePulse src/Dodge/Creature/Update.hs 136;" f -updatePulseBall src/Dodge/Update.hs 453;" f -updatePulseLaser src/Dodge/Update.hs 619;" f -updatePulseLasers src/Dodge/Update.hs 448;" f +updatePulseBall src/Dodge/Update.hs 451;" f +updatePulseLaser src/Dodge/Update.hs 617;" f +updatePulseLasers src/Dodge/Update.hs 446;" f updateRBList src/Dodge/Inventory/RBList.hs 22;" f updateRadarBlip src/Dodge/RadarBlip.hs 11;" f -updateRadarBlips src/Dodge/Update.hs 568;" f +updateRadarBlips src/Dodge/Update.hs 566;" f updateRadarSweep src/Dodge/RadarSweep.hs 39;" f -updateRadarSweeps src/Dodge/Update.hs 672;" f +updateRadarSweeps src/Dodge/Update.hs 670;" 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 663;" f +updateShockwaves src/Dodge/Update.hs 661;" 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 675;" f -updateTeslaArc src/Dodge/Update.hs 589;" f -updateTeslaArcs src/Dodge/Update.hs 586;" f +updateSparks src/Dodge/Update.hs 673;" 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 660;" f +updateTractorBeams src/Dodge/Update.hs 658;" f updateTurret src/Dodge/Machine/Update.hs 50;" f updateUniverse src/Dodge/Update.hs 79;" f updateUniverseFirst src/Dodge/Update.hs 90;" f @@ -5553,7 +5553,7 @@ updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 23;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 10;" f updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f updateWheelEvent src/Dodge/Update/Scroll.hs 25;" f -updateWheelEvents src/Dodge/Update.hs 417;" f +updateWheelEvents src/Dodge/Update.hs 416;" f updateWorldEventFlag src/Dodge/Update.hs 125;" f updateWorldEventFlags src/Dodge/Update.hs 113;" f upperBody src/Dodge/Creature/Picture.hs 120;" 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 1115;" f +useGasParams src/Dodge/HeldUse.hs 1118;" f useHotkey src/Dodge/Creature/YourControl.hs 76;" f -useInventoryPath src/Dodge/HeldUse.hs 1431;" f +useInventoryPath src/Dodge/HeldUse.hs 1434;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 19;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 25;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 259;" f -useLoadedAmmo src/Dodge/HeldUse.hs 711;" f +useLoadedAmmo src/Dodge/HeldUse.hs 714;" 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 1391;" f +useRewindGun src/Dodge/HeldUse.hs 1394;" f useRoomPosCond src/Dodge/PlacementSpot.hs 188;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 191;" f -useStopWatch src/Dodge/HeldUse.hs 1372;" f -useTimeScrollGun src/Dodge/HeldUse.hs 1380;" f +useStopWatch src/Dodge/HeldUse.hs 1375;" f +useTimeScrollGun src/Dodge/HeldUse.hs 1383;" f useUnusedLnk src/Dodge/PlacementSpot.hs 179;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 207;" f usedRoomLinkPoss src/Dodge/PlacementSpot.hs 214;" 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 777;" f +walkNozzle src/Dodge/HeldUse.hs 780;" 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 1425;" f +warmupSound src/Dodge/HeldUse.hs 1428;" f warningRooms src/Dodge/Room/Warning.hs 26;" f wasdAim src/Dodge/Creature/YourControl.hs 132;" f wasdDir src/Dodge/WASD.hs 17;" f @@ -5727,11 +5727,11 @@ zipArcs src/Dodge/Tesla.hs 52;" f zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 118;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f -zoneClouds src/Dodge/Update.hs 480;" f +zoneClouds src/Dodge/Update.hs 478;" f zoneCreature src/Dodge/Zoning/Creature.hs 54;" f -zoneCreatures src/Dodge/Update.hs 515;" f +zoneCreatures src/Dodge/Update.hs 513;" f zoneDust src/Dodge/Zoning/Cloud.hs 48;" f -zoneDusts src/Dodge/Update.hs 483;" f +zoneDusts src/Dodge/Update.hs 481;" f zoneExtract src/Dodge/Zoning/Base.hs 52;" f zoneMonoid src/Dodge/Zoning/Base.hs 83;" f zoneOfCirc src/Dodge/Zoning/Base.hs 24;" f