diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_horn.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_horn.wav index 235aaf4fc..c8530bc28 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_horn.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_horn.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_adam.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_adam.wav index 228f5d7a0..dab6cc28c 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_adam.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_adam.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_boy.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_boy.wav index b5a9845f9..7f65543f8 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_boy.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_boy.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_charles.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_charles.wav index b83536bba..679848dca 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_charles.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_charles.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_david.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_david.wav index 949f0b2a7..af8f21c3d 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_david.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_david.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_edward.wav b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_edward.wav index 00e2a90ba..8b3f582ab 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_edward.wav and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oac/oiss_ssa_vehaud_sahp_old/oiss_ssa_vehaud_siren_edward.wav differ diff --git a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_sahp_old.awc b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_sahp_old.awc index 7c060663c..93255f0f9 100644 Binary files a/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_sahp_old.awc and b/resources/ServerSidedSoundsSirens/dlc_serversideaudio/oiss_ssa_vehaud_sahp_old.awc differ diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/__resource.lua b/resources/[EGRP-CarPacks]/EGRP-Extras/__resource.lua index bc0d9a43b..7ad4f515f 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Extras/__resource.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/__resource.lua @@ -1065,6 +1065,39 @@ 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' + -- 24mustanggt4d + files { + 'data/24mustanggt4d/vehicles.meta', + 'data/24mustanggt4d/carvariations.meta', + 'data/24mustanggt4d/carcols.meta', + 'data/24mustanggt4d/handling.meta', + 'data/24mustanggt4d/vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'data/24mustanggt4d/handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'data/24mustanggt4d/vehicles.meta' +data_file 'CARCOLS_FILE' 'data/24mustanggt4d/carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'data/24mustanggt4d/carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'data/24mustanggt4d/dlctext.meta' + + -- speed1 + files { + 'data/speed1/vehicles.meta', + 'data/speed1/carvariations.meta', + 'data/speed1/carcols.meta', + 'data/speed1/handling.meta', + 'data/speed1/vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'data/speed1/handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'data/speed1/vehicles.meta' +data_file 'CARCOLS_FILE' 'data/speed1/carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'data/speed1/carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'data/speed1/dlctext.meta' + + + + client_script { 'vehicle_names.lua' } \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/carcols.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/carcols.meta new file mode 100644 index 000000000..041114f35 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/carcols.meta @@ -0,0 +1,838 @@ + + + + + + 24mustanggt4d + + + + + + + VehicleLight_sirenlight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/carvariations.meta new file mode 100644 index 000000000..b60c9e411 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/carvariations.meta @@ -0,0 +1,276 @@ + + + + + 24mustanggt4d + + + + 0 + 0 + 11 + 156 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + 0 + 134 + 156 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 75 + 0 + 157 + 156 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 7 + 0 + 134 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 34 + 0 + 45 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 2 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0_default_modkit + + + + + + Police guv plate + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/handling.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/handling.meta new file mode 100644 index 000000000..930f06a42 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/handling.meta @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + 24mustanggt4d + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 440010 + 0 + 0 + SPORTS_CAR + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/vehicles.meta new file mode 100644 index 000000000..7b37d1388 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/24mustanggt4d/vehicles.meta @@ -0,0 +1,125 @@ + + + vehshare + + + + 24mustanggt4d + 24mustanggt4d + 24mustanggt4d + 24mustanggt4d + OFFLORDBUILT + null + null + null + null + + null + ta185amv8 + LAYOUT_STANDARD + 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 + + + + + + + + + + + + + + + + + + + + + + 15.000000 + 30.000000 + 70.000000 + 140.000000 + 500.000000 + 500.000000 + + + + + + + + + + + SWANKNESS_3 + + FLAG_HAS_LIVERY FLAG_EXTRAS_ALL FLAG_SPORTS FLAG_PARKING_SENSORS + VEHICLE_TYPE_CAR + VPT_FRONT_AND_BACK_PLATES + VDT_RACE + VC_EMERGENCY + VWT_SPORT + + boattrailer + trailersmall + + + trailersmall2 + + + + EXTRA_1 EXTRA_2 + + + + + + + + + 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 + 24mustanggt4d + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/carcols.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/carcols.meta new file mode 100644 index 000000000..72bff3606 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/carcols.meta @@ -0,0 +1,759 @@ + + + + + + + + speed1 + + + + + + + VehicleLight_sirenlight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/carvariations.meta new file mode 100644 index 000000000..d865836d2 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/carvariations.meta @@ -0,0 +1,58 @@ + + + + + + + speed1 + + + + 270 + 134 + 156 + 156 + + + + + + + + + + + + + + + 134 + 134 + 156 + 156 + + + + + + + + + + + + + + + 157_massacaro2_modkit + + + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/handling.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/handling.meta new file mode 100644 index 000000000..2511bd416 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/handling.meta @@ -0,0 +1,67 @@ + + + + + + dfd18camaro + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 440010 + 0 + 0 + AVERAGE + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/vehicles.meta new file mode 100644 index 000000000..6f17c94fd --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/data/speed1/vehicles.meta @@ -0,0 +1,128 @@ + + + vehshare + + + + speed1 + speed1 + dfd18camaro + speed1 + + null + null + null + null + + null + ta185amv8 + LAYOUT_STANDARD + SHERIFF_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 + + + + + + + + + + + + + + + + + + + + + + 1500.000000 + 3000.000000 + 7000.000000 + 14000.000000 + 50000.000000 + 50000.000000 + + + + + + + + + + + SWANKNESS_1 + + FLAG_HAS_LIVERY FLAG_EXTRAS_STRONG FLAG_EXTRAS_REQUIRE FLAG_LAW_ENFORCEMENT FLAG_EMERGENCY_SERVICE FLAG_HAS_INTERIOR_EXTRAS FLAG_DONT_SPAWN_AS_AMBIENT FLAG_DONT_SPAWN_IN_CARGEN FLAG_NO_RESPRAY + VEHICLE_TYPE_CAR + VPT_FRONT_AND_BACK_PLATES + VDT_GENTAXI + VC_EMERGENCY + VWT_MUSCLE + + + + + + + + + + + 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-Extras/stream/24mustanggt4d/24mustanggt4d.yft b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/24mustanggt4d/24mustanggt4d.yft new file mode 100644 index 000000000..9f7dacf1d --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/24mustanggt4d/24mustanggt4d.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:290a2c84081c2455aa6ea50a858601857109b2b5da27660c2740e0af62790af1 +size 10948602 diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/stream/24mustanggt4d/24mustanggt4d.ytd b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/24mustanggt4d/24mustanggt4d.ytd new file mode 100644 index 000000000..76a8fde6a --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/24mustanggt4d/24mustanggt4d.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71e9a92b8daeb66378ab0a7f28c60f53e891a5e1d406b6292f3352df0d7af599 +size 11185657 diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/stream/24mustanggt4d/24mustanggt4d_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/24mustanggt4d/24mustanggt4d_hi.yft new file mode 100644 index 000000000..886155c61 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/24mustanggt4d/24mustanggt4d_hi.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dd09b38064ceb96b4820f02907cc62ba189862afa697b4b9b408ffc783fdc49 +size 10948669 diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1.yft b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1.yft new file mode 100644 index 000000000..81391f865 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d16ed13dd827e9201f3225c2698b333bededd1641782e4275ee721613352ea95 +size 10096933 diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1.ytd b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1.ytd new file mode 100644 index 000000000..15cb32acf --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57e9aa7f859d2120160eacf24f9faa2c75c70db8f3f2f6b561ea6b8b6a4fdba6 +size 8521312 diff --git a/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1_hi.yft new file mode 100644 index 000000000..94e550fd0 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Extras/stream/speed1/speed1_hi.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e54ed9983e4d9f7179b8fbca50c7080511aeb961d95a6fd67df3b2af63184227 +size 10029065 diff --git a/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua b/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua index faefc4bfb..361240806 100644 --- a/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua +++ b/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua @@ -48,7 +48,9 @@ Config.VehicleRestrictions = { "21mach1stang", "am_srt15", "18charger", - "18chargerb", + "18chargerb", + "24mustanggt4d", + "speed1", }, ['EG | Staff'] = { "Staff-EGRPescal21", @@ -103,7 +105,9 @@ Config.VehicleRestrictions = { "21mach1stang", "am_srt15", "18charger", - "18chargerb", + "18chargerb", + "24mustanggt4d", + "speed1", }, ['EG | Sr. Staff'] = { @@ -160,7 +164,9 @@ Config.VehicleRestrictions = { "21mach1stang", "am_srt15", "18charger", - "18chargerb", + "18chargerb", + "24mustanggt4d", + "speed1", }, ['EG | Moderator'] = { "Staff-EGRPescal21", @@ -212,7 +218,9 @@ Config.VehicleRestrictions = { "21mach1stang", "am_srt15", "18charger", - "18chargerb", + "18chargerb", + "24mustanggt4d", + "speed1", }, ['EG | Sr. Moderator'] = { "Staff-EGRPescal21", @@ -271,13 +279,8 @@ Config.VehicleRestrictions = { "18charger", "18chargerb", "mpf250rb", - "dps22tahoe", - "dps23tahoesg", - "dps21silv", - "dps23silv1500", - "dps20k9tahoe", - "dps20tahoe2", - "dps20tahoeslick", + "24mustanggt4d", + "speed1", }, ['EG | Admin'] = { @@ -353,13 +356,8 @@ Config.VehicleRestrictions = { "704", "7728", "mpf250rb", - "dps22tahoe", - "dps23tahoesg", - "dps21silv", - "dps23silv1500", - "dps20k9tahoe", - "dps20tahoe2", - "dps20tahoeslick", + "24mustanggt4d", + "speed1", }, ['EG | Sr. Admin'] = { @@ -469,13 +467,8 @@ Config.VehicleRestrictions = { "21mach1stang", "am_srt15", "mpf250rb", - "dps22tahoe", - "dps23tahoesg", - "dps21silv", - "dps23silv1500", - "dps20k9tahoe", - "dps20tahoe2", - "dps20tahoeslick", + "24mustanggt4d", + "speed1", }, ['EG | Head of Staff'] = { "Staff-EGRPescal21", @@ -668,13 +661,8 @@ Config.VehicleRestrictions = { "21mach1stang", "am_srt15", "mpf250rb", - "dps22tahoe", - "dps23tahoesg", - "dps21silv", - "dps23silv1500", - "dps20k9tahoe", - "dps20tahoe2", - "dps20tahoeslick", + "24mustanggt4d", + "speed1", " ", }, ['EG | Server Developer'] = { @@ -827,13 +815,8 @@ Config.VehicleRestrictions = { "MAXr2bison", "nforce24mustangS", "mpf250rb", - "dps22tahoe", - "dps23tahoesg", - "dps21silv", - "dps23silv1500", - "dps20k9tahoe", - "dps20tahoe2", - "dps20tahoeslick", + "24mustanggt4d", + "speed1", " ", }, ['EG | Owner'] = { @@ -989,13 +972,8 @@ Config.VehicleRestrictions = { "21mach1stang", "am_srt15", "mpf250rb", - "dps22tahoe", - "dps23tahoesg", - "dps21silv", - "dps23silv1500", - "dps20k9tahoe", - "dps20tahoe2", - "dps20tahoeslick", + "24mustanggt4d", + "speed1", "boxville5", "cognoscenti2", "limo2", diff --git a/resources/lvc/SIRENS.lua b/resources/lvc/SIRENS.lua index 8e747dd51..ca47b18db 100644 --- a/resources/lvc/SIRENS.lua +++ b/resources/lvc/SIRENS.lua @@ -36,6 +36,7 @@ RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_FIB_NEW', false) RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_LSFD_NEW', false) RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_BCFD_NEW', false) RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_LSSD_OLD', true) +RequestScriptAudioBank('DLC_SERVERSIDEAUDIO\\OISS_SSA_VEHAUD_SAHP_OLD', true) -- CHANGE SIREN NAMES, AUDIONAME, AUDIOREF SIRENS = { @@ -93,7 +94,12 @@ SIRENS = { --[[51]] { Name = 'LAPD-HORN', String = 'OISS_SSA_VEHAUD_LSSD_OLD_HORN', Ref = 'OISS_SSA_VEHAUD_LSSD_OLD_SOUNDSET'}, --[[52]] { Name = 'LAPD-WAIL', String = 'OISS_SSA_VEHAUD_LSSD_OLD_SIREN_BOY', Ref = 'OISS_SSA_VEHAUD_LSSD_OLD_SOUNDSET'}, --[[53]] { Name = 'LAPD-YELP', String = 'OISS_SSA_VEHAUD_LSSD_OLD_SIREN_ADAM', Ref = 'OISS_SSA_VEHAUD_LSSD_OLD_SOUNDSET'}, - +--[[54]] { Name = "Old SAHP HORN", String = "OISS_SSA_VEHAUD_SAHP_OLD_HORN", Ref = "OISS_SSA_VEHAUD_SAHP_OLD_SOUNDSET"}, +--[[55]] { Name = "Old SAHP ADAM", String = "OISS_SSA_VEHAUD_SAHP_OLD_SIREN_ADAM", Ref = "OISS_SSA_VEHAUD_SAHP_OLD_SOUNDSET"}, +--[[56]] { Name = "Old SAHP BOY", String = "OISS_SSA_VEHAUD_SAHP_OLD_SIREN_BOY", Ref = "OISS_SSA_VEHAUD_SAHP_OLD_SOUNDSET"}, +--[[57]] { Name = "Old SAHP CHARLES", String = "OISS_SSA_VEHAUD_SAHP_OLD_SIREN_CHARLES", Ref = "OISS_SSA_VEHAUD_SAHP_OLD_SOUNDSET"}, +--[[58]] { Name = "Old SAHP DAVID", String = "OISS_SSA_VEHAUD_SAHP_OLD_SIREN_DAVID", Ref = "OISS_SSA_VEHAUD_SAHP_OLD_SOUNDSET"}, +--[[59]] { Name = "Old SAHP EDWARD", String = "OISS_SSA_VEHAUD_SAHP_OLD_SIREN_EDWARD", Ref = "OISS_SSA_VEHAUD_SAHP_OLD_SOUNDSET"}, } @@ -200,14 +206,100 @@ SIREN_ASSIGNMENTS = { ['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 }, + ['16expmet'] = { 51, 52, 53 }, + ['lapdurango'] = { 51, 52, 53 }, + ['lasdurango'] = { 51, 52, 53 }, + ['08hybridcvpi1'] = { 51, 52, 53 }, + ['08hybridcvpi2'] = { 51, 52, 53 }, + ['08lapdcvpi1'] = { 51, 52, 53 }, + ['08lapdcvpi2'] = { 51, 52, 53 }, + ['08lapdcvpighost'] = { 51, 52, 53 }, + ['08lapdcvpiharbor'] = { 51, 52, 53 }, + ['08lapdcvpisecsd'] = { 51, 52, 53 }, + ['08lapdsap'] = { 51, 52, 53 }, + ['13lasdfpiu'] = { 51, 52, 53 }, + ['13lasdfpiu2'] = { 51, 52, 53 }, + ['13lasdfpiua'] = { 51, 52, 53 }, + ['13lasdfpiuseb'] = { 51, 52, 53 }, + ['dualpurpose1'] = { 51, 52, 53 }, + ['dualpurpose2'] = { 51, 52, 53 }, + ['dualpurpose3'] = { 51, 52, 53 }, + ['hybridfpis'] = { 51, 52, 53 }, + ['lacpvic'] = { 51, 52, 53 }, + ['lapd13fpiuv'] = { 51, 52, 53 }, + ['lapd14charger'] = { 51, 52, 53 }, + ['lapd14chargertd'] = { 51, 52, 53 }, + ['lapd16fpiu'] = { 51, 52, 53 }, + ['lapd16fpiu2'] = { 51, 52, 53 }, + ['lapd16fpiusecsd'] = { 51, 52, 53 }, + ['lapd16fpiutraffic'] = { 51, 52, 53 }, + ['lapd16fpiutraffic2'] = { 51, 52, 53 }, + ['lapd20chrgra'] = { 51, 52, 53 }, + ['lapd20sl'] = { 51, 52, 53 }, + ['lapd20unm1'] = { 51, 52, 53 }, + ['lapdalpr20'] = { 51, 52, 53 }, + ['lapdfpis'] = { 51, 52, 53 }, + ['lapdfpis2'] = { 51, 52, 53 }, + ['lapdfpiua'] = { 51, 52, 53 }, + ['lasd05cvpi'] = { 51, 52, 53 }, + ['lasd06cvpi'] = { 51, 52, 53 }, + ['lasd06cvpicarson'] = { 51, 52, 53 }, + ['lasd06cvpisd7100'] = { 51, 52, 53 }, + ['lasd06m'] = { 51, 52, 53 }, + ['lasd06u'] = { 51, 52, 53 }, + ['lasd08cvpi'] = { 51, 52, 53 }, + ['lasd08cvpilomita'] = { 51, 52, 53 }, + ['lasd08cvpitransit'] = { 51, 52, 53 }, + ['lasd15k9'] = { 51, 52, 53 }, + ['lasd15tahoe'] = { 51, 52, 53 }, + ['lasd15tunm'] = { 51, 52, 53 }, + ['lasd16asap'] = { 51, 52, 53 }, + ['lasd20fs'] = { 51, 52, 53 }, + ['lasd20k9'] = { 51, 52, 53 }, + ['lasd20tunm'] = { 51, 52, 53 }, + ['lasdchrg14'] = { 51, 52, 53 }, + ['lasdcrownvic'] = { 51, 52, 53 }, + ['lasdlithium'] = { 51, 52, 53 }, + ['lasdparamount'] = { 51, 52, 53 }, + ['lasdsd7100'] = { 51, 52, 53 }, + ['lasdvicslicktop'] = { 51, 52, 53 }, + ['metro16fpiu'] = { 51, 52, 53 }, + ['metro16fpiu2'] = { 51, 52, 53 }, + ['metro16fpiu3'] = { 51, 52, 53 }, + ['metrocharger'] = { 51, 52, 53 }, + ['11lapdvic'] = { 51, 52, 53 }, + ['11lapdvic2'] = { 51, 52, 53 }, + ['13lapdexp'] = { 51, 52, 53 }, + ['13lapdfpis'] = { 51, 52, 53 }, + ['13lapdfpis2'] = { 51, 52, 53 }, + ['14lapdchg'] = { 51, 52, 53 }, + ['16lapdexp'] = { 51, 52, 53 }, + ['16lapdexpk9'] = { 51, 52, 53 }, + ['20lapdexp'] = { 51, 52, 53 }, + ['20lapdexp2'] = { 51, 52, 53 }, + ['20lapdexp3'] = { 51, 52, 53 }, + ['20lapdexpk9'] = { 51, 52, 53 }, + ['lasdchg'] = { 51, 52, 53 }, + ['lasdexp'] = { 51, 52, 53 }, + ['lasdexp2'] = { 51, 52, 53 }, + ['lasdfpiu'] = { 51, 52, 53 }, + ['lasdfpiu2'] = { 51, 52, 53 }, + ['lasdfpiu3'] = { 51, 52, 53 }, + ['lasdfpiu4'] = { 51, 52, 53 }, + ['lasdtahoe2'] = { 51, 52, 53 }, + ['lasdvic'] = { 51, 52, 53 }, + ['lasdvic2'] = { 51, 52, 53 }, + ['lasd08tahoe'] = { 51, 52, 53 }, + ['lasd08tahoe2'] = { 51, 52, 53 }, + ['lasd14tahoe'] = { 51, 52, 53 }, + ['lasdchrg14'] = { 51, 52, 53 }, + ['LASDCVPI2'] = { 51, 52, 53 }, ['22tahoe'] = { 51, 52, 53 }, ['SMPDF150'] = { 51, 52, 53 }, ['chp23charg'] = { 21, 22, 23, 24 }, + ['chp20fpiup'] = { 21, 22, 23, 24 }, + ['chp1'] = { 21, 22, 23, 24 }, + ['chp3'] = { 21, 22, 23, 24 }, ['chp1'] = { 21, 22, 23, 24 }, ['chp3'] = { 21, 22, 23, 24 }, ['chp4'] = { 21, 22, 23, 24 }, @@ -294,9 +386,13 @@ SIREN_ASSIGNMENTS = { ['MAXr2bison'] = { 27, 28, 29, 30, 31, 32 }, ['nforce24mustangS'] = { 27, 28, 29, 30, 31, 32 }, ['nm_jeep'] = { 27, 28, 29, 30, 31, 32 }, - - - + ['bhpdexp'] = { 27, 28, 29, 30, 31, 32 }, + ['bhpdtahoe'] = { 27, 28, 29, 30, 31, 32 }, + ['bhpdtahoek9'] = { 27, 28, 29, 30, 31, 32 }, + ['24mustanggt4d'] = { 27, 28, 29, 30, 31, 32 }, + ['speed1'] = { 27, 28, 29, 30, 31, 32 }, + ['schp16piu'] = { 54, 55, 56, 57, 58, 59}, + ['schp16piust'] = { 54, 55, 56, 57, 58, 59 },