From 7222e5c5363b4bb793ad001c161e28050588e89d Mon Sep 17 00:00:00 2001 From: Rein Date: Wed, 13 Nov 2024 20:21:27 +0100 Subject: [PATCH] Tweaks & fixes + Traitor edits - BAF tropical SF had mtp uniforms. - BAF non SF gets SPAR instead of MXM. - BAF & US tropical were missing RF compat. - China had wrong SF vests & uniforms. - Rebels, Shotgun only >:) - All traitor loadouts edited to look a tiny bit more traitorous. - All militias tweaked. --- .../Templates/Aegis/Aegis_AI_AAF.sqf | 14 ++-- .../Templates/Aegis/Aegis_AI_BAF_Arid.sqf | 23 +++--- .../Aegis/Aegis_AI_BAF_Temperate.sqf | 23 +++--- .../Templates/Aegis/Aegis_AI_BAF_Tropical.sqf | 70 ++++++++++++++----- .../Templates/Aegis/Aegis_AI_China.sqf | 21 +++--- .../Templates/Aegis/Aegis_AI_Iran.sqf | 13 ++-- .../Templates/Aegis/Aegis_AI_LDF.sqf | 35 +++++----- .../Templates/Aegis/Aegis_AI_Russia.sqf | 16 +++-- .../Templates/Aegis/Aegis_AI_US_Arid.sqf | 13 ++-- .../Templates/Aegis/Aegis_AI_US_Temperate.sqf | 13 ++-- .../Templates/Aegis/Aegis_AI_US_Tropical.sqf | 49 +++++++++++-- .../Templates/Templates/Aegis/Aegis_Civ.sqf | 2 +- .../Templates/Aegis/Aegis_Reb_FIA.sqf | 6 +- .../Templates/Aegis/Aegis_Reb_SDK.sqf | 4 +- 14 files changed, 205 insertions(+), 97 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf index 45a672ee56..c70784bb0c 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf @@ -430,19 +430,19 @@ _militiaLoadoutData set ["backpacks", ["B_TacticalPack_oli", "B_FieldPack_oli", _militiaLoadoutData set ["helmets", ["H_MilCap_dgtl"]]; _militiaLoadoutData set ["rifles", [ -["arifle_Mk20_plain_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""], +["arifle_Mk20_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""], ["arifle_TRG21_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""] ]]; _militiaLoadoutData set ["carbines", [ -["arifle_Mk20C_plain_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""], +["arifle_Mk20C_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""], ["arifle_TRG20_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""] ]]; _militiaLoadoutData set ["grenadeLaunchers", [ -["arifle_Mk20_GL_plain_F", "", "", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""], +["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"], ""], ["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"], ""] ]]; _militiaLoadoutData set ["SMGs", [ -["SMG_03C_TR_camo", "", "", "", [], [], ""] +["SMG_03C_camo", "", "", "", [], [], ""] ]]; _militiaLoadoutData set ["machineGuns", [ ["LMG_Mk200_F", "", "", "", ["200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_03_F_blk"] @@ -469,6 +469,10 @@ _pilotLoadoutData set ["uniforms", ["U_I_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_oli"]]; _pilotLoadoutData set ["helmets", ["H_PilotHelmetHeli_I", "H_CrewHelmetHeli_I", "H_PilotHelmetHeli_I_visor_up"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_BG_Guerilla1_2_F"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_I_ParadeUniform_01_AAF_F", "U_I_ParadeUniform_01_AAF_decorated_F"]]; _officerLoadoutData set ["vests", ["V_Rangemaster_belt_blk"]]; @@ -1048,6 +1052,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf index 2d48ae9e75..c374d8d964 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf @@ -334,9 +334,9 @@ _militaryLoadoutData set ["machineGuns", [ ["LMG_Mk200_plain_F", "", "acc_pointer_IR", "Aegis_optic_ROS", ["200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_snd"] ]]; _militaryLoadoutData set ["marksmanRifles", [ -["arifle_MXM_F", "", "acc_pointer_IR", "optic_SOS", ["30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag_Tracer"], [], "bipod_01_F_snd"], -["arifle_MXM_F", "", "acc_pointer_IR", "optic_Hamr", ["30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag_Tracer"], [], "bipod_01_F_snd"], -["arifle_MXM_F", "", "acc_pointer_IR", "optic_DMS", ["30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag_Tracer"], [], "bipod_01_F_snd"], +["arifle_SPAR_03_snd_F", "", "acc_pointer_IR", "optic_SOS", [], [], "bipod_01_F_snd"], +["arifle_SPAR_03_snd_F", "", "acc_pointer_IR", "optic_Hamr", [], [], "bipod_01_F_snd"], +["arifle_SPAR_03_snd_F", "", "acc_pointer_IR", "optic_DMS", [], [], "bipod_01_F_snd"], ["Aegis_arifle_SR25_snd_F", "", "acc_pointer_IR", "optic_SOS", ["Aegis_20Rnd_762x51_Sand_SMAG"], [], "bipod_01_F_snd"], ["Aegis_arifle_SR25_snd_F", "", "acc_pointer_IR", "optic_Hamr", ["Aegis_20Rnd_762x51_Sand_SMAG"], [], "bipod_01_F_snd"], ["Aegis_arifle_SR25_snd_F", "", "acc_pointer_IR", "optic_DMS", ["Aegis_20Rnd_762x51_Sand_SMAG"], [], "bipod_01_F_snd"] @@ -373,9 +373,10 @@ _policeLoadoutData set ["sidearms", ["hgun_G17_black_F"]]; private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks _militiaLoadoutData set ["uniforms", ["U_B_UBACS_mtp_f", "U_B_UBACS_vest_mtp_f", "U_B_UBACS_tshirt_mtp_f"]]; -_militiaLoadoutData set ["vests", ["V_Chestrig_rgr", "V_CarrierRigKBT_01_Coyote_F"]]; -_militiaLoadoutData set ["backpacks", ["B_AssaultPack_rgr"]]; -_militiaLoadoutData set ["helmets", ["H_HelmetB", "H_MilCap_mcamo", "H_Bandanna_mcamo_hs"]]; +_militiaLoadoutData set ["vests", ["V_Chestrig_rgr", "V_BandollierB_rgr"]]; +_militiaLoadoutData set ["Hvests", ["V_TacVest_oli"]]; +_militiaLoadoutData set ["backpacks", ["B_TacticalPack_mcamo", "B_Kitbag_mcamo", "B_Carryall_mcamo"]]; +_militiaLoadoutData set ["helmets", ["H_MilCap_mcamo", "H_HelmetB_light_mcamo", "H_Bandanna_mcamo_hs"]]; _militiaLoadoutData set ["rifles", [ ["arifle_SA80_snd_F", "", "acc_flashlight", "", ["30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag_Tracer"], [], ""] @@ -393,8 +394,8 @@ _militiaLoadoutData set ["machineGuns", [ ["LMG_Mk200_plain_F", "", "acc_flashlight", "", ["200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_snd"] ]]; _militiaLoadoutData set ["marksmanRifles", [ -["arifle_MXM_F", "", "acc_flashlight", "optic_Hamr", ["30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag_Tracer"], [], "bipod_01_F_snd"], -["arifle_MXM_F", "", "acc_flashlight", "optic_MRCO", ["30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag_Tracer"], [], "bipod_01_F_snd"] +["arifle_SPAR_03_snd_F", "", "acc_flashlight", "optic_MRCO", [], [], "bipod_01_F_snd"], +["arifle_SPAR_03_snd_F", "", "acc_flashlight", "optic_Hamr", [], [], "bipod_01_F_snd"] ]]; _militiaLoadoutData set ["sniperRifles", [ ["srifle_LRR_F", "", "", "optic_SOS", [], [], ""], @@ -416,6 +417,10 @@ _pilotLoadoutData set ["uniforms", ["U_B_UBACS_vest_mtp_f"]]; _pilotLoadoutData set ["vests", ["V_CarrierRigKBT_01_MTP_F"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O", "H_PilotHelmetHeli_O_visor_up"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_B_UBACS_tshirt_mtp_f"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_B_ParadeUniform_01_US_F", "U_B_ParadeUniform_01_US_decorated_F"]]; _officerLoadoutData set ["vests", ["Aegis_V_CarrierRigKBT_01_holster_cbr_F"]]; @@ -982,6 +987,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf index 1920d87712..b1e8bae371 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf @@ -322,9 +322,9 @@ _militaryLoadoutData set ["machineGuns", [ ["LMG_Mk200_black_F", "", "acc_pointer_IR", "Aegis_optic_ROS", ["200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_blk"] ]]; _militaryLoadoutData set ["marksmanRifles", [ -["arifle_MXM_Black_F", "", "acc_pointer_IR", "optic_SOS", ["30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag_Tracer"], [], "bipod_01_F_blk"], -["arifle_MXM_Black_F", "", "acc_pointer_IR", "optic_Hamr", ["30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag_Tracer"], [], "bipod_01_F_blk"], -["arifle_MXM_Black_F", "", "acc_pointer_IR", "optic_DMS", ["30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag_Tracer"], [], "bipod_01_F_blk"], +["arifle_SPAR_03_blk_F", "", "acc_pointer_IR", "optic_SOS", [], [], "bipod_01_F_blk"], +["arifle_SPAR_03_blk_F", "", "acc_pointer_IR", "optic_DMS", [], [], "bipod_01_F_blk"], +["arifle_SPAR_03_blk_F", "", "acc_pointer_IR", "optic_Hamr", [], [], "bipod_01_F_blk"], ["Aegis_arifle_SR25_blk_F", "", "acc_pointer_IR", "optic_SOS", [], [], "bipod_01_F_blk"], ["Aegis_arifle_SR25_blk_F", "", "acc_pointer_IR", "optic_DMS", [], [], "bipod_01_F_blk"], ["Aegis_arifle_SR25_blk_F", "", "acc_pointer_IR", "optic_Hamr", [], [], "bipod_01_F_blk"] @@ -361,9 +361,10 @@ _policeLoadoutData set ["sidearms", ["hgun_G17_black_F"]]; private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks _militiaLoadoutData set ["uniforms", ["U_B_UBACS_wdl_f", "U_B_UBACS_vest_wdl_f", "U_B_UBACS_tshirt_wdl_f"]]; -_militiaLoadoutData set ["vests", ["V_Chestrig_rgr", "V_CarrierRigKBT_01_Olive_F"]]; -_militiaLoadoutData set ["backpacks", ["B_AssaultPack_wdl_F"]]; -_militiaLoadoutData set ["helmets", ["H_HelmetB_plain_wdl", "H_MilCap_wdl", "H_Bandanna_tna_hs_F"]]; +_militiaLoadoutData set ["vests", ["V_Chestrig_rgr", "V_BandollierB_rgr"]]; +_militiaLoadoutData set ["Hvests", ["V_TacVest_grn"]]; +_militiaLoadoutData set ["backpacks", ["B_TacticalPack_rgr", "B_Kitbag_wdl_F", "B_Carryall_wdl_F"]]; +_militiaLoadoutData set ["helmets", ["H_MilCap_wdl", "H_HelmetB_light_wdl", "H_Bandanna_khk_hs"]]; _militiaLoadoutData set ["rifles", [ ["arifle_SA80_blk_F", "", "acc_flashlight", "", ["30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag_Tracer"], [], ""] @@ -381,8 +382,8 @@ _militiaLoadoutData set ["machineGuns", [ ["LMG_Mk200_black_F", "", "acc_flashlight", "", ["200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_blk"] ]]; _militiaLoadoutData set ["marksmanRifles", [ -["arifle_MXM_Black_F", "", "acc_flashlight", "optic_MRCO", ["30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag_Tracer"], [], "bipod_01_F_blk"], -["arifle_MXM_Black_F", "", "acc_flashlight", "optic_Hamr", ["30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag_Tracer"], [], "bipod_01_F_blk"] +["arifle_SPAR_03_blk_F", "", "acc_pointer_IR", "optic_MRCO", [], [], "bipod_01_F_blk"], +["arifle_SPAR_03_blk_F", "", "acc_pointer_IR", "optic_Hamr", [], [], "bipod_01_F_blk"] ]]; _militiaLoadoutData set ["sniperRifles", [ ["srifle_LRR_F", "", "", "optic_SOS", [], [], ""], @@ -404,6 +405,10 @@ _pilotLoadoutData set ["uniforms", ["U_B_UBACS_vest_wdl_f"]]; _pilotLoadoutData set ["vests", ["V_CarrierRigKBT_01_Olive_F"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O", "H_PilotHelmetHeli_O_visor_up"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_B_UBACS_tshirt_wdl_f"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_B_ParadeUniform_01_US_F", "U_B_ParadeUniform_01_US_decorated_F"]]; _officerLoadoutData set ["vests", ["Aegis_V_CarrierRigKBT_01_holster_olive_F"]]; @@ -970,6 +975,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf index 2c02866fd1..b07d0c36c5 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf @@ -212,7 +212,7 @@ _loadoutData set ["items_unarmed_extras", []]; /////////////////////////////////////// private _sfLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks -_sfLoadoutData set ["uniforms", ["U_B_UBACS_mtp_f", "U_B_UBACS_vest_tna_f", "U_B_UBACS_tshirt_tna_f"]]; +_sfLoadoutData set ["uniforms", ["U_B_UBACS_tna_f", "U_B_UBACS_vest_tna_f", "U_B_UBACS_tshirt_tna_f"]]; _sfLoadoutData set ["vests", ["Aegis_V_CarrierRigKBT_01_recon_olive_F","V_TacVest_grn"]]; _sfLoadoutData set ["Hvests", ["Aegis_V_CarrierRigKBT_01_cqb_olive_F"]]; _sfLoadoutData set ["backpacks", ["B_Kitbag_tna_F", "B_Carryall_tna_F", "B_TacticalPack_tna_F", "B_AssaultPack_tna_F"]]; @@ -321,9 +321,9 @@ _militaryLoadoutData set ["machineGuns", [ ["LMG_Mk200_khk_F", "", "acc_pointer_IR", "Aegis_optic_ROS", ["200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_khk"] ]]; _militaryLoadoutData set ["marksmanRifles", [ -["arifle_MXM_khk_F", "", "acc_pointer_IR", "optic_SOS_khk_F", ["30Rnd_65x39_caseless_khaki_mag", "30Rnd_65x39_caseless_khaki_mag", "30Rnd_65x39_caseless_khaki_mag_Tracer"], [], "bipod_01_F_khk"], -["arifle_MXM_khk_F", "", "acc_pointer_IR", "optic_Hamr_khk_F", ["30Rnd_65x39_caseless_khaki_mag", "30Rnd_65x39_caseless_khaki_mag", "30Rnd_65x39_caseless_khaki_mag_Tracer"], [], "bipod_01_F_khk"], -["arifle_MXM_khk_F", "", "acc_pointer_IR", "optic_DMS", ["30Rnd_65x39_caseless_khaki_mag", "30Rnd_65x39_caseless_khaki_mag", "30Rnd_65x39_caseless_khaki_mag_Tracer"], [], "bipod_01_F_khk"], +["arifle_SPAR_03_khk_F", "", "acc_pointer_IR", "optic_SOS_khk_F", [], [], "bipod_01_F_khk"], +["arifle_SPAR_03_khk_F", "", "acc_pointer_IR", "optic_Hamr_khk_F", [], [], "bipod_01_F_khk"], +["arifle_SPAR_03_khk_F", "", "acc_pointer_IR", "optic_DMS", [], [], "bipod_01_F_khk"], ["Aegis_arifle_SR25_khk_F", "aegis_muzzle_snds_sr25_khk", "acc_pointer_IR", "optic_SOS_khk_F", [], [], "bipod_01_F_khk"], ["Aegis_arifle_SR25_khk_F", "aegis_muzzle_snds_sr25_khk", "acc_pointer_IR", "optic_Hamr_khk_F", [], [], "bipod_01_F_khk"], ["Aegis_arifle_SR25_khk_F", "aegis_muzzle_snds_sr25_khk", "acc_pointer_IR", "optic_DMS", [], [], "bipod_01_F_khk"] @@ -361,9 +361,10 @@ _policeLoadoutData set ["sidearms", ["hgun_G17_black_F"]]; private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks _militiaLoadoutData set ["uniforms", ["U_B_UBACS_tna_f", "U_B_UBACS_vest_tna_f", "U_B_UBACS_tshirt_tna_f"]]; -_militiaLoadoutData set ["vests", ["V_Chestrig_oli", "V_CarrierRigKBT_01_Olive_F"]]; -_militiaLoadoutData set ["backpacks", ["B_AssaultPack_rgr"]]; -_militiaLoadoutData set ["helmets", ["H_HelmetB_tna_F", "H_MilCap_tna_F", "H_Bandanna_tna_hs_F"]]; +_militiaLoadoutData set ["vests", ["V_Chestrig_oli", "V_BandollierB_oli"]]; +_militiaLoadoutData set ["Hvests", ["V_TacVest_oli"]]; +_militiaLoadoutData set ["backpacks", ["B_TacticalPack_tna_F", "B_Kitbag_tna_F", "B_Carryall_tna_F"]]; +_militiaLoadoutData set ["helmets", ["H_MilCap_tna_F", "H_HelmetB_Light_tna_F", "H_Bandanna_tna_hs_F"]]; _militiaLoadoutData set ["rifles", [ ["arifle_SA80_khk_F", "", "acc_flashlight", "", ["30Rnd_65x39_caseless_khaki_mag", "30Rnd_65x39_caseless_khaki_mag", "30Rnd_65x39_caseless_khaki_mag_Tracer"], [], ""] @@ -381,8 +382,8 @@ _militiaLoadoutData set ["machineGuns", [ ["LMG_Mk200_khk_F", "", "acc_flashlight", "", ["200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box","200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_khk"] ]]; _militiaLoadoutData set ["marksmanRifles", [ -["arifle_MXM_Black_F", "", "acc_flashlight", "optic_MRCO", ["30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag_Tracer"], [], "bipod_01_F_blk"], -["arifle_MXM_Black_F", "", "acc_flashlight", "optic_Hamr", ["30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag", "30Rnd_65x39_caseless_black_mag_Tracer"], [], "bipod_01_F_blk"] +["arifle_SPAR_03_khk_F", "", "acc_pointer_IR", "optic_MRCO", [], [], "bipod_01_F_khk"], +["arifle_SPAR_03_khk_F", "", "acc_pointer_IR", "optic_Hamr_khk_F", [], [], "bipod_01_F_khk"] ]]; _militiaLoadoutData set ["sniperRifles", [ ["srifle_LRR_F", "", "", "optic_SOS", [], [], ""], @@ -404,6 +405,10 @@ _pilotLoadoutData set ["uniforms", ["U_B_UBACS_vest_tna_f"]]; _pilotLoadoutData set ["vests", ["V_CarrierRigKBT_01_Olive_F"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O", "H_PilotHelmetHeli_O_visor_up"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_B_UBACS_tshirt_tna_f"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_B_ParadeUniform_01_US_F", "U_B_ParadeUniform_01_US_decorated_F"]]; _officerLoadoutData set ["vests", ["Aegis_V_CarrierRigKBT_01_holster_olive_F"]]; @@ -430,17 +435,50 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_02_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_01_F_blk"], ["srifle_DMR_02_F", "", "acc_pointer_IR", "optic_AMS", [], [], "bipod_01_F_blk"]]; }; +if ("rf" in A3A_enabledDLC) then { + (_sfLoadoutData get "sidearms") append [ + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""] + ]; + (_militaryLoadoutData get "sidearms") append [ + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""] + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_tna_RF", + "H_HelmetHeavy_Olive_RF", + "H_HelmetHeavy_Simple_Olive_RF", + "H_HelmetHeavy_VisorUp_Olive_RF"]; + (_militaryLoadoutData get "helmets") append ["H_HelmetB_plain_sb_tna_RF"]; +}; -// ##################### DO NOT TOUCH ANYTHING BELOW THIS LINE ##################### ///////////////////////////////// // Unit Type Definitions // ///////////////////////////////// -//These define the loadouts for different unit types. -//For example, rifleman, grenadier, squad leader, etc. -//In 95% of situations, you *should not need to edit these*. -//Almost all factions can be set up just by modifying the loadout data above. -//However, these exist in case you really do want to do a lot of custom alterations. + private _squadLeaderTemplate = { ["slHat"] call _fnc_setHelmet; @@ -937,6 +975,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf index e705ebe9ba..9ab9a7bec0 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf @@ -216,10 +216,10 @@ _loadoutData set ["items_unarmed_extras", []]; /////////////////////////////////////// private _sfLoadoutData = _loadoutData call _fnc_copyLoadoutData; -_sfLoadoutData set ["uniforms", ["U_O_T_Soldier_F"]]; -_sfLoadoutData set ["vests", ["V_HarnessO_ghex_F"]]; -_sfLoadoutData set ["glVests", ["V_HarnessOGL_ghex_F"]]; -_sfLoadoutData set ["Hvests", ["V_TacVest_oli"]]; +_sfLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_ghex_F", "Aegis_U_O_CombatFatigues_ghex_02_F"]]; +_sfLoadoutData set ["vests", ["Aegis_V_OCarrierLuchnik_Lite_grn_F"]]; +_sfLoadoutData set ["glVests", ["Aegis_V_OCarrierLuchnik_GL_grn_F"]]; +_sfLoadoutData set ["Hvests", ["Aegis_V_OCarrierLuchnik_CQB_grn_F"]]; _sfLoadoutData set ["backpacks", ["B_ViperLightHarness_ghex_F", "B_ViperHarness_ghex_F"]]; _sfLoadoutData set ["helmets", ["H_HelmetSpecO_ghex_F", "H_HelmetSpecO_blk"]]; _sfLoadoutData set ["NVGs", ["O_NVGoggles_ghex_F"]]; @@ -381,7 +381,7 @@ _militiaLoadoutData set ["SMGs", [ ["SMG_02_F", "", "acc_flashlight", "", [], [], ""] ]]; _militiaLoadoutData set ["machineGuns", [ -["LMG_Zafir_ghex_F", "", "acc_flashlight", "", ["150Rnd_762x54_Box", "150Rnd_762x54_Box_Tracer"], [], ""] +["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""] ]]; _militiaLoadoutData set ["marksmanRifles", [ ["srifle_DMR_07_blk_F", "", "", "optic_Arco_blk_F", [], [], ""] @@ -405,15 +405,18 @@ _pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_Rangemaster_belt_ghex_F"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["Aegis_U_O_CombatUniform_tshirt_ghex_F"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_O_ParadeUniform_01_CSAT_F", "U_O_ParadeUniform_01_CSAT_decorated_F"]]; _officerLoadoutData set ["vests", ["V_Rangemaster_belt_ghex_F"]]; _officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_CSAT_F"]]; _officerLoadoutData set ["backpacks", []]; _officerLoadoutData set ["SMGs", [ -["arifle_CTAR_blk_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], -["arifle_CTAR_blk_F", "", "acc_pointer_IR", "optic_Aco", [], [], ""], -["arifle_CTAR_blk_F", "", "acc_pointer_IR", "Aegis_optic_ROS", [], [], ""] +["Aegis_arifle_AKS74_gold_F", "", "", "", [], [], ""], +["Aegis_arifle_AK74_gold_F", "", "", "", [], [], ""] ]]; if ("mark" in A3A_enabledDLC) then { @@ -986,6 +989,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf index 6706abc030..9c9c809c1f 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf @@ -391,7 +391,7 @@ _militiaLoadoutData set ["SMGs", [ ["SMG_02_F", "", "acc_flashlight", "", [], [], ""] ]]; _militiaLoadoutData set ["machineGuns", [ -["LMG_Zafir_F", "", "acc_flashlight", "", ["150Rnd_762x54_Box", "150Rnd_762x54_Box_Tracer"], [], ""] +["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""] ]]; _militiaLoadoutData set ["marksmanRifles", [ ["srifle_DMR_01_F", "", "acc_flashlight", "optic_Arco_blk_F", [], [], "bipod_02_F_hex"] @@ -415,15 +415,18 @@ _pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_Rangemaster_belt_khk"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["Aegis_U_O_CombatUniform_tshirt_hex_F"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_O_ParadeUniform_01_CSAT_F", "U_O_ParadeUniform_01_CSAT_decorated_F"]]; _officerLoadoutData set ["vests", ["V_Rangemaster_belt_khk"]]; _officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_CSAT_F"]]; _officerLoadoutData set ["backpacks", []]; _officerLoadoutData set ["SMGs", [ -["arifle_Katiba_C_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], -["arifle_Katiba_C_F", "", "acc_pointer_IR", "optic_Aco", [], [], ""], -["arifle_Katiba_C_F", "", "acc_pointer_IR", "Aegis_optic_ROS", [], [], ""] +["Aegis_arifle_AKS74_gold_F", "", "", "", [], [], ""], +["Aegis_arifle_AK74_gold_F", "", "", "", [], [], ""] ]]; if ("mark" in A3A_enabledDLC) then { @@ -988,6 +991,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf index f8ce5375c0..e926943de6 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf @@ -293,16 +293,11 @@ _militaryLoadoutData set ["slRifles", [ ["arifle_MSBS65_F", "", "acc_pointer_IR", "Aegis_optic_ACOG", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], ""], ["arifle_MSBS65_UBS_F", "", "acc_pointer_IR", "optic_MRCO", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["6Rnd_12Gauge_Pellets", "6Rnd_12Gauge_Slug"], ""], ["arifle_MSBS65_UBS_F", "", "acc_pointer_IR", "optic_Hamr_khk_F", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["6Rnd_12Gauge_Pellets", "6Rnd_12Gauge_Slug"], ""], -["arifle_MSBS65_UBS_F", "", "acc_pointer_IR", "Aegis_optic_ACOG", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["6Rnd_12Gauge_Pellets", "6Rnd_12Gauge_Slug"], ""], -["arifle_MSBS65_GL_F", "", "acc_pointer_IR", "optic_MRCO", ["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"], ""], -["arifle_MSBS65_GL_F", "", "acc_pointer_IR", "optic_Hamr_khk_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"], ""], -["arifle_MSBS65_GL_F", "", "acc_pointer_IR", "Aegis_optic_ACOG", ["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"], ""] +["arifle_MSBS65_UBS_F", "", "acc_pointer_IR", "Aegis_optic_ACOG", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["6Rnd_12Gauge_Pellets", "6Rnd_12Gauge_Slug"], ""] ]]; _militaryLoadoutData set ["rifles", [ ["arifle_MSBS65_F", "", "acc_pointer_IR", "optic_Holosight_khk_F", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], ""], -["arifle_MSBS65_F", "", "acc_pointer_IR", "optic_ico_01_f", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], ""], -["arifle_MSBS65_UBS_F", "", "acc_pointer_IR", "optic_Holosight_khk_F", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["6Rnd_12Gauge_Pellets", "6Rnd_12Gauge_Slug"], ""], -["arifle_MSBS65_UBS_F", "", "acc_pointer_IR", "optic_ico_01_f", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], ["6Rnd_12Gauge_Pellets", "6Rnd_12Gauge_Slug"], ""] +["arifle_MSBS65_F", "", "acc_pointer_IR", "optic_ico_01_f", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], ""] ]]; _militaryLoadoutData set ["carbines", [ ["arifle_MSBS65_F", "", "acc_pointer_IR", "optic_Holosight_khk_F", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], ""], @@ -322,8 +317,11 @@ _militaryLoadoutData set ["machineGuns", [ ["LMG_Mk200_black_F", "", "acc_pointer_IR", "Aegis_optic_ACOG", ["200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Red", "200Rnd_65x39_cased_Box_Tracer_Red"], [], "bipod_01_F_blk"] ]]; _militaryLoadoutData set ["marksmanRifles", [ +["arifle_SPAR_03_blk_F", "", "acc_pointer_IR", "optic_SOS", [], [], "bipod_01_F_blk"], +["arifle_SPAR_03_blk_F", "", "acc_pointer_IR", "optic_DMS", [], [], "bipod_01_F_blk"], +["arifle_SPAR_03_blk_F", "", "acc_pointer_IR", "Aegis_optic_ACOG", [], [], "bipod_01_F_blk"],["arifle_MSBS65_Mark_F", "", "acc_pointer_IR", "optic_SOS", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], "bipod_01_F_blk"], ["arifle_MSBS65_Mark_F", "", "acc_pointer_IR", "optic_SOS", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], "bipod_01_F_blk"], -["arifle_MSBS65_Mark_F", "", "acc_pointer_IR", "optic_MRCO", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], "bipod_01_F_blk"], +["arifle_MSBS65_Mark_F", "", "acc_pointer_IR", "optic_DMS", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], "bipod_01_F_blk"], ["arifle_MSBS65_Mark_F", "", "acc_pointer_IR", "Aegis_optic_ACOG", ["30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag", "30Rnd_65x39_caseless_msbs_mag_Tracer"], [], "bipod_01_F_blk"] ]]; _militaryLoadoutData set ["sniperRifles", [ @@ -357,8 +355,8 @@ _policeLoadoutData set ["sidearms", ["hgun_ACPC2_black_F"]]; private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks _militiaLoadoutData set ["uniforms", ["U_I_E_Uniform_01_tanktop_F", "U_I_E_Uniform_01_shortsleeve_F", "U_I_E_Uniform_01_F"]]; -_militiaLoadoutData set ["vests", ["V_BandollierB_oli", "V_Chestrig_oli", "V_ChestrigF_oli", "V_TacVest_oli"]]; -_militiaLoadoutData set ["Hvests", ["V_CarrierRigKBT_01_light_Olive_F"]]; +_militiaLoadoutData set ["vests", ["V_BandollierB_oli", "V_Chestrig_oli", "V_ChestrigF_oli"]]; +_militiaLoadoutData set ["Hvests", ["V_TacVest_grn"]]; _militiaLoadoutData set ["backpacks", ["B_AssaultPack_eaf_F", "B_Carryall_eaf_F", "B_Kitbag_eaf_F", "B_FieldPack_green_F", "B_TacticalPack_eaf_F"]]; _militiaLoadoutData set ["helmets", ["H_MilCap_eaf"]]; @@ -380,7 +378,7 @@ _militiaLoadoutData set ["SMGs", [ ["SMG_03C_black", "", "", "", [], [], ""] ]]; _militiaLoadoutData set ["machineGuns", [ -["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""] +["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""] ]]; _militiaLoadoutData set ["marksmanRifles", [ ["srifle_DMR_01_black_F", "", "acc_flashlight", "optic_Arco_blk_F", [], [], "bipod_02_F_blk"] @@ -404,14 +402,18 @@ _pilotLoadoutData set ["uniforms", ["U_I_E_Uniform_01_coveralls_F"]]; _pilotLoadoutData set ["vests", ["V_CarrierRigKBT_01_EAF_F"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_I_E", "H_PilotHelmetHeli_I_E", "H_PilotHelmetHeli_I_E_visor_up"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_I_L_Uniform_01_camo_F"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_I_E_ParadeUniform_01_LDF_F", "U_I_E_ParadeUniform_01_LDF_decorated_F"]]; _officerLoadoutData set ["vests", ["Aegis_V_CarrierRigKBT_01_holster_olive_F"]]; _officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_LDF_F"]]; _officerLoadoutData set ["backpacks", []]; _officerLoadoutData set ["SMGs", [ -["arifle_MSBS65_F", "", "acc_pointer_IR", "optic_Holosight_khk_F", [], [], ""], -["arifle_MSBS65_F", "", "acc_pointer_IR", "optic_ico_01_f", [], [], ""] +["Aegis_arifle_AKS74_gold_F", "", "", "", [], [], ""], +["Aegis_arifle_AK74_gold_F", "", "", "", [], [], ""] ]]; if ("mark" in A3A_enabledDLC) then { @@ -483,7 +485,6 @@ private _squadLeaderTemplate = { ["slHat"] call _fnc_setHelmet; [["Hvests", "vests"] call _fnc_fallback] call _fnc_setVest; [["slUniforms", "uniforms"] call _fnc_fallback] call _fnc_setUniform; - ["backpacks"] call _fnc_setBackpack; [["slRifles", "rifles"] call _fnc_fallback] call _fnc_setPrimary; @@ -514,7 +515,6 @@ private _riflemanTemplate = { ["vests"] call _fnc_setVest; ["uniforms"] call _fnc_setUniform; - [selectRandom ["rifles", "carbines"]] call _fnc_setPrimary; ["primary", 6] call _fnc_addMagazines; ["primary", 2] call _fnc_addAdditionalMuzzleMagazines; @@ -761,7 +761,6 @@ private _marksmanTemplate = { ["vests"] call _fnc_setVest; ["uniforms"] call _fnc_setUniform; - ["marksmanRifles"] call _fnc_setPrimary; ["primary", 6] call _fnc_addMagazines; @@ -787,7 +786,6 @@ private _sniperTemplate = { ["vests"] call _fnc_setVest; ["uniforms"] call _fnc_setUniform; - ["sniperRifles"] call _fnc_setPrimary; ["primary", 7] call _fnc_addMagazines; @@ -813,7 +811,6 @@ private _policeTemplate = { ["vests"] call _fnc_setVest; ["uniforms"] call _fnc_setUniform; - [["rifles", "SMGs"] call _fnc_fallback] call _fnc_setPrimary; ["primary", 3] call _fnc_addMagazines; @@ -973,6 +970,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf index e7ddf0ec6f..a8106c1b12 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf @@ -365,8 +365,7 @@ private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch a _militiaLoadoutData set ["uniforms", ["U_O_R_officer_noInsignia_taiga_F"]]; _militiaLoadoutData set ["slUniforms", ["U_O_R_OfficerUniform_taiga_F"]]; _militiaLoadoutData set ["vests", ["Aegis_V_ChestrigEast_RUtaiga_F"]]; -_militiaLoadoutData set ["glVests", ["V_TacVest_grn"]]; -_militiaLoadoutData set ["Hvests", ["Aegis_V_OCarrierLuchnik_F"]]; +_militiaLoadoutData set ["Hvests", ["V_TacVest_grn"]]; _militiaLoadoutData set ["backpacks", ["B_Carryall_taiga_F", "B_FieldPack_taiga_F", "B_AssaultPack_taiga_F"]]; _militiaLoadoutData set ["helmets", ["H_MilCap_taiga"]]; @@ -389,7 +388,7 @@ _militiaLoadoutData set ["SMGs", [ ["SMG_02_F", "", "acc_flashlight", "", [], [], ""] ]]; _militiaLoadoutData set ["machineGuns", [ -["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""] +["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""] ]]; _militiaLoadoutData set ["marksmanRifles", [ ["srifle_DMR_01_black_F", "", "acc_flashlight", "optic_Arco_blk_F", [], [], "bipod_02_F_blk"] @@ -413,15 +412,18 @@ _pilotLoadoutData set ["uniforms", ["U_O_R_PilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_Rangemaster_belt_taiga_F"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O_visor_up", "H_PilotHelmetHeli_O"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_O_R_CombatUniform_tshirt_taiga_F"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_O_ParadeUniform_01_CSAT_F", "U_O_ParadeUniform_01_CSAT_decorated_F"]]; _officerLoadoutData set ["vests", ["V_Rangemaster_belt_taiga_F"]]; _officerLoadoutData set ["helmets", ["H_ParadeDressCap_01_CSAT_F"]]; _officerLoadoutData set ["backpacks", []]; _officerLoadoutData set ["SMGs", [ -["arifle_AK12U_545_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], -["arifle_AK12U_545_F", "", "acc_pointer_IR", "optic_ACO_grn", [], [], ""], -["arifle_AK12U_545_F", "", "acc_pointer_IR", "Aegis_optic_ROS", [], [], ""] +["Aegis_arifle_AKS74_gold_F", "", "", "", [], [], ""], +["Aegis_arifle_AK74_gold_F", "", "", "", [], [], ""] ]]; if ("mark" in A3A_enabledDLC) then { @@ -966,6 +968,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf index 7356ad0263..b19ee9e2ac 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf @@ -408,9 +408,10 @@ _policeLoadoutData set ["sidearms", ["hgun_ACPC2_black_F"]]; private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks _militiaLoadoutData set ["uniforms", ["U_B_CombatUniform_mcam_tshirt", "U_I_G_Story_Protagonist_F", "U_B_CombatUniform_mcam_vest"]]; -_militiaLoadoutData set ["vests", ["V_Chestrig_rgr", "V_BandollierB_rgr", "V_TacVest_oli"]]; -_militiaLoadoutData set ["backpacks", ["B_AssaultPack_rgr"]]; -_militiaLoadoutData set ["helmets", ["H_HelmetB", "H_MilCap_mcamo", "H_Bandanna_mcamo_hs"]]; +_militiaLoadoutData set ["vests", ["V_Chestrig_rgr", "V_BandollierB_rgr"]]; +_militiaLoadoutData set ["Hvests", ["V_TacVest_oli"]]; +_militiaLoadoutData set ["backpacks", ["B_AssaultPackSpec_mcamo", "B_Kitbag_mcamo", "B_Carryall_mcamo"]]; +_militiaLoadoutData set ["helmets", ["H_MilCap_mcamo", "H_HelmetB_light_mcamo", "H_Bandanna_mcamo_hs"]]; _militiaLoadoutData set ["rifles", [ ["Aegis_arifle_M4A1_grip_F", "", "acc_flashlight", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""], @@ -451,6 +452,10 @@ _pilotLoadoutData set ["uniforms", ["U_B_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_blk"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_B", "H_PilotHelmetHeli_B", "H_PilotHelmetHeli_B_visor_up"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_I_G_Story_Protagonist_F"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_B_ParadeUniform_01_US_F", "U_B_ParadeUniform_01_US_decorated_F"]]; _officerLoadoutData set ["vests", ["V_Rangemaster_belt"]]; @@ -1022,6 +1027,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf index 73c207e780..5181ff814e 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf @@ -390,9 +390,10 @@ _policeLoadoutData set ["sidearms", ["hgun_ACPC2_black_F"]]; private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks _militiaLoadoutData set ["uniforms", ["U_B_CombatUniform_mcam_wdl_f", "U_B_CombatUniform_tshirt_mcam_wdL_f", "U_B_CombatUniform_vest_mcam_wdl_f"]]; -_militiaLoadoutData set ["vests", ["V_TacVest_grn", "V_BandollierB_blk", "V_Chestrig_blk"]]; -_militiaLoadoutData set ["backpacks", ["B_AssaultPackSpec_blk"]]; -_militiaLoadoutData set ["helmets", ["H_MilCap_wdl", "H_HelmetB", "H_Bandanna_khk_hs"]]; +_militiaLoadoutData set ["vests", ["V_Chestrig_rgr", "V_BandollierB_rgr"]]; +_militiaLoadoutData set ["Hvests", ["V_TacVest_grn"]]; +_militiaLoadoutData set ["backpacks", ["B_AssaultPackSpec_wdl_F", "B_Kitbag_wdl_F", "B_Carryall_wdl_F"]]; +_militiaLoadoutData set ["helmets", ["H_MilCap_wdl", "H_HelmetB_light_wdl", "H_Bandanna_khk_hs"]]; _militiaLoadoutData set ["rifles", [ ["Aegis_arifle_M4A1_grip_F", "", "acc_flashlight", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""], @@ -433,6 +434,10 @@ _pilotLoadoutData set ["uniforms", ["U_B_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_blk"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_B", "H_PilotHelmetHeli_B", "H_PilotHelmetHeli_B_visor_up"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_B_CombatUniform_tshirt_mcam_wdL_f"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_B_ParadeUniform_01_US_F", "U_B_ParadeUniform_01_US_decorated_F"]]; _officerLoadoutData set ["vests", ["V_Rangemaster_belt"]]; @@ -1004,6 +1009,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf index 3777452cdf..50f35684bd 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf @@ -392,8 +392,8 @@ private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; _militiaLoadoutData set ["uniforms", ["U_B_T_Soldier_F", "U_B_T_Soldier_AR_F", "U_B_T_Soldier_SL_F"]];; _militiaLoadoutData set ["vests", ["V_BandollierB_oli", "V_Chestrig_oli"]]; _militiaLoadoutData set ["Hvests", ["V_TacVest_oli"]]; -_militiaLoadoutData set ["helmets", ["H_MilCap_tna_F"]]; -_militiaLoadoutData set ["backpacks", ["B_AssaultPack_tna_F", "B_Kitbag_sgg", "B_Carryall_oli"]]; +_militiaLoadoutData set ["backpacks", ["B_AssaultPack_Enh_tna_F", "B_Kitbag_tna_F", "B_Carryall_tna_F"]]; +_militiaLoadoutData set ["helmets", ["H_MilCap_tna_F", "H_HelmetB_Light_tna_F", "H_Bandanna_tna_hs_F"]]; _militiaLoadoutData set ["rifles", [ ["Aegis_arifle_M4A1_grip_F", "", "acc_flashlight", "", ["30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_Tracer_Yellow"], [], ""], @@ -434,6 +434,10 @@ _pilotLoadoutData set ["uniforms", ["U_B_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_blk"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_B", "H_PilotHelmetHeli_B", "H_PilotHelmetHeli_B_visor_up"]]; +private _traitorLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData; +_traitorLoadoutData set ["uniforms", ["U_B_T_Soldier_AR_F"]]; +_traitorLoadoutData set ["vests", ["V_TacVest_camo"]]; + private _officerLoadoutData = _loadoutData call _fnc_copyLoadoutData; _officerLoadoutData set ["uniforms", ["U_B_ParadeUniform_01_US_F", "U_B_ParadeUniform_01_US_decorated_F"]]; _officerLoadoutData set ["vests", ["V_Rangemaster_belt_tna_F"]]; @@ -471,8 +475,45 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_02_camo_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_01_F_khk"], ["srifle_DMR_02_camo_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_01_F_khk"]]; }; +if ("rf" in A3A_enabledDLC) then { + (_sfLoadoutData get "sidearms") append [ + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""] + ]; + (_militaryLoadoutData get "sidearms") append [ + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""] + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_tna_RF", + "H_HelmetHeavy_Olive_RF", + "H_HelmetHeavy_Simple_Olive_RF", + "H_HelmetHeavy_VisorUp_Olive_RF"]; + (_militaryLoadoutData get "helmets") append ["H_HelmetB_plain_sb_tna_RF"]; +}; -// ##################### DO NOT TOUCH ANYTHING BELOW THIS LINE ##################### ///////////////////////////////// // Unit Type Definitions // @@ -968,6 +1009,6 @@ private _unitTypes = [ //The following lines are determining the loadout for the unit used in the "kill the official" mission ["other", [["Official", _policeTemplate]], _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; +["other", [["Traitor", _traitorTemplate]], _traitorLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; //The following lines are determining the loadout for the AI used in the "Invader Punishment" mission ["other", [["Unarmed", _UnarmedTemplate]], _militaryLoadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Civ.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Civ.sqf index f27e315081..15c11aa133 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Civ.sqf @@ -104,7 +104,7 @@ private _civUniforms = [ "U_C_Uniform_Scientist_02_formal_F", "U_C_Uniform_Scientist_02_F", "U_C_Uniform_Scientist_01_F", - "U_C_Poor_2", //this and below be Aegis and Atlas + "U_C_Poor_2", // This and below be Aegis "U_Jayholder", "U_C_Man_casual_7_F", "U_C_Man_casual_8_F", diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf index e7173cff20..fd4f6fd1ee 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf @@ -77,8 +77,8 @@ if ("rf" in A3A_enabledDLC) then { private _initialRebelEquipment = [ "hgun_Pistol_heavy_02_F","hgun_ACPC2_black_F", -"SMG_02_F","sgun_Mp153_classic_F", -"6Rnd_45ACP_Cylinder","9Rnd_45ACP_Mag","30Rnd_9x21_Mag_SMG_02","4Rnd_12Gauge_Pellets","4Rnd_12Gauge_Slug","MiniGrenade","SmokeShell", +"sgun_Mp153_classic_F", +"6Rnd_45ACP_Cylinder","9Rnd_45ACP_Mag","4Rnd_12Gauge_Pellets","4Rnd_12Gauge_Slug","MiniGrenade","SmokeShell", ["IEDUrbanSmall_Remote_Mag", 10], ["IEDLandSmall_Remote_Mag", 10], ["IEDUrbanBig_Remote_Mag", 3], ["IEDLandBig_Remote_Mag", 3], "B_FieldPack_oli","B_FieldPack_blk","B_FieldPack_ocamo","B_FieldPack_oicamo","B_FieldPack_oucamo","B_FieldPack_cbr","B_FieldPack_khk", "V_Chestrig_blk","V_Chestrig_rgr","V_Chestrig_khk","V_Chestrig_oli","V_ChestrigF_blk","V_ChestrigF_rgr","V_ChestrigF_khk","V_ChestrigF_oli", @@ -88,7 +88,7 @@ private _initialRebelEquipment = [ "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol"]; if ("expansion" in A3A_enabledDLC) then { - _initialRebelEquipment append [["launch_RPG7_F", 15], ["RPG7_F", 45], "SMG_05_F", "hgun_Pistol_01_F", "10Rnd_9x21_Mag"]; + _initialRebelEquipment append [["launch_RPG7_F", 15], ["RPG7_F", 45], "hgun_Pistol_01_F", "10Rnd_9x21_Mag"]; } else { _initialRebelEquipment append [["launch_RPG32_F", 15], ["RPG32_F", 30]]; }; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf index fd19a6a526..45343456c1 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf @@ -71,8 +71,8 @@ if ("rf" in A3A_enabledDLC) then { private _initialRebelEquipment = [ "hgun_Pistol_01_F","hgun_ACPC2_black_F", - "SMG_05_F","sgun_Mp153_classic_F", - "10Rnd_9x21_Mag","9Rnd_45ACP_Mag","30Rnd_9x21_Mag_SMG_02","4Rnd_12Gauge_Pellets","4Rnd_12Gauge_Slug","MiniGrenade","SmokeShell", + "sgun_Mp153_classic_F", + "10Rnd_9x21_Mag","9Rnd_45ACP_Mag","4Rnd_12Gauge_Pellets","4Rnd_12Gauge_Slug","MiniGrenade","SmokeShell", ["IEDUrbanSmall_Remote_Mag", 10], ["IEDLandSmall_Remote_Mag", 10], ["IEDUrbanBig_Remote_Mag", 3], ["IEDLandBig_Remote_Mag", 3], "B_FieldPack_oli","B_FieldPack_blk","B_FieldPack_ocamo","B_FieldPack_oicamo","B_FieldPack_oucamo","B_FieldPack_cbr","B_FieldPack_khk", "V_Chestrig_blk","V_Chestrig_rgr","V_Chestrig_khk","V_Chestrig_oli","V_ChestrigF_blk","V_ChestrigF_rgr","V_ChestrigF_khk","V_ChestrigF_oli",