diff --git a/resources/[EGRP-CarPacks]/2024TacomaPD/2024TacomaPD.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/2024TacomaPD/2024TacomaPD.yft similarity index 100% rename from resources/[EGRP-CarPacks]/2024TacomaPD/2024TacomaPD.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/2024TacomaPD/2024TacomaPD.yft diff --git a/resources/[EGRP-CarPacks]/2024TacomaPD/2024TacomaPD.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/2024TacomaPD/2024TacomaPD.ytd similarity index 100% rename from resources/[EGRP-CarPacks]/2024TacomaPD/2024TacomaPD.ytd rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/2024TacomaPD/2024TacomaPD.ytd diff --git a/resources/[EGRP-CarPacks]/2024TacomaPD/2024TacomaPD_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/2024TacomaPD/2024TacomaPD_hi.yft similarity index 100% rename from resources/[EGRP-CarPacks]/2024TacomaPD/2024TacomaPD_hi.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/2024TacomaPD/2024TacomaPD_hi.yft diff --git a/resources/lvc/SIRENS.lua b/resources/lvc/SIRENS.lua index 29372f744..2c2bd9d23 100644 --- a/resources/lvc/SIRENS.lua +++ b/resources/lvc/SIRENS.lua @@ -98,13 +98,13 @@ SIREN_ASSIGNMENTS = { ['FIRETRUK'] = { 12, 13, 14, 11 }, ['AMBULAN'] = { 1, 2, 3, 4, 11 }, ['LGUARD'] = { 1, 2, 3, 4, 11 }, - ['20ramambo'] = { 45, 16,19, 18, 48, 31 }, - ['e450ambo'] = { 45, 16,19, 18, 48, 31 }, - ['f450ambo'] = { 45, 16,19, 18, 48, 31 }, + ['20ramambo'] = { 45, 16,40, 38, 48, 31 }, + ['e450ambo'] = { 45, 16,40, 38, 48, 31 }, + ['f450ambo'] = { 45, 16,40, 38, 48, 31 }, ['fireburb'] = { 45, 16,19, 18, 48, 31 }, ['bat3'] = { 45, 16,19, 18, 48, 31 }, - ['silvfire'] = { 45, 16,19, 18, 48, 31 }, - ['14tahoe'] = { 45, 16,19, 18, 48, 31 }, + ['brush'] = { 45, 16,19, 18, 48, 31 }, + ['14tahoe'] = { 45, 36,40, 18, 48, 31 }, ['exp'] = { 45, 16,19, 18, 48, 31 }, ['f750'] = { 45, 16,19, 18, 48, 31 }, ['roseneng'] = { 45, 48, 13, 50, 47, 46 }, @@ -120,7 +120,6 @@ SIREN_ASSIGNMENTS = { ['Quantum2'] = { 45, 48, 13, 50, 47, 46 }, ['fusion'] = { 27, 22, 23, 25, 28, 29 }, ['ram3500'] = { 45, 16,19, 18, 48, 31 }, - ['sdgcvpi'] = { 33, 22, 23, 16, 34, 26 }, ['onebeast'] = { 33, 22, 23, 16, 34, 26 }, ['policevic'] = { 33, 22, 23, 16, 34, 26 }, ['largeboat'] = { 45, 22, 23, 16, 34, 26 }, @@ -138,16 +137,16 @@ SIREN_ASSIGNMENTS = { ['swatsubrb'] = { 45, 22, 23, 16, 34, 26 }, ['Staff-Mustang'] = { 33, 22, 23, 16, 34, 26 }, ['code3bmw'] = { 33, 22, 23, 16, 34, 26 }, - ['code3camero'] = { 33, 22, 23, 16, 34, 26 }, + ['code3camero'] = { 33, 34, 35, 36, 37, 38 }, ['code3cap'] = { 33, 22, 23, 16, 34, 26 }, ['code3cvpi'] = { 33, 22, 23, 16, 34, 26 }, ['code3durango'] = { 33, 22, 23, 16, 34, 26 }, - ['code3f150'] = { 33, 22, 23, 16, 34, 26 }, - ['code3f250'] = { 33, 22, 23, 16, 34, 26 }, - ['code3fpis'] = { 33, 22, 23, 16, 34, 26 }, - ['code3harley'] = { 33, 22, 23, 16, 34, 26 }, - ['code3mustang'] = { 33, 22, 23, 16, 34, 26 }, - ['code3ram'] = { 33, 22, 23, 16, 34, 26 }, + ['code3f150'] = { 33, 34, 35, 36, 37, 38 }, + ['code3f250'] = { 33, 34, 35, 36, 37, 38 }, + ['code3fpis'] = { 33, 34, 35, 36, 37, 38 }, + ['code3harley'] = { 33, 34, 35, 36, 37, 38 }, + ['code3mustang'] = { 33, 34, 35, 36, 37, 38 }, + ['code3ram'] = { 33, 22, 36, 16, 34, 26 }, ['code3silverado'] = { 33, 22, 23, 16, 34, 26 }, ['code3trailer'] = { 33, 22, 23, 16, 34, 26 }, ['code3trailer2'] = { 33, 22, 23, 16, 34, 26 }, @@ -159,39 +158,43 @@ SIREN_ASSIGNMENTS = { ['code318charg'] = { 33, 22, 23, 16, 34, 26 }, ['code318chargk9'] = { 33, 22, 23, 16, 34, 26 }, ['code318tahoe'] = { 33, 22, 23, 16, 34, 26 }, - ['code318tahoek9'] = { 33, 22, 23, 16, 34, 26 }, - ['code319silv'] = { 33, 22, 23, 16, 34, 26 }, - ['code320exp'] = { 33, 22, 23, 16, 34, 26 }, - ['tr11vic'] = { 33, 22, 23, 16, 34, 26 }, - ['tr18taurus'] = { 33, 22, 23, 16, 34, 26 }, - ['tr14charger'] = { 33, 22, 23, 16, 34, 26 }, - ['tr18charger'] = { 33, 22, 23, 16, 34, 26 }, - ['tr18taurus'] = { 33, 22, 23, 16, 34, 26 }, - ['tr12caprice'] = { 33, 22, 23, 16, 34, 26 }, - ['tr16explorer'] = { 33, 22, 23, 16, 34, 26 }, - ['tr14tahoe'] = { 33, 22, 23, 16, 34, 26 }, - ['tr19tahoe'] = { 33, 22, 23, 16, 34, 26 }, - ['tr14ram'] = { 33, 22, 23, 16, 34, 26 }, + ['code318tahoek9'] = { 33, 34, 35, 36, 37, 38 }, + ['code319silv'] = { 27, 28, 29, 26, 31, 32 }, + ['code320exp'] = { 33, 22, 35, 36, 34, 26 }, + ['tr11vic'] = { 33, 34, 35, 36, 37, 38 }, + ['tr18taurus'] = { 33, 34, 35, 36, 37, 38 }, + ['tr14charger'] = { 33, 34, 35, 36, 37, 38 }, + ['tr18charger'] = { 33, 34, 35, 36, 37, 38 }, + ['tr18taurus'] = { 33, 34, 35, 36, 37, 38 }, + ['tr12caprice'] = { 33, 34, 35, 36, 37, 38 }, + ['tr16explorer'] = { 33, 34, 35, 36, 37, 38 }, + ['tr14tahoe'] = { 33, 34, 35, 36, 37, 38 }, + ['tr19tahoe'] = { 33, 34, 35, 36, 37, 38 }, + ['tr14ram'] = { 33, 34, 35, 36, 37, 38 }, ['14tesla'] = { 33, 22, 23, 16, 34, 26 }, ['909_21bronco'] = { 33, 22, 23, 16, 34, 26 }, - ['2015polstang'] = { 33, 22, 23, 16, 34, 26 }, - ['LASDCVPI1'] = { 33, 22, 23, 16, 34, 26 }, - ['trackhawkPD'] = { 33, 22, 23, 16, 34, 26 }, - ['sdgcvpi'] = { 33, 22, 23, 16, 34, 26 }, + ['2015polstang'] = { 33, 34, 35, 36, 37, 38 }, + ['LASDCVPI1'] = { 33, 34, 35, 36, 37, 38 }, + ['trackhawkPD'] = { 33, 34, 35, 36, 37, 38 }, + ['sdgcvpi'] = { 15, 16, 17, 18, 19, 20 }, ['2024TacomaPD'] = { 33, 22, 23, 16, 34, 26 }, ['cadillac22CT5VPD'] = { 33, 22, 23, 16, 34, 26 }, ['Chevrolet1980VANPD'] = { 45, 22, 23, 16, 34, 26 }, ['gcVan'] = { 45, 22, 23, 16, 34, 26 }, - ['jeepgd2023'] = { 33, 22, 23, 16, 34, 26 }, - ['leg19yF150'] = { 33, 22, 23, 16, 34, 26 }, - ['leg2014yfpiu'] = { 33, 22, 23, 16, 34, 26 }, - ['legTahoey22'] = { 33, 22, 23, 16, 34, 26 }, + ['jeepgd2023'] = { 33, 34, 35, 36, 37, 38 }, + ['leg19yF150'] = { 33, 34, 35, 36, 37, 38 }, + ['leg2014yfpiu'] = { 33, 34, 35, 36, 37, 38 }, + ['legTahoey22'] = { 33, 34, 35, 36, 37, 38 }, ['mach1rb'] = { 33, 22, 23, 16, 34, 26 }, ['nmcadillac2019CT5VPDPD'] = { 33, 22, 23, 16, 34, 26 }, ['swatmrap20'] = { 45, 22, 23, 16, 34, 26 }, ['kgbearcat'] = { 45, 22, 23, 16, 34, 26 }, - ['sspres'] = { 33, 22, 23, 16, 34, 26 }, - ['k92bb'] = { 33, 22, 23, 16, 34, 26 }, + ['sspres'] = { 39, 22, 40, 38, 34, 26 }, + ['k92bb'] = { 39, 22, 40, 38, 34, 26 }, + ['c3ghoulmarked'] = { 33, 34, 35, 36, 37, 38 }, + ['DramTRX'] = { 33, 34, 35, 36, 37, 38 }, + ['suburbanfbit'] = { 33, 34, 35, 36, 37, 38 }, + ['11vic'] = { 33, 34, 35, 36, 37, 38 },