diff --git a/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf b/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf index dc8d4d7d9..e5f16a709 100644 --- a/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf +++ b/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf @@ -43,8 +43,12 @@ if (_companySelector == "alpha") then { _crate addWeaponCargoGlobal ["rhs_weap_m4a1_m320",2]; _crate addWeaponCargoGlobal ["rhs_weap_m249_pip_L",2]; _crate addWeaponCargoGlobal ["rhs_weap_M136_hp",6]; + _crate addItemCargoGlobal ["acc_flashlight",50]; _crate addItemCargoGlobal ["rhsusf_acc_anpeq15_bk_light",50]; _crate addItemCargoGlobal ["rhsusf_acc_ELCAN",50]; + _crate addItemCargoGlobal ["rhsusf_acc_compm4",50]; + _crate addItemCargoGlobal ["rhsusf_acc_acog3",50]; + _crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",50]; //================== AMMO ==================\\ @@ -73,6 +77,7 @@ if (_companySelector == "alpha") then { _crate addMagazineCargoGlobal ["rhs_mag_m713_Red",25]; _crate addMagazineCargoGlobal ["ACE_HUNTIR_M203",25]; _crate addMagazineCargoGlobal ["rhs_mag_M585_white",25]; + _crate addMagazineCargoGlobal ["rhs_mag_m662_red",250]; _crate addMagazineCargoGlobal ["Chemlight_green",25]; _crate addMagazineCargoGlobal ["Chemlight_red",25]; _crate addMagazineCargoGlobal ["Chemlight_yellow",25]; @@ -120,7 +125,12 @@ if (_companySelector == "bravo") then { _crate addItemCargoGlobal ["rhsusf_acc_anpeq15_bk_light",50]; _crate addItemCargoGlobal ["rhsusf_acc_ELCAN",50]; + _crate addItemCargoGlobal ["rhsusf_accacog_mdo",50]; + _crate addItemCargoGlobal ["acc_flashlight",50]; _crate addItemCargoGlobal ["rhsusf_acc_eotech_552",50]; + _crate addItemCargoGlobal ["rhsusf_acc_compm4",50]; + _crate addItemCargoGlobal ["rhsusf_acc_acog3",50]; + _crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",50]; _crate addItemCargoGlobal ["rhs_optic_maaws",10]; _crate addWeaponCargoGlobal ["rhs_weap_m240B",5]; _crate addWeaponCargoGlobal ["rhs_weap_maaws",10]; @@ -157,6 +167,7 @@ if (_companySelector == "bravo") then { _crate addMagazineCargoGlobal ["rhs_mag_m713_Red",250]; _crate addMagazineCargoGlobal ["ACE_HUNTIR_M203",250]; _crate addMagazineCargoGlobal ["rhs_mag_M585_white",250]; + _crate addMagazineCargoGlobal ["rhs_mag_m662_red",250]; _crate addMagazineCargoGlobal ["Chemlight_Blue",250]; _crate addMagazineCargoGlobal ["Chemlight_Red",250]; @@ -204,7 +215,11 @@ if (_companySelector == "charlie") then { _crate addItemCargoGlobal ["rhsusf_acc_eotech_552",50]; _crate addItemCargoGlobal ["rhsusf_acc_anpeq15_bk_light",50]; + _crate addItemCargoGlobal ["acc_flashlight",50]; _crate addItemCargoGlobal ["rhsusf_acc_ELCAN",50]; + _crate addItemCargoGlobal ["rhsusf_acc_compm4",50]; + _crate addItemCargoGlobal ["rhsusf_acc_acog3",50]; + _crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",50]; _crate addItemCargoGlobal ["rhs_optic_maaws",10]; _crate addWeaponCargoGlobal ["rhs_weap_maaws",10]; _crate addWeaponCargoGlobal ["rhs_weap_M136_hp",10]; @@ -238,6 +253,7 @@ if (_companySelector == "charlie") then { _crate addMagazineCargoGlobal ["rhs_mag_m713_Red",250]; _crate addMagazineCargoGlobal ["ACE_HUNTIR_M203",250]; _crate addMagazineCargoGlobal ["rhs_mag_M585_white",250]; + _crate addMagazineCargoGlobal ["rhs_mag_m662_red",250]; _crate addMagazineCargoGlobal ["Chemlight_Blue",250]; _crate addMagazineCargoGlobal ["Chemlight_Red",250]; @@ -271,6 +287,7 @@ if (_companySelector == "charlie") then { //================== HELMETS ==================\\ _crate addItemCargoGlobal ["DAR_Beret_Mar",50]; + _crate addItemCargoGlobal ["rhsusf_ach_helmet_camo_ocp",50]; _crate addItemCargoGlobal ["rhsusf_patrolcap_ocp",50]; }; @@ -287,7 +304,11 @@ if (_companySelector == "medical") then { _crate addItemCargoGlobal ["rhsusf_acc_eotech_552",10]; _crate addItemCargoGlobal ["rhsusf_acc_anpeq15_bk_light",50]; + _crate addItemCargoGlobal ["acc_flashlight",50]; _crate addItemCargoGlobal ["rhsusf_acc_ELCAN",50]; + _crate addItemCargoGlobal ["rhsusf_acc_compm4",50]; + _crate addItemCargoGlobal ["rhsusf_acc_acog3",50]; + _crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",50]; //================== AMMO ==================\\ @@ -307,6 +328,7 @@ if (_companySelector == "medical") then { _crate addMagazineCargoGlobal ["B_IR_Grenade",250]; _crate addMagazineCargoGlobal ["ACE_M84",25]; _crate addMagazineCargoGlobal ["rhs_mag_M585_white",250]; + _crate addMagazineCargoGlobal ["rhs_mag_m662_red",250]; _crate addMagazineCargoGlobal ["Chemlight_Blue",250]; _crate addMagazineCargoGlobal ["Chemlight_Red",250]; @@ -371,7 +393,12 @@ if (_companySelector == "heavyweapons") then { _crate addItemCargoGlobal ["rhsusf_acc_eotech_552",50]; _crate addItemCargoGlobal ["rhsusf_acc_anpeq15_bk_light",50]; + _crate addItemCargoGlobal ["acc_flashlight",50]; _crate addItemCargoGlobal ["rhsusf_acc_ELCAN",50]; + _crate addItemCargoGlobal ["rhsusf_acc_compm4",50]; + _crate addItemCargoGlobal ["rhsusf_acc_acog3",50]; + _crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",50]; + _crate addItemCargoGlobal ["rhsusf_accacog_mdo",50]; _crate addItemCargoGlobal ["rhs_optic_maaws",10]; _crate addWeaponCargoGlobal ["rhs_weap_m240B",5]; _crate addWeaponCargoGlobal ["rhs_weap_fim92",10]; @@ -412,6 +439,7 @@ if (_companySelector == "heavyweapons") then { _crate addMagazineCargoGlobal ["rhs_mag_m713_Red",250]; _crate addMagazineCargoGlobal ["ACE_HUNTIR_M203",250]; _crate addMagazineCargoGlobal ["rhs_mag_M585_white",250]; + _crate addMagazineCargoGlobal ["rhs_mag_m662_red",250]; _crate addMagazineCargoGlobal ["Chemlight_Blue",250]; _crate addMagazineCargoGlobal ["Chemlight_Red",250]; diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie.hpp index 5b6db0cde..95e6d31e3 100644 --- a/cScripts/Loadouts/CfgLoadouts_Charlie.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Charlie.hpp @@ -2,7 +2,7 @@ class CAV_Charlie_OFFCR : CAV_Charlie_Base { // Leadership positions PSG and up - backpack[] = {"B_Carryall_mcamo"}; + //backpack[] = {"B_AssaultPack_mcamo"}; headgear[] = {"rhsusf_ach_helmet_headset_ocp"}; vest[] = {"rhsusf_spcs_ocp_squadleader"}; binoculars[] = {"ACE_Vector"}; @@ -14,6 +14,7 @@ class CAV_Charlie_OFFCR : CAV_Charlie_Base { // Leadership positions PSG and up "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",4, "rhs_mag_m67",4, + "ACE_HandFlare_Red",4, "SmokeShell",4, "SmokeShellGreen",1, @@ -40,6 +41,7 @@ class CAV_Charlie_OFFCR : CAV_Charlie_Base { // Leadership positions PSG and up // Electronics "ACE_microDAGR", "ACE_HuntIR_monitor", + "ItemAndroid", // Tools "ACE_SpraypaintRed", @@ -102,6 +104,7 @@ class CAV_Charlie_JFO : CAV_Charlie_Base { // Joint Fires Observer 36.3kg "ACE_HuntIR_monitor", "Laserbatteries",2, "ACE_Vector", + "ItemcTabHCam", "ACE_MX2A", "rhsusf_ANPVS_15", @@ -117,7 +120,7 @@ class CAV_Charlie_JFO : CAV_Charlie_Base { // Joint Fires Observer 36.3kg class CAV_Charlie_SL : CAV_Charlie_Base { // Squad Leader headgear[] = {"rhsusf_ach_helmet_headset_ess_ocp"}; - backpack[] = {"B_Carryall_mcamo"}; + //backpack[] = {"B_AssaultPack_mcamo"}; vest[] = {"rhsusf_spcs_ocp_teamleader_alt"}; binoculars[] = {"ACE_Vector"}; @@ -128,6 +131,7 @@ class CAV_Charlie_SL : CAV_Charlie_Base { // Squad Leader "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",4, "rhs_mag_m67",4, + "ACE_Handflare_Red",4, "SmokeShell",4, "SmokeShellGreen",1, @@ -175,6 +179,7 @@ class CAV_Charlie_TL : CAV_Charlie_Base { // Fire Team Leader "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",4, "rhs_mag_m67",4, + "ACE_HandFlare_Red",2, "SmokeShell",4, "SmokeShellGreen",1, @@ -217,7 +222,7 @@ class CAV_Charlie_AR : CAV_Charlie_Base { // Automatic Rifleman 31.9kg headgear[] = {"rhsusf_ach_helmet_camo_ocp"}; vest[] = {"rhsusf_spcs_ocp_saw"}; - primary[] = {"rhs_weap_m249_pip_L_para","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"}; + primary[] = {"rhs_weap_m249_pip_L_para","rhsusf_acc_anpeq15A","rhsusf_acc_ELCAN_ard"}; magazines[] = { "rhs_200rnd_556x45_M_SAW",5, @@ -263,9 +268,6 @@ class CAV_Charlie_GR : CAV_Charlie_Base { // Grenadier 28.4kg "ACE_MapTools", "ACE_CableTie", - // Electronics - "ACE_microDAGR", - // Tools "ACE_EntrenchingTool" }; @@ -323,8 +325,6 @@ class CAV_Charlie_CLS : CAV_Charlie_Base { // Combat Life Saver 24.3kg "ACE_MapTools", "ACE_CableTie", - "ACE_microDAGR", - // Tools "ACE_EntrenchingTool" }; diff --git a/cScripts/Loadouts/CfgLoadouts_Common.hpp b/cScripts/Loadouts/CfgLoadouts_Common.hpp index 7372da898..bd534cdec 100644 --- a/cScripts/Loadouts/CfgLoadouts_Common.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Common.hpp @@ -156,7 +156,7 @@ class CAV_Bravo_Base : CommonBlufor { }; class CAV_Charlie_Base : CommonBlufor { - backpack[] = {"B_Kitbag_cbr"}; + backpack[] = {"B_AssaultPack_mcamo"}; //goggles[] = {"rhs_googles_clear"}; headgear[] = {"rhsusf_ach_helmet_ocp"}; uniform[] = {"LOP_U_ISTS_Fatigue_19"}; @@ -180,9 +180,6 @@ class CAV_Charlie_Base : CommonBlufor { "ACE_MapTools", "ACE_CableTie", - // Electronics - "ACE_microDAGR", - // Tools "ACE_Canteen", "ACE_EntrenchingTool"