From 9f463e1f3d35457e9c5dc0129ca23a1b1dd79424 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sun, 7 Apr 2024 14:10:55 -0400 Subject: [PATCH 1/6] Added platoons to the loadout system. (#1154) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Broström.A | Evul --- cScripts/CfgFunctions.hpp | 4 +- cScripts/Loadouts/CfgLoadouts_Alpha.hpp | 6 +- .../Loadouts/CfgLoadouts_Alpha_FixedWing.hpp | 6 +- .../Loadouts/CfgLoadouts_Alpha_Rotary.hpp | 12 +- cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp | 1 + .../Loadouts/CfgLoadouts_Bravo_Viking.hpp | 3 +- cScripts/Loadouts/CfgLoadouts_Common.hpp | 1 + .../functions/gear/fn_gear_applyLoadout.sqf | 7 +- .../functions/init/fn_init_aceArsenal.sqf | 2 +- cScripts/functions/init/fn_init_logistics.sqf | 220 +++++------------- .../players/fn_player_getOrganization.sqf | 29 +++ .../players/fn_player_getPlatoon.sqf | 20 ++ .../players/fn_player_setCompany.sqf | 25 -- .../players/fn_player_setOrganization.sqf | 39 ++++ .../players/fn_unit_getVariables.sqf | 2 + .../systems/fn_addLoadoutSelection.sqf | 3 +- .../functions/systems/fn_allowLoadout.sqf | 5 +- .../systems/fn_getArsenalWhitelist.sqf | 31 ++- .../systems/fn_setupLoadoutSelection.sqf | 3 +- 19 files changed, 200 insertions(+), 219 deletions(-) create mode 100644 cScripts/functions/players/fn_player_getOrganization.sqf create mode 100644 cScripts/functions/players/fn_player_getPlatoon.sqf delete mode 100644 cScripts/functions/players/fn_player_setCompany.sqf create mode 100644 cScripts/functions/players/fn_player_setOrganization.sqf diff --git a/cScripts/CfgFunctions.hpp b/cScripts/CfgFunctions.hpp index 75b0e02aa..eeb6a4294 100644 --- a/cScripts/CfgFunctions.hpp +++ b/cScripts/CfgFunctions.hpp @@ -79,8 +79,10 @@ class cScripts { class setRadioChannel {}; class setActiveRadio {}; + class player_getOrganization {}; class player_getCompany {}; - class player_setCompany {}; + class player_getPlatoon {}; + class player_setOrganization {}; // Other Functions class unit_getVariables {}; diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp index 37d6a8565..aa37ed07c 100644 --- a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp @@ -2,7 +2,7 @@ class Cav_B_A_Officer_F: Cav_B_Alpha_base_F { displayName = "PEGASUS-6"; category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"}; scope = 2; - loadout = [["rhs_weap_m4a1_blockII_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["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],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",1,30]]],["USP_CRYE_JPC_ASLTB",[["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",8,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + loadout = [["rhs_weap_m4a1_blockII_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["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],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",1,30]]],["USP_CRYE_JPC_ASLTB",[["UK3CB_P320_9x21_17Rnd",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",8,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; role = "officer"; }; @@ -10,7 +10,7 @@ class Cav_B_A_PltSgt_Local: Cav_B_Alpha_base_F { displayName = "PEGASUS-5"; category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"}; scope = 2; - loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["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_ASLTB",[["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["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_ASLTB",[["UK3CB_P320_9x21_17Rnd",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; role = "officer"; }; @@ -27,7 +27,7 @@ class Cav_B_A_DroneOperator_F: Cav_B_Alpha_base_F { category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"}; scope = 2; abilityEngineer = 1; - loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["ACE_Banana",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_teamleader",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",8,30],["ACE_HandFlare_Green",2,1],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",1,17],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["ACE_Vector","","","",[],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","NVGogglesB_blk_F"]]; + loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["ACE_Banana",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_teamleader",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",8,30],["ACE_HandFlare_Green",2,1],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",1,17],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["ACE_Vector","","","",[],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","NVGogglesB_blk_F"]]; role = "officer"; }; // class Cav_B_A_JFO_F: Cav_B_Alpha_base_F { diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp index 2ea54faa5..b407e77bb 100644 --- a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp @@ -4,7 +4,7 @@ class Cav_B_A_Plane_Fighter_Pilot_F: Cav_B_Alpha_base_F { category[] += {"cScripts_Loadout_Cat_Alpha_FixedWing"}; scope = 2; abilityEngineer = 1; - loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["U_B_PilotCoveralls",[["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["ACE_EarPlugs",2],["ACE_Banana",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Painkiller",2,10],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["HandGrenade",1,1],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",2,17],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellPurple",2,1],["ACE_Chemlight_UltraHiOrange",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCB_CCT2",[["ToolKit",1],["USP_BASEBALL_CAP_ABU_BS",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1]]],"H_PilotHelmetFighter_B","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["U_B_PilotCoveralls",[["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["ACE_EarPlugs",2],["ACE_Banana",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Painkiller",2,10],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["HandGrenade",1,1],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",2,17],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellPurple",2,1],["ACE_Chemlight_UltraHiOrange",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCB_CCT2",[["ToolKit",1],["USP_BASEBALL_CAP_ABU_BS",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1]]],"H_PilotHelmetFighter_B","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; role = "pilotfighter"; }; class Cav_B_A_Plane_Transport_Pilot_F: Cav_B_Alpha_base_F { @@ -12,14 +12,14 @@ class Cav_B_A_Plane_Transport_Pilot_F: Cav_B_Alpha_base_F { category[] += {"cScripts_Loadout_Cat_Alpha_FixedWing"}; scope = 2; abilityEngineer = 1; - loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["B_CWU_coverall_od_usaf",[["ACE_packingBandage",20],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_Banana",1],["ACE_Chemlight_UltraHiOrange",1,1],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",2,17],["ACE_HandFlare_Green",2,1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["HandGrenade",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCT_CCT2",[["ToolKit",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_CT3_OD","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["B_CWU_coverall_od_usaf",[["ACE_packingBandage",20],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_Banana",1],["ACE_Chemlight_UltraHiOrange",1,1],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",2,17],["ACE_HandFlare_Green",2,1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["HandGrenade",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCT_CCT2",[["ToolKit",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_CT3_OD","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; role = "pilottransport"; }; class Cav_B_A_Plane_Transport_coPilot_F: Cav_B_A_Plane_Transport_Pilot_F { displayName = "$STR_Cav_Alpha_Characters_A_Plane_Transport_coPilot"; abilityEngineer = 1; scope = 2; - loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["B_CWU_coverall_od_usaf",[["ACE_packingBandage",20],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_Banana",1],["ACE_Chemlight_UltraHiOrange",1,1],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",2,17],["ACE_HandFlare_Green",2,1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["HandGrenade",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCT_CCT2",[["ToolKit",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_CT3_OD","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["B_CWU_coverall_od_usaf",[["ACE_packingBandage",20],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_Banana",1],["ACE_Chemlight_UltraHiOrange",1,1],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",2,17],["ACE_HandFlare_Green",2,1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["HandGrenade",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCT_CCT2",[["ToolKit",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_CT3_OD","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; }; diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp index beab135cd..da1c01e89 100644 --- a/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp @@ -6,19 +6,19 @@ class Cav_B_A_Helicopter_Tra_Pilot_F: Cav_B_A_PilotBase_F { displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Tra_Pilot"; category[] += {"cScripts_Loadout_Cat_Alpha_Rotary"}; scope = 2; - loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; + loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; role = "rotarypilot"; }; class Cav_B_A_Helicopter_Tra_coPilot_F: Cav_B_A_Helicopter_Tra_Pilot_F { displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Tra_coPilot"; scope = 2; - loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; + loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; }; class Cav_B_A_Helicopter_Tra_CrewChief_F: Cav_B_A_PilotBase_F { displayName = "Helicopter Crew Chief"; category[] += {"cScripts_Loadout_Cat_Alpha_Rotary"}; scope = 2; - loadout = [["rhs_weap_m249_pip_L_para_vfg2","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ELCAN_ard",["rhsusf_200Rnd_556x45_box",200],[],"rhsusf_acc_grip4_bipod"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["rhsusf_200Rnd_556x45_box",2,200],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; + loadout = [["rhs_weap_m249_pip_L_para_vfg2","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ELCAN_ard",["rhsusf_200Rnd_556x45_box",200],[],"rhsusf_acc_grip4_bipod"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["rhsusf_200Rnd_556x45_box",2,200],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; role = "rotarycrew"; }; @@ -27,20 +27,20 @@ class Cav_B_A_Helicopter_Tra_DoorGunner_F: Cav_B_A_Helicopter_Tra_CrewChief_F { scope = 2; abilityMedic = 1; role = "rotarycls"; - loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Pulseoximeter",1],["ACE_elasticBandage",20],["ACE_quikclot",20],["ACE_splint",2],["ACE_tourniquet",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; + loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Pulseoximeter",1],["ACE_elasticBandage",20],["ACE_quikclot",20],["ACE_splint",2],["ACE_tourniquet",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; }; class Cav_B_A_Helicopter_Att_Pilot_F: Cav_B_A_Helicopter_Tra_Pilot_F { displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Att_Pilot"; category[] += {"cScripts_Loadout_Cat_Alpha_Rotary"}; scope = 2; - loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; + loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; }; class Cav_B_A_Helicopter_Att_coPilot_F: Cav_B_A_Helicopter_Tra_Pilot_F { displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Att_coPilot"; category[] += {"cScripts_Loadout_Cat_Alpha_Rotary"}; scope = 2; - loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; + loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; }; // Named diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp index 0edc54d44..ea750644b 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp @@ -1,4 +1,5 @@ class Cav_B_Bravo_Atlas_base_F: Cav_B_Bravo_base_F { + platoon = 1; scope = 0; category[] += {"cScripts_Loadout_Cat_Bravo_Atlas"}; insignia = "cav_insignia_Specialized_Medic0"; diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp index 5126c998d..3833f66d9 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp @@ -1,4 +1,5 @@ class Cav_B_B_Scout_Base_F: Cav_B_Bravo_base_F { + platoon = 2; scope = 0; role = "weapons"; }; @@ -110,7 +111,7 @@ class Cav_B_B_Scout_CombatLifeSaver_F: Cav_B_B_Scout_Base_F { loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["ACE_microDAGR",1],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_splint",4]]],["USP_CRYE_JPC_ASLTB",[["kat_CarbonateItem",1],["ACE_epinephrine",3],["kat_phenylephrineAuto",3],["HandGrenade",4,1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["rhs_mag_mk3a2",4,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG",8,30]]],["USP_DELTA_BAG_MC",[["ACE_EntrenchingTool",1],["ACE_packingBandage",40],["ACE_quikclot",40],["ACE_tourniquet",12],["ACE_splint",8],["ACE_EarPlugs",2],["kat_chestSeal",10],["kat_guedel",10],["kat_ncdKit",5],["kat_pocketBVM",1],["kat_accuvac",1],["kat_Painkiller",3,10]]],"USP_OPS_FASTXP_TAN_MC_03","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]]; insignia = "cav_insignia_specialized_cls"; abilityMedic = 1; - role = "medic"; + role = "cls"; icon = "iconManMedic"; }; diff --git a/cScripts/Loadouts/CfgLoadouts_Common.hpp b/cScripts/Loadouts/CfgLoadouts_Common.hpp index 6405ebee7..8a2af07eb 100644 --- a/cScripts/Loadouts/CfgLoadouts_Common.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Common.hpp @@ -1,6 +1,7 @@ class CommonBlufor { //regiment = ""; //company = ""; + //platoon = 0; //displayName = ""; //scope = 0; diff --git a/cScripts/functions/gear/fn_gear_applyLoadout.sqf b/cScripts/functions/gear/fn_gear_applyLoadout.sqf index 4888406a5..7636f6d0b 100644 --- a/cScripts/functions/gear/fn_gear_applyLoadout.sqf +++ b/cScripts/functions/gear/fn_gear_applyLoadout.sqf @@ -36,10 +36,11 @@ if (_loadConfig) then { }; _unit setVariable [QEGVAR(Gear,LoadoutClass), _loadout]; - // Company + // Organizaiton if (GVAR(isPlayer)) then { - private _company = getText (_config >> "company"); - [_company] call EFUNC(player,setCompany); + private _configPlatoon = getNumber (_config >> "platoon"); + private _configCompany = getText (_config >> "company"); + [_configPlatoon,_configCompany] call EFUNC(Player,setOrganization); }; }; diff --git a/cScripts/functions/init/fn_init_aceArsenal.sqf b/cScripts/functions/init/fn_init_aceArsenal.sqf index 4a9972761..58bd6bb0c 100644 --- a/cScripts/functions/init/fn_init_aceArsenal.sqf +++ b/cScripts/functions/init/fn_init_aceArsenal.sqf @@ -40,7 +40,7 @@ GVAR(StagingArsenalOpen) = false; [QEGVAR(StagingArsenal,SaveWhitelist), { private _items = call FUNC(getArsenalWhitelist); - SETVAR(player,EGVAR(Player,ArsenalWhitelist), _items); + SETVAR(player,EGVAR(Player,ArsenalWhitelist),_items); }] call CBA_fnc_addEventHandler; diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index ce6e8088a..956a983c0 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -190,22 +190,6 @@ private _dataArray = [ ["USP_OPS_FASTXP_TAN_MC_08", 0], ["USP_BOONIE_HAT_MC", 0], - // Weapons - ["dzn_MG_Tripod_M122A1_M240Mount_Carry", 0], - ["ace_csw_carryMortarBaseplate", 0], - ["ace_csw_staticMortarCarry", 0], - - ["avm224_W_M224_mortar_carry", 0], - ["avm224_M_6Rnd_60mm_HE_csw", 0], - ["avm224_M_6Rnd_60mm_HE_0_csw", 0], - ["avm224_M_6Rnd_60mm_ILLUM_IR_csw", 0], - ["avm224_M_6Rnd_60mm_SMOKE_csw", 0], - - ["ACE_1Rnd_82mm_Mo_HE", 0], - ["ACE_1Rnd_82mm_Mo_Illum", 0], - ["ACE_1Rnd_82mm_Mo_HE_LaserGuided", 0], - ["ACE_1Rnd_82mm_Mo_Smoke", 0], - // Ammo ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0], ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red", 50], @@ -214,17 +198,6 @@ private _dataArray = [ ["30Rnd_556x45_Stanag_Sand_red", 0], ["30Rnd_556x45_Stanag_red", 0], ["rhs_mag_30Rnd_556x45_Mk262_PMAG", 0], - ["rhsusf_200Rnd_556x45_mixed_soft_pouch", 0], - ["rhsusf_100Rnd_762x51_m62_tracer", 0], - ["rhs_mag_M397_HET", 0], - ["rhs_mag_M433_HEDP", 50], - ["ACE_HuntIR_M203", 0], - ["ACE_40mm_Flare_white", 0], - ["ACE_40mm_Flare_red", 0], - ["ACE_40mm_Flare_ir", 0], - ["rhs_mag_m664_red_cluster", 0], - ["rhs_mag_m713_Red", 0], - ["rhs_mag_m716_yellow", 0], // NVG ["USP_PVS14", 0], @@ -248,20 +221,9 @@ private _dataArray = [ // Backpacks ["B_Carryall_mcamo", 0], - ["B_UAV_01_backpack_F", 0], ["B_Kitbag_mcamo", 0], ["UK3CB_B_Backpack_Pocket_OLI", 0], - ["UK3CB_B_Backpack_Pocket", 0], - ["B_rhsusf_B_BACKPACK", 0], - ["USP_TACTICAL_PACK_CCT", 0], - ["USP_TACTICAL_PACK_CCT2", 0], - ["USP_TACTICAL_PACK_CCT3", 0], - ["USP_TACTICAL_PACK_CCT4", 0], - ["USP_TACTICAL_PACK_CCT5", 0], - ["USP_TACTICAL_PACK_CCT6", 0], - ["USP_TACTICAL_PACK_CCT7", 0], - ["USP_TACTICAL_PACK_CCT8", 0], - ["UK3CB_US_B_B_RIF_OCP_Radio", 0] + ["UK3CB_B_Backpack_Pocket", 0] ]], ["bravo_company_viking", [ @@ -272,14 +234,23 @@ private _dataArray = [ ["TFAR_anprc152", 0], // Lunchers and mortars + ["rhs_weap_M136_hp",0], + ["rhs_weap_M136",0], ["rhs_weap_M136_hedp",1], - ["rhs_weap_m72a7",10], - ["rhs_weap_fgm148",1], - ["rhs_weap_fim92",1], - ["dzn_MG_Tripod_M122A1_M240Mount_Carry",2], - ["ace_csw_carryMortarBaseplate",2], - ["ace_csw_staticMortarCarry",2], - ["avm224_W_M224_mortar_carry",2], + ["rhs_weap_m72a7",0], + ["dzn_MG_Tripod_M122A1_M240Mount_Carry", 0], + ["ace_csw_carryMortarBaseplate", 0], + ["ace_compat_rhs_usf3_m252_carry", 0], + + ["avm224_W_M224_mortar_carry", 0], + ["avm224_M_6Rnd_60mm_HE_csw", 0], + ["avm224_M_6Rnd_60mm_HE_0_csw", 0], + ["avm224_M_6Rnd_60mm_ILLUM_IR_csw", 0], + ["avm224_M_6Rnd_60mm_SMOKE_csw", 0], + + ["ACE_1Rnd_82mm_Mo_HE", 0], + ["ACE_1Rnd_82mm_Mo_Illum", 0], + ["ACE_1Rnd_82mm_Mo_Smoke", 0], // Ammo ["rhs_mag_30Rnd_556x45_M855A1_PMAG",0], @@ -318,14 +289,6 @@ private _dataArray = [ ["ACE_Chemlight_HiBlue",0], ["ACE_Chemlight_HiRed",0], - // Medical - ["ACE_EarPlugs",10], - ["kat_chestSeal",0], - ["ACE_quikclot",0], - ["ACE_tourniquet",0], - ["kat_Painkiller",0], - ["kat_PainkillerItem",0], - // Mines and Explosives ["ACE_Clacker",0], ["ACE_DefusalKit",0], @@ -343,121 +306,22 @@ private _dataArray = [ ]], ["bravo_company_atlas", [ + + // Radios + ["ACRE_PRC343", 0], + ["ACRE_PRC152", 0], + ["TFAR_anprc152", 0], ["ACE_microDAGR",0], ["ItemAndroid",0], ["ItemAndroidMisc",0], - // AEDs - ["kat_AED",0], - ["kat_X_AED",0], - - // Airway Management and Respiration - ["kat_aatKit",0], - ["kat_accuvac",0], - ["kat_BVM",0], - ["kat_chestSeal",0], - ["kat_guedel",0], - ["kat_larynx",0], - ["kat_ncdKit",0], - ["kat_pocketBVM",0], - - // Autoinjectors - ["ACE_adenosine",0], - ["ACE_epinephrine",0], - ["ACE_morphine",0], - ["kat_phenylephrineAuto",0], - - // Bandages and Stitching - ["ACE_elasticBandage",0], - ["ACE_packingBandage",0], - ["ACE_quikclot",0], - ["ACE_surgicalKit",0], - - // Diagnostic Tools - ["kat_Pulseoximeter",0], - ["kat_ultrasound",0], - ["kat_stethoscope",0], - - // Fluids - ["ACE_bloodIV",0], - ["ACE_bloodIV_250",0], - ["ACE_bloodIV_500",0], - ["ACE_plasmaIV",0], - ["ACE_plasmaIV_250",0], - ["ACE_plasmaIV_500",0], - ["ACE_salineIV",0], - ["ACE_salineIV_250",0], - ["ACE_salineIV_500",0], - - //Pills and Inhalants - ["kat_Carbonate",0], - ["kat_CarbonateItem",0], - ["kat_naloxone",0], - ["kat_Painkiller",0], - ["kat_PainkillerItem",0], - ["kat_PenthroxItem",0], - - // Massive Hemorrhage Control - ["kat_reboa",0], - ["ACE_tourniquet",0], - - //-------------------------- - // Catheters and Medication - //-------------------------- - - // Catheters - ["kat_IV_16",0], - ["kat_IO_FAST",0], - - // Analgesic Medication - ["kat_fentanyl",0], - ["kat_ketamine",0], - ["kat_nalbuphine",0], - - // BP Medication - ["kat_nitroglycerin",0], - ["kat_norepinephrine",0], - ["kat_phenylephrine",0], - - // Cardiac resuscitation - ["kat_amiodarone",0], - ["kat_atropine",0], - - // Hemorrhage control - ["kat_EACA",0], - ["kat_TXA",0], - - // Surgical Medication - ["kat_etomidate",0], - ["kat_flumazenil",0], - ["kat_lidocaine",0], - ["kat_lorazepam",0], - //-------------------------- - - //-------------------------- - // Surgery and Fractures - //-------------------------- - - // Debridement - ["kat_vacuum",0], - - // Splints - ["ACE_splint",0], - - // Surgical Equipment - ["kat_clamp",0], - ["kat_plate",0], - ["kat_retractor",0], - ["kat_scalpel",0], - //-------------------------- - // Tools and Items + ["ACE_Flashlight_MX991",0], ["ACE_CableTie",0], ["ACE_Chemlight_Shield",0], ["ACE_EntrenchingTool",0], ["ACE_IR_Strobe_Item",0], ["ACE_wirecutter",10], - ["Rev_pelican_item",0], // Medical ["ACE_EarPlugs",10], @@ -558,7 +422,6 @@ private _dataArray = [ // Tools and Items ["ACE_CableTie",0], - ["USP_PVS15",0], ["ACE_EntrenchingTool",10], ["ACE_wirecutter",10], ["rhs_weap_rsp30_green",0], @@ -603,7 +466,7 @@ private _dataArray = [ // Autoinjector Medication ["kat_naloxone",20], ["ACE_epinephrine",20], - ["kat_phenylephrine_inject",24], + ["kat_phenylephrineAuto",24], // Oral Medication ["kat_Painkiller",60], @@ -915,7 +778,7 @@ private _dataArray = [ ["kat_naloxone",20], ["ACE_morphine",20], ["ACE_epinephrine",40], - ["kat_phenylephrine_inject",40], + ["kat_phenylephrineAuto",40], ["ACE_adenosine",0], // Splints @@ -1036,7 +899,7 @@ private _dataArray = [ ["rhs_weap_M136_hedp",2], // M320 Ammo - ["rhsusf_mag_M433_HEDP",20], + ["rhs_mag_M433_HEDP",20], ["rhs_mag_m714_White",6], ["rhs_mag_m713_Red",4], ["ACE_HuntIR_M203",1], @@ -1487,6 +1350,7 @@ private _dataArray = [ // Bandages and Stitching ["ACE_packingBandage",0], + ["ACE_quikclot",0], //Pills and Inhalants ["kat_Painkiller",0], @@ -1499,7 +1363,10 @@ private _dataArray = [ ["ACE_splint",0], // Night Gear - ["ACE_IR_Strobe_Item",0] + ["ACE_IR_Strobe_Item",0], + + // Radios + ["TFAR_anprc152", 0] ]], ["arsenal_company_fallback", [ @@ -1544,6 +1411,7 @@ private _dataArray = [ ["ItemAndroid", 0], ["rhsusf_weap_glock17g4", 0], ["rhsusf_mag_17Rnd_9x19_FMJ",0], + ["acc_pistol_flashlight",0], ["USP_VEST_STRANDHOGG2_MC", 0], ["USP_VEST_STRANDHOGG2_CBR", 0], ["ACE_Vector", 0], @@ -1565,6 +1433,7 @@ private _dataArray = [ ["ACE_MX2A", 0], ["rhsusf_weap_glock17g4", 0], ["rhsusf_mag_17Rnd_9x19_FMJ",0], + ["acc_pistol_flashlight",0], ["USP_VEST_STRANDHOGG2_MC", 0], ["USP_VEST_STRANDHOGG2_CBR", 0], ["ACE_HuntIR_monitor", 0], @@ -1705,6 +1574,7 @@ private _dataArray = [ ["kat_larynx",0], ["kat_ncdKit",0], ["kat_pocketBVM",0], + ["kat_suction",0], // Autoinjectors ["ACE_adenosine",0], @@ -1803,6 +1673,7 @@ private _dataArray = [ ["kat_guedel",0], ["kat_ncdKit",0], ["kat_pocketBVM",0], + ["kat_suction",0], // Autoinjectors ["ACE_adenosine",0], @@ -1869,8 +1740,19 @@ private _dataArray = [ ["kat_TXA",0], // Splints - ["ACE_splint",0] + ["ACE_splint",0], //-------------------------- + + //Backpack + ["USP_TACTICAL_PACK_CCT", 0], + ["USP_TACTICAL_PACK_CCT2", 0], + ["USP_TACTICAL_PACK_CCT3", 0], + ["USP_TACTICAL_PACK_CCT4", 0], + ["USP_TACTICAL_PACK_CCT5", 0], + ["USP_TACTICAL_PACK_CCT6", 0], + ["USP_TACTICAL_PACK_CCT7", 0], + ["USP_TACTICAL_PACK_CCT8", 0], + ["UK3CB_US_B_B_RIF_OCP_Radio", 0] ]], ["arsenal_role_cls",[ // Airway Management and Respiration @@ -1879,6 +1761,7 @@ private _dataArray = [ ["kat_guedel",0], ["kat_ncdKit",0], ["kat_pocketBVM",0], + ["kat_suction",0], // Autoinjectors ["ACE_epinephrine",0], @@ -1893,7 +1776,6 @@ private _dataArray = [ ["kat_CarbonateItem",0], ["kat_Painkiller",0], ["kat_PainkillerItem",0], - ["kat_PenthroxItem",0], // Massive Hemorrhage Control ["ACE_tourniquet",0], @@ -2161,7 +2043,11 @@ private _dataArray = [ ["rhsusf_weap_glock17g4",0], ["rhsusf_weap_m1911a1",0], ["rhsusf_mag_7x45acp_MHP",0], - ["rhsusf_mag_17Rnd_9x19_FMJ",0] + ["rhsusf_mag_17Rnd_9x19_FMJ",0], + ["UK3CB_P320_DES",0], + ["UK3CB_P320_BLK",0], + ["UK3CB_P320_9x21_17Rnd",0], + ["acc_pistol_flashlight",0] ]] ]; diff --git a/cScripts/functions/players/fn_player_getOrganization.sqf b/cScripts/functions/players/fn_player_getOrganization.sqf new file mode 100644 index 000000000..fffb97f57 --- /dev/null +++ b/cScripts/functions/players/fn_player_getOrganization.sqf @@ -0,0 +1,29 @@ +#include "..\script_component.hpp"; +/* + * Author: SGT.Brostrom.A + * This function return your platoon and company + * + * Arguments: + * None + * + * Return Value: + * Organization + * + * Example: + * call cScripts_fnc_player_getOrganization; + * + * Public: No + */ + +private _loadout = [player] call EFUNC(gear,getLoadoutName); + +private _config = missionConfigFile >> "CfgLoadouts" >> _loadout; + +private _configPlatoon = getNumber (_config >> "platoon"); +private _platoon = GETVAR(player,EGVAR(Player,Platoon),_configPlatoon); + +private _configCompany = getText (_config >> "company"); +private _company = GETVAR(player,EGVAR(Player,Company),_configCompany); +_company = toLower _company; + +[_platoon, _company] \ No newline at end of file diff --git a/cScripts/functions/players/fn_player_getPlatoon.sqf b/cScripts/functions/players/fn_player_getPlatoon.sqf new file mode 100644 index 000000000..dc37dccf9 --- /dev/null +++ b/cScripts/functions/players/fn_player_getPlatoon.sqf @@ -0,0 +1,20 @@ +#include "..\script_component.hpp"; +/* + * Author: SGT.Brostrom.A + * This function return your platoon + * + * Arguments: + * None + * + * Return Value: + * Platoon Number + * + * Example: + * call cScripts_fnc_player_getPlatoon; + * + * Public: No + */ + +private _platoon = GETVAR(player,EGVAR(Player,Platoon), 0); + +_platoon \ No newline at end of file diff --git a/cScripts/functions/players/fn_player_setCompany.sqf b/cScripts/functions/players/fn_player_setCompany.sqf deleted file mode 100644 index 9e74e0031..000000000 --- a/cScripts/functions/players/fn_player_setCompany.sqf +++ /dev/null @@ -1,25 +0,0 @@ -#include "..\script_component.hpp"; -/* - * Author: SGT.Brostrom.A - * This function sets your set your company name - * - * Arguments: - * 0: Company - * - * Return Value: - * Company Name - * - * Example: - * ["Charlie"] call cScripts_fnc_player_setCompany; - * - * Public: No - */ - -params [["_company", "", [""]]]; - -_company = toLower _company; -SETVAR(player,EGVAR(Player,Company),_company); - -INFO_2("Player", "%1 have company set to '%2'", name _unit, _company); - -_company \ No newline at end of file diff --git a/cScripts/functions/players/fn_player_setOrganization.sqf b/cScripts/functions/players/fn_player_setOrganization.sqf new file mode 100644 index 000000000..dbce26ae9 --- /dev/null +++ b/cScripts/functions/players/fn_player_setOrganization.sqf @@ -0,0 +1,39 @@ +#include "..\script_component.hpp"; +/* + * Author: SGT.Brostrom.A + * This function sets your set your company name + * + * Arguments: + * 0: Platoon + * 1: Company + * + * Return Value: + * Organization + * + * Example: + * [2,"Charlie"] call cScripts_fnc_player_setOrganization; + * + * Public: No + */ + +params [ + ["_platoon", 0, [0]], + ["_company", "", [""]] +]; + +// Set platoon number +if (_platoon < 0 || _platoon > 4) then { + SHOW_WARNING_1("Player","Platoon number '%1' is invalid. Must be between 0 and 4. Setting to default.",_platoon); + _platoon = 0; +}; + +SETVAR(player,EGVAR(Player,Platoon),_platoon); + +// Set company name +_company = toLower _company; +SETVAR(player,EGVAR(Player,Company),_company); + +private _unit = name player; +INFO_3("Player", "%1 have company set to '%2' and platoon set to '%3'",_unit,_company,_platoon); + +[_platoon, _company] \ No newline at end of file diff --git a/cScripts/functions/players/fn_unit_getVariables.sqf b/cScripts/functions/players/fn_unit_getVariables.sqf index 97dc11ec9..39f7bc5ff 100644 --- a/cScripts/functions/players/fn_unit_getVariables.sqf +++ b/cScripts/functions/players/fn_unit_getVariables.sqf @@ -32,6 +32,7 @@ private _rank_bis = GETVAR(_unit,EGVAR(Player,Rank),"PRIVATE"); private _regiment = ""; private _company = GETVAR(player,EGVAR(Player,Company), ""); +private _platoon = GETVAR(player,EGVAR(Player,Platoon), 0); private _squad = GETVAR(_unit,EGVAR(Player,Squad),groupId group _unit); private _squadInsignia = [_unit] call BIS_fnc_getUnitInsignia; private _team = ""; @@ -57,6 +58,7 @@ private _map = createHashMapFromArray [ ["regiment", _regiment], ["company", _company], + ["platoon", _platoon], ["squad", _squad], ["squadInsignia", _squadInsignia], ["team", _team], // Team Color diff --git a/cScripts/functions/systems/fn_addLoadoutSelection.sqf b/cScripts/functions/systems/fn_addLoadoutSelection.sqf index 8c2da6b39..ac727f140 100644 --- a/cScripts/functions/systems/fn_addLoadoutSelection.sqf +++ b/cScripts/functions/systems/fn_addLoadoutSelection.sqf @@ -27,6 +27,7 @@ params [ ["_icon", "", [""]], ["_category", ["ACE_MainActions", "cScripts_Loadout_Cat_Main"], [[]]], ["_company", "", [""]], + ["_platoon", 0, [0]], ["_allowAllLoadouts", false] ]; @@ -35,7 +36,7 @@ private _condition = { _params params ["_className", "_company", "_allowAllLoadouts"]; if (_allowAllLoadouts) exitWith {true}; if ([player] call EFUNC(gear,getLoadoutName) == _className) exitWith {true}; - if ([_company] call FUNC(allowLoadout)) exitWith {true}; + if ([_company,_platoon] call FUNC(allowLoadout)) exitWith {true}; false }; diff --git a/cScripts/functions/systems/fn_allowLoadout.sqf b/cScripts/functions/systems/fn_allowLoadout.sqf index b2f78c0e2..aa518c7d9 100644 --- a/cScripts/functions/systems/fn_allowLoadout.sqf +++ b/cScripts/functions/systems/fn_allowLoadout.sqf @@ -15,13 +15,16 @@ * Public: No */ -params ["_company"]; +params ["_company", "_platoon"]; _company = toLower _company; // If you dont have a company don't show any. if (_company == "") exitWith {false}; +// There are 4 platoons in a company. 0 is for if there is no difference between the companies. +if (_platoon < 0 || _platoon > 4) exitWith {false}; + // Show all loadouts if (EGVAR(Settings,showAllLoadouts)) exitWith {true}; diff --git a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf index 761a60d77..906164d11 100644 --- a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf +++ b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf @@ -28,11 +28,28 @@ _unitItems = _unitItems arrayIntersect _unitItems select {_x isEqualType "" && { private _commonGear = GET_CONTAINER_KEYS("arsenal_common"); -private _company = call EFUNC(player,getCompany); -private _companyItems = switch (_company) do { - case "alpha": {GET_CONTAINER_KEYS("alpha_company");}; - case "bravo": {GET_CONTAINER_KEYS("bravo_company");}; - case "charlie": {GET_CONTAINER_KEYS("charlie_company");}; +private _organization = call EFUNC(Player,getOrganization); +private _orgItems = switch (_organization#1) do { + case "alpha": { + GET_CONTAINER_KEYS("alpha_company"); + }; + case "bravo": { + // Bravo has two platoons that have different requirements + private _companyItems = GET_CONTAINER_KEYS("bravo_company"); + private _platoonItems = switch (_organization#0) do { + case 1: { + GET_CONTAINER_KEYS("bravo_company_atlas"); + }; + case 2: { + GET_CONTAINER_KEYS("bravo_company_viking"); + }; + default {[]}; + }; + _companyItems + _platoonItems; + }; + case "charlie": { + GET_CONTAINER_KEYS("charlie_company"); + }; default {GET_CONTAINER_KEYS("arsenal_company_fallback");}; }; @@ -82,6 +99,8 @@ private _handgunWeapon = if (!isNil{_loadout#2#0}) then {_loadout#2#0} else {""} private _handgunSpecific = switch (true) do { case (_handgunWeapon isKindOf ['rhs_weap_M320', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_ugl");}; case (_handgunWeapon isKindOf ['rhsusf_weap_glock17g4', configFile >> 'CfgWeapons'] + || _handgunWeapon isKindOf ['UK3CB_P320_BLK', configFile >> 'CfgWeapons'] + || _handgunWeapon isKindOf ['UK3CB_P320_DES', configFile >> 'CfgWeapons'] || _handgunWeapon isKindOf ['rhsusf_weap_m1911a1', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_sidearm");}; default {[]}; }; @@ -97,6 +116,6 @@ private _launcherSpecific = switch (true) do { default {[]}; }; -private _whitelist = _commonGear + _unitItems + _companyItems + _roleSpecific + _primarySpecific + _handgunSpecific + _launcherSpecific; +private _whitelist = _commonGear + _unitItems + _orgItems + _roleSpecific + _primarySpecific + _handgunSpecific + _launcherSpecific; _whitelist diff --git a/cScripts/functions/systems/fn_setupLoadoutSelection.sqf b/cScripts/functions/systems/fn_setupLoadoutSelection.sqf index 7b390933f..a78d638e8 100644 --- a/cScripts/functions/systems/fn_setupLoadoutSelection.sqf +++ b/cScripts/functions/systems/fn_setupLoadoutSelection.sqf @@ -39,12 +39,13 @@ private _classnameList = configProperties [missionconfigfile >> "CfgLoadouts", " private _icon = getText (missionConfigFile >> 'CfgLoadouts' >> _class >> "icon") call FUNC(getIcon); if (isNil{_icon}) then { _icon = "iconMan" }; private _company = getText (missionConfigFile >> 'CfgLoadouts' >> _class >> "company"); + private _platoon = getNumber (missionConfigFile >> 'CfgLoadouts' >> _class >> "platoon"); private _category = getArray (missionConfigFile >> 'CfgLoadouts' >> _class >> "category"); INFO_2("LoadoutSelector", "Setting up %1 loadout on %2.", _displayName, _object); _category = [_aceCategory, _mainCategory] + _category; - [_object, _displayName, _classname, _icon, _category, _company, _allowAllLoadouts] call FUNC(addLoadoutSelection); + [_object, _displayName, _classname, _icon, _category, _company, _platoon, _allowAllLoadouts] call FUNC(addLoadoutSelection); } forEach _classnameList; INFO_1("LoadoutSelector", "Done setting up quick selections on %1.", _object); \ No newline at end of file From 38dd73ddc65b76ec511f543ff068d9d17e55ff26 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sun, 7 Apr 2024 14:11:28 -0400 Subject: [PATCH 2/6] Updated CBA settings for ACE3 3.17.0 (#1159) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Broström.A | Evul --- cba_settings.sqf | 399 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 392 insertions(+), 7 deletions(-) diff --git a/cba_settings.sqf b/cba_settings.sqf index ef9b08f85..fb8dc6b9b 100644 --- a/cba_settings.sqf +++ b/cba_settings.sqf @@ -18,21 +18,19 @@ force force ace_advanced_ballistics_muzzleVelocityVariationEnabled = false; force force ace_advanced_ballistics_simulationInterval = 0.05; // ACE Advanced Fatigue -force force ace_advanced_fatigue_deployedSwayFactor = 1; force force ace_advanced_fatigue_enabled = true; //ace_advanced_fatigue_enableStaminaBar = true; //ace_advanced_fatigue_fadeStaminaBar = true; force force ace_advanced_fatigue_loadFactor = 1; force force ace_advanced_fatigue_performanceFactor = 1.75; force force ace_advanced_fatigue_recoveryFactor = 3; -force force ace_advanced_fatigue_restedSwayFactor = 1; -force force ace_advanced_fatigue_swayFactor = 1; force force ace_advanced_fatigue_terrainGradientFactor = 1; // ACE Advanced Throwing force force ace_advanced_throwing_enabled = true; force force ace_advanced_throwing_enablePickUp = true; force force ace_advanced_throwing_enablePickUpAttached = true; +//ace_advanced_throwing_enableTempWindInfo = true; force force ace_advanced_throwing_showMouseControls = true; force force ace_advanced_throwing_showThrowArc = true; @@ -81,12 +79,16 @@ force force ace_common_allowFadeMusic = true; force force ace_common_checkPBOsAction = 0; force force ace_common_checkPBOsCheckAll = false; force force ace_common_checkPBOsWhitelist = "[]"; +force force ace_common_deployedSwayFactor = 1; //ace_common_displayTextColor = [0,0,0,0.1]; //ace_common_displayTextFontColor = [1,1,1,1]; +force force ace_common_enableSway = true; //ace_common_epilepsyFriendlyMode = false; //ace_common_progressBarInfo = 2; +force force ace_common_restedSwayFactor = 1; //ace_common_settingFeedbackIcons = 1; //ace_common_settingProgressBarLocation = 0; +force force ace_common_swayFactor = 1; // ACE Cook off force force ace_cookoff_ammoCookoffDuration = 0; @@ -208,9 +210,282 @@ force force ace_interaction_interactWithTerrainObjects = false; //ace_interact_menu_useListMenu = true; //ace_interact_menu_useListMenuSelf = false; +// ACE Interaction Menu (Self) - More +//ace_interact_menu_more__ACE_CheckAirTemperature = false; +//ace_interact_menu_more__ace_csw_deploy = false; +//ace_interact_menu_more__ACE_Equipment = false; +//ace_interact_menu_more__ACE_Explosives = false; +//ace_interact_menu_more__ace_field_rations = false; +//ace_interact_menu_more__ace_fortify = false; +//ace_interact_menu_more__ace_gestures = false; +//ace_interact_menu_more__ace_intelitems = false; +//ace_interact_menu_more__ACE_MapFlashlight = false; +//ace_interact_menu_more__ACE_MapGpsHide = false; +//ace_interact_menu_more__ACE_MapGpsShow = false; +//ace_interact_menu_more__ACE_MapTools = false; +//ace_interact_menu_more__ACE_Medical = false; +//ace_interact_menu_more__ACE_Medical_Menu = false; +//ace_interact_menu_more__ACE_MoveRallypoint = false; +//ace_interact_menu_more__ACE_PlottingBoard = false; +//ace_interact_menu_more__ACE_PlottingBoardHide = false; +//ace_interact_menu_more__ACE_RepackMagazines = false; +//ace_interact_menu_more__ace_sandbag_place = false; +//ace_interact_menu_more__ACE_StartSurrenderingSelf = false; +//ace_interact_menu_more__ACE_StopEscortingSelf = false; +//ace_interact_menu_more__ACE_StopSurrenderingSelf = false; +//ace_interact_menu_more__ACE_Tags = false; +//ace_interact_menu_more__ACE_TeamManagement = false; +//ace_interact_menu_more__ace_zeus_create = false; +//ace_interact_menu_more__ace_zeus_delete = false; +//ace_interact_menu_more__aceax_ingame_gear = false; +//ace_interact_menu_more__acex_sitting_Stand = false; +//ace_interact_menu_more__cTab_Interact = false; +//ace_interact_menu_more__KAT_Equipment = false; +//ace_interact_menu_more__Medical = false; +//ace_interact_menu_more__TFAR_Radio = false; +//ace_interact_menu_more__vtx_detachHook = false; + +// ACE Interaction Menu (Self) - Move to Root +//ace_interact_menu_moveToRoot__ACE_Equipment__abc_main_clearBrush = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_atragmx_open = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_attach_Attach = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_attach_Detach = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ACE_CheckDogtags = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ACE_Chemlights = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_dagr_menu = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_dagr_menu__ace_dagr_toggle = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_goggles_wipeGlasses = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_gunbag_actions = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_gunbag_actions__ace_gunbag_status = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_gunbag_actions__ace_gunbag_weaponOff = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_gunbag_actions__ace_gunbag_weaponSwap = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_gunbag_actions__ace_gunbag_weaponTo = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_huntir_open = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_interaction_weaponAttachments = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_kestrel4500_open = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_kestrel4500_open__ace_kestrel4500_hide = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_kestrel4500_open__ace_kestrel4500_show = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_marker_flags = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_microdagr_configure = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_microdagr_configure__ace_microdagr_close = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_microdagr_configure__ace_microdagr_show = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_minedetector_metalDetector = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_minedetector_metalDetector__ace_minedetector_activate = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_minedetector_metalDetector__ace_minedetector_connectHeadphones = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_minedetector_metalDetector__ace_minedetector_deactivate = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_minedetector_metalDetector__ace_minedetector_disconnectHeadphones = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_mk6mortar_rangetable = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_overheating_CheckTemperature = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_overheating_CheckTemperatureSpareBarrels = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_overheating_CoolWeaponWithItem = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_overheating_SwapBarrel = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_overheating_UnJam = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ACE_PutInEarplugs = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_rangecard_open = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_rangecard_open__ace_rangecard_makeCopy = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_rangecard_open__ace_rangecard_openCopy = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_reload_checkAmmo = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ACE_RemoveEarplugs = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_scopes_adjustZero = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_scopes_resetZero = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_spottingscope_place = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ACE_TacticalLadders = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_trenches_digEnvelopeBig = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_trenches_digEnvelopeSmall = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__ace_tripod_place = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__AMP_DeployDoorWedge = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__KNB_panel_panel = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__uh60_jvmf_tablet = false; +//ace_interact_menu_moveToRoot__ACE_Equipment__vtx_stretcher_1 = false; +//ace_interact_menu_moveToRoot__ACE_Explosives__ACE_Cellphone = false; +//ace_interact_menu_moveToRoot__ACE_Explosives__ACE_Place = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Advance = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_CeaseFire = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Cover = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Engage = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Follow = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Forward = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Freeze = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Go = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Hold = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Point = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Regroup = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Stop = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Up = false; +//ace_interact_menu_moveToRoot__ace_gestures__ace_gestures_Warning = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsAlign = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsAlign__ACE_MapToolsAlignCompass = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsAlign__ACE_MapToolsAlignNorth = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsAlign__ACE_MapToolsAlignToPlottingBoard = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsAlign__ACE_MapToolsAlignToPlottingBoardAcrylic = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsAlign__ACE_MapToolsAlignToPlottingBoardRuler = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsHide = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsShowNormal = false; +//ace_interact_menu_moveToRoot__ACE_MapTools__ACE_MapToolsShowSmall = false; +//ace_interact_menu_moveToRoot__ACE_Medical__ACE_ArmLeft = false; +//ace_interact_menu_moveToRoot__ACE_Medical__ACE_ArmRight = false; +//ace_interact_menu_moveToRoot__ACE_Medical__ACE_Head = false; +//ace_interact_menu_moveToRoot__ACE_Medical__ACE_LegLeft = false; +//ace_interact_menu_moveToRoot__ACE_Medical__ACE_LegRight = false; +//ace_interact_menu_moveToRoot__ACE_Medical__ACE_Torso = false; +//ace_interact_menu_moveToRoot__ACE_Medical__ACE_Torso__TriageCard = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignAcrylic = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignAcrylic__ACE_PlottingBoardAlignAcrylicMaptool = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignAcrylic__ACE_PlottingBoardAlignAcrylicUp = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignBoard = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignBoard__ACE_PlottingBoardAlignBoardMaptool = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignBoard__ACE_PlottingBoardAlignBoardUp = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignRuler = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignRuler__ACE_PlottingBoardAlignRulerMaptool = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardAlign__ACE_PlottingBoardAlignRuler__ACE_PlottingBoardAlignRulerUp = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardRulerHide = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardRulerShow = false; +//ace_interact_menu_moveToRoot__ACE_PlottingBoardHide__ACE_PlottingBoardWipe = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__ACE_BecomeLeader = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__ACE_JoinTeamBlue = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__ACE_JoinTeamGreen = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__ACE_JoinTeamRed = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__ACE_JoinTeamYellow = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__ACE_LeaveGroup = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__ACE_LeaveTeam = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__ACE_RenameGroup = false; +//ace_interact_menu_moveToRoot__ACE_TeamManagement__diwako_dui_buddy_buddy_action_team_remove = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm__Doctor = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm__Doctor_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm__Kat = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm__Kat_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm__Medic = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm__Medic_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm__RedCross = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftArm__RedCross_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg__Doctor = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg__Doctor_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg__Kat = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg__Kat_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg__Medic = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg__Medic_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg__RedCross = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__LeftLeg__RedCross_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm__Doctor = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm__Doctor_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm__Kat = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm__Kat_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm__Medic = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm__Medic_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm__RedCross = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightArm__RedCross_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg__Doctor = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg__Doctor_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg__Kat = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg__Kat_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg__Medic = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg__Medic_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg__RedCross = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__RightLeg__RedCross_NVG = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__UnSlingLeftArm = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__UnSlingLeftLeg = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__UnSlingRightArm = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Armband__UnSlingRightLeg = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__BubbleWrapPopping = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AED_X_Interactions = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AED_X_Interactions__KAT_AED_X_addSound = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AED_X_Interactions__KAT_AED_X_removeSound = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AED_X_Interactions__KAT_AED_X_ViewMonitor = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Item = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Item__AFAKInfo = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Item__Slot1 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Item__Slot2 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Item__Slot3 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Item__Slot4 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Item__Slot5 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Item__Slot6 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__AFAKInfo = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot1 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot1_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot2 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot2_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot3 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot3_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot4 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot4_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot5 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot5_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot6 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_AFAK_Mag__Slot6_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_ChangeGasMaskFilter = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_CheckGasMaskDur = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Item = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Item__IFAKInfo = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Item__Slot1 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Item__Slot2 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Item__Slot3 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Item__Slot4 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__IFAKInfo = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__Slot1 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__Slot1_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__Slot2 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__Slot2_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__Slot3 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__Slot3_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__Slot4 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_IFAK_Mag__Slot4_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__MFAKInfo = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__Slot1 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__Slot2 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__Slot3 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__Slot4 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__Slot5 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__Slot6 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__Slot7 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Item__Slot8 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__MFAKInfo = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot1 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot1_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot2 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot2_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot3 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot3_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot4 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot4_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot5 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot5_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot6 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot6_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot7 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot7_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot8 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MFAK_Mag__Slot8_Repack = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_MuteChemDetector = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_placeAED = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_placeAEDX = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__KAT_UnmuteChemDetector = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__openCrossPanel = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__PulseOximeter_addSound = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__PulseOximeter_removeSound = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Refill_OxygenTank_150_Facility = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__Refill_OxygenTank_300_Facility = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__SetPreferred_OxygenTank_150 = false; +//ace_interact_menu_moveToRoot__KAT_Equipment__SetPreferred_OxygenTank_300 = false; +//ace_interact_menu_moveToRoot__Medical__ACE_Head = false; +//ace_interact_menu_moveToRoot__Medical__ACE_Head__CheckBloodPressure = false; + +// ACE Kill Tracker +force force ace_killtracker_trackAI = true; + // ACE Logistics force force ace_cargo_carryAfterUnload = true; force force ace_cargo_enable = true; +force force ace_cargo_enableDeploy = true; force force ace_cargo_enableRename = true; force force ace_cargo_loadTimeCoefficient = 0.2; force force ace_cargo_openAfterUnload = 0; @@ -339,6 +614,7 @@ force force ace_medical_treatment_treatmentTimeSplint = 7; force force ace_medical_treatment_treatmentTimeTourniquet = 7; force force ace_medical_treatment_woundReopenChance = 0.495006; force force ace_medical_treatment_woundStitchTime = 5; +force force ace_medical_vitals_simulateSpO2 = false; // ACE Medical Interface force force ace_medical_feedback_bloodVolumeEffectType = 0; @@ -374,6 +650,7 @@ force force ace_medical_gui_openAfterTreatment = true; //ace_medical_gui_peekMedicalInfoReleaseDelay = 1; //ace_medical_gui_peekMedicalOnHit = false; //ace_medical_gui_peekMedicalOnHitDuration = 1; +force force ace_medical_gui_showBleeding = 2; //ace_medical_gui_showBloodlossEntry = true; //ace_medical_gui_showDamageEntry = false; force force ace_medical_gui_tourniquetWarning = true; @@ -573,6 +850,52 @@ force force ace_vehiclelock_defaultLockpickStrength = 10; force force ace_vehiclelock_lockVehicleInventory = true; force force ace_vehiclelock_vehicleStartingLockState = -1; +// ACE Vehicle Medical +force force MIRA_Vehicle_Medical_CacheInterval = 0.4; +//MIRA_Vehicle_Medical_EnableAVM = true; +//MIRA_Vehicle_Medical_EnableIncapacitated = false; +//MIRA_Vehicle_Medical_EnableStable = true; +force force MIRA_Vehicle_Medical_EnableSupportKAT = true; +//MIRA_Vehicle_Medical_EnableUnstable = true; +//MIRA_Vehicle_Medical_Incapacitated_CanUnloadAll = true; +//MIRA_Vehicle_Medical_Incapacitated_ShowCount = false; +//MIRA_Vehicle_Medical_Stable_ShowCount = true; +//MIRA_Vehicle_Medical_Stable_ThresholdLowBP = 80; +//MIRA_Vehicle_Medical_Stable_ThresholdLowHR = 50; +//MIRA_Vehicle_Medical_Stable_TrackFractures = true; +//MIRA_Vehicle_Medical_Stable_TrackIV = true; +//MIRA_Vehicle_Medical_Stable_TrackLowBP = true; +//MIRA_Vehicle_Medical_Stable_TrackLowHR = true; +//MIRA_Vehicle_Medical_Stable_TrackNeedsBandage = true; +//MIRA_Vehicle_Medical_Stable_TrackSplints = true; +//MIRA_Vehicle_Medical_Stable_TrackStitchableWounds = true; +//MIRA_Vehicle_Medical_Stable_TrackTourniquets = true; +//MIRA_Vehicle_Medical_Unstable_AllowUnload = true; +//MIRA_Vehicle_Medical_Unstable_DogtagsDeadOnly = true; +//MIRA_Vehicle_Medical_Unstable_ShowCount = true; +//MIRA_Vehicle_Medical_Unstable_TakeDogtags = true; +//MIRA_Vehicle_Medical_Unstable_ThresholdLowBP = 80; +//MIRA_Vehicle_Medical_Unstable_ThresholdLowHR = 50; +//MIRA_Vehicle_Medical_Unstable_TrackAirwayBlocked = true; +//MIRA_Vehicle_Medical_Unstable_TrackAllPneumothorax = true; +//MIRA_Vehicle_Medical_Unstable_TrackBleeding = true; +//MIRA_Vehicle_Medical_Unstable_TrackCardiacArrest = true; +//MIRA_Vehicle_Medical_Unstable_TrackDead = true; +//MIRA_Vehicle_Medical_Unstable_TrackIV = true; +//MIRA_Vehicle_Medical_Unstable_TrackLegFractures = true; +//MIRA_Vehicle_Medical_Unstable_TrackLegSplints = true; +//MIRA_Vehicle_Medical_Unstable_TrackLowBP = true; +//MIRA_Vehicle_Medical_Unstable_TrackLowHR = true; +//MIRA_Vehicle_Medical_Unstable_TrackSpO2 = true; +//MIRA_Vehicle_Medical_Unstable_TrackUnconscious = true; +//MIRA_Vehicle_Medical_Vehicles_EnableCar = true; +//MIRA_Vehicle_Medical_Vehicles_EnableHelicopter = true; +//MIRA_Vehicle_Medical_Vehicles_EnablePlane = true; +//MIRA_Vehicle_Medical_Vehicles_EnableShip = true; +//MIRA_Vehicle_Medical_Vehicles_EnableTank = true; +//MIRA_Vehicle_Medical_VERSION = false; +//MIRA_Vehicle_Medical_WarnViewingDead = true; + // ACE Vehicles force force ace_novehicleclanlogo_enabled = false; force force ace_vehicles_hideEjectAction = true; @@ -812,11 +1135,29 @@ force force emr_main_preventHighVaulting = false; force force emr_main_staminaCoefficient = 1; force force emr_main_whitelistStr = ""; +// F/A-18 +force force js_jc_fa18_advancedStart = false; +//js_jc_fa18_atflirRequire = true; +//js_jc_fa18_canopyLoss = true; +//js_jc_fa18_core_afterburnerArmedByDefault = true; +//js_jc_fa18_core_simpleMavericks = true; +//js_jc_fa18_core_tdcDepressRequiredForMove = false; +//js_jc_fa18_cursorSensitivity = 1; +//js_jc_fa18_interactCursor = false; +//js_jc_fa18_interactionRadiusMod = 1; +//js_jc_fa18_showLabels = true; + // Fawks' Enhanced NVGs //PDT_ENVG_ACE = false; force force PDT_ENVG_Blacklist = ""; //PDT_ENVG_Effect = ""; +// Hatchet Vehicle Framework +//vxf_interaction_showLabels = 2; +force force vxf_interaction_updateEvery = 5; +//vxf_uh60_interaction_autoclose_actionmenu = false; +//vxf_uh60_interaction_pointing = true; + // KAT - ADV Medical: Airway force force kat_airway_Accuvac_time = 8; force force kat_airway_autoTriage = true; @@ -832,6 +1173,7 @@ force force kat_airway_Larynxtubus_time = 3; force force kat_airway_medLvl_Accuvac = 1; force force kat_airway_medLvl_Guedeltubus = 1; force force kat_airway_medLvl_Larynxtubus = 2; +force force kat_airway_medLvl_Suction = 1; force force kat_airway_occlusion_cooldownPeriod = 6; force force kat_airway_occlusion_repeatTimer = 60; force force kat_airway_probability_headturning = 65; @@ -841,6 +1183,8 @@ force force kat_airway_RecoveryPosition_Time = 6; force force kat_airway_RecoveryPosition_TimeToDrain = 10; force force kat_airway_ReusableAirwayItems = false; force force kat_airway_string_exit = ""; +kat_airway_Suction_reuse = false; +kat_airway_Suction_time = 12; // KAT - ADV Medical: Breathing force force kat_breathing_advPtxChance = 5; @@ -913,6 +1257,7 @@ force force kat_circulation_AdvRhythm_Hardcore_Enable = true; force force kat_circulation_AdvRhythm_hardcoreDeteriorationChance = 10; force force kat_circulation_AdvRhythm_PEAChance = 50; force force kat_circulation_AdvRhythm_VTChance = 50; +force force kat_circulation_AED_duringCpr = true; force force kat_circulation_AED_MaxChance = 80; force force kat_circulation_AED_MinChance = 40; force force kat_circulation_AED_X_MaxChance = 90; @@ -956,14 +1301,13 @@ force force kat_circulation_useLocation_AED = 0; // KAT - ADV Medical: GUI //kat_gui_ColoredLogs = true; -force force kat_gui_overlayBodyPart = true; -force force kat_gui_showBleedRate = false; -force force kat_gui_showInactiveStatuses = true; //kat_gui_showPatientSideLabels = false; // KAT - ADV Medical: Misc force force kat_misc_AFAK_Container = 0; +force force kat_misc_AFAK_Item_Color = [0.67,0.84,0.9]; force force kat_misc_AFAK_RemoveWhenEmpty = true; +//kat_misc_AFAK_Slot_Color = [1,0.96,0.32]; force force kat_misc_AFAKFifthSlotItem = "[['kat_guedel', 3]]"; force force kat_misc_AFAKFirstSlotItem = "[['ACE_tourniquet', 4], ['ACE_splint', 2]]"; force force kat_misc_AFAKFourthSlotItem = "[['kat_chestSeal', 4], ['kat_ncdKit', 4]]"; @@ -980,15 +1324,20 @@ force force kat_misc_armbandSlingRightArmRotation = "5, -5, -5"; force force kat_misc_armbandSlingRightLeg = "-0.32, -0.29, -0.42"; force force kat_misc_armbandSlingRightLegRotation = "-30, -5, 38"; force force kat_misc_enable = true; +force force kat_misc_enableStitchFullBody = true; force force kat_misc_IFAK_Container = 0; +force force kat_misc_IFAK_Item_Color = [0.67,0.84,0.9]; force force kat_misc_IFAK_RemoveWhenEmpty = true; +force kat_misc_IFAK_Slot_Color = [1,0.3,0.3]; force force kat_misc_IFAKFirstSlotItem = "[['ACE_tourniquet', 2]]"; force force kat_misc_IFAKFourthSlotItem = "[['kat_chestSeal', 1]]"; force force kat_misc_IFAKSecondSlotItem = "[['ACE_packingBandage', 5], ['ACE_quikclot', 5]]"; force force kat_misc_IFAKThirdSlotItem = "[['kat_Painkiller', 1]]"; force force kat_misc_incompatibilityWarning = true; force force kat_misc_MFAK_Container = 0; +force force kat_misc_MFAK_Item_Color = [0.67,0.84,0.9]; force force kat_misc_MFAK_RemoveWhenEmpty = true; +force force kat_misc_MFAK_Slot_Color = [0.56,0.93,0.56]; force force kat_misc_MFAKEighthSlotItem = "[['kat_Pulseoximeter', 3], ['kat_pocketBVM', 1]]"; force force kat_misc_MFAKFifthSlotItem = "[['kat_larynx', 6]]"; force force kat_misc_MFAKFirstSlotItem = "[['ACE_tourniquet', 6], ['ACE_splint', 4]]"; @@ -1045,6 +1394,7 @@ force force kat_pharma_Reorientation_Enable = true; force force kat_pharma_Reorientation_Slap = true; force force kat_pharma_reorientationChance = 100; force force kat_pharma_RequireInsIV = true; +force force kat_pharma_RequireInsIVBloodDraw = false; force force kat_pharma_staminaMedication = true; force force kat_pharma_treatmentTime_Amiodarone = 7; force force kat_pharma_treatmentTime_ApplyIO = 2.6; @@ -1082,13 +1432,19 @@ force force kat_surgery_fractureCheck_MedLevel = 1; force force kat_surgery_fractureCheck_Time = 8; force force kat_surgery_incisionTime = 10; force force kat_surgery_intermediateTime = 8; -force force kat_surgery_npwtTime = 5; +force force kat_surgery_npwtLocation = 0; +force force kat_surgery_npwtMedLevel = 2; +force force kat_surgery_npwtTime = 20; force force kat_surgery_openTime = 15; force force kat_surgery_simpleChance = 69; force force kat_surgery_Surgery_ConsciousnessRequirement = 3; force force kat_surgery_surgicalAction_MedLevel = 2; force force kat_surgery_surgicalLocation = 0; +// KNB +//KNB_panel_aceAction = true; +force force KNB_panel_consume = true; + // LAMBS Danger force force lambs_danger_cqbRange = 60; force force lambs_danger_disableAIAutonomousManoeuvres = false; @@ -1236,6 +1592,11 @@ force force vtx_uh60m_simpleStartup = false; //vtx_uh60m_trackIR_interaction_cursor = false; //vtx_uh60m_trackIR_interaction_cursorSensitivity = 2.5; +// UK3CB Factions +//uk3cb_pipstretchfactor = 0; +//uk3cb_preferedOptic = 0; +//uk3cb_preferedOpticHighMag = 0; + // USAF force force usaf_afterburner_setting_allow_ai = true; force force USAF_allowNuke = false; @@ -1380,6 +1741,24 @@ force force usaf_utility_core_allow_move_in_cargo = false; //zen_faction_filter_0_UK3CB_CHD_W_O = true; //zen_faction_filter_0_UK3CB_CHD_W_O_groups = true; //zen_faction_filter_0_UK3CB_CPD_O = true; +//zen_faction_filter_0_UK3CB_CSAT_A_O = true; +//zen_faction_filter_0_UK3CB_CSAT_A_O_groups = true; +//zen_faction_filter_0_UK3CB_CSAT_B_O = true; +//zen_faction_filter_0_UK3CB_CSAT_B_O_groups = true; +//zen_faction_filter_0_UK3CB_CSAT_F_O = true; +//zen_faction_filter_0_UK3CB_CSAT_F_O_groups = true; +//zen_faction_filter_0_UK3CB_CSAT_G_O = true; +//zen_faction_filter_0_UK3CB_CSAT_G_O_groups = true; +//zen_faction_filter_0_UK3CB_CSAT_M_O = true; +//zen_faction_filter_0_UK3CB_CSAT_M_O_groups = true; +//zen_faction_filter_0_UK3CB_CSAT_N_O = true; +//zen_faction_filter_0_UK3CB_CSAT_N_O_groups = true; +//zen_faction_filter_0_UK3CB_CSAT_S_O = true; +//zen_faction_filter_0_UK3CB_CSAT_S_O_groups = true; +//zen_faction_filter_0_UK3CB_CSAT_U_O = true; +//zen_faction_filter_0_UK3CB_CSAT_U_O_groups = true; +//zen_faction_filter_0_UK3CB_CSAT_W_O = true; +//zen_faction_filter_0_UK3CB_CSAT_W_O_groups = true; //zen_faction_filter_0_UK3CB_CW_SOV_O_EARLY = true; //zen_faction_filter_0_UK3CB_CW_SOV_O_LATE = true; //zen_faction_filter_0_UK3CB_FIA_O = true; @@ -1397,6 +1776,7 @@ force force usaf_utility_core_allow_move_in_cargo = false; //zen_faction_filter_0_UK3CB_LNM_O_groups = true; //zen_faction_filter_0_UK3CB_LSM_O = true; //zen_faction_filter_0_UK3CB_MDF_O = true; +//zen_faction_filter_0_UK3CB_MEC_O = true; //zen_faction_filter_0_UK3CB_MEE_O = true; //zen_faction_filter_0_UK3CB_MEI_O = true; //zen_faction_filter_0_UK3CB_NAP_O = true; @@ -1427,6 +1807,8 @@ force force usaf_utility_core_allow_move_in_cargo = false; //zen_faction_filter_1_rhsgref_faction_cdf_ground_b_groups = true; //zen_faction_filter_1_rhsgref_faction_cdf_ng_b = true; //zen_faction_filter_1_rhsgref_faction_hidf = true; +//zen_faction_filter_1_TF373_RAF = true; +//zen_faction_filter_1_TF373_SOAR = true; //zen_faction_filter_1_UK3CB_AAF_B = true; //zen_faction_filter_1_UK3CB_ADA_B = true; //zen_faction_filter_1_UK3CB_ADC_B = true; @@ -1462,6 +1844,7 @@ force force usaf_utility_core_allow_move_in_cargo = false; //zen_faction_filter_1_UK3CB_LNM_B_groups = true; //zen_faction_filter_1_UK3CB_LSM_B = true; //zen_faction_filter_1_UK3CB_MDF_B = true; +//zen_faction_filter_1_UK3CB_MEC_B = true; //zen_faction_filter_1_UK3CB_MEI_B = true; //zen_faction_filter_1_UK3CB_NAP_B = true; //zen_faction_filter_1_UK3CB_NAP_B_groups = true; @@ -1525,6 +1908,7 @@ force force usaf_utility_core_allow_move_in_cargo = false; //zen_faction_filter_2_UK3CB_LNM_I_groups = true; //zen_faction_filter_2_UK3CB_LSM_I = true; //zen_faction_filter_2_UK3CB_MDF_I = true; +//zen_faction_filter_2_UK3CB_MEC_I = true; //zen_faction_filter_2_UK3CB_MEE_I = true; //zen_faction_filter_2_UK3CB_MEI_I = true; //zen_faction_filter_2_UK3CB_NAP_I = true; @@ -1544,4 +1928,5 @@ force force usaf_utility_core_allow_move_in_cargo = false; //zen_faction_filter_3_IND_L_F = true; //zen_faction_filter_3_UK3CB_ADC_C = true; //zen_faction_filter_3_UK3CB_CHC_C = true; +//zen_faction_filter_3_UK3CB_MEC_C = true; //zen_faction_filter_3_UK3CB_TKC_C = true; From 7b95a68635d50670ee494addb7e0669c99e76321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Sun, 7 Apr 2024 20:11:56 +0200 Subject: [PATCH 3/6] Added alternative function setCargo that replace cargo and addCargo that append to the cargo container (#1165) Co-authored-by: Jonah Pool --- cScripts/CfgFunctions.hpp | 1 + cScripts/functions/logistics/fn_addCargo.sqf | 11 +--- .../logistics/fn_createCargoCrate.sqf | 2 +- .../logistics/fn_doFieldHospital.sqf | 2 +- .../logistics/fn_doStarterCrateSupplies.sqf | 2 +- .../functions/logistics/fn_doSupplyCrate.sqf | 2 +- cScripts/functions/logistics/fn_setCargo.sqf | 31 ++++++++++ .../vehicle/fn_vehicle_addInventory.sqf | 60 +++++++++---------- 8 files changed, 68 insertions(+), 43 deletions(-) create mode 100644 cScripts/functions/logistics/fn_setCargo.sqf diff --git a/cScripts/CfgFunctions.hpp b/cScripts/CfgFunctions.hpp index eeb6a4294..229001bf2 100644 --- a/cScripts/CfgFunctions.hpp +++ b/cScripts/CfgFunctions.hpp @@ -39,6 +39,7 @@ class cScripts { class logistics { file = "cScripts\functions\logistics"; class addCargo {}; + class setCargo {}; class setCargoAttributes {}; class checkItemValidity {}; class createCargoCrate {}; diff --git a/cScripts/functions/logistics/fn_addCargo.sqf b/cScripts/functions/logistics/fn_addCargo.sqf index 6280913ec..6bfac3c91 100644 --- a/cScripts/functions/logistics/fn_addCargo.sqf +++ b/cScripts/functions/logistics/fn_addCargo.sqf @@ -2,7 +2,7 @@ /* * Author: Whitsel.M * This function add given supplies to a container. - * If nothing in the array is defined the container will be empty. + * If nothing in the array is defined the container will not add anything. * * Arguments: * 0: Vehicle or Crate @@ -14,22 +14,15 @@ * Example: * [MyCrate, [["ACE_EarPlugs", 60]]] call cScripts_fnc_addCargo; * [MyTruck, [["ACE_personalAidKit", 8], ["ACE_tourniquet", 10]]] call cScripts_fnc_addCargo; - * [MyTruck, [["ACE_personalAidKit", 8], ["ACE_tourniquet", 10]], "myCrate", false] call cScripts_fnc_addCargo; * * Public: Yes */ params [ ["_vehicle", objNull, [objNull]], - ["_inventory", [], [[]]], - ["_crateName", "", [""]] + ["_inventory", [], [[]]] ]; -clearWeaponCargoGlobal _vehicle; -clearMagazineCargoGlobal _vehicle; -clearItemCargoGlobal _vehicle; -clearBackpackCargoGlobal _vehicle; - if ( count _inventory < 1 ) exitWith {}; { diff --git a/cScripts/functions/logistics/fn_createCargoCrate.sqf b/cScripts/functions/logistics/fn_createCargoCrate.sqf index 9e784c21e..56f6b59a8 100644 --- a/cScripts/functions/logistics/fn_createCargoCrate.sqf +++ b/cScripts/functions/logistics/fn_createCargoCrate.sqf @@ -51,7 +51,7 @@ if (!isNil{_resize}) then { if (_hasCargo) then { if (_inventory isEqualTo true) then { _inventory = [] }; - [_crate, _inventory] call FUNC(addCargo); + [_crate, _inventory] call FUNC(setCargo); }; if (_isInCargo) then { diff --git a/cScripts/functions/logistics/fn_doFieldHospital.sqf b/cScripts/functions/logistics/fn_doFieldHospital.sqf index 05a0efcd3..3ac388b7e 100644 --- a/cScripts/functions/logistics/fn_doFieldHospital.sqf +++ b/cScripts/functions/logistics/fn_doFieldHospital.sqf @@ -31,7 +31,7 @@ if (_isFacility) then { // If isServer add medical equipment if (isServer) then { private _crateContent = ["atlas"] call FUNC(getMedicalCrate); - [_crate, _crateContent] call FUNC(addCargo); + [_crate, _crateContent] call FUNC(setCargo); }; // Change ace logistics size of crate diff --git a/cScripts/functions/logistics/fn_doStarterCrateSupplies.sqf b/cScripts/functions/logistics/fn_doStarterCrateSupplies.sqf index f4d82f2ad..6afaa99ef 100644 --- a/cScripts/functions/logistics/fn_doStarterCrateSupplies.sqf +++ b/cScripts/functions/logistics/fn_doStarterCrateSupplies.sqf @@ -68,6 +68,6 @@ private _container = switch (_companySelector) do { default {[]}; }; -[_crate, _container] call FUNC(addCargo); +[_crate, _container] call FUNC(setCargo); true \ No newline at end of file diff --git a/cScripts/functions/logistics/fn_doSupplyCrate.sqf b/cScripts/functions/logistics/fn_doSupplyCrate.sqf index 04ae8aee1..a73fc6491 100644 --- a/cScripts/functions/logistics/fn_doSupplyCrate.sqf +++ b/cScripts/functions/logistics/fn_doSupplyCrate.sqf @@ -45,7 +45,7 @@ if (isServer) then { [{!isNil{EGVAR(DATABASE,DONE)} && EGVAR(DATABASE,DONE);}, { _this params ["_crate","_crateType"]; private _container = GET_CONTAINER(_crateType); - [_crate, _container] call FUNC(addCargo); + [_crate, _container] call FUNC(setCargo); }, [_crate, _crateType]] call CBA_fnc_waitUntilAndExecute; }; diff --git a/cScripts/functions/logistics/fn_setCargo.sqf b/cScripts/functions/logistics/fn_setCargo.sqf new file mode 100644 index 000000000..0504528d6 --- /dev/null +++ b/cScripts/functions/logistics/fn_setCargo.sqf @@ -0,0 +1,31 @@ +#include "..\script_component.hpp"; +/* + * Author: Whitsel.M + * This function sets given supplies to a container. + * If nothing in the array is defined the container will be empty. + * + * Arguments: + * 0: Vehicle or Crate + * 1: Inventory + * + * Return Value: + * Nothing + * + * Example: + * [MyCrate, [["ACE_EarPlugs", 60]]] call cScripts_fnc_setCargo; + * [MyTruck, [["ACE_personalAidKit", 8], ["ACE_tourniquet", 10]]] call cScripts_fnc_setCargo; + * + * Public: Yes + */ + +params [ + ["_vehicle", objNull, [objNull]], + ["_inventory", [], [[]]] +]; + +clearWeaponCargoGlobal _vehicle; +clearMagazineCargoGlobal _vehicle; +clearItemCargoGlobal _vehicle; +clearBackpackCargoGlobal _vehicle; + +[_vehicle, _inventory] call FUNC(addCargo); \ No newline at end of file diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index 6256d98e2..cdb2d1025 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -37,7 +37,7 @@ _vehicle setVariable ["ace_cargo_noRename", true, true]; _vehicle setVariable [QEGVAR(VehicleFunc,Inventory), true, true]; -if (_vehicleType == "EMPTY") exitWith { [_vehicle, []] call FUNC(addCargo); }; +if (_vehicleType == "EMPTY") exitWith { [_vehicle, []] call FUNC(setCargo); }; // Ground Vehicles @@ -57,7 +57,7 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then { // Vehicle Inventory [_vehicle, GET_CONTAINER("vehicle_strykerDragoon_V4") - ] call FUNC(addCargo); + ] call FUNC(setCargo); // Supply Crate ["Box_NATO_Equip_F", @@ -99,7 +99,7 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then { // Vehicle Inventory [_vehicle, GET_CONTAINER("vehicle_strykerDragoon") - ] call FUNC(addCargo); + ] call FUNC(setCargo); // Supply Crate ["Box_NATO_Equip_F", @@ -126,7 +126,7 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then { case "MED": { [_vehicle, GET_CONTAINER("vehicle_medicalAtlas") - ] call FUNC(addCargo); + ] call FUNC(setCargo); ["ace_medicalSupplyCrate", GET_CONTAINER("crate_medicalAtlas"), @@ -139,7 +139,7 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then { // Vehicle Inventory [_vehicle, GET_CONTAINER("vehicle_strykerDragoon") - ] call FUNC(addCargo); + ] call FUNC(setCargo); // Supply Crate ["Box_NATO_Equip_F", @@ -174,7 +174,7 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { case "MED": { [_vehicle, GET_CONTAINER("vehicle_medicalAtlas") - ] call FUNC(addCargo); + ] call FUNC(setCargo); ["ace_medicalSupplyCrate", GET_CONTAINER("crate_medicalAtlas"), @@ -185,13 +185,13 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { case "rhsusf_m1165a1_gmv_m2_m240_socom_w": { [_vehicle, GET_CONTAINER("vehicle_HMMWV") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; case "rhsusf_m1165a1_gmv_mk19_m240_socom_d"; case "rhsusf_m1165a1_gmv_mk19_m240_socom_w": { [_vehicle, GET_CONTAINER("vehicle_HMMWV_Weapons") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; case "rhsusf_M1239_socom_d"; case "rhsusf_M1239_M2_socom_d"; @@ -211,7 +211,7 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { // Vehicle Inventory [_vehicle, GET_CONTAINER(vehicle_strykerDragoon) - ] call FUNC(addCargo); + ] call FUNC(setCargo); // Supply Crate ["Box_NATO_Equip_F", @@ -243,7 +243,7 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { // Vehicle Inventory [_vehicle, GET_CONTAINER(vehicle_strykerDragoon) - ] call FUNC(addCargo); + ] call FUNC(setCargo); // Supply Crate ["Box_NATO_Equip_F", @@ -254,13 +254,13 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { default { [_vehicle, GET_CONTAINER("vehicle_HMMWV") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; }; }; if (_vehicle iskindOf "rhsusf_fmtv_base") then { - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; if (_vehicle iskindOf "Truck_01_base_F") then { @@ -270,7 +270,7 @@ if (_vehicle iskindOf "Truck_01_base_F") then { case "MED": { [_vehicle, GET_CONTAINER("vehicle_medicalAtlas") - ] call FUNC(addCargo); + ] call FUNC(setCargo); ["ace_medicalSupplyCrate", GET_CONTAINER("crate_medicalAtlas"), @@ -278,7 +278,7 @@ if (_vehicle iskindOf "Truck_01_base_F") then { ] call FUNC(createCargoCrate); }; default { - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; }; ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; @@ -296,7 +296,7 @@ if (_vehicle iskindOf "rhsusf_stryker_base") then { case "MED": { [_vehicle, GET_CONTAINER("vehicle_medicalAtlas") - ] call FUNC(addCargo); + ] call FUNC(setCargo); ["ace_medicalSupplyCrate", GET_CONTAINER("crate_medicalAtlas"), @@ -306,7 +306,7 @@ if (_vehicle iskindOf "rhsusf_stryker_base") then { default { [_vehicle, GET_CONTAINER("vehicle_strykerDragoon") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; }; ["FlexibleTank_01_forest_F", false, _vehicle, 1] call FUNC(createCargoCrate); @@ -317,7 +317,7 @@ if (_vehicle iskindOf "RHS_M2A2_Base") then { [_vehicle, GET_CONTAINER("vehicle_bradley") - ] call FUNC(addCargo); + ] call FUNC(setCargo); ["ACE_Track", _vehicle, true] call ace_cargo_fnc_loadItem; }; @@ -328,29 +328,29 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then { [_vehicle, GET_CONTAINER("vehicle_bradley") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; if (_vehicle iskindOf "RHS_MELB_base") then { - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; // Deployable if (_vehicle iskindOf "rhs_m2staticmg_base") then { - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; if (_vehicle iskindOf "RHS_MK19_TriPod_base") then { - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; if (_vehicle iskindOf "RHS_TOW_TriPod_base") then { - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; if (_vehicle iskindOf "NDS_M224_mortar_base") then { - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; @@ -364,7 +364,7 @@ if (_vehicle iskindOf "Heli_Transport_01_base_F") then { case "MED": { [_vehicle, GET_CONTAINER("vehicle_medicalAtlas") - ] call FUNC(addCargo); + ] call FUNC(setCargo); ["ace_medicalSupplyCrate", GET_CONTAINER("crate_medicalAtlas"), @@ -374,7 +374,7 @@ if (_vehicle iskindOf "Heli_Transport_01_base_F") then { default { [_vehicle, GET_CONTAINER("vehicle_heliTransport") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; }; }; @@ -382,28 +382,28 @@ if (_vehicle iskindOf "Heli_Transport_01_base_F") then { if (_vehicle iskindOf "Heli_Transport_02_base_F") then { [_vehicle, GET_CONTAINER("vehicle_heliTransport") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; if (_vehicle iskindOf "TF373_SOAR_MH47G_Base") then { [_vehicle, GET_CONTAINER("vehicle_heliTransport") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; if (_vehicle iskindOf "vtx_MH60M") then { [_vehicle, GET_CONTAINER("vehicle_heliTransport") - ] call FUNC(addCargo); + ] call FUNC(setCargo); }; if (_vehicle iskindOf "RHS_AH64_base") then { - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; // Fixed Wing if (_vehicle iskindOf "RHS_C130J_Base") then { [_vehicle, 45, -1, false, false] call FUNC(setCargoAttributes); - [_vehicle, []] call FUNC(addCargo); + [_vehicle, []] call FUNC(setCargo); }; From 10fd1f90b377a79bd61aac63bfffbd971917c220 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 8 Apr 2024 12:02:54 -0400 Subject: [PATCH 4/6] Update stryker dragoon weapons to use new 300 rnd belts --- .../functions/vehicle/fn_vehicle_getPylon.sqf | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 85fcfc976..6dc3fb130 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -120,8 +120,12 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ private _cav_dragoon_base_F = createHashMapFromArray [ ["antiarmor", [ ["SmokeLauncherMag",[0],6], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], @@ -131,8 +135,12 @@ private _cav_dragoon_base_F = createHashMapFromArray [ ]], // ["antiair", [ // ["SmokeLauncherMag",[0,0],6], - // ["2000Rnd_762x51_Belt_T_Red",[0],2000], - // ["2000Rnd_762x51_Belt_T_Red",[0],2000], + // ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + // ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + // ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + // ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + // ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + // ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], // ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], // ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], // ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], @@ -141,8 +149,12 @@ private _cav_dragoon_base_F = createHashMapFromArray [ // ]], ["default",[ ["SmokeLauncherMag",[0],6], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], @@ -152,8 +164,12 @@ private _cav_dragoon_base_F = createHashMapFromArray [ ]], ["balanced",[ ["SmokeLauncherMag",[0],6], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], From 44a7a95433e6a81b27eedf52e5d20c04db659d24 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 8 Apr 2024 12:06:21 -0400 Subject: [PATCH 5/6] Extra mag --- cScripts/functions/vehicle/fn_vehicle_getPylon.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 6dc3fb130..8f816b6b8 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -170,6 +170,7 @@ private _cav_dragoon_base_F = createHashMapFromArray [ ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], + ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], From 28a6d509a50aa5aeb0ba472f292d0b024fcbe473 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 8 Apr 2024 12:06:46 -0400 Subject: [PATCH 6/6] Take back extra mag --- cScripts/functions/vehicle/fn_vehicle_getPylon.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 8f816b6b8..6dc3fb130 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -170,7 +170,6 @@ private _cav_dragoon_base_F = createHashMapFromArray [ ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],