diff --git a/data/sound/seagullChatter1.CHUGUGUG.10000.wav b/data/sound/seagullChatter1.CHUGUGUG.10000.wav index 16bcc33fd..bc06167f6 100644 Binary files a/data/sound/seagullChatter1.CHUGUGUG.10000.wav and b/data/sound/seagullChatter1.CHUGUGUG.10000.wav differ diff --git a/data/sound/seagullCry1.CR-UH.5000.wav b/data/sound/seagullCry1.CR-UH.5000.wav new file mode 100644 index 000000000..c26d661c4 Binary files /dev/null and b/data/sound/seagullCry1.CR-UH.5000.wav differ diff --git a/src/Dodge/Creature/ChaseCrit.hs b/src/Dodge/Creature/ChaseCrit.hs index 71a58c63d..2f24d328b 100644 --- a/src/Dodge/Creature/ChaseCrit.hs +++ b/src/Dodge/Creature/ChaseCrit.hs @@ -49,9 +49,11 @@ chaseCrit = defaultCreature , _crVocalization = Vocalization seagullChatterS [seagullBarkS ,seagullChatterS + ,seagullChatter1S ,seagullWhistleS ,seagullWhistle1S ,seagullCryS + ,seagullCry1S ] 50 0 , _crMvType = defaultChaseMvType } diff --git a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs index 1a992b37f..e0ae5bd52 100644 --- a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs +++ b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs @@ -1,4 +1,4 @@ --- generated at 2022-05-19 12:29:16.87589614 UTC +-- generated at 2022-05-19 13:12:07.606387989 UTC module Dodge.SoundLogic.ExternallyGeneratedSounds where import Sound.Data soundToVol :: SoundID -> Float @@ -12,69 +12,70 @@ soundToVol v = case _getSoundID v of 6 -> 5000 7 -> 3000 8 -> 5000 - 9 -> 3000 - 10 -> 4000 - 11 -> 5000 + 9 -> 5000 + 10 -> 3000 + 11 -> 4000 12 -> 5000 - 13 -> 10000 - 14 -> 8000 + 13 -> 5000 + 14 -> 10000 15 -> 8000 16 -> 8000 17 -> 8000 - 18 -> 10000 - 19 -> 3000 - 20 -> 4000 - 21 -> 5000 + 18 -> 8000 + 19 -> 10000 + 20 -> 3000 + 21 -> 4000 22 -> 5000 23 -> 5000 - 24 -> 20000 - 25 -> 4000 - 26 -> 10000 - 27 -> 8000 - 28 -> 4000 - 29 -> 2000 - 30 -> 6000 - 31 -> 500 - 32 -> 5000 - 33 -> 8000 + 24 -> 5000 + 25 -> 20000 + 26 -> 4000 + 27 -> 10000 + 28 -> 8000 + 29 -> 4000 + 30 -> 2000 + 31 -> 6000 + 32 -> 500 + 33 -> 5000 34 -> 8000 35 -> 8000 - 36 -> 5000 - 37 -> 10000 - 38 -> 8000 - 39 -> 4000 - 40 -> 3000 - 41 -> 8000 - 42 -> 2000 - 43 -> 10000 - 44 -> 5000 - 45 -> 2000 - 46 -> 3000 - 47 -> 5000 - 48 -> 10000 - 49 -> 12000 - 50 -> 5000 + 36 -> 8000 + 37 -> 5000 + 38 -> 10000 + 39 -> 8000 + 40 -> 4000 + 41 -> 3000 + 42 -> 8000 + 43 -> 2000 + 44 -> 10000 + 45 -> 5000 + 46 -> 2000 + 47 -> 3000 + 48 -> 5000 + 49 -> 10000 + 50 -> 12000 51 -> 5000 - 52 -> 10000 - 53 -> 12000 - 54 -> 2000 - 55 -> 3000 - 56 -> 8000 - 57 -> 5000 - 58 -> 2000 - 59 -> 3000 - 60 -> 10000 - 61 -> 500 - 62 -> 10000 - 63 -> 3000 - 64 -> 15000 - 65 -> 10000 - 66 -> 3000 - 67 -> 1000 - 68 -> 15000 - 69 -> 10000 - 70 -> 5000 - 71 -> 8000 + 52 -> 5000 + 53 -> 10000 + 54 -> 12000 + 55 -> 2000 + 56 -> 3000 + 57 -> 8000 + 58 -> 5000 + 59 -> 2000 + 60 -> 3000 + 61 -> 10000 + 62 -> 500 + 63 -> 10000 + 64 -> 3000 + 65 -> 15000 + 66 -> 10000 + 67 -> 3000 + 68 -> 1000 + 69 -> 15000 + 70 -> 10000 + 71 -> 5000 + 72 -> 8000 _ -> 50 soundToOnomato :: SoundID -> String soundToOnomato v = case _getSoundID v of @@ -87,69 +88,70 @@ soundToOnomato v = case _getSoundID v of 6 -> "KRTNKL" 7 -> "DWAAH" 8 -> "DEDEDUM" - 9 -> "BWAH" - 10 -> "TIPTOP" - 11 -> "DEDEDA" - 12 -> "TINKLE" - 13 -> "TATATA" - 14 -> "CRSK" - 15 -> "CRNK" - 16 -> "TAKH" - 17 -> "CRUNK" - 18 -> "SCREE" - 19 -> "TNKTNKTNK" - 20 -> "TIPTAP" - 21 -> "WRR" - 22 -> "DEDUM" - 23 -> "HSS" - 24 -> "BOOM" - 25 -> "CLNK" - 26 -> "BRAP" - 27 -> "CRSNK" - 28 -> "TAPP" - 29 -> "BLIH" - 30 -> "TAPTIP" - 31 -> "CLICK" - 32 -> "FWUMP" - 33 -> "RINGGG" - 34 -> "BRAP" - 35 -> "CRUMPLE" - 36 -> "TRINKL" - 37 -> "PEW" - 38 -> "TAK" - 39 -> "SMACK" - 40 -> "DRR" - 41 -> "CRASH" - 42 -> "SWSH" - 43 -> "CRAKLE" - 44 -> "CRTINK" - 45 -> "FHP" - 46 -> "CHPCHPCHP" - 47 -> "BIPBIPBIP" - 48 -> "CHUGUGUG" - 49 -> "BRPBRPBRP" - 50 -> "CRUH" - 51 -> "CHNKCHNKCHUNK" - 52 -> "WRRR" - 53 -> "BRDBRDBRD" - 54 -> "PHF" - 55 -> "BWAAH" - 56 -> "BEP" - 57 -> "HSSS" - 58 -> "SHUHP" - 59 -> "THUD" - 60 -> "WHSSH" - 61 -> "HMM" - 62 -> "BRAHCHCH" - 63 -> "TIP" - 64 -> "BANGG" - 65 -> "ZHM" - 66 -> "TAP" - 67 -> "BLPCHCH" - 68 -> "BANG" - 69 -> "CHUGUGUG" - 70 -> "DEDA" - 71 -> "CRISH" + 9 -> "CR-UH" + 10 -> "BWAH" + 11 -> "TIPTOP" + 12 -> "DEDEDA" + 13 -> "TINKLE" + 14 -> "TATATA" + 15 -> "CRSK" + 16 -> "CRNK" + 17 -> "TAKH" + 18 -> "CRUNK" + 19 -> "SCREE" + 20 -> "TNKTNKTNK" + 21 -> "TIPTAP" + 22 -> "WRR" + 23 -> "DEDUM" + 24 -> "HSS" + 25 -> "BOOM" + 26 -> "CLNK" + 27 -> "BRAP" + 28 -> "CRSNK" + 29 -> "TAPP" + 30 -> "BLIH" + 31 -> "TAPTIP" + 32 -> "CLICK" + 33 -> "FWUMP" + 34 -> "RINGGG" + 35 -> "BRAP" + 36 -> "CRUMPLE" + 37 -> "TRINKL" + 38 -> "PEW" + 39 -> "TAK" + 40 -> "SMACK" + 41 -> "DRR" + 42 -> "CRASH" + 43 -> "SWSH" + 44 -> "CRAKLE" + 45 -> "CRTINK" + 46 -> "FHP" + 47 -> "CHPCHPCHP" + 48 -> "BIPBIPBIP" + 49 -> "CHUGUGUG" + 50 -> "BRPBRPBRP" + 51 -> "CRUH" + 52 -> "CHNKCHNKCHUNK" + 53 -> "WRRR" + 54 -> "BRDBRDBRD" + 55 -> "PHF" + 56 -> "BWAAH" + 57 -> "BEP" + 58 -> "HSSS" + 59 -> "SHUHP" + 60 -> "THUD" + 61 -> "WHSSH" + 62 -> "HMM" + 63 -> "BRAHCHCH" + 64 -> "TIP" + 65 -> "BANGG" + 66 -> "ZHM" + 67 -> "TAP" + 68 -> "BLPCHCH" + 69 -> "BANG" + 70 -> "CHUGUGUG" + 71 -> "DEDA" + 72 -> "CRISH" _ -> error "unitialised sound" soundPathList :: [String] soundPathList = @@ -162,6 +164,7 @@ soundPathList = , "smallGlass2.KRTNKL.5000.wav" , "skwareFadeTwoSec.DWAAH.3000.wav" , "dededum.DEDEDUM.5000.wav" + , "seagullCry1.CR-UH.5000.wav" , "sineRaisePitchOneSec.BWAH.3000.wav" , "twoStepSlow.TIPTOP.4000.wav" , "dededa.DEDEDA.5000.wav" @@ -244,129 +247,131 @@ skwareFadeTwoSecS :: SoundID skwareFadeTwoSecS = SoundID 7 dededumS :: SoundID dededumS = SoundID 8 +seagullCry1S :: SoundID +seagullCry1S = SoundID 9 sineRaisePitchOneSecS :: SoundID -sineRaisePitchOneSecS = SoundID 9 +sineRaisePitchOneSecS = SoundID 10 twoStepSlowS :: SoundID -twoStepSlowS = SoundID 10 +twoStepSlowS = SoundID 11 dededaS :: SoundID -dededaS = SoundID 11 +dededaS = SoundID 12 smallGlass4S :: SoundID -smallGlass4S = SoundID 12 +smallGlass4S = SoundID 13 autoBS :: SoundID -autoBS = SoundID 13 +autoBS = SoundID 14 glassShat4S :: SoundID -glassShat4S = SoundID 14 +glassShat4S = SoundID 15 glassShat3S :: SoundID -glassShat3S = SoundID 15 +glassShat3S = SoundID 16 tap2S :: SoundID -tap2S = SoundID 16 +tap2S = SoundID 17 impact2S :: SoundID -impact2S = SoundID 17 +impact2S = SoundID 18 tone440sawtoothS :: SoundID -tone440sawtoothS = SoundID 18 +tone440sawtoothS = SoundID 19 reloadS :: SoundID -reloadS = SoundID 19 +reloadS = SoundID 20 twoStepS :: SoundID -twoStepS = SoundID 20 +twoStepS = SoundID 21 fireS :: SoundID -fireS = SoundID 21 +fireS = SoundID 22 dedumS :: SoundID -dedumS = SoundID 22 +dedumS = SoundID 23 foamSprayFadeOutS :: SoundID -foamSprayFadeOutS = SoundID 23 +foamSprayFadeOutS = SoundID 24 explosionS :: SoundID -explosionS = SoundID 24 +explosionS = SoundID 25 tapQuietS :: SoundID -tapQuietS = SoundID 25 +tapQuietS = SoundID 26 autoGunS :: SoundID -autoGunS = SoundID 26 +autoGunS = SoundID 27 glassShat1S :: SoundID -glassShat1S = SoundID 27 +glassShat1S = SoundID 28 foot3S :: SoundID -foot3S = SoundID 28 +foot3S = SoundID 29 healS :: SoundID -healS = SoundID 29 +healS = SoundID 30 twoStep1S :: SoundID -twoStep1S = SoundID 30 +twoStep1S = SoundID 31 click1S :: SoundID -click1S = SoundID 31 +click1S = SoundID 32 tap4S :: SoundID -tap4S = SoundID 32 +tap4S = SoundID 33 tinitusS :: SoundID -tinitusS = SoundID 33 +tinitusS = SoundID 34 tap3S :: SoundID -tap3S = SoundID 34 +tap3S = SoundID 35 impact3S :: SoundID -impact3S = SoundID 35 +impact3S = SoundID 36 smallGlass1S :: SoundID -smallGlass1S = SoundID 36 +smallGlass1S = SoundID 37 seagullWhistle1S :: SoundID -seagullWhistle1S = SoundID 37 +seagullWhistle1S = SoundID 38 tap1S :: SoundID -tap1S = SoundID 38 +tap1S = SoundID 39 hit1S :: SoundID -hit1S = SoundID 39 +hit1S = SoundID 40 slideDoorS :: SoundID -slideDoorS = SoundID 40 +slideDoorS = SoundID 41 impact1S :: SoundID -impact1S = SoundID 41 +impact1S = SoundID 42 knifeS :: SoundID -knifeS = SoundID 42 +knifeS = SoundID 43 elecCrackleS :: SoundID -elecCrackleS = SoundID 43 +elecCrackleS = SoundID 44 smallGlass3S :: SoundID -smallGlass3S = SoundID 44 +smallGlass3S = SoundID 45 whiteNoiseFadeInS :: SoundID -whiteNoiseFadeInS = SoundID 45 +whiteNoiseFadeInS = SoundID 46 reload1S :: SoundID -reload1S = SoundID 46 +reload1S = SoundID 47 computerBeepingS :: SoundID -computerBeepingS = SoundID 47 +computerBeepingS = SoundID 48 seagullChatter1S :: SoundID -seagullChatter1S = SoundID 48 +seagullChatter1S = SoundID 49 miniS :: SoundID -miniS = SoundID 49 +miniS = SoundID 50 seagullCryS :: SoundID -seagullCryS = SoundID 50 +seagullCryS = SoundID 51 crankSlowS :: SoundID -crankSlowS = SoundID 51 +crankSlowS = SoundID 52 fireLoudS :: SoundID -fireLoudS = SoundID 52 +fireLoudS = SoundID 53 mini1S :: SoundID -mini1S = SoundID 53 +mini1S = SoundID 54 whiteNoiseFadeOutS :: SoundID -whiteNoiseFadeOutS = SoundID 54 +whiteNoiseFadeOutS = SoundID 55 sineRaisePitchTwoSecS :: SoundID -sineRaisePitchTwoSecS = SoundID 55 +sineRaisePitchTwoSecS = SoundID 56 tone440S :: SoundID -tone440S = SoundID 56 +tone440S = SoundID 57 foamSprayLoopS :: SoundID -foamSprayLoopS = SoundID 57 +foamSprayLoopS = SoundID 58 pickUpS :: SoundID -pickUpS = SoundID 58 +pickUpS = SoundID 59 hitS :: SoundID -hitS = SoundID 59 +hitS = SoundID 60 missileLaunchS :: SoundID -missileLaunchS = SoundID 60 +missileLaunchS = SoundID 61 fridgeHumS :: SoundID -fridgeHumS = SoundID 61 +fridgeHumS = SoundID 62 shotgunS :: SoundID -shotgunS = SoundID 62 +shotgunS = SoundID 63 foot1S :: SoundID -foot1S = SoundID 63 +foot1S = SoundID 64 bangEchoS :: SoundID -bangEchoS = SoundID 64 +bangEchoS = SoundID 65 teleS :: SoundID -teleS = SoundID 65 +teleS = SoundID 66 foot2S :: SoundID -foot2S = SoundID 66 +foot2S = SoundID 67 oldMachineBootS :: SoundID -oldMachineBootS = SoundID 67 +oldMachineBootS = SoundID 68 bangS :: SoundID -bangS = SoundID 68 +bangS = SoundID 69 seagullChatterS :: SoundID -seagullChatterS = SoundID 69 +seagullChatterS = SoundID 70 dedaS :: SoundID -dedaS = SoundID 70 +dedaS = SoundID 71 impact4S :: SoundID -impact4S = SoundID 71 +impact4S = SoundID 72