Skip to content

Commit

Permalink
Merge branch 'main' into set-vs-addCargo
Browse files Browse the repository at this point in the history
  • Loading branch information
@pool011
pool011 authored Apr 7, 2024
2 parents b9ceeec + 61c83ed commit 57b54d8
Show file tree
Hide file tree
Showing 19 changed files with 976 additions and 1,165 deletions.
308 changes: 154 additions & 154 deletions Compositions/1.Cav_Viking_Platoon/composition.sqe
View file

Large diffs are not rendered by default.

258 changes: 129 additions & 129 deletions Compositions/2.Cav_Bandit_Platoon/composition.sqe
View file

Large diffs are not rendered by default.

258 changes: 129 additions & 129 deletions Compositions/3.Cav_Misfit_Platoon/composition.sqe
View file

Large diffs are not rendered by default.

374 changes: 84 additions & 290 deletions Compositions/4.ATLAS_Platoon/composition.sqe
View file

Large diffs are not rendered by default.

414 changes: 207 additions & 207 deletions Compositions/6.Cav_Rotary_Aviation/composition.sqe
View file

Large diffs are not rendered by default.

386 changes: 193 additions & 193 deletions Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,22 @@ class Cav_B_C_FireTeamLeader_F: Cav_B_Charlie_base_F {
displayName = "$STR_Cav_Charlie_Characters_C_FireTeamLeader";
scope = 2;
category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],[],""],[],[],["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_TLB",[["ACE_IR_Strobe_Item",1],["SmokeShell",4,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["ACE_HuntIR_M203",1,1],["rhs_mag_m713_Red",2,1],["rhs_mag_m714_White",2,1],["SmokeShellPurple",1,1]]],["USP_REEBOW_3DAP_MC",[["ACE_HuntIR_monitor",1],["ACE_splint",2],["ACE_EntrenchingTool",1],["ACE_SpraypaintRed",1],["ACE_CableTie",2],["USP_PVS15",1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",1,200],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15_bk","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],[],""],[],[],["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_TLB",[["ACE_IR_Strobe_Item",1],["SmokeShell",4,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",10,30],["ACE_HuntIR_M203",1,1],["rhs_mag_m713_Red",2,1],["rhs_mag_m714_White",2,1],["SmokeShellPurple",1,1]]],["USP_REEBOW_3DAP_MC",[["ACE_HuntIR_monitor",1],["ACE_splint",2],["ACE_EntrenchingTool",1],["ACE_SpraypaintRed",1],["ACE_CableTie",2],["USP_PVS15",1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",2,200],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
role = "fireteamleader";
icon = "iconManLeader";
};
class Cav_B_C_AutomaticRifleman_F: Cav_B_Charlie_base_F {
displayName = "$STR_Cav_Charlie_Characters_C_AutomaticRifleman";
scope = 2;
category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
loadout = [["rhs_weap_m249_light_S_vfg2","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_elcan_3d",["rhsusf_200Rnd_556x45_mixed_soft_pouch",200],[],"rhsusf_acc_grip4_bipod"],[],[],["USP_G3C_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_splint",2],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_MGB",[["SmokeShell",4,1],["HandGrenade",2,1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",3,200]]],["USP_ZIPON_PANEL_CPC_MC",[["USP_PVS15",1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",1,200]]],"USP_OPSCORE_FASTMTC_CGSW","",[],["ItemMap","","","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m249_light_S_vfg2","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_elcan_3d",["rhsusf_200Rnd_556x45_mixed_soft_pouch",200],[],"rhsusf_acc_grip4_bipod"],[],[],["USP_G3C_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_splint",2],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_MGB",[["SmokeShell",4,1],["HandGrenade",2,1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",4,200]]],["USP_ZIPON_PANEL_CPC_MC",[["USP_PVS15",1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",2,200]]],"USP_OPSCORE_FASTMTC_CGSW","",[],["ItemMap","","","ItemCompass","ACE_Altimeter",""]];
icon = "iconManMG";
};
class Cav_B_C_Grenadier_F: Cav_B_Charlie_base_F {
displayName = "$STR_Cav_Charlie_Characters_C_Grenadier";
scope = 2;
category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],["rhs_mag_M433_HEDP",1],""],[],[],["USP_G3C_RS_CU_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_splint",2],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_GRB",[["SmokeShell",4,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",9,30],["rhs_mag_M433_HEDP",12,1],["rhs_mag_m714_White",4,1],["rhs_mag_m713_Red",2,1]]],["USP_ZIPON_PACK_CPC_MC",[["USP_PVS15",1],["ACE_EarPlugs",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_CGSW","",["rhsusf_bino_m24_ARD","","","",[],[],""],["ItemMap","","","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m4a1_m320","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],["rhs_mag_M433_HEDP",1],""],[],[],["USP_G3C_RS_CU_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_splint",2],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_GRB",[["SmokeShell",4,1],["HandGrenade",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",9,30],["rhs_mag_M433_HEDP",12,1],["rhs_mag_m714_White",4,1],["rhs_mag_m713_Red",2,1]]],["USP_ZIPON_PACK_CPC_MC",[["USP_PVS15",1],["ACE_EarPlugs",1],["ACE_EntrenchingTool",1],["rhs_mag_M433_HEDP",12,1],["rhs_mag_m714_White",4,1],["rhs_mag_m713_Red",2,1]]],"USP_OPSCORE_FASTMTC_CGSW","",["rhsusf_bino_m24_ARD","","","",[],[],""],["ItemMap","","","ItemCompass","ACE_Altimeter",""]];
};
class Cav_B_C_RiflemanLAT_F: Cav_B_Charlie_base_F {
displayName = "$STR_Cav_Charlie_Characters_C_RiflemanLAT";
Expand All @@ -84,7 +84,7 @@ class Cav_B_C_Marksman_F_Local: Cav_B_Charlie_base_F {
displayName = "Designated Marksman";
scope = 2;
category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
loadout = [["rhs_weap_sr25_ec","","rhsusf_acc_anpeq15side_bk","optic_AMS",["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",20],[],"rhsusf_acc_harris_bipod"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["kat_chestSeal",2],["kat_guedel",1],["ACE_tourniquet",4],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1],["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",1,20]]],["USP_CRYE_JPC_DMB",[["HandGrenade",2,1],["SmokeShell",4,1],["SmokeShellPurple",1,1],["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",5,20]]],["USP_ZIPON_PACK_CPC_MC",[["ACE_wirecutter",1],["ACE_EntrenchingTool",1],["ACE_splint",4],["kat_Painkiller",2,10]]],"USP_OPSCORE_FASTMTC_GSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]];
loadout = [["rhs_weap_sr25_ec","","rhsusf_acc_anpeq15side_bk","optic_AMS",["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",20],[],"rhsusf_acc_harris_bipod"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["kat_chestSeal",2],["kat_guedel",1],["ACE_tourniquet",4],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1]]],["USP_CRYE_JPC_DMB",[["HandGrenade",2,1],["SmokeShell",4,1],["SmokeShellPurple",1,1],["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",9,20]]],["USP_ZIPON_PACK_CPC_MC",[["USP_PVS15",1],["ACE_wirecutter",1],["ACE_EntrenchingTool",1],["ACE_splint",4],["kat_Painkiller",2,10]]],"USP_OPSCORE_FASTMTC_GSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
insignia = "cav_insignia_specialized_cls";
abilityMedic = 0;
icon = "iconManMedic";
Expand Down
2 changes: 1 addition & 1 deletion cScripts/Loadouts/CfgLoadouts_Special.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class S3_Base: Cav_B_Seventh_Cavalry_Base_F {
displayName = "S3 Mission Control";
category[] = {};
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"],[],["rhs_weap_M320","","","",["ACE_HuntIR_M203",1],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ItemcTabHCam",1],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_grenadier",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["rhs_mag_M664_red_cluster",2,1],["1Rnd_SmokeRed_Grenade_shell",2,1],["1Rnd_SmokeBlue_Grenade_shell",2,1],["ACE_HuntIR_M203",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1]]],["USP_TACTICAL_PACK_CCT7",[["Rev_darter_item",1],["ACE_HuntIR_monitor",1],["ACE_EntrenchingTool",1],["ACE_UAVBattery",1],["Laserbatteries",1,1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_shemagh2_gogg_grn",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS15"]];
loadout = [["rhs_weap_m4a1_blockII_grip_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR_3d",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],[],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["ACE_packingBandage",20],["kat_Painkiller",2,10],["SmokeShellPurple",2,1]]],["rhsusf_plateframe_grenadier",[["ACE_IR_Strobe_Item",2],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShellBlue",2,1],["SmokeShellRed",2,1]]],["USP_TACTICAL_PACK_CCT7",[["ACE_EntrenchingTool",1],["USP_PVS15",1],["Laserbatteries",1,1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter",""]];
role = "officer";

company = "";
Expand Down
1 change: 1 addition & 0 deletions cScripts/cScripts_preInit.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ EGVAR(patches,usesACRE) = isClass (configFile >> "CfgPatches" >> "acre_s
EGVAR(patches,usesTFAR) = isClass (configFile >> "CfgPatches" >> "task_force_radio");
EGVAR(patches,usesAlive) = isClass (configFile >> "CfgPatches" >> "ALiVE_main");
EGVAR(patches,usesZen) = isClass (configFile >> "CfgPatches" >> "zen_main");
EGVAR(patches,usesACEAX) = isCLass (configFile >> "CfgPatches" >> "aceax_main");

// Global Variables
EGVAR(Staging,ZoneStatus) = false;
Expand Down
5 changes: 2 additions & 3 deletions cScripts/functions/gear/fn_gear_saveLoadout.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@

params [["_unit", objNull, [objNull]]];

private _loadout = getUnitLoadout _unit;
if (EGVAR(patches,usesACRE)) then { _loadout = [_loadout] call acre_api_fnc_filterUnitLoadout; };
_loadout = [_unit] call CBA_fnc_getLoadout;
private _loadout = [_unit] call CBA_fnc_getLoadout;
_loadout = [_loadout] call FUNC(filterUnitLoadout);

_unit setVariable [QEGVAR(Gear,Loadout), _loadout];
_unit setVariable [QEGVAR(Gear,SavedLoadout), true];
Expand Down
37 changes: 24 additions & 13 deletions cScripts/functions/systems/fn_filterUnitLoadout.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,44 +20,55 @@
params [["_loadout", getUnitLoadout player, [[], objNull, "", configNull]]];

if !(_loadout isEqualType []) then {
_loadout = getUnitLoadout _loadout;
_loadout = [_loadout] call CBA_fnc_getLoadout;
};

if (_loadout isEqualTo []) exitWith {
_loadout
_loadout;
};

private _baseLoadout = _loadout;
if (EGVAR(Patches,usesACEAX)) then {
_baseLoadout = _loadout#0;
};

// Remove "ItemRadioAcreFlagged"
if ((_loadout select 9) select 2 == "ItemRadioAcreFlagged") then {
(_loadout select 9) set [2, ""];
if (_baseLoadout#9#2 == "ItemRadioAcreFlagged") then {
_baseLoadout#9 set [2, ""];
};

// Set ACRE base classes
private _replaceRadio = {
params ["_item"];
if (EGVAR(Patches,usesACRE)) then {
if (EGVAR(Patches,usesACRE)) then {
// Replace only if string (array can be eg. weapon inside container) and an ACRE radio
if (!(_item isEqualType []) && {[_item] call acre_api_fnc_isRadio}) then {
_this set [0, [_item] call acre_api_fnc_getBaseRadio];
};
};
if (EGVAR(Patches,usesTFAR)) then {
// Replace only if string (array can be eg. weapon inside container) and an TFAR radio
if (!(_item isEqualType []) && {[_item] call TFAR_fnc_isRadio}) then {
if (!(_item isEqualType []) && {_item call TFAR_fnc_isRadio}) then {
private _baseClassRadio = getText (configFile >> "CfgWeapons" >> _item >> "ace_arsenal_uniqueBase");
_this set [0, _baseClassRadio];
};
};
};
if ((_loadout select 3) isNotEqualTo []) then {
{_x call _replaceRadio} forEach ((_loadout select 3) select 1); // Uniform items

if ((_baseLoadout#3) isNotEqualTo []) then {
{_x call _replaceRadio} forEach (_baseLoadout#3#1); // Uniform items
};
if ((_loadout select 4) isNotEqualTo []) then {
{_x call _replaceRadio} forEach ((_loadout select 4) select 1); // Vest items

if ((_baseLoadout#4) isNotEqualTo []) then {
{_x call _replaceRadio} forEach (_baseLoadout#4#1); // Vest items
};
if ((_loadout select 5) isNotEqualTo []) then {
{_x call _replaceRadio} forEach ((_loadout select 5) select 1); // Backpack items

if ((_baseLoadout#5) isNotEqualTo []) then {
{_x call _replaceRadio} forEach (_baseLoadout#5#1); // Backpack items
};

if (EGVAR(Patches,usesACEAX)) then {
_loadout set [0,_baseLoadout];
};

_loadout
_loadout
4 changes: 2 additions & 2 deletions cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private _textures = [
_vehicle setVariable [QEGVAR(Vehicle,Callsign), -4, true];
}
]],
["I_APC_Wheeled_03_cannon_F", "Toggle Camo Net", [
["cav_dragoon_base_F", "Toggle Camo Net", [
"",
{
private _camoNetMounted = _vehicle animationSourcePhase "showCamonetHull";
Expand All @@ -109,7 +109,7 @@ private _textures = [
};
}
]],
["I_APC_Wheeled_03_cannon_F", "Toggle Slats", [
["cav_dragoon_base_F", "Toggle Slats", [
"",
{
private _slatsAreAttached = _vehicle animationSourcePhase "showSLATHull";
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if (_vehicle iskindOf "rhsusf_fmtv_base") then {
};


if (_vehicle isKindOf "I_APC_Wheeled_03_cannon_F") then {
if (_vehicle isKindOf "cav_dragoon_base_F") then {
// Animate slat armor and camo nets
_vehicle animateSource ["showCamonetHull",0, true];
_vehicle animateSource ["showBags",0, true];
Expand Down
2 changes: 2 additions & 0 deletions cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ private _pylon = [];

if (count _pylon == 0) then {
WARNING_2("VehicleDefaultLoadout", "Vehicle %1 [%2] has no loadout setup.", _vehicle, typeOf _vehicle);
} else {
_vehicle setVariable ["ace_rearm_scriptedLoadout", true, true];
};

_vehicle setVariable [QEGVAR(VehicleFunc,DefaultPylon), true, true];
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then {
[_vehicle] call EFUNC(vehicle,addFlagAction);
};

if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
if (_vehicle iskindOf "cav_dragoon_base_F") then {
[_vehicle] call EFUNC(vehicle,addFlagAction);
};
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if (_vehicle iskindOf "Truck_01_base_F") then {
};
};

if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
if (_vehicle iskindOf "cav_dragoon_base_F") then {
switch (_vehicleType) do {
case "MED": {_vehicle setVariable ["ace_medical_isMedicalVehicle", true, true];};
default {};
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addInventory.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if (_vehicleType == "EMPTY") exitWith { [_vehicle, []] call FUNC(setCargo); };


// Ground Vehicles
if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
if (_vehicle iskindOf "cav_dragoon_base_F") then {
[_vehicle, 15, 38, false, false] call FUNC(setCargoAttributes);

// Emergency kit in case of tire damage and fuel loss.
Expand Down
66 changes: 35 additions & 31 deletions cScripts/functions/vehicle/fn_vehicle_getPylon.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,52 +117,56 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [
];

// I_APC_Wheeled_03_cannon_F
private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [
// ["antiarmor", [
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_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],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
]],
// ["antiair", [
// ["SmokeLauncherMag",[0,0],6],
// ["2000Rnd_762x51_Belt_T_Red",[0],2000],
// ["2000Rnd_762x51_Belt_T_Red",[0],2000],
// ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],

// ["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],
// ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
// ["4Rnd_Titan_long_missiles",[0],4]
// ]],
[ "antiair", [
["SmokeLauncherMag",[0,0],6],
["default",[
["SmokeLauncherMag",[0],6],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
["4Rnd_Titan_long_missiles",[0],4]
["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],
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
]],
["default",[
["SmokeLauncherMag",[0,0],6],
["balanced",[
["SmokeLauncherMag",[0],6],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60]
["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],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
]]
// ["assault",[
// ["SmokeLauncherMag",[0,0],6],
// ["2000Rnd_762x51_Belt_T_Red",[0],2000],
// ["2000Rnd_762x51_Belt_T_Red",[0],2000],
// ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
// ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60]
// ]]
];

// Loadout vehicle list
private _allVehiclePylons = createHashMapFromArray [
["rhsusf_m1a1tank_base", _rhsusf_m1a1tank_base],
["I_APC_Wheeled_03_cannon_F", _I_APC_Wheeled_03_cannon_F]
["cav_dragoon_base_F", _cav_dragoon_base_F]
];

// Return keys or full hashmap
Expand Down
Loading

0 comments on commit 57b54d8

Please sign in to comment.