Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expeditionary Forces MJTF factions #3441

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Expeditionary Forces MJTF factions #3441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 52 additions & 7 deletions A3A/addons/config_fixes/RF/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ class CfgVehicles
class B_Pickup_rf;
class I_G_Pickup_rf;
class Heli_light_03_base_F;
class B_Heli_light_03_unarmed_rf;
class Heli_light_03_unarmed_base_F;
class B_Heli_light_03_unarmed_rf : Heli_light_03_unarmed_base_F{
class EventHandlers;
};
class Heli_EC_01_base_rf;
class B_Heli_EC_04_military_rf;
class B_Heli_EC_03_rf;
Expand Down Expand Up @@ -115,7 +118,9 @@ class CfgVehicles
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_Heli_light_03_dynamicLoadout_rf : B_Heli_light_03_dynamicLoadout_rf {};
class a3a_Heli_light_03_dynamicLoadout_rf : B_Heli_light_03_dynamicLoadout_rf {
class EventHandlers;
};
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"};
Expand All @@ -136,6 +141,13 @@ class CfgVehicles
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 a3a_navy_Heli_light_03_dynamicLoadout_rf : a3a_Heli_light_03_dynamicLoadout_rf {
class EventHandlers : EventHandlers{
postinit = "if (local (_this select 0)) then {[(_this select 0), """", [], true] call bis_fnc_initVehicle;}";
};
textureList[] = {"NAVY", 0.1, "NAVY_CAMO", 1};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\Heli_Light_03\data\Heli_Light_03_base_navy_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_navy_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"};
Expand All @@ -152,6 +164,13 @@ class CfgVehicles
textureList[] = {};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\Heli_Light_03\data\Heli_Light_03_base_tan_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_tan_co.paa"};
};
class a3a_navy_Heli_light_03_unarmed_rf : B_Heli_light_03_unarmed_rf {
class EventHandlers : EventHandlers{
postinit = "if (local (_this select 0)) then {[(_this select 0), """", [], true] call bis_fnc_initVehicle;}";
};
textureList[] = {"NAVY", 1, "NAVY_CAMO", 0.1};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\Heli_Light_03\data\Heli_Light_03_base_navy_CO.paa","\lxRF\air_rf\Heli_Light_03\data\wildcat_addons_navy_co.paa"};
};

class a3a_Heli_EC_02_rf : Heli_EC_02_base_rf { // Default camo is a lovely tan, perfect for patrolling your local desert
scope = 2;
Expand All @@ -174,9 +193,39 @@ class CfgVehicles
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"};
};
class a3a_sfia_Heli_EC_02_rf : a3a_Heli_EC_02_rf {
textureList[] = {};
textureList[] = {"CAMO_SFIA", 1, "CAMO_AFRICA", 0.5};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_01_sfia_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_01_sfia_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_01_sfia_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};
class a3a_ION_Heli_EC_02_rf : a3a_Heli_EC_02_rf {
textureList[] = {};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_06_ion_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_06_ion_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_06_ion_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};
class a3a_navy_Heli_EC_02_rf : a3a_Heli_EC_02_rf {
textureList[] = {"MARINE", 1};
hiddenSelectionsMaterials[] = {"\lxrf\air_rf\heli_medium_ec\data\as332_exterior_01.rvmat","\lxrf\air_rf\heli_medium_ec\data\as332_int_cargo.rvmat"};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_06_ion_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_06_ion_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_06_ion_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};
class a3a_navy_Heli_EC_04_military_rf : B_Heli_EC_04_military_rf {
textureList[] = {"MARINE", 1};
hiddenSelectionsMaterials[] = {"\lxrf\air_rf\heli_medium_ec\data\as332_exterior_01.rvmat","\lxrf\air_rf\heli_medium_ec\data\as332_int_cargo.rvmat"};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_04_marineblue_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_04_marineblue_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_04_marineblue_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};
class a3a_navy_Heli_EC_03_rf : B_Heli_EC_03_rf {
textureList[] = {"MARINE", 1};
hiddenSelectionsMaterials[] = {"\lxrf\air_rf\heli_medium_ec\data\as332_exterior_01.rvmat","\lxrf\air_rf\heli_medium_ec\data\as332_int_cargo.rvmat"};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_04_marineblue_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_04_marineblue_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_04_marineblue_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};
class I_Heli_EC_01A_military_RF;
class a3a_sfia_Heli_EC_04_military_rf : I_Heli_EC_01A_military_RF {
textureList[] = {"CAMO_SFIA", 1, "CAMO_AFRICA", 0.1};
hiddenSelectionsMaterials[] = {"\lxrf\air_rf\heli_medium_ec\data\as332_exterior_01.rvmat","\lxrf\air_rf\heli_medium_ec\data\as332_int_cargo.rvmat"};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_01_sfia_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_01_sfia_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_01_sfia_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};
class a3a_sfia_Heli_EC_03_rf : B_Heli_EC_03_rf {
textureList[] = {"CAMO_SFIA", 0.1, "CAMO_AFRICA", 1};
hiddenSelectionsMaterials[] = {"\lxrf\air_rf\heli_medium_ec\data\as332_exterior_01.rvmat","\lxrf\air_rf\heli_medium_ec\data\as332_int_cargo.rvmat"};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_01_sfia_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_01_sfia_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_01_sfia_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};
class a3a_tan_Heli_EC_04_military_rf : B_Heli_EC_04_military_rf {
textureList[] = {};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_09_tan_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_09_tan_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_09_tan_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
Expand All @@ -193,9 +242,5 @@ class CfgVehicles
textureList[] = {};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_06_ion_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_06_ion_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_06_ion_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};
class a3a_ION_Heli_EC_02_rf : a3a_Heli_EC_02_rf {
textureList[] = {};
hiddenSelectionsTextures[] = {"\lxRF\air_rf\heli_medium_ec\data\as332_exterior_06_ion_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_06_ion_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_exterior_06_ion_co.paa","\lxRF\air_rf\heli_medium_ec\data\as332_int_cargo_co.paa"};
};

};
33 changes: 33 additions & 0 deletions A3A/addons/core/Templates/AircraftLoadouts/EF/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#include "..\..\..\script_component.hpp"

class CfgPatches
{
class PATCHNAME(AirLoadout_EF)
{
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"EF_Data"};
skipWhenMissingDependencies = 1;
author = AUTHOR;
authors[] = { AUTHORS };
authorUrl = "";
VERSION_CONFIG;
};
};

class A3A {
class Loadouts
{
class Helicopter
{
class baseHelicopter;
class EF_B_AH99J_NATO : baseHelicopter{
loadout[] = { "PylonRack_12Rnd_missiles","PylonMissile_1Rnd_LG_scalpel","PylonRack_12Rnd_missiles","PylonRack_12Rnd_missiles","PylonMissile_1Rnd_LG_scalpel","PylonRack_12Rnd_missiles","EF_PylonMissile_Missile_Sidearm_x1","EF_PylonMissile_Titan_NLOS_2Rnd","EF_PylonMissile_Titan_NLOS_2Rnd","EF_PylonMissile_Missile_Sidearm_x1" };
};
class EF_B_AH99J_MJTF_Wdl : EF_B_AH99J_NATO {};
class EF_B_AH99J_MJTF_Des : EF_B_AH99J_NATO {};
};
};
};
10 changes: 10 additions & 0 deletions A3A/addons/core/Templates/AircraftLoadouts/RF/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ class A3A {
class a3a_AAF_Heli_EC_02_rf : a3a_Heli_EC_02_rf {};
class a3a_black_Heli_EC_02_rf : a3a_Heli_EC_02_rf {};
class a3a_sfia_Heli_EC_02_rf : a3a_Heli_EC_02_rf {};

class a3a_navy_Heli_EC_03_rf : baseHelicopter {
loadout[] = { "PylonWeapon_860Rnd_127x99mm_shells_black_RF","PylonRack_4Rnd_LG_scalpel" };
};
class a3a_navy_Heli_light_03_dynamicLoadout_rf : a3a_Heli_light_03_dynamicLoadout_rf {
loadout[] = { "PylonRack_19Rnd_missiles_gray_RF","PylonRack_4Rnd_LG_scalpel","PylonRack_19Rnd_missiles_gray_RF","PylonWeapon_860Rnd_127x99mm_shells_black_RF" };
};
class a3a_navy_Heli_EC_02_rf : a3a_Heli_EC_02_rf {
loadout[] = { "PylonRack_4Rnd_LG_scalpel","PylonRack_19Rnd_missiles_gray_RF","PylonRack_19Rnd_missiles_gray_RF","PylonRack_4Rnd_LG_scalpel" };
};
};
};
};
28 changes: 28 additions & 0 deletions A3A/addons/core/Templates/Templates.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,34 @@ class Templates
shortName = "NATO";
lore = $STR_A3A_templates_lore_NATO;
};

class EF_Base : Vanilla_Base
{
requiredAddons[] = {"EF_Data"};
logo = "\ef\ef_data\logos\arma3_ef_logo_ca.paa";
basepath = QPATHTOFOLDER(Templates\Templates\EF); //the path to the template folder
priority = 5;
forceDLC[] = {"ef"};
};

class EF_MJTF_Arid : EF_Base
{
side = "Occ";
flagTexture = "\ef\ef_data\data\Flag_29thMEU_CO.paa";
name = "EF MJTF Arid";
file = "EF_AI_MJTF_Arid";
shortName = "MJTF";
lore = $STR_A3A_templates_lore_NATO;
climate[] = {"arid", "arctic"};
};

class EF_MJTF_Temperate : EF_MJTF_Arid
{
name = "EF MJTF Temperate";
file = "EF_AI_MJTF_Temperate";
climate[] = {"temperate", "tropical"};
};

// ***************************** VN *****************************

class VN_Base
Expand Down
Loading