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.

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

Jump to bottom

Western Sahara Faction update #3091

Merged
merged 22 commits into from
Jan 28, 2024
Merged

Western Sahara Faction update #3091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c31e61c
Reskinned T100
ante185 Nov 10, 2023
19e9283
ION 30mm APC, MRL truck, Texture lists
ante185 Nov 10, 2023
6981918
Update WS_AI_CSAT_NAfrica.sqf
ante185 Nov 10, 2023
5fdce2c
ION loadout tuning
ante185 Nov 10, 2023
641521b
Update WS_AI_SFIA.sqf
ante185 Nov 10, 2023
2f7232e
Update WS_AI_SFIA.sqf
ante185 Nov 10, 2023
f8b470e
update
ante185 Nov 13, 2023
eb4556e
Update ws_ion.hpp
ante185 Nov 15, 2023
4124423
moved
ante185 Nov 15, 2023
fb21dff
Merge branch 'unstable' into ION-update
ante185 Dec 17, 2023
1f0b9a8
Adjusted light armed and militia cars
ante185 Dec 17, 2023
783f821
Update WS_AI_SFIA.sqf
ante185 Dec 17, 2023
12e64b1
removed not-yet existing APCs
ante185 Dec 17, 2023
3963f92
Update WS_AI_CSAT_NAfrica.sqf
ante185 Dec 17, 2023
0b2bdca
moved IFV's to APC pending #3049
ante185 Dec 17, 2023
32f4758
NATO Officer
ante185 Dec 17, 2023
da78d28
Update WS_AI_ION.sqf
ante185 Dec 17, 2023
5619a67
Update WS_AI_NATO_Desert.sqf
ante185 Dec 17, 2023
0010666
Update WS_AI_ADF.sqf
ante185 Dec 18, 2023
fa0752d
Update armor.hpp
ante185 Dec 23, 2023
bf83643
Merge branch 'unstable' into ION-update
ante185 Jan 27, 2024
a4f83d1
Merge branch 'unstable' into ION-update
Bob-Murphy Jan 28, 2024
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
21 changes: 21 additions & 0 deletions A3A/addons/config_fixes/Vanilla/armor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ class I_MRAP_03_gmg_F;
class I_MRAP_03_hmg_F;
class O_MBT_04_cannon_F;
class O_MBT_04_command_F;
class O_MBT_02_base_F
; //external Root Class
class O_MBT_02_cannon_F : O_MBT_02_base_F
{
class TextureSources; //external Child Class
};

//Grey
class a3a_MRAP_03_grey_F : I_MRAP_03_F
Expand All @@ -31,3 +37,18 @@ class a3a_MBT_04_command_black_F : O_MBT_04_command_F
textureList[] = {};
hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"};
};

class a3a_MBT_02_cannon_black_F : O_MBT_02_cannon_F
{
class TextureSources : TextureSources
{
class Grey
{
author = "Bohemia Interactive";
displayName = "Grey";
textures[] = {"a3\Armor_F_Decade\MBT_02\Data\MBT_02_body_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_turret_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_expo_CO.paa","A3\Armor_F\Data\camonet_CSAT_HEX_Green_CO.paa"};
};
};
textureList[] = {"Grey", 1};
hiddenSelectionsTextures[] = {"a3\Armor_F_Decade\MBT_02\Data\MBT_02_body_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_turret_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_expo_CO.paa","A3\Armor_F\Data\camonet_CSAT_HEX_Green_CO.paa"};
};
10 changes: 5 additions & 5 deletions A3A/addons/config_fixes/WS/ws_ion.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class a3a_ION_Truck_02_MRL_F : I_Truck_02_MRL_F
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","a3\soft_f_gamma\truck_02\data\truck_02_mrl_co.paa"};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\data\truck_02\zamak_mrl_brown_co.paa"};
};
class a3a_ION_Truck_02_Ammo_F : O_Truck_02_Ammo_F
{
Expand Down Expand Up @@ -69,22 +69,22 @@ class a3a_ION_Offroad_armor : B_Tura_Offroad_armor_lxWS
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
textureList[] = {};
textureList[] = {"Black", 1};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
};
class a3a_ION_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS
{
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
textureList[] = {};
textureList[] = {"Black", 1};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
};
class a3a_ION_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS
{
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
textureList[] = {};
textureList[] = {"Black", 1};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
};
};
18 changes: 8 additions & 10 deletions A3A/addons/core/Templates/Templates/WS/WS_AI_ADF.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
//A number of these vehicles could be replaced with simple retextures
["vehiclesBasic", ["B_Quadbike_01_F"]] call _fnc_saveToTemplate;
private _LightUnarmed = ["a3a_MRAP_03_grey_F"];
private _LightArmed = ["a3a_MRAP_03_gmg_grey_F", "a3a_MRAP_03_hmg_grey_F"];
private _LightArmed = ["a3a_MRAP_03_hmg_grey_F","a3a_MRAP_03_gmg_grey_F", "a3a_MRAP_03_hmg_grey_F"];
["vehiclesTrucks", ["B_Truck_01_covered_F", "B_Truck_01_transport_F"]] call _fnc_saveToTemplate;
["vehiclesCargoTrucks", ["B_Truck_01_cargo_F", "B_Truck_01_flatbed_F"]] call _fnc_saveToTemplate;
["vehiclesAmmoTrucks", ["B_Truck_01_ammo_F"]] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -80,11 +80,11 @@ if ("enoch" in A3A_enabledDLC) then {
_vehiclesMilitiaCars append ["a3a_Offroad_01_covered_tan_F","a3a_Offroad_01_comms_tan_F"];
};
if ("tanks" in A3A_enabledDLC) then {
_Tanks append ["B_AFV_Wheeled_01_cannon_F","B_AFV_Wheeled_01_up_cannon_F"]; //Closer to IFV than tank, but no passenger seats.
["vehiclesLightTanks", ["B_AFV_Wheeled_01_cannon_F","B_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate;
};
if ("expansion" in A3A_enabledDLC) then {
_LightUnarmed append ["a3a_MRAP_03_grey_F","B_LSV_01_unarmed_F"];
_LightArmed append ["a3a_MRAP_03_gmg_grey_F", "a3a_MRAP_03_hmg_grey_F","B_LSV_01_AT_F","B_LSV_01_armed_F"];
_LightArmed append ["B_LSV_01_AT_F","B_LSV_01_armed_F"];
};
if ("heli" in A3A_enabledDLC) then {
_HelisTransport append ["B_Heli_Transport_03_black_F", "B_Heli_Transport_03_unarmed_F"];
Expand Down Expand Up @@ -151,16 +151,14 @@ _loadoutData set ["machineGuns", []];
_loadoutData set ["marksmanRifles", []];
_loadoutData set ["sniperRifles", []];

_loadoutData set ["lightATLaunchers", [
_loadoutData set ["lightATLaunchers", ["launch_NLAW_F"]];
_loadoutData set ["ATLaunchers", [
["launch_MRAWS_sand_F", "", "acc_pointer_IR", "", ["MRAWS_HE_F", "MRAWS_HEAT55_F"], [], ""],
["launch_MRAWS_sand_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HEAT55_F"], [], ""],
["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"], [], ""]
]];
_loadoutData set ["ATLaunchers", ["launch_NLAW_F"]];
["launch_MRAWS_sand_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"], [], ""],
["launch_B_Titan_short_F", "", "acc_pointer_IR", "", ["Titan_AT"], [], ""]
]];
_loadoutData set ["AALaunchers", [
Expand Down
21 changes: 13 additions & 8 deletions A3A/addons/core/Templates/Templates/WS/WS_AI_CSAT_NAfrica.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

["vehiclesBasic", ["O_Quadbike_01_F"]] call _fnc_saveToTemplate;
private _LightUnarmed = ["O_MRAP_02_F"];
private _LightArmed = ["O_MRAP_02_hmg_F", "O_MRAP_02_gmg_F", "a3a_O_Truck_02_zu23_F"];
private _LightArmed = ["O_MRAP_02_hmg_F","O_MRAP_02_hmg_F", "O_MRAP_02_gmg_F", "a3a_O_Truck_02_zu23_F"];
["vehiclesTrucks", ["O_Truck_03_transport_F", "O_Truck_03_covered_F"]] call _fnc_saveToTemplate;
private _cargoTrucks = ["O_Truck_02_transport_F", "O_Truck_02_covered_F", "O_Truck_03_transport_F", "O_Truck_03_covered_F", "O_Truck_02_cargo_lxWS","O_Truck_02_flatbed_lxWS"];
["vehiclesAmmoTrucks", ["O_Truck_02_Ammo_F", "O_Truck_03_ammo_F"]] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -61,7 +61,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"];

["staticMGs", ["I_HMG_02_high_F"]] call _fnc_saveToTemplate;
["staticAT", ["O_static_AT_F"]] call _fnc_saveToTemplate;
["staticAA", ["O_static_AA_F"]] call _fnc_saveToTemplate;
["staticAA", ["O_SFIA_ZU23_lxWS","O_static_AA_F"]] call _fnc_saveToTemplate;
["staticMortars", ["O_Mortar_01_F"]] call _fnc_saveToTemplate;

["mortarMagazineHE", "8Rnd_82mm_Mo_shells"] call _fnc_saveToTemplate;
Expand All @@ -84,7 +84,7 @@ if ("tanks" in A3A_enabledDLC) then
if ("expansion" in A3A_enabledDLC) then
{
_LightUnarmed append ["O_MRAP_02_F", "O_LSV_02_unarmed_F"];
_LightArmed append ["O_MRAP_02_hmg_F", "O_MRAP_02_gmg_F", "O_LSV_02_AT_F", "O_LSV_02_armed_F"];
_LightArmed append ["O_LSV_02_AT_F", "O_LSV_02_armed_F"];
};
if ("orange" in A3A_enabledDLC) then
{
Expand Down Expand Up @@ -248,8 +248,6 @@ _sfLoadoutData set ["SMGs", [
["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]
]];
_sfLoadoutData set ["machineGuns", [
["LMG_S77_Hex_lxWS", "suppressor_h_sand_lxWS", "acc_pointer_IR", "optic_MRCO", ["100Rnd_762x51_S77_Green_lxWS", "100Rnd_762x51_S77_Green_Tracer_lxWS"], [], ""],
["LMG_S77_Hex_lxWS", "suppressor_h_sand_lxWS", "acc_pointer_IR", "optic_Holosight", ["100Rnd_762x51_S77_Green_lxWS", "100Rnd_762x51_S77_Green_Tracer_lxWS"], [], ""],
["LMG_S77_Compact_lxWS", "muzzle_snds_B_snd_F", "acc_pointer_IR", "optic_MRCO", ["100Rnd_762x51_S77_Green_lxWS", "100Rnd_762x51_S77_Green_Tracer_lxWS"], [], ""],
["LMG_S77_Compact_lxWS", "muzzle_snds_B_snd_F", "acc_pointer_IR", "optic_Holosight", ["100Rnd_762x51_S77_Green_lxWS", "100Rnd_762x51_S77_Green_Tracer_lxWS"], [], ""]
]];
Expand All @@ -275,7 +273,7 @@ _sfLoadoutData set ["sidearms", [
private _militaryLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
_militaryLoadoutData set ["uniforms", ["U_O_LCF_noInsignia_hex_lxws"]];
_militaryLoadoutData set ["slUniforms", ["U_O_OfficerUniform_ocamo"]];
_militaryLoadoutData set ["vests", ["V_HarnessO_brn"]];
_militaryLoadoutData set ["vests", ["V_HarnessO_brn", "V_lxWS_TacVestIR_oli"]];
_militaryLoadoutData set ["glVests", ["V_HarnessOGL_brn"]];
_militaryLoadoutData set ["Hvests", ["V_TacVest_brn"]];
_militaryLoadoutData set ["backpacks", ["B_TacticalPack_ocamo", "B_Carryall_ocamo", "B_FieldPack_ocamo", "B_Carryall_cbr", "B_Kitbag_cbr"]];
Expand All @@ -286,7 +284,6 @@ _militaryLoadoutData set ["slRifles", [
["arifle_Katiba_C_F", "", "acc_pointer_IR", "optic_Arco_blk_F", ["30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green_mag_Tracer"], [], ""],
["arifle_Katiba_F", "", "acc_pointer_IR", "optic_Arco", ["30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green_mag_Tracer"], [], ""],
["arifle_Katiba_GL_F", "", "acc_pointer_IR", "optic_Arco_blk_F", ["30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green_mag_Tracer"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""],
["arifle_Katiba_GL_F", "", "acc_pointer_IR", "optic_Arco", ["30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green_mag_Tracer"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""],
["arifle_SLR_V_lxWS", "", "", "optic_MRCO", ["20Rnd_762x51_slr_reload_tracer_green_lxWS", "20Rnd_762x51_slr_tracer_green_lxWS"], [], ""],
["arifle_SLR_V_lxWS", "", "", "optic_Arco_blk_F", ["30Rnd_762x51_slr_reload_tracer_green_lxWS", "30Rnd_762x51_slr_tracer_green_lxWS"], [], ""],
["arifle_Velko_lxWS", "", "acc_pointer_IR_sand_lxWS", "optic_Arco_blk_F", ["35Rnd_556x45_Velko_reload_tracer_green_lxWS","35Rnd_556x45_Velko_tracer_green_lxWS"], [], ""],
Expand Down Expand Up @@ -412,6 +409,14 @@ _pilotLoadoutData set ["vests", ["V_BandollierB_khk"]];
_pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]];
_pilotLoadoutData set ["facewear", ["G_Aviator","G_Squares_Tinted","G_Tactical_Black"]];

private _officerLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
_officerLoadoutData set ["slUniforms", ["U_O_OfficerUniform_ocamo", "U_O_ParadeUniform_01_CSAT_F", "U_O_ParadeUniform_01_CSAT_decorated_F"]];
_officerLoadoutData set ["vests", ["V_TacVest_khk", "V_LegStrapBag_coyote_F"]];
_officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_CSAT_F"]];
_officerLoadoutData set ["backpacks", []];
_officerLoadoutData set ["slRifles", [
["arifle_VelkoR5_lxWS", "", "acc_pointer_IR", "optic_r1_high_lxWS", ["35Rnd_556x45_Velko_reload_tracer_green_lxWS","35Rnd_556x45_Velko_tracer_green_lxWS"], [], ""],
["arifle_Katiba_C_F", "", "acc_pointer_IR", "optic_Arco_blk_F", ["30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green", "30Rnd_65x39_caseless_green_mag_Tracer"], [], ""]]];

if ("mark" in A3A_enabledDLC) then {
private _sfMG = _sfLoadoutData get "machineGuns";
Expand Down Expand Up @@ -987,7 +992,7 @@ private _unitTypes = [
["other", [["Crew", _crewTemplate]], _crewLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
["other", [["Pilot", _pilotTemplate]], _pilotLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
//The following lines are determining the loadout for the unit used in the "kill the official" mission
["other", [["Official", _squadLeaderTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
["other", [["Official", _squadLeaderTemplate]], _officerLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
//The following lines are determining the loadout for the AI used in the "kill the traitor" mission
["other", [["Traitor", _traitorTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
//The following lines are determining the loadout for the AI used in the "Invader Punishment" mission
Expand Down
Loading