From 8c0167e425667a38a4395e8589427dfc63f3b723 Mon Sep 17 00:00:00 2001 From: KingMcDonalds Date: Sat, 28 Mar 2026 12:16:20 -0700 Subject: [PATCH] fixing lapd vehicles --- resources/SmartFires/config.lua | 2 +- .../EGRP-Extras/data/chp2/vehicles.meta | 9 +- .../[lapd-pack]/LAPDFPIS_4pack/carcols.meta | 544 ++---------------- .../LAPDFPIS_4pack/carvariations.meta | 2 +- .../stream/lapdfpisvalor2+hi.ytd | 3 + .../LAPDFPIS_4pack/stream/lapdfpisvalor2.yft | 3 + .../LAPDFPIS_4pack/stream/lapdfpisvalor2.ytd | 3 + .../stream/lapdfpisvalor2_hi.yft | 3 + .../[lapd-pack]/LAPDFPIS_4pack/ulc.lua | 2 +- .../[lapd-pack]/LAPDFPIS_4pack/vehicles.meta | 132 ++++- resources/lvc/SIRENS.lua | 2 +- resources/ulc/config.lua | 120 ++-- 12 files changed, 249 insertions(+), 576 deletions(-) create mode 100644 resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2+hi.ytd create mode 100644 resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2.yft create mode 100644 resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2.ytd create mode 100644 resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2_hi.yft diff --git a/resources/SmartFires/config.lua b/resources/SmartFires/config.lua index f9f1f9e96..b929f1f7c 100644 --- a/resources/SmartFires/config.lua +++ b/resources/SmartFires/config.lua @@ -390,7 +390,7 @@ main = { }, -- This command is designed for standalone servers who still want to use automatic fires and spawn them according to the number of clocked on users clockOnSystem = { - enabled = false, + enabled = true, clockOnCommand = { enabled = true, -- Disable this command if you are using a menu to trigger an event/export to clock people on instead commandName = "clockfireon", diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/chp2/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/chp2/vehicles.meta index 026e51336..21a7cb04a 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Extras/data/chp2/vehicles.meta +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/chp2/vehicles.meta @@ -6,9 +6,9 @@ chp2 chp2 - 18CHARGER - 18CHARGER - 18DODGE + chp2 + chp2 + chp2 null null null @@ -124,6 +124,7 @@ STD_POLICE2_REAR_RIGHT + @@ -132,7 +133,7 @@ vehicles_race_generic - 18charger + chp2 \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/carcols.meta b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/carcols.meta index 694034e7e..29833101b 100644 --- a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/carcols.meta +++ b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/carcols.meta @@ -146,7 +146,7 @@ - lapdslickfpis clone + lapdslickfpis @@ -518,7 +518,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -592,7 +592,7 @@ - + @@ -629,7 +629,7 @@ - + @@ -666,7 +666,7 @@ - + @@ -999,7 +999,7 @@ - + @@ -1036,7 +1036,7 @@ - + @@ -1073,7 +1073,7 @@ - + @@ -1110,7 +1110,7 @@ - + @@ -1147,7 +1147,7 @@ - + @@ -1184,7 +1184,7 @@ - + @@ -1221,7 +1221,7 @@ - + @@ -1258,7 +1258,7 @@ - + @@ -1295,13 +1295,13 @@ - + - - - - + + + + @@ -1309,16 +1309,16 @@ - - - + + + - - - - - - + + + + + + @@ -1332,13 +1332,13 @@ - + - - - - + + + + @@ -1346,22 +1346,22 @@ - - - + + + - - - - - - + + + + + + - lapdarjetfpis clone + lapdarjetfpis @@ -1881,7 +1881,7 @@ - + @@ -1918,7 +1918,7 @@ - + @@ -1955,7 +1955,7 @@ - + @@ -1992,7 +1992,7 @@ - + @@ -2029,7 +2029,7 @@ - + @@ -2066,7 +2066,7 @@ - + @@ -2128,455 +2128,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lapdvalorfpis clone + lapdfpisvalor2 diff --git a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/carvariations.meta b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/carvariations.meta index 433469240..bb26c07e2 100644 --- a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/carvariations.meta +++ b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/carvariations.meta @@ -63,7 +63,7 @@ - lapdfpis2 + lapdfpisvalor2 diff --git a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2+hi.ytd b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2+hi.ytd new file mode 100644 index 000000000..a1dfdefa1 --- /dev/null +++ b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2+hi.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bdd5febec1ee523f19ef9fb2b3f88fbde5861a7b1b47d271191691f114cf162 +size 2732161 diff --git a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2.yft b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2.yft new file mode 100644 index 000000000..f7e6a9787 --- /dev/null +++ b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a15ad3d1a07b9dcabfcfa69c599eacc7b4c174eb8fb982496c18d8661882b55 +size 2407572 diff --git a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2.ytd b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2.ytd new file mode 100644 index 000000000..e15c436f7 --- /dev/null +++ b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8229f1484f8ea0c47cbabb99b8a496aa3b9b638edbc0f996ee72abf6cae5af5 +size 4084515 diff --git a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2_hi.yft b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2_hi.yft new file mode 100644 index 000000000..c91740961 --- /dev/null +++ b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/stream/lapdfpisvalor2_hi.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9b17804201b97acf986a4248b3fdea185fdd3d7dca5da2b6f0645fbc5fac98e +size 4856956 diff --git a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/ulc.lua b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/ulc.lua index 8f0cd8105..d1ece5025 100644 --- a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/ulc.lua +++ b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/ulc.lua @@ -6,7 +6,7 @@ To learn how to setup and use ULC visit here: https://docs.dwnstr.com/ulc/overview ]] -return { names = {"lapdfpis"}, +return { names = {"lapdfpis","lapdfpisvalor2"}, steadyBurnConfig = { forceOn = false, useTime = false, disableWithLights = false, diff --git a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/vehicles.meta b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/vehicles.meta index b35c417b7..9eda13a3e 100644 --- a/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/vehicles.meta +++ b/resources/[EGRP-CarPacks]/[lapd-pack]/LAPDFPIS_4pack/vehicles.meta @@ -15,7 +15,7 @@ null null - ecoboostv6 + sentinel LAYOUT_STD_EXITFIXUP POLICE3_COVER_OFFSET_INFO EXPLOSION_INFO_DEFAULT @@ -136,7 +136,128 @@ null null - ecoboostv6 + sentinel + LAYOUT_STD_EXITFIXUP + POLICE3_COVER_OFFSET_INFO + EXPLOSION_INFO_DEFAULT + + DEFAULT_FOLLOW_VEHICLE_CAMERA + MID_BOX_VEHICLE_AIM_CAMERA + VEHICLE_BONNET_CAMERA_MID_NEAR + DEFAULT_POV_CAMERA_LOOKAROUND + + + + + + + + + + + + + + + + + + + + + + + + + + + + VFXVEHICLEINFO_CAR_GENERIC + + + + + + + + + + + + + + + + + + + + + + 35.000000 + 45.000000 + 95.000000 + 150.000000 + 300.000000 + 500.000000 + + + + + + + + + + + SWANKNESS_1 + + FLAG_HAS_LIVERY FLAG_HAS_INTERIOR_EXTRAS FLAG_LAW_ENFORCEMENT FLAG_EMERGENCY_SERVICE FLAG_ALLOW_HATS_NO_ROOF + VEHICLE_TYPE_CAR + VPT_FRONT_AND_BACK_PLATES + VDT_FEROCI + VC_EMERGENCY + VWT_SUV + + + + + + + + + + + + WHEEL_FRONT_RIGHT_CAMERA + WHEEL_FRONT_LEFT_CAMERA + WHEEL_REAR_RIGHT_CAMERA + WHEEL_REAR_LEFT_CAMERA + + + + + + + RANGER_CAVALCADE_FRONT_LEFT + RANGER_FRONT_RIGHT + RANGER_PRANGER_REAR_LEFT + RANGER_PRANGER_REAR_RIGHT + + + + lapdfpisvalor2 + lapdfpisvalor2 + TAURUS + lapdfpisvalor2 + lapdfpisvalor2 + null + null + null + null + + null + sentinel LAYOUT_STD_EXITFIXUP POLICE3_COVER_OFFSET_INFO EXPLOSION_INFO_DEFAULT @@ -245,7 +366,6 @@ RANGER_PRANGER_REAR_RIGHT - @@ -256,7 +376,9 @@ vehicles_feroci_interior lapdfpis - - + + vehicles_feroci_interior + lapdfpisvalor2 + \ No newline at end of file diff --git a/resources/lvc/SIRENS.lua b/resources/lvc/SIRENS.lua index 7809cf3a2..68d6e1c04 100644 --- a/resources/lvc/SIRENS.lua +++ b/resources/lvc/SIRENS.lua @@ -849,7 +849,7 @@ SIREN_ASSIGNMENTS = { ['chpcvpirotator'] = { 21, 22, 23}, ['chpcvpirotatork9'] = { 21, 22, 23}, ['chp19charg'] = { 21, 22, 23}, - [' '] = { 21, 22, 23}, + ['chp18chargs'] = { 21, 22, 23}, [' '] = { 21, 22, 23}, [' '] = { 21, 22, 23}, [' '] = { 21, 22, 23}, diff --git a/resources/ulc/config.lua b/resources/ulc/config.lua index 5adee38be..030fdb47a 100644 --- a/resources/ulc/config.lua +++ b/resources/ulc/config.lua @@ -1065,8 +1065,57 @@ Config = { " ", " ", " ", - " ", - " ", + "lapd13fsl", + "lapd13fsli", + "lapd13fsunm", + "lapd19flv", + "lapd19fsl", + "lapd19fsunm", + "lapd14chargertd", + "lapd14charger", + "lapd13fpis", + "lapd19fpisv" +"lapd13fsl", +"lapd13fsli", +"lapd13fsunm", +"lapd19flv" +,"lapd19fsl", +"lapd19fsunm", +"lapd09charger1", +"lapd09charger2", + "metro16fpiu", + "metro16fpiu2", + "metro16fpiu3", + "lapdfpiua", + "lapdfpiub", + "lapdalpr20", + "lapdfpis", + "hybrid20fpiu", + "lapd20fpiu", + "lapd20fpiu2", + "lapd20fpiutraffic", + "lapd20fpiutraffic2", + "lapd16fpiua", + "lapd16fpiub", + "lapd16sfpiua", + "lapd16sfpiub", + "lapd16tfpiua", + "lapd16tfpiub", + "lapd16tfpiuc", + "lapd16tfpiud", + "lapd19fpiu", +"lapd14tahoe", +"lapd14tahoe2", +"lapd14tahoe3", +"lapd14tahoe4", +"lapd13fpis", +"lapd19fpisv", +"lapd18chrgr", +"lapd18chrgrb", +"lapd20chrgra", +"lapd20chrgrb", +"lapd20det", + "lapdfpisvalor2", " ", " ", " ", @@ -1100,73 +1149,6 @@ Config = { " ", " ", " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", "GL_Mustang", "24mustunmr1", "rbst18charger",