Skip to content

Commit 201e925

Browse files
Bob-MurphyBob-Murphy
authored
Merge pull request #3331 from official-antistasi-community/unstable
merge to master for 3.6.0
2 parents 31f87e0 + fede1c2 commit 201e925

File tree

306 files changed

+55001
-2347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+55001
-2347
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,18 @@ class CfgWeapons
1212
magazineWell[] = {"CBA_792x57_K98"};
1313
recoil = "recoil_dmr_01";
1414
};
15+
16+
class UK3CB_MG3;
17+
class UK3CB_MG3_KWS_T : UK3CB_MG3{
18+
BaseWeapon = "UK3CB_MG3_KWS_T";
19+
};
20+
class UK3CB_M21;
21+
class UK3CB_M21_Bipod_Railed : UK3CB_M21{
22+
BaseWeapon = "UK3CB_M21_Bipod_Railed";
23+
};
24+
class uk3cb_auga2_sr_carb;
25+
class uk3cb_auga2_sr_carb_tan : uk3cb_auga2_sr_carb{
26+
BaseWeapon = "uk3cb_auga2_sr_carb_tan";
27+
};
1528
};
1629

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class CfgPatches
1111
units[] = {};
1212
weapons[] = {};
1313
requiredVersion = REQUIRED_VERSION;
14-
requiredAddons[] = {"A3_Data_F_AoW_Loadorder","UK3CB_Factions_Vehicles_SUV"};
14+
requiredAddons[] = {"A3_Data_F_AoW_Loadorder","UK3CB_Factions_Vehicles_SUV",
15+
"UK3CB_Factions_Weapons_AUG","UK3CB_Factions_Weapons_M14","UK3CB_Factions_Weapons_MG3"};
1516
author = AUTHOR;
1617
authors[] = { AUTHORS };
1718
authorUrl = "";

‎A3A/addons/config_fixes/CUP/CfgVehicles.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
//Vanilla - CfgVehicles.hpp
2+
3+
class CfgVehicles
4+
{
5+
#include "sfp_air.hpp"
6+
};

‎A3A/addons/config_fixes/CUP/config.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include "..\script_component.hpp"
44

5-
#if __has_include("\CUP\Vehicles\CUP_Vehicles_LoadOrder\config.bin")
6-
75
class CfgPatches
86
{
97
class PATCHNAME(CUP)
@@ -16,13 +14,12 @@ class CfgPatches
1614
author = AUTHOR;
1715
authors[] = { AUTHORS };
1816
authorUrl = "";
17+
skipWhenMissingDependencies = 1;
1918
VERSION_CONFIG;
2019
};
2120
};
2221

2322
// Uncomment when needed
2423
//#include "CfgMagazines.hpp"
25-
//#include "CfgVehicles.hpp"
24+
#include "CfgVehicles.hpp"
2625
//#include "CfgWeapons.hpp"
27-
28-
#endif // __has_include("\CUP\Vehicles\CUP_Vehicles_LoadOrder\config.bin")

‎A3A/addons/config_fixes/CUP/sfp_air.hpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//CUP-SFP - sfp_air.hpp
2+
3+
class CUP_B_UH60S_USN;
4+
class CUP_MH60S_Unarmed_USN;
5+
class CUP_MH60S_Unarmed_FFV_USN;
6+
7+
class a3a_SFP_B_UH60S_USN : CUP_B_UH60S_USN
8+
{
9+
displayName = "UH-60M (M3M)";
10+
textureList[] = {"Black", 1};
11+
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};
12+
};
13+
class a3a_SFP_MH60S_Unarmed_USN : CUP_MH60S_Unarmed_USN
14+
{
15+
displayName = "UH-60M (Unarmed)";
16+
textureList[] = {"Black", 1};
17+
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};
18+
};
19+
class a3a_SFP_MH60S_Unarmed_FFV_USN : CUP_MH60S_Unarmed_FFV_USN
20+
{
21+
displayName = "UH-60M (Unarmed/FFV)";
22+
textureList[] = {"Black", 1};
23+
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};
24+
};

‎A3A/addons/config_fixes/IFA/CfgAmmo.hpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// IFA - CfgAmmo.hpp
2+
3+
class CfgAmmo {
4+
// Buffs to bring mortar effectiveness against unarmoured somewhere near vanilla against armoured
5+
class Sh_82mm_AMOS;
6+
class LIB_Sh_82_HE : Sh_82mm_AMOS {
7+
indirectHitRange = 13;
8+
};
9+
class LIB_Sh_81_HE : LIB_Sh_82_HE {
10+
indirectHitRange = 12.6;
11+
};
12+
class LIB_Sh_60_HE : LIB_Sh_82_HE {
13+
indirectHitRange = 11;
14+
};
15+
};

‎A3A/addons/config_fixes/IFA/CfgVehicles.hpp‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
//IFA - CfgVehicles.hpp
2+
3+
class DefaultEventHandlers;
4+
class CfgVehicles
5+
{
6+
class LIB_US_Willys_MB_M1919;
7+
class a3a_LIB_Willys_MB_M1919 : LIB_US_Willys_MB_M1919{
8+
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"};
9+
typicalCargo[] = {"LIB_SOV_AT_soldier"};
10+
crew = "LIB_SOV_unequip";
11+
faction = "LIB_RKKA";
12+
side = 0;
13+
};
14+
class LIB_DAK_PzKpfwIV_H;
15+
class a3a_lib_PzKpfwIV_noShield : LIB_DAK_PzKpfwIV_H{
16+
faction = "LIB_WEHRMACHT";
17+
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"};
18+
};
19+
class LIB_Zis6_Parm;
20+
class a3a_lib_Zis6_BOX : LIB_Zis6_Parm {
21+
displayName = "ZIS-5V (Box)";
22+
transportRepair = 0;
23+
typicalCargo[] = {"LIB_FFI_LAT_Soldier"};
24+
faction = "LIB_FFI";
25+
side = 2;
26+
};
27+
28+
class B_HMG_02_high_weapon_F;
29+
class I_G_HMG_02_high_weapon_F : B_HMG_02_high_weapon_F{
30+
class assembleInfo;
31+
};
32+
class a3a_hmg_02_high_weapon : I_G_HMG_02_high_weapon_F{
33+
class assembleInfo : assembleInfo {
34+
assembleTo = "a3a_hmg_02_high";
35+
};
36+
};
37+
class HMG_02_high_base_F;
38+
class B_G_HMG_02_high_F : HMG_02_high_base_F{
39+
class AnimationSources;
40+
};
41+
class a3a_hmg_02_high : B_G_HMG_02_high_F{
42+
displayName = ".50 M2HB (Raised)";
43+
class AnimationSources : AnimationSources{
44+
class Hide_Shield {
45+
animPeriod = 0.01;
46+
initPhase = 1;
47+
source = "user";
48+
useSource = 1;
49+
};
50+
class Hide_Rail {
51+
animPeriod = 0.01;
52+
initPhase = 1;
53+
source = "user";
54+
useSource = 1;
55+
};
56+
};
57+
animationList[] ={};
58+
};
59+
60+
// CBA event handlers fix
61+
class Tank;
62+
class LIB_Armored_Target_Dummy : Tank {
63+
delete EventHandlers;
64+
};
65+
};

‎A3A/addons/config_fixes/IFA/CfgWeapons.hpp‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
//IFA - CfgWeapons.hpp
2+
3+
//Fun weapons for finding in lootcrates or on SF
4+
class Mode_SemiAuto;
5+
class CfgWeapons
6+
{
7+
class ItemCore;
8+
class LIB_M1918A2_BAR_Bipod : ItemCore{
9+
picture = "\WW2\Assets_t\Weapons\Equipment_t\Weapons\MuzzleItem\Gear_ACC_BAR_Bipod_ca.paa";
10+
};
11+
class LIB_M1918A2_BAR_Handle : ItemCore{
12+
picture = "\WW2\Assets_t\Weapons\Equipment_t\Weapons\MuzzleItem\Gear_ACC_BAR_Handle_ca.paa";
13+
};
14+
class LIB_RIFLE;
15+
class LIB_PISTOL;
16+
class LIB_M1_Carbine : LIB_RIFLE {
17+
class Short;
18+
};
19+
class LIB_SVT_40 : LIB_RIFLE {
20+
class Short;
21+
};
22+
class LIB_M1896 : LIB_PISTOL{
23+
class Single;
24+
};
25+
class a3a_lib_M712 : LIB_M1896{
26+
displayName = "M712 Mauser";
27+
descriptionShort = "9x19mm machine pistol";
28+
recoil = "recoil_pistol_4five";
29+
recoilProne = "recoil_pistol_4five";
30+
changeFiremodeSound[] = {"A3\sounds_f\weapons\closure\firemode_changer_2.wss",0.1778,1,5};
31+
class Full : Single{
32+
aiDispersionCoefX = 2;
33+
aiDispersionCoefY = 3;
34+
displayName = "Full";
35+
autoFire = 1;
36+
textureType = "fullAuto";
37+
reloadTime = 0.066;
38+
maxRange = 25;
39+
maxRangeProbab = 0.05;
40+
midRange = 12.5;
41+
midRangeProbab = 0.5;
42+
minRange = 0;
43+
minRangeProbab = 1.0;
44+
showToPlayer = 1;
45+
};
46+
modes[] = {"Single", "Full"};
47+
};
48+
class a3a_lib_AVT_40 : LIB_SVT_40 {
49+
displayName = "AVT-40";
50+
descriptionShort = "AVT-40 Automatic rifle";
51+
changeFiremodeSound[] = {"A3\sounds_f\weapons\closure\firemode_changer_2.wss",0.1778,1,5};
52+
class Full : Short{
53+
aiDispersionCoefX = 2;
54+
aiDispersionCoefY = 3;
55+
displayName = "Full";
56+
autoFire = 1;
57+
textureType = "fullAuto";
58+
reloadTime = 0.08;
59+
maxRangeProbab = 0.05;
60+
midRangeProbab = 0.2;
61+
minRangeProbab = 0.7;
62+
minRange = 0;
63+
showToPlayer = 1;
64+
};
65+
modes[] = {"Single","Full","Far","Medium","Short"};
66+
};
67+
class a3a_lib_M2_Carbine : LIB_M1_Carbine{
68+
displayName = "M2 Carbine";
69+
descriptionShort = "M2 Carbine .30 Automatic rifle";
70+
changeFiremodeSound[] = {"A3\sounds_f\weapons\closure\firemode_changer_2.wss",0.1778,1,5};
71+
class Full : Short{
72+
aiDispersionCoefX = 2;
73+
aiDispersionCoefY = 3;
74+
displayName = "Full";
75+
autoFire = 1;
76+
textureType = "fullAuto";
77+
reloadTime = 0.08;
78+
maxRangeProbab = 0.05;
79+
midRangeProbab = 0.2;
80+
minRangeProbab = 0.7;
81+
minRange = 0;
82+
showToPlayer = 1;
83+
};
84+
modes[] = {"Single","Full","Far","Medium","Short"};
85+
};
86+
87+
// Adjust so that the mortars aren't wildly inaccurate at longer ranges
88+
class LIB_MortarCannon_base;
89+
class LIB_GRWR34 : LIB_MortarCannon_base {
90+
class Single1 : Mode_SemiAuto {
91+
artilleryDispersion = 4;
92+
};
93+
class Single2 : Single1 {
94+
artilleryDispersion = 4;
95+
};
96+
class Single3 : Single1 {
97+
artilleryDispersion = 4;
98+
};
99+
};
100+
class LIB_BM37 : LIB_MortarCannon_base {
101+
class Single1 : Mode_SemiAuto {
102+
artilleryDispersion = 4;
103+
};
104+
class Single2 : Single1 {
105+
artilleryDispersion = 4;
106+
};
107+
class Single3 : Single1 {
108+
artilleryDispersion = 4;
109+
};
110+
};
111+
class LIB_M2_60 : LIB_MortarCannon_base {
112+
class Single1 : Mode_SemiAuto {
113+
artilleryDispersion = 4;
114+
};
115+
class Single2 : Single1 {
116+
artilleryDispersion = 4;
117+
};
118+
class Single3 : Single1 {
119+
artilleryDispersion = 4;
120+
};
121+
};
122+
};

‎A3A/addons/config_fixes/IFA/config.cpp‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//IFA - config.cpp
2+
3+
#include "..\script_component.hpp"
4+
5+
6+
class CfgPatches
7+
{
8+
class PATCHNAME(IFA)
9+
{
10+
name = COMPONENT_NAME;
11+
units[] = {};
12+
weapons[] = {};
13+
requiredVersion = REQUIRED_VERSION;
14+
requiredAddons[] = {"IFA3_Core","WW2_Core_c_IF_ZZZ_LastLoaded_c"};
15+
skipWhenMissingDependencies = 1;
16+
author = AUTHOR;
17+
authors[] = { AUTHORS };
18+
authorUrl = "";
19+
VERSION_CONFIG;
20+
};
21+
};
22+
23+
// Uncomment when needed
24+
#include "CfgVehicles.hpp"
25+
#include "CfgWeapons.hpp"
26+
#include "CfgAmmo.hpp"

0 commit comments

Comments
 (0)