Skip to content

Commit 0e754b2

Browse files
Bob-MurphyBob-Murphy
authored
Merge pull request #3142 from official-antistasi-community/unstable
unstable to master for 3.5 release
2 parents 6ee54cd + 61e1c61 commit 0e754b2

File tree

220 files changed

+261528
-1039
lines changed

Some content is hidden

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

220 files changed

+261528
-1039
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//3CB - CfgWeapons.hpp
2+
3+
class CfgWeapons
4+
{
5+
class UK3CB_CZ550;
6+
class a3a_UK3CB_CZ550_8mm : UK3CB_CZ550
7+
{
8+
BaseWeapon = "a3a_UK3CB_CZ550_8mm";
9+
descriptionshort = "Hunting Rifle <br/>Caliber: 8×57mm IS";
10+
displayname = "CZ-550 Lux";
11+
magazines[] = {"rhsgref_5Rnd_792x57_kar98k"};
12+
magazineWell[] = {"CBA_792x57_K98"};
13+
recoil = "recoil_dmr_01";
14+
};
15+
};
16+

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ class CfgPatches
2121
};
2222

2323
#include "CfgVehicles.hpp"
24+
#include "CfgWeapons.hpp"

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
//IslaDuala3 - config.cpp
2+
3+
#include "..\script_component.hpp"
4+
5+
6+
class CfgPatches
7+
{
8+
class PATCHNAME(IslaDuala3)
9+
{
10+
name = COMPONENT_NAME;
11+
units[] = {};
12+
weapons[] = {};
13+
requiredVersion = REQUIRED_VERSION;
14+
requiredAddons[] = {"A3_Data_F_AoW_Loadorder","A3_Map_IslaDuala3"};
15+
skipWhenMissingDependencies = 1;
16+
author = AUTHOR;
17+
authors[] = { AUTHORS };
18+
authorUrl = "";
19+
VERSION_CONFIG;
20+
};
21+
};
22+
class CfgWorlds {
23+
class Stratis;
24+
class IslaDuala3 : Stratis {
25+
class Names {
26+
class a3a_Obmeya {
27+
angle = 0;
28+
name = "Noord Obmeya";
29+
position[] = {5056,5151};
30+
radiusA = 300;
31+
radiusB = 200;
32+
type = "NameCity";
33+
};
34+
class imalia {
35+
angle = 0; // never seen this non-zero
36+
name = "Imalia";
37+
position[] = {8942,620.74}; // 2d map coords
38+
radiusA = 200; // I think these are supposed to be outer/inner radius but Antistasi uses them as X/Y. Probably a bug.
39+
radiusB = 150;
40+
type = "NameVillage"; // NameCity also works, I don't think Antistasi cares
41+
};
42+
};
43+
};
44+
};

‎A3A/addons/config_fixes/RHS/chdkz_rhs.hpp‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ class rhsgref_ins_t72bc;
77

88
class a3a_rhs_chdkz_72a : rhsgref_ins_t72ba
99
{
10-
11-
#if __A3_DEBUG__
12-
scope = 2;
13-
#else
14-
scope = 1;
15-
#endif
1610
class EventHandlers
1711
{
1812
fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
@@ -22,11 +16,6 @@ class a3a_rhs_chdkz_72a : rhsgref_ins_t72ba
2216
};
2317
class a3a_rhs_chdkz_72b : rhsgref_ins_t72bb
2418
{
25-
#if __A3_DEBUG__
26-
scope = 2;
27-
#else
28-
scope = 1;
29-
#endif
3019
class EventHandlers
3120
{
3221
fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
@@ -36,11 +25,6 @@ class a3a_rhs_chdkz_72b : rhsgref_ins_t72bb
3625
};
3726
class a3a_rhs_chdkz_72c : rhsgref_ins_t72bc
3827
{
39-
#if __A3_DEBUG__
40-
scope = 2;
41-
#else
42-
scope = 1;
43-
#endif
4428
hiddenSelectionsTextures[] =
4529
{
4630
"rhsafrf\addons\rhs_t72_camo\data\rhs_t72b_01a_chdkz_co.paa",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ class CfgVehicles
44
{
55
#include "air.hpp"
66
#include "armor.hpp"
7+
#include "ifv.hpp"
78
#include "sea.hpp"
89
#include "soft.hpp"
910
};

‎A3A/addons/config_fixes/Vanilla/armor.hpp‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
//Vanilla - armor.hpp
22

3-
class I_APC_Wheeled_03_cannon_F;
43
class I_MRAP_03_F;
54
class I_MRAP_03_gmg_F;
65
class I_MRAP_03_hmg_F;
76
class O_MBT_04_cannon_F;
87
class O_MBT_04_command_F;
8+
class O_MBT_02_base_F
9+
; //external Root Class
10+
class O_MBT_02_cannon_F : O_MBT_02_base_F
11+
{
12+
class TextureSources; //external Child Class
13+
};
914

1015
//Grey
1116
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
2126
hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"};
2227
};
2328

24-
//Olive
25-
class a3a_APC_Wheeled_03_cannon_blufor_F : I_APC_Wheeled_03_cannon_F
26-
{
27-
textureList[] = {};
28-
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"};
29-
};
30-
3129
//Black
3230
class a3a_MBT_04_cannon_black_F : O_MBT_04_cannon_F
3331
{
@@ -39,3 +37,18 @@ class a3a_MBT_04_command_black_F : O_MBT_04_command_F
3937
textureList[] = {};
4038
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"};
4139
};
40+
41+
class a3a_MBT_02_cannon_black_F : O_MBT_02_cannon_F
42+
{
43+
class TextureSources : TextureSources
44+
{
45+
class Grey
46+
{
47+
author = "Bohemia Interactive";
48+
displayName = "Grey";
49+
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"};
50+
};
51+
};
52+
textureList[] = {"Grey", 1};
53+
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"};
54+
};

‎A3A/addons/config_fixes/Vanilla/ifv.hpp‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
//Vanilla - ifv.hpp
2+
3+
//Marshall
4+
class B_APC_Wheeled_01_base_F;
5+
class B_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_base_F { class EventHandlers; };
6+
class a3a_B_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_cannon_F
7+
{
8+
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
9+
class EventHandlers : EventHandlers
10+
{
11+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
12+
};
13+
};
14+
class B_T_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_cannon_F {};
15+
class a3a_B_T_APC_Wheeled_01_cannon_F : B_T_APC_Wheeled_01_cannon_F
16+
{
17+
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
18+
class EventHandlers : EventHandlers
19+
{
20+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
21+
};
22+
};
23+
24+
//Rhino
25+
class AFV_Wheeled_01_base_F;
26+
class B_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F { class EventHandlers; };
27+
class a3a_AFV_Wheeled_01_cannon_F : B_AFV_Wheeled_01_cannon_F
28+
{
29+
animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1};
30+
// Already has initVehicle EH
31+
};
32+
class B_T_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F { class EventHandlers; };
33+
class a3a_T_AFV_Wheeled_01_cannon_F : B_T_AFV_Wheeled_01_cannon_F
34+
{
35+
animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1};
36+
// Already has initVehicle EH
37+
};
38+
39+
//Gorgon
40+
class I_APC_Wheeled_03_base_F;
41+
class I_APC_Wheeled_03_cannon_F : I_APC_Wheeled_03_base_F { class EventHandlers; }
42+
class a3a_APC_Wheeled_03_cannon_F : I_APC_Wheeled_03_cannon_F
43+
{
44+
animationList[] = {"showCamonetHull",0,"showBags",0.3,"showBags2",0.3,"showTools",0.3,"showSLATHull",1};
45+
class EventHandlers : EventHandlers
46+
{
47+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
48+
};
49+
};
50+
class a3a_APC_Wheeled_03_cannon_blufor_F : a3a_APC_Wheeled_03_cannon_F
51+
{
52+
textureList[] = {};
53+
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"};
54+
};
55+
56+
//Mora
57+
class I_APC_tracked_03_base_F;
58+
class I_APC_tracked_03_cannon_F : I_APC_tracked_03_base_F { class EventHandlers; };
59+
class a3a_APC_tracked_03_cannon_F : I_APC_tracked_03_cannon_F
60+
{
61+
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
62+
class EventHandlers : EventHandlers
63+
{
64+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
65+
};
66+
};
67+
class I_E_APC_tracked_03_base_F;
68+
class I_E_APC_tracked_03_cannon_F : I_E_APC_tracked_03_base_F { class EventHandlers; };
69+
class a3a_E_APC_tracked_03_cannon_F : I_E_APC_tracked_03_cannon_F
70+
{
71+
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
72+
class EventHandlers : EventHandlers
73+
{
74+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
75+
};
76+
};
77+
//Marid
78+
class APC_Wheeled_02_base_v2_F;
79+
class O_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
80+
class a3a_APC_Wheeled_02_rcws_v2_F : O_APC_Wheeled_02_rcws_v2_F
81+
{
82+
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
83+
// Already has initVehicle EH
84+
};
85+
class O_T_APC_Wheeled_02_rcws_v2_ghex_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
86+
class a3a_T_APC_Wheeled_02_rcws_v2_F : O_T_APC_Wheeled_02_rcws_v2_ghex_F
87+
{
88+
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
89+
// Already has initVehicle EH
90+
};
91+
92+
//Kamysh
93+
class O_APC_Tracked_02_base_F;
94+
class O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_base_F { class EventHandlers; };
95+
class a3a_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F
96+
{
97+
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
98+
// Already has initVehicle EH
99+
};
100+
class O_T_APC_Tracked_02_cannon_ghex_F : O_APC_Tracked_02_cannon_F {};
101+
class a3a_T_APC_Tracked_02_cannon_F : O_T_APC_Tracked_02_cannon_ghex_F
102+
{
103+
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
104+
// Already has initVehicle EH
105+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class CfgVehicles
1818
class O_Tura_Truck_02_aa_lxWS;
1919
class O_Tura_ZU23_lxWS;
2020

21+
#include "ws_ifv.hpp"
2122
#include "ws_ion.hpp"
2223

2324
//Tan

‎A3A/addons/config_fixes/WS/ws_ifv.hpp‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
//WS - ws_ifv.hpp
2+
3+
//Marshall
4+
//Ion
5+
6+
class APC_Wheeled_01_base_F;
7+
class APC_Wheeled_01_command_base_lxWS : APC_Wheeled_01_base_F { class EventHandlers; }; // also used for NATO
8+
class B_ION_APC_Wheeled_01_command_lxWS: APC_Wheeled_01_command_base_lxWS {};
9+
class a3a_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS
10+
{
11+
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
12+
class EventHandlers : EventHandlers
13+
{
14+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
15+
};
16+
};
17+
class B_APC_Wheeled_01_cannon_lxWS;
18+
class B_ION_APC_Wheeled_01_cannon_lxWS: B_APC_Wheeled_01_cannon_lxWS { class EventHandlers; };
19+
class a3a_ION_APC_Wheeled_01_cannon_lxWS : B_ION_APC_Wheeled_01_cannon_lxWS
20+
{
21+
scope = 2;
22+
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
23+
class EventHandlers : EventHandlers
24+
{
25+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
26+
};
27+
};
28+
class B_D_APC_Wheeled_01_atgm_lxWS;
29+
class a3a_ION_APC_Wheeled_01_atgm : B_D_APC_Wheeled_01_atgm_lxWS {
30+
side = 1;
31+
crew = "B_ION_Soldier_lxWS";
32+
faction = "BLU_ION_lxWS";
33+
textureList[] = {"ION_BLACK", 1};
34+
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"};
35+
};
36+
37+
//NATO
38+
class a3a_APC_Wheeled_01_command_lxWS : APC_Wheeled_01_command_base_lxWS
39+
{
40+
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
41+
class EventHandlers : EventHandlers
42+
{
43+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
44+
};
45+
};
46+
class B_T_APC_Wheeled_01_command_lxWS : APC_Wheeled_01_command_base_lxWS {};
47+
class a3a_T_APC_Wheeled_01_command_lxWS : B_T_APC_Wheeled_01_command_lxWS
48+
{
49+
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
50+
class EventHandlers : EventHandlers
51+
{
52+
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
53+
};
54+
};
55+
56+
//Iskatel/Kamysh
57+
//Arid
58+
class O_APC_Tracked_02_30mm_lxWS;
59+
class a3a_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_30mm_lxWS
60+
{
61+
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
62+
// Has initVehicle EH already
63+
};
64+
//Tropical
65+
class O_T_APC_Tracked_02_30mm_lxWS;
66+
class a3a_T_APC_Tracked_02_30mm_lxWS : O_T_APC_Tracked_02_30mm_lxWS
67+
{
68+
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
69+
// Has initVehicle EH already
70+
};
71+
//SFIA
72+
class O_SFIA_APC_Tracked_02_30mm_lxWS;
73+
class a3a_SFIA_APC_Tracked_02_30mm_lxWS : O_SFIA_APC_Tracked_02_30mm_lxWS
74+
{
75+
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
76+
// Has initVehicle EH already
77+
};
78+
class O_SFIA_APC_Tracked_02_cannon_lxWS;
79+
class a3a_SFIA_APC_Tracked_02_cannon_lxWS : O_SFIA_APC_Tracked_02_cannon_lxWS
80+
{
81+
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
82+
// Has initVehicle EH already
83+
};
84+
//ION
85+
class a3a_ION_APC_Tracked_02_30mm : O_APC_Tracked_02_30mm_lxWS
86+
{
87+
side = 1;
88+
crew = "B_ION_Soldier_lxWS";
89+
faction = "BLU_ION_lxWS";
90+
animationList[] = {"showTracks",1,"showCamonetHull",0,"showBags",0.2,"showSLATHull",1};
91+
textureList[] = {"Grey", 1};
92+
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"};
93+
// Has initVehicle EH already
94+
};

0 commit comments

Comments
 (0)