Skip to content
New issue

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

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

WS minuscule patch #3175

Merged
merged 4 commits into from
Mar 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 changes: 2 additions & 2 deletions A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private _vehiclesLightArmed = ["a3a_ION_Offroad_armor_armed","a3a_ION_Offroad_ar
["vehiclesMedical", ["a3a_Van_02_black_medevac_F"]] call _fnc_saveToTemplate;
["vehiclesLightAPCs", ["B_ION_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate;
["vehiclesAPCs", ["a3a_ION_APC_Wheeled_01_command_lxWS","a3a_ION_APC_Wheeled_01_cannon_lxWS", "a3a_ION_APC_Wheeled_01_atgm"]] call _fnc_saveToTemplate;
["vehiclesIFVs", []] call _fnc_saveToTemplate;
["vehiclesIFVs", ["a3a_ION_APC_Tracked_02_30mm"]] call _fnc_saveToTemplate;
private _Tanks = ["a3a_MBT_02_cannon_black_F"];
["vehiclesAA", ["a3a_ION_Truck_02_zu23_F"]] call _fnc_saveToTemplate;

Expand Down Expand Up @@ -424,7 +424,7 @@ _pilotLoadoutData set ["uniforms", ["U_lxWS_ION_Casual3"]];
_pilotLoadoutData set ["vests", ["V_TacVest_blk"]];
_pilotLoadoutData set ["helmets", ["H_Cap_headphones", "H_HeadSet_black_F", "lxWS_H_Bandanna_blk_hs", "H_Cap_headphones_ion_lxws"]];
_pilotLoadoutData set ["facewear", ["G_Aviator","G_Squares_Tinted","G_Tactical_Black"]];
_crewLoadoutData set ["SMGs", [
_pilotLoadoutData set ["SMGs", [
["hgun_PDW2000_F", "", "", "optic_r1_high_lxWS", [], [], ""],
["hgun_PDW2000_F", "", "", "optic_r1_low_lxWS", [], [], ""]
]];
Expand Down
12 changes: 7 additions & 5 deletions A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ _loadoutData set ["ATLaunchers", [
["launch_MRAWS_sand_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HE_F"], [], ""],
["launch_MRAWS_sand_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HE_F", "MRAWS_HEAT55_F"], [], ""],
["launch_MRAWS_sand_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HEAT55_F"], [], ""],
["launch_MRAWS_sand_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HE_F"], [], ""]]];
["launch_MRAWS_sand_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HE_F"], [], ""]
]];
_loadoutData set ["missileATLaunchers", [
["launch_B_Titan_short_F", "", "acc_pointer_IR", "", ["Titan_AT", "Titan_AP"], [], ""],
["launch_B_Titan_short_F", "", "acc_pointer_IR", "", ["Titan_AT"], [], ""],
Expand Down Expand Up @@ -355,9 +356,9 @@ if (_sfSwitch < 0.5) then {

private _militaryLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
_militaryLoadoutData set ["uniforms", ["U_lxWS_B_CombatUniform_desert", "U_lxWS_B_CombatUniform_desert_tshirt"]];
_militaryLoadoutData set ["vests", ["V_lxWS_PlateCarrier1_desert", "V_lxWS_PlateCarrier2_desert"]];
_militaryLoadoutData set ["Hvests", ["V_lxWS_PlateCarrierSpec_desert"]];
_militaryLoadoutData set ["glVests", ["V_lxWS_PlateCarrierGL_desert"]];
_militaryLoadoutData set ["vests", ["V_lxWS_PlateCarrier1_desert", "V_lxWS_PlateCarrier2_desert","V_PlateCarrier1_rgr", "V_PlateCarrier2_rgr"]];
_militaryLoadoutData set ["Hvests", ["V_lxWS_PlateCarrierSpec_desert","V_PlateCarrierSpec_rgr"]];
_militaryLoadoutData set ["glVests", ["V_lxWS_PlateCarrierGL_desert","V_PlateCarrierGL_rgr"]];
_militaryLoadoutData set ["backpacks", ["B_Carryall_cbr", "B_Kitbag_rgr", "B_AssaultPack_rgr", "B_Kitbag_mcamo"]];
_militaryLoadoutData set ["helmets", ["H_HelmetB_desert", "H_HelmetB_sand", "H_HelmetB_light_desert","H_HelmetB_light_sand"]];
_militaryLoadoutData set ["binoculars", ["Laserdesignator"]];
Expand Down Expand Up @@ -436,8 +437,9 @@ _policeLoadoutData set ["sidearms", ["hgun_Rook40_F"]];
private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
_militiaLoadoutData set ["uniforms", ["U_lxWS_B_CombatUniform_desert", "U_lxWS_B_CombatUniform_desert_tshirt"]];
_militiaLoadoutData set ["vests", ["V_Chestrig_khk", "V_TacVest_khk"]];
_militiaLoadoutData set ["Hvests", ["V_TacVest_khk"]];
_militiaLoadoutData set ["backpacks", ["B_AssaultPack_rgr"]];
_militiaLoadoutData set ["helmets", ["H_Cap_tan_specops_US", "lxWS_H_MilCap_desert", "H_Bandanna_sand"]];
_militiaLoadoutData set ["helmets", ["lxWS_H_MilCap_desert", "lxWS_H_MilCap_desert", "H_Bandanna_sand"]];

_militiaLoadoutData set ["rifles", [
["arifle_MX_F", "", "acc_flashlight", "", ["30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag_Tracer"], [], ""]
Expand Down
27 changes: 15 additions & 12 deletions A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,16 @@ _officerLoadoutData set ["sidearms", ["hgun_ACPC2_F"]];


if ("expansion" in A3A_enabledDLC) then {
(_militaryLoadoutData get "rifles") append [
["arifle_AK12_F", "", "acc_pointer_IR", selectRandom _milSights, ["30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_Tracer_F"], [], ""]
];
(_militaryLoadoutData get "grenadeLaunchers") append [
["arifle_AK12_GL_F", "", "acc_pointer_IR", selectRandom _milSights, ["30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_Tracer_F"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]
];
(_militaryLoadoutData get "marksmanRifles") append [
["arifle_AK12_F", "", "acc_pointer_IR", "optic_Arco_AK_blk_F", ["30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_Tracer_F"], [], "bipod_02_F_blk"]
];

(_militiaLoadoutData get "rifles") append [
["arifle_AKM_F", "", "", "", ["30Rnd_762x39_Mag_Green_F","30Rnd_762x39_Mag_Tracer_Green_F"], [], ""]];
(_militiaLoadoutData get "carbines") append [
Expand All @@ -413,35 +423,28 @@ if ("expansion" in A3A_enabledDLC) then {
];
(_militiaLoadoutData get "SMGs") append [
["arifle_AKS_F", "", "", "", ["30Rnd_545x39_Mag_Green_F", "30Rnd_545x39_Mag_Tracer_Green_F"], [], ""]];
(_officerLoadoutData get "slRifles") append [
["arifle_AKS_F", "", "", "", ["30Rnd_545x39_Mag_Green_F", "30Rnd_545x39_Mag_Tracer_Green_F"], [], ""]];

_militiaLoadoutData set ["sidearms", ["hgun_Pistol_01_F"]];

_crewLoadoutData set ["carbines", [
["arifle_AKS_F", "", "", "", ["30Rnd_545x39_Mag_Green_F", "30Rnd_545x39_Mag_Tracer_Green_F"], [], ""],
["arifle_AKM_F", "", "", "", ["30Rnd_762x39_Mag_Green_F","30Rnd_762x39_Mag_Tracer_Green_F"], [], ""]]];

(_pilotLoadoutData get "carbines") append [
["arifle_AKS_F", "", "", "", ["30Rnd_545x39_Mag_Green_F", "30Rnd_545x39_Mag_Tracer_Green_F"], [], ""]
];
_militiaLoadoutData set ["sidearms", ["hgun_Pistol_01_F"]];
(_officerLoadoutData get "slRifles") append [
["arifle_AKS_F", "", "", "", ["30Rnd_545x39_Mag_Green_F", "30Rnd_545x39_Mag_Tracer_Green_F"], [], ""]];
};

if ("enoch" in A3A_enabledDLC) then {

(_militaryLoadoutData get "rifles") append [
["arifle_AK12_F", "", "acc_pointer_IR", selectRandom _milSights, ["30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_Tracer_F"], [], ""]
];
(_militaryLoadoutData get "grenadeLaunchers") append [
["arifle_AK12_GL_F", "", "acc_pointer_IR", selectRandom _milSights, ["30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_Tracer_F"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]
];
(_militaryLoadoutData get "carbines") append [
["arifle_AK12U_F", "", "acc_pointer_IR", selectRandom _milSights, ["30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_Tracer_F"], [], ""]
];
(_militaryLoadoutData get "machineGuns") append [
["arifle_RPK12_F", "", "acc_pointer_IR", selectRandom _milSights, ["75rnd_762x39_AK12_Mag_F", "75rnd_762x39_AK12_Mag_F", "75rnd_762x39_AK12_Mag_Tracer_F"], [], ""]
];
(_militaryLoadoutData get "marksmanRifles") append [
["arifle_AK12_F", "", "acc_pointer_IR", "optic_Arco_AK_blk_F", ["30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_Tracer_F"], [], "bipod_02_F_blk"]
];

(_pilotLoadoutData get "carbines") append [
["arifle_AK12U_F", "", "acc_pointer_IR", selectRandom _milSights, ["30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_F", "30Rnd_762x39_AK12_Mag_Tracer_F"], [], ""]
Expand Down