Skip to content

Commit 9b6a3b1

Browse files
johnb432johnb432
committed
Merge branch 'master' into explosives-refactor
2 parents c6407ab + f255375 commit 9b6a3b1

Some content is hidden

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

44 files changed

+1692
-363
lines changed

‎Cargo.lock‎

Lines changed: 591 additions & 327 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎addons/apl/data/glass_House.bisurf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Density=2400;
22
rough=0;
33
dust=0;
44
bulletPenetrability=50;
5-
soundEnviron=Empty;
6-
isWater=false;
5+
soundEnviron="Empty";
6+
isWater=0;
77
friction=0.1;
88
restitution=0.1;
9-
impact = Hit_Glass;
10-
soundHit = glass;
9+
impact = "Hit_Glass";
10+
soundHit = "glass";

‎addons/apl/data/plastic.bisurf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Density=1380;
22
rough=0.1;
33
dust=0;
44
bulletPenetrability=150;
5-
soundEnviron=Empty;
6-
isWater=false;
5+
soundEnviron="Empty";
6+
isWater=0;
77
friction=0.7;
88
restitution=0.3;
9-
impact = default_Mat;
10-
soundHit = plastic;
9+
impact = "default_Mat";
10+
soundHit = "plastic";

‎addons/casings/functions/fnc_createCasing.sqf‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
*
66
* Arguments:
77
* 0: unit - Object the event handler is assigned to <OBJECT>
8-
* 1: ammo - Ammo used <STRING>
8+
* 4: ammo - Ammo used <STRING>
9+
* 7: vehicle - vehicle, if weapon is vehicle weapon, otherwise objNull <OBJECT>
910
*
1011
* Return Value:
1112
* None
1213
*
1314
* Example:
14-
* [player, "", "","", "B_556x45_Ball"] call ace_casings_fnc_createCasing
15+
* [player, "", "","", "B_556x45_Ball", "", "", objNull] call ace_casings_fnc_createCasing
1516
*
1617
* Public: No
1718
*/
1819

19-
params ["_unit", "", "", "", "_ammo"];
20+
params ["_unit", "", "", "", "_ammo", "", "", "_vehicle"];
2021

22+
if (!isNull _vehicle) exitWith {};
2123
if (!isNull objectParent _unit) exitWith {};
2224

2325

‎addons/compat_gm/CfgMagazines.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ class CfgMagazines {
1515
class gm_100rnd_762x54mmR_pk_grn;
1616
class gm_100Rnd_762x54mm_API_b32_pk_grn: gm_100rnd_762x54mmR_pk_grn {
1717
ACE_isBelt = 1;
18+
type = 256;
1819
};
1920
class gm_100Rnd_762x54mm_B_T_t46_pk_grn: gm_100rnd_762x54mmR_pk_grn {
2021
ACE_isBelt = 1;
22+
type = 256;
2123
};
2224
class gm_100Rnd_762x54mmR_API_7bz3_pk_grn: gm_100rnd_762x54mmR_pk_grn {
2325
ACE_isBelt = 1;
26+
type = 256;
2427
};
2528
class gm_100Rnd_762x54mmR_B_T_7t2_pk_grn: gm_100rnd_762x54mmR_pk_grn {
2629
ACE_isBelt = 1;
30+
type = 256;
2731
};
2832
};

‎addons/compat_gm/CfgVehicles.hpp‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,15 @@ class CfgVehicles {
8181

8282
class gm_brdm2_base: gm_wheeled_APC_base {
8383
EGVAR(refuel,fuelCapacity) = 290;
84+
EGVAR(vehicle_damage,hullDetonationProb) = 0;
85+
EGVAR(vehicle_damage,turretDetonationProb) = 0.2;
86+
EGVAR(vehicle_damage,engineDetonationProb) = 0.2;
87+
EGVAR(vehicle_damage,hullFireProb) = 0.5;
88+
EGVAR(vehicle_damage,turretFireProb) = 0.7;
89+
EGVAR(vehicle_damage,engineFireProb) = 0.7;
90+
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
91+
EGVAR(vehicle_damage,canHaveFireRing) = 0;
92+
EGVAR(cookoff,canHaveFireJet) = 0;
8493

8594
class EGVAR(interaction,anims) {
8695
class AmmoBox_01_unhide {
@@ -107,6 +116,15 @@ class CfgVehicles {
107116
};
108117
};
109118
class gm_brdm2um_base: gm_brdm2_base {
119+
EGVAR(vehicle_damage,hullDetonationProb) = 0;
120+
EGVAR(vehicle_damage,turretDetonationProb) = 0;
121+
EGVAR(vehicle_damage,engineDetonationProb) = 0.2;
122+
EGVAR(vehicle_damage,hullFireProb) = 0.5;
123+
EGVAR(vehicle_damage,turretFireProb) = 0;
124+
EGVAR(vehicle_damage,engineFireProb) = 0.7;
125+
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
126+
EGVAR(vehicle_damage,canHaveFireRing) = 0;
127+
EGVAR(cookoff,canHaveFireJet) = 0;
110128
class EGVAR(interaction,anims): EGVAR(interaction,anims) {
111129
class AmmoBox_01_unhide: AmmoBox_01_unhide {
112130
positions[] = {{-0.1, -1.9, -0.5}};
@@ -119,10 +137,23 @@ class CfgVehicles {
119137
};
120138
};
121139
};
140+
class gm_brdm2_9p133_base: gm_brdm2_base {
141+
EGVAR(vehicle_damage,hullDetonationProb) = 0.2;
142+
EGVAR(vehicle_damage,turretDetonationProb) = 0.5;
143+
};
122144

123145
class gm_btr60_base: gm_wheeled_APC_base {
124146
EGVAR(refuel,fuelCapacity) = 290;
125147
EGVAR(cookoff,cookoffSelections)[] = {"commanderturret_hatch"};
148+
EGVAR(vehicle_damage,hullDetonationProb) = 0;
149+
EGVAR(vehicle_damage,turretDetonationProb) = 0;
150+
EGVAR(vehicle_damage,engineDetonationProb) = 0.2;
151+
EGVAR(vehicle_damage,hullFireProb) = 0.2;
152+
EGVAR(vehicle_damage,turretFireProb) = 0;
153+
EGVAR(vehicle_damage,engineFireProb) = 0.7;
154+
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
155+
EGVAR(vehicle_damage,canHaveFireRing) = 0;
156+
EGVAR(cookoff,canHaveFireJet) = 0;
126157

127158
class EGVAR(interaction,anims) {
128159
class AmmoBox_01_unhide {
@@ -177,6 +208,30 @@ class CfgVehicles {
177208
};
178209
};
179210

211+
class gm_btr60pb_base: gm_btr60_base {
212+
EGVAR(vehicle_damage,hullDetonationProb) = 0;
213+
EGVAR(vehicle_damage,turretDetonationProb) = 0.2;
214+
EGVAR(vehicle_damage,engineDetonationProb) = 0.2;
215+
EGVAR(vehicle_damage,hullFireProb) = 0.2;
216+
EGVAR(vehicle_damage,turretFireProb) = 0.7;
217+
EGVAR(vehicle_damage,engineFireProb) = 0.7;
218+
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
219+
EGVAR(vehicle_damage,canHaveFireRing) = 0;
220+
EGVAR(cookoff,canHaveFireJet) = 0;
221+
};
222+
223+
class gm_ot64_base: gm_wheeled_APC_base {
224+
EGVAR(vehicle_damage,hullDetonationProb) = 0;
225+
EGVAR(vehicle_damage,turretDetonationProb) = 0.2;
226+
EGVAR(vehicle_damage,engineDetonationProb) = 0.2;
227+
EGVAR(vehicle_damage,hullFireProb) = 0.2;
228+
EGVAR(vehicle_damage,turretFireProb) = 0.7;
229+
EGVAR(vehicle_damage,engineFireProb) = 0.7;
230+
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
231+
EGVAR(vehicle_damage,canHaveFireRing) = 0;
232+
EGVAR(cookoff,canHaveFireJet) = 0;
233+
};
234+
180235
class gm_ural375d_base: gm_wheeled_truck_base {
181236
EGVAR(refuel,fuelCapacity) = 360;
182237

@@ -375,11 +430,29 @@ class CfgVehicles {
375430

376431
class gm_fuchs_base: gm_wheeled_APC_base {
377432
EGVAR(refuel,fuelCapacity) = 390;
433+
EGVAR(vehicle_damage,hullDetonationProb) = 0;
434+
EGVAR(vehicle_damage,turretDetonationProb) = 0;
435+
EGVAR(vehicle_damage,engineDetonationProb) = 0.1;
436+
EGVAR(vehicle_damage,hullFireProb) = 0.2;
437+
EGVAR(vehicle_damage,turretFireProb) = 0.05;
438+
EGVAR(vehicle_damage,engineFireProb) = 0.5;
439+
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
440+
EGVAR(vehicle_damage,canHaveFireRing) = 0;
441+
EGVAR(cookoff,canHaveFireJet) = 0;
378442
};
379443

380444
class gm_luchs_base: gm_wheeled_APC_base {
381445
EGVAR(refuel,fuelCapacity) = 500;
382446
EGVAR(cookoff,cookoffSelections)[] = {"mainturret_hatch", "commanderturret_hatch"};
447+
EGVAR(vehicle_damage,hullDetonationProb) = 0;
448+
EGVAR(vehicle_damage,turretDetonationProb) = 0.2;
449+
EGVAR(vehicle_damage,engineDetonationProb) = 0.2;
450+
EGVAR(vehicle_damage,hullFireProb) = 0.2;
451+
EGVAR(vehicle_damage,turretFireProb) = 0.4;
452+
EGVAR(vehicle_damage,engineFireProb) = 0.5;
453+
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
454+
EGVAR(vehicle_damage,canHaveFireRing) = 0;
455+
EGVAR(cookoff,canHaveFireJet) = 1;
383456
};
384457

385458

‎addons/compat_gm/compat_gm_csw/ACE_CSW_Groups.hpp‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
class ACE_CSW_Groups {
2+
// MILAN
3+
class GVAR(gm_1Rnd_milan_heat_dm82) {
4+
gm_1Rnd_milan_heat_dm82 = 1;
5+
};
6+
class GVAR(gm_1Rnd_milan_heat_dm92) { // Same name as the carryable magazine
7+
gm_1Rnd_milan_heat_dm92 = 1; // Vehicle magazine that will be loaded when loading this magazine
8+
};
9+
10+
// Fagot
11+
class GVAR(gm_1Rnd_fagot_heat_9m111) {
12+
gm_1Rnd_fagot_heat_9m111 = 1;
13+
};
14+
15+
// MG3
16+
class gm_120Rnd_762x51mm_b_t_DM21_mg3_grn {
17+
gm_120Rnd_762x51mm_b_t_DM21_mg3_grn = 1;
18+
};
19+
class gm_120Rnd_762x51mm_b_t_DM21A1_mg3_grn {
20+
gm_120Rnd_762x51mm_b_t_DM21A1_mg3_grn = 1;
21+
};
22+
class gm_120Rnd_762x51mm_b_t_DM21A2_mg3_grn {
23+
gm_120Rnd_762x51mm_b_t_DM21A2_mg3_grn = 1;
24+
};
25+
26+
// 2B11
27+
class GVAR(1Rnd_120mm_he_of843) {
28+
gm_1Rnd_120mm_he_of843 = 1;
29+
};
30+
class GVAR(1Rnd_120mm_illum_s843) {
31+
gm_1Rnd_120mm_illum_s843 = 1;
32+
};
33+
class GVAR(1Rnd_120mm_smoke_d843) {
34+
gm_1Rnd_120mm_smoke_d843 = 1;
35+
};
36+
37+
// M120
38+
class GVAR(1Rnd_120mm_he_dm51) {
39+
gm_1Rnd_120mm_he_dm51 = 1;
40+
};
41+
class GVAR(1Rnd_120mm_illum_dm26) {
42+
gm_1Rnd_120mm_illum_dm26 = 1;
43+
};
44+
class GVAR(1Rnd_120mm_smoke_dm25) {
45+
gm_1Rnd_120mm_smoke_dm25 = 1;
46+
};
47+
};

‎addons/compat_gm/compat_gm_csw/CfgMagazines.hpp‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
class CfgMagazines {
2+
// MILAN
3+
class gm_1Rnd_milan_heat_dm82;
4+
class GVAR(gm_1Rnd_milan_heat_dm82): gm_1Rnd_milan_heat_dm82 {
5+
displayName = SUBCSTRING(mag_Milan1_dm82_displayName);
6+
scope = 2;
7+
scopeArsenal = 2;
8+
type = 256;
9+
count = 1;
10+
model = "\gm\gm_weapons\gm_launchers\gm_milan\gm_1rnd_milan_heat_dm92.p3d";
11+
ACE_isBelt = 0;
12+
mass = 159;
13+
};
14+
15+
class gm_1Rnd_milan_heat_dm92;
16+
class GVAR(gm_1Rnd_milan_heat_dm92): gm_1Rnd_milan_heat_dm92 {
17+
displayName = SUBCSTRING(mag_Milan2_dm92_displayName);
18+
scope = 2;
19+
scopeArsenal = 2;
20+
type = 256;
21+
count = 1;
22+
model = "\gm\gm_weapons\gm_launchers\gm_milan\gm_1rnd_milan_heat_dm92.p3d";
23+
ACE_isBelt = 0;
24+
mass = 168;
25+
};
26+
27+
// Fagot
28+
class gm_1Rnd_fagot_heat_9m111;
29+
class GVAR(gm_1Rnd_fagot_heat_9m111): gm_1Rnd_fagot_heat_9m111 {
30+
displayName = SUBCSTRING(mag_9M111_displayName);
31+
scope = 2;
32+
scopeArsenal = 2;
33+
type = 256;
34+
picture = QPATHTOEF(csw,UI\StaticAT_Icon.paa);
35+
ACE_isBelt = 0;
36+
mass = 276;
37+
};
38+
39+
// MG3
40+
class gm_120rnd_762x51mm_mg3_grn;
41+
class gm_120Rnd_762x51mm_b_t_DM21_mg3_grn: gm_120rnd_762x51mm_mg3_grn {
42+
ACE_isBelt = 0;
43+
};
44+
class gm_120Rnd_762x51mm_b_t_DM21A1_mg3_grn: gm_120rnd_762x51mm_mg3_grn {
45+
ACE_isBelt = 0;
46+
};
47+
class gm_120Rnd_762x51mm_b_t_DM21A2_mg3_grn: gm_120rnd_762x51mm_mg3_grn {
48+
ACE_isBelt = 0;
49+
};
50+
51+
// Mortar Rounds
52+
class gm_1Rnd_120mm_he_of843;
53+
class GVAR(1Rnd_120mm_he_of843): gm_1Rnd_120mm_he_of843 {
54+
EGVAR(arsenal,hide) = -1;
55+
displayName = SUBCSTRING(mag_of843_displayName);
56+
mass = 362;
57+
model = "\gm\gm_weapons\gm_mortars\gm_2s12\gm_shell_120mm_he_of843";
58+
picture = QPATHTOEF(mk6mortar,UI\w_l16_ammo_he_ca.paa);
59+
scope = 2;
60+
};
61+
class gm_1Rnd_120mm_illum_s843;
62+
class GVAR(1Rnd_120mm_illum_s843): gm_1Rnd_120mm_illum_s843 {
63+
EGVAR(arsenal,hide) = -1;
64+
displayName = SUBCSTRING(mag_s843_displayName);
65+
mass = 362;
66+
model = "\gm\gm_weapons\gm_mortars\gm_2s12\gm_shell_120mm_illum_s843";
67+
picture = QPATHTOEF(mk6mortar,UI\w_l16_ammo_illum_ca.paa);
68+
scope = 2;
69+
type = 256;
70+
};
71+
class gm_1Rnd_120mm_smoke_d843;
72+
class GVAR(1Rnd_120mm_smoke_d843): gm_1Rnd_120mm_smoke_d843 {
73+
EGVAR(arsenal,hide) = -1;
74+
displayName = SUBCSTRING(mag_d843_displayName);
75+
mass = 362;
76+
model = "\gm\gm_weapons\gm_mortars\gm_2s12\gm_shell_120mm_smoke_d843";
77+
picture = QPATHTOEF(mk6mortar,UI\w_l16_ammo_smk_white_ca.paa);
78+
scope = 2;
79+
type = 256;
80+
};
81+
class gm_1Rnd_120mm_he_dm51;
82+
class GVAR(1Rnd_120mm_he_dm51): gm_1Rnd_120mm_he_dm51 {
83+
EGVAR(arsenal,hide) = -1;
84+
displayName = SUBCSTRING(mag_dm51_displayName);
85+
mass = 287;
86+
model = "\gm\gm_weapons\gm_mortars\gm_m120\gm_shell_120mm_he_dm51";
87+
picture = QPATHTOEF(mk6mortar,UI\w_l16_ammo_he_ca.paa);
88+
scope = 2;
89+
type = 256;
90+
};
91+
class gm_1Rnd_120mm_illum_dm26;
92+
class GVAR(1Rnd_120mm_illum_dm26): gm_1Rnd_120mm_illum_dm26 {
93+
EGVAR(arsenal,hide) = -1;
94+
displayName = SUBCSTRING(mag_dm26_displayName);
95+
mass = 287;
96+
model = "\gm\gm_weapons\gm_mortars\gm_m120\gm_shell_120mm_illum_dm26";
97+
picture = QPATHTOEF(mk6mortar,UI\w_l16_ammo_illum_ca.paa);
98+
scope = 2;
99+
type = 256;
100+
};
101+
class gm_1Rnd_120mm_smoke_dm25;
102+
class GVAR(1Rnd_120mm_smoke_dm25): gm_1Rnd_120mm_smoke_dm25 {
103+
EGVAR(arsenal,hide) = -1;
104+
displayName = SUBCSTRING(mag_dm25_displayName);
105+
mass = 287;
106+
model = "\gm\gm_weapons\gm_mortars\gm_m120\gm_shell_120mm_smoke_dm25";
107+
picture = QPATHTOEF(mk6mortar,UI\w_l16_ammo_smk_white_ca.paa);
108+
scope = 2;
109+
type = 256;
110+
};
111+
};

0 commit comments

Comments
 (0)