Merge branch 'unstable' into IFA-AIO

A3A/addons/config_fixes/3CB/CfgWeapons.hpp

@@ -0,0 +1,16 @@
+//3CB - CfgWeapons.hpp
+
+class CfgWeapons 
+{
+    class UK3CB_CZ550;
+    class a3a_UK3CB_CZ550_8mm : UK3CB_CZ550
+    {
+        BaseWeapon = "a3a_UK3CB_CZ550_8mm";
+        descriptionshort = "Hunting Rifle <br/>Caliber: 8×57mm IS";
+        displayname = "CZ-550 Lux";
+        magazines[] = {"rhsgref_5Rnd_792x57_kar98k"};
+        magazineWell[] = {"CBA_792x57_K98"};
+        recoil = "recoil_dmr_01";
+    };
+};
+

A3A/addons/config_fixes/3CB/config.cpp

@@ -21,3 +21,4 @@ class CfgPatches
 };
 
 #include "CfgVehicles.hpp"
+#include "CfgWeapons.hpp"

A3A/addons/config_fixes/RHS/chdkz_rhs.hpp

@@ -7,12 +7,6 @@ class rhsgref_ins_t72bc;
 
 class a3a_rhs_chdkz_72a : rhsgref_ins_t72ba
 {
-
-#if __A3_DEBUG__
-    scope = 2;
-#else
-    scope = 1;
-#endif
 	class EventHandlers
 	{
 		fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
@@ -22,11 +16,6 @@ class a3a_rhs_chdkz_72a : rhsgref_ins_t72ba
 };
 class a3a_rhs_chdkz_72b : rhsgref_ins_t72bb
 {
-#if __A3_DEBUG__
-    scope = 2;
-#else
-    scope = 1;
-#endif
 	class EventHandlers
 	{
 		fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
@@ -36,11 +25,6 @@ class a3a_rhs_chdkz_72b : rhsgref_ins_t72bb
 };
 class a3a_rhs_chdkz_72c : rhsgref_ins_t72bc
 {
-#if __A3_DEBUG__
-    scope = 2;
-#else
-    scope = 1;
-#endif
 	hiddenSelectionsTextures[] =
 	{
 		"rhsafrf\addons\rhs_t72_camo\data\rhs_t72b_01a_chdkz_co.paa",

A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp

@@ -4,6 +4,7 @@ class CfgVehicles
 {
 #include "air.hpp"
 #include "armor.hpp"
+#include "ifv.hpp"
 #include "sea.hpp"
 #include "soft.hpp"
 };

A3A/addons/config_fixes/Vanilla/armor.hpp

@@ -1,11 +1,16 @@
 //Vanilla - armor.hpp
 
-class I_APC_Wheeled_03_cannon_F;
 class I_MRAP_03_F;
 class I_MRAP_03_gmg_F;
 class I_MRAP_03_hmg_F;
 class O_MBT_04_cannon_F;
 class O_MBT_04_command_F;
+    class O_MBT_02_base_F
+    ; //external Root Class
+    class O_MBT_02_cannon_F : O_MBT_02_base_F
+    { 
+        class TextureSources; //external Child Class
+    };
 
 //Grey
 class a3a_MRAP_03_grey_F : I_MRAP_03_F
@@ -21,13 +26,6 @@ class a3a_MRAP_03_hmg_grey_F : I_MRAP_03_hmg_F
     hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"};
 };
 
-//Olive
-class a3a_APC_Wheeled_03_cannon_blufor_F : I_APC_Wheeled_03_cannon_F
-{
-    textureList[] = {};
-    hiddenSelectionsTextures[] = {"a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext2_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\RCWS30_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_alpha_CO.paa","a3\armor_f\data\camonet_aaf_fia_desert_co.paa","a3\armor_f\data\cage_sand_co.paa"};
-};
-
 //Black
 class a3a_MBT_04_cannon_black_F : O_MBT_04_cannon_F
 {
@@ -39,3 +37,18 @@ class a3a_MBT_04_command_black_F : O_MBT_04_command_F
     textureList[] = {};
     hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"};
 };
+
+class a3a_MBT_02_cannon_black_F : O_MBT_02_cannon_F
+{
+    class TextureSources : TextureSources
+    {
+        class Grey
+        {
+            author = "Bohemia Interactive";
+            displayName = "Grey";
+            textures[] = {"a3\Armor_F_Decade\MBT_02\Data\MBT_02_body_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_turret_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_expo_CO.paa","A3\Armor_F\Data\camonet_CSAT_HEX_Green_CO.paa"};
+        };
+    };
+    textureList[] = {"Grey", 1};
+    hiddenSelectionsTextures[] = {"a3\Armor_F_Decade\MBT_02\Data\MBT_02_body_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_turret_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_expo_CO.paa","A3\Armor_F\Data\camonet_CSAT_HEX_Green_CO.paa"};
+};

A3A/addons/config_fixes/Vanilla/ifv.hpp

@@ -0,0 +1,105 @@
+//Vanilla - ifv.hpp
+
+//Marshall
+class B_APC_Wheeled_01_base_F;
+class B_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_base_F { class EventHandlers; };
+class a3a_B_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_cannon_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_F : B_APC_Wheeled_01_cannon_F {};
+class a3a_B_T_APC_Wheeled_01_cannon_F : B_T_APC_Wheeled_01_cannon_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;};";
+    };
+};
+
+//Rhino
+class AFV_Wheeled_01_base_F;
+class B_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F { class EventHandlers; };
+class a3a_AFV_Wheeled_01_cannon_F : B_AFV_Wheeled_01_cannon_F
+{
+    animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1};
+    // Already has initVehicle EH
+};
+class B_T_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F { class EventHandlers; };
+class a3a_T_AFV_Wheeled_01_cannon_F :  B_T_AFV_Wheeled_01_cannon_F
+{
+    animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1};
+    // Already has initVehicle EH
+};
+
+//Gorgon
+class I_APC_Wheeled_03_base_F;
+class I_APC_Wheeled_03_cannon_F : I_APC_Wheeled_03_base_F { class EventHandlers; }
+class a3a_APC_Wheeled_03_cannon_F : I_APC_Wheeled_03_cannon_F
+{
+    animationList[] = {"showCamonetHull",0,"showBags",0.3,"showBags2",0.3,"showTools",0.3,"showSLATHull",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class a3a_APC_Wheeled_03_cannon_blufor_F : a3a_APC_Wheeled_03_cannon_F
+{
+    textureList[] = {};
+    hiddenSelectionsTextures[] = {"a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext2_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\RCWS30_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_alpha_CO.paa","a3\armor_f\data\camonet_aaf_fia_desert_co.paa","a3\armor_f\data\cage_sand_co.paa"};
+};
+
+//Mora
+class I_APC_tracked_03_base_F;
+class I_APC_tracked_03_cannon_F : I_APC_tracked_03_base_F { class EventHandlers; };
+class a3a_APC_tracked_03_cannon_F : I_APC_tracked_03_cannon_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_base_F;
+class I_E_APC_tracked_03_cannon_F : I_E_APC_tracked_03_base_F { class EventHandlers; };
+class a3a_E_APC_tracked_03_cannon_F : I_E_APC_tracked_03_cannon_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;};";
+    };
+};
+//Marid
+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_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};
+    // Already has initVehicle EH
+};
+class O_T_APC_Wheeled_02_rcws_v2_ghex_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
+class a3a_T_APC_Wheeled_02_rcws_v2_F : O_T_APC_Wheeled_02_rcws_v2_ghex_F
+{
+    animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
+    // Already has initVehicle EH
+};
+
+//Kamysh
+class O_APC_Tracked_02_base_F;
+class O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_base_F { class EventHandlers; };
+class a3a_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    // Already has initVehicle EH
+};
+class O_T_APC_Tracked_02_cannon_ghex_F : O_APC_Tracked_02_cannon_F {};
+class a3a_T_APC_Tracked_02_cannon_F : O_T_APC_Tracked_02_cannon_ghex_F
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    // Already has initVehicle EH
+};

A3A/addons/config_fixes/WS/CfgVehicles.hpp

@@ -18,6 +18,7 @@ class CfgVehicles
     class O_Tura_Truck_02_aa_lxWS;
     class O_Tura_ZU23_lxWS;
 
+    #include "ws_ifv.hpp"
     #include "ws_ion.hpp"
 
     //Tan

A3A/addons/config_fixes/WS/ws_ifv.hpp

@@ -0,0 +1,94 @@
+//WS - ws_ifv.hpp
+
+//Marshall
+//Ion
+
+class APC_Wheeled_01_base_F;
+class APC_Wheeled_01_command_base_lxWS : APC_Wheeled_01_base_F { class EventHandlers; };    // also used for NATO
+class B_ION_APC_Wheeled_01_command_lxWS: APC_Wheeled_01_command_base_lxWS {};
+class a3a_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS
+{
+    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_APC_Wheeled_01_cannon_lxWS;
+class B_ION_APC_Wheeled_01_cannon_lxWS: B_APC_Wheeled_01_cannon_lxWS { class EventHandlers; };
+class a3a_ION_APC_Wheeled_01_cannon_lxWS : B_ION_APC_Wheeled_01_cannon_lxWS
+{
+    scope = 2;
+    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_D_APC_Wheeled_01_atgm_lxWS;
+class a3a_ION_APC_Wheeled_01_atgm : B_D_APC_Wheeled_01_atgm_lxWS {
+    side = 1;
+    crew = "B_ION_Soldier_lxWS";
+    faction = "BLU_ION_lxWS";
+    textureList[] = {"ION_BLACK", 1};
+    hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\APC_Wheeled_01\APC_Wheeled_ion_base_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\apc_wheeled_ion_adds_co.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\apc_wheeled_ion_tows_co.paa","a3\armor_f\Data\camonet_AAF_stripe_desert_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\cage_black_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\APC_Wheeled_ion_lxws_CO.paa"};
+};
+
+//NATO
+class a3a_APC_Wheeled_01_command_lxWS : APC_Wheeled_01_command_base_lxWS
+{
+    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_command_lxWS : APC_Wheeled_01_command_base_lxWS {};
+class a3a_T_APC_Wheeled_01_command_lxWS : B_T_APC_Wheeled_01_command_lxWS
+{
+    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;};";
+	};
+};
+
+//Iskatel/Kamysh
+//Arid
+class O_APC_Tracked_02_30mm_lxWS;
+class a3a_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_30mm_lxWS
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    // Has initVehicle EH already
+};
+//Tropical
+class O_T_APC_Tracked_02_30mm_lxWS;
+class a3a_T_APC_Tracked_02_30mm_lxWS : O_T_APC_Tracked_02_30mm_lxWS
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    // Has initVehicle EH already
+};
+//SFIA
+class O_SFIA_APC_Tracked_02_30mm_lxWS;
+class a3a_SFIA_APC_Tracked_02_30mm_lxWS : O_SFIA_APC_Tracked_02_30mm_lxWS
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    // Has initVehicle EH already
+};
+class O_SFIA_APC_Tracked_02_cannon_lxWS;
+class a3a_SFIA_APC_Tracked_02_cannon_lxWS : O_SFIA_APC_Tracked_02_cannon_lxWS
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    // Has initVehicle EH already
+};
+//ION
+class a3a_ION_APC_Tracked_02_30mm : O_APC_Tracked_02_30mm_lxWS
+{
+    side = 1;
+    crew = "B_ION_Soldier_lxWS";
+    faction = "BLU_ION_lxWS";
+    animationList[] = {"showTracks",1,"showCamonetHull",0,"showBags",0.2,"showSLATHull",1};
+    textureList[] = {"Grey", 1};
+    hiddenSelectionsTextures[] = {"lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_01_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_02_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_03_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_30mm_black_co.paa","A3\Armor_F\Data\camonet_CSAT_Stripe_Desert_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\cage_black_CO.paa"};
+    // Has initVehicle EH already
+};

A3A/addons/config_fixes/WS/ws_ion.hpp

@@ -6,7 +6,7 @@ class a3a_ION_Truck_02_MRL_F : I_Truck_02_MRL_F
     side = 1;
     crew = "B_ION_Soldier_lxWS";
     faction = "BLU_ION_lxWS";
-    hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","a3\soft_f_gamma\truck_02\data\truck_02_mrl_co.paa"};
+    hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\data\truck_02\zamak_mrl_brown_co.paa"};
 };
 class a3a_ION_Truck_02_Ammo_F : O_Truck_02_Ammo_F
 {
@@ -69,22 +69,22 @@ class a3a_ION_Offroad_armor : B_Tura_Offroad_armor_lxWS
     side = 1;
     crew = "B_ION_Soldier_lxWS";
     faction = "BLU_ION_lxWS";
-    textureList[] = {};
+    textureList[] = {"Black", 1};
     hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
 };
 class a3a_ION_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS
 {
     side = 1;
     crew = "B_ION_Soldier_lxWS";
     faction = "BLU_ION_lxWS";
-    textureList[] = {};
+    textureList[] = {"Black", 1};
     hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
 };
 class a3a_ION_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS
 {
     side = 1;
     crew = "B_ION_Soldier_lxWS";
     faction = "BLU_ION_lxWS";
-    textureList[] = {};
+    textureList[] = {"Black", 1};
     hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
-};
+};

A3A/addons/core/CfgFunctions.hpp

@@ -239,7 +239,7 @@ class CfgFunctions
             class cargoSeats {};
             class cleanserVeh {};
             class countFreeSpawnPositions {};
-            class createAIAirplane {};
+            class createAIAirbase {};
             class createAICities {};
             class createAIcontrols {};
             class createAIOutposts {};
@@ -293,6 +293,8 @@ class CfgFunctions
             class installSchrodingersBuildingFix {};
             class prepFunctions {};
             class spawnDebuggingLoop {};
+            class spawnSelectedTemplateAI {};
+            class debugSpawnVics {};    
         };
 
         class Dialogs {
@@ -381,6 +383,7 @@ class CfgFunctions
             class prepareMarkerArrays {};
             class resourcecheck {};
             class tags {};
+            class checkCampaignEnd {};
         };
 
         class Intel {

A3A/addons/core/Includes/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 3
 #define MINOR 5
-#define PATCHLVL 0
+#define PATCHLVL 1
 #define BUILD 0