From ad36e28d9465d8c64380897490de0fc4b1f4e9f3 Mon Sep 17 00:00:00 2001 From: KingMcDonalds Date: Wed, 2 Jul 2025 10:24:40 -0700 Subject: [PATCH] adding all california law vehicles new sirens --- .../EGRP-Emergency/stream/rbptvan/rbptvan.yft | 3 - .../EGRP-Emergency/stream/rbptvan/rbptvan.ytd | 3 - .../stream/rbptvan/rbptvan_hi.yft | 3 - .../EGRP-Extras/__resource.lua | 105 ---------------- resources/lvc/SIRENS.lua | 113 +++++++++++++++++- 5 files changed, 109 insertions(+), 118 deletions(-) delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan.yft delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan.ytd delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan_hi.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan.yft deleted file mode 100644 index 28910b162..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan.yft +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3492faacec910788e9cd05a8967eb0ec010748f9d88bae9d9d3a943d93f4f094 -size 8559530 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan.ytd deleted file mode 100644 index ddc8884d9..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan.ytd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2318caeb8a7452e7ef7921cdbe3b017f241677b44c49720d49d3e1ae1811756 -size 6046746 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan_hi.yft deleted file mode 100644 index a553da7ad..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/rbptvan/rbptvan_hi.yft +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9f83561fcb6b3c2a5e554f8a1a70112a6dbf02d0bc1f2eea08817d4febcbbbe -size 8559514 diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/__resource.lua b/resources/[EGRP-CarPacks]/EGRP-Extras/__resource.lua index 5fa98fd0c..bc0d9a43b 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Extras/__resource.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/__resource.lua @@ -1065,111 +1065,6 @@ data_file 'CARCOLS_FILE' 'data/mpf250rb/carcols.meta' data_file 'VEHICLE_VARIATION_FILE' 'data/mpf250rb/carvariations.meta' data_file 'VEHICLE_LAYOUTS_FILE' 'data/mpf250rb/dlctext.meta' - -- dps22tahoe - files { - 'data/dps22tahoe/vehicles.meta', - 'data/dps22tahoe/carvariations.meta', - 'data/dps22tahoe/carcols.meta', - 'data/dps22tahoe/handling.meta', - 'data/dps22tahoe/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/dps22tahoe/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/dps22tahoe/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/dps22tahoe/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/dps22tahoe/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/dps22tahoe/dlctext.meta' - - -- dps23tahoesg - files { - 'data/dps23tahoesg/vehicles.meta', - 'data/dps23tahoesg/carvariations.meta', - 'data/dps23tahoesg/carcols.meta', - 'data/dps23tahoesg/handling.meta', - 'data/dps23tahoesg/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/dps23tahoesg/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/dps23tahoesg/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/dps23tahoesg/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/dps23tahoesg/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/dps23tahoesg/dlctext.meta' - - -- dps21silv - files { - 'data/dps21silv/vehicles.meta', - 'data/dps21silv/carvariations.meta', - 'data/dps21silv/carcols.meta', - 'data/dps21silv/handling.meta', - 'data/dps21silv/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/dps21silv/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/dps21silv/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/dps21silv/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/dps21silv/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/dps21silv/dlctext.meta' - - -- dps23silv1500 - files { - 'data/dps23silv1500/vehicles.meta', - 'data/dps23silv1500/carvariations.meta', - 'data/dps23silv1500/carcols.meta', - 'data/dps23silv1500/handling.meta', - 'data/dps23silv1500/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/dps23silv1500/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/dps23silv1500/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/dps23silv1500/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/dps23silv1500/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/dps23silv1500/dlctext.meta' - - -- dps20k9tahoe - files { - 'data/dps20k9tahoe/vehicles.meta', - 'data/dps20k9tahoe/carvariations.meta', - 'data/dps20k9tahoe/carcols.meta', - 'data/dps20k9tahoe/handling.meta', - 'data/dps20k9tahoe/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/dps20k9tahoe/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/dps20k9tahoe/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/dps20k9tahoe/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/dps20k9tahoe/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/dps20k9tahoe/dlctext.meta' - - -- dps20tahoe2 - files { - 'data/dps20tahoe2/vehicles.meta', - 'data/dps20tahoe2/carvariations.meta', - 'data/dps20tahoe2/carcols.meta', - 'data/dps20tahoe2/handling.meta', - 'data/dps20tahoe2/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/dps20tahoe2/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/dps20tahoe2/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/dps20tahoe2/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/dps20tahoe2/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/dps20tahoe2/dlctext.meta' - - -- dps20tahoeslick - files { - 'data/dps20tahoeslick/vehicles.meta', - 'data/dps20tahoeslick/carvariations.meta', - 'data/dps20tahoeslick/carcols.meta', - 'data/dps20tahoeslick/handling.meta', - 'data/dps20tahoeslick/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/dps20tahoeslick/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/dps20tahoeslick/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/dps20tahoeslick/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/dps20tahoeslick/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/dps20tahoeslick/dlctext.meta' - client_script { 'vehicle_names.lua' } \ No newline at end of file diff --git a/resources/lvc/SIRENS.lua b/resources/lvc/SIRENS.lua index 4a8c84b5b..8e747dd51 100644 --- a/resources/lvc/SIRENS.lua +++ b/resources/lvc/SIRENS.lua @@ -126,8 +126,7 @@ SIREN_ASSIGNMENTS = { ['medic1a'] = { 45, 16,40, 38, 48, 31 }, ['medic1b'] = { 45, 16,40, 38, 48, 31 }, ['ram20pov'] = { 45, 16,40, 38, 48, 31 }, - ['EMSf550ambo'] = { 45, 16,40, 38, 48, 31 }, - ['EMSf550ambo2'] = { 45, 16,40, 38, 48, 31 }, + ['safr_fleet'] = { 45, 16,40, 38, 48, 31 }, ['walkinarrow'] = { 45, 16,40, 38, 48, 31 }, ['engine6a'] = { 45, 48, 13, 50, 47, 46 }, ['engine6d'] = { 45, 48, 13, 50, 47, 46 }, @@ -184,7 +183,8 @@ SIREN_ASSIGNMENTS = { ['petewrecker'] = { 45, 48, 13, 46, 47, 49 }, ['lafdtiller'] = { 45, 48, 13, 46, 47, 49 }, ['lafdcab'] = { 45, 48, 13, 46, 47, 49 }, - ['16ramcsquad'] = { 45, 48, 13, 46, 47, 49 }, + ['16ramcsquad'] = { 45, 48, 13, 46, 47, 49 }, + ['2021FDPack'] = { 45, 48, 13, 46, 47, 49 }, ['20Maxfdramsquad'] = { 45, 48, 13, 46, 47, 49 }, ['20ramcsquad'] = { 45, 48, 13, 46, 47, 49 }, ['f550csquad'] = { 45, 48, 13, 46, 47, 49 }, @@ -194,6 +194,111 @@ SIREN_ASSIGNMENTS = { ['firetruk13'] = { 45, 48, 13, 46, 47, 49 }, ['hazf350tec'] = { 45, 48, 13, 46, 47, 49 }, ['redf350brush21'] = { 45, 48, 13, 46, 47, 49 }, - ['11lapdvic'] = { 51, 52, 53 }, + ['lasd1997'] = { 51, 52, 53 }, + ['lasd1998'] = { 51, 52, 53 }, + ['lasd1999'] = { 51, 52, 53 }, + ['lasd2000'] = { 51, 52, 53 }, + ['lasd2001'] = { 51, 52, 53 }, + ['lasd2002'] = { 51, 52, 53 }, + ['LA_Durangos'] = { 51, 52, 53 }, + ['LA-Cars'] = { 51, 52, 53 }, + ['LAPD'] = { 51, 52, 53 }, + ['LASD'] = { 51, 52, 53 }, + ['Retro_LASD_Pack'] = { 51, 52, 53 }, + ['22tahoe'] = { 51, 52, 53 }, + ['SMPDF150'] = { 51, 52, 53 }, ['chp23charg'] = { 21, 22, 23, 24 }, + ['chp1'] = { 21, 22, 23, 24 }, + ['chp3'] = { 21, 22, 23, 24 }, + ['chp4'] = { 21, 22, 23, 24 }, + ['chp5'] = { 21, 22, 23, 24 }, + ['chp6'] = { 21, 22, 23, 24 }, + ['chp11cvpi'] = { 21, 22, 23, 24 }, + ['chp11cvpiS'] = { 21, 22, 23, 24 }, + ['chp13fpiu'] = { 21, 22, 23, 24 }, + ['chp13fpiuS'] = { 21, 22, 23, 24 }, + ['chp13harley'] = { 21, 22, 23, 24 }, + ['chp18charger'] = { 21, 22, 23, 24 }, + ['chp18chargerS'] = { 21, 22, 23, 24 }, + ['chp20tahoe'] = { 21, 22, 23, 24 }, + ['chp20tahoeS'] = { 21, 22, 23, 24 }, + ['chp181charger'] = { 21, 22, 23, 24 }, + ['chp1200rt'] = { 21, 22, 23, 24 }, + ['hp1'] = { 21, 22, 23, 24 }, + ['hp2'] = { 21, 22, 23, 24 }, + ['hp3'] = { 21, 22, 23, 24 }, + ['hp4'] = { 21, 22, 23, 24 }, + ['hp5'] = { 21, 22, 23, 24 }, + ['hp9'] = { 21, 22, 23, 24 }, + ['gt24non'] = { 21, 22, 23, 24 }, + ['hp14fpiu'] = { 21, 22, 23, 24 }, + ['hp15fpiu'] = { 21, 22, 23, 24 }, + ['hp16fpiu'] = { 21, 22, 23, 24 }, + ['lapd5'] = { 21, 22, 23, 24 }, + ['lapd5b'] = { 21, 22, 23, 24 }, + ['lapd10'] = { 21, 22, 23, 24 }, + ['lasdoldtahoe'] = { 21, 22, 23, 24 }, + ['chp2'] = { 21, 22, 23, 24 }, + ['PD23Suburban'] = { 27, 28, 29, 30, 31, 32 }, + ['ls14calpr'] = { 27, 28, 29, 30, 31, 32 }, + ['ls14chrgr'] = { 27, 28, 29, 30, 31, 32 }, + ['ls14tahoe'] = { 27, 28, 29, 30, 31, 32 }, + ['ls14talpr'] = { 27, 28, 29, 30, 31, 32 }, + ['ls16falpr'] = { 27, 28, 29, 30, 31, 32 }, + ['ls18calpr'] = { 27, 28, 29, 30, 31, 32 }, + ['ls18chrgr'] = { 27, 28, 29, 30, 31, 32 }, + ['ls20falpr'] = { 27, 28, 29, 30, 31, 32 }, + ['ls20tahoe'] = { 27, 28, 29, 30, 31, 32 }, + ['ls20talpr'] = { 27, 28, 29, 30, 31, 32 }, + ['maxcamaro19'] = { 27, 28, 29, 30, 31, 32 }, + ['Retro1'] = { 27, 28, 29, 30, 31, 32 }, + ['Retro2'] = { 27, 28, 29, 30, 31, 32 }, + ['retro3'] = { 27, 28, 29, 30, 31, 32 }, + ['retro4'] = { 27, 28, 29, 30, 31, 32 }, + ['rye20fpiu'] = { 27, 28, 29, 30, 31, 32 }, + ['rye20fpiurb'] = { 27, 28, 29, 30, 31, 32 }, + ['rye23tahoe'] = { 27, 28, 29, 30, 31, 32 }, + ['sdgcvpi'] = { 27, 28, 29, 30, 31, 32 }, + ['warden1'] = { 27, 28, 29, 30, 31, 32 }, + ['warden2'] = { 27, 28, 29, 30, 31, 32 }, + ['warden3'] = { 27, 28, 29, 30, 31, 32 }, + ['warden4'] = { 27, 28, 29, 30, 31, 32 }, + ['warden5'] = { 27, 28, 29, 30, 31, 32 }, + ['warden6'] = { 27, 28, 29, 30, 31, 32 }, + ['warden7'] = { 27, 28, 29, 30, 31, 32 }, + ['warden8'] = { 27, 28, 29, 30, 31, 32 }, + ['warden9'] = { 27, 28, 29, 30, 31, 32 }, + ['maxfedv'] = { 27, 28, 29, 30, 31, 32 }, + ['justice1'] = { 27, 28, 29, 30, 31, 32 }, + ['justice1canine'] = { 27, 28, 29, 30, 31, 32 }, + ['justice4'] = { 27, 28, 29, 30, 31, 32 }, + ['justice4canine'] = { 27, 28, 29, 30, 31, 32 }, + ['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 }, + ['20expk9rb'] = { 27, 28, 29, 30, 31, 32 }, + ['20fpiu_pd'] = { 27, 28, 29, 30, 31, 32 }, + ['22expedition'] = { 27, 28, 29, 30, 31, 32 }, + ['22jeepleo'] = { 27, 28, 29, 30, 31, 32 }, + ['18gtruckrb'] = { 27, 28, 29, 30, 31, 32 }, + ['14F250'] = { 27, 28, 29, 30, 31, 32 }, + ['20FDMTahoe'] = { 27, 28, 29, 30, 31, 32 }, + ['20TAHOEPPV19'] = { 27, 28, 29, 30, 31, 32 }, + ['2022pshrb'] = { 27, 28, 29, 30, 31, 32 }, + ['dhssemi'] = { 27, 28, 29, 30, 31, 32 }, + ['fbicharger'] = { 27, 28, 29, 30, 31, 32 }, + ['GC21F250'] = { 27, 28, 29, 30, 31, 32 }, + ['maxdrkhorse'] = { 27, 28, 29, 30, 31, 32 }, + ['MAXr2bison'] = { 27, 28, 29, 30, 31, 32 }, + ['nforce24mustangS'] = { 27, 28, 29, 30, 31, 32 }, + ['nm_jeep'] = { 27, 28, 29, 30, 31, 32 }, + + + + + + + } \ No newline at end of file