diff --git a/src/Dodge/Creature/Update.hs b/src/Dodge/Creature/Update.hs index da7fc3a24..35d63fea1 100644 --- a/src/Dodge/Creature/Update.hs +++ b/src/Dodge/Creature/Update.hs @@ -133,7 +133,7 @@ corpseOrGib cr = case cr ^? crDamage . to maxDamageType . _Just . _1 of . dodeathsound PoisonDeath Just PhysicalDamage | _crPain cr > 200 -> - addCrGibs cr + makeCrGibs cr . sethp CrIsGibs . dodeathsound GibsDeath _ -> diff --git a/src/Dodge/Prop/Gib.hs b/src/Dodge/Prop/Gib.hs index 6082d35d6..ab5ed0cbb 100644 --- a/src/Dodge/Prop/Gib.hs +++ b/src/Dodge/Prop/Gib.hs @@ -1,5 +1,7 @@ -module Dodge.Prop.Gib (addCrGibs) where +{-# LANGUAGE LambdaCase #-} +module Dodge.Prop.Gib (makeCrGibs) where +import Dodge.Creature.Material import Linear import Color import Control.Monad @@ -14,32 +16,33 @@ import LensHelp import qualified Quaternion as Q import RandomHelp -addCrGibs :: Creature -> World -> World -addCrGibs cr = case damageDirection $ _crDamage cr of +makeCrGibs :: Creature -> World -> World +makeCrGibs cr = case damageDirection $ _crDamage cr of Nothing -> - addGibAt (_skinHead skin) (cpos & _z +~ 25) - . addGibsAtDir pi 0 3 7 (_skinLower skin) cpos - . addGibsAtDir pi 0 13 20 (_skinUpper skin) cpos - . makeDustAt Flesh 50 cpos - . makeDustAt Flesh 50 cpos - . makeDustAt Flesh 50 cpos - . makeDustAt Flesh 50 cpos + addGibAt mat (_skinHead skin) (cpos & _z +~ 25) + . addGibsAtDir mat pi 0 3 7 (_skinLower skin) cpos + . addGibsAtDir mat pi 0 13 20 (_skinUpper skin) cpos + . makeDustAt mat 50 cpos + . makeDustAt mat 50 cpos + . makeDustAt mat 50 cpos + . makeDustAt mat 50 cpos Just d -> - addGibsAtDir (pi / 4) d 3 7 (_skinLower skin) cpos - . addGibsAtDir (pi / 4) d 13 20 (_skinUpper skin) cpos - . addGibAtDir d (_skinHead skin) (cpos & _z +~ 25) - . makeDustAt Flesh 50 cpos - . makeDustAt Flesh 50 cpos - . makeDustAt Flesh 50 cpos - . makeDustAt Flesh 50 cpos + addGibsAtDir mat (pi / 4) d 3 7 (_skinLower skin) cpos + . addGibsAtDir mat (pi / 4) d 13 20 (_skinUpper skin) cpos + . addGibAtDir mat d (_skinHead skin) (cpos & _z +~ 25) + . makeDustAt mat 50 cpos + . makeDustAt mat 50 cpos + . makeDustAt mat 50 cpos + . makeDustAt mat 50 cpos where + mat = crMaterial $ cr ^. crType skin = crShape $ _crType cr -- this should be cleaned up cpos = _crPos cr -- this is ugly because it is mostly copy-paste from addGibsAt -addGibsAtDir :: Float -> Float -> Float -> Float -> Color -> Point3 -> World -> World -addGibsAtDir spread dir minh maxh col p w = - foldl' (flip $ addGib4 p col) w (zip4 vels zspeeds quats hs) +addGibsAtDir :: Material -> Float -> Float -> Float -> Float -> Color -> Point3 -> World -> World +addGibsAtDir m spread dir minh maxh col p w = + foldl' (flip $ addGib4 m p col) w (zip4 vels zspeeds quats hs) & randGen .~ newg where (speeds, newg) = replicateM 4 (state (randomR (1, 4))) & runState $ _randGen w @@ -49,26 +52,27 @@ addGibsAtDir spread dir minh maxh col p w = zspeeds = replicateM 4 (state (randomR (-8, 8))) & evalState $ _randGen w quats = replicateM 4 (Q.vToQuat (V3 0 0 1) <$> randOnUnitSphere) & evalState $ _randGen w -addGib4 :: Point3 -> Color -> (Point2, Float, QFloat, Float) -> World -> World -addGib4 p col (v, zs, q, h) = +-- this should be unified with addGibAtDir +addGib4 :: Material -> Point3 -> Color -> (Point2, Float, QFloat, Float) -> World -> World +addGib4 m p col (v, zs, q, h) = cWorld . lWorld . debris .:~ DebrisChunk { _dbPos = p & _z +~ h - , _dbType = Gib 3 col + , _dbType = materialGib m col , _dbVel = v `v2z` zs , _dbRot = q , _dbSpin = Q.axisAngle (vNormal v `v2z` 0) (-0.1) } -addGibAt :: Color -> Point3 -> World -> World +addGibAt :: Material -> Color -> Point3 -> World -> World --addGibAt h col p w = addGibAtDir d h col p (w & randGen .~ newg) -addGibAt col p w = addGibAtDir d col p (w & randGen .~ newg) +addGibAt m col p w = addGibAtDir m d col p (w & randGen .~ newg) where (d, newg) = randomR (0, 2 * pi) $ _randGen w -addGibAtDir :: Float -> Color -> Point3 -> World -> World +addGibAtDir :: Material -> Float -> Color -> Point3 -> World -> World --addGibAtDir dir h col p w = -addGibAtDir dir col p w = +addGibAtDir m dir col p w = w & cWorld . lWorld . debris .:~ gib & randGen .~ newg @@ -82,8 +86,14 @@ addGibAtDir dir col p w = return $ DebrisChunk { _dbPos = p - , _dbType = Gib 3 col + , _dbType = materialGib m col , _dbVel = v `v2z` zs , _dbRot = q , _dbSpin = Q.axisAngle (vNormal v `v2z` 0) (-0.1) } + +materialGib :: Material -> Color -> DebrisType +materialGib = \case + Flesh -> Gib 3 + Metal -> MetalDebris + _ -> BlockDebris diff --git a/tags b/tags index ad5c9907c..c6d0f98b3 100644 --- a/tags +++ b/tags @@ -12,7 +12,7 @@ .++~ src/LensHelp.hs 33;" o .+.+~ src/LensHelp.hs 23;" o .:~ src/LensHelp.hs 14;" o -<$> src/Dodge/Data/ActionPlan.hs 156;" o +<$> src/Dodge/Data/ActionPlan.hs 157;" o <$> src/Dodge/Data/CWorld.hs 52;" o <$> src/Dodge/Data/Camera.hs 38;" o <$> src/Dodge/Data/Creature.hs 93;" o @@ -210,7 +210,7 @@ ChemFuel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 14;" C ChooseMovementLtAuto src/Dodge/Data/CreatureEffect.hs 30;" C Circ_collision_test src/Dodge/Data/Config.hs 99;" C Climate src/Dodge/Data/Scenario.hs 32;" C -CloseToMelee src/Dodge/Data/ActionPlan.hs 139;" C +CloseToMelee src/Dodge/Data/ActionPlan.hs 140;" C Close_shape_culling src/Dodge/Data/Config.hs 93;" C Cloud src/Dodge/Data/Cloud.hs 12;" t CloudType src/Dodge/Data/Cloud.hs 20;" t @@ -437,7 +437,7 @@ FlatFaces src/Shape/Data.hs 12;" C FlatShieldParams src/Dodge/Data/Item/Params.hs 14;" C FlechetteTrajectory src/Dodge/Data/Bullet.hs 43;" C FlechetteTrajectoryType src/Dodge/Data/Bullet.hs 50;" C -Flee src/Dodge/Data/ActionPlan.hs 143;" C +Flee src/Dodge/Data/ActionPlan.hs 144;" C Flesh src/Dodge/Data/Material.hs 17;" C FloatAbsCheckGreaterLess src/Dodge/Data/FloatFunction.hs 14;" C FloatBO src/Shader/Data.hs 85;" t @@ -488,14 +488,14 @@ GenParams src/Dodge/Data/GenParams.hs 13;" t GenWorld src/Dodge/Data/GenWorld.hs 24;" t GenericFaction src/Dodge/Data/Creature/State.hs 13;" C GeoObjShads src/Dodge/Data/Config.hs 117;" C -GetTo src/Dodge/Data/ActionPlan.hs 141;" C +GetTo src/Dodge/Data/ActionPlan.hs 142;" C GetToPoint src/Dodge/Data/Scenario.hs 12;" C Gib src/Dodge/Data/Prop.hs 22;" C GibsDeath src/Dodge/Data/Creature.hs 70;" C Glass src/Dodge/Data/Material.hs 14;" C GlassBreakSound src/Dodge/Data/SoundOrigin.hs 34;" C GlassDebris src/Dodge/Data/Prop.hs 25;" C -Goal src/Dodge/Data/ActionPlan.hs 149;" t +Goal src/Dodge/Data/ActionPlan.hs 150;" t GoesOnBack src/Dodge/Data/Equipment/Misc.hs 12;" C GoesOnChest src/Dodge/Data/Equipment/Misc.hs 11;" C GoesOnHead src/Dodge/Data/Equipment/Misc.hs 10;" C @@ -624,7 +624,7 @@ JoystickSF src/Dodge/Data/ComposedItem.hs 26;" C Just' src/MaybeHelp.hs 11;" C JustStartedPlaying src/Sound/Data.hs 22;" C KEYCARD src/Dodge/Data/Item/Combine.hs 177;" C -Kill src/Dodge/Data/ActionPlan.hs 151;" C +Kill src/Dodge/Data/ActionPlan.hs 152;" C LASER src/Dodge/Data/Item/Combine.hs 35;" C LDP src/Dodge/Data/SelectionList.hs 13;" C LDParams src/Dodge/Data/SelectionList.hs 13;" t @@ -667,7 +667,7 @@ LimitedBreathableAtmosphere src/Dodge/Data/Scenario.hs 38;" C LimitedFood src/Dodge/Data/Scenario.hs 39;" C LimitedWater src/Dodge/Data/Scenario.hs 40;" C LinearShockwave src/Dodge/Data/LinearShockwave.hs 11;" t -LiveLongAndProsper src/Dodge/Data/ActionPlan.hs 150;" C +LiveLongAndProsper src/Dodge/Data/ActionPlan.hs 151;" C LivingComplex src/Dodge/Data/Scenario.hs 68;" C LoadReady src/Dodge/Data/Universe.hs 101;" C LoadWaiting src/Dodge/Data/Universe.hs 100;" C @@ -743,7 +743,7 @@ MdWdWd src/Dodge/Data/WorldEffect.hs 49;" t 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 +MeleeStrike src/Dodge/Data/ActionPlan.hs 145;" C Memory src/Dodge/Data/Creature.hs 79;" t MenuOption src/Dodge/Data/Universe.hs 109;" t MenuOptionDisplay src/Dodge/Data/Universe.hs 104;" t @@ -1092,7 +1092,7 @@ RectRoomType src/Dodge/Data/Room.hs 33;" C ReducedRocketSmoke src/Dodge/Data/Projectile.hs 52;" C ReigonalGovernment src/Dodge/Data/Scenario.hs 50;" C Religion src/Dodge/Data/Scenario.hs 47;" C -Reload src/Dodge/Data/ActionPlan.hs 142;" C +Reload src/Dodge/Data/ActionPlan.hs 143;" C RemoteDetonatorSF src/Dodge/Data/ComposedItem.hs 27;" C RemoteScreenSF src/Dodge/Data/ComposedItem.hs 25;" C RemoveEquipment src/Dodge/Data/RightButtonOptions.hs 33;" C @@ -1157,7 +1157,7 @@ SaveSlotNum src/Dodge/Data/SaveSlot.hs 10;" C Scope src/Dodge/Data/Item/Scope.hs 11;" t ScreenLayer src/Dodge/Data/Universe.hs 81;" t ScreenPos src/Dodge/Data/ScreenPos.hs 12;" t -Search src/Dodge/Data/ActionPlan.hs 145;" C +Search src/Dodge/Data/ActionPlan.hs 146;" C SecretCabal src/Dodge/Data/Scenario.hs 44;" C SectionCursor src/Dodge/Data/SelectionList.hs 24;" t SeeAbove src/Dodge/Data/Wall.hs 32;" C @@ -1176,7 +1176,7 @@ SelfTree src/Dodge/Data/MetaTree.hs 21;" t SemiAutoTrigger src/Dodge/Data/TriggerType.hs 9;" C SensorType src/Dodge/Data/Machine/Sensor.hs 12;" t SensorWithRequirement src/Dodge/Data/Machine/Sensor.hs 30;" C -SentinelAt src/Dodge/Data/ActionPlan.hs 152;" C +SentinelAt src/Dodge/Data/ActionPlan.hs 153;" C SetLSCol src/Dodge/Data/WorldEffect.hs 28;" C SetTrigger src/Dodge/Data/WorldEffect.hs 27;" C SetTriggerAndSetLSCol src/Dodge/Data/WorldEffect.hs 29;" C @@ -1264,7 +1264,7 @@ StayInArea src/Dodge/Data/Scenario.hs 13;" C Stone src/Dodge/Data/Material.hs 13;" C StorageSS src/Dodge/Data/Scenario.hs 94;" C Strategy src/Dodge/Data/ActionPlan.hs 128;" t -StrategyActions src/Dodge/Data/ActionPlan.hs 140;" C +StrategyActions src/Dodge/Data/ActionPlan.hs 141;" C SubInventory src/Dodge/Data/HUD.hs 14;" t Superfluous src/Shape/Data.hs 33;" C Surface src/Shape/Data.hs 37;" t @@ -1465,6 +1465,7 @@ WallSound src/Dodge/Data/SoundOrigin.hs 25;" C WallStructure src/Dodge/Data/Wall/Structure.hs 11;" t WallWire src/Dodge/Data/Room.hs 59;" C Walls_info src/Dodge/Data/Config.hs 89;" C +Wander src/Dodge/Data/ActionPlan.hs 139;" C War src/Dodge/Data/Scenario.hs 28;" C WarmTime src/Dodge/Data/Item/Params.hs 19;" C WarmUpCoolDown src/Dodge/Data/TriggerType.hs 14;" C @@ -1929,7 +1930,7 @@ _items src/Dodge/Data/LWorld.hs 97;" f _itsInt src/Dodge/Data/Item.hs 40;" f _itsMax src/Dodge/Data/Item.hs 41;" f _itsRangeInt src/Dodge/Data/Item.hs 41;" f -_killTarget src/Dodge/Data/ActionPlan.hs 151;" f +_killTarget src/Dodge/Data/ActionPlan.hs 152;" f _lAimPos src/Dodge/Data/LWorld.hs 147;" f _lClock src/Dodge/Data/LWorld.hs 142;" f _lInvLock src/Dodge/Data/LWorld.hs 148;" f @@ -2028,7 +2029,7 @@ _mdUpdate src/Dodge/Data/Modification.hs 16;" f _mdUpdate src/Dodge/Data/Modification.hs 25;" f _meleeCooldown src/Dodge/Data/Creature/Misc.hs 57;" f _meleeCooldown src/Dodge/Data/Creature/Misc.hs 61;" f -_meleeTarget src/Dodge/Data/ActionPlan.hs 139;" f +_meleeTarget src/Dodge/Data/ActionPlan.hs 140;" f _mgField src/Dodge/Data/Magnet.hs 23;" f _mgPos src/Dodge/Data/Magnet.hs 22;" f _moEff src/Dodge/Data/Universe.hs 111;" f @@ -2083,6 +2084,7 @@ _opticPos src/Dodge/Data/Item/Scope.hs 14;" f _opticZoom src/Dodge/Data/Item/Scope.hs 17;" f _partialAction src/Dodge/Data/ActionPlan.hs 111;" f _pastWorlds src/Dodge/Data/World.hs 37;" f +_pathFailAction src/Dodge/Data/ActionPlan.hs 70;" f _pathToPoint src/Dodge/Data/ActionPlan.hs 70;" f _pauseTimeMesage src/Dodge/Data/World.hs 87;" f _pauseTimeMesageColor src/Dodge/Data/World.hs 88;" f @@ -2274,8 +2276,8 @@ _selLocation src/Dodge/Data/LWorld.hs 140;" f _sensAmount src/Dodge/Data/Machine/Sensor.hs 20;" f _sensType src/Dodge/Data/Machine/Sensor.hs 21;" f _sensorCoding src/Dodge/Data/GenParams.hs 14;" f -_sentinelDir src/Dodge/Data/ActionPlan.hs 152;" f -_sentinelPos src/Dodge/Data/ActionPlan.hs 152;" f +_sentinelDir src/Dodge/Data/ActionPlan.hs 153;" f +_sentinelPos src/Dodge/Data/ActionPlan.hs 153;" f _sfColor src/Shape/Data.hs 40;" f _sfShadowImportance src/Shape/Data.hs 41;" f _sfSize src/Shape/Data.hs 42;" f @@ -2533,16 +2535,15 @@ activeTargetCursorPic src/Dodge/Targeting/Draw.hs 31;" f addArmour src/Dodge/Creature.hs 82;" f addBranchAt src/Dodge/Tree/GenerateStructure.hs 18;" f addButtonSlowDoor src/Dodge/Room/LongDoor.hs 101;" f -addCrGibs src/Dodge/Prop/Gib.hs 17;" f addDepth src/Picture/Base.hs 125;" f addDoorAtNthLinkToggleInterrupt src/Dodge/Room/Warning.hs 47;" f addDoorAtNthLinkToggleTerminal src/Dodge/Room/Warning.hs 66;" f addDoorToggleTerminal src/Dodge/Room/Warning.hs 41;" f addDoorToggleTerminal' src/Dodge/Room/Warning.hs 87;" f -addGib4 src/Dodge/Prop/Gib.hs 52;" f -addGibAt src/Dodge/Prop/Gib.hs 63;" f -addGibAtDir src/Dodge/Prop/Gib.hs 69;" f -addGibsAtDir src/Dodge/Prop/Gib.hs 40;" f +addGib4 src/Dodge/Prop/Gib.hs 54;" f +addGibAt src/Dodge/Prop/Gib.hs 65;" f +addGibAtDir src/Dodge/Prop/Gib.hs 71;" f +addGibsAtDir src/Dodge/Prop/Gib.hs 42;" f addGirder src/Dodge/Room/Modify/Girder.hs 90;" f addGirder' src/Dodge/Room/Modify/Girder.hs 111;" f addGirderEW src/Dodge/Room/Modify/Girder.hs 72;" f @@ -2573,7 +2574,7 @@ advanceScrollAmount src/Dodge/Update.hs 479;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 33;" f aimDelaySweep src/Dodge/Render/Picture.hs 285;" f aimStanceInfo src/Dodge/Item/Info.hs 243;" f -aimTurn src/Dodge/Creature/YourControl.hs 150;" f +aimTurn src/Dodge/Creature/YourControl.hs 152;" f airlock src/Dodge/Room/Airlock.hs 28;" f airlock0 src/Dodge/Room/Airlock.hs 78;" f airlock90 src/Dodge/Room/Airlock.hs 201;" f @@ -2639,7 +2640,7 @@ argV src/Geometry/Vector.hs 83;" f armourChaseCrit src/Dodge/Creature/ArmourChase.hs 34;" f armouredChasers src/Dodge/Room/Boss.hs 58;" f armouredCorridor src/Dodge/Room/RoadBlock.hs 20;" f -arms src/Dodge/Creature/Picture.hs 134;" f +arms src/Dodge/Creature/Picture.hs 133;" f arrow src/Picture/Composite.hs 19;" f arrowPath src/Picture/Composite.hs 8;" f assignHotkey src/Dodge/AssignHotkey.hs 9;" f @@ -2659,9 +2660,9 @@ attachTree src/Dodge/Tree/Compose.hs 39;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 76;" f attribSize src/Shader/Compile.hs 139;" f autoAmr src/Dodge/Item/Held/Rod.hs 39;" f -autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 744;" f +autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 747;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f -autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f +autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 557;" f autoPistol src/Dodge/Item/Held/Stick.hs 21;" f autoRifle src/Dodge/Item/Held/Cane.hs 27;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 174;" f @@ -2670,15 +2671,15 @@ 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 183;" f -backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 734;" f +backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 737;" f backpackCombinations src/Dodge/Combine/Combinations.hs 27;" f backpackShape src/Dodge/Item/Draw/SPic.hs 188;" 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 650;" f +bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 653;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f -bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 832;" f +bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 835;" 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 @@ -2691,7 +2692,7 @@ baseItemTriggerType src/Dodge/BaseTriggerType.hs 21;" f baseRifleShape src/Dodge/Item/Draw/SPic.hs 324;" f baseRodShape src/Dodge/Item/Draw/SPic.hs 407;" f baseSMGShape src/Dodge/Item/Draw/SPic.hs 395;" f -baseShoulder src/Dodge/Creature/Picture.hs 172;" f +baseShoulder src/Dodge/Creature/Picture.hs 171;" f baseStickShape src/Dodge/Item/Draw/SPic.hs 301;" f baseStickShapeX src/Dodge/Item/Draw/SPic.hs 293;" f baseStickSpread src/Dodge/HeldUse.hs 346;" f @@ -2704,7 +2705,7 @@ basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMuzFlare src/Dodge/HeldUse.hs 731;" f battery src/Dodge/Item/Ammo.hs 60;" f batteryPack src/Dodge/Item/Equipment.hs 38;" f -beep3QuickS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 664;" f +beep3QuickS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 667;" f beltMag src/Dodge/Item/Ammo.hs 38;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 242;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 115;" f @@ -2725,22 +2726,22 @@ blockPillar src/Dodge/Room/Pillar.hs 23;" 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 720;" f -blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 814;" f -blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f -blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 840;" f -blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 562;" f -blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 774;" f -blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 566;" f -blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 552;" f -bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 594;" f -bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 780;" f -bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 838;" f -bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 844;" f -bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 674;" f -bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 756;" f -bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 598;" f -bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f +blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 723;" f +blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 817;" f +blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 649;" f +blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 845;" f +blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 565;" f +blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 777;" f +blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 569;" f +blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 555;" f +bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 597;" f +bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 783;" f +bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 843;" f +bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 849;" f +bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 677;" f +bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 759;" f +bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 601;" f +bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 545;" 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 @@ -2778,7 +2779,8 @@ bulletSynthesizer src/Dodge/Item/Ammo.hs 89;" f bulletWeapons src/Dodge/Combine/Combinations.hs 247;" f burstRifle src/Dodge/Item/Held/Cane.hs 30;" f buttonFlip src/Dodge/Button/Event.hs 18;" f -buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f +buzz1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 837;" f +buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 599;" f byNthLink src/Dodge/Room/Warning.hs 44;" f cChasm src/Dodge/Room/Tutorial.hs 137;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f @@ -2816,16 +2818,16 @@ chaseCrit src/Dodge/Creature/ChaseCrit.hs 28;" f chaseCritInternal src/Dodge/Humanoid.hs 11;" f chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 123;" f chaseUpperBody src/Dodge/Creature/Picture.hs 77;" f -chasmRotate src/Dodge/Creature/Update.hs 203;" f +chasmRotate src/Dodge/Creature/Update.hs 221;" f chasmSimpleMaze src/Dodge/Room/Tutorial.hs 375;" f chasmSpitTerminal src/Dodge/Room/Tutorial.hs 307;" f -chasmTestCorpse src/Dodge/Creature/Update.hs 171;" f -chasmTestLiving src/Dodge/Creature/Update.hs 147;" f +chasmTestCorpse src/Dodge/Creature/Update.hs 189;" f +chasmTestLiving src/Dodge/Creature/Update.hs 165;" f chasmWallToSurface src/Dodge/Base/Collide.hs 120;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkConnection src/Dodge/Inventory/Swap.hs 66;" f -checkDeath src/Dodge/Creature/Update.hs 82;" f -checkDeath' src/Dodge/Creature/Update.hs 85;" f +checkDeath src/Dodge/Creature/Update.hs 100;" f +checkDeath' src/Dodge/Creature/Update.hs 103;" f checkEndGame src/Dodge/Update.hs 857;" f checkErrorGL src/Shader/Compile.hs 86;" f checkFBO src/Framebuffer/Check.hs 6;" f @@ -2857,16 +2859,16 @@ 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 148;" f -clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 822;" f -clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 738;" f -clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 580;" f +clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 825;" f +clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 741;" f +clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 583;" f cleanUpPreload src/Preload.hs 10;" f cleanUpSoundPreload src/Preload.hs 15;" f cleanupHalted src/Sound.hs 119;" 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 788;" f +click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 791;" f clicker src/Dodge/Item/Scope.hs 88;" f clipV src/Geometry/Vector.hs 48;" f clipZoom src/Dodge/Update/Camera.hs 234;" f @@ -2913,7 +2915,7 @@ combineInventoryExtra src/Dodge/Render/HUD.hs 340;" f combineItemListYouX src/Dodge/Combine.hs 36;" f combineList src/Dodge/Combine.hs 21;" f combineRooms src/Dodge/Room/Procedural.hs 134;" f -combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 748;" f +combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 751;" f combineTree src/Dodge/Tree/Compose.hs 68;" f commandColor src/Dodge/Terminal.hs 127;" f commonPrefix src/Dodge/Debug/Terminal.hs 149;" f @@ -2927,10 +2929,10 @@ compileAndCheckShader src/Shader/Compile.hs 108;" f composeNode src/Dodge/Tree/Compose.hs 77;" f composeTree src/Dodge/Tree/Compose.hs 48;" f compressor src/Dodge/Item/Ammo.hs 74;" f -computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 670;" f +computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 673;" f conEffects src/Dodge/Concurrent.hs 12;" f concurrentIS src/Dodge/Inventory.hs 197;" f -connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 750;" f +connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 753;" f constructEdges src/Polyhedra.hs 31;" f constructEdgesList src/Polyhedra.hs 40;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 58;" f @@ -2946,7 +2948,7 @@ copierItemUpdate src/Dodge/Creature/State.hs 136;" f copyItemToFloor src/Dodge/FloorItem.hs 14;" f corDoor src/Dodge/Room/Room.hs 411;" f cornerList src/Preload/Render.hs 236;" f -corpseOrGib src/Dodge/Creature/Update.hs 108;" f +corpseOrGib src/Dodge/Creature/Update.hs 126;" f corridor src/Dodge/Room/Corridor.hs 17;" f corridorBoss src/Dodge/LockAndKey.hs 135;" f corridorN src/Dodge/Room/Corridor.hs 58;" f @@ -2958,7 +2960,7 @@ crCamouflage src/Dodge/Creature/Picture.hs 40;" f crCanSeeCr src/Dodge/Creature/Test.hs 50;" f crCrSpring src/Dodge/Update.hs 979;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 62;" f -crDeathSounds src/Dodge/Creature/Vocalization.hs 45;" f +crDeathSounds src/Dodge/Creature/Vocalization.hs 46;" 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 @@ -2994,18 +2996,18 @@ crShape src/Dodge/Creature/Shape.hs 8;" f crSpring src/Dodge/Update.hs 966;" f crStratConMatches src/Dodge/Creature/Test.hs 78;" f crStrength src/Dodge/Creature/Statistics.hs 29;" f -crUpdate src/Dodge/Creature/Update.hs 75;" f +crUpdate src/Dodge/Creature/Update.hs 93;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 67;" f crUpdateItemLocations src/Dodge/Inventory/Location.hs 49;" f -crVocalResetTime src/Dodge/Creature/Vocalization.hs 62;" f -crVocalizationSound src/Dodge/Creature/Vocalization.hs 16;" f -crWarningSounds src/Dodge/Creature/Vocalization.hs 26;" f +crVocalResetTime src/Dodge/Creature/Vocalization.hs 70;" f +crVocalizationSound src/Dodge/Creature/Vocalization.hs 17;" f +crWarningSounds src/Dodge/Creature/Vocalization.hs 27;" f crWlPbHit src/Dodge/WorldEvent/ThingsHit.hs 61;" f crWlPbHitZ src/Dodge/WorldEvent/ThingsHit.hs 71;" f crZoneSize src/Dodge/Zoning/Creature.hs 43;" f craftInfo src/Dodge/Item/Info.hs 168;" f craftItemSPic src/Dodge/Item/Draw/SPic.hs 40;" f -crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f +crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 603;" f createForceField src/Dodge/ForceField.hs 7;" f createGas src/Dodge/Gas.hs 10;" f createHeadLamp src/Dodge/Euse.hs 64;" f @@ -3099,11 +3101,11 @@ deZoneIX src/Dodge/Zoning/Base.hs 91;" f deZoneWall src/Dodge/Zoning/Wall.hs 69;" f deadEndPSType src/Dodge/Room/Room.hs 264;" f deadEndRoom src/Dodge/Room/Room.hs 267;" f -deadFeet src/Dodge/Creature/Picture.hs 130;" f -deadRot src/Dodge/Creature/Picture.hs 148;" f -deadScalp src/Dodge/Creature/Picture.hs 143;" f -deadUpperBody src/Dodge/Creature/Picture.hs 169;" f -debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 730;" f +deadFeet src/Dodge/Creature/Picture.hs 129;" f +deadRot src/Dodge/Creature/Picture.hs 147;" f +deadScalp src/Dodge/Creature/Picture.hs 142;" f +deadUpperBody src/Dodge/Creature/Picture.hs 168;" f +debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 733;" f debrisSPic src/Dodge/Prop/Draw.hs 17;" f debrisSize src/Dodge/Block/Debris.hs 131;" f debugEvent src/Dodge/Debug.hs 43;" f @@ -3128,10 +3130,10 @@ decoratedBlock src/Dodge/Placement/Instance/Block.hs 14;" f decorationToShape src/Dodge/Placement/TopDecoration.hs 16;" f decreaseAwareness src/Dodge/Creature/Perception.hs 131;" f decrementTimer src/Sound.hs 104;" f -dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f -dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 682;" f -dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 764;" f -dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 794;" f +dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 563;" f +dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 685;" f +dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 767;" f +dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 797;" f defCraftItem src/Dodge/Default/Item.hs 25;" f defDamageMaterial src/Dodge/Material/Damage.hs 34;" f defEquipment src/Dodge/Default.hs 24;" f @@ -3155,7 +3157,7 @@ defaultConfig src/Dodge/Data/Config.hs 152;" f defaultCreature src/Dodge/Default/Creature.hs 12;" f defaultCreatureMemory src/Dodge/Default/Creature.hs 67;" f defaultCrystalWall src/Dodge/Default/Wall.hs 35;" f -defaultDeathSounds src/Dodge/Creature/Vocalization.hs 55;" f +defaultDeathSounds src/Dodge/Creature/Vocalization.hs 56;" f defaultDirtBlock src/Dodge/Default/Block.hs 17;" f defaultDirtWall src/Dodge/Default/Wall.hs 47;" f defaultDoor src/Dodge/Default/Door.hs 5;" f @@ -3212,7 +3214,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 792;" f +disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 795;" f displayConfig src/Dodge/Menu.hs 223;" f displayControls src/Dodge/Menu.hs 239;" f displayFrameTicks src/Dodge/Render/Picture.hs 50;" f @@ -3232,7 +3234,7 @@ divideLine src/Geometry.hs 248;" f divideLineExact src/Geometry.hs 276;" f divideLineOddNumPoints src/Geometry.hs 261;" f dmType src/Dodge/Damage.hs 38;" f -doAimTwist src/Dodge/Creature/YourControl.hs 130;" f +doAimTwist src/Dodge/Creature/YourControl.hs 132;" f doAnyEquipmentEffect src/Dodge/Creature/State.hs 146;" f doBackspace src/Dodge/Update/Input/Text.hs 31;" f doBarrelSpin src/Dodge/Projectile/Update.hs 168;" f @@ -3354,7 +3356,7 @@ drawDragSelecting src/Dodge/Render/HUD.hs 162;" f drawDumbSwitch src/Dodge/Button/Draw.hs 31;" f drawEmptySet src/Dodge/Render/Picture.hs 151;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 7;" f -drawEquipment src/Dodge/Creature/Picture.hs 181;" f +drawEquipment src/Dodge/Creature/Picture.hs 180;" f drawExamineInventory src/Dodge/Render/HUD.hs 199;" f drawExplosiveBall src/Dodge/EnergyBall/Draw.hs 15;" f drawFarWallDetect src/Dodge/Debug/Picture.hs 271;" f @@ -3444,7 +3446,7 @@ 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 144;" f +dropAll src/Dodge/Creature/Update.hs 162;" f dropInventoryPath src/Dodge/HeldUse.hs 1371;" f dropItem src/Dodge/Creature/Action.hs 161;" f dropper src/Dodge/Item/Scope.hs 82;" f @@ -3476,8 +3478,8 @@ edgeToPic src/Dodge/Debug/Picture.hs 426;" f effectOnEquip src/Dodge/Euse.hs 84;" f effectOnRemove src/Dodge/Euse.hs 74;" f eitType src/Dodge/Data/EquipType.hs 15;" f -ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 842;" f -elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 826;" f +ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 847;" f +elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 829;" f elephantGun src/Dodge/Item/Held/Rod.hs 27;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 23;" f emptyTrie src/SimpleTrie.hs 17;" f @@ -3488,7 +3490,7 @@ encircleP src/Dodge/Creature/Boid.hs 30;" f endArcPos src/Dodge/Tesla.hs 86;" f endCombineRegex src/Dodge/Update/Input/InGame.hs 277;" f endRegex src/Dodge/Update/Input/InGame.hs 271;" f -energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 694;" f +energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 697;" f enterCombineInv src/Dodge/DisplayInventory.hs 321;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f epText src/Dodge/Inventory/SelectionList.hs 73;" f @@ -3522,7 +3524,7 @@ expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 189;" f explodeShell src/Dodge/Projectile/Update.hs 274;" f -explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 698;" f +explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 701;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 79;" f extendConeToScreenEdge src/Dodge/Debug/Picture.hs 82;" f @@ -3534,7 +3536,7 @@ faceEdges src/Polyhedra.hs 62;" f facesToVF src/Polyhedra/Geodesic.hs 70;" f farWallDistDirection src/Dodge/Update/Camera.hs 245;" f fdiv src/ShortShow.hs 41;" f -feet src/Dodge/Creature/Picture.hs 116;" f +feet src/Dodge/Creature/Picture.hs 115;" f filter3 src/FoldableHelp.hs 76;" f filterSectionsPair src/Dodge/DisplayInventory.hs 160;" f findBlips src/Dodge/RadarSweep.hs 63;" f @@ -3547,9 +3549,9 @@ 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 856;" f -fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 666;" f -fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 714;" f +fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 861;" f +fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 669;" f +fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 717;" f firstBreather src/Dodge/Room/Breather.hs 9;" f firstTrie src/SimpleTrie.hs 51;" f firstWorldLoad appDodge/Main.hs 68;" f @@ -3580,15 +3582,15 @@ floorItemPickupInfo src/Dodge/Render/HUD.hs 233;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 166;" f floorTo src/Geometry/Zone.hs 12;" f floorWire src/Dodge/Wire.hs 13;" f -foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 782;" f -foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 828;" f +foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 785;" f +foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 831;" f foldMTRS src/Dodge/Room/Tutorial.hs 91;" 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 824;" f -foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 710;" f -foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 836;" f +foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 827;" f +foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 713;" f +foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 841;" f forbidFlee src/Dodge/Creature/Boid.hs 45;" f forceElements src/StrictHelp.hs 10;" f forceField src/Dodge/Wall/ForceField.hs 6;" f @@ -3598,7 +3600,7 @@ fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 37;" f fpsText src/Dodge/Render/Picture.hs 57;" f fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 147;" f frag src/Shader/Data.hs 110;" f -fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f +fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 551;" f fromJust' src/MaybeHelp.hs 22;" f fromListL src/DoubleStack.hs 7;" f fromTopLeft src/Dodge/ScreenPos.hs 9;" f @@ -3682,16 +3684,15 @@ 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 702;" f -glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 712;" f -glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 716;" f -glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 692;" f +glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 705;" f +glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 715;" f +glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 719;" f +glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 695;" f glassSwitchBack src/Dodge/Room/Room.hs 86;" f glassSwitchBackCrits src/Dodge/Room/Room.hs 120;" f glauncherPic src/Dodge/Item/Draw/SPic.hs 404;" f gluintSize src/Shader/Parameters.hs 25;" f goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f -goToTarget src/Dodge/Creature/ReaderUpdate.hs 166;" f grahamEliminate src/Geometry/Polygon.hs 186;" f grahamScan src/Geometry/Polygon.hs 177;" f grapeCannon src/Dodge/Item/Held/Cone.hs 17;" f @@ -3706,13 +3707,13 @@ gridPoints' src/Grid.hs 37;" f gridPointsOff src/Grid.hs 32;" f gridRoomPos src/Dodge/Room/Procedural.hs 91;" f groupSplitItemAmounts src/Dodge/Combine.hs 52;" f -gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 524;" f -gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 854;" f -gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 590;" f -gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 688;" f -gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 700;" f -gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f -gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f +gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 527;" f +gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 859;" f +gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 593;" f +gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 691;" f +gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 703;" f +gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 681;" f +gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 729;" f gyroscope src/Dodge/Item/Scope.hs 170;" f hackBoldText src/Picture/Base.hs 193;" f hackDropShadow src/Picture/Base.hs 196;" f @@ -3726,7 +3727,7 @@ handHandleOrient src/Dodge/Item/HeldOffset.hs 71;" f handOrient src/Dodge/Item/HeldOffset.hs 52;" f handWalkingPos src/Dodge/Creature/HandPos.hs 51;" f handleEvent src/Dodge/Event.hs 27;" f -handleHotkeys src/Dodge/Creature/YourControl.hs 37;" f +handleHotkeys src/Dodge/Creature/YourControl.hs 41;" f handleKeyboardEvent src/Dodge/Event/Input.hs 23;" f handleMouseButtonEvent src/Dodge/Event/Input.hs 59;" f handleMouseMotionEvent src/Dodge/Event/Input.hs 47;" f @@ -3748,7 +3749,7 @@ headLamp src/Dodge/Item/Equipment.hs 68;" f headLampShape src/Dodge/Item/Draw/SPic.hs 425;" f headMap src/Dodge/DoubleTree.hs 118;" f headPQ src/Dodge/Creature/HandPos.hs 174;" f -healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 630;" f +healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 633;" f healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 109;" f healthTest src/Dodge/Room/LasTurret.hs 129;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 24;" f @@ -3759,7 +3760,7 @@ heldEffectMuzzles src/Dodge/HeldUse.hs 135;" f heldHandlePos src/Dodge/Item/HeldOffset.hs 98;" f heldInfo src/Dodge/Item/Info.hs 92;" f heldItemAmmoSlots src/Dodge/Item/AmmoSlots.hs 20;" f -heldItemBulkiness src/Dodge/Creature/YourControl.hs 163;" f +heldItemBulkiness src/Dodge/Creature/YourControl.hs 165;" f heldItemInvLock src/Dodge/HeldUse.hs 469;" f heldItemMuzVel src/Dodge/HeldUse.hs 1022;" f heldItemMuzzles src/Dodge/HeldUse.hs 198;" f @@ -3774,19 +3775,21 @@ 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 616;" f +hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 619;" f hitEffFromBul src/Dodge/Bullet.hs 156;" f -hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 758;" f +hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 761;" f holdForm src/Dodge/Creature/Boid.hs 139;" f holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 50;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToChar src/Dodge/Inventory/SelectionList.hs 185;" f -hotkeyToScancode src/Dodge/Creature/YourControl.hs 62;" f +hotkeyToScancode src/Dodge/Creature/YourControl.hs 66;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 182;" f hoverCrit src/Dodge/Creature/ChaseCrit.hs 35;" f +hoverCritHoverSound src/Dodge/Creature/Update.hs 70;" f hoverCritInternal src/Dodge/Humanoid.hs 28;" f hoverCritMv src/Dodge/Creature/ReaderUpdate.hs 152;" f +hoverDeathSounds src/Dodge/Creature/Vocalization.hs 63;" f iShape src/Dodge/Placement/Instance/LightSource.hs 58;" f icosahedronPoints src/Polyhedra/Geodesic.hs 12;" f icosohedronFaces src/Polyhedra/Geodesic.hs 19;" f @@ -3813,9 +3816,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 816;" f +insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 819;" f insertOver src/ListHelp.hs 47;" f -insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" f +insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 721;" 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 @@ -3921,7 +3924,7 @@ itemBaseName src/Dodge/Item/Display.hs 60;" f itemBaseStance src/Dodge/Item/AimStance.hs 22;" f itemBelowAttachables src/Dodge/Item/Grammar.hs 53;" f itemBlips src/Dodge/RadarSweep.hs 94;" f -itemBulkiness src/Dodge/Creature/YourControl.hs 157;" f +itemBulkiness src/Dodge/Creature/YourControl.hs 159;" f itemCombinations src/Dodge/Combine/Combinations.hs 56;" f itemDetectorEffect src/Dodge/HeldUse.hs 811;" f itemDisplay src/Dodge/Inventory/SelectionList.hs 53;" f @@ -3979,7 +3982,7 @@ keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 94;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 37;" f keyPic src/Dodge/Item/Draw/SPic.hs 441;" f keyholeCorridor src/Dodge/Room/Corridor.hs 45;" f -knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 746;" f +knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 749;" f lChasm src/Dodge/Room/Tutorial.hs 149;" f lConnect src/Dodge/Render/Connectors.hs 43;" f lConnectCol src/Dodge/Render/Connectors.hs 46;" f @@ -3993,7 +3996,7 @@ lasCenRunClose2 src/Dodge/Room/LasTurret.hs 470;" f lasCenRunCloseLongCor src/Dodge/Room/LasTurret.hs 362;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 164;" f lasGunPic src/Dodge/Item/Draw/SPic.hs 416;" f -lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 736;" f +lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 739;" f lasRunRand src/Dodge/Room/LasTurret.hs 467;" f lasRunYinYang src/Dodge/Room/LasTurret.hs 185;" f lasRunYinYangCenter src/Dodge/Room/LasTurret.hs 248;" f @@ -4085,7 +4088,7 @@ loopPairs src/ListHelp.hs 30;" f lootRoom src/Dodge/Room/Treasure.hs 59;" f lorem src/Lorem.hs 3;" f lowBlock src/Dodge/Placement/Instance/Block.hs 28;" f -lowWhirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f +lowWhirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 547;" f lsColPos src/Dodge/LightSource.hs 24;" f lsColPosID src/Dodge/LightSource.hs 21;" f lsColPosRad src/Dodge/LightSource.hs 30;" f @@ -4115,6 +4118,7 @@ makeCloudAt src/Dodge/WorldEvent/Cloud.hs 7;" f makeColorTermLine src/Dodge/Terminal.hs 124;" f makeColorTermPara src/Dodge/Terminal.hs 121;" f makeCorpse src/Dodge/Corpse/Make.hs 13;" f +makeCrGibs src/Dodge/Prop/Gib.hs 18;" f makeDebris src/Dodge/Block/Debris.hs 75;" f makeDebrisDirected src/Dodge/Block/Debris.hs 101;" f makeDebrisDirectedZ src/Dodge/Block/Debris.hs 81;" f @@ -4159,10 +4163,10 @@ makeTileFromPoly src/Tile.hs 34;" f makeTypeCraft src/Dodge/Item/Craftable.hs 15;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 12;" f mapper src/Dodge/Item/Scope.hs 76;" f -marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f -marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 588;" f -marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f -marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 614;" f +marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 621;" f +marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 591;" f +marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 629;" f +marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 617;" f materialColor src/Dodge/Material/Color.hs 8;" f materialPenetrable src/Dodge/Bullet.hs 212;" f maxAmmo src/Dodge/Item/MaxAmmo.hs 6;" f @@ -4213,13 +4217,13 @@ merge src/ListHelp.hs 84;" f mergeBy src/ListHelp.hs 87;" f mergeOn src/ListHelp.hs 94;" f mergeSound src/Sound.hs 60;" f -metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 846;" f -metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 740;" f -metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 576;" f -metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f -metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 658;" f -metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 784;" f -metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 690;" f +metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 851;" f +metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 743;" f +metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 579;" f +metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 529;" f +metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 661;" f +metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 787;" f +metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 693;" f metalPlate src/Dodge/Item/Craftable.hs 32;" f mglCreate src/GLHelp.hs 8;" f mglDelete src/GLHelp.hs 14;" f @@ -4235,18 +4239,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 586;" f +mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 589;" f miniGunCrit src/Dodge/Creature.hs 61;" f miniGunX src/Dodge/Item/Held/Cane.hs 33;" f miniGunXPict src/Dodge/Item/Draw/SPic.hs 375;" f miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 367;" f -miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 656;" f +miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 659;" f miniTree2 src/Dodge/Room/Room.hs 127;" f minimumOn src/FoldlHelp.hs 14;" f mirrorXAxis src/Geometry/Polygon.hs 76;" f mirrorxz src/Picture/Base.hs 330;" f mirroryz src/Picture/Base.hs 335;" f -missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f +missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 625;" f mixColors src/Color.hs 113;" f mixColorsFrac src/Color.hs 109;" f mixColorsLinear src/Color.hs 122;" f @@ -4353,11 +4357,11 @@ numSubElements src/Shader/Parameters.hs 39;" f numTraversable src/TreeHelp.hs 186;" f obstacleColor src/Dodge/Debug/Picture.hs 264;" f obstructPathsCrossing src/Dodge/Path.hs 153;" f -oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f +oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 641;" f onEquipWristShield src/Dodge/Euse.hs 89;" f onRemoveWristShield src/Dodge/Euse.hs 79;" f oneH src/Dodge/Creature/Test.hs 95;" f -oneSmooth src/Dodge/Creature/Picture.hs 113;" f +oneSmooth src/Dodge/Creature/Picture.hs 112;" f openConsole src/Dodge/Update.hs 138;" f optionMenu src/Dodge/Menu.hs 110;" f optionScreenDefaultEffect src/Dodge/Update/Input/ScreenLayer.hs 62;" f @@ -4430,7 +4434,7 @@ performTurnToA src/Dodge/Creature/Action.hs 134;" 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 776;" f +pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 779;" 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 @@ -4477,7 +4481,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 37;" f -poisonSPic src/Dodge/Creature/Update.hs 140;" f +poisonSPic src/Dodge/Creature/Update.hs 158;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f poke34 src/Shader/Poke.hs 509;" f pokeArrayOff src/Shader/Poke.hs 521;" f @@ -4551,7 +4555,7 @@ premapMaybe src/FoldlHelp.hs 26;" f prependTwo src/Geometry.hs 177;" f prettyDT src/Dodge/DoubleTree.hs 127;" f prettyShort src/AesonHelp.hs 11;" f -primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 648;" f +primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 651;" f printColumnTitles src/Dodge/Tree/Shift.hs 155;" f printColumns src/Dodge/Tree/Shift.hs 145;" f printInfo src/Dodge/Tree/Shift.hs 158;" f @@ -4693,10 +4697,10 @@ 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 706;" f -reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 804;" f +reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 709;" f +reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 807;" f reloadLevelStart src/Dodge/Save.hs 71;" f -reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 534;" f +reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 537;" f rememberSounds src/Dodge/Creature/Perception.hs 189;" f remoteDetonator src/Dodge/Item/Scope.hs 152;" f remoteScreen src/Dodge/Item/Scope.hs 146;" f @@ -4716,7 +4720,7 @@ renderListAt src/Dodge/Render/List.hs 177;" f renderShadows src/Render.hs 116;" f replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 184;" f replacePutID src/Dodge/Placement/Instance/Wall.hs 81;" f -resetCrVocCoolDown src/Dodge/Creature/Vocalization.hs 66;" f +resetCrVocCoolDown src/Dodge/Creature/Vocalization.hs 74;" f resetPLUse src/Dodge/PlacementSpot.hs 94;" f resetStride src/Dodge/Creature/State/WalkCycle.hs 51;" f resetTerminal src/Dodge/WorldEffect.hs 158;" f @@ -4734,7 +4738,7 @@ restrictRMInLinksPD src/Dodge/Room/Link.hs 26;" 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 812;" f +reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 815;" f reversePair src/Dodge/LevelGen.hs 87;" f rewinder src/Dodge/Item/Held/Utility.hs 36;" f rezBox src/Dodge/Room/RezBox.hs 31;" f @@ -4834,17 +4838,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 796;" f +sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 799;" 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 266;" f -scalp src/Dodge/Creature/Picture.hs 157;" f -scancodeToHotkey src/Dodge/Creature/YourControl.hs 82;" f +scalp src/Dodge/Creature/Picture.hs 156;" f +scancodeToHotkey src/Dodge/Creature/YourControl.hs 86;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f -scorchSPic src/Dodge/Creature/Update.hs 137;" f +scorchSPic src/Dodge/Creature/Update.hs 155;" 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 @@ -4856,15 +4860,15 @@ scrollRBOption src/Dodge/Update/Scroll.hs 139;" f scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f scrollTimeBack src/Dodge/Update.hs 243;" f scrollTimeForward src/Dodge/Update.hs 260;" f -seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" f -seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 536;" f -seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 602;" f -seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 834;" f -seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f -seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 676;" f -seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 686;" f -seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 754;" f -seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f +seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 585;" f +seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 539;" f +seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 605;" f +seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 839;" f +seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 637;" f +seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 679;" f +seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 689;" f +seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 757;" f +seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 627;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 229;" f secondColumnLDP src/Dodge/ListDisplayParams.hs 45;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 202;" f @@ -4879,7 +4883,7 @@ selSecSelCol src/Dodge/Render/HUD.hs 507;" f selSecSelSize src/Dodge/SelectionSections.hs 157;" f selSecYint src/Dodge/SelectionSections.hs 166;" f selectedItemScroll src/Dodge/Update/Scroll.hs 49;" f -semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 790;" f +semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 793;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 68;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 77;" f senseDamage src/Dodge/Machine/Update.hs 262;" f @@ -4993,7 +4997,7 @@ shootersRoom1 src/Dodge/Room/Room.hs 335;" f shootingRange src/Dodge/Room/Room.hs 362;" f shortPoint2 src/Dodge/ShortShow.hs 4;" f shortShow src/ShortShow.hs 7;" f -shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 530;" f +shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 533;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 77;" f showAttachItem src/Dodge/Item/Display.hs 92;" f showEquipItem src/Dodge/Item/Display.hs 108;" f @@ -5014,30 +5018,30 @@ shuffleTail src/RandomHelp.hs 78;" f sigmoid src/Dodge/Base.hs 151;" f simpleCrSprings src/Dodge/Update.hs 960;" f simpleTermMessage src/Dodge/Terminal.hs 275;" f -sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 762;" f -sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 798;" f +sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 765;" f +sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 801;" f singleAmmo src/Dodge/Item/AmmoSlots.hs 63;" f singleDT src/Dodge/DoubleTree.hs 8;" f 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 802;" f -slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 818;" f -slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 778;" f -slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 704;" f -slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 800;" f -slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 808;" f -slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 574;" f -slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f -slapClean2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 628;" f -slapClean3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f -slapClean4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f -slapClean5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 848;" f -slapClean6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 584;" f -slapClean7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 752;" f -slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 672;" f -slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 632;" f +skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 805;" f +slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 821;" f +slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 781;" f +slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 707;" f +slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 803;" f +slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 811;" f +slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 577;" f +slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 575;" f +slapClean2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 631;" f +slapClean3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 711;" f +slapClean4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 561;" f +slapClean5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 853;" f +slapClean6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 587;" f +slapClean7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 755;" f +slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 675;" f +slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 635;" f slideWindow src/ListHelp.hs 81;" f slowCrush90 src/Dodge/Room/LongDoor.hs 263;" f slowCrushRoom src/Dodge/Room/LongDoor.hs 148;" f @@ -5047,10 +5051,10 @@ smallBattery src/Dodge/Item/Ammo.hs 57;" f smallBranch src/Dodge/Tree/GenerateStructure.hs 32;" f smallChaseCrit src/Dodge/Creature/ChaseCrit.hs 15;" f smallDrawTree src/Dodge/LevelGen.hs 93;" f -smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 830;" f -smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 538;" f -smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 810;" f -smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f +smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 833;" f +smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 541;" f +smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 813;" f +smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 613;" f smallPillar src/Dodge/Room/Pillar.hs 38;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f smallSnailInt2 src/Dodge/Path.hs 106;" f @@ -5070,10 +5074,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 348;" f +soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 350;" f soundPic src/Dodge/Debug/Picture.hs 373;" f soundStart src/Dodge/SoundLogic.hs 118;" f -soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 176;" f +soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 177;" f soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f @@ -5137,7 +5141,7 @@ stackedInventory src/Dodge/Creature.hs 326;" f startCr src/Dodge/Creature.hs 90;" f startCrafts src/Dodge/Room/Start.hs 94;" f startDrag src/Dodge/Update/Input/InGame.hs 286;" f -startFalling src/Dodge/Creature/Update.hs 166;" f +startFalling src/Dodge/Creature/Update.hs 184;" f startInvList src/Dodge/Creature.hs 105;" f startInventory src/Dodge/Creature.hs 108;" f startNewGameInSlot src/Dodge/StartNewGame.hs 16;" f @@ -5148,11 +5152,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 56;" f -stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" f -stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 772;" f -stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 540;" f -stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 546;" f -stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 660;" f +stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 595;" f +stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 775;" f +stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 543;" f +stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 549;" f +stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 663;" f stopAllSounds src/Sound.hs 127;" f stopBulletAt src/Dodge/Bullet.hs 201;" f stopPushing src/Dodge/Wall/Damage.hs 172;" f @@ -5199,11 +5203,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 786;" f -tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 520;" f -tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 732;" f -tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 820;" f -tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f +tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 789;" f +tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 523;" f +tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 735;" f +tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 823;" f +tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 643;" 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 @@ -5212,7 +5216,7 @@ targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 218;" 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 578;" f +teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 581;" f termScreenColor src/Dodge/Terminal/Color.hs 8;" f termSoundLine src/Dodge/Terminal.hs 49;" f termTextColor src/Dodge/Terminal.hs 52;" f @@ -5258,8 +5262,8 @@ thingsHit src/Dodge/WorldEvent/ThingsHit.hs 46;" f thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 143;" f thingsHitZ src/Dodge/WorldEvent/ThingsHit.hs 54;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 67;" f -throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 806;" f -throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 766;" f +throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 809;" f +throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 769;" f throwItem src/Dodge/Creature/Action.hs 197;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 216;" f @@ -5268,13 +5272,13 @@ timeFlowUpdate src/Dodge/Update.hs 203;" 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 24;" f -ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f -ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f -ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 722;" f -ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 606;" f -ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 770;" f -tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 742;" f -tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 852;" f +ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 615;" f +ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 683;" f +ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 725;" f +ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 609;" f +ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 773;" f +tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 745;" f +tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 857;" f titleOptionsMenu src/Dodge/Menu.hs 104;" f titleOptionsNoWrite src/Dodge/Menu.hs 107;" f tlDoEffect src/Dodge/Terminal.hs 115;" f @@ -5286,7 +5290,7 @@ toBinary src/Dodge/Inventory/SelectionList.hs 138;" f toBothLnk src/Dodge/RoomLink.hs 136;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 158;" f -toDeathCarriage src/Dodge/Creature/Update.hs 102;" f +toDeathCarriage src/Dodge/Creature/Update.hs 120;" f toFloatVAs src/Shader/Compile.hs 66;" f toLabel src/Dodge/Cleat.hs 16;" f toMultiset src/Multiset.hs 64;" f @@ -5301,11 +5305,11 @@ toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 68;" f toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 106;" f toggleJust src/MaybeHelp.hs 39;" f toggleMapperInv src/Dodge/Creature/Impulse/UseItem.hs 111;" f -tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 696;" f -tone440_30sS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 636;" f -tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 604;" f -tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 662;" f -tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 668;" f +tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 699;" f +tone440_30sS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 639;" f +tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 607;" f +tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 665;" f +tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 671;" f topInvW src/Dodge/ListDisplayParams.hs 54;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f @@ -5313,7 +5317,7 @@ topTestPart src/Dodge/TestString.hs 87;" f torchShape src/Dodge/Item/Draw/SPic.hs 277;" f torqueAmount src/Dodge/HeldUse.hs 606;" f torqueCr src/Dodge/WorldEffect.hs 85;" f -torso src/Dodge/Creature/Picture.hs 162;" f +torso src/Dodge/Creature/Picture.hs 161;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f tractorBeamAt src/Dodge/HeldUse.hs 850;" f @@ -5362,7 +5366,7 @@ truncFaces src/Polyhedra/Geodesic.hs 54;" f truncate src/Polyhedra/Geodesic.hs 39;" f trunkDepth src/TreeHelp.hs 164;" f tryAttachItems src/Dodge/Item/Grammar.hs 34;" f -tryClickUse src/Dodge/Creature/YourControl.hs 205;" f +tryClickUse src/Dodge/Creature/YourControl.hs 207;" f tryCombine src/Dodge/Update/Input/InGame.hs 521;" f tryDrawToCapacitor src/Dodge/Creature/State.hs 156;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 140;" f @@ -5394,11 +5398,11 @@ twists src/Dodge/Creature/Test.hs 101;" f twoFlat src/Dodge/Creature/Test.hs 98;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 89;" f twoHandOffY src/Dodge/Creature/HandPos.hs 130;" f -twoHandTwistAmount src/Dodge/Creature/YourControl.hs 135;" f +twoHandTwistAmount src/Dodge/Creature/YourControl.hs 137;" f twoRoomPoss src/Dodge/PlacementSpot.hs 148;" f -twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 522;" f -twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 570;" f -twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 652;" f +twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 525;" f +twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 573;" f +twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 655;" f ubyteSize src/Shader/Parameters.hs 13;" f ugateCalc src/Dodge/Inventory/SelectionList.hs 109;" f uncurryV src/Geometry/Data.hs 66;" f @@ -5437,7 +5441,7 @@ updateCloud src/Dodge/Update.hs 886;" f updateClouds src/Dodge/Update.hs 755;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 40;" f updateCombineSections src/Dodge/DisplayInventory.hs 47;" f -updateCreature src/Dodge/Creature/Update.hs 38;" f +updateCreature src/Dodge/Creature/Update.hs 40;" f updateCreatureGroups src/Dodge/Update.hs 616;" f updateCreatureSoundPositions src/Dodge/Update.hs 595;" f updateCreatureStride src/Dodge/Update.hs 374;" f @@ -5486,7 +5490,7 @@ updateLaser src/Dodge/Laser/Update.hs 12;" f updateLasers src/Dodge/Update.hs 495;" f updateLeftParentSF src/Dodge/Item/Grammar.hs 177;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLivingCreature src/Dodge/Creature/Update.hs 48;" f +updateLivingCreature src/Dodge/Creature/Update.hs 50;" f updateLongPressInGame src/Dodge/Update/Input/InGame.hs 417;" f updateMachine src/Dodge/Machine/Update.hs 24;" f updateMagnets src/Dodge/Update.hs 389;" f @@ -5503,7 +5507,7 @@ updatePlasmaBall src/Dodge/Update.hs 509;" f updatePlasmaBalls src/Dodge/Update.hs 651;" f updatePreload src/Preload/Update.hs 21;" f updateProjectile src/Dodge/Projectile/Update.hs 26;" f -updatePulse src/Dodge/Creature/Update.hs 210;" f +updatePulse src/Dodge/Creature/Update.hs 228;" f updatePulseBall src/Dodge/Update.hs 529;" f updatePulseLaser src/Dodge/Update.hs 698;" f updatePulseLasers src/Dodge/Update.hs 504;" f @@ -5545,7 +5549,7 @@ updateWheelEvent src/Dodge/Update/Scroll.hs 21;" f updateWheelEvents src/Dodge/Update.hs 474;" f updateWorldEventFlag src/Dodge/Update.hs 127;" f updateWorldEventFlags src/Dodge/Update.hs 115;" f -upperBody src/Dodge/Creature/Picture.hs 177;" f +upperBody src/Dodge/Creature/Picture.hs 176;" f upperBox src/Shape.hs 153;" f upperBoxHalf src/Shape.hs 219;" f upperBoxMT src/Shape.hs 144;" f @@ -5565,7 +5569,7 @@ upperPrismPolyTS src/Shape.hs 116;" f upperRounded src/Shape.hs 182;" f useBulletPayload src/Dodge/Bullet.hs 117;" f useGasParams src/Dodge/HeldUse.hs 1111;" f -useHotkey src/Dodge/Creature/YourControl.hs 57;" f +useHotkey src/Dodge/Creature/YourControl.hs 61;" f useInventoryPath src/Dodge/HeldUse.hs 1402;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 19;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 26;" f @@ -5622,12 +5626,12 @@ wallsFromRooms src/Dodge/Layout.hs 153;" f wallsToDraw src/Dodge/Render/Walls.hs 18;" f warmupSound src/Dodge/HeldUse.hs 1396;" f warningRooms src/Dodge/Room/Warning.hs 34;" f -warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 850;" f -wasdAim src/Dodge/Creature/YourControl.hs 113;" f +warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 855;" f +wasdAim src/Dodge/Creature/YourControl.hs 117;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f -wasdMovement src/Dodge/Creature/YourControl.hs 138;" f -wasdWithAiming src/Dodge/Creature/YourControl.hs 106;" f +wasdMovement src/Dodge/Creature/YourControl.hs 140;" f +wasdWithAiming src/Dodge/Creature/YourControl.hs 110;" f watchCombinations src/Dodge/Combine/Combinations.hs 16;" f watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 201;" f weaponBehindPillar src/Dodge/Room/Room.hs 200;" f @@ -5638,22 +5642,22 @@ weaponRoom src/Dodge/Room/Room.hs 281;" f weaponUnderCrits src/Dodge/Room/Room.hs 179;" f wedgeGeom src/Dodge/Base.hs 42;" f wedgeOfThickness src/Dodge/Picture.hs 9;" f -whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 642;" f -whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 768;" f -whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 654;" f -whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 620;" f -whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 568;" f -whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 724;" f -whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 564;" f -whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 550;" f -whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 728;" f -whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 760;" f -whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f -whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f -whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 644;" f +whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 645;" f +whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 771;" f +whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 657;" f +whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 623;" f +whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 571;" f +whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 727;" f +whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 567;" f +whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 553;" f +whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 731;" f +whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 763;" f +whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 535;" f +whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 687;" f +whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 647;" f white src/Color.hs 53;" f -whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 608;" f -whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f +whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 611;" f +whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 559;" 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 @@ -5687,7 +5691,7 @@ worldPosToScreen src/Dodge/Base/Coordinate.hs 24;" 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 528;" f +wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 531;" f wristArmour src/Dodge/Item/Equipment.hs 35;" f wristInvisibility src/Dodge/Item/Equipment.hs 80;" f writeConfig src/Dodge/Menu.hs 180;" f