diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index 2b8307fad..19a3eb1e2 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -285,6 +285,15 @@ inventoryX c = case c of , FlashBall ]] <> [bulletModule (BulletModPayload BulGas)] <> [bulletModule (BulletModEffect x) | x <- [minBound .. maxBound]] + "W" -> [miniGunX 2 + , beltMag + , miniGunX 3 + , beltMag + , miniGunX 4 + , beltMag + , miniGunX 5 + , beltMag + ] _ -> [] testInventory :: [Item] diff --git a/src/Dodge/Creature/Update.hs b/src/Dodge/Creature/Update.hs index 24bd31046..ed1933a5c 100644 --- a/src/Dodge/Creature/Update.hs +++ b/src/Dodge/Creature/Update.hs @@ -1,5 +1,8 @@ module Dodge.Creature.Update (updateCreature) where +import Dodge.Creature.Vocalization +import RandomHelp +import Data.Maybe import Linear import NewInt import Color @@ -88,11 +91,22 @@ checkDeath' cr w = case cr ^. crHP of corpseOrGib :: Creature -> World -> World corpseOrGib cr = case cr ^? crDamage . to maxDamageType . _Just . _1 of Just CookingDamage -> sethp (CrIsCorpse $ scorchSPic thecorpse) + . dodeathsound CookDeath Just PoisonDamage -> sethp (CrIsCorpse $ poisonSPic thecorpse) + . dodeathsound PoisonDeath Just PhysicalDamage | _crPain cr > 200 -> addCrGibs cr . sethp CrIsGibs + . dodeathsound GibsDeath _ -> sethp (CrIsCorpse thecorpse) + . dodeathsound PlainDeath where + dodeathsound dt = f dt . stopSoundFrom (CrMouth cid) + f dt w = fromMaybe w $ do + let (msid, g) = runState (maybeTakeOne (crDeathSounds cr dt)) (_randGen w) + sid <- msid + return $ w & soundStart (CrMouth cid) (cr ^. crPos . _xy) sid Nothing + & randGen .~ g + cid = cr ^. crID sethp x = cWorld . lWorld . creatures . ix (_crID cr) . crHP .~ x thecorpse = makeCorpse cr diff --git a/src/Dodge/Creature/Vocalization.hs b/src/Dodge/Creature/Vocalization.hs index 4e53eeb50..3811cc05b 100644 --- a/src/Dodge/Creature/Vocalization.hs +++ b/src/Dodge/Creature/Vocalization.hs @@ -1,5 +1,7 @@ +{-# LANGUAGE LambdaCase #-} module Dodge.Creature.Vocalization ( crWarningSounds, + crDeathSounds, vocalizationTest, resetCrVocCoolDown, ) where @@ -39,6 +41,23 @@ crWarningSounds cr = case cr ^. crType of BarrelCrit{} -> mempty LampCrit{} -> mempty +crDeathSounds :: Creature -> DeathType -> [SoundID] +crDeathSounds cr dt = case cr ^. crType of + Avatar{} -> mempty + AvatarDead -> mempty + ChaseCrit{} -> defaultDeathSounds dt + SwarmCrit -> mempty + AutoCrit -> mempty + BarrelCrit{} -> mempty + LampCrit{} -> mempty + +defaultDeathSounds :: DeathType -> [SoundID] +defaultDeathSounds = \case + CookDeath -> mempty + PoisonDeath -> mempty + PlainDeath -> mempty + GibsDeath -> mempty + vocalizationTest :: Creature -> Maybe SoundID vocalizationTest cr = case cr ^? crVocalization . vcCoolDown of Just 0 -> crVocalizationSound cr diff --git a/src/Dodge/Data/Config.hs b/src/Dodge/Data/Config.hs index 26743f7d7..8c5e54518 100644 --- a/src/Dodge/Data/Config.hs +++ b/src/Dodge/Data/Config.hs @@ -52,7 +52,7 @@ data Config = Config , _gr_upscale_filter :: Bool , _gr_cloud_shadows :: Bool , _gr_distortions :: Bool - , _gr_bloom :: Bool +-- , _gr_bloom :: Bool , _gr_shadow_rendering :: ShadowRendering , _gr_shadows_on_clouds :: ShadowRendering , _gr_shadow_size :: Importance @@ -156,7 +156,7 @@ defaultConfig = , _volume_music = 0 , _gr_upscale_filter = True , _gr_cloud_shadows = True - , _gr_bloom = True +-- , _gr_bloom = True , _gr_shadow_rendering = GeoObjShads , _gr_shadows_on_clouds = NoObjShads , _gr_shadow_size = Typical diff --git a/src/Dodge/Data/Creature.hs b/src/Dodge/Data/Creature.hs index b6bb17cc4..894173264 100644 --- a/src/Dodge/Data/Creature.hs +++ b/src/Dodge/Data/Creature.hs @@ -65,6 +65,8 @@ data CrHP | CrIsGibs | CrIsPitted +data DeathType = CookDeath | PoisonDeath | PlainDeath | GibsDeath + data Intention = Intention { _targetCr :: Maybe Int , _mvToPoint :: Maybe Point2 diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index e7611ddca..7427054ad 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -208,14 +208,14 @@ heldItemMuzzles itm = \case BURSTRIFLE -> dbwMuzzles & ix 0 . mzPos .~ V2 25 0 & ix 0 . mzInaccuracy .~ 0.05 MINIGUNX i -> [ Muzzle - (V2 (30 + 40 * fromIntegral j / fromIntegral i) 0) + (V2 (40 * fromIntegral j / fromIntegral i) 0) 0 0.05 maguse1 NoFlare MuzzleShootBullet 10 - | j <- [0 .. i -1] + | j <- [1 .. i] ] & ix 0 . mzFlareType .~ MiniGunFlare BANGROD -> diff --git a/src/Dodge/Item/Draw/SPic.hs b/src/Dodge/Item/Draw/SPic.hs index 3409566bb..932d83aa4 100644 --- a/src/Dodge/Item/Draw/SPic.hs +++ b/src/Dodge/Item/Draw/SPic.hs @@ -321,9 +321,6 @@ shatterGunSPic = xa = 1 xb = 9 -baseCaneShape :: Shape -baseCaneShape = colorSH red $ xCylinderST 3 15 - baseRifleShape :: Shape baseRifleShape = colorSH red $ xCylinderST 3 25 @@ -372,12 +369,11 @@ miniGunXPictItem i it = miniGunXPict i (_wTime (_itParams it) - 10) miniGunXPict :: Int -> Int -> SPic miniGunXPict i spin = - noPic - ( colorSH red (rotateSHx a barrels) - <> baseRifleShape - ) + noPic . + colorSH red $ rotateSHx a barrels + <> xCylinderST 3 40 where - aBarrel = translateSH (V3 15 2 2) baseCaneShape + aBarrel = translateSH (V3 15 4 2.5) $ xCylinderST 2 25 barrels = foldMap (\an -> aBarrel & rotateSHx (2 * pi * fromIntegral an / fromIntegral i)) [1 .. i] a = fromIntegral spin / 100 diff --git a/src/Dodge/Menu.hs b/src/Dodge/Menu.hs index 1e0271996..347ea9866 100644 --- a/src/Dodge/Menu.hs +++ b/src/Dodge/Menu.hs @@ -192,7 +192,7 @@ graphicsMenuOptions = , enumOption gr_shadows_on_clouds "SHADOW DETAIL ON CLOUDS" id , enumOption gr_shadow_size "SHADOW DETAIL" id , enumOption gr_distortions "ENABLE DISTORTIONS" id - , enumOption gr_bloom "ENABLE BLOOM" id +-- , enumOption gr_bloom "ENABLE BLOOM" id , boolOption gr_cloud_shadows "CLOUD SHADOWS TOGGLE" , enumOption gr_num_shadow_casters "NUM SHADOW CASTERS" id ] diff --git a/src/Shape.hs b/src/Shape.hs index 0bb8cc5fa..66efe9524 100644 --- a/src/Shape.hs +++ b/src/Shape.hs @@ -131,14 +131,15 @@ xCylinderST :: Float -> Float -> Shape xCylinderST = xCylinder Small Typical xCylinder :: Size -> Importance -> Float -> Float -> Shape -xCylinder size shad r x = +xCylinder size shad d x = translateSHz r . rotateSHq (V3 0 1 0) (pi / 2) . upperCylinder size shad x $ - -- why didn't I make this a simple circle? [ V2 r r - , V2 (- r / 2) (r / 2) - , V2 (- r / 2) (negate $ r / 2) + , V2 (-r) (r) + , V2 (-r) (-r) , V2 r (- r) ] + where + r = 0.5 * d upperBoxMT :: Float -> [Point2] -> Shape upperBoxMT = upperBox Medium Typical diff --git a/tags b/tags index 81ce33d58..7a2ba341c 100644 --- a/tags +++ b/tags @@ -15,7 +15,7 @@ <$> src/Dodge/Data/ActionPlan.hs 156;" o <$> src/Dodge/Data/CWorld.hs 51;" o <$> src/Dodge/Data/Camera.hs 38;" o -<$> src/Dodge/Data/Creature.hs 89;" o +<$> src/Dodge/Data/Creature.hs 91;" o <$> src/Dodge/Data/LWorld.hs 176;" o <$> src/Dodge/Data/Terminal.hs 69;" o ABSOLUTE src/Dodge/Data/Item/Combine.hs 39;" C @@ -235,6 +235,7 @@ ContextLDT src/Dodge/Data/DoubleTree.hs 40;" t ContinentalGovernment src/Dodge/Data/Scenario.hs 51;" C ControlDeckSS src/Dodge/Data/Scenario.hs 89;" C ConvexPoly src/Geometry/ConvexPoly.hs 23;" t +CookDeath src/Dodge/Data/Creature.hs 68;" C CookingDamage src/Dodge/Data/Damage/Type.hs 5;" C Corporation src/Dodge/Data/Scenario.hs 46;" C Cosmic src/Dodge/Data/Scenario.hs 74;" C @@ -301,6 +302,7 @@ DamageHitSound src/Dodge/Data/SoundOrigin.hs 41;" C DamageLaser src/Dodge/Data/Laser.hs 15;" C DamageSensor src/Dodge/Data/Machine/Sensor.hs 19;" t DamageType src/Dodge/Data/Damage/Type.hs 3;" t +DeathType src/Dodge/Data/Creature.hs 68;" t Debris src/Dodge/Data/Prop.hs 25;" t DebrisChunk src/Dodge/Data/Prop.hs 25;" C DebrisType src/Dodge/Data/Prop.hs 21;" t @@ -484,6 +486,7 @@ GeoObjShads src/Dodge/Data/Config.hs 116;" C GetTo src/Dodge/Data/ActionPlan.hs 141;" C GetToPoint src/Dodge/Data/Scenario.hs 12;" C Gib src/Dodge/Data/Prop.hs 22;" C +GibsDeath src/Dodge/Data/Creature.hs 68;" C Glass src/Dodge/Data/Material.hs 14;" C GlassBreakSound src/Dodge/Data/SoundOrigin.hs 34;" C Goal src/Dodge/Data/ActionPlan.hs 149;" t @@ -574,7 +577,7 @@ Inspect_wall src/Dodge/Data/Config.hs 105;" C Institution src/Dodge/Data/Scenario.hs 42;" t Int2 src/Geometry/Data.hs 21;" t IntID src/Dodge/Data/Universe.hs 120;" t -Intention src/Dodge/Data/Creature.hs 68;" t +Intention src/Dodge/Data/Creature.hs 70;" t IntersectingRoomClipBoundaries src/Dodge/Data/Config.hs 122;" C IntroScanSF src/Dodge/Data/ComposedItem.hs 21;" C IntroScanType src/Dodge/Data/Item/Combine.hs 44;" t @@ -748,7 +751,7 @@ MedBaySS src/Dodge/Data/Scenario.hs 100;" C Medium src/Shape/Data.hs 25;" C Melee src/Dodge/Data/ActionPlan.hs 40;" C MeleeStrike src/Dodge/Data/ActionPlan.hs 144;" C -Memory src/Dodge/Data/Creature.hs 75;" t +Memory src/Dodge/Data/Creature.hs 77;" t MenuOption src/Dodge/Data/Universe.hs 109;" t MenuOptionDisplay src/Dodge/Data/Universe.hs 104;" t MetaBranch src/Dodge/Data/MetaTree.hs 18;" t @@ -991,6 +994,7 @@ PistolAI src/Dodge/Data/Creature/Misc.hs 41;" C Placement src/Dodge/Data/GenWorld.hs 104;" t PlacementSpot src/Dodge/Data/GenWorld.hs 90;" t PlainBarrel src/Dodge/Data/Creature/Misc.hs 86;" C +PlainDeath src/Dodge/Data/Creature.hs 68;" C PlantNurserySS src/Dodge/Data/Scenario.hs 96;" C PlayStatus src/Sound/Data.hs 21;" t PlayerFaction src/Dodge/Data/Creature/State.hs 20;" C @@ -1003,6 +1007,7 @@ Point3Q src/Geometry/Data.hs 52;" t Point4 src/Geometry/Data.hs 41;" t Poison src/Dodge/Data/Damage.hs 26;" C PoisonDamage src/Dodge/Data/Damage/Type.hs 6;" C +PoisonDeath src/Dodge/Data/Creature.hs 68;" C PoisonGas src/Dodge/Data/Cloud.hs 42;" C PolyEdge src/Dodge/Data/Room.hs 47;" C PolyShad src/Picture/Data.hs 31;" C @@ -1846,7 +1851,6 @@ _grLinkDirs src/Dodge/GameRoom.hs 18;" f _grName src/Dodge/GameRoom.hs 19;" f _grViewpoints src/Dodge/GameRoom.hs 13;" f _grViewpointsEx src/Dodge/GameRoom.hs 14;" f -_gr_bloom src/Dodge/Data/Config.hs 55;" f _gr_cloud_shadows src/Dodge/Data/Config.hs 53;" f _gr_distortions src/Dodge/Data/Config.hs 54;" f _gr_downsize_res src/Dodge/Data/Config.hs 59;" f @@ -2046,7 +2050,7 @@ _mtTree src/Dodge/Data/MetaTree.hs 12;" f _musicData src/Data/Preload.hs 13;" f _mvAimSpeed src/Dodge/Data/Creature/Misc.hs 33;" f _mvSpeed src/Dodge/Data/Creature/Misc.hs 28;" f -_mvToPoint src/Dodge/Data/Creature.hs 70;" f +_mvToPoint src/Dodge/Data/Creature.hs 72;" f _mvTurnJit src/Dodge/Data/Creature/Misc.hs 32;" f _mvTurnRad src/Dodge/Data/Creature/Misc.hs 31;" f _mzAmmoSlot src/Dodge/Data/Muzzle.hs 13;" f @@ -2058,7 +2062,7 @@ _mzRandomOffset src/Dodge/Data/Muzzle.hs 17;" f _mzRot src/Dodge/Data/Muzzle.hs 11;" f _nodeMetaTree src/Dodge/Data/MetaTree.hs 16;" f _nodeTree src/Dodge/Data/MetaTree.hs 15;" f -_nodesSearched src/Dodge/Data/Creature.hs 77;" f +_nodesSearched src/Dodge/Data/Creature.hs 79;" f _nonInf src/Dodge/Data/CardinalPoint.hs 44;" f _numLinkEW src/Dodge/Data/Room.hs 34;" f _numLinkNS src/Dodge/Data/Room.hs 35;" f @@ -2310,7 +2314,7 @@ _soundStatus src/Sound/Data.hs 45;" f _soundTime src/Sound/Data.hs 44;" f _soundVolume src/Sound/Data.hs 49;" f _soundVolumeFraction src/Sound/Data.hs 50;" f -_soundsToInvestigate src/Dodge/Data/Creature.hs 76;" f +_soundsToInvestigate src/Dodge/Data/Creature.hs 78;" f _spPixelOff src/Dodge/Data/ScreenPos.hs 14;" f _spScreenOff src/Dodge/Data/ScreenPos.hs 13;" f _sparks src/Dodge/Data/LWorld.hs 107;" f @@ -2342,7 +2346,7 @@ _swarm src/Dodge/Data/Creature/State.hs 26;" f _taArcSteps src/Dodge/Data/TeslaArc.hs 17;" f _taColor src/Dodge/Data/TeslaArc.hs 18;" f _taTimer src/Dodge/Data/TeslaArc.hs 16;" f -_targetCr src/Dodge/Data/Creature.hs 69;" f +_targetCr src/Dodge/Data/Creature.hs 71;" f _targetID src/Dodge/Data/ActionPlan.hs 67;" f _targetSeenAt src/Dodge/Data/ActionPlan.hs 68;" f _tbPos src/Dodge/Data/TractorBeam.hs 12;" f @@ -2458,7 +2462,7 @@ _vcMaxCoolDown src/Dodge/Data/Creature/Misc.hs 21;" f _vertices src/Polyhedra/Data.hs 22;" f _viDist src/Dodge/Data/Creature/Perception.hs 41;" f _viFOV src/Dodge/Data/Creature/Perception.hs 40;" f -_viewPoint src/Dodge/Data/Creature.hs 71;" f +_viewPoint src/Dodge/Data/Creature.hs 73;" f _volleyNumBarrels src/Dodge/Data/TriggerType.hs 13;" f _volleyRate src/Dodge/Data/TriggerType.hs 13;" f _volume_master src/Dodge/Data/Config.hs 49;" f @@ -2581,22 +2585,22 @@ angleVV src/Geometry/Vector.hs 58;" f angleVV3 src/Geometry/Vector3D.hs 122;" f anyUnusedSpot src/Dodge/PlacementSpot.hs 66;" f anythingHitCirc src/Dodge/Base/Collide.hs 342;" f -applyCME src/Dodge/HeldUse.hs 371;" f +applyCME src/Dodge/HeldUse.hs 372;" f applyClip src/Dodge/Debug.hs 138;" f applyCreatureDamage src/Dodge/Creature/Damage.hs 14;" f applyEventIO src/Loop.hs 90;" f applyGravityPU src/Dodge/Projectile/Update.hs 41;" f applyIndividualDamage src/Dodge/Creature/Damage.hs 17;" f -applyInvLock src/Dodge/HeldUse.hs 430;" f +applyInvLock src/Dodge/HeldUse.hs 431;" f applyMagnetsToBul src/Dodge/Bullet.hs 32;" f applyPastDamages src/Dodge/Creature/State.hs 49;" f applyPosition src/Sound.hs 112;" f -applyRecoil src/Dodge/HeldUse.hs 461;" f +applyRecoil src/Dodge/HeldUse.hs 462;" f applyResFactor src/Dodge/Data/Config.hs 125;" f applyResFactorF src/Dodge/Data/Config.hs 134;" f applySetTerminalString src/Dodge/Debug/Terminal.hs 83;" f -applySidePush src/Dodge/HeldUse.hs 561;" f -applySoundCME src/Dodge/HeldUse.hs 451;" f +applySidePush src/Dodge/HeldUse.hs 562;" f +applySoundCME src/Dodge/HeldUse.hs 452;" f applyTerminalCommand src/Dodge/Debug/Terminal.hs 28;" f applyTerminalCommandArguments src/Dodge/Debug/Terminal.hs 44;" f applyTerminalString src/Dodge/Debug/Terminal.hs 22;" f @@ -2604,7 +2608,7 @@ applyToNode src/TreeHelp.hs 65;" f applyToRandomNode src/TreeHelp.hs 151;" f applyToSubforest src/TreeHelp.hs 78;" f applyToSubtree src/TreeHelp.hs 71;" f -applyTorqueCME src/Dodge/HeldUse.hs 572;" f +applyTorqueCME src/Dodge/HeldUse.hs 573;" f applyWorldConfig src/Dodge/Config.hs 55;" f aquamarine src/Color.hs 50;" f arHUD src/Dodge/Item/Scope.hs 134;" f @@ -2640,9 +2644,9 @@ attachTree src/Dodge/Tree/Compose.hs 38;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 75;" f attribSize src/Shader/Compile.hs 139;" f autoAmr src/Dodge/Item/Held/Rod.hs 39;" f -autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 734;" f +autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 739;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f -autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f +autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 551;" f autoPistol src/Dodge/Item/Held/Stick.hs 49;" f autoRifle src/Dodge/Item/Held/Cane.hs 27;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 161;" f @@ -2651,45 +2655,44 @@ azure src/Color.hs 49;" f bQuadToF src/Geometry/Bezier.hs 37;" f bQuadToLine src/Geometry/Bezier.hs 30;" f backPQ src/Dodge/Creature/HandPos.hs 128;" f -backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 724;" f +backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 729;" f backpackCombinations src/Dodge/Combine/Combinations.hs 27;" f backpackShape src/Dodge/Item/Draw/SPic.hs 187;" 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 304;" f -bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 642;" f +bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 647;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f -bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 822;" f +bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 827;" f bangStick src/Dodge/Item/Held/Stick.hs 15;" f barPP src/Dodge/Room/Foreground.hs 231;" f barrel src/Dodge/Creature/Inanimate.hs 17;" f barrelShape src/Dodge/Render/ShapePicture.hs 110;" f -baseAMRShape src/Dodge/Item/Draw/SPic.hs 407;" f +baseAMRShape src/Dodge/Item/Draw/SPic.hs 403;" f baseBlockPane src/Dodge/Placement/Instance/Wall.hs 76;" f baseCI src/Dodge/Item/Grammar.hs 158;" f -baseCaneShape src/Dodge/Item/Draw/SPic.hs 324;" f baseFloorTileSize src/Tile.hs 45;" f baseItemTriggerType src/Dodge/BaseTriggerType.hs 21;" f -baseRifleShape src/Dodge/Item/Draw/SPic.hs 327;" f -baseRodShape src/Dodge/Item/Draw/SPic.hs 404;" f -baseSMGShape src/Dodge/Item/Draw/SPic.hs 392;" f +baseRifleShape src/Dodge/Item/Draw/SPic.hs 324;" f +baseRodShape src/Dodge/Item/Draw/SPic.hs 400;" f +baseSMGShape src/Dodge/Item/Draw/SPic.hs 388;" f baseShoulder src/Dodge/Creature/Picture.hs 117;" f baseStickShape src/Dodge/Item/Draw/SPic.hs 301;" f baseStickShapeX src/Dodge/Item/Draw/SPic.hs 293;" f -baseStickSpread src/Dodge/HeldUse.hs 321;" f +baseStickSpread src/Dodge/HeldUse.hs 322;" f basicAttentionUpdate src/Dodge/Creature/Perception.hs 127;" f basicAwarenessUpdate src/Dodge/Creature/Perception.hs 39;" f basicCrPict src/Dodge/Creature/Picture.hs 30;" f basicCrShape src/Dodge/Creature/Picture.hs 36;" f basicItemDisplay src/Dodge/Item/Display.hs 23;" f basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f -basicMuzFlare src/Dodge/HeldUse.hs 712;" f +basicMuzFlare src/Dodge/HeldUse.hs 713;" f battery src/Dodge/Item/Ammo.hs 63;" f batteryPack src/Dodge/Item/Equipment.hs 46;" f beltMag src/Dodge/Item/Ammo.hs 39;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 226;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 121;" f -bgunSound src/Dodge/HeldUse.hs 516;" f +bgunSound src/Dodge/HeldUse.hs 517;" f bingate src/Dodge/Item/Scope.hs 109;" f black src/Color.hs 54;" f blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f @@ -2704,22 +2707,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 710;" f -blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 804;" f -blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f -blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 830;" f -blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f -blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 764;" f -blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f -blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 546;" f -bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 588;" f -bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 770;" f -bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 828;" f -bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 834;" f -bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 664;" f -bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 746;" f -bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" f -bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 536;" f +blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 715;" f +blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 809;" f +blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 643;" f +blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 835;" f +blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 559;" f +blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 769;" f +blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 563;" f +blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 549;" f +bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 591;" f +bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 775;" f +bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 833;" f +bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 839;" f +bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 669;" f +bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 751;" f +bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 595;" f +bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 539;" f blowTorch src/Dodge/Item/Held/SprayGuns.hs 43;" f blue src/Color.hs 43;" f blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f @@ -2757,7 +2760,7 @@ bulletSynthesizer src/Dodge/Item/Ammo.hs 82;" f bulletWeapons src/Dodge/Combine/Combinations.hs 248;" f burstRifle src/Dodge/Item/Held/Cane.hs 30;" f buttonFlip src/Dodge/Button/Event.hs 17;" f -buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 590;" f +buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 593;" f cChasm src/Dodge/Room/Tutorial.hs 131;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f @@ -2765,7 +2768,7 @@ calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f calcTexCoord src/Tile.hs 19;" f canSee src/Dodge/Base/Collide.hs 328;" f canSeeIndirect src/Dodge/Base/Collide.hs 335;" f -cancelExamineInventory src/Dodge/Item/BackgroundEffect.hs 22;" f +cancelExamineInventory src/Dodge/Item/BackgroundEffect.hs 23;" f capacitor src/Dodge/Item/Ammo.hs 69;" f card8Vec src/Dodge/Base/CardinalPoint.hs 17;" f cardList src/Dodge/Base/CardinalPoint.hs 7;" f @@ -2794,7 +2797,7 @@ chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 121;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 32;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 36;" f chasmSimpleMaze src/Dodge/Room/Tutorial.hs 200;" f -chasmTest src/Dodge/Creature/Update.hs 109;" f +chasmTest src/Dodge/Creature/Update.hs 113;" f chasmWallToSurface src/Dodge/Base/Collide.hs 118;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkConnection src/Dodge/Inventory/Swap.hs 66;" f @@ -2832,9 +2835,9 @@ clAlt src/Dodge/Cloud.hs 5;" f clColor src/Shader/Poke/Cloud.hs 39;" f clZoneSize src/Dodge/Zoning/Cloud.hs 24;" f clampPath src/Dodge/Room/Procedural.hs 146;" f -clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 812;" f -clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 728;" f -clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 574;" f +clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 817;" f +clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 733;" f +clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 577;" f cldtPropagateFold src/Dodge/DoubleTree.hs 358;" f cleanUpPreload src/Preload.hs 10;" f cleanUpSoundPreload src/Preload.hs 15;" f @@ -2842,7 +2845,7 @@ cleanupHalted src/Sound.hs 118;" 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 778;" f +click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 783;" f clicker src/Dodge/Item/Scope.hs 82;" f clipV src/Geometry/Vector.hs 48;" f clipZoom src/Dodge/Update/Camera.hs 237;" f @@ -2878,7 +2881,7 @@ collidePointTestFilter src/Dodge/Base/Collide.hs 188;" f collidePointWallsFilter src/Dodge/Base/Collide.hs 202;" f color src/Picture/Base.hs 100;" f colorLamp src/Dodge/Creature/Lamp.hs 10;" f -colorSH src/Shape.hs 233;" f +colorSH src/Shape.hs 234;" f combinationsOf src/Multiset.hs 46;" f combinationsTrie src/Dodge/Combine.hs 44;" f combineAwareness src/Dodge/Creature/Perception.hs 109;" f @@ -2887,7 +2890,7 @@ combineInventoryExtra src/Dodge/Render/HUD.hs 334;" f combineItemListYouX src/Dodge/Combine.hs 36;" f combineList src/Dodge/Combine.hs 21;" f combineRooms src/Dodge/Room/Procedural.hs 132;" f -combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 738;" f +combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 743;" f combineTree src/Dodge/Tree/Compose.hs 67;" f commandColor src/Dodge/Terminal.hs 127;" f commonPrefix src/Dodge/Debug/Terminal.hs 149;" f @@ -2899,11 +2902,11 @@ compactDrawTree src/Dodge/LevelGen.hs 88;" f compileAndCheckShader src/Shader/Compile.hs 108;" f composeNode src/Dodge/Tree/Compose.hs 76;" f composeTree src/Dodge/Tree/Compose.hs 47;" f -computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 660;" f +computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 665;" f conEffects src/Dodge/Concurrent.hs 12;" f conLDTToConDT src/Dodge/DoubleTree.hs 22;" f concurrentIS src/Dodge/Update/Input/InGame.hs 292;" f -connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 740;" f +connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 745;" f constructEdges src/Polyhedra.hs 31;" f constructEdgesList src/Polyhedra.hs 40;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 58;" f @@ -2930,6 +2933,7 @@ crCamouflage src/Dodge/Creature/Picture.hs 33;" f crCanSeeCr src/Dodge/Creature/Test.hs 52;" f crCrSpring src/Dodge/Update.hs 916;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 62;" f +crDeathSounds src/Dodge/Creature/Vocalization.hs 43;" f crDexterity src/Dodge/Creature/Statistics.hs 19;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 39;" f crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 53;" f @@ -2965,27 +2969,27 @@ crStrength src/Dodge/Creature/Statistics.hs 29;" f crUpdate src/Dodge/Creature/Update.hs 63;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 66;" f crUpdateItemLocations src/Dodge/Inventory/Location.hs 48;" f -crVocalizationSound src/Dodge/Creature/Vocalization.hs 13;" f -crWarningSounds src/Dodge/Creature/Vocalization.hs 23;" f +crVocalizationSound src/Dodge/Creature/Vocalization.hs 14;" f +crWarningSounds src/Dodge/Creature/Vocalization.hs 24;" f crWlPbHit src/Dodge/WorldEvent/ThingsHit.hs 59;" f crZoneSize src/Dodge/Zoning/Creature.hs 43;" f craftInfo src/Dodge/Item/Info.hs 169;" f craftItemSPic src/Dodge/Item/Draw/SPic.hs 40;" f -crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 594;" f +crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 597;" f createForceField src/Dodge/ForceField.hs 7;" f createGas src/Dodge/Gas.hs 10;" f createHeadLamp src/Dodge/Euse.hs 58;" f createItemYou src/Dodge/Inventory/Add.hs 62;" f createLightMap src/Render.hs 26;" f -createProjectile src/Dodge/HeldUse.hs 1270;" f -createProjectileR src/Dodge/HeldUse.hs 1219;" f +createProjectile src/Dodge/HeldUse.hs 1271;" f +createProjectileR src/Dodge/HeldUse.hs 1220;" f createShell src/Dodge/Projectile/Create.hs 21;" f -createShieldWall src/Dodge/Item/BackgroundEffect.hs 39;" f +createShieldWall src/Dodge/Item/BackgroundEffect.hs 53;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 124;" f createWall src/Dodge/Wall/Create.hs 8;" f creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 12;" f -creatureShootLaser src/Dodge/HeldUse.hs 839;" f -creatureShootPulseLaser src/Dodge/HeldUse.hs 870;" f +creatureShootLaser src/Dodge/HeldUse.hs 840;" f +creatureShootPulseLaser src/Dodge/HeldUse.hs 871;" f creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 60;" f creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 81;" f creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 70;" f @@ -3053,7 +3057,7 @@ dark src/Color.hs 135;" f darkenBackground src/Dodge/Render/MenuScreen.hs 46;" f dbArg src/Dodge/Base.hs 165;" f dbArgChain src/Dodge/Base.hs 170;" f -dbwMuzzles src/Dodge/HeldUse.hs 324;" f +dbwMuzzles src/Dodge/HeldUse.hs 325;" f deZoneIX src/Dodge/Zoning/Base.hs 91;" f deZoneWall src/Dodge/Zoning/Wall.hs 70;" f deadEndRoom src/Dodge/Room/Room.hs 254;" f @@ -3061,7 +3065,7 @@ deadFeet src/Dodge/Creature/Picture.hs 68;" f deadRot src/Dodge/Creature/Picture.hs 84;" f deadScalp src/Dodge/Creature/Picture.hs 81;" f deadUpperBody src/Dodge/Creature/Picture.hs 114;" f -debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 720;" f +debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 725;" f debrisSPic src/Dodge/Prop/Draw.hs 16;" f debrisSize src/Dodge/Block/Debris.hs 83;" f debugEvent src/Dodge/Debug.hs 44;" f @@ -3085,10 +3089,10 @@ decoratedBlock src/Dodge/Placement/Instance/Block.hs 14;" f decorationToShape src/Dodge/Placement/TopDecoration.hs 16;" f decreaseAwareness src/Dodge/Creature/Perception.hs 118;" f decrementTimer src/Sound.hs 103;" f -dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f -dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 672;" f -dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 754;" f -dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 784;" f +dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 557;" f +dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 677;" f +dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 759;" f +dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 789;" f defDamageMaterial src/Dodge/Material/Damage.hs 30;" f defLSPic src/Dodge/LightSource/Draw.hs 10;" f defSPic src/Dodge/Item/Draw/SPic.hs 310;" f @@ -3156,9 +3160,9 @@ destroyMounts src/Dodge/Wall/Damage.hs 87;" f destroyProjectile src/Dodge/Projectile/Update.hs 112;" f detV src/Geometry/Vector.hs 94;" f detector src/Dodge/Item/Held/Utility.hs 27;" f -detectorColor src/Dodge/Item/Draw/SPic.hs 432;" f +detectorColor src/Dodge/Item/Draw/SPic.hs 428;" f detectorInfo src/Dodge/Item/Info.hs 224;" f -determineProjectileTracking src/Dodge/HeldUse.hs 1190;" f +determineProjectileTracking src/Dodge/HeldUse.hs 1191;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f did src/Dodge/Item/InvSize.hs 54;" f diffAngles src/Geometry.hs 205;" f @@ -3167,7 +3171,7 @@ digitalLine src/Geometry.hs 285;" f digitalRect src/Geometry.hs 302;" f dim src/Color.hs 139;" f dirtPoly src/Dodge/Room/RoadBlock.hs 74;" f -disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 782;" f +disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 787;" f displayConfig src/Dodge/Menu.hs 223;" f displayControls src/Dodge/Menu.hs 239;" f displayFrameTicks src/Dodge/Render/Picture.hs 50;" f @@ -3220,9 +3224,9 @@ doDrag src/Dodge/Update/Input/InGame.hs 128;" f doDrawing src/Dodge/Render.hs 33;" f doDrawing' src/Dodge/Render.hs 44;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f -doGenFloat src/Dodge/HeldUse.hs 1152;" f +doGenFloat src/Dodge/HeldUse.hs 1153;" f doGravityPU src/Dodge/Projectile/Update.hs 35;" f -doHeldUseEffect src/Dodge/HeldUse.hs 353;" f +doHeldUseEffect src/Dodge/HeldUse.hs 354;" f doInPlacements src/Dodge/Layout.hs 87;" f doIndividualPlacements src/Dodge/Layout.hs 101;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 38;" f @@ -3392,8 +3396,8 @@ drawZone src/Dodge/Debug/Picture.hs 152;" f drawZoneCirc src/Dodge/Debug/Picture.hs 293;" f drawZoneCol src/Dodge/Debug/Picture.hs 149;" f drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 286;" f -dropAll src/Dodge/Creature/Update.hs 106;" f -dropInventoryPath src/Dodge/HeldUse.hs 1345;" f +dropAll src/Dodge/Creature/Update.hs 110;" f +dropInventoryPath src/Dodge/HeldUse.hs 1346;" f dropItem src/Dodge/Creature/Action.hs 155;" f dropper src/Dodge/Item/Scope.hs 76;" f drumMag src/Dodge/Item/Ammo.hs 34;" f @@ -3424,8 +3428,8 @@ edgeToPic src/Dodge/Debug/Picture.hs 417;" f effectOnEquip src/Dodge/Equipment.hs 32;" f effectOnRemove src/Dodge/Equipment.hs 19;" f eitType src/Dodge/Data/EquipType.hs 15;" f -ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 832;" f -elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 816;" f +ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 837;" f +elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 821;" f elephantGun src/Dodge/Item/Held/Rod.hs 27;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 22;" f emptyTrie src/SimpleTrie.hs 17;" f @@ -3436,7 +3440,7 @@ encircleP src/Dodge/Creature/Boid.hs 30;" f endArcPos src/Dodge/Tesla.hs 87;" f endCombineRegex src/Dodge/Update/Input/InGame.hs 276;" f endRegex src/Dodge/Update/Input/InGame.hs 270;" f -energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f +energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 689;" f enterCombineInv src/Dodge/DisplayInventory.hs 321;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f epText src/Dodge/Inventory/SelectionList.hs 79;" f @@ -3470,7 +3474,7 @@ expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 188;" f explodeShell src/Dodge/Projectile/Update.hs 274;" f -explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 688;" f +explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 693;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 80;" f extendConeToScreenEdge src/Dodge/Debug/Picture.hs 82;" f @@ -3495,28 +3499,28 @@ findReverseEdgeList src/Polyhedra.hs 54;" f findWallFreeDropPoint src/Dodge/FloorItem.hs 27;" f findWallsInPolygon src/Dodge/LevelGen/StaticWalls/Deprecated.hs 78;" f findWithIx src/ListHelp.hs 124;" f -fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 846;" f -fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 656;" f -fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 704;" f +fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 851;" f +fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 661;" f +fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 709;" f firstBreather src/Dodge/Room/Breather.hs 9;" f firstTrie src/SimpleTrie.hs 51;" f firstWorldLoad appDodge/Main.hs 68;" f fixedCoordPictures src/Dodge/Render/Picture.hs 20;" f fixedSizePicClampArrow src/Dodge/Picture/SizeInvariant.hs 57;" f flFlicker src/Dodge/Flame.hs 39;" f -flameMuzzles src/Dodge/HeldUse.hs 327;" f +flameMuzzles src/Dodge/HeldUse.hs 328;" 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 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 395;" f -flareCircleAt src/Dodge/HeldUse.hs 693;" f +flamerPic src/Dodge/Item/Draw/SPic.hs 391;" f +flareCircleAt src/Dodge/HeldUse.hs 694;" 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 -flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 419;" f +flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 415;" f fleeFrom src/Dodge/CreatureEffect.hs 92;" f flickerMod src/Dodge/Placement/Instance/LightSource/Flicker.hs 10;" f flickerUpdate src/Dodge/Placement/Instance/LightSource/Flicker.hs 24;" f @@ -3529,15 +3533,15 @@ floorItemPickupInfo src/Dodge/Render/HUD.hs 229;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 152;" f floorTo src/Geometry/Zone.hs 12;" f floorWire src/Dodge/Wire.hs 13;" f -foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 772;" f -foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 818;" f +foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 777;" f +foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 823;" f foldMTRS src/Dodge/Room/Tutorial.hs 77;" f foldPairs src/ListHelp.hs 37;" f foldrWhileArb src/ListHelp.hs 111;" f followImpulse src/Dodge/Creature/Impulse.hs 24;" f -foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 814;" f -foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 700;" f -foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 826;" f +foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 819;" f +foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 705;" f +foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 831;" f forbidFlee src/Dodge/Creature/Boid.hs 45;" f forceElements src/StrictHelp.hs 10;" f forceField src/Dodge/Wall/ForceField.hs 6;" f @@ -3547,7 +3551,7 @@ fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 37;" f fpsText src/Dodge/Render/Picture.hs 57;" f fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 146;" f frag src/Shader/Data.hs 110;" f -fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f +fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 545;" f fromJust' src/MaybeHelp.hs 22;" f fromListL src/DoubleStack.hs 7;" f fromTopLeft src/Dodge/ScreenPos.hs 9;" f @@ -3570,7 +3574,7 @@ gameRoomsFromRooms src/Dodge/Layout.hs 149;" f gameplayMenu src/Dodge/Menu.hs 152;" f gameplayMenuOptions src/Dodge/Menu.hs 155;" f gasEffect src/Dodge/Update.hs 831;" f -gasType src/Dodge/HeldUse.hs 1109;" f +gasType src/Dodge/HeldUse.hs 1110;" f gassesNearPoint src/Dodge/Zoning/Cloud.hs 12;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 23;" f generateGraphs src/Dodge/Menu.hs 147;" f @@ -3584,11 +3588,11 @@ geometryUnitTests test/Spec.hs 22;" f geqConstr src/SameConstr.hs 21;" f getAimZoom src/Dodge/Update/Camera.hs 150;" f getAmmoLinks src/Dodge/Item/Grammar.hs 104;" f -getAttachedSFLink src/Dodge/HeldUse.hs 785;" f +getAttachedSFLink src/Dodge/HeldUse.hs 786;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 85;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 173;" f -getBulletType src/Dodge/HeldUse.hs 908;" f +getBulletType src/Dodge/HeldUse.hs 909;" f getCloseObj src/Dodge/Update/Input/InGame.hs 539;" f getCommand src/Dodge/Terminal.hs 61;" f getCommands src/Dodge/Terminal.hs 58;" f @@ -3598,17 +3602,17 @@ getCrsFromRooms' src/Dodge/Room/Tutorial.hs 338;" f getDebugMouseOver src/Dodge/Update.hs 423;" f getDistortions src/Dodge/Render.hs 443;" f getEdgesCrossing src/Dodge/Path.hs 37;" f -getGrenadeHitEffect src/Dodge/HeldUse.hs 1258;" f +getGrenadeHitEffect src/Dodge/HeldUse.hs 1259;" f getInventoryPath src/Dodge/Inventory/Path.hs 9;" f getItemValue src/Dodge/Inventory/SelectionList.hs 150;" f -getLaserColor src/Dodge/HeldUse.hs 709;" f -getLaserDamage src/Dodge/HeldUse.hs 706;" f -getLaserPhaseV src/Dodge/HeldUse.hs 703;" f +getLaserColor src/Dodge/HeldUse.hs 710;" f +getLaserDamage src/Dodge/HeldUse.hs 707;" f +getLaserPhaseV src/Dodge/HeldUse.hs 704;" f getLinksOfType src/Dodge/RoomLink.hs 41;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 6;" f getMenuMouseContext src/Dodge/Update.hs 435;" f getNodePos src/Dodge/Path.hs 34;" f -getPJStabiliser src/Dodge/HeldUse.hs 1245;" f +getPJStabiliser src/Dodge/HeldUse.hs 1246;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 3;" f getRoomsFromInts src/Dodge/Room/Tutorial.hs 334;" f @@ -3631,13 +3635,13 @@ girderZ src/Dodge/Room/Foreground.hs 108;" f glCreate src/GLHelp.hs 11;" f glassLesson src/Dodge/Room/GlassLesson.hs 23;" f glassLessonRunPast src/Dodge/Room/GlassLesson.hs 68;" f -glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 692;" f -glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 702;" f -glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 706;" f -glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 682;" f +glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 697;" f +glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 707;" f +glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 711;" f +glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 687;" f glassSwitchBack src/Dodge/Room/Room.hs 80;" f glassSwitchBackCrits src/Dodge/Room/Room.hs 114;" f -glauncherPic src/Dodge/Item/Draw/SPic.hs 401;" f +glauncherPic src/Dodge/Item/Draw/SPic.hs 397;" f gluintSize src/Shader/Parameters.hs 25;" f goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f goToTarget src/Dodge/Creature/ReaderUpdate.hs 150;" f @@ -3655,13 +3659,13 @@ gridPoints' src/Grid.hs 37;" f gridPointsOff src/Grid.hs 32;" f gridRoomPos src/Dodge/Room/Procedural.hs 90;" f groupSplitItemAmounts src/Dodge/Combine.hs 52;" f -gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 518;" f -gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 844;" f -gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 584;" f -gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f -gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 690;" f -gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 668;" f -gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 716;" f +gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 521;" f +gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 849;" f +gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 587;" f +gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 683;" f +gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 695;" f +gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 673;" f +gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 721;" f gyroscope src/Dodge/Item/Scope.hs 156;" f hackBoldText src/Picture/Base.hs 193;" f hackDropShadow src/Picture/Base.hs 196;" f @@ -3692,10 +3696,10 @@ hasLOSIndirect src/Dodge/Base/Collide.hs 320;" f hat src/Dodge/Item/Equipment.hs 76;" f head src/DoubleStack.hs 14;" f headLamp src/Dodge/Item/Equipment.hs 79;" f -headLampShape src/Dodge/Item/Draw/SPic.hs 422;" f +headLampShape src/Dodge/Item/Draw/SPic.hs 418;" f headMap src/Dodge/DoubleTree.hs 249;" f headPQ src/Dodge/Creature/HandPos.hs 116;" f -healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f +healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 627;" f healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 90;" f healthTest src/Dodge/Room/LasTurret.hs 111;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 24;" f @@ -3707,23 +3711,23 @@ heldHandlePos src/Dodge/Item/HeldOffset.hs 84;" f heldInfo src/Dodge/Item/Info.hs 92;" f heldItemAmmoSlots src/Dodge/Item/AmmoSlots.hs 20;" f heldItemBulkiness src/Dodge/Creature/YourControl.hs 194;" f -heldItemInvLock src/Dodge/HeldUse.hs 444;" f -heldItemMuzVel src/Dodge/HeldUse.hs 994;" f +heldItemInvLock src/Dodge/HeldUse.hs 445;" f +heldItemMuzVel src/Dodge/HeldUse.hs 995;" f heldItemMuzzles src/Dodge/HeldUse.hs 178;" f -heldItemRifling src/Dodge/HeldUse.hs 1037;" f +heldItemRifling src/Dodge/HeldUse.hs 1038;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 234;" f heldItemWeight src/Dodge/Creature/Statistics.hs 80;" f heldPositionInfo src/Dodge/Item/Info.hs 240;" f -heldTorqueAmount src/Dodge/HeldUse.hs 588;" f +heldTorqueAmount src/Dodge/HeldUse.hs 589;" f heldTriggerType src/Dodge/BaseTriggerType.hs 27;" f heron src/Geometry.hs 218;" f 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 610;" f +hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 613;" f hitEffFromBul src/Dodge/Bullet.hs 156;" f -hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 748;" f +hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 753;" f holdForm src/Dodge/Creature/Boid.hs 139;" f holsterWeapon src/Dodge/Creature/Volition.hs 15;" f homingModule src/Dodge/Item/Scope.hs 48;" f @@ -3758,9 +3762,9 @@ insertAt src/Padding.hs 63;" f insertIMInZone src/Dodge/Base.hs 54;" f insertInTrie src/SimpleTrie.hs 24;" f insertNewKey src/IntMapHelp.hs 65;" f -insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 806;" f +insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 811;" f insertOver src/ListHelp.hs 47;" f -insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f +insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 713;" f insertStructureWalls src/Dodge/Placement/PlaceSpot/Block.hs 41;" f insertWall src/Dodge/Placement/PlaceSpot/Block.hs 134;" f insertWallInZones src/Dodge/Wall/Zone.hs 20;" f @@ -3824,7 +3828,7 @@ invertIntMapUnique src/IntMapHelp.hs 103;" f invertInventoryToMap src/Dodge/Combine.hs 57;" f invisibleChaseCrit src/Dodge/Creature/ChaseCrit.hs 21;" f invisibleWall src/Dodge/Placement/Instance/Wall.hs 27;" f -isAmmoIntLink src/Dodge/HeldUse.hs 719;" f +isAmmoIntLink src/Dodge/HeldUse.hs 720;" f isAnimate src/Dodge/Creature/Test.hs 134;" f isCognizant src/Dodge/Creature/Perception.hs 105;" f isConnected src/Dodge/Inventory/Swap.hs 77;" f @@ -3855,8 +3859,8 @@ isWalkable src/Dodge/WorldEvent/ThingsHit.hs 183;" f isoMatrix src/MatrixHelper.hs 35;" f isotriBWH src/Geometry/Polygon.hs 22;" f itDim src/Dodge/Item/InvSize.hs 21;" f -itEffectOnDrop src/Dodge/Item/BackgroundEffect.hs 67;" f -itEffectOnPickup src/Dodge/Item/BackgroundEffect.hs 64;" f +itEffectOnDrop src/Dodge/Item/BackgroundEffect.hs 81;" f +itEffectOnPickup src/Dodge/Item/BackgroundEffect.hs 78;" f itInvHeight src/Dodge/Item/InvSize.hs 11;" f itUseCondition src/Dodge/ItemUseCondition.hs 6;" f itemAboveAttachables src/Dodge/Item/Grammar.hs 37;" f @@ -3868,7 +3872,7 @@ itemBelowAttachables src/Dodge/Item/Grammar.hs 50;" f itemBlips src/Dodge/RadarSweep.hs 94;" f itemBulkiness src/Dodge/Creature/YourControl.hs 188;" f itemCombinations src/Dodge/Combine/Combinations.hs 56;" f -itemDetectorEffect src/Dodge/HeldUse.hs 791;" f +itemDetectorEffect src/Dodge/HeldUse.hs 792;" f itemDisplay src/Dodge/Inventory/SelectionList.hs 53;" f itemEquipPict src/Dodge/Item/Draw.hs 18;" f itemExternalValue src/Dodge/Inventory/SelectionList.hs 88;" f @@ -3880,7 +3884,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 439;" f +itemInvLock src/Dodge/HeldUse.hs 440;" f itemMuzzles src/Dodge/HeldUse.hs 164;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPicTree.hs 16;" f @@ -3894,7 +3898,7 @@ itemShapeMaxX src/Dodge/Item/Orientation.hs 47;" f itemShapeMaxY src/Dodge/Item/Orientation.hs 50;" f itemShapeMaxZ src/Dodge/Item/Orientation.hs 53;" f itemShapeMin src/Dodge/Item/Orientation.hs 62;" f -itemSidePush src/Dodge/HeldUse.hs 387;" f +itemSidePush src/Dodge/HeldUse.hs 388;" f itemString src/Dodge/Item/Display.hs 56;" f itemToFunction src/Dodge/Item/Grammar.hs 107;" f itemTreeSPic src/Dodge/Item/Draw/SPicTree.hs 13;" f @@ -3923,9 +3927,9 @@ keyCard src/Dodge/Item/Held/Utility.hs 20;" f keyCardAnalyserByDoor src/Dodge/Room/LasTurret.hs 87;" f keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 75;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f -keyPic src/Dodge/Item/Draw/SPic.hs 438;" f +keyPic src/Dodge/Item/Draw/SPic.hs 434;" f keyholeCorridor src/Dodge/Room/Corridor.hs 40;" f -knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 736;" f +knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 741;" f lChasm src/Dodge/Room/Tutorial.hs 140;" f lConnect src/Dodge/Render/Connectors.hs 43;" f lConnectCol src/Dodge/Render/Connectors.hs 46;" f @@ -3934,8 +3938,8 @@ lShape src/Dodge/Placement/Instance/LightSource.hs 54;" f lamp src/Dodge/Creature/Lamp.hs 18;" f lampCrSPic src/Dodge/Render/ShapePicture.hs 115;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 130;" f -lasGunPic src/Dodge/Item/Draw/SPic.hs 413;" f -lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f +lasGunPic src/Dodge/Item/Draw/SPic.hs 409;" f +lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 731;" f lasSensorTurretTest src/Dodge/Room/LasTurret.hs 123;" f lasTunnel src/Dodge/Room/LasTurret.hs 142;" f lasTunnelRunPast src/Dodge/Room/LasTurret.hs 183;" f @@ -3968,7 +3972,7 @@ leftLegPQ src/Dodge/Creature/HandPos.hs 85;" f leftPad src/Padding.hs 15;" f leftRightCombine src/Dodge/Item/Grammar.hs 197;" f leftWristPQ src/Dodge/Creature/HandPos.hs 82;" f -legsSPic src/Dodge/Item/Draw/SPic.hs 447;" f +legsSPic src/Dodge/Item/Draw/SPic.hs 443;" f lerpP2A src/Dodge/ShiftPoint.hs 14;" f liShape src/Dodge/Placement/Instance/LightSource.hs 79;" f light src/Color.hs 131;" f @@ -3998,7 +4002,7 @@ lmt src/MatrixHelper.hs 53;" f lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 404;" f loadDodgeConfig src/Dodge/Config.hs 30;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f -loadMuzzle src/Dodge/HeldUse.hs 632;" f +loadMuzzle src/Dodge/HeldUse.hs 633;" f loadSaveSlot src/Dodge/Save.hs 74;" f loadSeed src/Dodge/LoadSeed.hs 7;" f loadSound src/Dodge/SoundLogic/LoadSound.hs 11;" f @@ -4038,7 +4042,7 @@ loopPairs src/ListHelp.hs 30;" f lootRoom src/Dodge/Room/Treasure.hs 58;" f lorem src/Lorem.hs 3;" f lowBlock src/Dodge/Placement/Instance/Block.hs 28;" f -lowWhirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 538;" f +lowWhirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 541;" f lsColPos src/Dodge/LightSource.hs 24;" f lsColPosID src/Dodge/LightSource.hs 21;" f lsColPosRad src/Dodge/LightSource.hs 30;" f @@ -4048,7 +4052,7 @@ ltAutoCrit src/Dodge/Creature/LtAutoCrit.hs 12;" f m src/ShortShow.hs 48;" f mAT src/Dodge/Item/MagAmmoType.hs 20;" f machinePistol src/Dodge/Item/Held/Stick.hs 52;" f -magAmmoParams src/Dodge/HeldUse.hs 929;" f +magAmmoParams src/Dodge/HeldUse.hs 930;" f magAmmoType src/Dodge/Item/MagAmmoType.hs 12;" f magMax src/Dodge/Item/MagAmmoType.hs 29;" f magShield src/Dodge/Item/Equipment.hs 27;" f @@ -4063,7 +4067,7 @@ makeArc src/Picture/Base.hs 149;" f makeAttach src/Dodge/Item/Attach.hs 10;" f makeBlip src/Dodge/RadarSweep.hs 70;" f makeBlockDebris src/Dodge/Block/Debris.hs 36;" f -makeBullet src/Dodge/HeldUse.hs 973;" f +makeBullet src/Dodge/HeldUse.hs 974;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 7;" f makeColorTermLine src/Dodge/Terminal.hs 124;" f @@ -4082,7 +4086,7 @@ makeFragBullets src/Dodge/Bullet.hs 132;" f makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 11;" f makeIntInterval src/Dodge/Zoning/Base.hs 37;" f makeMovingEB src/Dodge/EnergyBall.hs 60;" f -makeMuzzleFlare src/Dodge/HeldUse.hs 658;" f +makeMuzzleFlare src/Dodge/HeldUse.hs 659;" f makeParagraph src/Justify.hs 6;" f makePathBetween src/Dodge/Path.hs 63;" f makePathBetweenPs src/Dodge/Path.hs 87;" f @@ -4105,10 +4109,10 @@ makeTileFromPoly src/Tile.hs 34;" f makeTypeCraft src/Dodge/Item/Craftable.hs 18;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 12;" f mapper src/Dodge/Item/Scope.hs 70;" f -marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f -marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" f -marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 620;" f -marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 608;" f +marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 615;" f +marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 585;" f +marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 623;" f +marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 611;" f materialColor src/Dodge/Material/Color.hs 8;" f materialPenetrable src/Dodge/Bullet.hs 211;" f maxAmmo src/Dodge/Item/MaxAmmo.hs 6;" f @@ -4138,10 +4142,10 @@ mcProxSensorUpdate src/Dodge/Machine/Update.hs 177;" f mcProxTest src/Dodge/Machine/Update.hs 258;" f mcProximitySensorUpdate src/Dodge/Machine/Update.hs 219;" f mcSPic src/Dodge/Render/ShapePicture.hs 162;" f -mcShootAuto src/Dodge/HeldUse.hs 1163;" f -mcShootLaser src/Dodge/HeldUse.hs 1156;" f +mcShootAuto src/Dodge/HeldUse.hs 1164;" f +mcShootLaser src/Dodge/HeldUse.hs 1157;" f mcTypeUpdate src/Dodge/Machine/Update.hs 33;" f -mcUseHeld src/Dodge/HeldUse.hs 1080;" f +mcUseHeld src/Dodge/HeldUse.hs 1081;" f mcUseItem src/Dodge/Machine/Update.hs 111;" f megaBattery src/Dodge/Item/Ammo.hs 55;" f megaShellMag src/Dodge/Item/Ammo.hs 44;" f @@ -4159,13 +4163,13 @@ merge src/ListHelp.hs 84;" f mergeBy src/ListHelp.hs 87;" f mergeOn src/ListHelp.hs 94;" f mergeSound src/Sound.hs 59;" f -metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 836;" f -metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 730;" f -metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 570;" f -metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 520;" f -metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" f -metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 774;" f -metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f +metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 841;" f +metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 735;" f +metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 573;" f +metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 523;" f +metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 655;" f +metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 779;" f +metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 685;" f metalPlate src/Dodge/Item/Craftable.hs 35;" f mglCreate src/GLHelp.hs 8;" f mglDelete src/GLHelp.hs 14;" f @@ -4179,18 +4183,18 @@ midWall src/Dodge/Placement/Instance/Wall.hs 38;" f minAndMax src/FoldableHelp.hs 109;" f minCrIXOn src/Dodge/Zoning/Creature.hs 49;" f minOn src/FoldableHelp.hs 35;" f -mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 580;" f +mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 583;" f miniGunCrit src/Dodge/Creature.hs 61;" f miniGunX src/Dodge/Item/Held/Cane.hs 33;" f -miniGunXPict src/Dodge/Item/Draw/SPic.hs 373;" f -miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 370;" f -miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 648;" f +miniGunXPict src/Dodge/Item/Draw/SPic.hs 370;" f +miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 367;" f +miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 653;" f miniTree2 src/Dodge/Room/Room.hs 121;" f minimumOn src/FoldlHelp.hs 14;" f mirrorXAxis src/Geometry/Polygon.hs 68;" f mirrorxz src/Picture/Base.hs 330;" f mirroryz src/Picture/Base.hs 335;" f -missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 616;" f +missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 619;" f mixColors src/Color.hs 113;" f mixColorsFrac src/Color.hs 109;" f mixColorsLinear src/Color.hs 122;" f @@ -4231,9 +4235,9 @@ multiArrow src/Picture/Composite.hs 11;" f multiLookupTrie src/SimpleTrie.hs 57;" f multiLookupTrieI src/SimpleTrie.hs 66;" f muout src/Dodge/RoomLink.hs 144;" f -muzFlareAt src/Dodge/HeldUse.hs 680;" f -muzzlePos src/Dodge/HeldUse.hs 766;" f -muzzleRandPos src/Dodge/HeldUse.hs 775;" f +muzFlareAt src/Dodge/HeldUse.hs 681;" f +muzzlePos src/Dodge/HeldUse.hs 767;" f +muzzleRandPos src/Dodge/HeldUse.hs 776;" f muzzleWallCheck src/Dodge/Update.hs 323;" f mvButton src/Dodge/Placement/PlaceSpot.hs 175;" f mvCr src/Dodge/Placement/PlaceSpot.hs 178;" f @@ -4289,7 +4293,7 @@ numSubElements src/Shader/Parameters.hs 39;" f numTraversable src/TreeHelp.hs 184;" f obstacleColor src/Dodge/Debug/Picture.hs 264;" f obstructPathsCrossing src/Dodge/Path.hs 120;" f -oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 630;" 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 @@ -4316,14 +4320,14 @@ outLink src/Dodge/RoomLink.hs 120;" f outsideScreenPolygon src/Dodge/Debug/Picture.hs 44;" f outwardIntegers src/Dodge/Base.hs 181;" f overCol src/Picture/Base.hs 303;" f -overColObj src/Shape.hs 269;" f -overColSH src/Shape.hs 237;" f +overColObj src/Shape.hs 270;" f +overColSH src/Shape.hs 238;" f overDebugEvent src/Dodge/Debug.hs 38;" f overLnkPosDir src/Dodge/RoomLink.hs 115;" f overLnkType src/Dodge/RoomLink.hs 105;" f overPos src/Picture/Base.hs 298;" f -overPosObj src/Shape.hs 273;" f -overPosSH src/Shape.hs 257;" f +overPosObj src/Shape.hs 274;" f +overPosSH src/Shape.hs 258;" f overPosSP src/ShapePicture.hs 41;" f overlapCircWalls src/Dodge/Base/Collide.hs 230;" f overlapCircWallsClosest src/Dodge/Base/Collide.hs 272;" f @@ -4365,7 +4369,7 @@ performTurnToA src/Dodge/Creature/Action.hs 128;" f perspectiveMatrixb src/MatrixHelper.hs 11;" f pickUpItem src/Dodge/Inventory/Add.hs 70;" f pickUpItemAt src/Dodge/Inventory/Add.hs 75;" f -pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 766;" f +pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 771;" f pincerP src/Dodge/Creature/Boid.hs 63;" f pincerP' src/Dodge/Creature/Boid.hs 96;" f pincerP'' src/Dodge/Creature/Boid.hs 106;" f @@ -4411,7 +4415,7 @@ pointerToItemID src/Dodge/Item/Location.hs 42;" f pointerYourRootItem src/Dodge/Item/Location.hs 33;" f pointerYourSelectedItem src/Dodge/Item/Location.hs 26;" f pointsToPoly src/Geometry/ConvexPoly.hs 35;" f -poisonSPic src/Dodge/Creature/Update.hs 102;" f +poisonSPic src/Dodge/Creature/Update.hs 106;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f poke34 src/Shader/Poke.hs 509;" f pokeArrayOff src/Shader/Poke.hs 521;" f @@ -4485,7 +4489,7 @@ prependTwo src/Geometry.hs 177;" f prettyDT src/Dodge/DoubleTree.hs 258;" f prettyLDT src/Dodge/DoubleTree.hs 263;" f prettyShort src/AesonHelp.hs 11;" f -primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f +primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 645;" f printColumnTitles src/Dodge/Tree/Shift.hs 149;" f printColumns src/Dodge/Tree/Shift.hs 139;" f printInfo src/Dodge/Tree/Shift.hs 152;" f @@ -4603,7 +4607,7 @@ recComFindPredecessor src/Dodge/Terminal.hs 200;" f recComFindSuccessor src/Dodge/Terminal.hs 190;" f recComLookup src/Dodge/Terminal.hs 180;" f recTabComplete src/Dodge/Terminal.hs 227;" f -recoilAmount src/Dodge/HeldUse.hs 469;" f +recoilAmount src/Dodge/HeldUse.hs 470;" f rectNSWE src/Geometry/Polygon.hs 15;" f rectVV src/Geometry/Polygon.hs 40;" f rectWH src/Geometry/Polygon.hs 19;" f @@ -4625,19 +4629,19 @@ refract src/Dodge/Item/Weapon/LaserPath.hs 39;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 35;" f regexCombs src/Dodge/DisplayInventory.hs 71;" f regexList src/Dodge/DisplayInventory.hs 312;" f -reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 696;" f -reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 794;" f +reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 701;" f +reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 799;" f reloadLevelStart src/Dodge/Save.hs 71;" f -reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 528;" f +reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 531;" f rememberSounds src/Dodge/Creature/Perception.hs 176;" f remoteDetonator src/Dodge/Item/Scope.hs 144;" f remoteScreen src/Dodge/Item/Scope.hs 139;" f removeAimPosture src/Dodge/Creature/YourControl.hs 159;" f -removeAmmoFromMag src/Dodge/HeldUse.hs 904;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 905;" f removeDot src/ShortShow.hs 44;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeLights src/Dodge/Room/Tutorial.hs 249;" f -removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f +removeShieldWall src/Dodge/Item/BackgroundEffect.hs 71;" f removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f renderDataResizeUpdate src/Preload/Update.hs 27;" f renderFlatLighting src/Render.hs 102;" f @@ -4649,7 +4653,7 @@ renderListAt src/Dodge/Render/List.hs 177;" f renderShadows src/Render.hs 116;" f replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 168;" f replacePutID src/Dodge/Placement/Instance/Wall.hs 81;" f -resetCrVocCoolDown src/Dodge/Creature/Vocalization.hs 47;" f +resetCrVocCoolDown src/Dodge/Creature/Vocalization.hs 58;" f resetPLUse src/Dodge/PlacementSpot.hs 92;" f resetStride src/Dodge/Creature/State/WalkCycle.hs 25;" f resetTerminal src/Dodge/WorldEffect.hs 160;" f @@ -4667,7 +4671,7 @@ restrictRMInLinksPD src/Dodge/Room/Link.hs 25;" f resumeSound src/Dodge/SoundLogic.hs 48;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 9;" f revCard src/Dodge/Data/CardinalPoint.hs 13;" f -reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 802;" f +reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 807;" f reversePair src/Dodge/LevelGen.hs 85;" f rewinder src/Dodge/Item/Held/Utility.hs 36;" f rezBox src/Dodge/Room/RezBox.hs 31;" f @@ -4690,7 +4694,7 @@ rightPad src/Padding.hs 19;" f rightPadNoSquash src/Padding.hs 23;" f rightWristPQ src/Dodge/Creature/HandPos.hs 58;" f rlPosDir src/Dodge/RoomLink.hs 112;" f -rlauncherPic src/Dodge/Item/Draw/SPic.hs 398;" f +rlauncherPic src/Dodge/Item/Draw/SPic.hs 394;" f rmInLinks src/Dodge/RoomLink.hs 153;" f rmInvItem src/Dodge/Inventory.hs 74;" f rmLinksOfType src/Dodge/RoomLink.hs 150;" f @@ -4714,7 +4718,8 @@ roomShuriken src/Dodge/Room/Boss.hs 116;" f roomTwistCross src/Dodge/Room/Boss.hs 147;" f roomsContaining src/Dodge/Room/Containing.hs 20;" f roomsContaining' src/Dodge/Room/Containing.hs 25;" f -rootNotrootEff src/Dodge/Item/BackgroundEffect.hs 28;" f +rootAndAttNotEff src/Dodge/Item/BackgroundEffect.hs 40;" f +rootNotrootEff src/Dodge/Item/BackgroundEffect.hs 29;" f rose src/Color.hs 47;" f rotD src/Padding.hs 44;" f rotMatr src/MatrixHelper.hs 79;" f @@ -4726,9 +4731,9 @@ rotate3y src/Geometry/Vector3D.hs 66;" f rotate3z src/Geometry/Vector3D.hs 54;" f rotateCamera src/Dodge/Update/Camera.hs 204;" f rotateList src/Padding.hs 49;" f -rotateSH src/Shape.hs 253;" f -rotateSHq src/Shape.hs 162;" f -rotateSHx src/Shape.hs 261;" f +rotateSH src/Shape.hs 254;" f +rotateSHq src/Shape.hs 163;" f +rotateSHx src/Shape.hs 262;" f rotateSP src/ShapePicture.hs 57;" f rotateTo src/Polyhedra/Geodesic.hs 65;" f rotateToOverlappingWall src/Dodge/Update/Camera.hs 216;" f @@ -4766,17 +4771,17 @@ saveQuit src/Dodge/Menu.hs 77;" f saveQuitConc src/Dodge/Menu.hs 80;" f saveSlotPath src/Dodge/Save.hs 63;" f saveWorldInSlot src/Dodge/Save.hs 68;" f -sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 786;" f +sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 791;" f scToTS src/Dodge/Event/Input.hs 34;" f scale src/Picture/Base.hs 141;" f scale3 src/Picture/Base.hs 137;" f scaleMat src/MatrixHelper.hs 71;" f scaleMatrix src/MatrixHelper.hs 68;" f -scaleSH src/Shape.hs 265;" f +scaleSH src/Shape.hs 266;" f scalp src/Dodge/Creature/Picture.hs 93;" f scancodeToHotkey src/Dodge/Creature/YourControl.hs 102;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f -scorchSPic src/Dodge/Creature/Update.hs 99;" f +scorchSPic src/Dodge/Creature/Update.hs 103;" f screenBox src/Dodge/Base/Window.hs 54;" f screenPolygon src/Dodge/Base/Window.hs 18;" f screenPolygonBord src/Dodge/Base/Window.hs 28;" f @@ -4788,15 +4793,15 @@ scrollRBOption src/Dodge/Update/Scroll.hs 137;" f scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f scrollTimeBack src/Dodge/Update.hs 222;" f scrollTimeForward src/Dodge/Update.hs 239;" f -seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 576;" f -seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 530;" f -seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f -seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 824;" f -seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 628;" f -seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 666;" f -seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 676;" f -seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 744;" f -seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f +seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 579;" f +seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 533;" f +seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 599;" f +seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 829;" f +seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 631;" f +seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 671;" f +seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 681;" f +seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 749;" f +seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 621;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 213;" f secondColumnLDP src/Dodge/ListDisplayParams.hs 41;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 202;" f @@ -4811,7 +4816,7 @@ selSecSelCol src/Dodge/Render/HUD.hs 501;" f selSecSelSize src/Dodge/SelectionSections.hs 143;" f selSecYint src/Dodge/SelectionSections.hs 152;" f selectedItemScroll src/Dodge/Update/Scroll.hs 47;" f -semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 780;" f +semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 785;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 53;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 59;" f senseDamage src/Dodge/Machine/Update.hs 274;" f @@ -4885,7 +4890,7 @@ shellHitWall src/Dodge/Projectile/Update.hs 60;" f shellMag src/Dodge/Item/Ammo.hs 49;" f shellModule src/Dodge/Item/Scope.hs 123;" f shellShape src/Dodge/Projectile/Draw.hs 35;" f -shieldWall src/Dodge/Item/BackgroundEffect.hs 77;" f +shieldWall src/Dodge/Item/BackgroundEffect.hs 91;" f shiftByV2 src/Dodge/PlacementSpot.hs 250;" f shiftChildren src/Dodge/Tree/Compose.hs 44;" f shiftDraw src/Dodge/Render/ShapePicture.hs 120;" f @@ -4906,23 +4911,23 @@ shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f shineTargetLaser src/Dodge/Creature/State.hs 201;" f shineTorch src/Dodge/Creature/State.hs 238;" f -shootBullet src/Dodge/HeldUse.hs 967;" f -shootBullets src/Dodge/HeldUse.hs 961;" f +shootBullet src/Dodge/HeldUse.hs 968;" f +shootBullets src/Dodge/HeldUse.hs 962;" f shootFirstMiss src/Dodge/Creature/Volition.hs 34;" f -shootLaser src/Dodge/HeldUse.hs 849;" f -shootPulseBall src/Dodge/HeldUse.hs 890;" f -shootPulseLaser src/Dodge/HeldUse.hs 877;" f +shootLaser src/Dodge/HeldUse.hs 850;" f +shootPulseBall src/Dodge/HeldUse.hs 891;" f +shootPulseLaser src/Dodge/HeldUse.hs 878;" f shootShatter src/Dodge/Item/Weapon/Shatter.hs 12;" f -shootTeslaArc src/Dodge/HeldUse.hs 1180;" f +shootTeslaArc src/Dodge/HeldUse.hs 1181;" f shootTillEmpty src/Dodge/Creature/Volition.hs 19;" f -shootTractorBeam src/Dodge/HeldUse.hs 818;" f +shootTractorBeam src/Dodge/HeldUse.hs 819;" f shootersRoom src/Dodge/Room/Room.hs 332;" f shootersRoom' src/Dodge/Room/Room.hs 299;" f shootersRoom1 src/Dodge/Room/Room.hs 322;" f shootingRange src/Dodge/Room/Room.hs 349;" f shortPoint2 src/Dodge/ShortShow.hs 4;" f shortShow src/ShortShow.hs 7;" f -shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 524;" f +shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 527;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 63;" f shoulderSH src/Dodge/Creature/Picture.hs 125;" f showAttachItem src/Dodge/Item/Display.hs 92;" f @@ -4943,8 +4948,8 @@ shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 151;" f simpleCrSprings src/Dodge/Update.hs 907;" f simpleTermMessage src/Dodge/Terminal.hs 275;" f -sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 752;" f -sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 788;" f +sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 757;" f +sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 793;" f singleAmmo src/Dodge/Item/AmmoSlots.hs 64;" f singleDT src/Dodge/DoubleTree.hs 10;" f singleLDT src/Dodge/DoubleTree.hs 13;" f @@ -4952,22 +4957,22 @@ singleton src/DoubleStack.hs 11;" f singletonTrie src/SimpleTrie.hs 20;" f sizeFBOs src/Framebuffer/Update.hs 19;" f skColor src/Dodge/Spark/Draw.hs 14;" f -skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 792;" f -slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 808;" f -slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 768;" f -slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 694;" f -slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 790;" f -slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 798;" f -slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 568;" f -slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 566;" f -slapClean2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f -slapClean3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 698;" f -slapClean4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 552;" f -slapClean5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 838;" f -slapClean6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 578;" f -slapClean7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 742;" f -slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 662;" f -slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f +skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 797;" f +slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 813;" f +slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 773;" f +slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 699;" f +slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 795;" f +slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 803;" f +slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 571;" f +slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 569;" f +slapClean2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 625;" f +slapClean3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 703;" f +slapClean4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 555;" f +slapClean5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 843;" f +slapClean6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 581;" f +slapClean7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 747;" f +slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 667;" f +slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 629;" f slideWindow src/ListHelp.hs 81;" f slowDoorRoom src/Dodge/Room/LongDoor.hs 140;" f slowDoorRoomRunPast src/Dodge/Room/LongDoor.hs 157;" f @@ -4975,10 +4980,10 @@ smallBattery src/Dodge/Item/Ammo.hs 60;" f smallBranch src/Dodge/Tree/GenerateStructure.hs 32;" f smallChaseCrit src/Dodge/Creature/ChaseCrit.hs 14;" f smallDrawTree src/Dodge/LevelGen.hs 91;" f -smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 820;" f -smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f -smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 800;" f -smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 604;" f +smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 825;" f +smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 535;" f +smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 805;" f +smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 607;" f smallPillar src/Dodge/Room/Pillar.hs 37;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f smallSnailInt2 src/Dodge/Path.hs 81;" f @@ -4998,10 +5003,10 @@ soundMenuOptions src/Dodge/Menu.hs 161;" 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 344;" f +soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 346;" f soundPic src/Dodge/Debug/Picture.hs 364;" f soundStart src/Dodge/SoundLogic.hs 118;" f -soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 174;" f +soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 175;" f soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f @@ -5058,7 +5063,7 @@ ssfold src/FoldableHelp.hs 105;" f stackPicturesAt src/Dodge/Render/List.hs 95;" f stackPicturesAtOff src/Dodge/Render/List.hs 98;" f stackText src/Picture/Base.hs 180;" f -stackedInventory src/Dodge/Creature.hs 309;" f +stackedInventory src/Dodge/Creature.hs 318;" f startCr src/Dodge/Creature.hs 90;" f startCrafts src/Dodge/Room/Start.hs 93;" f startDrag src/Dodge/Update/Input/InGame.hs 285;" f @@ -5072,11 +5077,11 @@ startSeedGameConc src/Dodge/StartNewGame.hs 46;" f statsModifier src/Dodge/Creature/Info.hs 16;" f stickHitSound src/Dodge/Projectile/Update.hs 77;" f stickyMod src/Dodge/Item/Scope.hs 51;" f -stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 586;" f -stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 762;" f -stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 534;" f -stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 540;" f -stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 652;" f +stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 589;" f +stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 767;" f +stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 537;" f +stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 543;" f +stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 657;" f stopAllSounds src/Sound.hs 126;" f stopBulletAt src/Dodge/Bullet.hs 200;" f stopPushing src/Dodge/Wall/Damage.hs 95;" f @@ -5117,11 +5122,11 @@ tankShape src/Dodge/Placement/Instance/Tank.hs 23;" f tankSquareDec src/Dodge/Placement/Instance/Tank.hs 15;" f tanksPipesRoom src/Dodge/Room/Tanks.hs 69;" f tanksRoom src/Dodge/Room/Tanks.hs 77;" f -tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 776;" f -tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 514;" f -tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 722;" f -tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 810;" f -tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 632;" f +tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 781;" f +tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 517;" f +tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 727;" f +tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 815;" f +tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 637;" f targCorner src/Dodge/Targeting/Draw.hs 35;" f targetCursorPic src/Dodge/Targeting/Draw.hs 41;" f targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 14;" f @@ -5130,7 +5135,7 @@ targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 202;" f targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f targetingScope src/Dodge/Item/Scope.hs 38;" f tbComplete src/Dodge/Terminal.hs 217;" f -teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f +teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 575;" f termScreenColor src/Dodge/Terminal/Color.hs 8;" f termSoundLine src/Dodge/Terminal.hs 49;" f termTextColor src/Dodge/Terminal.hs 52;" f @@ -5142,10 +5147,10 @@ terminalScreenGlow src/Dodge/Machine/Update.hs 44;" f terminalShape src/Dodge/Machine/Draw.hs 50;" f terminalWheelEvent src/Dodge/Update/Scroll.hs 127;" f teslaGun src/Dodge/Item/Held/BatteryGuns.hs 19;" f -teslaGunPic src/Dodge/Item/Draw/SPic.hs 410;" f +teslaGunPic src/Dodge/Item/Draw/SPic.hs 406;" f teslaParams src/Dodge/Item/Held/BatteryGuns.hs 25;" f testEvent src/Dodge/Event/Test.hs 11;" f -testInventory src/Dodge/Creature.hs 290;" f +testInventory src/Dodge/Creature.hs 299;" f testPic src/Dodge/Render/ShapePicture.hs 55;" f testSPic src/Dodge/Render/ShapePicture.hs 52;" f testStringInit src/Dodge/TestString.hs 34;" f @@ -5176,8 +5181,8 @@ thingsHit src/Dodge/WorldEvent/ThingsHit.hs 44;" f thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 127;" f thingsHitZ src/Dodge/WorldEvent/ThingsHit.hs 52;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 67;" f -throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 796;" f -throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 756;" f +throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 801;" f +throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 761;" f throwItem src/Dodge/Creature/Action.hs 191;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 196;" f @@ -5186,13 +5191,13 @@ timeFlowUpdate src/Dodge/Update.hs 182;" f timeScroller src/Dodge/Item/Held/Utility.hs 42;" f timeStopper src/Dodge/Item/Held/Utility.hs 39;" f tinMag src/Dodge/Item/Ammo.hs 28;" f -ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 606;" f -ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 670;" f -ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 712;" f -ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f -ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 760;" f -tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 732;" f -tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 842;" f +ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 609;" f +ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 675;" f +ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 717;" f +ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 603;" f +ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 765;" f +tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 737;" f +tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 847;" f titleOptionsMenu src/Dodge/Menu.hs 104;" f titleOptionsNoWrite src/Dodge/Menu.hs 107;" f tlDoEffect src/Dodge/Terminal.hs 115;" f @@ -5218,23 +5223,24 @@ toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 67;" f toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 105;" f toggleJust src/MaybeHelp.hs 39;" f toggleMapperInv src/Dodge/Creature/Impulse/UseItem.hs 110;" f -tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 686;" f -tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 598;" f -tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 654;" f -tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 658;" f +tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 691;" f +tone440_30sS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 633;" f +tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 601;" f +tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 659;" f +tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 663;" f topInvW src/Dodge/ListDisplayParams.hs 50;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f topTestPart src/Dodge/TestString.hs 50;" f torchShape src/Dodge/Item/Draw/SPic.hs 277;" f -torqueAmount src/Dodge/HeldUse.hs 583;" f +torqueAmount src/Dodge/HeldUse.hs 584;" f torqueCr src/Dodge/WorldEffect.hs 87;" f torso src/Dodge/Creature/Picture.hs 103;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f -tractorBeamAt src/Dodge/HeldUse.hs 830;" f +tractorBeamAt src/Dodge/HeldUse.hs 831;" f tractorGun src/Dodge/Item/Held/BatteryGuns.hs 53;" f -tractorGunPic src/Dodge/Item/Draw/SPic.hs 416;" f +tractorGunPic src/Dodge/Item/Draw/SPic.hs 412;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f tranRot src/Picture/Base.hs 116;" f @@ -5247,9 +5253,9 @@ translateFloatingCameraKeys src/Dodge/Update/Camera.hs 66;" f translateH src/Picture/Base.hs 104;" f translatePointToLeftHand src/Dodge/Creature/HandPos.hs 76;" f translatePointToRightHand src/Dodge/Creature/HandPos.hs 37;" f -translateSH src/Shape.hs 241;" f -translateSHxy src/Shape.hs 245;" f -translateSHz src/Shape.hs 249;" f +translateSH src/Shape.hs 242;" f +translateSHxy src/Shape.hs 246;" f +translateSHz src/Shape.hs 250;" f translateSP src/ShapePicture.hs 53;" f translateSPxy src/ShapePicture.hs 45;" f translateSPz src/ShapePicture.hs 49;" f @@ -5312,9 +5318,9 @@ twoFlat src/Dodge/Creature/Test.hs 99;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 75;" f twoHandTwistAmount src/Dodge/Creature/YourControl.hs 166;" f twoRoomPoss src/Dodge/PlacementSpot.hs 146;" f -twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f -twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 564;" f -twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 644;" f +twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 519;" f +twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 567;" f +twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 649;" f ubyteSize src/Shader/Parameters.hs 13;" f ugateCalc src/Dodge/Inventory/SelectionList.hs 115;" f uncurryV src/Geometry/Data.hs 66;" f @@ -5415,7 +5421,7 @@ updateObjMapMaybe src/Dodge/Update.hs 577;" f updatePastWorlds src/Dodge/Update.hs 458;" f updatePreload src/Preload/Update.hs 21;" f updateProjectile src/Dodge/Projectile/Update.hs 26;" f -updatePulse src/Dodge/Creature/Update.hs 123;" f +updatePulse src/Dodge/Creature/Update.hs 127;" f updatePulseBall src/Dodge/Update.hs 483;" f updatePulseLaser src/Dodge/Update.hs 647;" f updatePulseLasers src/Dodge/Update.hs 478;" f @@ -5458,39 +5464,39 @@ updateWheelEvents src/Dodge/Update.hs 448;" f updateWorldEventFlag src/Dodge/Update.hs 128;" f updateWorldEventFlags src/Dodge/Update.hs 116;" f upperBody src/Dodge/Creature/Picture.hs 121;" f -upperBox src/Shape.hs 152;" f -upperBoxHalf src/Shape.hs 218;" f -upperBoxMT src/Shape.hs 143;" f -upperBoxST src/Shape.hs 146;" f -upperBoxSU src/Shape.hs 149;" f -upperCylinder src/Shape.hs 165;" f +upperBox src/Shape.hs 153;" f +upperBoxHalf src/Shape.hs 219;" f +upperBoxMT src/Shape.hs 144;" f +upperBoxST src/Shape.hs 147;" f +upperBoxSU src/Shape.hs 150;" f +upperCylinder src/Shape.hs 166;" f upperPrismPoly src/Shape.hs 119;" f -upperPrismPolyHalf src/Shape.hs 203;" f -upperPrismPolyHalfMI src/Shape.hs 197;" f -upperPrismPolyHalfST src/Shape.hs 200;" f +upperPrismPolyHalf src/Shape.hs 204;" f +upperPrismPolyHalfMI src/Shape.hs 198;" f +upperPrismPolyHalfST src/Shape.hs 201;" f upperPrismPolyMT src/Shape.hs 98;" f upperPrismPolySE src/Shape.hs 101;" f upperPrismPolySI src/Shape.hs 107;" f upperPrismPolyST src/Shape.hs 104;" f upperPrismPolySU src/Shape.hs 110;" f upperPrismPolyTS src/Shape.hs 116;" f -upperRounded src/Shape.hs 181;" f +upperRounded src/Shape.hs 182;" f useBulletPayload src/Dodge/Bullet.hs 117;" f -useGasParams src/Dodge/HeldUse.hs 1085;" f +useGasParams src/Dodge/HeldUse.hs 1086;" f useHotkey src/Dodge/Creature/YourControl.hs 77;" f -useInventoryPath src/Dodge/HeldUse.hs 1376;" f +useInventoryPath src/Dodge/HeldUse.hs 1377;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 19;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 26;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 255;" f -useLoadedAmmo src/Dodge/HeldUse.hs 722;" f +useLoadedAmmo src/Dodge/HeldUse.hs 723;" f useMagShield src/Dodge/Euse.hs 30;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 18;" f -useRewindGun src/Dodge/HeldUse.hs 1336;" f +useRewindGun src/Dodge/HeldUse.hs 1337;" f useRoomPosCond src/Dodge/PlacementSpot.hs 180;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 183;" f -useStopWatch src/Dodge/HeldUse.hs 1317;" f -useTimeScrollGun src/Dodge/HeldUse.hs 1325;" f +useStopWatch src/Dodge/HeldUse.hs 1318;" f +useTimeScrollGun src/Dodge/HeldUse.hs 1326;" f useUnusedLnk src/Dodge/PlacementSpot.hs 171;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 202;" f usedRoomLinkPoss src/Dodge/PlacementSpot.hs 209;" f @@ -5512,7 +5518,7 @@ vertTrans src/MatrixHelper.hs 103;" f verticalPipe src/Dodge/Picture.hs 19;" f verticalPipe src/Dodge/Placement/Instance/Pipe.hs 6;" f verticalWire src/Dodge/Wire.hs 23;" f -vgunMuzzles src/Dodge/HeldUse.hs 343;" f +vgunMuzzles src/Dodge/HeldUse.hs 344;" f viewBoundaries src/Dodge/Debug/Picture.hs 332;" f viewClipBounds src/Dodge/Debug/Picture.hs 341;" f viewDistanceFromItems src/Dodge/Update/Camera.hs 201;" f @@ -5520,10 +5526,10 @@ viewTarget src/Dodge/Creature/ReaderUpdate.hs 155;" f violet src/Color.hs 48;" f visibleWalls src/Dodge/Base/Collide.hs 216;" f visionCheck src/Dodge/Creature/Perception.hs 152;" f -vocalizationTest src/Dodge/Creature/Vocalization.hs 42;" f +vocalizationTest src/Dodge/Creature/Vocalization.hs 53;" f volleyGun src/Dodge/Item/Held/Cane.hs 15;" f -volleyGunShape src/Dodge/Item/Draw/SPic.hs 358;" f -walkNozzle src/Dodge/HeldUse.hs 806;" f +volleyGunShape src/Dodge/Item/Draw/SPic.hs 355;" f +walkNozzle src/Dodge/HeldUse.hs 807;" f walkableNodeNear src/Dodge/Path.hs 69;" f wallBlips src/Dodge/RadarSweep.hs 99;" f wallBuffer src/Dodge/WallCreatureCollisions.hs 54;" f @@ -5531,9 +5537,9 @@ wallIsZeroLength src/Dodge/LevelGen/StaticWalls.hs 179;" f wallToSurface src/Dodge/Base/Collide.hs 180;" f wallsFromRooms src/Dodge/Layout.hs 137;" f wallsToDraw src/Dodge/Render/Walls.hs 18;" f -warmupSound src/Dodge/HeldUse.hs 1370;" f +warmupSound src/Dodge/HeldUse.hs 1371;" f warningRooms src/Dodge/Room/Warning.hs 31;" f -warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 840;" f +warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 845;" f wasdAim src/Dodge/Creature/YourControl.hs 133;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f @@ -5549,22 +5555,22 @@ weaponRoom src/Dodge/Room/Room.hs 268;" f weaponUnderCrits src/Dodge/Room/Room.hs 173;" f wedgeGeom src/Dodge/Base.hs 42;" f wedgeOfThickness src/Dodge/Picture.hs 9;" f -whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f -whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 758;" f -whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f -whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 614;" f -whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 562;" f -whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 714;" f -whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f -whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f -whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" f -whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 750;" f -whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f -whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 674;" f -whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 636;" f +whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 639;" f +whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 763;" f +whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 651;" f +whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 617;" f +whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 565;" f +whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 719;" f +whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 561;" f +whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 547;" f +whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 723;" f +whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 755;" f +whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 529;" f +whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 679;" f +whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 641;" f white src/Color.hs 53;" f -whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 602;" f -whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 550;" f +whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 605;" f +whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 553;" f wiToFloat src/Dodge/Room/Modify/Girder.hs 168;" f winConfig appDodge/Main.hs 47;" f windowLine src/Dodge/Placement/Instance/Wall.hs 51;" f @@ -5596,7 +5602,7 @@ worldPosToScreen src/Dodge/Base/Coordinate.hs 22;" f worldSPic src/Dodge/Render/ShapePicture.hs 22;" f worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f wpAdd src/Dodge/Room/RezBox.hs 148;" f -wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 522;" f +wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 525;" f wristArmour src/Dodge/Item/Equipment.hs 43;" f wristInvisibility src/Dodge/Item/Equipment.hs 96;" f writeConfig src/Dodge/Menu.hs 180;" f