Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Stryker Inventory and Arsenal #1183

Merged
merged 10 commits into from
Apr 20, 2024
Merged

Updated Stryker Inventory and Arsenal #1183

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2c2deef
Refined inventory for strykers
pool011 Apr 20, 2024
5b8d38e
Update grenades for Atlas and Viking and add cTab items for Charlie
pool011 Apr 20, 2024
0069f76
Appropriate cTab Distribution
pool011 Apr 20, 2024
7cfeb78
Remove tubes but refine ammo to allow crossloading for bravo
pool011 Apr 20, 2024
87ded50
Move rifle and MG ammo to appropriate location
pool011 Apr 20, 2024
ecbba8a
Fixed missing comma
AndreasBrostrom Apr 20, 2024
50a204b
Missing comma
pool011 Apr 20, 2024
ee399ca
Merge branch 'Stryker-Inventory-Revamp' of https://github.com/pool011…
pool011 Apr 20, 2024
9619bd0
Use Weapons Crate instead of Equipment Crate for stryker resupply
pool011 Apr 20, 2024
fbd82ec
Replace more crates
pool011 Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 62 additions & 48 deletions cScripts/functions/init/fn_init_logistics.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,32 +240,30 @@ private _dataArray = [
["rhs_weap_M136_hedp",1],
["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],
["NDS_M_6Rnd_60mm_HE", 0],
["NDS_M_6Rnd_60mm_HE_0", 0],
["NDS_M_6Rnd_60mm_SMOKE", 0],
["avm224_M_6Rnd_60mm_ILLUM_IR", 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],
["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",28],
["ACE_30Rnd_556x45_Stanag_M995_AP_mag",0],
["rhsusf_200Rnd_556x45_soft_pouch",0],
["rhsusf_100Rnd_762x51_m62_tracer",0],
["rhs_fgm148_magazine_AT",1],
["rhs_fim92_mag",2],
["MRAWS_HE_F",2],
["MRAWS_HEAT_F",2],
["MAA_MAAWS_ASM509",0],
["MAA_MAAWS_GMM_MT",0],

// Ammo
["rhs_mag_30Rnd_556x45_M855A1_PMAG",0],
["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",28],
["ACE_30Rnd_556x45_Stanag_M995_AP_mag",0],
["rhsusf_200Rnd_556x45_soft_pouch",0],
["rhsusf_100Rnd_762x51_m62_tracer",0],

["rhs_mag_M397_HET",0],
["rhs_mag_M433_HEDP",20],
["ACE_HuntIR_M203",0],
Expand All @@ -278,17 +276,21 @@ private _dataArray = [
["ACE_40mm_Flare_ir",0],

// Grenades
["HandGrenade",0],
["SmokeShell",0],
["SmokeShellRed",0],
["HandGrenade",10],
["SmokeShell",10],
["SmokeShellBlue",0],
["SmokeShellPurple",0],
["SmokeShellGreen",0],
["SmokeShellYellow",0],
["rhs_mag_mk3a2",0],
["ACE_M84",0],
["ACE_Chemlight_HiYellow",0],
["SmokeShellRed",0],
["ACE_Chemlight_HiWhite",0],
["ACE_Chemlight_HiBlue",0],
["ACE_Chemlight_HiGreen",0],
["ACE_Chemlight_HiYellow",0],
["ACE_Chemlight_HiRed",0],
["ACE_Chemlight_IR",0],
["ACE_M84",0],
["rhs_mag_mk3a2",0],

// Mines and Explosives
["ACE_Clacker",0],
Expand Down Expand Up @@ -325,6 +327,20 @@ private _dataArray = [
["ACE_IR_Strobe_Item",0],
["ACE_wirecutter",10],

// Grenades
["SmokeShell",10],
["SmokeShellBlue",0],
["SmokeShellPurple",0],
["SmokeShellGreen",0],
["SmokeShellYellow",0],
["SmokeShellRed",0],
["ACE_Chemlight_HiWhite",0],
["ACE_Chemlight_HiBlue",0],
["ACE_Chemlight_HiGreen",0],
["ACE_Chemlight_HiYellow",0],
["ACE_Chemlight_HiRed",0],
["ACE_Chemlight_IR",0],

// Medical
["ACE_EarPlugs",10],
["ACE_bodyBag",0],
Expand Down Expand Up @@ -401,6 +417,7 @@ private _dataArray = [
["HandGrenade",10],
["SmokeShell",10],
["SmokeShellBlue",0],
["SmokeShellPurple",0],
["SmokeShellGreen",0],
["SmokeShellYellow",0],
["SmokeShellRed",0],
Expand Down Expand Up @@ -431,7 +448,7 @@ private _dataArray = [

//cTab
["ItemAndroid", 0],
["ItemcTab", 0],
["ItemAndroidMisc",0],

// NVG
["USP_PVS14", 0],
Expand Down Expand Up @@ -590,9 +607,10 @@ private _dataArray = [

["crate_strykerDragoon_resupply", [
// Rifle Ammo
["rhs_mag_30Rnd_556x45_M855A1_PMAG", 28],
["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red", 21],
["ACE_30Rnd_556x45_Stanag_M995_AP_mag", 7],
["rhs_mag_30Rnd_556x45_M855A1_PMAG", 35],
["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red", 7],
["ACE_30Rnd_556x45_Stanag_M995_AP_mag", 14],
["rhsusf_200Rnd_556x45_mixed_soft_pouch",9],

// MG Ammo
["rhsusf_100Rnd_762x51_m62_tracer", 10],
Expand All @@ -612,27 +630,30 @@ private _dataArray = [
["HandGrenade", 9],

// Smoke Grenades
["SmokeShell", 27],
["SmokeShellRed", 4],
["SmokeShell", 10],
["SmokeShellRed", 10],
["SmokeShellBlue", 4],
["SmokeShellYellow", 4],
["SmokeShellGreen", 4],
["SmokeShellYellow", 2],
["SmokeShellGreen", 2],

// Medical
["ACE_quikclot", 50],
["ACE_tourniquet", 18]
]],
["crate_strykerDragoon_60mm",[
["avm224_W_M224_mortar_carry",4],
["avm224_M_6Rnd_60mm_HE_csw", 50],
["avm224_M_6Rnd_60mm_HE_0_csw", 50],
["avm224_M_6Rnd_60mm_ILLUM_IR_csw", 25],
["avm224_M_6Rnd_60mm_SMOKE_csw", 25]
["NDS_M_6Rnd_60mm_HE", 7],
["NDS_M_6Rnd_60mm_HE_0", 4],
["NDS_M_6Rnd_60mm_SMOKE", 3],
["avm224_M_6Rnd_60mm_ILLUM_IR", 1]
]],
["crate_strykerDragoon_82mm",[
["ACE_1Rnd_82mm_Mo_HE", 24],
["ACE_1Rnd_82mm_Mo_Illum", 8],
["ACE_1Rnd_82mm_Mo_Smoke", 8]
["crate_strykerDragoon_81mm",[
["ace_compat_rhs_usf3_m252_carry", 2],
["ace_csw_carryMortarBaseplate", 2]
]],
["crate_strykerDragoon_81mm_ammo",[
["ACE_1Rnd_82mm_Mo_HE", 21],
["ACE_1Rnd_82mm_Mo_Illum", 6],
["ACE_1Rnd_82mm_Mo_Smoke", 6]
]],
["crate_stinger",[
["rhs_weap_fim92", 1],
Expand Down Expand Up @@ -829,9 +850,7 @@ private _dataArray = [
["rhs_weap_fgm148", 1],
["rhs_fgm148_magazine_AT", 2],

// MG
["rhs_weap_m240B",1],
["rhsusf_acc_su230a",1],
// MG Ammo
["rhsusf_100Rnd_762x51_m62_tracer", 10],

// Tools
Expand All @@ -857,18 +876,12 @@ private _dataArray = [
["rhs_weap_fgm148", 1],
["rhs_fgm148_magazine_AT", 2],

// MG
["rhs_weap_m240B",1],
["rhsusf_acc_su230a",1],
// MG Ammo
["rhsusf_100Rnd_762x51_m62_tracer", 10],

// Tools
["ACE_wirecutter", 1],

// 82mm Mortars
["ace_compat_rhs_usf3_m252_carry", 2],
["ace_csw_carryMortarBaseplate", 2],

// Medical
["kat_AED",1],
["ACE_epinephrine",4],
Expand Down Expand Up @@ -1389,7 +1402,9 @@ private _dataArray = [
["ACE_microDAGR", 0],
["ACE_HuntIR_monitor", 0],
["ItemAndroid", 0],
["ItemAndroidMisc",0],
["ItemcTab", 0],
["ItemcTabMisc", 0],
["USP_VEST_STRANDHOGG2_MC", 0],
["USP_VEST_STRANDHOGG2_CBR", 0],
["ACE_Vector", 0],
Expand All @@ -1409,7 +1424,6 @@ private _dataArray = [
["arsenal_role_squadleader", [
["ACE_microDAGR", 0],
["ACE_HuntIR_monitor", 0],
["ItemAndroid", 0],
["USP_VEST_STRANDHOGG2_MC", 0],
["USP_VEST_STRANDHOGG2_CBR", 0],
["ACE_Vector", 0],
Expand Down
39 changes: 29 additions & 10 deletions cScripts/functions/vehicle/fn_vehicle_addInventory.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,41 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then {
GET_CONTAINER("vehicle_strykerDragoon_V4")
] call FUNC(setCargo);

// 60mm Mortar into vehicle inventory
_vehicle addBackpackCargoGlobal ["NDS_B_M224_mortar",1];

// M240B with su230a sight into vehicle inventory
_vehicle addWeaponWithAttachmentsCargoGlobal [["rhs_weap_m240B","","","rhsusf_acc_su230a",["rhsusf_100Rnd_762x51_m62_tracer",100],[],""],1];

// Supply Crate
["Box_NATO_Equip_F",
GET_CONTAINER("crate_strykerDragoon_resupply"),
_vehicle, nil, "Supply Crate"
] call FUNC(createCargoCrate);

// 4x 60mm mortars with ammo
["Box_Syndicate_WpsLaunch_F",
// 1x 60mm mortar with ammo
private _mortar_60mm_crate = ["Box_Syndicate_WpsLaunch_F",
GET_CONTAINER("crate_strykerDragoon_60mm"),
_vehicle, nil, "4x 60mm mortars with ammo"
_vehicle, nil, "60mm mortar with ammo"
] call FUNC(createCargoCrate);

// Ammo for 2x 82mm mortars
private _mortar_ammo_82mm = GET_CONTAINER("crate_strykerDragoon_82mm");
_mortar_60mm_crate addBackpackCargoGlobal ["NDS_B_M224_mortar",1];

// 2x 81mm mortars
["Box_NATO_WpsLaunch_F",
GET_CONTAINER("crate_strykerDragoon_81mm"),
_vehicle, nil, "81mm mortars"
] call FUNC(createCargoCrate);

// Ammo for 2x 81mm mortars
private _mortar_ammo_81mm = GET_CONTAINER("crate_strykerDragoon_81mm_ammo");
["ACE_Box_82mm_Mo_Combo",
_mortar_ammo_82mm,
_vehicle, nil, "Ammo for 2x 82mm mortars"
_mortar_ammo_81mm,
_vehicle, nil, "Ammo for 81mm mortars"
] call FUNC(createCargoCrate);

["ACE_Box_82mm_Mo_Combo",
_mortar_ammo_82mm,
_vehicle, nil, "Ammo for 2x 82mm mortars"
_mortar_ammo_81mm,
_vehicle, nil, "Ammo for 81mm mortars"
] call FUNC(createCargoCrate);
};

Expand All @@ -100,6 +113,9 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then {
[_vehicle,
GET_CONTAINER("vehicle_strykerDragoon")
] call FUNC(setCargo);

// M240B with su230a sight into vehicle inventory
_vehicle addWeaponWithAttachmentsCargoGlobal [["rhs_weap_m240B","","","rhsusf_acc_su230a",["rhsusf_100Rnd_762x51_m62_tracer",100],[],""],1];

// Supply Crate
["Box_NATO_Equip_F",
Expand Down Expand Up @@ -141,6 +157,9 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then {
GET_CONTAINER("vehicle_strykerDragoon")
] call FUNC(setCargo);

// M240B with su230a sight into vehicle inventory
_vehicle addWeaponWithAttachmentsCargoGlobal [["rhs_weap_m240B","","","rhsusf_acc_su230a",["rhsusf_100Rnd_762x51_m62_tracer",100],[],""],1];

// Supply Crate
["Box_NATO_Equip_F",
GET_CONTAINER("crate_strykerDragoon_resupply"),
Expand Down