From 8cf59d5128fa728436ee139cff13e1457eb6c1b2 Mon Sep 17 00:00:00 2001 From: KingMcDonalds Date: Sun, 5 Dec 2021 12:31:54 -0800 Subject: [PATCH] Add New FireTruck Pierce Enforcer Ladder --- resources/Lux_ELS/client.lua | 5 +- .../EGRP-Emergency/__resource.lua | 15 + .../EGRP-Emergency/data/bat3/carcols.meta | 756 ------------------ .../data/bat3/carvariations.meta | 109 --- .../EGRP-Emergency/data/bat3/handling.meta | 66 -- .../EGRP-Emergency/data/bat3/vehicles.meta | 132 --- .../EGRP-Emergency/stream/bat3/bat3.yft | 3 - .../EGRP-Emergency/stream/bat3/bat3.ytd | 3 - .../EGRP-Emergency/stream/bat3/bat3_hi.yft | 3 - .../EGRP-Emergency/vehicle_names.lua | 2 + resources/vMenu/config/addons.json | 2 +- 11 files changed, 21 insertions(+), 1075 deletions(-) delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/carcols.meta delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/carvariations.meta delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/handling.meta delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/vehicles.meta delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3.yft delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3.ytd delete mode 100644 resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3_hi.yft diff --git a/resources/Lux_ELS/client.lua b/resources/Lux_ELS/client.lua index 050ea1591..6ce70776f 100644 --- a/resources/Lux_ELS/client.lua +++ b/resources/Lux_ELS/client.lua @@ -55,11 +55,12 @@ local eModelsWithFireSrn = "exp", "f750", "ferrara", - "pengine", + "pengine" "prescue", - "bat3", "brush", "enladder", + + } -- models listed below will use AMBULANCE_WARNING as auxiliary siren diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua index 841515c37..a5ff2768b 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua @@ -591,6 +591,21 @@ data_file 'CARCOLS_FILE' 'data/brush/carcols.meta' data_file 'VEHICLE_VARIATION_FILE' 'data/brush/carvariations.meta' data_file 'VEHICLE_LAYOUTS_FILE' 'data/brush/dlctext.meta' + --enladder + files { + 'data/enladder/vehicles.meta', + 'data/enladder/carvariations.meta', + 'data/enladder/carcols.meta', + 'data/enladder/handling.meta', + 'data/enladder/vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'data/enladder/handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'data/enladder/vehicles.meta' +data_file 'CARCOLS_FILE' 'data/enladder/carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'data/enladder/carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'data/enladder/dlctext.meta' + client_script { 'vehicle_names.lua' } \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/carcols.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/carcols.meta deleted file mode 100644 index b497ed3b2..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/carcols.meta +++ /dev/null @@ -1,756 +0,0 @@ - - - - - - batsilv - - - - - - - VehicleLight_sirenlight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/carvariations.meta deleted file mode 100644 index 834c645bb..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/carvariations.meta +++ /dev/null @@ -1,109 +0,0 @@ - - - - - bat3 - - - - 134 - 134 - 156 - 156 - - - - - - - - - - - - - - - 134 - 134 - 156 - 156 - - - - - - - - - - - - - - - 134 - 134 - 156 - 156 - - - - - - - - - - - - - - - 134 - 134 - 156 - 156 - - - - - - - - - - - - - - - 134 - 134 - 156 - 156 - - - - - - - - - - - - - - - 0_default_modkit - - - - - - - - - - \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/handling.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/handling.meta deleted file mode 100644 index 8fcd6cd46..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/handling.meta +++ /dev/null @@ -1,66 +0,0 @@ - - - - - chevy20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 440010 - 0 - 0 - AVERAGE - - - - - - - - - - - - diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/vehicles.meta deleted file mode 100644 index 596025704..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/bat3/vehicles.meta +++ /dev/null @@ -1,132 +0,0 @@ - - - vehshare - - - - bat3 - bat3 - chevy20 - bat3 - - null - null - null - null - - null - Bison - LAYOUT_STANDARD - POLICE_COVER_OFFSET_INFO - EXPLOSION_INFO_DEFAULT - - DEFAULT_FOLLOW_VEHICLE_CAMERA - DEFAULT_THIRD_PERSON_VEHICLE_AIM_CAMERA - VEHICLE_BONNET_CAMERA_MID_HIGH - DEFAULT_POV_CAMERA - - - - - - - - - - - - - - - - - - - - - - - - - - - - VFXVEHICLEINFO_CAR_GENERIC - - - - - - - - - - - - - - - - - - - - - - 100.000000 - 200.000000 - 300.000000 - 400.000000 - 500.000000 - 500.000000 - - - - - - - - - - - SWANKNESS_1 - - FLAG_ATTACH_TRAILER_ON_HIGHWAY FLAG_ATTACH_TRAILER_IN_CITY FLAG_HAS_LIVERY FLAG_EXTRAS_ALL FLAG_EXTRAS_STRONG FLAG_LAW_ENFORCEMENT FLAG_EMERGENCY_SERVICE FLAG_NO_RESPRAY FLAG_DONT_SPAWN_IN_CARGEN FLAG_REPORT_CRIME_IF_STANDING_ON - VEHICLE_TYPE_CAR - VPT_FRONT_AND_BACK_PLATES - VDT_GENTAXI - VC_EMERGENCY - VWT_MUSCLE - - boattrailer - trailersmall - trailersmall2 - - - - - - - - - - - - WHEEL_FRONT_RIGHT_CAMERA - WHEEL_FRONT_LEFT_CAMERA - WHEEL_REAR_RIGHT_CAMERA - WHEEL_REAR_LEFT_CAMERA - - - - - - - STD_POLICE_FRONT_LEFT - STD_POLICE_FRONT_RIGHT - STD_POLICE_REAR_LEFT - STD_POLICE_REAR_RIGHT - - - - \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3.yft deleted file mode 100644 index b642ffff7..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3.yft +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df86df03f5d9b8440f7c424d3f3bb7f8d85a5b64dcf5059514f377a49884ee59 -size 13517425 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3.ytd deleted file mode 100644 index 5d023e9a6..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3.ytd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02f42fcab3e6f71edcff3e1ce10fd80bffed24eb76e3965ad6a8da66b0e5e538 -size 10086806 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3_hi.yft deleted file mode 100644 index 2bbda7bae..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/bat3/bat3_hi.yft +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:decacb3387159a4fee5e138f59f63e35ceecd8f764b45ae2889f97117d9eb688 -size 13517350 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/vehicle_names.lua b/resources/[EGRP-CarPacks]/EGRP-Emergency/vehicle_names.lua index dd10f48c6..e3a812300 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/vehicle_names.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/vehicle_names.lua @@ -106,5 +106,7 @@ Citizen.CreateThread(function() AddTextEntry('prescue', '2014 Pierce prescue') -- brush AddTextEntry('brush', '2019 F550 brush') + -- enladder + AddTextEntry('enladder', 'Pierce Enforce Ladder') end) \ No newline at end of file diff --git a/resources/vMenu/config/addons.json b/resources/vMenu/config/addons.json index 0f4216721..07ad718e9 100644 --- a/resources/vMenu/config/addons.json +++ b/resources/vMenu/config/addons.json @@ -274,7 +274,7 @@ "pitbull", "pengine", "prescue", - "bat3", + "brush", "brush", "enladder", ],