diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua index 8f8d30c58..58bd30800 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua @@ -810,21 +810,6 @@ data_file 'CARCOLS_FILE' 'data/fdgator/carcols.meta' data_file 'VEHICLE_VARIATION_FILE' 'data/fdgator/carvariations.meta' data_file 'VEHICLE_LAYOUTS_FILE' 'data/fdgator/dlctext.meta' - -- hpbearcat - files { - 'data/hpbearcat/vehicles.meta', - 'data/hpbearcat/carvariations.meta', - 'data/hpbearcat/carcols.meta', - 'data/hpbearcat/handling.meta', - 'data/hpbearcat/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/hpbearcat/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/hpbearcat/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/hpbearcat/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/hpbearcat/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/hpbearcat/dlctext.meta' - -- dspov files { 'data/dspov/vehicles.meta', diff --git a/resources/c322track/22jeep_sign_1.png b/resources/c322track/22jeep_sign_1.png new file mode 100644 index 000000000..520775d51 Binary files /dev/null and b/resources/c322track/22jeep_sign_1.png differ diff --git a/resources/c322track/__resource.lua b/resources/c322track/__resource.lua new file mode 100644 index 000000000..fff0be1b8 --- /dev/null +++ b/resources/c322track/__resource.lua @@ -0,0 +1,15 @@ +resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5' + +files { + 'vehicles.meta', + 'carvariations.meta', + 'carcols.meta', + 'handling.meta', + 'vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta' +data_file 'CARCOLS_FILE' 'carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta' \ No newline at end of file diff --git a/resources/c322track/carcols.meta b/resources/c322track/carcols.meta new file mode 100644 index 000000000..f5eba91f1 --- /dev/null +++ b/resources/c322track/carcols.meta @@ -0,0 +1,779 @@ + + + + + + c322track + + + + + + + VehicleLight_sirenlight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/c322track/carvariations.meta b/resources/c322track/carvariations.meta new file mode 100644 index 000000000..20764aa97 --- /dev/null +++ b/resources/c322track/carvariations.meta @@ -0,0 +1,234 @@ + + + + + c322track + + + + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0_default_modkit + + + + + + police guv plate + + + + + + + + + \ No newline at end of file diff --git a/resources/c322track/handling.meta b/resources/c322track/handling.meta new file mode 100644 index 000000000..668063f39 --- /dev/null +++ b/resources/c322track/handling.meta @@ -0,0 +1,64 @@ + + + + + + c322track + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 220010 + 420000 + 0 + AVERAGE + + + + + + + + \ No newline at end of file diff --git a/resources/c322track/stream/c322track.yft b/resources/c322track/stream/c322track.yft new file mode 100644 index 000000000..80e0b3882 --- /dev/null +++ b/resources/c322track/stream/c322track.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:461765b6a51ff036086e6ac24e3c227640f6899926bd51431711ea2ddd15fe3d +size 11108922 diff --git a/resources/c322track/stream/c322track.ytd b/resources/c322track/stream/c322track.ytd new file mode 100644 index 000000000..d63e9690a --- /dev/null +++ b/resources/c322track/stream/c322track.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ccc8edaad8d0f8d4f1160b373f11316ae912666473042bed337d8487ac51a75 +size 10766356 diff --git a/resources/c322track/stream/c322track_hi.yft b/resources/c322track/stream/c322track_hi.yft new file mode 100644 index 000000000..dbca70a3f --- /dev/null +++ b/resources/c322track/stream/c322track_hi.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d45f4c18f3938a066293462f64c29026fee6d069937c16e421b877107957df54 +size 11108968 diff --git a/resources/c322track/vehicles.meta b/resources/c322track/vehicles.meta new file mode 100644 index 000000000..0a9c863be --- /dev/null +++ b/resources/c322track/vehicles.meta @@ -0,0 +1,134 @@ + + + vehshare + + + + c322track + c322track + c322track + c322track + 2022 TrackHawk + null + null + null + null + + null + demonv8 + LAYOUT_RANGER + GRANGER_COVER_OFFSET_INFO + EXPLOSION_INFO_DEFAULT + + DEFAULT_FOLLOW_VEHICLE_CAMERA + BOX_VEHICLE_AIM_CAMERA + VEHICLE_BONNET_CAMERA_STANDARD + DEFAULT_POV_CAMERA_LOOKAROUND + + + + + + + + + + + + + + + + + + + + + + + + + + + + VFXVEHICLEINFO_CAR_GENERIC + + + + + + + + + + + + + + + + + + + + + + 500.000000 + 500.000000 + 500.000000 + 500.000000 + 500.000000 + 500.000000 + + + + + + + + + + + SWANKNESS_1 + + FLAG_HAS_LIVERY FLAG_EXTRAS_STRONG FLAG_LAW_ENFORCEMENT FLAG_AVERAGE_CAR FLAG_POOR_CAR FLAG_ALLOWS_RAPPEL FLAG_IS_OFFROAD_VEHICLE FLAG_IS_BULKY FLAG_RECESSED_HEADLIGHT_CORONAS FLAG_HAS_INTERIOR_EXTRAS + VEHICLE_TYPE_CAR + VPT_FRONT_AND_BACK_PLATES + VDT_BANSHEE + 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 + + 4864 + + + + vehicles_banshee_interior + c322track + + + diff --git a/resources/dhs24mustang/__resource.lua b/resources/dhs24mustang/__resource.lua new file mode 100644 index 000000000..fff0be1b8 --- /dev/null +++ b/resources/dhs24mustang/__resource.lua @@ -0,0 +1,15 @@ +resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5' + +files { + 'vehicles.meta', + 'carvariations.meta', + 'carcols.meta', + 'handling.meta', + 'vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta' +data_file 'CARCOLS_FILE' 'carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta' \ No newline at end of file diff --git a/resources/dhs24mustang/carcols.meta b/resources/dhs24mustang/carcols.meta new file mode 100644 index 000000000..c7cba5d24 --- /dev/null +++ b/resources/dhs24mustang/carcols.meta @@ -0,0 +1,756 @@ + + + + + + dhs24mustang + + + + + + + VehicleLight_sirenlight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/dhs24mustang/carvariations.meta b/resources/dhs24mustang/carvariations.meta new file mode 100644 index 000000000..c54f831d5 --- /dev/null +++ b/resources/dhs24mustang/carvariations.meta @@ -0,0 +1,116 @@ + + + + + + dhs24mustang + + + + 0 + 0 + 156 + 156 + + + + + + + + + + + + + + + 0 + 0 + 156 + 156 + + + + + + + + + + + + + + + 0 + 0 + 156 + 156 + + + + + + + + + + + + + + + 0 + 0 + 156 + 156 + + + + + + + + + + + + + + + 0 + 0 + 156 + 156 + + + + + + + + + + + + + + + 0_default_modkit + + + + + + police guv plate + + + + + + + + + + \ No newline at end of file diff --git a/resources/dhs24mustang/handling.meta b/resources/dhs24mustang/handling.meta new file mode 100644 index 000000000..8a2112edc --- /dev/null +++ b/resources/dhs24mustang/handling.meta @@ -0,0 +1,68 @@ + + + + + + + dhs24mustang + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 440010 + 0 + 0 + AVERAGE + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/dhs24mustang/vehicles.meta b/resources/dhs24mustang/vehicles.meta new file mode 100644 index 000000000..d0224886c --- /dev/null +++ b/resources/dhs24mustang/vehicles.meta @@ -0,0 +1,120 @@ + + + vehshare + + + + dhs24mustang + dhs24mustang + dhs24mustang + dhs24mustang + FORD + null + null + null + null + + null + camls3v8 + LAYOUT_STD_LOWROOF + GROWLER_COVER_OFFSET_INFO + EXPLOSION_INFO_DEFAULT + + FOLLOW_CHEETAH_CAMERA + DEFAULT_THIRD_PERSON_VEHICLE_AIM_CAMERA + VEHICLE_BONNET_CAMERA_LOW_LOW + REDUCED_NEAR_CLIP_POV_CAMERA + + + + + + + + + + + + VFXVEHICLEINFO_CAR_GENERIC + + + + + + + + + + + + + + + + + + + + + + 500.000000 + 500.000000 + 500.000000 + 500.000000 + 500.000000 + 500.000000 + + + + + + + + + + + SWANKNESS_3 + + FLAG_HAS_LIVERY FLAG_EXTRAS_STRONG FLAG_LAW_ENFORCEMENT FLAG_SPORTS FLAG_PARKING_SENSORS + VEHICLE_TYPE_CAR + VPT_FRONT_AND_BACK_PLATES + VDT_RACE + VC_EMERGENCY + VWT_SPORT + + + + + + + + + + + + + + WHEEL_FRONT_RIGHT_CAMERA + WHEEL_FRONT_LEFT_CAMERA + WHEEL_REAR_RIGHT_CAMERA + WHEEL_REAR_LEFT_CAMERA + + Truck + + + + + STD_DILETTANTE_FRONT_LEFT + STD_DILETTANTE_FRONT_RIGHT + STD_BALLER_REAR_LEFT + STD_BALLER_REAR_RIGHT + + + + + + vehicles_bob_brown_interior + c3darkhorse + + + \ No newline at end of file diff --git a/resources/hpbearcat/__resource.lua b/resources/hpbearcat/__resource.lua new file mode 100644 index 000000000..fff0be1b8 --- /dev/null +++ b/resources/hpbearcat/__resource.lua @@ -0,0 +1,15 @@ +resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5' + +files { + 'vehicles.meta', + 'carvariations.meta', + 'carcols.meta', + 'handling.meta', + 'vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta' +data_file 'CARCOLS_FILE' 'carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta' \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/carcols.meta b/resources/hpbearcat/carcols.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/carcols.meta rename to resources/hpbearcat/carcols.meta diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/carvariations.meta b/resources/hpbearcat/carvariations.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/carvariations.meta rename to resources/hpbearcat/carvariations.meta diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/handling.meta b/resources/hpbearcat/handling.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/handling.meta rename to resources/hpbearcat/handling.meta diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/hpbearcat/hpbearcat.yft b/resources/hpbearcat/stream/hpbearcat.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Emergency/stream/hpbearcat/hpbearcat.yft rename to resources/hpbearcat/stream/hpbearcat.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/hpbearcat/hpbearcat.ytd b/resources/hpbearcat/stream/hpbearcat.ytd similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Emergency/stream/hpbearcat/hpbearcat.ytd rename to resources/hpbearcat/stream/hpbearcat.ytd diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/hpbearcat/hpbearcat_hi.yft b/resources/hpbearcat/stream/hpbearcat_hi.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Emergency/stream/hpbearcat/hpbearcat_hi.yft rename to resources/hpbearcat/stream/hpbearcat_hi.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/vehiclelayouts.meta b/resources/hpbearcat/vehiclelayouts.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/vehiclelayouts.meta rename to resources/hpbearcat/vehiclelayouts.meta diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/vehicles.meta b/resources/hpbearcat/vehicles.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Emergency/data/hpbearcat/vehicles.meta rename to resources/hpbearcat/vehicles.meta diff --git a/resources/lvc/SIRENS.lua b/resources/lvc/SIRENS.lua index 969e5697a..43fbe6ea8 100644 --- a/resources/lvc/SIRENS.lua +++ b/resources/lvc/SIRENS.lua @@ -127,14 +127,14 @@ SIREN_ASSIGNMENTS = { ['909_21bronco'] = { 33, 22, 23, 16, 34, 26 }, ['code06tahoe'] = { 33, 22, 23, 16, 34, 26 }, ['c322legacyexpd'] = { 33, 22, 23, 16, 34, 26 }, - ['21tahoek9rb'] = { 33, 22, 23, 16, 34, 26 }, + ['c322track'] = { 33, 22, 23, 16, 34, 26 }, ['21pdrbsub'] = { 33, 22, 23, 16, 34, 26 }, ['challenger18'] = { 33, 22, 23, 16, 34, 26 }, ['code06tahoe'] = { 33, 22, 23, 16, 34, 26 }, ['EG-Sheriff'] = { 33, 22, 23, 16, 34, 26 }, ['fueltruck'] = { 33, 22, 23, 16, 34, 26 }, ['pitbull'] = { 45, 22, 23, 16, 34, 26 }, - ['swatsubrb'] = { 45, 22, 23, 16, 34, 26 }, + ['dhs24mustang'] = { 45, 22, 23, 16, 34, 26 }, ['Staff-Mustang'] = { 33, 22, 23, 16, 34, 26 }, ['VVAALL00RRSS'] = { 33, 22, 23, 16, 34, 26 }, ['valormotor'] = { 15, 16, 34, 17, 23, 35, 44, 38, 30, 42 }, @@ -168,8 +168,7 @@ SIREN_ASSIGNMENTS = { ['tr19tahoe'] = { 33, 34, 35, 36, 37, 38 }, ['tr14ram'] = { 33, 34, 35, 36, 37, 38 }, ['gt24non'] = { 15, 16, 34, 17, 23, 35, 44, 38, 30, 42 }, - ['909_21bronco'] = { 33, 22, 23, 16, 34, 26 }, - ['Staff-18lasdchrg'] = { 15, 22, 23, 24, 27, 35, 44, 18, 30, 42 }, + ['Staff-c3ghoulmarked'] = { 33, 22, 23, 16, 34, 26 }, ['gt24non'] = { 33, 34, 35, 36, 37, 38 }, ['trackhawkPD'] = { 33, 34, 35, 36, 37, 38 }, ['Polmrambb23'] = { 15, 16, 17, 18, 19, 20 }, diff --git a/server.cfg b/server.cfg index 47f298dfd..da6084121 100644 --- a/server.cfg +++ b/server.cfg @@ -277,9 +277,9 @@ ensure fsc20 ensure fsm07 ensure ftecnica ensure fz0615 -ensure -ensure -ensure +ensure hpbearcat +ensure dhs24mustang +ensure c322track ensure ensure