diff --git a/data/sound/whirdown.WHRHH.250.wav b/data/sound/whirdown.WHRHH.250.wav new file mode 100644 index 000000000..c5c816226 Binary files /dev/null and b/data/sound/whirdown.WHRHH.250.wav differ diff --git a/src/Dodge/Creature/State.hs b/src/Dodge/Creature/State.hs index c53ce9381..dfad78f2f 100644 --- a/src/Dodge/Creature/State.hs +++ b/src/Dodge/Creature/State.hs @@ -3,6 +3,7 @@ module Dodge.Creature.State ( doDamage, ) where +import Dodge.Item.UseDelay import Control.Applicative import Control.Monad import qualified Data.Map.Strict as M @@ -163,9 +164,19 @@ invItemLocUpdate cr loc w = doAnyEquipmentEffect loc cr $ case itm ^. itType of w & pointerToItem itm . itParams . wTime %~ (max 0 . subtract 1) HELD MACHINEPISTOL{} + | fromMaybe 0 (itm ^? itParams . wTime) >= _coolEnd (useDelay itm) -> + w & pointerToItem itm . itParams . wTime + .~ 0 + | fromMaybe 0 (itm ^? itParams . wTime) >= _coolStart (useDelay itm) -> + w + & pointerToItem itm . itParams . wTime +~ 1 + & soundContinue (CrWeaponSound (_crID cr) (fromIntegral $ _itID itm)) (_crPos cr) whirdownS (Just 1) | itm ^? itParams . isWarming == Just True -> w & pointerToItem itm . itParams . isWarming .~ False + | fromMaybe 0 (itm ^? itParams . wTime) >= _warmStart (useDelay itm) -> + w & pointerToItem itm . itParams . wTime + .~ _coolStart (useDelay itm) | otherwise -> w & pointerToItem itm . itParams . wTime .~ 0 diff --git a/src/Dodge/Data/UseDelay.hs b/src/Dodge/Data/UseDelay.hs index 2ba8f1679..b54a33753 100644 --- a/src/Dodge/Data/UseDelay.hs +++ b/src/Dodge/Data/UseDelay.hs @@ -14,7 +14,11 @@ data ItemUseDelay -- should just be Delay } | WarmUpNoDelay { _warmMax :: Int --- , _warmSound :: SoundID + } + | WarmUpCoolDown + { _warmStart :: Int + , _coolStart :: Int + , _coolEnd :: Int } deriving (Eq, Ord, Show, Read) --Generic, Flat) diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index 31c0a2c1d..b301c23a7 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -111,6 +111,15 @@ useTimeCheck f item cr w = case useDelay $ item ^. ldtValue of & soundContinue (CrWeaponSound cid 0) (_crPos cr) (warmupSound $ item ^. ldtValue . itType) (Just 2) & cWorld . lWorld . creatures . ix cid . crInv . ix itRef . itParams . wTime +~ 1 WarmUpNoDelay {} -> f item cr w & setwarming + WarmUpCoolDown ws _ _ + | _wTime (_itParams $ _ldtValue item) < ws -> + w & setwarming + & soundContinue (CrWeaponSound cid 0) (_crPos cr) (warmupSound $ item ^. ldtValue . itType) (Just 2) + & cWorld . lWorld . creatures . ix cid . crInv . ix itRef . itParams . wTime +~ 1 + WarmUpCoolDown _ cs _ + | _wTime (_itParams $ _ldtValue item) < cs -> f item cr w & setwarming + & cWorld . lWorld . creatures . ix cid . crInv . ix itRef . itParams . wTime +~ 1 + WarmUpCoolDown {} -> w & setwarming NoDelay -> f item cr w where lastused = item ^. ldtValue . itTimeLastUsed @@ -165,7 +174,7 @@ heldItemMuzzles = \case & ix (i `div` 2) . mzFlareType .~ BasicFlare & ix (i -1) . mzFlareType .~ NoLightFlare PISTOL -> [Muzzle (V2 10 0) 0 0.05 0 BasicFlare MuzzleShootBullet (UseExactly 1)] - MACHINEPISTOL -> [Muzzle (V2 10 0) 0 0.15 0 MiniGunFlare MuzzleShootBullet (UseExactly 1)] + MACHINEPISTOL -> [Muzzle (V2 10 0) 0 0.3 0 MiniGunFlare MuzzleShootBullet (UseExactly 1)] AUTOPISTOL -> [Muzzle (V2 10 0) 0 0 0 BasicFlare MuzzleShootBullet (UseExactly 1)] SMG -> [Muzzle (V2 20 0) 0 0.05 0 BasicFlare MuzzleShootBullet (UseExactly 1)] RIFLE -> dbwMuzzles & ix 0 . mzPos .~ V2 25 0 diff --git a/src/Dodge/Item/UseDelay.hs b/src/Dodge/Item/UseDelay.hs index be7346065..e30573e58 100644 --- a/src/Dodge/Item/UseDelay.hs +++ b/src/Dodge/Item/UseDelay.hs @@ -24,7 +24,7 @@ heldUseDelay = \case PISTOL -> FixedRate 6 AUTOPISTOL -> FixedRate 8 SMG -> FixedRate 8 - MACHINEPISTOL -> WarmUpNoDelay 50 + MACHINEPISTOL -> WarmUpCoolDown 50 100 200 BURSTRIFLE -> FixedRate 8 -- time last used gets updated after the last burst fire BANGCONE -> FixedRate 20 BLUNDERBUSS -> FixedRate 20 diff --git a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs index bf5068dce..be7ee15eb 100644 --- a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs +++ b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs @@ -1,4 +1,4 @@ --- generated at 2025-06-26 00:05:44.195128752 UTC +-- generated at 2025-06-26 00:25:02.708688263 UTC module Dodge.SoundLogic.ExternallyGeneratedSounds where import Sound.Data soundToVol :: SoundID -> Float @@ -130,9 +130,10 @@ soundToVol v = case _getSoundID v of 124 -> 1000 125 -> 2000 126 -> 2000 - 127 -> 200 - 128 -> 100 - 129 -> 200 + 127 -> 250 + 128 -> 200 + 129 -> 100 + 130 -> 200 _ -> 50 soundToOnomato :: SoundID -> String soundToOnomato v = case _getSoundID v of @@ -263,9 +264,10 @@ soundToOnomato v = case _getSoundID v of 124 -> "BWMP" 125 -> "BRPBRPBRP" 126 -> "WE-OH" - 127 -> "THCK" - 128 -> "FHP" - 129 -> "QWLPH" + 127 -> "WHRHH" + 128 -> "THCK" + 129 -> "FHP" + 130 -> "QWLPH" _ -> error "unitialised sound" soundPathList :: [String] soundPathList = @@ -396,6 +398,7 @@ soundPathList = , "sawtoothFail.BWMP.1000.wav" , "mini.BRPBRPBRP.2000.wav" , "seagullWhistle.WE-OH.2000.wav" + , "whirdown.WHRHH.250.wav" , "connectItem.THCK.200.wav" , "whiteNoiseFadeIn.FHP.100.wav" , "gut1.QWLPH.200.wav" @@ -654,9 +657,11 @@ miniS :: SoundID miniS = SoundID 125 seagullWhistleS :: SoundID seagullWhistleS = SoundID 126 +whirdownS :: SoundID +whirdownS = SoundID 127 connectItemS :: SoundID -connectItemS = SoundID 127 +connectItemS = SoundID 128 whiteNoiseFadeInS :: SoundID -whiteNoiseFadeInS = SoundID 128 +whiteNoiseFadeInS = SoundID 129 gut1S :: SoundID -gut1S = SoundID 129 +gut1S = SoundID 130 diff --git a/tags b/tags index 226dfdd63..75c505350 100644 --- a/tags +++ b/tags @@ -668,7 +668,7 @@ FireSpark src/Dodge/Data/Spark.hs 22;" C Fixated src/Dodge/Data/Creature/Perception.hs 62;" C FixedCoordLayer src/Picture/Data.hs 28;" C FixedRate src/Dodge/Data/Item/HeldDelay.hs 15;" C -FixedRate src/Dodge/Data/UseDelay.hs 13;" C +FixedRate src/Dodge/Data/UseDelay.hs 12;" C FixedSelectionWidth src/Dodge/Data/SelectionList.hs 40;" C FlIt src/Dodge/Data/FloorItem.hs 16;" C Flame src/Dodge/Data/Flame.hs 13;" t @@ -726,7 +726,7 @@ FractionLoaded src/Dodge/Item/Weapon/FractionLoaded.hs 1;" m FromEdge src/Dodge/Data/Room.hs 47;" C FullRes src/Dodge/Data/Config.hs 97;" C FullShadowFidelity src/Shape/Data.hs 24;" C -FullSize src/Dodge/Data/Item/Params.hs 23;" C +FullSize src/Dodge/Data/Item/Params.hs 26;" C FullyVisible src/Dodge/Data/CamouflageStatus.hs 6;" C FunctionChangeLink src/Dodge/Data/ComposedItem.hs 29;" C FunctionChangeSF src/Dodge/Data/ComposedItem.hs 60;" C @@ -947,7 +947,7 @@ ItemCopierUpdate src/Dodge/Data/Item/Effect.hs 32;" C ItemDimension src/Dodge/Data/Item/Misc.hs 13;" t ItemLink src/Dodge/Data/ComposedItem.hs 70;" t ItemLocation src/Dodge/Data/Item/Location.hs 28;" t -ItemParamID src/Dodge/Data/Item/Params.hs 21;" C +ItemParamID src/Dodge/Data/Item/Params.hs 24;" C ItemParams src/Dodge/Data/Item/Params.hs 13;" t ItemParams src/Dodge/Tesla/ItemParams.hs 1;" m ItemReduceWarmTime src/Dodge/Data/Item/Effect.hs 33;" C @@ -961,7 +961,7 @@ ItemTargeting src/Dodge/Data/Item.hs 56;" t ItemType src/Dodge/Data/Item/Combine.hs 16;" t ItemUse src/Dodge/Data/Item/Use.hs 30;" t ItemUseCondition src/Dodge/ItemUseCondition.hs 1;" m -ItemUseDelay src/Dodge/Data/UseDelay.hs 11;" t +ItemUseDelay src/Dodge/Data/UseDelay.hs 10;" t ItemUseToggle src/Dodge/Data/Item/Effect.hs 30;" C ItmCrWdWd src/Dodge/Data/Item/Use/Equipment.hs 26;" t ItmCrWdWdDoNothing src/Dodge/Data/Item/Use/Equipment.hs 27;" C @@ -1269,7 +1269,7 @@ NoCrWdImp src/Dodge/Data/CreatureEffect.hs 14;" C NoCreatureEffect src/Dodge/Data/CreatureEffect.hs 11;" C NoDebugInfo src/Dodge/Data/Universe.hs 58;" C NoDelay src/Dodge/Data/Item/HeldDelay.hs 14;" C -NoDelay src/Dodge/Data/UseDelay.hs 12;" C +NoDelay src/Dodge/Data/UseDelay.hs 11;" C NoDropEffect src/Dodge/Data/Item/Effect.hs 37;" C NoEscapeMenuOption src/Dodge/Data/Universe.hs 79;" C NoFaction src/Dodge/Data/Creature/State.hs 20;" C @@ -1788,8 +1788,8 @@ Show_walls_near_point_you src/Dodge/Data/Config.hs 88;" C Show_walls_near_segment src/Dodge/Data/Config.hs 89;" C Show_zone_near_point_cursor src/Dodge/Data/Config.hs 90;" C ShrapnelBomb src/Dodge/Data/Payload.hs 12;" C -ShrinkGunStatus src/Dodge/Data/Item/Params.hs 23;" t -Shrunk src/Dodge/Data/Item/Params.hs 23;" C +ShrinkGunStatus src/Dodge/Data/Item/Params.hs 26;" t +Shrunk src/Dodge/Data/Item/Params.hs 26;" C SideCluster src/Dodge/Data/RoomCluster.hs 14;" C SideEffect src/Dodge/Data/Universe.hs 64;" t SimpleTrie src/SimpleTrie.hs 4;" m @@ -2161,8 +2161,9 @@ Walls src/Dodge/Render/Walls.hs 1;" m Walls_info src/Dodge/Data/Config.hs 75;" C War src/Dodge/Data/Scenario.hs 28;" C WarmTime src/Dodge/Data/Item/Params.hs 20;" C +WarmUpCoolDown src/Dodge/Data/UseDelay.hs 18;" C WarmUpNoDelay src/Dodge/Data/Item/HeldDelay.hs 18;" C -WarmUpNoDelay src/Dodge/Data/UseDelay.hs 16;" C +WarmUpNoDelay src/Dodge/Data/UseDelay.hs 15;" C Warning src/Dodge/Room/Warning.hs 2;" m WarningCry src/Dodge/Data/ActionPlan.hs 185;" C WasLeftForward src/Dodge/Data/Creature/Stance.hs 34;" C @@ -2381,6 +2382,8 @@ _cmeRecoil src/Dodge/Data/MuzzleEffect.hs 15;" f _cmeSound src/Dodge/Data/MuzzleEffect.hs 17;" f _cmeTorque src/Dodge/Data/MuzzleEffect.hs 16;" f _colorBlurShader src/Data/Preload/Render.hs 22;" f +_coolEnd src/Dodge/Data/UseDelay.hs 21;" f +_coolStart src/Dodge/Data/UseDelay.hs 20;" f _coordinates src/Dodge/Data/LWorld.hs 127;" f _corpses src/Dodge/Data/LWorld.hs 136;" f _cpAttention src/Dodge/Data/Creature/Perception.hs 34;" f @@ -2640,12 +2643,13 @@ _impulsesListList src/Dodge/Data/ActionPlan.hs 98;" f _input src/Dodge/Data/World.hs 42;" f _ipPlacement src/Dodge/Data/GenWorld.hs 132;" f _ipPlacementID src/Dodge/Data/GenWorld.hs 133;" f +_isWarming src/Dodge/Data/Item/Params.hs 22;" f _ispCloseButton src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 31;" f _ispCloseItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 29;" f _itConsumables src/Dodge/Data/Item.hs 41;" f _itID src/Dodge/Data/Item.hs 43;" f _itLocation src/Dodge/Data/Item.hs 44;" f -_itParamID src/Dodge/Data/Item/Params.hs 21;" f +_itParamID src/Dodge/Data/Item/Params.hs 24;" f _itParams src/Dodge/Data/Item.hs 46;" f _itScroll src/Dodge/Data/Item.hs 47;" f _itTargeting src/Dodge/Data/Item.hs 45;" f @@ -2930,7 +2934,7 @@ _radarBlips src/Dodge/Data/LWorld.hs 111;" f _radarSweeps src/Dodge/Data/LWorld.hs 107;" f _randGen src/Dodge/Data/World.hs 39;" f _rateMax src/Dodge/Data/Item/HeldDelay.hs 16;" f -_rateMax src/Dodge/Data/UseDelay.hs 14;" f +_rateMax src/Dodge/Data/UseDelay.hs 13;" f _rbColor src/Dodge/Data/RadarBlip.hs 15;" f _rbMaxTime src/Dodge/Data/RadarBlip.hs 17;" f _rbOptions src/Dodge/Data/World.hs 44;" f @@ -3240,7 +3244,7 @@ _vxLayer src/Picture/Data.hs 17;" f _vxPos src/Picture/Data.hs 14;" f _vxShadNum src/Picture/Data.hs 18;" f _wCam src/Dodge/Data/World.hs 54;" f -_wTime src/Dodge/Data/Item/Params.hs 20;" f +_wTime src/Dodge/Data/Item/Params.hs 21;" f _waitThenAction src/Dodge/Data/ActionPlan.hs 105;" f _waitThenTimer src/Dodge/Data/ActionPlan.hs 104;" f _wallDamages src/Dodge/Data/LWorld.hs 120;" f @@ -3250,9 +3254,9 @@ _walls src/Dodge/Data/LWorld.hs 119;" f _wanID src/Dodge/Data/LWorld.hs 161;" f _wanPos src/Dodge/Data/LWorld.hs 160;" f _warmMax src/Dodge/Data/Item/HeldDelay.hs 19;" f -_warmMax src/Dodge/Data/UseDelay.hs 17;" f +_warmMax src/Dodge/Data/UseDelay.hs 16;" f _warmSound src/Dodge/Data/Item/HeldDelay.hs 20;" f -_warmSound src/Dodge/Data/UseDelay.hs 18;" f +_warmStart src/Dodge/Data/UseDelay.hs 19;" f _windowPosX src/Dodge/Data/Config.hs 53;" f _windowPosY src/Dodge/Data/Config.hs 54;" f _windowShader src/Data/Preload/Render.hs 19;" f @@ -3367,21 +3371,21 @@ angleVV3 src/Geometry/Vector3D.hs 122;" f annoToRoomTree src/Dodge/Annotation.hs 17;" f anyUnusedSpot src/Dodge/PlacementSpot.hs 66;" f anythingHitCirc src/Dodge/Base/Collide.hs 247;" f -applyCME src/Dodge/HeldUse.hs 370;" f +applyCME src/Dodge/HeldUse.hs 379;" f applyCreatureDamage src/Dodge/Creature/Damage.hs 13;" f applyEventIO src/Loop.hs 89;" f applyGravityPU src/Dodge/Projectile/Update.hs 56;" f applyIndividualDamage src/Dodge/Creature/Damage.hs 16;" f -applyInvLock src/Dodge/HeldUse.hs 429;" f +applyInvLock src/Dodge/HeldUse.hs 438;" f applyMagnetsToBul src/Dodge/Bullet.hs 30;" f applyPastDamages src/Dodge/Creature/State.hs 131;" f applyPiercingDamage src/Dodge/Creature/Damage.hs 22;" f applyPosition src/Sound.hs 111;" f -applyRecoil src/Dodge/HeldUse.hs 461;" f +applyRecoil src/Dodge/HeldUse.hs 470;" f applyResFactor src/Dodge/Data/Config.hs 110;" f applySetTerminalString src/Dodge/Debug/Terminal.hs 81;" f -applySidePush src/Dodge/HeldUse.hs 560;" f -applySoundCME src/Dodge/HeldUse.hs 451;" f +applySidePush src/Dodge/HeldUse.hs 569;" f +applySoundCME src/Dodge/HeldUse.hs 460;" 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 @@ -3389,7 +3393,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 571;" f +applyTorqueCME src/Dodge/HeldUse.hs 580;" f applyWorldConfig src/Dodge/Config/Update.hs 38;" f aquamarine src/Color.hs 23;" f arHUD src/Dodge/Item/Scope.hs 134;" f @@ -3426,11 +3430,11 @@ attachTree src/Dodge/Tree/Compose.hs 38;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 68;" f attribSize src/Shader/Compile.hs 306;" f autoAmr src/Dodge/Item/Held/Rod.hs 39;" f -autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 432;" f +autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 443;" f autoCrit src/Dodge/Creature/AutoCrit.hs 12;" f autoDetector src/Dodge/Item/Weapon/Radar.hs 11;" f autoEffect src/Dodge/Item/Weapon/ExtraEffect.hs 18;" f -autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 620;" f +autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 633;" f autoPistol src/Dodge/Item/Held/Stick.hs 49;" f autoRifle src/Dodge/Item/Held/Cane.hs 40;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 163;" f @@ -3443,9 +3447,9 @@ backpackShape src/Dodge/Item/Draw/SPic.hs 177;" f backspaceInputted src/Dodge/Update/Input/Text.hs 25;" f bangCone src/Dodge/Item/Held/Cone.hs 11;" f bangConeShape src/Dodge/Item/Draw/SPic.hs 292;" f -bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 454;" f +bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 467;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f -bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 598;" f +bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 611;" f bangStick src/Dodge/Item/Held/Stick.hs 15;" f barPP src/Dodge/Room/Foreground.hs 236;" f barrel src/Dodge/Creature/Inanimate.hs 17;" f @@ -3462,7 +3466,7 @@ baseSMGShape src/Dodge/Item/Draw/SPic.hs 383;" f baseShoulder src/Dodge/Creature/Picture.hs 125;" f baseStickShape src/Dodge/Item/Draw/SPic.hs 289;" f baseStickShapeX src/Dodge/Item/Draw/SPic.hs 282;" f -baseStickSpread src/Dodge/HeldUse.hs 282;" f +baseStickSpread src/Dodge/HeldUse.hs 291;" f baseTriggerType src/Dodge/BaseTriggerType.hs 12;" f baseTriggerType src/Dodge/Item/TriggerType.hs 5;" f basicAttentionUpdate src/Dodge/Creature/Perception.hs 128;" f @@ -3473,7 +3477,7 @@ basicDrawBeam src/Dodge/Beam/Draw.hs 11;" f basicItemDisplay src/Dodge/Item/Display.hs 22;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMachineUpdate src/Dodge/Machine.hs 13;" f -basicMuzFlare src/Dodge/HeldUse.hs 711;" f +basicMuzFlare src/Dodge/HeldUse.hs 720;" f basicTerminal src/Dodge/Terminal.hs 35;" f battery src/Dodge/Item/Ammo.hs 62;" f batteryPack src/Dodge/Item/Equipment.hs 46;" f @@ -3482,7 +3486,7 @@ beltMag src/Dodge/Item/Ammo.hs 38;" f bfsNodePoints src/Dodge/Path.hs 58;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 218;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 114;" f -bgunSound src/Dodge/HeldUse.hs 514;" f +bgunSound src/Dodge/HeldUse.hs 523;" f bindFBO src/Render.hs 244;" f bingate src/Dodge/Item/Scope.hs 109;" f black src/Color.hs 27;" f @@ -3500,22 +3504,22 @@ blockPillar src/Dodge/Room/Pillar.hs 22;" f blockedCorridor src/Dodge/Room/RoadBlock.hs 71;" f blockedCorridorCloseBlocks src/Dodge/Room/RoadBlock.hs 78;" f blockingLoad src/Dodge/Concurrent.hs 35;" f -blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 562;" f -blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 434;" f -blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 590;" f -blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 484;" f -blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 466;" f -blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f -blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 422;" f -blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 410;" f -bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f -bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f -bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 510;" f -bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 546;" f -bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 424;" f -bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 440;" f -bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 564;" f -bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 528;" f +blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 575;" f +blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 445;" f +blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 603;" f +blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 497;" f +blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 479;" f +blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 637;" f +blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 433;" f +blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 421;" f +bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 557;" f +bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 529;" f +bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 523;" f +bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 559;" f +bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 435;" f +bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 453;" f +bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 577;" f +bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 541;" f blowTorch src/Dodge/Item/Held/SprayGuns.hs 43;" f blue src/Color.hs 16;" f blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f @@ -3550,7 +3554,7 @@ bulletSynthesizer src/Dodge/Item/Ammo.hs 75;" f bulletWeapons src/Dodge/Combine/Combinations.hs 248;" f burstRifle src/Dodge/Item/Held/Cane.hs 45;" f buttonFlip src/Dodge/Button/Event.hs 18;" f -buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f +buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 639;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f @@ -3571,7 +3575,7 @@ centerVaultRoom src/Dodge/Room/Procedural.hs 289;" f centroid src/Geometry/Polygon.hs 130;" f centroidNum src/Geometry/Polygon.hs 133;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f -chainLinkOrientation src/Dodge/Creature/State.hs 261;" f +chainLinkOrientation src/Dodge/Creature/State.hs 279;" f chainPairs src/Geometry.hs 359;" f changeSwapOther src/Dodge/Inventory.hs 144;" f changeSwapSel src/Dodge/Inventory.hs 137;" f @@ -3622,9 +3626,9 @@ clColor src/Shader/Poke/Cloud.hs 35;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 166;" f -clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 494;" f -clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 606;" f -clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 476;" f +clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 507;" f +clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 619;" f +clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 489;" f cldtPropagateFold src/Dodge/DoubleTree.hs 230;" f cleanUpPreload src/Preload.hs 10;" f cleanUpRenderPreload src/Preload/Render.hs 217;" f @@ -3633,7 +3637,7 @@ cleanupHalted src/Sound.hs 117;" f cleatLabel src/Dodge/Cleat.hs 30;" f cleatOnward src/Dodge/Cleat.hs 24;" f cleatSide src/Dodge/Cleat.hs 27;" f -click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 514;" f +click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 527;" f clickGetCreature src/Dodge/Debug.hs 107;" f clicker src/Dodge/Item/Scope.hs 82;" f clipV src/Geometry/Vector.hs 47;" f @@ -3678,7 +3682,7 @@ combineInventoryExtra src/Dodge/Render/HUD.hs 340;" f combineItemListYouX src/Dodge/Combine.hs 36;" f combineList src/Dodge/Combine.hs 22;" f combineRooms src/Dodge/Room/Procedural.hs 152;" f -combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 426;" f +combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 437;" f combineTree src/Dodge/Tree/Compose.hs 66;" f commandColor src/Dodge/Terminal.hs 132;" f commandFutureLines src/Dodge/Terminal.hs 256;" f @@ -3690,10 +3694,10 @@ compactDrawTree src/Dodge/LevelGen.hs 85;" f compileAndCheckShader src/Shader/Compile.hs 277;" f composeNode src/Dodge/Tree/Compose.hs 76;" f composeTree src/Dodge/Tree/Compose.hs 46;" f -computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 570;" f +computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 583;" f conEffects src/Dodge/Concurrent.hs 12;" f concurrentIS src/Dodge/Update/Input/InGame.hs 290;" f -connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 642;" f +connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 657;" f connectionBlurb src/Dodge/Terminal.hs 102;" f connectionBlurbLines src/Dodge/Terminal.hs 47;" f constructEdges src/Polyhedra.hs 34;" f @@ -3703,7 +3707,7 @@ convexHull src/Geometry/Polygon.hs 104;" f convexHullSafe src/Geometry/Polygon.hs 111;" f convexPolysOverlap src/Geometry/ConvexPoly.hs 50;" f copier src/Dodge/Item/Scope.hs 88;" f -copierItemUpdate src/Dodge/Creature/State.hs 168;" f +copierItemUpdate src/Dodge/Creature/State.hs 186;" f copierItemUpdate src/Dodge/ItEffect.hs 37;" f copyItemToFloor src/Dodge/FloorItem.hs 18;" f copyItemToFloorID src/Dodge/FloorItem.hs 22;" f @@ -3758,7 +3762,7 @@ crWarningSounds src/Dodge/Creature/Vocalization.hs 23;" f crZoneSize src/Dodge/Zoning/Creature.hs 41;" f craftInfo src/Dodge/Item/Info.hs 168;" f craftItemSPic src/Dodge/Item/Draw/SPic.hs 56;" f -crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 522;" f +crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 535;" f createArc src/Dodge/Tesla/Arc.hs 81;" f createFlIt src/Dodge/Placement/PlaceSpot.hs 180;" f createForceField src/Dodge/ForceField.hs 7;" f @@ -3768,14 +3772,14 @@ createItemYou src/Dodge/Inventory/Add.hs 95;" f createLightMap src/Render.hs 26;" f createNewArc src/Dodge/Tesla/Arc.hs 90;" f createPathGrid src/Dodge/Room/Path.hs 21;" f -createProjectile src/Dodge/HeldUse.hs 1273;" f -createProjectileR src/Dodge/HeldUse.hs 1238;" f +createProjectile src/Dodge/HeldUse.hs 1282;" f +createProjectileR src/Dodge/HeldUse.hs 1247;" f createShell src/Dodge/Projectile/Create.hs 23;" 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 824;" f +creatureShootLaser src/Dodge/HeldUse.hs 833;" f creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 52;" f creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 73;" f creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 62;" f @@ -3846,7 +3850,7 @@ dark src/Color.hs 108;" f darkenBackground src/Dodge/Render/MenuScreen.hs 52;" f dbArg src/Dodge/Base.hs 165;" f dbArgChain src/Dodge/Base.hs 170;" f -dbwMuzzles src/Dodge/HeldUse.hs 285;" f +dbwMuzzles src/Dodge/HeldUse.hs 294;" f deZoneIX src/Dodge/Zoning/Base.hs 89;" f deZoneWall src/Dodge/Zoning/Wall.hs 70;" f deadEndRoom src/Dodge/Room/Room.hs 235;" f @@ -3875,10 +3879,10 @@ decreaseAwareness src/Dodge/Creature/Perception.hs 119;" f decreaseToNothing' src/Dodge/Base/Arithmetic.hs 7;" f decreaseToZero src/Dodge/Base/Arithmetic.hs 4;" f decrementTimer src/Sound.hs 102;" f -dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 602;" f -dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 404;" f -dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f -dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 396;" f +dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 615;" f +dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 415;" f +dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 571;" f +dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 405;" f defDamageMaterial src/Dodge/Material/Damage.hs 22;" f defLSPic src/Dodge/LightSource/Draw.hs 10;" f defSPic src/Dodge/Item/Draw/SPic.hs 298;" f @@ -3964,7 +3968,7 @@ detector src/Dodge/Item/Held/Utility.hs 27;" f detectorColor src/Dodge/Item/Draw/SPic.hs 452;" f detectorEffect src/Dodge/Item/Weapon/Radar.hs 20;" f detectorInfo src/Dodge/Item/Info.hs 224;" f -determineProjectileTracking src/Dodge/HeldUse.hs 1221;" f +determineProjectileTracking src/Dodge/HeldUse.hs 1230;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f did src/Dodge/Item/InvSize.hs 54;" f diffAngles src/Geometry.hs 204;" f @@ -3976,7 +3980,7 @@ dirtColor src/Dodge/Block/Debris.hs 160;" f dirtDebris src/Dodge/Block/Debris.hs 154;" f dirtPoly src/Dodge/Room/RoadBlock.hs 74;" f dirtWallDamage src/Dodge/Wall/DamageEffect.hs 98;" f -disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 580;" f +disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 593;" f disconnectTerminal src/Dodge/Terminal.hs 217;" f displayConfig src/Dodge/Menu.hs 213;" f displayControls src/Dodge/Menu.hs 223;" f @@ -3997,7 +4001,7 @@ dmType src/Dodge/Damage.hs 38;" f doAfterPlacement src/Dodge/Layout.hs 86;" f doAfterPlacements src/Dodge/Layout.hs 83;" f doAimTwist src/Dodge/Creature/YourControl.hs 140;" f -doAnyEquipmentEffect src/Dodge/Creature/State.hs 178;" f +doAnyEquipmentEffect src/Dodge/Creature/State.hs 196;" f doArcStep src/Dodge/Tesla/Arc.hs 135;" f doBackspace src/Dodge/Update/Input/Text.hs 31;" f doBlBl src/Dodge/BlBl.hs 5;" f @@ -4029,9 +4033,9 @@ doDrag src/Dodge/Update/Input/InGame.hs 107;" f doDrawing src/Dodge/Render.hs 35;" f doDrawing' src/Dodge/Render.hs 46;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f -doGenFloat src/Dodge/HeldUse.hs 1179;" f +doGenFloat src/Dodge/HeldUse.hs 1188;" f doGravityPU src/Dodge/Projectile/Update.hs 50;" f -doHeldUseEffect src/Dodge/HeldUse.hs 315;" f +doHeldUseEffect src/Dodge/HeldUse.hs 324;" f doInPlacements src/Dodge/Layout.hs 92;" f doIndividualPlacements src/Dodge/Layout.hs 117;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 28;" f @@ -4094,7 +4098,7 @@ doublePair src/Geometry.hs 161;" f doublePairSet src/Geometry.hs 165;" f doubleTreeToIndentList src/Dodge/DoubleTree.hs 72;" f doubleV2 src/Geometry.hs 168;" f -drawARHUD src/Dodge/Creature/State.hs 288;" f +drawARHUD src/Dodge/Creature/State.hs 306;" f drawAimSweep src/Dodge/Render/Picture.hs 271;" f drawAllShadows src/Dodge/Shadows.hs 5;" f drawBaseMachine src/Dodge/Machine/Draw.hs 57;" f @@ -4223,7 +4227,7 @@ drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 279;" f droneLauncher src/Dodge/Item/Weapon/Drone.hs 11;" f dropAll src/Dodge/Creature/State.hs 124;" f dropExcept src/Dodge/Creature/Action.hs 166;" f -dropInventoryPath src/Dodge/HeldUse.hs 1352;" f +dropInventoryPath src/Dodge/HeldUse.hs 1361;" f dropItem src/Dodge/Creature/Action.hs 172;" f dropper src/Dodge/Item/Scope.hs 76;" f drumMag src/Dodge/Item/Ammo.hs 33;" f @@ -4255,8 +4259,8 @@ effectOnEquip src/Dodge/Equipment.hs 32;" f effectOnRemove src/Dodge/Equipment.hs 19;" f effectWhileAttached src/Dodge/ItEffect.hs 58;" f eitType src/Dodge/Data/EquipType.hs 15;" f -ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 586;" f -elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 446;" f +ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 599;" f +elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 459;" f elephantGun src/Dodge/Item/Held/Rod.hs 27;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 22;" f emptyTrie src/SimpleTrie.hs 16;" f @@ -4299,7 +4303,7 @@ expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 186;" f explodeShell src/Dodge/Projectile/Update.hs 244;" f -explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 490;" f +explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 503;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 84;" f extendAway src/Dodge/Placement/Instance/LightSource.hs 200;" f @@ -4330,15 +4334,15 @@ findReverseEdgeList src/Polyhedra.hs 57;" f findWallFreeDropPoint src/Dodge/FloorItem.hs 51;" f findWallsInPolygon src/Dodge/LevelGen/StaticWalls/Deprecated.hs 78;" f findWithIx src/ListHelp.hs 123;" f -fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 486;" f -fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 628;" f -fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 412;" f +fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 499;" f +fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 641;" f +fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 423;" f firstBreather src/Dodge/Room/Breather.hs 9;" f firstWorldLoad appDodge/Main.hs 77;" f fixedCoordPictures src/Dodge/Render/Picture.hs 17;" f fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f flFlicker src/Dodge/Flame.hs 38;" f -flameMuzzles src/Dodge/HeldUse.hs 288;" f +flameMuzzles src/Dodge/HeldUse.hs 297;" f flameShield src/Dodge/Item/Equipment.hs 33;" f flameSize src/Dodge/Flame/Size.hs 5;" f flameSpitter src/Dodge/Item/Held/SprayGuns.hs 23;" f @@ -4346,7 +4350,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 386;" f -flareCircleAt src/Dodge/HeldUse.hs 692;" f +flareCircleAt src/Dodge/HeldUse.hs 701;" f flatItemCombinations src/Dodge/Combine/Combinations.hs 51;" f flatLookupItems src/Dodge/Combine.hs 39;" f flatShield src/Dodge/Item/Held/Utility.hs 17;" f @@ -4368,16 +4372,16 @@ flockToPointUsing' src/Dodge/Creature/Boid.hs 228;" f floorItemPickupInfo src/Dodge/Render/HUD.hs 229;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 99;" f floorWire src/Dodge/Wire.hs 13;" f -foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 492;" f -foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 488;" f +foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 505;" f +foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 501;" f foldCr src/Dodge/Creature/State.hs 48;" f foldPairs src/ListHelp.hs 37;" f foldrWhileArb src/ListHelp.hs 110;" f followImpulse src/Dodge/Creature/Impulse.hs 38;" f followImpulses src/Dodge/Creature/Impulse.hs 32;" f -foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 430;" f -foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 448;" f -foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 552;" f +foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 441;" f +foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 461;" f +foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 565;" f forbidFlee src/Dodge/Creature/Boid.hs 43;" f forceElements src/StrictHelp.hs 10;" f forceField src/Dodge/Wall/ForceField.hs 7;" f @@ -4388,7 +4392,7 @@ fpsText src/Dodge/Render/Picture.hs 53;" f fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 137;" f frag src/Shader/Data.hs 102;" f freeShaderPointers' src/Shader.hs 37;" f -fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 442;" f +fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 455;" f fromEdgeTuple src/Dodge/Path/Translate.hs 5;" f fromJust' src/MaybeHelp.hs 24;" f fromListL src/DoubleStack.hs 7;" f @@ -4413,7 +4417,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 1135;" f +gasType src/Dodge/HeldUse.hs 1144;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f generateGraphs src/Dodge/LevelGen.hs 39;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f @@ -4428,11 +4432,11 @@ getAimZoom src/Dodge/Update/Camera.hs 135;" f getAmmoLinks src/Dodge/Item/Grammar.hs 142;" f getArguments src/Dodge/Update/Scroll.hs 178;" f getArguments' src/Dodge/Update/Scroll.hs 166;" f -getAttachedSFLink src/Dodge/HeldUse.hs 762;" f +getAttachedSFLink src/Dodge/HeldUse.hs 771;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 121;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 171;" f -getBulletType src/Dodge/HeldUse.hs 881;" f +getBulletType src/Dodge/HeldUse.hs 890;" f getCloseObj src/Dodge/Update/Input/InGame.hs 515;" f getCommands src/Dodge/Terminal.hs 117;" f getCommandsHelp src/Dodge/Terminal.hs 75;" f @@ -4440,17 +4444,17 @@ getCrMoveSpeed src/Dodge/Creature/Statistics.hs 45;" f getDamageCoding src/Dodge/Terminal.hs 177;" f getDistortions src/Dodge/Render.hs 411;" f getEquipmentAllocation src/Dodge/Inventory/RBList.hs 47;" f -getGrenadeHitEffect src/Dodge/HeldUse.hs 1266;" f +getGrenadeHitEffect src/Dodge/HeldUse.hs 1275;" f getInventoryPath src/Dodge/Inventory/Path.hs 8;" f getItemValue src/Dodge/Inventory/SelectionList.hs 143;" f -getLaserColor src/Dodge/HeldUse.hs 708;" f -getLaserDamage src/Dodge/HeldUse.hs 705;" f -getLaserPhaseV src/Dodge/HeldUse.hs 702;" f +getLaserColor src/Dodge/HeldUse.hs 717;" f +getLaserDamage src/Dodge/HeldUse.hs 714;" f +getLaserPhaseV src/Dodge/HeldUse.hs 711;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 11;" f getMenuMouseContext src/Dodge/Update.hs 392;" f getNodePos src/Dodge/Path.hs 31;" f -getPJStabiliser src/Dodge/HeldUse.hs 1258;" f +getPJStabiliser src/Dodge/HeldUse.hs 1267;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 8;" f getRootItemBounds src/Dodge/Render/HUD.hs 95;" f @@ -4471,10 +4475,10 @@ glNamedBufferSubDataH src/Shader/Bind.hs 53;" f glassDebris src/Dodge/Block/Debris.hs 169;" f glassLesson src/Dodge/Room/GlassLesson.hs 23;" f glassLessonRunPast src/Dodge/Room/GlassLesson.hs 68;" f -glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 578;" f -glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f -glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 406;" f -glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f +glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 591;" f +glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 561;" f +glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 417;" f +glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 555;" f glassSwitchBack src/Dodge/Room/Room.hs 70;" f glassSwitchBackCrits src/Dodge/Room/Room.hs 99;" f glassWallDamage src/Dodge/Wall/DamageEffect.hs 49;" f @@ -4497,13 +4501,13 @@ gridPoints' src/Grid.hs 79;" f gridPoints'' src/Grid.hs 74;" f gridPointsOff src/Grid.hs 62;" f groupSplitItemAmounts src/Dodge/Combine.hs 52;" f -gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 608;" f -gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f -gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 460;" f -gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 438;" f -gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 416;" f -gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 614;" f -gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 574;" f +gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 621;" f +gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 661;" f +gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 473;" f +gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 449;" f +gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 427;" f +gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 627;" f +gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 587;" f gyroscope src/Dodge/Item/Scope.hs 156;" f hackOutline src/Dodge/Render/Outline.hs 5;" f halfHeight src/Dodge/Base/Window.hs 48;" f @@ -4533,32 +4537,32 @@ headLampShape src/Dodge/Item/Draw/SPic.hs 442;" f headMap src/Dodge/DoubleTree.hs 170;" f heal src/Dodge/Item/Consumable.hs 17;" f heal25 src/Dodge/Item/Consumable.hs 14;" f -healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 436;" f +healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 447;" f healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 74;" f healthTest src/Dodge/Room/LasTurret.hs 95;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f heldAimStance src/Dodge/Item/AimStance.hs 17;" f heldAimZoom src/Dodge/Update/Camera.hs 140;" f heldEffect src/Dodge/HeldUse.hs 63;" f -heldEffectMuzzles src/Dodge/HeldUse.hs 125;" f +heldEffectMuzzles src/Dodge/HeldUse.hs 133;" f heldEffectNoHammerCheck src/Dodge/HeldUse.hs 66;" f heldHandlePos src/Dodge/Item/HeldOffset.hs 95;" f heldInfo src/Dodge/Item/Info.hs 90;" f heldItemAmmoSlots src/Dodge/Item/AmmoSlots.hs 18;" f heldItemBulkiness src/Dodge/Creature/YourControl.hs 177;" f -heldItemInvLock src/Dodge/HeldUse.hs 444;" f -heldItemMuzVel src/Dodge/HeldUse.hs 1021;" f -heldItemMuzzles src/Dodge/HeldUse.hs 150;" f +heldItemInvLock src/Dodge/HeldUse.hs 453;" f +heldItemMuzVel src/Dodge/HeldUse.hs 1030;" f +heldItemMuzzles src/Dodge/HeldUse.hs 158;" f heldItemOffset src/Dodge/Item/HeldOffset.hs 72;" f heldItemOrient2D src/Dodge/Item/HeldOffset.hs 29;" f heldItemRelativeOrient src/Dodge/Item/HeldOffset.hs 34;" f -heldItemRifling src/Dodge/HeldUse.hs 1065;" f +heldItemRifling src/Dodge/HeldUse.hs 1074;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 224;" f heldItemWeight src/Dodge/Creature/Statistics.hs 71;" f heldPositionInfo src/Dodge/Item/Info.hs 240;" f -heldTorqueAmount src/Dodge/HeldUse.hs 587;" f +heldTorqueAmount src/Dodge/HeldUse.hs 596;" f heldTriggerType src/Dodge/BaseTriggerType.hs 17;" f -heldUseDelay src/Dodge/Item/UseDelay.hs 19;" f +heldUseDelay src/Dodge/Item/UseDelay.hs 18;" f helpCommand src/Dodge/Terminal.hs 66;" f helpPoly3D src/Polyhedra.hs 125;" f heron src/Geometry.hs 217;" f @@ -4566,9 +4570,9 @@ hiToFloat src/Dodge/Room/Modify/Girder.hs 171;" f highBar src/Dodge/Room/Foreground.hs 89;" f highDiagonalMesh src/Dodge/Room/Foreground.hs 35;" f highMesh src/Dodge/Room/Foreground.hs 25;" f -hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 512;" f +hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 525;" f hitEffFromBul src/Dodge/Bullet.hs 154;" f -hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 468;" f +hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 481;" f holdForm src/Dodge/Creature/Boid.hs 137;" f holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 48;" f @@ -4615,9 +4619,9 @@ insertAt src/Padding.hs 63;" f insertIMInZone src/Dodge/Base.hs 54;" f insertInTrie src/SimpleTrie.hs 23;" f insertNewKey src/IntMapHelp.hs 64;" f -insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 452;" f +insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 465;" f insertOver src/ListHelp.hs 47;" f -insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 398;" f +insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 407;" f insertWall src/Dodge/Placement/PlaceSpot/Block.hs 122;" f insertWallInZones src/Dodge/Wall/Zone.hs 20;" f insertWalls src/Dodge/Placement/PlaceSpot/Block.hs 117;" f @@ -4671,7 +4675,7 @@ invertIntMap src/Multiset.hs 67;" f invertInventoryToMap src/Dodge/Combine.hs 57;" f invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 21;" f invisibleWall src/Dodge/Placement/Instance/Wall.hs 16;" f -isAmmoIntLink src/Dodge/HeldUse.hs 718;" f +isAmmoIntLink src/Dodge/HeldUse.hs 727;" f isAnimate src/Dodge/Creature/Test.hs 142;" f isCognizant src/Dodge/Creature/Perception.hs 106;" f isConnected src/Dodge/Inventory/Swap.hs 74;" f @@ -4708,7 +4712,7 @@ itemBlips src/Dodge/RadarSweep.hs 93;" f itemBulkiness src/Dodge/Creature/YourControl.hs 172;" f itemCombinations src/Dodge/Combine/Combinations.hs 56;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 61;" f -itemDetectorEffect src/Dodge/HeldUse.hs 768;" f +itemDetectorEffect src/Dodge/HeldUse.hs 777;" f itemDisplay src/Dodge/Inventory/SelectionList.hs 49;" f itemEquipPict src/Dodge/Item/Draw.hs 18;" f itemExternalValue src/Dodge/Inventory/SelectionList.hs 84;" f @@ -4720,9 +4724,9 @@ itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemInfo src/Dodge/Item/Info.hs 20;" f itemInternalValue src/Dodge/Item/Display.hs 33;" f itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f -itemInvLock src/Dodge/HeldUse.hs 439;" f -itemMuzzles src/Dodge/HeldUse.hs 139;" f -itemRandomOffset src/Dodge/HeldUse.hs 958;" f +itemInvLock src/Dodge/HeldUse.hs 448;" f +itemMuzzles src/Dodge/HeldUse.hs 147;" f +itemRandomOffset src/Dodge/HeldUse.hs 967;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 28;" f itemSPic src/Dodge/Item/Draw/SPic.hs 34;" f @@ -4730,7 +4734,7 @@ itemScan src/Dodge/Item/Scope.hs 63;" f itemScroll src/Dodge/Update/Scroll.hs 52;" f itemScrollDisplay src/Dodge/Inventory/SelectionList.hs 120;" f itemScrollValue src/Dodge/Inventory/SelectionList.hs 147;" f -itemSidePush src/Dodge/HeldUse.hs 385;" f +itemSidePush src/Dodge/HeldUse.hs 394;" f itemString src/Dodge/Item/Display.hs 55;" f itemToBreakLists src/Dodge/Item/Grammar.hs 68;" f itemToFunction src/Dodge/Item/Grammar.hs 148;" f @@ -4762,7 +4766,7 @@ keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 59;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f keyPic src/Dodge/Item/Draw/SPic.hs 458;" f keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f -knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 568;" f +knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 581;" f lConnect src/Dodge/Render/Connectors.hs 42;" f lConnectMulti src/Dodge/Render/Connectors.hs 46;" f lShape src/Dodge/Placement/Instance/LightSource.hs 76;" f @@ -4831,7 +4835,7 @@ lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 394;" 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 632;" f +loadMuzzle src/Dodge/HeldUse.hs 641;" f loadSaveSlot src/Dodge/Save.hs 74;" f loadSeed src/Dodge/LoadSeed.hs 7;" f loadSound src/Dodge/SoundLogic/LoadSound.hs 11;" f @@ -4874,7 +4878,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 902;" f +magAmmoParams src/Dodge/HeldUse.hs 911;" f magAmmoType src/Dodge/Item/MagAmmoType.hs 11;" f magShield src/Dodge/Item/Equipment.hs 27;" f magV src/Geometry/Vector.hs 171;" f @@ -4889,8 +4893,8 @@ makeAttach src/Dodge/Item/Attach.hs 10;" f makeBlip src/Dodge/RadarSweep.hs 69;" f makeBlockDebris src/Dodge/Block/Debris.hs 28;" f makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f -makeBullet src/Dodge/HeldUse.hs 1002;" f -makeBullet' src/Dodge/HeldUse.hs 944;" f +makeBullet src/Dodge/HeldUse.hs 1011;" f +makeBullet' src/Dodge/HeldUse.hs 953;" f makeButton src/Dodge/LevelGen/Switch.hs 17;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 128;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 7;" f @@ -4916,7 +4920,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 74;" f -makeMuzzleFlare src/Dodge/HeldUse.hs 653;" f +makeMuzzleFlare src/Dodge/HeldUse.hs 662;" f makeParagraph src/Justify.hs 6;" f makePathBetween src/Dodge/Path.hs 35;" f makePathBetweenPs src/Dodge/Path.hs 54;" f @@ -4972,11 +4976,11 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 130;" f mcSPic src/Dodge/Render/ShapePicture.hs 111;" f mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 93;" f mcSensorUpdate src/Dodge/Machine/Update.hs 125;" f -mcShootAuto src/Dodge/HeldUse.hs 1190;" f -mcShootLaser src/Dodge/HeldUse.hs 1183;" f +mcShootAuto src/Dodge/HeldUse.hs 1199;" f +mcShootLaser src/Dodge/HeldUse.hs 1192;" f mcTriggerVal src/Dodge/Machine/Update.hs 99;" f mcTypeUpdate src/Dodge/Machine/Update.hs 28;" f -mcUseHeld src/Dodge/HeldUse.hs 1109;" f +mcUseHeld src/Dodge/HeldUse.hs 1118;" f mcUseItem src/Dodge/Machine/Update.hs 85;" f medkit src/Dodge/Item/Consumable.hs 8;" f megaBattery src/Dodge/Item/Ammo.hs 54;" f @@ -4995,13 +4999,13 @@ merge src/ListHelp.hs 83;" f mergeBy src/ListHelp.hs 86;" f mergeOn src/ListHelp.hs 93;" f mergeSound src/Sound.hs 59;" f -metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 550;" f -metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f -metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 538;" f -metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 566;" f -metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" f -metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f -metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 470;" f +metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 563;" f +metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 625;" f +metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 551;" f +metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 579;" f +metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 595;" f +metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 631;" f +metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 483;" f metalDebris src/Dodge/Block/Debris.hs 163;" f metalPlate src/Dodge/Item/Craftable.hs 35;" f mglCreate src/GLHelp.hs 8;" f @@ -5015,19 +5019,19 @@ midWall src/Dodge/Placement/Instance/Wall.hs 27;" f minAndMax src/FoldableHelp.hs 109;" f minCrIXOn src/Dodge/Zoning/Creature.hs 47;" f minOn src/FoldableHelp.hs 35;" f -mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 402;" f +mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 413;" f miniGunCrit src/Dodge/Creature.hs 64;" f miniGunX src/Dodge/Item/Held/Cane.hs 48;" f miniGunXPict src/Dodge/Item/Draw/SPic.hs 364;" f miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 358;" f -miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f +miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 653;" f miniTree2 src/Dodge/Room/Room.hs 106;" f minimumOn src/FoldlHelp.hs 14;" f mirrorV3xz src/Dodge/Creature/HandPos.hs 26;" f mirrorXAxis src/Geometry/Polygon.hs 49;" f mirrorxz src/Picture/Base.hs 335;" f mirroryz src/Picture/Base.hs 340;" f -missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 604;" f +missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 617;" f mixColors src/Color.hs 86;" f mixColorsFrac src/Color.hs 82;" f mixColorsLinear src/Color.hs 95;" f @@ -5069,7 +5073,7 @@ multiArrow src/Picture/Composite.hs 11;" f multiLookupTrie src/SimpleTrie.hs 34;" f multiLookupTrieI src/SimpleTrie.hs 43;" f muout src/Dodge/RoomLink.hs 129;" f -muzFlareAt src/Dodge/HeldUse.hs 678;" f +muzFlareAt src/Dodge/HeldUse.hs 687;" f mvButton src/Dodge/Placement/PlaceSpot.hs 176;" f mvCr src/Dodge/Placement/PlaceSpot.hs 186;" f mvFS src/Dodge/Placement/PlaceSpot.hs 189;" f @@ -5126,7 +5130,7 @@ numSubElements src/Shader/Parameters.hs 39;" f numTraversable src/TreeHelp.hs 183;" f obstacleColor src/Dodge/Debug/Picture.hs 257;" f obstructPathsCrossing src/Dodge/Path.hs 138;" f -oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f +oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 635;" f onEquipWristShield src/Dodge/Equipment.hs 37;" f onRemoveWristShield src/Dodge/Equipment.hs 24;" f onXY src/Geometry/Vector3D.hs 130;" f @@ -5205,7 +5209,7 @@ picFormat src/Polyhedra.hs 23;" f picMap src/Picture/Base.hs 67;" f pickUpItem src/Dodge/Inventory/Add.hs 107;" f pickUpItemAt src/Dodge/Inventory/Add.hs 113;" f -pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f +pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 567;" f pincerP src/Dodge/Creature/Boid.hs 61;" f pincerP' src/Dodge/Creature/Boid.hs 94;" f pincerP'' src/Dodge/Creature/Boid.hs 104;" f @@ -5349,7 +5353,7 @@ prependTwo src/Geometry.hs 176;" f prettyDT src/Dodge/DoubleTree.hs 179;" f prettyLDT src/Dodge/DoubleTree.hs 183;" f prettyShort src/AesonHelp.hs 11;" f -primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 524;" f +primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 537;" f printColumnTitles src/Dodge/Tree/Shift.hs 142;" f printColumns src/Dodge/Tree/Shift.hs 132;" f printInfo src/Dodge/Tree/Shift.hs 145;" f @@ -5461,7 +5465,7 @@ randsOnCirc src/RandomHelp.hs 127;" f randsSpread src/RandomHelp.hs 120;" f ratIntersectLineLine src/Geometry/Intersect.hs 195;" f readSaveSlot src/Dodge/Save.hs 45;" f -recoilAmount src/Dodge/HeldUse.hs 466;" f +recoilAmount src/Dodge/HeldUse.hs 475;" f rectNSWE src/Geometry/Polygon.hs 13;" f rectVV src/Geometry/Polygon.hs 38;" f rectWH src/Geometry/Polygon.hs 17;" f @@ -5481,14 +5485,14 @@ refract src/Dodge/Item/Weapon/LaserPath.hs 40;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 38;" f regexCombs src/Dodge/DisplayInventory.hs 71;" f regexList src/Dodge/DisplayInventory.hs 314;" f -reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f +reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 545;" f reloadLevelStart src/Dodge/Save.hs 71;" f -reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 530;" f +reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 543;" f 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 147;" f -removeAmmoFromMag src/Dodge/HeldUse.hs 869;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 878;" f removeDot src/ShortShow.hs 29;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f @@ -5617,7 +5621,7 @@ saveQuit src/Dodge/Menu.hs 74;" f saveQuitConc src/Dodge/Menu.hs 77;" f saveSlotPath src/Dodge/Save.hs 63;" f saveWorldInSlot src/Dodge/Save.hs 68;" f -sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 636;" f +sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 651;" f scale src/Picture/Base.hs 149;" f scale3 src/Picture/Base.hs 145;" f scaleMat src/MatrixHelper.hs 59;" f @@ -5641,15 +5645,15 @@ scrollRBOption src/Dodge/Update/Scroll.hs 152;" f scrollSelectionSections src/Dodge/SelectionSections.hs 26;" f scrollTimeBack src/Dodge/Update.hs 212;" f scrollTimeForward src/Dodge/Update.hs 235;" f -seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f -seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 584;" f -seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f -seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 482;" f -seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" f -seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 508;" f -seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 520;" f -seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f -seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f +seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 515;" f +seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 597;" f +seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 609;" f +seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 495;" f +seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 513;" f +seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 521;" f +seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 533;" f +seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 457;" f +seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 655;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 205;" f secondColumnParams src/Dodge/ListDisplayParams.hs 43;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 204;" f @@ -5699,7 +5703,7 @@ setOldPos src/Dodge/Update.hs 475;" f 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 394;" f +setRBCreatureTargeting src/Dodge/Creature/State.hs 412;" f setSelWhileDragging src/Dodge/Update/Input/InGame.hs 334;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f setShaderSource src/Shader/Compile.hs 290;" f @@ -5766,23 +5770,23 @@ shiftRoomBy src/Dodge/Room/Link.hs 37;" f shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f shiftedGrid src/Grid.hs 25;" f -shineTargetLaser src/Dodge/Creature/State.hs 296;" f -shineTorch src/Dodge/Creature/State.hs 337;" f -shootBullet src/Dodge/HeldUse.hs 934;" f +shineTargetLaser src/Dodge/Creature/State.hs 314;" f +shineTorch src/Dodge/Creature/State.hs 355;" f +shootBullet src/Dodge/HeldUse.hs 943;" f shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f -shootLaser src/Dodge/HeldUse.hs 848;" f +shootLaser src/Dodge/HeldUse.hs 857;" f shootOutPassage src/Dodge/Room/RezBox.hs 74;" f shootShatter src/Dodge/Item/Weapon/Shatter.hs 11;" f -shootTeslaArc src/Dodge/HeldUse.hs 1209;" f +shootTeslaArc src/Dodge/HeldUse.hs 1218;" f shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f -shootTractorBeam src/Dodge/HeldUse.hs 801;" f +shootTractorBeam src/Dodge/HeldUse.hs 810;" 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 shootingRange src/Dodge/Room/Room.hs 332;" f shortPoint2 src/Dodge/ShortShow.hs 4;" f shortShow src/ShortShow.hs 9;" f -shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 632;" f +shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 645;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 75;" f shoulderSH src/Dodge/Creature/Picture.hs 133;" f shoulderSP src/Dodge/Creature/HandPos.hs 170;" f @@ -5791,9 +5795,9 @@ showEquipItem src/Dodge/Item/Display.hs 104;" f showInt src/Dodge/Item/Info.hs 73;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f showInventoryPathing src/Dodge/Item/Display.hs 84;" f -showManObj src/Dodge/TestString.hs 67;" f +showManObj src/Dodge/TestString.hs 62;" f showTerminalError src/Dodge/Debug/Terminal.hs 78;" f -showTimeFlow src/Dodge/TestString.hs 90;" f +showTimeFlow src/Dodge/TestString.hs 85;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 136;" f shrinkVert src/Geometry/Polygon.hs 140;" f shuffle src/RandomHelp.hs 49;" f @@ -5803,8 +5807,8 @@ shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 151;" f simpleCrSprings src/Dodge/Update.hs 805;" f simpleTermMessage src/Dodge/Terminal.hs 253;" f -sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f -sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 420;" f +sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 623;" f +sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 431;" f singleAmmo src/Dodge/Item/AmmoSlots.hs 62;" f singleBlock src/Dodge/Placement/Instance/Wall.hs 30;" f singleDT src/Dodge/DoubleTree.hs 9;" f @@ -5813,10 +5817,10 @@ singleton src/DoubleStack.hs 11;" f singletonTrie src/SimpleTrie.hs 19;" f sizeFBOs src/Framebuffer/Update.hs 22;" f skColor src/Dodge/Spark/Draw.hs 14;" f -skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 450;" f -slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f -slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 534;" f -slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 616;" f +skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 463;" f +slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 613;" f +slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 547;" f +slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 629;" f slideWindow src/ListHelp.hs 80;" f slowDoorRoom src/Dodge/Room/LongDoor.hs 154;" f slowDoorRoomRunPast src/Dodge/Room/LongDoor.hs 171;" f @@ -5824,13 +5828,13 @@ smallBattery src/Dodge/Item/Ammo.hs 59;" f smallBranch src/Dodge/Tree/GenerateStructure.hs 32;" f smallChaseCrit src/Dodge/Creature/ChaseCrit.hs 14;" f smallDrawTree src/Dodge/LevelGen.hs 88;" f -smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 418;" f -smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 576;" f -smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 456;" f -smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 414;" f +smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 429;" f +smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 589;" f +smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 469;" f +smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 425;" f smallPillar src/Dodge/Room/Pillar.hs 37;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f -smg src/Dodge/Item/Held/Stick.hs 61;" f +smg src/Dodge/Item/Held/Stick.hs 58;" f smokeReducer src/Dodge/Item/Scope.hs 162;" f sndV2 src/Geometry/Data.hs 52;" f sniperRifle src/Dodge/Item/Held/Rod.hs 44;" f @@ -5844,10 +5848,10 @@ soundMenuOptions src/Dodge/Menu.hs 143;" f soundMultiFrom src/Dodge/SoundLogic.hs 187;" f soundOriginIDsAt src/Dodge/WorldEvent/Sound.hs 18;" f soundOriginsIDsAt src/Dodge/WorldEvent/Sound.hs 13;" f -soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 264;" f +soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 270;" f soundPic src/Dodge/Debug/Picture.hs 336;" f soundStart src/Dodge/SoundLogic.hs 118;" f -soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 134;" f +soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 137;" f soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f @@ -5919,11 +5923,11 @@ startSeedGame src/Dodge/StartNewGame.hs 20;" f startSeedGameConc src/Dodge/StartNewGame.hs 27;" f statsModifier src/Dodge/Creature/Info.hs 16;" f stickyMod src/Dodge/Item/Scope.hs 51;" f -stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 474;" f -stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" f -stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f -stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 428;" f -stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f +stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 487;" f +stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 605;" f +stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 517;" f +stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 439;" f +stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 569;" f stoneDebris src/Dodge/Block/Debris.hs 137;" f stoneWallDamage src/Dodge/Wall/DamageEffect.hs 27;" f stopAllSounds src/Sound.hs 125;" f @@ -5968,11 +5972,11 @@ tankShape src/Dodge/Placement/Instance/Tank.hs 22;" f tankSquareDec src/Dodge/Placement/Instance/Tank.hs 15;" f tanksPipesRoom src/Dodge/Room/Tanks.hs 92;" f tanksRoom src/Dodge/Room/Tanks.hs 100;" f -tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f -tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 496;" f -tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 540;" f -tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 630;" f -tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 408;" f +tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 573;" f +tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 509;" f +tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 553;" f +tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 643;" f +tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 419;" f targCorner src/Dodge/Targeting/Draw.hs 35;" f targetCursorPic src/Dodge/Targeting/Draw.hs 41;" f targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 13;" f @@ -5981,7 +5985,7 @@ targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 196;" f targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f targetingScope src/Dodge/Item/Scope.hs 38;" f telRoomLev src/Dodge/Room/Teleport.hs 14;" f -teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 462;" f +teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 475;" f termButton src/Dodge/Placement/Instance/Terminal.hs 51;" f termScreenColor src/Dodge/Terminal/Color.hs 9;" f termSoundLine src/Dodge/Terminal.hs 111;" f @@ -5999,7 +6003,7 @@ teslaParams src/Dodge/Tesla/ItemParams.hs 6;" f testCrossWalls src/Dodge/Room/Path.hs 47;" f testEvent src/Dodge/Event/Test.hs 10;" f testInventory src/Dodge/Creature.hs 292;" f -testStringInit src/Dodge/TestString.hs 28;" f +testStringInit src/Dodge/TestString.hs 29;" f text src/Picture/Base.hs 193;" f textGrad src/Picture/Text.hs 5;" f textInputFocus src/Dodge/InputFocus.hs 16;" f @@ -6035,13 +6039,13 @@ timeStopper src/Dodge/Item/Held/Utility.hs 39;" f timeStopper src/Dodge/Item/Weapon/Utility.hs 41;" f timerTLS src/Dodge/LightSource/Update.hs 22;" f tinMag src/Dodge/Item/Ammo.hs 27;" f -ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 394;" f -ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 464;" f -ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 588;" f -ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f -ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f -tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 506;" f -tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 498;" f +ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 403;" f +ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 477;" f +ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 601;" f +ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 485;" f +ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 647;" f +tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 519;" f +tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 511;" f titleOptionsMenu src/Dodge/Menu.hs 102;" f titleOptionsNoWrite src/Dodge/Menu.hs 105;" f tmUpdate src/Dodge/Update.hs 455;" f @@ -6066,22 +6070,22 @@ toggleExamineInv src/Dodge/ToggleExamine.hs 5;" f toggleJust src/MaybeHelp.hs 41;" f toggleMapperInv src/Dodge/Creature/Impulse/UseItem.hs 133;" f togglesToEffects src/Dodge/Terminal.hs 248;" f -tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f -tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 594;" f -tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 536;" f -tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 400;" f +tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 585;" f +tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 607;" f +tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 549;" f +tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 409;" f topInvW src/Dodge/ListDisplayParams.hs 51;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f -topTestPart src/Dodge/TestString.hs 63;" f +topTestPart src/Dodge/TestString.hs 58;" f torch src/Dodge/Item/Held/Utility.hs 23;" f torchShape src/Dodge/Item/Draw/SPic.hs 268;" f -torqueAmount src/Dodge/HeldUse.hs 582;" f +torqueAmount src/Dodge/HeldUse.hs 591;" f torqueCr src/Dodge/WorldEffect.hs 69;" f torso src/Dodge/Creature/Picture.hs 99;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f -tractorBeamAt src/Dodge/HeldUse.hs 813;" f +tractorBeamAt src/Dodge/HeldUse.hs 822;" f tractorGun src/Dodge/Item/Held/BatteryGuns.hs 60;" f tractorGunPic src/Dodge/Item/Draw/SPic.hs 436;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f @@ -6150,8 +6154,8 @@ tryPutItemInInvAt src/Dodge/Inventory/Add.hs 32;" f trySeedFromClipboard src/Dodge/Menu.hs 91;" f tryShellBounce src/Dodge/Projectile/Update.hs 103;" f trySpinByCID src/Dodge/Projectile/Update.hs 177;" f -trySynthBullet src/Dodge/Creature/State.hs 192;" f -tryUseParent src/Dodge/Creature/State.hs 185;" f +trySynthBullet src/Dodge/Creature/State.hs 210;" f +tryUseParent src/Dodge/Creature/State.hs 203;" f turnTo src/Dodge/Movement/Turn.hs 8;" f turret src/Dodge/Placement/Instance/Turret.hs 35;" f turretItemOffset src/Dodge/Item/HeldOffset.hs 19;" f @@ -6163,9 +6167,9 @@ twoFlat src/Dodge/Creature/Test.hs 104;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 87;" f twoHandTwistAmount src/Dodge/Creature/YourControl.hs 150;" f twoRoomPoss src/Dodge/PlacementSpot.hs 147;" f -twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 478;" f -twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f -twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 518;" f +twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 491;" f +twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 539;" f +twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 531;" f ubyteSize src/Shader/Parameters.hs 13;" f ugateCalc src/Dodge/Inventory/SelectionList.hs 108;" f uncurryV src/Geometry/Data.hs 46;" f @@ -6191,7 +6195,7 @@ updateAimPos src/Dodge/Update.hs 308;" f updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla.hs 44;" f updateArc src/Dodge/Tesla/Arc.hs 100;" f -updateAttachedItems src/Dodge/Creature/State.hs 251;" f +updateAttachedItems src/Dodge/Creature/State.hs 269;" f updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 453;" f updateBarrel src/Dodge/Barreloid.hs 41;" f updateBarreloid src/Dodge/Barreloid.hs 15;" f @@ -6229,7 +6233,7 @@ updateFloatingCamera src/Dodge/Update/Camera.hs 34;" f updateFunctionKey src/Dodge/Update/Input/InGame.hs 364;" f updateFunctionKeys src/Dodge/Update/Input/InGame.hs 357;" f updateGusts src/Dodge/Update.hs 726;" f -updateHeldRootItem src/Dodge/Creature/State.hs 245;" f +updateHeldRootItem src/Dodge/Creature/State.hs 263;" f updateHumanoid src/Dodge/Humanoid.hs 13;" f updateIMl src/Dodge/Update.hs 510;" f updateIMl' src/Dodge/Update.hs 515;" f @@ -6237,8 +6241,8 @@ updateInGameCamera src/Dodge/Update/Camera.hs 78;" f updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 400;" f updateInt2Map src/Dodge/Zoning/Base.hs 92;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f -updateItemTargeting src/Dodge/Creature/State.hs 363;" f -updateItemWithOrientation src/Dodge/Creature/State.hs 271;" f +updateItemTargeting src/Dodge/Creature/State.hs 381;" f +updateItemWithOrientation src/Dodge/Creature/State.hs 289;" f updateKeyInGame src/Dodge/Update/Input/InGame.hs 394;" f updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 382;" f updateLampoid src/Dodge/Lampoid.hs 12;" f @@ -6323,27 +6327,27 @@ useBreakListsLinkTest src/Dodge/Item/Grammar.hs 45;" f useBulletPayload src/Dodge/Bullet.hs 113;" f useC src/Dodge/Cuse.hs 8;" f useC' src/Dodge/Cuse.hs 13;" f -useDelay src/Dodge/Item/UseDelay.hs 13;" f -useGasParams src/Dodge/HeldUse.hs 1114;" f +useDelay src/Dodge/Item/UseDelay.hs 12;" f +useGasParams src/Dodge/HeldUse.hs 1123;" f useHotkey src/Dodge/Creature/YourControl.hs 70;" f -useInventoryPath src/Dodge/HeldUse.hs 1377;" f +useInventoryPath src/Dodge/HeldUse.hs 1392;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 20;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 27;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f -useLoadedAmmo src/Dodge/HeldUse.hs 722;" f +useLoadedAmmo src/Dodge/HeldUse.hs 731;" f useLocation src/Dodge/Creature/Impulse/UseItem.hs 65;" f useMagShield src/Dodge/Euse.hs 26;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 18;" f -useRewindGun src/Dodge/HeldUse.hs 1343;" f +useRewindGun src/Dodge/HeldUse.hs 1352;" f useRewindGun src/Dodge/Luse.hs 40;" f useRoomPosCond src/Dodge/PlacementSpot.hs 178;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f -useStopWatch src/Dodge/HeldUse.hs 1324;" f +useStopWatch src/Dodge/HeldUse.hs 1333;" f useStopWatch src/Dodge/Luse.hs 21;" f -useTimeCheck src/Dodge/HeldUse.hs 101;" f +useTimeCheck src/Dodge/HeldUse.hs 102;" f useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 127;" f -useTimeScrollGun src/Dodge/HeldUse.hs 1332;" f +useTimeScrollGun src/Dodge/HeldUse.hs 1341;" f useTimeScrollGun src/Dodge/Luse.hs 29;" f useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 196;" f @@ -6367,7 +6371,7 @@ verticalLampCover src/Dodge/Placement/Instance/LightSource/Cover.hs 38;" f verticalPipe src/Dodge/Picture.hs 19;" f verticalPipe src/Dodge/Placement/Instance/Pipe.hs 6;" f verticalWire src/Dodge/Wire.hs 24;" f -vgunMuzzles src/Dodge/HeldUse.hs 304;" f +vgunMuzzles src/Dodge/HeldUse.hs 313;" f viewBoundaries src/Dodge/Debug/Picture.hs 304;" f viewClipBounds src/Dodge/Debug/Picture.hs 313;" f viewDistanceFromItems src/Dodge/Update/Camera.hs 186;" f @@ -6379,7 +6383,7 @@ vocalizationTest src/Dodge/Creature/Vocalization.hs 42;" f volleyGun src/Dodge/Item/Held/Cane.hs 15;" f volleyGunShape src/Dodge/Item/Draw/SPic.hs 346;" f waistSP src/Dodge/Creature/HandPos.hs 173;" f -walkNozzle src/Dodge/HeldUse.hs 783;" f +walkNozzle src/Dodge/HeldUse.hs 792;" f walkableNodeNear src/Dodge/Path.hs 48;" f wallBlips src/Dodge/RadarSweep.hs 98;" f wallBuffer src/Dodge/WallCreatureCollisions.hs 52;" f @@ -6387,6 +6391,7 @@ wallIsZeroLength src/Dodge/LevelGen/StaticWalls.hs 179;" f wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f wallsFromRooms src/Dodge/Layout.hs 146;" f wallsToDraw src/Dodge/Render/Walls.hs 17;" f +warmupSound src/Dodge/HeldUse.hs 1386;" f warningRooms src/Dodge/Room/Warning.hs 28;" f wasdAim src/Dodge/Creature/YourControl.hs 126;" f wasdDir src/Dodge/WASD.hs 17;" f @@ -6404,9 +6409,12 @@ weaponRoom src/Dodge/Room/Room.hs 249;" f weaponUnderCrits src/Dodge/Room/Room.hs 154;" f wedgeGeom src/Dodge/Base.hs 42;" f wedgeOfThickness src/Dodge/Picture.hs 9;" f +whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 649;" f +whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 411;" f +whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 451;" f white src/Color.hs 26;" f -whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 644;" f -whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 458;" f +whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 659;" f +whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 471;" f wiToFloat src/Dodge/Room/Modify/Girder.hs 168;" f winConfig appDodge/Main.hs 56;" f windowLine src/Dodge/Placement/Instance/Wall.hs 48;" f @@ -6436,7 +6444,7 @@ worldPosToScreen src/Dodge/Base/Coordinate.hs 28;" f worldSPic src/Dodge/Render/ShapePicture.hs 21;" f worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f wpAdd src/Dodge/Room/RezBox.hs 137;" f -wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f +wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 493;" f wristArmour src/Dodge/Item/Equipment.hs 43;" f wristInvisibility src/Dodge/Item/Equipment.hs 96;" f writeConfig src/Dodge/Menu.hs 162;" f