From 8971c558737e18e684caaea1891f04e119358cf2 Mon Sep 17 00:00:00 2001 From: Zarenx <111392464+Zarenx@users.noreply.github.com> Date: Mon, 16 Dec 2024 16:16:40 +0100 Subject: [PATCH 1/4] Added Death & Hit reactions CBA Settings (#1255) --- cba_settings.sqf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cba_settings.sqf b/cba_settings.sqf index 91a345365..730bb3d6c 100644 --- a/cba_settings.sqf +++ b/cba_settings.sqf @@ -737,6 +737,19 @@ force force cba_network_loadoutValidation = 1; //ctab_core_useArmaMarker = true; //ctab_core_useMils = false; +// Death && Hit Reactions +force force WBK_DeathAnimMod_Death_Chance = "100"; +force force WBK_DeathAnimMod_Deaths_AI = true; +force force WBK_DeathAnimMod_Deaths_HUGEANIMS = true; +force force WBK_DeathAnimMod_Deaths_NECKSHOTS = true; +force force WBK_DeathAnimMod_Deaths_PLR = true; +force force WBK_DeathAnimMod_Flinch_AI = true; +force force WBK_DeathAnimMod_Flinch_PLR = true; +force force WBK_DeathAnimMod_Hit_AI = true; +force force WBK_DeathAnimMod_Hit_Chance = "100"; +force force WBK_DeathAnimMod_Hit_Chance_PLR = "100"; +force force WBK_DeathAnimMod_Hit_PLR = false; + // DUI - Squad Radar - Indicators //diwako_dui_indicators_crew_range_enabled = false; //diwako_dui_indicators_fov_scale = false; From f96c2406c19dccc776f8ee8f5a2b1cee716bdd27 Mon Sep 17 00:00:00 2001 From: "Blake.H" Date: Tue, 17 Dec 2024 13:09:00 +0000 Subject: [PATCH 2/4] Changed Medical loadouts equipment ratios (#1258) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Broström.A | Evul --- cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp | 17 +++++++++-------- cScripts/cScripts_logistics.sqf | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp index 73d0ed73d..801d0c70b 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp @@ -12,28 +12,29 @@ class Cav_B_Bravo_Atlas_base_F: Cav_B_Bravo_base_F { class Cav_B_B_Atlas_Medic_TeamLeader_F: Cav_B_Bravo_Atlas_base_F { displayName = "Team Leader"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",4],["kat_norepinephrine",8],["kat_phenylephrine",10],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",10],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",5],["kat_nalbuphine",10],["kat_TXA",2],["kat_lidocaine",5],["kat_EACA",2],["kat_atropine",5],["kat_amiodarone",5],["ACE_splint",4],["ACE_adenosine",1],["kat_phenylephrineAuto",2],["kat_epinephrineIV",4],["ACE_epinephrine",2],["kat_ultrasound",1],["kat_BVM",1],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_TACTICAL_PACK",[["kat_AED",1],["ACE_plasmaIV",2],["ACE_plasmaIV_500",6],["kat_larynx",10],["kat_accuvac",1],["kat_aatKit",5],["ACE_bloodIV",2],["ACE_bloodIV_500",6],["ACE_salineIV_500",2]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; -}; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",4],["kat_norepinephrine",8],["kat_phenylephrine",10],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",10],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",5],["kat_nalbuphine",10],["kat_TXA",4],["kat_lidocaine",5],["kat_EACA",2],["kat_atropine",5],["kat_amiodarone",5],["ACE_splint",4],["ACE_adenosine",1],["kat_phenylephrineAuto",2],["kat_epinephrineIV",8],["kat_ultrasound",1],["kat_BVM",1],["kat_aatKit",5],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_TACTICAL_PACK",[["kat_AED",1],["ACE_plasmaIV_500",5],["kat_larynx",10],["kat_accuvac",1],["ACE_bloodIV",4],["ACE_bloodIV_500",7],["ACE_salineIV_500",2]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + }; class Cav_B_B_Atlas_Medic_CombatMedic_F: Cav_B_B_Atlas_Medic_TeamLeader_F { displayName = "Team Member"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["ACE_IR_Strobe_Item",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",4],["kat_norepinephrine",8],["kat_phenylephrine",10],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",20],["kat_stethoscope",1],["kat_nitroglycerin",10],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",5],["kat_nalbuphine",8],["ACE_adenosine",1],["ACE_epinephrine",2],["kat_amiodarone",3],["kat_atropine",8],["kat_EACA",2],["kat_TXA",2],["ACE_splint",4],["ACE_EntrenchingTool",1],["kat_reboa",1],["kat_ultrasound",1],["kat_phenylephrineAuto",2],["kat_BVM",1],["kat_epinephrineIV",4],["ACE_microDAGR",1],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",2],["kat_lidocaine",5],["ACE_salineIV_250",2],["kat_aatKit",5],["ACE_plasmaIV_500",7],["kat_accuvac",1],["ACE_bloodIV",2],["ACE_salineIV_500",2],["ACE_bloodIV_500",7],["ACE_bloodIV_250",2],["ACE_plasmaIV_250",2]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; -}; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["ACE_IR_Strobe_Item",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",4],["kat_norepinephrine",8],["kat_phenylephrine",10],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",20],["kat_stethoscope",1],["kat_nitroglycerin",10],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",5],["kat_nalbuphine",8],["kat_amiodarone",3],["kat_atropine",2],["kat_EACA",2],["kat_TXA",4],["ACE_splint",4],["ACE_EntrenchingTool",1],["kat_reboa",1],["kat_ultrasound",1],["kat_phenylephrineAuto",2],["kat_BVM",1],["kat_epinephrineIV",8],["ACE_microDAGR",1],["ACE_adenosine",8],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["kat_lidocaine",5],["ACE_salineIV_250",2],["kat_aatKit",5],["ACE_plasmaIV_500",6],["kat_accuvac",1],["ACE_bloodIV",4],["ACE_salineIV_500",2],["ACE_bloodIV_500",8],["ACE_bloodIV_250",2],["ACE_plasmaIV_250",2]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + }; class Cav_B_B_Atlas_Medic_CRNA_F: Cav_B_B_Atlas_Medic_TeamLeader_F { displayName = "CRNA"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["ACE_IR_Strobe_Item",1],["USP_PVS15",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",4],["kat_norepinephrine",6],["kat_phenylephrine",10],["ACE_packingBandage",10],["ACE_elasticBandage",20],["kat_IV_16",15],["kat_nitroglycerin",10],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",5],["kat_nalbuphine",8],["ACE_epinephrine",2],["kat_amiodarone",5],["kat_atropine",3],["kat_EACA",2],["kat_TXA",2],["ACE_splint",4],["kat_ultrasound",1],["ACE_adenosine",1],["kat_phenylephrineAuto",2],["ACE_microDAGR",1],["kat_epinephrineIV",4],["kat_stethoscope",1],["kat_BVM",1],["SmokeShellBlue",2,1],["SmokeShellPurple",1,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",2],["kat_lidocaine",10],["ACE_salineIV_250",2],["kat_aatKit",3],["ACE_plasmaIV_500",6],["kat_accuvac",1],["kat_X_AED",1],["kat_etomidate",12],["kat_flumazenil",6],["kat_lorazepam",6],["ACE_bloodIV",2],["ACE_bloodIV_500",6],["ACE_salineIV_500",1],["kat_oxygenTank_150",1,100]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; -}; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["ACE_IR_Strobe_Item",1],["USP_PVS15",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",4],["kat_norepinephrine",6],["kat_phenylephrine",10],["ACE_packingBandage",10],["ACE_elasticBandage",20],["kat_IV_16",15],["kat_nitroglycerin",10],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",5],["kat_nalbuphine",8],["kat_amiodarone",5],["kat_atropine",1],["kat_EACA",2],["kat_TXA",4],["ACE_splint",4],["kat_ultrasound",1],["ACE_adenosine",5],["kat_phenylephrineAuto",2],["ACE_microDAGR",1],["kat_epinephrineIV",8],["kat_stethoscope",1],["kat_BVM",1],["SmokeShellBlue",2,1],["SmokeShellPurple",1,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["kat_lidocaine",10],["ACE_salineIV_250",2],["kat_aatKit",3],["ACE_plasmaIV_500",5],["kat_accuvac",1],["kat_X_AED",1],["kat_etomidate",12],["kat_flumazenil",6],["kat_lorazepam",6],["ACE_bloodIV",4],["ACE_bloodIV_500",7],["ACE_salineIV_500",2]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + }; class Cav_B_B_Atlas_Medic_Surgeon_F_Local: Cav_B_B_Atlas_Medic_TeamLeader_F { displayName = "Surgeon"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["ACE_IR_Strobe_Item",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",3],["kat_norepinephrine",4],["kat_phenylephrine",8],["ACE_packingBandage",5],["ACE_elasticBandage",25],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",6],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",4],["kat_nalbuphine",8],["ACE_adenosine",1],["kat_amiodarone",5],["kat_atropine",5],["kat_EACA",2],["kat_TXA",2],["kat_BVM",1],["ACE_epinephrine",2],["ACE_splint",4],["kat_phenylephrineAuto",2],["kat_ultrasound",1],["ACE_EntrenchingTool",1],["kat_epinephrineIV",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_DELTA_BAG_MC",[["kat_vacuum",1],["kat_etomidate",14],["kat_flumazenil",6],["kat_larynx",10],["kat_lorazepam",6],["ACE_plasmaIV",2],["ACE_plasmaIV_500",6],["ACE_salineIV_250",6],["kat_scalpel",30],["kat_accuvac",1],["kat_reboa",10],["kat_aatKit",5],["kat_plate",10],["kat_clamp",1],["kat_retractor",1],["ACE_bloodIV",2],["ACE_bloodIV_500",6],["kat_lidocaine",10]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; -}; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["ACE_IR_Strobe_Item",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",3],["kat_norepinephrine",4],["kat_phenylephrine",8],["ACE_packingBandage",5],["ACE_elasticBandage",25],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",6],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",4],["kat_nalbuphine",8],["kat_amiodarone",5],["kat_atropine",2],["kat_EACA",2],["kat_TXA",4],["kat_BVM",1],["ACE_splint",4],["kat_phenylephrineAuto",2],["kat_ultrasound",1],["ACE_EntrenchingTool",1],["kat_epinephrineIV",8],["ACE_adenosine",8],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_DELTA_BAG_MC",[["kat_vacuum",1],["kat_etomidate",14],["kat_flumazenil",6],["kat_larynx",10],["kat_lorazepam",6],["ACE_plasmaIV_500",5],["ACE_salineIV_250",6],["kat_scalpel",30],["kat_accuvac",1],["kat_reboa",10],["kat_aatKit",5],["kat_plate",10],["kat_clamp",1],["kat_retractor",1],["ACE_bloodIV",4],["ACE_bloodIV_500",7],["kat_lidocaine",10]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + }; // Named class Cav_B_B_Atlas_Medic_TeamLeader_3_1_F: Cav_B_B_Atlas_Medic_TeamLeader_F { scope = 1; }; class Cav_B_B_Atlas_Medic_TeamLeader_3_2_F: Cav_B_B_Atlas_Medic_TeamLeader_F { scope = 1; }; + diff --git a/cScripts/cScripts_logistics.sqf b/cScripts/cScripts_logistics.sqf index 11f28f6cf..be92dea80 100644 --- a/cScripts/cScripts_logistics.sqf +++ b/cScripts/cScripts_logistics.sqf @@ -1738,6 +1738,7 @@ // Diagnostic Tools ["kat_Pulseoximeter",0], ["kat_stethoscope",0], + ["kat_ultrasound",0], // Fluids ["ACE_bloodIV",0], From 19dede45860aba6866683ce9a1bcb863dd51ccf9 Mon Sep 17 00:00:00 2001 From: "Geki.T" <46270872+Robot-Panda15@users.noreply.github.com> Date: Tue, 17 Dec 2024 07:10:53 -0600 Subject: [PATCH 3/4] Updated Bravo arsenal equipment (#1256) --- cScripts/cScripts_logistics.sqf | 70 +++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/cScripts/cScripts_logistics.sqf b/cScripts/cScripts_logistics.sqf index be92dea80..959b451cb 100644 --- a/cScripts/cScripts_logistics.sqf +++ b/cScripts/cScripts_logistics.sqf @@ -175,8 +175,8 @@ ["USP_OPSCORE_FASTMTC_MCA_CSW", 0], // Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0], - ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red", 50], + ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 56], + ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red", 56], ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan", 0], ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red", 0], ["30Rnd_556x45_Stanag_Sand_red", 0], @@ -186,11 +186,26 @@ // NVG ["USP_PVS14", 0], ["USP_PVS15", 0], - ["USP_L4G19", 0], - ["USP_L4G24",0], - ["USP_PVS31",0], + ["USP_PVS15_WP", 0], + ["USP_L4G24_BLK",0], + ["USP_PVS31_BLK",0], ["USP_PVS31_BLK2",0], - ["USP_PVS31_TAN2",0], + ["USP_PVS31_WP_BLK",0], + ["USP_PVS31_WP_BLK2",0], + ["USP_PVS31_HIGH_BLK",0], + ["USP_PVS31_HIGH_BLK2",0], + ["USP_PVS31_WP_HIGH_BLK",0], + ["USP_PVS31_WP_HIGH_BLK2",0], + ["USP_PVS31_LOW_BLK",0], + ["USP_PVS31_LOW_BLK2",0], + ["USP_PVS31_WP_LOW_BLK",0], + ["USP_PVS31_WP_LOW_BLK2",0], + ["USP_PVS31_MID_BLK",0], + ["USP_PVS31_MID_BLK2",0], + ["USP_PVS31_WP_MID_BLK",0], + ["USP_PVS31_WP_MID_BLK2",0], + ["USP_PVS31_WP_BLK",0], + ["USP_PVS31_WP_BLK2",0], ["USP_RHINO", 0], // cTab @@ -284,8 +299,38 @@ ["DemoCharge_Remote_Mag",0], ["ClaymoreDirectionalMine_Remote_Mag",0], + //Vests + ["V_TacChestrig_cbr_F", 0], + ["V_CarrierRigKBT_01_light_OCP_F",0], + // Backpack ["B_AssaultPack_mcamo", 0], + ["USP_45L_RUCKSACK_MC",0], + ["USP_ZIPON_PACK_CPC_MC",0], + ["USP_ZIPON_PACK_CPC_AT_MC",0], + ["USP_ZIPON_PACK_CPC_AT_RF2_MC",0], + ["USP_ZIPON_PACK_CPC_AT_RF2_SM_MC",0], + ["USP_ZIPON_PACK_CPC_AT_SM_MC",0], + ["USP_ZIPON_PACK_CPC_AT_RF2_MC",0], + ["USP_ZIPON_PACK_CPC_BC_SM_MC",0], + ["USP_ZIPON_PACK_CPC_RF2_SM_MC",0], + ["USP_ZIPON_PACK_CPC_AT_RF2_MC",0], + ["USP_ZIPON_PACK_CPC_SM_MC",0], + ["USP_ZIPON_PANEL_CPC_MC",0], + ["USP_ZIPON_PANEL_CPC_BC_MC",0], + ["USP_ZIPON_PANEL_CPC_BC_SM_MC",0], + ["USP_ZIPON_PANEL_CPC_BC_SMK_MC",0], + ["USP_ZIPON_PANEL_CPC_BC_SMK_SM_MC",0], + ["USP_ZIPON_PANEL_CPC_RF2_MC",0], + ["USP_ZIPON_PANEL_CPC_RF2_SM_MC",0], + ["USP_ZIPON_PANEL_CPC_RF2_SMK_MC",0], + ["USP_ZIPON_PANEL_CPC_RF2_SMK_SM_MC",0], + ["USP_ZIPON_PANEL_CPC_SM_MC",0], + ["USP_ZIPON_PANEL_CPC_SMK_MC",0], + ["USP_ZIPON_PANEL_CPC_SMK_SM_MC",0], + ["USP_REEBOW_3DAP_ACC3_MC",0], + ["USP_REEBOW_3DAP_ACC6_MC",0], + ["USP_TACTICAL_PACK_PO7",0], ["USP_REEBOW_3DAP_MC", 0], ["USP_REEBOW_3DAP_ACC1_MC", 0], ["USP_REEBOW_3DAP_ACC10_MC", 0], @@ -1411,6 +1456,11 @@ ["ACE_splint",0], // Night Gear + ["USP_PVS14",0], + ["USP_PVS15",0], + ["USP_PVS15_WP",0], + ["USP_RHINO",0], + ["USP_L4G24_BLK",0], ["ACE_IR_Strobe_Item",0], // Radios @@ -1948,6 +1998,9 @@ ["rhs_weap_mk18_wd", 0], ["rhs_weap_mk18_KAC_wd", 0], + //Vests + ["V_TacChestrig_cbr_F", 0], + //Attachments ["rhsusf_acc_sf3p556", 0], ["rhsusf_acc_eotech", 0], @@ -1997,7 +2050,10 @@ //Magazines ["rhsusf_20Rnd_762x51_SR25_m118_special_Mag", 0], - + + //Vests + ["V_TacChestrig_cbr_F", 0], + //Attachments ["rhsusf_acc_harris_bipod", 0], ["rhsusf_acc_anpeq15side", 0], From 44f1972346da2a3363f84af8f9a741630e422f00 Mon Sep 17 00:00:00 2001 From: deathmachine221 <116521935+deathmachine221@users.noreply.github.com> Date: Wed, 18 Dec 2024 04:35:07 -0500 Subject: [PATCH 4/4] Updated Charlie Machinegunner loadout (#1254) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Broström.A | Evul --- cScripts/Loadouts/CfgLoadouts_Charlie_Weapon.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie_Weapon.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie_Weapon.hpp index 8d7ef7184..1d32058e3 100644 --- a/cScripts/Loadouts/CfgLoadouts_Charlie_Weapon.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Charlie_Weapon.hpp @@ -17,7 +17,7 @@ class Cav_B_C_Weapons_M240B_FireTeamLeader_F: Cav_B_Charlie_Weapons_base_F { class Cav_B_C_Weapons_M240B_Machinegunner_F: Cav_B_Charlie_Weapons_base_F { displayName = "Machine Gunner"; scope = 2; - loadout = [["rhs_weap_m240B","rhsusf_acc_ARDEC_M240","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_MDO",["rhsusf_100Rnd_762x51_m62_tracer",100],[],""],[],[],["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_packingBandage",10],["ACE_splint",2],["USP_PVS15",1],["kat_Painkiller",1,4],["SmokeShell",1,1]]],["USP_CRYE_JPC_MGB",[["SmokeShell",1,1],["rhsusf_100Rnd_762x51_m62_tracer",6,100],["HandGrenade",2,1]]],[],"USP_OPSCORE_FASTMTC_CW","",[],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + loadout = [["rhs_weap_m240B","rhsusf_acc_ARDEC_M240","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_MDO",["rhsusf_100Rnd_762x51_m62_tracer",100],[],""],[],[],["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_packingBandage",10],["ACE_splint",2],["USP_PVS15",1],["ACE_EarPlugs",1],["kat_Painkiller",1,4],["SmokeShell",1,1]]],["USP_CRYE_JPC_MGB",[["SmokeShell",1,1],["rhsusf_100Rnd_762x51_m62_tracer",6,100],["HandGrenade",2,1]]],["USP_HYDRATION_PACK_MC",[]],"USP_OPSCORE_FASTMTC_CW","",[],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; icon = "iconManMG"; };