diff --git a/data/sound/slap2.SLP.100.wav b/data/sound/slap2.SLP.100.wav new file mode 100644 index 000000000..25806d238 Binary files /dev/null and b/data/sound/slap2.SLP.100.wav differ diff --git a/data/sound/slap3.SLP.100.wav b/data/sound/slap3.SLP.100.wav new file mode 100644 index 000000000..2f0801d29 Binary files /dev/null and b/data/sound/slap3.SLP.100.wav differ diff --git a/data/sound/slap4.SLP.100.wav b/data/sound/slap4.SLP.100.wav new file mode 100644 index 000000000..8f04bf89a Binary files /dev/null and b/data/sound/slap4.SLP.100.wav differ diff --git a/data/sound/slap5.SLP.100.wav b/data/sound/slap5.SLP.100.wav new file mode 100644 index 000000000..a6a57569f Binary files /dev/null and b/data/sound/slap5.SLP.100.wav differ diff --git a/data/sound/slap6.SLP.100.wav b/data/sound/slap6.SLP.100.wav new file mode 100644 index 000000000..fdd242b1a Binary files /dev/null and b/data/sound/slap6.SLP.100.wav differ diff --git a/data/sound/slap7.SLP.100.wav b/data/sound/slap7.SLP.100.wav new file mode 100644 index 000000000..00dc08889 Binary files /dev/null and b/data/sound/slap7.SLP.100.wav differ diff --git a/data/sound/slapClean2.SLP.100.wav b/data/sound/slapClean2.SLP.100.wav new file mode 100644 index 000000000..be525bdf6 Binary files /dev/null and b/data/sound/slapClean2.SLP.100.wav differ diff --git a/data/sound/slapClean3.SLP.100.wav b/data/sound/slapClean3.SLP.100.wav new file mode 100644 index 000000000..9e75736ad Binary files /dev/null and b/data/sound/slapClean3.SLP.100.wav differ diff --git a/data/sound/slapClean4.SLP.100.wav b/data/sound/slapClean4.SLP.100.wav new file mode 100644 index 000000000..8a6fdea61 Binary files /dev/null and b/data/sound/slapClean4.SLP.100.wav differ diff --git a/data/sound/slapClean5.SLP.100.wav b/data/sound/slapClean5.SLP.100.wav new file mode 100644 index 000000000..314bf8372 Binary files /dev/null and b/data/sound/slapClean5.SLP.100.wav differ diff --git a/data/sound/slapClean6.SLP.100.wav b/data/sound/slapClean6.SLP.100.wav new file mode 100644 index 000000000..c0f7bdc7b Binary files /dev/null and b/data/sound/slapClean6.SLP.100.wav differ diff --git a/data/sound/slapClean7.SLP.100.wav b/data/sound/slapClean7.SLP.100.wav new file mode 100644 index 000000000..9dae0aee5 Binary files /dev/null and b/data/sound/slapClean7.SLP.100.wav differ diff --git a/src/Dodge/Item/HeldOffset.hs b/src/Dodge/Item/HeldOffset.hs index f92f11b3b..6497df3e0 100644 --- a/src/Dodge/Item/HeldOffset.hs +++ b/src/Dodge/Item/HeldOffset.hs @@ -44,17 +44,10 @@ handOrient cr = case cr ^. crStance . posture of OneHand -> (V3 13 (-2) shoulderHeight, Q.qID) TwoHandFlat -> (V3 13 0 shoulderHeight, Q.qID) AtEase -> \case - --OneHand -> (V3 (10 + walkhandp) (-7) 15, Q.qID) OneHand -> rightHandPQ cr TwoHandFlat -> (V3 10 0 15, Q.axisAngle (V3 0 0 1) $ twoFlatHRot cr) TwoHandUnder -> (V3 7 (-8) 15, Q.axisAngle (V3 0 0 1) (strideRot cr + 1.2)) TwoHandOver -> (V3 10 0 15, Q.axisAngle (V3 0 0 1) (strideRot cr + 1.2)) - where - walkhandp = case cr ^? crStance . carriage of - Just (Walking x LeftForward) -> f x * 50 -2 - _ -> - 2 - f i = 0.1 * (sLen - i) / sLen - sLen = _strideLength $ _crStance cr locOrient :: LocationDT OItem -> Creature -> Point3Q locOrient loc cr = diff --git a/src/Dodge/Material/Damage.hs b/src/Dodge/Material/Damage.hs index df035a164..aee8433ec 100644 --- a/src/Dodge/Material/Damage.hs +++ b/src/Dodge/Material/Damage.hs @@ -36,7 +36,8 @@ damageStone dm ecw w = case dm of Piercing _ p t -> f dmam $ makeSpark NormalSpark (outTo p t) (rdir p t) . makeDustAt Stone 200 (addZ 20 (outTo p t)) - . randsound p [slapS, slap1S] +-- . randsound p [slapS, slap1S,slap2S,slap3S,slap4S,slap5S,slap6S,slap7S] + . randsound p [slapS, slap1S,slap2S] Blunt _ p t -> f dmam $ makeDustAt Stone 200 (addZ 20 (outTo p t)) Shattering _ p t -> f dmam $ makeDustAt Stone 200 (addZ 20 (outTo p t)) Crushing{} -> f dmam id @@ -133,7 +134,8 @@ damageDirt dm _ w = makeDustAt Dirt 200 (addZ 20 (outTo p t)) Piercing _ p t -> makeDustAt Dirt 200 (addZ 20 (outTo p t)) - . randsound p [slapS, slap1S] + -- . randsound p [slapS, slap1S] + . randsound p [slapS, slap1S,slap2S,slap3S,slap4S,slap5S,slap6S,slap7S] Blunt _ p t -> makeDustAt Dirt 200 (addZ 20 (outTo p t)) Shattering _ p t -> makeDustAt Dirt 200 (addZ 20 (outTo p t)) Crushing{} -> id diff --git a/src/Dodge/Material/Sound.hs b/src/Dodge/Material/Sound.hs index 511e92bfb..d60710f75 100644 --- a/src/Dodge/Material/Sound.hs +++ b/src/Dodge/Material/Sound.hs @@ -1,4 +1,4 @@ -module Dodge.Material.Sound where +module Dodge.Material.Sound (destroyMatS) where import Dodge.Data.Material import Dodge.SoundLogic.ExternallyGeneratedSounds @@ -16,14 +16,14 @@ destroyMatS mat = case mat of Flesh -> [gut1S, gut2S, gut3S, gut4S, gut5S, gut6S] ForceField -> [] -weakenMatS :: Material -> [SoundID] -weakenMatS mat = case mat of - Glass -> [smallGlass1S, smallGlass2S, smallGlass3S, smallGlass4S] - Crystal -> [smallGlass1S, smallGlass2S, smallGlass3S, smallGlass4S] - Stone -> [stone1S, stone2S, stone3S, stone4S, stone5S] - Dirt -> [stone1S, stone3S] - Wood -> [stone1S, stone3S] - Metal -> [metal1S, metal2S, metal3S, metal4S, metal5S, metal6S, metal7S] - Electronics -> [metal1S, metal2S, metal3S, metal4S, metal5S, metal6S, metal7S] - Flesh -> [blood1S, blood2S, blood3S, blood4S, blood5S, blood6S, blood7S, blood8S] - ForceField -> [] +--weakenMatS :: Material -> [SoundID] +--weakenMatS mat = case mat of +-- Glass -> [smallGlass1S, smallGlass2S, smallGlass3S, smallGlass4S] +-- Crystal -> [smallGlass1S, smallGlass2S, smallGlass3S, smallGlass4S] +-- Stone -> [stone1S, stone2S, stone3S, stone4S, stone5S] +-- Dirt -> [stone1S, stone3S] +-- Wood -> [stone1S, stone3S] +-- Metal -> [metal1S, metal2S, metal3S, metal4S, metal5S, metal6S, metal7S] +-- Electronics -> [metal1S, metal2S, metal3S, metal4S, metal5S, metal6S, metal7S] +-- Flesh -> [blood1S, blood2S, blood3S, blood4S, blood5S, blood6S, blood7S, blood8S] +-- ForceField -> [] diff --git a/src/Dodge/Projectile/Update.hs b/src/Dodge/Projectile/Update.hs index edb15c4e8..b30bffda6 100644 --- a/src/Dodge/Projectile/Update.hs +++ b/src/Dodge/Projectile/Update.hs @@ -1,8 +1,7 @@ ---{-# LANGUAGE LambdaCase #-} ---{-# OPTIONS_GHC -Wno-unused-imports #-} +-- {-# LANGUAGE LambdaCase #-} +-- {-# OPTIONS_GHC -Wno-unused-imports #-} module Dodge.Projectile.Update (updateProjectile) where -import Dodge.WorldEvent.Cloud import Control.Monad import Data.List (delete) import Data.Maybe @@ -14,7 +13,8 @@ import Dodge.Item.Location import Dodge.Movement.Turn import Dodge.Payload import Dodge.SoundLogic ---import Dodge.WorldEvent.Cloud +import Dodge.WorldEvent.Cloud +-- import Dodge.WorldEvent.Cloud import Dodge.WorldEvent.Sound import Geometry import qualified IntMapHelp as IM @@ -50,7 +50,7 @@ applyGravityPU pj shellExplosionCheck :: Projectile -> World -> World shellExplosionCheck pj | RetiredProjectile <- pj ^. pjType - , timeout = + , timeout = destroyProjectile pj | timeout = explodeShell pj | otherwise = id @@ -63,7 +63,7 @@ shellHitWall p n wl pj (topj . pjType .~ Grenade (GStuckWall (wl ^. wlStructure))) . stickHitSound pj | Just x <- pj ^? pjType . gnHitEffect . bounceTolerance - , abs (dot (pj ^. pjVel) (normalize n)) < x = + , abs (dot (pj ^. pjVel) (normalize n)) < x = (topj . pjVel %~ reflectInNormal n) . (topj . pjPos .~ p + normalize n) . bounceSound pj @@ -76,7 +76,10 @@ bounceSound pj = soundStart (ShellSound (pj ^. pjID)) (pj ^. pjPos . _xy) click1 stickHitSound :: Projectile -> World -> World stickHitSound pj = - soundOriginIDsAt (ShellSound (pj ^. pjID)) [slapS, slap1S] (pj ^. pjPos . _xy) + soundOriginIDsAt + (ShellSound (pj ^. pjID)) + [slapS, slap1S, slap2S, slap3S, slap4S, slap5S, slap6S, slap7S] + (pj ^. pjPos . _xy) shellHitCreature :: Point3 -> Creature -> Projectile -> World -> World shellHitCreature p cr pj @@ -89,7 +92,7 @@ shellHitCreature p cr pj gren = GStuckCreature (cr ^. crID) - (rotate3z (- cr ^. crDir) (p - cr ^. crPos)) + (rotate3z (-cr ^. crDir) (p - cr ^. crPos)) (pj ^. pjDir - cr ^. crDir) shellHitFloor :: Point3 -> Projectile -> World -> World @@ -129,8 +132,15 @@ tryThrust pj = fromMaybe id $ do doThrust :: Projectile -> Maybe RocketSmoke -> World -> World doThrust pj smoke w = w - & randGen .~ g - & cWorld . lWorld . projectiles . ix i . pjVel . _xy %~ (\v -> accel + frict *^ v) + & randGen + .~ g + & cWorld + . lWorld + . projectiles + . ix i + . pjVel + . _xy + %~ (\v -> accel + frict *^ v) & soundContinue (ShellSound i) (ep ^. _xy) missileLaunchS (Just 1) & makeFlamelet (sp - 0.5 *^ vel) @@ -157,15 +167,28 @@ doThrust pj smoke w = doBarrelSpin :: Int -> Float -> Projectile -> World -> World doBarrelSpin cid i pj w = - w & cWorld . lWorld . projectiles . ix pjid . pjSpin .~ newSpin - & cWorld . lWorld . projectiles . ix pjid . pjBarrelSpin .~ Nothing + w + & cWorld + . lWorld + . projectiles + . ix pjid + . pjSpin + .~ newSpin + & cWorld + . lWorld + . projectiles + . ix pjid + . pjBarrelSpin + .~ Nothing where pjid = _pjID pj dir = argV $ pj ^. pjVel . _xy newSpin = case w ^? cWorld . lWorld . creatures . ix cid of Just cr -> negate $ - min 0.2 $ max (-0.2) $ normalizeAnglePi (dir - _crDir cr) / spinFactor + min 0.2 $ + max (-0.2) $ + normalizeAnglePi (dir - _crDir cr) / spinFactor _ -> 0 spinFactor = 5 * (6 - i) @@ -176,17 +199,25 @@ pjRemoteSetDirection ph pj w = case ph of | lw ^? creatures . ix 0 . crManipulation . manObject . imSelectedItem == lw ^? items . ix (_unNInt screenid) . itLocation . ilInvID -> w - & pjlens . pjDir .~ mousedir - & pjlens . pjSpin .~ 0.5 * diffAngles mousedir pjdir + & pjlens + . pjDir + .~ mousedir + & pjlens + . pjSpin + .~ 0.5 + * diffAngles mousedir pjdir HomeUsingTargeting itid | Just tp <- w ^? pointerToItemID itid . itTargeting . itTgPos . _Just -> w - & pjlens . pjDir %~ turnTo 0.2 (pj ^. pjPos . _xy) tp - & pjlens . pjSpin - .~ 0.5 - * diffAngles - (turnTo 0.2 (pj ^. pjPos . _xy) tp pjdir) - pjdir + & pjlens + . pjDir + %~ turnTo 0.2 (pj ^. pjPos . _xy) tp + & pjlens + . pjSpin + .~ 0.5 + * diffAngles + (turnTo 0.2 (pj ^. pjPos . _xy) tp pjdir) + pjdir _ -> w where pjdir = pj ^. pjDir @@ -201,9 +232,17 @@ moveStuckGrenade cid poff d pj w = fromMaybe (w & pjlens . pjType .~ Grenade GSt cdir = cr ^. crDir return $ w - & pjlens . pjPos . _xy .~ xyV3 (cpos + rotate3z cdir poff) - & pjlens . pjDir .~ d + cdir - & pjlens . pjVel .~ (cpos - cr ^. crOldPos) + & pjlens + . pjPos + . _xy + .~ xyV3 (cpos + rotate3z cdir poff) + & pjlens + . pjDir + .~ d + + cdir + & pjlens + . pjVel + .~ (cpos - cr ^. crOldPos) where pjlens = cWorld . lWorld . projectiles . ix (pj ^. pjID) @@ -219,9 +258,15 @@ moveProjectile pj w (_, Just (_, OChasmWall)) -> w & pjlens . pjTimer .~ 0 -- no stick or bounce for now _ -> w - & pjlens . pjSpin *~ 0.99 - & pjlens . pjPos +~ _pjVel pj - & pjlens . pjDir +~ _pjSpin pj + & pjlens + . pjSpin + *~ 0.99 + & pjlens + . pjPos + +~ _pjVel pj + & pjlens + . pjDir + +~ _pjSpin pj where pjlens = cWorld . lWorld . projectiles . ix (pj ^. pjID) sp = _pjPos pj @@ -229,9 +274,15 @@ moveProjectile pj w explodeShell :: Projectile -> World -> World explodeShell pj w = w - & pjlens . pjType .~ RetiredProjectile - & pjlens . pjVel .~ 0 - & pjlens . pjTimer .~ 30 + & pjlens + . pjType + .~ RetiredProjectile + & pjlens + . pjVel + .~ 0 + & pjlens + . pjTimer + .~ 30 & usePayload (_pjPayload pj) (pj ^. pjPos) (pj ^. pjVel) & stopSoundFrom (ShellSound pjid) & updatedetonator diff --git a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs index de756d031..869958f7e 100644 --- a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs +++ b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs @@ -1,4 +1,4 @@ --- generated at 2025-12-26 16:45:40.177445936 UTC +-- generated at 2025-12-26 17:19:51.7238549 UTC module Dodge.SoundLogic.ExternallyGeneratedSounds where import Sound.Data soundToVol :: SoundID -> Float @@ -27,135 +27,141 @@ soundToVol v = case _getSoundID v of 21 -> 100 22 -> 200 23 -> 40 - 24 -> 1000 - 25 -> 1000 - 26 -> 500 - 27 -> 2000 - 28 -> 2000 - 29 -> 200 - 30 -> 200 - 31 -> 1000 - 32 -> 100 - 33 -> 200 + 24 -> 100 + 25 -> 100 + 26 -> 1000 + 27 -> 1000 + 28 -> 500 + 29 -> 2000 + 30 -> 2000 + 31 -> 200 + 32 -> 200 + 33 -> 1000 34 -> 100 - 35 -> 100 - 36 -> 2000 - 37 -> 300 - 38 -> 200 - 39 -> 100 - 40 -> 500 - 41 -> 200 - 42 -> 200 - 43 -> 100 + 35 -> 200 + 36 -> 100 + 37 -> 100 + 38 -> 2000 + 39 -> 300 + 40 -> 200 + 41 -> 100 + 42 -> 500 + 43 -> 200 44 -> 200 - 45 -> 200 - 46 -> 2000 - 47 -> 2000 - 48 -> 200 - 49 -> 50 - 50 -> 100 - 51 -> 2000 - 52 -> 1000 - 53 -> 40 - 54 -> 300 - 55 -> 250 - 56 -> 100 - 57 -> 500 - 58 -> 2000 - 59 -> 40 - 60 -> 200 - 61 -> 2000 - 62 -> 1000 - 63 -> 1000 - 64 -> 2000 - 65 -> 500 - 66 -> 500 + 45 -> 100 + 46 -> 200 + 47 -> 200 + 48 -> 2000 + 49 -> 2000 + 50 -> 200 + 51 -> 50 + 52 -> 100 + 53 -> 2000 + 54 -> 1000 + 55 -> 40 + 56 -> 300 + 57 -> 250 + 58 -> 100 + 59 -> 500 + 60 -> 2000 + 61 -> 40 + 62 -> 200 + 63 -> 2000 + 64 -> 1000 + 65 -> 1000 + 66 -> 2000 67 -> 500 - 68 -> 100 - 69 -> 100 - 70 -> 2000 - 71 -> 200 - 72 -> 200 - 73 -> 500 + 68 -> 500 + 69 -> 500 + 70 -> 100 + 71 -> 100 + 72 -> 2000 + 73 -> 200 74 -> 200 - 75 -> 2000 + 75 -> 500 76 -> 200 - 77 -> 1000 - 78 -> 1000 - 79 -> 250 - 80 -> 300 - 81 -> 2000 - 82 -> 200 - 83 -> 1000 - 84 -> 300 - 85 -> 40 - 86 -> 1000 - 87 -> 100 - 88 -> 1000 - 89 -> 500 + 77 -> 2000 + 78 -> 200 + 79 -> 1000 + 80 -> 1000 + 81 -> 250 + 82 -> 300 + 83 -> 2000 + 84 -> 200 + 85 -> 1000 + 86 -> 100 + 87 -> 300 + 88 -> 40 + 89 -> 1000 90 -> 100 - 91 -> 200 - 92 -> 250 - 93 -> 200 + 91 -> 1000 + 92 -> 500 + 93 -> 100 94 -> 200 - 95 -> 50 - 96 -> 1000 - 97 -> 50 - 98 -> 500 - 99 -> 500 - 100 -> 1000 - 101 -> 200 - 102 -> 2000 - 103 -> 20 - 104 -> 500 - 105 -> 200 - 106 -> 2000 - 107 -> 100 - 108 -> 100 - 109 -> 200 - 110 -> 300 - 111 -> 500 - 112 -> 100 + 95 -> 250 + 96 -> 200 + 97 -> 200 + 98 -> 50 + 99 -> 1000 + 100 -> 50 + 101 -> 500 + 102 -> 500 + 103 -> 1000 + 104 -> 200 + 105 -> 2000 + 106 -> 20 + 107 -> 500 + 108 -> 200 + 109 -> 2000 + 110 -> 100 + 111 -> 100 + 112 -> 200 113 -> 300 - 114 -> 200 - 115 -> 1000 - 116 -> 100 - 117 -> 50 - 118 -> 100 - 119 -> 50 - 120 -> 1000 - 121 -> 500 - 122 -> 40 - 123 -> 100 - 124 -> 200 + 114 -> 500 + 115 -> 100 + 116 -> 300 + 117 -> 200 + 118 -> 1000 + 119 -> 100 + 120 -> 50 + 121 -> 100 + 122 -> 100 + 123 -> 50 + 124 -> 1000 125 -> 500 - 126 -> 1000 - 127 -> 300 - 128 -> 300 - 129 -> 100 - 130 -> 500 - 131 -> 100 + 126 -> 40 + 127 -> 100 + 128 -> 200 + 129 -> 500 + 130 -> 1000 + 131 -> 300 132 -> 100 - 133 -> 500 + 133 -> 300 134 -> 100 135 -> 100 136 -> 500 - 137 -> 40 - 138 -> 200 - 139 -> 50 - 140 -> 500 - 141 -> 2000 - 142 -> 2000 + 137 -> 100 + 138 -> 100 + 139 -> 500 + 140 -> 100 + 141 -> 100 + 142 -> 500 143 -> 40 - 144 -> 100 - 145 -> 100 + 144 -> 200 + 145 -> 50 146 -> 500 - 147 -> 100 - 148 -> 1000 - 149 -> 500 - 150 -> 8000 - 151 -> 200 - 152 -> 300 + 147 -> 2000 + 148 -> 2000 + 149 -> 40 + 150 -> 100 + 151 -> 100 + 152 -> 500 + 153 -> 100 + 154 -> 1000 + 155 -> 500 + 156 -> 8000 + 157 -> 200 + 158 -> 300 _ -> 50 soundToOnomato :: SoundID -> String soundToOnomato v = case _getSoundID v of @@ -183,135 +189,141 @@ soundToOnomato v = case _getSoundID v of 21 -> "SQLEE" 22 -> "WHH" 23 -> "TIPTAP" - 24 -> "DHDHL" - 25 -> "ZHM" - 26 -> "CLANG" - 27 -> "UGGAUGGA" - 28 -> "BRDBRDBRD" - 29 -> "DING" - 30 -> "CRNCH" - 31 -> "CRASH" - 32 -> "SPLRT" - 33 -> "ZMM" - 34 -> "SQLEE" - 35 -> "CHNKCHNKCHUNK" - 36 -> "CHUGUGUG" - 37 -> "BWEP" - 38 -> "TING" - 39 -> "FHP" - 40 -> "TINKLE" - 41 -> "TING" - 42 -> "DING" - 43 -> "SMACK" + 24 -> "SLP" + 25 -> "SLP" + 26 -> "DHDHL" + 27 -> "ZHM" + 28 -> "CLANG" + 29 -> "UGGAUGGA" + 30 -> "BRDBRDBRD" + 31 -> "DING" + 32 -> "CRNCH" + 33 -> "CRASH" + 34 -> "SPLRT" + 35 -> "ZMM" + 36 -> "SQLEE" + 37 -> "CHNKCHNKCHUNK" + 38 -> "CHUGUGUG" + 39 -> "BWEP" + 40 -> "TING" + 41 -> "FHP" + 42 -> "TINKLE" + 43 -> "TING" 44 -> "DING" - 45 -> "WHH" - 46 -> "WHSSH" - 47 -> "WE-OH" - 48 -> "DING" - 49 -> "BLIH" - 50 -> "DRR" - 51 -> "CRH" - 52 -> "BLPCHCH" - 53 -> "CLNK" - 54 -> "WHRR" - 55 -> "WHR" - 56 -> "KKSQWL" - 57 -> "CLKCLK" - 58 -> "BANGG" - 59 -> "TIPTOP" - 60 -> "WHH" - 61 -> "BRPBRPBRP" - 62 -> "TTRKL" - 63 -> "CRUMBL" - 64 -> "SCREE" - 65 -> "WRRR" + 45 -> "SMACK" + 46 -> "DING" + 47 -> "WHH" + 48 -> "WHSSH" + 49 -> "WE-OH" + 50 -> "DING" + 51 -> "BLIH" + 52 -> "DRR" + 53 -> "CRH" + 54 -> "BLPCHCH" + 55 -> "CLNK" + 56 -> "WHRR" + 57 -> "WHR" + 58 -> "KKSQWL" + 59 -> "CLKCLK" + 60 -> "BANGG" + 61 -> "TIPTOP" + 62 -> "WHH" + 63 -> "BRPBRPBRP" + 64 -> "TTRKL" + 65 -> "CRUMBL" 66 -> "SCREE" - 67 -> "BIPBIPBIP" - 68 -> "SLP" - 69 -> "CLCLH" - 70 -> "CREUH" - 71 -> "SQWLTCH" - 72 -> "TING" - 73 -> "DEDEDA" - 74 -> "WHR" - 75 -> "CRUH" - 76 -> "SQWCH" - 77 -> "TRWNG" - 78 -> "CRSK" - 79 -> "DMP" - 80 -> "BEP" - 81 -> "BOOM" - 82 -> "SKREL" - 83 -> "CRSNK" - 84 -> "CHPCHPCHP" - 85 -> "TAP" - 86 -> "CRNKL" - 87 -> "WRR" - 88 -> "CRNK" - 89 -> "CUHRUP" - 90 -> "SPLRT" - 91 -> "TING" - 92 -> "WHRHH" - 93 -> "CRSKRL" - 94 -> "WH" - 95 -> "FHFH" - 96 -> "BRAP" - 97 -> "WHHH" - 98 -> "PLH" - 99 -> "CLANG" - 100 -> "CRUNK" - 101 -> "TING" - 102 -> "TATATA" - 103 -> "SWSH" - 104 -> "DNDNDNDN" - 105 -> "THCK" - 106 -> "PEW" - 107 -> "SKLE" - 108 -> "THUD" - 109 -> "WH" - 110 -> "BWAH" - 111 -> "DEDEDUM" - 112 -> "WHUMWHUM" - 113 -> "WHRP" - 114 -> "TING" - 115 -> "CRMPL" - 116 -> "SKLE" - 117 -> "SHUHP" - 118 -> "SPRT" - 119 -> "HSS" - 120 -> "TRNKL" - 121 -> "TAK" - 122 -> "CLICK" - 123 -> "DUHDEH" - 124 -> "SHTCK" - 125 -> "DEDUM" - 126 -> "BWMP" - 127 -> "BWAAH" - 128 -> "DWAAH" - 129 -> "VFVFVF" - 130 -> "CRTINK" - 131 -> "VHHP" - 132 -> "SPRT" - 133 -> "PRUM" - 134 -> "SLPP" - 135 -> "FWUMP" - 136 -> "CLANG" - 137 -> "TIP" - 138 -> "CRAKLE" - 139 -> "HSSS" - 140 -> "TRINKL" - 141 -> "BANG" - 142 -> "CHUGUGUG" - 143 -> "TAPP" - 144 -> "KKSQWL" - 145 -> "SKWLL" - 146 -> "DUDURAH" - 147 -> "SKWLL" - 148 -> "TRNKL" - 149 -> "WHUAWUH" - 150 -> "RINGGG" - 151 -> "QWLPH" - 152 -> "WRRR" + 67 -> "WRRR" + 68 -> "SCREE" + 69 -> "BIPBIPBIP" + 70 -> "SLP" + 71 -> "CLCLH" + 72 -> "CREUH" + 73 -> "SQWLTCH" + 74 -> "TING" + 75 -> "DEDEDA" + 76 -> "WHR" + 77 -> "CRUH" + 78 -> "SQWCH" + 79 -> "TRWNG" + 80 -> "CRSK" + 81 -> "DMP" + 82 -> "BEP" + 83 -> "BOOM" + 84 -> "SKREL" + 85 -> "CRSNK" + 86 -> "SLP" + 87 -> "CHPCHPCHP" + 88 -> "TAP" + 89 -> "CRNKL" + 90 -> "WRR" + 91 -> "CRNK" + 92 -> "CUHRUP" + 93 -> "SPLRT" + 94 -> "TING" + 95 -> "WHRHH" + 96 -> "CRSKRL" + 97 -> "WH" + 98 -> "FHFH" + 99 -> "BRAP" + 100 -> "WHHH" + 101 -> "PLH" + 102 -> "CLANG" + 103 -> "CRUNK" + 104 -> "TING" + 105 -> "TATATA" + 106 -> "SWSH" + 107 -> "DNDNDNDN" + 108 -> "THCK" + 109 -> "PEW" + 110 -> "SKLE" + 111 -> "THUD" + 112 -> "WH" + 113 -> "BWAH" + 114 -> "DEDEDUM" + 115 -> "WHUMWHUM" + 116 -> "WHRP" + 117 -> "TING" + 118 -> "CRMPL" + 119 -> "SKLE" + 120 -> "SHUHP" + 121 -> "SLP" + 122 -> "SPRT" + 123 -> "HSS" + 124 -> "TRNKL" + 125 -> "TAK" + 126 -> "CLICK" + 127 -> "DUHDEH" + 128 -> "SHTCK" + 129 -> "DEDUM" + 130 -> "BWMP" + 131 -> "BWAAH" + 132 -> "SLP" + 133 -> "DWAAH" + 134 -> "VFVFVF" + 135 -> "SLP" + 136 -> "CRTINK" + 137 -> "VHHP" + 138 -> "SPRT" + 139 -> "PRUM" + 140 -> "SLPP" + 141 -> "FWUMP" + 142 -> "CLANG" + 143 -> "TIP" + 144 -> "CRAKLE" + 145 -> "HSSS" + 146 -> "TRINKL" + 147 -> "BANG" + 148 -> "CHUGUGUG" + 149 -> "TAPP" + 150 -> "KKSQWL" + 151 -> "SKWLL" + 152 -> "DUDURAH" + 153 -> "SKWLL" + 154 -> "TRNKL" + 155 -> "WHUAWUH" + 156 -> "RINGGG" + 157 -> "QWLPH" + 158 -> "WRRR" _ -> error "unitialised sound" soundPathList :: [String] soundPathList = @@ -339,6 +351,8 @@ soundPathList = , "blood7.SQLEE.100.wav" , "whirdown3.WHH.200.wav" , "twoStep.TIPTAP.40.wav" + , "slap7.SLP.100.wav" + , "slap6.SLP.100.wav" , "metal3.DHDHL.1000.wav" , "tele.ZHM.1000.wav" , "clang.CLANG.500.wav" @@ -399,6 +413,7 @@ soundPathList = , "explosion.BOOM.2000.wav" , "gut4.SKREL.200.wav" , "glassShat1.CRSNK.1000.wav" + , "slap3.SLP.100.wav" , "reload1.CHPCHPCHP.300.wav" , "foot2.TAP.40.wav" , "glassShat2.CRNKL.1000.wav" @@ -433,6 +448,7 @@ soundPathList = , "stone2.CRMPL.1000.wav" , "blood6.SKLE.100.wav" , "pickUp.SHUHP.50.wav" + , "slap2.SLP.100.wav" , "bloodShort2.SPRT.100.wav" , "foamSprayFadeOut.HSS.50.wav" , "metal6.TRNKL.1000.wav" @@ -443,8 +459,10 @@ soundPathList = , "dedum.DEDUM.500.wav" , "sawtoothFail.BWMP.1000.wav" , "sineRaisePitchTwoSec.BWAAH.300.wav" + , "slap4.SLP.100.wav" , "skwareFadeTwoSec.DWAAH.300.wav" , "throb1.VFVFVF.100.wav" + , "slap5.SLP.100.wav" , "smallGlass3.CRTINK.500.wav" , "reverseCymbal1.VHHP.100.wav" , "blood2.SPRT.100.wav" @@ -517,261 +535,273 @@ whirdown3S :: SoundID whirdown3S = SoundID 22 twoStepS :: SoundID twoStepS = SoundID 23 +slap7S :: SoundID +slap7S = SoundID 24 +slap6S :: SoundID +slap6S = SoundID 25 metal3S :: SoundID -metal3S = SoundID 24 +metal3S = SoundID 26 teleS :: SoundID -teleS = SoundID 25 +teleS = SoundID 27 clangS :: SoundID -clangS = SoundID 26 +clangS = SoundID 28 seagullBarkS :: SoundID -seagullBarkS = SoundID 27 +seagullBarkS = SoundID 29 mini1S :: SoundID -mini1S = SoundID 28 +mini1S = SoundID 30 marimbaC5S :: SoundID -marimbaC5S = SoundID 29 +marimbaC5S = SoundID 31 gut2S :: SoundID -gut2S = SoundID 30 +gut2S = SoundID 32 stone1S :: SoundID -stone1S = SoundID 31 +stone1S = SoundID 33 bloodShort1S :: SoundID -bloodShort1S = SoundID 32 +bloodShort1S = SoundID 34 buzzS :: SoundID -buzzS = SoundID 33 +buzzS = SoundID 35 bloodShort7S :: SoundID -bloodShort7S = SoundID 34 +bloodShort7S = SoundID 36 crankSlowS :: SoundID -crankSlowS = SoundID 35 +crankSlowS = SoundID 37 seagullChatter1S :: SoundID -seagullChatter1S = SoundID 36 +seagullChatter1S = SoundID 38 tone440raiseS :: SoundID -tone440raiseS = SoundID 37 +tone440raiseS = SoundID 39 ting4S :: SoundID -ting4S = SoundID 38 +ting4S = SoundID 40 whiteNoiseFadeInS :: SoundID -whiteNoiseFadeInS = SoundID 39 +whiteNoiseFadeInS = SoundID 41 smallGlass4S :: SoundID -smallGlass4S = SoundID 40 +smallGlass4S = SoundID 42 ting1S :: SoundID -ting1S = SoundID 41 +ting1S = SoundID 43 marimbaG5S :: SoundID -marimbaG5S = SoundID 42 +marimbaG5S = SoundID 44 hit1S :: SoundID -hit1S = SoundID 43 +hit1S = SoundID 45 marimbaB6S :: SoundID -marimbaB6S = SoundID 44 +marimbaB6S = SoundID 46 whirdown2S :: SoundID -whirdown2S = SoundID 45 +whirdown2S = SoundID 47 missileLaunchS :: SoundID -missileLaunchS = SoundID 46 +missileLaunchS = SoundID 48 seagullWhistleS :: SoundID -seagullWhistleS = SoundID 47 +seagullWhistleS = SoundID 49 marimbaE5S :: SoundID -marimbaE5S = SoundID 48 +marimbaE5S = SoundID 50 healS :: SoundID -healS = SoundID 49 +healS = SoundID 51 slideDoorS :: SoundID -slideDoorS = SoundID 50 +slideDoorS = SoundID 52 seagullCry1S :: SoundID -seagullCry1S = SoundID 51 +seagullCry1S = SoundID 53 oldMachineBootS :: SoundID -oldMachineBootS = SoundID 52 +oldMachineBootS = SoundID 54 tapQuietS :: SoundID -tapQuietS = SoundID 53 +tapQuietS = SoundID 55 whirS :: SoundID -whirS = SoundID 54 +whirS = SoundID 56 whirupS :: SoundID -whirupS = SoundID 55 +whirupS = SoundID 57 blood3S :: SoundID -blood3S = SoundID 56 +blood3S = SoundID 58 primeS :: SoundID -primeS = SoundID 57 +primeS = SoundID 59 bangEchoS :: SoundID -bangEchoS = SoundID 58 +bangEchoS = SoundID 60 twoStepSlowS :: SoundID -twoStepSlowS = SoundID 59 +twoStepSlowS = SoundID 61 whirdown1S :: SoundID -whirdown1S = SoundID 60 +whirdown1S = SoundID 62 miniS :: SoundID -miniS = SoundID 61 +miniS = SoundID 63 metal5S :: SoundID -metal5S = SoundID 62 +metal5S = SoundID 64 stone5S :: SoundID -stone5S = SoundID 63 +stone5S = SoundID 65 tone440sawtoothS :: SoundID -tone440sawtoothS = SoundID 64 +tone440sawtoothS = SoundID 66 fireLoudS :: SoundID -fireLoudS = SoundID 65 +fireLoudS = SoundID 67 tone440sawtoothquietS :: SoundID -tone440sawtoothquietS = SoundID 66 +tone440sawtoothquietS = SoundID 68 computerBeepingS :: SoundID -computerBeepingS = SoundID 67 +computerBeepingS = SoundID 69 slapS :: SoundID -slapS = SoundID 68 +slapS = SoundID 70 bloodShort5S :: SoundID -bloodShort5S = SoundID 69 +bloodShort5S = SoundID 71 seagullCry2S :: SoundID -seagullCry2S = SoundID 70 +seagullCry2S = SoundID 72 gut5S :: SoundID -gut5S = SoundID 71 +gut5S = SoundID 73 ting2S :: SoundID -ting2S = SoundID 72 +ting2S = SoundID 74 dededaS :: SoundID -dededaS = SoundID 73 +dededaS = SoundID 75 whirdownSmall2S :: SoundID -whirdownSmall2S = SoundID 74 +whirdownSmall2S = SoundID 76 seagullCryS :: SoundID -seagullCryS = SoundID 75 +seagullCryS = SoundID 77 gut3S :: SoundID -gut3S = SoundID 76 +gut3S = SoundID 78 metal7S :: SoundID -metal7S = SoundID 77 +metal7S = SoundID 79 glassShat4S :: SoundID -glassShat4S = SoundID 78 +glassShat4S = SoundID 80 energyReleaseS :: SoundID -energyReleaseS = SoundID 79 +energyReleaseS = SoundID 81 tone440S :: SoundID -tone440S = SoundID 80 +tone440S = SoundID 82 explosionS :: SoundID -explosionS = SoundID 81 +explosionS = SoundID 83 gut4S :: SoundID -gut4S = SoundID 82 +gut4S = SoundID 84 glassShat1S :: SoundID -glassShat1S = SoundID 83 +glassShat1S = SoundID 85 +slap3S :: SoundID +slap3S = SoundID 86 reload1S :: SoundID -reload1S = SoundID 84 +reload1S = SoundID 87 foot2S :: SoundID -foot2S = SoundID 85 +foot2S = SoundID 88 glassShat2S :: SoundID -glassShat2S = SoundID 86 +glassShat2S = SoundID 89 fireS :: SoundID -fireS = SoundID 87 +fireS = SoundID 90 glassShat3S :: SoundID -glassShat3S = SoundID 88 +glassShat3S = SoundID 91 insertS :: SoundID -insertS = SoundID 89 +insertS = SoundID 92 blood1S :: SoundID -blood1S = SoundID 90 +blood1S = SoundID 93 ting3S :: SoundID -ting3S = SoundID 91 +ting3S = SoundID 94 whirdownS :: SoundID -whirdownS = SoundID 92 +whirdownS = SoundID 95 gut6S :: SoundID -gut6S = SoundID 93 +gut6S = SoundID 96 whirdownShort3S :: SoundID -whirdownShort3S = SoundID 94 +whirdownShort3S = SoundID 97 debrisS :: SoundID -debrisS = SoundID 95 +debrisS = SoundID 98 tap3S :: SoundID -tap3S = SoundID 96 +tap3S = SoundID 99 backgroundSpaceS :: SoundID -backgroundSpaceS = SoundID 97 +backgroundSpaceS = SoundID 100 lasPulseS :: SoundID -lasPulseS = SoundID 98 +lasPulseS = SoundID 101 clang2S :: SoundID -clang2S = SoundID 99 +clang2S = SoundID 102 metal2S :: SoundID -metal2S = SoundID 100 +metal2S = SoundID 103 tingS :: SoundID -tingS = SoundID 101 +tingS = SoundID 104 autoBS :: SoundID -autoBS = SoundID 102 +autoBS = SoundID 105 knifeS :: SoundID -knifeS = SoundID 103 +knifeS = SoundID 106 combineS :: SoundID -combineS = SoundID 104 +combineS = SoundID 107 connectItemS :: SoundID -connectItemS = SoundID 105 +connectItemS = SoundID 108 seagullWhistle1S :: SoundID -seagullWhistle1S = SoundID 106 +seagullWhistle1S = SoundID 109 bloodShort6S :: SoundID -bloodShort6S = SoundID 107 +bloodShort6S = SoundID 110 hitS :: SoundID -hitS = SoundID 108 +hitS = SoundID 111 whirdownShort4S :: SoundID -whirdownShort4S = SoundID 109 +whirdownShort4S = SoundID 112 sineRaisePitchOneSecS :: SoundID -sineRaisePitchOneSecS = SoundID 110 +sineRaisePitchOneSecS = SoundID 113 dededumS :: SoundID -dededumS = SoundID 111 +dededumS = SoundID 114 throbC4S :: SoundID -throbC4S = SoundID 112 +throbC4S = SoundID 115 whirTapS :: SoundID -whirTapS = SoundID 113 +whirTapS = SoundID 116 ting5S :: SoundID -ting5S = SoundID 114 +ting5S = SoundID 117 stone2S :: SoundID -stone2S = SoundID 115 +stone2S = SoundID 118 blood6S :: SoundID -blood6S = SoundID 116 +blood6S = SoundID 119 pickUpS :: SoundID -pickUpS = SoundID 117 +pickUpS = SoundID 120 +slap2S :: SoundID +slap2S = SoundID 121 bloodShort2S :: SoundID -bloodShort2S = SoundID 118 +bloodShort2S = SoundID 122 foamSprayFadeOutS :: SoundID -foamSprayFadeOutS = SoundID 119 +foamSprayFadeOutS = SoundID 123 metal6S :: SoundID -metal6S = SoundID 120 +metal6S = SoundID 124 tap1S :: SoundID -tap1S = SoundID 121 +tap1S = SoundID 125 click1S :: SoundID -click1S = SoundID 122 +click1S = SoundID 126 semitoneLoop1S :: SoundID -semitoneLoop1S = SoundID 123 +semitoneLoop1S = SoundID 127 disconnectItemS :: SoundID -disconnectItemS = SoundID 124 +disconnectItemS = SoundID 128 dedumS :: SoundID -dedumS = SoundID 125 +dedumS = SoundID 129 sawtoothFailS :: SoundID -sawtoothFailS = SoundID 126 +sawtoothFailS = SoundID 130 sineRaisePitchTwoSecS :: SoundID -sineRaisePitchTwoSecS = SoundID 127 +sineRaisePitchTwoSecS = SoundID 131 +slap4S :: SoundID +slap4S = SoundID 132 skwareFadeTwoSecS :: SoundID -skwareFadeTwoSecS = SoundID 128 +skwareFadeTwoSecS = SoundID 133 throb1S :: SoundID -throb1S = SoundID 129 +throb1S = SoundID 134 +slap5S :: SoundID +slap5S = SoundID 135 smallGlass3S :: SoundID -smallGlass3S = SoundID 130 +smallGlass3S = SoundID 136 reverseCymbal1S :: SoundID -reverseCymbal1S = SoundID 131 +reverseCymbal1S = SoundID 137 blood2S :: SoundID -blood2S = SoundID 132 +blood2S = SoundID 138 insertOneS :: SoundID -insertOneS = SoundID 133 +insertOneS = SoundID 139 slap1S :: SoundID -slap1S = SoundID 134 +slap1S = SoundID 140 tap4S :: SoundID -tap4S = SoundID 135 +tap4S = SoundID 141 clang1S :: SoundID -clang1S = SoundID 136 +clang1S = SoundID 142 foot1S :: SoundID -foot1S = SoundID 137 +foot1S = SoundID 143 elecCrackleS :: SoundID -elecCrackleS = SoundID 138 +elecCrackleS = SoundID 144 foamSprayLoopS :: SoundID -foamSprayLoopS = SoundID 139 +foamSprayLoopS = SoundID 145 smallGlass1S :: SoundID -smallGlass1S = SoundID 140 +smallGlass1S = SoundID 146 bangS :: SoundID -bangS = SoundID 141 +bangS = SoundID 147 seagullChatterS :: SoundID -seagullChatterS = SoundID 142 +seagullChatterS = SoundID 148 foot3S :: SoundID -foot3S = SoundID 143 +foot3S = SoundID 149 bloodShort3S :: SoundID -bloodShort3S = SoundID 144 +bloodShort3S = SoundID 150 blood4S :: SoundID -blood4S = SoundID 145 +blood4S = SoundID 151 ejectS :: SoundID -ejectS = SoundID 146 +ejectS = SoundID 152 bloodShort4S :: SoundID -bloodShort4S = SoundID 147 +bloodShort4S = SoundID 153 metal1S :: SoundID -metal1S = SoundID 148 +metal1S = SoundID 154 warp1S :: SoundID -warp1S = SoundID 149 +warp1S = SoundID 155 tinitusS :: SoundID -tinitusS = SoundID 150 +tinitusS = SoundID 156 gut1S :: SoundID -gut1S = SoundID 151 +gut1S = SoundID 157 fireFadeS :: SoundID -fireFadeS = SoundID 152 +fireFadeS = SoundID 158 diff --git a/tags b/tags index 3a96c0519..3d35c4d01 100644 --- a/tags +++ b/tags @@ -2637,9 +2637,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 676;" f +autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 700;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f -autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f +autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 522;" 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 @@ -2647,16 +2647,16 @@ axisInt src/Geometry/Intersect.hs 248;" f 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 127;" f -backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 666;" f +backPQ src/Dodge/Creature/HandPos.hs 128;" f +backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 690;" 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 588;" f +bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f -bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 754;" f +bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 784;" 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 @@ -2704,22 +2704,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 652;" f -blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 736;" f -blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 584;" f -blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 762;" f -blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 510;" f -blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 704;" f -blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 514;" f -blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f -bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 536;" f -bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f -bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 760;" f -bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 766;" f -bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f -bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 686;" f -bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 540;" f -bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 494;" f +blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 676;" f +blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 766;" f +blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 606;" f +blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 792;" f +blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 528;" f +blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 728;" f +blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f +blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 520;" f +bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f +bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 734;" f +bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 790;" f +bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 796;" f +bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 632;" f +bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 710;" f +bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 562;" f +bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 512;" 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 @@ -2756,7 +2756,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 538;" f +buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f cChasm src/Dodge/Room/Tutorial.hs 129;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f @@ -2810,7 +2810,7 @@ checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f checkWallRight src/Dodge/LevelGen/StaticWalls/Deprecated.hs 59;" f chemFuelPouch src/Dodge/Item/Ammo.hs 75;" f -chestPQ src/Dodge/Creature/HandPos.hs 124;" f +chestPQ src/Dodge/Creature/HandPos.hs 125;" f chooseCursorBorders src/Dodge/Render/List.hs 141;" f chooseEquipPosition src/Dodge/Inventory/RBList.hs 41;" f chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 35;" f @@ -2831,9 +2831,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 744;" f -clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 670;" f -clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 524;" f +clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 774;" f +clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 694;" f +clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 546;" f cldtPropagateFold src/Dodge/DoubleTree.hs 358;" f cleanUpPreload src/Preload.hs 10;" f cleanUpSoundPreload src/Preload.hs 15;" f @@ -2841,7 +2841,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 716;" f +click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 742;" f clicker src/Dodge/Item/Scope.hs 82;" f clipV src/Geometry/Vector.hs 48;" f clipZoom src/Dodge/Update/Camera.hs 237;" f @@ -2890,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 680;" f +combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 704;" f combineTree src/Dodge/Tree/Compose.hs 67;" f commandColor src/Dodge/Terminal.hs 121;" f commonPrefix src/Dodge/Debug/Terminal.hs 149;" f @@ -2902,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 606;" f +computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 628;" 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 682;" f +connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 706;" f constructEdges src/Polyhedra.hs 34;" f constructEdgesList src/Polyhedra.hs 43;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 58;" f @@ -2974,7 +2974,7 @@ 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 542;" f +crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 564;" f createForceField src/Dodge/ForceField.hs 7;" f createGas src/Dodge/Gas.hs 10;" f createHeadLamp src/Dodge/Euse.hs 58;" f @@ -3064,7 +3064,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 662;" f +debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 686;" f debrisSPic src/Dodge/Prop/Draw.hs 16;" f debrisSize src/Dodge/Block/Debris.hs 83;" f debugEvent src/Dodge/Debug.hs 37;" f @@ -3088,10 +3088,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 508;" f -dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f -dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 694;" f -dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 722;" f +dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f +dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f +dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" f +dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 748;" 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 @@ -3170,7 +3170,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 720;" f +disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 746;" f displayConfig src/Dodge/Menu.hs 225;" f displayControls src/Dodge/Menu.hs 241;" f displayFrameTicks src/Dodge/Render/Picture.hs 50;" f @@ -3431,8 +3431,8 @@ edgeToPic src/Dodge/Debug/Picture.hs 416;" 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 764;" f -elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 748;" f +ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 794;" f +elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 778;" f elephantGun src/Dodge/Item/Held/Rod.hs 27;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 22;" f emptyTrie src/SimpleTrie.hs 17;" f @@ -3443,7 +3443,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 630;" f +energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 652;" f enterCombineInv src/Dodge/DisplayInventory.hs 321;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f epText src/Dodge/Inventory/SelectionList.hs 79;" f @@ -3457,7 +3457,7 @@ equipInfo src/Dodge/Item/Info.hs 141;" f equipItemSPic src/Dodge/Item/Draw/SPic.hs 158;" f equipPosition src/Dodge/Item/Draw.hs 38;" f equipSiteInfo src/Dodge/Item/Info.hs 253;" f -equipSitePQ src/Dodge/Creature/HandPos.hs 26;" f +equipSitePQ src/Dodge/Creature/HandPos.hs 27;" f equipType src/Dodge/Data/EquipType.hs 10;" f equipmentDesignation src/Dodge/Inventory/RBList.hs 52;" f equipmentStrValue src/Dodge/Creature/Statistics.hs 56;" f @@ -3477,7 +3477,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 229;" f -explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f +explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 656;" 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 @@ -3502,9 +3502,9 @@ findReverseEdgeList src/Polyhedra.hs 57;" 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 776;" f -fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 602;" f -fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f +fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 806;" f +fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f +fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 670;" f firstBreather src/Dodge/Room/Breather.hs 9;" f firstTrie src/SimpleTrie.hs 51;" f firstWorldLoad appDodge/Main.hs 68;" f @@ -3536,15 +3536,15 @@ floorItemPickupInfo src/Dodge/Render/HUD.hs 229;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 124;" f floorTo src/Geometry/Zone.hs 12;" f floorWire src/Dodge/Wire.hs 13;" f -foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 710;" f -foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 750;" f +foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 736;" f +foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 780;" f foldMTRS src/Dodge/Room/Tutorial.hs 75;" 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 746;" f -foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 642;" f -foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 758;" f +foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 776;" f +foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 666;" f +foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 788;" f forbidFlee src/Dodge/Creature/Boid.hs 45;" f forceElements src/StrictHelp.hs 10;" f forceField src/Dodge/Wall/ForceField.hs 6;" f @@ -3554,7 +3554,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 498;" f +fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f fromJust' src/MaybeHelp.hs 22;" f fromListL src/DoubleStack.hs 7;" f fromTopLeft src/Dodge/ScreenPos.hs 9;" f @@ -3638,10 +3638,10 @@ 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 638;" f -glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 644;" f -glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 648;" f -glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 628;" f +glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 660;" f +glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 668;" f +glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 672;" f +glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" 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 @@ -3662,13 +3662,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 476;" f -gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 774;" f -gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f -gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f -gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 636;" f -gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 614;" f -gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 658;" f +gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 494;" f +gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 804;" f +gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f +gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f +gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 658;" f +gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 636;" f +gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 682;" f gyroscope src/Dodge/Item/Scope.hs 156;" f hackBoldText src/Picture/Base.hs 204;" f hackDropShadow src/Picture/Base.hs 207;" f @@ -3678,16 +3678,16 @@ halfHeight src/Dodge/Base/Window.hs 49;" f halfWidth src/Dodge/Base/Window.hs 49;" f haltSound src/Dodge/SoundLogic.hs 38;" f hammerCheck src/Dodge/HeldUse.hs 63;" f -handHandleOrient src/Dodge/Item/HeldOffset.hs 62;" f -handOrient src/Dodge/Item/HeldOffset.hs 38;" f +handHandleOrient src/Dodge/Item/HeldOffset.hs 57;" f +handOrient src/Dodge/Item/HeldOffset.hs 39;" f handleEvent src/Dodge/Event.hs 27;" f handleHotkeys src/Dodge/Creature/YourControl.hs 46;" f handleKeyboardEvent src/Dodge/Event/Input.hs 23;" f handleMouseButtonEvent src/Dodge/Event/Input.hs 61;" f handleMouseMotionEvent src/Dodge/Event/Input.hs 47;" f handleMouseWheelEvent src/Dodge/Event/Input.hs 56;" f -handleOrient src/Dodge/Item/HeldOffset.hs 31;" f -handlePos src/Dodge/Item/HeldOffset.hs 83;" f +handleOrient src/Dodge/Item/HeldOffset.hs 32;" f +handlePos src/Dodge/Item/HeldOffset.hs 78;" f handleResizeEvent src/Dodge/Event.hs 53;" f handleTextInput src/Dodge/Event/Input.hs 19;" f handleWindowMoveEvent src/Dodge/Event.hs 44;" f @@ -3701,8 +3701,8 @@ head src/DoubleStack.hs 14;" f headLamp src/Dodge/Item/Equipment.hs 79;" f headLampShape src/Dodge/Item/Draw/SPic.hs 422;" f headMap src/Dodge/DoubleTree.hs 249;" f -headPQ src/Dodge/Creature/HandPos.hs 115;" f -healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 570;" f +headPQ src/Dodge/Creature/HandPos.hs 116;" f +healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" 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 @@ -3710,7 +3710,7 @@ heldAimStance src/Dodge/Item/AimStance.hs 24;" f heldAimZoom src/Dodge/Update/Camera.hs 156;" f heldEffect src/Dodge/HeldUse.hs 60;" f heldEffectMuzzles src/Dodge/HeldUse.hs 131;" f -heldHandlePos src/Dodge/Item/HeldOffset.hs 89;" f +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 @@ -3730,9 +3730,9 @@ hiToFloat src/Dodge/Room/Modify/Girder.hs 171;" f highBar src/Dodge/Room/Foreground.hs 89;" f highDiagonalMesh src/Dodge/Room/Foreground.hs 35;" f highMesh src/Dodge/Room/Foreground.hs 25;" f -hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f +hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 580;" f hitEffFromBul src/Dodge/Bullet.hs 156;" f -hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 688;" f +hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 712;" 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 @@ -3767,9 +3767,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 738;" f +insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 768;" f insertOver src/ListHelp.hs 47;" f -insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" f +insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 674;" 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 @@ -3935,7 +3935,7 @@ keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 75;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f keyPic src/Dodge/Item/Draw/SPic.hs 438;" f keyholeCorridor src/Dodge/Room/Corridor.hs 40;" f -knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f +knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 702;" f lChasm src/Dodge/Room/Tutorial.hs 138;" f lConnect src/Dodge/Render/Connectors.hs 43;" f lConnectCol src/Dodge/Render/Connectors.hs 46;" f @@ -3945,7 +3945,7 @@ lamp src/Dodge/Creature/Lamp.hs 18;" f lampCrSPic src/Dodge/Render/ShapePicture.hs 87;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 130;" f lasGunPic src/Dodge/Item/Draw/SPic.hs 413;" f -lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 668;" f +lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 692;" 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 @@ -3972,12 +3972,12 @@ leaveResetQuitTerminal src/Dodge/WorldEffect.hs 165;" f led src/Dodge/Item/Held/Utility.hs 23;" f left src/DoubleStack.hs 16;" f leftChildList src/Dodge/Item/Grammar.hs 185;" f -leftHandPQ src/Dodge/Creature/HandPos.hs 60;" f +leftHandPQ src/Dodge/Creature/HandPos.hs 61;" f leftIsParentCombine src/Dodge/Item/Grammar.hs 163;" f -leftLegPQ src/Dodge/Creature/HandPos.hs 84;" f +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 81;" f +leftWristPQ src/Dodge/Creature/HandPos.hs 82;" f legsSPic src/Dodge/Item/Draw/SPic.hs 447;" f lerpP2A src/Dodge/ShiftPoint.hs 14;" f liShape src/Dodge/Placement/Instance/LightSource.hs 79;" f @@ -4027,7 +4027,7 @@ locGoRight src/Dodge/DoubleTree.hs 324;" f locLDTToLocDT src/Dodge/DoubleTree.hs 19;" f locLeftmost src/Dodge/DoubleTree.hs 306;" f locMuzzles src/Dodge/HeldUse.hs 145;" f -locOrient src/Dodge/Item/HeldOffset.hs 57;" f +locOrient src/Dodge/Item/HeldOffset.hs 52;" f locRightmost src/Dodge/DoubleTree.hs 309;" f locToTop src/Dodge/DoubleTree.hs 301;" f locUp src/Dodge/DoubleTree.hs 272;" f @@ -4115,10 +4115,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 560;" f -marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 530;" f -marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 568;" f -marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f +marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" f +marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 552;" f +marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 590;" f +marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 578;" f materialColor src/Dodge/Material/Color.hs 8;" f materialPenetrable src/Dodge/Bullet.hs 211;" f maxAmmo src/Dodge/Item/MaxAmmo.hs 6;" f @@ -4170,13 +4170,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 768;" f -metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 672;" f -metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 520;" f -metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 478;" f -metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f -metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 712;" f -metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f +metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 798;" f +metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 696;" f +metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f +metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 496;" f +metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f +metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 738;" f +metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 648;" f metalPlate src/Dodge/Item/Craftable.hs 35;" f mglCreate src/GLHelp.hs 8;" f mglDelete src/GLHelp.hs 14;" f @@ -4190,18 +4190,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 528;" f +mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 550;" 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 594;" f +miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 616;" 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 350;" f mirroryz src/Picture/Base.hs 355;" f -missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 564;" f +missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 586;" f mixColors src/Color.hs 113;" f mixColorsFrac src/Color.hs 109;" f mixColorsLinear src/Color.hs 122;" f @@ -4301,7 +4301,7 @@ numSubElements src/Shader/Parameters.hs 39;" f numTraversable src/TreeHelp.hs 184;" f obstacleColor src/Dodge/Debug/Picture.hs 263;" f obstructPathsCrossing src/Dodge/Path.hs 120;" f -oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 576;" f +oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 598;" f onEquipWristShield src/Dodge/Equipment.hs 37;" f onRemoveWristShield src/Dodge/Equipment.hs 24;" f onXY src/Geometry/Vector3D.hs 130;" f @@ -4379,7 +4379,7 @@ picFormat src/Polyhedra.hs 23;" f picMap src/Picture/Base.hs 70;" f pickUpItem src/Dodge/Inventory/Add.hs 70;" f pickUpItemAt src/Dodge/Inventory/Add.hs 75;" f -pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 706;" f +pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 730;" 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 @@ -4500,7 +4500,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 586;" f +primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 608;" 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 @@ -4633,9 +4633,9 @@ 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 640;" f +reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 664;" f reloadLevelStart src/Dodge/Save.hs 71;" f -reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 486;" f +reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" 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 @@ -4674,7 +4674,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 734;" f +reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 764;" 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,12 +4690,12 @@ rhombus src/Polyhedra.hs 72;" f rifle src/Dodge/Item/Held/Cane.hs 19;" f right src/DoubleStack.hs 16;" f rightChildList src/Dodge/Item/Grammar.hs 191;" f -rightHandPQ src/Dodge/Creature/HandPos.hs 39;" f +rightHandPQ src/Dodge/Creature/HandPos.hs 40;" f rightIsParentCombine src/Dodge/Item/Grammar.hs 174;" f -rightLegPQ src/Dodge/Creature/HandPos.hs 100;" f +rightLegPQ src/Dodge/Creature/HandPos.hs 101;" f rightPad src/Padding.hs 19;" f rightPadNoSquash src/Padding.hs 23;" f -rightWristPQ src/Dodge/Creature/HandPos.hs 57;" 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 rmInLinks src/Dodge/RoomLink.hs 153;" f @@ -4773,7 +4773,7 @@ saveQuit src/Dodge/Menu.hs 79;" f saveQuitConc src/Dodge/Menu.hs 82;" f saveSlotPath src/Dodge/Save.hs 63;" f saveWorldInSlot src/Dodge/Save.hs 68;" f -sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 724;" f +sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 750;" f scToTS src/Dodge/Event/Input.hs 34;" f scale src/Picture/Base.hs 152;" f scale3 src/Picture/Base.hs 148;" f @@ -4795,15 +4795,15 @@ scrollRBOption src/Dodge/Update/Scroll.hs 202;" f scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f scrollTimeBack src/Dodge/Update.hs 215;" f scrollTimeForward src/Dodge/Update.hs 232;" f -seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f -seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 488;" f -seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f -seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 756;" f -seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 574;" f -seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f -seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f -seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f -seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 566;" f +seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f +seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 506;" f +seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 566;" f +seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 786;" f +seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f +seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f +seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 644;" f +seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f +seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 588;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 213;" f secondColumnLDP src/Dodge/ListDisplayParams.hs 41;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 202;" f @@ -4818,7 +4818,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 51;" f -semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" f +semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 744;" 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 @@ -4930,8 +4930,8 @@ 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 482;" f -shoulderHeight src/Dodge/Item/HeldOffset.hs 68;" f +shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" 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 showEquipItem src/Dodge/Item/Display.hs 107;" f @@ -4950,8 +4950,8 @@ shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 151;" f simpleCrSprings src/Dodge/Update.hs 876;" f simpleTermMessage src/Dodge/Terminal.hs 173;" f -sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 692;" f -sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f +sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 716;" f +sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 752;" f singleAmmo src/Dodge/Item/AmmoSlots.hs 64;" f singleDT src/Dodge/DoubleTree.hs 10;" f singleLDT src/Dodge/DoubleTree.hs 13;" f @@ -4959,10 +4959,16 @@ 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 728;" f -slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 740;" f -slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 608;" f -slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f +skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 756;" f +slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 770;" f +slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 732;" f +slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 662;" f +slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 754;" f +slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 760;" f +slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 540;" f +slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 538;" f +slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 630;" f +slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 594;" f slideWindow src/ListHelp.hs 81;" f slowDoorRoom src/Dodge/Room/LongDoor.hs 140;" f slowDoorRoomRunPast src/Dodge/Room/LongDoor.hs 157;" f @@ -4970,10 +4976,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 752;" f -smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 490;" f -smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 732;" f -smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 552;" f +smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 782;" f +smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 508;" f +smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 762;" f +smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 574;" f smallPillar src/Dodge/Room/Pillar.hs 37;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f smallSnailInt2 src/Dodge/Path.hs 81;" f @@ -4993,10 +4999,10 @@ soundMenuOptions src/Dodge/Menu.hs 163;" 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 316;" f +soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 328;" f soundPic src/Dodge/Debug/Picture.hs 363;" f soundStart src/Dodge/SoundLogic.hs 118;" f -soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 160;" f +soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 166;" f soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f @@ -5067,11 +5073,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 534;" f -stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 702;" f -stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 492;" f -stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 496;" f -stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 598;" f +stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f +stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f +stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 510;" f +stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 514;" f +stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 620;" f stopAllSounds src/Sound.hs 126;" f stopBulletAt src/Dodge/Bullet.hs 200;" f stopPushing src/Dodge/Wall/Damage.hs 95;" f @@ -5081,7 +5087,7 @@ strFromEquipment src/Dodge/Creature/Statistics.hs 53;" f strFromHeldItem src/Dodge/Creature/Statistics.hs 67;" f strengthFactor src/Dodge/Creature/Impulse/Movement.hs 51;" f strictify src/MaybeHelp.hs 35;" f -strideRot src/Dodge/Item/HeldOffset.hs 71;" f +strideRot src/Dodge/Item/HeldOffset.hs 66;" f stringToList src/Picture/Base.hs 328;" f stringToListGrad src/Picture/Text.hs 12;" f stripZ src/Geometry/Vector3D.hs 97;" f @@ -5114,11 +5120,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 714;" f -tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f -tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 664;" f -tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 742;" f -tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 578;" f +tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 740;" f +tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 490;" f +tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 688;" f +tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 772;" f +tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" 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 @@ -5126,7 +5132,7 @@ targetYouLOS src/Dodge/Creature/ChooseTarget.hs 8;" f targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 202;" f targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f targetingScope src/Dodge/Item/Scope.hs 38;" f -teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 522;" f +teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f termScreenColor src/Dodge/Terminal/Color.hs 8;" f termSoundLine src/Dodge/Terminal.hs 43;" f termTextColor src/Dodge/Terminal.hs 46;" f @@ -5169,8 +5175,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 730;" f -throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 696;" f +throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 758;" f +throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 720;" f throwItem src/Dodge/Creature/Action.hs 191;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 196;" f @@ -5179,13 +5185,13 @@ timeFlowUpdate src/Dodge/Update.hs 175;" 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 554;" f -ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 616;" f -ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 654;" f -ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f -ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 700;" f -tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 674;" f -tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 772;" f +ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 576;" f +ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f +ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f +ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 570;" f +ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 724;" f +tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 698;" f +tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 802;" f titleOptionsMenu src/Dodge/Menu.hs 106;" f titleOptionsNoWrite src/Dodge/Menu.hs 109;" f tlDoEffect src/Dodge/Terminal.hs 109;" f @@ -5212,10 +5218,10 @@ 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 632;" f -tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 546;" f -tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f -tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 604;" f +tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 654;" f +tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 568;" f +tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f +tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f topInvW src/Dodge/ListDisplayParams.hs 50;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f @@ -5233,14 +5239,14 @@ tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f tranRot src/Picture/Base.hs 127;" f transMat src/MatrixHelper.hs 87;" f -transToHandle src/Dodge/Item/HeldOffset.hs 26;" f +transToHandle src/Dodge/Item/HeldOffset.hs 27;" f translate src/Picture/Base.hs 119;" f translate3 src/Picture/Base.hs 123;" f translateFloatingCamera src/Dodge/Update/Camera.hs 48;" f translateFloatingCameraKeys src/Dodge/Update/Camera.hs 66;" f translateH src/Picture/Base.hs 115;" f -translatePointToLeftHand src/Dodge/Creature/HandPos.hs 75;" f -translatePointToRightHand src/Dodge/Creature/HandPos.hs 36;" 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 @@ -5248,11 +5254,11 @@ translateSP src/ShapePicture.hs 53;" f translateSPxy src/ShapePicture.hs 45;" f translateSPz src/ShapePicture.hs 49;" f translateScreenPos src/Dodge/ScreenPos.hs 12;" f -translateToES src/Dodge/Creature/HandPos.hs 23;" f -translateToLeftHand src/Dodge/Creature/HandPos.hs 78;" f -translateToLeftLeg src/Dodge/Creature/HandPos.hs 97;" f -translateToRightHand src/Dodge/Creature/HandPos.hs 54;" f -translateToRightLeg src/Dodge/Creature/HandPos.hs 112;" f +translateToES src/Dodge/Creature/HandPos.hs 24;" f +translateToLeftHand src/Dodge/Creature/HandPos.hs 79;" f +translateToLeftLeg src/Dodge/Creature/HandPos.hs 98;" f +translateToRightHand src/Dodge/Creature/HandPos.hs 55;" f +translateToRightLeg src/Dodge/Creature/HandPos.hs 113;" f translateXY src/Polyhedra.hs 26;" f trapezionBWHW src/Geometry/Polygon.hs 26;" f treeAttachDeep src/TreeHelp.hs 193;" f @@ -5290,7 +5296,7 @@ trySynthBullet src/Dodge/Creature/State.hs 167;" f tryThrust src/Dodge/Projectile/Update.hs 123;" f tryUseParent src/Dodge/Creature/State.hs 145;" f turnTo src/Dodge/Movement/Turn.hs 8;" f -turretItemOffset src/Dodge/Item/HeldOffset.hs 21;" f +turretItemOffset src/Dodge/Item/HeldOffset.hs 22;" f tutAnoTree src/Dodge/Room/Tutorial.hs 47;" f tutDrop src/Dodge/Room/Tutorial.hs 94;" f tutHub src/Dodge/Room/Tutorial.hs 254;" f @@ -5303,12 +5309,12 @@ twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 79;" f twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 34;" f twists src/Dodge/Creature/Test.hs 102;" f twoFlat src/Dodge/Creature/Test.hs 99;" f -twoFlatHRot src/Dodge/Item/HeldOffset.hs 80;" 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 474;" f -twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 518;" f -twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 590;" f +twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 492;" f +twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 536;" f +twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f ubyteSize src/Shader/Parameters.hs 13;" f ugateCalc src/Dodge/Inventory/SelectionList.hs 115;" f uncurryV src/Geometry/Data.hs 66;" f @@ -5526,7 +5532,7 @@ wallsFromRooms src/Dodge/Layout.hs 137;" f wallsToDraw src/Dodge/Render/Walls.hs 18;" f warmupSound src/Dodge/HeldUse.hs 1368;" f warningRooms src/Dodge/Room/Warning.hs 31;" f -warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 770;" f +warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 800;" f wasdAim src/Dodge/Creature/YourControl.hs 133;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f @@ -5534,7 +5540,6 @@ wasdMovement src/Dodge/Creature/YourControl.hs 169;" f wasdWithAiming src/Dodge/Creature/YourControl.hs 126;" f watchCombinations src/Dodge/Combine/Combinations.hs 16;" f watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 185;" f -weakenMatS src/Dodge/Material/Sound.hs 19;" f weaponBehindPillar src/Dodge/Room/Room.hs 194;" f weaponBetweenPillars src/Dodge/Room/Room.hs 210;" f weaponEmptyRoom src/Dodge/Room/Room.hs 155;" f @@ -5543,22 +5548,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 580;" f -whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 698;" f -whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" f -whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 562;" f -whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f -whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 656;" f -whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 512;" f -whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" f -whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 660;" f -whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 690;" f -whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 484;" f -whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 620;" f -whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" f +whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 602;" f +whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 722;" f +whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 614;" f +whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 584;" f +whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 534;" f +whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f +whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 530;" f +whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 518;" f +whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f +whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 714;" f +whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f +whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 642;" f +whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 604;" f white src/Color.hs 53;" f -whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 550;" f -whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 506;" f +whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f +whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 524;" 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 @@ -5590,7 +5595,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 480;" f +wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 498;" f wristArmour src/Dodge/Item/Equipment.hs 43;" f wristInvisibility src/Dodge/Item/Equipment.hs 96;" f writeConfig src/Dodge/Menu.hs 182;" f