From d75fb6208a2d8421f6fd3055cca789f87896f3ab Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 13 Jan 2024 12:40:33 -0500 Subject: [PATCH 1/4] Add stinger crate and update viking inventories. --- cScripts/functions/init/fn_init_logistics.sqf | 28 +++++++++---------- .../vehicle/fn_vehicle_addInventory.sqf | 15 ++++++++++ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 89eb9ab32..459a9b02e 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -211,6 +211,8 @@ private _dataArray = [ ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red", 50], ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan", 0], ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red", 0], + ["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], @@ -749,6 +751,10 @@ private _dataArray = [ ["ACE_1Rnd_82mm_Mo_Smoke", 8], ["ACE_1Rnd_82mm_Mo_HE_LaserGuided",8] ]], + ["crate_stinger",[ + ["rhs_weap_fim92", 1], + ["rhs_fim92_mag",2] + ]], ["crate_resupply_general", [ // Rifle Ammo ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",70], @@ -939,14 +945,11 @@ private _dataArray = [ // AT ["rhs_weap_fgm148", 1], ["rhs_fgm148_magazine_AT", 2], - ["rhs_weap_M136", 2], - // M32 Rotary Grenade Launcher - ["rhs_weap_m32", 1], - ["rhsusf_mag_6Rnd_M397_HET", 2], - ["rhsusf_mag_6Rnd_M433_HEDP", 3], - ["rhsusf_mag_6Rnd_m4009", 3], - ["rhsusf_mag_6Rnd_M713_red", 2], + // MG + ["rhs_weap_m240B",1], + ["rhs_usf_acc_su230A",1], + ["rhsusf_100Rnd_762x51_m62_tracer", 10], // UAV Equipment ["ACE_UAVBattery", 4], @@ -973,14 +976,11 @@ private _dataArray = [ // AT ["rhs_weap_fgm148", 1], ["rhs_fgm148_magazine_AT", 2], - ["rhs_weap_M136", 2], - // M32 Rotary Grenade Launcher - ["rhs_weap_m32", 1], - ["rhsusf_mag_6Rnd_M397_HET", 2], - ["rhsusf_mag_6Rnd_M433_HEDP", 3], - ["rhsusf_mag_6Rnd_m4009", 3], - ["rhsusf_mag_6Rnd_M713_red", 2], + // MG + ["rhs_weap_m240B",1], + ["rhs_usf_acc_su230A",1], + ["rhsusf_100Rnd_762x51_m62_tracer", 10], // UAV Equipment ["ACE_UAVBattery", 4], diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index f2f068379..ac56eb0f3 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -82,6 +82,11 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then { _mortar_ammo_82mm, _vehicle, nil, "Ammo for 2x 82mm mortars" ] call FUNC(createCargoCrate); + + ["Box_NATO_WpsLaunch_F", + GET_CONTAINER(crate_stinger), + _vehicle, nil, "MANPAD" + ] call FUNC(createCargoCrate); }; // Logistical strykers: Have same inventory, but a lot of wheels in cargo. @@ -106,6 +111,11 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then { GET_CONTAINER(crate_strykerDragoon_resupply), _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); + + ["Box_NATO_WpsLaunch_F", + GET_CONTAINER(crate_stinger), + _vehicle, nil, "MANPAD" + ] call FUNC(createCargoCrate); }; // Ambulance strykers: Carry medical supplies and a medical resupply crate. @@ -135,6 +145,11 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then { GET_CONTAINER(crate_strykerDragoon_resupply), _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); + + ["Box_NATO_WpsLaunch_F", + GET_CONTAINER(crate_stinger), + _vehicle, nil, "MANPAD" + ] call FUNC(createCargoCrate); }; }; }; From 4bcd5bc4f2636c1cb0b518862dc66656295b32fa Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 13 Jan 2024 13:00:17 -0500 Subject: [PATCH 2/4] Fix classname --- cScripts/functions/init/fn_init_logistics.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 459a9b02e..aa72836e8 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -948,7 +948,7 @@ private _dataArray = [ // MG ["rhs_weap_m240B",1], - ["rhs_usf_acc_su230A",1], + ["rhsusf_acc_su230A",1], ["rhsusf_100Rnd_762x51_m62_tracer", 10], // UAV Equipment @@ -979,7 +979,7 @@ private _dataArray = [ // MG ["rhs_weap_m240B",1], - ["rhs_usf_acc_su230A",1], + ["rhsusf_acc_su230A",1], ["rhsusf_100Rnd_762x51_m62_tracer", 10], // UAV Equipment From 6c96a0da503b7f4bc75ebd7619b53311f481e71d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 13 Jan 2024 15:18:10 -0500 Subject: [PATCH 3/4] Remove UAV batteries and classname fix --- cScripts/functions/init/fn_init_logistics.sqf | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index aa72836e8..024823458 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -948,12 +948,9 @@ private _dataArray = [ // MG ["rhs_weap_m240B",1], - ["rhsusf_acc_su230A",1], + ["rhsusf_acc_su230a",1], ["rhsusf_100Rnd_762x51_m62_tracer", 10], - // UAV Equipment - ["ACE_UAVBattery", 4], - // Tools ["ACE_wirecutter", 1], @@ -979,12 +976,9 @@ private _dataArray = [ // MG ["rhs_weap_m240B",1], - ["rhsusf_acc_su230A",1], + ["rhsusf_acc_su230a",1], ["rhsusf_100Rnd_762x51_m62_tracer", 10], - // UAV Equipment - ["ACE_UAVBattery", 4], - // Tools ["ACE_wirecutter", 1], From 96006e156d8a31d0e05a52aaef5c179d8d191908 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sun, 14 Jan 2024 10:36:50 -0500 Subject: [PATCH 4/4] Engineer perms for fw and medic for door gunner --- cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp | 3 +++ cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp | 1 + 2 files changed, 4 insertions(+) diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp index 141bda396..eacf3aeca 100644 --- a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp @@ -3,6 +3,7 @@ class Cav_B_A_Plane_Fighter_Pilot_F: Cav_B_Alpha_base_F { displayName = "$STR_Cav_Alpha_Characters_A_Plane_Fighter_Pilot"; 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],[],""],["U_B_PilotCoveralls",[["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["acex_intelitems_notepad",1,1],["ACE_HandFlare_Green",2,1],["SmokeShellPurple",2,1],["ACE_Chemlight_UltraHiOrange",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],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCB_CCT7",[["ToolKit",1],["USP_BASEBALL_CAP_ABU_BS",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"H_PilotHelmetFighter_B","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; role = "pilotfighter"; }; @@ -10,11 +11,13 @@ class Cav_B_A_Plane_Transport_Pilot_F: Cav_B_Alpha_base_F { displayName = "$STR_Cav_Alpha_Characters_A_Plane_Transport_Pilot"; 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],["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_CCT7",[["ToolKit",1],["NVGogglesB_blk_F",1],["UK3CB_BAF_H_Earphone",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_OD_C","",["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],["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_CCT7",[["ToolKit",1],["NVGogglesB_blk_F",1],["UK3CB_BAF_H_Earphone",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_OD_C","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; }; diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp index 746ac76c8..817a122bc 100644 --- a/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp @@ -25,6 +25,7 @@ class Cav_B_A_Helicopter_Tra_CrewChief_F: Cav_B_A_PilotBase_F { class Cav_B_A_Helicopter_Tra_DoorGunner_F: Cav_B_A_Helicopter_Tra_CrewChief_F { displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Tra_DoorGunner"; scope = 2; + abilityMedic = 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],[],""],["USP_G3C_RS2_MC",[["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],["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]]],["USP_TACTICAL_PACK_CCT7",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_quikclot",20],["ACE_EntrenchingTool",1],["ACE_elasticBandage",20],["ACE_splint",2],["ACE_tourniquet",2],["rhsusf_m112_mag",1,1],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]]; };