diff --git a/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf b/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf index bf6a11a61..dcfabe9c0 100644 --- a/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf +++ b/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf @@ -395,6 +395,7 @@ if (_companySelector in _bravo or _alwaysAvalible) then { _crate addItemCargoGlobal ["ACE_wirecutter",10]; _crate addItemCargoGlobal ["ACE_EntrenchingTool",20]; _crate addItemCargoGlobal ["ACE_IR_Strobe_Item",20]; + _crate addItemCargoGlobal ["ItemAndroid", 10]; _crate addItemCargoGlobal ["ItemcTab", 10]; @@ -403,15 +404,23 @@ if (_companySelector in _bravo or _alwaysAvalible) then { _crate addItemCargoGlobal ["ACE_EarPlugs",250]; - _crate addItemCargoGlobal ["ACE_elasticBandage",250]; _crate addItemCargoGlobal ["ACE_quikclot",250]; + _crate addItemCargoGlobal ["ACE_packingBandage",250]; + _crate addItemCargoGlobal ["ACE_elasticBandage",250]; + _crate addItemCargoGlobal ["ACE_fieldDressing",250]; _crate addItemCargoGlobal ["ACE_tourniquet",250]; + _crate addItemCargoGlobal ["ACE_splint",250]; + + _crate addItemCargoGlobal ["ACE_adenosine",250]; + _crate addItemCargoGlobal ["ACE_epinephrine",250]; + _crate addItemCargoGlobal ["ACE_morphine",250]; _crate addItemCargoGlobal ["ACE_personalAidKit",250]; _crate addItemCargoGlobal ["ACE_surgicalKit",250]; _crate addItemCargoGlobal ["ACE_salineIV",250]; + _crate addItemCargoGlobal ["ACE_salineIV_250",250]; _crate addItemCargoGlobal ["ACE_salineIV_500",250]; _crate addItemCargoGlobal ["ACE_bodyBag",250]; diff --git a/cScripts/CavFnc/functions/modules/fn_zenModuleCreateFieldHospital.sqf b/cScripts/CavFnc/functions/modules/fn_zenModuleCreateFieldHospital.sqf index 2c91cdb98..8d7b38bc1 100644 --- a/cScripts/CavFnc/functions/modules/fn_zenModuleCreateFieldHospital.sqf +++ b/cScripts/CavFnc/functions/modules/fn_zenModuleCreateFieldHospital.sqf @@ -34,17 +34,9 @@ params ["_modulePos", "_objectPos"]; [_crate, true] call ace_dragging_fnc_setCarryable; // Add object to Zeus - [ - { - params ["_crate"]; - _crate == vehicle _crate; - }, - { - params ["_crate"]; - _crate call FUNC(addObjectToCurator); - }, - [_crate] - ] call CBA_fnc_waitUntilAndExecute; + [{ + _this call ace_zeus_fnc_addObjectToCurator; + }, _crate] call CBA_fnc_execNextFrame; }, {}, [_modulePos] diff --git a/cScripts/CavFnc/functions/modules/fn_zenModuleCreateMedicalCrate.sqf b/cScripts/CavFnc/functions/modules/fn_zenModuleCreateMedicalCrate.sqf index 12b9078fa..3ea08785f 100644 --- a/cScripts/CavFnc/functions/modules/fn_zenModuleCreateMedicalCrate.sqf +++ b/cScripts/CavFnc/functions/modules/fn_zenModuleCreateMedicalCrate.sqf @@ -26,7 +26,7 @@ params ["_modulePos", "_objectPos"]; _pos params ["_modulePos"]; private _crate = "ACE_medicalSupplyCrate" createVehicle _modulePos; - [_crate, _size] remoteExec [QFUNC(doMedicalCrate), 2, true]; + [_crate, _size] remoteExec [QFUNC(doMedicalCrate), 0, true]; // Change ace characteristics of crate [_crate, 1] call ace_cargo_fnc_setSize; @@ -34,17 +34,9 @@ params ["_modulePos", "_objectPos"]; [_crate, true] call ace_dragging_fnc_setCarryable; // Add object to Zeus - [ - { - params ["_crate"]; - _crate == vehicle _crate; - }, - { - params ["_crate"]; - _crate call FUNC(addObjectToCurator); - }, - [_crate] - ] call CBA_fnc_waitUntilAndExecute; + [{ + _this call ace_zeus_fnc_addObjectToCurator; + }, _crate] call CBA_fnc_execNextFrame; }, {}, [_modulePos] diff --git a/cScripts/CavFnc/functions/modules/fn_zenModuleCreateStarterCrate.sqf b/cScripts/CavFnc/functions/modules/fn_zenModuleCreateStarterCrate.sqf index 3f9292b46..1a784d1e6 100644 --- a/cScripts/CavFnc/functions/modules/fn_zenModuleCreateStarterCrate.sqf +++ b/cScripts/CavFnc/functions/modules/fn_zenModuleCreateStarterCrate.sqf @@ -81,16 +81,13 @@ params ["_modulePos", "_objectPos"]; "_arsenal" ]; _pos params ["_modulePos"]; - private _crate = "B_supplyCrate_F" createVehicle _modulePos; - [_crate, _quickSelectScale, _reGearOption, _reHealOption, _InsigniaSelectOption, _requireCompanyVariable, _arsenal] remoteExec [QFUNC(doStarterCrate), -2, true]; - [{ - _this params ["_crate", "_quickSelectScale"]; - [_crate, _quickSelectScale] remoteExec [QFUNC(doStarterCrateSupplies), 2, true]; - }, ["_crate", "_quickSelectScale"]] call CBA_fnc_execNextFrame; + [_crate, _quickSelectScale, _reGearOption, _reHealOption, _InsigniaSelectOption, _requireCompanyVariable, _arsenal] remoteExec [QFUNC(doStarterCrate), 0, true]; // Add object to Zeus - [_crate] call ace_zeus_fnc_addObjectToCurator; + [{ + _this call ace_zeus_fnc_addObjectToCurator; + }, _crate] call CBA_fnc_execNextFrame; }, {}, [_modulePos] diff --git a/cScripts/CavFnc/functions/modules/fn_zenModuleCreateSupplyCrate.sqf b/cScripts/CavFnc/functions/modules/fn_zenModuleCreateSupplyCrate.sqf index d7947fa49..5a79d2d28 100644 --- a/cScripts/CavFnc/functions/modules/fn_zenModuleCreateSupplyCrate.sqf +++ b/cScripts/CavFnc/functions/modules/fn_zenModuleCreateSupplyCrate.sqf @@ -27,10 +27,7 @@ params ["_modulePos", "_objectPos"]; private _crate = "B_CargoNet_01_ammo_F" createVehicle _modulePos; - [{ - _this params ["_crate", "_size"]; - [_crate, _size] remoteExec [QFUNC(doSupplyCrate), 2, true]; - }, ["_crate", "_size"]] call CBA_fnc_execNextFrame; + [_crate, _size] remoteExec [QFUNC(doSupplyCrate), 0, true]; // Change ace characteristics of crate @@ -39,7 +36,9 @@ params ["_modulePos", "_objectPos"]; [_crate, true] call ace_dragging_fnc_setCarryable; // Add object to Zeus - [_crate] call ace_zeus_fnc_addObjectToCurator; + [{ + _this call ace_zeus_fnc_addObjectToCurator; + }, _crate] call CBA_fnc_execNextFrame; }, {}, [_modulePos] diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp index 0bbbfd303..6fedf0d2c 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp @@ -7,53 +7,18 @@ class Cav_B_Bravo_Atlas_base_F : Cav_B_Bravo_base_F { //abilityEOD = 0; }; -class Cav_B_B_Atlas_Logistics_OpsOfficer_F : Cav_B_Bravo_Atlas_base_F { - displayName = "$STR_cav_troops_bravo_atlas_b_atlas_logistics_opsofficer"; - scope = 2; - loadout = [["rhs_weap_m4a1_mstock","rhsusf_acc_SFMB556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_Stanag",30],[],"rhsusf_acc_grip3"],[],[],["rhs_uniform_acu_oefcp",[["ACRE_PRC343",1],["ACE_MapTools",1],["ACE_Flashlight_XL50",1],["ACE_microDAGR",1],["ACE_EarPlugs",1],["ACE_CableTie",1],["ACE_quikclot",16],["B_IR_Grenade",1,1]]],["rhsusf_spcs_ocp_teamleader_alt",[["rhs_mag_30Rnd_556x45_M855A1_Stanag",5,30],["rhs_mag_m67",2,1],["SmokeShell",2,1],["SmokeShellGreen",2,1],["ACE_Chemlight_UltraHiOrange",6,1],["B_IR_Grenade",5,1]]],["B_Carryall_mcamo",[["ACE_quikclot",14],["ACE_tourniquet",4],["ACE_personalAidKit",1],["rhsusf_ANPVS_14",1],["ACE_splint",2],["ACE_morphine",2],["ACRE_PRC117F",1],["ACE_MapTools",1],["ACE_Flashlight_XL50",1],["ACE_microDAGR",1],["ACE_EarPlugs",1]]],"rhsusf_ach_bare_headset","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","ItemRadioAcreFlagged","ItemCompass","ItemWatch",""]]; - abilityEngineer = 1; - abilityEOD = 1; -}; -class Cav_B_B_Atlas_Logistics_OpsNCO_F : Cav_B_Bravo_Atlas_base_F { - displayName = "$STR_cav_troops_bravo_atlas_b_atlas_logistics_opsnco"; - scope = 2; - loadout = [["rhs_weap_m4a1","rhsusf_acc_SFMB556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_Stanag",30],[],"rhsusf_acc_tdstubby_tan"],[],[],["rhs_uniform_acu_ocp",[["ACRE_PRC343",1],["ACE_MapTools",1],["ACE_Flashlight_XL50",1],["ACE_microDAGR",1],["ACE_EarPlugs",1],["ACE_CableTie",1],["ACE_quikclot",20],["ACE_tourniquet",4]]],["rhsusf_spcs_ocp_teamleader_alt",[["rhs_mag_30Rnd_556x45_M855A1_Stanag",5,30],["rhs_mag_m67",2,1],["SmokeShell",2,1],["SmokeShellGreen",2,1],["ACE_Chemlight_UltraHiOrange",6,1],["B_IR_Grenade",5,1]]],["B_Carryall_mcamo",[["ACE_personalAidKit",1],["rhsusf_ANPVS_14",1],["ACE_quikclot",10],["ACE_splint",2],["ACE_morphine",2],["ACRE_PRC117F",1],["ACE_MapTools",1],["ACE_Flashlight_XL50",1],["ACE_microDAGR",1],["ACE_EarPlugs",1],["B_IR_Grenade",1,1]]],"rhsusf_ach_bare_headset","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","ItemRadioAcreFlagged","ItemCompass","ItemWatch",""]]; - abilityEngineer = 1; - abilityEOD = 1; -}; - class Cav_B_B_Atlas_Medic_TeamLeader_F : Cav_B_Bravo_Atlas_base_F { displayName = "$STR_cav_troops_bravo_atlas_b_atlas_logistics_teamleader"; - scope = 2; - loadout = [["rhs_weap_m4a1_mstock_grip3","rhsusf_acc_SFMB556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_Stanag",30],[],"rhsusf_acc_tdstubby_blk"],[],[],["rhs_uniform_acu_ocp",[["ACRE_PRC343",1],["ACRE_PRC152",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Flashlight_XL50",1],["ACE_CableTie",4],["ACE_EarPlugs",1]]],["rhsusf_mbav_medic",[["ACE_morphine",20],["ACE_epinephrine",20],["ACE_adenosine",6],["ACE_surgicalKit",1],["ACRE_PRC152",1],["rhs_mag_30Rnd_556x45_M855A1_Stanag",5,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["ACE_Chemlight_HiYellow",4,1],["ACE_Chemlight_HiRed",4,1]]],["B_Carryall_mcamo",[["ACE_quikclot",50],["ACE_tourniquet",14],["ACE_splint",8],["ACE_elasticBandage",40],["ACE_salineIV",10],["ACE_personalAidKit",6],["rhsusf_ANPVS_14",1]]],"rhsusf_ach_bare_tan_headset","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch",""]]; - abilityMedic = 2; -}; -class Cav_B_B_Atlas_Medic_CombatMedic_F : Cav_B_Bravo_Atlas_base_F { - displayName = "$STR_cav_troops_bravo_atlas_b_atlas_medic_combatmedic"; - scope = 2; + scope = 1; loadout = [["rhs_weap_m4a1","rhsusf_acc_SFMB556","rhsusf_acc_anpeq15_bk","rhsusf_acc_compm4",["rhs_mag_30Rnd_556x45_M855A1_Stanag",30],[],"rhsusf_acc_tdstubby_blk"],[],[],["rhs_uniform_acu_ocp",[["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Flashlight_XL50",1],["ACE_CableTie",4],["ACE_EarPlugs",1],["ACRE_PRC343",1],["ACRE_PRC152",1]]],["rhsusf_mbav_medic",[["ACE_morphine",20],["ACE_epinephrine",20],["ACE_adenosine",6],["ACE_surgicalKit",1],["rhs_mag_30Rnd_556x45_M855A1_Stanag",5,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["ACE_Chemlight_HiYellow",4,1],["ACE_Chemlight_HiRed",4,1]]],["B_Carryall_mcamo",[["ACE_quikclot",50],["ACE_tourniquet",14],["ACE_splint",8],["ACE_elasticBandage",50],["ACE_salineIV",10],["ACE_personalAidKit",6],["rhsusf_ANPVS_14",1]]],"rhsusf_ach_bare_tan_headset","",[],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch",""]]; + insignia = "cav_insignia_specialized_cls"; abilityMedic = 2; }; - -class Cav_B_B_Atlas_Logistics_TeamLeader_F : Cav_B_Bravo_Atlas_base_F { - displayName = "$STR_cav_troops_bravo_atlas_b_atlas_logistics_teamleader"; - scope = 2; - loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SFMB556","rhsusf_acc_anpeq15_bk","rhsusf_acc_compm4",["rhs_mag_30Rnd_556x45_M855A1_Stanag",30],["rhs_mag_m714_White",1],""],[],[],["rhs_uniform_acu_oefcp",[["ACRE_PRC343",1],["ACE_MapTools",1],["ACE_Flashlight_XL50",1],["ACE_microDAGR",1],["ACE_EarPlugs",1],["ACE_CableTie",1],["ACE_quikclot",20],["ACE_tourniquet",4]]],["rhsusf_spcs_ocp_saw",[["ACRE_PRC152",2],["rhs_mag_30Rnd_556x45_M855A1_Stanag",5,30],["SmokeShell",2,1],["SmokeShellGreen",2,1],["ACE_Chemlight_UltraHiOrange",5,1],["B_IR_Grenade",4,1],["rhs_mag_m714_White",1,1],["ACE_HuntIR_M203",3,1]]],["B_Carryall_mcamo",[["ACE_personalAidKit",1],["rhsusf_ANPVS_14",1],["ACE_splint",2],["ACE_morphine",2],["ToolKit",1],["ACRE_PRC152",1]]],"rhsusf_ach_bare_headset","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","ItemRadioAcreFlagged","ItemCompass","ItemWatch",""]]; - abilityEngineer = 2; - abilityEOD = 1; -}; -class Cav_B_B_Atlas_Logistics_TeamMember_F : Cav_B_Bravo_Atlas_base_F { - displayName = "$STR_cav_troops_bravo_atlas_b_atlas_logistics_teammember"; +class Cav_B_B_Atlas_Medic_CombatMedic_F : Cav_B_B_Atlas_Medic_TeamLeader_F { + displayName = "$STR_cav_troops_bravo_atlas_b_atlas_medic_combatmedic"; scope = 2; - loadout = [["rhs_weap_m4a1_mstock","rhsusf_acc_SFMB556","rhsusf_acc_anpeq15","rhsusf_acc_compm4",["rhs_mag_30Rnd_556x45_M855A1_Stanag",30],[],"rhsusf_acc_tdstubby_blk"],[],[],["rhs_uniform_acu_ocp",[["ACRE_PRC343",1],["ACE_MapTools",1],["ACE_Flashlight_XL50",1],["ACE_microDAGR",1],["ACE_EarPlugs",1],["ACE_CableTie",1],["ACE_quikclot",20],["ACE_tourniquet",4]]],["rhsusf_spcs_ocp_saw",[["ACRE_PRC152",3],["rhs_mag_30Rnd_556x45_M855A1_Stanag",5,30],["SmokeShell",2,1],["SmokeShellGreen",2,1],["ACE_Chemlight_UltraHiOrange",5,1],["B_IR_Grenade",4,1]]],["B_Carryall_mcamo",[["ACE_personalAidKit",1],["rhsusf_ANPVS_14",1],["ACE_splint",2],["ACE_morphine",2],["ToolKit",1],["ACE_SpraypaintRed",1]]],"rhsusf_ach_bare_headset_ess","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","ItemRadioAcreFlagged","ItemCompass","ItemWatch",""]]; - abilityEngineer = 2; - abilityEOD = 1; }; // Named -class Cav_B_B_Atlas_Logistics_OpsNCO_3_5_F : Cav_B_B_Atlas_Logistics_OpsNCO_F { scope = 1; }; -class Cav_B_B_Atlas_Logistics_OpsOfficer_3_6_F : Cav_B_B_Atlas_Logistics_OpsOfficer_F { scope = 1; }; 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; }; -class Cav_B_B_Atlas_Logistics_TeamLeader_3_3_F : Cav_B_B_Atlas_Logistics_TeamLeader_F { scope = 1; }; -class Cav_B_B_Atlas_Logistics_TeamLeader_3_4_F : Cav_B_B_Atlas_Logistics_TeamLeader_F { scope = 1; }; \ No newline at end of file +class Cav_B_B_Atlas_Medic_TeamLeader_3_2_F : Cav_B_B_Atlas_Medic_TeamLeader_F { scope = 1; }; \ No newline at end of file