Skip to content

Commit

Permalink
Added new marksman optics and flashlights (#1134)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pool011
pool011 authored Feb 12, 2024
1 parent 82668a1 commit 215dca8
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 15 deletions.
2 changes: 1 addition & 1 deletion cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class Cav_B_B_Scout_DMR_F_Local: Cav_B_B_Scout_Base_F {
displayName = "Designated Marksman";
scope = 2;
category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Squad"};
loadout = [["rhs_weap_sr25_ec","","rhsusf_acc_anpeq15side_bk","rhsusf_acc_M8541_mrds",["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",20],[],"rhsusf_acc_harris_bipod"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["kat_chestSeal",2],["kat_guedel",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1]]],["rhsusf_spcs_ocp_sniper",[["ACE_IR_Strobe_Item",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",1],["ACE_Chemlight_IR",2,1],["rhs_mag_mk3a2",1,1],["SmokeShellPurple",1,1],["kat_Painkiller",2,10],["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",6,20]]],["USP_TACTICAL_PACK",[["ACE_wirecutter",1],["ACE_EntrenchingTool",1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_MFRAME_SMC1_TAN2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS31"]];
loadout = [["rhs_weap_sr25_ec","","rhsusf_acc_anpeq15side_bk","optic_AMS",["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",20],[],"rhsusf_acc_harris_bipod"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["kat_chestSeal",2],["kat_guedel",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1]]],["rhsusf_spcs_ocp_sniper",[["ACE_IR_Strobe_Item",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",1],["ACE_Chemlight_IR",2,1],["rhs_mag_mk3a2",1,1],["SmokeShellPurple",1,1],["kat_Painkiller",2,10],["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",6,20]]],["USP_TACTICAL_PACK",[["ACE_wirecutter",1],["ACE_EntrenchingTool",1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_MFRAME_SMC1_TAN2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS31"]];
};
class Cav_B_B_Scout_Rifleman_F: Cav_B_B_Scout_Base_F {
displayName = "Rifleman";
Expand Down
2 changes: 1 addition & 1 deletion cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class Cav_B_C_Marksman_F_Local: Cav_B_Charlie_base_F {
displayName = "Designated Marksman";
scope = 2;
category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
loadout = [["rhs_weap_sr25_ec","","rhsusf_acc_anpeq15side_bk","rhsusf_acc_M8541_mrds",["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",20],[],"rhsusf_acc_harris_bipod"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["kat_chestSeal",2],["kat_guedel",1],["ACE_tourniquet",4],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1]]],["USP_CRYE_JPC_DMB",[["HandGrenade",2,1],["SmokeShell",4,1],["SmokeShellPurple",1,1],["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",6,20]]],["USP_ZIPON_PACK_CPC_MC",[["ACE_wirecutter",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_GSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]];
loadout = [["rhs_weap_sr25_ec","","rhsusf_acc_anpeq15side_bk","optic_AMS",["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",20],[],"rhsusf_acc_harris_bipod"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["kat_chestSeal",2],["kat_guedel",1],["ACE_tourniquet",4],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1],["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",1,20]]],["USP_CRYE_JPC_DMB",[["HandGrenade",2,1],["SmokeShell",4,1],["SmokeShellPurple",1,1],["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",5,20]]],["USP_ZIPON_PACK_CPC_MC",[["ACE_wirecutter",1],["ACE_EntrenchingTool",1],["ACE_splint",4],["kat_Painkiller",2,10]]],"USP_OPSCORE_FASTMTC_GSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]];
insignia = "cav_insignia_specialized_cls";
abilityMedic = 0;
icon = "iconManMedic";
Expand Down
54 changes: 41 additions & 13 deletions cScripts/functions/init/fn_init_logistics.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1672,6 +1672,13 @@ private _dataArray = [
["rhs_weap_mk18_KAC_wd", 0],

//Attachments
["rhsusf_acc_anpeq15side", 0],
["rhsusf_acc_anpeq15side_bk", 0],
["rhsusf_acc_anpeq15A", 0],
["rhsusf_acc_anpeq16A", 0],
["rhsusf_acc_wmx", 0],
["rhsusf_acc_wmx_bk", 0],
["acc_flashlight", 0],
["rhsusf_acc_sf3p556", 0],
["rhsusf_acc_eotech", 0],
["rhsusf_acc_g33_t1", 0],
Expand Down Expand Up @@ -1767,7 +1774,14 @@ private _dataArray = [
["rhsusf_acc_tdstubby_tan", 0],
["rhsusf_acc_grip3", 0],
["rhsusf_acc_grip3_tan", 0],
["rhsusf_acc_eotech_xps3", 0]
["rhsusf_acc_eotech_xps3", 0],
["rhsusf_acc_anpeq15side", 0],
["rhsusf_acc_anpeq15side_bk", 0],
["rhsusf_acc_anpeq15A", 0],
["rhsusf_acc_anpeq16A", 0],
["rhsusf_acc_wmx", 0],
["rhsusf_acc_wmx_bk", 0],
["acc_flashlight", 0]
]],
["arsenal_weap_sr25", [
["rhs_weap_sr25_ec", 0],
Expand All @@ -1779,15 +1793,16 @@ private _dataArray = [

//Attachments
["rhsusf_acc_harris_bipod", 0],
["rhsusf_acc_m8541_d", 0],
["rhsusf_acc_m8541_mrds", 0],
["rhsusf_acc_elcan_ard", 0],
["rhsusf_acc_su230a", 0],
["rhsusf_acc_su230a_c", 0],
["rhsusf_acc_su230a_mrds", 0],
["rhsusf_acc_su230a_mrds_c", 0],
["rhsusf_acc_m8541_wd", 0],
["rhsusf_acc_acog_mdo", 0]
["rhsusf_acc_anpeq15side", 0],
["rhsusf_acc_anpeq15side_bk", 0],
["rhsusf_acc_anpeq15A", 0],
["rhsusf_acc_anpeq16A", 0],
["rhsusf_acc_wmx", 0],
["rhsusf_acc_wmx_bk", 0],
["acc_flashlight", 0],
["optic_AMS", 0],
["optic_AMS_khk", 0],
["optic_AMS_snd", 0]
]],
["arsenal_weap_m240", [
["rhs_weap_m240B", 0],
Expand All @@ -1804,12 +1819,18 @@ private _dataArray = [
["rhsusf_acc_compm4", 0],
["rhsusf_acc_t1_high", 0],
["rhsusf_acc_elcan_ard", 0],
["rhsusf_acc_anpeq16a", 0],
["rhsusf_acc_su230a", 0],
["rhsusf_acc_su230a_c", 0],
["rhsusf_acc_su230a_mrds", 0],
["rhsusf_acc_su230a_mrds_c", 0],
["rhsusf_acc_acog_mdo", 0]
["rhsusf_acc_acog_mdo", 0],
["rhsusf_acc_anpeq15side", 0],
["rhsusf_acc_anpeq15side_bk", 0],
["rhsusf_acc_anpeq15A", 0],
["rhsusf_acc_anpeq16A", 0],
["rhsusf_acc_wmx", 0],
["rhsusf_acc_wmx_bk", 0],
["acc_flashlight", 0]
]],
["arsenal_weap_m249", [
["rhs_weap_m249_pip", 0],
Expand Down Expand Up @@ -1845,7 +1866,14 @@ private _dataArray = [
["rhsusf_acc_kac_grip_saw_bipod", 0],
["rhsusf_acc_grip4", 0],
["rhsusf_acc_grip4_bipod", 0],
["rhsusf_acc_saw_lw_bipod", 0]
["rhsusf_acc_saw_lw_bipod", 0],
["rhsusf_acc_anpeq15side", 0],
["rhsusf_acc_anpeq15side_bk", 0],
["rhsusf_acc_anpeq15A", 0],
["rhsusf_acc_anpeq16A", 0],
["rhsusf_acc_wmx", 0],
["rhsusf_acc_wmx_bk", 0],
["acc_flashlight", 0]
]]

];
Expand Down

0 comments on commit 215dca8

Please sign in to comment.