From bc0f7ada3cd47ed1c057b1418e08259f5c2b3518 Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 21 May 2022 10:10:17 +0100 Subject: [PATCH] Redo sound travel distances --- ...TATATA.10000.wav => autoB.TATATA.2000.wav} | Bin ...n.BRAP.10000.wav => autoGun.BRAP.2000.wav} | Bin ...bang.BANG.15000.wav => bang.BANG.2000.wav} | Bin ...ANGG.15000.wav => bangEcho.BANGG.2000.wav} | Bin .../{buzz.ZMM.8000.wav => buzz.ZMM.200.wav} | Bin ...ick1.CLICK.500.wav => click1.CLICK.40.wav} | Bin ....wav => computerBeeping.BIPBIPBIP.500.wav} | Bin ...00.wav => crankSlow.CHNKCHNKCHUNK.100.wav} | Bin .../{deda.DEDA.5000.wav => deda.DEDA.500.wav} | Bin ....DEDEDA.5000.wav => dededa.DEDEDA.500.wav} | Bin ...DEDUM.5000.wav => dededum.DEDEDUM.500.wav} | Bin ...dum.DEDUM.5000.wav => dedum.DEDUM.500.wav} | Bin ...E.10000.wav => elecCrackle.CRAKLE.200.wav} | Bin ...BOOM.20000.wav => explosion.BOOM.2000.wav} | Bin .../{fire.WRR.5000.wav => fire.WRR.100.wav} | Bin ...d.WRRR.10000.wav => fireLoud.WRRR.500.wav} | Bin ...S.5000.wav => foamSprayFadeOut.HSS.50.wav} | Bin ...SSS.5000.wav => foamSprayLoop.HSSS.50.wav} | Bin .../{foot1.TIP.3000.wav => foot1.TIP.40.wav} | Bin .../{foot2.TAP.3000.wav => foot2.TAP.40.wav} | Bin ...{foot3.TAPP.4000.wav => foot3.TAPP.40.wav} | Bin ...geHum.HMM.500.wav => fridgeHum.HMM.50.wav} | Bin ...SNK.8000.wav => glassShat1.CRSNK.1000.wav} | Bin ...NKL.8000.wav => glassShat2.CRNKL.1000.wav} | Bin ...CRNK.8000.wav => glassShat3.CRNK.1000.wav} | Bin ...CRSK.8000.wav => glassShat4.CRSK.1000.wav} | Bin .../{grunt.HNH.5000.wav => grunt.HNH.100.wav} | Bin .../{heal.BLIH.2000.wav => heal.BLIH.50.wav} | Bin .../{hit.THUD.3000.wav => hit.THUD.100.wav} | Bin ...hit1.SMACK.4000.wav => hit1.SMACK.100.wav} | Bin ....CRASH.8000.wav => impact1.CRASH.1000.wav} | Bin ....CRUNK.8000.wav => impact2.CRUNK.1000.wav} | Bin ...MPLE.8000.wav => impact3.CRUMPLE.1000.wav} | Bin ....CRISH.8000.wav => impact4.CRISH.1000.wav} | Bin ...{knife.SWSH.2000.wav => knife.SWSH.20.wav} | Bin ...PBRP.12000.wav => mini.BRPBRPBRP.2000.wav} | Bin ...BRD.12000.wav => mini1.BRDBRDBRD.2000.wav} | Bin ...10000.wav => missileLaunch.WHSSH.2000.wav} | Bin ...kUp.SHUHP.2000.wav => pickUp.SHUHP.50.wav} | Bin ...KTNK.3000.wav => reload.TNKTNKTNK.300.wav} | Bin ...CHP.3000.wav => reload1.CHPCHPCHP.300.wav} | Bin ...5000.wav => seagullBark.UGGAUGGA.2000.wav} | Bin ...0.wav => seagullChatter.CHUGUGUG.2000.wav} | Bin ....wav => seagullChatter1.CHUGUGUG.2000.wav} | Bin ...CRUH.5000.wav => seagullCry.CRUH.2000.wav} | Bin ....CRH.5000.wav => seagullCry1.CRH.2000.wav} | Bin ...UH.5000.wav => seagullCry2.CREUH.2000.wav} | Bin ...5000.wav => seagullWhistle.WE-OH.2000.wav} | Bin ...10000.wav => seagullWhistle1.PEW.2000.wav} | Bin ...CH.10000.wav => shotgun.BRAHCHCH.2000.wav} | Bin ....wav => sineRaisePitchOneSec.BWAH.300.wav} | Bin ...wav => sineRaisePitchTwoSec.BWAAH.300.wav} | Bin ...000.wav => skwareFadeTwoSec.DWAAH.300.wav} | Bin ...oor.DRR.3000.wav => slideDoor.DRR.100.wav} | Bin ...KL.5000.wav => smallGlass1.TRINKL.500.wav} | Bin ...KL.5000.wav => smallGlass2.KRTNKL.500.wav} | Bin ...NK.5000.wav => smallGlass3.CRTINK.500.wav} | Bin ...LE.5000.wav => smallGlass4.TINKLE.500.wav} | Bin .../{tap1.TAK.8000.wav => tap1.TAK.500.wav} | Bin ...{tap2.TAKH.8000.wav => tap2.TAKH.1000.wav} | Bin ...{tap3.BRAP.8000.wav => tap3.BRAP.1000.wav} | Bin ...tap4.FWUMP.5000.wav => tap4.FWUMP.100.wav} | Bin ...iet.CLNK.4000.wav => tapQuiet.CLNK.40.wav} | Bin .../{tele.ZHM.10000.wav => tele.ZHM.1000.wav} | Bin ...ne440.BEP.8000.wav => tone440.BEP.300.wav} | Bin ...000.wav => tone440sawtooth.SCREE.2000.wav} | Bin ...wav => tone440sawtoothquiet.SCREE.500.wav} | Bin ....TIPTAP.4000.wav => twoStep.TIPTAP.40.wav} | Bin ...TAPTIP.6000.wav => twoStep1.TAPTIP.40.wav} | Bin ...TOP.4000.wav => twoStepSlow.TIPTOP.40.wav} | Bin ....2000.wav => whiteNoiseFadeIn.FHP.100.wav} | Bin ...2000.wav => whiteNoiseFadeOut.PHF.100.wav} | Bin src/Dodge/Creature/ArmourChase.hs | 1 + src/Dodge/Creature/Perception.hs | 14 +- src/Dodge/Default.hs | 2 +- .../SoundLogic/ExternallyGeneratedSounds.hs | 734 +++++++++--------- 76 files changed, 379 insertions(+), 372 deletions(-) rename data/sound/{autoB.TATATA.10000.wav => autoB.TATATA.2000.wav} (100%) rename data/sound/{autoGun.BRAP.10000.wav => autoGun.BRAP.2000.wav} (100%) rename data/sound/{bang.BANG.15000.wav => bang.BANG.2000.wav} (100%) rename data/sound/{bangEcho.BANGG.15000.wav => bangEcho.BANGG.2000.wav} (100%) rename data/sound/{buzz.ZMM.8000.wav => buzz.ZMM.200.wav} (100%) rename data/sound/{click1.CLICK.500.wav => click1.CLICK.40.wav} (100%) rename data/sound/{computerBeeping.BIPBIPBIP.5000.wav => computerBeeping.BIPBIPBIP.500.wav} (100%) rename data/sound/{crankSlow.CHNKCHNKCHUNK.5000.wav => crankSlow.CHNKCHNKCHUNK.100.wav} (100%) rename data/sound/{deda.DEDA.5000.wav => deda.DEDA.500.wav} (100%) rename data/sound/{dededa.DEDEDA.5000.wav => dededa.DEDEDA.500.wav} (100%) rename data/sound/{dededum.DEDEDUM.5000.wav => dededum.DEDEDUM.500.wav} (100%) rename data/sound/{dedum.DEDUM.5000.wav => dedum.DEDUM.500.wav} (100%) rename data/sound/{elecCrackle.CRAKLE.10000.wav => elecCrackle.CRAKLE.200.wav} (100%) rename data/sound/{explosion.BOOM.20000.wav => explosion.BOOM.2000.wav} (100%) rename data/sound/{fire.WRR.5000.wav => fire.WRR.100.wav} (100%) rename data/sound/{fireLoud.WRRR.10000.wav => fireLoud.WRRR.500.wav} (100%) rename data/sound/{foamSprayFadeOut.HSS.5000.wav => foamSprayFadeOut.HSS.50.wav} (100%) rename data/sound/{foamSprayLoop.HSSS.5000.wav => foamSprayLoop.HSSS.50.wav} (100%) rename data/sound/{foot1.TIP.3000.wav => foot1.TIP.40.wav} (100%) rename data/sound/{foot2.TAP.3000.wav => foot2.TAP.40.wav} (100%) rename data/sound/{foot3.TAPP.4000.wav => foot3.TAPP.40.wav} (100%) rename data/sound/{fridgeHum.HMM.500.wav => fridgeHum.HMM.50.wav} (100%) rename data/sound/{glassShat1.CRSNK.8000.wav => glassShat1.CRSNK.1000.wav} (100%) rename data/sound/{glassShat2.CRNKL.8000.wav => glassShat2.CRNKL.1000.wav} (100%) rename data/sound/{glassShat3.CRNK.8000.wav => glassShat3.CRNK.1000.wav} (100%) rename data/sound/{glassShat4.CRSK.8000.wav => glassShat4.CRSK.1000.wav} (100%) rename data/sound/{grunt.HNH.5000.wav => grunt.HNH.100.wav} (100%) rename data/sound/{heal.BLIH.2000.wav => heal.BLIH.50.wav} (100%) rename data/sound/{hit.THUD.3000.wav => hit.THUD.100.wav} (100%) rename data/sound/{hit1.SMACK.4000.wav => hit1.SMACK.100.wav} (100%) rename data/sound/{impact1.CRASH.8000.wav => impact1.CRASH.1000.wav} (100%) rename data/sound/{impact2.CRUNK.8000.wav => impact2.CRUNK.1000.wav} (100%) rename data/sound/{impact3.CRUMPLE.8000.wav => impact3.CRUMPLE.1000.wav} (100%) rename data/sound/{impact4.CRISH.8000.wav => impact4.CRISH.1000.wav} (100%) rename data/sound/{knife.SWSH.2000.wav => knife.SWSH.20.wav} (100%) rename data/sound/{mini.BRPBRPBRP.12000.wav => mini.BRPBRPBRP.2000.wav} (100%) rename data/sound/{mini1.BRDBRDBRD.12000.wav => mini1.BRDBRDBRD.2000.wav} (100%) rename data/sound/{missileLaunch.WHSSH.10000.wav => missileLaunch.WHSSH.2000.wav} (100%) rename data/sound/{pickUp.SHUHP.2000.wav => pickUp.SHUHP.50.wav} (100%) rename data/sound/{reload.TNKTNKTNK.3000.wav => reload.TNKTNKTNK.300.wav} (100%) rename data/sound/{reload1.CHPCHPCHP.3000.wav => reload1.CHPCHPCHP.300.wav} (100%) rename data/sound/{seagullBark.UGGAUGGA.5000.wav => seagullBark.UGGAUGGA.2000.wav} (100%) rename data/sound/{seagullChatter.CHUGUGUG.10000.wav => seagullChatter.CHUGUGUG.2000.wav} (100%) rename data/sound/{seagullChatter1.CHUGUGUG.10000.wav => seagullChatter1.CHUGUGUG.2000.wav} (100%) rename data/sound/{seagullCry.CRUH.5000.wav => seagullCry.CRUH.2000.wav} (100%) rename data/sound/{seagullCry1.CRH.5000.wav => seagullCry1.CRH.2000.wav} (100%) rename data/sound/{seagullCry2.CREUH.5000.wav => seagullCry2.CREUH.2000.wav} (100%) rename data/sound/{seagullWhistle.WE-OH.5000.wav => seagullWhistle.WE-OH.2000.wav} (100%) rename data/sound/{seagullWhistle1.PEW.10000.wav => seagullWhistle1.PEW.2000.wav} (100%) rename data/sound/{shotgun.BRAHCHCH.10000.wav => shotgun.BRAHCHCH.2000.wav} (100%) rename data/sound/{sineRaisePitchOneSec.BWAH.3000.wav => sineRaisePitchOneSec.BWAH.300.wav} (100%) rename data/sound/{sineRaisePitchTwoSec.BWAAH.3000.wav => sineRaisePitchTwoSec.BWAAH.300.wav} (100%) rename data/sound/{skwareFadeTwoSec.DWAAH.3000.wav => skwareFadeTwoSec.DWAAH.300.wav} (100%) rename data/sound/{slideDoor.DRR.3000.wav => slideDoor.DRR.100.wav} (100%) rename data/sound/{smallGlass1.TRINKL.5000.wav => smallGlass1.TRINKL.500.wav} (100%) rename data/sound/{smallGlass2.KRTNKL.5000.wav => smallGlass2.KRTNKL.500.wav} (100%) rename data/sound/{smallGlass3.CRTINK.5000.wav => smallGlass3.CRTINK.500.wav} (100%) rename data/sound/{smallGlass4.TINKLE.5000.wav => smallGlass4.TINKLE.500.wav} (100%) rename data/sound/{tap1.TAK.8000.wav => tap1.TAK.500.wav} (100%) rename data/sound/{tap2.TAKH.8000.wav => tap2.TAKH.1000.wav} (100%) rename data/sound/{tap3.BRAP.8000.wav => tap3.BRAP.1000.wav} (100%) rename data/sound/{tap4.FWUMP.5000.wav => tap4.FWUMP.100.wav} (100%) rename data/sound/{tapQuiet.CLNK.4000.wav => tapQuiet.CLNK.40.wav} (100%) rename data/sound/{tele.ZHM.10000.wav => tele.ZHM.1000.wav} (100%) rename data/sound/{tone440.BEP.8000.wav => tone440.BEP.300.wav} (100%) rename data/sound/{tone440sawtooth.SCREE.10000.wav => tone440sawtooth.SCREE.2000.wav} (100%) rename data/sound/{tone440sawtoothquiet.SCREE.5000.wav => tone440sawtoothquiet.SCREE.500.wav} (100%) rename data/sound/{twoStep.TIPTAP.4000.wav => twoStep.TIPTAP.40.wav} (100%) rename data/sound/{twoStep1.TAPTIP.6000.wav => twoStep1.TAPTIP.40.wav} (100%) rename data/sound/{twoStepSlow.TIPTOP.4000.wav => twoStepSlow.TIPTOP.40.wav} (100%) rename data/sound/{whiteNoiseFadeIn.FHP.2000.wav => whiteNoiseFadeIn.FHP.100.wav} (100%) rename data/sound/{whiteNoiseFadeOut.PHF.2000.wav => whiteNoiseFadeOut.PHF.100.wav} (100%) diff --git a/data/sound/autoB.TATATA.10000.wav b/data/sound/autoB.TATATA.2000.wav similarity index 100% rename from data/sound/autoB.TATATA.10000.wav rename to data/sound/autoB.TATATA.2000.wav diff --git a/data/sound/autoGun.BRAP.10000.wav b/data/sound/autoGun.BRAP.2000.wav similarity index 100% rename from data/sound/autoGun.BRAP.10000.wav rename to data/sound/autoGun.BRAP.2000.wav diff --git a/data/sound/bang.BANG.15000.wav b/data/sound/bang.BANG.2000.wav similarity index 100% rename from data/sound/bang.BANG.15000.wav rename to data/sound/bang.BANG.2000.wav diff --git a/data/sound/bangEcho.BANGG.15000.wav b/data/sound/bangEcho.BANGG.2000.wav similarity index 100% rename from data/sound/bangEcho.BANGG.15000.wav rename to data/sound/bangEcho.BANGG.2000.wav diff --git a/data/sound/buzz.ZMM.8000.wav b/data/sound/buzz.ZMM.200.wav similarity index 100% rename from data/sound/buzz.ZMM.8000.wav rename to data/sound/buzz.ZMM.200.wav diff --git a/data/sound/click1.CLICK.500.wav b/data/sound/click1.CLICK.40.wav similarity index 100% rename from data/sound/click1.CLICK.500.wav rename to data/sound/click1.CLICK.40.wav diff --git a/data/sound/computerBeeping.BIPBIPBIP.5000.wav b/data/sound/computerBeeping.BIPBIPBIP.500.wav similarity index 100% rename from data/sound/computerBeeping.BIPBIPBIP.5000.wav rename to data/sound/computerBeeping.BIPBIPBIP.500.wav diff --git a/data/sound/crankSlow.CHNKCHNKCHUNK.5000.wav b/data/sound/crankSlow.CHNKCHNKCHUNK.100.wav similarity index 100% rename from data/sound/crankSlow.CHNKCHNKCHUNK.5000.wav rename to data/sound/crankSlow.CHNKCHNKCHUNK.100.wav diff --git a/data/sound/deda.DEDA.5000.wav b/data/sound/deda.DEDA.500.wav similarity index 100% rename from data/sound/deda.DEDA.5000.wav rename to data/sound/deda.DEDA.500.wav diff --git a/data/sound/dededa.DEDEDA.5000.wav b/data/sound/dededa.DEDEDA.500.wav similarity index 100% rename from data/sound/dededa.DEDEDA.5000.wav rename to data/sound/dededa.DEDEDA.500.wav diff --git a/data/sound/dededum.DEDEDUM.5000.wav b/data/sound/dededum.DEDEDUM.500.wav similarity index 100% rename from data/sound/dededum.DEDEDUM.5000.wav rename to data/sound/dededum.DEDEDUM.500.wav diff --git a/data/sound/dedum.DEDUM.5000.wav b/data/sound/dedum.DEDUM.500.wav similarity index 100% rename from data/sound/dedum.DEDUM.5000.wav rename to data/sound/dedum.DEDUM.500.wav diff --git a/data/sound/elecCrackle.CRAKLE.10000.wav b/data/sound/elecCrackle.CRAKLE.200.wav similarity index 100% rename from data/sound/elecCrackle.CRAKLE.10000.wav rename to data/sound/elecCrackle.CRAKLE.200.wav diff --git a/data/sound/explosion.BOOM.20000.wav b/data/sound/explosion.BOOM.2000.wav similarity index 100% rename from data/sound/explosion.BOOM.20000.wav rename to data/sound/explosion.BOOM.2000.wav diff --git a/data/sound/fire.WRR.5000.wav b/data/sound/fire.WRR.100.wav similarity index 100% rename from data/sound/fire.WRR.5000.wav rename to data/sound/fire.WRR.100.wav diff --git a/data/sound/fireLoud.WRRR.10000.wav b/data/sound/fireLoud.WRRR.500.wav similarity index 100% rename from data/sound/fireLoud.WRRR.10000.wav rename to data/sound/fireLoud.WRRR.500.wav diff --git a/data/sound/foamSprayFadeOut.HSS.5000.wav b/data/sound/foamSprayFadeOut.HSS.50.wav similarity index 100% rename from data/sound/foamSprayFadeOut.HSS.5000.wav rename to data/sound/foamSprayFadeOut.HSS.50.wav diff --git a/data/sound/foamSprayLoop.HSSS.5000.wav b/data/sound/foamSprayLoop.HSSS.50.wav similarity index 100% rename from data/sound/foamSprayLoop.HSSS.5000.wav rename to data/sound/foamSprayLoop.HSSS.50.wav diff --git a/data/sound/foot1.TIP.3000.wav b/data/sound/foot1.TIP.40.wav similarity index 100% rename from data/sound/foot1.TIP.3000.wav rename to data/sound/foot1.TIP.40.wav diff --git a/data/sound/foot2.TAP.3000.wav b/data/sound/foot2.TAP.40.wav similarity index 100% rename from data/sound/foot2.TAP.3000.wav rename to data/sound/foot2.TAP.40.wav diff --git a/data/sound/foot3.TAPP.4000.wav b/data/sound/foot3.TAPP.40.wav similarity index 100% rename from data/sound/foot3.TAPP.4000.wav rename to data/sound/foot3.TAPP.40.wav diff --git a/data/sound/fridgeHum.HMM.500.wav b/data/sound/fridgeHum.HMM.50.wav similarity index 100% rename from data/sound/fridgeHum.HMM.500.wav rename to data/sound/fridgeHum.HMM.50.wav diff --git a/data/sound/glassShat1.CRSNK.8000.wav b/data/sound/glassShat1.CRSNK.1000.wav similarity index 100% rename from data/sound/glassShat1.CRSNK.8000.wav rename to data/sound/glassShat1.CRSNK.1000.wav diff --git a/data/sound/glassShat2.CRNKL.8000.wav b/data/sound/glassShat2.CRNKL.1000.wav similarity index 100% rename from data/sound/glassShat2.CRNKL.8000.wav rename to data/sound/glassShat2.CRNKL.1000.wav diff --git a/data/sound/glassShat3.CRNK.8000.wav b/data/sound/glassShat3.CRNK.1000.wav similarity index 100% rename from data/sound/glassShat3.CRNK.8000.wav rename to data/sound/glassShat3.CRNK.1000.wav diff --git a/data/sound/glassShat4.CRSK.8000.wav b/data/sound/glassShat4.CRSK.1000.wav similarity index 100% rename from data/sound/glassShat4.CRSK.8000.wav rename to data/sound/glassShat4.CRSK.1000.wav diff --git a/data/sound/grunt.HNH.5000.wav b/data/sound/grunt.HNH.100.wav similarity index 100% rename from data/sound/grunt.HNH.5000.wav rename to data/sound/grunt.HNH.100.wav diff --git a/data/sound/heal.BLIH.2000.wav b/data/sound/heal.BLIH.50.wav similarity index 100% rename from data/sound/heal.BLIH.2000.wav rename to data/sound/heal.BLIH.50.wav diff --git a/data/sound/hit.THUD.3000.wav b/data/sound/hit.THUD.100.wav similarity index 100% rename from data/sound/hit.THUD.3000.wav rename to data/sound/hit.THUD.100.wav diff --git a/data/sound/hit1.SMACK.4000.wav b/data/sound/hit1.SMACK.100.wav similarity index 100% rename from data/sound/hit1.SMACK.4000.wav rename to data/sound/hit1.SMACK.100.wav diff --git a/data/sound/impact1.CRASH.8000.wav b/data/sound/impact1.CRASH.1000.wav similarity index 100% rename from data/sound/impact1.CRASH.8000.wav rename to data/sound/impact1.CRASH.1000.wav diff --git a/data/sound/impact2.CRUNK.8000.wav b/data/sound/impact2.CRUNK.1000.wav similarity index 100% rename from data/sound/impact2.CRUNK.8000.wav rename to data/sound/impact2.CRUNK.1000.wav diff --git a/data/sound/impact3.CRUMPLE.8000.wav b/data/sound/impact3.CRUMPLE.1000.wav similarity index 100% rename from data/sound/impact3.CRUMPLE.8000.wav rename to data/sound/impact3.CRUMPLE.1000.wav diff --git a/data/sound/impact4.CRISH.8000.wav b/data/sound/impact4.CRISH.1000.wav similarity index 100% rename from data/sound/impact4.CRISH.8000.wav rename to data/sound/impact4.CRISH.1000.wav diff --git a/data/sound/knife.SWSH.2000.wav b/data/sound/knife.SWSH.20.wav similarity index 100% rename from data/sound/knife.SWSH.2000.wav rename to data/sound/knife.SWSH.20.wav diff --git a/data/sound/mini.BRPBRPBRP.12000.wav b/data/sound/mini.BRPBRPBRP.2000.wav similarity index 100% rename from data/sound/mini.BRPBRPBRP.12000.wav rename to data/sound/mini.BRPBRPBRP.2000.wav diff --git a/data/sound/mini1.BRDBRDBRD.12000.wav b/data/sound/mini1.BRDBRDBRD.2000.wav similarity index 100% rename from data/sound/mini1.BRDBRDBRD.12000.wav rename to data/sound/mini1.BRDBRDBRD.2000.wav diff --git a/data/sound/missileLaunch.WHSSH.10000.wav b/data/sound/missileLaunch.WHSSH.2000.wav similarity index 100% rename from data/sound/missileLaunch.WHSSH.10000.wav rename to data/sound/missileLaunch.WHSSH.2000.wav diff --git a/data/sound/pickUp.SHUHP.2000.wav b/data/sound/pickUp.SHUHP.50.wav similarity index 100% rename from data/sound/pickUp.SHUHP.2000.wav rename to data/sound/pickUp.SHUHP.50.wav diff --git a/data/sound/reload.TNKTNKTNK.3000.wav b/data/sound/reload.TNKTNKTNK.300.wav similarity index 100% rename from data/sound/reload.TNKTNKTNK.3000.wav rename to data/sound/reload.TNKTNKTNK.300.wav diff --git a/data/sound/reload1.CHPCHPCHP.3000.wav b/data/sound/reload1.CHPCHPCHP.300.wav similarity index 100% rename from data/sound/reload1.CHPCHPCHP.3000.wav rename to data/sound/reload1.CHPCHPCHP.300.wav diff --git a/data/sound/seagullBark.UGGAUGGA.5000.wav b/data/sound/seagullBark.UGGAUGGA.2000.wav similarity index 100% rename from data/sound/seagullBark.UGGAUGGA.5000.wav rename to data/sound/seagullBark.UGGAUGGA.2000.wav diff --git a/data/sound/seagullChatter.CHUGUGUG.10000.wav b/data/sound/seagullChatter.CHUGUGUG.2000.wav similarity index 100% rename from data/sound/seagullChatter.CHUGUGUG.10000.wav rename to data/sound/seagullChatter.CHUGUGUG.2000.wav diff --git a/data/sound/seagullChatter1.CHUGUGUG.10000.wav b/data/sound/seagullChatter1.CHUGUGUG.2000.wav similarity index 100% rename from data/sound/seagullChatter1.CHUGUGUG.10000.wav rename to data/sound/seagullChatter1.CHUGUGUG.2000.wav diff --git a/data/sound/seagullCry.CRUH.5000.wav b/data/sound/seagullCry.CRUH.2000.wav similarity index 100% rename from data/sound/seagullCry.CRUH.5000.wav rename to data/sound/seagullCry.CRUH.2000.wav diff --git a/data/sound/seagullCry1.CRH.5000.wav b/data/sound/seagullCry1.CRH.2000.wav similarity index 100% rename from data/sound/seagullCry1.CRH.5000.wav rename to data/sound/seagullCry1.CRH.2000.wav diff --git a/data/sound/seagullCry2.CREUH.5000.wav b/data/sound/seagullCry2.CREUH.2000.wav similarity index 100% rename from data/sound/seagullCry2.CREUH.5000.wav rename to data/sound/seagullCry2.CREUH.2000.wav diff --git a/data/sound/seagullWhistle.WE-OH.5000.wav b/data/sound/seagullWhistle.WE-OH.2000.wav similarity index 100% rename from data/sound/seagullWhistle.WE-OH.5000.wav rename to data/sound/seagullWhistle.WE-OH.2000.wav diff --git a/data/sound/seagullWhistle1.PEW.10000.wav b/data/sound/seagullWhistle1.PEW.2000.wav similarity index 100% rename from data/sound/seagullWhistle1.PEW.10000.wav rename to data/sound/seagullWhistle1.PEW.2000.wav diff --git a/data/sound/shotgun.BRAHCHCH.10000.wav b/data/sound/shotgun.BRAHCHCH.2000.wav similarity index 100% rename from data/sound/shotgun.BRAHCHCH.10000.wav rename to data/sound/shotgun.BRAHCHCH.2000.wav diff --git a/data/sound/sineRaisePitchOneSec.BWAH.3000.wav b/data/sound/sineRaisePitchOneSec.BWAH.300.wav similarity index 100% rename from data/sound/sineRaisePitchOneSec.BWAH.3000.wav rename to data/sound/sineRaisePitchOneSec.BWAH.300.wav diff --git a/data/sound/sineRaisePitchTwoSec.BWAAH.3000.wav b/data/sound/sineRaisePitchTwoSec.BWAAH.300.wav similarity index 100% rename from data/sound/sineRaisePitchTwoSec.BWAAH.3000.wav rename to data/sound/sineRaisePitchTwoSec.BWAAH.300.wav diff --git a/data/sound/skwareFadeTwoSec.DWAAH.3000.wav b/data/sound/skwareFadeTwoSec.DWAAH.300.wav similarity index 100% rename from data/sound/skwareFadeTwoSec.DWAAH.3000.wav rename to data/sound/skwareFadeTwoSec.DWAAH.300.wav diff --git a/data/sound/slideDoor.DRR.3000.wav b/data/sound/slideDoor.DRR.100.wav similarity index 100% rename from data/sound/slideDoor.DRR.3000.wav rename to data/sound/slideDoor.DRR.100.wav diff --git a/data/sound/smallGlass1.TRINKL.5000.wav b/data/sound/smallGlass1.TRINKL.500.wav similarity index 100% rename from data/sound/smallGlass1.TRINKL.5000.wav rename to data/sound/smallGlass1.TRINKL.500.wav diff --git a/data/sound/smallGlass2.KRTNKL.5000.wav b/data/sound/smallGlass2.KRTNKL.500.wav similarity index 100% rename from data/sound/smallGlass2.KRTNKL.5000.wav rename to data/sound/smallGlass2.KRTNKL.500.wav diff --git a/data/sound/smallGlass3.CRTINK.5000.wav b/data/sound/smallGlass3.CRTINK.500.wav similarity index 100% rename from data/sound/smallGlass3.CRTINK.5000.wav rename to data/sound/smallGlass3.CRTINK.500.wav diff --git a/data/sound/smallGlass4.TINKLE.5000.wav b/data/sound/smallGlass4.TINKLE.500.wav similarity index 100% rename from data/sound/smallGlass4.TINKLE.5000.wav rename to data/sound/smallGlass4.TINKLE.500.wav diff --git a/data/sound/tap1.TAK.8000.wav b/data/sound/tap1.TAK.500.wav similarity index 100% rename from data/sound/tap1.TAK.8000.wav rename to data/sound/tap1.TAK.500.wav diff --git a/data/sound/tap2.TAKH.8000.wav b/data/sound/tap2.TAKH.1000.wav similarity index 100% rename from data/sound/tap2.TAKH.8000.wav rename to data/sound/tap2.TAKH.1000.wav diff --git a/data/sound/tap3.BRAP.8000.wav b/data/sound/tap3.BRAP.1000.wav similarity index 100% rename from data/sound/tap3.BRAP.8000.wav rename to data/sound/tap3.BRAP.1000.wav diff --git a/data/sound/tap4.FWUMP.5000.wav b/data/sound/tap4.FWUMP.100.wav similarity index 100% rename from data/sound/tap4.FWUMP.5000.wav rename to data/sound/tap4.FWUMP.100.wav diff --git a/data/sound/tapQuiet.CLNK.4000.wav b/data/sound/tapQuiet.CLNK.40.wav similarity index 100% rename from data/sound/tapQuiet.CLNK.4000.wav rename to data/sound/tapQuiet.CLNK.40.wav diff --git a/data/sound/tele.ZHM.10000.wav b/data/sound/tele.ZHM.1000.wav similarity index 100% rename from data/sound/tele.ZHM.10000.wav rename to data/sound/tele.ZHM.1000.wav diff --git a/data/sound/tone440.BEP.8000.wav b/data/sound/tone440.BEP.300.wav similarity index 100% rename from data/sound/tone440.BEP.8000.wav rename to data/sound/tone440.BEP.300.wav diff --git a/data/sound/tone440sawtooth.SCREE.10000.wav b/data/sound/tone440sawtooth.SCREE.2000.wav similarity index 100% rename from data/sound/tone440sawtooth.SCREE.10000.wav rename to data/sound/tone440sawtooth.SCREE.2000.wav diff --git a/data/sound/tone440sawtoothquiet.SCREE.5000.wav b/data/sound/tone440sawtoothquiet.SCREE.500.wav similarity index 100% rename from data/sound/tone440sawtoothquiet.SCREE.5000.wav rename to data/sound/tone440sawtoothquiet.SCREE.500.wav diff --git a/data/sound/twoStep.TIPTAP.4000.wav b/data/sound/twoStep.TIPTAP.40.wav similarity index 100% rename from data/sound/twoStep.TIPTAP.4000.wav rename to data/sound/twoStep.TIPTAP.40.wav diff --git a/data/sound/twoStep1.TAPTIP.6000.wav b/data/sound/twoStep1.TAPTIP.40.wav similarity index 100% rename from data/sound/twoStep1.TAPTIP.6000.wav rename to data/sound/twoStep1.TAPTIP.40.wav diff --git a/data/sound/twoStepSlow.TIPTOP.4000.wav b/data/sound/twoStepSlow.TIPTOP.40.wav similarity index 100% rename from data/sound/twoStepSlow.TIPTOP.4000.wav rename to data/sound/twoStepSlow.TIPTOP.40.wav diff --git a/data/sound/whiteNoiseFadeIn.FHP.2000.wav b/data/sound/whiteNoiseFadeIn.FHP.100.wav similarity index 100% rename from data/sound/whiteNoiseFadeIn.FHP.2000.wav rename to data/sound/whiteNoiseFadeIn.FHP.100.wav diff --git a/data/sound/whiteNoiseFadeOut.PHF.2000.wav b/data/sound/whiteNoiseFadeOut.PHF.100.wav similarity index 100% rename from data/sound/whiteNoiseFadeOut.PHF.2000.wav rename to data/sound/whiteNoiseFadeOut.PHF.100.wav diff --git a/src/Dodge/Creature/ArmourChase.hs b/src/Dodge/Creature/ArmourChase.hs index e35586f75..344b57f07 100644 --- a/src/Dodge/Creature/ArmourChase.hs +++ b/src/Dodge/Creature/ArmourChase.hs @@ -54,6 +54,7 @@ flockArmourChaseCrit = defaultCreature armourChaseCrit :: Creature armourChaseCrit = chaseCrit { _crName = "armourChaseCrit" + --, _crUpdate = defaultImpulsive [] , _crInv = IM.fromList [(0,frontArmour) ,(1,medkit 200) diff --git a/src/Dodge/Creature/Perception.hs b/src/Dodge/Creature/Perception.hs index febc3f531..556f693bb 100644 --- a/src/Dodge/Creature/Perception.hs +++ b/src/Dodge/Creature/Perception.hs @@ -2,7 +2,7 @@ module Dodge.Creature.Perception ( perceptionUpdate , chaseCritPerceptionUpdate - , newSounds +-- , newSounds ) where import Dodge.Data import Dodge.Creature.Vocalization @@ -165,7 +165,13 @@ rememberSounds w cr = cr where awakeupdate | null closesounds = id | otherwise = crPerception . crAwakeLevel .~ Vigilant - closesounds = map fst (filter (soundIsClose cr) (newSounds w)) + closesounds = map fst (filter (soundIsClose w cr) (newSounds w)) -soundIsClose :: Creature -> (Point2,Float) -> Bool -soundIsClose cr (pos,vol) = vol > (_auDist . _crAudition $ _crPerception cr) (dist pos (_crPos cr)) +-- TODO work out correct form for sounds passing through walls +soundIsClose :: World -> Creature -> (Point2,Float) -> Bool +soundIsClose w cr (pos,vol) + | dist cpos pos > 2000 = False + | hasLOS cpos pos w = vol > (_auDist . _crAudition $ _crPerception cr) (dist pos cpos) + | otherwise = False + where + cpos = _crPos cr diff --git a/src/Dodge/Default.hs b/src/Dodge/Default.hs index dd7635642..d38713f9b 100644 --- a/src/Dodge/Default.hs +++ b/src/Dodge/Default.hs @@ -94,7 +94,7 @@ defaultVision = Eyes | otherwise = 1 defaultAudition :: Audition defaultAudition = Ears - { _auDist = \x -> x * x + { _auDist = id } defaultIntention :: Intention defaultIntention = Intention diff --git a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs index 8818c7c29..380eb0974 100644 --- a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs +++ b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs @@ -1,382 +1,382 @@ --- generated at 2022-05-19 16:16:01.090595039 UTC +-- generated at 2022-05-21 09:06:32.926791584 UTC module Dodge.SoundLogic.ExternallyGeneratedSounds where import Sound.Data soundToVol :: SoundID -> Float soundToVol v = case _getSoundID v of - 0 -> 5000 - 1 -> 5000 - 2 -> 8000 - 3 -> 8000 - 4 -> 5000 - 5 -> 5000 - 6 -> 5000 - 7 -> 3000 - 8 -> 5000 - 9 -> 5000 - 10 -> 3000 - 11 -> 4000 - 12 -> 5000 - 13 -> 5000 - 14 -> 10000 - 15 -> 8000 - 16 -> 8000 - 17 -> 8000 - 18 -> 8000 - 19 -> 10000 - 20 -> 3000 - 21 -> 4000 - 22 -> 5000 - 23 -> 5000 - 24 -> 5000 - 25 -> 20000 - 26 -> 4000 - 27 -> 10000 - 28 -> 8000 - 29 -> 4000 - 30 -> 2000 - 31 -> 6000 - 32 -> 500 - 33 -> 5000 - 34 -> 8000 - 35 -> 5000 - 36 -> 8000 - 37 -> 8000 - 38 -> 5000 - 39 -> 10000 - 40 -> 8000 - 41 -> 4000 - 42 -> 3000 - 43 -> 8000 - 44 -> 2000 - 45 -> 10000 - 46 -> 5000 - 47 -> 2000 - 48 -> 3000 - 49 -> 5000 - 50 -> 10000 - 51 -> 12000 - 52 -> 5000 - 53 -> 5000 - 54 -> 10000 - 55 -> 12000 - 56 -> 2000 - 57 -> 3000 - 58 -> 8000 - 59 -> 5000 - 60 -> 2000 - 61 -> 3000 - 62 -> 10000 - 63 -> 500 - 64 -> 10000 - 65 -> 3000 - 66 -> 15000 - 67 -> 10000 - 68 -> 3000 - 69 -> 1000 - 70 -> 15000 - 71 -> 10000 - 72 -> 5000 - 73 -> 8000 + 0 -> 500 + 1 -> 500 + 2 -> 1000 + 3 -> 2000 + 4 -> 500 + 5 -> 1000 + 6 -> 40 + 7 -> 100 + 8 -> 500 + 9 -> 500 + 10 -> 300 + 11 -> 40 + 12 -> 2000 + 13 -> 50 + 14 -> 50 + 15 -> 2000 + 16 -> 200 + 17 -> 40 + 18 -> 300 + 19 -> 2000 + 20 -> 500 + 21 -> 100 + 22 -> 1000 + 23 -> 100 + 24 -> 1000 + 25 -> 40 + 26 -> 2000 + 27 -> 50 + 28 -> 1000 + 29 -> 2000 + 30 -> 50 + 31 -> 1000 + 32 -> 8000 + 33 -> 2000 + 34 -> 2000 + 35 -> 2000 + 36 -> 100 + 37 -> 40 + 38 -> 40 + 39 -> 2000 + 40 -> 100 + 41 -> 40 + 42 -> 1000 + 43 -> 300 + 44 -> 300 + 45 -> 2000 + 46 -> 1000 + 47 -> 1000 + 48 -> 1000 + 49 -> 40 + 50 -> 50 + 51 -> 500 + 52 -> 500 + 53 -> 20 + 54 -> 500 + 55 -> 300 + 56 -> 500 + 57 -> 1000 + 58 -> 2000 + 59 -> 2000 + 60 -> 500 + 61 -> 2000 + 62 -> 100 + 63 -> 300 + 64 -> 100 + 65 -> 2000 + 66 -> 1000 + 67 -> 200 + 68 -> 500 + 69 -> 100 + 70 -> 2000 + 71 -> 2000 + 72 -> 2000 + 73 -> 100 _ -> 50 soundToOnomato :: SoundID -> String soundToOnomato v = case _getSoundID v of - 0 -> "SCREE" - 1 -> "HNH" - 2 -> "CRNKL" - 3 -> "ZMM" - 4 -> "WE-OH" - 5 -> "UGGAUGGA" - 6 -> "KRTNKL" - 7 -> "DWAAH" - 8 -> "DEDEDUM" - 9 -> "CREUH" - 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 -> "CRH" - 36 -> "BRAP" - 37 -> "CRUMPLE" - 38 -> "TRINKL" - 39 -> "PEW" - 40 -> "TAK" - 41 -> "SMACK" - 42 -> "DRR" - 43 -> "CRASH" - 44 -> "SWSH" - 45 -> "CRAKLE" - 46 -> "CRTINK" - 47 -> "FHP" - 48 -> "CHPCHPCHP" - 49 -> "BIPBIPBIP" - 50 -> "CHUGUGUG" - 51 -> "BRPBRPBRP" - 52 -> "CRUH" - 53 -> "CHNKCHNKCHUNK" - 54 -> "WRRR" - 55 -> "BRDBRDBRD" - 56 -> "PHF" - 57 -> "BWAAH" - 58 -> "BEP" - 59 -> "HSSS" - 60 -> "SHUHP" - 61 -> "THUD" - 62 -> "WHSSH" - 63 -> "HMM" - 64 -> "BRAHCHCH" - 65 -> "TIP" - 66 -> "BANGG" - 67 -> "ZHM" - 68 -> "TAP" - 69 -> "BLPCHCH" - 70 -> "BANG" - 71 -> "CHUGUGUG" - 72 -> "DEDA" - 73 -> "CRISH" + 0 -> "DEDUM" + 1 -> "SCREE" + 2 -> "CRISH" + 3 -> "BRDBRDBRD" + 4 -> "DEDEDA" + 5 -> "CRNK" + 6 -> "CLNK" + 7 -> "WRR" + 8 -> "TINKLE" + 9 -> "TRINKL" + 10 -> "BWAAH" + 11 -> "TIP" + 12 -> "TATATA" + 13 -> "BLIH" + 14 -> "HMM" + 15 -> "PEW" + 16 -> "CRAKLE" + 17 -> "TAP" + 18 -> "DWAAH" + 19 -> "BANGG" + 20 -> "CRTINK" + 21 -> "PHF" + 22 -> "ZHM" + 23 -> "THUD" + 24 -> "CRUNK" + 25 -> "TAPTIP" + 26 -> "CHUGUGUG" + 27 -> "HSSS" + 28 -> "CRUMPLE" + 29 -> "BOOM" + 30 -> "HSS" + 31 -> "TAKH" + 32 -> "RINGGG" + 33 -> "CRH" + 34 -> "UGGAUGGA" + 35 -> "CREUH" + 36 -> "SMACK" + 37 -> "CLICK" + 38 -> "TIPTOP" + 39 -> "CRUH" + 40 -> "CHNKCHNKCHUNK" + 41 -> "TIPTAP" + 42 -> "CRASH" + 43 -> "TNKTNKTNK" + 44 -> "CHPCHPCHP" + 45 -> "SCREE" + 46 -> "BRAP" + 47 -> "CRSK" + 48 -> "CRNKL" + 49 -> "TAPP" + 50 -> "SHUHP" + 51 -> "DEDEDUM" + 52 -> "TAK" + 53 -> "SWSH" + 54 -> "BIPBIPBIP" + 55 -> "BEP" + 56 -> "KRTNKL" + 57 -> "CRSNK" + 58 -> "CHUGUGUG" + 59 -> "BANG" + 60 -> "DEDA" + 61 -> "WHSSH" + 62 -> "HNH" + 63 -> "BWAH" + 64 -> "DRR" + 65 -> "BRAP" + 66 -> "BLPCHCH" + 67 -> "ZMM" + 68 -> "WRRR" + 69 -> "FWUMP" + 70 -> "BRAHCHCH" + 71 -> "BRPBRPBRP" + 72 -> "WE-OH" + 73 -> "FHP" _ -> error "unitialised sound" soundPathList :: [String] soundPathList = - [ "tone440sawtoothquiet.SCREE.5000.wav" - , "grunt.HNH.5000.wav" - , "glassShat2.CRNKL.8000.wav" - , "buzz.ZMM.8000.wav" - , "seagullWhistle.WE-OH.5000.wav" - , "seagullBark.UGGAUGGA.5000.wav" - , "smallGlass2.KRTNKL.5000.wav" - , "skwareFadeTwoSec.DWAAH.3000.wav" - , "dededum.DEDEDUM.5000.wav" - , "seagullCry2.CREUH.5000.wav" - , "sineRaisePitchOneSec.BWAH.3000.wav" - , "twoStepSlow.TIPTOP.4000.wav" - , "dededa.DEDEDA.5000.wav" - , "smallGlass4.TINKLE.5000.wav" - , "autoB.TATATA.10000.wav" - , "glassShat4.CRSK.8000.wav" - , "glassShat3.CRNK.8000.wav" - , "tap2.TAKH.8000.wav" - , "impact2.CRUNK.8000.wav" - , "tone440sawtooth.SCREE.10000.wav" - , "reload.TNKTNKTNK.3000.wav" - , "twoStep.TIPTAP.4000.wav" - , "fire.WRR.5000.wav" - , "dedum.DEDUM.5000.wav" - , "foamSprayFadeOut.HSS.5000.wav" - , "explosion.BOOM.20000.wav" - , "tapQuiet.CLNK.4000.wav" - , "autoGun.BRAP.10000.wav" - , "glassShat1.CRSNK.8000.wav" - , "foot3.TAPP.4000.wav" - , "heal.BLIH.2000.wav" - , "twoStep1.TAPTIP.6000.wav" - , "click1.CLICK.500.wav" - , "tap4.FWUMP.5000.wav" + [ "dedum.DEDUM.500.wav" + , "tone440sawtoothquiet.SCREE.500.wav" + , "impact4.CRISH.1000.wav" + , "mini1.BRDBRDBRD.2000.wav" + , "dededa.DEDEDA.500.wav" + , "glassShat3.CRNK.1000.wav" + , "tapQuiet.CLNK.40.wav" + , "fire.WRR.100.wav" + , "smallGlass4.TINKLE.500.wav" + , "smallGlass1.TRINKL.500.wav" + , "sineRaisePitchTwoSec.BWAAH.300.wav" + , "foot1.TIP.40.wav" + , "autoB.TATATA.2000.wav" + , "heal.BLIH.50.wav" + , "fridgeHum.HMM.50.wav" + , "seagullWhistle1.PEW.2000.wav" + , "elecCrackle.CRAKLE.200.wav" + , "foot2.TAP.40.wav" + , "skwareFadeTwoSec.DWAAH.300.wav" + , "bangEcho.BANGG.2000.wav" + , "smallGlass3.CRTINK.500.wav" + , "whiteNoiseFadeOut.PHF.100.wav" + , "tele.ZHM.1000.wav" + , "hit.THUD.100.wav" + , "impact2.CRUNK.1000.wav" + , "twoStep1.TAPTIP.40.wav" + , "seagullChatter.CHUGUGUG.2000.wav" + , "foamSprayLoop.HSSS.50.wav" + , "impact3.CRUMPLE.1000.wav" + , "explosion.BOOM.2000.wav" + , "foamSprayFadeOut.HSS.50.wav" + , "tap2.TAKH.1000.wav" , "tinitus.RINGGG.8000.wav" - , "seagullCry1.CRH.5000.wav" - , "tap3.BRAP.8000.wav" - , "impact3.CRUMPLE.8000.wav" - , "smallGlass1.TRINKL.5000.wav" - , "seagullWhistle1.PEW.10000.wav" - , "tap1.TAK.8000.wav" - , "hit1.SMACK.4000.wav" - , "slideDoor.DRR.3000.wav" - , "impact1.CRASH.8000.wav" - , "knife.SWSH.2000.wav" - , "elecCrackle.CRAKLE.10000.wav" - , "smallGlass3.CRTINK.5000.wav" - , "whiteNoiseFadeIn.FHP.2000.wav" - , "reload1.CHPCHPCHP.3000.wav" - , "computerBeeping.BIPBIPBIP.5000.wav" - , "seagullChatter1.CHUGUGUG.10000.wav" - , "mini.BRPBRPBRP.12000.wav" - , "seagullCry.CRUH.5000.wav" - , "crankSlow.CHNKCHNKCHUNK.5000.wav" - , "fireLoud.WRRR.10000.wav" - , "mini1.BRDBRDBRD.12000.wav" - , "whiteNoiseFadeOut.PHF.2000.wav" - , "sineRaisePitchTwoSec.BWAAH.3000.wav" - , "tone440.BEP.8000.wav" - , "foamSprayLoop.HSSS.5000.wav" - , "pickUp.SHUHP.2000.wav" - , "hit.THUD.3000.wav" - , "missileLaunch.WHSSH.10000.wav" - , "fridgeHum.HMM.500.wav" - , "shotgun.BRAHCHCH.10000.wav" - , "foot1.TIP.3000.wav" - , "bangEcho.BANGG.15000.wav" - , "tele.ZHM.10000.wav" - , "foot2.TAP.3000.wav" + , "seagullCry1.CRH.2000.wav" + , "seagullBark.UGGAUGGA.2000.wav" + , "seagullCry2.CREUH.2000.wav" + , "hit1.SMACK.100.wav" + , "click1.CLICK.40.wav" + , "twoStepSlow.TIPTOP.40.wav" + , "seagullCry.CRUH.2000.wav" + , "crankSlow.CHNKCHNKCHUNK.100.wav" + , "twoStep.TIPTAP.40.wav" + , "impact1.CRASH.1000.wav" + , "reload.TNKTNKTNK.300.wav" + , "reload1.CHPCHPCHP.300.wav" + , "tone440sawtooth.SCREE.2000.wav" + , "tap3.BRAP.1000.wav" + , "glassShat4.CRSK.1000.wav" + , "glassShat2.CRNKL.1000.wav" + , "foot3.TAPP.40.wav" + , "pickUp.SHUHP.50.wav" + , "dededum.DEDEDUM.500.wav" + , "tap1.TAK.500.wav" + , "knife.SWSH.20.wav" + , "computerBeeping.BIPBIPBIP.500.wav" + , "tone440.BEP.300.wav" + , "smallGlass2.KRTNKL.500.wav" + , "glassShat1.CRSNK.1000.wav" + , "seagullChatter1.CHUGUGUG.2000.wav" + , "bang.BANG.2000.wav" + , "deda.DEDA.500.wav" + , "missileLaunch.WHSSH.2000.wav" + , "grunt.HNH.100.wav" + , "sineRaisePitchOneSec.BWAH.300.wav" + , "slideDoor.DRR.100.wav" + , "autoGun.BRAP.2000.wav" , "oldMachineBoot.BLPCHCH.1000.wav" - , "bang.BANG.15000.wav" - , "seagullChatter.CHUGUGUG.10000.wav" - , "deda.DEDA.5000.wav" - , "impact4.CRISH.8000.wav" + , "buzz.ZMM.200.wav" + , "fireLoud.WRRR.500.wav" + , "tap4.FWUMP.100.wav" + , "shotgun.BRAHCHCH.2000.wav" + , "mini.BRPBRPBRP.2000.wav" + , "seagullWhistle.WE-OH.2000.wav" + , "whiteNoiseFadeIn.FHP.100.wav" ] -tone440sawtoothquietS :: SoundID -tone440sawtoothquietS = SoundID 0 -gruntS :: SoundID -gruntS = SoundID 1 -glassShat2S :: SoundID -glassShat2S = SoundID 2 -buzzS :: SoundID -buzzS = SoundID 3 -seagullWhistleS :: SoundID -seagullWhistleS = SoundID 4 -seagullBarkS :: SoundID -seagullBarkS = SoundID 5 -smallGlass2S :: SoundID -smallGlass2S = SoundID 6 -skwareFadeTwoSecS :: SoundID -skwareFadeTwoSecS = SoundID 7 -dededumS :: SoundID -dededumS = SoundID 8 -seagullCry2S :: SoundID -seagullCry2S = SoundID 9 -sineRaisePitchOneSecS :: SoundID -sineRaisePitchOneSecS = SoundID 10 -twoStepSlowS :: SoundID -twoStepSlowS = SoundID 11 -dededaS :: SoundID -dededaS = SoundID 12 -smallGlass4S :: SoundID -smallGlass4S = SoundID 13 -autoBS :: SoundID -autoBS = SoundID 14 -glassShat4S :: SoundID -glassShat4S = SoundID 15 -glassShat3S :: SoundID -glassShat3S = SoundID 16 -tap2S :: SoundID -tap2S = SoundID 17 -impact2S :: SoundID -impact2S = SoundID 18 -tone440sawtoothS :: SoundID -tone440sawtoothS = SoundID 19 -reloadS :: SoundID -reloadS = SoundID 20 -twoStepS :: SoundID -twoStepS = SoundID 21 -fireS :: SoundID -fireS = SoundID 22 dedumS :: SoundID -dedumS = SoundID 23 -foamSprayFadeOutS :: SoundID -foamSprayFadeOutS = SoundID 24 -explosionS :: SoundID -explosionS = SoundID 25 -tapQuietS :: SoundID -tapQuietS = SoundID 26 -autoGunS :: SoundID -autoGunS = SoundID 27 -glassShat1S :: SoundID -glassShat1S = SoundID 28 -foot3S :: SoundID -foot3S = SoundID 29 -healS :: SoundID -healS = SoundID 30 -twoStep1S :: SoundID -twoStep1S = SoundID 31 -click1S :: SoundID -click1S = SoundID 32 -tap4S :: SoundID -tap4S = SoundID 33 -tinitusS :: SoundID -tinitusS = SoundID 34 -seagullCry1S :: SoundID -seagullCry1S = SoundID 35 -tap3S :: SoundID -tap3S = SoundID 36 -impact3S :: SoundID -impact3S = SoundID 37 -smallGlass1S :: SoundID -smallGlass1S = SoundID 38 -seagullWhistle1S :: SoundID -seagullWhistle1S = SoundID 39 -tap1S :: SoundID -tap1S = SoundID 40 -hit1S :: SoundID -hit1S = SoundID 41 -slideDoorS :: SoundID -slideDoorS = SoundID 42 -impact1S :: SoundID -impact1S = SoundID 43 -knifeS :: SoundID -knifeS = SoundID 44 -elecCrackleS :: SoundID -elecCrackleS = SoundID 45 -smallGlass3S :: SoundID -smallGlass3S = SoundID 46 -whiteNoiseFadeInS :: SoundID -whiteNoiseFadeInS = SoundID 47 -reload1S :: SoundID -reload1S = SoundID 48 -computerBeepingS :: SoundID -computerBeepingS = SoundID 49 -seagullChatter1S :: SoundID -seagullChatter1S = SoundID 50 -miniS :: SoundID -miniS = SoundID 51 -seagullCryS :: SoundID -seagullCryS = SoundID 52 -crankSlowS :: SoundID -crankSlowS = SoundID 53 -fireLoudS :: SoundID -fireLoudS = SoundID 54 -mini1S :: SoundID -mini1S = SoundID 55 -whiteNoiseFadeOutS :: SoundID -whiteNoiseFadeOutS = SoundID 56 -sineRaisePitchTwoSecS :: SoundID -sineRaisePitchTwoSecS = SoundID 57 -tone440S :: SoundID -tone440S = SoundID 58 -foamSprayLoopS :: SoundID -foamSprayLoopS = SoundID 59 -pickUpS :: SoundID -pickUpS = SoundID 60 -hitS :: SoundID -hitS = SoundID 61 -missileLaunchS :: SoundID -missileLaunchS = SoundID 62 -fridgeHumS :: SoundID -fridgeHumS = SoundID 63 -shotgunS :: SoundID -shotgunS = SoundID 64 -foot1S :: SoundID -foot1S = SoundID 65 -bangEchoS :: SoundID -bangEchoS = SoundID 66 -teleS :: SoundID -teleS = SoundID 67 -foot2S :: SoundID -foot2S = SoundID 68 -oldMachineBootS :: SoundID -oldMachineBootS = SoundID 69 -bangS :: SoundID -bangS = SoundID 70 -seagullChatterS :: SoundID -seagullChatterS = SoundID 71 -dedaS :: SoundID -dedaS = SoundID 72 +dedumS = SoundID 0 +tone440sawtoothquietS :: SoundID +tone440sawtoothquietS = SoundID 1 impact4S :: SoundID -impact4S = SoundID 73 +impact4S = SoundID 2 +mini1S :: SoundID +mini1S = SoundID 3 +dededaS :: SoundID +dededaS = SoundID 4 +glassShat3S :: SoundID +glassShat3S = SoundID 5 +tapQuietS :: SoundID +tapQuietS = SoundID 6 +fireS :: SoundID +fireS = SoundID 7 +smallGlass4S :: SoundID +smallGlass4S = SoundID 8 +smallGlass1S :: SoundID +smallGlass1S = SoundID 9 +sineRaisePitchTwoSecS :: SoundID +sineRaisePitchTwoSecS = SoundID 10 +foot1S :: SoundID +foot1S = SoundID 11 +autoBS :: SoundID +autoBS = SoundID 12 +healS :: SoundID +healS = SoundID 13 +fridgeHumS :: SoundID +fridgeHumS = SoundID 14 +seagullWhistle1S :: SoundID +seagullWhistle1S = SoundID 15 +elecCrackleS :: SoundID +elecCrackleS = SoundID 16 +foot2S :: SoundID +foot2S = SoundID 17 +skwareFadeTwoSecS :: SoundID +skwareFadeTwoSecS = SoundID 18 +bangEchoS :: SoundID +bangEchoS = SoundID 19 +smallGlass3S :: SoundID +smallGlass3S = SoundID 20 +whiteNoiseFadeOutS :: SoundID +whiteNoiseFadeOutS = SoundID 21 +teleS :: SoundID +teleS = SoundID 22 +hitS :: SoundID +hitS = SoundID 23 +impact2S :: SoundID +impact2S = SoundID 24 +twoStep1S :: SoundID +twoStep1S = SoundID 25 +seagullChatterS :: SoundID +seagullChatterS = SoundID 26 +foamSprayLoopS :: SoundID +foamSprayLoopS = SoundID 27 +impact3S :: SoundID +impact3S = SoundID 28 +explosionS :: SoundID +explosionS = SoundID 29 +foamSprayFadeOutS :: SoundID +foamSprayFadeOutS = SoundID 30 +tap2S :: SoundID +tap2S = SoundID 31 +tinitusS :: SoundID +tinitusS = SoundID 32 +seagullCry1S :: SoundID +seagullCry1S = SoundID 33 +seagullBarkS :: SoundID +seagullBarkS = SoundID 34 +seagullCry2S :: SoundID +seagullCry2S = SoundID 35 +hit1S :: SoundID +hit1S = SoundID 36 +click1S :: SoundID +click1S = SoundID 37 +twoStepSlowS :: SoundID +twoStepSlowS = SoundID 38 +seagullCryS :: SoundID +seagullCryS = SoundID 39 +crankSlowS :: SoundID +crankSlowS = SoundID 40 +twoStepS :: SoundID +twoStepS = SoundID 41 +impact1S :: SoundID +impact1S = SoundID 42 +reloadS :: SoundID +reloadS = SoundID 43 +reload1S :: SoundID +reload1S = SoundID 44 +tone440sawtoothS :: SoundID +tone440sawtoothS = SoundID 45 +tap3S :: SoundID +tap3S = SoundID 46 +glassShat4S :: SoundID +glassShat4S = SoundID 47 +glassShat2S :: SoundID +glassShat2S = SoundID 48 +foot3S :: SoundID +foot3S = SoundID 49 +pickUpS :: SoundID +pickUpS = SoundID 50 +dededumS :: SoundID +dededumS = SoundID 51 +tap1S :: SoundID +tap1S = SoundID 52 +knifeS :: SoundID +knifeS = SoundID 53 +computerBeepingS :: SoundID +computerBeepingS = SoundID 54 +tone440S :: SoundID +tone440S = SoundID 55 +smallGlass2S :: SoundID +smallGlass2S = SoundID 56 +glassShat1S :: SoundID +glassShat1S = SoundID 57 +seagullChatter1S :: SoundID +seagullChatter1S = SoundID 58 +bangS :: SoundID +bangS = SoundID 59 +dedaS :: SoundID +dedaS = SoundID 60 +missileLaunchS :: SoundID +missileLaunchS = SoundID 61 +gruntS :: SoundID +gruntS = SoundID 62 +sineRaisePitchOneSecS :: SoundID +sineRaisePitchOneSecS = SoundID 63 +slideDoorS :: SoundID +slideDoorS = SoundID 64 +autoGunS :: SoundID +autoGunS = SoundID 65 +oldMachineBootS :: SoundID +oldMachineBootS = SoundID 66 +buzzS :: SoundID +buzzS = SoundID 67 +fireLoudS :: SoundID +fireLoudS = SoundID 68 +tap4S :: SoundID +tap4S = SoundID 69 +shotgunS :: SoundID +shotgunS = SoundID 70 +miniS :: SoundID +miniS = SoundID 71 +seagullWhistleS :: SoundID +seagullWhistleS = SoundID 72 +whiteNoiseFadeInS :: SoundID +whiteNoiseFadeInS = SoundID 73