From 674d8665b70680a9f4552120a9e101c0b4b65145 Mon Sep 17 00:00:00 2001 From: Tiny-DM Date: Tue, 26 Mar 2024 14:35:42 -0400 Subject: [PATCH 1/5] initial commit (SMALL BUGS) --- A3A/addons/config_fixes/RF/CfgVehicles.hpp | 204 ++++++++++++++++++ A3A/addons/config_fixes/RF/config.cpp | 25 +++ .../Templates/Vanilla/Vanilla_AI_AAF.sqf | 58 ++++- .../Vanilla/Vanilla_AI_CSAT_Apex.sqf | 48 +++++ .../Vanilla/Vanilla_AI_CSAT_Arid.sqf | 51 ++++- .../Vanilla/Vanilla_AI_CSAT_Enoch.sqf | 50 +++++ .../Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 49 ++++- .../Templates/Vanilla/Vanilla_AI_LDF.sqf | 54 ++++- .../Vanilla/Vanilla_AI_NATO_Apex.sqf | 57 ++++- .../Vanilla/Vanilla_AI_NATO_Arid.sqf | 57 ++++- .../Vanilla/Vanilla_AI_NATO_Temperate.sqf | 58 ++++- .../Vanilla/Vanilla_AI_NATO_Tropical.sqf | 58 ++++- .../Templates/Vanilla/Vanilla_Civ.sqf | 51 +++-- .../Templates/Vanilla/Vanilla_Reb_FIA.sqf | 29 ++- .../Templates/Vanilla/Vanilla_Reb_LFF.sqf | 25 ++- .../Templates/Vanilla/Vanilla_Reb_SDK.sqf | 29 ++- .../Vanilla_Reb_Vehicle_Attributes.sqf | 15 +- .../core/Templates/Templates/WS/WS_Civ.sqf | 51 +++-- .../Templates/Templates/WS/WS_Reb_TURA.sqf | 26 ++- .../WS/WS_Reb_Vehicle_Attributes.sqf | 2 +- .../core/functions/init/fn_initVarServer.sqf | 3 +- .../core/functions/init/fn_setupMonitor.sqf | 3 +- A3A/addons/logistics/CfgLogistics.hpp | 1 + A3A/addons/logistics/Nodes/RF.hpp | 51 +++++ 24 files changed, 1000 insertions(+), 55 deletions(-) create mode 100644 A3A/addons/config_fixes/RF/CfgVehicles.hpp create mode 100644 A3A/addons/config_fixes/RF/config.cpp create mode 100644 A3A/addons/logistics/Nodes/RF.hpp diff --git a/A3A/addons/config_fixes/RF/CfgVehicles.hpp b/A3A/addons/config_fixes/RF/CfgVehicles.hpp new file mode 100644 index 0000000000..99658ddaa8 --- /dev/null +++ b/A3A/addons/config_fixes/RF/CfgVehicles.hpp @@ -0,0 +1,204 @@ +//RF - CfgVehicles.hpp + +class CfgVehicles +{ + class C_IDAP_Pickup_fuel_rf; // Parent is Pickup_fuel_base_rf + class C_Pickup_rf; + class I_G_Pickup_mmg_rf; + class B_Pickup_comms_rf; + class B_Pickup_rf; + class Heli_light_03_base_F; + class B_Heli_light_03_unarmed_RF; + class Heli_EC_01_base_RF; + + class a3a_black_Pickup_rf : C_Pickup_rf + { + textureList[] = {}; + hiddenSelectionsTextures[] = {"\lxRF\vehicles_rf\pickup_01\Data\pickup_01_ext_black_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_adds_white_tank_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_ext2_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_AAT_olive_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_launcher_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_service_black_co.paa"}; + }; + class a3a_black_Pickup_mmg_rf : I_G_Pickup_mmg_rf + { + textureList[] = {}; + hiddenSelectionsTextures[] = {"\lxRF\vehicles_rf\pickup_01\Data\pickup_01_ext_black_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_adds_white_tank_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_ext2_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_AAT_olive_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_launcher_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_service_black_co.paa"}; + }; + class a3a_civ_Pickup_fuel_rf : C_IDAP_Pickup_fuel_rf + { + textureList[] = {"Red",1,"Tan",1,"White",1,"Blue",1,"Gray",1,"Black",1,"Brown",1,"Olive",1,"Orange",1,"Yellow",1}; + hiddenSelectionsTextures[] = {"lxrf\vehicles_rf\pickup_01\data\pickup_01_ext_white_co.paa","lxrf\vehicles_rf\pickup_01\data\pickup_01_adds_black_tank_co.paa","lxrf\vehicles_rf\pickup_01\data\pickup_01_ext2_co.paa","lxrf\vehicles_rf\pickup_01\data\pickup_01_aat_co.paa","lxrf\vehicles_rf\pickup_01\data\pickup_01_launcher_co.paa","lxrf\vehicles_rf\pickup_01\data\pickup_01_service_white_co.paa"}; + }; + class a3a_police_Pickup_comms_rf : B_Pickup_comms_rf + { + textureList[] = {}; + hiddenselectionstextures[] = {"\lxRF\vehicles_rf\pickup_01\Data\pickup_01_ext_gendarmerie_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_adds_gendarmerie_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_ext2_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_AAT_olive_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_Launcher_black_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_service_gendarmerie_co.paa"}; + }; + class a3a_police_Pickup_rf : B_Pickup_rf + { + textureList[] = {}; + hiddenselectionstextures[] = {"\lxRF\vehicles_rf\pickup_01\Data\pickup_01_ext_gendarmerie_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_adds_gendarmerie_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_ext2_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_AAT_olive_co.paa","\lxrf\vehicles_rf\pickup_01\data\pickup_01_Launcher_black_co.paa","\lxRF\vehicles_rf\pickup_01\Data\pickup_01_service_gendarmerie_co.paa"}; + }; + + class Heli_light_03_dynamicLoadout_base_F: Heli_light_03_base_F { + class Components; + }; + class B_Heli_light_03_dynamicLoadout_RF: Heli_light_03_dynamicLoadout_base_F { + class Components : Components { + class TransportPylonsComponent; + }; + }; + class a3a_Heli_light_03_dynamicLoadout_RF : B_Heli_light_03_dynamicLoadout_RF { // !!!! This is the Navy (Camo) paint by default + class Components : Components { + class TransportPylonsComponent : TransportPylonsComponent { + class Presets { + class Default { + attachment[] = {"PylonRack_19Rnd_missiles_gray_RF","PylonRack_19Rnd_missiles_gray_RF","PylonRack_19Rnd_missiles_gray_RF","PylonRack_19Rnd_missiles_gray_RF"}; + displayName = "Default"; + }; + class Empty { + attachment[] = {}; + displayName = "Empty"; + }; // this is why we cant have nice things + }; + class Pylons { + class PylonLeft1 { + attachment = "PylonRack_19Rnd_missiles_gray_RF"; + hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; + priority = 5; + turret[] = {0}; + UIposition[] = {"0.06 + 0.02",0.4}; + }; + class PylonLeft2 { + attachment = "PylonRack_19Rnd_missiles_gray_RF"; + hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; + priority = 4; + turret[] = {0}; + UIposition[] = {"0.08 + 0.02",0.35}; + }; + class PylonRight1 { + attachment = "PylonRack_19Rnd_missiles_gray_RF"; + hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; + priority = 5; + turret[] = {0}; + UIposition[] = {"0.57 + 0.04",0.35}; + }; + class PylonRight2 { + attachment = "PylonRack_19Rnd_missiles_gray_RF"; + hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; + priority = 4; + turret[] = {0}; + UIposition[] = {"0.59 + 0.04",0.4}; + }; + + }; + }; + }; + }; + class a3a_AAF_Heli_light_03_dynamicLoadout_RF : a3a_Heli_light_03_dynamicLoadout_RF { + textureList[] = {}; + hiddenSelectionsTextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_INDP_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_INDP_co.paa"}; + }; + class a3a_LDF_Heli_light_03_dynamicLoadout_RF : a3a_Heli_light_03_dynamicLoadout_RF { + textureList[] = {}; + hiddenSelectionsTextures[] = {"\A3\Air_F_Enoch\Heli_Light_03\data\Heli_Light_03_base_EAF_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_LDF_co.paa"}; + }; + class a3a_black_Heli_light_03_dynamicLoadout_RF : a3a_Heli_light_03_dynamicLoadout_RF { + textureList[] = {}; + hiddenSelectionsTextures[] = {"\lxRF\air_rf\Heli_Light_03\data\Heli_Light_03_base_black_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_black_co.paa"}; + }; + class a3a_AAF_Heli_light_03_unarmed_RF : B_Heli_light_03_unarmed_RF { + textureList[] = {}; + hiddenSelectionsTextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_INDP_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_INDP_co.paa"}; + }; + class a3a_black_Heli_light_03_unarmed_RF : B_Heli_light_03_unarmed_RF { + textureList[] = {}; + hiddenSelectionsTextures[] = {"\lxRF\air_rf\Heli_Light_03\data\Heli_Light_03_base_black_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_black_co.paa"}; + }; + class a3a_green_Heli_light_03_unarmed_RF : B_Heli_light_03_unarmed_RF { + textureList[] = {}; + hiddenselectionstextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_green_co.paa"}; + }; + + class Heli_EC_02_base_RF: Heli_EC_01_base_RF { + class Components; + }; + class a3a_Heli_EC_02_RF : Heli_EC_02_base_RF { + scope = 2 + faction = "IND_F"; + side = 2; + hiddenSelectionTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa","#(rgb,1024,1024,1)ui('lxRF_MFDMinimap','lxRF_MFDMinimap')","\lxRF\air_rf\heli_medium_ec\data\as332_adds_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"}; + class Components : Components { + class TransportPylonsComponent { + uiPicture = "\lxRF\air_rf\heli_medium_ec\data\UI\heli_medium_ec_02_3DEN_CA.paa"; + class Presets { + class AT { + attachment[] = {"PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel"}; + displayName = "AT"; + }; + class CAS { + attachment[] = {"PylonRack_19Rnd_Rocket_Skyfire","PylonMissile_1Rnd_Bomb_03_F","PylonMissile_1Rnd_Bomb_03_F","PylonRack_19Rnd_Rocket_Skyfire"}; + displayName = "CAS"; + }; + class Default { + attachment[] = {"PylonRack_19Rnd_missiles_olive_RF","PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel","PylonRack_19Rnd_missiles_olive_RF"}; + displayName = "Default"; + }; + class Empty { + attachment[] = {}; + displayName = "Empty"; + }; // this is why we cant have nice things + class HAT { + attachment[] = {"PylonRack_4Rnd_LG_scalpel","PylonRack_1Rnd_Missile_AGM_01_F","PylonRack_1Rnd_Missile_AGM_01_F","PylonRack_4Rnd_LG_scalpel"}; + displayName = "Heavy AT"; + }; + }; + class Pylons { + class PylonLeft1 { + attachment = "PylonRack_19Rnd_missiles_olive_RF"; + hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; + priority = 5; + turret[] = {0}; + UIposition[] = {0.06,0.4}; + }; + class PylonLeft2 { + attachment = "PylonRack_4Rnd_LG_scalpel"; + hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; + priority = 4; + turret[] = {0}; + UIposition[] = {0.08,0.35}; + }; + class PylonRight1 { + attachment = "PylonRack_19Rnd_missiles_olive_RF"; + hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; + priority = 5; + mirroredMissilePos = 1; + turret[] = {0}; + UIposition[] = {0.59,0.4}; + }; + class PylonRight2 { + attachment = "PylonRack_4Rnd_LG_scalpel"; + hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; + priority = 4; + mirroredMissilePos = 2; + turret[] = {0}; + UIposition[] = {0.57,0.35}; + }; + + }; + }; + }; + }; + class a3a_LDF_Heli_EC_02_RF : a3a_Heli_EC_02_RF { + factions = "IND_E_F"; + side = 2; + textureList[] = {}; + hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_03_ldf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa","#(rgb,1024,1024,1)ui('lxRF_MFDMinimap','lxRF_MFDMinimap')","\lxRF\air_rf\heli_medium_ec\data\as332_adds_03_ldf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_03_ldf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"}; + }; + class a3a_black_Heli_EC_02_RF : a3a_Heli_EC_02_RF { + factions = "CIV_F"; + side = 2; + textureList[] = {}; + hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_34_dark_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_light_co.paa","#(rgb,1024,1024,1)ui('lxRF_MFDMinimap','lxRF_MFDMinimap')","\lxRF\air_rf\heli_medium_ec\data\as332_adds_34_dark_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_34_dark_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_light_co.paa"}; + }; + + +}; + diff --git a/A3A/addons/config_fixes/RF/config.cpp b/A3A/addons/config_fixes/RF/config.cpp new file mode 100644 index 0000000000..4d0979c2b8 --- /dev/null +++ b/A3A/addons/config_fixes/RF/config.cpp @@ -0,0 +1,25 @@ +//RF - config.cpp + +#include "..\script_component.hpp" + +class CfgPatches +{ + class PATCHNAME(RF) + { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"A3_Data_F_AoW_Loadorder","RF_Vehicles"}; + author = AUTHOR; + authors[] = { AUTHORS }; + authorUrl = ""; + VERSION_CONFIG; + skipWhenMissingDependencies = 1; + }; +}; + +// Uncomment when needed +#include "CfgVehicles.hpp" +//#include "CfgMarkers.hpp" +//#include "CfgWeapons.hpp" diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf index e22824e550..4a2345a8c3 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -41,9 +41,9 @@ private _AA = ["I_LT_01_AA_F"]; ["vehiclesPlanesTransport", []] call _fnc_saveToTemplate; ["vehiclesHelisLight", ["I_Heli_light_03_unarmed_F"]] call _fnc_saveToTemplate; -["vehiclesHelisTransport", ["I_Heli_Transport_02_F"]] call _fnc_saveToTemplate; -["vehiclesHelisLightAttack", ["I_Heli_light_03_dynamicLoadout_F"]] call _fnc_saveToTemplate; -["vehiclesHelisAttack", ["B_Heli_Attack_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; +private _vehiclesHelisTransport = ["I_Heli_Transport_02_F"]; +private _vehiclesHelisLightAttack = ["I_Heli_light_03_dynamicLoadout_F"]; +private _vehiclesHelisAttack = ["B_Heli_Attack_01_dynamicLoadout_F"]; ["vehiclesArtillery", ["I_Truck_02_MRL_F", "B_MBT_01_arty_F"]] call _fnc_saveToTemplate; ["magazines", createHashMapFromArray [ @@ -94,7 +94,16 @@ if ("enoch" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _vehiclesHelisTransport append ["a3a_AAF_Heli_light_03_unarmed_RF", "I_Heli_EC_01A_military_RF"]; + _vehiclesHelisLightAttack append ["a3a_AAF_Heli_light_03_dynamicLoadout_RF"]; + _vehiclesHelisAttack = ["a3a_Heli_EC_02_RF"]; +}; +["vehiclesHelisTransport", _vehiclesHelisTransport] call _fnc_saveToTemplate; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; +["vehiclesHelisAttack", _vehiclesHelisAttack] call _fnc_saveToTemplate; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate; @@ -416,6 +425,49 @@ if ("mark" in A3A_enabledDLC) then { //Overwrites the ABR/EBR - not fitting for the AAF militia, others will still use it }; +if ("rf" in A3A_enabledDLC) then { + _sfLoadoutData set ["sidearms",[ + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] + ]]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append ["SMG_01_black_RF", "SMG_02_F", "SMG_03_black", "SMG_03C_black"]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ]]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetIA_sb_digital_RF", + "H_HelmetHeavy_Olive_RF", + "H_HelmetHeavy_Simple_Olive_RF", + "H_HelmetHeavy_VisorUp_Olive_RF"]; + (_militaryLoadoutData get "helmets") append ["H_HelmetIA_sb_digital_RF"]; + (_militiaLoadoutData get "helmets") append ["H_HelmetIA_sb_digital_RF"]; +}; + ///////////////////////////////// // Unit Type Definitions // diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf index d73832734c..513b90c6e2 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf @@ -89,6 +89,9 @@ if ("tanks" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; +}; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; ["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; @@ -423,6 +426,51 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_05_blk_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_02_F_hex"] ]; }; +if ("rf" in A3A_enabledDLC) then { + (_sfLoadoutData get "slRifles") append [ + ["arifle_ash12_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Arco_ghex_F",["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], [], ""], + ["arifle_ash12_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Arco_ghex_F",["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], [], ""] + ]; + (_sfLoadoutData get "rifles") append [["arifle_ash12_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Holosight_lush_F",["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], [], ""]]; + (_sfLoadoutData get "grenadeLaunchers") append [["arifle_ash12_GL_wood_RF", "suppressor_127x55_small_wood_RF", "acc_pointer_IR", "optic_Holosight_lush_F", ["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]]; + (_sfLoadoutData get "marksmanRifles") append [ + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_Arco_ghex_F",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetHeavy_GHex_RF", + "H_HelmetHeavy_Simple_GHex_RF", + "H_HelmetHeavy_VisorUp_GHex_RF" + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ]]; +}; ///////////////////////////////// // Unit Type Definitions // diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf index c5362ab1fd..e2137dcab7 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf @@ -93,6 +93,9 @@ if ("expansion" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; +}; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; @@ -419,7 +422,53 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_05_tan_f", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_02_F_hex"] ]; }; - +if ("rf" in A3A_enabledDLC) then { + (_sfLoadoutData get "slRifles") append [ + ["arifle_ash12_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Arco_blk_F",["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], [], ""], + ["arifle_ash12_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Arco_blk_F",["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], [], ""] + ]; + (_sfLoadoutData get "rifles") append [["arifle_ash12_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Holosight_blk_F",["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], [], ""]]; + (_sfLoadoutData get "grenadeLaunchers") append [["arifle_ash12_GL_blk_RF", "suppressor_127x55_small_RF", "acc_pointer_IR", "optic_Holosight_blk_F", ["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]]; + (_sfLoadoutData get "marksmanRifles") append [ + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_Arco_blk_F",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetHeavy_Hex_RF", + "H_HelmetHeavy_Simple_Hex_RF", + "H_HelmetHeavy_VisorUp_Hex_RF" + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ]]; + (_militaryLoadoutData get "helmets") append ["H_HelmetO_ocano_sb_hex_RF"]; + (_militiaLoadoutData get "helmets") append ["H_HelmetO_ocamo_sb_hex_RF"]; +}; ///////////////////////////////// // Unit Type Definitions // diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf index 27ec54506a..a89dfde7f9 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf @@ -94,6 +94,9 @@ if ("expansion" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; +}; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; ["vehiclesLightUnarmed", _LightUnarmed] call _fnc_saveToTemplate; @@ -433,6 +436,53 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_05_blk_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_02_F_blk"] ]; }; +if ("rf" in A3A_enabledDLC) then { + (_sfLoadoutData get "slRifles") append [ + ["arifle_ash12_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Arco_blk_F",["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], [], ""], + ["arifle_ash12_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Arco_blk_F",["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], [], ""] + ]; + (_sfLoadoutData get "rifles") append [["arifle_ash12_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Holosight_blk_F",["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], [], ""]]; + (_sfLoadoutData get "grenadeLaunchers") append [["arifle_ash12_GL_blk_RF", "suppressor_127x55_small_RF", "acc_pointer_IR", "optic_Holosight_blk_F", ["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]]; + (_sfLoadoutData get "marksmanRifles") append [ + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_Arco_blk_F",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetHeavy_Hex_RF", + "H_HelmetHeavy_Simple_Hex_RF", + "H_HelmetHeavy_VisorUp_Hex_RF" + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ]]; + (_militaryLoadoutData get "helmets") append ["H_HelmetO_ocano_sb_hex_RF"]; + (_militiaLoadoutData get "helmets") append ["H_HelmetO_ocamo_sb_hex_RF"]; +}; ///////////////////////////////// // Unit Type Definitions // diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf index a58d7b00f7..b55d42f327 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf @@ -95,6 +95,9 @@ if ("expansion" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; +}; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; @@ -429,7 +432,51 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_05_blk_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_02_F_blk"] ]; }; - +if ("rf" in A3A_enabledDLC) then { + (_sfLoadoutData get "slRifles") append [ + ["arifle_ash12_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Arco_ghex_F",["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], [], ""], + ["arifle_ash12_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Arco_ghex_F",["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], [], ""] + ]; + (_sfLoadoutData get "rifles") append [["arifle_ash12_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Holosight_lush_F",["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], [], ""]]; + (_sfLoadoutData get "grenadeLaunchers") append [["arifle_ash12_GL_wood_RF", "suppressor_127x55_small_wood_RF", "acc_pointer_IR", "optic_Holosight_lush_F", ["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]]; + (_sfLoadoutData get "marksmanRifles") append [ + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_Arco_ghex_F",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetHeavy_GHex_RF", + "H_HelmetHeavy_Simple_GHex_RF", + "H_HelmetHeavy_VisorUp_GHex_RF" + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ]]; +}; ///////////////////////////////// // Unit Type Definitions // diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf index 0b93976624..b514565cf8 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -42,8 +42,8 @@ private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesHelisLight", ["I_E_Heli_light_03_unarmed_F", "B_Heli_Light_01_F"]] call _fnc_saveToTemplate; private _HelisTransport = ["B_Heli_Transport_01_camo_F"]; -["vehiclesHelisLightAttack", ["I_E_Heli_light_03_dynamicLoadout_F", "B_Heli_Light_01_armed_F"]] call _fnc_saveToTemplate; -["vehiclesHelisAttack", ["B_Heli_Attack_01_F"]] call _fnc_saveToTemplate; +private _vehiclesHelisLightAttack = ["I_E_Heli_light_03_dynamicLoadout_F", "B_Heli_Light_01_armed_F"]; +private _vehiclesHelisAttack = ["B_Heli_Attack_01_F"]; ["vehiclesArtillery", ["B_T_MBT_01_arty_F", "I_E_Truck_02_MRL_F"]] call _fnc_saveToTemplate; ["magazines", createHashMapFromArray [ @@ -94,6 +94,14 @@ if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["I_E_Van_02_transport_MP_F"]; ["vehiclesMilitiaTrucks", ["I_E_Van_02_transport_F", "I_E_Van_02_vehicle_F"]] call _fnc_saveToTemplate; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _HelisTransport append ["I_E_Heli_light_03_unarmed_RF","I_E_Heli_EC_01A_military_RF"]; + _vehiclesHelisLightAttack append ["a3a_LDF_Heli_light_03_dynamicLoadout_RF"]; + _vehiclesHelisAttack = ["a3a_LDF_Heli_EC_02_RF"]; +}; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; +["vehiclesHelisAttack", _vehiclesHelisAttack] call _fnc_saveToTemplate; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; @@ -454,6 +462,48 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_06_olive_F", "", "", "optic_KHS_blk", ["10Rnd_Mk14_762x51_Mag"], [], ""]]; }; +if ("rf" in A3A_enabledDLC) then { + _sfLoadoutData set ["sidearms",[ + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] + ]]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append ["SMG_01_black_RF", "SMG_02_F", "SMG_03_black", "SMG_03C_black"]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ]]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_geo_RF", + "H_HelmetHeavy_Olive_RF", + "H_HelmetHeavy_Simple_Olive_RF", + "H_HelmetHeavy_VisorUp_Olive_RF"]; + (_militaryLoadoutData get "helmets") append ["H_HelmetB_plain_sb_geo_RF"]; +}; + ///////////////////////////////// // Unit Type Definitions // ///////////////////////////////// diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf index bf9d101cf3..d93fb35453 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf @@ -42,7 +42,7 @@ private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesHelisLight", ["B_Heli_Light_01_F"]] call _fnc_saveToTemplate; private _HelisTransport = ["B_Heli_Transport_01_camo_F","B_CTRG_Heli_Transport_01_tropic_F"]; -["vehiclesHelisLightAttack", ["B_Heli_Light_01_armed_F"]] call _fnc_saveToTemplate; +private _vehiclesHelisLightAttack = ["B_Heli_Light_01_armed_F"]; ["vehiclesHelisAttack", ["B_Heli_Attack_01_F"]] call _fnc_saveToTemplate; ["vehiclesArtillery", ["B_T_MBT_01_arty_F", "B_T_MBT_01_mlrs_F"]] call _fnc_saveToTemplate; @@ -93,6 +93,12 @@ if ("heli" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _HelisTransport append ["B_Heli_light_03_unarmed_RF","B_Heli_EC_03_RF"]; + _vehiclesHelisLightAttack append ["a3a_Heli_light_03_dynamicLoadout_RF","B_Heli_EC_04_military_RF"]; +}; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; ["vehiclesAPCs", _APCs] call _fnc_saveToTemplate; @@ -450,6 +456,55 @@ 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 set ["sidearms",[ + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] + ]]; + _militaryLoadoutData set ["sidearms", [ + ["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", "", [], [], ""], + ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "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", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Yorris", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "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"]; +}; ///////////////////////////////// // Unit Type Definitions // diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf index 74ad5697aa..4b481d921e 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf @@ -42,7 +42,7 @@ private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]; ["vehiclesHelisLight", ["B_Heli_Light_01_F"]] call _fnc_saveToTemplate; private _HelisTransport = ["B_Heli_Transport_01_F"]; -["vehiclesHelisLightAttack", ["B_Heli_Light_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; +private _vehiclesHelisLightAttack = ["B_Heli_Light_01_dynamicLoadout_F"]; ["vehiclesHelisAttack", ["B_Heli_Attack_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesArtillery", ["B_MBT_01_arty_F","B_MBT_01_mlrs_F"]] call _fnc_saveToTemplate; //this line determines artillery vehicles -- Example: ["vehiclesArtillery", ["B_MBT_01_arty_F"]] -- Array, can contain multiple assets @@ -99,6 +99,12 @@ if ("heli" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _HelisTransport append ["B_Heli_light_03_unarmed_RF","B_Heli_EC_03_RF"]; + _vehiclesHelisLightAttack append ["a3a_Heli_light_03_dynamicLoadout_RF","B_Heli_EC_04_military_RF"]; +}; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; ["vehiclesLightUnarmed", _LightUnarmed] call _fnc_saveToTemplate; @@ -447,6 +453,55 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_02_sniper_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_01_F_snd"]]; }; +if ("rf" in A3A_enabledDLC) then { + _sfLoadoutData set ["sidearms",[ + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] + ]]; + _militaryLoadoutData set ["sidearms", [ + ["hgun_Glock19_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_Tan_RF", "", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "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", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Yorris", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_Black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ]]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_mtp_RF", + "H_HelmetHeavy_Sand_RF", + "H_HelmetHeavy_Simple_Sand_RF", + "H_HelmetHeavy_VisorUp_Sand_RF"]; + (_militaryLoadoutData get "helmets") append ["H_HelmetB_plain_sb_mtp_RF"]; +}; ///////////////////////////////// // Unit Type Definitions // diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf index 39c1799c21..d9ff7b5dc3 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf @@ -42,7 +42,7 @@ private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesHelisLight", ["B_Heli_Light_01_F"]] call _fnc_saveToTemplate; private _HelisTransport = ["B_Heli_Transport_01_camo_F"]; -["vehiclesHelisLightAttack", ["B_Heli_Light_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; +private _vehiclesHelisLightAttack = ["B_Heli_Light_01_dynamicLoadout_F"]; ["vehiclesHelisAttack", ["B_Heli_Attack_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesArtillery", ["B_T_MBT_01_mlrs_F","B_T_MBT_01_arty_F"]] call _fnc_saveToTemplate; @@ -98,6 +98,12 @@ if ("heli" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _HelisTransport append ["B_Heli_light_03_unarmed_RF","B_Heli_EC_03_RF"]; + _vehiclesHelisLightAttack append ["a3a_Heli_light_03_dynamicLoadout_RF","B_Heli_EC_04_military_RF"]; +}; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; @@ -445,7 +451,55 @@ 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_LRPS", [], [], "bipod_01_F_blk"]]; }; - +if ("rf" in A3A_enabledDLC) then { + _sfLoadoutData set ["sidearms",[ + ["hgun_Glock19_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], + ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] + ]]; + _militaryLoadoutData set ["sidearms", [ + ["hgun_Glock19_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_RF", "", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_auto_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "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", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Yorris", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ]]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_mtp_RF", + "H_HelmetHeavy_Sand_RF", + "H_HelmetHeavy_Simple_Sand_RF", + "H_HelmetHeavy_VisorUp_Sand_RF"]; + (_militaryLoadoutData get "helmets") append ["H_HelmetB_plain_sb_mtp_RF"]; +}; ///////////////////////////////// diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf index 26fe2e2708..eaa0e15bf9 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf @@ -42,7 +42,7 @@ private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesHelisLight", ["B_Heli_Light_01_F"]] call _fnc_saveToTemplate; private _HelisTransport = ["B_Heli_Transport_01_camo_F"]; -["vehiclesHelisLightAttack", ["B_Heli_Light_01_armed_F"]] call _fnc_saveToTemplate; +private _vehiclesHelisLightAttack = ["B_Heli_Light_01_dynamicLoadout_F"]; ["vehiclesHelisAttack", ["B_Heli_Attack_01_F"]] call _fnc_saveToTemplate; ["vehiclesArtillery", ["B_T_MBT_01_arty_F", "B_T_MBT_01_mlrs_F"]] call _fnc_saveToTemplate; @@ -99,6 +99,12 @@ if ("heli" in A3A_enabledDLC) then { if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _HelisTransport append ["B_Heli_light_03_unarmed_RF","B_Heli_EC_03_RF"]; + _vehiclesHelisLightAttack append ["a3a_Heli_light_03_dynamicLoadout_RF","B_Heli_EC_04_military_RF"]; +}; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; @@ -445,7 +451,55 @@ 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 set ["sidearms",[ + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] + ]]; + _militaryLoadoutData set ["sidearms", [ + ["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", "", [], [], ""], + ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_ACPC2_F", "", "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", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Yorris", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], + ["SMG_02_F", "", "acc_flashlight", "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"]; +}; ///////////////////////////////// // Unit Type Definitions // ///////////////////////////////// diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf index 5564353046..4ba8653d95 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf @@ -6,7 +6,9 @@ // Vehicles // ////////////////////////// -["vehiclesCivCar", [ +//TODO: Vehicles, and preferably their spawn chances, need to be added/removed/adjusted depending on the loaded factions. Stopgap fix for RF now. + +private _vehiclesCivCar = [ "C_Quadbike_01_F", 0.3 ,"C_Hatchback_01_F", 2.0 ,"C_Hatchback_01_sport_F", 0.3 @@ -16,33 +18,45 @@ ,"C_Van_02_transport_F", 0.2 // minibus ,"C_Offroad_02_unarmed_F", 0.5 // Apex 4WD ,"C_Offroad_01_comms_F", 0.1 // Contact - ,"C_Offroad_01_covered_F", 0.1]] call _fnc_saveToTemplate; - -["vehiclesCivIndustrial", [ + ,"C_Offroad_01_covered_F", 0.1]; +private _vehiclesCivIndustrial = [ "C_Van_01_transport_F", 1.0 ,"C_Van_01_box_F", 0.8 ,"C_Truck_02_transport_F", 0.5 ,"C_Truck_02_covered_F", 0.5 - ,"C_Tractor_01_F", 0.3 ]] call _fnc_saveToTemplate; + ,"C_Tractor_01_F", 0.3]; -["vehiclesCivBoat", [ +private _vehiclesCivBoat = [ "C_Boat_Civil_01_rescue_F", 0.1 // motorboats ,"C_Boat_Civil_01_police_F", 0.1 ,"C_Boat_Civil_01_F", 1.0 ,"C_Rubberboat", 1.0 // rescue boat ,"C_Boat_Transport_02_F", 1.0 // RHIB - ,"C_Scooter_Transport_01_F", 0.5]] call _fnc_saveToTemplate; + ,"C_Scooter_Transport_01_F", 0.5]; -["vehiclesCivRepair", [ +private _vehiclesCivRepair = [ "C_Offroad_01_repair_F", 0.3 ,"C_Van_02_service_F", 0.3 // orange - ,"C_Truck_02_box_F", 0.1]] call _fnc_saveToTemplate; + ,"C_Truck_02_box_F", 0.1]; -["vehiclesCivMedical", ["C_Van_02_medevac_F", 0.1]] call _fnc_saveToTemplate; +private _vehiclesCivMedical = ["C_Van_02_medevac_F", 0.1]; -["vehiclesCivFuel", [ +private _vehiclesCivFuel = [ "C_Van_01_fuel_F", 0.2 - ,"C_Truck_02_fuel_F", 0.1]] call _fnc_saveToTemplate; + ,"C_Truck_02_fuel_F", 0.1]; + +if ("rf" in A3A_enabledDLC) then { + _vehiclesCivCar append ["C_Pickup_rf", 2.0, "C_Pickup_covered_rf", 0.1]; + _vehiclesCivRepair append ["C_Pickup_repair_rf", 0.3]; + _vehiclesCivFuel append ["a3a_civ_Pickup_fuel_rf", 0.1]; +}; + +["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; +["vehiclesCivIndustrial", _vehiclesCivIndustrial] call _fnc_saveToTemplate; +["vehiclesCivBoat", _vehiclesCivBoat] call _fnc_saveToTemplate; +["vehiclesCivRepair", _vehiclesCivRepair] call _fnc_saveToTemplate; +["vehiclesCivMedical", _vehiclesCivMedical] call _fnc_saveToTemplate; +["vehiclesCivFuel", _vehiclesCivFuel] call _fnc_saveToTemplate; ///////////////////// /// Identities /// @@ -143,6 +157,19 @@ if (allowDLCWS) then { ]; }; +if ("rf" in A3A_enabledDLC) then { + if (A3A_climate in ["temperate","arctic"]) then { + _dlcUniforms append [ + "U_C_PilotJacket_black_RF", + "U_C_PilotJacket_brown_RF", + "U_C_PilotJacket_lbrown_RF", + "U_C_PilotJacket_open_black_RF", + "U_C_PilotJacket_open_brown_RF", + "U_C_PilotJacket_open_lbrown_RF" + ]; + }; +}; + ["uniforms", _civUniforms + _pressUniforms + _workerUniforms + _dlcUniforms] call _fnc_saveToTemplate; private _civhats = [ diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf index 3319bbbf3f..6832d5403d 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf @@ -21,13 +21,13 @@ private _vehicleAA = []; private _vehiclesCivCar = ["C_Offroad_01_F", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", "C_SUV_01_F"]; ["vehiclesCivTruck", ["C_Van_01_transport_F", "C_Van_02_transport_F", "C_Van_02_vehicle_F"]] call _fnc_saveToTemplate; -["vehiclesCivHeli", ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]] call _fnc_saveToTemplate; +private _vehiclesCivHeli = ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]; ["vehiclesCivBoat", ["C_Boat_Civil_01_F", "C_Rubberboat"]] call _fnc_saveToTemplate; ["staticMGs", ["I_G_HMG_02_high_F", "I_G_HMG_02_F"]] call _fnc_saveToTemplate; ["staticAT", ["I_static_AT_F"]] call _fnc_saveToTemplate; private _staticAA = ["I_static_AA_F"]; -["staticMortars", ["I_G_Mortar_01_F"]] call _fnc_saveToTemplate; +private _staticMortars = ["I_G_Mortar_01_F"]; ["staticMortarMagHE", "8Rnd_82mm_Mo_shells"] call _fnc_saveToTemplate; ["staticMortarMagSmoke", "8Rnd_82mm_Mo_Smoke_white"] call _fnc_saveToTemplate; ["staticMortarMagFlare", "8Rnd_82mm_Mo_Flare_white"] call _fnc_saveToTemplate; @@ -46,7 +46,14 @@ if ("expansion" in A3A_enabledDLC) then { _vehiclesLightArmed append ["I_C_Offroad_02_LMG_F"]; _vehiclesAT append ["I_C_Offroad_02_AT_F"]; }; -["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; + +if ("rf" in A3A_enabledDLC) then { + _vehiclesCivCar append ["C_Pickup_rf","C_Pickup_covered_rf"]; + _vehiclesLightUnarmed append ["I_G_Pickup_rf"]; + _vehiclesLightArmed append ["I_G_Pickup_mmg_rf"]; + _staticMortars append ["I_G_CommandoMortar_RF"]; + _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_01_civ_RF","C_Heli_EC_04_rescue_RF"]; +}; if ("ws" in A3A_enabledDLC) then { _vehicleAA append ["I_Tura_Truck_02_aa_lxWS"]; @@ -56,6 +63,9 @@ if ("ws" in A3A_enabledDLC) then { _vehiclesAT insert [1, ["I_G_Offroad_01_armor_AT_lxWS"]]; }; +["vehiclesCivHeli", _vehiclesCivHeli] call _fnc_saveToTemplate; +["staticMortars", _staticMortars] call _fnc_saveToTemplate; +["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; ["vehiclesLightUnarmed", _vehiclesLightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _vehiclesLightArmed] call _fnc_saveToTemplate; ["vehiclesAT", _vehiclesAT] call _fnc_saveToTemplate; @@ -85,10 +95,17 @@ if ("expansion" in A3A_enabledDLC) then { } else { _initialRebelEquipment append [["launch_RPG32_F", 15], ["RPG32_F", 30]]; }; +if ("rf" in A3A_enabledDLC) then { + _initialRebelEquipment append ["srifle_h6_tan_rf","10Rnd_556x45_AP_Stanag_red_Tan_RF","10Rnd_556x45_AP_Stanag_Tan_RF","10Rnd_556x45_AP_Stanag_green_Tan_RF"]; + _initialRebelEquipment = _initialRebelEquipment - ["SMG_05_F","SMG_01_F","hgun_PDW2000_F","SMG_02_F","30Rnd_45ACP_Mag_SMG_01","30Rnd_9x21_Mag_SMG_02"]; +} else { + _initialRebelEquipment append ["SMG_01_F","hgun_PDW2000_F","SMG_02_F","30Rnd_45ACP_Mag_SMG_01","30Rnd_9x21_Mag_SMG_02"]; +}; if ("enoch" in A3A_enabledDLC) then { _initialRebelEquipment append ["sgun_HunterShotgun_01_F", "sgun_HunterShotgun_01_sawedoff_F", "2Rnd_12Gauge_Pellets", "2Rnd_12Gauge_Slug"]; }; + if (A3A_hasTFAR) then {_initialRebelEquipment append ["tf_microdagr","tf_anprc154"]}; if (A3A_hasTFAR && startWithLongRangeRadio) then {_initialRebelEquipment append ["tf_anprc155","tf_anprc155_coyote"]}; if (A3A_hasTFARBeta) then {_initialRebelEquipment append ["TFAR_microdagr","TFAR_anprc154"]}; @@ -140,6 +157,12 @@ if ("ws" in A3A_enabledDLC) then {_dlcUniforms append [ ]; }; +if ("rf" in A3A_enabledDLC) then {_dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" +]; +}; + ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; ["headgear", [ diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LFF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LFF.sqf index 136dc1c6f9..541bb3c0af 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LFF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LFF.sqf @@ -21,13 +21,13 @@ private _vehicleAA = []; private _vehiclesCivCar = ["C_Offroad_01_comms_F", "C_Offroad_01_covered_F","C_Offroad_01_F", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", "C_SUV_01_F"]; ["vehiclesCivTruck", ["C_Van_01_transport_F", "C_Van_02_transport_F", "C_Van_02_vehicle_F"]] call _fnc_saveToTemplate; -["vehiclesCivHeli", ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]] call _fnc_saveToTemplate; +private _vehiclesCivHeli = ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]; ["vehiclesCivBoat", ["C_Boat_Civil_01_F", "C_Rubberboat"]] call _fnc_saveToTemplate; ["staticMGs", ["I_G_HMG_02_high_F", "I_G_HMG_02_F"]] call _fnc_saveToTemplate; ["staticAT", ["I_static_AT_F"]] call _fnc_saveToTemplate; private _staticAA = ["I_static_AA_F"]; -["staticMortars", ["I_G_Mortar_01_F"]] call _fnc_saveToTemplate; +private _staticMortars = ["I_G_Mortar_01_F"]; ["staticMortarMagHE", "8Rnd_82mm_Mo_shells"] call _fnc_saveToTemplate; ["staticMortarMagSmoke", "8Rnd_82mm_Mo_Smoke_white"] call _fnc_saveToTemplate; ["staticMortarMagFlare", "8Rnd_82mm_Mo_Flare_white"] call _fnc_saveToTemplate; @@ -46,6 +46,15 @@ if ("expansion" in A3A_enabledDLC) then { _vehiclesLightArmed append ["a3a_Offroad_02_LMG_black_F"]; _vehiclesAT append ["a3a_Offroad_02_black_AT_F"]; }; + +if ("rf" in A3A_enabledDLC) then { + _vehiclesCivCar append ["C_Pickup_rf","C_Pickup_covered_rf"]; + _vehiclesLightUnarmed append ["a3a_black_Pickup_rf"]; + _vehiclesLightArmed append ["a3a_black_Pickup_mmg_rf"]; + _staticMortars append ["I_G_CommandoMortar_RF"]; + _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_01_civ_RF","C_Heli_EC_04_rescue_RF"]; +}; + ["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; if ("ws" in A3A_enabledDLC) then { @@ -56,6 +65,8 @@ if ("ws" in A3A_enabledDLC) then { _vehiclesAT insert [1, ["a3a_ION_Offroad_armor_at"]]; }; +["vehiclesCivHeli", _vehiclesCivHeli] call _fnc_saveToTemplate; +["staticMortars",_staticMortars] call _fnc_saveToTemplate; ["vehiclesLightUnarmed", _vehiclesLightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _vehiclesLightArmed] call _fnc_saveToTemplate; ["vehiclesAT", _vehiclesAT] call _fnc_saveToTemplate; @@ -86,6 +97,10 @@ if ("expansion" in A3A_enabledDLC) then { _initialRebelEquipment append [["launch_RPG32_green_F", 15], ["RPG32_F", 30]]; }; +if ("rf" in A3A_enabledDLC) then { + _initialRebelEquipment append ["srifle_h6_blk_rf","10Rnd_556x45_AP_Stanag_red_RF","10Rnd_556x45_AP_Stanag_RF","10Rnd_556x45_AP_Stanag_green_RF"]; +}; + if (A3A_hasTFAR) then {_initialRebelEquipment append ["tf_microdagr","tf_anprc154"]}; if (A3A_hasTFAR && startWithLongRangeRadio) then {_initialRebelEquipment append ["tf_anprc155","tf_anprc155_coyote"]}; if (A3A_hasTFARBeta) then {_initialRebelEquipment append ["TFAR_microdagr","TFAR_anprc154"]}; @@ -140,6 +155,12 @@ if ("ws" in A3A_enabledDLC) then {_dlcUniforms append [ ]; }; +if ("rf" in A3A_enabledDLC) then {_dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" +]; +}; + ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; ["headgear", [ diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf index 4777774cf4..b65e7c7abf 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf @@ -19,15 +19,15 @@ private _vehicleAA = []; ["vehiclesPlane", ["I_C_Plane_Civil_01_F"]] call _fnc_saveToTemplate; -["vehiclesCivCar", ["C_Offroad_01_F", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", "C_Offroad_02_unarmed_F", "C_SUV_01_F"]] call _fnc_saveToTemplate; +private _vehiclesCivCar = ["C_Offroad_01_F", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", "C_Offroad_02_unarmed_F", "C_SUV_01_F"]; ["vehiclesCivTruck", ["C_Van_01_transport_F", "C_Van_02_transport_F", "C_Van_02_vehicle_F"]] call _fnc_saveToTemplate; -["vehiclesCivHeli", ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]] call _fnc_saveToTemplate; +private _vehiclesCivHeli = ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]; ["vehiclesCivBoat", ["C_Boat_Civil_01_F", "C_Rubberboat"]] call _fnc_saveToTemplate; ["staticMGs", ["I_G_HMG_02_high_F", "I_G_HMG_02_F"]] call _fnc_saveToTemplate; ["staticAT", ["I_static_AT_F"]] call _fnc_saveToTemplate; private _staticAA = ["I_static_AA_F"]; -["staticMortars", ["I_G_Mortar_01_F"]] call _fnc_saveToTemplate; +private _staticMortars = ["I_G_Mortar_01_F"]; ["staticMortarMagHE", "8Rnd_82mm_Mo_shells"] call _fnc_saveToTemplate; ["staticMortarMagSmoke", "8Rnd_82mm_Mo_Smoke_white"] call _fnc_saveToTemplate; ["staticMortarMagFlare", "8Rnd_82mm_Mo_Flare_white"] call _fnc_saveToTemplate; @@ -47,6 +47,17 @@ if ("ws" in A3A_enabledDLC) then { _vehiclesAT insert [1, ["I_G_Offroad_01_armor_AT_lxWS"]]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesCivCar append ["C_Pickup_rf","C_Pickup_covered_rf"]; + _vehiclesLightUnarmed append ["I_C_Pickup_rf"]; + _vehiclesLightArmed append ["I_C_Pickup_mmg_rf"]; + _staticMortars append ["I_G_CommandoMortar_RF"]; + _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_01_civ_RF","C_Heli_EC_04_rescue_RF"]; +}; + +["vehiclesCivHeli", _vehiclesCivHeli] call _fnc_saveToTemplate; +["staticMortars", _staticMortars] call _fnc_saveToTemplate; +["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; ["vehiclesLightUnarmed", _vehiclesLightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _vehiclesLightArmed] call _fnc_saveToTemplate; ["vehiclesAT", _vehiclesAT] call _fnc_saveToTemplate; @@ -76,6 +87,12 @@ _initialRebelEquipment append [["launch_RPG7_F", 15], ["RPG7_F", 45]]; if ("enoch" in A3A_enabledDLC) then { _initialRebelEquipment append ["sgun_HunterShotgun_01_F", "sgun_HunterShotgun_01_sawedoff_F", "2Rnd_12Gauge_Pellets", "2Rnd_12Gauge_Slug"]; }; +if ("rf" in A3A_enabledDLC) then { + _initialRebelEquipment append ["srifle_h6_oli_rf","10Rnd_556x45_AP_Stanag_red_khk_RF","10Rnd_556x45_AP_Stanag_khk_RF","10Rnd_556x45_AP_Stanag_green_khk_RF"]; + _initialRebelEquipment = _initialRebelEquipment - ["SMG_05_F","hgun_PDW2000_F","30Rnd_9x21_Mag_SMG_02"]; +} else { + _initialRebelEquipment append ["SMG_05_F","hgun_PDW2000_F","30Rnd_9x21_Mag_SMG_02"]; +}; if (A3A_hasTFAR) then {_initialRebelEquipment append ["tf_microdagr","tf_anprc154"]}; if (A3A_hasTFAR && startWithLongRangeRadio) then {_initialRebelEquipment append ["tf_anprc155","tf_anprc155_coyote"]}; @@ -124,6 +141,12 @@ if ("ws" in A3A_enabledDLC) then {_dlcUniforms append [ ]; }; +if ("rf" in A3A_enabledDLC) then {_dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" +]; +}; + ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; ["headgear", [ diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf index 8542273bce..9e4d3066c5 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf @@ -2,7 +2,7 @@ ["I_C_Offroad_02_LMG_F", ["rebCost", 500]], ["I_C_Offroad_02_unarmed_F", ["rebCost", 150]], //Slow, 4 seats only - ["a3a_C_Heli_Transport_02_F", ["rebCost", 6500]] + ["a3a_C_Heli_Transport_02_F", ["rebCost", 8000]] ]] call _fnc_saveToTemplate; @@ -16,4 +16,15 @@ if (isClass (configFile >> "CfgPatches" >> "Vehicles_F_lxWS")) then { ["a3a_ION_Offroad_armor_armed", ["rebCost", 900], ["threat", 60]], ["a3a_ION_Offroad_armor_at", ["rebCost", 900], ["threat", 60]] ]; -}; \ No newline at end of file +}; + +//Reaction Forces Vehicles +if (isClass (configFile >> "CfgPatches" >> "RF_Vehicles")) then { + (["attributesVehicles"] call _fnc_getFromTemplate) append [ + ["C_Heli_EC_01A_civ_RF", ["rebCost", 8000]], + ["C_Heli_EC_01_civ_RF", ["rebCost", 8000]], + ["C_Heli_EC_04_rescue_RF", ["rebCost", 8000]], + ["C_Pickup_rf", ["rebCost, 250"]], + ["C_Pickup_covered_rf", ["rebCost, 250"]] + ]; +}; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf index f7d2155f64..3d4834cf26 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf @@ -6,7 +6,7 @@ // Vehicles // ////////////////////////// -["vehiclesCivCar", [ +private _vehiclesCivCar = [ "C_Quadbike_01_F", 0.15 ,"C_Hatchback_01_F", 1.0 ,"C_Hatchback_01_sport_F", 0.15 @@ -17,10 +17,9 @@ ,"C_Van_02_transport_F", 0.2 // minibus ,"C_Offroad_02_unarmed_F", 1.5 // Apex 4WD ,"C_Offroad_01_comms_F", 0.3 // Contact - ,"C_Offroad_01_covered_F", 0.3 - ]] call _fnc_saveToTemplate; + ,"C_Offroad_01_covered_F", 0.3]; -["vehiclesCivIndustrial", [ +private _vehiclesCivIndustrial = [ "C_Van_01_transport_F", 1.0 ,"C_Van_01_box_F", 0.8 ,"C_Truck_02_transport_F", 0.5 @@ -28,27 +27,39 @@ ,"C_Tractor_01_F", 0.3 ,"C_Truck_02_racing_lxWS", 0.2 ,"C_Truck_02_flatbed_lxWS", 0.5 - ,"C_Truck_02_cargo_lxWS", 0.5 - ]] call _fnc_saveToTemplate; + ,"C_Truck_02_cargo_lxWS", 0.5]; -["vehiclesCivBoat", [ +private _vehiclesCivBoat = [ "C_Boat_Civil_01_rescue_F", 0.1 // motorboats ,"C_Boat_Civil_01_police_F", 0.1 ,"C_Boat_Civil_01_F", 1.0 ,"C_Rubberboat", 1.0 // rescue boat ,"C_Boat_Transport_02_F", 1.0 // RHIB - ,"C_Scooter_Transport_01_F", 0.5]] call _fnc_saveToTemplate; + ,"C_Scooter_Transport_01_F", 0.5]; -["vehiclesCivRepair", [ +private _vehiclesCivRepair = [ "C_Offroad_01_repair_F", 0.3 ,"C_Van_02_service_F", 0.3 // orange - ,"C_Truck_02_box_F", 0.1]] call _fnc_saveToTemplate; + ,"C_Truck_02_box_F", 0.1]; -["vehiclesCivMedical", ["C_Van_02_medevac_F", 0.1]] call _fnc_saveToTemplate; +private _vehiclesCivMedical = ["C_Van_02_medevac_F", 0.1]; -["vehiclesCivFuel", [ +private _vehiclesCivFuel = [ "C_Van_01_fuel_F", 0.2 - ,"C_Truck_02_fuel_F", 0.1]] call _fnc_saveToTemplate; + ,"C_Truck_02_fuel_F", 0.1]; + +if ("rf" in A3A_enabledDLC) then { + _vehiclesCivCar append ["C_Pickup_rf", 1.25, "C_Pickup_covered_rf", 0.2]; + _vehiclesCivRepair append ["C_Pickup_repair_rf", 0.2]; + _vehiclesCivFuel append ["a3a_civ_Pickup_fuel_rf", 0.1]; +}; + +["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; +["vehiclesCivIndustrial", _vehiclesCivIndustrial] call _fnc_saveToTemplate; +["vehiclesCivBoat", _vehiclesCivBoat] call _fnc_saveToTemplate; +["vehiclesCivRepair", _vehiclesCivRepair] call _fnc_saveToTemplate; +["vehiclesCivMedical", _vehiclesCivMedical] call _fnc_saveToTemplate; +["vehiclesCivFuel", _vehiclesCivFuel] call _fnc_saveToTemplate; ///////////////////// /// Identities /// @@ -102,6 +113,20 @@ if (allowDLCOrange) then { "U_C_Mechanic_01_F" ]; }; + +if ("rf" in A3A_enabledDLC) then { + if (A3A_climate in ["temperate","arctic"]) then { + _dlcUniforms append [ + "U_C_PilotJacket_black_RF", + "U_C_PilotJacket_brown_RF", + "U_C_PilotJacket_lbrown_RF", + "U_C_PilotJacket_open_black_RF", + "U_C_PilotJacket_open_brown_RF", + "U_C_PilotJacket_open_lbrown_RF" + ]; + }; +}; + _workerUniforms append [ "U_C_ConstructionCoverall_Black_F", "U_C_ConstructionCoverall_Blue_F", diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf index d40a8861f4..04002ae87d 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf @@ -21,13 +21,13 @@ private _vehiclesAT = ["O_SFIA_Offroad_AT_lxWS","O_Tura_Offroad_armor_AT_lxWS"]; private _vehiclesCivCar = ["C_Offroad_lxWS", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", "C_SUV_01_F", "C_Offroad_01_F"]; ["vehiclesCivTruck", ["C_Van_01_transport_F", "C_Van_02_transport_F", "C_Van_02_vehicle_F","C_Truck_02_transport_F","C_Truck_02_covered_F","C_Truck_02_flatbed_lxWS","C_Truck_02_cargo_lxWS"]] call _fnc_saveToTemplate; -["vehiclesCivHeli", ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]] call _fnc_saveToTemplate; +private _vehiclesCivHeli = ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]; ["vehiclesCivBoat", ["C_Boat_Civil_01_F", "C_Rubberboat"]] call _fnc_saveToTemplate; ["staticMGs", ["I_G_HMG_02_high_F", "I_G_HMG_02_F"]] call _fnc_saveToTemplate; ["staticAT", ["I_static_AT_F"]] call _fnc_saveToTemplate; ["staticAA", ["I_Tura_ZU23_lxWS"]] call _fnc_saveToTemplate; -["staticMortars", ["I_G_Mortar_01_F"]] call _fnc_saveToTemplate; +private _staticMortars = ["I_G_Mortar_01_F"]; ["staticMortarMagHE", "8Rnd_82mm_Mo_shells"] call _fnc_saveToTemplate; ["staticMortarMagSmoke", "8Rnd_82mm_Mo_Smoke_white"] call _fnc_saveToTemplate; ["staticMortarMagFlare", "8Rnd_82mm_Mo_Flare_white"] call _fnc_saveToTemplate; @@ -44,6 +44,16 @@ if ("expansion" in A3A_enabledDLC) then { _vehiclesLightArmed append ["I_C_Offroad_02_LMG_F"]; _vehiclesAT append ["I_C_Offroad_02_AT_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _vehiclesCivCar append ["C_Pickup_rf"]; + _vehiclesLightUnarmed append ["I_Tura_Pickup_01_RF"]; + _vehiclesLightArmed append ["I_Tura_Pickup_01_mmg_rf"]; + _staticMortars append ["I_G_CommandoMortar_RF"]; + _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_01_civ_RF","C_Heli_EC_04_rescue_RF"]; +}; + +["vehiclesCivHeli", _vehiclesCivHeli] call _fnc_saveToTemplate; +["staticMortars", _staticMortars] call _fnc_saveToTemplate; ["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; ["vehiclesLightUnarmed", _vehiclesLightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _vehiclesLightArmed] call _fnc_saveToTemplate; @@ -72,6 +82,12 @@ if (allowDLCExpansion) then { } else { _initialRebelEquipment append [["launch_RPG32_F", 15], ["RPG32_F", 30]]; }; +if ("rf" in A3A_enabledDLC) then { + _initialRebelEquipment append ["srifle_h6_tan_rf","10Rnd_556x45_AP_Stanag_red_Tan_RF","10Rnd_556x45_AP_Stanag_Tan_RF","10Rnd_556x45_AP_Stanag_green_Tan_RF"]; + _initialRebelEquipment = _initialRebelEquipment - ["hgun_PDW2000_F","SMG_02_F","30Rnd_9x21_Mag_SMG_02","SMG_05_F"]; +} else { + _initialRebelEquipment append ["hgun_PDW2000_F","SMG_02_F","30Rnd_9x21_Mag_SMG_02"]; +}; if ("enoch" in A3A_enabledDLC) then { _initialRebelEquipment append ["sgun_HunterShotgun_01_F", "sgun_HunterShotgun_01_sawedoff_F", "2Rnd_12Gauge_Pellets", "2Rnd_12Gauge_Slug"]; @@ -130,6 +146,12 @@ if (allowDLCExpansion) then {_dlcUniforms append [ ]; }; +if ("rf" in A3A_enabledDLC) then {_dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" +]; +}; + ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; ["headgear", [ diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf index efb30b367c..661bedef12 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf @@ -2,4 +2,4 @@ ["O_Tura_Offroad_armor_lxWS", ["rebCost", 300]], ["O_Tura_Offroad_armor_armed_lxWS", ["rebCost", 800]], ["O_Tura_Offroad_armor_AT_lxWS", ["rebCost", 800]] -]; \ No newline at end of file +]; diff --git a/A3A/addons/core/functions/init/fn_initVarServer.sqf b/A3A/addons/core/functions/init/fn_initVarServer.sqf index 4fab68d84b..d1e8a43477 100644 --- a/A3A/addons/core/functions/init/fn_initVarServer.sqf +++ b/A3A/addons/core/functions/init/fn_initVarServer.sqf @@ -262,8 +262,7 @@ Info("Setting up faction and DLC equipment flags"); // Set enabled & disabled DLC/CDLC arrays for faction/equipment modification private _loadedDLC = getLoadedModsInfo select { - (_x#3 or {_x#0 isEqualTo "Arma 3 Creator DLC: Western Sahara"}) - and {!(_x#1 in ["A3","curator","argo","tacops"])} + (_x#3) and {!(_x#1 in ["A3","curator","argo","tacops"])} } apply {tolower (_x#1)}; A3A_enabledDLC = (_saveData get "DLC") apply {tolower _x}; // should be pre-checked against _loadedDLC { diff --git a/A3A/addons/core/functions/init/fn_setupMonitor.sqf b/A3A/addons/core/functions/init/fn_setupMonitor.sqf index ce7ed31b79..e3cca0e40b 100644 --- a/A3A/addons/core/functions/init/fn_setupMonitor.sqf +++ b/A3A/addons/core/functions/init/fn_setupMonitor.sqf @@ -16,8 +16,7 @@ private _addonVics = "true" configClasses (configFile/"A3A"/"AddonVics"); // Ignore DLC without equipment and vehicles // Need the true names from here, so pass it all in private _loadedDLC = getLoadedModsInfo select { - (_x#3 or {_x#0 isEqualTo "Arma 3 Creator DLC: Western Sahara"}) - and {!(_x#1 in ["A3","curator","argo","tacops"])} + (_x#3) and {!(_x#1 in ["A3","curator","argo","tacops"])} }; diff --git a/A3A/addons/logistics/CfgLogistics.hpp b/A3A/addons/logistics/CfgLogistics.hpp index 8845e94a0c..19a1f2bc21 100644 --- a/A3A/addons/logistics/CfgLogistics.hpp +++ b/A3A/addons/logistics/CfgLogistics.hpp @@ -12,6 +12,7 @@ class DOUBLES(ADDON,Nodes) #include "Nodes\D3S.hpp" #include "Nodes\GM.hpp" #include "Nodes\RDS.hpp" + #include "Nodes\RF.hpp" #include "Nodes\RHS.hpp" #include "Nodes\RNT.hpp" #include "Nodes\SPE.hpp" diff --git a/A3A/addons/logistics/Nodes/RF.hpp b/A3A/addons/logistics/Nodes/RF.hpp new file mode 100644 index 0000000000..eb4cc58916 --- /dev/null +++ b/A3A/addons/logistics/Nodes/RF.hpp @@ -0,0 +1,51 @@ +// RF.hpp - Vehicle Logistic Nodes + +//Default open pickup +class lxRF_vehicles_rf_pickup_01_pickup_01_unarmed_rf_p3d : TRIPLES(ADDON,Nodes,Base) +{ + class Nodes + { + class Node1 + { + offset[] = {0,-1.5,-1}; + seats[] = {5,6}; + }; + class Node2 + { + offset[] = {0,-2.3,-1}; + seats[] = {3,4}; + }; + }; +}; +class lxRF_vehicles_rf_pickup_01_pickup_01_mmg_rf_p3d : TRIPLES(ADDON,Nodes,Base) +{ + class Nodes + { + class Node1 + { + offset[] = {0,-1.5,-1.1}; + seats[] = {5,6}; + }; + class Node2 + { + offset[] = {0,-2.3,-1.1}; + seats[] = {3,4}; + }; + }; +}; +class lxRF_vehicles_rf_pickup_01_pickup_01_service_rf_p3d : TRIPLES(ADDON,Nodes,Base) +{ + class Nodes + { + class Node1 + { + offset[] = {0,-1.5,-1}; + seats[] = {5,6}; + }; + class Node2 + { + offset[] = {0,-2.3,-1}; + seats[] = {3,4}; + }; + }; +}; \ No newline at end of file From 81a13ea5db40f3e786e6f848928f67a06c440566 Mon Sep 17 00:00:00 2001 From: Tiny-DM Date: Wed, 27 Mar 2024 13:45:15 -0400 Subject: [PATCH 2/5] changes from Ante (2024.3.27) --- A3A/addons/config_fixes/RF/CfgVehicles.hpp | 14 +--- .../Templates/Vanilla/Vanilla_AI_AAF.sqf | 38 ++++------- .../Vanilla/Vanilla_AI_CSAT_Apex.sqf | 33 ++++------ .../Vanilla/Vanilla_AI_CSAT_Arid.sqf | 33 ++++------ .../Vanilla/Vanilla_AI_CSAT_Enoch.sqf | 33 ++++------ .../Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 33 ++++------ .../Templates/Vanilla/Vanilla_AI_LDF.sqf | 40 +++++------- .../Vanilla/Vanilla_AI_NATO_Apex.sqf | 28 ++++---- .../Vanilla/Vanilla_AI_NATO_Arid.sqf | 30 ++++----- .../Vanilla/Vanilla_AI_NATO_Temperate.sqf | 28 ++++---- .../Vanilla/Vanilla_AI_NATO_Tropical.sqf | 28 ++++---- .../Templates/Vanilla/Vanilla_Reb_FIA.sqf | 64 ++++++++++--------- .../Templates/Vanilla/Vanilla_Reb_LFF.sqf | 51 ++++++++------- .../Templates/Vanilla/Vanilla_Reb_SDK.sqf | 37 +++++------ .../Vanilla_Reb_Vehicle_Attributes.sqf | 4 +- .../Templates/Templates/WS/WS_Reb_TURA.sqf | 47 +++++++------- .../WS/WS_Reb_Vehicle_Attributes.sqf | 11 ++++ A3A/addons/logistics/Nodes/RF.hpp | 6 +- 18 files changed, 243 insertions(+), 315 deletions(-) diff --git a/A3A/addons/config_fixes/RF/CfgVehicles.hpp b/A3A/addons/config_fixes/RF/CfgVehicles.hpp index 99658ddaa8..9abd484cd5 100644 --- a/A3A/addons/config_fixes/RF/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/RF/CfgVehicles.hpp @@ -56,7 +56,7 @@ class CfgVehicles class Empty { attachment[] = {}; displayName = "Empty"; - }; // this is why we cant have nice things + }; }; class Pylons { class PylonLeft1 { @@ -121,7 +121,7 @@ class CfgVehicles class Components; }; class a3a_Heli_EC_02_RF : Heli_EC_02_base_RF { - scope = 2 + scope = 2; faction = "IND_F"; side = 2; hiddenSelectionTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa","#(rgb,1024,1024,1)ui('lxRF_MFDMinimap','lxRF_MFDMinimap')","\lxRF\air_rf\heli_medium_ec\data\as332_adds_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"}; @@ -133,10 +133,6 @@ class CfgVehicles attachment[] = {"PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel"}; displayName = "AT"; }; - class CAS { - attachment[] = {"PylonRack_19Rnd_Rocket_Skyfire","PylonMissile_1Rnd_Bomb_03_F","PylonMissile_1Rnd_Bomb_03_F","PylonRack_19Rnd_Rocket_Skyfire"}; - displayName = "CAS"; - }; class Default { attachment[] = {"PylonRack_19Rnd_missiles_olive_RF","PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel","PylonRack_19Rnd_missiles_olive_RF"}; displayName = "Default"; @@ -144,11 +140,7 @@ class CfgVehicles class Empty { attachment[] = {}; displayName = "Empty"; - }; // this is why we cant have nice things - class HAT { - attachment[] = {"PylonRack_4Rnd_LG_scalpel","PylonRack_1Rnd_Missile_AGM_01_F","PylonRack_1Rnd_Missile_AGM_01_F","PylonRack_4Rnd_LG_scalpel"}; - displayName = "Heavy AT"; - }; + }; }; class Pylons { class PylonLeft1 { diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf index 4a2345a8c3..f966e2584b 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -426,39 +426,27 @@ if ("mark" in A3A_enabledDLC) then { }; if ("rf" in A3A_enabledDLC) then { - _sfLoadoutData set ["sidearms",[ - ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] - ]]; + (_sfLoadoutData get "sidearms") append [ + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""] + ]; (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; (_sfLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""] ]; (_militaryLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append ["SMG_01_black_RF", "SMG_02_F", "SMG_03_black", "SMG_03C_black"]; - _policeLoadoutData set ["SMGs", [ + (_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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; (_sfLoadoutData get "helmets") append [ "H_HelmetIA_sb_digital_RF", "H_HelmetHeavy_Olive_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf index 513b90c6e2..d46b6a9102 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf @@ -434,9 +434,9 @@ if ("rf" in A3A_enabledDLC) then { (_sfLoadoutData get "rifles") append [["arifle_ash12_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Holosight_lush_F",["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], [], ""]]; (_sfLoadoutData get "grenadeLaunchers") append [["arifle_ash12_GL_wood_RF", "suppressor_127x55_small_wood_RF", "acc_pointer_IR", "optic_Holosight_lush_F", ["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]]; (_sfLoadoutData get "marksmanRifles") append [ - ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_Arco_ghex_F",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], - ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], - ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"] + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Arco_ghex_F",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"] ]; (_sfLoadoutData get "helmets") append [ "H_HelmetHeavy_GHex_RF", @@ -446,30 +446,19 @@ if ("rf" in A3A_enabledDLC) then { (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; (_sfLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""] ]; (_militaryLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; - _policeLoadoutData set ["SMGs", [ + ["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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; }; ///////////////////////////////// diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf index e2137dcab7..beb1ee2e5b 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf @@ -430,9 +430,9 @@ if ("rf" in A3A_enabledDLC) then { (_sfLoadoutData get "rifles") append [["arifle_ash12_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Holosight_blk_F",["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], [], ""]]; (_sfLoadoutData get "grenadeLaunchers") append [["arifle_ash12_GL_blk_RF", "suppressor_127x55_small_RF", "acc_pointer_IR", "optic_Holosight_blk_F", ["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]]; (_sfLoadoutData get "marksmanRifles") append [ - ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_Arco_blk_F",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], - ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], - ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"] + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Arco_blk_F",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"] ]; (_sfLoadoutData get "helmets") append [ "H_HelmetHeavy_Hex_RF", @@ -442,30 +442,19 @@ if ("rf" in A3A_enabledDLC) then { (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; (_sfLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""] ]; (_militaryLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; - _policeLoadoutData set ["SMGs", [ + ["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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; (_militaryLoadoutData get "helmets") append ["H_HelmetO_ocano_sb_hex_RF"]; (_militiaLoadoutData get "helmets") append ["H_HelmetO_ocamo_sb_hex_RF"]; }; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf index a89dfde7f9..ae5d38d16a 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf @@ -444,9 +444,9 @@ if ("rf" in A3A_enabledDLC) then { (_sfLoadoutData get "rifles") append [["arifle_ash12_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Holosight_blk_F",["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], [], ""]]; (_sfLoadoutData get "grenadeLaunchers") append [["arifle_ash12_GL_blk_RF", "suppressor_127x55_small_RF", "acc_pointer_IR", "optic_Holosight_blk_F", ["20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF","20Rnd_127x55_Mag_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]]; (_sfLoadoutData get "marksmanRifles") append [ - ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_Arco_blk_F",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], - ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], - ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF""acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"] + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_Arco_blk_F",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_blk_RF","suppressor_127x55_small_RF","acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF","10Rnd_127x55_Mag_RF"], [], "bipod_02_F_hex"] ]; (_sfLoadoutData get "helmets") append [ "H_HelmetHeavy_Hex_RF", @@ -456,30 +456,19 @@ if ("rf" in A3A_enabledDLC) then { (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; (_sfLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""] ]; (_militaryLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; - _policeLoadoutData set ["SMGs", [ + ["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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; (_militaryLoadoutData get "helmets") append ["H_HelmetO_ocano_sb_hex_RF"]; (_militiaLoadoutData get "helmets") append ["H_HelmetO_ocamo_sb_hex_RF"]; }; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf index b55d42f327..0c61e9a70c 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf @@ -440,9 +440,9 @@ if ("rf" in A3A_enabledDLC) then { (_sfLoadoutData get "rifles") append [["arifle_ash12_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Holosight_lush_F",["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], [], ""]]; (_sfLoadoutData get "grenadeLaunchers") append [["arifle_ash12_GL_wood_RF", "suppressor_127x55_small_wood_RF", "acc_pointer_IR", "optic_Holosight_lush_F", ["20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF","20Rnd_127x55_Mag_wood_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_HE_Grenade_shell", "1Rnd_Smoke_Grenade_shell"], ""]]; (_sfLoadoutData get "marksmanRifles") append [ - ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_Arco_ghex_F",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], - ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], - ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF""acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"] + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_Arco_ghex_F",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_DMS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"], + ["arifle_ash12_LR_wood_RF","suppressor_127x55_small_wood_RF","acc_pointer_IR","optic_SOS",["10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF","10Rnd_127x55_Mag_wood_RF"], [], "bipod_02_F_hex"] ]; (_sfLoadoutData get "helmets") append [ "H_HelmetHeavy_GHex_RF", @@ -452,30 +452,19 @@ if ("rf" in A3A_enabledDLC) then { (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; (_sfLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""] ]; (_militaryLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; - _policeLoadoutData set ["SMGs", [ + ["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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; }; ///////////////////////////////// diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf index b514565cf8..dee4022f6f 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -98,7 +98,7 @@ if ("rf" in A3A_enabledDLC) then { _vehiclesPolice append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; _HelisTransport append ["I_E_Heli_light_03_unarmed_RF","I_E_Heli_EC_01A_military_RF"]; _vehiclesHelisLightAttack append ["a3a_LDF_Heli_light_03_dynamicLoadout_RF"]; - _vehiclesHelisAttack = ["a3a_LDF_Heli_EC_02_RF"]; + _vehiclesHelisAttack append ["a3a_LDF_Heli_EC_02_RF"]; }; ["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["vehiclesHelisAttack", _vehiclesHelisAttack] call _fnc_saveToTemplate; @@ -464,38 +464,28 @@ if ("mark" in A3A_enabledDLC) then { if ("rf" in A3A_enabledDLC) then { _sfLoadoutData set ["sidearms",[ - ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""] ]]; (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; (_sfLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "muzzle_snds_570", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Aco_smg", [], [], ""] ]; (_militaryLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_camo", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; - (_militiaLoadoutData get "SMGs") append ["SMG_01_black_RF", "SMG_02_F", "SMG_03_black", "SMG_03C_black"]; - _policeLoadoutData set ["SMGs", [ + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + "SMG_01_black_RF" + ]; + (_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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_geo_RF", "H_HelmetHeavy_Olive_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf index d93fb35453..b7de25fe94 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf @@ -457,24 +457,20 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_02_camo_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_01_F_khk"]]; }; if ("rf" in A3A_enabledDLC) then { - _sfLoadoutData set ["sidearms",[ - ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] - ]]; - _militaryLoadoutData set ["sidearms", [ + (_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", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""] - ]]; + ["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 [ @@ -490,14 +486,14 @@ if ("rf" in A3A_enabledDLC) then { (_militiaLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; - _policeLoadoutData set ["SMGs", [ + (_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", [], [], ""], ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_tna_RF", "H_HelmetHeavy_Olive_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf index 4b481d921e..82f2741ae1 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf @@ -454,24 +454,20 @@ if ("mark" in A3A_enabledDLC) then { }; if ("rf" in A3A_enabledDLC) then { - _sfLoadoutData set ["sidearms",[ - ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] - ]]; - _militaryLoadoutData set ["sidearms", [ + (_sfLoadoutData get "sidearms") append [ + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""], + ["hgun_Glock19_auto_Tan_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_tan_RF", [], [], ""] + ]; + (_militaryLoadoutData get "sidearms") append [ ["hgun_Glock19_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""], ["hgun_Glock19_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""], ["hgun_Glock19_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""], ["hgun_Glock19_Tan_RF", "", "acc_flashlight_pistol", "optic_MRD_tan_RF", [], [], ""], - ["hgun_Glock19_auto_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""] - ]]; + ["hgun_Glock19_auto_Tan_RF", "", "acc_flashlight_pistol", "", [], [], ""] + ]; (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; (_sfLoadoutData get "SMGs") append [ @@ -481,20 +477,20 @@ if ("rf" in A3A_enabledDLC) then { ]; (_militaryLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_Black_RF", "", "", "optic_Aco_smg", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""], ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; (_militiaLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; - _policeLoadoutData set ["SMGs", [ + (_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", [], [], ""], ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_mtp_RF", "H_HelmetHeavy_Sand_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf index d9ff7b5dc3..ccbff38351 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf @@ -452,24 +452,20 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_02_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_01_F_blk"]]; }; if ("rf" in A3A_enabledDLC) then { - _sfLoadoutData set ["sidearms",[ - ["hgun_Glock19_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], - ["hgun_Glock19_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], - ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], - ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], - ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], - ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] - ]]; - _militaryLoadoutData set ["sidearms", [ + (_sfLoadoutData get "sidearms") append [ + ["hgun_Glock19_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_black", [], [], ""], + ["hgun_Glock19_auto_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_black", [], [], ""] + ]; + (_militaryLoadoutData get "sidearms") append [ ["hgun_Glock19_RF", "", "acc_flashlight_pistol", "", [], [], ""], ["hgun_Glock19_RF", "", "acc_flashlight_pistol", "", [], [], ""], ["hgun_Glock19_RF", "", "acc_flashlight_pistol", "", [], [], ""], ["hgun_Glock19_RF", "", "acc_flashlight_pistol", "optic_MRD_black", [], [], ""], - ["hgun_Glock19_auto_RF", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""] - ]]; + ["hgun_Glock19_auto_RF", "", "acc_flashlight_pistol", "", [], [], ""] + ]; (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; (_sfLoadoutData get "SMGs") append [ @@ -485,14 +481,14 @@ if ("rf" in A3A_enabledDLC) then { (_militiaLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; - _policeLoadoutData set ["SMGs", [ + (_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", [], [], ""], ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_mtp_RF", "H_HelmetHeavy_Sand_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf index eaa0e15bf9..7a5acc718a 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf @@ -452,24 +452,20 @@ if ("mark" in A3A_enabledDLC) then { ["srifle_DMR_02_camo_F", "", "acc_pointer_IR", "optic_LRPS", [], [], "bipod_01_F_khk"]]; }; if ("rf" in A3A_enabledDLC) then { - _sfLoadoutData set ["sidearms",[ - ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] - ]]; - _militaryLoadoutData set ["sidearms", [ + (_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", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_ACPC2_F", "", "acc_flashlight_pistol", "", [], [], ""] - ]]; + ["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 [ @@ -485,14 +481,14 @@ if ("rf" in A3A_enabledDLC) then { (_militiaLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; - _policeLoadoutData set ["SMGs", [ + (_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", [], [], ""], ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] - ]]; + ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_tna_RF", "H_HelmetHeavy_Olive_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf index 6832d5403d..ae5d62a10b 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf @@ -52,7 +52,7 @@ if ("rf" in A3A_enabledDLC) then { _vehiclesLightUnarmed append ["I_G_Pickup_rf"]; _vehiclesLightArmed append ["I_G_Pickup_mmg_rf"]; _staticMortars append ["I_G_CommandoMortar_RF"]; - _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_01_civ_RF","C_Heli_EC_04_rescue_RF"]; + _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_04_rescue_RF"]; }; if ("ws" in A3A_enabledDLC) then { @@ -98,8 +98,6 @@ if ("expansion" in A3A_enabledDLC) then { if ("rf" in A3A_enabledDLC) then { _initialRebelEquipment append ["srifle_h6_tan_rf","10Rnd_556x45_AP_Stanag_red_Tan_RF","10Rnd_556x45_AP_Stanag_Tan_RF","10Rnd_556x45_AP_Stanag_green_Tan_RF"]; _initialRebelEquipment = _initialRebelEquipment - ["SMG_05_F","SMG_01_F","hgun_PDW2000_F","SMG_02_F","30Rnd_45ACP_Mag_SMG_01","30Rnd_9x21_Mag_SMG_02"]; -} else { - _initialRebelEquipment append ["SMG_01_F","hgun_PDW2000_F","SMG_02_F","30Rnd_45ACP_Mag_SMG_01","30Rnd_9x21_Mag_SMG_02"]; }; if ("enoch" in A3A_enabledDLC) then { _initialRebelEquipment append ["sgun_HunterShotgun_01_F", "sgun_HunterShotgun_01_sawedoff_F", "2Rnd_12Gauge_Pellets", "2Rnd_12Gauge_Slug"]; @@ -127,40 +125,44 @@ private _rebUniforms = [ private _dlcUniforms = []; -if ("enoch" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_I_L_Uniform_01_camo_F" -]; +if ("enoch" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_I_L_Uniform_01_camo_F" + ]; }; -if ("expansion" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_I_C_Soldier_Bandit_4_F", - "U_I_C_Soldier_Bandit_1_F", - "U_I_C_Soldier_Bandit_2_F", - "U_I_C_Soldier_Bandit_5_F", - "U_I_C_Soldier_Bandit_3_F", - "U_I_C_Soldier_Para_2_F", - "U_I_C_Soldier_Para_3_F", - "U_I_C_Soldier_Para_5_F", - "U_I_C_Soldier_Para_4_F", - "U_I_C_Soldier_Para_1_F", - "U_I_C_Soldier_Camo_F" -]; +if ("expansion" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_I_C_Soldier_Bandit_4_F", + "U_I_C_Soldier_Bandit_1_F", + "U_I_C_Soldier_Bandit_2_F", + "U_I_C_Soldier_Bandit_5_F", + "U_I_C_Soldier_Bandit_3_F", + "U_I_C_Soldier_Para_2_F", + "U_I_C_Soldier_Para_3_F", + "U_I_C_Soldier_Para_5_F", + "U_I_C_Soldier_Para_4_F", + "U_I_C_Soldier_Para_1_F", + "U_I_C_Soldier_Camo_F" + ]; }; -if ("ws" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_lxWS_ION_Casual1", - "U_lxWS_ION_Casual2", - "U_lxWS_ION_Casual3", - "U_lxWS_ION_Casual4", - "U_lxWS_ION_Casual5", - "U_lxWS_SFIA_deserter" -]; +if ("ws" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_lxWS_ION_Casual1", + "U_lxWS_ION_Casual2", + "U_lxWS_ION_Casual3", + "U_lxWS_ION_Casual4", + "U_lxWS_ION_Casual5", + "U_lxWS_SFIA_deserter" + ]; }; -if ("rf" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_IG_Guerrilla_RF", - "U_IG_leader_RF" -]; +if ("rf" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" + ]; }; ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LFF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LFF.sqf index 541bb3c0af..190eb7bc0c 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LFF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LFF.sqf @@ -52,7 +52,7 @@ if ("rf" in A3A_enabledDLC) then { _vehiclesLightUnarmed append ["a3a_black_Pickup_rf"]; _vehiclesLightArmed append ["a3a_black_Pickup_mmg_rf"]; _staticMortars append ["I_G_CommandoMortar_RF"]; - _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_01_civ_RF","C_Heli_EC_04_rescue_RF"]; + _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_04_rescue_RF"]; }; ["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; @@ -132,33 +132,36 @@ private _dlcUniforms = [ ]; //They aren't DLC uniforms, but i think you get it -if ("expansion" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_I_C_Soldier_Bandit_4_F", - "U_I_C_Soldier_Bandit_1_F", - "U_I_C_Soldier_Bandit_5_F", - "U_I_C_Soldier_Para_2_F", - "U_I_C_Soldier_Para_3_F", - "U_I_C_Soldier_Para_5_F", - "U_I_C_Soldier_Para_4_F", - "U_I_C_Soldier_Para_1_F", - "U_I_C_Soldier_Camo_F" -]; +if ("expansion" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_I_C_Soldier_Bandit_4_F", + "U_I_C_Soldier_Bandit_1_F", + "U_I_C_Soldier_Bandit_5_F", + "U_I_C_Soldier_Para_2_F", + "U_I_C_Soldier_Para_3_F", + "U_I_C_Soldier_Para_5_F", + "U_I_C_Soldier_Para_4_F", + "U_I_C_Soldier_Para_1_F", + "U_I_C_Soldier_Camo_F" + ]; }; -if ("ws" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_lxWS_ION_Casual1", - "U_lxWS_ION_Casual2", - "U_lxWS_ION_Casual3", - "U_lxWS_ION_Casual4", - "U_lxWS_ION_Casual5", - "U_lxWS_SFIA_deserter" -]; +if ("ws" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_lxWS_ION_Casual1", + "U_lxWS_ION_Casual2", + "U_lxWS_ION_Casual3", + "U_lxWS_ION_Casual4", + "U_lxWS_ION_Casual5", + "U_lxWS_SFIA_deserter" + ]; }; -if ("rf" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_IG_Guerrilla_RF", - "U_IG_leader_RF" -]; +if ("rf" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" + ]; }; ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf index b65e7c7abf..65326ef754 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf @@ -52,7 +52,7 @@ if ("rf" in A3A_enabledDLC) then { _vehiclesLightUnarmed append ["I_C_Pickup_rf"]; _vehiclesLightArmed append ["I_C_Pickup_mmg_rf"]; _staticMortars append ["I_G_CommandoMortar_RF"]; - _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_01_civ_RF","C_Heli_EC_04_rescue_RF"]; + _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_04_rescue_RF"]; }; ["vehiclesCivHeli", _vehiclesCivHeli] call _fnc_saveToTemplate; @@ -90,8 +90,6 @@ if ("enoch" in A3A_enabledDLC) then { if ("rf" in A3A_enabledDLC) then { _initialRebelEquipment append ["srifle_h6_oli_rf","10Rnd_556x45_AP_Stanag_red_khk_RF","10Rnd_556x45_AP_Stanag_khk_RF","10Rnd_556x45_AP_Stanag_green_khk_RF"]; _initialRebelEquipment = _initialRebelEquipment - ["SMG_05_F","hgun_PDW2000_F","30Rnd_9x21_Mag_SMG_02"]; -} else { - _initialRebelEquipment append ["SMG_05_F","hgun_PDW2000_F","30Rnd_9x21_Mag_SMG_02"]; }; if (A3A_hasTFAR) then {_initialRebelEquipment append ["tf_microdagr","tf_anprc154"]}; @@ -126,25 +124,28 @@ private _rebUniforms = [ private _dlcUniforms = []; -if ("enoch" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_I_L_Uniform_01_camo_F" -]; +if ("enoch" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_I_L_Uniform_01_camo_F" + ]; }; -if ("ws" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_lxWS_ION_Casual1", - "U_lxWS_ION_Casual2", - "U_lxWS_ION_Casual3", - "U_lxWS_ION_Casual4", - "U_lxWS_ION_Casual5", - "U_lxWS_SFIA_deserter" -]; +if ("ws" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_lxWS_ION_Casual1", + "U_lxWS_ION_Casual2", + "U_lxWS_ION_Casual3", + "U_lxWS_ION_Casual4", + "U_lxWS_ION_Casual5", + "U_lxWS_SFIA_deserter" + ]; }; -if ("rf" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_IG_Guerrilla_RF", - "U_IG_leader_RF" -]; +if ("rf" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" + ]; }; ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf index 9e4d3066c5..4a1ac58357 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_Vehicle_Attributes.sqf @@ -24,7 +24,7 @@ if (isClass (configFile >> "CfgPatches" >> "RF_Vehicles")) then { ["C_Heli_EC_01A_civ_RF", ["rebCost", 8000]], ["C_Heli_EC_01_civ_RF", ["rebCost", 8000]], ["C_Heli_EC_04_rescue_RF", ["rebCost", 8000]], - ["C_Pickup_rf", ["rebCost, 250"]], - ["C_Pickup_covered_rf", ["rebCost, 250"]] + ["C_Pickup_rf", ["rebCost", 250]], + ["C_Pickup_covered_rf", ["rebCost", 250]] ]; }; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf index 04002ae87d..caf04029b1 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf @@ -49,7 +49,7 @@ if ("rf" in A3A_enabledDLC) then { _vehiclesLightUnarmed append ["I_Tura_Pickup_01_RF"]; _vehiclesLightArmed append ["I_Tura_Pickup_01_mmg_rf"]; _staticMortars append ["I_G_CommandoMortar_RF"]; - _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_01_civ_RF","C_Heli_EC_04_rescue_RF"]; + _vehiclesCivHeli append ["C_Heli_EC_01A_civ_RF","C_Heli_EC_04_rescue_RF"]; }; ["vehiclesCivHeli", _vehiclesCivHeli] call _fnc_saveToTemplate; @@ -85,8 +85,6 @@ if (allowDLCExpansion) then { if ("rf" in A3A_enabledDLC) then { _initialRebelEquipment append ["srifle_h6_tan_rf","10Rnd_556x45_AP_Stanag_red_Tan_RF","10Rnd_556x45_AP_Stanag_Tan_RF","10Rnd_556x45_AP_Stanag_green_Tan_RF"]; _initialRebelEquipment = _initialRebelEquipment - ["hgun_PDW2000_F","SMG_02_F","30Rnd_9x21_Mag_SMG_02","SMG_05_F"]; -} else { - _initialRebelEquipment append ["hgun_PDW2000_F","SMG_02_F","30Rnd_9x21_Mag_SMG_02"]; }; if ("enoch" in A3A_enabledDLC) then { @@ -126,30 +124,33 @@ private _dlcUniforms = [ "U_I_L_Uniform_01_deserter_F" ]; -if ("enoch" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_I_L_Uniform_01_camo_F" -]; +if ("enoch" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_I_L_Uniform_01_camo_F" + ]; }; -if (allowDLCExpansion) then {_dlcUniforms append [ - "U_I_C_Soldier_Bandit_4_F", - "U_I_C_Soldier_Bandit_1_F", - "U_I_C_Soldier_Bandit_2_F", - "U_I_C_Soldier_Bandit_5_F", - "U_I_C_Soldier_Bandit_3_F", - "U_I_C_Soldier_Para_2_F", - "U_I_C_Soldier_Para_3_F", - "U_I_C_Soldier_Para_5_F", - "U_I_C_Soldier_Para_4_F", - "U_I_C_Soldier_Para_1_F", - "U_I_C_Soldier_Camo_F" -]; +if (allowDLCExpansion) then { + _dlcUniforms append [ + "U_I_C_Soldier_Bandit_4_F", + "U_I_C_Soldier_Bandit_1_F", + "U_I_C_Soldier_Bandit_2_F", + "U_I_C_Soldier_Bandit_5_F", + "U_I_C_Soldier_Bandit_3_F", + "U_I_C_Soldier_Para_2_F", + "U_I_C_Soldier_Para_3_F", + "U_I_C_Soldier_Para_5_F", + "U_I_C_Soldier_Para_4_F", + "U_I_C_Soldier_Para_1_F", + "U_I_C_Soldier_Camo_F" + ]; }; -if ("rf" in A3A_enabledDLC) then {_dlcUniforms append [ - "U_IG_Guerrilla_RF", - "U_IG_leader_RF" -]; +if ("rf" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" + ]; }; ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf index 661bedef12..f5b30ddb05 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf @@ -3,3 +3,14 @@ ["O_Tura_Offroad_armor_armed_lxWS", ["rebCost", 800]], ["O_Tura_Offroad_armor_AT_lxWS", ["rebCost", 800]] ]; + +//Reaction Forces Vehicles +if (isClass (configFile >> "CfgPatches" >> "RF_Vehicles")) then { + (["attributesVehicles"] call _fnc_getFromTemplate) append [ + ["C_Heli_EC_01A_civ_RF", ["rebCost", 8000]], + ["C_Heli_EC_01_civ_RF", ["rebCost", 8000]], + ["C_Heli_EC_04_rescue_RF", ["rebCost", 8000]], + ["C_Pickup_rf", ["rebCost", 250]], + ["C_Pickup_covered_rf", ["rebCost", 250]] + ]; +}; \ No newline at end of file diff --git a/A3A/addons/logistics/Nodes/RF.hpp b/A3A/addons/logistics/Nodes/RF.hpp index eb4cc58916..dadce0f90c 100644 --- a/A3A/addons/logistics/Nodes/RF.hpp +++ b/A3A/addons/logistics/Nodes/RF.hpp @@ -3,7 +3,7 @@ //Default open pickup class lxRF_vehicles_rf_pickup_01_pickup_01_unarmed_rf_p3d : TRIPLES(ADDON,Nodes,Base) { - class Nodes + class Nodes { class Node1 { @@ -19,7 +19,7 @@ class lxRF_vehicles_rf_pickup_01_pickup_01_unarmed_rf_p3d : TRIPLES(ADDON,Nodes, }; class lxRF_vehicles_rf_pickup_01_pickup_01_mmg_rf_p3d : TRIPLES(ADDON,Nodes,Base) { - class Nodes + class Nodes { class Node1 { @@ -35,7 +35,7 @@ class lxRF_vehicles_rf_pickup_01_pickup_01_mmg_rf_p3d : TRIPLES(ADDON,Nodes,Base }; class lxRF_vehicles_rf_pickup_01_pickup_01_service_rf_p3d : TRIPLES(ADDON,Nodes,Base) { - class Nodes + class Nodes { class Node1 { From e280a476197ebb47ccc7cc5689d221a034f9d4a2 Mon Sep 17 00:00:00 2001 From: Tiny-DM Date: Thu, 28 Mar 2024 09:48:42 -0400 Subject: [PATCH 3/5] Changes by Ante (2023.3.28) RPTs for all changed factions since last commit are clean. fixed issue with helicopter pylons. --- A3A/addons/config_fixes/RF/CfgVehicles.hpp | 23 ++++++++++--------- .../Templates/Vanilla/Vanilla_AI_AAF.sqf | 2 +- .../Vanilla/Vanilla_AI_NATO_Apex.sqf | 19 +++++---------- .../Vanilla/Vanilla_AI_NATO_Arid.sqf | 19 +++++---------- .../Vanilla/Vanilla_AI_NATO_Tropical.sqf | 19 +++++---------- .../WS/WS_Reb_Vehicle_Attributes.sqf | 13 +---------- 6 files changed, 32 insertions(+), 63 deletions(-) diff --git a/A3A/addons/config_fixes/RF/CfgVehicles.hpp b/A3A/addons/config_fixes/RF/CfgVehicles.hpp index 9abd484cd5..ead8ba051e 100644 --- a/A3A/addons/config_fixes/RF/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/RF/CfgVehicles.hpp @@ -77,15 +77,17 @@ class CfgVehicles attachment = "PylonRack_19Rnd_missiles_gray_RF"; hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; priority = 5; + mirroredMissilePos = 1; turret[] = {0}; - UIposition[] = {"0.57 + 0.04",0.35}; + UIposition[] = {"0.59 + 0.04",0.4}; }; class PylonRight2 { attachment = "PylonRack_19Rnd_missiles_gray_RF"; hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; priority = 4; + mirroredMissilePos = 2; turret[] = {0}; - UIposition[] = {"0.59 + 0.04",0.4}; + UIposition[] = {"0.57 + 0.04",0.35}; }; }; @@ -114,7 +116,7 @@ class CfgVehicles }; class a3a_green_Heli_light_03_unarmed_RF : B_Heli_light_03_unarmed_RF { textureList[] = {}; - hiddenselectionstextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_green_co.paa"}; + hiddenSelectionsTextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_green_co.paa"}; }; class Heli_EC_02_base_RF: Heli_EC_01_base_RF { @@ -124,7 +126,7 @@ class CfgVehicles scope = 2; faction = "IND_F"; side = 2; - hiddenSelectionTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa","#(rgb,1024,1024,1)ui('lxRF_MFDMinimap','lxRF_MFDMinimap')","\lxRF\air_rf\heli_medium_ec\data\as332_adds_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"}; + hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa","#(rgb,1024,1024,1)ui('lxRF_MFDMinimap','lxRF_MFDMinimap')","\lxRF\air_rf\heli_medium_ec\data\as332_adds_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_02_aaf_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"}; class Components : Components { class TransportPylonsComponent { uiPicture = "\lxRF\air_rf\heli_medium_ec\data\UI\heli_medium_ec_02_3DEN_CA.paa"; @@ -158,22 +160,21 @@ class CfgVehicles UIposition[] = {0.08,0.35}; }; class PylonRight1 { - attachment = "PylonRack_19Rnd_missiles_olive_RF"; + attachment = "PylonRack_4Rnd_LG_scalpel"; hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; priority = 5; - mirroredMissilePos = 1; + mirroredMissilePos = 2; turret[] = {0}; - UIposition[] = {0.59,0.4}; + UIposition[] = {0.57,0.35}; }; class PylonRight2 { - attachment = "PylonRack_4Rnd_LG_scalpel"; + attachment = "PylonRack_19Rnd_missiles_olive_RF"; hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; priority = 4; - mirroredMissilePos = 2; + mirroredMissilePos = 1; turret[] = {0}; - UIposition[] = {0.57,0.35}; + UIposition[] = {0.59,0.4}; }; - }; }; }; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf index f966e2584b..db7a240e62 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -442,7 +442,7 @@ if ("rf" in A3A_enabledDLC) then { ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] ]; - (_militiaLoadoutData get "SMGs") append ["SMG_01_black_RF", "SMG_02_F", "SMG_03_black", "SMG_03C_black"]; + (_militiaLoadoutData get "SMGs") append ["SMG_01_black_RF"]; (_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", [], [], ""] diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf index b7de25fe94..2f0fd1fad3 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf @@ -474,25 +474,18 @@ if ("rf" in A3A_enabledDLC) then { (_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", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Yorris", [], [], ""] + ["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", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + ["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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_tna_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf index 82f2741ae1..58ccf078fe 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf @@ -471,25 +471,18 @@ if ("rf" in A3A_enabledDLC) then { (_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", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Yorris", [], [], ""] + ["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", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + ["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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_mtp_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf index 7a5acc718a..691010d581 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf @@ -469,25 +469,18 @@ if ("rf" in A3A_enabledDLC) then { (_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", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Yorris", [], [], ""] + ["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", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + ["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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_tna_RF", diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf index f5b30ddb05..efb30b367c 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf @@ -2,15 +2,4 @@ ["O_Tura_Offroad_armor_lxWS", ["rebCost", 300]], ["O_Tura_Offroad_armor_armed_lxWS", ["rebCost", 800]], ["O_Tura_Offroad_armor_AT_lxWS", ["rebCost", 800]] -]; - -//Reaction Forces Vehicles -if (isClass (configFile >> "CfgPatches" >> "RF_Vehicles")) then { - (["attributesVehicles"] call _fnc_getFromTemplate) append [ - ["C_Heli_EC_01A_civ_RF", ["rebCost", 8000]], - ["C_Heli_EC_01_civ_RF", ["rebCost", 8000]], - ["C_Heli_EC_04_rescue_RF", ["rebCost", 8000]], - ["C_Pickup_rf", ["rebCost", 250]], - ["C_Pickup_covered_rf", ["rebCost", 250]] - ]; -}; \ No newline at end of file +]; \ No newline at end of file From cdd16c1622b3d07c8b7e93eb2ed15c820f61b593 Mon Sep 17 00:00:00 2001 From: Tiny-DM Date: Thu, 28 Mar 2024 08:54:36 -0400 Subject: [PATCH 4/5] Changes from Ante (2024.3.28b) --- A3A/addons/config_fixes/RF/CfgVehicles.hpp | 6 +++--- .../Templates/Vanilla/Vanilla_AI_AAF.sqf | 4 +++- .../Templates/Vanilla/Vanilla_AI_LDF.sqf | 2 +- .../Vanilla/Vanilla_AI_NATO_Temperate.sqf | 19 ++++++------------- .../Templates/Vanilla/Vanilla_Civ.sqf | 17 +++++++++-------- .../core/Templates/Templates/WS/WS_Civ.sqf | 17 +++++++++-------- 6 files changed, 31 insertions(+), 34 deletions(-) diff --git a/A3A/addons/config_fixes/RF/CfgVehicles.hpp b/A3A/addons/config_fixes/RF/CfgVehicles.hpp index ead8ba051e..04760648db 100644 --- a/A3A/addons/config_fixes/RF/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/RF/CfgVehicles.hpp @@ -50,7 +50,7 @@ class CfgVehicles class TransportPylonsComponent : TransportPylonsComponent { class Presets { class Default { - attachment[] = {"PylonRack_19Rnd_missiles_gray_RF","PylonRack_19Rnd_missiles_gray_RF","PylonRack_19Rnd_missiles_gray_RF","PylonRack_19Rnd_missiles_gray_RF"}; + attachment[] = {"PylonRack_19Rnd_missiles_gray_RF","PylonWeapon_1000Rnd_20x102mm_shells_gray_RF","PylonRack_19Rnd_missiles_gray_RF","PylonWeapon_1000Rnd_20x102mm_shells_gray_RF"}; displayName = "Default"; }; class Empty { @@ -67,7 +67,7 @@ class CfgVehicles UIposition[] = {"0.06 + 0.02",0.4}; }; class PylonLeft2 { - attachment = "PylonRack_19Rnd_missiles_gray_RF"; + attachment = "PylonWeapon_1000Rnd_20x102mm_shells_gray_RF"; hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; priority = 4; turret[] = {0}; @@ -82,7 +82,7 @@ class CfgVehicles UIposition[] = {"0.59 + 0.04",0.4}; }; class PylonRight2 { - attachment = "PylonRack_19Rnd_missiles_gray_RF"; + attachment = "PylonWeapon_1000Rnd_20x102mm_shells_gray_RF"; hardpoints[] = {"DAR","DAGR","B_SHIEKER","UNI_SCALPEL","20MM_TWIN_CANNON","B_ASRRAM_EJECTOR","WEAPON_PODS_RF","B_BOMB_PYLON"}; priority = 4; mirroredMissilePos = 2; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf index db7a240e62..06af198b60 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -442,7 +442,9 @@ if ("rf" in A3A_enabledDLC) then { ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] ]; - (_militiaLoadoutData get "SMGs") append ["SMG_01_black_RF"]; + (_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", [], [], ""] diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf index dee4022f6f..2d044ef053 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -480,7 +480,7 @@ if ("rf" in A3A_enabledDLC) then { ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] ]; (_militiaLoadoutData get "SMGs") append [ - "SMG_01_black_RF" + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] ]; (_policeLoadoutData get "SMGs") append [ ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf index ccbff38351..dd8c5ebf5c 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf @@ -469,25 +469,18 @@ if ("rf" in A3A_enabledDLC) then { (_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", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "muzzle_snds_L", "acc_pointer_IR", "optic_Yorris", [], [], ""] + ["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", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_pointer_IR", "optic_Aco_smg", [], [], ""]]; + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]]; + ["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", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_03C_TR_black", "", "acc_flashlight", "optic_Aco_smg", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Holosight_blk_F", [], [], ""], - ["SMG_02_F", "", "acc_flashlight", "optic_Aco_smg", [], [], ""] + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] ]; (_sfLoadoutData get "helmets") append [ "H_HelmetB_plain_sb_mtp_RF", diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf index 4ba8653d95..1f77881edb 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf @@ -158,15 +158,16 @@ if (allowDLCWS) then { }; if ("rf" in A3A_enabledDLC) then { + private _RFleatherJackets [ + "U_C_PilotJacket_black_RF", + "U_C_PilotJacket_brown_RF", + "U_C_PilotJacket_lbrown_RF", + "U_C_PilotJacket_open_black_RF", + "U_C_PilotJacket_open_brown_RF", + "U_C_PilotJacket_open_lbrown_RF"] + _dlcUniforms append _RFleatherJackets if (A3A_climate in ["temperate","arctic"]) then { - _dlcUniforms append [ - "U_C_PilotJacket_black_RF", - "U_C_PilotJacket_brown_RF", - "U_C_PilotJacket_lbrown_RF", - "U_C_PilotJacket_open_black_RF", - "U_C_PilotJacket_open_brown_RF", - "U_C_PilotJacket_open_lbrown_RF" - ]; + _civUniforms append _RFleatherJackets }; }; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf index 3d4834cf26..a43f93d6b0 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf @@ -115,15 +115,16 @@ if (allowDLCOrange) then { }; if ("rf" in A3A_enabledDLC) then { + private _RFleatherJackets [ + "U_C_PilotJacket_black_RF", + "U_C_PilotJacket_brown_RF", + "U_C_PilotJacket_lbrown_RF", + "U_C_PilotJacket_open_black_RF", + "U_C_PilotJacket_open_brown_RF", + "U_C_PilotJacket_open_lbrown_RF"] + _dlcUniforms append _RFleatherJackets if (A3A_climate in ["temperate","arctic"]) then { - _dlcUniforms append [ - "U_C_PilotJacket_black_RF", - "U_C_PilotJacket_brown_RF", - "U_C_PilotJacket_lbrown_RF", - "U_C_PilotJacket_open_black_RF", - "U_C_PilotJacket_open_brown_RF", - "U_C_PilotJacket_open_lbrown_RF" - ]; + _civUniforms append _RFleatherJackets }; }; From 7b0737ed0ee4fd85bf42c3e5f4acf7c33baffb1b Mon Sep 17 00:00:00 2001 From: Tiny-DM Date: Thu, 28 Mar 2024 09:19:57 -0400 Subject: [PATCH 5/5] Changes from Ante (2024.3.28c) fixed a few semicolons --- .../core/Templates/Templates/Vanilla/Vanilla_Civ.sqf | 8 ++++---- A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf index 1f77881edb..4e2cf7474b 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf @@ -158,16 +158,16 @@ if (allowDLCWS) then { }; if ("rf" in A3A_enabledDLC) then { - private _RFleatherJackets [ + private _RFleatherJackets = [ "U_C_PilotJacket_black_RF", "U_C_PilotJacket_brown_RF", "U_C_PilotJacket_lbrown_RF", "U_C_PilotJacket_open_black_RF", "U_C_PilotJacket_open_brown_RF", - "U_C_PilotJacket_open_lbrown_RF"] - _dlcUniforms append _RFleatherJackets + "U_C_PilotJacket_open_lbrown_RF"]; + _dlcUniforms append _RFleatherJackets; if (A3A_climate in ["temperate","arctic"]) then { - _civUniforms append _RFleatherJackets + _civUniforms append _RFleatherJackets; }; }; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf index a43f93d6b0..a7a5982e3b 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf @@ -115,16 +115,16 @@ if (allowDLCOrange) then { }; if ("rf" in A3A_enabledDLC) then { - private _RFleatherJackets [ + private _RFleatherJackets = [ "U_C_PilotJacket_black_RF", "U_C_PilotJacket_brown_RF", "U_C_PilotJacket_lbrown_RF", "U_C_PilotJacket_open_black_RF", "U_C_PilotJacket_open_brown_RF", - "U_C_PilotJacket_open_lbrown_RF"] - _dlcUniforms append _RFleatherJackets + "U_C_PilotJacket_open_lbrown_RF"]; + _dlcUniforms append _RFleatherJackets; if (A3A_climate in ["temperate","arctic"]) then { - _civUniforms append _RFleatherJackets + _civUniforms append _RFleatherJackets; }; };