Skip to content

Commit

Permalink
Updated flags, added low air attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
@ante185
ante185 committed Dec 28, 2023
1 parent 649c593 commit 3876116
Show file tree
Hide file tree
Showing 24 changed files with 428 additions and 196 deletions.
34 changes: 24 additions & 10 deletions A3A/addons/core/Templates/Templates.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -952,46 +952,60 @@ class Templates
class IFA_WEH : IFA_Base
{
side = "Inv";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\marker_weh.paa);
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_weh.paa);
name = "IFA WEHRMACHT";
priority = 65;
file = "IFA_AI_WEH";
};
class IFA_SOV : IFA_Base
{
side = "Inv";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_sov.paa);
name = "IFA SOVIET ARMY";
file = "IFA_AI_SOV";
};
class IFA_ALLIES : IFA_Base
{
side = "Occ";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\marker_allies.paa);
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_allies.paa);
name = "IFA ALLIES";
priority = 65;
file = "IFA_AI_ALLIES";
};
class IFA_SOV : IFA_Base
class IFA_US : IFA_Base
{
side = "Inv";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\marker_sov.paa);
name = "IFA SOVIETS";
file = "IFA_AI_SOV";
side = "Occ";
flagTexture = "a3\data_f\flags\flag_us_co.paa";
name = "IFA US ARMY";
file = "IFA_AI_US";
};
class IFA_UK : IFA_Base
{
side = "Occ";
flagTexture = "\A3\Data_F\Flags\flag_uk_co.paa";
name = "IFA UK ARMY";
file = "IFA_AI_UK";
};
class IFA_FFI : IFA_Base
{
side = "Reb";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\marker_ffi.paa);
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_ffi.paa);
name = "IFA French Resistance";
priority = 65;
file = "IFA_REB_FFI";
};
class IFA_CIV_FR : IFA_Base
{
side = "Civ";
flagTexture = "\A3\Ui_f\data\Map\Markers\Flags\france_ca.paa";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_fr.paa);
name = "IFA French";
priority = 65;
file = "IFA_CIV_FR";
};
class IFA_CIV_PL : IFA_Base
{
side = "Civ";
//flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\marker_pl.paa);
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_pl.paa);
name = "IFA Polish";
file = "IFA_CIV_PL";
};
Expand Down
37 changes: 19 additions & 18 deletions A3A/addons/core/Templates/Templates/IFA/IFA_AI_ALLIES.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
["spawnMarkerName", "Allies Support Corridor"] call _fnc_saveToTemplate;

["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Templates\Templates\IFA\marker_allies.paa"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Templates\Templates\IFA\flag_allies.paa"] call _fnc_saveToTemplate;
["flagMarkerType", "a3a_flag_ALLIES"] call _fnc_saveToTemplate;

//////////////////////////
Expand Down Expand Up @@ -50,7 +50,7 @@ private _tanks = _heavyTanks;
for "_i" from 1 to _tankRatio do { _tanks append _mediumTanks; };
["vehiclesTanks", _tanks] call _fnc_saveToTemplate;

["vehiclesAA", ["LIB_Zis5v_61K"]] call _fnc_saveToTemplate; // ideally heavily armed with anti-ground capability and enclosed turret. Passengers will be ignored
["vehiclesAA", ["LIB_Zis5v_61K"]] call _fnc_saveToTemplate; //Fake "truck with bofors"


["vehiclesTransportBoats", ["LIB_LCA"]] call _fnc_saveToTemplate;
Expand All @@ -61,11 +61,10 @@ for "_i" from 1 to _tankRatio do { _tanks append _mediumTanks; };
["vehiclesPlanesAA", ["LIB_P47","LIB_RAF_P39","LIB_US_P39","LIB_US_P39_2"]] call _fnc_saveToTemplate; //
["vehiclesPlanesTransport", ["LIB_C47_RAF", "LIB_C47_Skytrain"]] call _fnc_saveToTemplate;

["vehiclesHelisLight", []] call _fnc_saveToTemplate; // ideally fragile & unarmed helis seating 4+
["vehiclesHelisLight", []] call _fnc_saveToTemplate;
["vehiclesHelisTransport", []] call _fnc_saveToTemplate;
// Should be capable of dealing damage to ground targets without additional scripting
["vehiclesHelisLightAttack", []] call _fnc_saveToTemplate; // Utility helis with fixed or door guns + rocket pods
["vehiclesHelisAttack", []] call _fnc_saveToTemplate; // Proper attack helis: Apache, Hind etc
["vehiclesHelisLightAttack", []] call _fnc_saveToTemplate;
["vehiclesHelisAttack", []] call _fnc_saveToTemplate;

["vehiclesArtillery", ["LIB_FlaK_36_ARTY","LIB_leFH18"]] call _fnc_saveToTemplate;
["magazines", createHashMapFromArray [
Expand All @@ -86,16 +85,18 @@ for "_i" from 1 to _tankRatio do { _tanks append _mediumTanks; };

["staticMGs", ["LIB_M1919_M2"]] call _fnc_saveToTemplate;
["staticAT", ["LIB_Zis3","LIB_leFH18_AT"]] call _fnc_saveToTemplate;
["staticAA", ["LIB_61k"]] call _fnc_saveToTemplate;
["staticAA", ["LIB_61k"]] call _fnc_saveToTemplate; //Fake Bofors
["staticMortars", ["LIB_M2_60"]] call _fnc_saveToTemplate;

["mortarMagazineHE", "LIB_8Rnd_60mmHE_M2"] call _fnc_saveToTemplate;
["mortarMagazineSmoke", ""] call _fnc_saveToTemplate;

//Minefield definition
//CFGVehicles variant of Mines are needed "ATMine", "APERSTripMine", "APERSMine"
["minefieldAT", ["LIB_US_M1A1_ATMINE_ammo"]] call _fnc_saveToTemplate;
["minefieldAPERS", ["LIB_US_M3_ammo"]] call _fnc_saveToTemplate;
["minefieldAT", ["LIB_US_M1A1_ATMINE"]] call _fnc_saveToTemplate;
["minefieldAPERS", ["LIB_US_M3_MINE"]] call _fnc_saveToTemplate;

#include "IFA_Vehicle_Attributes.sqf"

/////////////////////
/// Identities ///
Expand Down Expand Up @@ -203,8 +204,8 @@ _sfLoadoutData set ["slWeapons", ["LIB_M1928_Thompson", "LIB_M1928A1_Thompson",
_sfLoadoutData set ["rifles", ["LIB_M1_Garand", "LIB_M1A1_Carbine"]];
_sfLoadoutData set ["carbines", ["LIB_M1A1_Carbine"]];
_sfLoadoutData set ["grenadeLaunchers", [
["LIB_M1_Garand_M7", "LIB_ACC_GW_SB_Empty", "", "", [], ["LIB_1Rnd_G_Mk2"], ""],
["LIB_M1_Garand_M7", "LIB_ACC_GW_SB_Empty", "", "", [], ["LIB_1Rnd_G_M9A1"], ""]
["LIB_M1_Garand", "LIB_ACC_GL_M7", "", "", [], ["LIB_1Rnd_G_Mk2"], ""],
["LIB_M1_Garand", "LIB_ACC_GL_M7", "", "", [], ["LIB_1Rnd_G_M9A1"], ""]
]];
_sfLoadoutData set ["SMGs", ["LIB_M1928_Thompson", "LIB_M1A1_Thompson"]];
_sfLoadoutData set ["machineGuns", ["LIB_M1918A2_BAR", "LIB_M1919A6"]];
Expand All @@ -222,8 +223,8 @@ _militaryLoadoutData set ["slWeapons", ["LIB_M3_GreaseGun", "LIB_M1A1_Thompson",
_militaryLoadoutData set ["rifles", ["LIB_M1_Garand"]];
_militaryLoadoutData set ["carbines", ["LIB_M1_Carbine"]];
_militaryLoadoutData set ["grenadeLaunchers", [
["LIB_M1_Garand_M7", "LIB_ACC_GW_SB_Empty", "", "", [], ["LIB_1Rnd_G_Mk2"], ""],
["LIB_M1_Garand_M7", "LIB_ACC_GW_SB_Empty", "", "", [], ["LIB_1Rnd_G_M9A1"], ""]
["LIB_M1_Garand", "LIB_ACC_GL_M7", "", "", [], ["LIB_1Rnd_G_Mk2"], ""],
["LIB_M1_Garand", "LIB_ACC_GL_M7", "", "", [], ["LIB_1Rnd_G_M9A1"], ""]
]];
_militaryLoadoutData set ["SMGs", ["LIB_M3_GreaseGun", "LIB_M3_GreaseGun", "LIB_M1A1_Thompson"]];
_militaryLoadoutData set ["machineGuns", [
Expand Down Expand Up @@ -262,18 +263,18 @@ _militiaLoadoutData set ["antiInfantryGrenades", ["LIB_MillsBomb"]];
_militiaLoadoutData set ["smokeGrenades", ["LIB_No77"]];

_militiaLoadoutData set ["ATLaunchers", ["LIB_PIAT"]];
_militiaLoadoutData set ["slWeapons", ["LIB_M1928A1_Thompson", "LIB_Sten_Mk5", "LIB_Sten_Mk2", "LIB_Sten_Mk5", "LIB_Sten_Mk2"]];
_militiaLoadoutData set ["slWeapons", ["LIB_M1_Carbine", "LIB_M1928A1_Thompson", "LIB_Sten_Mk5", "LIB_Sten_Mk5", "LIB_Sten_Mk2", "LIB_Sten_Mk2"]];
_militiaLoadoutData set ["rifles", ["LIB_LeeEnfield_No4"]];
_militiaLoadoutData set ["carbines", ["LIB_M1_Carbine", "LIB_LeeEnfield_No4"]];
_militiaLoadoutData set ["grenadeLaunchers", [
["LIB_LeeEnfield_No4_CUP", "LIB_ACC_GL_Enfield_CUP_Empty", "", "", [], ["LIB_1Rnd_G_MillsBomb"], ""]
["LIB_LeeEnfield_No4", "LIB_ACC_GL_Enfield_CUP_Empty", "", "", [], ["LIB_1Rnd_G_MillsBomb"], ""]
]];
_militiaLoadoutData set ["SMGs", ["LIB_Sten_Mk2"]];
_militiaLoadoutData set ["machineGuns", ["LIB_Bren_Mk2"]];
_militiaLoadoutData set ["marksmanRifles", ["LIB_LeeEnfield_No4_Scoped"]];

_militiaLoadoutData set ["sidearms", ["LIB_Colt_M1911", "LIB_Webley_mk6"]];
_militiaLoadoutData set ["slSidearms", ["LIB_Colt_M1911", "LIB_Webley_mk6", "LIB_Webley_Flare"]];
_militiaLoadoutData set ["sidearms", ["LIB_Webley_mk6"]];
_militiaLoadoutData set ["slSidearms", ["LIB_Webley_mk6", "LIB_Webley_mk6", "LIB_Webley_Flare"]];

//////////////////////////
// Misc Loadouts //
Expand Down Expand Up @@ -369,7 +370,7 @@ private _medicTemplate = {
["uniforms"] call _fnc_setUniform;
["backpacks"] call _fnc_setBackpack;

[["SMGs", "rifles"] call _fnc_fallback] call _fnc_setPrimary;
[[selectRandom ["SMGs", "carbines", "rifles"], "rifles"] call _fnc_fallback] call _fnc_setPrimary;
["primary", 5] call _fnc_addMagazines;

["sidearms"] call _fnc_setHandgun;
Expand Down
20 changes: 13 additions & 7 deletions A3A/addons/core/Templates/Templates/IFA/IFA_AI_SOV.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
["spawnMarkerName", "Soviet Support Corridor"] call _fnc_saveToTemplate;

["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Templates\Templates\IFA\marker_sov.paa"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Templates\Templates\IFA\flag_sov.paa"] call _fnc_saveToTemplate;
["flagMarkerType", "a3a_flag_SOV"] call _fnc_saveToTemplate;

//////////////////////////
Expand All @@ -20,7 +20,7 @@
// vehicles can be placed in more than one category if they fit between both. Cost will be derived by the higher category
["vehiclesBasic", ["LIB_Willys_MB"]] call _fnc_saveToTemplate;
["vehiclesLightUnarmed", ["LIB_Willys_MB", "LIB_Willys_MB_Hood"]] call _fnc_saveToTemplate;
["vehiclesLightArmed", ["LIB_Scout_M3_FFV", "LIB_Scout_M3_FFV", "LIB_Zis5v_61K"]] call _fnc_saveToTemplate; // Should be armed, unarmoured to lightly armoured, with 0-4 passengers
["vehiclesLightArmed", ["LIB_Scout_M3_FFV", "LIB_Scout_M3_FFV"]] call _fnc_saveToTemplate; // Should be armed, unarmoured to lightly armoured, with 0-4 passengers
["vehiclesTrucks", ["LIB_US6_Open","LIB_US6_Tent_Cargo"]] call _fnc_saveToTemplate;
["vehiclesCargoTrucks", ["LIB_US6_Open_Cargo","LIB_Zis5v"]] call _fnc_saveToTemplate;
["vehiclesAmmoTrucks", ["LIB_US6_Ammo"]] call _fnc_saveToTemplate;
Expand All @@ -30,7 +30,7 @@
["vehiclesLightAPCs", ["LIB_SOV_M3_Halftrack", "LIB_Scout_M3_FFV"]] call _fnc_saveToTemplate; // armed, lightly armoured, with 6-8 passengers
["vehiclesAPCs", ["LIB_SOV_M3_Halftrack", "LIB_SdKfz251_captured_FFV"]] call _fnc_saveToTemplate; // armed with enclosed turret, armoured, with 6-8 passengers
["vehiclesIFVs", []] call _fnc_saveToTemplate; // capable of surviving multiple rockets, cannon armed, with 6-8 passengers
["vehiclesLightTanks", ["LIB_T34_76", "LIB_M4A2_SOV"]] call _fnc_saveToTemplate;
["vehiclesLightTanks", []] call _fnc_saveToTemplate;
["vehiclesTanks", [
"LIB_T34_76", "LIB_T34_76", "LIB_T34_76", "LIB_M4A2_SOV", "LIB_M4A2_SOV",
"LIB_T34_85","LIB_SU85","LIB_JS2_43"
Expand Down Expand Up @@ -78,8 +78,10 @@

//Minefield definition
//CFGVehicles variant of Mines are needed "ATMine", "APERSTripMine", "APERSMine"
["minefieldAT", ["LIB_TM44_ammo"]] call _fnc_saveToTemplate;
["minefieldAPERS", ["LIB_pomzec_ammo","LIB_PMD6_ammo"]] call _fnc_saveToTemplate;
["minefieldAT", ["LIB_TM44_MINE"]] call _fnc_saveToTemplate;
["minefieldAPERS", ["LIB_pomzec_MINE","LIB_PMD6_MINE"]] call _fnc_saveToTemplate;

#include "IFA_Reb_Vehicle_Attributes.sqf"

/////////////////////
/// Identities ///
Expand Down Expand Up @@ -110,8 +112,8 @@ _loadoutData set ["lightATLaunchers", []];
_loadoutData set ["ATLaunchers", ["LIB_M1A1_Bazooka"]];
_loadoutData set ["missileATLaunchers", []];
_loadoutData set ["AALaunchers", []];
_loadoutData set ["sidearms", ["LIB_M1895", "LIB_TT33"]];
_loadoutData set ["slSidearms", ["LIB_M1895", "LIB_TT33", "LIB_FLARE_PISTOL"]];
_loadoutData set ["sidearms", []];
_loadoutData set ["slSidearms", []];

_loadoutData set ["ATMines", ["LIB_TM44_MINE_mag"]];
_loadoutData set ["APMines", ["LIB_PMD6_MINE_mag","LIB_pomzec_MINE_mag"]];
Expand Down Expand Up @@ -200,6 +202,8 @@ _sfLoadoutData set ["SMGs", [
_sfLoadoutData set ["machineGuns", [
"LIB_DT", "LIB_DT_OPTIC",
["LIB_PPSh41_m", "", "", "", ["LIB_71Rnd_762x25"], [], ""]]];
_sfLoadoutData set ["sidearms", ["LIB_TT33"]];
_sfLoadoutData set ["slSidearms", ["LIB_TT33", "LIB_TT33", "LIB_FLARE_PISTOL"]];
/////////////////////////////////
// Military Loadout Data //
/////////////////////////////////
Expand All @@ -223,6 +227,8 @@ _militaryLoadoutData set ["grenadeLaunchers", [
]];
_militaryLoadoutData set ["SMGs", ["LIB_PPSh41_m"]];
_militaryLoadoutData set ["machineGuns", ["LIB_DP28", "LIB_DP28", "LIB_DP28", "LIB_DP28", "LIB_DP28", "LIB_DP28", "LIB_DT", "LIB_DT", "LIB_DT_OPTIC"]];
_militaryLoadoutData set ["sidearms", ["LIB_M1895", "LIB_TT33"]];
_militaryLoadoutData set ["slSidearms", ["LIB_M1895", "LIB_TT33", "LIB_FLARE_PISTOL"]];

///////////////////////////////
// Police Loadout Data //
Expand Down
Loading

0 comments on commit 3876116

Please sign in to comment.