Skip to content

Commit f3aed1e

Browse files
ante185ante185
authored
Vanilla/WS Factions update, fine tuning, officer loadouts, further RF integration on missed factions (#3407)
* WS * officer loadouts * RF UK/ION Update * validation error clearup * moved NLAW to lightAT * some extra MX and Katibas * Update Vanilla_AI_NATO_Temperate.sqf * officer uniform fix
1 parent 5f6b852 commit f3aed1e

18 files changed

+289
-97
lines changed

‎A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ _loadoutData set ["machineGuns", []];
140140
_loadoutData set ["marksmanRifles", []];
141141
_loadoutData set ["sniperRifles", []];
142142

143-
_loadoutData set ["lightATLaunchers", [
143+
_loadoutData set ["lightATLaunchers", ["launch_NLAW_F"]];
144+
_loadoutData set ["ATLaunchers", [
144145
["launch_MRAWS_green_F", "", "acc_pointer_IR", "", ["MRAWS_HE_F", "MRAWS_HEAT55_F"], [], ""],
145146
["launch_MRAWS_green_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HEAT55_F"], [], ""],
146147
["launch_MRAWS_green_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HE_F"], [], ""],
147148
["launch_MRAWS_green_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HE_F", "MRAWS_HEAT55_F"], [], ""],
148149
["launch_MRAWS_green_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HEAT55_F"], [], ""],
149150
["launch_MRAWS_green_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HE_F"], [], ""]
150151
]];
151-
_loadoutData set ["ATLaunchers", ["launch_NLAW_F"]];
152152
_loadoutData set ["missileATLaunchers", [
153153
["launch_I_Titan_short_F", "", "acc_pointer_IR", "", ["Titan_AT"], [], ""]
154154
]];
@@ -371,15 +371,12 @@ _militiaLoadoutData set ["backpacks", ["B_TacticalPack_oli", "B_FieldPack_oli",
371371
_militiaLoadoutData set ["helmets", ["H_HelmetIA"]];
372372

373373
_militiaLoadoutData set ["rifles", [
374-
["arifle_Mk20_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""],
375374
["arifle_TRG21_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""]
376375
]];
377376
_militiaLoadoutData set ["carbines", [
378-
["arifle_Mk20C_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""],
379377
["arifle_TRG20_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""]
380378
]];
381379
_militiaLoadoutData set ["grenadeLaunchers", [
382-
["arifle_Mk20_GL_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""],
383380
["arifle_TRG21_GL_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]
384381
]];
385382
_militiaLoadoutData set ["SMGs", ["SMG_01_F", "SMG_02_F", "SMG_03_black", "SMG_03C_black"]];
@@ -405,6 +402,17 @@ private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
405402
_pilotLoadoutData set ["uniforms", ["U_I_HeliPilotCoveralls"]];
406403
_pilotLoadoutData set ["vests", ["V_TacVest_oli"]];
407404
_pilotLoadoutData set ["helmets", ["H_PilotHelmetHeli_I", "H_CrewHelmetHeli_I"]];
405+
_pilotLoadoutData set ["facewear", ["G_Aviator","G_Squares_Tinted","G_Tactical_Black"]];
406+
407+
private _officerLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
408+
_officerLoadoutData set ["uniforms", ["U_I_ParadeUniform_01_AAF_F", "U_B_ParadeUniform_01_US_decorated_F"]];
409+
_officerLoadoutData set ["vests", ["V_TacVest_blk", "V_LegStrapBag_olive_F"]];
410+
_officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_AAF_F"]];
411+
_officerLoadoutData set ["backpacks", []];
412+
_officerLoadoutData set ["SMGs", [
413+
["hgun_PDW2000_F", "", "", "optic_Holosight_blk_F", [], [], ""],
414+
["arifle_Mk20C_plain_F", "", "acc_pointer_IR", "optic_Aco", [], [], ""]
415+
]];
408416

409417
if ("mark" in A3A_enabledDLC) then {
410418

@@ -972,7 +980,7 @@ private _unitTypes = [
972980

973981
["other", [["Pilot", _crewTemplate]], _pilotLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
974982
//The following lines are determining the loadout for the unit used in the "kill the official" mission
975-
["other", [["Official", _squadLeaderTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
983+
["other", [["Official", _policeTemplate]], _officerLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
976984
//The following lines are determining the loadout for the AI used in the "kill the traitor" mission
977985
["other", [["Traitor", _traitorTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
978986
//The following lines are determining the loadout for the AI used in the "Invader Punishment" mission

‎A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,18 @@ private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
407407
_pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]];
408408
_pilotLoadoutData set ["vests", ["V_BandollierB_khk"]];
409409
_pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]];
410+
_pilotLoadoutData set ["facewear", ["G_Aviator","G_Squares_Tinted","G_Tactical_Black"]];
411+
412+
private _officerLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
413+
_officerLoadoutData set ["uniforms", ["U_O_T_Officer_F", "U_O_ParadeUniform_01_CSAT_F", "U_O_ParadeUniform_01_CSAT_decorated_F"]];
414+
_officerLoadoutData set ["vests", ["V_TacVest_khk", "V_LegStrapBag_olive_F"]];
415+
_officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_CSAT_F"]];
416+
_officerLoadoutData set ["backpacks", []];
417+
_officerLoadoutData set ["SMGs", [
418+
["arifle_Katiba_C_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""],
419+
["arifle_Katiba_C_F", "", "acc_flashlight", "optic_ACO_grn", [], [], ""]
420+
]];
421+
410422

411423
if ("mark" in A3A_enabledDLC) then {
412424
(_sfLoadoutData get "machineGuns") append [
@@ -962,7 +974,7 @@ private _unitTypes = [
962974

963975
["other", [["Pilot", _crewTemplate]], _pilotLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
964976
//The following lines are determining the loadout for the unit used in the "kill the official" mission
965-
["other", [["Official", _squadLeaderTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
977+
["other", [["Official", _policeTemplate]], _officerLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
966978
//The following lines are determining the loadout for the AI used in the "kill the traitor" mission
967979
["other", [["Traitor", _traitorTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
968980
//The following lines are determining the loadout for the AI used in the "Invader Punishment" mission

‎A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,17 @@ private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
400400
_pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]];
401401
_pilotLoadoutData set ["vests", ["V_BandollierB_khk"]];
402402
_pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]];
403+
_pilotLoadoutData set ["facewear", ["G_Aviator","G_Squares_Tinted","G_Tactical_Black"]];
404+
405+
private _officerLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
406+
_officerLoadoutData set ["uniforms", ["U_O_OfficerUniform_ocamo", "U_O_ParadeUniform_01_CSAT_F", "U_O_ParadeUniform_01_CSAT_decorated_F"]];
407+
_officerLoadoutData set ["vests", ["V_TacVest_khk", "V_LegStrapBag_coyote_F"]];
408+
_officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_CSAT_F"]];
409+
_officerLoadoutData set ["backpacks", []];
410+
_officerLoadoutData set ["SMGs", [
411+
["arifle_Katiba_C_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""],
412+
["arifle_Katiba_C_F", "", "acc_flashlight", "optic_ACO_grn", [], [], ""]
413+
]];
403414

404415

405416
if ("mark" in A3A_enabledDLC) then {
@@ -958,7 +969,7 @@ private _unitTypes = [
958969
["other", [["Crew", _crewTemplate]], _crewLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
959970
["other", [["Pilot", _crewTemplate]], _pilotLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
960971
//The following lines are determining the loadout for the unit used in the "kill the official" mission
961-
["other", [["Official", _squadLeaderTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
972+
["other", [["Official", _policeTemplate]], _officerLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
962973
//The following lines are determining the loadout for the AI used in the "kill the traitor" mission
963974
["other", [["Traitor", _traitorTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
964975
//The following lines are determining the loadout for the AI used in the "Invader Punishment" mission

‎A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,17 @@ private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
414414
_pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]];
415415
_pilotLoadoutData set ["vests", ["V_BandollierB_khk"]];
416416
_pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]];
417+
_pilotLoadoutData set ["facewear", ["G_Aviator","G_Squares_Tinted","G_Tactical_Black"]];
418+
419+
private _officerLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
420+
_officerLoadoutData set ["uniforms", ["U_O_T_Officer_F", "U_O_ParadeUniform_01_CSAT_F", "U_O_ParadeUniform_01_CSAT_decorated_F"]];
421+
_officerLoadoutData set ["vests", ["V_TacVest_khk", "V_LegStrapBag_olive_F"]];
422+
_officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_CSAT_F"]];
423+
_officerLoadoutData set ["backpacks", []];
424+
_officerLoadoutData set ["SMGs", [
425+
["arifle_Katiba_C_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""],
426+
["arifle_Katiba_C_F", "", "acc_flashlight", "optic_ACO_grn", [], [], ""]
427+
]];
417428

418429

419430
if ("mark" in A3A_enabledDLC) then {
@@ -973,7 +984,7 @@ private _unitTypes = [
973984

974985
["other", [["Pilot", _crewTemplate]], _pilotLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
975986
//The following lines are determining the loadout for the unit used in the "kill the official" mission
976-
["other", [["Official", _squadLeaderTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
987+
["other", [["Official", _policeTemplate]], _officerLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
977988
//The following lines are determining the loadout for the AI used in the "kill the traitor" mission
978989
["other", [["Traitor", _traitorTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
979990
//The following lines are determining the loadout for the AI used in the "Invader Punishment" mission

‎A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,17 @@ private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
409409
_pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]];
410410
_pilotLoadoutData set ["vests", ["V_BandollierB_khk"]];
411411
_pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]];
412+
_pilotLoadoutData set ["facewear", ["G_Aviator","G_Squares_Tinted","G_Tactical_Black"]];
413+
414+
private _officerLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
415+
_officerLoadoutData set ["uniforms", ["U_O_T_Officer_F", "U_O_ParadeUniform_01_CSAT_F", "U_O_ParadeUniform_01_CSAT_decorated_F"]];
416+
_officerLoadoutData set ["vests", ["V_TacVest_khk", "V_LegStrapBag_olive_F"]];
417+
_officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_CSAT_F"]];
418+
_officerLoadoutData set ["backpacks", []];
419+
_officerLoadoutData set ["SMGs", [
420+
["arifle_Katiba_C_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""],
421+
["arifle_Katiba_C_F", "", "acc_flashlight", "optic_ACO_grn", [], [], ""]
422+
]];
412423

413424

414425

@@ -962,7 +973,7 @@ private _unitTypes = [
962973

963974
["other", [["Pilot", _crewTemplate]], _pilotLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
964975
//The following lines are determining the loadout for the unit used in the "kill the official" mission
965-
["other", [["Official", _squadLeaderTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
976+
["other", [["Official", _policeTemplate]], _officerLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
966977
//The following lines are determining the loadout for the AI used in the "kill the traitor" mission
967978
["other", [["Traitor", _traitorTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
968979
//The following lines are determining the loadout for the AI used in the "Invader Punishment" mission

‎A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ _loadoutData set ["machineGuns", []];
144144
_loadoutData set ["marksmanRifles", []];
145145
_loadoutData set ["sniperRifles", []];
146146

147-
_loadoutData set ["lightATLaunchers", [
147+
_loadoutData set ["lightATLaunchers", ["launch_NLAW_F"]];
148+
_loadoutData set ["ATLaunchers", [
148149
["launch_MRAWS_olive_F", "", "acc_pointer_IR", "", ["MRAWS_HE_F", "MRAWS_HEAT55_F"], [], ""],
149150
["launch_MRAWS_olive_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HEAT55_F"], [], ""],
150151
["launch_MRAWS_olive_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HE_F"], [], ""],
151152
["launch_MRAWS_olive_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HE_F", "MRAWS_HEAT55_F"], [], ""],
152153
["launch_MRAWS_olive_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HEAT55_F"], [], ""],
153154
["launch_MRAWS_olive_rail_F", "", "acc_pointer_IR", "", ["MRAWS_HEAT_F", "MRAWS_HE_F"], [], ""]
154155
]];
155-
_loadoutData set ["ATLaunchers", ["launch_NLAW_F"]];
156156
_loadoutData set ["missileATLaunchers", [
157157
["launch_I_Titan_short_F", "", "acc_pointer_IR", "", ["Titan_AT"], [], ""]
158158
]];
@@ -268,12 +268,9 @@ _sfLoadoutData set ["grenadeLaunchers", [
268268
["arifle_MSBS65_GL_F", "muzzle_snds_65_TI_blk_F", "acc_pointer_IR", "optic_ico_01_f", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]
269269
]];
270270
_sfLoadoutData set ["SMGs", [
271-
["SMG_01_F", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""],
272-
["SMG_01_F", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""],
273271
["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""],
274272
["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""],
275-
["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""],
276-
["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]
273+
["SMG_03C_black", "muzzle_snds_570", "", "", [], [], ""]
277274
]];
278275
_sfLoadoutData set ["machineGuns", [
279276
["LMG_Mk200_black_F", "muzzle_snds_H", "acc_pointer_IR", "optic_MRCO", ["200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_blk"],
@@ -335,12 +332,9 @@ _militaryLoadoutData set ["grenadeLaunchers", [
335332
["arifle_MSBS65_GL_F", "", "acc_pointer_IR", "optic_ico_01_f", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]
336333
]];
337334
_militaryLoadoutData set ["SMGs", [
338-
["SMG_01_F", "", "", "optic_Holosight", [], [], ""],
339-
["SMG_01_F", "", "", "optic_Aco_smg", [], [], ""],
340335
["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""],
341336
["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""],
342-
["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""],
343-
["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]
337+
"SMG_03C_black"
344338
]];
345339
_militaryLoadoutData set ["machineGuns", [
346340
["LMG_Mk200_black_F", "", "acc_pointer_IR", "optic_MRCO", ["200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_blk"],
@@ -374,12 +368,10 @@ _policeLoadoutData set ["vests", ["V_TacVest_blk_POLICE"]];
374368
_policeLoadoutData set ["helmets", ["H_Cap_police"]];
375369

376370
_policeLoadoutData set ["SMGs", [
377-
["SMG_01_F", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""],
378-
["SMG_01_F", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""],
379-
["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""],
371+
["SMG_03_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""],
380372
["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""],
381-
["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""],
382-
["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""]
373+
"SMG_03_black",
374+
"SMG_03C_black"
383375
]];
384376
_policeLoadoutData set ["sidearms", ["hgun_Rook40_F"]];
385377

@@ -408,7 +400,7 @@ _militiaLoadoutData set ["grenadeLaunchers", [
408400
["arifle_MSBS65_GL_F", "", "", "", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]
409401
]];
410402

411-
_militiaLoadoutData set ["SMGs", ["SMG_01_F", "SMG_02_F", "SMG_03_black", "SMG_03C_black"]];
403+
_militiaLoadoutData set ["SMGs", ["SMG_03_black", "SMG_03C_black"]];
412404
_militiaLoadoutData set ["machineGuns", [
413405
["LMG_Mk200_black_F", "", "", "", ["200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_blk"]
414406
]];
@@ -435,6 +427,17 @@ private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
435427
_pilotLoadoutData set ["uniforms", ["U_I_E_Uniform_01_coveralls_F"]];
436428
_pilotLoadoutData set ["vests", ["V_CarrierRigKBT_01_EAF_F"]];
437429
_pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_I_E", "H_PilotHelmetHeli_I_E"]];
430+
_pilotLoadoutData set ["facewear", ["G_Aviator","G_Squares_Tinted","G_Tactical_Black"]];
431+
432+
private _officerLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
433+
_officerLoadoutData set ["uniforms", ["U_I_E_ParadeUniform_01_LDF_F", "U_I_E_ParadeUniform_01_LDF_decorated_F","U_I_E_Uniform_01_officer_F"]];
434+
_officerLoadoutData set ["vests", ["V_CarrierRigKBT_01_EAF_F", "V_LegStrapBag_olive_F"]];
435+
_officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_LDF_F", "H_Beret_EAF_01_F"]];
436+
_officerLoadoutData set ["backpacks", []];
437+
_officerLoadoutData set ["SMGs", [
438+
["arifle_MSBS65_black_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""],
439+
["arifle_MSBS65_black_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""]
440+
]];
438441

439442
if ("mark" in A3A_enabledDLC) then {
440443
(_sfLoadoutData get "machineGuns") append [
@@ -995,7 +998,7 @@ private _unitTypes = [
995998

996999
["other", [["Pilot", _crewTemplate]], _pilotLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
9971000
//The following lines are determining the loadout for the unit used in the "kill the official" mission
998-
["other", [["Official", _squadLeaderTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
1001+
["other", [["Official", _policeTemplate]], _officerLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
9991002
//The following lines are determining the loadout for the AI used in the "kill the traitor" mission
10001003
["other", [["Traitor", _traitorTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate;
10011004
//The following lines are determining the loadout for the AI used in the "Invader Punishment" mission

0 commit comments

Comments
 (0)