ThatGuyJacobee/Elite-Gaming-FiveM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing sirens

Browse Source
This commit is contained in:
KingMcDonalds
2025-08-26 13:32:07 -07:00
parent 7b9ef479c1
commit 2d7496a0b7
3 changed files with 97 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/[EGRP-CarPacks]/ERGP-Highwaypatrol/__resource.lua
-15
View File
@@ -1,20 +1,5 @@
resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5'
-- chp24pack
files {
'data/chp24pack/vehicles.meta',
'data/chp24pack/carvariations.meta',
'data/chp24pack/carcols.meta',
'data/chp24pack/handling.meta',
'data/chp24pack/vehiclelayouts.meta',
}
data_file 'HANDLING_FILE' 'data/chp24pack/handling.meta'
data_file 'VEHICLE_METADATA_FILE' 'data/chp24pack/vehicles.meta'
data_file 'CARCOLS_FILE' 'data/chp24pack/carcols.meta'
data_file 'VEHICLE_VARIATION_FILE' 'data/chp24pack/carvariations.meta'
data_file 'VEHICLE_LAYOUTS_FILE' 'data/chp24pack/dlctext.meta'
-- 17colorado
files {
'data/17colorado/vehicles.meta',
resources/lvc/SETTINGS.lua
+2 -2
View File
@@ -27,9 +27,9 @@ hud_first_default = true
---------------MAIN SIREN SETTINGS-----------------
main_siren_settings_masterswitch = true
-- Enables users to rename siren tones, change siren options. (Cycle / Button)
park_kill_masterswitch = true
park_kill_masterswitch = false
-- Enables park kill functionality. Setting this to false will not allow users to change from default behaviour this.
park_kill_default = false
park_kill_default = true
-- Default setting for park kill mode. (default: true)
airhorn_interrupt_masterswitch = true
-- Enables ability to toggle air horn interrupt. Setting this to false will not allow users to change from default behaviour this.
resources/lvc/SIRENS.lua
+95 -95
View File
@@ -113,7 +113,7 @@ SIRENS = {
--ASSIGN SIRENS TO VEHICLES
SIREN_ASSIGNMENTS = {
--['<gameName>'] = {tones},
['DEFAULT'] = { 54, 52, 22, 55, 56, 61, 53, 23, 42, 31 },
['DEFAULT'] = { 21, 22, 23, 24, 25 },
['FIRETRUK'] = { 12, 13, 14, 11 },
['AMBULAN'] = { 1, 2, 3, 4, 11 },
['LGUARD'] = { 1, 2, 3, 4, 11 },
@@ -224,19 +224,19 @@ SIREN_ASSIGNMENTS = {
['firetruk13'] = { 45, 48, 13, 46, 47, 49, 61, 62, 63},
['hazf350tec'] = { 45, 48, 13, 46, 47, 49 },
['redf350brush21'] = { 45, 48, 13, 46, 47, 49 },
['lasd1997'] = { 21, 22, 23, 24, 25, 28 },
['lasd1998'] = { 21, 22, 23, 24, 25, 28 },
['lasd1999'] = { 21, 22, 23, 24, 25, 28 },
['lasd2000'] = { 21, 22, 23, 24, 25, 28 },
['lasd2001'] = { 21, 22, 23, 24, 25, 28 },
['lasd2002'] = { 21, 22, 23, 24, 25, 28 },
['16expmet'] = { 21, 22, 23, 24, 25, 28 },
['lasd1997'] = { 21, 22, 23, 24, 25 },
['lasd1998'] = { 21, 22, 23, 24, 25 },
['lasd1999'] = { 21, 22, 23, 24, 25 },
['lasd2000'] = { 21, 22, 23, 24, 25 },
['lasd2001'] = { 21, 22, 23, 24, 25 },
['lasd2002'] = { 21, 22, 23, 24, 25 },
['16expmet'] = { 21, 22, 23, 24, 25 },
['lapdurango'] = { 51, 52, 53 },
['lasdurango'] = { 21, 22, 23, 24, 25, 28 },
['13lasdfpiu'] = { 21, 22, 23, 24, 25, 28 },
['13lasdfpiu2'] = { 21, 22, 23, 24, 25, 28 },
['13lasdfpiua'] = { 21, 22, 23, 24, 25, 28 },
['13lasdfpiuseb'] = { 21, 22, 23, 24, 25, 28 },
['lasdurango'] = { 21, 22, 23, 24, 25 },
['13lasdfpiu'] = { 21, 22, 23, 24, 25 },
['13lasdfpiu2'] = { 21, 22, 23, 24, 25 },
['13lasdfpiua'] = { 21, 22, 23, 24, 25 },
['13lasdfpiuseb'] = { 21, 22, 23, 24, 25 },
['dualpurpose1'] = { 51, 52, 53 },
['dualpurpose3'] = { 51, 52, 53 },
['hybridfpis'] = { 51, 52, 53 },
@@ -257,29 +257,29 @@ SIREN_ASSIGNMENTS = {
['lapdfpis'] = { 51, 52, 53 },
['lapdfpis2'] = { 51, 52, 53 },
['lapdfpiua'] = { 51, 52, 53 },
['dualpurpose2'] = { 21, 22, 23, 24, 25, 28 },
['lasd05cvpi'] = { 21, 22, 23, 24, 25, 28 },
['lasd06cvpi'] = { 21, 22, 23, 24, 25, 28 },
['lasd06cvpicarson'] = { 21, 22, 23, 24, 25, 28 },
['lasd06cvpisd7100'] = { 21, 22, 23, 24, 25, 28 },
['lasd06m'] = { 21, 22, 23, 24, 25, 28 },
['lasd06u'] = { 21, 22, 23, 24, 25, 28 },
['lasd08cvpi'] = { 21, 22, 23, 24, 25, 28 },
['lasd08cvpilomita'] = { 21, 22, 23, 24, 25, 28 },
['lasd08cvpitransit'] = { 21, 22, 23, 24, 25, 28 },
['lasd15k9'] = { 21, 22, 23, 24, 25, 28 },
['lasd15tahoe'] = { 21, 22, 23, 24, 25, 28 },
['lasd15tunm'] = { 21, 22, 23, 24, 25, 28 },
['lasd16asap'] = { 21, 22, 23, 24, 25, 28 },
['lasd20fs'] = { 21, 22, 23, 24, 25, 28 },
['lasd20k9'] = { 21, 22, 23, 24, 25, 28 },
['lasd20tunm'] = { 21, 22, 23, 24, 25, 28 },
['lasdchrg14'] = { 21, 22, 23, 24, 25, 28 },
['lasdcrownvic'] = { 21, 22, 23, 24, 25, 28 },
['lasdlithium'] = { 21, 22, 23, 24, 25, 28 },
['lasdparamount'] = { 21, 22, 23, 24, 25, 28 },
['lasdsd7100'] = { 21, 22, 23, 24, 25, 28 },
['lasdvicslicktop'] = { 21, 22, 23, 24, 25, 28 },
['dualpurpose2'] = { 21, 22, 23, 24, 25 },
['lasd05cvpi'] = { 21, 22, 23, 24, 25 },
['lasd06cvpi'] = { 21, 22, 23, 24, 25 },
['lasd06cvpicarson'] = { 21, 22, 23, 24, 25 },
['lasd06cvpisd7100'] = { 21, 22, 23, 24, 25 },
['lasd06m'] = { 21, 22, 23, 24, 25 },
['lasd06u'] = { 21, 22, 23, 24, 25 },
['lasd08cvpi'] = { 21, 22, 23, 24, 25 },
['lasd08cvpilomita'] = { 21, 22, 23, 24, 25 },
['lasd08cvpitransit'] = { 21, 22, 23, 24, 25 },
['lasd15k9'] = { 21, 22, 23, 24, 25 },
['lasd15tahoe'] = { 21, 22, 23, 24, 25 },
['lasd15tunm'] = { 21, 22, 23, 24, 25 },
['lasd16asap'] = { 21, 22, 23, 24, 25 },
['lasd20fs'] = { 21, 22, 23, 24, 25 },
['lasd20k9'] = { 21, 22, 23, 24, 25 },
['lasd20tunm'] = { 21, 22, 23, 24, 25 },
['lasdchrg14'] = { 21, 22, 23, 24, 25 },
['lasdcrownvic'] = { 21, 22, 23, 24, 25 },
['lasdlithium'] = { 21, 22, 23, 24, 25 },
['lasdparamount'] = { 21, 22, 23, 24, 25 },
['lasdsd7100'] = { 21, 22, 23, 24, 25 },
['lasdvicslicktop'] = { 21, 22, 23, 24, 25 },
['metrocharger'] = { 51, 52, 53 },
['11lapdvic'] = { 51, 52, 53 },
['11lapdvic2'] = { 51, 52, 53 },
@@ -331,58 +331,58 @@ SIREN_ASSIGNMENTS = {
['metro16fpiu'] = { 51, 52, 53 },
['metro16fpiu2'] = { 51, 52, 53 },
['metro16fpiu3'] = { 51, 52, 53 },
['18challengerbw'] = { 21, 22, 23, 24, 25, 28 },
['21mach1stang'] = { 21, 22, 23, 24, 25, 28 },
['19mustgt'] = { 21, 22, 23, 24, 25, 28 },
['21tacouc'] = { 21, 22, 23, 24, 25, 28 },
['21f150'] = { 21, 22, 23, 24, 25, 28 },
['22f150rb'] = { 21, 22, 23, 24, 25, 28 },
['23f150pr'] = { 21, 22, 23, 24, 25, 28 },
['23f150prbb'] = { 21, 22, 23, 24, 25, 28 },
['23f150st'] = { 21, 22, 23, 24, 25, 28 },
['23gmcleo'] = { 21, 22, 23, 24, 25, 28 },
['23gmcleoslick'] = { 21, 22, 23, 24, 25, 28 },
['23hoe'] = { 21, 22, 23, 24, 25, 28 },
['23ram6'] = { 21, 22, 23, 24, 25, 28 },
['24tactrd'] = { 21, 22, 23, 24, 25, 28 },
['2019GMCSlick'] = { 21, 22, 23, 24, 25, 28 },
['hpsrtcat18'] = { 21, 22, 23, 24, 25, 28 },
['Maxpursuit'] = { 21, 22, 23, 24, 25, 28 },
['max-stang21'] = { 21, 22, 23, 24, 25, 28 },
['Polmrambb23'] = { 21, 22, 23, 24, 25, 28 },
['mxxraprb'] = { 21, 22, 23, 24, 25, 28 },
['whelen22sierra'] = { 21, 22, 23, 24, 25, 28 },
['max2021f150'] = { 21, 22, 23, 24, 25, 28 },
['maxdrkhorse'] = { 21, 22, 23, 24, 25, 28 },
['lasd18taurus'] = { 21, 22, 23, 24, 25, 28 },
['lasd06tahoe'] = { 21, 22, 23, 24, 25, 28 },
['lasd16ram'] = { 21, 22, 23, 24, 25, 28 },
['18challengerbw'] = { 21, 22, 23, 24, 25 },
['21mach1stang'] = { 21, 22, 23, 24, 25 },
['19mustgt'] = { 21, 22, 23, 24, 25 },
['21tacouc'] = { 21, 22, 23, 24, 25 },
['21f150'] = { 21, 22, 23, 24, 25 },
['22f150rb'] = { 21, 22, 23, 24, 25 },
['23f150pr'] = { 21, 22, 23, 24, 25 },
['23f150prbb'] = { 21, 22, 23, 24, 25 },
['23f150st'] = { 21, 22, 23, 24, 25 },
['23gmcleo'] = { 21, 22, 23, 24, 25 },
['23gmcleoslick'] = { 21, 22, 23, 24, 25 },
['23hoe'] = { 21, 22, 23, 24, 25 },
['23ram6'] = { 21, 22, 23, 24, 25 },
['24tactrd'] = { 21, 22, 23, 24, 25 },
['2019GMCSlick'] = { 21, 22, 23, 24, 25 },
['hpsrtcat18'] = { 21, 22, 23, 24, 25 },
['Maxpursuit'] = { 21, 22, 23, 24, 25 },
['max-stang21'] = { 21, 22, 23, 24, 25 },
['Polmrambb23'] = { 21, 22, 23, 24, 25 },
['mxxraprb'] = { 21, 22, 23, 24, 25 },
['whelen22sierra'] = { 21, 22, 23, 24, 25 },
['max2021f150'] = { 21, 22, 23, 24, 25 },
['maxdrkhorse'] = { 21, 22, 23, 24, 25 },
['lasd18taurus'] = { 21, 22, 23, 24, 25 },
['lasd06tahoe'] = { 21, 22, 23, 24, 25 },
['lasd16ram'] = { 21, 22, 23, 24, 25 },
['lax20fpiu'] = { 21, 22, 23, 24, 25, 34, 28, 29, 30 },
['lasdcharger'] = { 21, 22, 23, 24, 25, 28 },
['lasdchg'] = { 21, 22, 23, 24, 25, 28 },
['lasdexp'] = { 21, 22, 23, 24, 25, 28 },
['lasdexp2'] = { 21, 22, 23, 24, 25, 36 },
['lasdexp2'] = { 21, 22, 23, 24, 25, 36 },
['lasdfpiu'] = { 21, 22, 23, 24, 25, 28 },
['lasdfpiu2'] = { 21, 22, 23, 24, 25, 36 },
['lssdfpisa'] = { 21, 22, 23, 24, 25, 36 },
['lssdfpisi'] = { 21, 22, 23, 24, 25, 36 },
['LAssd20fpiu'] = { 21, 22, 23, 24, 25, 36 },
['lasdcharger'] = { 21, 22, 23, 24, 25 },
['lasdchg'] = { 21, 22, 23, 24, 25 },
['lasdexp'] = { 21, 22, 23, 24, 25 },
['lasdexp2'] = { 21, 22, 23, 24, 25 },
['lasdexp2'] = { 21, 22, 23, 24, 25 },
['lasdfpiu'] = { 21, 22, 23, 24, 25 },
['lasdfpiu2'] = { 21, 22, 23, 24, 25 },
['lssdfpisa'] = { 21, 22, 23, 24, 25 },
['lssdfpisi'] = { 21, 22, 23, 24, 25 },
['LAssd20fpiu'] = { 21, 22, 23, 24, 25 },
['metro7'] = { 21, 22, 23, 24, 25, 36 },
['metrovan'] = { 21, 22, 23, 24, 25, 36 },
['MAX20FPIULASD'] = { 21, 22, 23, 28, 29, 36 },
['MAX20FPIULASD'] = { 21, 22, 23, 24, 25 },
['METT'] = { 21, 22, 23, 28, 29, 30 },
['lasdfpiu3'] = { 21, 22, 23, 24, 25, 29 },
['lasdfpiu4'] = { 21, 22, 23, 24, 25, 29 },
['lasdtahoe2'] = { 21, 22, 23, 24, 25, 29 },
['lasdvic'] = { 21, 22, 23, 24, 25, 29 },
['lasdvic2'] = { 21, 22, 23, 24, 25, 28 },
['lasd08tahoe'] = { 21, 22, 23, 24, 25, 28 },
['lasd08tahoe2'] = { 21, 22, 23, 24, 25, 28 },
['lasd14tahoe'] = { 21, 22, 23, 24, 25, 28 },
['lasdchrg14'] = { 21, 22, 23, 24, 25, 28 },
['LASDCVPI2'] = { 21, 22, 23, 24, 25, 28 },
['22tahoe'] = { 21, 22, 23, 24, 25, 28 },
['lasdfpiu3'] = { 21, 22, 23, 24, 25 },
['lasdfpiu4'] = { 21, 22, 23, 24, 25 },
['lasdtahoe2'] = { 21, 22, 23, 24, 25 },
['lasdvic'] = { 21, 22, 23, 24, 25 },
['lasdvic2'] = { 21, 22, 23, 24, 25 },
['lasd08tahoe'] = { 21, 22, 23, 24, 25 },
['lasd08tahoe2'] = { 21, 22, 23, 24, 25 },
['lasd14tahoe'] = { 21, 22, 23, 24, 25 },
['lasdchrg14'] = { 21, 22, 23, 24, 25 },
['LASDCVPI2'] = { 21, 22, 23, 24, 25 },
['22tahoe'] = { 21, 22, 23, 24, 25 },
['SMPDF150'] = { 51, 52, 53 },
['chp23charg'] = { 54, 55, 56, 57 },
['chp15exped'] = { 54, 55, 56, 57 },
@@ -440,7 +440,7 @@ SIREN_ASSIGNMENTS = {
['lapd5'] = { 21, 22, 23, 24 },
['lapd5b'] = { 21, 22, 23, 24 },
['lapd10'] = { 21, 22, 23, 24 },
['lasdoldtahoe'] = { 21, 22, 23, 24 },
['lasdoldtahoe'] = { 21, 22, 23, 24, 25 },
['chp2'] = { 21, 22, 23, 24 },
['ls14calpr'] = { 27, 28, 29, 30, 31, 32 },
['ls14chrgr'] = { 27, 28, 29, 30, 31, 32 },
@@ -478,8 +478,8 @@ SIREN_ASSIGNMENTS = {
['dsp19tahoe'] = { 27, 28, 29, 30, 31, 32 },
['231500rb'] = { 27, 28, 29, 30, 31, 32 },
['615'] = { 27, 28, 29, 30, 31, 32 },
['19Yukonrb'] = { 27, 28, 29, 30, 31, 32 },
['19yukonslick'] = { 27, 28, 29, 30, 31, 32 },
['19Yukonrb'] = { 21, 22, 23, 24, 25 },
['19yukonslick'] = { 21, 22, 23, 24, 25 },
['20expk9rb'] = { 27, 28, 29, 30, 31, 32 },
['20fpiu_pd'] = { 27, 28, 29, 30, 31, 32 },
['22expedition'] = { 27, 28, 29, 30, 31, 32 },
@@ -531,14 +531,14 @@ SIREN_ASSIGNMENTS = {
['hazf350tec'] = { 45, 16, 28, 29, 48, 31 },
['firetahoe'] = { 33, 16, 28, 29, 30, 31 },
['ftaurus'] = { 33, 16, 28, 29, 30, 31 },
['LASD16T6'] = { 21, 22, 23, 24, 25, 28 },
['seb2'] = { 21, 22, 23, 24, 25, 36 },
['lasd20tfs'] = { 21, 22, 23, 24, 25, 28 },
['lasdtahoelan'] = { 21, 22, 23, 24, 25, 36 },
['fs23hoe'] = { 21, 22, 23, 24, 25, 28 },
['23f150'] = { 21, 22, 23, 24, 25, 28 },
['PD23Suburban'] = { 21, 22, 23, 19, 29, 28, 34, 36 },
['vhpd1'] = { 21, 22, 23, 16, 17, 18, 19, 26 },
['LASD16T6'] = { 21, 22, 23, 24, 25 },
['seb2'] = { 21, 22, 23, 24, 25 },
['lasd20tfs'] = { 21, 22, 23, 24, 25 },
['lasdtahoelan'] = { 21, 22, 23, 24, 25 },
['fs23hoe'] = { 21, 22, 23, 24, 25 },
['23f150'] = { 21, 22, 23, 24, 25 },
['PD23Suburban'] = { 21, 22, 23, 24, 25 },
['vhpd1'] = { 21, 22, 23, 24, 25 },
['17colorado'] = { 51, 52, 53 },
['lapd09charger1'] = { 51, 52, 53 },
['lapd09charger2'] = { 51, 52, 53 },