Merge branch 'official-antistasi-community:unstable' into AegisAtlas

.github/workflows/UpdateDevBuild.yml

@@ -27,7 +27,7 @@ jobs:
       run: '.\tools\Builder\buildAddons.ps1 -WorkshopID ${{github.event.inputs.workshopid}} -modFileName mod_dev.cpp'
 
     - name: Upload build addon artifact
-      uses: actions/upload-artifact@v3.1.2
+      uses: actions/upload-artifact@v4
       with:
         name: A3A
         path: build\A3A
@@ -38,7 +38,7 @@ jobs:
     needs: [build]
     steps:
     - name: Download addon artifact
-      uses: actions/download-artifact@v3.0.2
+      uses: actions/download-artifact@v4
       with:
         name: A3A
         path: A3A

.github/workflows/publishBranchToSteam.yml

@@ -10,7 +10,7 @@ jobs:
     timeout-minutes: 5
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.3.0
 
     - name: Increment version locally
       run: chmod +x ./tools/incrementVersion.js &&
@@ -20,7 +20,7 @@ jobs:
       run: '.\tools\Builder\buildAddons.ps1 -WorkshopID ${{secrets.WORKSHOPID}}'
 
     - name: Upload build addon artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: A3A
         path: build\A3A
@@ -31,13 +31,13 @@ jobs:
     needs: [build]
     steps:
     - name: Download addon artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         name: A3A
         path: A3A
 
     - name: Publish to Steam Workshop
-      uses: arma-actions/workshop-upload@v1
+      uses: arma-actions/workshop-upload@v1.0.2
       with:
         appId: '107410'      # default
         itemId: ${{ secrets.WORKSHOPID }} # https://steamcommunity.com/sharedfiles/filedetails/?id=[...]]

.github/workflows/syncStringtables.yml

@@ -28,7 +28,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install antistasi_translation_sync package
-        run: pip install "Tools/antistasi_translation_sync-0.5.0-py3-none-any.whl"
+        run: pip install "Tools/antistasi_translation_sync-0.6.1-py3-none-any.whl"
 
 
       - name: actual syncing

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,38 @@
+//Vanilla - CfgVehicles.hpp
+
+class CfgVehicles 
+{
+    #include "sfp_air.hpp"
+
+    // Nose-fall tweaks to make planes turn at a semi-decent rate when flown by AI
+	class Plane_Base_F;
+	class CUP_A10_Base : Plane_Base_F
+	{
+		draconicTorqueXCoef = 2;
+	};
+	class CUP_L39_base : Plane_base_F
+	{
+		draconicTorqueXCoef = 2;
+	};
+
+    // The faster planes benefit slightly from more torque, so we use the array form
+	class Plane;
+	class CUP_AV8B_Base : Plane
+	{
+		draconicTorqueXCoef[] = {2,3,4,5,6,7,8,9,10,10.1,10.2};
+	};
+	class CUP_Su25_base : Plane
+	{
+		draconicTorqueXCoef[] = {2,3,4,5,6,7,8,9,10,10.1,10.2};
+		//speeds in m/s: {0, 37.5, 75, 112.5, 150, 187.5, 225, 262.5, 300, 337.5, 375m/s}
+	};
+	class CUP_F35B_base : Plane
+	{
+		draconicTorqueXCoef[] = {2,3.5,5,6.5,8,9,10,11,12,12.1,12.2};
+		//speeds in m/s: {0, 58.3, 117, 175, 233, 292, 350, 408, 467, 525, 583m/s}
+	};
+	class CUP_SU34_BASE : Plane
+	{
+		draconicTorqueXCoef[] = {2,3.5,5,6.5,8,9,10,11,12,12.1,12.2};
+	};
+};

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,87 @@
+//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;
+	};
+
+	// Nose-fall tweaks to make planes turn at a semi-decent rate when flown by AI
+	// Note: LIB_Ju87 not adjusted because planes with low maxSpeed use different AI logic
+	class LIB_GER_Plane_base;
+	class LIB_FW190F8 : LIB_GER_Plane_base
+	{
+		draconicTorqueXCoef = 2;
+	};
+	class LIB_SU_Plane_base;
+	class LIB_P39 : LIB_SU_Plane_base
+	{
+		draconicTorqueXCoef = 2;
+	};
+	class LIB_Pe2 : LIB_SU_Plane_base
+	{
+		draconicTorqueXCoef = 2;
+	};
+	class LIB_US_Plane_base;
+	class LIB_P47 : LIB_US_Plane_base
+	{
+		draconicTorqueXCoef = 2;
+	};
+};