Skip to content

Commit

Permalink
WS compat
Browse files Browse the repository at this point in the history
  • Loading branch information
RetardedFoX committed Oct 13, 2024
1 parent fdff841 commit 81d6187
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 9 deletions.
9 changes: 7 additions & 2 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"];
if ("ws" in A3A_enabledDLC) then {
_cargoTrucks append ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"];
["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate;
["vehiclesLightAPCs", ["O_T_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate;
_vehiclesIFVs append ["a3a_T_APC_Tracked_02_30mm_lxWS"];
["vehiclesLightAPCs", ["O_T_APC_Wheeled_02_hmg_lxWS", "O_T_APC_Wheeled_02_unarmed_lxWS"]] call _fnc_saveToTemplate;
_vehiclesIFVs append ["O_T_APC_Tracked_02_30mm_lxWS"];
};
if ("enoch" in A3A_enabledDLC) then {
_vehiclesPolice append ["B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"];
Expand Down Expand Up @@ -419,6 +419,11 @@ if ("mark" in A3A_enabledDLC) then {
["MMG_01_black_F", "", "acc_pointer_IR", "optic_Arco", [], [], "bipod_02_F_blk"],
["MMG_01_ghex_F", "", "acc_pointer_IR", "optic_MRCO", [], [], "bipod_02_F_blk"]
];
(_militaryLoadoutData get "shotGuns") append [
["sgun_aa40_lxWS", "", "acc_pointer_IR", "optic_Holosight_smg_blk_F", ["8Rnd_12Gauge_AA40_Pellets_lxWS", "8Rnd_12Gauge_AA40_Slug_lxWS"], [], ""],
["sgun_aa40_lxWS", "", "acc_pointer_IR", "optic_Aco_smg", ["8Rnd_12Gauge_AA40_Pellets_lxWS", "8Rnd_12Gauge_AA40_Slug_lxWS"], [], ""],
["sgun_aa40_lxWS", "", "acc_pointer_IR", "Aegis_optic_ROS_SMG", ["20Rnd_12Gauge_AA40_Pellets_lxWS", "20Rnd_12Gauge_AA40_Slug_lxWS"], [], ""]
];
(_militaryLoadoutData get "marksmanRifles") append [
["srifle_DMR_07_ghex_F", "", "", "optic_KHS_blk", [], [], ""]
];
Expand Down
10 changes: 8 additions & 2 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"];
if ("ws" in A3A_enabledDLC) then {
_cargoTrucks append ["O_Truck_02_cargo_lxWS","O_Truck_02_flatbed_lxWS"];
["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate;
["vehiclesLightAPCs", ["O_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate;
["vehiclesLightAPCs", ["O_APC_Wheeled_02_hmg_lxWS", "O_APC_Wheeled_02_unarmed_lxWS"]] call _fnc_saveToTemplate;
_vehiclesIFVs append ["a3a_APC_Tracked_02_30mm_lxWS"];
};
if ("enoch" in A3A_enabledDLC) then {
Expand Down Expand Up @@ -430,7 +430,13 @@ if ("mark" in A3A_enabledDLC) then {

(_militaryLoadoutData get "machineGuns") append [
["MMG_01_tan_F", "", "acc_pointer_IR", "optic_Arco", [], [], "bipod_02_F_hex"],
["MMG_01_hex_F", "", "acc_pointer_IR", "optic_MRCO", [], [], "bipod_02_F_hex"]];
["MMG_01_hex_F", "", "acc_pointer_IR", "optic_MRCO", [], [], "bipod_02_F_hex"]
];
(_militaryLoadoutData get "shotGuns") append [
["sgun_aa40_lxWS", "", "acc_pointer_IR", "optic_Holosight_smg_blk_F", ["8Rnd_12Gauge_AA40_Pellets_lxWS", "8Rnd_12Gauge_AA40_Slug_lxWS"], [], ""],
["sgun_aa40_lxWS", "", "acc_pointer_IR", "optic_Aco_smg", ["8Rnd_12Gauge_AA40_Pellets_lxWS", "8Rnd_12Gauge_AA40_Slug_lxWS"], [], ""],
["sgun_aa40_lxWS", "", "acc_pointer_IR", "Aegis_optic_ROS_SMG", ["20Rnd_12Gauge_AA40_Pellets_lxWS", "20Rnd_12Gauge_AA40_Slug_lxWS"], [], ""]
];
(_militaryLoadoutData get "sniperRifles") append [
["srifle_DMR_05_hex_F", "", "acc_pointer_IR", "optic_KHS_hex", [], [], "bipod_02_F_hex"],
["srifle_DMR_05_tan_f", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_02_F_hex"]
Expand Down
4 changes: 3 additions & 1 deletion A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private _cargoTrucks = ["I_E_Truck_02_transport_F", "I_E_Truck_02_F"];
["vehiclesFuelTrucks", ["I_E_Truck_02_fuel_F"]] call _fnc_saveToTemplate;
["vehiclesMedical", ["I_E_Truck_02_Medical_F", "Aegis_I_E_APC_Wheeled_01_medical_F"]] call _fnc_saveToTemplate;
["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
["vehiclesAPCs", ["I_E_APC_tracked_03_cannon_v2_F", "Aegis_I_E_APC_Wheeled_01_cannon_v2_F", "Aegis_I_E_APC_Wheeled_01_cannon_v2_F"]] call _fnc_saveToTemplate;
private _APCs = ["Aegis_I_E_APC_Wheeled_01_cannon_v2_F"];
["vehiclesIFVs", ["I_E_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
["vehiclesTanks", ["Aegis_I_E_MBT_03_cannon_F"]] call _fnc_saveToTemplate;
["vehiclesAA", ["B_W_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -76,6 +76,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F","B_GEN_Offroad_01_comms_F","
//If DLC
if ("ws" in A3A_enabledDLC) then {
_cargoTrucks append ["I_E_Truck_02_cargo_lxWS","I_E_Truck_02_flatbed_lxWS"];
_APCs append ["Aegis_I_E_APC_Wheeled_01_atgm_v2"];
["uavsPortable", ["I_E_UAV_01_F", "I_UAV_02_lxWS"]] call _fnc_saveToTemplate;
};
if ("orange" in A3A_enabledDLC) then {
Expand All @@ -84,6 +85,7 @@ if ("orange" in A3A_enabledDLC) then {
};

["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;
["vehiclesAPCs", _APCs] call _fnc_saveToTemplate;

["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate;
["vehiclesMilitiaTrucks", _vehiclesMilitiaTrucks] call _fnc_saveToTemplate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private _cargoTrucks = ["O_R_Truck_03_transport_F","O_R_Truck_03_covered_F","O_R
private _APCs = [];
["vehiclesIFVs", ["Aegis_O_R_APC_Tracked_02_30mm_lxWS"]] call _fnc_saveToTemplate;
private _Tanks = ["O_R_MBT_02_cannon_F"];
["vehiclesAA", ["O_R_APC_Tracked_02_AA_F"]] call _fnc_saveToTemplate;
private _AA = ["O_R_APC_Tracked_02_AA_F"];

["vehiclesTransportBoats", ["O_Boat_Transport_01_F"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["O_Boat_Armed_01_hmg_F"]] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -77,13 +77,16 @@ private _Tanks = ["O_R_MBT_02_cannon_F"];
if ("ws" in A3A_enabledDLC) then {
_cargoTrucks append ["O_R_Truck_02_cargo_F","O_R_Truck_02_flatbed_F"];
_APCs append ["O_R_APC_Wheeled_04_cannon_F"];
_AA append ["Aegis_O_R_Truck_02_aa_F"];
};
if ("tanks" in A3A_enabledDLC) then {
_Tanks append ["O_R_MBT_04_cannon_F"];
};
["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;
["vehiclesAPCs", _APCs] call _fnc_saveToTemplate;
["vehiclesTanks", _Tanks] call _fnc_saveToTemplate;
["vehiclesAA", _AA] call _fnc_saveToTemplate;


#include "Vanilla_Vehicle_Attributes.sqf"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"];

//If Western Sahara DLC
if ("ws" in A3A_enabledDLC) then {
_APCs append ["APC_Wheeled_01_atgm_base_lxWS", "a3a_APC_Wheeled_01_command_lxWS"];
_APCs append ["APC_Wheeled_01_atgm_lxWS_v2", "a3a_APC_Wheeled_01_command_lxWS"];
["uavsPortable", ["B_UAV_01_F", "B_UAV_02_lxWS"]] call _fnc_saveToTemplate;
};
if ("enoch" in A3A_enabledDLC) then {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"];

//If Western Sahara DLC
if ("ws" in A3A_enabledDLC) then {
_APCs append ["B_T_APC_Wheeled_01_atgm_lxWS", "a3a_T_APC_Wheeled_01_command_lxWS"];
_APCs append ["B_W_APC_Wheeled_01_atgm_lxWS_v2", "B_W_APC_Wheeled_01_command_lxWS"];
["uavsPortable", ["B_UAV_01_F", "B_UAV_02_lxWS"]] call _fnc_saveToTemplate;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"];

//If Western Sahara DLC
if ("ws" in A3A_enabledDLC) then {
_APCs append ["B_T_APC_Wheeled_01_atgm_lxWS", "a3a_T_APC_Wheeled_01_command_lxWS"];
_APCs append ["B_T_APC_Wheeled_01_atgm_lxWS_v2", "B_T_APC_Wheeled_01_command_lxWS"];
["uavsPortable", ["B_UAV_01_F", "B_UAV_02_lxWS"]] call _fnc_saveToTemplate;
};
if ("enoch" in A3A_enabledDLC) then {
Expand Down

0 comments on commit 81d6187

Please sign in to comment.