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.

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

Aegis factions Compatability #3414

Merged
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
a7b05c9
Basic AegisAtlas Templates Ported
RetardedFoX Apr 11, 2022
2977d1b
Spelling mistakes, factions, parameters
RetardedFoX Apr 12, 2022
0caf08f
template vt7
RetardedFoX Apr 12, 2022
957a3c9
Merge branch 'official-antistasi-community:unstable' into AegisAtlas
RetardedFoX Apr 20, 2022
9064bab
Merge branch 'official-antistasi-community:unstable' into AegisAtlas
RetardedFoX May 10, 2022
1cbd34d
Rest of BLUFOR factions
RetardedFoX May 17, 2022
8c549f8
Merge branch 'official-antistasi-community:unstable' into AegisAtlas
RetardedFoX May 19, 2022
f2e7678
LogNodes, spelling mistakes
RetardedFoX May 22, 2022
184b6ca
Merge branch 'official-antistasi-community:unstable' into AegisAtlas
RetardedFoX May 22, 2022
4e64963
Minor spelling mistakes
RetardedFoX May 22, 2022
4037662
Edits to hopefully fix merge conflict
RetardedFoX Jun 12, 2022
2f3dc26
Merge branch 'unstable' into AegisAtlas
RetardedFoX Jun 12, 2022
f5931a0
Merge pull request #2 from official-antistasi-community/unstable
RetardedFoX Sep 6, 2022
b72d261
Update Templates.hpp
RetardedFoX Dec 9, 2023
b6a4038
Merge branch 'unstable' of https://github.com/RetardedFoX/A3-Antistas…
RetardedFoX Mar 20, 2024
b341afe
Trying to fix conflicts
RetardedFoX Mar 20, 2024
3c16151
Again
RetardedFoX Mar 20, 2024
1db0084
Revert "Again"
RetardedFoX Mar 20, 2024
837decd
And again
RetardedFoX Mar 20, 2024
1536ea1
Update Templates.hpp
RetardedFoX Mar 20, 2024
19febd8
Merge pull request #3 from RetardedFoX/unstable
RetardedFoX Mar 20, 2024
b0f88ef
Identity + minor vars updated
RetardedFoX Sep 1, 2024
fdff841
Aegis eq update
RetardedFoX Oct 13, 2024
81d6187
WS compat
RetardedFoX Oct 13, 2024
408e9ae
Merge branch 'official-antistasi-community:unstable' into AegisAtlas
RetardedFoX Oct 13, 2024
eb865d9
Vic attributes, templates.hpp
RetardedFoX Oct 13, 2024
89f4a56
Merge branch 'AegisAtlas' of https://github.com/RetardedFoX/A3-Antist…
RetardedFoX Oct 13, 2024
414c53d
BAF voice fix
RetardedFoX Oct 13, 2024
688bfaf
AT swaparounds, No UKvoices in the US
RetardedFoX Oct 13, 2024
360c426
ws check + US SCAR + LDF AK
RetardedFoX Oct 13, 2024
8a51c26
Officer + AAF
RetardedFoX Oct 14, 2024
fe6fd7f
Outdated DLC checks
RetardedFoX Oct 14, 2024
3c2f51c
Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf
RetardedFoX Oct 14, 2024
c8537c4
Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf
RetardedFoX Oct 14, 2024
8778d9e
Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf
RetardedFoX Oct 14, 2024
e261b50
Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf
RetardedFoX Oct 14, 2024
eaa2952
The rest replaced to C130
RetardedFoX Oct 14, 2024
ae6cbd5
Spelling mistakes + minor edits
RetardedFoX Oct 18, 2024
6f830aa
militia EOD + Engi losing primary
RetardedFoX Oct 19, 2024
08244e3
BAF + Officer Classnames
RetardedFoX Oct 20, 2024
9ec9c26
aircraft loadouts + western weaponry
RetardedFoX Oct 24, 2024
3db1373
Update config.cpp
RetardedFoX Nov 3, 2024
bbf69a2
Minor errors + CfgWeapons
RetardedFoX Nov 10, 2024
ec42e12
RF compat
RetardedFoX Nov 10, 2024
1e55f76
classname errors + officers spawning with shotgun
RetardedFoX Nov 11, 2024
e894e99
black mk20
RetardedFoX Nov 11, 2024
7222e5c
Tweaks & fixes + Traitor edits
RetardedFoX Nov 13, 2024
1e2358d
Config fixes + CSAT outfits
RetardedFoX Nov 14, 2024
c1b3658
missing s in reb + stuff not needed on AAF
RetardedFoX Nov 21, 2024
2a25996
Update ifv.hpp
ante185 Nov 24, 2024
9d06221
Update Aegis_AI_US_Arid.sqf
RetardedFoX Nov 24, 2024
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
123 changes: 123 additions & 0 deletions A3A/addons/core/Templates/Templates.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,129 @@ class Templates
lore = $STR_A3A_templates_lore_VN_Civ;
};

// ***************************** Aegis *****************************
class Aegis_Base : Vanilla_Base
{
requiredAddons[] = {"A3_Aegis_Weapons_F_Aegis"};
logo = "\A3_Aegis\Data_F_Aegis\Logos\arma3_aegis_logo_CA.paa";
basepath = QPATHTOFOLDER(Templates\Templates\Aegis)
priority = 25;
};

class Aegis_Iran : Aegis_Base
{
side = "Inv";
flagTexture = "\A3_Aegis\Data_F_Aegis\Flags\flag_Iran_CO.paa";
name = "Aegis Iran";
file = "Aegis_AI_Iran";
climate[] = {"arid", "arctic"};
};
class Aegis_China : Aegis_Iran
{
flagTexture = "\A3_Aegis\Data_F_Aegis\Flags\flag_China_CO.paa";
name = "Aegis China";
file = "Aegis_AI_China";
climate[] = {"tropical"};
forceDLC[] = {"expansion"};
};
class Aegis_Russia : Aegis_Iran
{
flagTexture = "a3_aegis\data_f_aegis\flags\flag_rus_co.paa";
name = "Aegis Russia";
file = "Aegis_AI_Russia";
climate[] = {"temperate"};
forceDLC[] = {"enoch"};
};
class Aegis_US_Arid : Aegis_Base
{
side = "Occ";
flagTexture = "\A3_Aegis\data_f_aegis\Flags\flag_USA_51_CO.paa";
name = "Aegis US Arid";
file = "Aegis_AI_US_Arid";
climate[] = {"arid"};
};
class Aegis_US_Tropical : Aegis_US_Arid
{
name = "Aegis US Tropical";
file = "Aegis_AI_US_Tropical";
climate[] = {"tropical"};
};
class Aegis_US_Temperate : Aegis_US_Arid
{
name = "Aegis US Temperate";
file = "Aegis_AI_US_Temperate";
climate[] = {"temperate", "arctic"};
};
class Aegis_BAF_Arid : Aegis_Base
{
side = "Occ";
flagTexture = "\A3\Data_F\Flags\Flag_uk_CO.paa";
name = "Aegis BAF Arid";
file = "Aegis_AI_BAF_Arid";
climate[] = {"arid"};
forceDLC[] = {"enoch"};
};
class Aegis_BAF_Tropical : Aegis_BAF_Arid
{
name = "Aegis BAF Tropical";
file = "Aegis_BAF_Tropical";
climate[] = {"tropical"};
forceDLC[] = {"enoch"};
};
class Aegis_BAF_Temperate : Aegis_BAF_Arid
{
name = "Aegis BAF Temperate";
file = "Aegis_AI_BAF_Temperate";
climate[] = {"temperate", "arctic"};
forceDLC[] = {"enoch"};
};
class Aegis_LDF : Aegis_Base
{
side = "Occ";
flagTexture = "a3\data_f_enoch\flags\flag_enoch_co.paa";
name = "Aegis LDF";
file = "Aegis_AI_LDF";
maps[] = {"enoch","vt7"};
climate[] = {"temperate"};
forceDLC[] = {"enoch"};
};
class Aegis_AAF : Aegis_Base
{
side = "Occ";
flagTexture = "a3\data_f\flags\flag_aaf_co.paa";
name = "Aegis AAF";
file = "Aegis_AI_AAF";
maps[] = {"altis"};
climate[] = {"arid"};
};

class Aegis_FIA : Aegis_Base
{
side = "Reb";
flagTexture = "a3\data_f\flags\flag_fia_co.paa";
name = "Aegis FIA";
file = "Aegis_Reb_FIA";
};

class Aegis_SDK : Aegis_Base
{
side = "Reb";
flagTexture = "\A3\Data_F_exp\Flags\Flag_Synd_CO.paa";
name = "Aegis SDK";
file = "Aegis_Reb_SDK";
maps[] = {"Tanoa"};
climate[] = {"tropical"};
forceDLC[] = {"expansion"};
};

class Aegis_Civ : Aegis_Base
{
side = "Civ";
flagTexture = "a3\data_f\flags\flag_aaf_co.paa";
name = "Aegis";
file = "Aegis_Civ";
};

// ***************************** RHS *****************************

class RHS_Base
Expand Down
994 changes: 994 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf

Large diffs are not rendered by default.

923 changes: 923 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf

Large diffs are not rendered by default.

912 changes: 912 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf

Large diffs are not rendered by default.

916 changes: 916 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf

Large diffs are not rendered by default.

950 changes: 950 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf

Large diffs are not rendered by default.

954 changes: 954 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf

Large diffs are not rendered by default.

924 changes: 924 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf

Large diffs are not rendered by default.

926 changes: 926 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf

Large diffs are not rendered by default.

1,038 changes: 1,038 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf

Large diffs are not rendered by default.

1,007 changes: 1,007 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf

Large diffs are not rendered by default.

1,010 changes: 1,010 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf

Large diffs are not rendered by default.

259 changes: 259 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_Civ.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,259 @@
//////////////////////////////
// Civilian Information //
//////////////////////////////

//////////////////////////
// Vehicles //
//////////////////////////

["vehiclesCivCar", [
"C_Quadbike_01_F", 0.3
,"C_Hatchback_01_F", 2.0
,"C_Hatchback_01_sport_F", 0.3
,"C_Offroad_01_F", 2.0
,"C_SUV_01_F", 1.0
,"C_Van_02_vehicle_F", 1.0 // van from Orange
,"C_Van_02_transport_F", 0.2 // minibus
,"C_Offroad_02_unarmed_F", 0.5 // Apex 4WD
,"C_Offroad_01_comms_F", 0.1 // Contact
,"C_Offroad_01_covered_F", 0.1]] call _fnc_saveToTemplate;

["vehiclesCivIndustrial", [
"C_Van_01_transport_F", 1.0
,"C_Van_01_box_F", 0.8
,"C_Truck_02_transport_F", 0.5
,"C_Truck_02_covered_F", 0.5
,"C_Tractor_01_F", 0.3 ]] call _fnc_saveToTemplate;

["vehiclesCivHeli", []] call _fnc_saveToTemplate;

["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
,"C_Boat_Civil_02_F", 1.0]] call _fnc_saveToTemplate; // Aegis boat

["vehiclesCivRepair", [
"C_Offroad_01_repair_F", 0.3
,"C_Van_02_service_F", 0.3 // orange
,"C_Truck_02_box_F", 0.1]] call _fnc_saveToTemplate;

["vehiclesCivMedical", ["C_Van_02_medevac_F", 0.1]] call _fnc_saveToTemplate;

["vehiclesCivFuel", [
"C_Van_01_fuel_F", 0.2
,"C_Truck_02_fuel_F", 0.1]] call _fnc_saveToTemplate;

/////////////////////
/// Identities ///
/////////////////////

["faces", ["GreekHead_A3_02", "GreekHead_A3_03", "GreekHead_A3_04", "GreekHead_A3_05", "GreekHead_A3_06",
"GreekHead_A3_07", "GreekHead_A3_08", "GreekHead_A3_09", "Ioannou", "Barklem", "AfricanHead_02",
"AsianHead_A3_02", "AsianHead_A3_03", "WhiteHead_05"]] call _fnc_saveToTemplate;
"CivMen" call _fnc_saveNames;

//////////////////////////
// Loadouts //
//////////////////////////

private _civUniforms = [
"U_C_Man_casual_1_F",
"U_C_Man_casual_2_F",
"U_C_Man_casual_3_F",
"U_C_Man_casual_4_F",
"U_C_Man_casual_5_F",
"U_C_Man_casual_6_F",
"U_C_ArtTShirt_01_v1_F",
"U_C_ArtTShirt_01_v2_F",
"U_C_ArtTShirt_01_v3_F",
"U_C_ArtTShirt_01_v4_F",
"U_C_ArtTShirt_01_v5_F",
"U_C_ArtTShirt_01_v6_F",
"U_NikosBody",
"U_NikosAgedBody",
"U_C_Poloshirt_blue",
"U_C_Poloshirt_burgundy",
"U_C_Poloshirt_stripped",
"U_C_Poloshirt_tricolour",
"U_C_Poloshirt_salmon",
"U_C_Poloshirt_redwhite",
"U_OrestesBody",
"U_C_Poor_1",
"U_C_HunterBody_grn",
"U_I_L_Uniform_01_tshirt_skull_F",
"U_I_L_Uniform_01_tshirt_black_F",
"U_I_L_Uniform_01_tshirt_sport_F",
"U_C_Scientist",
"U_C_Uniform_Scientist_02_formal_F",
"U_C_Uniform_Scientist_02_F",
"U_C_Uniform_Scientist_01_F",
"U_C_Poor_2", //this and below be Aegis and Atlas
"U_Jayholder",
"U_C_Man_casual_7_F",
"U_C_Man_casual_8_F",
"U_C_Man_casual_9_F",
"U_C_PriestBody",
"U_C_Commoner1_1",
"U_C_Commoner1_2",
"U_C_Commoner1_3",
"U_C_Uniform_Formal_01_blue_F",
"U_C_Uniform_Formal_01_striped_F",
"U_C_Uniform_Formal_01_white_F"
];

private _pressUniforms = [
"U_C_Journalist",
"U_Marshal",
"U_C_Uniform_Formal_01_blue_F",
"U_C_Uniform_Formal_01_striped_F",
"U_C_Uniform_Formal_01_white_F"
];

private _workerUniforms = [
"U_C_WorkerCoveralls",
"U_C_Uniform_Farmer_01_F"
];

private _dlcUniforms = [];

if ("expansion" in A3A_enabledDLC) then {
_dlcUniforms append [
"U_C_man_sport_1_F",
"U_C_man_sport_2_F",
"U_C_man_sport_3_F"
];
};

if ("orange" in A3A_enabledDLC) then {
_dlcUniforms append [
"U_C_Paramedic_01_F",
"U_C_Mechanic_01_F"
];
_workerUniforms append [
"U_C_ConstructionCoverall_Black_F",
"U_C_ConstructionCoverall_Blue_F",
"U_C_ConstructionCoverall_Red_F",
"U_C_ConstructionCoverall_Vrana_F"
];
};

if ("ws" in A3A_enabledDLC) then {
_dlcUniforms append [
"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"
];
};

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 = [
"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"
];

["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"]];

_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;
Loading