Config fixes + CSAT outfits

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

A3A/addons/config_fixes/Aegis/CfgVehicles.hpp

@@ -0,0 +1,10 @@
+//Aegis - CfgVehicles.hpp
+
+class CfgVehicles 
+{
+//#include "air.hpp"
+//#include "armor.hpp"
+#include "ifv.hpp"
+//#include "sea.hpp"
+//#include "soft.hpp"
+};

A3A/addons/config_fixes/Aegis/CfgWeapons.hpp

@@ -8,4 +8,3 @@ class CfgWeapons
         baseWeapon = "Aegis_arifle_AKM74_sand_F";
     };
 };
-

A3A/addons/config_fixes/Aegis/config.cpp

@@ -21,5 +21,5 @@ class CfgPatches
 };
 
 // Uncomment when needed
-//#include "CfgVehicles.hpp" - Later for Russian BTR
+#include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"

A3A/addons/config_fixes/Aegis/ifv.hpp

@@ -0,0 +1,169 @@
+//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 Wheeled_APC_F;
+class APC_Wheeled_04_base_F : Wheeled_APC_F { class Turrets; };
+class O_R_APC_Wheeled_04_cannon_F : APC_Wheeled_04_base_F { class EventHandlers; class Turrets : Turrets { class MainTurret; }; };
+class a3a_O_R_APC_Wheeled_04_cannon_F : O_R_APC_Wheeled_04_cannon_F
+{
+    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"};
+        };
+    };
+};

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf

@@ -28,7 +28,7 @@ private _cargoTrucks = ["I_Truck_02_transport_F", "I_Truck_02_covered_F"];
 ["vehiclesMedical", ["I_Truck_02_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["I_APC_tracked_03_cannon_v2_F", "I_APC_Wheeled_03_cannon_F", "I_APC_Wheeled_03_cannon_F"]] call _fnc_saveToTemplate;;
-["vehiclesIFVs", ["I_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
+["vehiclesIFVs", ["a3a_I_APC_tracked_03_cannon_v2_F", "a3a_APC_Wheeled_03_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["I_MBT_03_cannon_F"]] call _fnc_saveToTemplate;
 private _AA = ["I_LT_01_AA_F"];
 

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

@@ -28,7 +28,7 @@
 ["vehiclesMedical", ["B_A_Truck_01_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["B_A_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+["vehiclesIFVs", ["a3a_B_A_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["B_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf

@@ -28,7 +28,7 @@
 ["vehiclesMedical", ["B_A_Truck_01_medical_wdl_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["B_A_APC_tracked_03_cannon_v2_wdl_F"]] call _fnc_saveToTemplate;
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+["vehiclesIFVs", ["a3a_B_A_APC_tracked_03_cannon_v2_wdl_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["B_W_MBT_01_TUSK_F", "B_W_MBT_01_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["B_W_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf

@@ -28,7 +28,7 @@
 ["vehiclesMedical", ["B_A_Truck_01_medical_tna_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["B_A_APC_tracked_03_cannon_v2_tna_F"]] call _fnc_saveToTemplate;
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+["vehiclesIFVs", ["a3a_B_A_APC_tracked_03_cannon_v2_tna_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 

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

@@ -27,8 +27,8 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F","O_T_Truck_02_F","O_T_Truck_0
 ["vehiclesFuelTrucks", ["O_T_Truck_02_fuel_F","O_T_Truck_03_fuel_ghex_F"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["O_T_Truck_03_medical_ghex_F","O_T_Truck_02_Medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate;
-private _vehiclesIFVs = ["a3a_T_APC_Tracked_02_cannon_F"];
+["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F", "a3a_O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate;
+private _vehiclesIFVs = ["a3a_O_T_APC_Tracked_02_cannon_ghex_F", "O_T_APC_Tracked_02_cannon_ghex_F"];
 ["vehiclesTanks", ["O_T_MBT_02_cannon_ghex_F"]] call _fnc_saveToTemplate; 
 ["vehiclesAA", ["O_T_APC_Tracked_02_AA_ghex_F"]] call _fnc_saveToTemplate;
 
@@ -216,10 +216,10 @@ _loadoutData set ["items_unarmed_extras", []];
 ///////////////////////////////////////
 
 private _sfLoadoutData = _loadoutData call _fnc_copyLoadoutData;
-_sfLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_ghex_F", "Aegis_U_O_CombatFatigues_ghex_02_F"]];
-_sfLoadoutData set ["vests", ["Aegis_V_OCarrierLuchnik_Lite_grn_F"]];
-_sfLoadoutData set ["glVests", ["Aegis_V_OCarrierLuchnik_GL_grn_F"]];
-_sfLoadoutData set ["Hvests", ["Aegis_V_OCarrierLuchnik_CQB_grn_F"]];
+_sfLoadoutData set ["uniforms", ["U_O_T_Soldier_F"]];
+_sfLoadoutData set ["vests", ["V_HarnessO_ghex_F", "Aegis_V_ChestrigEast_ghex_F"]];
+_sfLoadoutData set ["glVests", ["V_HarnessOGL_ghex_F"]];
+_sfLoadoutData set ["Hvests", ["V_TacVest_oli"]];
 _sfLoadoutData set ["backpacks", ["B_ViperLightHarness_ghex_F", "B_ViperHarness_ghex_F"]];
 _sfLoadoutData set ["helmets", ["H_HelmetSpecO_ghex_F", "H_HelmetSpecO_blk"]];
 _sfLoadoutData set ["NVGs", ["O_NVGoggles_ghex_F"]];
@@ -278,11 +278,11 @@ _sfLoadoutData set ["sidearms", [
 /////////////////////////////////
 
 private _militaryLoadoutData = _loadoutData call _fnc_copyLoadoutData;
-_militaryLoadoutData set ["uniforms", ["U_O_T_Soldier_F"]];
+_militaryLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_ghex_F", "Aegis_U_O_CombatFatigues_02_ghex_F"]];
 _militaryLoadoutData set ["slUniforms", ["U_O_T_Officer_F"]];
-_militaryLoadoutData set ["vests", ["V_HarnessO_ghex_F"]];
-_militaryLoadoutData set ["glVests", ["V_HarnessOGL_ghex_F"]];
-_militaryLoadoutData set ["Hvests", ["V_TacVest_oli"]];
+_militaryLoadoutData set ["vests", ["Aegis_V_OCarrierLuchnik_Lite_grn_F"]];
+_militaryLoadoutData set ["glVests", ["Aegis_V_OCarrierLuchnik_GL_grn_F"]];
+_militaryLoadoutData set ["Hvests", ["Aegis_V_OCarrierLuchnik_CQB_grn_F"]];
 _militaryLoadoutData set ["backpacks", ["B_Carryall_ghex_F", "B_FieldPack_ghex_F", "B_AssaultPack_ghex_F"]];
 _militaryLoadoutData set ["helmets", ["H_HelmetO_ghex_F", "H_HelmetLeaderO_ghex_F"]];
 _militaryLoadoutData set ["binoculars", ["Laserdesignator_02_ghex_F"]];
@@ -360,9 +360,9 @@ _policeLoadoutData set ["sidearms", ["hgun_Pistol_01_F"]];
 ////////////////////////////////
 
 private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
-_militiaLoadoutData set ["uniforms", ["U_O_T_officer_noInsignia_ghex_F", "Aegis_U_O_CombatUniform_tshirt_ghex_F"]];
+_militiaLoadoutData set ["uniforms", ["U_O_T_officer_noInsignia_ghex_F"]];
 _militiaLoadoutData set ["slUniforms", ["U_O_T_Officer_F"]];
-_militiaLoadoutData set ["vests", ["V_HarnessO_ghex_F", "V_BandollierB_ghex_F"]];
+_militiaLoadoutData set ["vests", ["Aegis_V_ChestrigEast_ghex_F", "V_HarnessO_ghex_F", "V_BandollierB_ghex_F"]];
 _militiaLoadoutData set ["glVests", ["V_HarnessOGL_ghex_F"]];
 _militiaLoadoutData set ["Hvests", ["V_TacVest_oli"]];
 _militiaLoadoutData set ["backpacks", ["B_Carryall_ghex_F", "B_FieldPack_ghex_F", "B_AssaultPack_ghex_F"]];
@@ -381,7 +381,7 @@ _militiaLoadoutData set ["SMGs", [
 ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]
 ]];
 _militiaLoadoutData set ["machineGuns", [
-["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""]
+["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["75Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_Tracer_F"], [], ""]
 ]];
 _militiaLoadoutData set ["marksmanRifles", [
 ["srifle_DMR_07_blk_F", "", "", "optic_Arco_blk_F", [], [], ""]
@@ -396,8 +396,8 @@ _militiaLoadoutData set ["sidearms", ["hgun_Rook40_F"]];
 //////////////////////////
 
 private _crewLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
-_crewLoadoutData set ["uniforms", ["U_O_T_Soldier_F"]];
-_crewLoadoutData set ["vests", ["V_HarnessO_ghex_F"]];
+_crewLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_02_ghex_F"]];
+_crewLoadoutData set ["vests", ["Aegis_V_ChestrigEast_ghex_F"]];
 _crewLoadoutData set ["helmets", ["H_HelmetCrew_O", "H_Tank_black_F"]];
 
 private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;