diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua index d03151489..0396513f0 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua @@ -1530,6 +1530,20 @@ data_file 'CARCOLS_FILE' 'data/silvfd3/carcols.meta' data_file 'VEHICLE_VARIATION_FILE' 'data/silvfd3/carvariations.meta' data_file 'VEHICLE_LAYOUTS_FILE' 'data/silvfd3/dlctext.meta' + --nm_toyotasupra + files { + 'data/nm_toyotasupra/vehicles.meta', + 'data/nm_toyotasupra/carvariations.meta', + 'data/nm_toyotasupra/carcols.meta', + 'data/nm_toyotasupra/handling.meta', + 'data/nm_toyotasupra/vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'data/nm_toyotasupra/handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'data/nm_toyotasupra/vehicles.meta' +data_file 'CARCOLS_FILE' 'data/nm_toyotasupra/carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'data/nm_toyotasupra/carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'data/nm_toyotasupra/dlctext.meta' diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/carcols.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/carcols.meta index 8bd981257..fa5fa8298 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/carcols.meta +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/carcols.meta @@ -3,7 +3,7 @@ - + Staff-EGRPghoul @@ -56,7 +56,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -380,7 +380,7 @@ - + @@ -488,7 +488,7 @@ - + @@ -524,7 +524,7 @@ - + @@ -632,7 +632,7 @@ - + @@ -704,7 +704,7 @@ - + @@ -740,7 +740,7 @@ - + diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/carvariations.meta index cdb713d60..e7c1c0b40 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/carvariations.meta +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/carvariations.meta @@ -138,8 +138,8 @@ - - + + night4 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/vehicles.meta index 0e82a1337..e29448303 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/vehicles.meta +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/Staff-EGRPghoul/vehicles.meta @@ -16,7 +16,7 @@ null null -demonv8 +lg81hcredeye LAYOUT_STD_HIGHWINDOW freeboghoulffre_COVER_OFFSET_INFO EXPLOSION_INFO_DEFAULT diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/maxkhellwb/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/maxkhellwb/vehicles.meta index eab9a6576..5de9e465e 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/maxkhellwb/vehicles.meta +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/maxkhellwb/vehicles.meta @@ -15,7 +15,7 @@ null null - str392m + lg81hcredeye LAYOUT_STANDARD BUFFALO_COVER_OFFSET_INFO EXPLOSION_INFO_DEFAULT diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/Template/supra_sign_1.dds b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/Template/supra_sign_1.dds new file mode 100644 index 000000000..afc3ac48a Binary files /dev/null and b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/Template/supra_sign_1.dds differ diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/carcols.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/carcols.meta new file mode 100644 index 000000000..f68b5007b --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/carcols.meta @@ -0,0 +1,804 @@ + + + + + + + + + nm_toyotasupra + + + + + + + + VehicleLight_sirenlight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/carvariations.meta new file mode 100644 index 000000000..44c9fc54c --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/carvariations.meta @@ -0,0 +1,73 @@ + + + + + + nm_toyotasupra + + + + 4 + 154 + 4 + 2 + + + + + + + + + + + + + + + 0 + 154 + 10 + 2 + + + + + + + + + + + + + + + 2019_supraultra_modkit + + + + + + Standard White + + + + White Plate 2 + + + + Blue Plate + + + + Yellow Plate + + + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/handling.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/handling.meta new file mode 100644 index 000000000..5957e37ec --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/handling.meta @@ -0,0 +1,75 @@ + + + + + supraultra + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 00440010 + 00000002 + 00000000 + SPORTS_CAR + + + + + + + + + + + + + + 00000000 + + + + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/modkits.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/modkits.meta new file mode 100644 index 000000000..f0ee581a2 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/modkits.meta @@ -0,0 +1,626 @@ + + + + + + 2019_supraultra_modkit + + MKT_SPECIAL + + + supraultra_wing1 + A90 Front Fender 1 + + + VMT_WING_L + chassis + chassis + VMCP_DEFAULT + + + + + + + + + + + + + + + + supraultra_int + chassis + + + + line_f + bumper_f + + + + line_m + chassis + + + + mr + door_pside_f + + + + ml + door_dside_f + + + + trd_logo + boot + + + + ridox_c + bumper_f + + + + ridox_b + chassis + + + + ridox_a + chassis + + + + varis_a + chassis + + + + + + + + + + VMT_ENGINE + + + + + + + VMT_ENGINE + + + + + + + VMT_ENGINE + + + + + + + VMT_ENGINE + + + + + + + VMT_BRAKES + + + + + + + VMT_BRAKES + + + + + + + VMT_BRAKES + + + + + + + VMT_GEARBOX + + + + + + + VMT_GEARBOX + + + + + + + VMT_GEARBOX + + + + + + + VMT_ARMOUR + + + + + + + VMT_ARMOUR + + + + + + + VMT_ARMOUR + + + + + + + VMT_ARMOUR + + + + + + + VMT_ARMOUR + + + HORN_TRUCK + + + + VMT_HORN + + + HORN_COP + + + + VMT_HORN + + + HORN_CLOWN + + + + VMT_HORN + + + HORN_MUSICAL_1 + + + + VMT_HORN + + + HORN_MUSICAL_2 + + + + VMT_HORN + + + HORN_MUSICAL_3 + + + + VMT_HORN + + + HORN_MUSICAL_4 + + + + VMT_HORN + + + HORN_MUSICAL_5 + + + + VMT_HORN + + + HORN_SAD_TROMBONE + + + + VMT_HORN + + + MUSICAL_HORN_BUSINESS_1 + + + + VMT_HORN + + + MUSICAL_HORN_BUSINESS_2 + + + + VMT_HORN + + + MUSICAL_HORN_BUSINESS_3 + + + + VMT_HORN + + + MUSICAL_HORN_BUSINESS_4 + + + + VMT_HORN + + + MUSICAL_HORN_BUSINESS_5 + + + + VMT_HORN + + + MUSICAL_HORN_BUSINESS_6 + + + + VMT_HORN + + + MUSICAL_HORN_BUSINESS_7 + + + + VMT_HORN + + + DLC_BUSI2_C_MAJOR_NOTES_C0 + + + + VMT_HORN + + + DLC_BUSI2_C_MAJOR_NOTES_D0 + + + + VMT_HORN + + + DLC_BUSI2_C_MAJOR_NOTES_E0 + + + + VMT_HORN + + + DLC_BUSI2_C_MAJOR_NOTES_F0 + + + + VMT_HORN + + + DLC_BUSI2_C_MAJOR_NOTES_G0 + + + + VMT_HORN + + + DLC_BUSI2_C_MAJOR_NOTES_A0 + + + + VMT_HORN + + + DLC_BUSI2_C_MAJOR_NOTES_B0 + + + + VMT_HORN + + + DLC_BUSI2_C_MAJOR_NOTES_C1 + + + + VMT_HORN + + + HIPSTER_HORN_1 + + + + VMT_HORN + + + HIPSTER_HORN_2 + + + + VMT_HORN + + + HIPSTER_HORN_3 + + + + VMT_HORN + + + HIPSTER_HORN_4 + + + + VMT_HORN + + + INDEP_HORN_1 + + + + VMT_HORN + + + INDEP_HORN_2 + + + + VMT_HORN + + + INDEP_HORN_3 + + + + VMT_HORN + + + INDEP_HORN_4 + + + + VMT_HORN + + + LUXE_HORN_1 + + + + VMT_HORN + + + LUXE_HORN_2 + + + + VMT_HORN + + + LUXE_HORN_3 + + + + VMT_HORN + + + + LUXORY_HORN_1 + + + + VMT_HORN + + + + LUXURY_HORN_2 + + + + VMT_HORN + + + + LUXURY_HORN_3 + + + + VMT_HORN + + + + + + + VMT_SUSPENSION + + + + + + + VMT_SUSPENSION + + + + + + + VMT_SUSPENSION + + + + + + + VMT_SUSPENSION + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VehicleLight_car_oldsquare + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + supraultra + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/vehiclelayouts.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/vehiclelayouts.meta new file mode 100644 index 000000000..8ee3903b7 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/vehiclelayouts.meta @@ -0,0 +1,196 @@ + + + + + + + SEAT_RHD_FRONT_LEFT + seat_dside_f + SEAT_LOW_FRONT_RIGHT + SEAT_LOW_REAR_LEFT + TASK_DRIVE_WANDER + IsFrontSeat + + + + SEAT_RHD_FRONT_RIGHT + seat_pside_f + SEAT_LOW_FRONT_LEFT + SEAT_LOW_REAR_RIGHT + TASK_DRIVE_WANDER + IsFrontSeat + + + + + + SEAT_ANIM_RHD_FRONT_LEFT + + + clipset@veh@low@ds@idle_panic + clipset@veh@low@ds@idle_agitated + clipset@veh@low@ds@idle_duck + LOW_CAR_FRONT_DS_IDLE + IN_CAR_LOW + VEHICLE_DEFAULT + UseStandardInVehicleAnims UseCloseDoorBlendAnims + + LOW + ANIM_GROUP_GESTURE_M_CAR_LOW_DS + ANIM_GROUP_GESTURE_F_CAR_LOW_DS + + + SEAT_ANIM_RHD_FRONT_RIGHT + + + clipset@veh@low@ps@idle_panic + + clipset@veh@low@ps@idle_duck + LOW_CAR_FRONT_PS_IDLE + IN_CAR_LOW + VEHICLE_DEFAULT + UseStandardInVehicleAnims HasPanicAnims UseCloseDoorBlendAnims PreventShuffleJack + + LOW + ANIM_GROUP_GESTURE_M_CAR_LOW_PS + ANIM_GROUP_GESTURE_F_CAR_LOW_PS + + + + + ENTRY_POINT_RHD_FRONT_LEFT + door_pside_f + + handle_pside_f + FRONT_RIGHT + SIDE_LEFT + + + + + BlockJackReactionUntilJackerIsReady + + SIDE_RIGHT + + + + ENTRY_POINT_RHD_FRONT_RIGHT + door_dside_f + + handle_dside_f + FRONT_LEFT + SIDE_RIGHT + + + + + BlockJackReactionUntilJackerIsReady + + SIDE_LEFT + + + + + + ENTRY_POINT_ANIM_LOW_RHD_FRONT_LEFT + + + + LOW_Locked_DS + LOW_Force_Entry_DS + low_perp_ds_a + low_victim_ds_a + clipset@veh@low@ds@female@enter_exit + ENTER_VEHICLE_STD + + + + + + JackIncludesGetIn UsesNoDoorTransitionForExit UseOpenDoorBlendAnims FixUpMoverToEntryPointOnExit UseGetUpAfterJack JackVariationsIncludeGetIn HasCombatEntry + + LOWCAR + + + ENTRY_POINT_ANIM_LOW_RHD_FRONT_RIGHT + + + + LOW_Locked_PS + LOW_Force_Entry_PS + low_perp_ps_a + low_victim_ps_a + clipset@veh@low@ps@female@enter_exit + ENTER_VEHICLE_STD + + + + + + JackIncludesGetIn UsesNoDoorTransitionForExit UseOpenDoorBlendAnims FixUpMoverToEntryPointOnExit UseGetUpAfterJack JackVariationsIncludeGetIn HasCombatEntry + + + + + + LAYOUT_LOW_RHD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + StreamAnims UseDoorOscillation UseLeanSteerAnims UseSteeringWheelIk + + + busted_vehicle_low + + + + + + + clipset@veh@low@ds@idle_a + clipset@veh@low@ds@idle_b + clipset@veh@low@ds@idle_c + clipset@veh@low@ds@idle_d + clipset@veh@low@ds@idle_e + + + clipset@veh@low@ds@hit_wheel@idle_a + clipset@veh@low@ds@hit_wheel@idle_b + clipset@veh@low@ds@hit_wheel@idle_c + + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/vehicles.meta new file mode 100644 index 000000000..b32efb25c --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/nm_toyotasupra/vehicles.meta @@ -0,0 +1,122 @@ + + + vehshare + + + + nm_toyotasupra + nm_toyotasupra + supraultra + Supra A90 + Toyota + null + null + null + null + + null + SULTANRS + LAYOUT_LOW_RHD + BLISTA_COVER_OFFSET_INFO + EXPLOSION_INFO_DEFAULT + + DEFAULT_FOLLOW_VEHICLE_CAMERA + DEFAULT_THIRD_PERSON_VEHICLE_AIM_CAMERA + VEHICLE_BONNET_CAMERA_LOW + DEFAULT_POV_CAMERA + + + + + + + + + + + + + + + + + + VFXVEHICLEINFO_CAR_GENERIC + + + + + + + + + + + + + + + + + + + + + + 15.000000 + 30.000000 + 65.000000 + 130.000000 + 500.000000 + 500.000000 + + + + + + + + + + + SWANKNESS_2 + + FLAG_HAS_LIVERY FLAG_CAN_HAVE_NEONS FLAG_SPAWN_ON_TRAILER FLAG_AVERAGE_CAR FLAG_HAS_INTERIOR_EXTRAS FLAG_INCREASE_CAMBER_WITH_SUSPENSION_MOD FLAG_LAW_ENFORCEMENT FLAG_EMERGENCY_SERVICE + VEHICLE_TYPE_CAR + VPT_FRONT_AND_BACK_PLATES + VDT_SPEEDO + VC_EMERGENCY + VWT_SPORT + + + + + + + + + + + + WHEEL_FRONT_RIGHT_CAMERA + WHEEL_FRONT_LEFT_CAMERA + WHEEL_REAR_RIGHT_CAMERA + WHEEL_REAR_LEFT_CAMERA + + + + + + + STD_BLISTA_FRONT_LEFT + STD_BLISTA_FRONT_RIGHT + + + + + + vehicles_btype_interior + nm_toyotasupra + + + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra.yft new file mode 100644 index 000000000..8925e1ba7 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d37df4ebe16df712835c73671ead13c698695372124320ac0fffd5643e374277 +size 14402029 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra.ytd new file mode 100644 index 000000000..fbb234d88 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccc7975341c5c852dbc922d64579711affd381383a0f45bb3fd862e85b12e1a2 +size 7457251 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra_hi.yft new file mode 100644 index 000000000..6b93fafe0 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/nm_toyotasupra/nm_toyotasupra_hi.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3644ea38f6bf9d9c4ea3cc2aeae54f91e89da0dea23a50f4742a876e06871fd0 +size 14401930 diff --git a/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua b/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua index 3014f85fb..75495c284 100644 --- a/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua +++ b/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua @@ -11,10 +11,11 @@ Config.VehicleRestrictions = { "maxkhellwb", "nforce24mustang", "20ramcsquad", - "chargfire", + "chargfire", "enforcer", - "c3silvhdfd", - "c3hs53pd", + "hprs518", + "c3hs53pd", + "nm_toyotasupra", "Staff-EGRPghoul", "staff-22gscrb", "Staff-EGRP21escal", @@ -26,7 +27,7 @@ Config.VehicleRestrictions = { "Staff-Buggy", "staff-22gscrb", "Staff-23gsbb", - "maxkhellwb", + "hprs518", "nforce24mustang", "Staff-EGRP21escal", "Staff-EGRP21expd", @@ -39,6 +40,7 @@ Config.VehicleRestrictions = { "c3silvhdfd", "Staff-EGRPghoul", "Staff-DMLEOF82", + "nm_toyotasupra", "Staff-kgbearcat", "caddys" @@ -48,10 +50,11 @@ Config.VehicleRestrictions = { "staff-22gscrb", "Staff-23gsbb", "Staff-DMLEOF82", - "maxkhellwb", + "hprs518", "20ramcsquad", "chargfire", - "enforcer", + "enforcer", + "nm_toyotasupra", "c3silvhdfd", "Staff-EGRP21escal", "Staff-EGRP21expd", @@ -71,7 +74,7 @@ Config.VehicleRestrictions = { "Staff-DMLEOF82", "Staff-kgbearcat", "caddys", - "csdotp579", + "hprs518", "dick", "hpf350su", "maxkhellwb", @@ -104,7 +107,8 @@ Config.VehicleRestrictions = { "c3prfpis", "Staff-EGRPghoul", "c3brz", - "maxghoulchgrb", + "maxghoulchgrb", + "nm_toyotasupra", "hpcat21", "plcamaro", "sschev", @@ -141,7 +145,7 @@ Config.VehicleRestrictions = { "c3hs53pd", "c3prfpis", "Staff-EGRPghoul", - "c3brz", + "hprs518", "maxghoulchgrb", "hpf350su", "hpcat21", @@ -181,6 +185,7 @@ Config.VehicleRestrictions = { "maxc322prfpiu", "maxc8z0623", "BCSOMaxcharger", + "nm_toyotasupra", "Staff-gtwinturbocobra", "maxfedv", "csdotboxlongtr", @@ -208,7 +213,7 @@ Config.VehicleRestrictions = { "Staff-EGRP21expd", "Staff-EGRPf350su", "csdotp579", - "plcamaro", + "hprs518", "freebovenomgt", "hpf350su", "hpcat21", @@ -255,6 +260,7 @@ Config.VehicleRestrictions = { "maxc322prfpiu", "maxc8z0623", "BCSOMaxcharger", + "nm_toyotasupra", "Staff-gtwinturbocobra", "maxfedv", "mxxraprb", @@ -282,7 +288,7 @@ Config.VehicleRestrictions = { "Staff-EGRP21escal", "Staff-EGRP21expd", "Staff-EGRPf350su", - "plcamaro", + "hprs518", "freebovenomgt", "maxdhssemi", "maxdhssemitrailer", @@ -325,7 +331,8 @@ Config.VehicleRestrictions = { "c320pursuittahoek9", "jw_23tundraintb", "rw24aev", - "c3rampddual", + "c3rampddual", + "nm_toyotasupra", "independent389", "hpstang21", "PD23Suburban", @@ -364,7 +371,8 @@ Config.VehicleRestrictions = { "maxdhssemitrailer", "MAXgtsx500", "MAXMGTSPED", - "socalchev", + "hprs518", + "nm_toyotasupra", "maxdarkhorse", "MAX15CHARG", "MAX2019zrr19", @@ -425,7 +433,7 @@ Config.VehicleRestrictions = { "Staff-kgbearcat", "caddys", "dick", - "maxkhellwb", + "hprs518", "zr1RB", "Staff-EGRP21escal", "Staff-EGRP21expd", @@ -433,7 +441,7 @@ Config.VehicleRestrictions = { "swat1", "nforce24mustang", "c3lib18chgrb", - "c3libyukonblue", + "nm_toyotasupra", "c3hs53pd", "c3prfpis", "csdotp579", @@ -512,7 +520,11 @@ Config.VehicleRestrictions = { "navigatorleo", "hpf350su", "hpcat21", - "plcamaro", + "nm_toyotasupra", + " ", + " ", + " ", + "hprs518", "csdotp579", "freebovenomgt", "maxdhssemi", diff --git a/resources/beanbagshotgun/README.md b/resources/beanbagshotgun/README.md new file mode 100644 index 000000000..697b2c7db --- /dev/null +++ b/resources/beanbagshotgun/README.md @@ -0,0 +1,29 @@ +# install instructions for QBCore + +# qb-core/shared/weapons.lua +[`weapon_beanbag`] = { name = 'weapon_beanbag', label = 'Bean Bag Shotgun', weapontype = 'Weapon', ammotype = 'AMMO_BEANBAG', damagereason = 'Hurt by a beanbag from a non-lethal shotgun' }, + +# qb-core/shared/items.lua +weapon_beanbag = { name = 'weapon_beanbag', label = 'Bean Bag Shotgun', weight = 1000, type = 'weapon', ammotype = 'AMMO_BEANBAG', image = 'weapon_beanbag', unique = true, useable = true, description = 'Bean Bag' }, + +# qb-weapons/server/main.lua > local AmmoTypes add this following, make sure you haven't missed your comma's +beanbag_ammo = { ammoType = 'AMMO_BEANBAG', amount = 1 } + + + +# install instructions for ox_inventory + +# add to ox_inventory/data/weapons.lua > Weapons Table + +['WEAPON_BEANBAG'] = { + label = 'Bean Bag Shotgun', + weight = 1400, + durability = 0.1, + ammoname = 'ammo-beanbag', +}, + +# add to ox_inventory/data/weapons.lua > Ammo Table +['ammo-beanbag'] = { + label = 'Bean Bag', + weight = 20, +}, \ No newline at end of file diff --git a/resources/beanbagshotgun/fxmanifest.lua b/resources/beanbagshotgun/fxmanifest.lua new file mode 100644 index 000000000..7e0eb668a --- /dev/null +++ b/resources/beanbagshotgun/fxmanifest.lua @@ -0,0 +1,23 @@ +fx_version 'cerulean' +game "gta5" +description 'Free Beanbag Shotgun' + +files{ + 'meta/**/weaponarchetypes.meta', + 'meta/**/weaponcomponents.meta', + 'meta/**/weaponanimations.meta', + 'meta/**/weapons.meta', + 'meta/**/weapondagger.meta', + 'meta/**/weaponsnowball.meta', + 'meta/**/weaponmachete.meta', + 'meta/**/pedpersonality.meta', +} + +data_file 'WEAPON_METADATA_FILE' 'meta/**/weaponarchetypes.meta' +data_file 'WEAPON_ANIMATIONS_FILE' 'meta/**/weaponanimations.meta' +data_file 'WEAPON_COMPONENTS_FILE' 'meta/**/weaponcomponents.meta' +data_file 'WEAPONINFO_FILE' 'meta/**/weapons.meta' +data_file 'WEAPONINFO_FILE' 'meta/**/weapondagger.meta' +data_file 'WEAPONINFO_FILE' 'meta/**/weaponsnowball.meta' +data_file 'WEAPONINFO_FILE' 'meta/**/weaponmachete.meta' +data_file 'PED_PERSONALITY_FILE' 'meta/**/pedpersonality.meta' \ No newline at end of file diff --git a/resources/beanbagshotgun/meta/beanbagshotgun/pedpersonality.meta b/resources/beanbagshotgun/meta/beanbagshotgun/pedpersonality.meta new file mode 100644 index 000000000..79137ee42 --- /dev/null +++ b/resources/beanbagshotgun/meta/beanbagshotgun/pedpersonality.meta @@ -0,0 +1,372 @@ + + + + + + UNHOLSTER_UNARMED + + + + WEAPON_BEANBAG + + unarmed_holster_2h + + + + + UNHOLSTER_2H_MELEE + + + + WEAPON_BEANBAG + + 2h_melee_holster_2h + + + + + UNHOLSTER_1H + + + + WEAPON_BEANBAG + + 1h_holster_2h + + + + + UNHOLSTER_2H + + + + WEAPON_BEANBAG + + 2h_holster_2h + + + + + UNHOLSTER_MINIGUN + + + + WEAPON_BEANBAG + + mini_holster_2h + + + + + UNHOLSTER_UNARMED_STEALTH + + + + WEAPON_BEANBAG + + unarmed_holster_2h + + + + + UNHOLSTER_2H_MELEE_STEALTH + + + + WEAPON_BEANBAG + + unarmed_holster_2h + + + + + UNHOLSTER_1H_STEALTH + + + + WEAPON_BEANBAG + + 1h_holster_2h + + + + + UNHOLSTER_2H_STEALTH + + + + WEAPON_BEANBAG + + 2h_holster_2h + + + + + + + DEFAULT_ACTION + + + + + WEAPON_BEANBAG + + + + move_action@p_m_zero@armed@core + move_action@p_m_zero@armed@2H@upper + UpperbodyAndIk_filter + + + + + + MOVE_ACTION@GENERIC@TRANS@2H + + + MOVE_ACTION@P_M_ZERO@HOLSTER + + + + + + + + + WEAPON_BEANBAG + + + + move_stealth@p_m_zero@unarmed@core + move_stealth@p_m_zero@2h@upper + UpperbodyAndIk_filter + + + + + + move_stealth@generic@trans@2h + + + move_stealth@p_m_zero@holster + + + + + + + + + MP_FEMALE_ACTION + + + + + WEAPON_BEANBAG + + + + move_action@p_m_zero@armed@core + move_action@mp_female@armed@2H@upper + UpperbodyAndIk_filter + + + + + + MOVE_ACTION@MP_FEMALE@ARMED@2H@TRANS + + + MOVE_ACTION@P_M_ZERO@HOLSTER + + + + + + + + + WEAPON_BEANBAG + + + + move_stealth@p_m_zero@unarmed@core + move_stealth@p_m_zero@2h@upper + UpperbodyAndIk_filter + + + + + + MOVE_STEALTH@MP_FEMALE@2H@TRANS + + + move_stealth@p_m_zero@holster + + + + + + + + + MICHAEL_ACTION + + + + + WEAPON_BEANBAG + + + + move_action@p_m_zero@armed@core + move_action@p_m_zero@armed@2H@upper + UpperbodyAndIk_filter + + + + + + MOVE_ACTION@P_M_ZERO@ARMED@2H@TRANS@A + + + MOVE_ACTION@P_M_ZERO@HOLSTER + + + + + + + + + WEAPON_BEANBAG + + + + move_stealth@p_m_zero@unarmed@core + move_stealth@p_m_zero@2h@upper + UpperbodyAndIk_filter + + + + + + move_stealth@p_m_zero@2h@trans@a + + + move_stealth@p_m_zero@holster + + + + + + + + + FRANKLIN_ACTION + + + + + WEAPON_BEANBAG + + + + move_action@p_m_one@armed@core + move_action@P_M_ONE@armed@2H@upper + UpperbodyAndIk_filter + + + + + + MOVE_ACTION@P_M_ONE@ARMED@2H@TRANS@A + + + MOVE_ACTION@P_M_ONE@HOLSTER + + + + + + + + + WEAPON_BEANBAG + + + + move_stealth@p_m_one@unarmed@core + move_stealth@p_m_one@2h@upper + UpperbodyAndIk_filter + + + + + + move_stealth@p_m_one@2h@trans@a + + + MOVE_STEALTH@P_M_ONE@HOLSTER + + + + + + + + + TREVOR_ACTION + + + + + WEAPON_BEANBAG + + + + move_action@p_m_two@armed@core + move_action@p_m_two@armed@2H@upper + UpperbodyAndIk_filter + + + + + + MOVE_ACTION@P_M_TWO@ARMED@2H@TRANS@A + + + MOVE_ACTION@P_M_TWO@HOLSTER + + + + + + + + + WEAPON_BEANBAG + + + + move_stealth@p_m_two@unarmed@core + move_stealth@p_m_two@2h@upper + UpperbodyAndIk_filter + + + + + + move_stealth@p_m_two@2h@trans@a + + + MOVE_STEALTH@P_M_TWO@HOLSTER + + + + + + + + + \ No newline at end of file diff --git a/resources/beanbagshotgun/meta/beanbagshotgun/weaponanimations.meta b/resources/beanbagshotgun/meta/beanbagshotgun/weaponanimations.meta new file mode 100644 index 000000000..6b78aac60 --- /dev/null +++ b/resources/beanbagshotgun/meta/beanbagshotgun/weaponanimations.meta @@ -0,0 +1,393 @@ + + + + + Default + + + + + + + move_ballistic_2h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + weapons@holster_fat_2h + + + + + + + + + cover@move@base@2h + cover@move@extra@2h + cover@move@ai@base@2h + Cover_Wpn_ShotgunLo + weapons@rifle@lo@pump + BothArms_filter + + + + + weapons@rifle@lo@pump + weapons@rifle@lo@pump_str + + weapons@rifle@lo@pump@stealth + + + + + + + + combat_aim_turns_rifle + + melee@rifle@streamed_core + + + + + reaction@shellshock@2h + MOVE_JUMP@WEAPONS@RIFLE + MOVE_FALL@WEAPONS@RIFLE + weapons@rifle@ + + + + + + + + + Wpn_Thrown_Grenade_Aiming_Rifle + + + + + + Gang + + + + + + + weapons@rifle@lo@pump@f + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + move_m@generic + cover@first_person@move@base@2h + cover@first_person@move@extra@2h + cover@move@ai@base@2h + Cover_FirstPerson_Wpn_ShotgunLo + weapons@first_person@aim_idle@generic@assault_rifle@shared@core + BothArms_filter + + + move_ped_strafing_stealth + + weapons@first_person@aim_idle@generic@assault_rifle@shared@core + weapons@first_person@aim_rng@generic@shotgun@pump_shotgun_str + + weapons@first_person@aim_stealth@generic@shotgun@shared@core + + + + + + + + combat_aim_turns_rifle + + melee@rifle@streamed_core + + + + + reaction@shellshock@2h + MOVE_JUMP@WEAPONS@RIFLE + MOVE_FALL@WEAPONS@RIFLE + weapons@rifle@ + + + + + + + + + weapons@first_person@aim_rng@generic@assault_rifle@shared@core + + weapons@first_person@aim_rng@p_m_zero@assault_rifle@shared@aim_trans@rng_to_idle + weapons@first_person@aim_lt@p_m_zero@assault_rifle@shared@aim_trans@lt_to_idle + weapons@first_person@aim_scope@p_m_zero@assault_rifle@shared@aim_trans@scope_to_idle + weapons@first_person@aim_idle@p_m_zero@assault_rifle@shared@aim_trans@unholster_to_idle + weapons@first_person@aim_stealth@p_m_zero@assault_rifle@shared@aim_trans@stealth_to_idle + weapons@first_person@aim_idle@p_m_zero@assault_rifle@shared@aim_trans@idle_to_stealth + weapons@first_person@aim_stealth@p_m_zero@assault_rifle@shared@aim_trans@unholster_to_stealth + weapons@first_person@aim_idle@remote_clone@assault_rifle@shared@core + + weapons@first_person@aim_idle@p_m_zero@assault_rifle@shared@fidgets@a + weapons@first_person@aim_idle@p_m_zero@assault_rifle@shared@fidgets@b + weapons@first_person@aim_idle@p_m_zero@assault_rifle@shared@fidgets@c + + + + + + Default + + + cover@first_person@move@base@2h + cover@first_person@move@extra@2h + cover@move@ai@base@2h + Cover_FirstPerson_Wpn_ShotgunLo + weapons@first_person@aim_rng@generic@assault_rifle@shared@core + BothArms_filter + + + move_ped_strafing_stealth + + weapons@first_person@aim_lt@generic@shotgun@shared@core@w_fire + weapons@first_person@aim_rng@generic@shotgun@pump_shotgun_str + + weapons@first_person@aim_lt@generic@shotgun@shared@core@w_fire + + + + + + + + combat_aim_turns_rifle + + melee@rifle@streamed_core + + + + + reaction@shellshock@2h + MOVE_JUMP@WEAPONS@RIFLE + MOVE_FALL@WEAPONS@RIFLE + weapons@rifle@ + + + + + + + + + weapons@first_person@aim_rng@generic@assault_rifle@shared@core + + weapons@first_person@aim_idle@p_m_zero@assault_rifle@shared@aim_trans@idle_to_lt + weapons@first_person@aim_rng@p_m_zero@assault_rifle@shared@aim_trans@rng_to_lt + + weapons@first_person@aim_scope@p_m_zero@assault_rifle@shared@aim_trans@scope_to_lt + weapons@first_person@aim_lt@p_m_zero@assault_rifle@shared@aim_trans@unholster_to_lt + weapons@first_person@aim_stealth@p_m_zero@assault_rifle@shared@aim_trans@stealth_to_lt + weapons@first_person@aim_lt@p_m_zero@assault_rifle@shared@aim_trans@lt_to_stealth + + weapons@first_person@aim_lt@p_m_zero@shotgun@shared@fidgets@a + weapons@first_person@aim_lt@p_m_zero@shotgun@shared@fidgets@b + weapons@first_person@aim_lt@p_m_zero@shotgun@shared@fidgets@c + + + + + + Default + + + cover@first_person@move@base@2h + cover@first_person@move@extra@2h + cover@move@ai@base@2h + Cover_FirstPerson_Wpn_ShotgunLo + weapons@first_person@aim_rng@generic@assault_rifle@shared@core + BothArms_filter + + + move_ped_strafing_stealth + + weapons@first_person@aim_rng@generic@shotgun@shared@core@w_fire + weapons@first_person@aim_rng@generic@shotgun@pump_shotgun_str + + weapons@first_person@aim_rng@generic@shotgun@shared@core@w_fire + + + + + + + + combat_aim_turns_rifle + + melee@rifle@streamed_core + + + + + reaction@shellshock@2h + MOVE_JUMP@WEAPONS@RIFLE + MOVE_FALL@WEAPONS@RIFLE + weapons@rifle@ + + + + + + + + + weapons@first_person@aim_rng@generic@assault_rifle@shared@core + + weapons@first_person@aim_idle@p_m_zero@assault_rifle@shared@aim_trans@idle_to_rng + + weapons@first_person@aim_lt@p_m_zero@assault_rifle@shared@aim_trans@lt_to_rng + weapons@first_person@aim_scope@p_m_zero@assault_rifle@shared@aim_trans@scope_to_rng + weapons@first_person@aim_rng@p_m_zero@assault_rifle@shared@aim_trans@unholster_to_rng + weapons@first_person@aim_stealth@p_m_zero@assault_rifle@shared@aim_trans@stealth_to_rng + weapons@first_person@aim_rng@p_m_zero@assault_rifle@shared@aim_trans@rng_to_stealth + + weapons@first_person@aim_rng@p_m_zero@shotgun@shared@fidgets@a + weapons@first_person@aim_rng@p_m_zero@shotgun@shared@fidgets@b + weapons@first_person@aim_rng@p_m_zero@shotgun@shared@fidgets@c + + + + + + Default + + + cover@first_person@move@base@2h + cover@first_person@move@extra@2h + cover@move@ai@base@2h + Cover_FirstPerson_Wpn_ShotgunLo + weapons@first_person@aim_rng@generic@assault_rifle@shared@core + BothArms_filter + + + move_ped_strafing_stealth + + weapons@first_person@aim_scope@generic@shotgun@shared@core@w_fire + weapons@first_person@aim_rng@generic@shotgun@pump_shotgun_str + + weapons@first_person@aim_scope@generic@shotgun@shared@core@w_fire + + + + + + + + combat_aim_turns_rifle + + melee@rifle@streamed_core + + + + + reaction@shellshock@2h + MOVE_JUMP@WEAPONS@RIFLE + MOVE_FALL@WEAPONS@RIFLE + weapons@rifle@ + + + + + + + + + weapons@first_person@aim_rng@generic@assault_rifle@shared@core + + weapons@first_person@aim_idle@p_m_zero@assault_rifle@shared@aim_trans@idle_to_scope + weapons@first_person@aim_rng@p_m_zero@assault_rifle@shared@aim_trans@rng_to_scope + weapons@first_person@aim_lt@p_m_zero@assault_rifle@shared@aim_trans@lt_to_scope + + weapons@first_person@aim_scope@p_m_zero@assault_rifle@shared@aim_trans@unholster_to_scope + weapons@first_person@aim_stealth@p_m_zero@assault_rifle@shared@aim_trans@stealth_to_scope + weapons@first_person@aim_scope@p_m_zero@assault_rifle@shared@aim_trans@scope_to_stealth + + + + + \ No newline at end of file diff --git a/resources/beanbagshotgun/meta/beanbagshotgun/weaponarchetypes.meta b/resources/beanbagshotgun/meta/beanbagshotgun/weaponarchetypes.meta new file mode 100644 index 000000000..0291e095d --- /dev/null +++ b/resources/beanbagshotgun/meta/beanbagshotgun/weaponarchetypes.meta @@ -0,0 +1,13 @@ + + + + + + + w_sg_beanbag + w_sg_beanbag + null + + + + \ No newline at end of file diff --git a/resources/beanbagshotgun/meta/beanbagshotgun/weapons.meta b/resources/beanbagshotgun/meta/beanbagshotgun/weapons.meta new file mode 100644 index 000000000..fe0b6dafb --- /dev/null +++ b/resources/beanbagshotgun/meta/beanbagshotgun/weapons.meta @@ -0,0 +1,309 @@ + + + + + + + + + SLOT_BEANBAG + + + + + + + + SLOT_BEANBAG + + + + + + + + + SLOT_BEANBAG + + + + + + + + + + + + + + + WEAPON_BEANBAG + w_sg_beanbag + + SLOT_BEANBAG + ELECTRIC + + DONTCARE + DONTCARE + DONTCARE + DONTCARE + DONTCARE + DONTCARE + + INSTANT_HIT + WHEEL_SHOTGUN + GROUP_SHOTGUN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BONETAG_HEAD + + + + + BONETAG_NECK + + + + + BONETAG_R_CLAVICLE + + + + + BONETAG_L_CLAVICLE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WEAPON_EFFECT_GROUP_SHOTGUN + muz_shotgun + + muz_smoking_barrel_shotgun + muz_smoking_barrel_fp + + + + eject_shotgun + eject_shotgun_fp + + ShotgunLarge + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SHOTGUN_AIM_CAMERA + SHOTGUN_AIM_IN_COVER_CAMERA + + SHOTGUN_RUN_AND_GUN_CAMERA + SHOTGUN_CINEMATIC_SHOOTING_CAMERA + + + + + + + + + + + + + + + + + + + + + + + + + SHOTGUN_RECOIL_SHAKE + FPS_SHOTGUN_RECOIL_SHAKE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WEAPONTYPE_SHOTGUN + + PICKUP_WEAPON_BEANBAG + PICKUP_AMMO_BULLET_MP + WT_SG_BB + MMI_2Handed + STUNGUN + + + Shotgun + + + WAPClip + + + COMPONENT_PUMPSHOTGUN_CLIP_01 + + + + + + + + CarriedInHand ApplyBulletForce Gun CanLockonOnFoot CanLockonInVehicle CanFreeAim TwoHanded AnimReload AnimCrouchFire UsableOnFoot UsableInCover NoLeftHandIKWhenBlocked AllowCloseQuarterKills NeedsGunCockingInCover HasLowCoverReloads HasLowCoverSwaps ProcessGripAnim UseFPSAimIK UseFPSSecondaryMotion + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DLC - BEANBAG + \ No newline at end of file diff --git a/resources/beanbagshotgun/stream/w_sg_beanbag+hi.ytd b/resources/beanbagshotgun/stream/w_sg_beanbag+hi.ytd new file mode 100644 index 000000000..5c465214d --- /dev/null +++ b/resources/beanbagshotgun/stream/w_sg_beanbag+hi.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d03cb7a94e6120e87f77ada2b47e2d6d6d490e2e2410ce24f20ae84652d04dfe +size 4628291 diff --git a/resources/beanbagshotgun/stream/w_sg_beanbag.ydr b/resources/beanbagshotgun/stream/w_sg_beanbag.ydr new file mode 100644 index 000000000..b58d47588 --- /dev/null +++ b/resources/beanbagshotgun/stream/w_sg_beanbag.ydr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e087af0bf9ac83f9c6b0d3e89c11dd53b17bf1befe2e0e96cb9f5d938b85602 +size 50927 diff --git a/resources/beanbagshotgun/stream/w_sg_beanbag.ytd b/resources/beanbagshotgun/stream/w_sg_beanbag.ytd new file mode 100644 index 000000000..f04e54e88 --- /dev/null +++ b/resources/beanbagshotgun/stream/w_sg_beanbag.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cc0f514cce5adabdea2993550a0fc5f32f1a218697c3f0c3b43fe75ff62c555 +size 4423233 diff --git a/resources/beanbagshotgun/stream/w_sg_beanbag_hi.ydr b/resources/beanbagshotgun/stream/w_sg_beanbag_hi.ydr new file mode 100644 index 000000000..c6877c80e --- /dev/null +++ b/resources/beanbagshotgun/stream/w_sg_beanbag_hi.ydr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b56ff22a15e18cd8058b2d5c177a7a68c45536d65d260ed73d0fe2a33bfedacb +size 205603 diff --git a/resources/nm_redeye/Template/chr19_sign_1.dds b/resources/nm_redeye/Template/chr19_sign_1.dds new file mode 100644 index 000000000..303646d8a Binary files /dev/null and b/resources/nm_redeye/Template/chr19_sign_1.dds differ diff --git a/resources/nm_redeye/audioconfig/lg81hcredeye_game.dat151.rel b/resources/nm_redeye/audioconfig/lg81hcredeye_game.dat151.rel new file mode 100644 index 000000000..09d8a7bec Binary files /dev/null and b/resources/nm_redeye/audioconfig/lg81hcredeye_game.dat151.rel differ diff --git a/resources/nm_redeye/audioconfig/lg81hcredeye_sounds.dat54.rel b/resources/nm_redeye/audioconfig/lg81hcredeye_sounds.dat54.rel new file mode 100644 index 000000000..78731e15d Binary files /dev/null and b/resources/nm_redeye/audioconfig/lg81hcredeye_sounds.dat54.rel differ diff --git a/resources/nm_redeye/carcols.meta b/resources/nm_redeye/carcols.meta new file mode 100644 index 000000000..5064e0cde --- /dev/null +++ b/resources/nm_redeye/carcols.meta @@ -0,0 +1,804 @@ + + + + + + + + + nm_redeye + + + + + + + + VehicleLight_sirenlight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/nm_redeye/carvariations.meta b/resources/nm_redeye/carvariations.meta new file mode 100644 index 000000000..222944792 --- /dev/null +++ b/resources/nm_redeye/carvariations.meta @@ -0,0 +1,66 @@ + + + + + nm_redeye + + + + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0_default_modkit + + + + + + Police guv plate + + + + + + + + + \ No newline at end of file diff --git a/resources/nm_redeye/fxmanifest.lua b/resources/nm_redeye/fxmanifest.lua new file mode 100644 index 000000000..538fb09e1 --- /dev/null +++ b/resources/nm_redeye/fxmanifest.lua @@ -0,0 +1,23 @@ +fx_version 'cerulean' +game 'gta5' + +author 'Northern Modifications' +description 'A police Dodge Charger Hellcat Redeye by Northern Modifications!' +version '1.0' + +files { + 'data/*.meta', + 'data/audioconfig/*.dat151.rel', + 'data/audioconfig/*.dat54.rel', + 'data/audioconfig/*.dat10.rel', + 'data/sfx/**/*.awc' +} + +data_file 'HANDLING_FILE' 'data/handling.meta' +data_file 'AUDIO_SYNTHDATA' 'data/audioconfig/lg81hcredeye_amp.dat' +data_file 'AUDIO_GAMEDATA' 'data/audioconfig/lg81hcredeye_game.dat' +data_file 'AUDIO_SOUNDDATA' 'data/audioconfig/lg81hcredeye_sounds.dat' +data_file 'AUDIO_WAVEPACK' 'data/sfx/dlc_lg81hcredeye' +data_file 'VEHICLE_METADATA_FILE' 'data/vehicles.meta' +data_file 'CARCOLS_FILE' 'data/carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'data/carvariations.meta' \ No newline at end of file diff --git a/resources/nm_redeye/handling.meta b/resources/nm_redeye/handling.meta new file mode 100644 index 000000000..f846d1a12 --- /dev/null +++ b/resources/nm_redeye/handling.meta @@ -0,0 +1,67 @@ + + + + + + nm_redeye + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 440010 + 0 + 0 + AVERAGE + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/nm_redeye/sfx/dlc_lg81hcredeye/lg81hcredeye.awc b/resources/nm_redeye/sfx/dlc_lg81hcredeye/lg81hcredeye.awc new file mode 100644 index 000000000..33cdb10f6 Binary files /dev/null and b/resources/nm_redeye/sfx/dlc_lg81hcredeye/lg81hcredeye.awc differ diff --git a/resources/nm_redeye/sfx/dlc_lg81hcredeye/lg81hcredeye_npc.awc b/resources/nm_redeye/sfx/dlc_lg81hcredeye/lg81hcredeye_npc.awc new file mode 100644 index 000000000..d75e85124 Binary files /dev/null and b/resources/nm_redeye/sfx/dlc_lg81hcredeye/lg81hcredeye_npc.awc differ diff --git a/resources/nm_redeye/stream/nm_redeye.yft b/resources/nm_redeye/stream/nm_redeye.yft new file mode 100644 index 000000000..4bc60724a --- /dev/null +++ b/resources/nm_redeye/stream/nm_redeye.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb00f5783a0b0745befc124852c8c9a87ab19eeb485b9be0f50c33b9b5dbd1bb +size 11031182 diff --git a/resources/nm_redeye/stream/nm_redeye.ytd b/resources/nm_redeye/stream/nm_redeye.ytd new file mode 100644 index 000000000..b82149acc --- /dev/null +++ b/resources/nm_redeye/stream/nm_redeye.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2e8c930b44a5fa77cf26d9f2677aaecc1b9424ed9d1514b89e8d582efac904b +size 7326067 diff --git a/resources/nm_redeye/stream/nm_redeye_hi.yft b/resources/nm_redeye/stream/nm_redeye_hi.yft new file mode 100644 index 000000000..84084d246 --- /dev/null +++ b/resources/nm_redeye/stream/nm_redeye_hi.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49bdeb9b2e54b2e3e42fc985f92fa114157aab54532f3661e9db5a734b33d858 +size 11030978 diff --git a/resources/nm_redeye/vehicles.meta b/resources/nm_redeye/vehicles.meta new file mode 100644 index 000000000..83d101eb2 --- /dev/null +++ b/resources/nm_redeye/vehicles.meta @@ -0,0 +1,134 @@ + + + vehshare + + + + nm_redeye + nm_redeye + nm_redeye + Redeye + DODGE + null + null + null + null + + null + lg81hcredeye + LAYOUT_STANDARD + BUFFALO2_COVER_OFFSET_INFO + EXPLOSION_INFO_DEFAULT + + DEFAULT_FOLLOW_VEHICLE_CAMERA + DEFAULT_THIRD_PERSON_VEHICLE_AIM_CAMERA + VEHICLE_BONNET_CAMERA_STANDARD + DEFAULT_POV_CAMERA + + + + + + + + + + + + + + + + + + + + + + + + + + + + VFXVEHICLEINFO_CAR_GENERIC + + + + + + + + + + + + + + + + + + + + + + 500.000000 + 500.000000 + 500.000000 + 500.000000 + 500.000000 + 500.000000 + + + + + + + + + + + SWANKNESS_3 + + FLAG_LAW_ENFORCEMENT FLAG_EMERGENCY_SERVICE FLAG_HAS_LIVERY FLAG_AVERAGE_CAR FLAG_RECESSED_HEADLIGHT_CORONAS FLAG_HAS_INTERIOR_EXTRAS FLAG_HAS_BULLET_RESISTANT_GLASS FLAG_HAS_INCREASED_RAMMING_FORCE FLAG_HAS_CAPPED_EXPLOSION_DAMAGE + VEHICLE_TYPE_CAR + VPT_BACK_PLATES + VDT_RACE + VC_EMERGENCY + VWT_SPORT + + + + + + + + + + + + WHEEL_FRONT_RIGHT_CAMERA + WHEEL_FRONT_LEFT_CAMERA + WHEEL_REAR_RIGHT_CAMERA + WHEEL_REAR_LEFT_CAMERA + + + + + + + STD_BUFFALO2_FRONT_LEFT + STD_BUFFALO2_FRONT_RIGHT + STD_BUFFALO_REAR_LEFT + STD_BUFFALO_REAR_RIGHT + + + + + + vehicles_race_generic + nm_redeye + + + \ No newline at end of file diff --git a/resources/thinline_aspbaton/fxmanifest.lua b/resources/thinline_aspbaton/fxmanifest.lua new file mode 100644 index 000000000..124a8179a --- /dev/null +++ b/resources/thinline_aspbaton/fxmanifest.lua @@ -0,0 +1,2 @@ +fx_version 'cerulean' +game 'gta5' \ No newline at end of file diff --git a/resources/thinline_aspbaton/stream/w_me_nightstick.ydr b/resources/thinline_aspbaton/stream/w_me_nightstick.ydr new file mode 100644 index 000000000..9b1f234f3 --- /dev/null +++ b/resources/thinline_aspbaton/stream/w_me_nightstick.ydr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300306124c08758bca9b65909dbdf504e105b201c8f148b619c106c3beff23eb +size 23099 diff --git a/resources/thinline_aspbaton/stream/w_me_nightstick.ytd b/resources/thinline_aspbaton/stream/w_me_nightstick.ytd new file mode 100644 index 000000000..78bc53578 --- /dev/null +++ b/resources/thinline_aspbaton/stream/w_me_nightstick.ytd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46ca505b3a63632b9914987ee5aae4a667069c92a907854de697792fb99a3fde +size 4501681 diff --git a/resources/vMenu/config/addons.json b/resources/vMenu/config/addons.json index 6d5172d93..8d235d251 100644 --- a/resources/vMenu/config/addons.json +++ b/resources/vMenu/config/addons.json @@ -730,6 +730,9 @@ "WEAPON_FIREAXE", "WEAPON_pepperspray", "WEAPON_flashlight", + "WEAPON_beanbag", + "WEAPON_nightstick", + ], "weapon_components": [ "weapon_component_name_1", diff --git a/server.cfg b/server.cfg index c9f736a90..daef202e9 100644 --- a/server.cfg +++ b/server.cfg @@ -1,4 +1,4 @@ -++#Force to load permission.cfg +-++#Force to load permission.cfg exec resources/vMenu/config/permissions.cfg ## Proxy @@ -296,7 +296,7 @@ ensure srtvipeng ensure am_srt15 ensure mrap ensure CadesFord6.7 -ensure +ensure nm_redeye ensure ensure ensure @@ -336,10 +336,11 @@ ensure firehook ensure FireTools ensure FIREAXE ensure halligan +ensure thinline_aspbaton +ensure beanbagshotgun ensure ensure - #[-----Map Add-On-----] ensure ad2 ensure SandyShores-Hospital @@ -434,14 +435,14 @@ ensure gas_station ensure dl_sandymechanic ensure csafemlo ensure warehouse -//ensure beachtower +ensure beachtower ensure sc1_29_motel_fivem ensure sandygespeedbirdge -ensure r68_roadworks_water +//ensure r68_roadworks_water //ensure ParkingEnforcement //ensure ParkingEnforcementHQ ensure iak_DrugFarm -//ensure Giant_BarTheDrink +ensure Giant_BarTheDrink ensure paletocityhall ensure dragstrip_new ensure dragtrack @@ -464,7 +465,6 @@ ensure smokey_paletobarak4 ensure smokey_paletobarak ensure pd_sandy ensure nve_christmas -ensure vg_logcabin_1 ensure molo_lux