Skip to content

Commit

Permalink
Aegis factions Compatability (#3414)
Browse files Browse the repository at this point in the history
* Basic AegisAtlas Templates Ported

BUG: Rebel factions broken

* Spelling mistakes, factions, parameters

Fixed spelling mistakes.
Added templates for Bundeswehr, Belarus, Argana, Takistania army.
Added parameter for Western Sahara DLC.

* template vt7

forgot to add this in last commit.

* Rest of BLUFOR factions

* LogNodes, spelling mistakes

* Minor spelling mistakes

* Edits to hopefully fix merge conflict

* Update Templates.hpp

Random comment

* Trying to fix conflicts

* Again

* Revert "Again"

This reverts commit 3c16151.

* And again

* Update Templates.hpp

* Identity + minor vars updated

Updating every file to have identities, slHat, sniHats, slRifles

* Aegis eq update

Equipment update (Still needs WS check)
Removed Atlas factions (temporarily)

* WS compat

* Vic attributes, templates.hpp

* BAF voice fix

Now its only british voices

* AT swaparounds, No UKvoices in the US

* ws check + US SCAR + LDF AK

Accidentally put AA40 check in marksman dlc.
Added SCARs to US for more variety than MX.
Added AKs to LDF militia, cus former soviet country :D

* Officer + AAF

Officer template overhaul on all factions.
AAF now has M4s, SF got SR25.

* Outdated DLC checks

AAF & CIV had outdated DLC checks.
Added missing DLC stuff to REB factions.

* Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf

Co-authored-by: ante185 <[email protected]>

* Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf

Co-authored-by: ante185 <[email protected]>

* Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf

Co-authored-by: ante185 <[email protected]>

* Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf

Co-authored-by: ante185 <[email protected]>

* The rest replaced to C130

* Spelling mistakes + minor edits

Lots of spelling mistake errors in RPT (Thanks Ante!!).
OPFOR T140 variants added as _vehiclesHeavyTanks.
Russia SF now has Raven helmets.
Rebels had minor Atlas items leftover.
(Hopefully) fixed police and officer sharing same template.

* militia EOD + Engi losing primary

* BAF + Officer Classnames

* aircraft loadouts + western weaponry

config.cpp created with CAS & CAP loadouts.
AAF, BAF, US & LDF got slightly changed or a minor overhaul for more new weapons.

* Update config.cpp

Removed unnecessary setups

* Minor errors + CfgWeapons

* RF compat

* classname errors + officers spawning with shotgun

* black mk20

* Tweaks & fixes + Traitor edits

- BAF tropical SF had mtp uniforms.
- BAF non SF gets SPAR instead of MXM.
- BAF & US tropical were missing RF compat.
- China had wrong SF vests & uniforms.
- Rebels, Shotgun only >:)
- All traitor loadouts edited to look a tiny bit more traitorous.
- All militias tweaked.

* Config fixes + CSAT outfits

- Config fixes for APCs/IFVs (SLATs).
- Ammo bandolier :)
- China, Iran & Russia got military and sf outfits swapped around, fits better.

* missing s in reb + stuff not needed on AAF

* Update ifv.hpp

* Update Aegis_AI_US_Arid.sqf

---------

Co-authored-by: ante185 <[email protected]>
  • Loading branch information
RetardedFoX and ante185 authored Nov 27, 2024
1 parent 579d434 commit e29fd44
Show file tree
Hide file tree
Showing 21 changed files with 12,212 additions and 0 deletions.
10 changes: 10 additions & 0 deletions A3A/addons/config_fixes/Aegis/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//Aegis - CfgVehicles.hpp

class CfgVehicles
{
//#include "air.hpp"
//#include "armor.hpp"
#include "ifv.hpp"
//#include "sea.hpp"
//#include "soft.hpp"
};
10 changes: 10 additions & 0 deletions A3A/addons/config_fixes/Aegis/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//Aegis - CfgWeapons.hpp

class CfgWeapons
{
class Aegis_arifle_AKM74_F;
class Aegis_arifle_AKM74_sand_F : Aegis_arifle_AKM74_F
{
baseWeapon = "Aegis_arifle_AKM74_sand_F";
};
};
25 changes: 25 additions & 0 deletions A3A/addons/config_fixes/Aegis/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//Aegis - config.cpp

#include "..\script_component.hpp"


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

// Uncomment when needed
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
170 changes: 170 additions & 0 deletions A3A/addons/config_fixes/Aegis/ifv.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
//Aegis - ifv.hpp

// Mora/Lancer/Odyniec //
class APC_Tracked_03_base_v2_F;
class I_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_I_APC_tracked_03_cannon_v2_F : I_APC_tracked_03_cannon_v2_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class I_E_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_I_E_APC_tracked_03_cannon_v2_F : I_E_APC_tracked_03_cannon_v2_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_A_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_B_A_APC_tracked_03_cannon_v2_F : B_A_APC_tracked_03_cannon_v2_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_A_APC_tracked_03_cannon_v2_wdl_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_B_A_APC_tracked_03_cannon_v2_wdl_F : B_A_APC_tracked_03_cannon_v2_wdl_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_A_APC_tracked_03_cannon_v2_tna_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_B_A_APC_tracked_03_cannon_v2_tna_F : B_A_APC_tracked_03_cannon_v2_tna_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

// Marshall/Borsuk //
class APC_Wheeled_01_base_v2_F;
class B_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
class a3a_B_APC_Wheeled_01_cannon_v2_F : B_APC_Wheeled_01_cannon_v2_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_W_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
class a3a_B_W_APC_Wheeled_01_cannon_v2_F : B_W_APC_Wheeled_01_cannon_v2_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_T_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
class a3a_B_T_APC_Wheeled_01_cannon_v2_F : B_T_APC_Wheeled_01_cannon_v2_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class Aegis_I_E_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
class a3a_Aegis_I_E_APC_Wheeled_01_cannon_v2_F : Aegis_I_E_APC_Wheeled_01_cannon_v2_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

// Marid/Kazak //
class APC_Wheeled_02_base_v2_F;
class O_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
class a3a_O_APC_Wheeled_02_rcws_v2_F : O_APC_Wheeled_02_rcws_v2_F
{
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class O_T_APC_Wheeled_02_rcws_v2_ghex_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
class a3a_O_T_APC_Wheeled_02_rcws_v2_ghex_F : O_T_APC_Wheeled_02_rcws_v2_ghex_F
{
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class O_R_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
class a3a_O_R_APC_Wheeled_02_rcws_v2_F : O_R_APC_Wheeled_02_rcws_v2_F
{
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

// Kamysh/Okhotnik //
class O_APC_Tracked_02_base_F;
class O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_base_F { class EventHandlers; };
class a3a_O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class O_T_APC_Tracked_02_cannon_ghex_F : O_APC_Tracked_02_base_F { class EventHandlers; };
class a3a_O_T_APC_Tracked_02_cannon_ghex_F : O_T_APC_Tracked_02_cannon_ghex_F
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class O_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_cannon_F {};
class Aegis_O_R_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_30mm_lxWS {};
class a3a_Aegis_O_R_APC_Tracked_02_30mm_lxWS : Aegis_O_R_APC_Tracked_02_30mm_lxWS
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

// Bogatyr //
class APC_Wheeled_04_base_F;
class O_R_APC_Wheeled_04_cannon_F : APC_Wheeled_04_base_F { class Turrets;};
class a3a_O_R_APC_Wheeled_04_cannon_base : O_R_APC_Wheeled_04_cannon_F { scope = 0; class EventHandlers; class Turrets : Turrets { class MainTurret; }; };
class a3a_O_R_APC_Wheeled_04_cannon_F : a3a_O_R_APC_Wheeled_04_cannon_base
{
scope = 2;
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
class Turrets : Turrets
{
class MainTurret : MainTurret
{
magazines[] = {"140Rnd_30mm_MP_shells_Tracer_Green","140Rnd_30mm_MP_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Green","2000Rnd_762x51_Belt_Green","4rnd_Vorona_HEAT","4rnd_Vorona_HE"};
weapons[] = {"autocannon_30mm_CTWS","LMG_coax_ext","missiles_Vorona_vehicle"};
};
};
};
67 changes: 67 additions & 0 deletions A3A/addons/core/Templates/AircraftLoadouts/Aegis/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#include "..\..\..\script_component.hpp"

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

class A3A {
class Loadouts
{
class CASPlane
{
class baseCAS;

class B_Plane_CAS_01_dynamicLoadout_F;

class O_Plane_CAS_02_dynamicLoadout_F;
class O_T_Plane_CAS_02_dynamicLoadout_ghex_F : O_Plane_CAS_02_dynamicLoadout_F{};
class O_R_Plane_CAS_02_dynamicLoadout_F : O_Plane_CAS_02_dynamicLoadout_F{};

class I_Plane_Fighter_03_dynamicLoadout_F;

class I_E_Plane_Fighter_04_F : baseCAS {
loadout[] = {"magazine_Fighter04_Gun20mm_AA_x120_red","PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_Missile_AGM_02_x2","PylonRack_Missile_AGM_02_x2"};
mainGun[] = {"weapon_Fighter_Gun20mm_AA"};
rocketLauncher[] = {"Rocket_04_HE_Plane_CAS_01_F"};
missileLauncher[] = {"weapon_AGM_65Launcher"};
};
class B_A_Plane_Fighter_05_F : baseCAS {
loadout[] = {"PylonRack_Missile_AGM_02_x1","PylonRack_Missile_AGM_02_x1","PylonRack_Missile_AGM_02_x1","PylonRack_Missile_AGM_02_x1","PylonRack_Missile_AGM_02_x1","PylonRack_Missile_AGM_02_x1","PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_7Rnd_Rocket_04_HE_F","PylonRack_Missile_AGM_02_x1","PylonRack_Missile_AGM_02_x1","PylonWeapon_220Rnd_25mm_shells"};
mainGun[] = {"gatling_25mm"};
rocketLauncher[] = {"Rocket_04_HE_Plane_CAS_01_F"};
missileLauncher[] = {"weapon_AGM_65Launcher"};
};

};
class CAPPlane
{
class baseCAP;

class B_Plane_Fighter_01_F;

class O_Plane_Fighter_02_F;
class O_T_Plane_Fighter_02_ghex_F : O_Plane_Fighter_02_F{};
class O_R_Plane_Fighter_02_F : O_Plane_Fighter_02_F{};

class I_Plane_Fighter_04_F;
class I_E_Plane_Fighter_04_F : I_Plane_Fighter_04_F {};

class B_Plane_Fighter_05_F : baseCAP {
loadout[] = {"PylonRack_Missile_BIM9X_x1","PylonRack_Missile_BIM9X_x1","PylonRack_Missile_BIM9X_x2","PylonRack_Missile_BIM9X_x2","PylonRack_Missile_AMRAAM_D_x2","PylonRack_Missile_AMRAAM_D_x2","PylonMissile_Missile_AMRAAM_D_INT_x1","PylonMissile_Missile_AMRAAM_D_INT_x1","PylonMissile_Missile_AMRAAM_D_INT_x1","PylonMissile_Missile_AMRAAM_D_INT_x1","PylonWeapon_220Rnd_25mm_shells"};
};
class B_A_Plane_Fighter_05_F : B_Plane_Fighter_05_F{};

};
};
};
Loading

0 comments on commit e29fd44

Please sign in to comment.