Merge pull request #3331 from official-antistasi-community/unstable

merge to master for 3.6.0

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

@@ -12,5 +12,18 @@ class CfgWeapons
         magazineWell[] = {"CBA_792x57_K98"};
         recoil = "recoil_dmr_01";
     };
+
+    class UK3CB_MG3;
+    class UK3CB_MG3_KWS_T : UK3CB_MG3{
+        BaseWeapon = "UK3CB_MG3_KWS_T";
+    };
+    class UK3CB_M21;
+    class UK3CB_M21_Bipod_Railed : UK3CB_M21{
+        BaseWeapon = "UK3CB_M21_Bipod_Railed";
+    };
+    class uk3cb_auga2_sr_carb;
+    class uk3cb_auga2_sr_carb_tan : uk3cb_auga2_sr_carb{
+        BaseWeapon = "uk3cb_auga2_sr_carb_tan";
+    };
 };
 

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

@@ -11,7 +11,8 @@ class CfgPatches
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","UK3CB_Factions_Vehicles_SUV"};
+        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","UK3CB_Factions_Vehicles_SUV",
+        "UK3CB_Factions_Weapons_AUG","UK3CB_Factions_Weapons_M14","UK3CB_Factions_Weapons_MG3"};
         author = AUTHOR;
         authors[] = { AUTHORS };
         authorUrl = "";

A3A/addons/config_fixes/CUP/CfgVehicles.hpp

@@ -0,0 +1,6 @@
+//Vanilla - CfgVehicles.hpp
+
+class CfgVehicles 
+{
+#include "sfp_air.hpp"
+};

A3A/addons/config_fixes/CUP/config.cpp

@@ -2,8 +2,6 @@
 
 #include "..\script_component.hpp"
 
-#if __has_include("\CUP\Vehicles\CUP_Vehicles_LoadOrder\config.bin")
-
 class CfgPatches 
 {
     class PATCHNAME(CUP) 
@@ -16,13 +14,12 @@ class CfgPatches
         author = AUTHOR;
         authors[] = { AUTHORS };
         authorUrl = "";
+        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };
 
 // Uncomment when needed
 //#include "CfgMagazines.hpp"
-//#include "CfgVehicles.hpp"
+#include "CfgVehicles.hpp"
 //#include "CfgWeapons.hpp"
-
-#endif      // __has_include("\CUP\Vehicles\CUP_Vehicles_LoadOrder\config.bin")

A3A/addons/config_fixes/CUP/sfp_air.hpp

@@ -0,0 +1,24 @@
+//CUP-SFP - sfp_air.hpp
+
+class CUP_B_UH60S_USN;
+class CUP_MH60S_Unarmed_USN;
+class CUP_MH60S_Unarmed_FFV_USN;
+
+class a3a_SFP_B_UH60S_USN : CUP_B_UH60S_USN
+{
+    displayName = "UH-60M (M3M)";
+    textureList[] = {"Black", 1};
+    animationList[] = {"Navyclan_hide",1,"Navyclan2_hide",1,"Filters_Hide",1,"mainRotor_folded",1,"mainRotor_unfolded",0,"Hide_ESSS2x",1,"Hide_ESSS4x",1,"Hide_Nose",0,"Blackhawk_Hide",0,"Hide_FlirTurret",1,"Hide_Probe",1,"Doorcock_Hide",0};
+};
+class a3a_SFP_MH60S_Unarmed_USN : CUP_MH60S_Unarmed_USN
+{
+    displayName = "UH-60M (Unarmed)";
+    textureList[] = {"Black", 1};
+    animationList[] = {"Navyclan_hide",1,"Navyclan2_hide",1,"Filters_Hide",1,"mainRotor_folded",1,"mainRotor_unfolded",0,"Hide_ESSS2x",1,"Hide_ESSS4x",1,"Hide_Nose",0,"Blackhawk_Hide",0,"Hide_FlirTurret",0,"Hide_Probe",1,"Doorcock_Hide",0};
+};
+class a3a_SFP_MH60S_Unarmed_FFV_USN : CUP_MH60S_Unarmed_FFV_USN
+{
+    displayName = "UH-60M (Unarmed/FFV)";
+    textureList[] = {"Black", 1};
+    animationList[] = {"Navyclan_hide",1,"Navyclan2_hide",1,"Filters_Hide",1,"mainRotor_folded",1,"mainRotor_unfolded",0,"Hide_ESSS2x",1,"Hide_ESSS4x",1,"Hide_Nose",0,"Blackhawk_Hide",0,"Hide_FlirTurret",0,"Hide_Probe",1,"Doorcock_Hide",0};
+};

A3A/addons/config_fixes/IFA/CfgAmmo.hpp

@@ -0,0 +1,15 @@
+// IFA - CfgAmmo.hpp
+
+class CfgAmmo {
+    // Buffs to bring mortar effectiveness against unarmoured somewhere near vanilla against armoured
+    class Sh_82mm_AMOS;
+    class LIB_Sh_82_HE : Sh_82mm_AMOS {
+        indirectHitRange = 13;
+    };
+    class LIB_Sh_81_HE : LIB_Sh_82_HE {
+        indirectHitRange = 12.6;
+    };
+    class LIB_Sh_60_HE : LIB_Sh_82_HE {
+        indirectHitRange = 11;
+    };
+};

A3A/addons/config_fixes/IFA/CfgVehicles.hpp

@@ -0,0 +1,65 @@
+//IFA - CfgVehicles.hpp
+
+class DefaultEventHandlers;
+class CfgVehicles 
+{
+	class LIB_US_Willys_MB_M1919;
+	class a3a_LIB_Willys_MB_M1919 : LIB_US_Willys_MB_M1919{
+		hiddenSelectionsTextures[] = {"WW2\Assets_t\Vehicles\Cars_t\IF_Willys_MB\Willys_co.paa","\WW2\Assets_t\Vehicles\Cars_t\IF_Willys_MB\Willys_Additional_co.paa"};
+		typicalCargo[] = {"LIB_SOV_AT_soldier"};
+		crew = "LIB_SOV_unequip";
+		faction = "LIB_RKKA";
+		side = 0;
+	};
+	class LIB_DAK_PzKpfwIV_H;
+	class a3a_lib_PzKpfwIV_noShield : LIB_DAK_PzKpfwIV_H{
+		faction = "LIB_WEHRMACHT";
+		hiddenSelectionsTextures[] = {"\WW2\Assets_t\Vehicles\Tanks_t\IF_PzKpfwIV_H\Body_co.paa","\WW2\Assets_t\Vehicles\Tanks_t\IF_PzKpfwIV_H\Turret_co.paa","\WW2\Assets_t\Vehicles\Tanks_t\IF_PzKpfwIV_H\Wheels_co.paa","\WW2\Assets_t\Vehicles\Tanks_t\IF_PzKpfwIV_H\Tracks_co.paa"};
+	};
+	class LIB_Zis6_Parm;
+	class a3a_lib_Zis6_BOX : LIB_Zis6_Parm {
+		displayName = "ZIS-5V (Box)";
+		transportRepair = 0;
+		typicalCargo[] = {"LIB_FFI_LAT_Soldier"};
+		faction = "LIB_FFI";
+		side = 2;
+	};
+
+	class B_HMG_02_high_weapon_F;
+	class I_G_HMG_02_high_weapon_F : B_HMG_02_high_weapon_F{
+		class assembleInfo;
+	};
+	class a3a_hmg_02_high_weapon : I_G_HMG_02_high_weapon_F{
+		class assembleInfo : assembleInfo {
+			assembleTo = "a3a_hmg_02_high";
+		};
+	};
+	class HMG_02_high_base_F;
+	class B_G_HMG_02_high_F : HMG_02_high_base_F{
+		class AnimationSources;
+	};
+	class a3a_hmg_02_high : B_G_HMG_02_high_F{
+		displayName = ".50 M2HB (Raised)";
+		class AnimationSources : AnimationSources{
+			class Hide_Shield {
+				animPeriod = 0.01;
+				initPhase = 1;
+				source = "user";
+				useSource = 1;
+			};
+			class Hide_Rail {
+				animPeriod = 0.01;
+				initPhase = 1;
+				source = "user";
+				useSource = 1;
+			};
+		};
+		animationList[] ={};
+	};
+
+	// CBA event handlers fix
+	class Tank;
+	class LIB_Armored_Target_Dummy : Tank {
+		delete EventHandlers;
+	};
+};

A3A/addons/config_fixes/IFA/CfgWeapons.hpp

@@ -0,0 +1,122 @@
+//IFA - CfgWeapons.hpp
+
+//Fun weapons for finding in lootcrates or on SF
+class Mode_SemiAuto;
+class CfgWeapons 
+{
+	class ItemCore;
+	class LIB_M1918A2_BAR_Bipod : ItemCore{
+		picture = "\WW2\Assets_t\Weapons\Equipment_t\Weapons\MuzzleItem\Gear_ACC_BAR_Bipod_ca.paa";
+	};
+	class LIB_M1918A2_BAR_Handle : ItemCore{
+		picture = "\WW2\Assets_t\Weapons\Equipment_t\Weapons\MuzzleItem\Gear_ACC_BAR_Handle_ca.paa";
+	};
+    class LIB_RIFLE;
+    class LIB_PISTOL;
+    class LIB_M1_Carbine : LIB_RIFLE {
+        class Short;
+    };
+    class LIB_SVT_40 : LIB_RIFLE {
+        class Short;
+    };
+    class LIB_M1896 : LIB_PISTOL{
+        class Single;
+    };
+    class a3a_lib_M712 : LIB_M1896{
+        displayName = "M712 Mauser";
+        descriptionShort = "9x19mm machine pistol";
+        recoil = "recoil_pistol_4five";
+        recoilProne = "recoil_pistol_4five";
+        changeFiremodeSound[] = {"A3\sounds_f\weapons\closure\firemode_changer_2.wss",0.1778,1,5};
+        class Full : Single{
+            aiDispersionCoefX = 2;
+            aiDispersionCoefY = 3;
+            displayName = "Full";
+            autoFire = 1;
+            textureType = "fullAuto";
+            reloadTime = 0.066;
+            maxRange = 25;
+            maxRangeProbab = 0.05;
+            midRange = 12.5;
+            midRangeProbab = 0.5;
+            minRange = 0;
+            minRangeProbab = 1.0;
+            showToPlayer = 1;
+        };
+        modes[] = {"Single", "Full"};
+    };
+    class a3a_lib_AVT_40 : LIB_SVT_40 {
+        displayName = "AVT-40";
+        descriptionShort = "AVT-40 Automatic rifle";
+        changeFiremodeSound[] = {"A3\sounds_f\weapons\closure\firemode_changer_2.wss",0.1778,1,5};
+        class Full : Short{
+            aiDispersionCoefX = 2;
+            aiDispersionCoefY = 3;
+            displayName = "Full";
+            autoFire = 1;
+            textureType = "fullAuto";
+            reloadTime = 0.08;
+            maxRangeProbab = 0.05;
+            midRangeProbab = 0.2;
+            minRangeProbab = 0.7;
+            minRange = 0;
+            showToPlayer = 1;
+        };
+        modes[] = {"Single","Full","Far","Medium","Short"};
+    };
+    class a3a_lib_M2_Carbine : LIB_M1_Carbine{
+        displayName = "M2 Carbine";
+        descriptionShort = "M2 Carbine .30 Automatic rifle";
+        changeFiremodeSound[] = {"A3\sounds_f\weapons\closure\firemode_changer_2.wss",0.1778,1,5};
+        class Full : Short{
+            aiDispersionCoefX = 2;
+            aiDispersionCoefY = 3;
+            displayName = "Full";
+            autoFire = 1;
+            textureType = "fullAuto";
+            reloadTime = 0.08;
+            maxRangeProbab = 0.05;
+            midRangeProbab = 0.2;
+            minRangeProbab = 0.7;
+            minRange = 0;
+            showToPlayer = 1;
+        };
+        modes[] = {"Single","Full","Far","Medium","Short"};
+    };
+
+    // Adjust so that the mortars aren't wildly inaccurate at longer ranges
+    class LIB_MortarCannon_base;
+    class LIB_GRWR34 : LIB_MortarCannon_base {
+        class Single1 : Mode_SemiAuto {
+            artilleryDispersion = 4;
+        };
+        class Single2 : Single1 {
+            artilleryDispersion = 4;
+        };
+        class Single3 : Single1 {
+            artilleryDispersion = 4;
+        };
+    };
+    class LIB_BM37 : LIB_MortarCannon_base {
+        class Single1 : Mode_SemiAuto {
+            artilleryDispersion = 4;
+        };
+        class Single2 : Single1 {
+            artilleryDispersion = 4;
+        };
+        class Single3 : Single1 {
+            artilleryDispersion = 4;
+        };
+    };
+    class LIB_M2_60 : LIB_MortarCannon_base {
+        class Single1 : Mode_SemiAuto {
+            artilleryDispersion = 4;
+        };
+        class Single2 : Single1 {
+            artilleryDispersion = 4;
+        };
+        class Single3 : Single1 {
+            artilleryDispersion = 4;
+        };
+    };
+};

A3A/addons/config_fixes/IFA/config.cpp

@@ -0,0 +1,26 @@
+//IFA - config.cpp
+
+#include "..\script_component.hpp"
+
+
+class CfgPatches 
+{
+    class PATCHNAME(IFA)
+    {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"IFA3_Core","WW2_Core_c_IF_ZZZ_LastLoaded_c"};
+        skipWhenMissingDependencies = 1;
+        author = AUTHOR;
+        authors[] = { AUTHORS };
+        authorUrl = "";
+        VERSION_CONFIG;
+    };
+};
+
+// Uncomment when needed
+#include "CfgVehicles.hpp"
+#include "CfgWeapons.hpp"
+#include "CfgAmmo.hpp"