From 40b13e1a9adc15221021f7cd9c5bfba0a8254640 Mon Sep 17 00:00:00 2001 From: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat, 30 Mar 2024 16:40:46 +0000 Subject: [PATCH 1/5] templates + logistics https://github.com/official-antistasi-community/A3-Antistasi/pull/3185 --- A3A/addons/config_fixes/RF/CfgVehicles.hpp | 231 ++++++++++++++++ A3A/addons/config_fixes/RF/config.cpp | 25 ++ A3A/addons/core/Templates/Templates.hpp | 8 + .../Templates/Vanilla/Vanilla_AI_AAF.sqf | 50 +++- .../Vanilla/Vanilla_AI_CSAT_Arid.sqf | 40 +++ .../Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 37 +++ .../Templates/Vanilla/Vanilla_AI_LDF.sqf | 45 ++- .../Vanilla/Vanilla_AI_NATO_Arid.sqf | 13 +- .../Vanilla/Vanilla_AI_NATO_Temperate.sqf | 57 +++- .../Vanilla/Vanilla_AI_NATO_Tropical.sqf | 57 +++- .../Templates/Vanilla/Vanilla_Civ.sqf | 23 +- .../Templates/Vanilla/Vanilla_Reb_FIA.sqf | 17 +- .../Templates/Vanilla/Vanilla_Reb_SDK.sqf | 34 ++- .../Vanilla_Reb_Vehicle_Attributes.sqf | 14 +- .../core/Templates/Templates/WS/WS_Civ.sqf | 260 ++++++++++++++++++ .../Templates/Templates/WS/WS_Reb_Tura.sqf | 46 +++- .../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 | 53 ++++ 20 files changed, 976 insertions(+), 41 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/core/Templates/Templates/WS/WS_Civ.sqf 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..e0abc6269d --- /dev/null +++ b/A3A/addons/config_fixes/RF/CfgVehicles.hpp @@ -0,0 +1,231 @@ +//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","PylonWeapon_1000Rnd_20x102mm_shells_gray_RF","PylonRack_19Rnd_missiles_gray_RF","PylonWeapon_1000Rnd_20x102mm_shells_gray_RF"}; + displayName = "Default"; + }; + class Empty + { + attachment[] = {}; + displayName = "Empty"; + }; + }; + 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 = "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}; + 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; + mirroredMissilePos = 1; + turret[] = {0}; + UIposition[] = {"0.59 + 0.04",0.4}; + }; + class PylonRight2 + { + 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; + turret[] = {0}; + UIposition[] = {"0.57 + 0.04",0.35}; + }; + + }; + }; + }; + }; + 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; + 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"; + class Presets + { + class AT + { + attachment[] = {"PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel","PylonRack_4Rnd_LG_scalpel"}; + displayName = "AT"; + }; + 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"; + }; + }; + 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_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 = 2; + turret[] = {0}; + UIposition[] = {0.57,0.35}; + }; + class PylonRight2 + { + 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 = 1; + turret[] = {0}; + UIposition[] = {0.59,0.4}; + }; + }; + }; + }; + }; + 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"}; + }; + + +}; \ No newline at end of file diff --git a/A3A/addons/config_fixes/RF/config.cpp b/A3A/addons/config_fixes/RF/config.cpp new file mode 100644 index 0000000000..024f4b8508 --- /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" \ No newline at end of file diff --git a/A3A/addons/core/Templates/Templates.hpp b/A3A/addons/core/Templates/Templates.hpp index 6f25a82190..94d952e241 100644 --- a/A3A/addons/core/Templates/Templates.hpp +++ b/A3A/addons/core/Templates/Templates.hpp @@ -17,6 +17,14 @@ class Templates equipFlags[] = {"vanilla"}; }; + class WS_Civ : WS_Base + { + side = "Civ"; + flagTexture = "\lxws\data_f_lxws\img\flags\flag_Argana_CO.paa"; + name = "Western Sahara"; + file = "WS_Civ"; + }; + class WS_Tura : WS_Base { side = "Reb"; 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 679ac337f5..fac97cdd69 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -56,9 +56,9 @@ if (_hasJets) then { ["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"]] call _fnc_saveToTemplate; ["magazines", createHashMapFromArray [ @@ -85,6 +85,16 @@ private _policeVehs = if (_hasContact) then { if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _policeVehs 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", _policeVehs] call _fnc_saveToTemplate; ["staticMGs", ["I_HMG_02_high_F","I_HMG_01_high_F"]] call _fnc_saveToTemplate; @@ -378,6 +388,40 @@ _sfLoadoutData set ["sidearms", [ ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] ]]; +if ("rf" in A3A_enabledDLC) then { + (_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", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_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"]; +}; + ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// 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 d7d441b740..f43d9551a8 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 @@ -96,6 +96,10 @@ private _policeVehs = if (_hasContact) then { ["B_GEN_Offroad_01_gen_F"] }; +if ("rf" in A3A_enabledDLC) then { + _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; +}; + if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; @@ -447,6 +451,42 @@ _sfLoadoutData set ["sidearms", [ ["hgun_Rook40_F", "muzzle_snds_L", "", "", [], [], ""] ]]; +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", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_militaryLoadoutData get "helmets") append ["H_HelmetO_ocano_sb_hex_RF"]; + (_militiaLoadoutData get "helmets") append ["H_HelmetO_ocamo_sb_hex_RF"]; +}; ///////////////////////////////// // Elite Loadout Data // 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 f0909fe416..b3c02a81c8 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 @@ -90,6 +90,9 @@ private _policeVehs = if (_hasContact) then { } else { ["B_GEN_Offroad_01_gen_F"] }; +if ("rf" in A3A_enabledDLC) then { + _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; +}; if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; @@ -439,6 +442,40 @@ _sfLoadoutData set ["sidearms", [ ["hgun_Rook40_F", "muzzle_snds_L", "", "", [], [], ""] ]]; +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", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; +}; ///////////////////////////////// // Elite Loadout Data // 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 aea6bccb30..35a95f746a 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -53,8 +53,8 @@ private _planesAA = ["B_Plane_CAS_01_dynamicLoadout_F"]; ["vehiclesHelisLight", ["I_E_Heli_light_03_unarmed_F", "B_Heli_Light_01_F"]] call _fnc_saveToTemplate; ["vehiclesHelisTransport", ["B_Heli_Transport_01_camo_F"]] call _fnc_saveToTemplate; -["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 [ @@ -82,6 +82,14 @@ private _policeVehs = if (_hasContact) then { if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; +if ("rf" in A3A_enabledDLC) then { + _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _transportHelicopters 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 append ["a3a_LDF_Heli_EC_02_RF"]; +}; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; +["vehiclesHelisAttack", _vehiclesHelisAttack] call _fnc_saveToTemplate; ["vehiclesPolice", _policeVehs] call _fnc_saveToTemplate; ["staticMGs", ["I_G_HMG_02_high_F","I_E_HMG_01_high_F"]] call _fnc_saveToTemplate; @@ -349,6 +357,39 @@ _sfLoadoutData set ["sidearms", [ ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] ]]; +if ("rf" in A3A_enabledDLC) then { + _sfLoadoutData set ["sidearms", [ + ["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", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_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"]; +}; + ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// 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 e7578dd00a..1e29c39862 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 @@ -65,7 +65,7 @@ if (_hasHelicopters) then { }; private _helisLight = ["B_Heli_Light_01_F"]; -private _helisLightAttack = ["B_Heli_Light_01_dynamicLoadout_F"]; +private _vehiclesHelisLightAttack = ["B_Heli_Light_01_dynamicLoadout_F"]; private _helisAttack = ["B_Heli_Attack_01_dynamicLoadout_F"]; private _artillery = ["B_MBT_01_arty_F","B_MBT_01_mlrs_F"]; @@ -93,7 +93,6 @@ private _policeVehs = if (_hasContact) then { if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; -["vehiclesPolice", _policeVehs] call _fnc_saveToTemplate; ["staticMGs", ["B_G_HMG_02_high_F", "B_HMG_01_high_F"]] call _fnc_saveToTemplate; ["staticAT", ["B_static_AT_F"]] call _fnc_saveToTemplate; @@ -144,11 +143,19 @@ if (_hasWs) then { _transportHelicopters pushback "B_D_Heli_Transport_01_lxWS"; }; +if ("rf" in A3A_enabledDLC) then { + _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _transportHelicopters 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"]; +}; + +["vehiclesHelisTransport", _transportHelicopters] call _fnc_saveToTemplate; +["vehiclesPolice", _policeVehs] call _fnc_saveToTemplate; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["vehiclesPlanesTransport", _planesTransport] call _fnc_saveToTemplate; ["vehiclesHelisLight", _helisLight] call _fnc_saveToTemplate; ["vehiclesHelisLightAttack", _helisLightAttack] call _fnc_saveToTemplate; ["vehiclesHelisAttack", _helisAttack] call _fnc_saveToTemplate; -["vehiclesHelisTransport", _transportHelicopters] call _fnc_saveToTemplate; ["staticHowitzers", _howitzers] call _fnc_saveToTemplate; ["vehicleRadar", _radar] call _fnc_saveToTemplate; ["vehicleSam", _SAM] call _fnc_saveToTemplate; 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 45f70428ee..4b7145ce4f 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 @@ -57,9 +57,8 @@ private _transportHelicopters = ["B_Heli_Transport_01_F","B_CTRG_Heli_Transport_ if (_hasHelicopters) then { _transportHelicopters append ["B_Heli_Transport_03_F", "B_Heli_Transport_03_unarmed_F"]; }; -["vehiclesHelisTransport", _transportHelicopters] call _fnc_saveToTemplate; ["vehiclesHelisLight", ["B_Heli_Light_01_F"]] call _fnc_saveToTemplate; -["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; private _artillery = ["B_T_MBT_01_arty_F","B_T_MBT_01_mlrs_F"]; @@ -88,7 +87,6 @@ private _policeVehs = if (_hasContact) then { if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; -["vehiclesPolice", _policeVehs] call _fnc_saveToTemplate; ["staticMGs", ["B_G_HMG_02_high_F", "B_HMG_01_high_F"]] call _fnc_saveToTemplate; ["staticAT", ["B_T_Static_AT_F"]] call _fnc_saveToTemplate; @@ -133,6 +131,15 @@ if (_hasWs) then { _militiaAPCs pushBack "B_T_APC_Wheeled_01_command_lxWS"; }; +if ("rf" in A3A_enabledDLC) then { + _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _transportHelicopters 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"]; +}; + +["vehiclesHelisTransport", _transportHelicopters] call _fnc_saveToTemplate; +["vehiclesPolice", _policeVehs] call _fnc_saveToTemplate; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["staticHowitzers", _howitzers] call _fnc_saveToTemplate; ["vehicleRadar", _radar] call _fnc_saveToTemplate; ["vehicleSam", _SAM] call _fnc_saveToTemplate; @@ -173,11 +180,11 @@ if (_hasWs) then { ["B_SAM_System_02_F", ["Green", 1.0]], ["B_T_VTOL_01_infantry_F", ["Blue",0.4 , "Olive", 0.6]], ["B_Plane_Fighter_01_F", ["DarkGreyCamo", 0.4, "DarkGrey", 0.6]], - ["B_Plane_Fighter_01_Stealth_F", ["DarkGreyCamo", 0.4, "DarkGrey", 0.6]]], + ["B_Plane_Fighter_01_Stealth_F", ["DarkGreyCamo", 0.4, "DarkGrey", 0.6]], ["B_Radar_System_01_F", ["Olive", 1]], ["B_SAM_System_03_F", ["Olive", 1]], ["B_T_APC_Wheeled_01_command_lxWS", ["BLACK", 0.3, "Olive", 0.7]], - ["B_T_APC_Wheeled_01_atgm_lxWS", ["BLACK", 0.3, "Olive", 0.7], + ["B_T_APC_Wheeled_01_atgm_lxWS", ["BLACK", 0.3, "Olive", 0.7]], ["B_T_APC_Wheeled_01_mortar_lxWS", ["BLACK", 0.3, "Olive", 0.7]], ["B_Heli_Transport_03_F", ["Black", 0.5, "Green", 0.5]], ["B_Heli_Transport_03_unarmed_F", ["Black", 0.5, "Green", 0.5]], @@ -496,6 +503,46 @@ _sfLoadoutData set ["sidearms", [ ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] ]]; +if ("rf" in A3A_enabledDLC) then { + (_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", "", [], [], ""] + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_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"]; +}; + ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// 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 b17999d75f..a2b1ba9afa 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 @@ -57,9 +57,8 @@ private _transportHelicopters = ["B_Heli_Transport_01_F", "B_CTRG_Heli_Transport if (_hasHelicopters) then { _transportHelicopters append ["B_Heli_Transport_03_F", "B_Heli_Transport_03_unarmed_F"]; }; -["vehiclesHelisTransport", _transportHelicopters] call _fnc_saveToTemplate; ["vehiclesHelisLight", ["B_Heli_Light_01_F"]] call _fnc_saveToTemplate; -["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; private _artillery = ["B_T_MBT_01_arty_F","B_T_MBT_01_mlrs_F"]; @@ -88,7 +87,6 @@ private _policeVehs = if (_hasContact) then { if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; -["vehiclesPolice", _policeVehs] call _fnc_saveToTemplate; ["staticMGs", ["B_G_HMG_02_high_F", "B_HMG_01_high_F"]] call _fnc_saveToTemplate; ["staticAT", ["B_T_Static_AT_F"]] call _fnc_saveToTemplate; @@ -133,6 +131,15 @@ if (_hasWs) then { _militiaAPCs pushBack "B_T_APC_Wheeled_01_command_lxWS"; }; +if ("rf" in A3A_enabledDLC) then { + _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; + _transportHelicopters 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"]; +}; + +["vehiclesHelisTransport", _transportHelicopters] call _fnc_saveToTemplate; +["vehiclesPolice", _policeVehs] call _fnc_saveToTemplate; +["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["staticHowitzers", _howitzers] call _fnc_saveToTemplate; ["vehicleRadar", _radar] call _fnc_saveToTemplate; ["vehicleSam", _SAM] call _fnc_saveToTemplate; @@ -173,11 +180,11 @@ if (_hasWs) then { ["B_SAM_System_02_F", ["Green", 1.0]], ["B_T_VTOL_01_infantry_F", ["Blue",0.4 , "Olive", 0.6]], ["B_Plane_Fighter_01_F", ["DarkGreyCamo", 0.4, "DarkGrey", 0.6]], - ["B_Plane_Fighter_01_Stealth_F", ["DarkGreyCamo", 0.4, "DarkGrey", 0.6]]], + ["B_Plane_Fighter_01_Stealth_F", ["DarkGreyCamo", 0.4, "DarkGrey", 0.6]], ["B_Radar_System_01_F", ["Olive", 1]], ["B_SAM_System_03_F", ["Olive", 1]], ["B_T_APC_Wheeled_01_command_lxWS", ["BLACK", 0.3, "Olive", 0.7]], - ["B_T_APC_Wheeled_01_atgm_lxWS", ["BLACK", 0.3, "Olive", 0.7], + ["B_T_APC_Wheeled_01_atgm_lxWS", ["BLACK", 0.3, "Olive", 0.7]], ["B_T_APC_Wheeled_01_mortar_lxWS", ["BLACK", 0.3, "Olive", 0.7]], ["B_Heli_Transport_03_F", ["Black", 0.5, "Green", 0.5]], ["B_Heli_Transport_03_unarmed_F", ["Black", 0.5, "Green", 0.5]], @@ -496,6 +503,46 @@ _sfLoadoutData set ["sidearms", [ ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] ]]; +if ("rf" in A3A_enabledDLC) then { + (_sfLoadoutData get "sidearms") append [ + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""] + ]; + (_militaryLoadoutData get "sidearms") append [ + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""] + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_tna_RF", + "H_HelmetHeavy_Olive_RF", + "H_HelmetHeavy_Simple_Olive_RF", + "H_HelmetHeavy_VisorUp_Olive_RF" + ]; + (_militaryLoadoutData get "helmets") append ["H_HelmetB_plain_sb_tna_RF"]; +}; + ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf index f5ee857222..1496f40611 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf @@ -36,8 +36,6 @@ if (_hasWs) then { _civCarsWithWeights append ["C_Truck_02_racing_lxWS" , 0.1 , "C_Offroad_lxWS", 0.5]; }; -["vehiclesCivCar", _civCarsWithWeights] call _fnc_saveToTemplate; - private _civIndustrial = [ "C_Van_01_transport_F", 1.0 ,"C_Van_01_box_F", 0.8 @@ -92,8 +90,15 @@ if (_hasApex) then { _civPlanes append ["C_Plane_Civil_01_racing_F", "C_Plane_Civil_01_F"] }; +if ("rf" in A3A_enabledDLC) then { + _civCarsWithWeights append ["C_Pickup_rf", 2.0, "C_Pickup_covered_rf", 0.1]; + _civRepair append ["C_Pickup_repair_rf", 0.3]; + _civFuel append ["a3a_civ_Pickup_fuel_rf", 0.1]; +}; + ["vehiclesCivHeli", ["C_Heli_Light_01_civil_F" , "O_Heli_Light_02_unarmed_F" , "I_Heli_Transport_02_F"]] call _fnc_saveToTemplate; +["vehiclesCivCar", _civCarsWithWeights] call _fnc_saveToTemplate; ["vehiclesCivIndustrial", _civIndustrial] call _fnc_saveToTemplate; ["vehiclesCivBoat", _civBoat] call _fnc_saveToTemplate; ["vehiclesCivRepair", _civRepair] call _fnc_saveToTemplate; @@ -208,6 +213,20 @@ if (_hasWs && {(toLowerANSI worldName) in ["sefrouramal", "takistan"]}) 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 { + _civUniforms append _RFleatherJackets; + }; +}; + ["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 8c89830300..3a5b17b6e8 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf @@ -35,14 +35,14 @@ if (_hasApex) then { private _vehiclesCivCar = ["C_Offroad_01_F", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", "C_SUV_01_F"]; private _CivTruck = ["C_Truck_02_transport_F", "C_Truck_02_covered_F"]; -["vehiclesCivHeli", ["C_Heli_Light_01_civil_F", "O_Heli_Light_02_unarmed_F" , "I_Heli_Transport_02_F"]] call _fnc_saveToTemplate; +private _vehiclesCivHeli = ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]; private _CivBoat = ["C_Boat_Civil_01_F", "C_Rubberboat"]; ["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; @@ -89,10 +89,12 @@ if (_hasKart) then { ["vehiclesBasic", _vehiclesBasic] call _fnc_saveToTemplate; ["vehiclesPlane", _vehiclePlane] call _fnc_saveToTemplate; ["vehiclesCivTruck", _CivTruck] call _fnc_saveToTemplate; +["vehiclesCivHeli", _vehiclesCivHeli] call _fnc_saveToTemplate; ["vehiclesTruck", _VehTruck] call _fnc_saveToTemplate; ["vehiclesCivBoat", _CivBoat] call _fnc_saveToTemplate; ["vehiclesAA", _vehicleAA] call _fnc_saveToTemplate; ["staticAA", _staticAA] call _fnc_saveToTemplate; +["staticMortars", _staticMortars] call _fnc_saveToTemplate; ["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; ["vehiclesLightUnarmed", _vehiclesLightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _vehiclesLightArmed] call _fnc_saveToTemplate; @@ -191,6 +193,11 @@ private _initialRebelEquipment = [ "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol" ]; +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"]; +}; + if (_hasLawsOfWar) then { _initialRebelEquipment append [ "V_Pocketed_olive_F", @@ -342,6 +349,12 @@ if (_hasArtOfWar) then { "U_C_ArtTShirt_01_v6_F" ]; }; +if ("rf" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" + ]; +}; ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; private _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 1f443bea55..3151444c47 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf @@ -25,15 +25,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_Truck_02_transport_F", "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", "O_Heli_Light_02_unarmed_F" , "I_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; @@ -51,6 +51,17 @@ if (_hasWs) then { _staticAA = ["I_Tura_ZU23_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_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; @@ -149,6 +160,11 @@ private _initialRebelEquipment = [ "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol" ]; +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"]; +}; + if (_hasLawsOfWar) then { _initialRebelEquipment append [ "V_Pocketed_olive_F", @@ -256,11 +272,7 @@ if (_hasWs) then { "U_lxWS_ION_Casual3", "U_lxWS_ION_Casual4", "U_lxWS_ION_Casual5", - "U_lxWS_SFIA_deserter", - "U_lxWS_Djella_02_Brown", - "U_lxWS_Djella_02_Grey", - "U_lxWS_Djella_03_Green", - "U_lxWS_Djella_02_Sand" + "U_lxWS_SFIA_deserter" ]; }; if (_hasApex) then { @@ -298,6 +310,12 @@ if (_hasArtOfWar) then { "U_C_ArtTShirt_01_v6_F" ]; }; +if ("rf" in A3A_enabledDLC) then { + _dlcUniforms append [ + "U_IG_Guerrilla_RF", + "U_IG_leader_RF" + ]; +}; ["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; private _rebUniforms = [ 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 9abc4f9f27..c6ac693efb 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,5 +2,17 @@ ["I_C_Offroad_02_LMG_F", ["rebCost", 500]], ["I_G_Offroad_01_armor_base_lxWS", ["rebCost", 500]], ["I_G_Offroad_01_armor_armed_lxWS", ["rebCost", 1100]], - ["I_G_Offroad_01_armor_AT_lxWS", ["rebCost", 1500]] + ["I_G_Offroad_01_armor_AT_lxWS", ["rebCost", 1500]], + + ["a3a_C_Heli_Transport_02_F", ["rebCost", 8000]] ]] call _fnc_saveToTemplate; + +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/core/Templates/Templates/WS/WS_Civ.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf new file mode 100644 index 0000000000..498c059f6b --- /dev/null +++ b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf @@ -0,0 +1,260 @@ +////////////////////////////// +// Civilian Information // +////////////////////////////// + +////////////////////////// +// Vehicles // +////////////////////////// + +private _vehiclesCivCar = [ + "C_Quadbike_01_F", 0.15 + ,"C_Hatchback_01_F", 1.0 + ,"C_Hatchback_01_sport_F", 0.15 + ,"C_Offroad_01_F", 1.5 + ,"C_Offroad_lxWS", 1.5 + ,"C_SUV_01_F", 0.75 + ,"C_Van_02_vehicle_F", 1.0 // van from Orange + ,"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 +]; + +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 + ,"C_Truck_02_racing_lxWS", 0.2 + ,"C_Truck_02_flatbed_lxWS", 0.5 + ,"C_Truck_02_cargo_lxWS", 0.5 +]; + +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 +]; + +private _vehiclesCivRepair = [ + "C_Offroad_01_repair_F", 0.3 + ,"C_Van_02_service_F", 0.3 // orange + ,"C_Truck_02_box_F", 0.1 +]; + +private _vehiclesCivMedical = ["C_Van_02_medevac_F", 0.1]; + +private _vehiclesCivFuel = [ + "C_Van_01_fuel_F", 0.2 + ,"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 /// +///////////////////// + +["faces", ["PersianHead_A3_01","PersianHead_A3_02","PersianHead_A3_03", +"lxWS_African_Head_Old","lxWS_African_Head_01","lxWS_African_Head_02", +"lxWS_African_Head_03","lxWS_African_Head_04","lxWS_African_Head_05","lxWS_Said_Head", +"lxWS_African_Head_Old_Bard"]] call _fnc_saveToTemplate; +"lxWS_WSaharaMen" call _fnc_saveNames; + +////////////////////////// +// Loadouts // +////////////////////////// + +private _civUniforms = [ + "U_lxWS_C_Djella_01", + "U_lxWS_C_Djella_02", + "U_lxWS_C_Djella_02a", + "U_lxWS_C_Djella_03", + "U_lxWS_C_Djella_04", + "U_lxWS_C_Djella_05", + "U_lxWS_C_Djella_06", + "U_lxWS_C_Djella_07", + "U_lxWS_Tak_01_A", + "U_lxWS_Tak_01_B", + "U_lxWS_Tak_01_C", + "U_lxWS_Tak_02_A", + "U_lxWS_Tak_02_B", + "U_lxWS_Tak_02_C", + "U_lxWS_Tak_03_A", + "U_lxWS_Tak_03_B", + "U_lxWS_Tak_03_C" +]; + +private _pressUniforms = [ + "U_C_Journalist", + "U_Marshal" + ]; + +private _workerUniforms = [ + "U_C_WorkerCoveralls", + "U_C_Uniform_Farmer_01_F" + ]; + +private _dlcUniforms = []; + +if (allowDLCOrange) then { + _dlcUniforms append [ + "U_C_Paramedic_01_F", + "U_C_Mechanic_01_F" + ]; +}; + +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 { + _civUniforms append _RFleatherJackets; + }; +}; + +_workerUniforms append [ +"U_C_ConstructionCoverall_Black_F", +"U_C_ConstructionCoverall_Blue_F", +"U_C_ConstructionCoverall_Red_F", +"U_C_ConstructionCoverall_Vrana_F" +]; + +["uniforms", _civUniforms + _pressUniforms + _workerUniforms + _dlcUniforms] call _fnc_saveToTemplate; + +private _civhats = [ + "H_Bandanna_blu", + "H_Bandanna_cbr", + "H_Bandanna_gry", + "H_Bandanna_khk", + "H_Bandanna_sand", + "H_Bandanna_sgg", + "H_Bandanna_surfer", + "H_Bandanna_surfer_blk", + "H_Bandanna_surfer_grn", + "H_Cap_blk", + "H_Cap_blu", + "H_Cap_grn", + "H_Cap_grn_BI", + "H_Cap_oli", + "H_Cap_red", + "H_Cap_surfer", + "H_Cap_tan", + "H_StrawHat", + "H_StrawHat_dark", + "H_Hat_checker", + "H_ShemagOpen_khk", + "lxWS_H_cloth_5_A", + "lxWS_H_cloth_5_C", + "lxWS_H_cloth_5_B", + + "lxWS_H_turban_01_black", + "lxWS_H_turban_01_blue", + "lxWS_H_turban_01_green", + "lxWS_H_turban_01_red", + "lxWS_H_turban_01_sand", + "lxWS_H_turban_01_gray", + "lxWS_H_turban_01_yellow", + + "lxWS_H_turban_02_black", + "lxWS_H_turban_02_blue", + "lxWS_H_turban_02_green", + "lxWS_H_turban_02_orange", + "lxWS_H_turban_02_red", + "lxWS_H_turban_02_sand", + "lxWS_H_turban_02_gray", + "lxWS_H_turban_02_yellow", + + "lxWS_H_turban_03_black", + "lxWS_H_turban_03_blue", + "lxWS_H_turban_03_green", + "lxWS_H_turban_03_orange", + "lxWS_H_turban_03_red", + "lxWS_H_turban_03_sand", + "lxWS_H_turban_03_gray", + "lxWS_H_turban_03_yellow", + + "lxWS_H_turban_04_black", + "lxWS_H_turban_04_blue", + "lxWS_H_turban_04_green", + "lxWS_H_turban_04_red", + "lxWS_H_turban_04_sand", + "lxWS_H_turban_04_gray", + "lxWS_H_turban_04_yellow" +]; + +["headgear", _civHats] call _fnc_saveToTemplate; + +private _loadoutData = call _fnc_createLoadoutData; + +_loadoutData set ["uniforms", _civUniforms]; +_loadoutData set ["pressUniforms", _pressUniforms]; +_loadoutData set ["workerUniforms", _workerUniforms]; +_loadoutData set ["pressVests", ["V_Press_F"]]; +_loadoutData set ["helmets", _civHats]; +_loadoutData set ["pressHelmets", ["H_Cap_press", "H_PASGT_basic_blue_press_F","H_PASGT_neckprot_blue_press_F"]]; + +_loadoutData set ["maps", ["ItemMap"]]; +_loadoutData set ["watches", ["ItemWatch"]]; +_loadoutData set ["compasses", ["ItemCompass"]]; + + +private _manTemplate = { + ["helmets"] call _fnc_setHelmet; + ["uniforms"] call _fnc_setUniform; + + ["items_medical_standard"] call _fnc_addItemSet; + + ["maps"] call _fnc_addMap; + ["watches"] call _fnc_addWatch; + ["compasses"] call _fnc_addCompass; +}; +private _workerTemplate = { + ["helmets"] call _fnc_setHelmet; + ["workerUniforms"] call _fnc_setUniform; + + ["items_medical_standard"] call _fnc_addItemSet; + + ["maps"] call _fnc_addMap; + ["watches"] call _fnc_addWatch; + ["compasses"] call _fnc_addCompass; +}; +private _pressTemplate = { + ["pressHelmets"] call _fnc_setHelmet; + ["pressVests"] call _fnc_setVest; + ["pressUniforms"] call _fnc_setUniform; + + ["items_medical_standard"] call _fnc_addItemSet; + + ["maps"] call _fnc_addMap; + ["watches"] call _fnc_addWatch; + ["compasses"] call _fnc_addCompass; +}; +private _prefix = "militia"; +private _unitTypes = [ + ["Press", _pressTemplate], + ["Worker", _workerTemplate], + ["Man", _manTemplate] +]; + +[_prefix, _unitTypes, _loadoutData] call _fnc_generateAndSaveUnitsToTemplate; \ No newline at end of file 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 e946b6ee40..bfb77db9dd 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Tura.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Tura.sqf @@ -14,26 +14,26 @@ private _hasContact = "enoch" in A3A_enabledDLC; ["flagMarkerType", "lxWS_flag_Argana"] call _fnc_saveToTemplate; ["vehiclesBasic", ["I_G_Quadbike_01_F"]] call _fnc_saveToTemplate; -["vehiclesLightUnarmed", ["I_G_Offroad_01_F"]] call _fnc_saveToTemplate; -["vehiclesLightArmed", ["I_G_Offroad_01_armed_F"]] call _fnc_saveToTemplate; +private _vehiclesLightUnarmed = ["O_SFIA_Offroad_lxWS","O_Tura_Offroad_armor_lxWS"]; +private _vehiclesLightArmed = ["O_SFIA_Offroad_armed_lxWS","O_Tura_Offroad_armor_armed_lxWS"]; ["vehiclesTruck", ["I_G_Van_01_transport_F"]] call _fnc_saveToTemplate; -["vehiclesAT", ["I_Tura_Offroad_armor_AT_lxWS"]] call _fnc_saveToTemplate; +private _vehiclesAT = ["O_SFIA_Offroad_AT_lxWS","O_Tura_Offroad_armor_AT_lxWS"]; ["vehiclesAA", ["I_G_Offroad_01_AT_F"]] call _fnc_saveToTemplate; ["vehiclesBoat", ["I_C_Boat_Transport_02_F"]] call _fnc_saveToTemplate; ["vehiclesPlane", ["I_C_Plane_Civil_01_F"]] call _fnc_saveToTemplate; -["vehiclesCivCar", ["C_Offroad_lxWS"]] call _fnc_saveToTemplate; +private _vehiclesCivCar = ["C_Offroad_lxWS", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", "C_SUV_01_F", "C_Offroad_01_F"]; ["vehiclesCivTruck", ["C_Truck_02_transport_F"]] call _fnc_saveToTemplate; -["vehiclesCivHeli", ["C_Heli_Light_01_civil_F"]] call _fnc_saveToTemplate; +private _vehiclesCivHeli = ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]; ["vehiclesCivBoat", ["C_Rubberboat"]] call _fnc_saveToTemplate; ["staticMGs", ["I_G_HMG_02_high_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; @@ -43,6 +43,28 @@ private _hasContact = "enoch" in A3A_enabledDLC; ["breachingExplosivesAPC", [["DemoCharge_Remote_Mag", 1]]] call _fnc_saveToTemplate; ["breachingExplosivesTank", [["SatchelCharge_Remote_Mag", 1], ["DemoCharge_Remote_Mag", 2]]] call _fnc_saveToTemplate; +if ("expansion" in A3A_enabledDLC) then { + _vehiclesCivCar append ["C_Offroad_02_unarmed_F"]; + _vehiclesLightUnarmed append ["I_C_Offroad_02_unarmed_F"]; + _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_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; + ////////////////////////////////////// // Antistasi Plus Stuff // ////////////////////////////////////// @@ -81,6 +103,11 @@ private _initialRebelEquipment = [ "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol" ]; +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"]; +}; + private _backpacks = []; if (_hasLawsOfWar) then { _backpacks append [ @@ -166,6 +193,13 @@ if (_hasApex) then { ]; }; +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/functions/init/fn_initVarServer.sqf b/A3A/addons/core/functions/init/fn_initVarServer.sqf index c87b6dd331..cff4048947 100644 --- a/A3A/addons/core/functions/init/fn_initVarServer.sqf +++ b/A3A/addons/core/functions/init/fn_initVarServer.sqf @@ -301,8 +301,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", "kart"])} + (_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 71a7c0573c..ba54b84ea4 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","kart"])} + (_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 3de44a1b03..5228a4c21b 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\Scion.hpp" diff --git a/A3A/addons/logistics/Nodes/RF.hpp b/A3A/addons/logistics/Nodes/RF.hpp new file mode 100644 index 0000000000..ff1a4d76fd --- /dev/null +++ b/A3A/addons/logistics/Nodes/RF.hpp @@ -0,0 +1,53 @@ +// RF.hpp - Vehicle Logistic Nodes + +// https://github.com/official-antistasi-community/A3-Antistasi/pull/3185 + +//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 6a080a9722d9f2516410116ca9e56d4a61294a31 Mon Sep 17 00:00:00 2001 From: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Sat, 30 Mar 2024 17:38:01 +0000 Subject: [PATCH 2/5] bug fixes --- .../Templates/Vanilla/Vanilla_AI_AAF.sqf | 70 ++++++++-------- .../Vanilla/Vanilla_AI_CSAT_Arid.sqf | 74 ++++++++--------- .../Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 70 ++++++++-------- .../Templates/Vanilla/Vanilla_AI_LDF.sqf | 66 +++++++-------- .../Vanilla/Vanilla_AI_NATO_Arid.sqf | 1 - .../Vanilla/Vanilla_AI_NATO_Temperate.sqf | 81 +++++++++---------- .../Vanilla/Vanilla_AI_NATO_Tropical.sqf | 81 +++++++++---------- .../Templates/Vanilla/Vanilla_Civ.sqf | 3 +- .../Templates/Vanilla/Vanilla_Reb_SDK.sqf | 15 ++-- 9 files changed, 228 insertions(+), 233 deletions(-) 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 fac97cdd69..0973e9b486 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -388,40 +388,6 @@ _sfLoadoutData set ["sidearms", [ ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] ]]; -if ("rf" in A3A_enabledDLC) then { - (_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", [], [], ""] - ]; - (_militaryLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] - ]; - (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] - ]; - (_policeLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] - ]; - (_sfLoadoutData get "helmets") append [ - "H_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"]; -}; - ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// @@ -673,9 +639,39 @@ _pilotLoadoutData set ["uniforms", ["U_I_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_oli"]]; _pilotLoadoutData set ["helmets", ["H_PilotHelmetHeli_I", "H_CrewHelmetHeli_I"]]; - - - +if ("rf" in A3A_enabledDLC) then { + (_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", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_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_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf index f43d9551a8..0b60d523d8 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 @@ -451,43 +451,6 @@ _sfLoadoutData set ["sidearms", [ ["hgun_Rook40_F", "muzzle_snds_L", "", "", [], [], ""] ]]; -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", [], [], ""] - ]; - (_militaryLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] - ]; - (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] - ]; - (_policeLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] - ]; - (_militaryLoadoutData get "helmets") append ["H_HelmetO_ocano_sb_hex_RF"]; - (_militiaLoadoutData get "helmets") append ["H_HelmetO_ocamo_sb_hex_RF"]; -}; - ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// @@ -739,6 +702,43 @@ _pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_BandollierB_khk"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]]; +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", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_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 b3c02a81c8..46e9e0ba5d 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 @@ -442,41 +442,6 @@ _sfLoadoutData set ["sidearms", [ ["hgun_Rook40_F", "muzzle_snds_L", "", "", [], [], ""] ]]; -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", [], [], ""] - ]; - (_militaryLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] - ]; - (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] - ]; - (_policeLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] - ]; -}; - ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// @@ -729,6 +694,41 @@ _pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_BandollierB_khk"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]]; +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", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; +}; + ///////////////////////////////// // 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 35a95f746a..f02e91e373 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -357,39 +357,6 @@ _sfLoadoutData set ["sidearms", [ ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] ]]; -if ("rf" in A3A_enabledDLC) then { - _sfLoadoutData set ["sidearms", [ - ["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", [], [], ""] - ]; - (_militaryLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] - ]; - (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] - ]; - (_policeLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] - ]; - (_sfLoadoutData get "helmets") append [ - "H_HelmetB_plain_sb_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"]; -}; - ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// @@ -651,6 +618,39 @@ _pilotLoadoutData set ["uniforms", ["U_I_E_Uniform_01_coveralls_F"]]; _pilotLoadoutData set ["vests", ["V_CarrierRigKBT_01_EAF_F"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_I_E", "H_PilotHelmetHeli_I_E"]]; +if ("rf" in A3A_enabledDLC) then { + _sfLoadoutData set ["sidearms", [ + ["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", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_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_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf index 1e29c39862..757a96a01e 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 @@ -154,7 +154,6 @@ if ("rf" in A3A_enabledDLC) then { ["vehiclesHelisLightAttack", _vehiclesHelisLightAttack] call _fnc_saveToTemplate; ["vehiclesPlanesTransport", _planesTransport] call _fnc_saveToTemplate; ["vehiclesHelisLight", _helisLight] call _fnc_saveToTemplate; -["vehiclesHelisLightAttack", _helisLightAttack] call _fnc_saveToTemplate; ["vehiclesHelisAttack", _helisAttack] call _fnc_saveToTemplate; ["staticHowitzers", _howitzers] call _fnc_saveToTemplate; ["vehicleRadar", _radar] call _fnc_saveToTemplate; 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 4b7145ce4f..4e737e882d 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 @@ -503,46 +503,6 @@ _sfLoadoutData set ["sidearms", [ ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] ]]; -if ("rf" in A3A_enabledDLC) then { - (_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", "", [], [], ""] - ]; - (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; - (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; - (_sfLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""] - ]; - (_militaryLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] - ]; - (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] - ]; - (_policeLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] - ]; - (_sfLoadoutData get "helmets") append [ - "H_HelmetB_plain_sb_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"]; -}; - ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// @@ -794,8 +754,45 @@ _pilotLoadoutData set ["uniforms", ["U_B_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_oli"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_B", "H_PilotHelmetHeli_B"]]; - - +if ("rf" in A3A_enabledDLC) then { + (_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", "", [], [], ""] + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_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_Tropical.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf index a2b1ba9afa..61e0cb1752 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 @@ -503,46 +503,6 @@ _sfLoadoutData set ["sidearms", [ ["hgun_ACPC2_F", "muzzle_snds_acp", "acc_flashlight_pistol", "", [], [], ""] ]]; -if ("rf" in A3A_enabledDLC) then { - (_sfLoadoutData get "sidearms") append [ - ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""] - ]; - (_militaryLoadoutData get "sidearms") append [ - ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], - ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], - ["hgun_Glock19_auto_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""] - ]; - (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; - (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; - (_sfLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""] - ]; - (_militaryLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] - ]; - (_militiaLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] - ]; - (_policeLoadoutData get "SMGs") append [ - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], - ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] - ]; - (_sfLoadoutData get "helmets") append [ - "H_HelmetB_plain_sb_tna_RF", - "H_HelmetHeavy_Olive_RF", - "H_HelmetHeavy_Simple_Olive_RF", - "H_HelmetHeavy_VisorUp_Olive_RF" - ]; - (_militaryLoadoutData get "helmets") append ["H_HelmetB_plain_sb_tna_RF"]; -}; - ///////////////////////////////// // Elite Loadout Data // ///////////////////////////////// @@ -835,8 +795,45 @@ _pilotLoadoutData set ["uniforms", ["U_B_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_oli"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_B", "H_PilotHelmetHeli_B"]]; - - +if ("rf" in A3A_enabledDLC) then { + (_sfLoadoutData get "sidearms") append [ + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""] + ]; + (_militaryLoadoutData get "sidearms") append [ + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""], + ["hgun_Glock19_khk_RF", "", "acc_flashlight_pistol", "optic_MRD_khk_RF", [], [], ""], + ["hgun_Glock19_auto_khk_RF", "", "acc_flashlight_pistol", "", [], [], ""] + ]; + (_policeLoadoutData get "sidearms") append ["hgun_Glock19_RF"]; + (_pilotLoadoutData get "uniforms") append ["U_B_HeliPilotCoveralls_MTP_RF"]; + (_sfLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "muzzle_snds_acp", "", "optic_Holosight", [], [], ""] + ]; + (_militaryLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "", "optic_Aco_smg", [], [], ""] + ]; + (_militiaLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "", [], [], ""] + ]; + (_policeLoadoutData get "SMGs") append [ + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Holosight", [], [], ""], + ["SMG_01_black_RF", "", "acc_flashlight_smg_01", "optic_Aco_smg", [], [], ""] + ]; + (_sfLoadoutData get "helmets") append [ + "H_HelmetB_plain_sb_tna_RF", + "H_HelmetHeavy_Olive_RF", + "H_HelmetHeavy_Simple_Olive_RF", + "H_HelmetHeavy_VisorUp_Olive_RF" + ]; + (_militaryLoadoutData get "helmets") append ["H_HelmetB_plain_sb_tna_RF"]; +}; ///////////////////////////////// // 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 1496f40611..e33e75be81 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf @@ -220,7 +220,8 @@ if ("rf" in A3A_enabledDLC) then { "U_C_PilotJacket_lbrown_RF", "U_C_PilotJacket_open_black_RF", "U_C_PilotJacket_open_brown_RF", - "U_C_PilotJacket_open_lbrown_RF"]; + "U_C_PilotJacket_open_lbrown_RF" + ]; _dlcUniforms append _RFleatherJackets; if (A3A_climate in ["temperate","arctic"]) then { _civUniforms append _RFleatherJackets; 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 3151444c47..efb01318e6 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf @@ -1,8 +1,13 @@ private _hasWs = "ws" in A3A_enabledDLC; +private _hasMarksman = "mark" in A3A_enabledDLC; private _hasLawsOfWar = "orange" in A3A_enabledDLC; +private _hasTanks = "tank" in A3A_enabledDLC; private _hasApex = "expansion" in A3A_enabledDLC; +private _hasHelicopters = "heli" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; +private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; +private _hasKart = "kart" in A3A_enabledDLC; /////////////////////////// // Rebel Information // @@ -18,7 +23,7 @@ private _hasArtOfWar = "aow" in A3A_enabledDLC; private _vehiclesLightUnarmed = ["I_G_Offroad_01_F", "I_C_Offroad_02_unarmed_F"]; private _vehiclesLightArmed = ["I_C_Offroad_02_LMG_F", "I_G_Offroad_01_armed_F"]; ["vehiclesTruck", ["I_C_Van_01_transport_F"]] call _fnc_saveToTemplate; -private _vehiclesAt = ["I_G_Offroad_01_AT_F", "I_C_Offroad_02_AT_F"]; +private _vehiclesAT = ["I_G_Offroad_01_AT_F", "I_C_Offroad_02_AT_F"]; private _vehicleAA = []; ["vehiclesBoat", ["I_C_Boat_Transport_02_F"]] call _fnc_saveToTemplate; @@ -47,7 +52,7 @@ if (_hasWs) then { _vehiclesLightUnarmed pushBack "I_G_Offroad_01_armor_base_lxWS"; _vehiclesLightArmed pushBack "I_G_Offroad_01_armor_armed_lxWS"; _vehiclesAt pushBack "I_G_Offroad_01_armor_AT_lxWS"; - _vehiclesAA pushBack "I_Tura_Truck_02_aa_lxWS"; + _vehicleAA pushBack "I_Tura_Truck_02_aa_lxWS"; _staticAA = ["I_Tura_ZU23_lxWS"]; }; @@ -64,8 +69,8 @@ if ("rf" in A3A_enabledDLC) then { ["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; ["vehiclesLightUnarmed", _vehiclesLightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _vehiclesLightArmed] call _fnc_saveToTemplate; -["vehiclesAT", _vehiclesAt] call _fnc_saveToTemplate; -["vehiclesAA", _vehiclesAA] call _fnc_saveToTemplate; +["vehiclesAT", _vehiclesAT] call _fnc_saveToTemplate; +["vehiclesAA", _vehicleAA] call _fnc_saveToTemplate; ["staticAA", _staticAA] call _fnc_saveToTemplate; ////////////////////////////////////// @@ -431,7 +436,7 @@ if (_hasLawsOfWar) then { ]; }; -["headgear", _headgear + _dlcheadgear] call _fnc_saveToTemplate; +["headgear", _dlcheadgear] call _fnc_saveToTemplate; ///////////////////// /// Identities /// From fa9a06d8211c898fdb8cd2dd296c48c750914b68 Mon Sep 17 00:00:00 2001 From: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:26:25 +0100 Subject: [PATCH 3/5] ws_civ fix + rivals RF support --- A3A/addons/config_fixes/RF/CfgVehicles.hpp | 12 ++++++ .../Vanilla/Vanilla_Riv_Exegermenos.sqf | 12 ++++++ .../Templates/Vanilla/Vanilla_Riv_LE.sqf | 40 ++++++++++++++----- .../core/Templates/Templates/WS/WS_Civ.sqf | 2 +- .../Templates/WS/WS_Riv_Exegermenos.sqf | 12 ++++++ 5 files changed, 68 insertions(+), 10 deletions(-) diff --git a/A3A/addons/config_fixes/RF/CfgVehicles.hpp b/A3A/addons/config_fixes/RF/CfgVehicles.hpp index e0abc6269d..14ae7f7b70 100644 --- a/A3A/addons/config_fixes/RF/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/RF/CfgVehicles.hpp @@ -16,11 +16,23 @@ class CfgVehicles 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 a3u_black_Pickup_rival_rf : a3a_black_Pickup_rf + { + animationList[] = {"hide_rack",0,"hide_antenna",1,"hide_bullbar",0,"hide_snorkel",1,"hide_armor_window_armor_top",1,"hide_trunk_cover",0,"hide_sidesteps",0,"trunk_door_open",0}; + }; 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 a3u_black_Pickup_mmg_frame_rf : a3a_black_Pickup_mmg_rf + { + animationList[] = {"hide_antenna",1,"hide_bullbar",0,"hide_snorkel",1,"hide_armor_window_armor_top",1,"hide_frame",1,"hide_frame_full",0,"hide_sidesteps",0,"trunk_door_open",1}; + }; + class a3u_black_Pickup_mmg_alt_rf : a3a_black_Pickup_mmg_rf + { + animationList[] = {"hide_antenna",0,"hide_bullbar",0,"hide_snorkel",1,"hide_armor_window_armor_top",1,"hide_frame",0,"hide_frame_full",0,"hide_sidesteps",0,"trunk_door_open",0}; + }; 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}; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf index 535423cd39..ae8a6f3cb3 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf @@ -78,6 +78,11 @@ if (_hasTanks) then { _tanks pushBack "I_LT_01_cannon_F"; }; +if ("rf" in A3A_enabledDLC) then { + _lightArmedVehicles append ["a3a_black_Pickup_mmg_rf", "a3u_black_Pickup_mmg_frame_rf", "a3u_black_Pickup_mmg_alt_rf"]; + _lightUnarmedVehicles pushBack "a3u_black_Pickup_rival_rf"; +}; + ["vehiclesRivalsLightArmed", _lightArmedVehicles] call _fnc_saveToTemplate; ["vehiclesRivalsTrucks", _trucks] call _fnc_saveToTemplate; ["vehiclesRivalsCars", _lightUnarmedVehicles] call _fnc_saveToTemplate; @@ -152,6 +157,13 @@ private _rpgs = [ private _pistols = ["hgun_Rook40_F"]; +if ("rf" in A3A_enabledDLC) then { + _marksmanRifles pushBack ["srifle_DMR_01_black_RF", "", "acc_flashlight", "optic_VRCO_RF", ["10Rnd_762x54_Mag"], [], ""]; + _enforcerRifles pushBack ["arifle_ash12_LR_blk_RF", "", "", "optic_VRCO_RF", ["20Rnd_127x55_Mag_RF"], [], ""]; + _gls pushBack ["arifle_ash12_GL_blk_RF", "", "acc_flashlight", "optic_VRCO_khk_RF", ["10Rnd_127x55_Mag_RF", "20Rnd_127x55_Mag_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_SmokeGreen_Grenade_shell", "UGL_FlareGreen_F"], ""]; + _pistols = ["hgun_Glock19_RF", "hgun_Glock19_auto_RF", "hgun_DEagle_RF"]; +}; + if (_hasContact) then { _carbines pushBack ["arifle_AK12U_F", "", "", "", ["30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Tracer_Green_F"], [], ""]; _tunedRifles pushBack ["arifle_AK12U_F", "", "acc_flashlight", "optic_ACO_grn", ["30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Tracer_Green_F"], [], ""]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf index a5dfe66b71..7dae5ca8d3 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf @@ -23,15 +23,13 @@ private _hasContact = "enoch" in A3A_enabledDLC; ["ammobox", "Box_FIA_Support_F"] call _fnc_saveToTemplate; //Don't touch or you die a sad and lonely death! ["surrenderCrate", "Box_Syndicate_Wps_F"] call _fnc_saveToTemplate; -["vehiclesRivalsLightArmed", ["I_C_Offroad_02_AT_F", "I_C_Offroad_02_LMG_F"]] call _fnc_saveToTemplate; -["vehiclesRivalsCars", ["I_C_Offroad_02_unarmed_F"]] call _fnc_saveToTemplate; +private _vehiclesRivalsLightArmed = ["I_C_Offroad_02_AT_F", "I_C_Offroad_02_LMG_F"]; +private _vehiclesRivalsCars = ["I_C_Offroad_02_unarmed_F"]; +private _vehiclesRivalsTrucks = ["I_C_Van_01_transport_F"]; +private _vehiclesRivalsHelis = ["I_C_Heli_Light_01_civil_F"]; -["vehiclesRivalsLightArmed", ["I_C_Offroad_02_AT_F", "I_C_Offroad_02_LMG_F"]] call _fnc_saveToTemplate; -["vehiclesRivalsCars", ["I_C_Offroad_02_unarmed_F"]] call _fnc_saveToTemplate; -["vehiclesRivalsTrucks", ["I_C_Van_01_transport_F"]] call _fnc_saveToTemplate; ["vehiclesRivalsAPCs", []] call _fnc_saveToTemplate; ["vehiclesRivalsTanks", []] call _fnc_saveToTemplate; -["vehiclesRivalsHelis", ["I_C_Heli_Light_01_civil_F"]] call _fnc_saveToTemplate; ["vehiclesRivalsUavs", ["O_UAV_01_F"]] call _fnc_saveToTemplate; ["staticLowWeapons", ["O_G_HMG_02_F"]] call _fnc_saveToTemplate; @@ -46,6 +44,17 @@ private _hasContact = "enoch" in A3A_enabledDLC; ["minefieldAT", ["ATMine"]] call _fnc_saveToTemplate; ["minefieldAPERS", ["APERSMine", "APERSBoundingMine"]] call _fnc_saveToTemplate; +if ("rf" in A3A_enabledDLC) then { + _vehiclesRivalsLightArmed append ["I_C_Pickup_mmg_rf", "B_T_Pickup_mmg_rf"]; + _vehiclesRivalsCars append ["I_C_Pickup_rf", "B_T_Pickup_rf", "B_T_Pickup_Comms_rf", "C_Pickup_rf"]; + _vehiclesRivalsHelis append ["C_Heli_EC_01A_civ_RF", "C_Heli_EC_01_civ_RF"]; +}; + +["vehiclesRivalsLightArmed", _vehiclesRivalsLightArmed] call _fnc_saveToTemplate; +["vehiclesRivalsCars", _vehiclesRivalsCars] call _fnc_saveToTemplate; +["vehiclesRivalsTrucks", _vehiclesRivalsTrucks] call _fnc_saveToTemplate; +["vehiclesRivalsHelis", _vehiclesRivalsHelis] call _fnc_saveToTemplate; + ////////////////////////// // Loadouts // ////////////////////////// @@ -78,6 +87,21 @@ private _marksmanRifles = [ private _pistols = ["hgun_Pistol_01_F"]; +private _helmets = ["H_Helmet_Skate"]; + +if ("rf" in A3A_enabledDLC) then { + _marksmanRifles pushBack ["srifle_DMR_01_black_RF", "", "acc_flashlight", "optic_VRCO_RF", ["10Rnd_762x54_Mag"], [], ""]; + _gls pushBack ["arifle_ash12_GL_wood_RF", "", "acc_flashlight", "optic_VRCO_khk_RF", ["10Rnd_127x55_Mag_wood_RF", "20Rnd_127x55_Mag_wood_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_SmokeGreen_Grenade_shell", "UGL_FlareGreen_F"], ""]; + _pistols append ["hgun_Glock19_auto_khk_RF", "hgun_DEagle_classic_RF"]; + + _helmets = ["H_HelmetHeavy_VisorUp_Olive_RF", "H_HelmetB_plain_sb_tna_RF"]; + + if (random 100 <= 10) then { + _tunedRifles pushBack ["srifle_h6_gold_rf", "muzzle_snds_M", "", "optic_VRCO_RF", ["30Rnd_556x45_AP_Stanag_green_RF"], [], ""]; + _pistols append ["hgun_DEagle_gold_RF"]; + }; +}; + if (_hasContact) then { _carbines pushBack ["arifle_AK12U_F", "", "", "", ["30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Tracer_Green_F"], [], ""]; _tunedRifles pushBack ["arifle_AK12U_F", "", "acc_flashlight", "optic_ACO_grn", ["30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Tracer_Green_F"], [], ""]; @@ -143,6 +167,7 @@ _loadoutData set ["facewear", [ "G_Aviator", "G_Combat", "G_Bandanna_aviator", + "G_Bandanna_Syndikat2", "G_Bandanna_beast", "G_Bandanna_sport", "G_Bandanna_shades", @@ -167,7 +192,6 @@ _loadoutData set ["NVGs", ["NVGoggles_INDEP"]]; _loadoutData set ["binoculars", ["Binocular"]]; _loadoutData set ["Rangefinder", ["Rangefinder"]]; - _loadoutData set ["uniforms", [ "U_I_C_Soldier_Bandit_4_F", "U_I_C_Soldier_Bandit_1_F", @@ -176,8 +200,6 @@ _loadoutData set ["uniforms", [ "U_I_C_Soldier_Bandit_3_F" ]]; -private _helmets = ["H_Helmet_Skate"]; - if (_hasLawsOfWar) then { _helmets pushBack "H_PASGT_basic_olive_F"; }; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf index 498c059f6b..cb10606e2b 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf @@ -74,7 +74,7 @@ if ("rf" in A3A_enabledDLC) then { "lxWS_African_Head_Old","lxWS_African_Head_01","lxWS_African_Head_02", "lxWS_African_Head_03","lxWS_African_Head_04","lxWS_African_Head_05","lxWS_Said_Head", "lxWS_African_Head_Old_Bard"]] call _fnc_saveToTemplate; -"lxWS_WSaharaMen" call _fnc_saveNames; +// "lxWS_WSaharaMen" call _fnc_saveNames; ////////////////////////// // Loadouts // diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf index f863027d42..fc7e53102c 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf @@ -63,6 +63,11 @@ if (_hasLawsOfWar) then { _trucks pushBack "O_G_Van_02_transport_F"; }; +if ("rf" in A3A_enabledDLC) then { + _lightArmedVehicles append ["a3a_black_Pickup_mmg_rf", "a3u_black_Pickup_mmg_frame_rf", "a3u_black_Pickup_mmg_alt_rf"]; + _lightUnarmedVehicles pushBack "a3u_black_Pickup_rival_rf"; +}; + ["vehiclesRivalsLightArmed", _lightArmedVehicles] call _fnc_saveToTemplate; ["vehiclesRivalsTrucks", _trucks] call _fnc_saveToTemplate; ["vehiclesRivalsCars", _lightUnarmedVehicles] call _fnc_saveToTemplate; @@ -121,6 +126,13 @@ private _rpgs = [ private _pistols = ["hgun_Rook40_F"]; +if ("rf" in A3A_enabledDLC) then { + _marksmanRifles pushBack ["srifle_DMR_01_tan_RF", "", "acc_flashlight", "optic_VRCO_RF", ["10Rnd_762x54_Mag"], [], ""]; + _enforcerRifles pushBack ["arifle_ash12_LR_desert_RF", "", "", "optic_VRCO_RF", ["20Rnd_127x55_Mag_RF"], [], ""]; + _gls pushBack ["arifle_ash12_GL_desert_RF", "", "acc_flashlight", "optic_VRCO_RF", ["10Rnd_127x55_Mag_RF", "20Rnd_127x55_Mag_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_SmokeGreen_Grenade_shell", "UGL_FlareGreen_F"], ""]; + _pistols = ["hgun_Glock19_Tan_RF", "hgun_Glock19_auto_Tan_RF", "hgun_DEagle_classic_RF"]; +}; + if (_hasContact) then { _carbines pushBack ["arifle_AK12U_F", "", "", "", ["30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Tracer_Green_F"], [], ""]; _tunedRifles pushBack ["arifle_AK12U_F", "", "acc_flashlight", "optic_ACO_grn", ["30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Green_F", "30Rnd_762x39_Mag_Tracer_Green_F"], [], ""]; From 5a91728b6fdf2cd83f58156af4c3b1d4ffd4cd8e Mon Sep 17 00:00:00 2001 From: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Thu, 4 Apr 2024 14:11:54 +0100 Subject: [PATCH 4/5] add pickups to hq box --- .../core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf | 7 +++++++ .../core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf | 7 +++++++ 2 files changed, 14 insertions(+) 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 3a5b17b6e8..3d850ecd00 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf @@ -52,6 +52,13 @@ private _staticMortars = ["I_G_Mortar_01_F"]; ["breachingExplosivesAPC", [["DemoCharge_Remote_Mag", 1]]] call _fnc_saveToTemplate; ["breachingExplosivesTank", [["SatchelCharge_Remote_Mag", 1], ["DemoCharge_Remote_Mag", 2]]] call _fnc_saveToTemplate; +if ("rf" in A3A_enabledDLC) then { + _vehiclesCivCar = ["C_Pickup_rf", "C_Pickup_covered_rf"]; + _vehiclesCivHeli = ["C_Heli_EC_01A_civ_RF", "C_Heli_EC_01_civ_RF"]; + _vehiclesLightArmed = ["a3u_black_Pickup_mmg_alt_rf", "a3u_black_Pickup_mmg_frame_rf"]; + _vehiclesLightUnarmed append ["a3a_black_Pickup_rf"]; +}; + if (_hasApex) then { _vehiclesCivCar pushBack "C_Offroad_02_unarmed_F"; _vehiclesLightUnarmed pushBack "I_C_Offroad_02_unarmed_F"; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf index 3f9b13b66b..78df9b90a5 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf @@ -52,6 +52,13 @@ private _staticAA = ["I_static_AA_F"]; ["breachingExplosivesAPC", [["DemoCharge_Remote_Mag", 1]]] call _fnc_saveToTemplate; ["breachingExplosivesTank", [["SatchelCharge_Remote_Mag", 1], ["DemoCharge_Remote_Mag", 2]]] call _fnc_saveToTemplate; +if ("rf" in A3A_enabledDLC) then { + _vehiclesCivCar = ["C_Pickup_rf", "C_Pickup_covered_rf"]; + _vehiclesCivHeli = ["C_Heli_EC_01A_civ_RF", "C_Heli_EC_01_civ_RF"]; + _vehiclesLightArmed = ["a3u_black_Pickup_mmg_alt_rf", "a3u_black_Pickup_mmg_frame_rf"]; + _vehiclesLightUnarmed append ["a3a_black_Pickup_rf"]; +}; + if (_hasApex) then { _vehiclesCivCar pushBack "C_Offroad_02_unarmed_F"; _vehiclesLightUnarmed pushBack "I_C_Offroad_02_unarmed_F"; From 41ad13b1999e7c45318ac5da2cfd514e2add132b Mon Sep 17 00:00:00 2001 From: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com> Date: Thu, 4 Apr 2024 15:44:56 +0100 Subject: [PATCH 5/5] RF naming convention --- .../core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf | 5 +++-- .../Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf | 5 +++-- .../Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 5 +++-- .../core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf | 5 +++-- .../Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf | 3 ++- .../Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf | 5 +++-- .../Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf | 5 +++-- .../core/Templates/Templates/Vanilla/Vanilla_Civ.sqf | 5 +++-- .../core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf | 7 ++++--- .../core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf | 3 ++- .../core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf | 7 ++++--- .../Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf | 5 +++-- .../core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf | 5 +++-- A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf | 6 ++++-- A3A/addons/core/Templates/Templates/WS/WS_Reb_Tura.sqf | 7 ++++--- .../core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf | 5 +++-- 16 files changed, 50 insertions(+), 33 deletions(-) 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 0973e9b486..9311d5452f 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -7,6 +7,7 @@ private _hasJets = "jets" in A3A_enabledDLC; private _hasHelicopters = "heli" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; private _hasApex = "expansion" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; ////////////////////////// // Side Information // @@ -85,7 +86,7 @@ private _policeVehs = if (_hasContact) then { if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _policeVehs 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"]; @@ -639,7 +640,7 @@ _pilotLoadoutData set ["uniforms", ["U_I_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_oli"]]; _pilotLoadoutData set ["helmets", ["H_PilotHelmetHeli_I", "H_CrewHelmetHeli_I"]]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { (_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", [], [], ""], 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 0b60d523d8..71c676d0bd 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 @@ -7,6 +7,7 @@ private _hasLawsOfWar = "orange" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; ////////////////////////// // Side Information // @@ -96,7 +97,7 @@ private _policeVehs = if (_hasContact) then { ["B_GEN_Offroad_01_gen_F"] }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; }; @@ -702,7 +703,7 @@ _pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_BandollierB_khk"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) 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"], [], ""] 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 46e9e0ba5d..165f5259ea 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 @@ -7,6 +7,7 @@ private _hasLawsOfWar = "orange" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; ////////////////////////// // Side Information // @@ -90,7 +91,7 @@ private _policeVehs = if (_hasContact) then { } else { ["B_GEN_Offroad_01_gen_F"] }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; }; if (_hasLawsOfWar) then { @@ -694,7 +695,7 @@ _pilotLoadoutData set ["uniforms", ["U_O_PilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_BandollierB_khk"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_O", "H_PilotHelmetHeli_O"]]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) 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"], [], ""] 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 f02e91e373..2489b24068 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -7,6 +7,7 @@ private _hasLawsOfWar = "orange" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; ////////////////////////// // Side Information // @@ -82,7 +83,7 @@ private _policeVehs = if (_hasContact) then { if (_hasLawsOfWar) then { _policeVehs append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; _transportHelicopters append ["I_E_Heli_light_03_unarmed_RF","I_E_Heli_EC_01A_military_RF"]; _vehiclesHelisLightAttack append ["a3a_LDF_Heli_light_03_dynamicLoadout_RF"]; @@ -618,7 +619,7 @@ _pilotLoadoutData set ["uniforms", ["U_I_E_Uniform_01_coveralls_F"]]; _pilotLoadoutData set ["vests", ["V_CarrierRigKBT_01_EAF_F"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_I_E", "H_PilotHelmetHeli_I_E"]]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _sfLoadoutData set ["sidearms", [ ["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", [], [], ""], 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 757a96a01e..f6e9dfec52 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 @@ -7,6 +7,7 @@ private _hasLawsOfWar = "orange" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; ////////////////////////// // Side Information // @@ -143,7 +144,7 @@ if (_hasWs) then { _transportHelicopters pushback "B_D_Heli_Transport_01_lxWS"; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; _transportHelicopters 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"]; 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 4e737e882d..c45766b0e1 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 @@ -7,6 +7,7 @@ private _hasHelicopters = "heli" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; ////////////////////////// // Side Information // @@ -131,7 +132,7 @@ if (_hasWs) then { _militiaAPCs pushBack "B_T_APC_Wheeled_01_command_lxWS"; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; _transportHelicopters 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"]; @@ -754,7 +755,7 @@ _pilotLoadoutData set ["uniforms", ["U_B_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_oli"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_B", "H_PilotHelmetHeli_B"]]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { (_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", [], [], ""], 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 61e0cb1752..b811ec756c 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 @@ -7,6 +7,7 @@ private _hasHelicopters = "heli" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; ////////////////////////// // Side Information // @@ -131,7 +132,7 @@ if (_hasWs) then { _militiaAPCs pushBack "B_T_APC_Wheeled_01_command_lxWS"; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _policeVehs append ["a3a_police_Pickup_rf", "B_GEN_Pickup_covered_rf", "a3a_police_Pickup_comms_rf"]; _transportHelicopters 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"]; @@ -795,7 +796,7 @@ _pilotLoadoutData set ["uniforms", ["U_B_HeliPilotCoveralls"]]; _pilotLoadoutData set ["vests", ["V_TacVest_oli"]]; _pilotLoadoutData set ["helmets", ["H_CrewHelmetHeli_B", "H_PilotHelmetHeli_B"]]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { (_sfLoadoutData get "sidearms") append [ ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], ["hgun_Glock19_khk_RF", "muzzle_snds_L", "acc_flashlight_IR_pistol_RF", "optic_MRD_khk_RF", [], [], ""], diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf index e33e75be81..b94ddf9d85 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Civ.sqf @@ -4,6 +4,7 @@ private _hasApex = "expansion" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; private _hasKart = "kart" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; ////////////////////////////// // Civilian Information // @@ -90,7 +91,7 @@ if (_hasApex) then { _civPlanes append ["C_Plane_Civil_01_racing_F", "C_Plane_Civil_01_F"] }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _civCarsWithWeights append ["C_Pickup_rf", 2.0, "C_Pickup_covered_rf", 0.1]; _civRepair append ["C_Pickup_repair_rf", 0.3]; _civFuel append ["a3a_civ_Pickup_fuel_rf", 0.1]; @@ -213,7 +214,7 @@ if (_hasWs && {(toLowerANSI worldName) in ["sefrouramal", "takistan"]}) then { ]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { private _RFleatherJackets = [ "U_C_PilotJacket_black_RF", "U_C_PilotJacket_brown_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 3d850ecd00..342a39de11 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf @@ -8,6 +8,7 @@ private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; private _hasKart = "kart" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; /////////////////////////// // Rebel Information // @@ -52,7 +53,7 @@ private _staticMortars = ["I_G_Mortar_01_F"]; ["breachingExplosivesAPC", [["DemoCharge_Remote_Mag", 1]]] call _fnc_saveToTemplate; ["breachingExplosivesTank", [["SatchelCharge_Remote_Mag", 1], ["DemoCharge_Remote_Mag", 2]]] call _fnc_saveToTemplate; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _vehiclesCivCar = ["C_Pickup_rf", "C_Pickup_covered_rf"]; _vehiclesCivHeli = ["C_Heli_EC_01A_civ_RF", "C_Heli_EC_01_civ_RF"]; _vehiclesLightArmed = ["a3u_black_Pickup_mmg_alt_rf", "a3u_black_Pickup_mmg_frame_rf"]; @@ -200,7 +201,7 @@ private _initialRebelEquipment = [ "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol" ]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) 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"]; }; @@ -356,7 +357,7 @@ if (_hasArtOfWar) then { "U_C_ArtTShirt_01_v6_F" ]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _dlcUniforms append [ "U_IG_Guerrilla_RF", "U_IG_leader_RF" diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf index 78df9b90a5..bd4d0a429f 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf @@ -8,6 +8,7 @@ private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; private _hasKart = "kart" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; /////////////////////////// // Rebel Information // @@ -52,7 +53,7 @@ private _staticAA = ["I_static_AA_F"]; ["breachingExplosivesAPC", [["DemoCharge_Remote_Mag", 1]]] call _fnc_saveToTemplate; ["breachingExplosivesTank", [["SatchelCharge_Remote_Mag", 1], ["DemoCharge_Remote_Mag", 2]]] call _fnc_saveToTemplate; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _vehiclesCivCar = ["C_Pickup_rf", "C_Pickup_covered_rf"]; _vehiclesCivHeli = ["C_Heli_EC_01A_civ_RF", "C_Heli_EC_01_civ_RF"]; _vehiclesLightArmed = ["a3u_black_Pickup_mmg_alt_rf", "a3u_black_Pickup_mmg_frame_rf"]; 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 efb01318e6..4de5afff1c 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf @@ -8,6 +8,7 @@ private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; private _hasKart = "kart" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; /////////////////////////// // Rebel Information // @@ -56,7 +57,7 @@ if (_hasWs) then { _staticAA = ["I_Tura_ZU23_lxWS"]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _vehiclesCivCar append ["C_Pickup_rf","C_Pickup_covered_rf"]; _vehiclesLightUnarmed append ["I_C_Pickup_rf"]; _vehiclesLightArmed append ["I_C_Pickup_mmg_rf"]; @@ -165,7 +166,7 @@ private _initialRebelEquipment = [ "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol" ]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) 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"]; }; @@ -315,7 +316,7 @@ if (_hasArtOfWar) then { "U_C_ArtTShirt_01_v6_F" ]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _dlcUniforms append [ "U_IG_Guerrilla_RF", "U_IG_leader_RF" diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf index ae8a6f3cb3..312f401cbf 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Exegermenos.sqf @@ -8,6 +8,7 @@ private _hasContact = "enoch" in A3A_enabledDLC; private _hasJets = "jets" in A3A_enabledDLC; private _hasArtOfWar = "aow" in A3A_enabledDLC; private _hasKart = "kart" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; //////////////////////////// // Rivals Information // @@ -78,7 +79,7 @@ if (_hasTanks) then { _tanks pushBack "I_LT_01_cannon_F"; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _lightArmedVehicles append ["a3a_black_Pickup_mmg_rf", "a3u_black_Pickup_mmg_frame_rf", "a3u_black_Pickup_mmg_alt_rf"]; _lightUnarmedVehicles pushBack "a3u_black_Pickup_rival_rf"; }; @@ -157,7 +158,7 @@ private _rpgs = [ private _pistols = ["hgun_Rook40_F"]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _marksmanRifles pushBack ["srifle_DMR_01_black_RF", "", "acc_flashlight", "optic_VRCO_RF", ["10Rnd_762x54_Mag"], [], ""]; _enforcerRifles pushBack ["arifle_ash12_LR_blk_RF", "", "", "optic_VRCO_RF", ["20Rnd_127x55_Mag_RF"], [], ""]; _gls pushBack ["arifle_ash12_GL_blk_RF", "", "acc_flashlight", "optic_VRCO_khk_RF", ["10Rnd_127x55_Mag_RF", "20Rnd_127x55_Mag_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_SmokeGreen_Grenade_shell", "UGL_FlareGreen_F"], ""]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf index 7dae5ca8d3..936449975a 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_LE.sqf @@ -2,6 +2,7 @@ private _hasWs = "ws" in A3A_enabledDLC; private _hasLawsOfWar = "orange" in A3A_enabledDLC; private _hasApex = "expansion" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; //////////////////////////// // Rivals Information // @@ -44,7 +45,7 @@ private _vehiclesRivalsHelis = ["I_C_Heli_Light_01_civil_F"]; ["minefieldAT", ["ATMine"]] call _fnc_saveToTemplate; ["minefieldAPERS", ["APERSMine", "APERSBoundingMine"]] call _fnc_saveToTemplate; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _vehiclesRivalsLightArmed append ["I_C_Pickup_mmg_rf", "B_T_Pickup_mmg_rf"]; _vehiclesRivalsCars append ["I_C_Pickup_rf", "B_T_Pickup_rf", "B_T_Pickup_Comms_rf", "C_Pickup_rf"]; _vehiclesRivalsHelis append ["C_Heli_EC_01A_civ_RF", "C_Heli_EC_01_civ_RF"]; @@ -89,7 +90,7 @@ private _pistols = ["hgun_Pistol_01_F"]; private _helmets = ["H_Helmet_Skate"]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _marksmanRifles pushBack ["srifle_DMR_01_black_RF", "", "acc_flashlight", "optic_VRCO_RF", ["10Rnd_762x54_Mag"], [], ""]; _gls pushBack ["arifle_ash12_GL_wood_RF", "", "acc_flashlight", "optic_VRCO_khk_RF", ["10Rnd_127x55_Mag_wood_RF", "20Rnd_127x55_Mag_wood_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_SmokeGreen_Grenade_shell", "UGL_FlareGreen_F"], ""]; _pistols append ["hgun_Glock19_auto_khk_RF", "hgun_DEagle_classic_RF"]; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf index cb10606e2b..5cbdb4dfd6 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf @@ -2,6 +2,8 @@ // Civilian Information // ////////////////////////////// +private _hasRF = "rf" in A3A_enabledDLC; + ////////////////////////// // Vehicles // ////////////////////////// @@ -53,7 +55,7 @@ private _vehiclesCivFuel = [ ,"C_Truck_02_fuel_F", 0.1 ]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) 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]; @@ -119,7 +121,7 @@ if (allowDLCOrange) then { ]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { private _RFleatherJackets = [ "U_C_PilotJacket_black_RF", "U_C_PilotJacket_brown_RF", 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 bfb77db9dd..7dd7929884 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Tura.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Tura.sqf @@ -2,6 +2,7 @@ private _hasWs = "ws" in A3A_enabledDLC; private _hasLawsOfWar = "orange" in A3A_enabledDLC; private _hasApex = "expansion" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; /////////////////////////// // Rebel Information // @@ -50,7 +51,7 @@ if ("expansion" in A3A_enabledDLC) then { _vehiclesAT append ["I_C_Offroad_02_AT_F"]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _vehiclesCivCar append ["C_Pickup_rf"]; _vehiclesLightUnarmed append ["I_Tura_Pickup_01_RF"]; _vehiclesLightArmed append ["I_Tura_Pickup_01_mmg_rf"]; @@ -103,7 +104,7 @@ private _initialRebelEquipment = [ "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol" ]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) 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"]; }; @@ -193,7 +194,7 @@ if (_hasApex) then { ]; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _dlcUniforms append [ "U_IG_Guerrilla_RF", "U_IG_leader_RF" diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf index fc7e53102c..00676d8ee6 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Riv_Exegermenos.sqf @@ -3,6 +3,7 @@ private _hasLawsOfWar = "orange" in A3A_enabledDLC; private _hasApex = "expansion" in A3A_enabledDLC; private _hasContact = "enoch" in A3A_enabledDLC; private _hasMarksman = "mark" in A3A_enabledDLC; +private _hasRF = "rf" in A3A_enabledDLC; //////////////////////////// // Rivals Information // @@ -63,7 +64,7 @@ if (_hasLawsOfWar) then { _trucks pushBack "O_G_Van_02_transport_F"; }; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _lightArmedVehicles append ["a3a_black_Pickup_mmg_rf", "a3u_black_Pickup_mmg_frame_rf", "a3u_black_Pickup_mmg_alt_rf"]; _lightUnarmedVehicles pushBack "a3u_black_Pickup_rival_rf"; }; @@ -126,7 +127,7 @@ private _rpgs = [ private _pistols = ["hgun_Rook40_F"]; -if ("rf" in A3A_enabledDLC) then { +if (_hasRF) then { _marksmanRifles pushBack ["srifle_DMR_01_tan_RF", "", "acc_flashlight", "optic_VRCO_RF", ["10Rnd_762x54_Mag"], [], ""]; _enforcerRifles pushBack ["arifle_ash12_LR_desert_RF", "", "", "optic_VRCO_RF", ["20Rnd_127x55_Mag_RF"], [], ""]; _gls pushBack ["arifle_ash12_GL_desert_RF", "", "acc_flashlight", "optic_VRCO_RF", ["10Rnd_127x55_Mag_RF", "20Rnd_127x55_Mag_RF"], ["1Rnd_HE_Grenade_shell", "1Rnd_SmokeGreen_Grenade_shell", "UGL_FlareGreen_F"], ""];