From cf7affa2f51fcd24036abee182dac36ffb51f7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Sun, 14 Jan 2024 20:18:09 +0100 Subject: [PATCH 01/58] Added new insignia to the selection --- cScripts/functions/systems/fn_addInsigniaSelectionList.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf b/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf index 2fd7dc943..77bee57d6 100644 --- a/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf +++ b/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf @@ -98,6 +98,7 @@ if (!isPlayer _object) then { [_object,"Squad Insignia 2/1/C/1-7","Charlie_1_2","z\cav\addons\insignia\data\Charlie_1_2.paa",_charlieCategory] call FUNC(addInsigniaSelection); [_object,"Squad Insignia 3/1/C/1-7","Charlie_1_3","z\cav\addons\insignia\data\Charlie_1_3.paa",_charlieCategory] call FUNC(addInsigniaSelection); [_object,"Squad Insignia 4/1/C/1-7","Charlie_1_4","z\cav\addons\insignia\data\Charlie_1_4.paa",_charlieCategory] call FUNC(addInsigniaSelection); +[_object,"Squad Insignia 4/1/C/1-7 (Colored)","charlie_1_4_colored","z\cav\addons\insignia\data\charlie_1_4_colored.paa",_charlieCategory] call FUNC(addInsigniaSelection); // Charlie Company 2nd Platoon [_object,"Platoon Insignia 2/C/1-7","Charlie_2","z\cav\addons\insignia\data\Charlie_2.paa",_charlieCategory] call FUNC(addInsigniaSelection); @@ -120,4 +121,4 @@ if (!isPlayer _object) then { [_object,"S3","specialized_s3","z\cav\addons\insignia\data\specialized_s3.paa",_specialCategory] call FUNC(addInsigniaSelection); -INFO_1("addInsigniaSelectionList", "Setup insignia selection list on %1 is completed.", _object); \ No newline at end of file +INFO_1("addInsigniaSelectionList", "Setup insignia selection list on %1 is completed.", _object); From a0d92a1c48b6a8b3aff05cbc8fc5af681dee4f58 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 18:19:29 -0500 Subject: [PATCH 02/58] MP swapped for 78 rnd HEI --- .../functions/vehicle/fn_vehicle_getPylon.sqf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 84a64f535..6834026be 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -132,21 +132,21 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["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], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["4Rnd_Titan_long_missiles",[0],4] ]], ["default",[ ["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], - ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60], - ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60] + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]] // ["assault",[ // ["SmokeLauncherMag",[0,0],6], From 7dd14335ca203a3ae2472d87e08726deab156912 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 20:56:05 -0500 Subject: [PATCH 03/58] Updated Possible Loadouts --- .../functions/vehicle/fn_vehicle_getPylon.sqf | 44 ++++++++++--------- .../fn_vehicle_setupPylonCategories.sqf | 7 +-- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 6834026be..9a90eb417 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -118,23 +118,25 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ // I_APC_Wheeled_03_cannon_F private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ - // ["antiarmor", [ - // ["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], - - // ]], - [ "antiair", [ + ["antiarmor", [ ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["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], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["4Rnd_Titan_long_missiles",[0],4] ]], ["default",[ @@ -143,20 +145,22 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] + ]], + ["balanced",[ + ["SmokeLauncherMag",[0,0],6], + ["2000Rnd_762x51_Belt_T_Red",[0],2000], + ["2000Rnd_762x51_Belt_T_Red",[0],2000], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["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 diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index ad271d0bf..4b5c56e2d 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -36,10 +36,11 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then { if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dragoon_unarmed_base_F")) then { _pylonList = [ // TypeOf, DisplayName, Name, Icon - // ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""], + ["I_APC_Wheeled_03_cannon_F", "Anti-Personnel (default)", "default", ""], + ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], + ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""], ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""], - // ["I_APC_Wheeled_03_cannon_F", "Assault", "assault", ""], - ["I_APC_Wheeled_03_cannon_F", "Default", "default", ""] + ]; }; From 8a2d15e8b90f7d75a3f40aef452d2a3c4f0fb61d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 21:06:45 -0500 Subject: [PATCH 04/58] Extra comma removed --- cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index 4b5c56e2d..a99b1b6c1 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -39,7 +39,7 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dr ["I_APC_Wheeled_03_cannon_F", "Anti-Personnel (default)", "default", ""], ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""], - ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""], + ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] ]; }; From 4387886ca993a9a02a8e6993dec785efa4e891e4 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 21:07:08 -0500 Subject: [PATCH 05/58] Extra new line removed --- cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index a99b1b6c1..5b7982d66 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -40,7 +40,6 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dr ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""], ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] - ]; }; From ab0753210585dc0b0488d7628a783b7ea2cb2f4c Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Tue, 2 Apr 2024 03:04:41 -0400 Subject: [PATCH 06/58] Updated Stryker Dragoon crates and added new MRAPs for Viking (#1156) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Broström.A | Evul --- .../Loadouts/CfgLoadouts_Alpha_FixedWing.hpp | 2 +- .../vehicle/fn_vehicle_addInventory.sqf | 74 ++++++++++++++++--- 2 files changed, 65 insertions(+), 11 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp index 9592d808a..2ea54faa5 100644 --- a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp @@ -74,4 +74,4 @@ class Cav_B_A_Plane_Fighter_Pilot_Hog_8_F: Cav_B_A_Plane_Fighter_Pilot_F { class Cav_B_A_Plane_Fighter_Pilot_Hog_9_F: Cav_B_A_Plane_Fighter_Pilot_F { scope = 1; insignia = "cav_insignia_alpha_2_b"; -}; +}; \ 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 1f2310155..446858f7a 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -82,11 +82,6 @@ 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. @@ -112,6 +107,12 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then { _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); + // 2 Stingers to distribute to 1 section. + ["Box_NATO_WpsLaunch_F", + GET_CONTAINER(crate_stinger), + _vehicle, nil, "MANPAD" + ] call FUNC(createCargoCrate); + ["Box_NATO_WpsLaunch_F", GET_CONTAINER("crate_stinger"), _vehicle, nil, "MANPAD" @@ -145,11 +146,6 @@ 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); }; }; }; @@ -197,6 +193,64 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { GET_CONTAINER("vehicle_HMMWV_Weapons") ] call FUNC(addCargo); }; + case "rhsusf_M1239_socom_d"; + case "rhsusf_M1239_M2_socom_d"; + case "rhsusf_M1239_MK19_socom_d"; + case "rhsusf_M1239_M2_Deploy_socom_d"; + case "rhsusf_M1239_MK19_Deploy_socom_d": { + [_vehicle, 15, 38, false, false] call FUNC(setCargoAttributes); + + // Emergency kit in case of tire damage and fuel loss. + ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; + ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; + ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; + ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; + ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; + ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; + ["FlexibleTank_01_forest_F", _vehicle, true] call ace_cargo_fnc_loadItem; // Emergency Fuel Tank + // Vehicle Inventory + [_vehicle, + GET_CONTAINER(vehicle_strykerDragoon) + ] call FUNC(addCargo); + + // Supply Crate + ["Box_NATO_Equip_F", + GET_CONTAINER(crate_strykerDragoon_resupply), + _vehicle, nil, "Resupply Crate" + ] call FUNC(createCargoCrate); + + // 2 Stingers to distribute to 1 section. + ["Box_NATO_WpsLaunch_F", + GET_CONTAINER(crate_stinger), + _vehicle, nil, "MANPAD" + ] call FUNC(createCargoCrate); + + ["Box_NATO_WpsLaunch_F", + GET_CONTAINER(crate_stinger), + _vehicle, nil, "MANPAD" + ] call FUNC(createCargoCrate); + }; + case "rhsusf_M1238A1_socom_d"; + case "rhsusf_M1238A1_M2_socom_d"; + case "rhsusf_M1238A1_Mk19_socom_d": { + [_vehicle, 15, 38, false, false] call FUNC(setCargoAttributes); + + // Emergency kit in case of tire damage and fuel loss. + ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; + ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; + ["FlexibleTank_01_forest_F", _vehicle, true] call ace_cargo_fnc_loadItem; // Emergency Fuel Tank + + // Vehicle Inventory + [_vehicle, + GET_CONTAINER(vehicle_strykerDragoon) + ] call FUNC(addCargo); + + // Supply Crate + ["Box_NATO_Equip_F", + GET_CONTAINER(crate_strykerDragoon_resupply), + _vehicle, nil, "Resupply Crate" + ] call FUNC(createCargoCrate); + }; default { [_vehicle, GET_CONTAINER("vehicle_HMMWV") From 745538b233c2fc84c0d48c42713cc7d6c63bb3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Tue, 2 Apr 2024 09:30:50 +0200 Subject: [PATCH 07/58] Added ability to show all items in the staging arsenal (#1132) --- cScripts/functions/systems/fn_addArsenal.sqf | 24 ++++++++++++-------- cScripts/initSettings.inc.sqf | 16 +++++++++++-- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/cScripts/functions/systems/fn_addArsenal.sqf b/cScripts/functions/systems/fn_addArsenal.sqf index 5a1105855..487f5f23c 100644 --- a/cScripts/functions/systems/fn_addArsenal.sqf +++ b/cScripts/functions/systems/fn_addArsenal.sqf @@ -24,18 +24,22 @@ private _arsenalStatement = { call FUNC(addDefaultArsenalLoadout); waitUntil { count ace_arsenal_defaultLoadoutsList != 0 }; - private _items = GETVAR(player,EGVAR(Player,ArsenalWhitelist), []); - INFO_3("Staging Arsenal", "Whitleist containing %1 items added to %2 (%3)", count _items, player, typeOf player); - if (count _items == 0) exitWith { - [ - [], - ["Arsenal is not avalible for your class."], - [""], - [""] - ] call CBA_fnc_notify; + if (EGVAR(Settings,useFilteredArsenal)) then { + private _items = GETVAR(player,EGVAR(Player,ArsenalWhitelist), []); + INFO_3("Staging Arsenal", "Whitleist containing %1 items added to %2 (%3)", count _items, player, typeOf player); + if (count _items == 0) exitWith { + [ + [], + ["Arsenal is not avalible for your class."], + [""], + [""] + ] call CBA_fnc_notify; + }; + [player, _items] call ace_arsenal_fnc_addVirtualItems; + } else { + [player, true] call ace_arsenal_fnc_addVirtualItems; }; - [player, _items] call ace_arsenal_fnc_addVirtualItems; [{ INFO_2("Staging Arsenal", "Opening Staging Arsenal for %1 (%2)", player, typeOf player); diff --git a/cScripts/initSettings.inc.sqf b/cScripts/initSettings.inc.sqf index d492cd7d4..498f43be4 100644 --- a/cScripts/initSettings.inc.sqf +++ b/cScripts/initSettings.inc.sqf @@ -142,7 +142,19 @@ private _cScriptSettings = "cScripts Mission Settings"; }, false ] call CBA_fnc_addSetting; - +[ // Use Filtered Arsenal + QEGVAR(Settings,useFilteredArsenal), + "CHECKBOX", + ["Use Filtered Arsenal","Use a filtered or show all items in the staging arsenal."], + [_cScriptSettings, "4; Staging"], + false, + true, + { + params ["_value"]; + { EGVAR(Staging,showAllLoadouts) = _value; } remoteExecCall ["call"]; + }, + false +] call CBA_fnc_addSetting; // 5; Vehicle [ // Enable @@ -326,4 +338,4 @@ private _cScriptSettings = "cScripts Mission Settings"; true, {}, true -] call CBA_fnc_addSetting; \ No newline at end of file +] call CBA_fnc_addSetting; From 8c358f2e14c26b9280b80c67289e6b2be498c83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Thu, 4 Apr 2024 15:20:08 +0200 Subject: [PATCH 08/58] Fixed issues were all loadouts as well as the arsenal being unfiltered (#1161) --- cScripts/initSettings.inc.sqf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cScripts/initSettings.inc.sqf b/cScripts/initSettings.inc.sqf index 498f43be4..240531abe 100644 --- a/cScripts/initSettings.inc.sqf +++ b/cScripts/initSettings.inc.sqf @@ -147,12 +147,9 @@ private _cScriptSettings = "cScripts Mission Settings"; "CHECKBOX", ["Use Filtered Arsenal","Use a filtered or show all items in the staging arsenal."], [_cScriptSettings, "4; Staging"], - false, true, - { - params ["_value"]; - { EGVAR(Staging,showAllLoadouts) = _value; } remoteExecCall ["call"]; - }, + true, + {}, false ] call CBA_fnc_addSetting; From 583634c0ab818f6dfccfeb64be25af6fc2cff442 Mon Sep 17 00:00:00 2001 From: Zarenx <111392464+Zarenx@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:07:28 +0200 Subject: [PATCH 09/58] Updated Kits for Charlie Updated kits with missing equipment like Altimeter. Updated Ammo ammount for AR, DMR, FTL and Grenadier. Updated Backpack extra ammo for FTL with 1 more softpack for the AR. Moved NVGs on kits that started with them on the helmet to their backpacks. Removed Bloat equipment like CTAB Camera, M320 Flares, Handflares, UAV, Suppressor and googles from the S3 Kit. --- cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp | 8 ++++---- cScripts/Loadouts/CfgLoadouts_Special.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp index 80856cf6e..d07c900d2 100644 --- a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp @@ -47,7 +47,7 @@ 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"; }; @@ -55,14 +55,14 @@ 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"; @@ -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"; diff --git a/cScripts/Loadouts/CfgLoadouts_Special.hpp b/cScripts/Loadouts/CfgLoadouts_Special.hpp index 198bab8a4..b2d7ae368 100644 --- a/cScripts/Loadouts/CfgLoadouts_Special.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Special.hpp @@ -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_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","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],["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],["rhs_mag_M664_red_cluster",2,1],["1Rnd_SmokeRed_Grenade_shell",2,1],["1Rnd_SmokeBlue_Grenade_shell",2,1],,["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShellBlue",2,1],["SmokeShellRed",2,1]]],["USP_TACTICAL_PACK_CCT7",[["ACE_EntrenchingTool",1],["Laserbatteries",1,1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS15"]]; role = "officer"; company = ""; From ae59c4e380e6cde19186301037f8be65c6d078e4 Mon Sep 17 00:00:00 2001 From: Zarenx <111392464+Zarenx@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:20:09 +0200 Subject: [PATCH 10/58] Update CfgLoadouts_Special.hpp --- cScripts/Loadouts/CfgLoadouts_Special.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Special.hpp b/cScripts/Loadouts/CfgLoadouts_Special.hpp index b2d7ae368..bceccf89d 100644 --- a/cScripts/Loadouts/CfgLoadouts_Special.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Special.hpp @@ -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","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","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],["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],["rhs_mag_M664_red_cluster",2,1],["1Rnd_SmokeRed_Grenade_shell",2,1],["1Rnd_SmokeBlue_Grenade_shell",2,1],,["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShellBlue",2,1],["SmokeShellRed",2,1]]],["USP_TACTICAL_PACK_CCT7",[["ACE_EntrenchingTool",1],["Laserbatteries",1,1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","",["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 = ""; From 21e4666e1ee2016bca76b1dc6da9ce784dc206ea Mon Sep 17 00:00:00 2001 From: Zarenx <111392464+Zarenx@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:57:43 +0200 Subject: [PATCH 11/58] Updated staging zone boxes to limit Staging zone loadouts to Company (#1164) --- .../1.Cav_Viking_Platoon/composition.sqe | 308 ++++++------- .../2.Cav_Bandit_Platoon/composition.sqe | 258 +++++------ .../3.Cav_Misfit_Platoon/composition.sqe | 258 +++++------ Compositions/4.ATLAS_Platoon/composition.sqe | 374 ++++------------ .../6.Cav_Rotary_Aviation/composition.sqe | 410 +++++++++--------- .../7.Cav_Fixed_Wing_Aviation/composition.sqe | 386 ++++++++--------- 6 files changed, 894 insertions(+), 1100 deletions(-) diff --git a/Compositions/1.Cav_Viking_Platoon/composition.sqe b/Compositions/1.Cav_Viking_Platoon/composition.sqe index 3a80eeacb..709855f71 100644 --- a/Compositions/1.Cav_Viking_Platoon/composition.sqe +++ b/Compositions/1.Cav_Viking_Platoon/composition.sqe @@ -1,5 +1,5 @@ version=54; -center[]={3421.3616,5,1282.7375}; +center[]={795.86157,5,6021.6689}; class items { items=7; @@ -22,7 +22,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.9936523,0.0014390945,14.885498}; + position[]={-2.9938354,0.0014390945,14.888672}; angles[]={0,3.1415927,0}; }; side="West"; @@ -35,7 +35,7 @@ class items description="Platoon Leader@VIKING-6"; isPlayable=1; }; - id=80; + id=175; type="Cav_B_B_Scout_PlatoonLead_2_6_F"; class CustomAttributes { @@ -73,24 +73,24 @@ class items { dynamicSimulation=1; }; - id=79; + id=174; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={-0.2512207,0.89242268,12.458252}; + position[]={-0.25140381,0.89242268,12.461914}; angles[]={-0,1.5526583,0}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bravo"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=83; + id=176; type="B_supplyCrate_F"; class CustomAttributes { @@ -141,16 +141,16 @@ class items dataType="Object"; class PositionInfo { - position[]={14.301514,0.89242268,2.1525879}; + position[]={14.301331,0.89242268,2.15625}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bravo"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=84; + id=177; type="B_supplyCrate_F"; class CustomAttributes { @@ -201,18 +201,18 @@ class items dataType="Comment"; class PositionInfo { - position[]={1.7380371,0,6.9772949}; + position[]={1.737854,0,6.9804688}; }; title="Stryker Scout Platoon (Tooltip)"; description="B/1-7's Stryker Scout Platoon is a hybrid fighting force that specializes in scout tasks and missions. They handle everything from Screening Operations, Guard Operations, Ambushes, Area Reconnaissance, and all other general infantry tasks. While the composition utilizes 6 Strykers for the Platoon, unless it's completely full, they'll mostly only use 4 or 5. Viking does NOT require a JTAC to call in CAS as they are trained and capable of doing so internally."; - id=85; + id=178; }; class Item4 { dataType="Object"; class PositionInfo { - position[]={-6.5314941,2.6142888,19.24292}; + position[]={-6.5316772,2.6142888,19.246094}; }; side="Empty"; flags=4; @@ -220,7 +220,7 @@ class items { dynamicSimulation=1; }; - id=86; + id=179; type="cav_dragoon_WD_V6"; class CustomAttributes { @@ -259,7 +259,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.9936523,0.0014390945,16.385498}; + position[]={-2.9938354,0.0014390945,16.388672}; angles[]={0,3.1415927,0}; }; side="West"; @@ -271,7 +271,7 @@ class items description="Stryker Vehicle Commander@SIERRA-6"; isPlayable=1; }; - id=81; + id=182; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -322,7 +322,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.9936523,0.0014390945,17.885498}; + position[]={-2.9938354,0.0014390945,17.888672}; angles[]={0,3.1415927,0}; }; side="West"; @@ -334,7 +334,7 @@ class items description="Stryker Driver@SIERRA-6"; isPlayable=1; }; - id=82; + id=183; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -384,13 +384,13 @@ class items class Attributes { }; - id=168; + id=181; }; }; - id=167; + id=180; }; }; - id=78; + id=173; }; class Item1 { @@ -411,7 +411,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.0063477,0.0014390945,14.885498}; + position[]={3.0061646,0.0014390945,14.888672}; angles[]={0,3.1415927,0}; }; side="West"; @@ -424,7 +424,7 @@ class items description="Platoon Sergeant@VIKING-5"; isPlayable=1; }; - id=89; + id=186; type="Cav_B_B_Scout_PlatoonLead_2_5_F"; class CustomAttributes { @@ -462,7 +462,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.0065918,0.0014390945,16.385498}; + position[]={3.0064087,0.0014390945,16.388672}; angles[]={0,3.1415927,0}; }; side="West"; @@ -474,7 +474,7 @@ class items description="Stryker Driver"; isPlayable=1; }; - id=90; + id=187; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -525,14 +525,14 @@ class items { dynamicSimulation=1; }; - id=88; + id=185; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={6.2321777,2.6142888,19.176514}; + position[]={6.2319946,2.6142888,19.179688}; angles[]={-0,0.005982683,0}; }; side="Empty"; @@ -541,7 +541,7 @@ class items { dynamicSimulation=1; }; - id=91; + id=188; type="cav_dragoon_WD_V5"; class CustomAttributes { @@ -562,7 +562,7 @@ class items }; }; }; - id=87; + id=184; }; class Item2 { @@ -583,7 +583,7 @@ class items dataType="Object"; class PositionInfo { - position[]={1.6523438,0.0014390945,15.814453}; + position[]={1.6521606,0.0014390945,15.817871}; angles[]={0,3.1415927,0}; }; side="West"; @@ -596,7 +596,7 @@ class items description="Platoon Medic@VIKING-7"; isPlayable=1; }; - id=94; + id=191; type="Cav_B_B_Scout_PlatoonMedic_2_7_F"; class CustomAttributes { @@ -647,10 +647,10 @@ class items { dynamicSimulation=1; }; - id=93; + id=190; }; }; - id=92; + id=189; }; class Item3 { @@ -671,7 +671,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-11.744629,0.0014390945,-0.37854004}; + position[]={-11.744812,0.0014390945,-0.375}; }; side="West"; flags=6; @@ -682,7 +682,7 @@ class items description="Squad Leader@VIKING-1"; isPlayable=1; }; - id=97; + id=194; type="Cav_B_B_Scout_SquadLeader_F"; class CustomAttributes { @@ -720,7 +720,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-13.744385,0.0014390945,-1.3781738}; + position[]={-13.744568,0.0014390945,-1.375}; }; side="West"; flags=5; @@ -732,7 +732,7 @@ class items description="Alpha Team Leader"; isPlayable=1; }; - id=98; + id=195; type="Cav_B_B_Scout_Alpha_TeamLead_F"; class CustomAttributes { @@ -770,7 +770,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-13.744385,0.0014390945,-2.8781738}; + position[]={-13.744568,0.0014390945,-2.875}; }; side="West"; flags=5; @@ -781,7 +781,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=99; + id=196; type="Cav_B_B_Scout_Alpha_AutomaticRifleman_F"; class CustomAttributes { @@ -819,7 +819,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-13.744385,0.0014390945,-4.3786621}; + position[]={-13.744568,0.0014390945,-4.375}; }; side="West"; flags=4; @@ -830,7 +830,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=100; + id=197; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -868,7 +868,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-13.744385,0.0014390945,-5.8781738}; + position[]={-13.744568,0.0014390945,-5.875}; }; side="West"; flags=5; @@ -879,7 +879,7 @@ class items description="Alpha Rifleman"; isPlayable=1; }; - id=101; + id=198; type="Cav_B_B_Scout_Alpha_Rifleman_F"; class CustomAttributes { @@ -917,7 +917,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7443848,0.0014390945,-1.3781738}; + position[]={-9.7445679,0.0014390945,-1.375}; }; side="West"; flags=5; @@ -929,7 +929,7 @@ class items description="Bravo Team Leader"; isPlayable=1; }; - id=102; + id=199; type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { @@ -967,7 +967,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7443848,0.0014390945,-2.8781738}; + position[]={-9.7445679,0.0014390945,-2.875}; }; side="West"; flags=5; @@ -978,7 +978,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=103; + id=200; type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; class CustomAttributes { @@ -1016,7 +1016,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7443848,0.0014390945,-4.3781738}; + position[]={-9.7445679,0.0014390945,-4.375}; }; side="West"; flags=4; @@ -1027,7 +1027,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=104; + id=201; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -1065,7 +1065,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7443848,0.0014390945,-5.8786621}; + position[]={-9.7445679,0.0014390945,-5.875}; }; side="West"; flags=5; @@ -1076,7 +1076,7 @@ class items description="Bravo Combat Lifesaver"; isPlayable=1; }; - id=105; + id=202; type="Cav_B_B_Scout_Bravo_CombatLifeSaver_F"; class CustomAttributes { @@ -1114,23 +1114,23 @@ class items { dynamicSimulation=1; }; - id=96; + id=193; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={-8.6740723,0.89242268,1.0187988}; + position[]={-8.6742554,0.89242268,1.0224609}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bravo"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=108; + id=203; type="B_supplyCrate_F"; class CustomAttributes { @@ -1181,7 +1181,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-12.606689,2.6142888,7.666748}; + position[]={-12.606873,2.6142888,7.6699219}; }; side="Empty"; flags=4; @@ -1189,7 +1189,7 @@ class items { dynamicSimulation=1; }; - id=109; + id=204; type="cav_dragoon_WD_V1"; class CustomAttributes { @@ -1228,7 +1228,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-11.744629,0.0014390945,-2.37854}; + position[]={-11.744812,0.0014390945,-2.375}; }; side="West"; flags=7; @@ -1239,7 +1239,7 @@ class items description="Stryker Vehicle Commander@SIERRA-1"; isPlayable=1; }; - id=106; + id=207; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -1290,7 +1290,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-11.744629,0.0014390945,-3.87854}; + position[]={-11.744812,0.0014390945,-3.875}; }; side="West"; flags=5; @@ -1301,7 +1301,7 @@ class items description="Stryker Driver@SIERRA-1"; isPlayable=1; }; - id=107; + id=208; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -1351,13 +1351,13 @@ class items class Attributes { }; - id=165; + id=206; }; }; - id=164; + id=205; }; }; - id=95; + id=192; }; class Item4 { @@ -1378,7 +1378,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.1555176,0.0014390945,-4.7974854}; + position[]={-4.1557007,0.0014390945,-4.7939453}; }; side="West"; flags=6; @@ -1389,7 +1389,7 @@ class items description="Squad Leader@VIKING-2"; isPlayable=1; }; - id=112; + id=211; type="Cav_B_B_Scout_SquadLeader_F"; class CustomAttributes { @@ -1427,7 +1427,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1555176,0.0014390945,-5.7976074}; + position[]={-6.1557007,0.0014390945,-5.7939453}; }; side="West"; flags=5; @@ -1439,7 +1439,7 @@ class items description="Alpha Team Leader"; isPlayable=1; }; - id=113; + id=212; type="Cav_B_B_Scout_Alpha_TeamLead_F"; class CustomAttributes { @@ -1477,7 +1477,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1555176,0.0014390945,-7.2976074}; + position[]={-6.1557007,0.0014390945,-7.2939453}; }; side="West"; flags=5; @@ -1488,7 +1488,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=114; + id=213; type="Cav_B_B_Scout_Alpha_AutomaticRifleman_F"; class CustomAttributes { @@ -1526,7 +1526,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1555176,0.0014390945,-8.7976074}; + position[]={-6.1557007,0.0014390945,-8.7939453}; }; side="West"; flags=4; @@ -1537,7 +1537,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=115; + id=214; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -1575,7 +1575,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1555176,0.0014390945,-10.297607}; + position[]={-6.1557007,0.0014390945,-10.293945}; }; side="West"; flags=5; @@ -1586,7 +1586,7 @@ class items description="Alpha Rifleman"; isPlayable=1; }; - id=116; + id=215; type="Cav_B_B_Scout_Alpha_Rifleman_F"; class CustomAttributes { @@ -1624,7 +1624,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1555176,0.0014390945,-5.7976074}; + position[]={-2.1557007,0.0014390945,-5.7939453}; }; side="West"; flags=5; @@ -1636,7 +1636,7 @@ class items description="Bravo Team Leader"; isPlayable=1; }; - id=117; + id=216; type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { @@ -1674,7 +1674,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1555176,0.0014390945,-7.2976074}; + position[]={-2.1557007,0.0014390945,-7.2939453}; }; side="West"; flags=5; @@ -1685,7 +1685,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=118; + id=217; type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; class CustomAttributes { @@ -1723,7 +1723,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1555176,0.0014390945,-8.7976074}; + position[]={-2.1557007,0.0014390945,-8.7939453}; }; side="West"; flags=4; @@ -1734,7 +1734,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=119; + id=218; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -1772,7 +1772,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1555176,0.0014390945,-10.297607}; + position[]={-2.1557007,0.0014390945,-10.293945}; }; side="West"; flags=5; @@ -1783,7 +1783,7 @@ class items description="Bravo Combat Lifesaver"; isPlayable=1; }; - id=120; + id=219; type="Cav_B_B_Scout_Bravo_CombatLifeSaver_F"; class CustomAttributes { @@ -1821,23 +1821,23 @@ class items { dynamicSimulation=1; }; - id=111; + id=210; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={-1.6574707,0.89242268,-2.4123535}; + position[]={-1.6576538,0.89242268,-2.4091797}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bravo"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=123; + id=220; type="B_supplyCrate_F"; class CustomAttributes { @@ -1888,7 +1888,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.8327637,2.6142888,3.501709}; + position[]={-4.8329468,2.6142888,3.5048828}; }; side="Empty"; flags=4; @@ -1896,7 +1896,7 @@ class items { dynamicSimulation=1; }; - id=124; + id=221; type="cav_dragoon_WD_V2"; class CustomAttributes { @@ -1935,7 +1935,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.1555176,0.0014390945,-6.7974854}; + position[]={-4.1557007,0.0014390945,-6.7939453}; }; side="West"; flags=7; @@ -1946,7 +1946,7 @@ class items description="Stryker Vehicle Commander@SIERRA-2"; isPlayable=1; }; - id=121; + id=224; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -1997,7 +1997,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.1555176,0.0014390945,-8.2974854}; + position[]={-4.1557007,0.0014390945,-8.2939453}; }; side="West"; flags=5; @@ -2008,7 +2008,7 @@ class items description="Stryker Driver@SIERRA-2"; isPlayable=1; }; - id=122; + id=225; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -2058,13 +2058,13 @@ class items class Attributes { }; - id=163; + id=223; }; }; - id=161; + id=222; }; }; - id=110; + id=209; }; class Item5 { @@ -2085,7 +2085,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3444824,0.0014390945,-4.7974854}; + position[]={4.3442993,0.0014390945,-4.7939453}; }; side="West"; flags=6; @@ -2096,7 +2096,7 @@ class items description="Squad Leader@VIKING-3"; isPlayable=1; }; - id=127; + id=228; type="Cav_B_B_Scout_SquadLeader_F"; class CustomAttributes { @@ -2134,7 +2134,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.3444824,0.0014390945,-5.7976074}; + position[]={2.3442993,0.0014390945,-5.7939453}; }; side="West"; flags=5; @@ -2146,7 +2146,7 @@ class items description="Alpha Team Leader"; isPlayable=1; }; - id=128; + id=229; type="Cav_B_B_Scout_Alpha_TeamLead_F"; class CustomAttributes { @@ -2184,7 +2184,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.3444824,0.0014390945,-7.2976074}; + position[]={2.3442993,0.0014390945,-7.2939453}; }; side="West"; flags=5; @@ -2195,7 +2195,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=129; + id=230; type="Cav_B_B_Scout_Alpha_AutomaticRifleman_F"; class CustomAttributes { @@ -2233,7 +2233,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.3444824,0.0014390945,-8.7976074}; + position[]={2.3442993,0.0014390945,-8.7939453}; }; side="West"; flags=4; @@ -2244,7 +2244,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=130; + id=231; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -2282,7 +2282,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.3444824,0.0014390945,-10.297607}; + position[]={2.3442993,0.0014390945,-10.293945}; }; side="West"; flags=5; @@ -2293,7 +2293,7 @@ class items description="Alpha Rifleman"; isPlayable=1; }; - id=131; + id=232; type="Cav_B_B_Scout_Alpha_Rifleman_F"; class CustomAttributes { @@ -2331,7 +2331,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3444824,0.0014390945,-5.7976074}; + position[]={6.3442993,0.0014390945,-5.7939453}; }; side="West"; flags=5; @@ -2343,7 +2343,7 @@ class items description="Bravo Team Leader"; isPlayable=1; }; - id=132; + id=233; type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { @@ -2381,7 +2381,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3444824,0.0014390945,-7.2976074}; + position[]={6.3442993,0.0014390945,-7.2939453}; }; side="West"; flags=5; @@ -2392,7 +2392,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=133; + id=234; type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; class CustomAttributes { @@ -2430,7 +2430,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3444824,0.0014390945,-8.7976074}; + position[]={6.3442993,0.0014390945,-8.7939453}; }; side="West"; flags=4; @@ -2441,7 +2441,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=134; + id=235; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -2479,7 +2479,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3444824,0.0014390945,-10.297607}; + position[]={6.3442993,0.0014390945,-10.293945}; }; side="West"; flags=5; @@ -2490,7 +2490,7 @@ class items description="Bravo Combat Lifesaver"; isPlayable=1; }; - id=135; + id=236; type="Cav_B_B_Scout_Bravo_CombatLifeSaver_F"; class CustomAttributes { @@ -2528,23 +2528,23 @@ class items { dynamicSimulation=1; }; - id=126; + id=227; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={1.532959,0.89242268,-2.2858887}; + position[]={1.5327759,0.89242268,-2.2822266}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bravo"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Bravo"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=138; + id=237; type="B_supplyCrate_F"; class CustomAttributes { @@ -2595,7 +2595,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.1066895,2.6142888,3.7492676}; + position[]={4.1065063,2.6142888,3.7529297}; }; side="Empty"; flags=4; @@ -2603,7 +2603,7 @@ class items { dynamicSimulation=1; }; - id=139; + id=238; type="cav_dragoon_WD_V3"; class CustomAttributes { @@ -2642,7 +2642,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3444824,0.0014390945,-6.7974854}; + position[]={4.3442993,0.0014390945,-6.7939453}; }; side="West"; flags=7; @@ -2653,7 +2653,7 @@ class items description="Stryker Vehicle Commander@SIERRA-3"; isPlayable=1; }; - id=136; + id=241; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -2704,7 +2704,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3444824,0.0014390945,-8.2974854}; + position[]={4.3442993,0.0014390945,-8.2939453}; }; side="West"; flags=5; @@ -2715,7 +2715,7 @@ class items description="Stryker Driver@SIERRA-3"; isPlayable=1; }; - id=137; + id=242; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -2765,13 +2765,13 @@ class items class Attributes { }; - id=159; + id=240; }; }; - id=158; + id=239; }; }; - id=125; + id=226; }; class Item6 { @@ -2792,7 +2792,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.344482,0.0014390945,-0.29748535}; + position[]={11.344299,0.0014390945,-0.29394531}; }; side="West"; flags=6; @@ -2803,7 +2803,7 @@ class items description="Squad Leader@VIKING-4"; isPlayable=1; }; - id=142; + id=245; type="Cav_B_B_Scout_SquadLeader_F"; class CustomAttributes { @@ -2841,7 +2841,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.3444824,0.0014390945,-1.2976074}; + position[]={9.3442993,0.0014390945,-1.2939453}; }; side="West"; flags=5; @@ -2853,7 +2853,7 @@ class items description="Alpha Team Leader"; isPlayable=1; }; - id=143; + id=246; type="Cav_B_B_Scout_Alpha_TeamLead_F"; class CustomAttributes { @@ -2891,7 +2891,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.3444824,0.0014390945,-2.7976074}; + position[]={9.3442993,0.0014390945,-2.7939453}; }; side="West"; flags=5; @@ -2902,7 +2902,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=144; + id=247; type="Cav_B_B_Scout_Alpha_AutomaticRifleman_F"; class CustomAttributes { @@ -2940,7 +2940,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.3444824,0.0014390945,-4.2976074}; + position[]={9.3442993,0.0014390945,-4.2939453}; }; side="West"; flags=4; @@ -2951,7 +2951,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=145; + id=248; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -2989,7 +2989,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.3444824,0.0014390945,-5.7976074}; + position[]={9.3442993,0.0014390945,-5.7939453}; }; side="West"; flags=5; @@ -3000,7 +3000,7 @@ class items description="Alpha Rifleman"; isPlayable=1; }; - id=146; + id=249; type="Cav_B_B_Scout_Alpha_Rifleman_F"; class CustomAttributes { @@ -3038,7 +3038,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.344482,0.0014390945,-1.2976074}; + position[]={13.344299,0.0014390945,-1.2939453}; }; side="West"; flags=5; @@ -3050,7 +3050,7 @@ class items description="Bravo Team Leader"; isPlayable=1; }; - id=147; + id=250; type="Cav_B_B_Scout_Bravo_TeamLead_F"; class CustomAttributes { @@ -3088,7 +3088,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.344482,0.0014390945,-2.7976074}; + position[]={13.344299,0.0014390945,-2.7939453}; }; side="West"; flags=5; @@ -3099,7 +3099,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=148; + id=251; type="Cav_B_B_Scout_Bravo_AutomaticRifleman_F"; class CustomAttributes { @@ -3137,7 +3137,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.344482,0.0014390945,-4.2976074}; + position[]={13.344299,0.0014390945,-4.2939453}; }; side="West"; flags=4; @@ -3148,7 +3148,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=149; + id=252; type="Cav_B_B_Scout_Rifleman_F"; class CustomAttributes { @@ -3186,7 +3186,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.344482,0.0014390945,-5.7976074}; + position[]={13.344299,0.0014390945,-5.7939453}; }; side="West"; flags=5; @@ -3197,7 +3197,7 @@ class items description="Bravo Combat Lifesaver"; isPlayable=1; }; - id=150; + id=253; type="Cav_B_B_Scout_Bravo_CombatLifeSaver_F"; class CustomAttributes { @@ -3235,14 +3235,14 @@ class items { dynamicSimulation=1; }; - id=141; + id=244; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={11.029541,2.6142888,6.7277832}; + position[]={11.029358,2.6142888,6.7314453}; }; side="Empty"; flags=4; @@ -3250,7 +3250,7 @@ class items { dynamicSimulation=1; }; - id=153; + id=254; type="cav_dragoon_WD_V4"; class CustomAttributes { @@ -3289,7 +3289,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.438477,0.0014390945,-3.5014648}; + position[]={11.438293,0.0014390945,-3.4980469}; }; side="West"; flags=7; @@ -3300,7 +3300,7 @@ class items description="Stryker Vehicle Commander@SIERRA-4"; isPlayable=1; }; - id=151; + id=257; type="Cav_B_B_Ifv_Commander_F"; class CustomAttributes { @@ -3351,7 +3351,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.438477,0.0014390945,-5.0014648}; + position[]={11.438293,0.0014390945,-4.9980469}; }; side="West"; flags=5; @@ -3362,7 +3362,7 @@ class items description="Stryker Driver@SIERRA-4"; isPlayable=1; }; - id=152; + id=258; type="Cav_B_B_Ifv_Driver_F"; class CustomAttributes { @@ -3412,12 +3412,12 @@ class items class Attributes { }; - id=156; + id=256; }; }; - id=155; + id=255; }; }; - id=140; + id=243; }; }; diff --git a/Compositions/2.Cav_Bandit_Platoon/composition.sqe b/Compositions/2.Cav_Bandit_Platoon/composition.sqe index 67c629e10..6699f0bc9 100644 --- a/Compositions/2.Cav_Bandit_Platoon/composition.sqe +++ b/Compositions/2.Cav_Bandit_Platoon/composition.sqe @@ -1,5 +1,5 @@ version=54; -center[]={5674.2729,5,7209.0308}; +center[]={795.14655,5,6039.209}; class items { items=5; @@ -22,11 +22,11 @@ class items dataType="Comment"; class PositionInfo { - position[]={0.15429688,0,2.6708984}; + position[]={0.15582275,0,2.6708984}; }; title="Bandit (Tooltip)"; description="Charlie Company, when motorized, uses either M1151 Humvees (M240s for rifle squads, M2 and Mk19 for WPN Squads) or the M1240/A1 MRAPs. You can use the SOCOM GMVs as well as an up-gun solution depending on the op. For air assault (helicopter) solutions, delete the humvees. Airborne, depending on the mission, may require jumping the humvees with the troops for additional mobility and expansion of the airhead."; - id=287; + id=349; }; class Item1 { @@ -40,7 +40,7 @@ class items dataType="Object"; class PositionInfo { - position[]={0.14404297,0.0014390945,15.193848}; + position[]={0.14556885,0.0014390945,15.193848}; }; side="West"; flags=7; @@ -51,7 +51,7 @@ class items description="Platoon Leader@BANDIT-6"; isPlayable=1; }; - id=289; + id=351; type="Cav_B_C_PlatoonLeader_Bandit_6_F"; class CustomAttributes { @@ -89,10 +89,10 @@ class items { dynamicSimulation=1; }; - id=288; + id=350; }; }; - id=286; + id=348; }; class Item1 { @@ -106,17 +106,17 @@ class items dataType="Object"; class PositionInfo { - position[]={0,0.89242268,16.989258}; + position[]={0.0015258789,0.89242268,16.989258}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Misfit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=291; + id=353; type="B_supplyCrate_F"; class CustomAttributes { @@ -148,7 +148,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.1733398,0.0014390945,15.176758}; + position[]={2.1748657,0.0014390945,15.176758}; }; side="West"; flags=7; @@ -159,7 +159,7 @@ class items description="Platoon Sergeant@BANDIT-5"; isPlayable=1; }; - id=293; + id=355; type="Cav_B_C_PlatoonSergeant_Bandit_5_F"; class CustomAttributes { @@ -197,7 +197,7 @@ class items { dynamicSimulation=1; }; - id=292; + id=354; }; class Item2 { @@ -211,7 +211,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-1.8266602,0.0014390945,15.168945}; + position[]={-1.8251343,0.0014390945,15.168945}; }; side="West"; flags=7; @@ -222,7 +222,7 @@ class items description="Platoon Medic@BANDIT-7"; isPlayable=1; }; - id=295; + id=357; type="Cav_B_C_PlatoonMedic_Bandit_7_F"; class CustomAttributes { @@ -273,13 +273,13 @@ class items { dynamicSimulation=1; }; - id=294; + id=356; }; }; - id=290; + id=352; }; }; - id=285; + id=347; }; class Item1 { @@ -293,17 +293,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.6499023,0.89242268,5.5058594}; + position[]={-8.6483765,0.89242268,5.5058594}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bandit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=297; + id=359; type="B_supplyCrate_F"; class CustomAttributes { @@ -335,7 +335,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.6499023,0.0014390945,3.5561523}; + position[]={-8.6483765,0.0014390945,3.5561523}; }; side="West"; flags=7; @@ -346,7 +346,7 @@ class items description="Squad Leader@BANDIT-1"; isPlayable=1; }; - id=299; + id=361; type="Cav_B_C_SquadLeader_Bandit_1_F"; class CustomAttributes { @@ -384,7 +384,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.1513672,0.0014390945,2.5561523}; + position[]={-7.1498413,0.0014390945,2.5561523}; }; side="West"; flags=5; @@ -396,7 +396,7 @@ class items description="Alpha Fireteam Leader"; isPlayable=1; }; - id=300; + id=362; type="Cav_B_C_Alpha_FireTeamLeader_F"; }; class Item2 @@ -404,7 +404,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.1513672,0.0014390945,2.5561523}; + position[]={-8.1498413,0.0014390945,2.5561523}; }; side="West"; flags=5; @@ -415,7 +415,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=301; + id=363; type="Cav_B_C_Alpha_AutomaticRifleman_F"; }; class Item3 @@ -423,7 +423,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.1513672,0.0014390945,2.5561523}; + position[]={-9.1498413,0.0014390945,2.5561523}; }; side="West"; flags=5; @@ -434,7 +434,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=302; + id=364; type="Cav_B_C_Alpha_Grenadier_F"; }; class Item4 @@ -442,7 +442,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-10.151367,0.0014390945,2.5561523}; + position[]={-10.149841,0.0014390945,2.5561523}; }; side="West"; flags=5; @@ -453,7 +453,7 @@ class items description="Alpha Rifleman (LAT)"; isPlayable=1; }; - id=303; + id=365; type="Cav_B_C_Alpha_RiflemanLAT_F"; }; class Item5 @@ -461,7 +461,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.1513672,0.0014390945,1.5561523}; + position[]={-7.1498413,0.0014390945,1.5561523}; }; side="West"; flags=5; @@ -473,7 +473,7 @@ class items description="Bravo Fireteam Leader"; isPlayable=1; }; - id=304; + id=366; type="Cav_B_C_Bravo_FireTeamLeader_F"; }; class Item6 @@ -481,7 +481,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.1513672,0.0014390945,1.5561523}; + position[]={-8.1498413,0.0014390945,1.5561523}; }; side="West"; flags=5; @@ -492,7 +492,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=305; + id=367; type="Cav_B_C_Bravo_AutomaticRifleman_F"; }; class Item7 @@ -500,7 +500,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.1513672,0.0014390945,1.5561523}; + position[]={-9.1498413,0.0014390945,1.5561523}; }; side="West"; flags=5; @@ -511,7 +511,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=306; + id=368; type="Cav_B_C_Bravo_Grenadier_F"; }; class Item8 @@ -519,7 +519,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-10.15918,0.0014390945,1.4907227}; + position[]={-10.157654,0.0014390945,1.4907227}; }; side="West"; flags=5; @@ -529,7 +529,7 @@ class items description="Bravo CLS"; isPlayable=1; }; - id=307; + id=369; type="Cav_B_C_CombatLifeSaver_F"; class CustomAttributes { @@ -567,10 +567,10 @@ class items { dynamicSimulation=1; }; - id=298; + id=360; }; }; - id=296; + id=358; }; class Item2 { @@ -584,17 +584,17 @@ class items dataType="Object"; class PositionInfo { - position[]={8.5073242,0.89242268,4.7993164}; + position[]={8.5084839,0.89242268,4.7988281}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bandit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=309; + id=371; type="B_supplyCrate_F"; class CustomAttributes { @@ -626,7 +626,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.5073242,0.0014390945,2.8500977}; + position[]={8.5088501,0.0014390945,2.8500977}; }; side="West"; flags=7; @@ -637,7 +637,7 @@ class items description="Squad Leader@BANDIT-2"; isPlayable=1; }; - id=311; + id=373; type="Cav_B_C_SquadLeader_Bandit_2_F"; class CustomAttributes { @@ -675,7 +675,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.007324,0.0014390945,1.8500977}; + position[]={10.00885,0.0014390945,1.8500977}; }; side="West"; flags=5; @@ -687,7 +687,7 @@ class items description="Alpha Fireteam Leader"; isPlayable=1; }; - id=312; + id=374; type="Cav_B_C_Alpha_FireTeamLeader_F"; }; class Item2 @@ -695,7 +695,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.0073242,0.0014390945,1.8500977}; + position[]={9.0088501,0.0014390945,1.8500977}; }; side="West"; flags=5; @@ -706,7 +706,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=313; + id=375; type="Cav_B_C_Alpha_AutomaticRifleman_F"; }; class Item3 @@ -714,7 +714,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.0073242,0.0014390945,1.8500977}; + position[]={8.0088501,0.0014390945,1.8500977}; }; side="West"; flags=5; @@ -725,7 +725,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=314; + id=376; type="Cav_B_C_Alpha_Grenadier_F"; }; class Item4 @@ -733,7 +733,7 @@ class items dataType="Object"; class PositionInfo { - position[]={7.0073242,0.0014390945,1.8500977}; + position[]={7.0088501,0.0014390945,1.8500977}; }; side="West"; flags=5; @@ -744,7 +744,7 @@ class items description="Alpha Rifleman (LAT)"; isPlayable=1; }; - id=315; + id=377; type="Cav_B_C_Alpha_RiflemanLAT_F"; }; class Item5 @@ -752,7 +752,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.007324,0.0014390945,0.85009766}; + position[]={10.00885,0.0014390945,0.85009766}; }; side="West"; flags=5; @@ -764,7 +764,7 @@ class items description="Bravo Fireteam Leader"; isPlayable=1; }; - id=316; + id=378; type="Cav_B_C_Bravo_FireTeamLeader_F"; }; class Item6 @@ -772,7 +772,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.0073242,0.0014390945,0.85009766}; + position[]={9.0088501,0.0014390945,0.85009766}; }; side="West"; flags=5; @@ -783,7 +783,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=317; + id=379; type="Cav_B_C_Bravo_AutomaticRifleman_F"; }; class Item7 @@ -791,7 +791,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.0073242,0.0014390945,0.85009766}; + position[]={8.0088501,0.0014390945,0.85009766}; }; side="West"; flags=5; @@ -802,7 +802,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=318; + id=380; type="Cav_B_C_Bravo_Grenadier_F"; }; class Item8 @@ -810,7 +810,7 @@ class items dataType="Object"; class PositionInfo { - position[]={7.0092773,0.0014390945,0.86083984}; + position[]={7.0108032,0.0014390945,0.86083984}; }; side="West"; flags=5; @@ -820,7 +820,7 @@ class items description="Bravo CLS"; isPlayable=1; }; - id=319; + id=381; type="Cav_B_C_CombatLifeSaver_F"; class CustomAttributes { @@ -858,10 +858,10 @@ class items { dynamicSimulation=1; }; - id=310; + id=372; }; }; - id=308; + id=370; }; class Item3 { @@ -875,17 +875,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.6499023,0.89242268,-5.9941406}; + position[]={-9.6483765,0.89242268,-5.9941406}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bandit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=321; + id=383; type="B_supplyCrate_F"; class CustomAttributes { @@ -917,7 +917,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.6499023,0.0014390945,-7.9438477}; + position[]={-9.6483765,0.0014390945,-7.9438477}; }; side="West"; flags=7; @@ -928,7 +928,7 @@ class items description="Squad Leader@BANDIT-3"; isPlayable=1; }; - id=323; + id=385; type="Cav_B_C_SquadLeader_Bandit_3_F"; class CustomAttributes { @@ -966,7 +966,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.1503906,0.0014390945,-8.9438477}; + position[]={-8.1488647,0.0014390945,-8.9438477}; }; side="West"; flags=5; @@ -978,7 +978,7 @@ class items description="Alpha Fireteam Leader"; isPlayable=1; }; - id=324; + id=386; type="Cav_B_C_Alpha_FireTeamLeader_F"; }; class Item2 @@ -986,7 +986,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.1503906,0.0014390945,-8.9438477}; + position[]={-9.1488647,0.0014390945,-8.9438477}; }; side="West"; flags=5; @@ -997,7 +997,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=325; + id=387; type="Cav_B_C_Alpha_AutomaticRifleman_F"; }; class Item3 @@ -1005,7 +1005,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-10.150391,0.0014390945,-8.9438477}; + position[]={-10.148865,0.0014390945,-8.9438477}; }; side="West"; flags=5; @@ -1016,7 +1016,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=326; + id=388; type="Cav_B_C_Alpha_Grenadier_F"; }; class Item4 @@ -1024,7 +1024,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-11.150391,0.0014390945,-8.9438477}; + position[]={-11.148865,0.0014390945,-8.9438477}; }; side="West"; flags=5; @@ -1035,7 +1035,7 @@ class items description="Alpha Rifleman (LAT)"; isPlayable=1; }; - id=327; + id=389; type="Cav_B_C_Alpha_RiflemanLAT_F"; }; class Item5 @@ -1043,7 +1043,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.1503906,0.0014390945,-9.9438477}; + position[]={-8.1488647,0.0014390945,-9.9438477}; }; side="West"; flags=5; @@ -1055,7 +1055,7 @@ class items description="Bravo Fireteam Leader"; isPlayable=1; }; - id=328; + id=390; type="Cav_B_C_Bravo_FireTeamLeader_F"; }; class Item6 @@ -1063,7 +1063,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.1503906,0.0014390945,-9.9438477}; + position[]={-9.1488647,0.0014390945,-9.9438477}; }; side="West"; flags=5; @@ -1074,7 +1074,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=329; + id=391; type="Cav_B_C_Bravo_AutomaticRifleman_F"; }; class Item7 @@ -1082,7 +1082,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-10.150391,0.0014390945,-9.9438477}; + position[]={-10.148865,0.0014390945,-9.9438477}; }; side="West"; flags=5; @@ -1093,7 +1093,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=330; + id=392; type="Cav_B_C_Bravo_Grenadier_F"; }; class Item8 @@ -1101,7 +1101,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-11.000977,0.0014390945,-9.9858398}; + position[]={-10.999451,0.0014390945,-9.9858398}; }; side="West"; flags=5; @@ -1111,7 +1111,7 @@ class items description="Bravo CLS"; isPlayable=1; }; - id=331; + id=393; type="Cav_B_C_CombatLifeSaver_F"; class CustomAttributes { @@ -1149,7 +1149,7 @@ class items { dynamicSimulation=1; }; - id=322; + id=384; }; class Item2 { @@ -1163,17 +1163,17 @@ class items dataType="Object"; class PositionInfo { - position[]={8.6855469,0.89242268,-5.0737305}; + position[]={8.6870728,0.89242268,-5.0737305}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bandit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=333; + id=395; type="B_supplyCrate_F"; class CustomAttributes { @@ -1205,7 +1205,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.5073242,0.0014390945,-7.1499023}; + position[]={8.5088501,0.0014390945,-7.1499023}; }; side="West"; flags=6; @@ -1216,7 +1216,7 @@ class items description="Squad Leader@BANDIT-4"; isPlayable=1; }; - id=335; + id=397; type="Cav_B_C_Weapons_SquadLeader_F"; class CustomAttributes { @@ -1254,7 +1254,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.007324,0.0014390945,-8.1499023}; + position[]={10.00885,0.0014390945,-8.1499023}; }; side="West"; flags=4; @@ -1266,7 +1266,7 @@ class items description="Alpha Fireteam Leader"; isPlayable=1; }; - id=336; + id=398; type="Cav_B_C_Weapons_M240B_FireTeamLeader_F"; class CustomAttributes { @@ -1304,7 +1304,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.0073242,0.0014390945,-8.1499023}; + position[]={9.0088501,0.0014390945,-8.1499023}; }; side="West"; flags=4; @@ -1315,7 +1315,7 @@ class items description="Alpha Machine Gunner"; isPlayable=1; }; - id=337; + id=399; type="Cav_B_C_Weapons_M240B_Machinegunner_F"; class CustomAttributes { @@ -1353,7 +1353,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.0073242,0.0014390945,-8.1499023}; + position[]={8.0088501,0.0014390945,-8.1499023}; }; side="West"; flags=4; @@ -1364,7 +1364,7 @@ class items description="Alpha M240 Ammo Bearer"; isPlayable=1; }; - id=338; + id=400; type="Cav_B_C_Weapons_M240B_MachinegunnerAmmoBearer_F"; class CustomAttributes { @@ -1402,7 +1402,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.007324,0.0014390945,-9.1499023}; + position[]={10.00885,0.0014390945,-9.1499023}; }; side="West"; flags=4; @@ -1414,7 +1414,7 @@ class items description="Bravo Fireteam Leader"; isPlayable=1; }; - id=339; + id=401; type="Cav_B_C_Weapons_M240B_FireTeamLeader_F"; class CustomAttributes { @@ -1452,7 +1452,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.0073242,0.0014390945,-9.1499023}; + position[]={9.0088501,0.0014390945,-9.1499023}; }; side="West"; flags=4; @@ -1463,7 +1463,7 @@ class items description="Bravo Machine Gunner"; isPlayable=1; }; - id=340; + id=402; type="Cav_B_C_Weapons_M240B_Machinegunner_F"; class CustomAttributes { @@ -1501,7 +1501,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.0073242,0.0014390945,-9.1499023}; + position[]={8.0088501,0.0014390945,-9.1499023}; }; side="West"; flags=4; @@ -1512,7 +1512,7 @@ class items description="Bravo M240 Ammo Bearer"; isPlayable=1; }; - id=341; + id=403; type="Cav_B_C_Weapons_M240B_MachinegunnerAmmoBearer_F"; class CustomAttributes { @@ -1550,7 +1550,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.871582,0.0014390945,-8.059082}; + position[]={6.8731079,0.0014390945,-8.059082}; angles[]={0,0.13096951,0}; }; side="West"; @@ -1561,7 +1561,7 @@ class items description="Charlie MAAWS Gunner"; isPlayable=1; }; - id=342; + id=404; type="Cav_B_C_Weapons_MAAWS_MAAWSGunner_F"; class CustomAttributes { @@ -1599,7 +1599,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.8691406,0.0014390945,-9.1743164}; + position[]={6.8706665,0.0014390945,-9.1743164}; angles[]={0,6.1690288,0}; }; side="West"; @@ -1610,7 +1610,7 @@ class items description="Charlie MAAWS Assistant"; isPlayable=1; }; - id=343; + id=405; type="Cav_B_C_Weapons_MAAWS_MAAWSAssistant_F"; class CustomAttributes { @@ -1648,13 +1648,13 @@ class items { dynamicSimulation=1; }; - id=334; + id=396; }; }; - id=332; + id=394; }; }; - id=320; + id=382; }; class Item4 { @@ -1668,7 +1668,7 @@ class items dataType="Object"; class PositionInfo { - position[]={0.14453125,1.7828913,11.143066}; + position[]={0.14605713,1.7828913,11.143066}; }; side="Empty"; flags=4; @@ -1679,7 +1679,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=345; + id=407; type="rhsusf_m1152_rsv_usarmy_wd"; class CustomAttributes { @@ -1704,7 +1704,7 @@ class items dataType="Object"; class PositionInfo { - position[]={14.447266,1.7822218,3.6000977}; + position[]={14.448792,1.7822218,3.6000977}; }; side="Empty"; flags=4; @@ -1716,7 +1716,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=346; + id=408; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -2035,7 +2035,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.8808594,1.7822218,-6.4204102}; + position[]={3.8823853,1.7822218,-6.4204102}; }; side="Empty"; flags=4; @@ -2047,7 +2047,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=347; + id=409; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -2366,7 +2366,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.3510742,1.7822218,-7.1254883}; + position[]={-4.3495483,1.7822218,-7.1254883}; }; side="Empty"; flags=4; @@ -2378,7 +2378,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=348; + id=410; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -2697,7 +2697,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-14.097168,1.7822218,-7.3364258}; + position[]={-14.095642,1.7822218,-7.3364258}; }; side="Empty"; flags=4; @@ -2709,7 +2709,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=349; + id=411; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -3028,7 +3028,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.3017578,1.7822218,3.6865234}; + position[]={-4.3002319,1.7822218,3.6865234}; }; side="Empty"; flags=4; @@ -3040,7 +3040,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=350; + id=412; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -3359,7 +3359,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-14.093262,1.7822218,4.1811523}; + position[]={-14.091736,1.7822218,4.1811523}; }; side="Empty"; flags=4; @@ -3371,7 +3371,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=351; + id=413; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -3690,7 +3690,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.9824219,1.7822218,2.7612305}; + position[]={3.9839478,1.7822218,2.7612305}; }; side="Empty"; flags=4; @@ -3702,7 +3702,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=352; + id=414; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -4021,7 +4021,7 @@ class items dataType="Object"; class PositionInfo { - position[]={14.065918,1.7822218,-7.1811523}; + position[]={14.067444,1.7822218,-7.1811523}; }; side="Empty"; flags=4; @@ -4033,7 +4033,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=353; + id=415; type="rhsusf_m1165a1_gmv_mk19_m240_socom_d"; class CustomAttributes { @@ -4348,6 +4348,6 @@ class items }; }; }; - id=344; + id=406; }; }; diff --git a/Compositions/3.Cav_Misfit_Platoon/composition.sqe b/Compositions/3.Cav_Misfit_Platoon/composition.sqe index 1815a3fc9..914efd108 100644 --- a/Compositions/3.Cav_Misfit_Platoon/composition.sqe +++ b/Compositions/3.Cav_Misfit_Platoon/composition.sqe @@ -1,5 +1,5 @@ version=54; -center[]={5671.4814,5,7227.3887}; +center[]={795.20221,5,6039.6377}; class items { items=6; @@ -29,7 +29,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-0.32763672,0.0014390945,15.970703}; + position[]={-0.328125,0.0014390945,15.969727}; }; side="West"; flags=6; @@ -40,7 +40,7 @@ class items description="Platoon Leader@MISFIT-6"; isPlayable=1; }; - id=456; + id=420; type="Cav_B_C_PlatoonLeader_F"; class CustomAttributes { @@ -78,10 +78,10 @@ class items { dynamicSimulation=1; }; - id=455; + id=419; }; }; - id=454; + id=418; }; class Item1 { @@ -95,17 +95,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-0.47216797,0.89242268,17.765625}; + position[]={-0.472229,0.89242268,17.76416}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Misfit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=458; + id=422; type="B_supplyCrate_F"; class CustomAttributes { @@ -137,7 +137,7 @@ class items dataType="Object"; class PositionInfo { - position[]={1.7001953,0.0014390945,15.953125}; + position[]={1.699707,0.0014390945,15.952148}; }; side="West"; flags=6; @@ -148,7 +148,7 @@ class items description="Platoon Sergeant@MISFIT-5"; isPlayable=1; }; - id=460; + id=424; type="Cav_B_C_PlatoonSergeant_F"; class CustomAttributes { @@ -186,7 +186,7 @@ class items { dynamicSimulation=1; }; - id=459; + id=423; }; class Item2 { @@ -200,7 +200,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.2998047,0.0014390945,15.946289}; + position[]={-2.300293,0.0014390945,15.945313}; }; side="West"; flags=6; @@ -211,7 +211,7 @@ class items description="Platoon Medic@MISFIT-7"; isPlayable=1; }; - id=462; + id=426; type="Cav_B_C_PlatoonMedic_F"; class CustomAttributes { @@ -262,24 +262,24 @@ class items { dynamicSimulation=1; }; - id=461; + id=425; }; class Item3 { dataType="Comment"; class PositionInfo { - position[]={-0.021484375,0,4.7529297}; + position[]={-0.021972656,0,4.7519531}; }; title="Misfit (Tooltip)"; description="Charlie Company, when motorized, uses either M1151 Humvees (M240s for rifle squads, M2 and Mk19 for WPN Squads) or the M1240/A1 MRAPs. You can use the SOCOM GMVs as well as an up-gun solution depending on the op. For air assault (helicopter) solutions, delete the humvees. Airborne, depending on the mission, may require jumping the humvees with the troops for additional mobility and expansion of the airhead."; - id=463; + id=427; }; }; - id=457; + id=421; }; }; - id=453; + id=417; }; class Item1 { @@ -293,17 +293,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.2036133,0.89242268,5.3955078}; + position[]={-7.2041016,0.89242268,5.3945313}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bandit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=465; + id=429; type="B_supplyCrate_F"; class CustomAttributes { @@ -335,7 +335,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.2036133,0.0014390945,3.4453125}; + position[]={-7.2041016,0.0014390945,3.4443359}; }; side="West"; flags=6; @@ -346,7 +346,7 @@ class items description="Squad Leader@MISFIT-1"; isPlayable=1; }; - id=467; + id=431; type="Cav_B_C_SquadLeader_F"; class CustomAttributes { @@ -384,7 +384,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-5.7055664,0.0014390945,2.4453125}; + position[]={-5.7060547,0.0014390945,2.4443359}; }; side="West"; flags=5; @@ -396,7 +396,7 @@ class items description="Alpha Fireteam Leader"; isPlayable=1; }; - id=468; + id=432; type="Cav_B_C_Alpha_FireTeamLeader_F"; }; class Item2 @@ -404,7 +404,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.7055664,0.0014390945,2.4453125}; + position[]={-6.7060547,0.0014390945,2.4443359}; }; side="West"; flags=5; @@ -415,7 +415,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=469; + id=433; type="Cav_B_C_Alpha_AutomaticRifleman_F"; }; class Item3 @@ -423,7 +423,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.7055664,0.0014390945,2.4453125}; + position[]={-7.7060547,0.0014390945,2.4443359}; }; side="West"; flags=5; @@ -434,7 +434,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=470; + id=434; type="Cav_B_C_Alpha_Grenadier_F"; }; class Item4 @@ -442,7 +442,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.7055664,0.0014390945,2.4453125}; + position[]={-8.7060547,0.0014390945,2.4443359}; }; side="West"; flags=5; @@ -453,7 +453,7 @@ class items description="Alpha Rifleman (LAT)"; isPlayable=1; }; - id=471; + id=435; type="Cav_B_C_Alpha_RiflemanLAT_F"; }; class Item5 @@ -461,7 +461,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-5.7055664,0.0014390945,1.4453125}; + position[]={-5.7060547,0.0014390945,1.4443359}; }; side="West"; flags=5; @@ -473,7 +473,7 @@ class items description="Bravo Fireteam Leader"; isPlayable=1; }; - id=472; + id=436; type="Cav_B_C_Bravo_FireTeamLeader_F"; }; class Item6 @@ -481,7 +481,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.7055664,0.0014390945,1.4453125}; + position[]={-6.7060547,0.0014390945,1.4443359}; }; side="West"; flags=5; @@ -492,7 +492,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=473; + id=437; type="Cav_B_C_Bravo_AutomaticRifleman_F"; }; class Item7 @@ -500,7 +500,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.7055664,0.0014390945,1.4453125}; + position[]={-7.7060547,0.0014390945,1.4443359}; }; side="West"; flags=5; @@ -511,7 +511,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=474; + id=438; type="Cav_B_C_Bravo_Grenadier_F"; }; class Item8 @@ -519,7 +519,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.7133789,0.0014390945,1.3798828}; + position[]={-8.7138672,0.0014390945,1.3789063}; }; side="West"; flags=5; @@ -529,7 +529,7 @@ class items description="Bravo CLS"; isPlayable=1; }; - id=475; + id=439; type="Cav_B_C_CombatLifeSaver_F"; class CustomAttributes { @@ -567,10 +567,10 @@ class items { dynamicSimulation=1; }; - id=466; + id=430; }; }; - id=464; + id=428; }; class Item2 { @@ -584,17 +584,17 @@ class items dataType="Object"; class PositionInfo { - position[]={7.6552734,0.89242268,4.796875}; + position[]={7.6547852,0.89242268,4.7958984}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bandit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=477; + id=441; type="B_supplyCrate_F"; class CustomAttributes { @@ -626,7 +626,7 @@ class items dataType="Object"; class PositionInfo { - position[]={7.6552734,0.0014390945,2.847168}; + position[]={7.6547852,0.0014390945,2.8461914}; }; side="West"; flags=6; @@ -637,7 +637,7 @@ class items description="Squad Leader@MISFIT-2"; isPlayable=1; }; - id=479; + id=443; type="Cav_B_C_SquadLeader_F"; class CustomAttributes { @@ -675,7 +675,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.1552734,0.0014390945,1.8466797}; + position[]={9.1547852,0.0014390945,1.8457031}; }; side="West"; flags=5; @@ -687,7 +687,7 @@ class items description="Alpha Fireteam Leader"; isPlayable=1; }; - id=480; + id=444; type="Cav_B_C_Alpha_FireTeamLeader_F"; }; class Item2 @@ -695,7 +695,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.1552734,0.0014390945,1.8466797}; + position[]={8.1547852,0.0014390945,1.8457031}; }; side="West"; flags=5; @@ -706,7 +706,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=481; + id=445; type="Cav_B_C_Alpha_AutomaticRifleman_F"; }; class Item3 @@ -714,7 +714,7 @@ class items dataType="Object"; class PositionInfo { - position[]={7.1552734,0.0014390945,1.8466797}; + position[]={7.1547852,0.0014390945,1.8457031}; }; side="West"; flags=5; @@ -725,7 +725,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=482; + id=446; type="Cav_B_C_Alpha_Grenadier_F"; }; class Item4 @@ -733,7 +733,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.1552734,0.0014390945,1.8466797}; + position[]={6.1547852,0.0014390945,1.8457031}; }; side="West"; flags=5; @@ -744,7 +744,7 @@ class items description="Alpha Rifleman (LAT)"; isPlayable=1; }; - id=483; + id=447; type="Cav_B_C_Alpha_RiflemanLAT_F"; }; class Item5 @@ -752,7 +752,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.1552734,0.0014390945,0.84667969}; + position[]={9.1547852,0.0014390945,0.84570313}; }; side="West"; flags=5; @@ -764,7 +764,7 @@ class items description="Bravo Fireteam Leader"; isPlayable=1; }; - id=484; + id=448; type="Cav_B_C_Bravo_FireTeamLeader_F"; }; class Item6 @@ -772,7 +772,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.1552734,0.0014390945,0.84667969}; + position[]={8.1547852,0.0014390945,0.84570313}; }; side="West"; flags=5; @@ -783,7 +783,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=485; + id=449; type="Cav_B_C_Bravo_AutomaticRifleman_F"; }; class Item7 @@ -791,7 +791,7 @@ class items dataType="Object"; class PositionInfo { - position[]={7.1552734,0.0014390945,0.84667969}; + position[]={7.1547852,0.0014390945,0.84570313}; }; side="West"; flags=5; @@ -802,7 +802,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=486; + id=450; type="Cav_B_C_Bravo_Grenadier_F"; }; class Item8 @@ -810,7 +810,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.1572266,0.0014390945,0.85839844}; + position[]={6.1567383,0.0014390945,0.85742188}; }; side="West"; flags=5; @@ -820,7 +820,7 @@ class items description="Bravo CLS"; isPlayable=1; }; - id=487; + id=451; type="Cav_B_C_CombatLifeSaver_F"; class CustomAttributes { @@ -858,10 +858,10 @@ class items { dynamicSimulation=1; }; - id=478; + id=442; }; }; - id=476; + id=440; }; class Item3 { @@ -875,17 +875,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.2036133,0.89242268,-6.1044922}; + position[]={-8.2041016,0.89242268,-6.1054688}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bandit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=489; + id=453; type="B_supplyCrate_F"; class CustomAttributes { @@ -917,7 +917,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.2036133,0.0014390945,-8.0546875}; + position[]={-8.2041016,0.0014390945,-8.0556641}; }; side="West"; flags=6; @@ -928,7 +928,7 @@ class items description="Squad Leader@MISFIT-3"; isPlayable=1; }; - id=491; + id=455; type="Cav_B_C_SquadLeader_F"; class CustomAttributes { @@ -966,7 +966,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.7045898,0.0014390945,-9.0546875}; + position[]={-6.7050781,0.0014390945,-9.0556641}; }; side="West"; flags=5; @@ -978,7 +978,7 @@ class items description="Alpha Fireteam Leader"; isPlayable=1; }; - id=492; + id=456; type="Cav_B_C_Alpha_FireTeamLeader_F"; }; class Item2 @@ -986,7 +986,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.7045898,0.0014390945,-9.0546875}; + position[]={-7.7050781,0.0014390945,-9.0556641}; }; side="West"; flags=5; @@ -997,7 +997,7 @@ class items description="Alpha Automatic Rifleman"; isPlayable=1; }; - id=493; + id=457; type="Cav_B_C_Alpha_AutomaticRifleman_F"; }; class Item3 @@ -1005,7 +1005,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.7045898,0.0014390945,-9.0546875}; + position[]={-8.7050781,0.0014390945,-9.0556641}; }; side="West"; flags=5; @@ -1016,7 +1016,7 @@ class items description="Alpha Grenadier"; isPlayable=1; }; - id=494; + id=458; type="Cav_B_C_Alpha_Grenadier_F"; }; class Item4 @@ -1024,7 +1024,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.7045898,0.0014390945,-9.0546875}; + position[]={-9.7050781,0.0014390945,-9.0556641}; }; side="West"; flags=5; @@ -1035,7 +1035,7 @@ class items description="Alpha Rifleman (LAT)"; isPlayable=1; }; - id=495; + id=459; type="Cav_B_C_Alpha_RiflemanLAT_F"; }; class Item5 @@ -1043,7 +1043,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.7045898,0.0014390945,-10.054688}; + position[]={-6.7050781,0.0014390945,-10.055664}; }; side="West"; flags=5; @@ -1055,7 +1055,7 @@ class items description="Bravo Fireteam Leader"; isPlayable=1; }; - id=496; + id=460; type="Cav_B_C_Bravo_FireTeamLeader_F"; }; class Item6 @@ -1063,7 +1063,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.7045898,0.0014390945,-10.054688}; + position[]={-7.7050781,0.0014390945,-10.055664}; }; side="West"; flags=5; @@ -1074,7 +1074,7 @@ class items description="Bravo Automatic Rifleman"; isPlayable=1; }; - id=497; + id=461; type="Cav_B_C_Bravo_AutomaticRifleman_F"; }; class Item7 @@ -1082,7 +1082,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-8.7045898,0.0014390945,-10.054688}; + position[]={-8.7050781,0.0014390945,-10.055664}; }; side="West"; flags=5; @@ -1093,7 +1093,7 @@ class items description="Bravo Grenadier"; isPlayable=1; }; - id=498; + id=462; type="Cav_B_C_Bravo_Grenadier_F"; }; class Item8 @@ -1101,7 +1101,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.5551758,0.0014390945,-10.09668}; + position[]={-9.5556641,0.0014390945,-10.097656}; }; side="West"; flags=5; @@ -1111,7 +1111,7 @@ class items description="Bravo CLS"; isPlayable=1; }; - id=499; + id=463; type="Cav_B_C_CombatLifeSaver_F"; class CustomAttributes { @@ -1149,10 +1149,10 @@ class items { dynamicSimulation=1; }; - id=490; + id=454; }; }; - id=488; + id=452; }; class Item4 { @@ -1166,17 +1166,17 @@ class items dataType="Object"; class PositionInfo { - position[]={7.8330078,0.89242268,-5.0771484}; + position[]={7.8325195,0.89242268,-5.078125}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Bandit"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Charlie"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=501; + id=465; type="B_supplyCrate_F"; class CustomAttributes { @@ -1208,7 +1208,7 @@ class items dataType="Object"; class PositionInfo { - position[]={7.6552734,0.0014390945,-7.152832}; + position[]={7.6547852,0.0014390945,-7.1538086}; }; side="West"; flags=6; @@ -1219,7 +1219,7 @@ class items description="Squad Leader@MISFIT-4"; isPlayable=1; }; - id=503; + id=467; type="Cav_B_C_Weapons_SquadLeader_F"; class CustomAttributes { @@ -1257,7 +1257,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.1552734,0.0014390945,-8.1533203}; + position[]={9.1547852,0.0014390945,-8.1542969}; }; side="West"; flags=4; @@ -1269,7 +1269,7 @@ class items description="Alpha Fireteam Leader"; isPlayable=1; }; - id=504; + id=468; type="Cav_B_C_Weapons_M240B_FireTeamLeader_F"; class CustomAttributes { @@ -1307,7 +1307,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.1552734,0.0014390945,-8.1533203}; + position[]={8.1547852,0.0014390945,-8.1542969}; }; side="West"; flags=4; @@ -1318,7 +1318,7 @@ class items description="Alpha Machine Gunner"; isPlayable=1; }; - id=505; + id=469; type="Cav_B_C_Weapons_M240B_Machinegunner_F"; class CustomAttributes { @@ -1356,7 +1356,7 @@ class items dataType="Object"; class PositionInfo { - position[]={7.1552734,0.0014390945,-8.1533203}; + position[]={7.1547852,0.0014390945,-8.1542969}; }; side="West"; flags=4; @@ -1367,7 +1367,7 @@ class items description="Alpha M240 Ammo Bearer"; isPlayable=1; }; - id=506; + id=470; type="Cav_B_C_Weapons_M240B_MachinegunnerAmmoBearer_F"; class CustomAttributes { @@ -1405,7 +1405,7 @@ class items dataType="Object"; class PositionInfo { - position[]={9.1552734,0.0014390945,-9.1533203}; + position[]={9.1547852,0.0014390945,-9.1542969}; }; side="West"; flags=4; @@ -1417,7 +1417,7 @@ class items description="Bravo Fireteam Leader"; isPlayable=1; }; - id=507; + id=471; type="Cav_B_C_Weapons_M240B_FireTeamLeader_F"; class CustomAttributes { @@ -1455,7 +1455,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.1552734,0.0014390945,-9.1533203}; + position[]={8.1547852,0.0014390945,-9.1542969}; }; side="West"; flags=4; @@ -1466,7 +1466,7 @@ class items description="Bravo Machine Gunner"; isPlayable=1; }; - id=508; + id=472; type="Cav_B_C_Weapons_M240B_Machinegunner_F"; class CustomAttributes { @@ -1504,7 +1504,7 @@ class items dataType="Object"; class PositionInfo { - position[]={7.1552734,0.0014390945,-9.1533203}; + position[]={7.1547852,0.0014390945,-9.1542969}; }; side="West"; flags=4; @@ -1515,7 +1515,7 @@ class items description="Bravo M240 Ammo Bearer"; isPlayable=1; }; - id=509; + id=473; type="Cav_B_C_Weapons_M240B_MachinegunnerAmmoBearer_F"; class CustomAttributes { @@ -1553,7 +1553,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.1552734,0.0014390945,-8.1533203}; + position[]={6.1547852,0.0014390945,-8.1542969}; }; side="West"; flags=4; @@ -1564,7 +1564,7 @@ class items description="Charlie MAAWS Gunner"; isPlayable=1; }; - id=510; + id=474; type="Cav_B_C_Weapons_MAAWS_MAAWSGunner_F"; class CustomAttributes { @@ -1602,7 +1602,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.1464844,0.0014390945,-9.1787109}; + position[]={6.1459961,0.0014390945,-9.1796875}; }; side="West"; flags=4; @@ -1612,7 +1612,7 @@ class items description="Charlie MAAWS Assistant"; isPlayable=1; }; - id=511; + id=475; type="Cav_B_C_Weapons_MAAWS_MAAWSAssistant_F"; class CustomAttributes { @@ -1650,10 +1650,10 @@ class items { dynamicSimulation=1; }; - id=502; + id=466; }; }; - id=500; + id=464; }; class Item5 { @@ -1667,7 +1667,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-0.32763672,1.7828913,11.92041}; + position[]={-0.328125,1.7828913,11.919434}; }; side="Empty"; flags=4; @@ -1678,7 +1678,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=513; + id=477; type="rhsusf_m1152_rsv_usarmy_wd"; class CustomAttributes { @@ -1703,7 +1703,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.3125,1.7822218,2.7641602}; + position[]={13.312012,1.7822218,2.7631836}; }; side="Empty"; flags=4; @@ -1715,7 +1715,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=514; + id=478; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -2034,7 +2034,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.7456055,1.7822218,-7.2568359}; + position[]={2.7451172,1.7822218,-7.2578125}; }; side="Empty"; flags=4; @@ -2046,7 +2046,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=515; + id=479; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -2365,7 +2365,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-3.1875,1.7822218,-8.0693359}; + position[]={-3.1879883,1.7822218,-8.0703125}; }; side="Empty"; flags=4; @@ -2377,7 +2377,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=516; + id=480; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -2696,7 +2696,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-12.934082,1.7822218,-8.2802734}; + position[]={-12.93457,1.7822218,-8.28125}; }; side="Empty"; flags=4; @@ -2708,7 +2708,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=517; + id=481; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -3027,7 +3027,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-3.1386719,1.7822218,2.7421875}; + position[]={-3.1391602,1.7822218,2.7412109}; }; side="Empty"; flags=4; @@ -3039,7 +3039,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=518; + id=482; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -3358,7 +3358,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-12.929688,1.7822218,3.2373047}; + position[]={-12.930176,1.7822218,3.2363281}; }; side="Empty"; flags=4; @@ -3370,7 +3370,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=519; + id=483; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -3689,7 +3689,7 @@ class items dataType="Object"; class PositionInfo { - position[]={2.8476563,1.7822218,1.9248047}; + position[]={2.847168,1.7822218,1.9238281}; }; side="Empty"; flags=4; @@ -3701,7 +3701,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=520; + id=484; type="rhsusf_m1165a1_gmv_m2_m240_socom_d"; class CustomAttributes { @@ -4020,7 +4020,7 @@ class items dataType="Object"; class PositionInfo { - position[]={12.930664,1.7822218,-8.0175781}; + position[]={12.930176,1.7822218,-8.0185547}; }; side="Empty"; flags=4; @@ -4032,7 +4032,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=521; + id=485; type="rhsusf_m1165a1_gmv_mk19_m240_socom_d"; class CustomAttributes { @@ -4347,6 +4347,6 @@ class items }; }; }; - id=512; + id=476; }; }; diff --git a/Compositions/4.ATLAS_Platoon/composition.sqe b/Compositions/4.ATLAS_Platoon/composition.sqe index 072d1617a..4fe4c6aeb 100644 --- a/Compositions/4.ATLAS_Platoon/composition.sqe +++ b/Compositions/4.ATLAS_Platoon/composition.sqe @@ -1,5 +1,5 @@ version=54; -center[]={6469.0635,4.9999995,864.81848}; +center[]={794.17871,4.9999995,6039.6216}; class items { items=3; @@ -29,7 +29,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-1.8383789,0.0014395714,9.5146484}; + position[]={-1.8756714,0.0014395714,10.393066}; }; side="West"; flags=7; @@ -40,7 +40,7 @@ class items description="Platoon Leader@ATLAS-6"; isPlayable=1; }; - id=287; + id=490; type="Cav_B_C_PlatoonLeader_Bandit_6_F"; class CustomAttributes { @@ -78,10 +78,10 @@ class items { dynamicSimulation=1; }; - id=286; + id=489; }; }; - id=285; + id=488; }; class Item1 { @@ -89,7 +89,7 @@ class items name="ATLAS Platoon Sergeant"; class Entities { - items=4; + items=2; class Item0 { dataType="Group"; @@ -102,7 +102,7 @@ class items dataType="Object"; class PositionInfo { - position[]={0.19140625,0.0014395714,9.4978027}; + position[]={0.15411377,0.0014395714,10.376465}; }; side="West"; flags=7; @@ -113,7 +113,7 @@ class items description="Platoon Sergeant@ATLAS-5"; isPlayable=1; }; - id=290; + id=493; type="Cav_B_C_PlatoonSergeant_Bandit_5_F"; class CustomAttributes { @@ -151,229 +151,23 @@ class items { dynamicSimulation=1; }; - id=289; + id=492; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={1.5893555,1.8048949,18.377197}; - }; - side="Empty"; - flags=4; - class Attributes - { - textures="rhs_woodland"; - reportRemoteTargets=1; - receiveRemoteTargets=1; - reportOwnPosition=1; - }; - id=293; - type="rhsusf_m1151_m2crows_usmc_wd"; - class CustomAttributes - { - class Attribute0 - { - property="ammoBox"; - expression="[_this,_value] call bis_fnc_initAmmoBox;"; - class Value - { - class data - { - singleType="STRING"; - value="[[[[],[]],[[],[]],[[],[]],[[],[]]],false]"; - }; - }; - }; - nAttributes=1; - }; - }; - class Item2 - { - dataType="Object"; - class PositionInfo - { - position[]={-2.5634766,3.1061692,17.384277}; - }; - side="Empty"; - flags=4; - class Attributes - { - textures="rhs_woodland"; - }; - id=292; - type="rhsusf_M1238A1_M2_socom_d"; - class CustomAttributes - { - class Attribute0 - { - property="VehicleCustomization"; - expression="if (local _this) then {([_this] + _value + [true]) call (uinamespace getvariable 'BIS_fnc_initVehicle')};"; - class Value - { - class data - { - singleType="ARRAY"; - class value - { - items=2; - class Item0 - { - class data - { - singleType="ARRAY"; - class value - { - items=2; - class Item0 - { - class data - { - singleType="STRING"; - value="rhs_woodland"; - }; - }; - class Item1 - { - class data - { - singleType="SCALAR"; - value=1; - }; - }; - }; - }; - }; - class Item1 - { - class data - { - singleType="ARRAY"; - class value - { - items=12; - class Item0 - { - class data - { - singleType="STRING"; - value="DUKE_Hide"; - }; - }; - class Item1 - { - class data - { - singleType="SCALAR"; - value=0; - }; - }; - class Item2 - { - class data - { - singleType="STRING"; - value="hide_rhino"; - }; - }; - class Item3 - { - class data - { - singleType="SCALAR"; - value=1; - }; - }; - class Item4 - { - class data - { - singleType="STRING"; - value="hide_spare"; - }; - }; - class Item5 - { - class data - { - singleType="SCALAR"; - value=1; - }; - }; - class Item6 - { - class data - { - singleType="STRING"; - value="hide_ammoboxes"; - }; - }; - class Item7 - { - class data - { - singleType="SCALAR"; - value=1; - }; - }; - class Item8 - { - class data - { - singleType="STRING"; - value="hide_towbar"; - }; - }; - class Item9 - { - class data - { - singleType="SCALAR"; - value=0; - }; - }; - class Item10 - { - class data - { - singleType="STRING"; - value="hide_srchlight_cvr"; - }; - }; - class Item11 - { - class data - { - singleType="SCALAR"; - value=0; - }; - }; - }; - }; - }; - }; - }; - }; - }; - nAttributes=1; - }; - }; - class Item3 - { - dataType="Object"; - class PositionInfo - { - position[]={-0.79003906,0.89242315,11.768799}; + position[]={-0.82769775,0.89242315,12.647461}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Atlas"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Atlas"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=291; + id=496; type="B_supplyCrate_F"; class CustomAttributes { @@ -420,10 +214,10 @@ class items }; }; }; - id=288; + id=491; }; }; - id=284; + id=487; }; class Item1 { @@ -451,7 +245,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.783691,0.0014395714,0.88140869}; + position[]={11.746399,0.0014395714,1.7597656}; angles[]={0,4.6955252,0}; }; side="West"; @@ -463,7 +257,7 @@ class items description="Medical Team Leader@ATLAS-1"; isPlayable=1; }; - id=298; + id=500; type="Cav_B_B_Atlas_Medic_TeamLeader_3_1_F"; class CustomAttributes { @@ -527,7 +321,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.75,0.0014395714,2.8811646}; + position[]={11.712708,0.0014395714,3.7597656}; angles[]={0,4.6955252,0}; }; side="West"; @@ -539,7 +333,7 @@ class items description="Medical Team Member"; isPlayable=1; }; - id=299; + id=501; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -603,7 +397,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.766602,0.0014395714,1.914856}; + position[]={13.729309,0.0014395714,2.793457}; angles[]={0,4.6955252,0}; }; side="West"; @@ -615,7 +409,7 @@ class items description="Medical Team Member"; isPlayable=1; }; - id=300; + id=502; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -679,7 +473,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.73291,0.0014395714,3.9146118}; + position[]={13.695618,0.0014395714,4.7929688}; angles[]={0,4.6955252,0}; }; side="West"; @@ -691,7 +485,7 @@ class items description="Medical Team Member"; isPlayable=1; }; - id=301; + id=503; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -755,14 +549,14 @@ class items { dynamicSimulation=1; }; - id=297; + id=499; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={14.371094,1.9449997,-5.6547241}; + position[]={14.333801,1.9449997,-4.7763672}; }; side="Empty"; flags=4; @@ -771,7 +565,7 @@ class items init="this setVariable [""cScripts_vehicle_type"", ""MED"", true];"; dynamicSimulation=1; }; - id=304; + id=504; type="rhsusf_m998_w_2dr_fulltop"; class CustomAttributes { @@ -822,7 +616,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.3134766,2.6142893,-4.5988159}; + position[]={3.2761841,2.6142893,-3.7202148}; }; side="Empty"; flags=4; @@ -830,7 +624,7 @@ class items { dynamicSimulation=1; }; - id=303; + id=505; type="cav_dragoon_Unarmed_WD"; class CustomAttributes { @@ -855,14 +649,14 @@ class items dataType="Object"; class PositionInfo { - position[]={9.5878906,3.0851159,-6.2460327}; + position[]={9.5505981,3.0851159,-5.3676758}; }; side="Empty"; flags=4; class Attributes { }; - id=302; + id=506; type="rhsusf_M1230a1_usarmy_wd"; class CustomAttributes { @@ -887,17 +681,17 @@ class items dataType="Object"; class PositionInfo { - position[]={8.965332,0.89242315,1.8372192}; + position[]={8.9280396,0.89242315,2.7158203}; angles[]={-0,1.5768372,0}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Atlas"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Atlas"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=296; + id=507; type="B_supplyCrate_F"; class CustomAttributes { @@ -944,7 +738,7 @@ class items }; }; }; - id=295; + id=498; }; class Item1 { @@ -965,7 +759,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3549805,0.0014395714,2.9963989}; + position[]={6.317688,0.0014395714,3.875}; angles[]={0,1.5768372,0}; }; side="West"; @@ -977,7 +771,7 @@ class items description="Medical Team Leader@ATLAS-2"; isPlayable=1; }; - id=307; + id=510; type="Cav_B_B_Atlas_Medic_TeamLeader_3_2_F"; class CustomAttributes { @@ -1041,7 +835,7 @@ class items dataType="Object"; class PositionInfo { - position[]={6.3427734,0.0014395714,0.99639893}; + position[]={6.305481,0.0014395714,1.875}; angles[]={0,1.5768372,0}; }; side="West"; @@ -1053,7 +847,7 @@ class items description="Medical Team Member"; isPlayable=1; }; - id=308; + id=511; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -1117,7 +911,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3369141,0.0014395714,0.0083618164}; + position[]={4.2996216,0.0014395714,0.88671875}; angles[]={0,1.5768372,0}; }; side="West"; @@ -1129,7 +923,7 @@ class items description="Medical Team Member"; isPlayable=1; }; - id=309; + id=512; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -1193,7 +987,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3491211,0.0014395714,2.0083618}; + position[]={4.3118286,0.0014395714,2.8867188}; angles[]={0,1.5768372,0}; }; side="West"; @@ -1205,7 +999,7 @@ class items description="Medical Team Member"; isPlayable=1; }; - id=310; + id=513; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -1269,14 +1063,14 @@ class items { dynamicSimulation=1; }; - id=306; + id=509; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={14.328613,1.9449997,-14.541931}; + position[]={14.291321,1.9449997,-13.663574}; }; side="Empty"; flags=4; @@ -1285,7 +1079,7 @@ class items init="this setVariable [""cScripts_vehicle_type"", ""MED"", true];"; dynamicSimulation=1; }; - id=311; + id=514; type="rhsusf_m998_w_2dr_fulltop"; class CustomAttributes { @@ -1336,7 +1130,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.3413086,2.6142893,-15.449646}; + position[]={3.3040161,2.6142893,-14.571289}; }; side="Empty"; flags=4; @@ -1344,7 +1138,7 @@ class items { dynamicSimulation=1; }; - id=312; + id=515; type="cav_dragoon_Unarmed_WD"; class CustomAttributes { @@ -1369,14 +1163,14 @@ class items dataType="Object"; class PositionInfo { - position[]={9.6713867,3.0851159,-15.045593}; + position[]={9.6340942,3.0851159,-14.166992}; }; side="Empty"; flags=4; class Attributes { }; - id=313; + id=516; type="rhsusf_M1230a1_usarmy_wd"; class CustomAttributes { @@ -1397,10 +1191,10 @@ class items }; }; }; - id=305; + id=508; }; }; - id=294; + id=497; }; class Item2 { @@ -1428,7 +1222,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.3237305,0.0014395714,-0.3727417}; + position[]={-6.3610229,0.0014395714,0.50585938}; angles[]={0,4.7879443,0}; }; side="West"; @@ -1440,7 +1234,7 @@ class items description="Logistics Team Leader@ATLAS-3"; isPlayable=1; }; - id=337; + id=520; type="Cav_B_B_Atlas_Medic_TeamLeader_3_1_F"; class CustomAttributes { @@ -1517,7 +1311,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.1733398,0.0014395714,1.6213989}; + position[]={-6.2106323,0.0014395714,2.5}; angles[]={0,4.7879391,0}; }; side="West"; @@ -1529,7 +1323,7 @@ class items description="Logistics Team Member"; isPlayable=1; }; - id=338; + id=521; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -1606,7 +1400,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.2539063,0.0014395714,0.47344971}; + position[]={-4.2911987,0.0014395714,1.3520508}; angles[]={0,4.7879391,0}; }; side="West"; @@ -1618,7 +1412,7 @@ class items description="Logistics Team Member"; isPlayable=1; }; - id=339; + id=522; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -1695,7 +1489,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-4.1035156,0.0014395714,2.4673462}; + position[]={-4.1408081,0.0014395714,3.3457031}; angles[]={0,4.7879443,0}; }; side="West"; @@ -1707,7 +1501,7 @@ class items description="Logistics Team Member"; isPlayable=1; }; - id=340; + id=523; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -1784,14 +1578,14 @@ class items { dynamicSimulation=1; }; - id=336; + id=519; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={-6.6743164,2.0752864,-18.628601}; + position[]={-6.7116089,2.0752864,-17.75}; }; side="Empty"; flags=4; @@ -1802,7 +1596,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=341; + id=524; type="rhsusf_stryker_m1132_m2_wd"; class CustomAttributes { @@ -2391,7 +2185,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-6.3432617,3.2261033,-6.7362671}; + position[]={-6.3805542,3.2261033,-5.8579102}; }; side="Empty"; flags=4; @@ -2400,9 +2194,9 @@ class items textures="rhs_woodland"; dynamicSimulation=1; }; - id=342; + id=525; type="rhsusf_M1239_M2_Deploy_socom_d"; - atlOffset=-4.7683716e-007; + atlOffset=-4.7683716e-07; class CustomAttributes { class Attribute0 @@ -2609,17 +2403,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-9.2792969,0.89242315,0.78277588}; + position[]={-9.3165894,0.89242315,1.6611328}; angles[]={-0,1.5697142,0}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Atlas"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Atlas"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; dynamicSimulation=1; }; - id=335; + id=526; type="B_supplyCrate_F"; class CustomAttributes { @@ -2666,7 +2460,7 @@ class items }; }; }; - id=334; + id=518; }; class Item1 { @@ -2687,7 +2481,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-12.351563,0.0014395714,2.3855591}; + position[]={-12.388855,0.0014395714,3.2641602}; angles[]={0,1.5391899,0}; }; side="West"; @@ -2699,7 +2493,7 @@ class items description="FARP Team Leader@ATLAS-4"; isPlayable=1; }; - id=345; + id=529; type="Cav_B_B_Atlas_Medic_TeamLeader_3_1_F"; class CustomAttributes { @@ -2776,7 +2570,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-12.288574,0.0014395714,0.38653564}; + position[]={-12.325867,0.0014395714,1.2651367}; angles[]={0,1.5391885,0}; }; side="West"; @@ -2788,7 +2582,7 @@ class items description="FARP Team Member"; isPlayable=1; }; - id=346; + id=530; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -2865,7 +2659,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-14.319336,0.0014395714,1.3225708}; + position[]={-14.356628,0.0014395714,2.2011719}; angles[]={0,1.5391885,0}; }; side="West"; @@ -2877,7 +2671,7 @@ class items description="FARP Team Member"; isPlayable=1; }; - id=347; + id=531; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -2954,7 +2748,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-14.255859,0.0014395714,-0.67596436}; + position[]={-14.293152,0.0014395714,0.20263672}; angles[]={0,1.5391885,0}; }; side="West"; @@ -2966,7 +2760,7 @@ class items description="FARP Team Member"; isPlayable=1; }; - id=348; + id=532; type="Cav_B_B_Atlas_Medic_CombatMedic_F"; class CustomAttributes { @@ -3043,14 +2837,14 @@ class items { dynamicSimulation=1; }; - id=344; + id=528; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={-12.527832,2.0752864,-18.501892}; + position[]={-12.565125,2.0752864,-17.623535}; }; side="Empty"; flags=4; @@ -3061,7 +2855,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=350; + id=533; type="rhsusf_stryker_m1132_m2_wd"; class CustomAttributes { @@ -3650,7 +3444,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-12.694824,3.2261033,-7.0265503}; + position[]={-12.732117,3.2261033,-6.1479492}; }; side="Empty"; flags=4; @@ -3659,9 +3453,9 @@ class items textures="rhs_woodland"; dynamicSimulation=1; }; - id=349; + id=534; type="rhsusf_M1239_M2_Deploy_socom_d"; - atlOffset=-4.7683716e-007; + atlOffset=-4.7683716e-07; class CustomAttributes { class Attribute0 @@ -3864,9 +3658,9 @@ class items }; }; }; - id=343; + id=527; }; }; - id=333; + id=517; }; }; diff --git a/Compositions/6.Cav_Rotary_Aviation/composition.sqe b/Compositions/6.Cav_Rotary_Aviation/composition.sqe index aa2d27b94..a94e87e06 100644 --- a/Compositions/6.Cav_Rotary_Aviation/composition.sqe +++ b/Compositions/6.Cav_Rotary_Aviation/composition.sqe @@ -1,12 +1,12 @@ version=54; -center[]={7647.748,5,5494.9014}; +center[]={790.24005,5,6043.4009}; class items { items=3; class Item0 { dataType="Layer"; - name="Attack Rotary"; + name="1.Attack Rotary"; class Entities { items=3; @@ -29,17 +29,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-26.162598,0.89242268,26.549316}; + position[]={-26.158203,0.89242268,26.549316}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=263; + id=555; type="B_supplyCrate_F"; class CustomAttributes { @@ -64,7 +64,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-18.027832,2.3659716,22.47168}; + position[]={-18.023438,2.3659716,22.47168}; }; side="Empty"; flags=4; @@ -75,7 +75,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=264; + id=556; type="RHS_AH64D_wd"; }; class Item2 @@ -90,7 +90,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-23.754395,0.0014390945,24.465332}; + position[]={-23.75,0.0014390945,24.465332}; }; side="West"; flags=7; @@ -102,7 +102,7 @@ class items description="Pilot@RAIDER-1"; isPlayable=1; }; - id=266; + id=558; type="Cav_B_A_Helicopter_Att_Pilot_Raider_1_F"; class CustomAttributes { @@ -153,7 +153,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-22.754883,0.0014390945,24.465332}; + position[]={-22.750488,0.0014390945,24.465332}; }; side="West"; flags=5; @@ -165,7 +165,7 @@ class items description="Co-Pilot@RAIDER-1"; isPlayable=1; }; - id=267; + id=559; type="Cav_B_A_Helicopter_Att_coPilot_F"; class CustomAttributes { @@ -216,10 +216,10 @@ class items { dynamicSimulation=1; }; - id=265; + id=557; }; }; - id=262; + id=554; }; class Item1 { @@ -233,7 +233,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-32.904785,2.3659716,23.424805}; + position[]={-32.900391,2.3659716,23.424805}; }; side="Empty"; flags=4; @@ -244,7 +244,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=269; + id=561; type="RHS_AH64D_wd"; }; class Item1 @@ -259,7 +259,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-29.10791,0.0014390945,24.934082}; + position[]={-29.103516,0.0014390945,24.934082}; }; side="West"; flags=7; @@ -271,7 +271,7 @@ class items description="Pilot@RAIDER-2"; isPlayable=1; }; - id=271; + id=563; type="Cav_B_A_Helicopter_Att_Pilot_Raider_2_F"; class CustomAttributes { @@ -322,7 +322,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-28.10791,0.0014390945,24.934082}; + position[]={-28.103516,0.0014390945,24.934082}; }; side="West"; flags=5; @@ -334,7 +334,7 @@ class items description="Co-Pilot@RAIDER-2"; isPlayable=1; }; - id=272; + id=564; type="Cav_B_A_Helicopter_Att_coPilot_F"; class CustomAttributes { @@ -385,25 +385,25 @@ class items { dynamicSimulation=1; }; - id=270; + id=562; }; }; - id=268; + id=560; }; class Item2 { dataType="Comment"; class PositionInfo { - position[]={-26.578613,5.777462,25.928223}; + position[]={-26.574219,5.777462,25.928223}; }; title="Rotary Attack (Tooltip)"; description="The Apache functions much differently compared to what you may think attack rotary does. This is a glass cannon. It uses ATGMs and it's cannon from stand-off distances to achieve effects. These can also function largely without a JTAC and are much easier for a PLTHQ to call for fire if needed compared to Fixed Wing Attack. The Apaches can also theoretically be Airborne Forward Air Controllers (FAC-A) but it's usually not recommended depending on scale."; - id=273; + id=565; atlOffset=5.777462; }; }; - id=261; + id=553; atlOffset=2.888731; }; class Item1 @@ -425,7 +425,7 @@ class items dataType="Object"; class PositionInfo { - position[]={22.712891,2.024261,-24.996582}; + position[]={22.717285,2.024261,-24.996582}; angles[]={-0,0.0050614546,0}; }; side="Empty"; @@ -437,7 +437,7 @@ class items reportOwnPosition=1; pylons="VTX_4Rnd_ACE_Hellfire_AGM114K;VTX_M230_Chaingun_R;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;VTX_PylonRack_M261_DAGR;VTX_PylonRack_M261_M229;;"; }; - id=276; + id=568; type="vtx_MH60M_DAP_MLASS"; class CustomAttributes { @@ -802,7 +802,7 @@ class items dataType="Object"; class PositionInfo { - position[]={15.868652,0.0014390945,-22.69043}; + position[]={15.873047,0.0014390945,-22.69043}; }; side="West"; flags=6; @@ -814,7 +814,7 @@ class items description="DAP Pilot@BISON-1"; isPlayable=1; }; - id=278; + id=570; type="Cav_B_A_Helicopter_Tra_Pilot_F"; class CustomAttributes { @@ -865,7 +865,7 @@ class items dataType="Object"; class PositionInfo { - position[]={17.310547,0.0014390945,-22.76416}; + position[]={17.314941,0.0014390945,-22.76416}; }; side="West"; flags=5; @@ -875,7 +875,7 @@ class items description="Co-Pilot@BISON-1"; isPlayable=1; }; - id=279; + id=571; type="Cav_B_A_Helicopter_Tra_Pilot_F"; class CustomAttributes { @@ -913,10 +913,10 @@ class items { dynamicSimulation=1; }; - id=277; + id=569; }; }; - id=275; + id=567; }; class Item1 { @@ -930,17 +930,17 @@ class items dataType="Object"; class PositionInfo { - position[]={14.109375,0.89242458,-20.307129}; + position[]={14.11377,0.89242458,-20.307129}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=281; + id=573; type="B_supplyCrate_F"; atlOffset=1.9073486e-06; class CustomAttributes @@ -966,7 +966,7 @@ class items dataType="Object"; class PositionInfo { - position[]={5.8964844,2.024261,-24.479004}; + position[]={5.9008789,2.024261,-24.479004}; angles[]={-0,0.0050614546,0}; }; side="Empty"; @@ -978,7 +978,7 @@ class items reportOwnPosition=1; pylons="VTX_4Rnd_ACE_Hellfire_AGM114K;VTX_M230_Chaingun_R;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;VTX_PylonRack_M261_DAGR;VTX_PylonRack_M261_M229;;"; }; - id=282; + id=574; type="vtx_MH60M_DAP_MLASS"; class CustomAttributes { @@ -1343,7 +1343,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.099609,0.0014390945,-22.48291}; + position[]={10.104004,0.0014390945,-22.48291}; }; side="West"; flags=6; @@ -1355,7 +1355,7 @@ class items description="DAP Pilot@BISON-2"; isPlayable=1; }; - id=284; + id=576; type="Cav_B_A_Helicopter_Tra_Pilot_F"; class CustomAttributes { @@ -1406,7 +1406,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.985352,0.0014390945,-22.638672}; + position[]={10.989746,0.0014390945,-22.638672}; }; side="West"; flags=5; @@ -1416,7 +1416,7 @@ class items description="Co-Pilot@BISON-2"; isPlayable=1; }; - id=285; + id=577; type="Cav_B_A_Helicopter_Tra_Pilot_F"; class CustomAttributes { @@ -1467,10 +1467,10 @@ class items { dynamicSimulation=1; }; - id=283; + id=575; }; }; - id=280; + id=572; atlOffset=4.7683716e-07; }; class Item2 @@ -1478,15 +1478,15 @@ class items dataType="Comment"; class PositionInfo { - position[]={14.791016,5.777462,-30.57373}; + position[]={14.79541,5.777462,-30.57373}; }; title="Rotary Hybrid (Tooltip)"; description="While the DAPs can transport infantry, it is NOT their primary purpose. The DAPs provide a great option for escort with MH-60s due to being pretty much the same bird, and you can also flex additional personnel on here if needed. Think about using this if the mission calls for closer support and less armor-focused when comparing to the AH-64. This isn't going to replace CAS, it works great for escort of the birds, but that's it. It's going to struggle to deal with large concentrations of OPFOR."; - id=286; + id=578; atlOffset=5.777462; }; }; - id=274; + id=566; atlOffset=2.888731; }; class Item2 @@ -1508,7 +1508,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-19.187988,1.9401751,2.6352539}; + position[]={-19.183594,1.9401751,2.6352539}; }; side="Empty"; flags=4; @@ -1519,7 +1519,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=289; + id=581; type="RHS_MELB_AH6M"; class CustomAttributes { @@ -1564,7 +1564,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-23.135254,0.0014410019,5.3540039}; + position[]={-23.130859,0.0014410019,5.3540039}; angles[]={-0,0.019358397,0}; }; side="West"; @@ -1577,7 +1577,7 @@ class items description="Pilot@SPARROW-1"; isPlayable=1; }; - id=291; + id=583; type="Cav_B_A_Helicopter_Att_Pilot_F"; atlOffset=1.9073486e-06; class CustomAttributes @@ -1629,7 +1629,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-21.629883,0.0014390945,5.0473633}; + position[]={-21.625488,0.0014390945,5.0473633}; angles[]={-0,0.019355701,0}; }; side="West"; @@ -1642,7 +1642,7 @@ class items description="Co-Pilot@SPARROW-1"; isPlayable=1; }; - id=292; + id=584; type="Cav_B_A_Helicopter_Att_Pilot_F"; class CustomAttributes { @@ -1693,11 +1693,11 @@ class items { dynamicSimulation=1; }; - id=290; + id=582; atlOffset=1.9073486e-06; }; }; - id=288; + id=580; atlOffset=9.5367432e-07; }; class Item1 @@ -1712,18 +1712,18 @@ class items dataType="Object"; class PositionInfo { - position[]={-24.723145,0.89242458,7.8950195}; + position[]={-24.71875,0.89242458,7.8950195}; angles[]={-0,3.1415925,0}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=294; + id=586; type="B_supplyCrate_F"; atlOffset=1.9073486e-06; class CustomAttributes @@ -1749,7 +1749,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-29.687988,1.9401751,2.6352539}; + position[]={-29.683594,1.9401751,2.6352539}; }; side="Empty"; flags=4; @@ -1760,7 +1760,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=295; + id=587; type="RHS_MELB_AH6M"; class CustomAttributes { @@ -1805,7 +1805,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-27.053223,0.0014390945,5.4926758}; + position[]={-27.048828,0.0014390945,5.4926758}; angles[]={-0,0.016603449,0}; }; side="West"; @@ -1818,7 +1818,7 @@ class items description="Pilot@SPARROW-2"; isPlayable=1; }; - id=297; + id=589; type="Cav_B_A_Helicopter_Att_Pilot_F"; class CustomAttributes { @@ -1869,7 +1869,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-25.962891,0.0014390945,5.3852539}; + position[]={-25.958496,0.0014390945,5.3852539}; angles[]={-0,0.019355701,0}; }; side="West"; @@ -1882,7 +1882,7 @@ class items description="Co-Pilot@SPARROW-2"; isPlayable=1; }; - id=298; + id=590; type="Cav_B_A_Helicopter_Att_Pilot_F"; class CustomAttributes { @@ -1933,10 +1933,10 @@ class items { dynamicSimulation=1; }; - id=296; + id=588; }; }; - id=293; + id=585; atlOffset=4.7683716e-07; }; class Item2 @@ -1944,25 +1944,25 @@ class items dataType="Comment"; class PositionInfo { - position[]={-24.578613,5.777462,3.9282227}; + position[]={-24.574219,5.777462,3.9282227}; }; title="Rotary Light Attack (Tooltip)"; description="Not as long distance as the AH-64, the AH-6s function closer in reality to Fixed Wing, they come in low and fast, do a run, and get out. They can conversely be used as observation aircraft due to the FLIR camera as well and can pick off targets, but they will go down quite easily due to being entirely open. It's recommended to avoid using these in operations that have armor heavier than BTRs."; - id=299; + id=591; atlOffset=5.777462; }; }; - id=287; + id=579; atlOffset=2.8887315; }; }; - id=387; + id=552; atlOffset=2.888731; }; class Item1 { dataType="Layer"; - name="Service Vehicles"; + name="3.Service Vehicles"; class Entities { items=3; @@ -1971,7 +1971,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-12.105469,1.9255862,5.2563477}; + position[]={-12.101074,1.9255862,5.2563477}; }; side="Empty"; flags=4; @@ -1979,7 +1979,7 @@ class items { dynamicSimulation=1; }; - id=357; + id=593; type="B_Truck_01_ammo_F"; class CustomAttributes { @@ -2017,7 +2017,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-7.1054688,1.9160042,5.2543945}; + position[]={-7.1010742,1.9160042,5.2543945}; }; side="Empty"; flags=4; @@ -2025,7 +2025,7 @@ class items { dynamicSimulation=1; }; - id=358; + id=594; type="B_Truck_01_fuel_F"; class CustomAttributes { @@ -2063,7 +2063,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-2.1054688,2.3134775,5.2543945}; + position[]={-2.1010742,2.3134775,5.2543945}; }; side="Empty"; flags=4; @@ -2071,7 +2071,7 @@ class items { dynamicSimulation=1; }; - id=359; + id=595; type="B_Truck_01_Repair_F"; class CustomAttributes { @@ -2105,12 +2105,12 @@ class items }; }; }; - id=356; + id=592; }; class Item2 { dataType="Layer"; - name="Transport Rotary"; + name="2.Transport Rotary"; class Entities { items=3; @@ -2133,7 +2133,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-18.578613,1.940177,-15.071777}; + position[]={-18.574219,1.940177,-15.071777}; }; side="Empty"; flags=4; @@ -2144,7 +2144,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=302; + id=599; type="RHS_MELB_MH6M"; atlOffset=1.9073486e-06; class CustomAttributes @@ -2190,7 +2190,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-22.555176,0.0014410019,-11.495605}; + position[]={-22.550781,0.0014410019,-11.495605}; }; side="West"; flags=7; @@ -2202,7 +2202,7 @@ class items description="Pilot@RAVEN-1"; isPlayable=1; }; - id=304; + id=601; type="Cav_B_A_Helicopter_Att_Pilot_Raven_1_F"; atlOffset=1.9073486e-06; class CustomAttributes @@ -2254,7 +2254,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-21.554688,0.0014390945,-11.495605}; + position[]={-21.550293,0.0014390945,-11.495605}; }; side="West"; flags=5; @@ -2266,7 +2266,7 @@ class items description="Co-Pilot@RAVEN-1"; isPlayable=1; }; - id=305; + id=602; type="Cav_B_A_Helicopter_Att_coPilot_F"; class CustomAttributes { @@ -2317,11 +2317,11 @@ class items { dynamicSimulation=1; }; - id=303; + id=600; atlOffset=1.9073486e-06; }; }; - id=301; + id=598; atlOffset=1.9073486e-06; }; class Item1 @@ -2336,17 +2336,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-24.043457,0.89242458,-9.284668}; + position[]={-24.039063,0.89242458,-9.284668}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=307; + id=604; type="B_supplyCrate_F"; atlOffset=1.9073486e-06; class CustomAttributes @@ -2372,7 +2372,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-29.578613,1.9401751,-15.071777}; + position[]={-29.574219,1.9401751,-15.071777}; }; side="Empty"; flags=4; @@ -2383,7 +2383,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=308; + id=605; type="RHS_MELB_MH6M"; class CustomAttributes { @@ -2428,7 +2428,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-26.748535,0.0014390945,-10.942871}; + position[]={-26.744141,0.0014390945,-10.942871}; }; side="West"; flags=7; @@ -2440,7 +2440,7 @@ class items description="Pilot@RAVEN-2"; isPlayable=1; }; - id=310; + id=607; type="Cav_B_A_Helicopter_Att_Pilot_Raven_2_F"; class CustomAttributes { @@ -2491,7 +2491,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-25.749023,0.0014390945,-10.942871}; + position[]={-25.744629,0.0014390945,-10.942871}; }; side="West"; flags=5; @@ -2503,7 +2503,7 @@ class items description="Co-Pilot@RAVEN-2"; isPlayable=1; }; - id=311; + id=608; type="Cav_B_A_Helicopter_Att_coPilot_F"; class CustomAttributes { @@ -2554,10 +2554,10 @@ class items { dynamicSimulation=1; }; - id=309; + id=606; }; }; - id=306; + id=603; atlOffset=4.7683716e-07; }; class Item2 @@ -2572,17 +2572,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-24.570801,0.89242458,-23.060059}; + position[]={-24.566406,0.89242458,-23.060059}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=313; + id=610; type="B_supplyCrate_F"; atlOffset=1.9073486e-06; class CustomAttributes @@ -2608,7 +2608,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-30.578613,1.940177,-29.071777}; + position[]={-30.574219,1.940177,-29.071777}; }; side="Empty"; flags=4; @@ -2619,7 +2619,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=314; + id=611; type="RHS_MELB_MH6M"; atlOffset=1.9073486e-06; class CustomAttributes @@ -2665,7 +2665,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-27.150879,0.0014390945,-24.571777}; + position[]={-27.146484,0.0014390945,-24.571777}; }; side="West"; flags=7; @@ -2677,7 +2677,7 @@ class items description="Pilot@RAVEN-3"; isPlayable=1; }; - id=316; + id=613; type="Cav_B_A_Helicopter_Att_Pilot_Raven_3_F"; class CustomAttributes { @@ -2728,7 +2728,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-26.152832,0.0014390945,-24.571777}; + position[]={-26.148438,0.0014390945,-24.571777}; }; side="West"; flags=5; @@ -2740,7 +2740,7 @@ class items description="Co-Pilot@RAVEN-3"; isPlayable=1; }; - id=317; + id=614; type="Cav_B_A_Helicopter_Att_coPilot_F"; class CustomAttributes { @@ -2791,10 +2791,10 @@ class items { dynamicSimulation=1; }; - id=315; + id=612; }; }; - id=312; + id=609; atlOffset=9.5367432e-07; }; class Item3 @@ -2809,7 +2809,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-18.578613,1.940177,-29.571777}; + position[]={-18.574219,1.940177,-29.571777}; }; side="Empty"; flags=4; @@ -2820,7 +2820,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=319; + id=616; type="RHS_MELB_MH6M"; atlOffset=1.9073486e-06; class CustomAttributes @@ -2866,7 +2866,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-22.787598,0.0014410019,-25.347168}; + position[]={-22.783203,0.0014410019,-25.347168}; }; side="West"; flags=7; @@ -2878,7 +2878,7 @@ class items description="Pilot@RAVEN-4"; isPlayable=1; }; - id=321; + id=618; type="Cav_B_A_Helicopter_Att_Pilot_Raven_4_F"; atlOffset=1.9073486e-06; class CustomAttributes @@ -2930,7 +2930,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-21.788086,0.0014390945,-25.34668}; + position[]={-21.783691,0.0014390945,-25.34668}; }; side="West"; flags=5; @@ -2942,7 +2942,7 @@ class items description="Co-Pilot@RAVEN-4"; isPlayable=1; }; - id=322; + id=619; type="Cav_B_A_Helicopter_Att_coPilot_F"; class CustomAttributes { @@ -2993,11 +2993,11 @@ class items { dynamicSimulation=1; }; - id=320; + id=617; atlOffset=1.9073486e-06; }; }; - id=318; + id=615; atlOffset=1.9073486e-06; }; class Item4 @@ -3005,15 +3005,15 @@ class items dataType="Comment"; class PositionInfo { - position[]={-24.36377,5.777462,-16.706543}; + position[]={-24.359375,5.777462,-16.706543}; }; title="Rotary Light Transport (Tooltip)"; description="IOT lift an entire platoon (with 2x 4-man Atlas teams), you will need up to 3 lifts. Separate the squads into one fireteam per bird, SL rides with one team, PL member with the other. You may be able to squeeze one Atlas team in the second lift. Best practice would be to use half a platoon (2 squads) with one 4-man medical team and then bring additional assets along for fun and variety."; - id=323; + id=620; atlOffset=5.777462; }; }; - id=300; + id=597; atlOffset=2.888732; }; class Item1 @@ -3035,7 +3035,7 @@ class items dataType="Object"; class PositionInfo { - position[]={22.507813,2.024261,23.76123}; + position[]={22.512207,2.024261,23.76123}; angles[]={-0,0.0050614546,0}; }; side="Empty"; @@ -3047,7 +3047,7 @@ class items reportOwnPosition=1; pylons=";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"; }; - id=326; + id=623; type="vtx_MH60M"; class CustomAttributes { @@ -3412,7 +3412,7 @@ class items dataType="Object"; class PositionInfo { - position[]={16.60791,0.0014390945,22.714844}; + position[]={16.612305,0.0014390945,22.714844}; }; side="West"; flags=7; @@ -3424,7 +3424,7 @@ class items description="Pilot@BUFFALO-1"; isPlayable=1; }; - id=328; + id=625; type="Cav_B_A_Helicopter_Tra_Pilot_B1_F"; class CustomAttributes { @@ -3488,7 +3488,7 @@ class items dataType="Object"; class PositionInfo { - position[]={17.60791,0.0014390945,22.716797}; + position[]={17.612305,0.0014390945,22.716797}; }; side="West"; flags=5; @@ -3500,7 +3500,7 @@ class items description="Co-Pilot@BUFFALO-1"; isPlayable=1; }; - id=329; + id=626; type="Cav_B_A_Helicopter_Tra_coPilot_F"; class CustomAttributes { @@ -3564,7 +3564,7 @@ class items dataType="Object"; class PositionInfo { - position[]={16.60791,0.0014390945,21.716797}; + position[]={16.612305,0.0014390945,21.716797}; }; side="West"; flags=5; @@ -3575,7 +3575,7 @@ class items description="Crew Chief@BUFFALO-1"; isPlayable=1; }; - id=330; + id=627; type="Cav_B_A_Helicopter_Tra_CrewChief_F"; class CustomAttributes { @@ -3639,7 +3639,7 @@ class items dataType="Object"; class PositionInfo { - position[]={17.60791,0.0014390945,21.716797}; + position[]={17.612305,0.0014390945,21.716797}; }; side="West"; flags=5; @@ -3651,7 +3651,7 @@ class items description="Crew@BUFFALO-1"; isPlayable=1; }; - id=331; + id=628; type="Cav_B_A_Helicopter_Tra_DoorGunner_F"; class CustomAttributes { @@ -3715,10 +3715,10 @@ class items { dynamicSimulation=1; }; - id=327; + id=624; }; }; - id=325; + id=622; }; class Item1 { @@ -3732,7 +3732,7 @@ class items dataType="Object"; class PositionInfo { - position[]={5.7890625,2.024261,22.171387}; + position[]={5.793457,2.024261,22.171387}; angles[]={-0,0.0050614546,0}; }; side="Empty"; @@ -3744,7 +3744,7 @@ class items reportOwnPosition=1; pylons=";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"; }; - id=333; + id=630; type="vtx_MH60M"; class CustomAttributes { @@ -4102,17 +4102,17 @@ class items dataType="Object"; class PositionInfo { - position[]={14.123047,0.89242268,23.614746}; + position[]={14.126953,0.89242268,23.615234}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=334; + id=631; type="B_supplyCrate_F"; class CustomAttributes { @@ -4144,7 +4144,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.167969,0.0014390945,22.542969}; + position[]={10.172363,0.0014390945,22.542969}; }; side="West"; flags=7; @@ -4156,7 +4156,7 @@ class items description="Pilot@BUFFALO-2"; isPlayable=1; }; - id=336; + id=633; type="Cav_B_A_Helicopter_Tra_Pilot_B2_F"; class CustomAttributes { @@ -4220,7 +4220,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.167969,0.0014390945,22.544922}; + position[]={11.172363,0.0014390945,22.544922}; }; side="West"; flags=5; @@ -4232,7 +4232,7 @@ class items description="Co-Pilot@BUFFALO-2"; isPlayable=1; }; - id=337; + id=634; type="Cav_B_A_Helicopter_Tra_coPilot_F"; class CustomAttributes { @@ -4296,7 +4296,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.165527,0.0014390945,21.544922}; + position[]={10.169922,0.0014390945,21.544922}; }; side="West"; flags=5; @@ -4307,7 +4307,7 @@ class items description="Crew Chief@BUFFALO-2"; isPlayable=1; }; - id=338; + id=635; type="Cav_B_A_Helicopter_Tra_CrewChief_F"; class CustomAttributes { @@ -4371,7 +4371,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.167969,0.0014390945,21.544922}; + position[]={11.172363,0.0014390945,21.544922}; }; side="West"; flags=5; @@ -4383,7 +4383,7 @@ class items description="Crew@BUFFALO-2"; isPlayable=1; }; - id=339; + id=636; type="Cav_B_A_Helicopter_Tra_DoorGunner_F"; class CustomAttributes { @@ -4447,10 +4447,10 @@ class items { dynamicSimulation=1; }; - id=335; + id=632; }; }; - id=332; + id=629; }; class Item2 { @@ -4464,7 +4464,7 @@ class items dataType="Object"; class PositionInfo { - position[]={22.277344,2.024261,1.9995117}; + position[]={22.281738,2.024261,1.9995117}; angles[]={-0,0.0050614546,0}; }; side="Empty"; @@ -4476,7 +4476,7 @@ class items reportOwnPosition=1; pylons=";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"; }; - id=341; + id=638; type="vtx_MH60M"; class CustomAttributes { @@ -4841,7 +4841,7 @@ class items dataType="Object"; class PositionInfo { - position[]={16.794922,0.0014390945,2.8725586}; + position[]={16.799316,0.0014390945,2.8725586}; }; side="West"; flags=7; @@ -4853,7 +4853,7 @@ class items description="Pilot@BUFFALO-3"; isPlayable=1; }; - id=343; + id=640; type="Cav_B_A_Helicopter_Tra_Pilot_B3_F"; class CustomAttributes { @@ -4917,7 +4917,7 @@ class items dataType="Object"; class PositionInfo { - position[]={17.794922,0.0014390945,2.8725586}; + position[]={17.799316,0.0014390945,2.8725586}; }; side="West"; flags=5; @@ -4929,7 +4929,7 @@ class items description="Co-Pilot@BUFFALO-3"; isPlayable=1; }; - id=344; + id=641; type="Cav_B_A_Helicopter_Tra_coPilot_F"; class CustomAttributes { @@ -4993,7 +4993,7 @@ class items dataType="Object"; class PositionInfo { - position[]={16.794922,0.0014390945,1.8725586}; + position[]={16.799316,0.0014390945,1.8725586}; }; side="West"; flags=5; @@ -5004,7 +5004,7 @@ class items description="Crew Chief@BUFFALO-3"; isPlayable=1; }; - id=345; + id=642; type="Cav_B_A_Helicopter_Tra_CrewChief_F"; class CustomAttributes { @@ -5068,7 +5068,7 @@ class items dataType="Object"; class PositionInfo { - position[]={17.794922,0.0014390945,1.8725586}; + position[]={17.799316,0.0014390945,1.8725586}; }; side="West"; flags=5; @@ -5080,7 +5080,7 @@ class items description="Crew@BUFFALO-3"; isPlayable=1; }; - id=346; + id=643; type="Cav_B_A_Helicopter_Tra_DoorGunner_F"; class CustomAttributes { @@ -5144,10 +5144,10 @@ class items { dynamicSimulation=1; }; - id=342; + id=639; }; }; - id=340; + id=637; }; class Item3 { @@ -5161,7 +5161,7 @@ class items dataType="Object"; class PositionInfo { - position[]={5.5585938,2.024261,0.40966797}; + position[]={5.5629883,2.024261,0.40966797}; angles[]={-0,0.0050614546,0}; }; side="Empty"; @@ -5173,7 +5173,7 @@ class items reportOwnPosition=1; pylons=";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"; }; - id=348; + id=645; type="vtx_MH60M"; class CustomAttributes { @@ -5531,17 +5531,17 @@ class items dataType="Object"; class PositionInfo { - position[]={14.255859,0.89242268,5.0776367}; + position[]={14.260254,0.89242268,5.0776367}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=349; + id=646; type="B_supplyCrate_F"; class CustomAttributes { @@ -5573,7 +5573,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.759766,0.0014390945,2.4038086}; + position[]={10.76416,0.0014390945,2.4038086}; }; side="West"; flags=7; @@ -5585,7 +5585,7 @@ class items description="Pilot@BUFFALO-4"; isPlayable=1; }; - id=351; + id=648; type="Cav_B_A_Helicopter_Tra_Pilot_B4_F"; class CustomAttributes { @@ -5649,7 +5649,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.759766,0.0014390945,2.4038086}; + position[]={11.76416,0.0014390945,2.4038086}; }; side="West"; flags=5; @@ -5661,7 +5661,7 @@ class items description="Co-Pilot@BUFFALO-4"; isPlayable=1; }; - id=352; + id=649; type="Cav_B_A_Helicopter_Tra_coPilot_F"; class CustomAttributes { @@ -5725,7 +5725,7 @@ class items dataType="Object"; class PositionInfo { - position[]={10.759766,0.0014390945,1.4038086}; + position[]={10.76416,0.0014390945,1.4038086}; }; side="West"; flags=5; @@ -5736,7 +5736,7 @@ class items description="Crew Chief@BUFFALO-4"; isPlayable=1; }; - id=353; + id=650; type="Cav_B_A_Helicopter_Tra_CrewChief_F"; class CustomAttributes { @@ -5800,7 +5800,7 @@ class items dataType="Object"; class PositionInfo { - position[]={11.759766,0.0014390945,1.4038086}; + position[]={11.76416,0.0014390945,1.4038086}; }; side="West"; flags=5; @@ -5812,7 +5812,7 @@ class items description="Crew@BUFFALO-4"; isPlayable=1; }; - id=354; + id=651; type="Cav_B_A_Helicopter_Tra_DoorGunner_F"; class CustomAttributes { @@ -5876,25 +5876,25 @@ class items { dynamicSimulation=1; }; - id=350; + id=647; }; }; - id=347; + id=644; }; class Item4 { dataType="Comment"; class PositionInfo { - position[]={14.917969,5.777462,16.003418}; + position[]={14.922363,5.777462,16.003418}; }; title="Rotary Transport (Tooltip)"; description="These are MH-60Ms, they can lift the entire platoon, but it is going to be tight to have too many additional attachments to the platoon. You may be able to swap for the UH-60M for one more seat per bird, but that's about it. It's also less cool sitting in a seat vs the side of the helicopter... A good rule of thumb is to include some form of Attack Rotary escort with the Serial."; - id=355; + id=652; atlOffset=5.777462; }; }; - id=324; + id=621; atlOffset=2.888731; }; class Item2 @@ -5923,7 +5923,7 @@ class items dataType="Object"; class PositionInfo { - position[]={42.081543,0.0014390945,-2.1982422}; + position[]={42.085938,0.0014390945,-2.1982422}; }; side="West"; flags=7; @@ -5935,7 +5935,7 @@ class items description="Pilot@GRIZZLY-1"; isPlayable=1; }; - id=377; + id=656; type="Cav_B_A_Helicopter_Tra_Pilot_B1_F"; class CustomAttributes { @@ -5999,7 +5999,7 @@ class items dataType="Object"; class PositionInfo { - position[]={43.081543,0.0014390945,-2.1962891}; + position[]={43.085938,0.0014390945,-2.1962891}; }; side="West"; flags=5; @@ -6011,7 +6011,7 @@ class items description="Co-Pilot@GRIZZLY-1"; isPlayable=1; }; - id=378; + id=657; type="Cav_B_A_Helicopter_Tra_coPilot_F"; class CustomAttributes { @@ -6075,7 +6075,7 @@ class items dataType="Object"; class PositionInfo { - position[]={42.081543,0.0014390945,-3.1962891}; + position[]={42.085938,0.0014390945,-3.1962891}; }; side="West"; flags=5; @@ -6086,7 +6086,7 @@ class items description="Crew Chief@GRIZZLY-1"; isPlayable=1; }; - id=379; + id=658; type="Cav_B_A_Helicopter_Tra_CrewChief_F"; class CustomAttributes { @@ -6150,7 +6150,7 @@ class items dataType="Object"; class PositionInfo { - position[]={43.081543,0.0014390945,-3.1962891}; + position[]={43.085938,0.0014390945,-3.1962891}; }; side="West"; flags=5; @@ -6162,7 +6162,7 @@ class items description="Crew@GRIZZLY-1"; isPlayable=1; }; - id=380; + id=659; type="Cav_B_A_Helicopter_Tra_DoorGunner_F"; class CustomAttributes { @@ -6226,24 +6226,24 @@ class items { dynamicSimulation=1; }; - id=376; + id=655; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={39.649902,0.89242268,-1.5029297}; + position[]={39.654297,0.89242268,-1.5029297}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=381; + id=660; type="B_supplyCrate_F"; class CustomAttributes { @@ -6268,7 +6268,7 @@ class items dataType="Object"; class PositionInfo { - position[]={40.148926,2.8099375,18.473633}; + position[]={40.15332,2.8099375,18.473633}; }; side="Empty"; flags=4; @@ -6276,11 +6276,11 @@ class items { reportOwnPosition=1; }; - id=370; + id=661; type="TF373_SOAR_MH47G_No_Rear_Guns"; }; }; - id=390; + id=654; }; class Item1 { @@ -6301,7 +6301,7 @@ class items dataType="Object"; class PositionInfo { - position[]={36.395996,0.0014390945,-2.0336914}; + position[]={36.400391,0.0014390945,-2.0336914}; }; side="West"; flags=7; @@ -6313,7 +6313,7 @@ class items description="Pilot@GRIZZLY-2"; isPlayable=1; }; - id=383; + id=664; type="Cav_B_A_Helicopter_Tra_Pilot_B2_F"; class CustomAttributes { @@ -6377,7 +6377,7 @@ class items dataType="Object"; class PositionInfo { - position[]={37.395996,0.0014390945,-2.0317383}; + position[]={37.400391,0.0014390945,-2.0317383}; }; side="West"; flags=5; @@ -6389,7 +6389,7 @@ class items description="Co-Pilot@GRIZZLY-2"; isPlayable=1; }; - id=384; + id=665; type="Cav_B_A_Helicopter_Tra_coPilot_F"; class CustomAttributes { @@ -6453,7 +6453,7 @@ class items dataType="Object"; class PositionInfo { - position[]={36.393066,0.0014390945,-3.0317383}; + position[]={36.397461,0.0014390945,-3.0317383}; }; side="West"; flags=5; @@ -6464,7 +6464,7 @@ class items description="Crew Chief@GRIZZLY-2"; isPlayable=1; }; - id=385; + id=666; type="Cav_B_A_Helicopter_Tra_CrewChief_F"; class CustomAttributes { @@ -6528,7 +6528,7 @@ class items dataType="Object"; class PositionInfo { - position[]={37.395996,0.0014390945,-3.0317383}; + position[]={37.400391,0.0014390945,-3.0317383}; }; side="West"; flags=5; @@ -6540,7 +6540,7 @@ class items description="Crew@GRIZZLY-2"; isPlayable=1; }; - id=386; + id=667; type="Cav_B_A_Helicopter_Tra_DoorGunner_F"; class CustomAttributes { @@ -6604,14 +6604,14 @@ class items { dynamicSimulation=1; }; - id=382; + id=663; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={39.160645,2.8099375,-23.553223}; + position[]={39.165039,2.8099375,-23.553223}; }; side="Empty"; flags=4; @@ -6619,17 +6619,17 @@ class items { reportOwnPosition=1; }; - id=375; + id=668; type="TF373_SOAR_MH47G_No_Rear_Guns"; }; }; - id=391; + id=662; }; }; - id=389; + id=653; }; }; - id=388; + id=596; atlOffset=1.4443655; }; }; diff --git a/Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe b/Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe index f4f80c1d7..17fd08380 100644 --- a/Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe +++ b/Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe @@ -1,12 +1,12 @@ version=54; -center[]={7646.1812,5,5555.6841}; +center[]={775.47339,5,6042.1978}; class items { items=4; class Item0 { dataType="Layer"; - name="Attack Fixed Wing"; + name="1.Attack Fixed Wing"; class Entities { items=4; @@ -16,13 +16,13 @@ class items name="F/A-18 Hornet (EAGLE)"; class Entities { - items=4; + items=5; class Item0 { dataType="Object"; class PositionInfo { - position[]={-24.79834,2.3150053,-37.660156}; + position[]={-24.801758,2.3150053,-37.750488}; }; side="Empty"; flags=4; @@ -33,7 +33,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=166; + id=672; type="JS_JC_FA18E"; class CustomAttributes { @@ -84,7 +84,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-41.000488,2.3150053,-37.487793}; + position[]={-41.003906,2.3150053,-37.578125}; angles[]={-0,6.2688394,0}; }; side="Empty"; @@ -96,7 +96,7 @@ class items receiveRemoteTargets=1; reportOwnPosition=1; }; - id=167; + id=673; type="JS_JC_FA18E"; class CustomAttributes { @@ -154,7 +154,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-29.493164,0.0014390945,-32.971191}; + position[]={-29.496582,0.0014390945,-33.061523}; angles[]={0,0.019565141,0}; }; side="West"; @@ -167,7 +167,7 @@ class items description="Pilot@EAGLE-1"; isPlayable=1; }; - id=169; + id=675; type="Cav_B_A_Plane_Fighter_Pilot_Hog_1_F"; class CustomAttributes { @@ -217,7 +217,7 @@ class items class Attributes { }; - id=168; + id=674; }; class Item3 { @@ -231,7 +231,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-35.853516,0.0014390945,-32.983398}; + position[]={-35.856934,0.0014390945,-33.07373}; angles[]={0,0.019565141,0}; }; side="West"; @@ -244,7 +244,7 @@ class items description="Pilot@EAGLE-2"; isPlayable=1; }; - id=171; + id=677; type="Cav_B_A_Plane_Fighter_Pilot_Hog_2_F"; class CustomAttributes { @@ -294,10 +294,45 @@ class items class Attributes { }; - id=170; + id=676; + }; + class Item4 + { + dataType="Object"; + class PositionInfo + { + position[]={-32.744141,0.89242268,-31.195313}; + }; + side="Empty"; + flags=4; + class Attributes + { + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; + description="Starter Crate"; + dynamicSimulation=1; + }; + id=696; + type="B_supplyCrate_F"; + class CustomAttributes + { + class Attribute0 + { + property="ammoBox"; + expression="[_this,_value] call bis_fnc_initAmmoBox;"; + class Value + { + class data + { + singleType="STRING"; + value="[[[[""launch_NLAW_F"",""arifle_MX_F"",""arifle_MX_SW_F"",""FirstAidKit""],[1,2,1,10]],[[""30Rnd_65x39_caseless_mag"",""16Rnd_9x21_Mag"",""30Rnd_45ACP_Mag_SMG_01"",""20Rnd_762x51_Mag"",""100Rnd_65x39_caseless_mag"",""1Rnd_HE_Grenade_shell"",""3Rnd_HE_Grenade_shell"",""1Rnd_Smoke_Grenade_shell"",""1Rnd_SmokeGreen_Grenade_shell"",""Chemlight_green"",""Laserbatteries"",""HandGrenade"",""MiniGrenade"",""SmokeShell"",""SmokeShellGreen"",""UGL_FlareWhite_F"",""UGL_FlareGreen_F"",""ACE_SpareBarrel"",""ACE_20Rnd_65x47_Scenar_mag"",""ACE_30Rnd_65x47_Scenar_mag"",""ACE_20Rnd_65_Creedmor_mag"",""ACE_30Rnd_65_Creedmor_mag"",""ACE_10Rnd_762x51_M118LR_Mag"",""ACE_20Rnd_762x51_M118LR_Mag"",""ACE_10Rnd_762x51_Mk316_Mod_0_Mag"",""ACE_20Rnd_762x51_Mk316_Mod_0_Mag"",""ACE_10Rnd_762x51_Mk319_Mod_0_Mag"",""ACE_20Rnd_762x51_Mk319_Mod_0_Mag"",""ACE_20Rnd_762x51_Mag_Tracer"",""ACE_20Rnd_762x51_Mag_Tracer_Dim""],[24,6,6,6,6,3,1,2,2,6,2,6,6,2,2,2,2,2,4,4,4,4,4,4,4,4,4,4,4,4]],[[""Laserdesignator"",""acc_flashlight"",""bipod_01_F_blk"",""ACE_Chemlight_Shield"",""ACE_EarPlugs""],[1,2,1,12,12]],[[""B_Kitbag_mcamo""],[2]]],false]"; + }; + }; + }; + nAttributes=1; + }; }; }; - id=165; + id=671; }; class Item1 { @@ -311,17 +346,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-33.563965,0.89242268,39.99707}; + position[]={-33.567383,0.89242268,39.906738}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=92; + id=679; type="B_supplyCrate_F"; class CustomAttributes { @@ -346,7 +381,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-43.653809,2.479682,46.44043}; + position[]={-43.657227,2.479682,46.350098}; }; side="Empty"; flags=4; @@ -354,7 +389,7 @@ class items { dynamicSimulation=1; }; - id=93; + id=680; type="USAF_F22_EWP_AG"; class CustomAttributes { @@ -379,7 +414,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-23.653809,2.479682,46.94043}; + position[]={-23.657227,2.479682,46.850098}; }; side="Empty"; flags=4; @@ -387,7 +422,7 @@ class items { dynamicSimulation=1; }; - id=94; + id=681; type="USAF_F22_EWP_AG"; class CustomAttributes { @@ -412,11 +447,11 @@ class items dataType="Comment"; class PositionInfo { - position[]={-34.092285,0.036382675,47.645508}; + position[]={-34.095703,0.036382675,47.555176}; }; title="FW Attack ASF (Tooltip)"; description="The F-22A is primarily an air to air intercept fighter. It excels best when it's slick. There's the stock slick version and three variants: EWP-AG, EWP-AA, Heavy. EWP is Enhanced Weapons Package. AG and AA is Air to Ground and Air to Air. Heavy is just outer hardpoints. All three of these variants technically negate the stealth benefits of the F-22. Pilots will pick what they want. Definitely throw some fast air at these guys, they'll love every minute of it."; - id=95; + id=682; atlOffset=0.036382675; }; class Item4 @@ -431,7 +466,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-35.975586,0.0014390945,37.058594}; + position[]={-35.979004,0.0014390945,36.968262}; angles[]={-0,0.019565141,0}; }; side="West"; @@ -444,7 +479,7 @@ class items description="Pilot@RAPTOR-1"; isPlayable=1; }; - id=97; + id=684; type="Cav_B_A_Plane_Fighter_Pilot_F"; class CustomAttributes { @@ -494,7 +529,7 @@ class items class Attributes { }; - id=96; + id=683; }; class Item5 { @@ -508,7 +543,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-31.1875,0.0014390945,37.255859}; + position[]={-31.190918,0.0014390945,37.165527}; angles[]={-0,0.019565141,0}; }; side="West"; @@ -521,7 +556,7 @@ class items description="Pilot@RAPTOR-2"; isPlayable=1; }; - id=99; + id=686; type="Cav_B_A_Plane_Fighter_Pilot_F"; class CustomAttributes { @@ -571,10 +606,10 @@ class items class Attributes { }; - id=98; + id=685; }; }; - id=91; + id=678; atlOffset=0.0045480728; }; class Item2 @@ -583,7 +618,7 @@ class items name="FW Attack Ground (A-10C)"; class Entities { - items=8; + items=7; class Item0 { dataType="Group"; @@ -596,7 +631,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-28.85498,0.0014390945,-15.775391}; + position[]={-28.858398,0.0014390945,-15.865723}; angles[]={0,0.019565141,0}; }; side="West"; @@ -609,7 +644,7 @@ class items description="Pilot@HOG-1"; isPlayable=1; }; - id=102; + id=689; type="Cav_B_A_Plane_Fighter_Pilot_Hog_1_F"; class CustomAttributes { @@ -659,7 +694,7 @@ class items class Attributes { }; - id=101; + id=688; }; class Item1 { @@ -673,7 +708,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-36.932129,0.0014390945,-15.93457}; + position[]={-36.935547,0.0014390945,-16.024902}; angles[]={0,0.019565141,0}; }; side="West"; @@ -686,7 +721,7 @@ class items description="Pilot@HOG-2"; isPlayable=1; }; - id=104; + id=691; type="Cav_B_A_Plane_Fighter_Pilot_Hog_2_F"; class CustomAttributes { @@ -736,14 +771,14 @@ class items class Attributes { }; - id=103; + id=690; }; class Item2 { dataType="Object"; class PositionInfo { - position[]={-22.592285,2.094676,-8.5859375}; + position[]={-22.595703,2.094676,-8.6762695}; }; side="Empty"; flags=4; @@ -751,7 +786,7 @@ class items { dynamicSimulation=1; }; - id=105; + id=692; type="USAF_A10"; }; class Item3 @@ -759,7 +794,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-42.592285,2.094676,-9.0859375}; + position[]={-42.595703,2.094676,-9.1762695}; }; side="Empty"; flags=4; @@ -767,7 +802,7 @@ class items { dynamicSimulation=1; }; - id=106; + id=693; type="USAF_A10"; }; class Item4 @@ -775,17 +810,17 @@ class items dataType="Object"; class PositionInfo { - position[]={-32.92334,0.89242268,-13.419922}; + position[]={-32.926758,0.89242268,-13.510254}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=107; + id=694; type="B_supplyCrate_F"; class CustomAttributes { @@ -810,62 +845,27 @@ class items dataType="Comment"; class PositionInfo { - position[]={-32.88916,0.036382675,-12.615723}; + position[]={-32.892578,0.036382675,-12.706055}; }; title="FW Ground Attack"; description="The A-10 is venerable as one of the ""best"" A2G platforms on the market. There are only two key things here: if we have an A-10 up, there is no enemy fixed wing. A-10s only operate in air superiority environments where we control the skies. That's not to say you can't threaten them with a good time though."; - id=108; + id=695; atlOffset=0.036382675; }; class Item6 - { - dataType="Object"; - class PositionInfo - { - position[]={-32.740723,0.89242268,-31.10498}; - }; - side="Empty"; - flags=4; - class Attributes - { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; - description="Starter Crate"; - dynamicSimulation=1; - }; - id=109; - type="B_supplyCrate_F"; - class CustomAttributes - { - class Attribute0 - { - property="ammoBox"; - expression="[_this,_value] call bis_fnc_initAmmoBox;"; - class Value - { - class data - { - singleType="STRING"; - value="[[[[""launch_NLAW_F"",""arifle_MX_F"",""arifle_MX_SW_F"",""FirstAidKit""],[1,2,1,10]],[[""30Rnd_65x39_caseless_mag"",""16Rnd_9x21_Mag"",""30Rnd_45ACP_Mag_SMG_01"",""20Rnd_762x51_Mag"",""100Rnd_65x39_caseless_mag"",""1Rnd_HE_Grenade_shell"",""3Rnd_HE_Grenade_shell"",""1Rnd_Smoke_Grenade_shell"",""1Rnd_SmokeGreen_Grenade_shell"",""Chemlight_green"",""Laserbatteries"",""HandGrenade"",""MiniGrenade"",""SmokeShell"",""SmokeShellGreen"",""UGL_FlareWhite_F"",""UGL_FlareGreen_F"",""ACE_SpareBarrel"",""ACE_20Rnd_65x47_Scenar_mag"",""ACE_30Rnd_65x47_Scenar_mag"",""ACE_20Rnd_65_Creedmor_mag"",""ACE_30Rnd_65_Creedmor_mag"",""ACE_10Rnd_762x51_M118LR_Mag"",""ACE_20Rnd_762x51_M118LR_Mag"",""ACE_10Rnd_762x51_Mk316_Mod_0_Mag"",""ACE_20Rnd_762x51_Mk316_Mod_0_Mag"",""ACE_10Rnd_762x51_Mk319_Mod_0_Mag"",""ACE_20Rnd_762x51_Mk319_Mod_0_Mag"",""ACE_20Rnd_762x51_Mag_Tracer"",""ACE_20Rnd_762x51_Mag_Tracer_Dim""],[24,6,6,6,6,3,1,2,2,6,2,6,6,2,2,2,2,2,4,4,4,4,4,4,4,4,4,4,4,4]],[[""Laserdesignator"",""acc_flashlight"",""bipod_01_F_blk"",""ACE_Chemlight_Shield"",""ACE_EarPlugs""],[1,2,1,12,12]],[[""B_Kitbag_mcamo""],[2]]],false]"; - }; - }; - }; - nAttributes=1; - }; - }; - class Item7 { dataType="Comment"; class PositionInfo { - position[]={-32.706055,0,-30.300781}; + position[]={-32.709473,0,-30.391113}; }; title="FW Ground Attack"; description="The F/A-18 is used for Carrier Operations. These are often used when we need to for example start off map and done have access to any airfields for a invasion or retrograde."; - id=110; + id=697; }; }; - id=100; - atlOffset=0.0045480728; + id=687; + atlOffset=0.0090956688; }; class Item3 { @@ -886,7 +886,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-36.099609,0.0014390945,9.3120117}; + position[]={-36.103027,0.0014390945,9.2216797}; angles[]={-0,0.019565141,0}; }; side="West"; @@ -899,7 +899,7 @@ class items description="Pilot@LIGHTNING-1"; isPlayable=1; }; - id=113; + id=700; type="Cav_B_A_Plane_Fighter_Pilot_F"; class CustomAttributes { @@ -949,7 +949,7 @@ class items class Attributes { }; - id=112; + id=699; }; class Item1 { @@ -963,7 +963,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-31.311523,0.0014390945,9.5102539}; + position[]={-31.314941,0.0014390945,9.4199219}; angles[]={-0,0.019565141,0}; }; side="West"; @@ -976,7 +976,7 @@ class items description="Pilot@LIGHTNING-2"; isPlayable=1; }; - id=115; + id=702; type="Cav_B_A_Plane_Fighter_Pilot_F"; class CustomAttributes { @@ -1026,24 +1026,24 @@ class items class Attributes { }; - id=114; + id=701; }; class Item2 { dataType="Object"; class PositionInfo { - position[]={-33.664551,0.89242268,12.12793}; + position[]={-33.667969,0.89242268,12.037598}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=116; + id=703; type="B_supplyCrate_F"; class CustomAttributes { @@ -1068,7 +1068,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-23.710938,2.2409725,18.043945}; + position[]={-23.714355,2.2409725,17.953613}; }; side="Empty"; flags=4; @@ -1076,7 +1076,7 @@ class items { dynamicSimulation=1; }; - id=117; + id=704; type="USAF_F35A"; class CustomAttributes { @@ -1101,7 +1101,7 @@ class items dataType="Object"; class PositionInfo { - position[]={-43.710938,2.2409725,17.543945}; + position[]={-43.714355,2.2409725,17.453613}; }; side="Empty"; flags=4; @@ -1109,7 +1109,7 @@ class items { dynamicSimulation=1; }; - id=118; + id=705; type="USAF_F35A"; class CustomAttributes { @@ -1134,25 +1134,25 @@ class items dataType="Comment"; class PositionInfo { - position[]={-34.374023,0.036382675,15.990234}; + position[]={-34.377441,0.036382675,15.899902}; }; title="FW Multirole (Tooltip)"; description="The F-35A is a versatile platform capable of carrying air to air and air to ground ordnance - pick the role you want it to do and stick to it. The F-35A also has an on-board satellite view of the battlespace. Stand-off ordnances from multiple kilometers away are the namesake of the F-35A, but it's capable of everything the A-10C is and more. (Sorry not sorry Suto)"; - id=119; + id=706; atlOffset=0.036382675; }; }; - id=111; + id=698; atlOffset=0.018191338; }; }; - id=173; - atlOffset=0.010801315; + id=670; + atlOffset=0.011938095; }; class Item1 { dataType="Layer"; - name="Drones"; + name="2.Drones"; class Entities { items=2; @@ -1168,7 +1168,7 @@ class items dataType="Object"; class PositionInfo { - position[]={50.212402,1.7847013,46.961426}; + position[]={50.208984,1.7847013,46.871094}; }; side="Empty"; flags=4; @@ -1179,7 +1179,7 @@ class items dynamicSimulation=1; pylons="USAF_PylonRack_2Rnd_AGM114R[0];USAF_PylonRack_4Rnd_GBU53[0];USAF_PylonRack_4Rnd_GBU39[0];USAF_PylonRack_2Rnd_AGM114R[0];"; }; - id=121; + id=709; type="USAF_MQ9"; class CustomAttributes { @@ -1248,7 +1248,7 @@ class items dataType="Object"; class PositionInfo { - position[]={50.145996,0.0014390945,33.265625}; + position[]={50.142578,0.0014390945,33.175293}; }; side="West"; flags=7; @@ -1258,7 +1258,7 @@ class items description="Drone Pilot@REAPER-1"; isPlayable=1; }; - id=123; + id=711; type="Cav_B_A_AirController_F"; class CustomAttributes { @@ -1308,22 +1308,22 @@ class items class Attributes { }; - id=122; + id=710; }; class Item2 { dataType="Comment"; class PositionInfo { - position[]={46.842773,0.036382198,51.960449}; + position[]={46.839355,0.036382198,51.870117}; }; title="FW Drone Attack (Tooltip)"; description="The MQ-9 has a light armament available to it that is mostly Laser guided. All ordnance is capable of tracking and launching from the drone's camera, with little regard on the orientation of the drone (given enough altitude). cTAB tablets have the ability to interface with the drone gunner optics which allows ground force elements instant eyes-on to whatever the drone is seeing."; - id=124; + id=712; atlOffset=0.036382198; }; }; - id=120; + id=708; atlOffset=0.018191338; }; class Item1 @@ -1338,7 +1338,7 @@ class items dataType="Object"; class PositionInfo { - position[]={50.236816,1.8006945,15.17041}; + position[]={50.233398,1.8006945,15.080078}; }; side="Empty"; flags=4; @@ -1347,7 +1347,7 @@ class items init="this setGroupid [""DTHSTR""];"; dynamicSimulation=1; }; - id=126; + id=714; type="USAF_RQ4A"; }; class Item1 @@ -1355,25 +1355,25 @@ class items dataType="Comment"; class PositionInfo { - position[]={50.044922,0.036382198,23.944824}; + position[]={50.041504,0.036382198,23.854492}; }; title="FW Drone Recon (Tooltip)"; description="The RQ-4 can be put in the air on a racetrack pattern and has enough fuel to last an entire 3hr op. If your operation is deemed to be in an area that has BLUFOR having air supremacy, it's a good idea to put one of these in the air at a height of 2500m or higher in a loiter pattern over the AO. Units with cTAB can tap into the drone's turret camera and observe the area for a better perspective, allowing freedom of information to the unit without the need of a middle-man calling out what he sees."; - id=127; + id=715; atlOffset=0.036382198; }; }; - id=125; + id=713; atlOffset=0.018191338; }; }; - id=174; + id=707; atlOffset=0.018191338; }; class Item2 { dataType="Layer"; - name="Transport"; + name="3.Transport"; class Entities { items=2; @@ -1403,7 +1403,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.2739258,0.0014390945,-14.508301}; + position[]={3.2705078,0.0014390945,-14.598633}; }; side="West"; flags=7; @@ -1415,7 +1415,7 @@ class items description="Pilot@TITAN-1"; isPlayable=1; }; - id=131; + id=720; type="Cav_B_A_Plane_Transport_Pilot_Titan_1_F"; class CustomAttributes { @@ -1466,7 +1466,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.2753906,0.0014390945,-14.507813}; + position[]={4.2719727,0.0014390945,-14.598145}; }; side="West"; flags=5; @@ -1478,7 +1478,7 @@ class items description="Co-Pilot@TITAN-1"; isPlayable=1; }; - id=132; + id=721; type="Cav_B_A_Plane_Transport_coPilot_F"; class CustomAttributes { @@ -1528,24 +1528,24 @@ class items class Attributes { }; - id=130; + id=719; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={3.7739258,0.89242268,-12.558594}; + position[]={3.7705078,0.89242268,-12.648926}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=133; + id=722; type="B_supplyCrate_F"; class CustomAttributes { @@ -1570,7 +1570,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.1494141,0.014522076,-24.924316}; + position[]={8.1459961,0.014522076,-25.014648}; }; side="Empty"; flags=4; @@ -1578,11 +1578,11 @@ class items { dynamicSimulation=1; }; - id=134; + id=723; type="USAF_C130J"; }; }; - id=129; + id=718; }; class Item1 { @@ -1596,7 +1596,7 @@ class items dataType="Object"; class PositionInfo { - position[]={51.37793,0.014522076,-61.678223}; + position[]={51.374512,0.014522076,-61.768555}; }; side="Empty"; flags=4; @@ -1604,7 +1604,7 @@ class items { dynamicSimulation=1; }; - id=136; + id=725; type="USAF_C130J"; }; class Item1 @@ -1619,7 +1619,7 @@ class items dataType="Object"; class PositionInfo { - position[]={47.45459,0.0014390945,-53.856445}; + position[]={47.451172,0.0014390945,-53.946777}; }; side="West"; flags=7; @@ -1631,7 +1631,7 @@ class items description="Pilot@TITAN-2"; isPlayable=1; }; - id=138; + id=727; type="Cav_B_A_Plane_Transport_Pilot_Titan_2_F"; class CustomAttributes { @@ -1682,7 +1682,7 @@ class items dataType="Object"; class PositionInfo { - position[]={48.456055,0.0014390945,-53.855957}; + position[]={48.452637,0.0014390945,-53.946289}; }; side="West"; flags=5; @@ -1694,7 +1694,7 @@ class items description="Co-Pilot@TITAN-2"; isPlayable=1; }; - id=139; + id=728; type="Cav_B_A_Plane_Transport_coPilot_F"; class CustomAttributes { @@ -1744,24 +1744,24 @@ class items class Attributes { }; - id=137; + id=726; }; class Item2 { dataType="Object"; class PositionInfo { - position[]={47.87793,0.89242268,-51.083496}; + position[]={47.874512,0.89242268,-51.173828}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=140; + id=729; type="B_supplyCrate_F"; class CustomAttributes { @@ -1782,18 +1782,18 @@ class items }; }; }; - id=135; + id=724; }; class Item2 { dataType="Comment"; class PositionInfo { - position[]={7.012207,0.036382198,-42.356445}; + position[]={7.0087891,0.036382198,-42.446777}; }; title="FW Transport (Tooltip)"; description="The C-130J's from USAF can fit *almost* the entire Bandit Platoon in one C-130J, however, keep in mind that the more bodies in one bird, the longer your DZ or the need to have multiple sticks in one bird and have go-arounds, which means longer time before all troops are in the AO. You won't be able to jump the entirety of the PLT's 11 vehicles with only 2 cargo variants (3 vehicles fit in one C-130J Cargo) so it's recommended to either forego the vehicles or zeus-assist them if you only plan on using the C-130s."; - id=141; + id=730; atlOffset=0.036382198; }; class Item3 @@ -1815,7 +1815,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.3535156,0.0014390945,-52.063965}; + position[]={3.3500977,0.0014390945,-52.154297}; }; side="West"; flags=7; @@ -1827,7 +1827,7 @@ class items description="Pilot@TITAN-3"; isPlayable=1; }; - id=144; + id=733; type="Cav_B_A_Plane_Transport_Pilot_Titan_3_F"; class CustomAttributes { @@ -1878,7 +1878,7 @@ class items dataType="Object"; class PositionInfo { - position[]={4.3544922,0.0014390945,-52.064453}; + position[]={4.3510742,0.0014390945,-52.154785}; }; side="West"; flags=5; @@ -1890,7 +1890,7 @@ class items description="Co-Pilot@TITAN-3"; isPlayable=1; }; - id=145; + id=734; type="Cav_B_A_Plane_Transport_coPilot_F"; class CustomAttributes { @@ -1940,14 +1940,14 @@ class items class Attributes { }; - id=143; + id=732; }; class Item1 { dataType="Object"; class PositionInfo { - position[]={8.4921875,0.014522076,-61.44043}; + position[]={8.4887695,0.014522076,-61.530762}; }; side="Empty"; flags=4; @@ -1955,7 +1955,7 @@ class items { dynamicSimulation=1; }; - id=146; + id=735; type="USAF_C130J_Cargo"; class CustomAttributes { @@ -1980,17 +1980,17 @@ class items dataType="Object"; class PositionInfo { - position[]={3.9785156,0.89242268,-49.779785}; + position[]={3.9750977,0.89242268,-49.870117}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=147; + id=736; type="B_supplyCrate_F"; class CustomAttributes { @@ -2011,7 +2011,7 @@ class items }; }; }; - id=142; + id=731; }; class Item4 { @@ -2025,7 +2025,7 @@ class items dataType="Object"; class PositionInfo { - position[]={50.546387,0.014522076,-25.062988}; + position[]={50.542969,0.014522076,-25.15332}; }; side="Empty"; flags=4; @@ -2033,7 +2033,7 @@ class items { dynamicSimulation=1; }; - id=149; + id=738; type="USAF_C130J_Cargo"; class CustomAttributes { @@ -2065,7 +2065,7 @@ class items dataType="Object"; class PositionInfo { - position[]={46.668945,0.0014390945,-16.068848}; + position[]={46.665527,0.0014390945,-16.15918}; }; side="West"; flags=7; @@ -2077,7 +2077,7 @@ class items description="Pilot@TITAN-4"; isPlayable=1; }; - id=151; + id=740; type="Cav_B_A_Plane_Transport_Pilot_Titan_4_F"; class CustomAttributes { @@ -2128,7 +2128,7 @@ class items dataType="Object"; class PositionInfo { - position[]={47.669434,0.0014390945,-16.069336}; + position[]={47.666016,0.0014390945,-16.159668}; }; side="West"; flags=5; @@ -2140,7 +2140,7 @@ class items description="Co-Pilot@TITAN-4"; isPlayable=1; }; - id=152; + id=741; type="Cav_B_A_Plane_Transport_coPilot_F"; class CustomAttributes { @@ -2190,24 +2190,24 @@ class items class Attributes { }; - id=150; + id=739; }; class Item2 { dataType="Object"; class PositionInfo { - position[]={47.021484,0.89242268,-13.432617}; + position[]={47.018066,0.89242268,-13.522949}; }; side="Empty"; flags=4; class Attributes { - init="call{[this,""Alpha"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Alpha"",true,true,true,false,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; dynamicSimulation=1; }; - id=153; + id=742; type="B_supplyCrate_F"; class CustomAttributes { @@ -2228,10 +2228,10 @@ class items }; }; }; - id=148; + id=737; }; }; - id=128; + id=717; atlOffset=0.0045480728; }; class Item1 @@ -2246,11 +2246,11 @@ class items dataType="Comment"; class PositionInfo { - position[]={10.568359,0,20.811523}; + position[]={10.564941,0,20.721191}; }; title="FW Heavy Transport (Tooltip)"; description="While one C-17 can carry an entire platoon in one transport, keep in mind that the more bodies in one bird, the longer your DZ or the need to have multiple sticks in one bird and have go-arounds, which means longer time before all troops are in the AO. For motorized jumps, the platoon has 11 vehicles. 10 if you forego the Platoon HQ vehicle and have them ride along with the infantry. Each C-17 fits 5 Vehicles. Math."; - id=155; + id=744; }; class Item1 { @@ -2264,7 +2264,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.3500977,3.3578539,31.219238}; + position[]={8.3466797,3.3578539,31.128906}; angles[]={-0,6.2807975,0}; }; side="Empty"; @@ -2273,7 +2273,7 @@ class items { dynamicSimulation=1; }; - id=157; + id=746; type="USAF_C17"; class CustomAttributes { @@ -2294,19 +2294,19 @@ class items }; }; }; - id=156; + id=745; }; }; - id=154; + id=743; }; }; - id=175; + id=716; atlOffset=0.0022740364; }; class Item3 { dataType="Layer"; - name="USAF Service Menu"; + name="4.USAF Service Menu"; class Entities { items=6; @@ -2315,7 +2315,7 @@ class items dataType="Object"; class PositionInfo { - position[]={3.2773438,1.9255862,63.527344}; + position[]={3.2739258,1.9255862,63.437012}; }; side="Empty"; flags=4; @@ -2323,7 +2323,7 @@ class items { dynamicSimulation=1; }; - id=159; + id=748; type="B_Truck_01_ammo_F"; class CustomAttributes { @@ -2361,7 +2361,7 @@ class items dataType="Object"; class PositionInfo { - position[]={8.2773438,1.9160042,63.527344}; + position[]={8.2739258,1.9160042,63.437012}; }; side="Empty"; flags=4; @@ -2369,7 +2369,7 @@ class items { dynamicSimulation=1; }; - id=160; + id=749; type="B_Truck_01_fuel_F"; class CustomAttributes { @@ -2407,7 +2407,7 @@ class items dataType="Object"; class PositionInfo { - position[]={13.277344,2.3134775,63.527344}; + position[]={13.273926,2.3134775,63.437012}; }; side="Empty"; flags=4; @@ -2415,7 +2415,7 @@ class items { dynamicSimulation=1; }; - id=161; + id=750; type="B_Truck_01_Repair_F"; class CustomAttributes { @@ -2453,9 +2453,9 @@ class items dataType="Logic"; class PositionInfo { - position[]={3.2773438,0,73.527344}; + position[]={3.2739258,0,73.437012}; }; - id=162; + id=751; type="USAF_ServiceMenu_moduleAddRearmService"; class CustomAttributes { @@ -2493,9 +2493,9 @@ class items dataType="Logic"; class PositionInfo { - position[]={8.2773438,0,73.527344}; + position[]={8.2739258,0,73.437012}; }; - id=163; + id=752; type="USAF_ServiceMenu_moduleAddRefuelService"; class CustomAttributes { @@ -2520,9 +2520,9 @@ class items dataType="Logic"; class PositionInfo { - position[]={13.277344,0,73.527344}; + position[]={13.273926,0,73.437012}; }; - id=164; + id=753; type="USAF_ServiceMenu_moduleAddRepairService"; class CustomAttributes { @@ -2543,7 +2543,7 @@ class items }; }; }; - id=158; + id=747; }; }; class connections @@ -2558,8 +2558,8 @@ class connections class Item0 { linkID=0; - item0=162; - item1=159; + item0=751; + item1=748; class CustomData { type="Sync"; @@ -2568,8 +2568,8 @@ class connections class Item1 { linkID=1; - item0=163; - item1=160; + item0=752; + item1=749; class CustomData { type="Sync"; @@ -2578,8 +2578,8 @@ class connections class Item2 { linkID=2; - item0=164; - item1=161; + item0=753; + item1=750; class CustomData { type="Sync"; From 99c445d6752a4022b98fa5cc533d3d552c0a532f Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 4 Apr 2024 15:37:05 -0400 Subject: [PATCH 12/58] Missiles removed --- .../functions/vehicle/fn_vehicle_getPylon.sqf | 58 ++++++++++--------- .../fn_vehicle_setupPylonCategories.sqf | 4 +- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 9a90eb417..2864cf174 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -120,46 +120,50 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["antiarmor", [ ["SmokeLauncherMag",[0,0],6], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["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], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["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_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], + // ["SmokeLauncherMag",[0,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], + // ["4Rnd_Titan_long_missiles",[0],4] + // ]], ["default",[ + ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_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_HEI_shells_Tracer_Red",[0],78], + ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]], ["balanced",[ + ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_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], + ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]] ]; diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index 5b7982d66..efdd19e41 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -38,8 +38,8 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dr // TypeOf, DisplayName, Name, Icon ["I_APC_Wheeled_03_cannon_F", "Anti-Personnel (default)", "default", ""], ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], - ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""], - ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] + ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""] + // ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] ]; }; From 8802bc81f3d9f8d67e5aebf310704aefe464e787 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 4 Apr 2024 17:39:15 -0400 Subject: [PATCH 13/58] Remove extra smoke launcher mag --- cScripts/functions/vehicle/fn_vehicle_getPylon.sqf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 2864cf174..bb72fc4bd 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -119,7 +119,6 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ // I_APC_Wheeled_03_cannon_F private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["antiarmor", [ - ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], @@ -132,7 +131,6 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ]], // ["antiair", [ // ["SmokeLauncherMag",[0,0],6], - // ["SmokeLauncherMag",[0,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], @@ -142,7 +140,6 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ // ["4Rnd_Titan_long_missiles",[0],4] // ]], ["default",[ - ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], @@ -154,7 +151,6 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]], ["balanced",[ - ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], From 5eda6bd119588d54a58dab6dfc1e50c36c37a72a Mon Sep 17 00:00:00 2001 From: Zarenx <111392464+Zarenx@users.noreply.github.com> Date: Fri, 5 Apr 2024 20:27:51 +0200 Subject: [PATCH 14/58] Updated MH-47G to the Easy Action version Updated the Alpha composition MH-47G to the MH-47G Easy Action with Rear guns after testing done on WFW and on request from rotary. --- Compositions/6.Cav_Rotary_Aviation/composition.sqe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Compositions/6.Cav_Rotary_Aviation/composition.sqe b/Compositions/6.Cav_Rotary_Aviation/composition.sqe index a94e87e06..3916d2ea7 100644 --- a/Compositions/6.Cav_Rotary_Aviation/composition.sqe +++ b/Compositions/6.Cav_Rotary_Aviation/composition.sqe @@ -6277,7 +6277,7 @@ class items reportOwnPosition=1; }; id=661; - type="TF373_SOAR_MH47G_No_Rear_Guns"; + type="TF373_SOAR_MH47G_EasyActions"; }; }; id=654; @@ -6620,7 +6620,7 @@ class items reportOwnPosition=1; }; id=668; - type="TF373_SOAR_MH47G_No_Rear_Guns"; + type="TF373_SOAR_MH47G_EasyActions"; }; }; id=662; From 80e203a6f5e43f3272d07fc1a0a5773b7e9c380d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 5 Apr 2024 21:32:06 -0400 Subject: [PATCH 15/58] Used cav_dragoon_base_F instead of AAF pandur as class for cScripts functions and fix smoke loading. --- .../vehicle/fn_vehicle_addCosmeticSelection.sqf | 4 ++-- cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf | 2 +- cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf | 2 +- .../vehicle/fn_vehicle_addFunctionsGlobal.sqf | 2 +- cScripts/functions/vehicle/fn_vehicle_addInventory.sqf | 2 +- cScripts/functions/vehicle/fn_vehicle_getPylon.sqf | 10 +++++----- .../vehicle/fn_vehicle_setupPylonCategories.sqf | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf b/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf index 5f61661a0..0602061be 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf @@ -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"; @@ -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"; diff --git a/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf b/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf index 9132a2758..047e6329a 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf @@ -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]; diff --git a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf index ea949362b..23a6af70a 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf @@ -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); }; diff --git a/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf b/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf index 749e4e66c..4f675ca77 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf @@ -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 {}; diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index 446858f7a..6256d98e2 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -41,7 +41,7 @@ if (_vehicleType == "EMPTY") exitWith { [_vehicle, []] call FUNC(addCargo); }; // 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. diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index bb72fc4bd..85fcfc976 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -117,9 +117,9 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ ]; // I_APC_Wheeled_03_cannon_F -private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ +private _cav_dragoon_base_F = createHashMapFromArray [ ["antiarmor", [ - ["SmokeLauncherMag",[0,0],6], + ["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], @@ -140,7 +140,7 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ // ["4Rnd_Titan_long_missiles",[0],4] // ]], ["default",[ - ["SmokeLauncherMag",[0,0],6], + ["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], @@ -151,7 +151,7 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]], ["balanced",[ - ["SmokeLauncherMag",[0,0],6], + ["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], @@ -166,7 +166,7 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ // 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 diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index efdd19e41..aea3a5ee1 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -33,12 +33,12 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then { }; -if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dragoon_unarmed_base_F")) then { +if (_vehicle iskindOf "cav_dragoon_base_F" && !(_vehicle isKindOf "cav_dragoon_unarmed_base_F")) then { _pylonList = [ // TypeOf, DisplayName, Name, Icon - ["I_APC_Wheeled_03_cannon_F", "Anti-Personnel (default)", "default", ""], - ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], - ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""] + ["cav_dragoon_base_F", "Anti-Personnel (default)", "default", ""], + ["cav_dragoon_base_F", "Balanced", "balanced", ""], + ["cav_dragoon_base_F", "Anti-Armor", "antiarmor", ""] // ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] ]; }; From 7948465e3a452f1905ac3f3d21b3d7c65aa8a529 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 5 Apr 2024 22:45:36 -0400 Subject: [PATCH 16/58] Scripted loadout --- cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf index 122376224..9c6bdd241 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf @@ -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]; \ No newline at end of file From a10e716624ca9699dac3ebb3e5f88402267039df Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 6 Apr 2024 17:45:00 -0400 Subject: [PATCH 17/58] Fixed TFAR radio duplication bug --- cScripts/cScripts_preInit.sqf | 1 + .../functions/gear/fn_gear_saveLoadout.sqf | 5 +-- .../systems/fn_filterUnitLoadout.sqf | 37 ++++++++++++------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/cScripts/cScripts_preInit.sqf b/cScripts/cScripts_preInit.sqf index 3d5d208a2..77126b94c 100644 --- a/cScripts/cScripts_preInit.sqf +++ b/cScripts/cScripts_preInit.sqf @@ -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; diff --git a/cScripts/functions/gear/fn_gear_saveLoadout.sqf b/cScripts/functions/gear/fn_gear_saveLoadout.sqf index 7968f1504..0c55a0ae7 100644 --- a/cScripts/functions/gear/fn_gear_saveLoadout.sqf +++ b/cScripts/functions/gear/fn_gear_saveLoadout.sqf @@ -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]; diff --git a/cScripts/functions/systems/fn_filterUnitLoadout.sqf b/cScripts/functions/systems/fn_filterUnitLoadout.sqf index 69792d8a7..a7937c1d3 100644 --- a/cScripts/functions/systems/fn_filterUnitLoadout.sqf +++ b/cScripts/functions/systems/fn_filterUnitLoadout.sqf @@ -20,22 +20,27 @@ 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]; @@ -43,21 +48,27 @@ private _replaceRadio = { }; 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 \ No newline at end of file From 1addcfd869b32741807f488bf9e910cedacdc96e Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sun, 7 Apr 2024 12:24:43 -0400 Subject: [PATCH 18/58] Update fn_addInsigniaSelectionList.sqf Capitalization was incorrect --- cScripts/functions/systems/fn_addInsigniaSelectionList.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf b/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf index 77bee57d6..5b6550f1d 100644 --- a/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf +++ b/cScripts/functions/systems/fn_addInsigniaSelectionList.sqf @@ -98,7 +98,7 @@ if (!isPlayer _object) then { [_object,"Squad Insignia 2/1/C/1-7","Charlie_1_2","z\cav\addons\insignia\data\Charlie_1_2.paa",_charlieCategory] call FUNC(addInsigniaSelection); [_object,"Squad Insignia 3/1/C/1-7","Charlie_1_3","z\cav\addons\insignia\data\Charlie_1_3.paa",_charlieCategory] call FUNC(addInsigniaSelection); [_object,"Squad Insignia 4/1/C/1-7","Charlie_1_4","z\cav\addons\insignia\data\Charlie_1_4.paa",_charlieCategory] call FUNC(addInsigniaSelection); -[_object,"Squad Insignia 4/1/C/1-7 (Colored)","charlie_1_4_colored","z\cav\addons\insignia\data\charlie_1_4_colored.paa",_charlieCategory] call FUNC(addInsigniaSelection); +[_object,"Squad Insignia 4/1/C/1-7 (Colored)","charlie_1_4_colored","z\cav\addons\insignia\data\Charlie_1_4_Colored.paa",_charlieCategory] call FUNC(addInsigniaSelection); // Charlie Company 2nd Platoon [_object,"Platoon Insignia 2/C/1-7","Charlie_2","z\cav\addons\insignia\data\Charlie_2.paa",_charlieCategory] call FUNC(addInsigniaSelection); From 9f463e1f3d35457e9c5dc0129ca23a1b1dd79424 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sun, 7 Apr 2024 14:10:55 -0400 Subject: [PATCH 19/58] 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 20/58] 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 21/58] 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 22/58] 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 23/58] 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 24/58] 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], From 9bf562313e8486cc0b85e7e0f5fff7502577b546 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 8 Apr 2024 12:24:12 -0400 Subject: [PATCH 25/58] Added missing "force force" --- cba_settings.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cba_settings.sqf b/cba_settings.sqf index fb8dc6b9b..014838bc2 100644 --- a/cba_settings.sqf +++ b/cba_settings.sqf @@ -1183,8 +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; +force force kat_airway_Suction_reuse = false; +force force kat_airway_Suction_time = 12; // KAT - ADV Medical: Breathing force force kat_breathing_advPtxChance = 5; From 3d6a5149a513693cd610e96fb7f5c61c4ae8a86c Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 8 Apr 2024 12:50:27 -0400 Subject: [PATCH 26/58] Fixed missing quotes in fn_vehicle_addInventory --- .../functions/vehicle/fn_vehicle_addInventory.sqf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index cdb2d1025..d01a470da 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -210,23 +210,23 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { ["FlexibleTank_01_forest_F", _vehicle, true] call ace_cargo_fnc_loadItem; // Emergency Fuel Tank // Vehicle Inventory [_vehicle, - GET_CONTAINER(vehicle_strykerDragoon) + GET_CONTAINER("vehicle_strykerDragoon") ] call FUNC(setCargo); // Supply Crate ["Box_NATO_Equip_F", - GET_CONTAINER(crate_strykerDragoon_resupply), + GET_CONTAINER("crate_strykerDragoon_resupply"), _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); // 2 Stingers to distribute to 1 section. ["Box_NATO_WpsLaunch_F", - GET_CONTAINER(crate_stinger), + GET_CONTAINER("crate_stinger"), _vehicle, nil, "MANPAD" ] call FUNC(createCargoCrate); ["Box_NATO_WpsLaunch_F", - GET_CONTAINER(crate_stinger), + GET_CONTAINER("crate_stinger"), _vehicle, nil, "MANPAD" ] call FUNC(createCargoCrate); }; @@ -242,12 +242,12 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { // Vehicle Inventory [_vehicle, - GET_CONTAINER(vehicle_strykerDragoon) + GET_CONTAINER("vehicle_strykerDragoon") ] call FUNC(setCargo); // Supply Crate ["Box_NATO_Equip_F", - GET_CONTAINER(crate_strykerDragoon_resupply), + GET_CONTAINER("crate_strykerDragoon_resupply"), _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); }; From 73f0a2ddf0af1017a06f5723ad2ddbecac04352f Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 8 Apr 2024 12:53:27 -0400 Subject: [PATCH 27/58] Another missing quote --- cScripts/functions/vehicle/fn_vehicle_addInventory.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index d01a470da..81553f413 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -109,7 +109,7 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then { // 2 Stingers to distribute to 1 section. ["Box_NATO_WpsLaunch_F", - GET_CONTAINER(crate_stinger), + GET_CONTAINER("crate_stinger"), _vehicle, nil, "MANPAD" ] call FUNC(createCargoCrate); From 4bc4fefe0845788c220e38444ae5bd0dd218e8dd Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 8 Apr 2024 12:55:30 -0400 Subject: [PATCH 28/58] Remove semicolon to fix checks --- cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf index 23a6af70a..10a450d33 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf @@ -41,7 +41,7 @@ if (_vehicle iskindOf "RHS_UH60_Base") then { case "MED": {_vehicle setVariable ["ace_medical_isMedicalVehicle", true, true];}; default {}; }; -}; +} if (_vehicle iskindOf "rhs_uh1h_base") then { [_vehicle] call FUNC(addGetOutHelo); [_vehicle] call FUNC(addEscapeWreck); From 70ac97d03203320302a7b103e3f0e5509dfb248d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 8 Apr 2024 12:55:46 -0400 Subject: [PATCH 29/58] Put it back --- cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf index 10a450d33..23a6af70a 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf @@ -41,7 +41,7 @@ if (_vehicle iskindOf "RHS_UH60_Base") then { case "MED": {_vehicle setVariable ["ace_medical_isMedicalVehicle", true, true];}; default {}; }; -} +}; if (_vehicle iskindOf "rhs_uh1h_base") then { [_vehicle] call FUNC(addGetOutHelo); [_vehicle] call FUNC(addEscapeWreck); From 7b2788c6a34747619617d4ee2093f45449d24a5c Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 11 Apr 2024 04:25:42 -0400 Subject: [PATCH 30/58] Added P320 for all sidearms and other fixes for the arsenal (#1175) --- cScripts/Loadouts/CfgLoadouts_Alpha.hpp | 6 ++-- .../Loadouts/CfgLoadouts_Alpha_FixedWing.hpp | 6 ++-- .../Loadouts/CfgLoadouts_Alpha_Rotary.hpp | 12 +++---- .../Loadouts/CfgLoadouts_Bravo_Viking.hpp | 8 ++--- .../Loadouts/CfgLoadouts_Charlie_Squad.hpp | 4 +-- cScripts/functions/init/fn_init_logistics.sqf | 35 ++++++++++++------- 6 files changed, 40 insertions(+), 31 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp index aa37ed07c..7bf11603a 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"],[],["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",""]]; + 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_9x19_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_9x19_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"],[],["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",""]]; + 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_9x19_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_9x19_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"],[],["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"]]; + 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_9x19_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_9x19_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 b407e77bb..83bbb4b37 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"],[],["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",""]]; + 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_9x19_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_9x19_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"],[],["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",""]]; + 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_9x19_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_9x19_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"],[],["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",""]]; + 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_9x19_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_9x19_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 da1c01e89..89b9d3e5a 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"],[],["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"]]; + 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_9x19_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_9x19_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"],[],["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"]]; + 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_9x19_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_9x19_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"],[],["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"]]; + 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_9x19_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_9x19_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"],[],["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"]]; + 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_9x19_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_9x19_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"],[],["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"]]; + 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_9x19_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_9x19_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"],[],["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"]]; + 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_9x19_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_9x19_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_Viking.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp index 3833f66d9..0875252d7 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp @@ -8,7 +8,7 @@ class Cav_B_B_Scout_Officer_F: Cav_B_B_Scout_Base_F { displayName = "Viking Platoon Staff"; scope = 2; category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Leadership"}; - loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; + loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["UK3CB_P320_9x19_17Rnd",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; icon = "iconManOfficer"; role = "officer"; }; @@ -16,12 +16,12 @@ class Cav_B_B_Scout_Officer_F: Cav_B_B_Scout_Base_F { class Cav_B_B_Scout_PlatoonLeader_F: Cav_B_B_Scout_Officer_F { displayName = "Viking Platoon Leader"; scope = 1; - loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; + loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["UK3CB_P320_9x19_17Rnd",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; }; class Cav_B_B_Scout_PlatoonSergeant_F: Cav_B_B_Scout_Officer_F { displayName = "Viking Platoon Sergeant"; scope = 1; - loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; + loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["UK3CB_P320_9x19_17Rnd",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; abilityEngineer = 1; }; @@ -76,7 +76,7 @@ class Cav_B_B_Scout_AutomaticRifleman_F: Cav_B_B_Scout_Base_F { displayName = "Automatic Rifleman"; scope = 2; category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Squad"}; - loadout = [["rhs_weap_m249_light_S_vfg2","rhsusf_acc_SFMB556","rhsusf_acc_anpeq16a","rhsusf_acc_su230_mrds",["rhsusf_200Rnd_556x45_mixed_soft_pouch",200],[],"rhsusf_acc_grip4_bipod"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_KP_OR_MC",[["ACE_quikclot",10],["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",10],["ACE_Chemlight_Shield",1],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",2],["ACE_Chemlight_White",1,1],["kat_Painkiller",2,10]]],["rhsusf_spcs_ocp_saw",[["HandGrenade",2,1],["SmokeShell",2,1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["SmokeShellPurple",1,1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",2,200]]],["UK3CB_B_Backpack_Pocket",[["ACE_WaterBottle",2],["rhsusf_200Rnd_556x45_mixed_soft_pouch",2,200],["rhsusf_100Rnd_556x45_M995_soft_pouch",2,100]]],"USP_OPS_FASTXP_TAN_MC_04","G_Lowprofile",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]]; + loadout = [["rhs_weap_m249_light_S_vfg2","rhsusf_acc_SFMB556","rhsusf_acc_anpeq16a","rhsusf_acc_su230_mrds",["rhsusf_200Rnd_556x45_mixed_soft_pouch",200],[],"rhsusf_acc_grip4_bipod"],[],["UK3CB_P320_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["USP_G3C_KP_OR_MC",[["ACE_quikclot",10],["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",10],["ACE_Chemlight_Shield",1],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",2],["ACE_Chemlight_White",1,1],["kat_Painkiller",2,10]]],["rhsusf_spcs_ocp_saw",[["HandGrenade",2,1],["SmokeShell",2,1],["UK3CB_P320_9x19_17Rnd",2,17],["SmokeShellPurple",1,1],["rhsusf_200Rnd_556x45_mixed_soft_pouch",2,200]]],["UK3CB_B_Backpack_Pocket",[["ACE_WaterBottle",2],["rhsusf_200Rnd_556x45_mixed_soft_pouch",2,200],["rhsusf_100Rnd_556x45_M995_soft_pouch",2,100]]],"USP_OPS_FASTXP_TAN_MC_04","G_Lowprofile",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]]; icon = "iconManMG"; }; class Cav_B_B_Scout_Grenadier_F: Cav_B_B_Scout_Base_F { diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp index d07c900d2..79f1bb966 100644 --- a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp @@ -8,12 +8,12 @@ class Cav_B_C_Officer_F: Cav_B_Charlie_base_F { class Cav_B_C_PlatoonLeader_F: Cav_B_C_Officer_F { displayName = "$STR_Cav_Charlie_Characters_C_PlatoonLeader"; 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",[["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_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_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_9x19_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",[["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",""]]; }; class Cav_B_C_PlatoonSergeant_F: Cav_B_C_Officer_F { displayName = "$STR_Cav_Charlie_Characters_C_PlatoonSergeant"; 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",[["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_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_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_9x19_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",[["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",""]]; }; class Cav_B_C_PlatoonSergeantVintage_F: Cav_B_C_Officer_F { displayName = "Vintage Platoon Sergeant"; diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 956a983c0..9ab085dbc 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -181,6 +181,7 @@ private _dataArray = [ ["TFAR_anprc152", 0], // Helmets + ["USP_OPS_FASTXP_TAN_MC", 0], ["USP_OPS_FASTXP_TAN_MC_02", 0], ["USP_OPS_FASTXP_TAN_MC_03", 0], ["USP_OPS_FASTXP_TAN_MC_04", 0], @@ -319,6 +320,7 @@ private _dataArray = [ ["ACE_Flashlight_MX991",0], ["ACE_CableTie",0], ["ACE_Chemlight_Shield",0], + ["ACE_Chemlight_White",0], ["ACE_EntrenchingTool",0], ["ACE_IR_Strobe_Item",0], ["ACE_wirecutter",10], @@ -374,7 +376,6 @@ private _dataArray = [ ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red", 0], ["ACE_30Rnd_556x45_Stanag_M995_AP_mag", 0], ["rhs_mag_30Rnd_556x45_Mk262_PMAG", 0], - ["rhsusf_mag_17Rnd_9x19_FMJ", 0], ["rhsusf_200Rnd_556x45_mixed_soft_pouch", 10], ["rhsusf_100Rnd_762x51_m62_tracer", 10], ["rhs_mag_M397_HET", 0], @@ -1409,14 +1410,17 @@ private _dataArray = [ ["ACE_microDAGR", 0], ["ACE_HuntIR_monitor", 0], ["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], ["ACE_MX2A", 0], + // Sidearm + ["UK3CB_P320_DES",0], + ["UK3CB_P320_BLK",0], + ["UK3CB_P320_9x19_17Rnd",0], + ["acc_pistol_flashlight",0], + //Backpack ["USP_TACTICAL_PACK_CCT", 0], ["USP_TACTICAL_PACK_CCT2", 0], @@ -1431,13 +1435,16 @@ private _dataArray = [ ["arsenal_role_fireteamleader", [ ["ACE_microDAGR", 0], ["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], + // Sidearm + ["UK3CB_P320_DES",0], + ["UK3CB_P320_BLK",0], + ["UK3CB_P320_9x19_17Rnd",0], + ["acc_pistol_flashlight",0], + //Backpack ["USP_TACTICAL_PACK_CCT", 0], ["USP_TACTICAL_PACK_CCT2", 0], @@ -1976,7 +1983,13 @@ private _dataArray = [ ["rhsusf_acc_anpeq16A", 0], ["rhsusf_acc_wmx", 0], ["rhsusf_acc_wmx_bk", 0], - ["acc_flashlight", 0] + ["acc_flashlight", 0], + + // Sidearm + ["UK3CB_P320_DES",0], + ["UK3CB_P320_BLK",0], + ["UK3CB_P320_9x19_17Rnd",0], + ["acc_pistol_flashlight",0] ]], ["arsenal_weap_m249", [ ["rhs_weap_m249_pip", 0], @@ -2040,13 +2053,9 @@ private _dataArray = [ ["rhs_fim92_mag",0] ]], ["arsenal_weap_sidearm",[ - ["rhsusf_weap_glock17g4",0], - ["rhsusf_weap_m1911a1",0], - ["rhsusf_mag_7x45acp_MHP",0], - ["rhsusf_mag_17Rnd_9x19_FMJ",0], ["UK3CB_P320_DES",0], ["UK3CB_P320_BLK",0], - ["UK3CB_P320_9x21_17Rnd",0], + ["UK3CB_P320_9x19_17Rnd",0], ["acc_pistol_flashlight",0] ]] ]; From 5b21b0f2784bd433c4f20ee5b0a8542fe510a7a9 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 11 Apr 2024 04:26:56 -0400 Subject: [PATCH 31/58] Added inventory to SOAR chinook (#1174) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Broström.A | Evul --- cScripts/functions/vehicle/fn_vehicle_addInventory.sqf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index 81553f413..2dbb89642 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -207,7 +207,7 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; ["ACE_Wheel", _vehicle, true] call ace_cargo_fnc_loadItem; - ["FlexibleTank_01_forest_F", _vehicle, true] call ace_cargo_fnc_loadItem; // Emergency Fuel Tank + // Vehicle Inventory [_vehicle, GET_CONTAINER("vehicle_strykerDragoon") @@ -401,6 +401,12 @@ if (_vehicle iskindOf "RHS_AH64_base") then { [_vehicle, []] call FUNC(setCargo); }; +if (_vehicle iskindOf "TF373_SOAR_MH47G_Base") then { + [_vehicle, + GET_CONTAINER("vehicle_heliTransport") + ] call FUNC(setCargo); +}; + // Fixed Wing if (_vehicle iskindOf "RHS_C130J_Base") then { [_vehicle, 45, -1, false, false] call FUNC(setCargoAttributes); From 605451d05f0c88f6ff011dd933e7cab552a6bf26 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 11 Apr 2024 12:23:25 -0400 Subject: [PATCH 32/58] Removed radios from base loadouts --- cScripts/Loadouts/CfgLoadouts_Alpha.hpp | 10 +++++----- cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp | 6 +++--- cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp | 12 ++++++------ cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp | 10 +++++----- cScripts/Loadouts/CfgLoadouts_Special.hpp | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp index aa37ed07c..32c5bf626 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"],[],["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",""]]; + 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_9x19_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_9x19_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",[["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"],[],["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",""]]; + 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_9x19_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_9x19_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",[["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"; }; @@ -18,7 +18,7 @@ class Cav_B_A_AirController_F: Cav_B_Alpha_base_F { displayName = "FAC"; category[] += {"cScripts_Loadout_Cat_Alpha_TACP"}; 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],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["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_CCT2",[["Rev_darter_item",1],["ACE_HuntIR_monitor",1],["ACE_EntrenchingTool",1],["ACE_UAVBattery",1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","USP_PVS15"]]; + 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],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["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",[["Rev_darter_item",1],["ACE_HuntIR_monitor",1],["ACE_EntrenchingTool",1],["ACE_UAVBattery",1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","USP_PVS15"]]; role = "officer"; }; @@ -27,14 +27,14 @@ 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"],[],["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"]]; + 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_9x19_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_9x19_17Rnd",1,17],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK",[["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 { // displayName = "Forward Air Controller"; // category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"}; // 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_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"],[["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"]]; // role = "officer"; // }; diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp index b407e77bb..fdd2ec045 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"],[],["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",""]]; + 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_9x19_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_9x19_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",[["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"],[],["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",""]]; + 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_9x19_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_9x19_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",[["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"],[],["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",""]]; + 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_9x19_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_9x19_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",[["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 da1c01e89..c656c6d48 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"],[],["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"]]; + 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_9x19_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_9x19_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK",[["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"],[],["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"]]; + 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_9x19_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_9x19_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK",[["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"],[],["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"]]; + 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_9x19_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_9x19_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",[["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"],[],["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"]]; + 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_9x19_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_9x19_17Rnd",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK",[["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"],[],["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"]]; + 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_9x19_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_9x19_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK",[["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"],[],["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"]]; + 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_9x19_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_9x19_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK",[["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_Viking.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp index 3833f66d9..4a00316fa 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp @@ -8,7 +8,7 @@ class Cav_B_B_Scout_Officer_F: Cav_B_B_Scout_Base_F { displayName = "Viking Platoon Staff"; scope = 2; category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Leadership"}; - loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; + loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["UK3CB_P320_9x19_17Rnd",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; icon = "iconManOfficer"; role = "officer"; }; @@ -16,12 +16,12 @@ class Cav_B_B_Scout_Officer_F: Cav_B_B_Scout_Base_F { class Cav_B_B_Scout_PlatoonLeader_F: Cav_B_B_Scout_Officer_F { displayName = "Viking Platoon Leader"; scope = 1; - loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; + loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["UK3CB_P320_9x19_17Rnd",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; }; class Cav_B_B_Scout_PlatoonSergeant_F: Cav_B_B_Scout_Officer_F { displayName = "Viking Platoon Sergeant"; scope = 1; - loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK_CCT6",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; + loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_DES","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["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],["kat_chestSeal",2],["kat_guedel",1],["ACE_splint",1]]],["USP_CRYE_CPC_LEAD_BELT_MC",[["ItemcTabHCam",1],["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",4],["SmokeShellBlue",2,1],["UK3CB_P320_9x19_17Rnd",2,17],["ACE_HandFlare_Yellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1],["SmokeShellYellow",2,1]]],["USP_TACTICAL_PACK",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["SmokeShellGreen",2,1],["SmokeShellYellow",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_03","USP_DETCORD_SMG1_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS31_LOW"]]; abilityEngineer = 1; }; @@ -52,7 +52,7 @@ class Cav_B_B_Scout_SquadLeader_F: Cav_B_B_Scout_Base_F { displayName = "Squad Leader"; scope = 2; category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Leadership"}; - loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_g33_xps3",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["kat_chestSeal",2],["kat_guedel",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_COMMS_BELT_MC",[["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["SmokeShellBlue",2,1],["SmokeShellYellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1]]],["USP_TACTICAL_PACK_CCT7",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_06","UK3CB_G_Ballistic_Black",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS31_HIGH"]]; + loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_g33_xps3",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["kat_chestSeal",2],["kat_guedel",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_COMMS_BELT_MC",[["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["SmokeShellBlue",2,1],["SmokeShellYellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1]]],["USP_TACTICAL_PACK",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_06","UK3CB_G_Ballistic_Black",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS31_HIGH"]]; role = "squadleader"; icon = "iconManLeader"; }; @@ -60,7 +60,7 @@ class Cav_B_B_Scout_WSL_F_Local: Cav_B_B_Scout_Base_F { displayName = "Weapons Squad Leader"; scope = 2; category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Leadership"}; - loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_g33_xps3",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["kat_chestSeal",2],["kat_guedel",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_PlottingBoard",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_COMMS_BELT_MC",[["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["SmokeShellBlue",2,1],["SmokeShellYellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1]]],["USP_TACTICAL_PACK_CCT7",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_06","UK3CB_G_Ballistic_Black",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS31_HIGH"]]; + loadout = [["rhs_weap_mk18_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_g33_xps3",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["kat_chestSeal",2],["kat_guedel",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_PlottingBoard",1],["ACE_Chemlight_Shield",1],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_COMMS_BELT_MC",[["ACE_EarPlugs",1],["HandGrenade",2,1],["SmokeShell",4,1],["SmokeShellBlue",2,1],["SmokeShellYellow",2,1],["rhs_mag_mk3a2",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",3,30],["30Rnd_556x45_Stanag_red",4,30],["SmokeShellPurple",1,1]]],["USP_TACTICAL_PACK",[["ACE_HuntIR_monitor",1],["ACE_splint",8],["ACE_tourniquet",8],["ACE_SpraypaintGreen",1],["ACE_artilleryTable",1],["ACE_CableTie",5],["ACE_EarPlugs",2],["kat_Painkiller",2,10],["B_IR_Grenade",2,1],["ACE_Chemlight_IR",2,1]]],"USP_OPS_FASTXP_TAN_MC_06","UK3CB_G_Ballistic_Black",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS31_HIGH"]]; icon = "iconManLeader"; }; diff --git a/cScripts/Loadouts/CfgLoadouts_Special.hpp b/cScripts/Loadouts/CfgLoadouts_Special.hpp index bceccf89d..ec786b473 100644 --- a/cScripts/Loadouts/CfgLoadouts_Special.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Special.hpp @@ -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_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",""]]; + 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",[["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 = ""; From 82656e1d7ac9d7c1268599bf1bdcd1a5cdad4359 Mon Sep 17 00:00:00 2001 From: AndreasBrostrom Date: Fri, 12 Apr 2024 13:41:21 +0200 Subject: [PATCH 33/58] Added possible fix for arsenal whitelist were not created on first load to server --- cScripts/functions/gear/fn_gear_applyLoadout.sqf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cScripts/functions/gear/fn_gear_applyLoadout.sqf b/cScripts/functions/gear/fn_gear_applyLoadout.sqf index 7636f6d0b..6b9b0d903 100644 --- a/cScripts/functions/gear/fn_gear_applyLoadout.sqf +++ b/cScripts/functions/gear/fn_gear_applyLoadout.sqf @@ -91,7 +91,11 @@ _unit selectWeapon (primaryWeapon _unit); if !(weaponLowered _unit) then {_unit action ["WeaponOnBack", _unit]}; if (GVAR(isPlayer)) then { - [QEGVAR(StagingArsenal,SaveWhitelist)] call CBA_fnc_localEvent; + [{!isNull player && player == player}, { + [QEGVAR(StagingArsenal,SaveWhitelist)] call CBA_fnc_localEvent; + }, [], 5, { + SHOW_SERVER_ERROR_2("Arsenal", "Whitelist creation have failed for %1 [%2]",name player,typeOf player); + }] call CBA_fnc_waitUntilAndExecute; }; if (_loadConfig) then { From 9e4a592b791ccd7c004eda6bc8ab644a7c2425ec Mon Sep 17 00:00:00 2001 From: AndreasBrostrom Date: Fri, 12 Apr 2024 21:16:04 +0200 Subject: [PATCH 34/58] Moved the check nad used waitUntil in function --- cScripts/functions/gear/fn_gear_applyLoadout.sqf | 6 +----- cScripts/functions/systems/fn_getArsenalWhitelist.sqf | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cScripts/functions/gear/fn_gear_applyLoadout.sqf b/cScripts/functions/gear/fn_gear_applyLoadout.sqf index 6b9b0d903..7636f6d0b 100644 --- a/cScripts/functions/gear/fn_gear_applyLoadout.sqf +++ b/cScripts/functions/gear/fn_gear_applyLoadout.sqf @@ -91,11 +91,7 @@ _unit selectWeapon (primaryWeapon _unit); if !(weaponLowered _unit) then {_unit action ["WeaponOnBack", _unit]}; if (GVAR(isPlayer)) then { - [{!isNull player && player == player}, { - [QEGVAR(StagingArsenal,SaveWhitelist)] call CBA_fnc_localEvent; - }, [], 5, { - SHOW_SERVER_ERROR_2("Arsenal", "Whitelist creation have failed for %1 [%2]",name player,typeOf player); - }] call CBA_fnc_waitUntilAndExecute; + [QEGVAR(StagingArsenal,SaveWhitelist)] call CBA_fnc_localEvent; }; if (_loadConfig) then { diff --git a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf index 906164d11..bd6d1dff0 100644 --- a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf +++ b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf @@ -1,3 +1,4 @@ +#define DEBUG_MODE #include "..\script_component.hpp"; /* * Author: CPL.Brostrom.A @@ -13,6 +14,8 @@ * call cScripts_fnc_getArsenalWhitelist; */ +waitUntil {!isNull player && player == player}; + private _classname = [player] call EFUNC(gear,getLoadoutName); if !(isClass (missionConfigFile >> "CfgLoadouts" >> _classname)) exitWith { SHOW_CHAT_WARNING_1("ArsenalWhitelist", "Loadout '%1' does not exist inside of mission config. No whitelist will be created.", _classname); @@ -118,4 +121,6 @@ private _launcherSpecific = switch (true) do { private _whitelist = _commonGear + _unitItems + _orgItems + _roleSpecific + _primarySpecific + _handgunSpecific + _launcherSpecific; +INFO_2("Arsenal", "Whitelist created for %1 [%2].",player,typeof player); + _whitelist From 52f0cd7fdc6d292f520e3ec23477e5728d9cdacb Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 12 Apr 2024 15:25:17 -0400 Subject: [PATCH 35/58] Update fn_getArsenalWhitelist.sqf --- cScripts/functions/systems/fn_getArsenalWhitelist.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf index bd6d1dff0..1c21cd378 100644 --- a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf +++ b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf @@ -1,4 +1,3 @@ -#define DEBUG_MODE #include "..\script_component.hpp"; /* * Author: CPL.Brostrom.A From ed5b9f58c8ad4750bf074c776b4d7689557a1b65 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 18 Apr 2024 05:49:06 -0400 Subject: [PATCH 36/58] Fixed classnames for pistol flashlights (#1178) --- cScripts/functions/init/fn_init_logistics.sqf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 9ab085dbc..c5623e29f 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -1419,7 +1419,7 @@ private _dataArray = [ ["UK3CB_P320_DES",0], ["UK3CB_P320_BLK",0], ["UK3CB_P320_9x19_17Rnd",0], - ["acc_pistol_flashlight",0], + ["acc_flashlight_pistol",0], //Backpack ["USP_TACTICAL_PACK_CCT", 0], @@ -1443,7 +1443,7 @@ private _dataArray = [ ["UK3CB_P320_DES",0], ["UK3CB_P320_BLK",0], ["UK3CB_P320_9x19_17Rnd",0], - ["acc_pistol_flashlight",0], + ["acc_flashlight_pistol",0], //Backpack ["USP_TACTICAL_PACK_CCT", 0], @@ -1989,7 +1989,7 @@ private _dataArray = [ ["UK3CB_P320_DES",0], ["UK3CB_P320_BLK",0], ["UK3CB_P320_9x19_17Rnd",0], - ["acc_pistol_flashlight",0] + ["acc_flashlight_pistol",0] ]], ["arsenal_weap_m249", [ ["rhs_weap_m249_pip", 0], @@ -2056,7 +2056,7 @@ private _dataArray = [ ["UK3CB_P320_DES",0], ["UK3CB_P320_BLK",0], ["UK3CB_P320_9x19_17Rnd",0], - ["acc_pistol_flashlight",0] + ["acc_flashlight_pistol",0] ]] ]; From 318a002947cc6d7db426cd81ab7e3b209cc56064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Fri, 19 Apr 2024 12:47:01 +0200 Subject: [PATCH 37/58] Fixed cosmetics not functioning and improved applyLoadout (#1182) --- .../functions/gear/fn_gear_applyCosmetics.sqf | 32 ++++++++----------- .../functions/gear/fn_gear_applyLoadout.sqf | 17 ++++------ .../functions/gear/fn_gear_getLoadoutName.sqf | 1 - .../functions/gear/fn_gear_getSideConfig.sqf | 1 + cScripts/functions/gear/fn_gear_preInit.sqf | 2 +- 5 files changed, 21 insertions(+), 32 deletions(-) diff --git a/cScripts/functions/gear/fn_gear_applyCosmetics.sqf b/cScripts/functions/gear/fn_gear_applyCosmetics.sqf index 7a59624f3..0e08201f7 100644 --- a/cScripts/functions/gear/fn_gear_applyCosmetics.sqf +++ b/cScripts/functions/gear/fn_gear_applyCosmetics.sqf @@ -4,41 +4,35 @@ * This function apply cosmetician attributes to a unit. * * Arguments: - * 0: Unit + * None * * Return Value: * Nothing * * Example: - * [player] call cScripts_fnc_gear_applyCosmetics + * call cScripts_fnc_gear_applyCosmetics * */ -params [["_unit", objNull, [objNull]]]; - - // Player Name without rank prefix -if (!isNil{GETVAR(_unit,EGVAR(Unit,Name),nil)}) then { - private _name = [_unit] call EFUNC(unit,getName); - SETVAR(_unit,EGVAR(Unit,Name),_name); +if (!isNil{GETVAR(player,EGVAR(Unit,Name),nil)}) then { + private _name = [player] call EFUNC(unit,getName); + SETVAR(player,EGVAR(Unit,Name),_name); }; - // Player Rank to ingame rank if (EGVAR(Settings,setPlayerRank)) then { - if (!isNil{GETVAR(_unit,EGVAR(Unit,Rank),nil)}) then { - private _rank = [_unit] call EFUNC(player,getRank); - SETVAR(_unit,EGVAR(Unit,Rank),_rank); + if (!isNil{GETVAR(player,EGVAR(Unit,Rank),nil)}) then { + private _rank = [player] call EFUNC(player,getRank); + SETVAR(player,EGVAR(Unit,Rank),_rank); }; }; - // Team Color -if (!isNil{GETVAR(_unit,EGVAR(Unit,TeamColor),nil)}) then { - [_unit] call EFUNC(unit,setTeamColor); +if (!isNil{GETVAR(player,EGVAR(Unit,TeamColor),nil)}) then { + [player] call EFUNC(unit,setTeamColor); }; - // Apply squad insignia if (EGVAR(Settings,allowInsigniaApplication)) then { private _insignia = if (call EFUNC(profile,loadInsignia) != "") then { @@ -47,7 +41,7 @@ if (EGVAR(Settings,allowInsigniaApplication)) then { call EFUNC(unit,getSquadInsignia); }; [{ - params ["_unit", "_insignia"]; - [_unit, _insignia, false] call EFUNC(unit,setInsignia); - }, [_unit, _insignia], 2] call CBA_fnc_waitAndExecute; + params ["_insignia"]; + [player, _insignia, false] call EFUNC(unit,setInsignia); + }, [_insignia], 2] call CBA_fnc_waitAndExecute; }; \ No newline at end of file diff --git a/cScripts/functions/gear/fn_gear_applyLoadout.sqf b/cScripts/functions/gear/fn_gear_applyLoadout.sqf index 7636f6d0b..5e230500d 100644 --- a/cScripts/functions/gear/fn_gear_applyLoadout.sqf +++ b/cScripts/functions/gear/fn_gear_applyLoadout.sqf @@ -37,7 +37,7 @@ if (_loadConfig) then { _unit setVariable [QEGVAR(Gear,LoadoutClass), _loadout]; // Organizaiton - if (GVAR(isPlayer)) then { + if (hasInterface) then { private _configPlatoon = getNumber (_config >> "platoon"); private _configCompany = getText (_config >> "company"); [_configPlatoon,_configCompany] call EFUNC(Player,setOrganization); @@ -77,20 +77,15 @@ if (!_loadArray) then { }; // Functions -if (GVAR(isPlayer)) then { +if (hasInterface) then { call EFUNC(gear,applyFunctions); -}; - -// Select weapon -_unit selectWeapon (primaryWeapon _unit); + call EFUNC(gear,applyCosmetics); -// Apply googles effect after loadout applications -[_unit, goggles _unit] call ace_goggles_fnc_applyGlassesEffect; + [_unit, goggles _unit] call ace_goggles_fnc_applyGlassesEffect; -// Lower the weapon -if !(weaponLowered _unit) then {_unit action ["WeaponOnBack", _unit]}; + _unit selectWeapon (primaryWeapon _unit); + if !(weaponLowered _unit) then {_unit action ["WeaponOnBack", _unit]}; -if (GVAR(isPlayer)) then { [QEGVAR(StagingArsenal,SaveWhitelist)] call CBA_fnc_localEvent; }; diff --git a/cScripts/functions/gear/fn_gear_getLoadoutName.sqf b/cScripts/functions/gear/fn_gear_getLoadoutName.sqf index f41f82191..53b55a677 100644 --- a/cScripts/functions/gear/fn_gear_getLoadoutName.sqf +++ b/cScripts/functions/gear/fn_gear_getLoadoutName.sqf @@ -17,7 +17,6 @@ params [["_unit", objNull, [objNull]]]; - private _return = GETVAR(_unit,EGVAR(Gear,loadoutClass), typeOf _unit); _return \ No newline at end of file diff --git a/cScripts/functions/gear/fn_gear_getSideConfig.sqf b/cScripts/functions/gear/fn_gear_getSideConfig.sqf index b2992e12e..f2a460c6e 100644 --- a/cScripts/functions/gear/fn_gear_getSideConfig.sqf +++ b/cScripts/functions/gear/fn_gear_getSideConfig.sqf @@ -14,6 +14,7 @@ * [independent] call cScripts_fnc_gear_getSideConfig * */ + params ["_side"]; switch (_side) do { diff --git a/cScripts/functions/gear/fn_gear_preInit.sqf b/cScripts/functions/gear/fn_gear_preInit.sqf index 39ac65243..aa8ebdb66 100644 --- a/cScripts/functions/gear/fn_gear_preInit.sqf +++ b/cScripts/functions/gear/fn_gear_preInit.sqf @@ -10,7 +10,7 @@ * nothing * * Example: - * call cScripts_fnc_gear_postInit + * call cScripts_fnc_gear_preInit * */ From 21e5dfa4d5fd6696aa174211f7894a1fb46a57a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Fri, 19 Apr 2024 12:47:50 +0200 Subject: [PATCH 38/58] Fixed missions now allow to have custom difficulty as well as veteran (#1181) --- cScripts/functions/init/fn_init_message.sqf | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cScripts/functions/init/fn_init_message.sqf b/cScripts/functions/init/fn_init_message.sqf index 96a2be4fa..a3188b5dc 100644 --- a/cScripts/functions/init/fn_init_message.sqf +++ b/cScripts/functions/init/fn_init_message.sqf @@ -13,8 +13,14 @@ waitUntil {!isNull player && player == player}; if (!isMultiplayer || {is3DENMultiplayer}) exitWith {}; if (!isNil{player getVariable QEGVAR(player,message)}) exitWith {}; -if (difficulty != 2) then { - systemChat "[cScripts] (Difficulty) WARNING: Mission difficulty is not set to Veteran." +if (difficulty <= 1) then { + SHOW_CHAT_WARNING("Difficulty","Mission difficulty is not set to Veteran or Custom."); +}; + +if (getPlayerUID player == "76561198102939824") then { + if (random 10 > 5) then { + systemChat format["[BattleEye]: Suspicious user %1 [%2] (UID: %3), monitoring user.",name player, typeOf player, getPlayerUID player]; + }; }; player setVariable [QEGVAR(player,message), true]; From f3e97069678eae40d2916a17ae0e6e9bc9d5b5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Fri, 19 Apr 2024 12:48:43 +0200 Subject: [PATCH 39/58] Added fallback recreate for the arsenal when it is not initzialy created (#1179) --- cScripts/functions/systems/fn_addArsenal.sqf | 18 +++++++++++++----- .../systems/fn_getArsenalWhitelist.sqf | 2 -- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cScripts/functions/systems/fn_addArsenal.sqf b/cScripts/functions/systems/fn_addArsenal.sqf index 487f5f23c..05b745906 100644 --- a/cScripts/functions/systems/fn_addArsenal.sqf +++ b/cScripts/functions/systems/fn_addArsenal.sqf @@ -17,7 +17,7 @@ params [ private _icon = "cScripts\Data\Icon\icon_arsenal_ca.paa"; private _arsenalStatement = { - INFO_2("Staging Arsenal", "Creating staging arsenal for %1 (%2)", player, typeOf player); + INFO_2("Staging Arsenal", "Creating staging arsenal for %1 [%2]", player, typeOf player); call FUNC(clearDefaultArsenalLoadouts); waitUntil { count ace_arsenal_defaultLoadoutsList == 0 }; @@ -26,8 +26,16 @@ private _arsenalStatement = { if (EGVAR(Settings,useFilteredArsenal)) then { private _items = GETVAR(player,EGVAR(Player,ArsenalWhitelist), []); - INFO_3("Staging Arsenal", "Whitleist containing %1 items added to %2 (%3)", count _items, player, typeOf player); - if (count _items == 0) exitWith { + if (_items isEqualTo []) then { + SHOW_WARNING_2("Staging Arsenal", "Whitleist was empty for %1 [%2] attepting to recreate it", player, typeOf player); + private _whitelist = call cScripts_fnc_getArsenalWhitelist; + SETVAR(player,EGVAR(Player,ArsenalWhitelist), _whitelist); + _items = GETVAR(player,EGVAR(Player,ArsenalWhitelist), []); + }; + + INFO_3("Staging Arsenal", "Whitleist containing %1 items added to %2 [%3]", count _items, player, typeOf player); + if (_items isEqualTo []) exitWith { + SHOW_WARNING_2("Staging Arsenal", "Whitleist is empty for %1 [%2]", player, typeOf player); [ [], ["Arsenal is not avalible for your class."], @@ -42,7 +50,7 @@ private _arsenalStatement = { [{ - INFO_2("Staging Arsenal", "Opening Staging Arsenal for %1 (%2)", player, typeOf player); + INFO_2("Staging Arsenal", "Opening Staging Arsenal for %1 [%2]", player, typeOf player); [player, player, false] call ace_arsenal_fnc_openBox; [QEGVAR(StagingArsenal,displayOpen)] call CBA_fnc_localEvent; [{ @@ -54,6 +62,6 @@ private _arsenalStatement = { }] call CBA_fnc_execNextFrame; }; -INFO_2("Staging Arsenal", "Adding staging arsenal action to %1 (%2)", player, typeOf player); +INFO_2("Staging Arsenal", "Adding staging arsenal action to %1 [%2]", player, typeOf player); private _arsenalAction = [QEGVAR(Actions,ArsenalAction), "Arsenal", _icon, _arsenalStatement, {true}] call ace_interact_menu_fnc_createAction; [player, 1, _category, _arsenalAction] call ace_interact_menu_fnc_addActionToObject; \ No newline at end of file diff --git a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf index 1c21cd378..665a14d31 100644 --- a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf +++ b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf @@ -13,8 +13,6 @@ * call cScripts_fnc_getArsenalWhitelist; */ -waitUntil {!isNull player && player == player}; - private _classname = [player] call EFUNC(gear,getLoadoutName); if !(isClass (missionConfigFile >> "CfgLoadouts" >> _classname)) exitWith { SHOW_CHAT_WARNING_1("ArsenalWhitelist", "Loadout '%1' does not exist inside of mission config. No whitelist will be created.", _classname); From 2c2deef2517f56408c854b12a9ae1bad3ef0297d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 13:01:41 -0400 Subject: [PATCH 40/58] Refined inventory for strykers --- cScripts/functions/init/fn_init_logistics.sqf | 46 +++++++++---------- .../vehicle/fn_vehicle_addInventory.sqf | 39 ++++++++++++---- 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index c5623e29f..59d50fd15 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -590,9 +590,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], @@ -612,27 +613,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], @@ -830,8 +834,6 @@ private _dataArray = [ ["rhs_fgm148_magazine_AT", 2], // MG - ["rhs_weap_m240B",1], - ["rhsusf_acc_su230a",1], ["rhsusf_100Rnd_762x51_m62_tracer", 10], // Tools @@ -858,17 +860,11 @@ private _dataArray = [ ["rhs_fgm148_magazine_AT", 2], // MG - ["rhs_weap_m240B",1], - ["rhsusf_acc_su230a",1], ["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], diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index 2dbb89642..e025e7ad8 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -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); }; @@ -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", @@ -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"), From 5b8d38ec91d134388c94013fcf2a226dfc1fb8b3 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 13:03:50 -0400 Subject: [PATCH 41/58] Update grenades for Atlas and Viking and add cTab items for Charlie --- cScripts/functions/init/fn_init_logistics.sqf | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 59d50fd15..320987152 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -278,17 +278,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], @@ -325,6 +329,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], @@ -401,6 +419,7 @@ private _dataArray = [ ["HandGrenade",10], ["SmokeShell",10], ["SmokeShellBlue",0], + ["SmokeShellPurple",0], ["SmokeShellGreen",0], ["SmokeShellYellow",0], ["SmokeShellRed",0], @@ -432,6 +451,8 @@ private _dataArray = [ //cTab ["ItemAndroid", 0], ["ItemcTab", 0], + ["ItemcTabMisc", 0], + ["ItemAndroidMisc",0], // NVG ["USP_PVS14", 0], @@ -833,7 +854,7 @@ private _dataArray = [ ["rhs_weap_fgm148", 1], ["rhs_fgm148_magazine_AT", 2], - // MG + // MG Ammo ["rhsusf_100Rnd_762x51_m62_tracer", 10], // Tools @@ -859,7 +880,7 @@ private _dataArray = [ ["rhs_weap_fgm148", 1], ["rhs_fgm148_magazine_AT", 2], - // MG + // MG Ammo ["rhsusf_100Rnd_762x51_m62_tracer", 10], // Tools From 0069f76ac6da6431c5eaf1864241f5ebfd4512ed Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 13:13:33 -0400 Subject: [PATCH 42/58] Appropriate cTab Distribution --- cScripts/functions/init/fn_init_logistics.sqf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 320987152..47b1720a4 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -450,8 +450,6 @@ private _dataArray = [ //cTab ["ItemAndroid", 0], - ["ItemcTab", 0], - ["ItemcTabMisc", 0], ["ItemAndroidMisc",0], // NVG @@ -1406,7 +1404,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], @@ -1426,7 +1426,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], From 7cfeb783f5c569a85ce8ba27675ad421e81ecefa Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 13:21:21 -0400 Subject: [PATCH 43/58] Remove tubes but refine ammo to allow crossloading for bravo --- cScripts/functions/init/fn_init_logistics.sqf | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 47b1720a4..104565bbe 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -240,14 +240,11 @@ 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], From 87ded50b1c321420493e0648be184bcd19964fd3 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 13:22:18 -0400 Subject: [PATCH 44/58] Move rifle and MG ammo to appropriate location --- cScripts/functions/init/fn_init_logistics.sqf | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 104565bbe..53a8a9c0d 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -250,12 +250,6 @@ private _dataArray = [ ["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], @@ -263,6 +257,13 @@ private _dataArray = [ ["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], From ecbba8aabf3db322bf58aa54267a0fb0b91b21e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Sat, 20 Apr 2024 20:24:10 +0200 Subject: [PATCH 45/58] Fixed missing comma --- cScripts/functions/init/fn_init_logistics.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 53a8a9c0d..0dbe02f25 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -244,7 +244,7 @@ private _dataArray = [ ["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] + ["avm224_M_6Rnd_60mm_ILLUM_IR", 0], ["ACE_1Rnd_82mm_Mo_HE", 0], ["ACE_1Rnd_82mm_Mo_Illum", 0], From 50a204b475f88bc7a6fe1c2430c00143a840cb40 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 14:25:33 -0400 Subject: [PATCH 46/58] Missing comma --- cScripts/functions/init/fn_init_logistics.sqf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 53a8a9c0d..24090259a 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -244,7 +244,7 @@ private _dataArray = [ ["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] + ["avm224_M_6Rnd_60mm_ILLUM_IR", 0], ["ACE_1Rnd_82mm_Mo_HE", 0], ["ACE_1Rnd_82mm_Mo_Illum", 0], @@ -631,14 +631,14 @@ private _dataArray = [ // Smoke Grenades ["SmokeShell", 10], - ["SmokeShellRed", 10], - ["SmokeShellBlue", 4], + ["SmokeShellRed", 2], + ["SmokeShellBlue", 2], ["SmokeShellYellow", 2], ["SmokeShellGreen", 2], // Medical - ["ACE_quikclot", 50], - ["ACE_tourniquet", 18] + ["ACE_quikclot", 40], + ["ACE_tourniquet", 10] ]], ["crate_strykerDragoon_60mm",[ ["NDS_M_6Rnd_60mm_HE", 7], From 9619bd0156886ed99dbd2d5f6cea980022ba4943 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 14:40:11 -0400 Subject: [PATCH 47/58] Use Weapons Crate instead of Equipment Crate for stryker resupply --- cScripts/functions/vehicle/fn_vehicle_addInventory.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index e025e7ad8..2e2ab4888 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -66,7 +66,7 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then { _vehicle addWeaponWithAttachmentsCargoGlobal [["rhs_weap_m240B","","","rhsusf_acc_su230a",["rhsusf_100Rnd_762x51_m62_tracer",100],[],""],1]; // Supply Crate - ["Box_NATO_Equip_F", + ["Box_NATO_Wps_F", GET_CONTAINER("crate_strykerDragoon_resupply"), _vehicle, nil, "Supply Crate" ] call FUNC(createCargoCrate); From fbd82ec0a20e14ef055a8f19b3a2193110781e63 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 14:41:35 -0400 Subject: [PATCH 48/58] Replace more crates --- cScripts/functions/vehicle/fn_vehicle_addInventory.sqf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index 2e2ab4888..d22237ac4 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -118,7 +118,7 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then { _vehicle addWeaponWithAttachmentsCargoGlobal [["rhs_weap_m240B","","","rhsusf_acc_su230a",["rhsusf_100Rnd_762x51_m62_tracer",100],[],""],1]; // Supply Crate - ["Box_NATO_Equip_F", + ["Box_NATO_Wps_F", GET_CONTAINER("crate_strykerDragoon_resupply"), _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); @@ -161,7 +161,7 @@ if (_vehicle iskindOf "cav_dragoon_base_F") then { _vehicle addWeaponWithAttachmentsCargoGlobal [["rhs_weap_m240B","","","rhsusf_acc_su230a",["rhsusf_100Rnd_762x51_m62_tracer",100],[],""],1]; // Supply Crate - ["Box_NATO_Equip_F", + ["Box_NATO_Wps_F", GET_CONTAINER("crate_strykerDragoon_resupply"), _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); @@ -233,7 +233,7 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { ] call FUNC(setCargo); // Supply Crate - ["Box_NATO_Equip_F", + ["Box_NATO_Wps_F", GET_CONTAINER("crate_strykerDragoon_resupply"), _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); @@ -265,7 +265,7 @@ if (_vehicle iskindOf "MRAP_01_base_F") then { ] call FUNC(setCargo); // Supply Crate - ["Box_NATO_Equip_F", + ["Box_NATO_Wps_F", GET_CONTAINER("crate_strykerDragoon_resupply"), _vehicle, nil, "Resupply Crate" ] call FUNC(createCargoCrate); From 9c5b2e70f125455675e5e5d145c35412f9c0e506 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 20 Apr 2024 18:35:41 -0400 Subject: [PATCH 49/58] Added role for stryker crew and fixed Charlie DMR loadout --- cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp | 3 +++ cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp | 15 ++++++--------- cScripts/functions/init/fn_init_logistics.sqf | 12 ++++++++++++ .../functions/systems/fn_getArsenalWhitelist.sqf | 1 + 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp index 21def3315..72a88dee0 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp @@ -122,6 +122,7 @@ class Cav_B_B_Crew_F: Cav_B_B_Scout_Base_F { category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Squad"}; loadout = [["rhs_weap_mk18_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_T1_high",["rhs_mag_30Rnd_556x45_Mk262_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",1]]],["rhsusf_iotv_ocp_Repair",[["HandGrenade",2,1],["SmokeShellPurple",1,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",2],["ACE_Chemlight_IR",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG",4,30]]],["USP_TACTICAL_PACK",[["ToolKit",1],["ACE_tourniquet",8],["ACE_quikclot",10],["ACE_packingBandage",10]]],"rhsusf_cvc_green_helmet","USP_BALACLAVA_ADV_SMC1_RGR2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]]; abilityEngineer = 1; + role = "strykercrew"; }; class Cav_B_B_Ifv_Driver_F: Cav_B_B_Scout_Base_F { displayName = "Stryker Driver"; @@ -129,6 +130,7 @@ class Cav_B_B_Ifv_Driver_F: Cav_B_B_Scout_Base_F { category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Squad"}; loadout = [["rhs_weap_mk18_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_T1_high",["rhs_mag_30Rnd_556x45_Mk262_PMAG",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["kat_chestSeal",2],["kat_guedel",1],["ACE_microDAGR",1],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_splint",1]]],["rhsusf_iotv_ocp_Repair",[["HandGrenade",2,1],["SmokeShellPurple",1,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",2],["ACE_Chemlight_IR",2,1],["30Rnd_556x45_Stanag_red",4,30]]],["USP_TACTICAL_PACK",[["ToolKit",1],["ACE_tourniquet",8],["ACE_quikclot",10],["ACE_packingBandage",10]]],"rhsusf_cvc_green_helmet","USP_BALACLAVA_ADV_SMC1_RGR2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]]; abilityEngineer = 1; + role = "strykercrew"; }; class Cav_B_B_Ifv_Commander_F: Cav_B_B_Scout_Base_F { displayName = "Stryker Vehicle Commander"; @@ -136,6 +138,7 @@ class Cav_B_B_Ifv_Commander_F: Cav_B_B_Scout_Base_F { category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Squad"}; loadout = [["rhs_weap_mk18_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_T1_high",["rhs_mag_30Rnd_556x45_Mk262_PMAG",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["kat_chestSeal",2],["kat_guedel",1],["ACE_microDAGR",1],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_splint",1]]],["USP_CRYE_CPC_MEDIC_MC",[["HandGrenade",2,1],["SmokeShellPurple",1,1],["SmokeShell",4,1],["ACE_IR_Strobe_Item",2],["ACE_Chemlight_IR",2,1],["30Rnd_556x45_Stanag_red",4,30]]],["USP_TACTICAL_PACK",[["ToolKit",1],["ACE_tourniquet",8],["ACE_quikclot",10],["ACE_packingBandage",10]]],"rhsusf_cvc_green_helmet","USP_BALACLAVA_ADV_SMC1_RGR2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]]; abilityEngineer = 1; + role = "strykercrew"; }; // Named diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp index 79f1bb966..86d1e1af0 100644 --- a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp @@ -71,6 +71,12 @@ class Cav_B_C_RiflemanLAT_F: Cav_B_Charlie_base_F { loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",30],[],""],["rhs_weap_M136_hedp","","","",[],[],""],[],["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_ASLTB",[["SmokeShell",4,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan",9,30],["HandGrenade",2,1]]],["USP_ZIPON_PACK_CPC_BC_MC",[["USP_PVS15",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_CGSW","",[],["ItemMap","","","ItemCompass","ACE_Altimeter",""]]; icon = "iconManAT"; }; +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]]],["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",""]]; +}; class Cav_B_C_CombatLifeSaver_F: Cav_B_Charlie_base_F { displayName = "$STR_Cav_Charlie_Characters_C_CombatLifeSaver"; scope = 2; @@ -80,15 +86,6 @@ class Cav_B_C_CombatLifeSaver_F: Cav_B_Charlie_base_F { role = "cls"; icon = "iconManMedic"; }; -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]]],["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"; -}; // Named class Cav_B_C_SquadLeader_Bandit_1_F: Cav_B_C_SquadLeader_F { scope = 1; diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index c5623e29f..da5aca7a2 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -1791,6 +1791,18 @@ private _dataArray = [ ["ACE_splint",0] //-------------------------- ]], + ["arsenal_role_strykercrew",[ + //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] + ]], // Weapons ["arsenal_weap_ugl", [ diff --git a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf index 665a14d31..1339eca5d 100644 --- a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf +++ b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf @@ -59,6 +59,7 @@ private _roleSpecific = switch ([player] call EFUNC(gear,getLoadoutRole)) do { case "squadleader": {GET_CONTAINER_KEYS("arsenal_role_squadleader");}; case "fireteamleader": {GET_CONTAINER_KEYS("arsenal_role_fireteamleader");}; case "weapons": {GET_CONTAINER_KEYS("arsenal_role_weapons");}; + case "strykercrew": {GET_CONTAINER_KEYS("arsenal_role_strykercrew");}; case "pilot"; case "rotarypilot": {GET_CONTAINER_KEYS("arsenal_role_rotarypilot");}; case "rotarycrew": {GET_CONTAINER_KEYS("arsenal_role_pilotcrew");}; From 3416f0aeb1747fdb9a8b9655cff53feaf9a9c367 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 29 Apr 2024 11:23:09 -0400 Subject: [PATCH 50/58] Updated chemlights before I get yelled at by battalion (#1185) --- cScripts/functions/init/fn_init_logistics.sqf | 42 ++++++------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 3ed86e23a..7f475b067 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -98,18 +98,6 @@ private _dataArray = [ ["ACE_30Rnd_556x45_Stanag_M995_AP_mag", 0], ["rhs_mag_30Rnd_556x45_Mk262_PMAG", 0], ["rhsusf_mag_15Rnd_9x19_JHP",10], - - // Grenades - ["rhs_mag_m67",10], - ["SmokeShell",10], - ["SmokeShellRed",0], - ["SmokeShellBlue",0], - ["SmokeShellGreen",0], - ["SmokeShellOrange",0], - ["SmokeShellYellow",0], - ["SmokeShellPurple",0], - ["B_IR_Grenade",0], - ["ACE_M84",0], ["rhs_mag_M441_HE",0], ["rhs_mag_M433_HEDP",0], ["rhs_mag_m714_White",0], @@ -118,9 +106,18 @@ private _dataArray = [ ["rhs_mag_m713_Red",0], ["ACE_HUNTIR_M203",0], ["ACE_40mm_Flare_red",0], - ["Chemlight_green",0], - ["Chemlight_red",0], - ["Chemlight_yellow",0], + + // Grenades + ["HandGrenade",10], + ["SmokeShell",10], + ["SmokeShellBlue",0], + ["SmokeShellPurple",0], + ["SmokeShellRed",0], + ["ACE_Chemlight_HiBlue",0], + ["ACE_Chemlight_HiRed",0], + ["ACE_Chemlight_IR",0], + ["B_IR_Grenade",0], + ["ACE_M84",0], // Tools and Items ["Toolkit",10], @@ -280,13 +277,8 @@ private _dataArray = [ ["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], ["ACE_M84",0], @@ -331,13 +323,8 @@ private _dataArray = [ ["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], @@ -418,13 +405,8 @@ private _dataArray = [ ["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], ["ACE_M84",0], From 66d770f28b1f20696321ac6ceb276bd1e2a126cf Mon Sep 17 00:00:00 2001 From: Bethea Date: Mon, 29 Apr 2024 17:21:43 -0500 Subject: [PATCH 51/58] MH-47 Support for Jump Script --- cScripts/functions/mission/fn_addLineJump.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/mission/fn_addLineJump.sqf b/cScripts/functions/mission/fn_addLineJump.sqf index 1c24edb91..76103b367 100644 --- a/cScripts/functions/mission/fn_addLineJump.sqf +++ b/cScripts/functions/mission/fn_addLineJump.sqf @@ -29,7 +29,7 @@ params [ // Check so the options arent added twice. if (!isNil {_vehicle getVariable QEGVAR(VehicleFunc,JumpAction)}) exitWith {SHOW_WARNING_1("JumpAction", "Aircraft jump setting already applied for %1.", _vehicle)}; -private _conditionHoldAction = format ["((_target getCargoIndex player) != -1) && ((_target animationPhase 'ramp_bottom' > 0.64) or (_target animationPhase 'door_2_1' == 1) or (_target animationPhase 'door_2_2' == 1) or (_target animationPhase 'jumpdoor_1' == 1) or (_target animationPhase 'jumpdoor_2' == 1) or (_target animationPhase 'back_ramp_switch' == 1) or (_target animationPhase 'back_ramp_half_switch' == 1) or (_target doorPhase 'RearDoors' > 0.5) or (_target doorPhase 'Door_1_source' > 0.5) or (_target animationSourcePhase 'ramp_anim' > 0.5)) && ((getPosVisual _target) select 2 >= %1) && ((getPosVisual _target) select 2 <= %2) && (speed _target <= %3)", _minAltetude, _maxAltetude, _maxSpeed]; +private _conditionHoldAction = format ["((_target getCargoIndex player) != -1) && ((_target animationPhase 'ramp_bottom' > 0.64) or (_target animationPhase 'door_2_1' == 1) or (_target animationPhase 'door_2_2' == 1) or (_target animationPhase 'jumpdoor_1' == 1) or (_target animationPhase 'jumpdoor_2' == 1) or (_target animationPhase 'back_ramp_switch' == 1) or (_target animationPhase 'back_ramp_half_switch' == 1) or (_target doorPhase 'RearDoors' > 0.5) or (_target doorPhase 'Door_1_source' > 0.5) or (_target animationSourcePhase 'ramp_anim' > 0.5) or (_target animationPhase 'Ramp' < 0.5)) && ((getPosVisual _target) select 2 >= %1) && ((getPosVisual _target) select 2 <= %2) && (speed _target <= %3)", _minAltetude, _maxAltetude, _maxSpeed]; // Add hold action for jump private _actionID = [ From 11b88b204d5ce504c28fc781566e54ec67c7577a Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 29 Apr 2024 18:59:02 -0400 Subject: [PATCH 52/58] Updated fn_addLineJump.sqf --- cScripts/functions/mission/fn_addLineJump.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/mission/fn_addLineJump.sqf b/cScripts/functions/mission/fn_addLineJump.sqf index 76103b367..f450008a9 100644 --- a/cScripts/functions/mission/fn_addLineJump.sqf +++ b/cScripts/functions/mission/fn_addLineJump.sqf @@ -1,6 +1,6 @@ #include "..\script_component.hpp"; /* - * Author: CPL.Brostrom.A + * Author: CPL.Brostrom.A, Elemtael * This function adds a Jump out option to a vehicle. * * Arguments: From 3745c3570f2abd913361a1735eefdfde6767e030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Thu, 2 May 2024 16:41:22 +0000 Subject: [PATCH 53/58] Improved code quality for the the Halo and Line Jump script (#1191) --- cScripts/functions/mission/fn_addHaloJump.sqf | 16 +++++++++++++++- cScripts/functions/mission/fn_addLineJump.sqf | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/cScripts/functions/mission/fn_addHaloJump.sqf b/cScripts/functions/mission/fn_addHaloJump.sqf index e4b91368e..85f756437 100644 --- a/cScripts/functions/mission/fn_addHaloJump.sqf +++ b/cScripts/functions/mission/fn_addHaloJump.sqf @@ -24,7 +24,21 @@ params [ // Check so the options arent added twice. if (!isNil {_vehicle getVariable QEGVAR(VehicleFunc,HaloAction)}) exitWith {SHOW_WARNING_1("HaloJump", "Aircraft halo jump setting already applied for %1.", _vehicle)}; -private _conditionHoldAction = format ["((_target getCargoIndex player) != -1) && ((_target animationPhase 'ramp_bottom' > 0.64) or (_target animationPhase 'door_2_1' == 1) or (_target animationPhase 'door_2_2' == 1) or (_target animationPhase 'jumpdoor_1' == 1) or (_target animationPhase 'jumpdoor_2' == 1) or (_target animationPhase 'back_ramp_switch' == 1) or (_target animationPhase 'back_ramp_half_switch' == 1) or (_target doorPhase 'RearDoors' > 0.5) or (_target doorPhase 'Door_1_source' > 0.5) or (_target animationSourcePhase 'ramp_anim' > 0.5)) && ((getPosVisual _target) select 2 >= %1)", _minAltetude]; +private _doors = tostring { + ((_target animationPhase 'ramp_bottom' > 0.64) || // RHS_C130J + (_target animationPhase 'door_2_1' == 1) || // RHS_C130J + (_target animationPhase 'door_2_2' == 1) || // RHS_C130J + (_target animationPhase 'jumpdoor_1' == 1) || + (_target animationPhase 'jumpdoor_2' == 1) || + (_target animationPhase 'back_ramp_switch' == 1) || + (_target animationPhase 'back_ramp_half_switch' == 1) || + (_target doorPhase 'RearDoors' > 0.5) || + (_target doorPhase 'Door_1_source' > 0.5) || + (_target animationSourcePhase 'ramp_anim' > 0.5) || + (_target animationPhase 'Ramp' < 0.5)) // TF373_RAF_HC5, TF373_SOAR_MH47G_No_Rear_Guns +}; + +private _conditionHoldAction = format ["((_target getCargoIndex player) != -1) && (%1) && ((getPosVisual _target) select 2 >= %2)", _doors, _minAltetude]; // Add hold action for jump private _actionID = [ diff --git a/cScripts/functions/mission/fn_addLineJump.sqf b/cScripts/functions/mission/fn_addLineJump.sqf index f450008a9..d80c13976 100644 --- a/cScripts/functions/mission/fn_addLineJump.sqf +++ b/cScripts/functions/mission/fn_addLineJump.sqf @@ -29,7 +29,21 @@ params [ // Check so the options arent added twice. if (!isNil {_vehicle getVariable QEGVAR(VehicleFunc,JumpAction)}) exitWith {SHOW_WARNING_1("JumpAction", "Aircraft jump setting already applied for %1.", _vehicle)}; -private _conditionHoldAction = format ["((_target getCargoIndex player) != -1) && ((_target animationPhase 'ramp_bottom' > 0.64) or (_target animationPhase 'door_2_1' == 1) or (_target animationPhase 'door_2_2' == 1) or (_target animationPhase 'jumpdoor_1' == 1) or (_target animationPhase 'jumpdoor_2' == 1) or (_target animationPhase 'back_ramp_switch' == 1) or (_target animationPhase 'back_ramp_half_switch' == 1) or (_target doorPhase 'RearDoors' > 0.5) or (_target doorPhase 'Door_1_source' > 0.5) or (_target animationSourcePhase 'ramp_anim' > 0.5) or (_target animationPhase 'Ramp' < 0.5)) && ((getPosVisual _target) select 2 >= %1) && ((getPosVisual _target) select 2 <= %2) && (speed _target <= %3)", _minAltetude, _maxAltetude, _maxSpeed]; +private _doors = tostring { + ((_target animationPhase 'ramp_bottom' > 0.64) || // RHS_C130J + (_target animationPhase 'door_2_1' == 1) || // RHS_C130J + (_target animationPhase 'door_2_2' == 1) || // RHS_C130J + (_target animationPhase 'jumpdoor_1' == 1) || + (_target animationPhase 'jumpdoor_2' == 1) || + (_target animationPhase 'back_ramp_switch' == 1) || + (_target animationPhase 'back_ramp_half_switch' == 1) || + (_target doorPhase 'RearDoors' > 0.5) || + (_target doorPhase 'Door_1_source' > 0.5) || + (_target animationSourcePhase 'ramp_anim' > 0.5) || + (_target animationPhase 'Ramp' < 0.5)) // TF373_RAF_HC5, TF373_SOAR_MH47G_No_Rear_Guns +}; + +private _conditionHoldAction = format ["((_target getCargoIndex player) != -1) && (%1) && ((getPosVisual _target) select 2 >= %2) && ((getPosVisual _target) select 2 <= %3) && (speed _target <= %4)", _doors, _minAltetude, _maxAltetude, _maxSpeed]; // Add hold action for jump private _actionID = [ From 2ffe0667ed8e040c44ca96db768f2c4e6e871498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Fri, 3 May 2024 07:55:57 +0000 Subject: [PATCH 54/58] Changed pylon and logistics system to utilize separate sqf files (#1125) --- cScripts/CfgFunctions.hpp | 6 +- cScripts/cScripts_logistics.sqf | 2053 ++++++++++++++++ cScripts/cScripts_preInit.sqf | 3 + cScripts/cScripts_pylons.sqf | 168 ++ cScripts/functions/init/fn_init_logistics.sqf | 2057 +---------------- cScripts/functions/init/fn_init_pylons.sqf | 46 + .../logistics/fn_logistics_getContainer.sqf | 2 +- cScripts/functions/systems/fn_getIcon.sqf | 4 +- .../vehicle/fn_vehicle_addDefaultLoadout.sqf | 2 +- .../vehicle/fn_vehicle_addPylonSelection.sqf | 22 +- .../functions/vehicle/fn_vehicle_getPylon.sqf | 212 -- .../vehicle/fn_vehicle_getPylonIcon.sqf | 28 + .../vehicle/fn_vehicle_getPylonLoadout.sqf | 24 + .../vehicle/fn_vehicle_getPylonName.sqf | 24 + .../fn_vehicle_setupPylonCategories.sqf | 42 +- 15 files changed, 2386 insertions(+), 2307 deletions(-) create mode 100644 cScripts/cScripts_logistics.sqf create mode 100644 cScripts/cScripts_pylons.sqf create mode 100644 cScripts/functions/init/fn_init_pylons.sqf delete mode 100644 cScripts/functions/vehicle/fn_vehicle_getPylon.sqf create mode 100644 cScripts/functions/vehicle/fn_vehicle_getPylonIcon.sqf create mode 100644 cScripts/functions/vehicle/fn_vehicle_getPylonLoadout.sqf create mode 100644 cScripts/functions/vehicle/fn_vehicle_getPylonName.sqf diff --git a/cScripts/CfgFunctions.hpp b/cScripts/CfgFunctions.hpp index 229001bf2..fd563de22 100644 --- a/cScripts/CfgFunctions.hpp +++ b/cScripts/CfgFunctions.hpp @@ -10,6 +10,7 @@ class cScripts { class init_staging {}; class init_logistics {}; + class init_pylons {}; class init_diary {}; class init_message {}; @@ -189,7 +190,10 @@ class cScripts { class vehicle_applyLoadout {}; class vehicle_addDefaultLoadout {}; - class vehicle_getPylon {}; + + class vehicle_getPylonName {}; + class vehicle_getPylonLoadout {}; + class vehicle_getPylonIcon {}; // Other class vehicle_reset {}; diff --git a/cScripts/cScripts_logistics.sqf b/cScripts/cScripts_logistics.sqf new file mode 100644 index 000000000..bbb627ea0 --- /dev/null +++ b/cScripts/cScripts_logistics.sqf @@ -0,0 +1,2053 @@ +[ + // // // // // // // + // Starter Crates \\ + // // // // // // // + ["alpha_company", [ + // Radios + ["ACRE_PRC343", 0], + ["ACRE_PRC152", 0], + ["ACRE_PRC117F", 0], + ["TFAR_anprc152", 0], + + // Helmets + ["H_Cap_tan", 0], + ["H_Cap_headphones", 0], + ["DAR_Beret_Mar", 0], + ["rhsusf_hgu56p_black", 0], + ["rhsusf_hgu56p_green", 0], + ["rhsusf_hgu56p_mask_black_skull", 0], + ["rhsusf_hgu56p_mask_black", 0], + ["rhsusf_hgu56p_mask_green_mo", 0], + ["rhsusf_hgu56p_mask_green", 0], + ["rhsusf_hgu56p_mask_mo", 0], + ["rhsusf_hgu56p_mask_pink", 0], + ["rhsusf_hgu56p_mask_saf", 0], + ["rhsusf_hgu56p_mask_skull", 0], + ["rhsusf_hgu56p_mask_smiley", 0], + ["rhsusf_hgu56p_mask_tan", 0], + ["rhsusf_hgu56p_mask", 0], + ["rhsusf_hgu56p_pink", 0], + ["rhsusf_hgu56p_saf", 0], + ["rhsusf_hgu56p_tan", 0], + ["rhsusf_hgu56p_usa", 0], + ["rhsusf_hgu56p_visor_black", 0], + ["rhsusf_hgu56p_visor_green", 12], + ["rhsusf_hgu56p_visor_mask_black_skull", 0], + ["rhsusf_hgu56p_visor_mask_black", 12], + ["rhsusf_hgu56p_visor_mask_Empire_black", 0], + ["rhsusf_hgu56p_visor_mask_green_mo", 0], + ["rhsusf_hgu56p_visor_mask_green", 0], + ["rhsusf_hgu56p_visor_mask_mo", 0], + ["rhsusf_hgu56p_visor_mask_pink", 0], + ["rhsusf_hgu56p_visor_mask_saf", 0], + ["rhsusf_hgu56p_visor_mask_skull", 0], + ["rhsusf_hgu56p_visor_mask_smiley", 0], + ["rhsusf_hgu56p_visor_mask_tan", 0], + ["rhsusf_hgu56p_visor_mask", 0], + ["rhsusf_hgu56p_visor_pink", 0], + ["rhsusf_hgu56p_visor_saf", 0], + ["rhsusf_hgu56p_visor_tan", 0], + ["rhsusf_hgu56p_visor_usa", 0], + ["rhsusf_hgu56p_visor_white", 0], + ["rhsusf_hgu56p_visor", 12], + ["rhsusf_hgu56p_white", 0], + ["rhsusf_hgu56p", 0], + ["rhsusf_ihadss", 12], + ["rhsusf_patrolcap_ocp", 0], + + // Vest + ["B_ACU_crye_ocp_SH_1", 0], + ["B_ACU_crye_ocp_SH_vest_1", 0], + + + // Weapons + ["rhs_weap_m4a1_m320",0], + ["rhs_weap_m249_pip_L",0], + ["rhs_weap_m240B",0], + ["rhs_weap_M136_hp",0], + + ["acc_flashlight",0], + ["rhsusf_acc_anpeq15_bk_light",0], + ["rhsusf_acc_acog_mdo",0], + ["rhsusf_acc_ELCAN",0], + ["rhsusf_acc_compm4",0], + ["rhsusf_acc_acog3",0], + ["rhsusf_acc_eotech_xps3",0], + + // Ammo + ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0], + ["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], + ["ACE_30Rnd_556x45_Stanag_M995_AP_mag", 0], + ["rhs_mag_30Rnd_556x45_Mk262_PMAG", 0], + ["rhsusf_mag_15Rnd_9x19_JHP",10], + ["rhs_mag_M441_HE",0], + ["rhs_mag_M433_HEDP",0], + ["rhs_mag_m714_White",0], + ["rhs_mag_m715_Green",0], + ["rhs_mag_m716_yellow",0], + ["rhs_mag_m713_Red",0], + ["ACE_HUNTIR_M203",0], + ["ACE_40mm_Flare_red",0], + + // Grenades + ["HandGrenade",10], + ["SmokeShell",10], + ["SmokeShellBlue",0], + ["SmokeShellPurple",0], + ["SmokeShellRed",0], + ["ACE_Chemlight_HiBlue",0], + ["ACE_Chemlight_HiRed",0], + ["ACE_Chemlight_IR",0], + ["B_IR_Grenade",0], + ["ACE_M84",0], + + // Tools and Items + ["Toolkit",10], + ["ACE_Flashlight_MX991",0], + ["itemcTabHCam",0], + ["ACE_CableTie",0], + ["ACE_Chemlight_Shield",0], + ["ACE_VMH3",0], + ["ACE_VMM3",0], + ["Flagstack_Red",0], + ["Signpack_Mines",0], + + //cTab + ["ItemAndroid", 0], + ["ItemcTab", 0], + ["ItemcTabMisc", 0], + ["ItemAndroidMisc",0], + + // Medical + ["ACE_EarPlugs",10], + ["ACE_quikclot",0], + ["ACE_packingBandage",0], + ["ACE_tourniquet",0], + ["ACE_splint",0], + ["ACE_epinephrine",0], + ["ACE_personalAidKit",0], + ["ACE_bodyBag",0], + ["kat_IV_16",0], + ["kat_carbonate",0], + ["kat_naloxone",0], + ["kat_Painkiller",0], + ["kat_chestSeal",0], + + // NVG + ["USP_PVS14", 0], + ["USP_PVS15", 0], + ["USP_L4G19", 0], + ["USP_RHINO", 0], + + //Backpack + ["USP_TACTICAL_PACK", 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] + ]], + + ["bravo_company", [ + // Radios + ["ACRE_PRC343", 0], + ["ACRE_PRC152", 0], + ["ACRE_PRC117F", 0], + ["TFAR_anprc152", 0], + + // Helmets + ["USP_OPS_FASTXP_TAN_MC", 0], + ["USP_OPS_FASTXP_TAN_MC_02", 0], + ["USP_OPS_FASTXP_TAN_MC_03", 0], + ["USP_OPS_FASTXP_TAN_MC_04", 0], + ["USP_OPS_FASTXP_TAN_MC_05", 0], + ["USP_OPS_FASTXP_TAN_MC_06", 0], + ["USP_OPS_FASTXP_TAN_MC_07", 0], + ["USP_OPS_FASTXP_TAN_MC_08", 0], + ["USP_BOONIE_HAT_MC", 0], + + // Ammo + ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0], + ["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], + + // NVG + ["USP_PVS14", 0], + ["USP_PVS15", 0], + ["USP_L4G19", 0], + ["USP_L4G24",0], + ["USP_PVS31",0], + ["USP_PVS31_HIGH",0], + ["USP_PVS31_LOW",0], + ["USP_PVS31_COMPACT",0], + ["USP_RHINO", 0], + + // cTab + ["ItemAndroid", 0], + ["ItemcTab", 0], + ["ItemcTabMisc", 0], + ["ItemAndroidMisc",0], + + // Tools + ["ACE_EntrenchingTool", 0], + + // Backpacks + ["B_Carryall_mcamo", 0], + ["B_Kitbag_mcamo", 0], + ["UK3CB_B_Backpack_Pocket_OLI", 0], + ["UK3CB_B_Backpack_Pocket", 0] + ]], + + ["bravo_company_viking", [ + // Radios + ["ACRE_PRC343", 0], + ["ACRE_PRC152", 0], + ["ACRE_PRC117F", 0], + ["TFAR_anprc152", 0], + + // Lunchers and mortars + ["rhs_weap_M136_hp",0], + ["rhs_weap_M136",0], + ["rhs_weap_M136_hedp",1], + ["rhs_weap_m72a7",0], + ["dzn_MG_Tripod_M122A1_M240Mount_Carry", 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], + + ["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], + ["ACE_40mm_Flare_white",0], + ["ACE_40mm_Flare_red",0], + ["rhs_mag_m664_red_cluster",0], + ["rhs_mag_m713_Red",0], + ["rhs_mag_m716_yellow",0], + ["rhs_mag_M663_green_cluster",0], + ["ACE_40mm_Flare_ir",0], + + // Grenades + ["HandGrenade",10], + ["SmokeShell",10], + ["SmokeShellBlue",0], + ["SmokeShellPurple",0], + ["SmokeShellRed",0], + ["ACE_Chemlight_HiBlue",0], + ["ACE_Chemlight_HiRed",0], + ["ACE_Chemlight_IR",0], + ["ACE_M84",0], + ["rhs_mag_mk3a2",0], + + // Mines and Explosives + ["ACE_Clacker",0], + ["ACE_DefusalKit",0], + ["ACE_M26_Clacker",0], + ["SatchelCharge_Remote_Mag",0], + ["DemoCharge_Remote_Mag",0], + ["ClaymoreDirectionalMine_Remote_Mag",0], + + // Tools and Items + ["ACE_Flashlight_MX991",0], + ["ACE_CableTie",0], + ["ACE_wirecutter",0], + ["ACE_EntrenchingTool",0], + ["B_UavTerminal",0] + ]], + + ["bravo_company_atlas", [ + + // Radios + ["ACRE_PRC343", 0], + ["ACRE_PRC152", 0], + ["TFAR_anprc152", 0], + ["ACE_microDAGR",0], + ["ItemAndroid",0], + ["ItemAndroidMisc",0], + + // Tools and Items + ["ACE_Flashlight_MX991",0], + ["ACE_CableTie",0], + ["ACE_Chemlight_Shield",0], + ["ACE_Chemlight_White",0], + ["ACE_EntrenchingTool",0], + ["ACE_IR_Strobe_Item",0], + ["ACE_wirecutter",10], + + // Grenades + ["SmokeShell",10], + ["SmokeShellBlue",0], + ["SmokeShellPurple",0], + ["SmokeShellRed",0], + ["ACE_Chemlight_HiBlue",0], + ["ACE_Chemlight_HiRed",0], + ["ACE_Chemlight_IR",0], + + // Medical + ["ACE_EarPlugs",10], + ["ACE_bodyBag",0], + ["ACE_personalAidKit",0], + + // Backpacks + ["USP_DELTA_BAG_MC", 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] + ]], + + ["charlie_company", [ + // Radios + ["ACRE_PRC343", 0], + ["ACRE_PRC152", 0], + ["TFAR_anprc152", 0], + + // Helmets + ["DAR_Beret_Mar", 0], + ["USP_OPSCORE_FASTMTC_CGW", 0], + ["USP_OPSCORE_FASTMTC_CMW", 0], + ["USP_OPSCORE_FASTMTC_CMGSW", 0], + ["USP_OPSCORE_FASTMTC_CMGTW", 0], + ["USP_OPSCORE_FASTMTC_CMSW", 0], + ["USP_OPSCORE_FASTMTC_CMTW", 0], + ["USP_OPSCORE_FASTMTC_CW", 0], + ["USP_OPSCORE_FASTMTC_CGSW", 0], + ["USP_OPSCORE_FASTMTC_CGTW", 0], + ["USP_OPSCORE_FASTMTC_CSW", 0], + ["USP_OPSCORE_FASTMTC_CTW", 0], + + // Weapons + ["rhs_weap_M136_hp",0], + ["rhs_weap_M136",0], + ["rhs_weap_M136_hedp",10], + ["rhs_weap_m72a7",10], + ["dzn_MG_Tripod_M122A1_M240Mount_Carry",0], + + // Ammo + ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0], + ["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], + ["ACE_30Rnd_556x45_Stanag_M995_AP_mag", 0], + ["rhs_mag_30Rnd_556x45_Mk262_PMAG", 0], + ["rhsusf_200Rnd_556x45_mixed_soft_pouch", 10], + ["rhsusf_100Rnd_762x51_m62_tracer", 10], + ["rhs_mag_M397_HET", 0], + ["rhs_mag_M433_HEDP", 20], + ["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], + + ["MRAWS_HE_F", 0], + ["MRAWS_HEAT_F", 0], + ["MAA_MAAWS_ASM509", 0], + ["MAA_MAAWS_GMM_MT", 0], + ["NDS_M_6Rnd_60mm_HE_0", 0], + ["NDS_M_6Rnd_60mm_HE", 0], + ["NDS_M_6Rnd_60mm_SMOKE", 0], + ["NDS_M_6Rnd_60mm_ILLUM", 0], + + // Grenades + ["HandGrenade",10], + ["SmokeShell",10], + ["SmokeShellBlue",0], + ["SmokeShellPurple",0], + ["SmokeShellRed",0], + ["ACE_Chemlight_HiBlue",0], + ["ACE_Chemlight_HiRed",0], + ["ACE_Chemlight_IR",0], + ["ACE_M84",0], + ["rhs_mag_mk3a2",0], + + // Mines and Explosives + ["ACE_Clacker",0], + ["ACE_DefusalKit",0], + ["ACE_M26_Clacker",0], + ["SatchelCharge_Remote_Mag",0], + ["DemoCharge_Remote_Mag",0], + ["ClaymoreDirectionalMine_Remote_Mag",0], + + // Tools and Items + ["ACE_CableTie",0], + ["ACE_EntrenchingTool",10], + ["ACE_wirecutter",10], + ["rhs_weap_rsp30_green",0], + ["rhs_weap_rsp30_red",0], + ["ACE_SpareBarrel", 4], + + //cTab + ["ItemAndroid", 0], + ["ItemAndroidMisc",0], + + // NVG + ["USP_PVS14", 0], + ["USP_PVS15", 0], + ["USP_L4G19", 0], + ["rhsusf_ANPVS_14", 0], + ["rhsusf_ANPVS_15", 0], + ["USP_RHINO", 0] + ]], + + // // // // // // // + // Resupply Crates \\ + // // // // // // // + ["crate_medicalInfantry", [ + // Bandages + ["ACE_elasticBandage",60], + ["ACE_packingBandage",90], + ["ACE_quikclot",150], + ["kat_chestSeal",20], + ["kat_guedel",10], + + // Tourniquets + ["ACE_tourniquet",50], + + // Fluids + ["ACE_plasmaIV",20], + ["ACE_plasmaIV_500",20], + + // IV & IO Catheters + ["kat_IO_FAST",10], + ["kat_IV_16",20], + + // Autoinjector Medication + ["kat_naloxone",20], + ["ACE_epinephrine",20], + ["kat_phenylephrineAuto",24], + + // Oral Medication + ["kat_Painkiller",60], + + // Splints + ["ACE_splint",40], + + // Surgical Medication + ["kat_lidocaine",16], + + // Surgical Kits + ["ACE_surgicalKit",2], + + // Body Bags + ["ACE_bodyBag", 20] + ]], + + ["crate_medicalAtlas", [ + // AEDs + ["kat_AED",1], + ["kat_X_AED",1], + + // Airway Management and Respiration + ["kat_aatKit",10], + ["kat_accuvac",2], + ["kat_BVM",4], + ["kat_chestSeal",20], + ["kat_larynx",10], + + // Autoinjectors + ["ACE_morphine",20], + ["ACE_epinephrine",40], + ["kat_phenylephrineAuto",40], + + // Bandages + ["ACE_elasticBandage",150], + ["ACE_packingBandage",90], + ["ACE_quikclot",150], + + // Diagnostic Tools + ["kat_Pulseoximeter",12], + ["kat_ultrasound",2], + ["kat_stethoscope",4], + + // Tourniquets + ["ACE_tourniquet",20], + + // Fluids + ["ACE_plasmaIV",30], + ["ACE_plasmaIV_500",30], + ["ACE_salineIV_250",20], + + // IV & IO Catheters + ["kat_IO_FAST",20], + ["kat_IV_16",40], + + // Analgesic Medication + ["kat_fentanyl",10], + ["kat_ketamine",10], + ["kat_nalbuphine",40], + + // Cardiac resuscitation + ["kat_amiodarone",10], + ["kat_atropine",10], + + // Blood Pressure Medication + ["kat_nitroglycerin",40], + ["kat_phenylephrine",40], + ["kat_norepinephrine",40], + + // Hemorrhage Control Medication + ["kat_EACA",40], + ["kat_TXA",40], + + // Oral Medication & + ["kat_naloxone",20], + ["kat_carbonate",20], + ["kat_Painkiller",40], + ["kat_PenthroxItem",10], + + // Splints + ["ACE_splint",40], + + // Surgical Equipment + ["kat_scalpel",40], + ["kat_plate",10], + ["kat_clamp",4], + ["kat_retractor",4], + ["kat_vacuum",1], + ["kat_reboa",12], + + // Surgical Medication + ["kat_lidocaine",20], + ["kat_lorazepam",10], + ["kat_etomidate",20], + ["kat_flumazenil",10], + + // Surgical Kits + ["ACE_surgicalKit",4], + + // Body Bags + ["ACE_bodyBag",10], + + // E-Tools + ["ACE_EntrenchingTool",4], + + // Smokes + ["SmokeShell",16], + ["SmokeShellBlue",8], + ["SmokeShellGreen",8], + ["SmokeShellPurple",8], + + // Flags and Paint + ["ace_marker_flags_green",4], + ["ace_marker_flags_red",4], + ["ace_marker_flags_blue",4], + ["ACE_SpraypaintBlue",1], + ["ACE_SpraypaintRed",1] + ]], + + ["crate_strykerDragoon_resupply", [ + // Rifle Ammo + ["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], + + // AT + ["rhs_fgm148_magazine_AT", 1], + + // M320 Ammo + ["rhs_mag_m433_HEDP", 20], + ["rhs_mag_m397_HET", 10], + ["rhs_mag_M664_red_cluster", 5], + ["rhs_mag_m714_White", 5], + ["ACE_40mm_Flare_IR", 5], + ["ACE_HUNTIR_M203", 5], + + // Offensive/Defensive Grenades + ["HandGrenade", 9], + + // Smoke Grenades + ["SmokeShell", 10], + ["SmokeShellRed", 2], + ["SmokeShellBlue", 2], + ["SmokeShellYellow", 2], + ["SmokeShellGreen", 2], + + // Medical + ["ACE_quikclot", 40], + ["ACE_tourniquet", 10] + ]], + ["crate_strykerDragoon_60mm",[ + ["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_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], + ["rhs_fim92_mag",2] + ]], + ["crate_resupply_general", [ + // Rifle Ammo + ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",70], + ["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",7], + + // MG Ammo + ["rhsusf_200rnd_556x45_mixed_soft_pouch",16], + ["rhsusf_100Rnd_762x51_m62_tracer",19], + + // AT + ["rhs_fgm148_magazine_AT",3], + ["MRAWS_HEAT_F",6], + ["MRAWS_HE_F",3], + ["rhs_weap_M136_hedp",8], + + // AA + ["rhs_fim92_mag",3], + + // M320 Ammo + ["rhs_mag_M433_HEDP",40], + ["rhs_mag_m714_White",20], + ["ACE_HUNTIR_M203",5], + ["ACE_40mm_Flare_white",10], + ["ACE_40mm_Flare_IR",10], + + // Mortar Ammo + ["NDS_M_6Rnd_60mm_HE_0",3], + ["NDS_M_6Rnd_60mm_HE",7], + ["NDS_M_6Rnd_60mm_SMOKE",2], + + // Offensive/Defensive Hand Grenades + ["HandGrenade",20], + + // LTL Hand Grenades + ["ACE_M84",10], + + // Smoke Grenades + ["SmokeShell",30], + ["SmokeShellRed",10], + ["SmokeShellBlue",10], + + // Chemlights + ["ACE_Chemlight_HiRed",15], + ["ACE_Chemlight_HiBlue",15], + ["ACE_Chemlight_IR",15], + + // Explosives + ["SatchelCharge_Remote_Mag",2], + ["DemoCharge_Remote_Mag",4], + + ["ACE_EarPlugs", 3], + ["ACE_quikclot", 80], + ["ACE_tourniquet", 15] + ]], + + // // // // // // // + // Alpha Vehicles \\ + // // // // // // // + ["vehicle_heliTransport", [ + ["ToolKit", 2], + ["ACE_rope18", 4], + ["ACE_rope36", 2], + + // Medical + ["kat_AED",1], + ["ACE_epinephrine",4], + ["ACE_splint",4], + ["kat_naloxone",2], + ["ACE_tourniquet",8], + ["kat_guedel",2], + ["kat_ncdKit",2], + ["kat_pocketBVM",1], + ["kat_accuvac",1], + ["kat_chestSeal",4], + ["ACE_quikclot",20], + ["ACE_packingBandage",20], + + ["rhs_mag_30Rnd_556x45_M855A1_Stanag", 32], + ["SmokeShell", 8] + ]], + + // // // // // // // + // Bravo Vehicles \\ + // // // // // // // + ["vehicle_medicalAtlas", [ + // AEDs + ["kat_AED",1], + ["kat_X_AED",1], + + // Analgesic + ["kat_fentanyl",10], + ["kat_ketamine",20], + ["kat_nalbuphine",30], + ["kat_PenthroxItem",20], + + // Airway Management and Respiration + ["kat_aatKit",4], + ["kat_accuvac",1], + ["kat_BVM",2], + ["kat_chestSeal",30], + ["kat_larynx",15], + ["kat_pocketBVM",3], + + + // Bandages + ["ACE_elasticBandage",150], + ["ACE_packingBandage",90], + ["ACE_quikclot",150], + + // Tourniquets + ["ACE_tourniquet",20], + ["kat_reboa",10], + + // Fluids + ["ACE_plasmaIV",30], + ["ACE_plasmaIV_500",30], + ["ACE_salineIV_250",20], + + // IV & IO Catheters + ["kat_IO_FAST",20], + ["kat_IV_16",40], + + // Blood Pressure Medication + ["kat_nitroglycerin",40], + ["kat_phenylephrine",40], + ["kat_norepinephrine",40], + + // Hemorrhage Control Medication + ["kat_EACA",40], + ["kat_TXA",40], + ["kat_amiodarone",15], + ["ACE_epinephrine",10], + + // Oral Medication + ["kat_carbonate",20], + ["kat_Painkiller",40], + + // Autoinjector & Nasal Spray Medication + ["kat_naloxone",20], + ["ACE_morphine",20], + ["ACE_epinephrine",40], + ["kat_phenylephrineAuto",40], + ["ACE_adenosine",0], + + // Splints + ["ACE_splint",20], + + // Surgical Equipment + ["kat_scalpel",40], + ["kat_plate",10], + ["kat_clamp",1], + ["kat_retractor",1], + ["kat_vacuum",1], + + // Surgical Medication + ["kat_lidocaine",20], + ["kat_lorazepam",10], + ["kat_etomidate",20], + ["kat_flumazenil",10], + + // Surgical Kits + ["ACE_surgicalKit",4], + + // Body Bags + ["ACE_bodyBag",10], + + // E-Tools + ["ACE_EntrenchingTool",4], + + // Smoke Grenades + ["SmokeShell",16], + ["SmokeShellBlue",4], + ["SmokeShellGreen",4], + ["SmokeShellPurple",4], + + // Flags and Paint + ["ace_marker_flags_green",4], + ["ace_marker_flags_red",4], + ["ace_marker_flags_blue",4], + ["ACE_SpraypaintBlue",1], + ["ACE_SpraypaintRed",1], + + // Rifle Ammo + ["rhs_mag_30Rnd_556x45_M855A1_PMAG",24], // M855A1 PMAGs + ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",8] // M856A1 PMAGs + ]], + ["vehicle_strykerDragoon", [ + // AT + ["rhs_weap_fgm148", 1], + ["rhs_fgm148_magazine_AT", 2], + + // MG Ammo + ["rhsusf_100Rnd_762x51_m62_tracer", 10], + + // Tools + ["ACE_wirecutter", 1], + + + // Medical + ["kat_AED",1], + ["ACE_epinephrine",4], + ["ACE_splint",4], + ["kat_naloxone",2], + ["ACE_tourniquet",8], + ["kat_guedel",2], + ["kat_ncdKit",2], + ["kat_pocketBVM",1], + ["kat_accuvac",1], + ["kat_chestSeal",4], + ["ACE_quikclot",20], + ["ACE_packingBandage",20] + ]], + ["vehicle_strykerDragoon_V4", [ + // AT + ["rhs_weap_fgm148", 1], + ["rhs_fgm148_magazine_AT", 2], + + // MG Ammo + ["rhsusf_100Rnd_762x51_m62_tracer", 10], + + // Tools + ["ACE_wirecutter", 1], + + // Medical + ["kat_AED",1], + ["ACE_epinephrine",4], + ["ACE_splint",4], + ["kat_naloxone",2], + ["ACE_tourniquet",8], + ["kat_guedel",2], + ["kat_ncdKit",2], + ["kat_pocketBVM",1], + ["kat_accuvac",1], + ["kat_chestSeal",4], + ["ACE_quikclot",20], + ["ACE_packingBandage",20] + ]], + + // // // // // // // // + // Charlie Vehicles \\ + // // // // // // // // + ["vehicle_HMMWV", [ + // Rifle Ammo + ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",42], + + // MG Ammo + ["rhsusf_200Rnd_556x45_mixed_soft_pouch",8], + + // AT + ["rhs_weap_fgm148",1], + ["rhs_fgm148_magazine_AT",1], + ["rhs_weap_M136_hedp",2], + + // M320 Ammo + ["rhs_mag_M433_HEDP",20], + ["rhs_mag_m714_White",6], + ["rhs_mag_m713_Red",4], + ["ACE_HuntIR_M203",1], + + // Offensive/Defensive Hand Grenades + ["HandGrenade",8], + + // Smoke Grenades + ["SmokeShell",10], + ["SmokeShellBlue",2], + ["SmokeShellRed",2], + + // Chemlights + ["ACE_Chemlight_HiBlue",2], + ["ACE_Chemlight_HiRed",2], + ["ACE_Chemlight_IR",4], + + // Medical + ["kat_AED",1], + ["ACE_epinephrine",4], + ["ACE_splint",4], + ["kat_naloxone",2], + ["ACE_tourniquet",8], + ["kat_guedel",4], + ["kat_chestSeal",6], + ["ACE_packingBandage",40] + ]], + + ["vehicle_HMMWV_Weapons", [ + // Rifle Ammo + ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",25], + + // MG Ammo + ["rhsusf_100Rnd_762x51_m62_tracer",18], + + // AT + ["rhs_weap_fgm148",1], + ["rhs_fgm148_magazine_AT",1], + ["MRAWS_HE_F",2], + ["MRAWS_HEAT_F",6], + + // M320 Ammo + ["rhs_mag_m713_Red",4], + + // Offensive/Defensive Hand Grenades + ["HandGrenade",4], + + // Smoke Grenades + ["SmokeShell",6], + ["SmokeShellBlue",1], + + // Chemlights + ["ACE_Chemlight_HiBlue",2], + ["ACE_Chemlight_IR",2], + + // Medical + ["ACE_splint",4], + ["ACE_tourniquet",8], + ["kat_guedel",4], + ["kat_chestSeal",6], + ["ACE_packingBandage",40] + ]], + + // // // // // // + // Specialized \\ + // // // // // // + ["crate_mortar_60mm_ammo", [ + ["NDS_M_6Rnd_60mm_HE_0",5], + ["NDS_M_6Rnd_60mm_HE",5], + ["NDS_M_6Rnd_60mm_SMOKE",2], + ["NDS_M_6Rnd_60mm_ILLUM",2] + ]], + // ["demolitions", []], + ["radios", [ + ["ACRE_PRC343", 0], + ["ACRE_PRC152", 0], + ["ACRE_PRC117F", 0], + + ["TFAR_anprc152", 0] + ]], + + // No longer used \\ + ["vehicle_bradley", [ + ["rhs_weap_fgm148", 1], + ["rhs_fgm148_magazine_AT", 2], + ["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], + ["rhs_weap_M136", 4], + ["B_UAV_01_backpack_F", 2], + ["B_UavTerminal", 1], + ["ACE_UAVBattery", 4], + ["ACE_wirecutter", 1] + ]], + + // // // // // + // Arsenal \\ + // // // // // + ["arsenal_common", [ + ["G_Aviator", 0], + ["rhs_googles_black", 0], + ["rhs_googles_clear", 0], + ["rhs_googles_orange", 0], + ["rhs_googles_yellow", 0], + ["rhs_ess_black", 0], + ["G_Shades_Black", 0], + ["G_Shades_Blue", 0], + ["G_Shades_Green", 0], + ["G_Shades_Red", 0], + ["rhsusf_shemagh_grn", 0], + ["rhsusf_shemagh2_grn", 0], + ["rhsusf_shemagh_od", 0], + ["rhsusf_shemagh2_od", 0], + ["rhsusf_shemagh_tan", 0], + ["rhsusf_shemagh2_tan", 0], + ["rhsusf_shemagh_white", 0], + ["rhsusf_shemagh2_white", 0], + ["rhsusf_shemagh_gogg_grn", 0], + ["rhsusf_shemagh2_gogg_grn", 0], + ["rhsusf_shemagh_gogg_od", 0], + ["rhsusf_shemagh2_gogg_od", 0], + ["rhsusf_shemagh_gogg_tan", 0], + ["rhsusf_shemagh2_gogg_tan", 0], + ["rhsusf_shemagh_gogg_white", 0], + ["rhsusf_shemagh2_gogg_white", 0], + ["rhsusf_oakley_goggles_blk", 0], + ["rhsusf_oakley_goggles_clr", 0], + ["rhsusf_oakley_goggles_ylw", 0], + ["USP_RAID_BLK2", 0], + ["USP_RAID_BLK", 0], + ["USP_RAID_SMC1_BLK2", 0], + ["USP_RAID_SMC1_BLK", 0], + ["USP_RAID_SMC2_BLK2", 0], + ["USP_RAID_SMC2_BLK", 0], + ["USP_RAID_SMC3_BLK2", 0], + ["USP_RAID_SMC3_BLK", 0], + ["USP_RAID_SMG1_BLK2", 0], + ["USP_RAID_SMG1_BLK", 0], + ["USP_RAID_SMG2_BLK2", 0], + ["USP_RAID_SMG2_BLK", 0], + ["USP_RAID_SMG3_BLK2", 0], + ["USP_RAID_SMG3_BLK", 0], + ["USP_BALACLAVA_CBR", 0], + ["USP_BALACLAVA_GRY", 0], + ["USP_BALACLAVA_MCA", 0], + ["USP_BALACLAVA_RGR", 0], + ["USP_BALACLAVA2_CBR", 0], + ["USP_BALACLAVA2_GRY", 0], + ["USP_BALACLAVA2_MCA", 0], + ["USP_BALACLAVA2_RGR", 0], + ["USP_BALACLAVA_ADV_CBR", 0], + ["USP_BALACLAVA_ADV_GRY", 0], + ["USP_BALACLAVA_ADV_MCA", 0], + ["USP_BALACLAVA_ADV_RGR", 0], + ["USP_BALACLAVA_ADV_CBR2", 0], + ["USP_BALACLAVA_ADV_GRY2", 0], + ["USP_BALACLAVA_ADV_MCA2", 0], + ["USP_BALACLAVA_ADV_RGR2", 0], + ["USP_BALACLAVA_ADV_SMC1_CBR", 0], + ["USP_BALACLAVA_ADV_SMC1_GRY", 0], + ["USP_BALACLAVA_ADV_SMC1_MCA", 0], + ["USP_BALACLAVA_ADV_SMC1_RGR", 0], + ["USP_BALACLAVA_ADV_SMC1_CBR2", 0], + ["USP_BALACLAVA_ADV_SMC1_GRY2", 0], + ["USP_BALACLAVA_ADV_SMC1_MCA2", 0], + ["USP_BALACLAVA_ADV_SMC1_RGR2", 0], + ["USP_BALACLAVA_ADV_SMG1_CBR", 0], + ["USP_BALACLAVA_ADV_SMG1_GRY", 0], + ["USP_BALACLAVA_ADV_SMG1_MCA", 0], + ["USP_BALACLAVA_ADV_SMG1_RGR", 0], + ["USP_BALACLAVA_ADV_SMG1_CBR2", 0], + ["USP_BALACLAVA_ADV_SMG1_GRY2", 0], + ["USP_BALACLAVA_ADV_SMG1_MCA2", 0], + ["USP_BALACLAVA_ADV_SMG1_RGR2", 0], + ["USP_BALACLAVA_ESS_CBR", 0], + ["USP_BALACLAVA_ESS_GRY", 0], + ["USP_BALACLAVA_ESS_MCA", 0], + ["USP_BALACLAVA_ESS_RGR", 0], + ["USP_BALACLAVA_ESS_CBR2", 0], + ["USP_BALACLAVA_ESS_GRY2", 0], + ["USP_BALACLAVA_ESS_MCA2", 0], + ["USP_BALACLAVA_ESS_RGR2", 0], + ["USP_BALACLAVA_ESS_CBR3", 0], + ["USP_BALACLAVA_ESS_GRY3", 0], + ["USP_BALACLAVA_ESS_MCA3", 0], + ["USP_BALACLAVA_ESS_RGR3", 0], + ["USP_BALACLAVA_ESS_SMC1_CBR", 0], + ["USP_BALACLAVA_ESS_SMC1_GRY", 0], + ["USP_BALACLAVA_ESS_SMC1_MCA", 0], + ["USP_BALACLAVA_ESS_SMC1_RGR", 0], + ["USP_BALACLAVA_ESS_SMC1_CBR2", 0], + ["USP_BALACLAVA_ESS_SMC1_GRY2", 0], + ["USP_BALACLAVA_ESS_SMC1_MCA2", 0], + ["USP_BALACLAVA_ESS_SMC1_RGR2", 0], + ["USP_BALACLAVA_ESS_SMG1_CBR", 0], + ["USP_BALACLAVA_ESS_SMG1_GRY", 0], + ["USP_BALACLAVA_ESS_SMG1_MCA", 0], + ["USP_BALACLAVA_ESS_SMG1_RGR", 0], + ["USP_BALACLAVA_ESS_SMG1_CBR2", 0], + ["USP_BALACLAVA_ESS_SMG1_GRY2", 0], + ["USP_BALACLAVA_ESS_SMG1_MCA2", 0], + ["USP_BALACLAVA_ESS_SMG1_RGR2", 0], + ["USP_BALACLAVA_ESS_SMG1_CBR3", 0], + ["USP_BALACLAVA_ESS_SMG1_GRY3", 0], + ["USP_BALACLAVA_ESS_SMG1_MCA3", 0], + ["USP_BALACLAVA_ESS_SMG1_RGR3", 0], + ["USP_BALACLAVA_OAK_CBR", 0], + ["USP_BALACLAVA_OAK_GRY", 0], + ["USP_BALACLAVA_OAK_MCA", 0], + ["USP_BALACLAVA_OAK_RGR", 0], + ["USP_BALACLAVA_OAK_CBR2", 0], + ["USP_BALACLAVA_OAK_GRY2", 0], + ["USP_BALACLAVA_OAK_MCA2", 0], + ["USP_BALACLAVA_OAK_RGR2", 0], + ["USP_BALACLAVA_OAK_SMC1_CBR", 0], + ["USP_BALACLAVA_OAK_SMC1_GRY", 0], + ["USP_BALACLAVA_OAK_SMC1_MCA", 0], + ["USP_BALACLAVA_OAK_SMC1_RGR", 0], + ["USP_BALACLAVA_OAK_SMC1_CBR2", 0], + ["USP_BALACLAVA_OAK_SMC1_GRY2", 0], + ["USP_BALACLAVA_OAK_SMC1_MCA2", 0], + ["USP_BALACLAVA_OAK_SMC1_RGR2", 0], + ["USP_BALACLAVA_OAK_SMG1_CBR", 0], + ["USP_BALACLAVA_OAK_SMG1_GRY", 0], + ["USP_BALACLAVA_OAK_SMG1_MCA", 0], + ["USP_BALACLAVA_OAK_SMG1_RGR", 0], + ["USP_BALACLAVA_OAK_SMG1_CBR2", 0], + ["USP_BALACLAVA_OAK_SMG1_GRY2", 0], + ["USP_BALACLAVA_OAK_SMG1_MCA2", 0], + ["USP_BALACLAVA_OAK_SMG1_RGR2", 0], + ["USP_ADVANCER_CLR", 0], + ["USP_ADVANCER", 0], + ["USP_ADVANCER_SF2", 0], + ["USP_ADVANCER_SF3", 0], + ["USP_ADVANCER_SFL2", 0], + ["USP_ADVANCER_SFL3", 0], + ["USP_ADVANCER_SL2", 0], + ["USP_ADVANCER_SL3", 0], + ["USP_ADVANCER_SN2", 0], + ["USP_ADVANCER_SN3", 0], + ["USP_ADVANCER_SNL2", 0], + ["USP_ADVANCER_SNL3", 0], + ["USP_ADVANCER_ST2", 0], + ["USP_ADVANCER_ST3", 0], + ["USP_ADVANCER_STL2", 0], + ["USP_ADVANCER_STL3", 0], + ["USP_CROSSBOW_BLK2", 0], + ["USP_CROSSBOW_BLK", 0], + ["USP_CROSSBOW_TAN2", 0], + ["USP_CROSSBOW_TAN", 0], + ["USP_CROSSBOW_SMC1_BLK2", 0], + ["USP_CROSSBOW_SMC1_BLK", 0], + ["USP_CROSSBOW_SMC2_BLK2", 0], + ["USP_CROSSBOW_SMC2_BLK", 0], + ["USP_CROSSBOW_SMC3_BLK2", 0], + ["USP_CROSSBOW_SMC3_BLK", 0], + ["USP_CROSSBOW_SMG1_BLK2", 0], + ["USP_CROSSBOW_SMG1_BLK", 0], + ["USP_CROSSBOW_SMG2_BLK2", 0], + ["USP_CROSSBOW_SMG2_BLK", 0], + ["USP_CROSSBOW_SMG3_BLK2", 0], + ["USP_CROSSBOW_SMG3_BLK", 0], + ["USP_CROSSBOW_SMC1_TAN2", 0], + ["USP_CROSSBOW_SMC1_TAN", 0], + ["USP_CROSSBOW_SMC2_TAN2", 0], + ["USP_CROSSBOW_SMC2_TAN", 0], + ["USP_CROSSBOW_SMC3_TAN2", 0], + ["USP_CROSSBOW_SMC3_TAN", 0], + ["USP_CROSSBOW_SMG1_TAN2", 0], + ["USP_CROSSBOW_SMG1_TAN", 0], + ["USP_CROSSBOW_SMG2_TAN2", 0], + ["USP_CROSSBOW_SMG2_TAN", 0], + ["USP_CROSSBOW_SMG3_TAN2", 0], + ["USP_CROSSBOW_SMG3_TAN", 0], + ["USP_GATORZ_BLK2", 0], + ["USP_GATORZ_BLK", 0], + ["USP_GATORZ_SMC1_BLK2", 0], + ["USP_GATORZ_SMC1_BLK", 0], + ["USP_GATORZ_SMC2_BLK2", 0], + ["USP_GATORZ_SMC2_BLK", 0], + ["USP_GATORZ_SMC3_BLK2", 0], + ["USP_GATORZ_SMC3_BLK", 0], + ["USP_GATORZ_SMG1_BLK2", 0], + ["USP_GATORZ_SMG1_BLK", 0], + ["USP_GATORZ_SMG2_BLK2", 0], + ["USP_GATORZ_SMG2_BLK", 0], + ["USP_GATORZ_SMG3_BLK2", 0], + ["USP_GATORZ_SMG3_BLK", 0], + ["USP_OAKLEY_SI2", 0], + ["USP_OAKLEY_SI2_MC", 0], + ["USP_OAKLEY_SI2_TAN", 0], + ["USP_DETCORD_BLK2", 0], + ["USP_DETCORD_BLK", 0], + ["USP_DETCORD_SMC1_BLK2", 0], + ["USP_DETCORD_SMC1_BLK", 0], + ["USP_DETCORD_SMC2_BLK2", 0], + ["USP_DETCORD_SMC2_BLK", 0], + ["USP_DETCORD_SMC3_BLK2", 0], + ["USP_DETCORD_SMC3_BLK", 0], + ["USP_DETCORD_SMG1_BLK2", 0], + ["USP_DETCORD_SMG1_BLK", 0], + ["USP_DETCORD_SMG2_BLK2", 0], + ["USP_DETCORD_SMG2_BLK", 0], + ["USP_DETCORD_SMG3_BLK2", 0], + ["USP_DETCORD_SMG3_BLK", 0], + ["USP_DETCORD_TAN2", 0], + ["USP_DETCORD_TAN", 0], + ["USP_DETCORD_SMC1_TAN2", 0], + ["USP_DETCORD_SMC1_TAN", 0], + ["USP_DETCORD_SMC2_TAN2", 0], + ["USP_DETCORD_SMC2_TAN", 0], + ["USP_DETCORD_SMC3_TAN2", 0], + ["USP_DETCORD_SMC3_TAN", 0], + ["USP_DETCORD_SMG1_TAN2", 0], + ["USP_DETCORD_SMG1_TAN", 0], + ["USP_DETCORD_SMG2_TAN2", 0], + ["USP_DETCORD_SMG2_TAN", 0], + ["USP_DETCORD_SMG3_TAN2", 0], + ["USP_DETCORD_SMG3_TAN", 0], + ["USP_MFRAME_BLK2", 0], + ["USP_MFRAME_BLK", 0], + ["USP_MFRAME_TAN2", 0], + ["USP_MFRAME_TAN", 0], + ["USP_MFRAME_SMC1_BLK2", 0], + ["USP_MFRAME_SMC1_BLK", 0], + ["USP_MFRAME_SMC2_BLK2", 0], + ["USP_MFRAME_SMC2_BLK", 0], + ["USP_MFRAME_SMC3_BLK2", 0], + ["USP_MFRAME_SMC3_BLK", 0], + ["USP_MFRAME_SMG1_BLK2", 0], + ["USP_MFRAME_SMG1_BLK", 0], + ["USP_MFRAME_SMG2_BLK2", 0], + ["USP_MFRAME_SMG2_BLK", 0], + ["USP_MFRAME_SMG3_BLK2", 0], + ["USP_MFRAME_SMG3_BLK", 0], + ["USP_MFRAME_SMC1_TAN2", 0], + ["USP_MFRAME_SMC1_TAN", 0], + ["USP_MFRAME_SMC2_TAN2", 0], + ["USP_MFRAME_SMC2_TAN", 0], + ["USP_MFRAME_SMC3_TAN2", 0], + ["USP_MFRAME_SMC3_TAN", 0], + ["USP_MFRAME_SMG1_TAN2", 0], + ["USP_MFRAME_SMG1_TAN", 0], + ["USP_MFRAME_SMG2_TAN2", 0], + ["USP_MFRAME_SMG2_TAN", 0], + ["USP_MFRAME_SMG3_TAN2", 0], + ["USP_MFRAME_SMG3_TAN", 0], + ["USP_STRAIGHTJACKET_BLK2", 0], + ["USP_STRAIGHTJACKET_BLK", 0], + ["USP_STRAIGHTJACKET_TAN2", 0], + ["USP_STRAIGHTJACKET_TAN", 0], + ["USP_STRAIGHTJACKET_SMC1_BLK2", 0], + ["USP_STRAIGHTJACKET_SMC1_BLK", 0], + ["USP_STRAIGHTJACKET_SMC2_BLK2", 0], + ["USP_STRAIGHTJACKET_SMC2_BLK", 0], + ["USP_STRAIGHTJACKET_SMC3_BLK2", 0], + ["USP_STRAIGHTJACKET_SMC3_BLK", 0], + ["USP_STRAIGHTJACKET_SMG1_BLK2", 0], + ["USP_STRAIGHTJACKET_SMG1_BLK", 0], + ["USP_STRAIGHTJACKET_SMG2_BLK2", 0], + ["USP_STRAIGHTJACKET_SMG2_BLK", 0], + ["USP_STRAIGHTJACKET_SMG3_BLK2", 0], + ["USP_STRAIGHTJACKET_SMG3_BLK", 0], + ["USP_STRAIGHTJACKET_SMC1_TAN2", 0], + ["USP_STRAIGHTJACKET_SMC1_TAN", 0], + ["USP_STRAIGHTJACKET_SMC2_TAN2", 0], + ["USP_STRAIGHTJACKET_SMC2_TAN", 0], + ["USP_STRAIGHTJACKET_SMC3_TAN2", 0], + ["USP_STRAIGHTJACKET_SMC3_TAN", 0], + ["USP_STRAIGHTJACKET_SMG1_TAN2", 0], + ["USP_STRAIGHTJACKET_SMG1_TAN", 0], + ["USP_STRAIGHTJACKET_SMG2_TAN2", 0], + ["USP_STRAIGHTJACKET_SMG2_TAN", 0], + ["USP_STRAIGHTJACKET_SMG3_TAN2", 0], + ["USP_STRAIGHTJACKET_SMG3_TAN", 0], + ["G_Spectacles", 0], + ["G_Spectacles_Tinted", 0], + + // Headgear + ["rhsusf_patrolcap_ocp", 0], + ["rhsusf_ach_helmet_camo_ocp", 0], + ["H_HelmetHBK_ocp_headset_F", 0], + ["H_HelmetB_camo", 0], + + // Uniforms + ["USP_G3C_MC", 0], + ["USP_G3C_KP_MC", 0], + ["USP_G3C_KP_MX_MC", 0], + ["USP_G3C_KP_OR_MC", 0], + ["USP_G3C_MX_MC", 0], + ["USP_G3C_OR_MC", 0], + ["USP_G3C_RS_MC", 0], + ["USP_G3C_RS_KP_MC", 0], + ["USP_G3C_RS_KP_MX_MC", 0], + ["USP_G3C_RS_KP_OR_MC", 0], + ["USP_G3C_RS_MX_MC", 0], + ["USP_G3C_RS_MX_MC", 0], + ["USP_G3C_RS2_MC", 0], + ["USP_G3C_RS2_KP_MC", 0], + ["USP_G3C_RS2_KP_MX_MC", 0], + ["USP_G3C_RS2_KP_OR_MC", 0], + ["USP_G3C_RS2_MX_MC", 0], + ["USP_G3C_RS2_OR_MC", 0], + ["USP_G3F_MC", 0], + ["USP_G3F_MX_MC", 0], + ["USP_G3F_OR_MC", 0], + ["USP_PCU_G3C_MX_MC", 0], + ["USP_PCU_G3C_OR_MC", 0], + ["USP_PCU_G3C_KP_MX_MC", 0], + ["USP_PCU_G3C_KP_OR_MC", 0], + ["USP_SOFTSHELL_G3C_MC", 0], + ["USP_SOFTSHELL_G3C_KP_MC", 0], + ["USP_SOFTSHELL_G3C_KP_MX_MC", 0], + ["USP_SOFTSHELL_G3C_KP_OR_MC", 0], + ["USP_SOFTSHELL_G3C_MX_MC", 0], + ["USP_SOFTSHELL_G3C_OR_MC", 0], + ["USP_G3F_MX_MCA", 0], + ["USP_G3F_OR_MCA", 0], + ["USP_G3F_G3C_KP_MX_MCA", 0], + ["USP_G3F_G3C_KP_OR_MCA", 0], + ["USP_OVERWHITE_G3C_KP_MX_MCA_MC", 0], + ["USP_OVERWHITE_G3C_KP_OR_MCA_MC", 0], + ["USP_OVERWHITE_G3C_MX_MCA_MC", 0], + ["USP_OVERWHITE_G3C_OR_MCA_MC", 0], + + // Backpack + ["B_AssaultPack_mcamo", 0], + ["USP_PACK_BREACHER_MC", 0], + ["USP_PACK_FASTHAWK", 0], + ["USP_PACK_POINTMAN", 0], + ["USP_ZIPON_PANEL_CPC_MC", 0], + ["USP_ZIPON_PACK_CPC_MC", 0], + ["USP_ZIPON_PACK_CPC_BC_MC", 0], + ["USP_ZIPON_PANEL_CPC_SMK_MC", 0], + ["USP_REEBOW_3DAP_MC", 0], + ["USP_REEBOW_3DAP_ACC1_MC", 0], + ["USP_REEBOW_3DAP_ACC10_MC", 0], + ["USP_ROLLFLAG2", 0], + ["USP_PACK_HYDRATION", 0], + + // Medical + ["ACE_EarPlugs",0], + + // Airway Management and Respiration + ["kat_chestSeal",0], + + // Bandages and Stitching + ["ACE_packingBandage",0], + ["ACE_quikclot",0], + + //Pills and Inhalants + ["kat_Painkiller",0], + ["kat_PainkillerItem",0], + + // Massive Hemorrhage Control + ["ACE_tourniquet",0], + + // Splints + ["ACE_splint",0], + + // Night Gear + ["ACE_IR_Strobe_Item",0], + + // Radios + ["TFAR_anprc152", 0] + ]], + + ["arsenal_company_fallback", [ + ["NDS_M_6Rnd_60mm_HE_0", 0], + ["NDS_M_6Rnd_60mm_HE", 0], + ["NDS_M_6Rnd_60mm_SMOKE", 0], + ["NDS_M_6Rnd_60mm_ILLUM", 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] + ]], + // Roles + ["arsenal_role_officer", [ + ["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], + ["ACE_MX2A", 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_squadleader", [ + ["ACE_microDAGR", 0], + ["ACE_HuntIR_monitor", 0], + ["USP_VEST_STRANDHOGG2_MC", 0], + ["USP_VEST_STRANDHOGG2_CBR", 0], + ["ACE_Vector", 0], + ["ACE_MX2A", 0], + + // Sidearm + ["UK3CB_P320_DES",0], + ["UK3CB_P320_BLK",0], + ["UK3CB_P320_9x19_17Rnd",0], + ["acc_flashlight_pistol",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_fireteamleader", [ + ["ACE_microDAGR", 0], + ["ACE_MX2A", 0], + ["USP_VEST_STRANDHOGG2_MC", 0], + ["USP_VEST_STRANDHOGG2_CBR", 0], + ["ACE_HuntIR_monitor", 0], + + // Sidearm + ["UK3CB_P320_DES",0], + ["UK3CB_P320_BLK",0], + ["UK3CB_P320_9x19_17Rnd",0], + ["acc_flashlight_pistol",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_weapons", [ + // MAAWS ammo + ["MRAWS_HEAT_F", 0], + ["MRAWS_HE_F", 0], + ["MAA_MAAWS_ASM509", 0], + ["MAA_MAAWS_HEDP502", 0], + ["MAA_MAAWS_GMM_MT", 0], + ["MAA_MAAWS_MT756", 0], + ["rhs_fgm148_magazine_AT",0], + ["rhs_fim92_mag",0], + + // Tools and Items + ["ACE_PlottingBoard",0], + ["ACE_Vector", 0] + ]], + ["arsenal_role_rotarypilot", [ + ["H_PilotHelqmetHeli_B", 0], + ["rhsusf_hgu56p_black", 0], + ["rhsusf_hgu56p_green", 0], + ["rhsusf_hgu56p_pink", 0], + ["rhsusf_hgu56p_saf", 0], + ["rhsusf_hgu56p_tan", 0], + ["rhsusf_hgu56p_usa", 0], + ["rhsusf_hgu56p_visor_black", 0], + ["rhsusf_hgu56p_visor_green", 0], + ["rhsusf_hgu56p_visor_pink", 0], + ["rhsusf_hgu56p_visor_saf", 0], + ["rhsusf_hgu56p_visor_tan", 0], + ["rhsusf_hgu56p_visor_usa", 0], + ["rhsusf_hgu56p_visor_white", 0], + ["rhsusf_hgu56p_visor", 0], + ["rhsusf_hgu56p_white", 0], + ["rhsusf_hgu56p", 0], + ["rhsusf_ihadss", 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_pilotcrew", [ + ["H_CrewHelmetHeli_B", 0], + ["rhsusf_hgu56p_mask_black", 0], + ["rhsusf_hgu56p_mask_black_skull", 0], + ["rhsusf_hgu56p_visor_mask_black", 0], + ["rhsusf_hgu56p_visor_mask_Empire_black", 0], + ["rhsusf_hgu56p_visor_mask_black_skull", 0], + ["rhsusf_hgu56p_mask_green", 0], + ["rhsusf_hgu56p_mask_green_mo", 0], + ["rhsusf_hgu56p_visor_mask_green", 0], + ["rhsusf_hgu56p_visor_mask_green_mo", 0], + ["rhsusf_hgu56p_mask", 0], + ["rhsusf_hgu56p_mask_mo", 0], + ["rhsusf_hgu56p_mask_skull", 0], + ["rhsusf_hgu56p_visor_mask", 0], + ["rhsusf_hgu56p_visor_mask_mo", 0], + ["rhsusf_hgu56p_visor_mask_skull", 0], + ["rhsusf_hgu56p_mask_tan", 0], + ["rhsusf_hgu56p_visor_mask_tan", 0], + ["rhsusf_hgu56p_mask_pink", 0], + ["rhsusf_hgu56p_visor_mask_pink", 0], + ["rhsusf_hgu56p_mask_saf", 0], + ["rhsusf_hgu56p_visor_mask_saf", 0], + ["rhsusf_hgu56p_mask_smiley", 0], + ["rhsusf_hgu56p_visor_mask_smiley", 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_pilotfighter", [ + ["RHS_jetpilot_usaf", 0], + + //Backpack + ["USP_TACTICAL_PACK_MCB_CCT", 0], + ["USP_TACTICAL_PACK_MCB_CCT2", 0], + ["USP_TACTICAL_PACK_MCB_CCT3", 0], + ["USP_TACTICAL_PACK_MCB_CCT4", 0], + ["USP_TACTICAL_PACK_MCB_CCT5", 0], + ["USP_TACTICAL_PACK_MCB_CCT6", 0], + ["USP_TACTICAL_PACK_MCB_CCT7", 0], + ["USP_TACTICAL_PACK_MCB_CCT8", 0], + ["UK3CB_US_B_B_RIF_OCP_Radio", 0] + ]], + ["arsenal_role_pilottransport", [ + ["USP_BASEBALL_CAP_OD_C", 0], + + //Backpack + ["USP_TACTICAL_PACK_MCB_CCT", 0], + ["USP_TACTICAL_PACK_MCB_CCT2", 0], + ["USP_TACTICAL_PACK_MCB_CCT3", 0], + ["USP_TACTICAL_PACK_MCB_CCT4", 0], + ["USP_TACTICAL_PACK_MCB_CCT5", 0], + ["USP_TACTICAL_PACK_MCB_CCT6", 0], + ["USP_TACTICAL_PACK_MCB_CCT7", 0], + ["USP_TACTICAL_PACK_MCB_CCT8", 0], + ["UK3CB_US_B_B_RIF_OCP_Radio", 0] + ]], + ["arsenal_role_doctor",[ + // 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], + ["kat_suction",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], + ["kat_atropine",0], + + // Cardiac resuscitation + ["kat_amiodarone",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] + //-------------------------- + ]], + ["arsenal_role_medic",[ + // Airway Management and Respiration + ["kat_accuvac",0], + ["kat_chestSeal",0], + ["kat_guedel",0], + ["kat_ncdKit",0], + ["kat_pocketBVM",0], + ["kat_suction",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_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 + ["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], + ["kat_atropine",0], + + // Cardiac resuscitation + ["kat_amiodarone",0], + + // Hemorrhage control + ["kat_EACA",0], + ["kat_TXA",0], + + // Splints + ["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 + ["kat_accuvac",0], + ["kat_chestSeal",0], + ["kat_guedel",0], + ["kat_ncdKit",0], + ["kat_pocketBVM",0], + ["kat_suction",0], + + // Autoinjectors + ["ACE_epinephrine",0], + ["kat_phenylephrineAuto",0], + + // Bandages and Stitching + ["ACE_packingBandage",0], + ["ACE_quikclot",0], + + //Pills and Inhalants + ["kat_Carbonate",0], + ["kat_CarbonateItem",0], + ["kat_Painkiller",0], + ["kat_PainkillerItem",0], + + // Massive Hemorrhage Control + ["ACE_tourniquet",0], + + // Splints + ["ACE_splint",0] + //-------------------------- + ]], + ["arsenal_role_strykercrew",[ + //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] + ]], + + // Weapons + ["arsenal_weap_ugl", [ + ["rhs_weap_m4a1_m320", 0], + ["rhs_weap_mk18_m320", 0], + ["rhs_weap_M320", 0], + ["rhs_weap_m4a1_carryhandle", 0], + ["rhs_weap_m4a1_carryhandle_mstock", 0], + ["rhs_weap_m4a1", 0], + ["rhs_weap_m4a1_mstock", 0], + ["rhs_weap_m4a1_d", 0], + ["rhs_weap_m4a1_d_mstock", 0], + ["rhs_weap_m4a1_wd", 0], + ["rhs_weap_m4a1_wd_mstock", 0], + + ["rhs_weap_m4a1_blockII", 0], + ["rhs_weap_m4a1_blockII_KAC", 0], + ["rhs_weap_m4a1_blockII_bk", 0], + ["rhs_weap_m4a1_blockII_KAC_bk", 0], + ["rhs_weap_m4a1_blockII_d", 0], + ["rhs_weap_m4a1_blockII_KAC_d", 0], + ["rhs_weap_m4a1_blockII_wd", 0], + ["rhs_weap_m4a1_blockII_KAC_wd", 0], + + ["rhs_weap_mk18", 0], + ["rhs_weap_mk18_bk", 0], + ["rhs_weap_mk18_KAC_bk", 0], + ["rhs_weap_mk18_d", 0], + ["rhs_weap_mk18_KAC_d", 0], + ["rhs_weap_mk18_KAC", 0], + ["rhs_weap_mk18_wd", 0], + ["rhs_weap_mk18_KAC_wd", 0], + + //Attachments + ["rhsusf_acc_anpeq15side", 0], + ["rhsusf_acc_anpeq15side_bk", 0], + ["rhsusf_acc_anpeq15A", 0], + ["rhsusf_acc_anpeq16A", 0], + ["rhsusf_acc_wmx", 0], + ["rhsusf_acc_wmx_bk", 0], + ["acc_flashlight", 0], + ["rhsusf_acc_sf3p556", 0], + ["rhsusf_acc_eotech", 0], + ["rhsusf_acc_g33_t1", 0], + ["rhsusf_acc_g33_xps3", 0], + ["rhsusf_acc_g33_xps3_tan", 0], + ["rhsusf_acc_elcan", 0], + ["rhsusf_acc_acog", 0], + ["rhsusf_acc_acog2", 0], + ["rhsusf_acc_acog3", 0], + ["rhsusf_acc_eotech_552", 0], + ["rhsusf_acc_eotech_552_d", 0], + ["rhsusf_acc_eotech_552_wd", 0], + ["rhsusf_acc_compm4", 0], + ["rhsusf_acc_su230", 0], + ["rhsusf_acc_su230_c", 0], + ["rhsusf_acc_su230_mrds", 0], + ["rhsusf_acc_su230_mrds_c", 0], + ["rhsusf_acc_t1_high", 0], + ["rhsusf_acc_acog_rmr", 0], + ["rhsusf_acc_acog_d", 0], + ["rhsusf_acc_acog_wd", 0], + ["rhsusf_acc_grip2", 0], + ["rhsusf_acc_grip2_tan", 0], + ["rhsusf_acc_grip2_wd", 0], + ["rhsusf_acc_grip1", 0], + ["rhsusf_acc_kac_grip", 0], + ["rhsusf_acc_rvg_blk", 0], + ["rhsusf_acc_rvg_de", 0], + ["rhsusf_acc_tdstubby_blk", 0], + ["rhsusf_acc_tdstubby_tan", 0], + ["rhsusf_acc_grip3", 0], + ["rhsusf_acc_grip3_tan", 0], + ["rhsusf_acc_eotech_xps3", 0] + ]], + ["arsenal_weap_m4", [ + ["rhs_weap_m4a1_carryhandle", 0], + ["rhs_weap_m4a1_carryhandle_mstock", 0], + ["rhs_weap_m4a1", 0], + ["rhs_weap_m4a1_mstock", 0], + ["rhs_weap_m4a1_d", 0], + ["rhs_weap_m4a1_d_mstock", 0], + ["rhs_weap_m4a1_wd", 0], + ["rhs_weap_m4a1_wd_mstock", 0], + + ["rhs_weap_m4a1_blockII", 0], + ["rhs_weap_m4a1_blockII_KAC", 0], + ["rhs_weap_m4a1_blockII_bk", 0], + ["rhs_weap_m4a1_blockII_KAC_bk", 0], + ["rhs_weap_m4a1_blockII_d", 0], + ["rhs_weap_m4a1_blockII_KAC_d", 0], + ["rhs_weap_m4a1_blockII_wd", 0], + ["rhs_weap_m4a1_blockII_KAC_wd", 0], + + ["rhs_weap_mk18", 0], + ["rhs_weap_mk18_bk", 0], + ["rhs_weap_mk18_KAC_bk", 0], + ["rhs_weap_mk18_d", 0], + ["rhs_weap_mk18_KAC_d", 0], + ["rhs_weap_mk18_KAC", 0], + ["rhs_weap_mk18_wd", 0], + ["rhs_weap_mk18_KAC_wd", 0], + + //Attachments + ["rhsusf_acc_sf3p556", 0], + ["rhsusf_acc_eotech", 0], + ["rhsusf_acc_g33_t1", 0], + ["rhsusf_acc_g33_xps3", 0], + ["rhsusf_acc_g33_xps3_tan", 0], + ["rhsusf_acc_elcan", 0], + ["rhsusf_acc_acog", 0], + ["rhsusf_acc_acog2", 0], + ["rhsusf_acc_acog3", 0], + ["rhsusf_acc_eotech_552", 0], + ["rhsusf_acc_eotech_552_d", 0], + ["rhsusf_acc_eotech_552_wd", 0], + ["rhsusf_acc_compm4", 0], + ["rhsusf_acc_su230", 0], + ["rhsusf_acc_su230_c", 0], + ["rhsusf_acc_su230_mrds", 0], + ["rhsusf_acc_su230_mrds_c", 0], + ["rhsusf_acc_t1_high", 0], + ["rhsusf_acc_acog_rmr", 0], + ["rhsusf_acc_acog_d", 0], + ["rhsusf_acc_acog_wd", 0], + ["rhsusf_acc_grip2", 0], + ["rhsusf_acc_grip2_tan", 0], + ["rhsusf_acc_grip2_wd", 0], + ["rhsusf_acc_grip1", 0], + ["rhsusf_acc_kac_grip", 0], + ["rhsusf_acc_rvg_blk", 0], + ["rhsusf_acc_rvg_de", 0], + ["rhsusf_acc_tdstubby_blk", 0], + ["rhsusf_acc_tdstubby_tan", 0], + ["rhsusf_acc_grip3", 0], + ["rhsusf_acc_grip3_tan", 0], + ["rhsusf_acc_eotech_xps3", 0], + ["rhsusf_acc_anpeq15side", 0], + ["rhsusf_acc_anpeq15side_bk", 0], + ["rhsusf_acc_anpeq15A", 0], + ["rhsusf_acc_anpeq16A", 0], + ["rhsusf_acc_wmx", 0], + ["rhsusf_acc_wmx_bk", 0], + ["acc_flashlight", 0] + ]], + ["arsenal_weap_sr25", [ + ["rhs_weap_sr25_ec", 0], + ["rhs_weap_sr25_ec_d", 0], + ["rhs_weap_sr25_ec_wd", 0], + + //Magazines + ["rhsusf_20Rnd_762x51_SR25_m118_special_Mag", 0], + + //Attachments + ["rhsusf_acc_harris_bipod", 0], + ["rhsusf_acc_anpeq15side", 0], + ["rhsusf_acc_anpeq15side_bk", 0], + ["rhsusf_acc_anpeq15A", 0], + ["rhsusf_acc_anpeq16A", 0], + ["rhsusf_acc_wmx", 0], + ["rhsusf_acc_wmx_bk", 0], + ["acc_flashlight", 0], + ["optic_AMS", 0], + ["optic_AMS_khk", 0], + ["optic_AMS_snd", 0] + ]], + ["arsenal_weap_m240", [ + ["rhs_weap_m240B", 0], + ["rhs_weap_m240G", 0], + + // Attachments + ["rhsusf_acc_eotech", 0], + ["rhsusf_acc_g33_t1", 0], + ["rhsusf_acc_g33_xps3", 0], + ["rhsusf_acc_g33_xps3_tan", 0], + ["rhsusf_acc_eotech_552", 0], + ["rhsusf_acc_eotech_552_d", 0], + ["rhsusf_acc_eotech_552_wd", 0], + ["rhsusf_acc_compm4", 0], + ["rhsusf_acc_t1_high", 0], + ["rhsusf_acc_elcan_ard", 0], + ["rhsusf_acc_su230a", 0], + ["rhsusf_acc_su230a_c", 0], + ["rhsusf_acc_su230a_mrds", 0], + ["rhsusf_acc_su230a_mrds_c", 0], + ["rhsusf_acc_acog_mdo", 0], + ["rhsusf_acc_anpeq15side", 0], + ["rhsusf_acc_anpeq15side_bk", 0], + ["rhsusf_acc_anpeq15A", 0], + ["rhsusf_acc_anpeq16A", 0], + ["rhsusf_acc_wmx", 0], + ["rhsusf_acc_wmx_bk", 0], + ["acc_flashlight", 0], + + // Sidearm + ["UK3CB_P320_DES",0], + ["UK3CB_P320_BLK",0], + ["UK3CB_P320_9x19_17Rnd",0], + ["acc_flashlight_pistol",0] + ]], + ["arsenal_weap_m249", [ + ["rhs_weap_m249_pip", 0], + ["rhs_weap_m249_light_L", 0], + ["rhs_weap_m249_pip_L_para", 0], + ["rhs_weap_m249_pip_L", 0], + ["rhs_weap_m249_pip_ris", 0], + ["rhs_weap_m249_light_S", 0], + ["rhs_weap_m249_pip_S_para", 0], + ["rhs_weap_m249_pip_S", 0], + + // Attachements + ["rhsusf_acc_eotech", 0], + ["rhsusf_acc_g33_t1", 0], + ["rhsusf_acc_g33_xps3", 0], + ["rhsusf_acc_g33_xps3_tan", 0], + ["rhsusf_acc_elcan", 0], + ["rhsusf_acc_acog", 0], + ["rhsusf_acc_acog2", 0], + ["rhsusf_acc_acog3", 0], + ["rhsusf_acc_eotech_552", 0], + ["rhsusf_acc_eotech_552_d", 0], + ["rhsusf_acc_eotech_552_wd", 0], + ["rhsusf_acc_compm4", 0], + ["rhsusf_acc_su230", 0], + ["rhsusf_acc_su230_c", 0], + ["rhsusf_acc_su230_mrds", 0], + ["rhsusf_acc_su230_mrds_c", 0], + ["rhsusf_acc_t1_high", 0], + ["rhsusf_acc_acog_rmr", 0], + ["rhsusf_acc_acog_d", 0], + ["rhsusf_acc_acog_wd", 0], + ["rhsusf_acc_kac_grip_saw_bipod", 0], + ["rhsusf_acc_grip4", 0], + ["rhsusf_acc_grip4_bipod", 0], + ["rhsusf_acc_saw_lw_bipod", 0], + ["rhsusf_acc_anpeq15side", 0], + ["rhsusf_acc_anpeq15side_bk", 0], + ["rhsusf_acc_anpeq15A", 0], + ["rhsusf_acc_anpeq16A", 0], + ["rhsusf_acc_wmx", 0], + ["rhsusf_acc_wmx_bk", 0], + ["acc_flashlight", 0] + ]], + ["arsenal_weap_launchers", [ + // Launchers + ["launch_MRAWS_green_F", 0], + ["launch_MRAWS_sand_F", 0], + ["launch_MRAWS_olive_F", 0], + ["rhs_weap_fgm148",0], + ["rhs_weap_fim92",0], + + // Launcher ammo + ["MRAWS_HEAT_F", 0], + ["MRAWS_HE_F", 0], + ["MAA_MAAWS_ASM509", 0], + ["MAA_MAAWS_HEDP502", 0], + ["MAA_MAAWS_GMM_MT", 0], + ["MAA_MAAWS_MT756", 0], + ["rhs_fgm148_magazine_AT",0], + ["rhs_fim92_mag",0] + ]], + ["arsenal_weap_sidearm",[ + ["UK3CB_P320_DES",0], + ["UK3CB_P320_BLK",0], + ["UK3CB_P320_9x19_17Rnd",0], + ["acc_flashlight_pistol",0] + ]] +]; \ No newline at end of file diff --git a/cScripts/cScripts_preInit.sqf b/cScripts/cScripts_preInit.sqf index 77126b94c..670fbf9e0 100644 --- a/cScripts/cScripts_preInit.sqf +++ b/cScripts/cScripts_preInit.sqf @@ -42,6 +42,9 @@ EGVAR(DATABASE,DONE) = false; GVAR(DATABASE) = call EFUNC(init,logistics); EGVAR(DATABASE,DONE) = true; +EGVAR(PYLONS,DONE) = false; +GVAR(PYLONS) = call EFUNC(init,pylons); +EGVAR(PYLONS,DONE) = true; if (EGVAR(Settings,allowCustomTagging)) then { call EFUNC(init,aceTagging); diff --git a/cScripts/cScripts_pylons.sqf b/cScripts/cScripts_pylons.sqf new file mode 100644 index 000000000..abd758d6e --- /dev/null +++ b/cScripts/cScripts_pylons.sqf @@ -0,0 +1,168 @@ +[ + ["rhsusf_m1a1tank_base", [ + ["hard", [ + ["displayName", "Hard"], + ["icon", ""], + ["loadout", [ + ["rhs_mag_smokegen",[-1],999], + ["rhs_mag_M829A3_max",[0],44], + ["rhs_mag_M830A1_max",[0],8], + ["rhs_mag_762x51_M240_1200",[0],0], + ["rhs_mag_762x51_M240_1200",[0],0], + ["rhs_mag_762x51_M240_1200",[0],0], + ["rhs_mag_762x51_M240_1200",[0],0], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_LaserFCSMag",[0],99], + ["rhs_LaserFCSMag",[0],99], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhsusf_mag_L8A3_12",[0,0],12], + ["rhs_mag_762x51_M240_200",[0,2]], + ["rhs_mag_762x51_M240_200",[0,2]], + ["rhs_mag_762x51_M240_200",[0,2]] + ]] + ]], + [ "default", [ + ["displayName", "Default"], + ["icon", ""], + ["loadout", [ + ["rhs_mag_smokegen",[-1],999], + ["rhs_mag_M829A3_max",[0],28], + ["rhs_mag_M830A1_max",[0],16], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_LaserFCSMag",[0],99], + ["rhs_LaserFCSMag",[0],99], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhsusf_mag_L8A3_12",[0,0],12], + ["rhs_mag_762x51_M240_200",[0,2]], + ["rhs_mag_762x51_M240_200",[0,2]], + ["rhs_mag_762x51_M240_200",[0,2]] + ]] + ]], + ["soft", [ + ["displayName", "Soft"], + ["icon", ""], + ["loadout", [ + ["rhs_mag_smokegen",[-1],999], + ["rhs_mag_M829A3_max",[0],4], + ["rhs_mag_M1028_max",[0],10], + ["rhs_mag_M1069_max",[0],22], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_mag_762x51_M240_1200",[0],1200], + ["rhs_LaserFCSMag",[0],99], + ["rhs_LaserFCSMag",[0],99], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], + ["rhsusf_mag_L8A3_12",[0,0],12], + ["rhs_mag_762x51_M240_200",[0,2]], + ["rhs_mag_762x51_M240_200",[0,2]], + ["rhs_mag_762x51_M240_200",[0,2]] + ]] + ]] + ]], + + ["cav_dragoon_base_F", [ + ["antiarmor", [ + ["SmokeLauncherMag",[0],6], + ["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], + ["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], + // ["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], + // ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + // ["4Rnd_Titan_long_missiles",[0],4] + // ]], + ["default",[ + ["SmokeLauncherMag",[0],6], + ["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], + ["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] + ]], + ["balanced",[ + ["SmokeLauncherMag",[0],6], + ["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], + ["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] + ]] + ]] +]; \ No newline at end of file diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf index 7f475b067..3ac7428b9 100644 --- a/cScripts/functions/init/fn_init_logistics.sqf +++ b/cScripts/functions/init/fn_init_logistics.sqf @@ -12,2061 +12,8 @@ * Public: No */ - INFO("Logistics", "Creating logistical database"); -private _dataArray = [ - // // // // // // // - // Starter Crates \\ - // // // // // // // - ["alpha_company", [ - // Radios - ["ACRE_PRC343", 0], - ["ACRE_PRC152", 0], - ["ACRE_PRC117F", 0], - ["TFAR_anprc152", 0], - - // Helmets - ["H_Cap_tan", 0], - ["H_Cap_headphones", 0], - ["DAR_Beret_Mar", 0], - ["rhsusf_hgu56p_black", 0], - ["rhsusf_hgu56p_green", 0], - ["rhsusf_hgu56p_mask_black_skull", 0], - ["rhsusf_hgu56p_mask_black", 0], - ["rhsusf_hgu56p_mask_green_mo", 0], - ["rhsusf_hgu56p_mask_green", 0], - ["rhsusf_hgu56p_mask_mo", 0], - ["rhsusf_hgu56p_mask_pink", 0], - ["rhsusf_hgu56p_mask_saf", 0], - ["rhsusf_hgu56p_mask_skull", 0], - ["rhsusf_hgu56p_mask_smiley", 0], - ["rhsusf_hgu56p_mask_tan", 0], - ["rhsusf_hgu56p_mask", 0], - ["rhsusf_hgu56p_pink", 0], - ["rhsusf_hgu56p_saf", 0], - ["rhsusf_hgu56p_tan", 0], - ["rhsusf_hgu56p_usa", 0], - ["rhsusf_hgu56p_visor_black", 0], - ["rhsusf_hgu56p_visor_green", 12], - ["rhsusf_hgu56p_visor_mask_black_skull", 0], - ["rhsusf_hgu56p_visor_mask_black", 12], - ["rhsusf_hgu56p_visor_mask_Empire_black", 0], - ["rhsusf_hgu56p_visor_mask_green_mo", 0], - ["rhsusf_hgu56p_visor_mask_green", 0], - ["rhsusf_hgu56p_visor_mask_mo", 0], - ["rhsusf_hgu56p_visor_mask_pink", 0], - ["rhsusf_hgu56p_visor_mask_saf", 0], - ["rhsusf_hgu56p_visor_mask_skull", 0], - ["rhsusf_hgu56p_visor_mask_smiley", 0], - ["rhsusf_hgu56p_visor_mask_tan", 0], - ["rhsusf_hgu56p_visor_mask", 0], - ["rhsusf_hgu56p_visor_pink", 0], - ["rhsusf_hgu56p_visor_saf", 0], - ["rhsusf_hgu56p_visor_tan", 0], - ["rhsusf_hgu56p_visor_usa", 0], - ["rhsusf_hgu56p_visor_white", 0], - ["rhsusf_hgu56p_visor", 12], - ["rhsusf_hgu56p_white", 0], - ["rhsusf_hgu56p", 0], - ["rhsusf_ihadss", 12], - ["rhsusf_patrolcap_ocp", 0], - - // Vest - ["B_ACU_crye_ocp_SH_1", 0], - ["B_ACU_crye_ocp_SH_vest_1", 0], - - - // Weapons - ["rhs_weap_m4a1_m320",0], - ["rhs_weap_m249_pip_L",0], - ["rhs_weap_m240B",0], - ["rhs_weap_M136_hp",0], - - ["acc_flashlight",0], - ["rhsusf_acc_anpeq15_bk_light",0], - ["rhsusf_acc_acog_mdo",0], - ["rhsusf_acc_ELCAN",0], - ["rhsusf_acc_compm4",0], - ["rhsusf_acc_acog3",0], - ["rhsusf_acc_eotech_xps3",0], - - // Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0], - ["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], - ["ACE_30Rnd_556x45_Stanag_M995_AP_mag", 0], - ["rhs_mag_30Rnd_556x45_Mk262_PMAG", 0], - ["rhsusf_mag_15Rnd_9x19_JHP",10], - ["rhs_mag_M441_HE",0], - ["rhs_mag_M433_HEDP",0], - ["rhs_mag_m714_White",0], - ["rhs_mag_m715_Green",0], - ["rhs_mag_m716_yellow",0], - ["rhs_mag_m713_Red",0], - ["ACE_HUNTIR_M203",0], - ["ACE_40mm_Flare_red",0], - - // Grenades - ["HandGrenade",10], - ["SmokeShell",10], - ["SmokeShellBlue",0], - ["SmokeShellPurple",0], - ["SmokeShellRed",0], - ["ACE_Chemlight_HiBlue",0], - ["ACE_Chemlight_HiRed",0], - ["ACE_Chemlight_IR",0], - ["B_IR_Grenade",0], - ["ACE_M84",0], - - // Tools and Items - ["Toolkit",10], - ["ACE_Flashlight_MX991",0], - ["itemcTabHCam",0], - ["ACE_CableTie",0], - ["ACE_Chemlight_Shield",0], - ["ACE_VMH3",0], - ["ACE_VMM3",0], - ["Flagstack_Red",0], - ["Signpack_Mines",0], - - //cTab - ["ItemAndroid", 0], - ["ItemcTab", 0], - ["ItemcTabMisc", 0], - ["ItemAndroidMisc",0], - - // Medical - ["ACE_EarPlugs",10], - ["ACE_quikclot",0], - ["ACE_packingBandage",0], - ["ACE_tourniquet",0], - ["ACE_splint",0], - ["ACE_epinephrine",0], - ["ACE_personalAidKit",0], - ["ACE_bodyBag",0], - ["kat_IV_16",0], - ["kat_carbonate",0], - ["kat_naloxone",0], - ["kat_Painkiller",0], - ["kat_chestSeal",0], - - // NVG - ["USP_PVS14", 0], - ["USP_PVS15", 0], - ["USP_L4G19", 0], - ["USP_RHINO", 0], - - //Backpack - ["USP_TACTICAL_PACK", 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] - ]], - - ["bravo_company", [ - // Radios - ["ACRE_PRC343", 0], - ["ACRE_PRC152", 0], - ["ACRE_PRC117F", 0], - ["TFAR_anprc152", 0], - - // Helmets - ["USP_OPS_FASTXP_TAN_MC", 0], - ["USP_OPS_FASTXP_TAN_MC_02", 0], - ["USP_OPS_FASTXP_TAN_MC_03", 0], - ["USP_OPS_FASTXP_TAN_MC_04", 0], - ["USP_OPS_FASTXP_TAN_MC_05", 0], - ["USP_OPS_FASTXP_TAN_MC_06", 0], - ["USP_OPS_FASTXP_TAN_MC_07", 0], - ["USP_OPS_FASTXP_TAN_MC_08", 0], - ["USP_BOONIE_HAT_MC", 0], - - // Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0], - ["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], - - // NVG - ["USP_PVS14", 0], - ["USP_PVS15", 0], - ["USP_L4G19", 0], - ["USP_L4G24",0], - ["USP_PVS31",0], - ["USP_PVS31_HIGH",0], - ["USP_PVS31_LOW",0], - ["USP_PVS31_COMPACT",0], - ["USP_RHINO", 0], - - // cTab - ["ItemAndroid", 0], - ["ItemcTab", 0], - ["ItemcTabMisc", 0], - ["ItemAndroidMisc",0], - - // Tools - ["ACE_EntrenchingTool", 0], - - // Backpacks - ["B_Carryall_mcamo", 0], - ["B_Kitbag_mcamo", 0], - ["UK3CB_B_Backpack_Pocket_OLI", 0], - ["UK3CB_B_Backpack_Pocket", 0] - ]], - - ["bravo_company_viking", [ - // Radios - ["ACRE_PRC343", 0], - ["ACRE_PRC152", 0], - ["ACRE_PRC117F", 0], - ["TFAR_anprc152", 0], - - // Lunchers and mortars - ["rhs_weap_M136_hp",0], - ["rhs_weap_M136",0], - ["rhs_weap_M136_hedp",1], - ["rhs_weap_m72a7",0], - ["dzn_MG_Tripod_M122A1_M240Mount_Carry", 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], - - ["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], - ["ACE_40mm_Flare_white",0], - ["ACE_40mm_Flare_red",0], - ["rhs_mag_m664_red_cluster",0], - ["rhs_mag_m713_Red",0], - ["rhs_mag_m716_yellow",0], - ["rhs_mag_M663_green_cluster",0], - ["ACE_40mm_Flare_ir",0], - - // Grenades - ["HandGrenade",10], - ["SmokeShell",10], - ["SmokeShellBlue",0], - ["SmokeShellPurple",0], - ["SmokeShellRed",0], - ["ACE_Chemlight_HiBlue",0], - ["ACE_Chemlight_HiRed",0], - ["ACE_Chemlight_IR",0], - ["ACE_M84",0], - ["rhs_mag_mk3a2",0], - - // Mines and Explosives - ["ACE_Clacker",0], - ["ACE_DefusalKit",0], - ["ACE_M26_Clacker",0], - ["SatchelCharge_Remote_Mag",0], - ["DemoCharge_Remote_Mag",0], - ["ClaymoreDirectionalMine_Remote_Mag",0], - - // Tools and Items - ["ACE_Flashlight_MX991",0], - ["ACE_CableTie",0], - ["ACE_wirecutter",0], - ["ACE_EntrenchingTool",0], - ["B_UavTerminal",0] - ]], - - ["bravo_company_atlas", [ - - // Radios - ["ACRE_PRC343", 0], - ["ACRE_PRC152", 0], - ["TFAR_anprc152", 0], - ["ACE_microDAGR",0], - ["ItemAndroid",0], - ["ItemAndroidMisc",0], - - // Tools and Items - ["ACE_Flashlight_MX991",0], - ["ACE_CableTie",0], - ["ACE_Chemlight_Shield",0], - ["ACE_Chemlight_White",0], - ["ACE_EntrenchingTool",0], - ["ACE_IR_Strobe_Item",0], - ["ACE_wirecutter",10], - - // Grenades - ["SmokeShell",10], - ["SmokeShellBlue",0], - ["SmokeShellPurple",0], - ["SmokeShellRed",0], - ["ACE_Chemlight_HiBlue",0], - ["ACE_Chemlight_HiRed",0], - ["ACE_Chemlight_IR",0], - - // Medical - ["ACE_EarPlugs",10], - ["ACE_bodyBag",0], - ["ACE_personalAidKit",0], - - // Backpacks - ["USP_DELTA_BAG_MC", 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] - ]], - - ["charlie_company", [ - // Radios - ["ACRE_PRC343", 0], - ["ACRE_PRC152", 0], - ["TFAR_anprc152", 0], - - // Helmets - ["DAR_Beret_Mar", 0], - ["USP_OPSCORE_FASTMTC_CGW", 0], - ["USP_OPSCORE_FASTMTC_CMW", 0], - ["USP_OPSCORE_FASTMTC_CMGSW", 0], - ["USP_OPSCORE_FASTMTC_CMGTW", 0], - ["USP_OPSCORE_FASTMTC_CMSW", 0], - ["USP_OPSCORE_FASTMTC_CMTW", 0], - ["USP_OPSCORE_FASTMTC_CW", 0], - ["USP_OPSCORE_FASTMTC_CGSW", 0], - ["USP_OPSCORE_FASTMTC_CGTW", 0], - ["USP_OPSCORE_FASTMTC_CSW", 0], - ["USP_OPSCORE_FASTMTC_CTW", 0], - - // Weapons - ["rhs_weap_M136_hp",0], - ["rhs_weap_M136",0], - ["rhs_weap_M136_hedp",10], - ["rhs_weap_m72a7",10], - ["dzn_MG_Tripod_M122A1_M240Mount_Carry",0], - - // Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0], - ["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], - ["ACE_30Rnd_556x45_Stanag_M995_AP_mag", 0], - ["rhs_mag_30Rnd_556x45_Mk262_PMAG", 0], - ["rhsusf_200Rnd_556x45_mixed_soft_pouch", 10], - ["rhsusf_100Rnd_762x51_m62_tracer", 10], - ["rhs_mag_M397_HET", 0], - ["rhs_mag_M433_HEDP", 20], - ["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], - - ["MRAWS_HE_F", 0], - ["MRAWS_HEAT_F", 0], - ["MAA_MAAWS_ASM509", 0], - ["MAA_MAAWS_GMM_MT", 0], - ["NDS_M_6Rnd_60mm_HE_0", 0], - ["NDS_M_6Rnd_60mm_HE", 0], - ["NDS_M_6Rnd_60mm_SMOKE", 0], - ["NDS_M_6Rnd_60mm_ILLUM", 0], - - // Grenades - ["HandGrenade",10], - ["SmokeShell",10], - ["SmokeShellBlue",0], - ["SmokeShellPurple",0], - ["SmokeShellRed",0], - ["ACE_Chemlight_HiBlue",0], - ["ACE_Chemlight_HiRed",0], - ["ACE_Chemlight_IR",0], - ["ACE_M84",0], - ["rhs_mag_mk3a2",0], - - // Mines and Explosives - ["ACE_Clacker",0], - ["ACE_DefusalKit",0], - ["ACE_M26_Clacker",0], - ["SatchelCharge_Remote_Mag",0], - ["DemoCharge_Remote_Mag",0], - ["ClaymoreDirectionalMine_Remote_Mag",0], - - // Tools and Items - ["ACE_CableTie",0], - ["ACE_EntrenchingTool",10], - ["ACE_wirecutter",10], - ["rhs_weap_rsp30_green",0], - ["rhs_weap_rsp30_red",0], - ["ACE_SpareBarrel", 4], - - //cTab - ["ItemAndroid", 0], - ["ItemAndroidMisc",0], - - // NVG - ["USP_PVS14", 0], - ["USP_PVS15", 0], - ["USP_L4G19", 0], - ["rhsusf_ANPVS_14", 0], - ["rhsusf_ANPVS_15", 0], - ["USP_RHINO", 0] - ]], - - // // // // // // // - // Resupply Crates \\ - // // // // // // // - ["crate_medicalInfantry", [ - // Bandages - ["ACE_elasticBandage",60], - ["ACE_packingBandage",90], - ["ACE_quikclot",150], - ["kat_chestSeal",20], - ["kat_guedel",10], - - // Tourniquets - ["ACE_tourniquet",50], - - // Fluids - ["ACE_plasmaIV",20], - ["ACE_plasmaIV_500",20], - - // IV & IO Catheters - ["kat_IO_FAST",10], - ["kat_IV_16",20], - - // Autoinjector Medication - ["kat_naloxone",20], - ["ACE_epinephrine",20], - ["kat_phenylephrineAuto",24], - - // Oral Medication - ["kat_Painkiller",60], - - // Splints - ["ACE_splint",40], - - // Surgical Medication - ["kat_lidocaine",16], - - // Surgical Kits - ["ACE_surgicalKit",2], - - // Body Bags - ["ACE_bodyBag", 20] - ]], - - ["crate_medicalAtlas", [ - // AEDs - ["kat_AED",1], - ["kat_X_AED",1], - - // Airway Management and Respiration - ["kat_aatKit",10], - ["kat_accuvac",2], - ["kat_BVM",4], - ["kat_chestSeal",20], - ["kat_larynx",10], - - // Autoinjectors - ["ACE_morphine",20], - ["ACE_epinephrine",40], - ["kat_phenylephrineAuto",40], - - // Bandages - ["ACE_elasticBandage",150], - ["ACE_packingBandage",90], - ["ACE_quikclot",150], - - // Diagnostic Tools - ["kat_Pulseoximeter",12], - ["kat_ultrasound",2], - ["kat_stethoscope",4], - - // Tourniquets - ["ACE_tourniquet",20], - - // Fluids - ["ACE_plasmaIV",30], - ["ACE_plasmaIV_500",30], - ["ACE_salineIV_250",20], - - // IV & IO Catheters - ["kat_IO_FAST",20], - ["kat_IV_16",40], - - // Analgesic Medication - ["kat_fentanyl",10], - ["kat_ketamine",10], - ["kat_nalbuphine",40], - - // Cardiac resuscitation - ["kat_amiodarone",10], - ["kat_atropine",10], - - // Blood Pressure Medication - ["kat_nitroglycerin",40], - ["kat_phenylephrine",40], - ["kat_norepinephrine",40], - - // Hemorrhage Control Medication - ["kat_EACA",40], - ["kat_TXA",40], - - // Oral Medication & - ["kat_naloxone",20], - ["kat_carbonate",20], - ["kat_Painkiller",40], - ["kat_PenthroxItem",10], - - // Splints - ["ACE_splint",40], - - // Surgical Equipment - ["kat_scalpel",40], - ["kat_plate",10], - ["kat_clamp",4], - ["kat_retractor",4], - ["kat_vacuum",1], - ["kat_reboa",12], - - // Surgical Medication - ["kat_lidocaine",20], - ["kat_lorazepam",10], - ["kat_etomidate",20], - ["kat_flumazenil",10], - - // Surgical Kits - ["ACE_surgicalKit",4], - - // Body Bags - ["ACE_bodyBag",10], - - // E-Tools - ["ACE_EntrenchingTool",4], - - // Smokes - ["SmokeShell",16], - ["SmokeShellBlue",8], - ["SmokeShellGreen",8], - ["SmokeShellPurple",8], - - // Flags and Paint - ["ace_marker_flags_green",4], - ["ace_marker_flags_red",4], - ["ace_marker_flags_blue",4], - ["ACE_SpraypaintBlue",1], - ["ACE_SpraypaintRed",1] - ]], - - ["crate_strykerDragoon_resupply", [ - // Rifle Ammo - ["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], - - // AT - ["rhs_fgm148_magazine_AT", 1], - - // M320 Ammo - ["rhs_mag_m433_HEDP", 20], - ["rhs_mag_m397_HET", 10], - ["rhs_mag_M664_red_cluster", 5], - ["rhs_mag_m714_White", 5], - ["ACE_40mm_Flare_IR", 5], - ["ACE_HUNTIR_M203", 5], - - // Offensive/Defensive Grenades - ["HandGrenade", 9], - - // Smoke Grenades - ["SmokeShell", 10], - ["SmokeShellRed", 2], - ["SmokeShellBlue", 2], - ["SmokeShellYellow", 2], - ["SmokeShellGreen", 2], - - // Medical - ["ACE_quikclot", 40], - ["ACE_tourniquet", 10] - ]], - ["crate_strykerDragoon_60mm",[ - ["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_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], - ["rhs_fim92_mag",2] - ]], - ["crate_resupply_general", [ - // Rifle Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",70], - ["rhsusf_20Rnd_762x51_SR25_m118_special_Mag",7], - - // MG Ammo - ["rhsusf_200rnd_556x45_mixed_soft_pouch",16], - ["rhsusf_100Rnd_762x51_m62_tracer",19], - - // AT - ["rhs_fgm148_magazine_AT",3], - ["MRAWS_HEAT_F",6], - ["MRAWS_HE_F",3], - ["rhs_weap_M136_hedp",8], - - // AA - ["rhs_fim92_mag",3], - - // M320 Ammo - ["rhs_mag_M433_HEDP",40], - ["rhs_mag_m714_White",20], - ["ACE_HUNTIR_M203",5], - ["ACE_40mm_Flare_white",10], - ["ACE_40mm_Flare_IR",10], - - // Mortar Ammo - ["NDS_M_6Rnd_60mm_HE_0",3], - ["NDS_M_6Rnd_60mm_HE",7], - ["NDS_M_6Rnd_60mm_SMOKE",2], - - // Offensive/Defensive Hand Grenades - ["HandGrenade",20], - - // LTL Hand Grenades - ["ACE_M84",10], - - // Smoke Grenades - ["SmokeShell",30], - ["SmokeShellRed",10], - ["SmokeShellBlue",10], - - // Chemlights - ["ACE_Chemlight_HiRed",15], - ["ACE_Chemlight_HiBlue",15], - ["ACE_Chemlight_IR",15], - - // Explosives - ["SatchelCharge_Remote_Mag",2], - ["DemoCharge_Remote_Mag",4], - - ["ACE_EarPlugs", 3], - ["ACE_quikclot", 80], - ["ACE_tourniquet", 15] - ]], - - // // // // // // // - // Alpha Vehicles \\ - // // // // // // // - ["vehicle_heliTransport", [ - ["ToolKit", 2], - ["ACE_rope18", 4], - ["ACE_rope36", 2], - - // Medical - ["kat_AED",1], - ["ACE_epinephrine",4], - ["ACE_splint",4], - ["kat_naloxone",2], - ["ACE_tourniquet",8], - ["kat_guedel",2], - ["kat_ncdKit",2], - ["kat_pocketBVM",1], - ["kat_accuvac",1], - ["kat_chestSeal",4], - ["ACE_quikclot",20], - ["ACE_packingBandage",20], - - ["rhs_mag_30Rnd_556x45_M855A1_Stanag", 32], - ["SmokeShell", 8] - ]], - - // // // // // // // - // Bravo Vehicles \\ - // // // // // // // - ["vehicle_medicalAtlas", [ - // AEDs - ["kat_AED",1], - ["kat_X_AED",1], - - // Analgesic - ["kat_fentanyl",10], - ["kat_ketamine",20], - ["kat_nalbuphine",30], - ["kat_PenthroxItem",20], - - // Airway Management and Respiration - ["kat_aatKit",4], - ["kat_accuvac",1], - ["kat_BVM",2], - ["kat_chestSeal",30], - ["kat_larynx",15], - ["kat_pocketBVM",3], - - - // Bandages - ["ACE_elasticBandage",150], - ["ACE_packingBandage",90], - ["ACE_quikclot",150], - - // Tourniquets - ["ACE_tourniquet",20], - ["kat_reboa",10], - - // Fluids - ["ACE_plasmaIV",30], - ["ACE_plasmaIV_500",30], - ["ACE_salineIV_250",20], - - // IV & IO Catheters - ["kat_IO_FAST",20], - ["kat_IV_16",40], - - // Blood Pressure Medication - ["kat_nitroglycerin",40], - ["kat_phenylephrine",40], - ["kat_norepinephrine",40], - - // Hemorrhage Control Medication - ["kat_EACA",40], - ["kat_TXA",40], - ["kat_amiodarone",15], - ["ACE_epinephrine",10], - - // Oral Medication - ["kat_carbonate",20], - ["kat_Painkiller",40], - - // Autoinjector & Nasal Spray Medication - ["kat_naloxone",20], - ["ACE_morphine",20], - ["ACE_epinephrine",40], - ["kat_phenylephrineAuto",40], - ["ACE_adenosine",0], - - // Splints - ["ACE_splint",20], - - // Surgical Equipment - ["kat_scalpel",40], - ["kat_plate",10], - ["kat_clamp",1], - ["kat_retractor",1], - ["kat_vacuum",1], - - // Surgical Medication - ["kat_lidocaine",20], - ["kat_lorazepam",10], - ["kat_etomidate",20], - ["kat_flumazenil",10], - - // Surgical Kits - ["ACE_surgicalKit",4], - - // Body Bags - ["ACE_bodyBag",10], - - // E-Tools - ["ACE_EntrenchingTool",4], - - // Smoke Grenades - ["SmokeShell",16], - ["SmokeShellBlue",4], - ["SmokeShellGreen",4], - ["SmokeShellPurple",4], - - // Flags and Paint - ["ace_marker_flags_green",4], - ["ace_marker_flags_red",4], - ["ace_marker_flags_blue",4], - ["ACE_SpraypaintBlue",1], - ["ACE_SpraypaintRed",1], - - // Rifle Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG",24], // M855A1 PMAGs - ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",8] // M856A1 PMAGs - ]], - ["vehicle_strykerDragoon", [ - // AT - ["rhs_weap_fgm148", 1], - ["rhs_fgm148_magazine_AT", 2], - - // MG Ammo - ["rhsusf_100Rnd_762x51_m62_tracer", 10], - - // Tools - ["ACE_wirecutter", 1], - - - // Medical - ["kat_AED",1], - ["ACE_epinephrine",4], - ["ACE_splint",4], - ["kat_naloxone",2], - ["ACE_tourniquet",8], - ["kat_guedel",2], - ["kat_ncdKit",2], - ["kat_pocketBVM",1], - ["kat_accuvac",1], - ["kat_chestSeal",4], - ["ACE_quikclot",20], - ["ACE_packingBandage",20] - ]], - ["vehicle_strykerDragoon_V4", [ - // AT - ["rhs_weap_fgm148", 1], - ["rhs_fgm148_magazine_AT", 2], - - // MG Ammo - ["rhsusf_100Rnd_762x51_m62_tracer", 10], - - // Tools - ["ACE_wirecutter", 1], - - // Medical - ["kat_AED",1], - ["ACE_epinephrine",4], - ["ACE_splint",4], - ["kat_naloxone",2], - ["ACE_tourniquet",8], - ["kat_guedel",2], - ["kat_ncdKit",2], - ["kat_pocketBVM",1], - ["kat_accuvac",1], - ["kat_chestSeal",4], - ["ACE_quikclot",20], - ["ACE_packingBandage",20] - ]], - - // // // // // // // // - // Charlie Vehicles \\ - // // // // // // // // - ["vehicle_HMMWV", [ - // Rifle Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",42], - - // MG Ammo - ["rhsusf_200Rnd_556x45_mixed_soft_pouch",8], - - // AT - ["rhs_weap_fgm148",1], - ["rhs_fgm148_magazine_AT",1], - ["rhs_weap_M136_hedp",2], - - // M320 Ammo - ["rhs_mag_M433_HEDP",20], - ["rhs_mag_m714_White",6], - ["rhs_mag_m713_Red",4], - ["ACE_HuntIR_M203",1], - - // Offensive/Defensive Hand Grenades - ["HandGrenade",8], - - // Smoke Grenades - ["SmokeShell",10], - ["SmokeShellBlue",2], - ["SmokeShellRed",2], - - // Chemlights - ["ACE_Chemlight_HiBlue",2], - ["ACE_Chemlight_HiRed",2], - ["ACE_Chemlight_IR",4], - - // Medical - ["kat_AED",1], - ["ACE_epinephrine",4], - ["ACE_splint",4], - ["kat_naloxone",2], - ["ACE_tourniquet",8], - ["kat_guedel",4], - ["kat_chestSeal",6], - ["ACE_packingBandage",40] - ]], - - ["vehicle_HMMWV_Weapons", [ - // Rifle Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",25], - - // MG Ammo - ["rhsusf_100Rnd_762x51_m62_tracer",18], - - // AT - ["rhs_weap_fgm148",1], - ["rhs_fgm148_magazine_AT",1], - ["MRAWS_HE_F",2], - ["MRAWS_HEAT_F",6], - - // M320 Ammo - ["rhs_mag_m713_Red",4], - - // Offensive/Defensive Hand Grenades - ["HandGrenade",4], - - // Smoke Grenades - ["SmokeShell",6], - ["SmokeShellBlue",1], - - // Chemlights - ["ACE_Chemlight_HiBlue",2], - ["ACE_Chemlight_IR",2], - - // Medical - ["ACE_splint",4], - ["ACE_tourniquet",8], - ["kat_guedel",4], - ["kat_chestSeal",6], - ["ACE_packingBandage",40] - ]], - - // // // // // // - // Specialized \\ - // // // // // // - ["crate_mortar_60mm_ammo", [ - ["NDS_M_6Rnd_60mm_HE_0",5], - ["NDS_M_6Rnd_60mm_HE",5], - ["NDS_M_6Rnd_60mm_SMOKE",2], - ["NDS_M_6Rnd_60mm_ILLUM",2] - ]], - // ["demolitions", []], - ["radios", [ - ["ACRE_PRC343", 0], - ["ACRE_PRC152", 0], - ["ACRE_PRC117F", 0], - - ["TFAR_anprc152", 0] - ]], - - // No longer used \\ - ["vehicle_bradley", [ - ["rhs_weap_fgm148", 1], - ["rhs_fgm148_magazine_AT", 2], - ["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], - ["rhs_weap_M136", 4], - ["B_UAV_01_backpack_F", 2], - ["B_UavTerminal", 1], - ["ACE_UAVBattery", 4], - ["ACE_wirecutter", 1] - ]], - - // // // // // - // Arsenal \\ - // // // // // - ["arsenal_common", [ - ["G_Aviator", 0], - ["rhs_googles_black", 0], - ["rhs_googles_clear", 0], - ["rhs_googles_orange", 0], - ["rhs_googles_yellow", 0], - ["rhs_ess_black", 0], - ["G_Shades_Black", 0], - ["G_Shades_Blue", 0], - ["G_Shades_Green", 0], - ["G_Shades_Red", 0], - ["rhsusf_shemagh_grn", 0], - ["rhsusf_shemagh2_grn", 0], - ["rhsusf_shemagh_od", 0], - ["rhsusf_shemagh2_od", 0], - ["rhsusf_shemagh_tan", 0], - ["rhsusf_shemagh2_tan", 0], - ["rhsusf_shemagh_white", 0], - ["rhsusf_shemagh2_white", 0], - ["rhsusf_shemagh_gogg_grn", 0], - ["rhsusf_shemagh2_gogg_grn", 0], - ["rhsusf_shemagh_gogg_od", 0], - ["rhsusf_shemagh2_gogg_od", 0], - ["rhsusf_shemagh_gogg_tan", 0], - ["rhsusf_shemagh2_gogg_tan", 0], - ["rhsusf_shemagh_gogg_white", 0], - ["rhsusf_shemagh2_gogg_white", 0], - ["rhsusf_oakley_goggles_blk", 0], - ["rhsusf_oakley_goggles_clr", 0], - ["rhsusf_oakley_goggles_ylw", 0], - ["USP_RAID_BLK2", 0], - ["USP_RAID_BLK", 0], - ["USP_RAID_SMC1_BLK2", 0], - ["USP_RAID_SMC1_BLK", 0], - ["USP_RAID_SMC2_BLK2", 0], - ["USP_RAID_SMC2_BLK", 0], - ["USP_RAID_SMC3_BLK2", 0], - ["USP_RAID_SMC3_BLK", 0], - ["USP_RAID_SMG1_BLK2", 0], - ["USP_RAID_SMG1_BLK", 0], - ["USP_RAID_SMG2_BLK2", 0], - ["USP_RAID_SMG2_BLK", 0], - ["USP_RAID_SMG3_BLK2", 0], - ["USP_RAID_SMG3_BLK", 0], - ["USP_BALACLAVA_CBR", 0], - ["USP_BALACLAVA_GRY", 0], - ["USP_BALACLAVA_MCA", 0], - ["USP_BALACLAVA_RGR", 0], - ["USP_BALACLAVA2_CBR", 0], - ["USP_BALACLAVA2_GRY", 0], - ["USP_BALACLAVA2_MCA", 0], - ["USP_BALACLAVA2_RGR", 0], - ["USP_BALACLAVA_ADV_CBR", 0], - ["USP_BALACLAVA_ADV_GRY", 0], - ["USP_BALACLAVA_ADV_MCA", 0], - ["USP_BALACLAVA_ADV_RGR", 0], - ["USP_BALACLAVA_ADV_CBR2", 0], - ["USP_BALACLAVA_ADV_GRY2", 0], - ["USP_BALACLAVA_ADV_MCA2", 0], - ["USP_BALACLAVA_ADV_RGR2", 0], - ["USP_BALACLAVA_ADV_SMC1_CBR", 0], - ["USP_BALACLAVA_ADV_SMC1_GRY", 0], - ["USP_BALACLAVA_ADV_SMC1_MCA", 0], - ["USP_BALACLAVA_ADV_SMC1_RGR", 0], - ["USP_BALACLAVA_ADV_SMC1_CBR2", 0], - ["USP_BALACLAVA_ADV_SMC1_GRY2", 0], - ["USP_BALACLAVA_ADV_SMC1_MCA2", 0], - ["USP_BALACLAVA_ADV_SMC1_RGR2", 0], - ["USP_BALACLAVA_ADV_SMG1_CBR", 0], - ["USP_BALACLAVA_ADV_SMG1_GRY", 0], - ["USP_BALACLAVA_ADV_SMG1_MCA", 0], - ["USP_BALACLAVA_ADV_SMG1_RGR", 0], - ["USP_BALACLAVA_ADV_SMG1_CBR2", 0], - ["USP_BALACLAVA_ADV_SMG1_GRY2", 0], - ["USP_BALACLAVA_ADV_SMG1_MCA2", 0], - ["USP_BALACLAVA_ADV_SMG1_RGR2", 0], - ["USP_BALACLAVA_ESS_CBR", 0], - ["USP_BALACLAVA_ESS_GRY", 0], - ["USP_BALACLAVA_ESS_MCA", 0], - ["USP_BALACLAVA_ESS_RGR", 0], - ["USP_BALACLAVA_ESS_CBR2", 0], - ["USP_BALACLAVA_ESS_GRY2", 0], - ["USP_BALACLAVA_ESS_MCA2", 0], - ["USP_BALACLAVA_ESS_RGR2", 0], - ["USP_BALACLAVA_ESS_CBR3", 0], - ["USP_BALACLAVA_ESS_GRY3", 0], - ["USP_BALACLAVA_ESS_MCA3", 0], - ["USP_BALACLAVA_ESS_RGR3", 0], - ["USP_BALACLAVA_ESS_SMC1_CBR", 0], - ["USP_BALACLAVA_ESS_SMC1_GRY", 0], - ["USP_BALACLAVA_ESS_SMC1_MCA", 0], - ["USP_BALACLAVA_ESS_SMC1_RGR", 0], - ["USP_BALACLAVA_ESS_SMC1_CBR2", 0], - ["USP_BALACLAVA_ESS_SMC1_GRY2", 0], - ["USP_BALACLAVA_ESS_SMC1_MCA2", 0], - ["USP_BALACLAVA_ESS_SMC1_RGR2", 0], - ["USP_BALACLAVA_ESS_SMG1_CBR", 0], - ["USP_BALACLAVA_ESS_SMG1_GRY", 0], - ["USP_BALACLAVA_ESS_SMG1_MCA", 0], - ["USP_BALACLAVA_ESS_SMG1_RGR", 0], - ["USP_BALACLAVA_ESS_SMG1_CBR2", 0], - ["USP_BALACLAVA_ESS_SMG1_GRY2", 0], - ["USP_BALACLAVA_ESS_SMG1_MCA2", 0], - ["USP_BALACLAVA_ESS_SMG1_RGR2", 0], - ["USP_BALACLAVA_ESS_SMG1_CBR3", 0], - ["USP_BALACLAVA_ESS_SMG1_GRY3", 0], - ["USP_BALACLAVA_ESS_SMG1_MCA3", 0], - ["USP_BALACLAVA_ESS_SMG1_RGR3", 0], - ["USP_BALACLAVA_OAK_CBR", 0], - ["USP_BALACLAVA_OAK_GRY", 0], - ["USP_BALACLAVA_OAK_MCA", 0], - ["USP_BALACLAVA_OAK_RGR", 0], - ["USP_BALACLAVA_OAK_CBR2", 0], - ["USP_BALACLAVA_OAK_GRY2", 0], - ["USP_BALACLAVA_OAK_MCA2", 0], - ["USP_BALACLAVA_OAK_RGR2", 0], - ["USP_BALACLAVA_OAK_SMC1_CBR", 0], - ["USP_BALACLAVA_OAK_SMC1_GRY", 0], - ["USP_BALACLAVA_OAK_SMC1_MCA", 0], - ["USP_BALACLAVA_OAK_SMC1_RGR", 0], - ["USP_BALACLAVA_OAK_SMC1_CBR2", 0], - ["USP_BALACLAVA_OAK_SMC1_GRY2", 0], - ["USP_BALACLAVA_OAK_SMC1_MCA2", 0], - ["USP_BALACLAVA_OAK_SMC1_RGR2", 0], - ["USP_BALACLAVA_OAK_SMG1_CBR", 0], - ["USP_BALACLAVA_OAK_SMG1_GRY", 0], - ["USP_BALACLAVA_OAK_SMG1_MCA", 0], - ["USP_BALACLAVA_OAK_SMG1_RGR", 0], - ["USP_BALACLAVA_OAK_SMG1_CBR2", 0], - ["USP_BALACLAVA_OAK_SMG1_GRY2", 0], - ["USP_BALACLAVA_OAK_SMG1_MCA2", 0], - ["USP_BALACLAVA_OAK_SMG1_RGR2", 0], - ["USP_ADVANCER_CLR", 0], - ["USP_ADVANCER", 0], - ["USP_ADVANCER_SF2", 0], - ["USP_ADVANCER_SF3", 0], - ["USP_ADVANCER_SFL2", 0], - ["USP_ADVANCER_SFL3", 0], - ["USP_ADVANCER_SL2", 0], - ["USP_ADVANCER_SL3", 0], - ["USP_ADVANCER_SN2", 0], - ["USP_ADVANCER_SN3", 0], - ["USP_ADVANCER_SNL2", 0], - ["USP_ADVANCER_SNL3", 0], - ["USP_ADVANCER_ST2", 0], - ["USP_ADVANCER_ST3", 0], - ["USP_ADVANCER_STL2", 0], - ["USP_ADVANCER_STL3", 0], - ["USP_CROSSBOW_BLK2", 0], - ["USP_CROSSBOW_BLK", 0], - ["USP_CROSSBOW_TAN2", 0], - ["USP_CROSSBOW_TAN", 0], - ["USP_CROSSBOW_SMC1_BLK2", 0], - ["USP_CROSSBOW_SMC1_BLK", 0], - ["USP_CROSSBOW_SMC2_BLK2", 0], - ["USP_CROSSBOW_SMC2_BLK", 0], - ["USP_CROSSBOW_SMC3_BLK2", 0], - ["USP_CROSSBOW_SMC3_BLK", 0], - ["USP_CROSSBOW_SMG1_BLK2", 0], - ["USP_CROSSBOW_SMG1_BLK", 0], - ["USP_CROSSBOW_SMG2_BLK2", 0], - ["USP_CROSSBOW_SMG2_BLK", 0], - ["USP_CROSSBOW_SMG3_BLK2", 0], - ["USP_CROSSBOW_SMG3_BLK", 0], - ["USP_CROSSBOW_SMC1_TAN2", 0], - ["USP_CROSSBOW_SMC1_TAN", 0], - ["USP_CROSSBOW_SMC2_TAN2", 0], - ["USP_CROSSBOW_SMC2_TAN", 0], - ["USP_CROSSBOW_SMC3_TAN2", 0], - ["USP_CROSSBOW_SMC3_TAN", 0], - ["USP_CROSSBOW_SMG1_TAN2", 0], - ["USP_CROSSBOW_SMG1_TAN", 0], - ["USP_CROSSBOW_SMG2_TAN2", 0], - ["USP_CROSSBOW_SMG2_TAN", 0], - ["USP_CROSSBOW_SMG3_TAN2", 0], - ["USP_CROSSBOW_SMG3_TAN", 0], - ["USP_GATORZ_BLK2", 0], - ["USP_GATORZ_BLK", 0], - ["USP_GATORZ_SMC1_BLK2", 0], - ["USP_GATORZ_SMC1_BLK", 0], - ["USP_GATORZ_SMC2_BLK2", 0], - ["USP_GATORZ_SMC2_BLK", 0], - ["USP_GATORZ_SMC3_BLK2", 0], - ["USP_GATORZ_SMC3_BLK", 0], - ["USP_GATORZ_SMG1_BLK2", 0], - ["USP_GATORZ_SMG1_BLK", 0], - ["USP_GATORZ_SMG2_BLK2", 0], - ["USP_GATORZ_SMG2_BLK", 0], - ["USP_GATORZ_SMG3_BLK2", 0], - ["USP_GATORZ_SMG3_BLK", 0], - ["USP_OAKLEY_SI2", 0], - ["USP_OAKLEY_SI2_MC", 0], - ["USP_OAKLEY_SI2_TAN", 0], - ["USP_DETCORD_BLK2", 0], - ["USP_DETCORD_BLK", 0], - ["USP_DETCORD_SMC1_BLK2", 0], - ["USP_DETCORD_SMC1_BLK", 0], - ["USP_DETCORD_SMC2_BLK2", 0], - ["USP_DETCORD_SMC2_BLK", 0], - ["USP_DETCORD_SMC3_BLK2", 0], - ["USP_DETCORD_SMC3_BLK", 0], - ["USP_DETCORD_SMG1_BLK2", 0], - ["USP_DETCORD_SMG1_BLK", 0], - ["USP_DETCORD_SMG2_BLK2", 0], - ["USP_DETCORD_SMG2_BLK", 0], - ["USP_DETCORD_SMG3_BLK2", 0], - ["USP_DETCORD_SMG3_BLK", 0], - ["USP_DETCORD_TAN2", 0], - ["USP_DETCORD_TAN", 0], - ["USP_DETCORD_SMC1_TAN2", 0], - ["USP_DETCORD_SMC1_TAN", 0], - ["USP_DETCORD_SMC2_TAN2", 0], - ["USP_DETCORD_SMC2_TAN", 0], - ["USP_DETCORD_SMC3_TAN2", 0], - ["USP_DETCORD_SMC3_TAN", 0], - ["USP_DETCORD_SMG1_TAN2", 0], - ["USP_DETCORD_SMG1_TAN", 0], - ["USP_DETCORD_SMG2_TAN2", 0], - ["USP_DETCORD_SMG2_TAN", 0], - ["USP_DETCORD_SMG3_TAN2", 0], - ["USP_DETCORD_SMG3_TAN", 0], - ["USP_MFRAME_BLK2", 0], - ["USP_MFRAME_BLK", 0], - ["USP_MFRAME_TAN2", 0], - ["USP_MFRAME_TAN", 0], - ["USP_MFRAME_SMC1_BLK2", 0], - ["USP_MFRAME_SMC1_BLK", 0], - ["USP_MFRAME_SMC2_BLK2", 0], - ["USP_MFRAME_SMC2_BLK", 0], - ["USP_MFRAME_SMC3_BLK2", 0], - ["USP_MFRAME_SMC3_BLK", 0], - ["USP_MFRAME_SMG1_BLK2", 0], - ["USP_MFRAME_SMG1_BLK", 0], - ["USP_MFRAME_SMG2_BLK2", 0], - ["USP_MFRAME_SMG2_BLK", 0], - ["USP_MFRAME_SMG3_BLK2", 0], - ["USP_MFRAME_SMG3_BLK", 0], - ["USP_MFRAME_SMC1_TAN2", 0], - ["USP_MFRAME_SMC1_TAN", 0], - ["USP_MFRAME_SMC2_TAN2", 0], - ["USP_MFRAME_SMC2_TAN", 0], - ["USP_MFRAME_SMC3_TAN2", 0], - ["USP_MFRAME_SMC3_TAN", 0], - ["USP_MFRAME_SMG1_TAN2", 0], - ["USP_MFRAME_SMG1_TAN", 0], - ["USP_MFRAME_SMG2_TAN2", 0], - ["USP_MFRAME_SMG2_TAN", 0], - ["USP_MFRAME_SMG3_TAN2", 0], - ["USP_MFRAME_SMG3_TAN", 0], - ["USP_STRAIGHTJACKET_BLK2", 0], - ["USP_STRAIGHTJACKET_BLK", 0], - ["USP_STRAIGHTJACKET_TAN2", 0], - ["USP_STRAIGHTJACKET_TAN", 0], - ["USP_STRAIGHTJACKET_SMC1_BLK2", 0], - ["USP_STRAIGHTJACKET_SMC1_BLK", 0], - ["USP_STRAIGHTJACKET_SMC2_BLK2", 0], - ["USP_STRAIGHTJACKET_SMC2_BLK", 0], - ["USP_STRAIGHTJACKET_SMC3_BLK2", 0], - ["USP_STRAIGHTJACKET_SMC3_BLK", 0], - ["USP_STRAIGHTJACKET_SMG1_BLK2", 0], - ["USP_STRAIGHTJACKET_SMG1_BLK", 0], - ["USP_STRAIGHTJACKET_SMG2_BLK2", 0], - ["USP_STRAIGHTJACKET_SMG2_BLK", 0], - ["USP_STRAIGHTJACKET_SMG3_BLK2", 0], - ["USP_STRAIGHTJACKET_SMG3_BLK", 0], - ["USP_STRAIGHTJACKET_SMC1_TAN2", 0], - ["USP_STRAIGHTJACKET_SMC1_TAN", 0], - ["USP_STRAIGHTJACKET_SMC2_TAN2", 0], - ["USP_STRAIGHTJACKET_SMC2_TAN", 0], - ["USP_STRAIGHTJACKET_SMC3_TAN2", 0], - ["USP_STRAIGHTJACKET_SMC3_TAN", 0], - ["USP_STRAIGHTJACKET_SMG1_TAN2", 0], - ["USP_STRAIGHTJACKET_SMG1_TAN", 0], - ["USP_STRAIGHTJACKET_SMG2_TAN2", 0], - ["USP_STRAIGHTJACKET_SMG2_TAN", 0], - ["USP_STRAIGHTJACKET_SMG3_TAN2", 0], - ["USP_STRAIGHTJACKET_SMG3_TAN", 0], - ["G_Spectacles", 0], - ["G_Spectacles_Tinted", 0], - - // Headgear - ["rhsusf_patrolcap_ocp", 0], - ["rhsusf_ach_helmet_camo_ocp", 0], - ["H_HelmetHBK_ocp_headset_F", 0], - ["H_HelmetB_camo", 0], - - // Uniforms - ["USP_G3C_MC", 0], - ["USP_G3C_KP_MC", 0], - ["USP_G3C_KP_MX_MC", 0], - ["USP_G3C_KP_OR_MC", 0], - ["USP_G3C_MX_MC", 0], - ["USP_G3C_OR_MC", 0], - ["USP_G3C_RS_MC", 0], - ["USP_G3C_RS_KP_MC", 0], - ["USP_G3C_RS_KP_MX_MC", 0], - ["USP_G3C_RS_KP_OR_MC", 0], - ["USP_G3C_RS_MX_MC", 0], - ["USP_G3C_RS_MX_MC", 0], - ["USP_G3C_RS2_MC", 0], - ["USP_G3C_RS2_KP_MC", 0], - ["USP_G3C_RS2_KP_MX_MC", 0], - ["USP_G3C_RS2_KP_OR_MC", 0], - ["USP_G3C_RS2_MX_MC", 0], - ["USP_G3C_RS2_OR_MC", 0], - ["USP_G3F_MC", 0], - ["USP_G3F_MX_MC", 0], - ["USP_G3F_OR_MC", 0], - ["USP_PCU_G3C_MX_MC", 0], - ["USP_PCU_G3C_OR_MC", 0], - ["USP_PCU_G3C_KP_MX_MC", 0], - ["USP_PCU_G3C_KP_OR_MC", 0], - ["USP_SOFTSHELL_G3C_MC", 0], - ["USP_SOFTSHELL_G3C_KP_MC", 0], - ["USP_SOFTSHELL_G3C_KP_MX_MC", 0], - ["USP_SOFTSHELL_G3C_KP_OR_MC", 0], - ["USP_SOFTSHELL_G3C_MX_MC", 0], - ["USP_SOFTSHELL_G3C_OR_MC", 0], - ["USP_G3F_MX_MCA", 0], - ["USP_G3F_OR_MCA", 0], - ["USP_G3F_G3C_KP_MX_MCA", 0], - ["USP_G3F_G3C_KP_OR_MCA", 0], - ["USP_OVERWHITE_G3C_KP_MX_MCA_MC", 0], - ["USP_OVERWHITE_G3C_KP_OR_MCA_MC", 0], - ["USP_OVERWHITE_G3C_MX_MCA_MC", 0], - ["USP_OVERWHITE_G3C_OR_MCA_MC", 0], - - // Backpack - ["B_AssaultPack_mcamo", 0], - ["USP_PACK_BREACHER_MC", 0], - ["USP_PACK_FASTHAWK", 0], - ["USP_PACK_POINTMAN", 0], - ["USP_ZIPON_PANEL_CPC_MC", 0], - ["USP_ZIPON_PACK_CPC_MC", 0], - ["USP_ZIPON_PACK_CPC_BC_MC", 0], - ["USP_ZIPON_PANEL_CPC_SMK_MC", 0], - ["USP_REEBOW_3DAP_MC", 0], - ["USP_REEBOW_3DAP_ACC1_MC", 0], - ["USP_REEBOW_3DAP_ACC10_MC", 0], - ["USP_ROLLFLAG2", 0], - ["USP_PACK_HYDRATION", 0], - - // Medical - ["ACE_EarPlugs",0], - - // Airway Management and Respiration - ["kat_chestSeal",0], - - // Bandages and Stitching - ["ACE_packingBandage",0], - ["ACE_quikclot",0], - - //Pills and Inhalants - ["kat_Painkiller",0], - ["kat_PainkillerItem",0], - - // Massive Hemorrhage Control - ["ACE_tourniquet",0], - - // Splints - ["ACE_splint",0], - - // Night Gear - ["ACE_IR_Strobe_Item",0], - - // Radios - ["TFAR_anprc152", 0] - ]], - - ["arsenal_company_fallback", [ - ["NDS_M_6Rnd_60mm_HE_0", 0], - ["NDS_M_6Rnd_60mm_HE", 0], - ["NDS_M_6Rnd_60mm_SMOKE", 0], - ["NDS_M_6Rnd_60mm_ILLUM", 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] - ]], - // Roles - ["arsenal_role_officer", [ - ["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], - ["ACE_MX2A", 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_squadleader", [ - ["ACE_microDAGR", 0], - ["ACE_HuntIR_monitor", 0], - ["USP_VEST_STRANDHOGG2_MC", 0], - ["USP_VEST_STRANDHOGG2_CBR", 0], - ["ACE_Vector", 0], - ["ACE_MX2A", 0], - - // Sidearm - ["UK3CB_P320_DES",0], - ["UK3CB_P320_BLK",0], - ["UK3CB_P320_9x19_17Rnd",0], - ["acc_flashlight_pistol",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_fireteamleader", [ - ["ACE_microDAGR", 0], - ["ACE_MX2A", 0], - ["USP_VEST_STRANDHOGG2_MC", 0], - ["USP_VEST_STRANDHOGG2_CBR", 0], - ["ACE_HuntIR_monitor", 0], - - // Sidearm - ["UK3CB_P320_DES",0], - ["UK3CB_P320_BLK",0], - ["UK3CB_P320_9x19_17Rnd",0], - ["acc_flashlight_pistol",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_weapons", [ - // MAAWS ammo - ["MRAWS_HEAT_F", 0], - ["MRAWS_HE_F", 0], - ["MAA_MAAWS_ASM509", 0], - ["MAA_MAAWS_HEDP502", 0], - ["MAA_MAAWS_GMM_MT", 0], - ["MAA_MAAWS_MT756", 0], - ["rhs_fgm148_magazine_AT",0], - ["rhs_fim92_mag",0], - - // Tools and Items - ["ACE_PlottingBoard",0], - ["ACE_Vector", 0] - ]], - ["arsenal_role_rotarypilot", [ - ["H_PilotHelqmetHeli_B", 0], - ["rhsusf_hgu56p_black", 0], - ["rhsusf_hgu56p_green", 0], - ["rhsusf_hgu56p_pink", 0], - ["rhsusf_hgu56p_saf", 0], - ["rhsusf_hgu56p_tan", 0], - ["rhsusf_hgu56p_usa", 0], - ["rhsusf_hgu56p_visor_black", 0], - ["rhsusf_hgu56p_visor_green", 0], - ["rhsusf_hgu56p_visor_pink", 0], - ["rhsusf_hgu56p_visor_saf", 0], - ["rhsusf_hgu56p_visor_tan", 0], - ["rhsusf_hgu56p_visor_usa", 0], - ["rhsusf_hgu56p_visor_white", 0], - ["rhsusf_hgu56p_visor", 0], - ["rhsusf_hgu56p_white", 0], - ["rhsusf_hgu56p", 0], - ["rhsusf_ihadss", 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_pilotcrew", [ - ["H_CrewHelmetHeli_B", 0], - ["rhsusf_hgu56p_mask_black", 0], - ["rhsusf_hgu56p_mask_black_skull", 0], - ["rhsusf_hgu56p_visor_mask_black", 0], - ["rhsusf_hgu56p_visor_mask_Empire_black", 0], - ["rhsusf_hgu56p_visor_mask_black_skull", 0], - ["rhsusf_hgu56p_mask_green", 0], - ["rhsusf_hgu56p_mask_green_mo", 0], - ["rhsusf_hgu56p_visor_mask_green", 0], - ["rhsusf_hgu56p_visor_mask_green_mo", 0], - ["rhsusf_hgu56p_mask", 0], - ["rhsusf_hgu56p_mask_mo", 0], - ["rhsusf_hgu56p_mask_skull", 0], - ["rhsusf_hgu56p_visor_mask", 0], - ["rhsusf_hgu56p_visor_mask_mo", 0], - ["rhsusf_hgu56p_visor_mask_skull", 0], - ["rhsusf_hgu56p_mask_tan", 0], - ["rhsusf_hgu56p_visor_mask_tan", 0], - ["rhsusf_hgu56p_mask_pink", 0], - ["rhsusf_hgu56p_visor_mask_pink", 0], - ["rhsusf_hgu56p_mask_saf", 0], - ["rhsusf_hgu56p_visor_mask_saf", 0], - ["rhsusf_hgu56p_mask_smiley", 0], - ["rhsusf_hgu56p_visor_mask_smiley", 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_pilotfighter", [ - ["RHS_jetpilot_usaf", 0], - - //Backpack - ["USP_TACTICAL_PACK_MCB_CCT", 0], - ["USP_TACTICAL_PACK_MCB_CCT2", 0], - ["USP_TACTICAL_PACK_MCB_CCT3", 0], - ["USP_TACTICAL_PACK_MCB_CCT4", 0], - ["USP_TACTICAL_PACK_MCB_CCT5", 0], - ["USP_TACTICAL_PACK_MCB_CCT6", 0], - ["USP_TACTICAL_PACK_MCB_CCT7", 0], - ["USP_TACTICAL_PACK_MCB_CCT8", 0], - ["UK3CB_US_B_B_RIF_OCP_Radio", 0] - ]], - ["arsenal_role_pilottransport", [ - ["USP_BASEBALL_CAP_OD_C", 0], - - //Backpack - ["USP_TACTICAL_PACK_MCB_CCT", 0], - ["USP_TACTICAL_PACK_MCB_CCT2", 0], - ["USP_TACTICAL_PACK_MCB_CCT3", 0], - ["USP_TACTICAL_PACK_MCB_CCT4", 0], - ["USP_TACTICAL_PACK_MCB_CCT5", 0], - ["USP_TACTICAL_PACK_MCB_CCT6", 0], - ["USP_TACTICAL_PACK_MCB_CCT7", 0], - ["USP_TACTICAL_PACK_MCB_CCT8", 0], - ["UK3CB_US_B_B_RIF_OCP_Radio", 0] - ]], - ["arsenal_role_doctor",[ - // 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], - ["kat_suction",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], - ["kat_atropine",0], - - // Cardiac resuscitation - ["kat_amiodarone",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] - //-------------------------- - ]], - ["arsenal_role_medic",[ - // Airway Management and Respiration - ["kat_accuvac",0], - ["kat_chestSeal",0], - ["kat_guedel",0], - ["kat_ncdKit",0], - ["kat_pocketBVM",0], - ["kat_suction",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_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 - ["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], - ["kat_atropine",0], - - // Cardiac resuscitation - ["kat_amiodarone",0], - - // Hemorrhage control - ["kat_EACA",0], - ["kat_TXA",0], - - // Splints - ["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 - ["kat_accuvac",0], - ["kat_chestSeal",0], - ["kat_guedel",0], - ["kat_ncdKit",0], - ["kat_pocketBVM",0], - ["kat_suction",0], - - // Autoinjectors - ["ACE_epinephrine",0], - ["kat_phenylephrineAuto",0], - - // Bandages and Stitching - ["ACE_packingBandage",0], - ["ACE_quikclot",0], - - //Pills and Inhalants - ["kat_Carbonate",0], - ["kat_CarbonateItem",0], - ["kat_Painkiller",0], - ["kat_PainkillerItem",0], - - // Massive Hemorrhage Control - ["ACE_tourniquet",0], - - // Splints - ["ACE_splint",0] - //-------------------------- - ]], - ["arsenal_role_strykercrew",[ - //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] - ]], - - // Weapons - ["arsenal_weap_ugl", [ - ["rhs_weap_m4a1_m320", 0], - ["rhs_weap_mk18_m320", 0], - ["rhs_weap_M320", 0], - ["rhs_weap_m4a1_carryhandle", 0], - ["rhs_weap_m4a1_carryhandle_mstock", 0], - ["rhs_weap_m4a1", 0], - ["rhs_weap_m4a1_mstock", 0], - ["rhs_weap_m4a1_d", 0], - ["rhs_weap_m4a1_d_mstock", 0], - ["rhs_weap_m4a1_wd", 0], - ["rhs_weap_m4a1_wd_mstock", 0], - - ["rhs_weap_m4a1_blockII", 0], - ["rhs_weap_m4a1_blockII_KAC", 0], - ["rhs_weap_m4a1_blockII_bk", 0], - ["rhs_weap_m4a1_blockII_KAC_bk", 0], - ["rhs_weap_m4a1_blockII_d", 0], - ["rhs_weap_m4a1_blockII_KAC_d", 0], - ["rhs_weap_m4a1_blockII_wd", 0], - ["rhs_weap_m4a1_blockII_KAC_wd", 0], - - ["rhs_weap_mk18", 0], - ["rhs_weap_mk18_bk", 0], - ["rhs_weap_mk18_KAC_bk", 0], - ["rhs_weap_mk18_d", 0], - ["rhs_weap_mk18_KAC_d", 0], - ["rhs_weap_mk18_KAC", 0], - ["rhs_weap_mk18_wd", 0], - ["rhs_weap_mk18_KAC_wd", 0], - - //Attachments - ["rhsusf_acc_anpeq15side", 0], - ["rhsusf_acc_anpeq15side_bk", 0], - ["rhsusf_acc_anpeq15A", 0], - ["rhsusf_acc_anpeq16A", 0], - ["rhsusf_acc_wmx", 0], - ["rhsusf_acc_wmx_bk", 0], - ["acc_flashlight", 0], - ["rhsusf_acc_sf3p556", 0], - ["rhsusf_acc_eotech", 0], - ["rhsusf_acc_g33_t1", 0], - ["rhsusf_acc_g33_xps3", 0], - ["rhsusf_acc_g33_xps3_tan", 0], - ["rhsusf_acc_elcan", 0], - ["rhsusf_acc_acog", 0], - ["rhsusf_acc_acog2", 0], - ["rhsusf_acc_acog3", 0], - ["rhsusf_acc_eotech_552", 0], - ["rhsusf_acc_eotech_552_d", 0], - ["rhsusf_acc_eotech_552_wd", 0], - ["rhsusf_acc_compm4", 0], - ["rhsusf_acc_su230", 0], - ["rhsusf_acc_su230_c", 0], - ["rhsusf_acc_su230_mrds", 0], - ["rhsusf_acc_su230_mrds_c", 0], - ["rhsusf_acc_t1_high", 0], - ["rhsusf_acc_acog_rmr", 0], - ["rhsusf_acc_acog_d", 0], - ["rhsusf_acc_acog_wd", 0], - ["rhsusf_acc_grip2", 0], - ["rhsusf_acc_grip2_tan", 0], - ["rhsusf_acc_grip2_wd", 0], - ["rhsusf_acc_grip1", 0], - ["rhsusf_acc_kac_grip", 0], - ["rhsusf_acc_rvg_blk", 0], - ["rhsusf_acc_rvg_de", 0], - ["rhsusf_acc_tdstubby_blk", 0], - ["rhsusf_acc_tdstubby_tan", 0], - ["rhsusf_acc_grip3", 0], - ["rhsusf_acc_grip3_tan", 0], - ["rhsusf_acc_eotech_xps3", 0] - ]], - ["arsenal_weap_m4", [ - ["rhs_weap_m4a1_carryhandle", 0], - ["rhs_weap_m4a1_carryhandle_mstock", 0], - ["rhs_weap_m4a1", 0], - ["rhs_weap_m4a1_mstock", 0], - ["rhs_weap_m4a1_d", 0], - ["rhs_weap_m4a1_d_mstock", 0], - ["rhs_weap_m4a1_wd", 0], - ["rhs_weap_m4a1_wd_mstock", 0], - - ["rhs_weap_m4a1_blockII", 0], - ["rhs_weap_m4a1_blockII_KAC", 0], - ["rhs_weap_m4a1_blockII_bk", 0], - ["rhs_weap_m4a1_blockII_KAC_bk", 0], - ["rhs_weap_m4a1_blockII_d", 0], - ["rhs_weap_m4a1_blockII_KAC_d", 0], - ["rhs_weap_m4a1_blockII_wd", 0], - ["rhs_weap_m4a1_blockII_KAC_wd", 0], - - ["rhs_weap_mk18", 0], - ["rhs_weap_mk18_bk", 0], - ["rhs_weap_mk18_KAC_bk", 0], - ["rhs_weap_mk18_d", 0], - ["rhs_weap_mk18_KAC_d", 0], - ["rhs_weap_mk18_KAC", 0], - ["rhs_weap_mk18_wd", 0], - ["rhs_weap_mk18_KAC_wd", 0], - - //Attachments - ["rhsusf_acc_sf3p556", 0], - ["rhsusf_acc_eotech", 0], - ["rhsusf_acc_g33_t1", 0], - ["rhsusf_acc_g33_xps3", 0], - ["rhsusf_acc_g33_xps3_tan", 0], - ["rhsusf_acc_elcan", 0], - ["rhsusf_acc_acog", 0], - ["rhsusf_acc_acog2", 0], - ["rhsusf_acc_acog3", 0], - ["rhsusf_acc_eotech_552", 0], - ["rhsusf_acc_eotech_552_d", 0], - ["rhsusf_acc_eotech_552_wd", 0], - ["rhsusf_acc_compm4", 0], - ["rhsusf_acc_su230", 0], - ["rhsusf_acc_su230_c", 0], - ["rhsusf_acc_su230_mrds", 0], - ["rhsusf_acc_su230_mrds_c", 0], - ["rhsusf_acc_t1_high", 0], - ["rhsusf_acc_acog_rmr", 0], - ["rhsusf_acc_acog_d", 0], - ["rhsusf_acc_acog_wd", 0], - ["rhsusf_acc_grip2", 0], - ["rhsusf_acc_grip2_tan", 0], - ["rhsusf_acc_grip2_wd", 0], - ["rhsusf_acc_grip1", 0], - ["rhsusf_acc_kac_grip", 0], - ["rhsusf_acc_rvg_blk", 0], - ["rhsusf_acc_rvg_de", 0], - ["rhsusf_acc_tdstubby_blk", 0], - ["rhsusf_acc_tdstubby_tan", 0], - ["rhsusf_acc_grip3", 0], - ["rhsusf_acc_grip3_tan", 0], - ["rhsusf_acc_eotech_xps3", 0], - ["rhsusf_acc_anpeq15side", 0], - ["rhsusf_acc_anpeq15side_bk", 0], - ["rhsusf_acc_anpeq15A", 0], - ["rhsusf_acc_anpeq16A", 0], - ["rhsusf_acc_wmx", 0], - ["rhsusf_acc_wmx_bk", 0], - ["acc_flashlight", 0] - ]], - ["arsenal_weap_sr25", [ - ["rhs_weap_sr25_ec", 0], - ["rhs_weap_sr25_ec_d", 0], - ["rhs_weap_sr25_ec_wd", 0], - - //Magazines - ["rhsusf_20Rnd_762x51_SR25_m118_special_Mag", 0], - - //Attachments - ["rhsusf_acc_harris_bipod", 0], - ["rhsusf_acc_anpeq15side", 0], - ["rhsusf_acc_anpeq15side_bk", 0], - ["rhsusf_acc_anpeq15A", 0], - ["rhsusf_acc_anpeq16A", 0], - ["rhsusf_acc_wmx", 0], - ["rhsusf_acc_wmx_bk", 0], - ["acc_flashlight", 0], - ["optic_AMS", 0], - ["optic_AMS_khk", 0], - ["optic_AMS_snd", 0] - ]], - ["arsenal_weap_m240", [ - ["rhs_weap_m240B", 0], - ["rhs_weap_m240G", 0], - - // Attachments - ["rhsusf_acc_eotech", 0], - ["rhsusf_acc_g33_t1", 0], - ["rhsusf_acc_g33_xps3", 0], - ["rhsusf_acc_g33_xps3_tan", 0], - ["rhsusf_acc_eotech_552", 0], - ["rhsusf_acc_eotech_552_d", 0], - ["rhsusf_acc_eotech_552_wd", 0], - ["rhsusf_acc_compm4", 0], - ["rhsusf_acc_t1_high", 0], - ["rhsusf_acc_elcan_ard", 0], - ["rhsusf_acc_su230a", 0], - ["rhsusf_acc_su230a_c", 0], - ["rhsusf_acc_su230a_mrds", 0], - ["rhsusf_acc_su230a_mrds_c", 0], - ["rhsusf_acc_acog_mdo", 0], - ["rhsusf_acc_anpeq15side", 0], - ["rhsusf_acc_anpeq15side_bk", 0], - ["rhsusf_acc_anpeq15A", 0], - ["rhsusf_acc_anpeq16A", 0], - ["rhsusf_acc_wmx", 0], - ["rhsusf_acc_wmx_bk", 0], - ["acc_flashlight", 0], - - // Sidearm - ["UK3CB_P320_DES",0], - ["UK3CB_P320_BLK",0], - ["UK3CB_P320_9x19_17Rnd",0], - ["acc_flashlight_pistol",0] - ]], - ["arsenal_weap_m249", [ - ["rhs_weap_m249_pip", 0], - ["rhs_weap_m249_light_L", 0], - ["rhs_weap_m249_pip_L_para", 0], - ["rhs_weap_m249_pip_L", 0], - ["rhs_weap_m249_pip_ris", 0], - ["rhs_weap_m249_light_S", 0], - ["rhs_weap_m249_pip_S_para", 0], - ["rhs_weap_m249_pip_S", 0], - - // Attachements - ["rhsusf_acc_eotech", 0], - ["rhsusf_acc_g33_t1", 0], - ["rhsusf_acc_g33_xps3", 0], - ["rhsusf_acc_g33_xps3_tan", 0], - ["rhsusf_acc_elcan", 0], - ["rhsusf_acc_acog", 0], - ["rhsusf_acc_acog2", 0], - ["rhsusf_acc_acog3", 0], - ["rhsusf_acc_eotech_552", 0], - ["rhsusf_acc_eotech_552_d", 0], - ["rhsusf_acc_eotech_552_wd", 0], - ["rhsusf_acc_compm4", 0], - ["rhsusf_acc_su230", 0], - ["rhsusf_acc_su230_c", 0], - ["rhsusf_acc_su230_mrds", 0], - ["rhsusf_acc_su230_mrds_c", 0], - ["rhsusf_acc_t1_high", 0], - ["rhsusf_acc_acog_rmr", 0], - ["rhsusf_acc_acog_d", 0], - ["rhsusf_acc_acog_wd", 0], - ["rhsusf_acc_kac_grip_saw_bipod", 0], - ["rhsusf_acc_grip4", 0], - ["rhsusf_acc_grip4_bipod", 0], - ["rhsusf_acc_saw_lw_bipod", 0], - ["rhsusf_acc_anpeq15side", 0], - ["rhsusf_acc_anpeq15side_bk", 0], - ["rhsusf_acc_anpeq15A", 0], - ["rhsusf_acc_anpeq16A", 0], - ["rhsusf_acc_wmx", 0], - ["rhsusf_acc_wmx_bk", 0], - ["acc_flashlight", 0] - ]], - ["arsenal_weap_launchers", [ - // Launchers - ["launch_MRAWS_green_F", 0], - ["launch_MRAWS_sand_F", 0], - ["launch_MRAWS_olive_F", 0], - ["rhs_weap_fgm148",0], - ["rhs_weap_fim92",0], - - // Launcher ammo - ["MRAWS_HEAT_F", 0], - ["MRAWS_HE_F", 0], - ["MAA_MAAWS_ASM509", 0], - ["MAA_MAAWS_HEDP502", 0], - ["MAA_MAAWS_GMM_MT", 0], - ["MAA_MAAWS_MT756", 0], - ["rhs_fgm148_magazine_AT",0], - ["rhs_fim92_mag",0] - ]], - ["arsenal_weap_sidearm",[ - ["UK3CB_P320_DES",0], - ["UK3CB_P320_BLK",0], - ["UK3CB_P320_9x19_17Rnd",0], - ["acc_flashlight_pistol",0] - ]] -]; +private _dataArray = call compileFinal preprocessfilelinenumbers 'cScripts\cScripts_logistics.sqf'; private _return = createHashMapFromArray _dataArray; @@ -2075,4 +22,4 @@ if (!(_return isEqualType createHashMap)) exitWith { createHashMapFromArray [["", []]]; }; -_return; +_return; \ No newline at end of file diff --git a/cScripts/functions/init/fn_init_pylons.sqf b/cScripts/functions/init/fn_init_pylons.sqf new file mode 100644 index 000000000..a4cd4cc7b --- /dev/null +++ b/cScripts/functions/init/fn_init_pylons.sqf @@ -0,0 +1,46 @@ +#include "..\script_component.hpp"; +/* + * Author: commy2 + * This function initzializes the pylons database + * + * Return Value: + * HashMap + * + * Example: + * call cScripts_fnc_init_pylons + * + * Public: No + */ + +INFO("VehiclePylon", "Creating pylons database"); +private _raw = call compileFinal preprocessfilelinenumbers 'cScripts\cScripts_pylons.sqf'; +private _processed = createHashMap; + +{ + _x params ["_classname", "_loadouts", "_icon"]; + private _map = createHashMap; + _processed set [_classname, _map]; + + { + _x params ["_loadoutName", "_loadoutInfo"]; + private _loadoutMap = createHashMapFromArray _loadoutInfo; + if !("displayName" in _loadoutMap) then { + SHOW_WARNING('VehiclePylon', _classname + " has no displayName!"); + }; + if !("loadout" in _loadoutMap) then { + SHOW_WARNING('VehiclePylon', _loadouts + " has no loadout!"); + }; + if !("icon" in _loadoutMap) then { + SHOW_WARNING('VehiclePylon', _icon + " has no icon!"); + }; + _map set [_loadoutName, _loadoutMap]; + } forEach _loadouts; +} forEach _raw; + + +if (!(_processed isEqualType createHashMap)) exitWith { + SHOW_CHAT_ERROR_1("VehiclePylon", "Fatal error creating database (database base type faulty %1)...", typeName _vehicleMap); + createHashMapFromArray [["", []]]; +}; + +_processed; diff --git a/cScripts/functions/logistics/fn_logistics_getContainer.sqf b/cScripts/functions/logistics/fn_logistics_getContainer.sqf index 43c2539a3..cd7e62f12 100644 --- a/cScripts/functions/logistics/fn_logistics_getContainer.sqf +++ b/cScripts/functions/logistics/fn_logistics_getContainer.sqf @@ -25,7 +25,7 @@ params [ if (_key == "") exitWith {}; private _containerMap = GVAR(DATABASE); -private _container = _containerMap getOrDefaultCall [_key, {WARNING_1("Logistics", "%1 does not exist.", _key); []}]; +private _container = _containerMap getOrDefaultCall [_key, {SHOW_WARNING_1("Logistics", "%1 does not exist.", _key); []}]; if (_keysOnly) then { private _containerItemMap = createHashMapFromArray _container; diff --git a/cScripts/functions/systems/fn_getIcon.sqf b/cScripts/functions/systems/fn_getIcon.sqf index 969e7833e..062b29117 100644 --- a/cScripts/functions/systems/fn_getIcon.sqf +++ b/cScripts/functions/systems/fn_getIcon.sqf @@ -25,4 +25,6 @@ params[["_icon", "", [""]]]; getText (configFile >> 'CfgGroupIcons' >> _icon >> "icon"), getText (configfile >> "CfgUnitInsignia" >> _icon >> "texture"), if (fileExists _icon) then {_icon} else {""} -]; \ No newline at end of file +]; + +"" \ No newline at end of file diff --git a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf index 9c6bdd241..55a601891 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf @@ -41,4 +41,4 @@ if (count _pylon == 0) then { _vehicle setVariable ["ace_rearm_scriptedLoadout", true, true]; }; -_vehicle setVariable [QEGVAR(VehicleFunc,DefaultPylon), true, true]; \ No newline at end of file +_vehicle setVariable [QEGVAR(VehicleFunc,DefaultPylon), true, true]; diff --git a/cScripts/functions/vehicle/fn_vehicle_addPylonSelection.sqf b/cScripts/functions/vehicle/fn_vehicle_addPylonSelection.sqf index f7aa80b54..7a732e0f0 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addPylonSelection.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addPylonSelection.sqf @@ -17,7 +17,7 @@ * * Example: * [_vehicle, "Default Loadout", "rhsusf_m1a1tank_base", "default", [], ""] call cScripts_fnc_vehicle_addPylonSelection; - * [_vehicle, _displayName, _vehicleKind, _loadoutName, _pylon, _icon] call cScripts_fnc_vehicle_addPylonSelection; + * [_vehicle, _displayName, _classname, _pylonName, _loadout _icon] call cScripts_fnc_vehicle_addPylonSelection; * [_vehicle, "Default Loadout", "rhsusf_m1a1tank_base", "default", [_vehicle, "rhsusf_m1a1tank_base", "default"] call cScripts_fnc_vehicle_getPylon, ""] call cScripts_fnc_vehicle_addPylonSelection; * * Public: No @@ -26,28 +26,28 @@ params [ ["_vehicle", objNull, [objNull]], ["_displayName", "", [""]], - ["_vehicleKind", "", [""]], - ["_loadoutName", "", [""]], - ["_pylon", [], ["",[],0]], + ["_classname", "", [""]], + ["_pylonName", "", [""]], + ["_loadout", [], ["",[],0]], ["_icon", "", [""]] ]; private _condition = { params ["_vehicle", "", "_params"]; - _params params ["_vehicleKind"]; - _vehicle iskindOf _vehicleKind; + _params params ["_classname"]; + _vehicle iskindOf _classname; }; private _statement = { params ["_vehicle", "_player", "_params"]; - _params params ["", "_loadoutName", "_pylon"]; - [_vehicle, _loadoutName, _pylon] call EFUNC(vehicle,applyLoadout); + _params params ["", "_pylonName", "_loadout"]; + [_vehicle, _pylonName, _loadout] call EFUNC(vehicle,applyLoadout); }; private _selfCategory = ["ACE_SelfActions", QEGVAR(Actions_Vehicle,Main_Cat), QEGVAR(Actions_Vehicle,Pylon_Cat)]; -private _actionName = format["%1_%2_%3", QGVAR(Pylon), _vehicleKind, _loadoutName]; +private _actionName = format["%1_%2_%3", QGVAR(Pylon), _classname, _pylonName]; -private _action = [_actionName, _displayName, _icon, _statement, _condition, nil, [_vehicleKind, _loadoutName, _pylon]] call ace_interact_menu_fnc_createAction; +private _action = [_actionName, _displayName, _icon, _statement, _condition, nil, [_classname, _pylonName, _loadout]] call ace_interact_menu_fnc_createAction; [_vehicle, 1, _selfCategory, _action] call ace_interact_menu_fnc_addActionToObject; -INFO_4("VehiclePylonSelector", "Selector for kindOf '%1' named '%2' added to %3 (%4)", _vehicleKind, _displayName, _vehicle, typeOf _vehicle); \ No newline at end of file +INFO_4("VehiclePylonSelector", "Selector for kindOf '%1' named '%2' added to %3 (%4)", _classname, _displayName, _vehicle, typeOf _vehicle); \ No newline at end of file diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf deleted file mode 100644 index 6dc3fb130..000000000 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ /dev/null @@ -1,212 +0,0 @@ -#include "..\script_component.hpp"; -/* - * Author: CPL.Brostrom.A - * This function return a vehicle loadout based on provided name and vehicle kind. - * - * Arguments: - * 0: VehicleKind or ListOfVehicleKind(true) or Everything(false) - * 1: LoadoutName (Default; "default") - * - * Return Value: - * Vehicle loadout Array or keys - * - * Example: - * ["rhsusf_m1a1tank_base", "default"] call cScripts_fnc_vehicle_getPylon; - * [true] call cScripts_fnc_vehicle_getPylon; - * - * Public: No - */ - -params [ - ["_vehicleKind", "", ["", true]], - ["_loadout", "default", [""]] -]; - -// rhsusf_m1a1tank_base -private _rhsusf_m1a1tank_base = createHashMapFromArray [ - ["hard", [ - ["rhs_mag_smokegen",[-1],999], - ["rhs_mag_M829A3_max",[0],44], - ["rhs_mag_M830A1_max",[0],8], - ["rhs_mag_762x51_M240_1200",[0],0], - ["rhs_mag_762x51_M240_1200",[0],0], - ["rhs_mag_762x51_M240_1200",[0],0], - ["rhs_mag_762x51_M240_1200",[0],0], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_LaserFCSMag",[0],99], - ["rhs_LaserFCSMag",[0],99], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhsusf_mag_L8A3_12",[0,0],12], - ["rhs_mag_762x51_M240_200",[0,2]], - ["rhs_mag_762x51_M240_200",[0,2]], - ["rhs_mag_762x51_M240_200",[0,2]] - ]], - [ "default", [ - ["rhs_mag_smokegen",[-1],999], - ["rhs_mag_M829A3_max",[0],28], - ["rhs_mag_M830A1_max",[0],16], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_LaserFCSMag",[0],99], - ["rhs_LaserFCSMag",[0],99], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhsusf_mag_L8A3_12",[0,0],12], - ["rhs_mag_762x51_M240_200",[0,2]], - ["rhs_mag_762x51_M240_200",[0,2]], - ["rhs_mag_762x51_M240_200",[0,2]] - ]], - ["soft",[ - ["rhs_mag_smokegen",[-1],999], - ["rhs_mag_M829A3_max",[0],4], - ["rhs_mag_M1028_max",[0],10], - ["rhs_mag_M1069_max",[0],22], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_mag_762x51_M240_1200",[0],1200], - ["rhs_LaserFCSMag",[0],99], - ["rhs_LaserFCSMag",[0],99], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0,0]], - ["rhsusf_mag_L8A3_12",[0,0],12], - ["rhs_mag_762x51_M240_200",[0,2]], - ["rhs_mag_762x51_M240_200",[0,2]], - ["rhs_mag_762x51_M240_200",[0,2]] - ]] -]; - -// I_APC_Wheeled_03_cannon_F -private _cav_dragoon_base_F = createHashMapFromArray [ - ["antiarmor", [ - ["SmokeLauncherMag",[0],6], - ["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], - ["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], - // ["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], - // ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - // ["4Rnd_Titan_long_missiles",[0],4] - // ]], - ["default",[ - ["SmokeLauncherMag",[0],6], - ["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], - ["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] - ]], - ["balanced",[ - ["SmokeLauncherMag",[0],6], - ["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], - ["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] - ]] -]; - -// Loadout vehicle list -private _allVehiclePylons = createHashMapFromArray [ - ["rhsusf_m1a1tank_base", _rhsusf_m1a1tank_base], - ["cav_dragoon_base_F", _cav_dragoon_base_F] -]; - -// Return keys or full hashmap -if (_vehicleKind isEqualType true) exitWith { - if (_vehicleKind) then {_allVehiclePylons = keys _allVehiclePylons}; - _allVehiclePylons; -}; - - -// Check if valid input -if (_vehicleKind == "") exitWith { - SHOW_WARNING("VehiclePylon", "No kind of vehicle is defined"); - []; -}; -if (_loadout == "") exitWith { - SHOW_WARNING("VehiclePylon", "No vehicle loadout is defined"); - []; -}; - -// Obtain pylon -private _vehiclePylons = _allVehiclePylons getOrDefault [_vehicleKind, []]; -private _pylon = _vehiclePylons getOrDefault [_loadout, []]; -if (count _pylon == 0) then { - SHOW_WARNING_2("VehiclePylon", "%1 does not exist for selected kind of %2.", _loadout, _vehicleKind); -}; - -_pylon; diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylonIcon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylonIcon.sqf new file mode 100644 index 000000000..f54c18fcd --- /dev/null +++ b/cScripts/functions/vehicle/fn_vehicle_getPylonIcon.sqf @@ -0,0 +1,28 @@ +#include "..\script_component.hpp"; +/* + * Author: SGT.Brostrom.A + * This function return a pylon icon + * + * Arguments: + * 0: VehicleKind + * 1: LoadoutName (Default; "default") + * + * Return Value: + * DisplayName + * + * Example: + * ["rhsusf_m1a1tank_base", "default"] call cScripts_fnc_vehicle_getPylonIcon; + * + * Public: No + */ + +params [ + ["_classname", "", [""]], + ["_loadout", "default", [""]] +]; + + +private _icon = GVAR(PYLONS) get _classname get _loadout getOrDefault ["icon", ""]; +private _return = [_icon] call FUNC(getIcon); + +_return \ No newline at end of file diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylonLoadout.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylonLoadout.sqf new file mode 100644 index 000000000..4dab7745d --- /dev/null +++ b/cScripts/functions/vehicle/fn_vehicle_getPylonLoadout.sqf @@ -0,0 +1,24 @@ +#include "..\script_component.hpp"; +/* + * Author: SGT.Brostrom.A + * This function returns a vehicle loadout or pylon + * + * Arguments: + * 0: VehicleKind + * 1: LoadoutName (Default; "default") + * + * Return Value: + * Vehicle loadout Array + * + * Example: + * ["rhsusf_m1a1tank_base", "default"] call cScripts_fnc_vehicle_getPylonLoadout; + * + * Public: No + */ + +params [ + ["_classname", "", [""]], + ["_loadout", "default", [""]] +]; + +GVAR(PYLONS) get _classname get _loadout getOrDefault ["loadout", ""] \ No newline at end of file diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylonName.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylonName.sqf new file mode 100644 index 000000000..f23bae85e --- /dev/null +++ b/cScripts/functions/vehicle/fn_vehicle_getPylonName.sqf @@ -0,0 +1,24 @@ +#include "..\script_component.hpp"; +/* + * Author: SGT.Brostrom.A + * This function return a pylon displayname + * + * Arguments: + * 0: VehicleKind + * 1: LoadoutName (Default; "default") + * + * Return Value: + * DisplayName + * + * Example: + * ["rhsusf_m1a1tank_base", "default"] call cScripts_fnc_vehicle_getPylonName; + * + * Public: No + */ + +params [ + ["_classname", "", [""]], + ["_loadout", "default", [""]] +]; + +GVAR(PYLONS) get _classname get _loadout getOrDefault ["displayName", ""] \ No newline at end of file diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index aea3a5ee1..a1643680e 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -1,6 +1,6 @@ #include "..\script_component.hpp"; /* - * Author: CPL.Brostrom.A + * Author: SGT.Brostrom.A * This function setup a loadout categories * * Arguments: @@ -23,26 +23,19 @@ params [["_vehicle", objNull, [objNull]]]; // Loadout action setup private _pylonList = []; -if (_vehicle iskindOf "rhsusf_m1a1tank_base") then { - _pylonList = [ - // TypeOf, DisplayName, Name, Icon - ["rhsusf_m1a1tank_base", "Hard", "hard", ""], - ["rhsusf_m1a1tank_base", "Soft", "soft", ""], - ["rhsusf_m1a1tank_base", "Default", "default", ""] - ]; -}; - - -if (_vehicle iskindOf "cav_dragoon_base_F" && !(_vehicle isKindOf "cav_dragoon_unarmed_base_F")) then { - _pylonList = [ - // TypeOf, DisplayName, Name, Icon - ["cav_dragoon_base_F", "Anti-Personnel (default)", "default", ""], - ["cav_dragoon_base_F", "Balanced", "balanced", ""], - ["cav_dragoon_base_F", "Anti-Armor", "antiarmor", ""] - // ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] - ]; -}; - +{ + _x params ["_classname"]; + if (_vehicle iskindOf _classname) then { + { + _x params ["_pylonName"]; + private _displayName = [_classname, _pylonName] call EFUNC(vehicle,getPylonName); + private _loadout = [_classname, _pylonName] call EFUNC(vehicle,getPylonLoadout); + private _icon = [_classname, _pylonName] call EFUNC(vehicle,getPylonIcon); + _pylonList append [[_classname, _displayName, _pylonName, _loadout, _icon]]; + } forEach (keys (GVAR(PYLONS) get _classname)); + break; + }; +} forEach (keys GVAR(PYLONS)); if (count _pylonList == 0) exitWith {false}; // Setup category @@ -52,10 +45,9 @@ private _vehiclePylon = [QEGVAR(Actions_Vehicle,Pylon_Cat), "Vehicle Loadouts", // Setup loadouts selection { - _x params ["_vehicleKind", "_displayName", "_loadoutName", ["_icon", ""]]; - INFO_4("VehiclePylonSetup", "Creating loadout '%1' (%2) action for vehicle %3 (%4)", _displayName, _loadoutName, _vehicle, typeOf _vehicle); - private _pylon = [_vehicleKind, _loadoutName] call EFUNC(vehicle,getPylon); - [_vehicle, _displayName, _vehicleKind, _loadoutName, _pylon, _icon] call EFUNC(vehicle,addPylonSelection); + _x params ["_classname", "_displayName", "_pylonName", "_loadout", "_icon"]; + INFO_4("VehiclePylonSetup", "Creating loadout '%1' (%2) action for vehicle %3 (%4)", _displayName, _pylonName, _vehicle, typeOf _vehicle); + [_vehicle, _displayName, _classname, _pylonName, _loadout, _icon] call EFUNC(vehicle,addPylonSelection); } forEach _pylonList; true \ No newline at end of file From 5ec935a6ad1a8d717d27b1334141cb5110f45559 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Tue, 14 May 2024 15:57:28 -0400 Subject: [PATCH 55/58] Fixed pylons not loading (#1193) --- cScripts/CfgFunctions.hpp | 2 +- cScripts/cScripts_pylons.sqf | 90 +++++++++++-------- .../vehicle/fn_vehicle_addDefaultLoadout.sqf | 5 +- 3 files changed, 54 insertions(+), 43 deletions(-) diff --git a/cScripts/CfgFunctions.hpp b/cScripts/CfgFunctions.hpp index fd563de22..601233a2b 100644 --- a/cScripts/CfgFunctions.hpp +++ b/cScripts/CfgFunctions.hpp @@ -258,4 +258,4 @@ class cScripts { class testing_loadoutArrays {}; class testing_equipmentUsed {}; }; -}; +}; \ No newline at end of file diff --git a/cScripts/cScripts_pylons.sqf b/cScripts/cScripts_pylons.sqf index abd758d6e..755fa2b65 100644 --- a/cScripts/cScripts_pylons.sqf +++ b/cScripts/cScripts_pylons.sqf @@ -106,19 +106,23 @@ ["cav_dragoon_base_F", [ ["antiarmor", [ - ["SmokeLauncherMag",[0],6], - ["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], - ["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] + ["displayName", "Anti-Armor"], + ["icon", ""], + ["loadout",[ + ["SmokeLauncherMag",[0],6], + ["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], + ["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], @@ -135,34 +139,42 @@ // ["4Rnd_Titan_long_missiles",[0],4] // ]], ["default",[ - ["SmokeLauncherMag",[0],6], - ["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], - ["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] + ["displayName", "Anti-Personnel"], + ["icon", ""], + ["loadout",[ + ["SmokeLauncherMag",[0],6], + ["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], + ["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] + ]] ]], ["balanced",[ - ["SmokeLauncherMag",[0],6], - ["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], - ["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] + ["displayName", "Balanced"], + ["icon", ""], + ["loadout",[ + ["SmokeLauncherMag",[0],6], + ["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], + ["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] + ]] ]] ]] ]; \ No newline at end of file diff --git a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf index 55a601891..e3f69656a 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf @@ -24,16 +24,15 @@ if (!(_vehicle call FUNC(isValidFaction))) exitWith {}; INFO_2("VehicleDefaultLoadout", "Applying vehicle loadout to %1 [%2].", _vehicle, typeOf _vehicle); // Default pylon applied -private _vehicleTypes = [true] call EFUNC(vehicle,getPylon); private _pylon = []; { if (_vehicle iskindOf _x) exitWith { - _pylon = [_x, "default"] call EFUNC(vehicle,getPylon); + _pylon = [_x, "default"] call EFUNC(vehicle,getPylonLoadout); INFO_3("VehicleDefaultLoadout", "Vehicle %1 [%2] applied have loadout %3.", _vehicle, typeOf _vehicle, _pylon); [_vehicle, "default", _pylon] call EFUNC(vehicle,applyLoadout); }; -} forEach _vehicleTypes; +} forEach (keys GVAR(PYLONS)); if (count _pylon == 0) then { WARNING_2("VehicleDefaultLoadout", "Vehicle %1 [%2] has no loadout setup.", _vehicle, typeOf _vehicle); From fb766daa7701f5fe930f7ee6849e519c2322e028 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Tue, 14 May 2024 15:58:37 -0400 Subject: [PATCH 56/58] Fixed PVS-31 classnames after USP update (#1194) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Broström.A | Evul --- cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp | 8 ++++---- cScripts/cScripts_logistics.sqf | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp index ea750644b..53e692b0d 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp @@ -12,25 +12,25 @@ class Cav_B_Bravo_Atlas_base_F: Cav_B_Bravo_base_F { class Cav_B_B_Atlas_Medic_TeamLeader_F: Cav_B_Bravo_Atlas_base_F { displayName = "Team Leader"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",4],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_EarPlugs",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",5],["kat_norepinephrine",15],["kat_phenylephrine",15],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",15],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["kat_TXA",5],["kat_lidocaine",5],["kat_EACA",15],["kat_atropine",5],["kat_amiodarone",5],["ACE_epinephrine",3],["ACE_splint",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_TACTICAL_PACK",[["kat_AED",1],["ACE_plasmaIV",6],["ACE_plasmaIV_500",6],["ACE_salineIV_250",2],["kat_BVM",1],["kat_larynx",10],["ACE_salineIV",1],["ACE_Chemlight_Shield",1],["kat_accuvac",1],["kat_ultrasound",1],["kat_aatKit",5],["ACE_Chemlight_White",1,1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31_COMPACT"]]; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",4],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_EarPlugs",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",5],["kat_norepinephrine",15],["kat_phenylephrine",15],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",15],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["kat_TXA",5],["kat_lidocaine",5],["kat_EACA",15],["kat_atropine",5],["kat_amiodarone",5],["ACE_epinephrine",3],["ACE_splint",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_TACTICAL_PACK",[["kat_AED",1],["ACE_plasmaIV",6],["ACE_plasmaIV_500",6],["ACE_salineIV_250",2],["kat_BVM",1],["kat_larynx",10],["ACE_salineIV",1],["ACE_Chemlight_Shield",1],["kat_accuvac",1],["kat_ultrasound",1],["kat_aatKit",5],["ACE_Chemlight_White",1,1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31"]]; }; class Cav_B_B_Atlas_Medic_CombatMedic_F: Cav_B_B_Atlas_Medic_TeamLeader_F { displayName = "Team Member"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",5],["ACE_CableTie",4],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",5],["kat_norepinephrine",15],["kat_phenylephrine",15],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",20],["kat_stethoscope",1],["ACE_Chemlight_Shield",1],["ACE_IR_Strobe_Item",2],["kat_nitroglycerin",12],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["ACE_epinephrine",3],["kat_amiodarone",5],["kat_atropine",10],["kat_EACA",10],["kat_TXA",5],["ACE_splint",4],["ACE_EntrenchingTool",1],["kat_reboa",1],["kat_ultrasound",1],["ACE_Chemlight_White",1,1],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",7],["kat_lidocaine",5],["ACE_salineIV_250",2],["kat_aatKit",5],["ACE_plasmaIV_500",7],["kat_BVM",1],["ACE_salineIV",2],["kat_accuvac",1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31_COMPACT"]]; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",5],["ACE_CableTie",4],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",5],["kat_norepinephrine",15],["kat_phenylephrine",15],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",20],["kat_stethoscope",1],["ACE_Chemlight_Shield",1],["ACE_IR_Strobe_Item",2],["kat_nitroglycerin",12],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["ACE_epinephrine",3],["kat_amiodarone",5],["kat_atropine",10],["kat_EACA",10],["kat_TXA",5],["ACE_splint",4],["ACE_EntrenchingTool",1],["kat_reboa",1],["kat_ultrasound",1],["ACE_Chemlight_White",1,1],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",7],["kat_lidocaine",5],["ACE_salineIV_250",2],["kat_aatKit",5],["ACE_plasmaIV_500",7],["kat_BVM",1],["ACE_salineIV",2],["kat_accuvac",1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31"]]; }; class Cav_B_B_Atlas_Medic_CRNA_F: Cav_B_B_Atlas_Medic_TeamLeader_F { displayName = "CRNA"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",5],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_Chemlight_Shield",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",5],["kat_norepinephrine",12],["kat_phenylephrine",12],["ACE_packingBandage",10],["ACE_elasticBandage",20],["kat_IV_16",15],["ACE_IR_Strobe_Item",2],["kat_nitroglycerin",15],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",10],["kat_nalbuphine",10],["ACE_adenosine",3],["ACE_epinephrine",5],["kat_amiodarone",5],["kat_atropine",3],["kat_EACA",10],["kat_TXA",5],["ACE_splint",4],["kat_ultrasound",1],["SmokeShellBlue",2,1],["SmokeShellPurple",1,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",5],["kat_lidocaine",10],["ACE_salineIV_250",2],["kat_aatKit",3],["ACE_plasmaIV_500",5],["kat_BVM",1],["kat_accuvac",1],["kat_X_AED",1],["kat_etomidate",12],["kat_flumazenil",6],["kat_lorazepam",6],["kat_oxygenTank_300",1,200]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31_COMPACT"]]; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",5],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_Chemlight_Shield",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",5],["kat_norepinephrine",12],["kat_phenylephrine",12],["ACE_packingBandage",10],["ACE_elasticBandage",20],["kat_IV_16",15],["ACE_IR_Strobe_Item",2],["kat_nitroglycerin",15],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",10],["kat_nalbuphine",10],["ACE_adenosine",3],["ACE_epinephrine",5],["kat_amiodarone",5],["kat_atropine",3],["kat_EACA",10],["kat_TXA",5],["ACE_splint",4],["kat_ultrasound",1],["SmokeShellBlue",2,1],["SmokeShellPurple",1,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",5],["kat_lidocaine",10],["ACE_salineIV_250",2],["kat_aatKit",3],["ACE_plasmaIV_500",5],["kat_BVM",1],["kat_accuvac",1],["kat_X_AED",1],["kat_etomidate",12],["kat_flumazenil",6],["kat_lorazepam",6],["kat_oxygenTank_300",1,200]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31"]]; }; class Cav_B_B_Atlas_Medic_Surgeon_F_Local: Cav_B_B_Atlas_Medic_TeamLeader_F { displayName = "Surgeon"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",5],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",3],["kat_norepinephrine",10],["kat_phenylephrine",10],["ACE_packingBandage",5],["ACE_elasticBandage",25],["kat_IV_16",15],["kat_stethoscope",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["kat_nitroglycerin",6],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["kat_amiodarone",5],["kat_atropine",5],["kat_EACA",10],["kat_TXA",5],["kat_lidocaine",10],["kat_BVM",1],["ACE_epinephrine",3],["ACE_splint",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_vacuum",1],["kat_etomidate",14],["kat_flumazenil",6],["kat_larynx",10],["kat_lorazepam",6],["ACE_plasmaIV",6],["ACE_plasmaIV_500",5],["ACE_salineIV_250",6],["kat_scalpel",30],["kat_accuvac",1],["kat_ultrasound",1],["kat_reboa",10],["kat_aatKit",5],["kat_plate",6],["kat_clamp",1],["kat_retractor",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31_COMPACT"]]; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",5],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",3],["kat_norepinephrine",10],["kat_phenylephrine",10],["ACE_packingBandage",5],["ACE_elasticBandage",25],["kat_IV_16",15],["kat_stethoscope",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["kat_nitroglycerin",6],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["kat_amiodarone",5],["kat_atropine",5],["kat_EACA",10],["kat_TXA",5],["kat_lidocaine",10],["kat_BVM",1],["ACE_epinephrine",3],["ACE_splint",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_vacuum",1],["kat_etomidate",14],["kat_flumazenil",6],["kat_larynx",10],["kat_lorazepam",6],["ACE_plasmaIV",6],["ACE_plasmaIV_500",5],["ACE_salineIV_250",6],["kat_scalpel",30],["kat_accuvac",1],["kat_ultrasound",1],["kat_reboa",10],["kat_aatKit",5],["kat_plate",6],["kat_clamp",1],["kat_retractor",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31"]]; }; // Named diff --git a/cScripts/cScripts_logistics.sqf b/cScripts/cScripts_logistics.sqf index bbb627ea0..25fdd4229 100644 --- a/cScripts/cScripts_logistics.sqf +++ b/cScripts/cScripts_logistics.sqf @@ -187,9 +187,8 @@ ["USP_L4G19", 0], ["USP_L4G24",0], ["USP_PVS31",0], - ["USP_PVS31_HIGH",0], - ["USP_PVS31_LOW",0], - ["USP_PVS31_COMPACT",0], + ["USP_PVS31_BLK2",0], + ["USP_PVS31_TAN2",0], ["USP_RHINO", 0], // cTab From a88a46bce229a9657c8d7532cb6e7747b6497b5b Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 16 May 2024 09:57:32 -0400 Subject: [PATCH 57/58] Updated settings for ACE Update (#1196) --- cba_settings.sqf | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/cba_settings.sqf b/cba_settings.sqf index 014838bc2..eef8472ce 100644 --- a/cba_settings.sqf +++ b/cba_settings.sqf @@ -88,7 +88,7 @@ force force ace_common_enableSway = true; force force ace_common_restedSwayFactor = 1; //ace_common_settingFeedbackIcons = 1; //ace_common_settingProgressBarLocation = 0; -force force ace_common_swayFactor = 1; +force force ace_common_swayFactor = 0.75; // ACE Cook off force force ace_cookoff_ammoCookoffDuration = 0; @@ -173,7 +173,7 @@ force force acex_headless_log = false; force force acex_headless_transferLoadout = 1; // ACE Hearing -force force ace_hearing_autoAddEarplugsToUnits = false; +force force ace_hearing_autoAddEarplugsToUnits = 2; force force ace_hearing_disableEarRinging = false; force force ace_hearing_earplugsVolume = 0.5; force force ace_hearing_enableCombatDeafness = true; @@ -1315,20 +1315,20 @@ force force kat_misc_AFAKSecondSlotItem = "[['ACE_packingBandage', 10], ['ACE_qu force force kat_misc_AFAKSixthSlotItem = "[['ACE_morphine', 3], ['ACE_epinephrine', 3]]"; force force kat_misc_AFAKThirdSlotItem = "[['kat_Penthrox', 2], ['kat_Painkiller', 1]]"; force force kat_misc_allowSharedVehicleEquipment = 4; -force force kat_misc_armbandSlingLeftArm = "0.2, -0.39, -0.2"; -force force kat_misc_armbandSlingLeftArmRotation = "240, 33, 26"; -force force kat_misc_armbandSlingLeftLeg = "0.435, -0.075, -0.38"; -force force kat_misc_armbandSlingLeftLegRotation = "-160, -5, 45"; -force force kat_misc_armbandSlingRightArm = "-0.228, -0.1, -0.43"; -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_armbandSlingLeftArm = "[0.2, -0.39, -0.2]"; +force force kat_misc_armbandSlingLeftArmRotation = "[240, 33, 26]"; +force force kat_misc_armbandSlingLeftLeg = "[0.435, -0.075, -0.38]"; +force force kat_misc_armbandSlingLeftLegRotation = "[-160, -5, 45]"; +force force kat_misc_armbandSlingRightArm = "[-0.228, -0.1, -0.43]"; +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_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]]"; @@ -1704,6 +1704,7 @@ force force usaf_utility_core_allow_move_in_cargo = false; //zen_attributes_enableWaypointType = true; // Zeus Enhanced - Faction Filter +//zen_faction_filter_0_EdCat_GO_CSAT_Arctic = true; //zen_faction_filter_0_OPF_F = true; //zen_faction_filter_0_OPF_G_F = true; //zen_faction_filter_0_OPF_GEN_F = true; @@ -1795,6 +1796,7 @@ force force usaf_utility_core_allow_move_in_cargo = false; //zen_faction_filter_1_BLU_T_F = true; //zen_faction_filter_1_BLU_USA_7CAV_F = true; //zen_faction_filter_1_BLU_W_F = true; +//zen_faction_filter_1_EdCat_GO_NATO_Arctic = true; //zen_faction_filter_1_rhs_faction_socom = true; //zen_faction_filter_1_rhs_faction_usaf = true; //zen_faction_filter_1_rhs_faction_usarmy_d = true; From 3ab0d6d4317b480f113b0ed5fa7deaa431d068f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Fri, 17 May 2024 09:00:00 +0000 Subject: [PATCH 58/58] Fixed undefined variables (#1195) --- cScripts/functions/init/fn_init_pylons.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cScripts/functions/init/fn_init_pylons.sqf b/cScripts/functions/init/fn_init_pylons.sqf index a4cd4cc7b..98074ab87 100644 --- a/cScripts/functions/init/fn_init_pylons.sqf +++ b/cScripts/functions/init/fn_init_pylons.sqf @@ -25,13 +25,13 @@ private _processed = createHashMap; _x params ["_loadoutName", "_loadoutInfo"]; private _loadoutMap = createHashMapFromArray _loadoutInfo; if !("displayName" in _loadoutMap) then { - SHOW_WARNING('VehiclePylon', _classname + " has no displayName!"); + SHOW_WARNING_1('VehiclePylon',"%1 has no defined displayName.",_classname); }; if !("loadout" in _loadoutMap) then { - SHOW_WARNING('VehiclePylon', _loadouts + " has no loadout!"); + SHOW_WARNING_1('VehiclePylon',"%1 has no defined loadout.",_classname); }; if !("icon" in _loadoutMap) then { - SHOW_WARNING('VehiclePylon', _icon + " has no icon!"); + SHOW_WARNING_1('VehiclePylon',"%1 has no defined icon.",_classname); }; _map set [_loadoutName, _loadoutMap]; } forEach _loadouts;