diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_horn.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_horn.wav index 6071eee5c..c8530bc28 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_horn.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_horn.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_adam.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_adam.wav index daa156120..64632fe47 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_adam.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_adam.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_boy.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_boy.wav index 5ad035a0c..7f65543f8 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_boy.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_boy.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_charles.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_charles.wav index db2b2cbd6..2f5d29fd8 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_charles.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_charles.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_david.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_david.wav index 949f0b2a7..5de18c8a0 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_david.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_lssd_new/oiss_ssa_vehaud_siren_david.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new.oac b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new.oac deleted file mode 100644 index abae1baad..000000000 --- a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new.oac +++ /dev/null @@ -1,104 +0,0 @@ -Version 1 11 -{ - IsStream False - DescriptorsInOrder False - Entries - { - WaveTrack oiss_ssa_vehaud_siren_adam - { - Compression PCM - Headroom -200 - LoopPoint 0 - LoopBegin 0 - LoopEnd 0 - PlayBegin 0 - PlayEnd 0 - Wave oiss_ssa_vehaud_sahp_new\oiss_ssa_vehaud_siren_adam.wav - AnimClip null - Events null - UNKNOWN_23097A2B null - UNKNOWN_E787895A null - UNKNOWN_252C20D9 null - } - WaveTrack oiss_ssa_vehaud_siren_boy - { - Compression PCM - Headroom -200 - LoopPoint 0 - LoopBegin 0 - LoopEnd 0 - PlayBegin 0 - PlayEnd 0 - Wave oiss_ssa_vehaud_sahp_new\oiss_ssa_vehaud_siren_boy.wav - AnimClip null - Events null - UNKNOWN_23097A2B null - UNKNOWN_E787895A null - UNKNOWN_252C20D9 null - } - WaveTrack oiss_ssa_vehaud_siren_charles - { - Compression PCM - Headroom -200 - LoopPoint 0 - LoopBegin 0 - LoopEnd 0 - PlayBegin 0 - PlayEnd 0 - Wave oiss_ssa_vehaud_sahp_new\oiss_ssa_vehaud_siren_charles.wav - AnimClip null - Events null - UNKNOWN_23097A2B null - UNKNOWN_E787895A null - UNKNOWN_252C20D9 null - } - WaveTrack oiss_ssa_vehaud_siren_david - { - Compression PCM - Headroom -200 - LoopPoint 0 - LoopBegin 0 - LoopEnd 0 - PlayBegin 0 - PlayEnd 0 - Wave oiss_ssa_vehaud_sahp_new\oiss_ssa_vehaud_siren_david.wav - AnimClip null - Events null - UNKNOWN_23097A2B null - UNKNOWN_E787895A null - UNKNOWN_252C20D9 null - } - WaveTrack oiss_ssa_vehaud_siren_edward - { - Compression PCM - Headroom -200 - LoopPoint 0 - LoopBegin 0 - LoopEnd 0 - PlayBegin 0 - PlayEnd 0 - Wave oiss_ssa_vehaud_sahp_new\oiss_ssa_vehaud_siren_edward.wav - AnimClip null - Events null - UNKNOWN_23097A2B null - UNKNOWN_E787895A null - UNKNOWN_252C20D9 null - } - WaveTrack oiss_ssa_vehaud_horn - { - Compression PCM - Headroom -200 - LoopPoint 0 - LoopBegin 0 - LoopEnd 0 - PlayBegin 0 - PlayEnd 0 - Wave oiss_ssa_vehaud_sahp_new\oiss_ssa_vehaud_horn.wav - AnimClip null - Events null - UNKNOWN_23097A2B null - UNKNOWN_E787895A null - UNKNOWN_252C20D9 null - } - } -} diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_horn.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_horn.wav deleted file mode 100644 index 2dfb16730..000000000 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_horn.wav and /dev/null differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_adam.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_adam.wav deleted file mode 100644 index bb5a9b218..000000000 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_adam.wav and /dev/null differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_boy.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_boy.wav deleted file mode 100644 index 451b449fa..000000000 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_boy.wav and /dev/null differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_charles.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_charles.wav deleted file mode 100644 index 33856b30a..000000000 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_charles.wav and /dev/null differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_david.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_david.wav deleted file mode 100644 index 943d66ebc..000000000 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_david.wav and /dev/null differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_edward.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_edward.wav deleted file mode 100644 index eeb4a2142..000000000 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_new/oiss_ssa_vehaud_siren_edward.wav and /dev/null differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_lssd_new.awc b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_lssd_new.awc index 61b14a93f..dec21cc3e 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_lssd_new.awc and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_lssd_new.awc differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_sahp_new.awc b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_sahp_new.awc deleted file mode 100644 index 9e6fc833f..000000000 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_sahp_new.awc and /dev/null differ diff --git a/resources/lvc/SIRENS.lua b/resources/lvc/SIRENS.lua index a48ce79f0..37dcce7c9 100644 --- a/resources/lvc/SIRENS.lua +++ b/resources/lvc/SIRENS.lua @@ -35,8 +35,8 @@ RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_SAHP_NEW', false) RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_FIB_NEW', false) RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_LSFD_NEW', false) RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_BCFD_NEW', false) -RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_LSSD_OLD', true) -RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_SAHP_OLD', true) +RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_LSSD_OLD', false) +RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_SAHP_OLD', false) -- CHANGE SIREN NAMES, AUDIONAME, AUDIOREF SIRENS = { @@ -233,28 +233,28 @@ SIREN_ASSIGNMENTS = { ['lapdfpis'] = { 51, 52, 53 }, ['lapdfpis2'] = { 51, 52, 53 }, ['lapdfpiua'] = { 51, 52, 53 }, - ['lasd05cvpi'] = { 51, 52, 53 }, - ['lasd06cvpi'] = { 51, 52, 53 }, - ['lasd06cvpicarson'] = { 51, 52, 53 }, - ['lasd06cvpisd7100'] = { 51, 52, 53 }, - ['lasd06m'] = { 51, 52, 53 }, - ['lasd06u'] = { 51, 52, 53 }, - ['lasd08cvpi'] = { 51, 52, 53 }, - ['lasd08cvpilomita'] = { 51, 52, 53 }, - ['lasd08cvpitransit'] = { 51, 52, 53 }, - ['lasd15k9'] = { 51, 52, 53 }, - ['lasd15tahoe'] = { 51, 52, 53 }, - ['lasd15tunm'] = { 51, 52, 53 }, - ['lasd16asap'] = { 51, 52, 53 }, - ['lasd20fs'] = { 51, 52, 53 }, - ['lasd20k9'] = { 51, 52, 53 }, - ['lasd20tunm'] = { 51, 52, 53 }, - ['lasdchrg14'] = { 51, 52, 53 }, - ['lasdcrownvic'] = { 51, 52, 53 }, - ['lasdlithium'] = { 51, 52, 53 }, - ['lasdparamount'] = { 51, 52, 53 }, - ['lasdsd7100'] = { 51, 52, 53 }, - ['lasdvicslicktop'] = { 51, 52, 53 }, + ['lasd05cvpi'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd06cvpi'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd06cvpicarson'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd06cvpisd7100'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd06m'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd06u'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd08cvpi'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd08cvpilomita'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd08cvpitransit'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd15k9'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd15tahoe'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd15tunm'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd16asap'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd20fs'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd20k9'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd20tunm'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdchrg14'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdcrownvic'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdlithium'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdparamount'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdsd7100'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdvicslicktop'] = { 21, 22, 23, 24, 25, 25 }, ['metrocharger'] = { 51, 52, 53 }, ['11lapdvic'] = { 51, 52, 53 }, ['11lapdvic2'] = { 51, 52, 53 }, @@ -305,53 +305,23 @@ SIREN_ASSIGNMENTS = { ['metro16fpiu'] = { 51, 52, 53 }, ['metro16fpiu2'] = { 51, 52, 53 }, ['metro16fpiu3'] = { 51, 52, 53 }, - ['lasdcharger'] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - [' '] = { 51, 52, 53 }, - - - - - - - - - - - - ['lasdchg'] = { 51, 52, 53 }, - ['lasdexp'] = { 51, 52, 53 }, - ['lasdexp2'] = { 51, 52, 53 }, - ['lasdfpiu'] = { 51, 52, 53 }, - ['lasdfpiu2'] = { 51, 52, 53 }, - ['lasdfpiu3'] = { 51, 52, 53 }, - ['lasdfpiu4'] = { 51, 52, 53 }, - ['lasdtahoe2'] = { 51, 52, 53 }, - ['lasdvic'] = { 51, 52, 53 }, - ['lasdvic2'] = { 51, 52, 53 }, - ['lasd08tahoe'] = { 51, 52, 53 }, - ['lasd08tahoe2'] = { 51, 52, 53 }, - ['lasd14tahoe'] = { 51, 52, 53 }, - ['lasdchrg14'] = { 51, 52, 53 }, - ['LASDCVPI2'] = { 51, 52, 53 }, - ['22tahoe'] = { 51, 52, 53 }, + ['lasdcharger'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdchg'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdexp'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdexp2'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdfpiu'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdfpiu2'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdfpiu3'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdfpiu4'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdtahoe2'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdvic'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdvic2'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd08tahoe'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd08tahoe2'] = { 21, 22, 23, 24, 25, 25 }, + ['lasd14tahoe'] = { 21, 22, 23, 24, 25, 25 }, + ['lasdchrg14'] = { 21, 22, 23, 24, 25, 25 }, + ['LASDCVPI2'] = { 21, 22, 23, 24, 25, 25 }, + ['22tahoe'] = { 21, 22, 23, 24, 25, 25 }, ['SMPDF150'] = { 51, 52, 53 }, ['chp23charg'] = { 21, 22, 23, 24 }, ['chp20fpiup'] = { 21, 22, 23, 24 },