Skip to content

Commit

Permalink
Charlie Co Equipment Adjustments
Browse files Browse the repository at this point in the history 
- Removing M320 from SL/TLs
- Cleaning up Grenadiers weapons whitelist.
- Adjusting M240 Tripod to only be available for M240 Gunner/Assistant.
  • Loading branch information
@Zarenx
Zarenx committed Oct 2, 2024
1 parent 6742026 commit ea4150d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 32 deletions.
4 changes: 2 additions & 2 deletions cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ class Cav_B_C_SquadLeader_F: Cav_B_Charlie_base_F {
displayName = "$STR_Cav_Charlie_Characters_C_SquadLeader";
scope = 2;
category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],[],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_TLB",[["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["HandGrenade",2,1],["SmokeShellPurple",1,1],["rhs_mag_m713_Red",3,1],["rhs_mag_m714_White",4,1],["SmokeShellBlue",2,1]]],["USP_REEBOW_3DAP_MC",[["ACE_HuntIR_monitor",1],["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2]]],"USP_OPSCORE_FASTMTC_CMGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m4a1","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],[],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_TLB",[["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["HandGrenade",2,1],["SmokeShellPurple",1,1],["rhs_mag_m713_Red",3,1],["rhs_mag_m714_White",4,1],["SmokeShellBlue",2,1]]],["USP_REEBOW_3DAP_MC",[["ACE_HuntIR_monitor",1],["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2]]],"USP_OPSCORE_FASTMTC_CMGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
role = "squadleader";
icon = "iconManLeader";
};
class Cav_B_C_FireTeamLeader_F: Cav_B_Charlie_base_F {
displayName = "$STR_Cav_Charlie_Characters_C_FireTeamLeader";
scope = 2;
category[] += {"cScripts_Loadout_Cat_Charlie_Rifle_Squad"};
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],[],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_TLB",[["ACE_IR_Strobe_Item",1],["SmokeShell",4,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",10,30],["ACE_HuntIR_M203",1,1],["rhs_mag_m713_Red",2,1],["rhs_mag_m714_White",2,1],["SmokeShellPurple",1,1]]],["USP_REEBOW_3DAP_MC",[["ACE_HuntIR_monitor",1],["ACE_splint",2],["ACE_EntrenchingTool",1],["ACE_SpraypaintRed",1],["ACE_CableTie",2],["USP_PVS15",1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",2,200],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m4a1","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],[],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_TLB",[["ACE_IR_Strobe_Item",1],["SmokeShell",4,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",10,30],["ACE_HuntIR_M203",1,1],["rhs_mag_m713_Red",2,1],["rhs_mag_m714_White",2,1],["SmokeShellPurple",1,1]]],["USP_REEBOW_3DAP_MC",[["ACE_HuntIR_monitor",1],["ACE_splint",2],["ACE_EntrenchingTool",1],["ACE_SpraypaintRed",1],["ACE_CableTie",2],["USP_PVS15",1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",2,200],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
role = "fireteamleader";
icon = "iconManLeader";
};
Expand Down
6 changes: 3 additions & 3 deletions cScripts/Loadouts/CfgLoadouts_Charlie_Weapon.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ class Cav_B_Charlie_Weapons_base_F: Cav_B_Charlie_base_F {
class Cav_B_C_Weapons_SquadLeader_F: Cav_B_C_SquadLeader_F {
displayName = "Weapons Squad Leader";
scope = 2;
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],["rhs_mag_m713_Red",1],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_quikclot",10],["kat_chestSeal",2],["kat_guedel",1],["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_CableTie",2],["kat_Painkiller",1,10]]],["USP_CRYE_JPC_TLB",[["ACE_IR_Strobe_Item",1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["SmokeShellRed",2,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",11,30],["rhs_mag_m713_Red",3,1],["ACE_HuntIR_M203",4,1],["SmokeShellBlue",2,1]]],["USP_TACTICAL_PACK",[["ACE_HuntIR_monitor",1],["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_CMSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m4a1_blockII","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],["rhs_mag_m713_Red",1],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_quikclot",10],["kat_chestSeal",2],["kat_guedel",1],["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_CableTie",2],["kat_Painkiller",1,10]]],["USP_CRYE_JPC_TLB",[["ACE_IR_Strobe_Item",1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["SmokeShellRed",2,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",11,30],["rhs_mag_m713_Red",3,1],["ACE_HuntIR_M203",4,1],["SmokeShellBlue",2,1]]],["USP_TACTICAL_PACK",[["ACE_HuntIR_monitor",1],["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_CMSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
};
class Cav_B_C_Weapons_M240B_FireTeamLeader_F: Cav_B_Charlie_Weapons_base_F {
displayName = "Machine Gun Fireteam Leader ";
scope = 2;
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],["rhs_mag_M433_HEDP",1],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_quikclot",10],["kat_chestSeal",2],["kat_guedel",1],["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_CableTie",2],["ACE_splint",2],["kat_Painkiller",1,10]]],["USP_CRYE_CPC_COMMS_BELT_MC",[["ACE_IR_Strobe_Item",1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["rhs_mag_m713_Red",4,1],["rhs_mag_M433_HEDP",7,1],["SmokeShellBlue",2,1],["SmokeShellRed",1,1]]],["B_Kitbag_mcamo",[["USP_PVS15",1],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["rhsusf_100Rnd_762x51_m62_tracer",5,100]]],"USP_OPSCORE_FASTMTC_CMSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m4a1_blockII","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],["rhs_mag_M433_HEDP",1],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_quikclot",10],["kat_chestSeal",2],["kat_guedel",1],["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_CableTie",2],["ACE_splint",2],["kat_Painkiller",1,10]]],["USP_CRYE_CPC_COMMS_BELT_MC",[["ACE_IR_Strobe_Item",1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["rhs_mag_m713_Red",4,1],["rhs_mag_M433_HEDP",7,1],["SmokeShellBlue",2,1],["SmokeShellRed",1,1]]],["B_Kitbag_mcamo",[["USP_PVS15",1],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["rhsusf_100Rnd_762x51_m62_tracer",5,100]]],"USP_OPSCORE_FASTMTC_CMSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
icon = "iconManLeader";
};
class Cav_B_C_Weapons_M240B_Machinegunner_F: Cav_B_Charlie_Weapons_base_F {
Expand Down Expand Up @@ -43,7 +43,7 @@ class Cav_B_C_Weapons_MAAWS_MAAWSAssistant_F: Cav_B_Charlie_Weapons_base_F {
class Cav_B_C_Weapons_Mortar_FireTeamLeader_F: Cav_B_Charlie_Weapons_base_F {
displayName = "Mortar Team Leader";
scope = 2;
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],["rhs_mag_m713_Red",1],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_PlottingBoard",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["ACE_artilleryTable",1],["ACE_IR_Strobe_Item",1],["ACE_splint",2],["kat_Painkiller",1,10]]],["USP_CRYE_CPC_COMMS_BELT_MC",[["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["HandGrenade",2,1],["SmokeShellBlue",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["rhs_mag_m713_Red",4,1]]],["B_Kitbag_mcamo",[["ACE_EntrenchingTool",1],["USP_PVS15",1],["avm224_M_6Rnd_60mm_ILLUM_IR",1,6],["NDS_M_6Rnd_60mm_HE_0",1,6],["NDS_M_6Rnd_60mm_SMOKE",1,6],["NDS_M_6Rnd_60mm_HE",1,6]]],"USP_OPSCORE_FASTMTC_CW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m4a1_blockII","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],["rhs_mag_m713_Red",1],""],[],[],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_PlottingBoard",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["ACE_artilleryTable",1],["ACE_IR_Strobe_Item",1],["ACE_splint",2],["kat_Painkiller",1,10]]],["USP_CRYE_CPC_COMMS_BELT_MC",[["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["HandGrenade",2,1],["SmokeShellBlue",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["rhs_mag_m713_Red",4,1]]],["B_Kitbag_mcamo",[["ACE_EntrenchingTool",1],["USP_PVS15",1],["avm224_M_6Rnd_60mm_ILLUM_IR",1,6],["NDS_M_6Rnd_60mm_HE_0",1,6],["NDS_M_6Rnd_60mm_SMOKE",1,6],["NDS_M_6Rnd_60mm_HE",1,6]]],"USP_OPSCORE_FASTMTC_CW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
};
class Cav_B_C_Weapons_Mortar_M224_F: Cav_B_Charlie_Weapons_base_F {
displayName = "Mortar Gunner";
Expand Down
27 changes: 0 additions & 27 deletions cScripts/cScripts_logistics.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@
["rhs_weap_M136",0],
["rhs_weap_M136_hedp",10],
["rhs_weap_m72a7",10],
["dzn_MG_Tripod_M122A1_M240Mount_Carry",0],

// Ammo
["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0],
Expand Down Expand Up @@ -1823,32 +1822,6 @@
["rhs_weap_m4a1_m320", 0],
["rhs_weap_mk18_m320", 0],
["rhs_weap_M320", 0],
["rhs_weap_m4a1_carryhandle", 0],
["rhs_weap_m4a1_carryhandle_mstock", 0],
["rhs_weap_m4a1", 0],
["rhs_weap_m4a1_mstock", 0],
["rhs_weap_m4a1_d", 0],
["rhs_weap_m4a1_d_mstock", 0],
["rhs_weap_m4a1_wd", 0],
["rhs_weap_m4a1_wd_mstock", 0],

["rhs_weap_m4a1_blockII", 0],
["rhs_weap_m4a1_blockII_KAC", 0],
["rhs_weap_m4a1_blockII_bk", 0],
["rhs_weap_m4a1_blockII_KAC_bk", 0],
["rhs_weap_m4a1_blockII_d", 0],
["rhs_weap_m4a1_blockII_KAC_d", 0],
["rhs_weap_m4a1_blockII_wd", 0],
["rhs_weap_m4a1_blockII_KAC_wd", 0],

["rhs_weap_mk18", 0],
["rhs_weap_mk18_bk", 0],
["rhs_weap_mk18_KAC_bk", 0],
["rhs_weap_mk18_d", 0],
["rhs_weap_mk18_KAC_d", 0],
["rhs_weap_mk18_KAC", 0],
["rhs_weap_mk18_wd", 0],
["rhs_weap_mk18_KAC_wd", 0],

//Attachments
["rhsusf_acc_anpeq15side", 0],
Expand Down

0 comments on commit ea4150d

Please sign in to comment.