diff --git a/.gitignore b/.gitignore index 1114558ac..2f426bbdc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ loop.cabal keys.json log/* generated/* +UntrackedMisc/* tags ghcidOutput .ghcid.bak diff --git a/data/sound/beep3Quick.BIPBIPBIP.500.wav b/data/sound/beep3Quick.BIPBIPBIP.500.wav new file mode 100644 index 000000000..4390085df Binary files /dev/null and b/data/sound/beep3Quick.BIPBIPBIP.500.wav differ diff --git a/src/Dodge/Creature/Vocalization.hs b/src/Dodge/Creature/Vocalization.hs index 58aeda116..9934b91d3 100644 --- a/src/Dodge/Creature/Vocalization.hs +++ b/src/Dodge/Creature/Vocalization.hs @@ -17,7 +17,7 @@ crVocalizationSound :: Creature -> Maybe SoundID crVocalizationSound cr = case cr ^. crType of Avatar{} -> Nothing ChaseCrit{} -> Just seagullChatterS - HoverCrit{} -> Nothing + HoverCrit{} -> Just beep3QuickS SwarmCrit -> Nothing AutoCrit -> Nothing BarrelCrit{} -> Nothing diff --git a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs index 701c97f39..f45a3f056 100644 --- a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs +++ b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs @@ -1,4 +1,4 @@ --- generated at 2026-01-02 12:33:10.260560049 UTC +-- generated at 2026-04-02 23:18:41.468999125 UTC module Dodge.SoundLogic.ExternallyGeneratedSounds where import Sound.Data soundToVol :: SoundID -> Float @@ -78,99 +78,100 @@ soundToVol v = case _getSoundID v of 72 -> 500 73 -> 500 74 -> 500 - 75 -> 100 + 75 -> 500 76 -> 100 - 77 -> 2000 - 78 -> 200 + 77 -> 100 + 78 -> 2000 79 -> 200 - 80 -> 500 - 81 -> 200 - 82 -> 2000 - 83 -> 200 - 84 -> 1000 + 80 -> 200 + 81 -> 500 + 82 -> 200 + 83 -> 2000 + 84 -> 200 85 -> 1000 - 86 -> 250 - 87 -> 300 - 88 -> 2000 - 89 -> 200 - 90 -> 1000 - 91 -> 100 - 92 -> 300 - 93 -> 100 - 94 -> 40 - 95 -> 1000 - 96 -> 100 - 97 -> 1000 - 98 -> 500 - 99 -> 100 - 100 -> 200 - 101 -> 250 - 102 -> 200 + 86 -> 1000 + 87 -> 250 + 88 -> 300 + 89 -> 2000 + 90 -> 200 + 91 -> 1000 + 92 -> 100 + 93 -> 300 + 94 -> 100 + 95 -> 40 + 96 -> 1000 + 97 -> 100 + 98 -> 1000 + 99 -> 500 + 100 -> 100 + 101 -> 200 + 102 -> 250 103 -> 200 - 104 -> 50 - 105 -> 1000 - 106 -> 50 - 107 -> 500 + 104 -> 200 + 105 -> 50 + 106 -> 1000 + 107 -> 50 108 -> 500 - 109 -> 1000 - 110 -> 200 - 111 -> 2000 - 112 -> 20 - 113 -> 500 - 114 -> 200 - 115 -> 100 - 116 -> 2000 - 117 -> 100 + 109 -> 500 + 110 -> 1000 + 111 -> 200 + 112 -> 2000 + 113 -> 20 + 114 -> 500 + 115 -> 200 + 116 -> 100 + 117 -> 2000 118 -> 100 - 119 -> 200 - 120 -> 300 - 121 -> 500 - 122 -> 100 - 123 -> 300 - 124 -> 200 - 125 -> 1000 - 126 -> 100 - 127 -> 50 - 128 -> 100 + 119 -> 100 + 120 -> 200 + 121 -> 300 + 122 -> 500 + 123 -> 100 + 124 -> 300 + 125 -> 200 + 126 -> 1000 + 127 -> 100 + 128 -> 50 129 -> 100 - 130 -> 50 - 131 -> 1000 - 132 -> 500 - 133 -> 40 - 134 -> 100 - 135 -> 200 - 136 -> 500 - 137 -> 1000 - 138 -> 300 - 139 -> 100 - 140 -> 300 + 130 -> 100 + 131 -> 50 + 132 -> 1000 + 133 -> 500 + 134 -> 40 + 135 -> 100 + 136 -> 200 + 137 -> 500 + 138 -> 1000 + 139 -> 300 + 140 -> 100 141 -> 300 - 142 -> 100 + 142 -> 300 143 -> 100 - 144 -> 500 - 145 -> 100 + 144 -> 100 + 145 -> 500 146 -> 100 - 147 -> 500 - 148 -> 100 + 147 -> 100 + 148 -> 500 149 -> 100 - 150 -> 500 - 151 -> 40 - 152 -> 200 - 153 -> 50 - 154 -> 500 - 155 -> 2000 + 150 -> 100 + 151 -> 500 + 152 -> 40 + 153 -> 200 + 154 -> 50 + 155 -> 500 156 -> 2000 - 157 -> 40 - 158 -> 100 + 157 -> 2000 + 158 -> 40 159 -> 100 - 160 -> 500 - 161 -> 100 - 162 -> 1000 - 163 -> 100 - 164 -> 500 - 165 -> 8000 - 166 -> 200 - 167 -> 300 + 160 -> 100 + 161 -> 500 + 162 -> 100 + 163 -> 1000 + 164 -> 100 + 165 -> 500 + 166 -> 8000 + 167 -> 200 + 168 -> 300 _ -> 50 soundToOnomato :: SoundID -> String soundToOnomato v = case _getSoundID v of @@ -246,102 +247,103 @@ soundToOnomato v = case _getSoundID v of 69 -> "TTRKL" 70 -> "CRUMBL" 71 -> "SCREE" - 72 -> "WRRR" - 73 -> "SCREE" - 74 -> "BIPBIPBIP" - 75 -> "SLP" - 76 -> "CLCLH" - 77 -> "CREUH" - 78 -> "SQWLTCH" - 79 -> "TING" - 80 -> "DEDEDA" - 81 -> "WHR" - 82 -> "CRUH" - 83 -> "SQWCH" - 84 -> "TRWNG" - 85 -> "CRSK" - 86 -> "DMP" - 87 -> "BEP" - 88 -> "BOOM" - 89 -> "SKREL" - 90 -> "CRSNK" - 91 -> "SLP" - 92 -> "CHPCHPCHP" - 93 -> "SLP" - 94 -> "TAP" - 95 -> "CRNKL" - 96 -> "WRR" - 97 -> "CRNK" - 98 -> "CUHRUP" - 99 -> "SPLRT" - 100 -> "TING" - 101 -> "WHRHH" - 102 -> "CRSKRL" - 103 -> "WH" - 104 -> "FHFH" - 105 -> "BRAP" - 106 -> "WHHH" - 107 -> "PLH" - 108 -> "CLANG" - 109 -> "CRUNK" - 110 -> "TING" - 111 -> "TATATA" - 112 -> "SWSH" - 113 -> "DNDNDNDN" - 114 -> "THCK" - 115 -> "SLP" - 116 -> "PEW" - 117 -> "SKLE" - 118 -> "THUD" - 119 -> "WH" - 120 -> "BWAH" - 121 -> "DEDEDUM" - 122 -> "WHUMWHUM" - 123 -> "WHRP" - 124 -> "TING" - 125 -> "CRMPL" - 126 -> "SKLE" - 127 -> "SHUHP" - 128 -> "SLP" - 129 -> "SPRT" - 130 -> "HSS" - 131 -> "TRNKL" - 132 -> "TAK" - 133 -> "CLICK" - 134 -> "DUHDEH" - 135 -> "SHTCK" - 136 -> "DEDUM" - 137 -> "BWMP" - 138 -> "BWAAH" - 139 -> "SLP" - 140 -> "DWAAH" - 141 -> "TNKTONK" - 142 -> "VFVFVF" - 143 -> "SLP" - 144 -> "CRTINK" - 145 -> "VHHP" - 146 -> "SPRT" - 147 -> "PRUM" - 148 -> "SLPP" - 149 -> "FWUMP" - 150 -> "CLANG" - 151 -> "TIP" - 152 -> "CRAKLE" - 153 -> "HSSS" - 154 -> "TRINKL" - 155 -> "BANG" - 156 -> "CHUGUGUG" - 157 -> "TAPP" - 158 -> "KKSQWL" - 159 -> "SKWLL" - 160 -> "DUDURAH" - 161 -> "SKWLL" - 162 -> "TRNKL" - 163 -> "SLP" - 164 -> "WHUAWUH" - 165 -> "RINGGG" - 166 -> "QWLPH" - 167 -> "WRRR" + 72 -> "BIPBIPBIP" + 73 -> "WRRR" + 74 -> "SCREE" + 75 -> "BIPBIPBIP" + 76 -> "SLP" + 77 -> "CLCLH" + 78 -> "CREUH" + 79 -> "SQWLTCH" + 80 -> "TING" + 81 -> "DEDEDA" + 82 -> "WHR" + 83 -> "CRUH" + 84 -> "SQWCH" + 85 -> "TRWNG" + 86 -> "CRSK" + 87 -> "DMP" + 88 -> "BEP" + 89 -> "BOOM" + 90 -> "SKREL" + 91 -> "CRSNK" + 92 -> "SLP" + 93 -> "CHPCHPCHP" + 94 -> "SLP" + 95 -> "TAP" + 96 -> "CRNKL" + 97 -> "WRR" + 98 -> "CRNK" + 99 -> "CUHRUP" + 100 -> "SPLRT" + 101 -> "TING" + 102 -> "WHRHH" + 103 -> "CRSKRL" + 104 -> "WH" + 105 -> "FHFH" + 106 -> "BRAP" + 107 -> "WHHH" + 108 -> "PLH" + 109 -> "CLANG" + 110 -> "CRUNK" + 111 -> "TING" + 112 -> "TATATA" + 113 -> "SWSH" + 114 -> "DNDNDNDN" + 115 -> "THCK" + 116 -> "SLP" + 117 -> "PEW" + 118 -> "SKLE" + 119 -> "THUD" + 120 -> "WH" + 121 -> "BWAH" + 122 -> "DEDEDUM" + 123 -> "WHUMWHUM" + 124 -> "WHRP" + 125 -> "TING" + 126 -> "CRMPL" + 127 -> "SKLE" + 128 -> "SHUHP" + 129 -> "SLP" + 130 -> "SPRT" + 131 -> "HSS" + 132 -> "TRNKL" + 133 -> "TAK" + 134 -> "CLICK" + 135 -> "DUHDEH" + 136 -> "SHTCK" + 137 -> "DEDUM" + 138 -> "BWMP" + 139 -> "BWAAH" + 140 -> "SLP" + 141 -> "DWAAH" + 142 -> "TNKTONK" + 143 -> "VFVFVF" + 144 -> "SLP" + 145 -> "CRTINK" + 146 -> "VHHP" + 147 -> "SPRT" + 148 -> "PRUM" + 149 -> "SLPP" + 150 -> "FWUMP" + 151 -> "CLANG" + 152 -> "TIP" + 153 -> "CRAKLE" + 154 -> "HSSS" + 155 -> "TRINKL" + 156 -> "BANG" + 157 -> "CHUGUGUG" + 158 -> "TAPP" + 159 -> "KKSQWL" + 160 -> "SKWLL" + 161 -> "DUDURAH" + 162 -> "SKWLL" + 163 -> "TRNKL" + 164 -> "SLP" + 165 -> "WHUAWUH" + 166 -> "RINGGG" + 167 -> "QWLPH" + 168 -> "WRRR" _ -> error "unitialised sound" soundPathList :: [String] soundPathList = @@ -417,6 +419,7 @@ soundPathList = , "metal5.TTRKL.1000.wav" , "stone5.CRUMBL.1000.wav" , "tone440sawtooth.SCREE.2000.wav" + , "beep3Quick.BIPBIPBIP.500.wav" , "fireLoud.WRRR.500.wav" , "tone440sawtoothquiet.SCREE.500.wav" , "computerBeeping.BIPBIPBIP.500.wav" @@ -658,195 +661,197 @@ stone5S :: SoundID stone5S = SoundID 70 tone440sawtoothS :: SoundID tone440sawtoothS = SoundID 71 +beep3QuickS :: SoundID +beep3QuickS = SoundID 72 fireLoudS :: SoundID -fireLoudS = SoundID 72 +fireLoudS = SoundID 73 tone440sawtoothquietS :: SoundID -tone440sawtoothquietS = SoundID 73 +tone440sawtoothquietS = SoundID 74 computerBeepingS :: SoundID -computerBeepingS = SoundID 74 +computerBeepingS = SoundID 75 slapS :: SoundID -slapS = SoundID 75 +slapS = SoundID 76 bloodShort5S :: SoundID -bloodShort5S = SoundID 76 +bloodShort5S = SoundID 77 seagullCry2S :: SoundID -seagullCry2S = SoundID 77 +seagullCry2S = SoundID 78 gut5S :: SoundID -gut5S = SoundID 78 +gut5S = SoundID 79 ting2S :: SoundID -ting2S = SoundID 79 +ting2S = SoundID 80 dededaS :: SoundID -dededaS = SoundID 80 +dededaS = SoundID 81 whirdownSmall2S :: SoundID -whirdownSmall2S = SoundID 81 +whirdownSmall2S = SoundID 82 seagullCryS :: SoundID -seagullCryS = SoundID 82 +seagullCryS = SoundID 83 gut3S :: SoundID -gut3S = SoundID 83 +gut3S = SoundID 84 metal7S :: SoundID -metal7S = SoundID 84 +metal7S = SoundID 85 glassShat4S :: SoundID -glassShat4S = SoundID 85 +glassShat4S = SoundID 86 energyReleaseS :: SoundID -energyReleaseS = SoundID 86 +energyReleaseS = SoundID 87 tone440S :: SoundID -tone440S = SoundID 87 +tone440S = SoundID 88 explosionS :: SoundID -explosionS = SoundID 88 +explosionS = SoundID 89 gut4S :: SoundID -gut4S = SoundID 89 +gut4S = SoundID 90 glassShat1S :: SoundID -glassShat1S = SoundID 90 +glassShat1S = SoundID 91 slap3S :: SoundID -slap3S = SoundID 91 +slap3S = SoundID 92 reload1S :: SoundID -reload1S = SoundID 92 +reload1S = SoundID 93 slapClean3S :: SoundID -slapClean3S = SoundID 93 +slapClean3S = SoundID 94 foot2S :: SoundID -foot2S = SoundID 94 +foot2S = SoundID 95 glassShat2S :: SoundID -glassShat2S = SoundID 95 +glassShat2S = SoundID 96 fireS :: SoundID -fireS = SoundID 96 +fireS = SoundID 97 glassShat3S :: SoundID -glassShat3S = SoundID 97 +glassShat3S = SoundID 98 insertS :: SoundID -insertS = SoundID 98 +insertS = SoundID 99 blood1S :: SoundID -blood1S = SoundID 99 +blood1S = SoundID 100 ting3S :: SoundID -ting3S = SoundID 100 +ting3S = SoundID 101 whirdownS :: SoundID -whirdownS = SoundID 101 +whirdownS = SoundID 102 gut6S :: SoundID -gut6S = SoundID 102 +gut6S = SoundID 103 whirdownShort3S :: SoundID -whirdownShort3S = SoundID 103 +whirdownShort3S = SoundID 104 debrisS :: SoundID -debrisS = SoundID 104 +debrisS = SoundID 105 tap3S :: SoundID -tap3S = SoundID 105 +tap3S = SoundID 106 backgroundSpaceS :: SoundID -backgroundSpaceS = SoundID 106 +backgroundSpaceS = SoundID 107 lasPulseS :: SoundID -lasPulseS = SoundID 107 +lasPulseS = SoundID 108 clang2S :: SoundID -clang2S = SoundID 108 +clang2S = SoundID 109 metal2S :: SoundID -metal2S = SoundID 109 +metal2S = SoundID 110 tingS :: SoundID -tingS = SoundID 110 +tingS = SoundID 111 autoBS :: SoundID -autoBS = SoundID 111 +autoBS = SoundID 112 knifeS :: SoundID -knifeS = SoundID 112 +knifeS = SoundID 113 combineS :: SoundID -combineS = SoundID 113 +combineS = SoundID 114 connectItemS :: SoundID -connectItemS = SoundID 114 +connectItemS = SoundID 115 slapClean7S :: SoundID -slapClean7S = SoundID 115 +slapClean7S = SoundID 116 seagullWhistle1S :: SoundID -seagullWhistle1S = SoundID 116 +seagullWhistle1S = SoundID 117 bloodShort6S :: SoundID -bloodShort6S = SoundID 117 +bloodShort6S = SoundID 118 hitS :: SoundID -hitS = SoundID 118 +hitS = SoundID 119 whirdownShort4S :: SoundID -whirdownShort4S = SoundID 119 +whirdownShort4S = SoundID 120 sineRaisePitchOneSecS :: SoundID -sineRaisePitchOneSecS = SoundID 120 +sineRaisePitchOneSecS = SoundID 121 dededumS :: SoundID -dededumS = SoundID 121 +dededumS = SoundID 122 throbC4S :: SoundID -throbC4S = SoundID 122 +throbC4S = SoundID 123 whirTapS :: SoundID -whirTapS = SoundID 123 +whirTapS = SoundID 124 ting5S :: SoundID -ting5S = SoundID 124 +ting5S = SoundID 125 stone2S :: SoundID -stone2S = SoundID 125 +stone2S = SoundID 126 blood6S :: SoundID -blood6S = SoundID 126 +blood6S = SoundID 127 pickUpS :: SoundID -pickUpS = SoundID 127 +pickUpS = SoundID 128 slap2S :: SoundID -slap2S = SoundID 128 +slap2S = SoundID 129 bloodShort2S :: SoundID -bloodShort2S = SoundID 129 +bloodShort2S = SoundID 130 foamSprayFadeOutS :: SoundID -foamSprayFadeOutS = SoundID 130 +foamSprayFadeOutS = SoundID 131 metal6S :: SoundID -metal6S = SoundID 131 +metal6S = SoundID 132 tap1S :: SoundID -tap1S = SoundID 132 +tap1S = SoundID 133 click1S :: SoundID -click1S = SoundID 133 +click1S = SoundID 134 semitoneLoop1S :: SoundID -semitoneLoop1S = SoundID 134 +semitoneLoop1S = SoundID 135 disconnectItemS :: SoundID -disconnectItemS = SoundID 135 +disconnectItemS = SoundID 136 dedumS :: SoundID -dedumS = SoundID 136 +dedumS = SoundID 137 sawtoothFailS :: SoundID -sawtoothFailS = SoundID 137 +sawtoothFailS = SoundID 138 sineRaisePitchTwoSecS :: SoundID -sineRaisePitchTwoSecS = SoundID 138 +sineRaisePitchTwoSecS = SoundID 139 slap4S :: SoundID -slap4S = SoundID 139 +slap4S = SoundID 140 skwareFadeTwoSecS :: SoundID -skwareFadeTwoSecS = SoundID 140 +skwareFadeTwoSecS = SoundID 141 reloadFailS :: SoundID -reloadFailS = SoundID 141 +reloadFailS = SoundID 142 throb1S :: SoundID -throb1S = SoundID 142 +throb1S = SoundID 143 slap5S :: SoundID -slap5S = SoundID 143 +slap5S = SoundID 144 smallGlass3S :: SoundID -smallGlass3S = SoundID 144 +smallGlass3S = SoundID 145 reverseCymbal1S :: SoundID -reverseCymbal1S = SoundID 145 +reverseCymbal1S = SoundID 146 blood2S :: SoundID -blood2S = SoundID 146 +blood2S = SoundID 147 insertOneS :: SoundID -insertOneS = SoundID 147 +insertOneS = SoundID 148 slap1S :: SoundID -slap1S = SoundID 148 +slap1S = SoundID 149 tap4S :: SoundID -tap4S = SoundID 149 +tap4S = SoundID 150 clang1S :: SoundID -clang1S = SoundID 150 +clang1S = SoundID 151 foot1S :: SoundID -foot1S = SoundID 151 +foot1S = SoundID 152 elecCrackleS :: SoundID -elecCrackleS = SoundID 152 +elecCrackleS = SoundID 153 foamSprayLoopS :: SoundID -foamSprayLoopS = SoundID 153 +foamSprayLoopS = SoundID 154 smallGlass1S :: SoundID -smallGlass1S = SoundID 154 +smallGlass1S = SoundID 155 bangS :: SoundID -bangS = SoundID 155 +bangS = SoundID 156 seagullChatterS :: SoundID -seagullChatterS = SoundID 156 +seagullChatterS = SoundID 157 foot3S :: SoundID -foot3S = SoundID 157 +foot3S = SoundID 158 bloodShort3S :: SoundID -bloodShort3S = SoundID 158 +bloodShort3S = SoundID 159 blood4S :: SoundID -blood4S = SoundID 159 +blood4S = SoundID 160 ejectS :: SoundID -ejectS = SoundID 160 +ejectS = SoundID 161 bloodShort4S :: SoundID -bloodShort4S = SoundID 161 +bloodShort4S = SoundID 162 metal1S :: SoundID -metal1S = SoundID 162 +metal1S = SoundID 163 slapClean5S :: SoundID -slapClean5S = SoundID 163 +slapClean5S = SoundID 164 warp1S :: SoundID -warp1S = SoundID 164 +warp1S = SoundID 165 tinitusS :: SoundID -tinitusS = SoundID 165 +tinitusS = SoundID 166 gut1S :: SoundID -gut1S = SoundID 166 +gut1S = SoundID 167 fireFadeS :: SoundID -fireFadeS = SoundID 167 +fireFadeS = SoundID 168 diff --git a/tags b/tags index aec7015bd..35bd9abb0 100644 --- a/tags +++ b/tags @@ -2637,7 +2637,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 124;" f +arms src/Dodge/Creature/Picture.hs 123;" f arrow src/Picture/Composite.hs 19;" f arrowPath src/Picture/Composite.hs 8;" f assignHotkey src/Dodge/AssignHotkey.hs 9;" f @@ -2657,9 +2657,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 739;" f +autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 744;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f -autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 551;" f +autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" 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 161;" f @@ -2668,15 +2668,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 199;" f -backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 729;" f +backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 734;" 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 647;" f +bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f -bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 827;" f +bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 832;" 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 @@ -2689,7 +2689,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 162;" f +baseShoulder src/Dodge/Creature/Picture.hs 161;" 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 @@ -2702,6 +2702,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 beltMag src/Dodge/Item/Ammo.hs 38;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 242;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 115;" f @@ -2722,22 +2723,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 715;" f -blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 809;" f -blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 643;" f -blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 835;" f -blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 559;" f -blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 769;" f -blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 563;" f -blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 549;" f -bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 591;" f -bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 775;" f -bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 833;" f -bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 839;" f -bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 669;" f -bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 751;" f -bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 595;" f -bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 539;" f +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 blowTorch src/Dodge/Item/Held/SprayGuns.hs 43;" f blue src/Color.hs 43;" f blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f @@ -2775,7 +2776,7 @@ 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 593;" f +buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f byNthLink src/Dodge/Room/Warning.hs 44;" f cChasm src/Dodge/Room/Tutorial.hs 137;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f @@ -2814,7 +2815,7 @@ chaseCritAwarenessUpdate src/Dodge/Creature/Perception.hs 65;" f chaseCritInternal src/Dodge/Humanoid.hs 11;" f chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 123;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 32;" f -chaseUpperBody src/Dodge/Creature/Picture.hs 74;" f +chaseUpperBody src/Dodge/Creature/Picture.hs 73;" f chasmRotate src/Dodge/Creature/Update.hs 182;" f chasmSimpleMaze src/Dodge/Room/Tutorial.hs 373;" f chasmSpitTerminal src/Dodge/Room/Tutorial.hs 307;" f @@ -2856,16 +2857,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 817;" f -clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 733;" f -clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 577;" 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 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 783;" f +click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 788;" f clicker src/Dodge/Item/Scope.hs 88;" f clipV src/Geometry/Vector.hs 48;" f clipZoom src/Dodge/Update/Camera.hs 234;" f @@ -2911,7 +2912,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 743;" f +combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 748;" f combineTree src/Dodge/Tree/Compose.hs 68;" f commandColor src/Dodge/Terminal.hs 127;" f commonPrefix src/Dodge/Debug/Terminal.hs 149;" f @@ -2925,10 +2926,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 665;" f +computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 670;" f conEffects src/Dodge/Concurrent.hs 12;" f concurrentIS src/Dodge/Inventory.hs 197;" f -connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 745;" f +connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 750;" f constructEdges src/Polyhedra.hs 31;" f constructEdgesList src/Polyhedra.hs 40;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 58;" f @@ -3002,7 +3003,7 @@ 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 597;" f +crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f createForceField src/Dodge/ForceField.hs 7;" f createGas src/Dodge/Gas.hs 10;" f createHeadLamp src/Dodge/Euse.hs 64;" f @@ -3096,11 +3097,11 @@ deZoneIX src/Dodge/Zoning/Base.hs 91;" f deZoneWall src/Dodge/Zoning/Wall.hs 69;" f deadEndPSType src/Dodge/Room/Room.hs 263;" f deadEndRoom src/Dodge/Room/Room.hs 266;" f -deadFeet src/Dodge/Creature/Picture.hs 120;" f -deadRot src/Dodge/Creature/Picture.hs 138;" f -deadScalp src/Dodge/Creature/Picture.hs 133;" f -deadUpperBody src/Dodge/Creature/Picture.hs 159;" f -debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 725;" f +deadFeet src/Dodge/Creature/Picture.hs 119;" f +deadRot src/Dodge/Creature/Picture.hs 137;" f +deadScalp src/Dodge/Creature/Picture.hs 132;" f +deadUpperBody src/Dodge/Creature/Picture.hs 158;" f +debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 730;" f debrisSPic src/Dodge/Prop/Draw.hs 17;" f debrisSize src/Dodge/Block/Debris.hs 131;" f debugEvent src/Dodge/Debug.hs 43;" f @@ -3125,10 +3126,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 104;" f -dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 557;" f -dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 677;" f -dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 759;" f -dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 789;" f +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 defCraftItem src/Dodge/Default/Item.hs 25;" f defDamageMaterial src/Dodge/Material/Damage.hs 34;" f defEquipment src/Dodge/Default.hs 24;" f @@ -3209,7 +3210,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 787;" f +disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 792;" f displayConfig src/Dodge/Menu.hs 223;" f displayControls src/Dodge/Menu.hs 239;" f displayFrameTicks src/Dodge/Render/Picture.hs 50;" f @@ -3322,7 +3323,7 @@ drawBoundingBox src/Dodge/Debug/Picture.hs 368;" f drawBullet src/Dodge/Render/ShapePicture.hs 179;" f drawButton src/Dodge/Button/Draw.hs 11;" f drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f -drawChaseCrit src/Dodge/Creature/Picture.hs 65;" f +drawChaseCrit src/Dodge/Creature/Picture.hs 64;" f drawCircCollisionTest src/Dodge/Debug/Picture.hs 118;" f drawCliff src/Dodge/Render/ShapePicture.hs 87;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f @@ -3351,7 +3352,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 171;" f +drawEquipment src/Dodge/Creature/Picture.hs 170;" 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 @@ -3473,8 +3474,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 837;" f -elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 821;" f +ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 842;" f +elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 826;" f elephantGun src/Dodge/Item/Held/Rod.hs 27;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 23;" f emptyTrie src/SimpleTrie.hs 17;" f @@ -3485,7 +3486,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 689;" f +energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 694;" f enterCombineInv src/Dodge/DisplayInventory.hs 321;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f epText src/Dodge/Inventory/SelectionList.hs 73;" f @@ -3519,7 +3520,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 693;" f +explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 698;" 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 @@ -3531,7 +3532,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 106;" f +feet src/Dodge/Creature/Picture.hs 105;" f filter3 src/FoldableHelp.hs 76;" f filterSectionsPair src/Dodge/DisplayInventory.hs 160;" f findBlips src/Dodge/RadarSweep.hs 63;" f @@ -3544,9 +3545,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 851;" f -fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 661;" f -fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 709;" 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 firstBreather src/Dodge/Room/Breather.hs 9;" f firstTrie src/SimpleTrie.hs 51;" f firstWorldLoad appDodge/Main.hs 68;" f @@ -3577,15 +3578,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 777;" f -foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 823;" f +foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 782;" f +foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 828;" 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 819;" f -foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 705;" f -foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 831;" 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 forbidFlee src/Dodge/Creature/Boid.hs 45;" f forceElements src/StrictHelp.hs 10;" f forceField src/Dodge/Wall/ForceField.hs 6;" f @@ -3595,7 +3596,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 545;" f +fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f fromJust' src/MaybeHelp.hs 22;" f fromListL src/DoubleStack.hs 7;" f fromTopLeft src/Dodge/ScreenPos.hs 9;" f @@ -3679,10 +3680,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 697;" f -glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 707;" f -glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 711;" f -glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 687;" f +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 glassSwitchBack src/Dodge/Room/Room.hs 85;" f glassSwitchBackCrits src/Dodge/Room/Room.hs 119;" f glauncherPic src/Dodge/Item/Draw/SPic.hs 404;" f @@ -3703,13 +3704,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 521;" f -gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 849;" f -gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 587;" f -gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 683;" f -gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 695;" f -gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 673;" f -gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 721;" f +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 gyroscope src/Dodge/Item/Scope.hs 170;" f hackBoldText src/Picture/Base.hs 193;" f hackDropShadow src/Picture/Base.hs 196;" f @@ -3745,7 +3746,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 190;" f -healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 627;" f +healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 630;" 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 @@ -3771,9 +3772,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 613;" f +hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 616;" f hitEffFromBul src/Dodge/Bullet.hs 156;" f -hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 753;" f +hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 758;" 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 @@ -3810,9 +3811,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 811;" f +insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 816;" f insertOver src/ListHelp.hs 47;" f -insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 713;" f +insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" 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 @@ -3976,7 +3977,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 741;" f +knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 746;" 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 @@ -3990,7 +3991,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 731;" f +lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 736;" 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 @@ -4082,7 +4083,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 541;" f +lowWhirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f lsColPos src/Dodge/LightSource.hs 24;" f lsColPosID src/Dodge/LightSource.hs 21;" f lsColPosRad src/Dodge/LightSource.hs 30;" f @@ -4156,10 +4157,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 615;" f -marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 585;" f -marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 623;" f -marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 611;" f +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 materialColor src/Dodge/Material/Color.hs 8;" f materialPenetrable src/Dodge/Bullet.hs 212;" f maxAmmo src/Dodge/Item/MaxAmmo.hs 6;" f @@ -4210,13 +4211,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 841;" f -metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 735;" f -metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 573;" f -metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 523;" f -metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 655;" f -metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 779;" f -metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 685;" f +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 metalPlate src/Dodge/Item/Craftable.hs 32;" f mglCreate src/GLHelp.hs 8;" f mglDelete src/GLHelp.hs 14;" f @@ -4232,18 +4233,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 583;" f +mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 586;" 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 653;" f +miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 656;" f miniTree2 src/Dodge/Room/Room.hs 126;" 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 619;" f +missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f mixColors src/Color.hs 113;" f mixColorsFrac src/Color.hs 109;" f mixColorsLinear src/Color.hs 122;" f @@ -4350,11 +4351,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 635;" f +oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" 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 103;" f +oneSmooth src/Dodge/Creature/Picture.hs 102;" f openConsole src/Dodge/Update.hs 138;" f optionMenu src/Dodge/Menu.hs 110;" f optionScreenDefaultEffect src/Dodge/Update/Input/ScreenLayer.hs 62;" f @@ -4427,7 +4428,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 771;" f +pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 776;" 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 @@ -4548,7 +4549,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 645;" f +primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 648;" 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 @@ -4690,10 +4691,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 701;" f -reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 799;" f +reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 706;" f +reloadFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 804;" f reloadLevelStart src/Dodge/Save.hs 71;" f -reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 531;" f +reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 534;" f rememberSounds src/Dodge/Creature/Perception.hs 176;" f remoteDetonator src/Dodge/Item/Scope.hs 152;" f remoteScreen src/Dodge/Item/Scope.hs 146;" f @@ -4732,7 +4733,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 807;" f +reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 812;" 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 @@ -4832,14 +4833,14 @@ 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 791;" f +sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 796;" 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 147;" f +scalp src/Dodge/Creature/Picture.hs 146;" f scancodeToHotkey src/Dodge/Creature/YourControl.hs 82;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f scorchSPic src/Dodge/Creature/Update.hs 130;" f @@ -4854,15 +4855,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 579;" f -seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 533;" f -seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 599;" f -seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 829;" f -seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 631;" f -seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 671;" f -seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 681;" f -seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 749;" f -seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 621;" f +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 searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 229;" f secondColumnLDP src/Dodge/ListDisplayParams.hs 45;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 202;" f @@ -4877,7 +4878,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 785;" f +semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 790;" 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 @@ -4992,7 +4993,7 @@ shootersRoom1 src/Dodge/Room/Room.hs 334;" f shootingRange src/Dodge/Room/Room.hs 361;" f shortPoint2 src/Dodge/ShortShow.hs 4;" f shortShow src/ShortShow.hs 7;" f -shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 527;" f +shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 530;" 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 @@ -5013,30 +5014,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 757;" f -sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 793;" f +sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 762;" f +sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 798;" 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 797;" f -slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 813;" f -slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 773;" f -slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 699;" f -slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 795;" f -slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 803;" f -slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 571;" f -slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 569;" f -slapClean2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 625;" f -slapClean3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 703;" f -slapClean4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 555;" f -slapClean5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 843;" f -slapClean6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 581;" f -slapClean7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 747;" f -slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 667;" f -slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 629;" f +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 slideWindow src/ListHelp.hs 81;" f slowCrush90 src/Dodge/Room/LongDoor.hs 263;" f slowCrushRoom src/Dodge/Room/LongDoor.hs 148;" f @@ -5046,10 +5047,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 825;" f -smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 535;" f -smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 805;" f -smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 607;" f +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 smallPillar src/Dodge/Room/Pillar.hs 38;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f smallSnailInt2 src/Dodge/Path.hs 106;" f @@ -5069,10 +5070,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 346;" f +soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 348;" f soundPic src/Dodge/Debug/Picture.hs 373;" f soundStart src/Dodge/SoundLogic.hs 118;" f -soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 175;" f +soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 176;" f soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f @@ -5147,11 +5148,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 589;" f -stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 767;" f -stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 537;" f -stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 543;" f -stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 657;" f +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 stopAllSounds src/Sound.hs 127;" f stopBulletAt src/Dodge/Bullet.hs 201;" f stopPushing src/Dodge/Wall/Damage.hs 172;" f @@ -5198,11 +5199,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 781;" f -tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 517;" f -tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 727;" f -tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 815;" f -tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 637;" f +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 targCorner src/Dodge/Targeting/Draw.hs 35;" f targetCursorPic src/Dodge/Targeting/Draw.hs 41;" f targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 14;" f @@ -5211,7 +5212,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 575;" f +teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 578;" f termScreenColor src/Dodge/Terminal/Color.hs 8;" f termSoundLine src/Dodge/Terminal.hs 49;" f termTextColor src/Dodge/Terminal.hs 52;" f @@ -5257,8 +5258,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 801;" f -throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 761;" f +throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 806;" f +throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 766;" f throwItem src/Dodge/Creature/Action.hs 197;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 216;" f @@ -5267,13 +5268,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 609;" f -ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 675;" f -ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 717;" f -ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 603;" f -ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 765;" f -tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 737;" f -tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 847;" f +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 titleOptionsMenu src/Dodge/Menu.hs 104;" f titleOptionsNoWrite src/Dodge/Menu.hs 107;" f tlDoEffect src/Dodge/Terminal.hs 115;" f @@ -5299,11 +5300,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 691;" f -tone440_30sS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 633;" f -tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 601;" f -tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 659;" f -tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 663;" f +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 topInvW src/Dodge/ListDisplayParams.hs 54;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f @@ -5311,7 +5312,7 @@ topTestPart src/Dodge/TestString.hs 81;" 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 152;" f +torso src/Dodge/Creature/Picture.hs 151;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f tractorBeamAt src/Dodge/HeldUse.hs 850;" f @@ -5394,9 +5395,9 @@ twoFlatHRot src/Dodge/Item/HeldOffset.hs 91;" f twoHandOffY src/Dodge/Creature/HandPos.hs 138;" f twoHandTwistAmount src/Dodge/Creature/YourControl.hs 142;" f twoRoomPoss src/Dodge/PlacementSpot.hs 148;" f -twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 519;" f -twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 567;" f -twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 649;" f +twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 522;" f +twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 570;" f +twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 652;" f ubyteSize src/Shader/Parameters.hs 13;" f ugateCalc src/Dodge/Inventory/SelectionList.hs 109;" f uncurryV src/Geometry/Data.hs 66;" f @@ -5542,7 +5543,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 167;" f +upperBody src/Dodge/Creature/Picture.hs 166;" f upperBox src/Shape.hs 153;" f upperBoxHalf src/Shape.hs 219;" f upperBoxMT src/Shape.hs 144;" f @@ -5619,7 +5620,7 @@ 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 845;" f +warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 850;" f wasdAim src/Dodge/Creature/YourControl.hs 113;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f @@ -5635,22 +5636,22 @@ weaponRoom src/Dodge/Room/Room.hs 280;" f weaponUnderCrits src/Dodge/Room/Room.hs 178;" f wedgeGeom src/Dodge/Base.hs 42;" f wedgeOfThickness src/Dodge/Picture.hs 9;" f -whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 639;" f -whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 763;" f -whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 651;" f -whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 617;" f -whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 565;" f -whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 719;" f -whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 561;" f -whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 547;" f -whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 723;" f -whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 755;" f -whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 529;" f -whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 679;" f -whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 641;" f +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 white src/Color.hs 53;" f -whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 605;" f -whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 553;" f +whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 608;" f +whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" 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 @@ -5684,7 +5685,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 525;" f +wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 528;" f wristArmour src/Dodge/Item/Equipment.hs 35;" f wristInvisibility src/Dodge/Item/Equipment.hs 80;" f writeConfig src/Dodge/Menu.hs 180;" f