Merge pull request #307 from wersal454/Combined-factions

A tiny pr now with combined factions
SilenceIsFatto · Sep 25, 2024 · 22ea256 · 22ea256
2 parents 14ee154 + e44d1a8
commit 22ea256
Show file tree

Hide file tree

Showing 569 changed files with 34,718 additions and 10,731 deletions.
diff --git a/A3A/addons/config_fixes/CUP/CfgVehicles.hpp b/A3A/addons/config_fixes/CUP/CfgVehicles.hpp
@@ -2,6 +2,8 @@
 
 class CfgVehicles 
 {
+    #include "sfp_air.hpp"
+
     // Western Militia
     class CUP_B_nM1025_Unarmed_USA_DES;
     class CUP_B_nM1025_M240_USA_DES;
@@ -91,4 +93,36 @@ class CfgVehicles
     {
         textureList[] = {"Green",1};
     };
+
+    // 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};
+	};
 };
diff --git a/A3A/addons/config_fixes/CUP/sfp_air.hpp b/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};
+};
diff --git a/A3A/addons/config_fixes/GM/CfgVehicles.hpp b/A3A/addons/config_fixes/GM/CfgVehicles.hpp
@@ -596,6 +596,11 @@ class CfgVehicles
 		gm_InsigniasDefaultNation = "gm_insignia_none";
 		gm_InsigniasDefaultFlag = "gm_insignia_none";
 	};
+	class gm_pl_airforce_mi2urpg_noinsignia : gm_pl_airforce_mi2urpg
+	{
+		gm_InsigniasDefaultNation = "gm_insignia_none";
+		gm_InsigniasDefaultFlag = "gm_insignia_none";
+	};
 	class gm_pl_airforce_mi2urs_noinsignia : gm_pl_airforce_mi2urs
 	{
 		gm_InsigniasDefaultNation = "gm_insignia_none";

diff --git a/A3A/addons/config_fixes/IFA/CfgVehicles.hpp b/A3A/addons/config_fixes/IFA/CfgVehicles.hpp
@@ -11,4 +11,59 @@
 			QPATHTOFOLDER(IFA\data\dc3_body_01_bob_co.paa),
 			QPATHTOFOLDER(IFA\data\dc3_body_02_co.paa)
 		};
-	};
+
+
+	};
+
+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;
+	};
+	// 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;
+	};
+};
diff --git a/A3A/addons/config_fixes/SOG_NK/CfgVehicles.hpp b/A3A/addons/config_fixes/SOG_NK/CfgVehicles.hpp
@@ -0,0 +1,67 @@
+//SOG nickel steel - CfgVehicles.hpp
+
+class CfgVehicles
+{
+	class vnx_i_air_ac119_01_01;
+	class vnx_i_air_ac119_02_01;
+	class vnx_i_air_ac119_03_01;
+
+	class vnx_b_air_ac119_01_01;
+	class vnx_b_air_ac119_02_01;
+	class vnx_b_air_ac119_03_01;
+	class vnx_b_air_ac119_04_01;
+
+	class vnx_b_air_ac119_03_02;
+	class vnx_b_air_ac119_02_02;
+
+
+	class vnx_i_air_ac119_01_01_noinsignia : vnx_i_air_ac119_01_01
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_01_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+	class vnx_i_air_ac119_02_01_noinsignia : vnx_i_air_ac119_02_01
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_02_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+	class vnx_i_air_ac119_03_01_noinsignia : vnx_i_air_ac119_03_01
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_02_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_02_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+
+
+	class vnx_b_air_ac119_01_01_noinsignia : vnx_b_air_ac119_01_01
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_01_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+	class vnx_b_air_ac119_02_01_noinsignia : vnx_b_air_ac119_02_01
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_01_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+	class vnx_b_air_ac119_03_01_noinsignia : vnx_b_air_ac119_03_01
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_01_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+	class vnx_b_air_ac119_04_01_noinsignia : vnx_b_air_ac119_04_01
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_01_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+
+
+	class vnx_b_air_ac119_03_02_noinsignia : vnx_b_air_ac119_03_02
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_01_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+	class vnx_b_air_ac119_02_02_noinsignia : vnx_b_air_ac119_02_02
+    {
+	   hiddenSelections[] = {"camo1","camo2","camo3","camo4","camo5","camo6","none","d_rank_pilot","d_rank_copilot","d_name_pilot_01","d_name_pilot_02","d_name_pilot_03","d_name_pilot_04","d_name_pilot_05","d_name_pilot_06","d_name_pilot_07","d_name_pilot_08","d_name_pilot_09","d_name_pilot_10","d_name_copilot_01","d_name_copilot_02","d_name_copilot_03","d_name_copilot_04","d_name_copilot_05","d_name_copilot_06","d_name_copilot_07","d_name_copilot_08","d_name_copilot_09","d_name_copilot_10"};
+       hiddenSelectionsTextures[] = {"vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_01_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_02_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_03_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_04_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_05_01_co.paa","vnx\air_f_vietnam_04\ac119\data\vnx_air_ac119_ext_06_01_co.paa","\a3\data_f\clear_empty.paa"};
+    };
+};
diff --git a/A3A/addons/config_fixes/SOG_NK/config.cpp b/A3A/addons/config_fixes/SOG_NK/config.cpp
@@ -0,0 +1,25 @@
+//SOG nickel steel - config.cpp
+
+#include "..\script_component.hpp"
+
+class CfgPatches 
+{
+    class PATCHNAME(SOG_NK) 
+    {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"A3_Data_F_AoW_Loadorder","air_f_vietnam_04"};
+        author = AUTHOR;
+        authors[] = { AUTHORS };
+        authorUrl = "";
+        VERSION_CONFIG;
+        skipWhenMissingDependencies = 1;
+    };
+};
+
+// Uncomment when needed
+#include "CfgVehicles.hpp"
+//#include "CfgMarkers.hpp"
+//#include "CfgWeapons.hpp"