Skip to content

Revert "Added ATLAS-3 Logistics and composition" #1259

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
AndreasBrostrom merged 1 commit into from
Dec 18, 2024
Merged

Revert "Added ATLAS-3 Logistics and composition" #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,534 changes: 3,180 additions & 1,354 deletions Compositions/4.Cav_ATLAS_Platoon/composition.sqe
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Compositions/4.Cav_ATLAS_Platoon/header.sqe
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version=54;
name="5.ATLAS_Platoon_v4.5.21";
author="=7Cav=SGT.Blake.H";
name="4.ATLAS_Platoon_DEVBUILD";
author="=7Cav=CPL.Zaren.T";
category="Cav_EdSubcat_Deploy_Platoon";
requiredAddons[]=
{
"ace_fortify",
"Desert",
"cav_charlie_characters_units",
"rhsusf_c_m11xx",
"rhsusf_c_RG33",
"A3_Weapons_F_Ammoboxes",
"ace_cargo",
"cav_troops_bravo_atlas",
"rhsusf_vehicles",
"cav_vehicles_dragoon",
"rhsusf_c_Caiman",
"rhsusf_c_M1239",
"cav_bravo_characters"
"rhsusf_c_stryker",
"rhsusf_c_M1239"
};
1 change: 0 additions & 1 deletion cScripts/CfgLoadouts.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ class CfgLoadouts {
#include "Loadouts\CfgLoadouts_Bravo_Viking.hpp"
#include "Loadouts\CfgLoadouts_Bravo_Viking_Weapons.hpp"
#include "Loadouts\CfgLoadouts_Bravo_Atlas.hpp"
#include "Loadouts\CfgLoadouts_Bravo_Atlas_Logistics.hpp"

#include "Loadouts\CfgLoadouts_Charlie_Squad.hpp"
#include "Loadouts\CfgLoadouts_Charlie_Weapon.hpp"
Expand Down
19 changes: 0 additions & 19 deletions cScripts/Loadouts/CfgLoadouts_Bravo_Atlas_Logistics.hpp
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Cav_B_B_Scout_PlatoonSergeant_F: Cav_B_B_Scout_Officer_F {
displayName = "Platoon Sergeant";
scope = 2;
loadout = [["rhs_weap_m4a1_blockII_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_T1_high",["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_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",16],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["ACE_splint",2],["ACE_quikclot",8],["ACE_CableTie",2],["kat_Painkiller",2,10],["ACE_Chemlight_IR",1,1]]],["USP_CRYE_JPC_ASLTB",[["UK3CB_P320_9x19_17Rnd",2,17],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",7,30]]],["USP_TACTICAL_PACK",[["USP_PVS15",1],["ACE_EntrenchingTool",1],["KNB_PanelYellow",1],["ToolKit",1]]],"USP_OPSCORE_FASTMTC_CSW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
abilityEngineer = 1;
};

class Cav_B_B_Scout_PlatoonMedic_F: Cav_B_B_Scout_Officer_F {
Expand Down
176 changes: 4 additions & 172 deletions cScripts/cScripts_logistics.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,42 +388,6 @@
["USP_TACTICAL_PACK_CCT8", 0]
]],

["bravo_company_atlas_logistics", [
// Tools
["ACE_wirecutter", 0],
["ACE_Fortify",0],
["ACE_M26_Clacker",0],

// Equipment
["ace_marker_flags_black",0],
["ace_marker_flags_blue",0],
["ace_marker_flags_green",0],
["ace_marker_flags_orange",0],
["ace_marker_flags_purple",0],
["ace_marker_flags_red",0],
["ace_marker_flags_white",0],
["ace_marker_flags_yellow",0],
["KNB_PanelGreen",0],
["KNB_PanelRed",0],
["KNB_PanelYellow",0],
["ACE_rope3",0],
["ACE_rope6",0],
["ACE_rope12",0],
["ACE_rope15",0],
["ACE_Chemlight_HiBlue",0],
["ACE_Chemlight_HiGreen",0],
["ACE_Chemlight_HiRed",0],
["ACE_Chemlight_HiWhite",0],
["ACE_Chemlight_HiYellow",0],
["ACE_Chemlight_UltraHiOrange",0],
["ACE_HandFlare_Green",0],
["ACE_HandFlare_Red",0],
["ACE_HandFlare_Yellow",0],

// Explosives
["DemoCharge_Remote_Mag",0]
]],

["charlie_company", [
// Radios
["ACRE_PRC343", 0],
Expand Down Expand Up @@ -796,14 +760,12 @@
["ACE_Chemlight_IR",15],

// Explosives
["DemoCharge_Remote_Mag",8],
["SatchelCharge_Remote_Mag",2],
["DemoCharge_Remote_Mag",4],

["ACE_EarPlugs", 3],
["ACE_packingBandage", 50],
["ACE_quikclot", 20],
["ACE_splint",10],
["ACE_tourniquet", 10],
["kat_chestSeal",15]
["ACE_quikclot", 80],
["ACE_tourniquet", 15]
]],

// // // // // // //
Expand Down Expand Up @@ -941,99 +903,6 @@
// Rifle Ammo
["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",24] // M856A1 PMAGs Tracer
]],

["vehicle_atlas_m998", [
// AT
["rhs_weap_M136_hedp", 2],

// Tools
["ACE_wirecutter",1],
["ACE_rope6",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],

// Grenades
["HandGrenade",6],
["SmokeShell",16],
["SmokeShellBlue",4],
["SmokeShellGreen",4],
["SmokeShellPurple",4],

// Flags and Paint
["ACE_SpraypaintBlue",1],
["ACE_SpraypaintGreen",1],
["ACE_SpraypaintRed",1],

// Rifle Ammo
["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",12] // M856A1 PMAGs Tracer
]],

["vehicle_atlas_auv", [
// AT
["rhs_weap_M136_hedp", 2],

// Weapons
["rhs_weap_m249_light_S_vfg2",1],

// Scopes
["rhsusf_acc_ECLAN",1],

// Attachments
["rhsusf_acc_SF3P556",1],

// MG Ammo
["rhsusf_200Rnd_556x45_mixed_soft_pouch",6],

// Tools
["ACE_wirecutter",1],
["ACE_rope6",2],
["Toolkit",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],

// Grenades
["HandGrenade",4],
["SmokeShell",12],
["SmokeShellBlue",6],
["SmokeShellGreen",6],
["SmokeShellPurple",6],

// Flags and Paint
["ace_marker_flags_green",6],
["ace_marker_flags_red",6],
["ace_marker_flags_blue",6],
["ACE_SpraypaintBlue",1],
["ACE_SpraypaintGreen",1],
["ACE_SpraypaintRed",1],

// Rifle Ammo
["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",12] // M856A1 PMAGs Tracer
]],

["vehicle_strykerDragoon", [
// AT
["rhs_weap_fgm148", 1],
Expand Down Expand Up @@ -1983,43 +1852,6 @@
["USP_TACTICAL_PACK_CCT7", 0],
["USP_TACTICAL_PACK_CCT8", 0],
["UK3CB_US_B_B_RIF_OCP_Radio", 0]
]],
["arsenal_role_logistics", [
// Tools
["ACE_Clacker",0],
["ACE_Fortify",0],
["ACE_M26_Clacker",0],
["ACE_wirecutter",0],

// Equipment
["ACE_Chemlight_HiBlue",0],
["ACE_Chemlight_HiGreen",0],
["ACE_Chemlight_HiRed",0],
["ACE_Chemlight_HiWhite",0],
["ACE_Chemlight_HiYellow",0],
["ACE_Chemlight_UltraHiOrange",0],
["ACE_HandFlare_Green",0],
["ACE_HandFlare_Red",0],
["ACE_HandFlare_Yellow",0],
["ace_marker_flags_black",0],
["ace_marker_flags_blue",0],
["ace_marker_flags_green",0],
["ace_marker_flags_orange",0],
["ace_marker_flags_purple",0],
["ace_marker_flags_red",0],
["ace_marker_flags_white",0],
["ace_marker_flags_yellow",0],
["ACE_rope12",0],
["ACE_rope15",0],
["ACE_rope3",0],
["ACE_rope6",0],
["KNB_PanelGreen",0],
["KNB_PanelRed",0],
["KNB_PanelYellow",0],

// Explosives
["AMP_Breaching_Charge_Mag",0],
["DemoCharge_Remote_Mag",0]
]],
["arsenal_role_cls",[
// Airway Management and Respiration
Expand Down
5 changes: 2 additions & 3 deletions cScripts/functions/logistics/fn_doStarterCrateSupplies.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ _companySelector = toUpper(_companySelector);
// Create categories
private _officer = ["OFFICER"];
private _alpha = ["ALPHA", "BUFFALO", "TITAN", "RAIDER", "SPARROW"];
private _bravo = ["BRAVO", "LANCER", "VIKING", "SABER", "BANSHEE", "ATLAS Medical","ATLAS Logistics"];
private _bravo = ["BRAVO", "LANCER", "VIKING", "SABER", "BANSHEE", "ATLAS"];
private _charlie = ["CHARLIE", "BANDIT", "MISFIT"];

if !(_companySelector in (["NONE", "FULL", "ALL"] + _officer + _alpha + _bravo + _charlie)) exitWith {
Expand All @@ -46,7 +46,6 @@ private _container = switch (_companySelector) do {
case "ALPHA": {GET_CONTAINER("alpha_company");};

case "ATLAS": {GET_CONTAINER("bravo_company_atlas");};
case "ATLAS_L": {GET_CONTAINER("bravo_company_atlas_logistics");};
case "SABER";
case "VIKING";
case "BRAVO": {GET_CONTAINER("bravo_company_viking");};
Expand All @@ -61,7 +60,7 @@ private _container = switch (_companySelector) do {
{
private _items = GET_CONTAINER(_x);
_fullContainer append _items;
} forEach ["alpha_company", "bravo_company_atlas","bravo_company_atlas_logistics", "bravo_company_viking", "charlie_company"];
} forEach ["alpha_company", "bravo_company_atlas", "bravo_company_viking", "charlie_company"];
};

case "";
Expand Down
1 change: 0 additions & 1 deletion cScripts/functions/systems/fn_getArsenalWhitelist.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ private _roleSpecific = switch ([player] call EFUNC(gear,getLoadoutRole)) do {
case "cls": {GET_CONTAINER_KEYS("arsenal_role_cls");};
case "medic": {GET_CONTAINER_KEYS("arsenal_role_medic");};
case "doctor": {GET_CONTAINER_KEYS("arsenal_role_doctor");};
case "logistics": {GET_CONTAINER_KEYS("arsenal_role_logistics");};
default {[]};
};

Expand Down
3 changes: 1 addition & 2 deletions cScripts/functions/systems/fn_setupLoadoutCategories.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ if (_aceCategory == "ACE_SelfActions") then {
[_object, "cScripts_Loadout_Cat_Bravo_Viking_Leadership", "Leadership", _leadIcon, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
[_object, "cScripts_Loadout_Cat_Bravo_Viking_Rifle_Squad","Rifle Squad", _squadIcon, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
[_object, "cScripts_Loadout_Cat_Bravo_Viking_Weapons", "Weapons Squad", _speciIcon, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
[_object, "cScripts_Loadout_Cat_Bravo_Atlas", "Atlas Medical", _iconMedic, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
[_object, "cScripts_Loadout_Cat_Bravo_Atlas_Logistics", "Atlas Logistics", _iconMedic, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
[_object, "cScripts_Loadout_Cat_Bravo_Atlas", "Atlas", _iconMedic, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
[_object, "cScripts_Loadout_Cat_Bravo_Tank", "Tank", _iconTank, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
[_object, "cScripts_Loadout_Cat_Bravo_IFV", "IFV", _iconIfv, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
[_object, "cScripts_Loadout_Cat_Bravo_Weapons", "Weapons", _squadIcon, [_aceCategory, _mainCategory, "cScripts_Loadout_Cat_Bravo"]] call FUNC(createActionCategory);
Expand Down
43 changes: 10 additions & 33 deletions cScripts/functions/vehicle/fn_vehicle_addInventory.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,34 +214,12 @@ if (_vehicle iskindOf "MRAP_01_base_F") then {
GET_CONTAINER("vehicle_HMMWV_Weapons")
] call FUNC(setCargo);
};

case "rhsusf_m998_w_s_4dr_fulltop";
case "rhsusf_m998_d_s_4dr_fulltop":{

// Vehicle Inventory
[_vehicle,
GET_CONTAINER("vehicle_atlas_m998")
] call FUNC(setCargo);
};

case "rhsusf_m998_d_2dr_halftop";
case "rhsusf_m998_w_2dr_halftop": {
[_vehicle, 10, 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;

// Vehicle Inventory
[_vehicle,
GET_CONTAINER("vehicle_atlas_m998")
] call FUNC(setCargo);
};
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, 16, 38, false, false] call FUNC(setCargoAttributes);
[_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;
Expand All @@ -253,22 +231,21 @@ 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_atlas_auv")
GET_CONTAINER("vehicle_strykerDragoon")
] call FUNC(setCargo);

// General Supply Crate
["I_supplyCrate_F",
GET_CONTAINER("crate_resupply_general"),
// Supply Crate
["Box_NATO_Wps_F",
GET_CONTAINER("crate_strykerDragoon_resupply"),
_vehicle, nil, "Resupply Crate"
] call FUNC(createCargoCrate);
// Medical Crate
["ace_medicalSupplyCrate",
GET_CONTAINER("crate_medicalAtlas"),
_vehicle, nil, "Medical Supply Crate"

// 2 Stingers to distribute to 1 section.
["Box_NATO_WpsLaunch_F",
GET_CONTAINER("crate_stinger"),
_vehicle, nil, "MANPAD"
] call FUNC(createCargoCrate);

// Stinger
["Box_NATO_WpsLaunch_F",
GET_CONTAINER("crate_stinger"),
_vehicle, nil, "MANPAD"
Expand Down
Loading
Loading