Skip to content

Commit 3061933

Browse files
johnb432johnb432
authored
Frag - Remove deprecated enabled attribute (#11186)
* Remove deprecated frag attribute * Update shells.hpp
1 parent 46f02fc commit 3061933

File tree

9 files changed

+2
-82
lines changed

9 files changed

+2
-82
lines changed

‎addons/compat_rhs_afrf3/CfgAmmo.hpp‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ class CfgAmmo {
153153

154154
class GrenadeHand;
155155
class rhs_ammo_rgd5: GrenadeHand {
156-
EGVAR(frag,enabled) = 1;
157156
EGVAR(frag,metal) = 200;
158157
EGVAR(frag,charge) = 110;
159158
EGVAR(frag,gurney_c) = 2440;
@@ -172,16 +171,9 @@ class CfgAmmo {
172171
EGVAR(frag,skip) = 1;
173172
EGVAR(frag,force) = 0;
174173
};
175-
class rhs_ammo_fakels: rhs_ammo_fakel {};
176-
class rhs_ammo_zarya2: rhs_ammo_fakels {};
177-
class rhs_ammo_plamyam: rhs_ammo_fakels {};
178174

179-
class RocketBase;
180-
class R_PG32V_F: RocketBase {};
181-
class rhs_rpg26_rocket: R_PG32V_F {};
182-
class rhs_rpg7v2_pg7vl: rhs_rpg26_rocket {};
175+
class rhs_rpg7v2_pg7vl;
183176
class rhs_rpg7v2_og7v: rhs_rpg7v2_pg7vl {
184-
EGVAR(frag,enabled) = 1;
185177
EGVAR(frag,metal) = 400;
186178
EGVAR(frag,charge) = 210;
187179
EGVAR(frag,gurney_c) = 2800;

‎addons/compat_rhs_usf3/CfgAmmo.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ class CfgAmmo {
360360
EGVAR(frag,force) = 0;
361361
};
362362
class rhs_ammo_m67: GrenadeHand {
363-
EGVAR(frag,enabled) = 1;
364363
EGVAR(frag,metal) = 213;
365364
EGVAR(frag,charge) = 185;
366365
EGVAR(frag,gurney_c) = 2700;
@@ -370,7 +369,6 @@ class CfgAmmo {
370369
EGVAR(frag,force) = 1;
371370
};
372371
class rhs_ammo_M136_hedp_rocket: rhs_ammo_M136_rocket {
373-
EGVAR(frag,enabled) = 1;
374372
EGVAR(frag,metal) = 330;
375373
EGVAR(frag,charge) = 280;
376374
EGVAR(frag,gurney_c) = 2800;

‎addons/compat_spe/CfgAmmo/bombs.hpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
class SPE_Bomb_base;
22
class SPE_NC250_Bomb: SPE_Bomb_base {
3-
EGVAR(frag,enabled) = 1;
43
EGVAR(frag,force) = 1;
54
EGVAR(frag,metal) = 166000;
65
EGVAR(frag,charge) = 130000;
@@ -9,7 +8,6 @@ class SPE_NC250_Bomb: SPE_Bomb_base {
98
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
109
};
1110
class SPE_NC50_Bomb: SPE_Bomb_base {
12-
EGVAR(frag,enabled) = 1;
1311
EGVAR(frag,force) = 1;
1412
EGVAR(frag,metal) = 25000;
1513
EGVAR(frag,charge) = 24400;
@@ -18,7 +16,6 @@ class SPE_NC50_Bomb: SPE_Bomb_base {
1816
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"};
1917
};
2018
class SPE_SC500_Bomb: SPE_Bomb_base {
21-
EGVAR(frag,enabled) = 1;
2219
EGVAR(frag,force) = 1;
2320
EGVAR(frag,metal) = 200000;
2421
EGVAR(frag,charge) = 275000;
@@ -27,7 +24,6 @@ class SPE_SC500_Bomb: SPE_Bomb_base {
2724
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
2825
};
2926
class SPE_US_500lb_Bomb: SPE_Bomb_base {
30-
EGVAR(frag,enabled) = 1;
3127
EGVAR(frag,force) = 1;
3228
EGVAR(frag,metal) = 100000;
3329
EGVAR(frag,charge) = 124000;
@@ -36,7 +32,6 @@ class SPE_US_500lb_Bomb: SPE_Bomb_base {
3632
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
3733
};
3834
class SPE_US_1000lb_Bomb: SPE_Bomb_base {
39-
EGVAR(frag,enabled) = 1;
4035
EGVAR(frag,force) = 1;
4136
EGVAR(frag,metal) = 200000;
4237
EGVAR(frag,charge) = 158000;

‎addons/compat_spe/CfgAmmo/bullets.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class SPE_B_792x57_Ball: SPE_Bullet_base {
2626
// FLAK
2727
class SPE_Bullet_AA_base;
2828
class SPE_SprGr_FlaK_38: SPE_Bullet_AA_base {
29-
EGVAR(frag,enabled) = 1;
3029
EGVAR(frag,force) = 1;
3130
EGVAR(frag,metal) = 50;
3231
EGVAR(frag,charge) = 6;
@@ -38,7 +37,6 @@ class SPE_SprGr_FlaK_38: SPE_Bullet_AA_base {
3837

3938
class SPE_Bullet_AP_base;
4039
class SPE_PzGr_FlaK_38_AP_T: SPE_Bullet_AP_base {
41-
EGVAR(frag,enabled) = 1;
4240
EGVAR(frag,force) = 1;
4341
EGVAR(frag,metal) = 50;
4442
EGVAR(frag,charge) = 6;

‎addons/compat_spe/CfgAmmo/explosives.hpp‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ class SPE_ShellHEAT_base;
55
class SPE_MAIN_mine;
66
class SPE_Rocket_base;
77
class SPE_PzFaust_30m: SPE_Rocket_base {
8-
EGVAR(frag,enabled) = 1;
98
EGVAR(frag,force) = 1;
109
EGVAR(frag,metal) = 150;
1110
EGVAR(frag,charge) = 400;
@@ -14,7 +13,6 @@ class SPE_PzFaust_30m: SPE_Rocket_base {
1413
EGVAR(frag,classes)[] = {"ACE_frag_small"};
1514
};
1615
class SPE_60mm_M6: SPE_Rocket_base {
17-
EGVAR(frag,enabled) = 1;
1816
EGVAR(frag,force) = 1;
1917
EGVAR(frag,metal) = 250;
2018
EGVAR(frag,charge) = 400;
@@ -23,7 +21,6 @@ class SPE_60mm_M6: SPE_Rocket_base {
2321
EGVAR(frag,classes)[] = {"ACE_frag_small"};
2422
};
2523
class SPE_Sh_M43A1_81_HE: SubmunitionBase {
26-
EGVAR(frag,enabled) = 1;
2724
EGVAR(frag,force) = 1;
2825
EGVAR(frag,metal) = 1200;
2926
EGVAR(frag,charge) = 600;
@@ -33,7 +30,6 @@ class SPE_Sh_M43A1_81_HE: SubmunitionBase {
3330
EGVAR(rearm,caliber) = 82;
3431
};
3532
class SPE_M48_HE: SPE_ShellHE_base {
36-
EGVAR(frag,enabled) = 1;
3733
EGVAR(frag,force) = 1;
3834
EGVAR(frag,metal) = 1250;
3935
EGVAR(frag,charge) = 670;
@@ -43,7 +39,6 @@ class SPE_M48_HE: SPE_ShellHE_base {
4339
EGVAR(rearm,caliber) = 75;
4440
};
4541
class SPE_M101_M1_HE: SPE_ShellHE_base {
46-
EGVAR(frag,enabled) = 1;
4742
EGVAR(frag,force) = 1;
4843
EGVAR(frag,metal) = 2500;
4944
EGVAR(frag,charge) = 1980;
@@ -53,7 +48,6 @@ class SPE_M101_M1_HE: SPE_ShellHE_base {
5348
EGVAR(rearm,caliber) = 105;
5449
};
5550
class SPE_S_105L28_Gr38: SPE_ShellHE_base {
56-
EGVAR(frag,enabled) = 1;
5751
EGVAR(frag,force) = 1;
5852
EGVAR(frag,metal) = 2500;
5953
EGVAR(frag,charge) = 1500;
@@ -63,7 +57,6 @@ class SPE_S_105L28_Gr38: SPE_ShellHE_base {
6357
EGVAR(rearm,caliber) = 105;
6458
};
6559
class SPE_S_105L28_Gr39HlC: SPE_ShellHEAT_base {
66-
EGVAR(frag,enabled) = 1;
6760
EGVAR(frag,force) = 1;
6861
EGVAR(frag,metal) = 2500;
6962
EGVAR(frag,charge) = 1500;
@@ -73,7 +66,6 @@ class SPE_S_105L28_Gr39HlC: SPE_ShellHEAT_base {
7366
EGVAR(rearm,caliber) = 105;
7467
};
7568
class SPE_R_280mm_WkSpr: SubmunitionBase {
76-
EGVAR(frag,enabled) = 1;
7769
EGVAR(frag,force) = 1;
7870
EGVAR(frag,metal) = 37000;
7971
EGVAR(frag,charge) = 50000;
@@ -82,7 +74,6 @@ class SPE_R_280mm_WkSpr: SubmunitionBase {
8274
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
8375
};
8476
class SPE_US_Bangalore_ammo: SPE_MAIN_pipebomb {
85-
EGVAR(frag,enabled) = 1;
8677
EGVAR(frag,force) = 1;
8778
EGVAR(frag,metal) = 1700;
8879
EGVAR(frag,charge) = 4100;
@@ -92,7 +83,6 @@ class SPE_US_Bangalore_ammo: SPE_MAIN_pipebomb {
9283
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
9384
};
9485
class SPE_Ladung_Big_ammo: SPE_MAIN_pipebomb {
95-
EGVAR(frag,enabled) = 1;
9686
EGVAR(frag,force) = 1;
9787
EGVAR(frag,metal) = 500;
9888
EGVAR(frag,charge) = 1500;
@@ -102,7 +92,6 @@ class SPE_Ladung_Big_ammo: SPE_MAIN_pipebomb {
10292
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
10393
};
10494
class SPE_Ladung_Small_ammo: SPE_MAIN_pipebomb {
105-
EGVAR(frag,enabled) = 1;
10695
EGVAR(frag,force) = 1;
10796
EGVAR(frag,metal) = 250;
10897
EGVAR(frag,charge) = 750;
@@ -112,7 +101,6 @@ class SPE_Ladung_Small_ammo: SPE_MAIN_pipebomb {
112101
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
113102
};
114103
class SPE_US_M1A1_ATMINE_ammo: SPE_MAIN_mine {
115-
EGVAR(frag,enabled) = 1;
116104
EGVAR(frag,force) = 1;
117105
EGVAR(frag,metal) = 2100;
118106
EGVAR(frag,charge) = 2700;
@@ -122,7 +110,6 @@ class SPE_US_M1A1_ATMINE_ammo: SPE_MAIN_mine {
122110
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
123111
};
124112
class SPE_US_TNT_half_pound_ammo: SPE_MAIN_pipebomb {
125-
EGVAR(frag,enabled) = 1;
126113
EGVAR(frag,force) = 1;
127114
EGVAR(frag,metal) = 100;
128115
EGVAR(frag,charge) = 226;
@@ -132,7 +119,6 @@ class SPE_US_TNT_half_pound_ammo: SPE_MAIN_pipebomb {
132119
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
133120
};
134121
class SPE_US_TNT_4pound_ammo: SPE_MAIN_pipebomb {
135-
EGVAR(frag,enabled) = 1;
136122
EGVAR(frag,force) = 1;
137123
EGVAR(frag,metal) = 372;
138124
EGVAR(frag,charge) = 1814;
@@ -142,7 +128,6 @@ class SPE_US_TNT_4pound_ammo: SPE_MAIN_pipebomb {
142128
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
143129
};
144130
class SPE_US_M3_PRessure_ammo: SPE_MAIN_mine {
145-
EGVAR(frag,enabled) = 1;
146131
EGVAR(frag,force) = 1;
147132
EGVAR(frag,metal) = 2267;
148133
EGVAR(frag,charge) = 454;
@@ -152,7 +137,6 @@ class SPE_US_M3_PRessure_ammo: SPE_MAIN_mine {
152137
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
153138
};
154139
class SPE_US_M3_ammo: SPE_MAIN_mine {
155-
EGVAR(frag,enabled) = 1;
156140
EGVAR(frag,force) = 1;
157141
EGVAR(frag,metal) = 2267;
158142
EGVAR(frag,charge) = 454;
@@ -162,7 +146,6 @@ class SPE_US_M3_ammo: SPE_MAIN_mine {
162146
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
163147
};
164148
class SPE_shumine42_ammo: SPE_MAIN_mine {
165-
EGVAR(frag,enabled) = 1;
166149
EGVAR(frag,force) = 1;
167150
EGVAR(frag,metal) = 300;
168151
EGVAR(frag,charge) = 200;
@@ -172,7 +155,6 @@ class SPE_shumine42_ammo: SPE_MAIN_mine {
172155
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
173156
};
174157
class SPE_Shg24x7_Improvised_Mine_ammo: SPE_MAIN_mine {
175-
EGVAR(frag,enabled) = 1;
176158
EGVAR(frag,force) = 1;
177159
EGVAR(frag,metal) = 525;
178160
EGVAR(frag,charge) = 1330;
@@ -181,7 +163,6 @@ class SPE_Shg24x7_Improvised_Mine_ammo: SPE_MAIN_mine {
181163
EGVAR(frag,classes)[] = {"ACE_frag_small_HD"};
182164
};
183165
class SPE_SMI35_Pressure_ammo: SPE_MAIN_mine {
184-
EGVAR(frag,enabled) = 1;
185166
EGVAR(frag,force) = 1;
186167
EGVAR(frag,metal) = 2720;
187168
EGVAR(frag,charge) = 182;
@@ -191,7 +172,6 @@ class SPE_SMI35_Pressure_ammo: SPE_MAIN_mine {
191172
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
192173
};
193174
class SPE_SMI35_1_ammo: SPE_MAIN_mine {
194-
EGVAR(frag,enabled) = 1;
195175
EGVAR(frag,force) = 1;
196176
EGVAR(frag,metal) = 2720;
197177
EGVAR(frag,charge) = 182;
@@ -201,7 +181,6 @@ class SPE_SMI35_1_ammo: SPE_MAIN_mine {
201181
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
202182
};
203183
class SPE_SMI35_ammo: SPE_MAIN_mine {
204-
EGVAR(frag,enabled) = 1;
205184
EGVAR(frag,force) = 1;
206185
EGVAR(frag,metal) = 2720;
207186
EGVAR(frag,charge) = 182;
@@ -211,7 +190,6 @@ class SPE_SMI35_ammo: SPE_MAIN_mine {
211190
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
212191
};
213192
class SPE_STMI_ammo: SPE_MAIN_mine {
214-
EGVAR(frag,enabled) = 1;
215193
EGVAR(frag,force) = 1;
216194
EGVAR(frag,metal) = 1520;
217195
EGVAR(frag,charge) = 152;
@@ -221,7 +199,6 @@ class SPE_STMI_ammo: SPE_MAIN_mine {
221199
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
222200
};
223201
class SPE_TMI42_ammo: SPE_MAIN_mine {
224-
EGVAR(frag,enabled) = 1;
225202
EGVAR(frag,force) = 1;
226203
EGVAR(frag,metal) = 2520;
227204
EGVAR(frag,charge) = 5400;

‎addons/compat_spe/CfgAmmo/grenades.hpp‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ class SPE_Grenade_base;
33

44
class SPE_US_M15: SPE_GrenadeHand_base {
55
ACE_damageType = QGVAR(explosive_incendiary);
6-
EGVAR(frag,enabled) = 1;
76
};
87
class SPE_Shg24: SPE_GrenadeHand_base {
9-
EGVAR(frag,enabled) = 1;
108
EGVAR(frag,force) = 1;
119
EGVAR(frag,metal) = 75;
1210
EGVAR(frag,charge) = 170;
@@ -15,7 +13,6 @@ class SPE_Shg24: SPE_GrenadeHand_base {
1513
EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"};
1614
};
1715
class SPE_Shg24_Frag: SPE_GrenadeHand_base {
18-
EGVAR(frag,enabled) = 1;
1916
EGVAR(frag,force) = 1;
2017
EGVAR(frag,metal) = 250;
2118
EGVAR(frag,charge) = 190;
@@ -24,7 +21,6 @@ class SPE_Shg24_Frag: SPE_GrenadeHand_base {
2421
EGVAR(frag,classes)[] = {"ACE_frag_small_HD"};
2522
};
2623
class SPE_Shg24x7: SPE_GrenadeHand_base {
27-
EGVAR(frag,enabled) = 1;
2824
EGVAR(frag,force) = 1;
2925
EGVAR(frag,metal) = 525;
3026
EGVAR(frag,charge) = 1330;
@@ -33,7 +29,6 @@ class SPE_Shg24x7: SPE_GrenadeHand_base {
3329
EGVAR(frag,classes)[] = {"ACE_frag_small_HD"};
3430
};
3531
class SPE_M39: SPE_GrenadeHand_base {
36-
EGVAR(frag,enabled) = 1;
3732
EGVAR(frag,force) = 1;
3833
EGVAR(frag,metal) = 200;
3934
EGVAR(frag,charge) = 112;
@@ -42,17 +37,14 @@ class SPE_M39: SPE_GrenadeHand_base {
4237
EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"};
4338
};
4439
class SPE_US_Mk_2: SPE_GrenadeHand_base {
45-
EGVAR(frag,enabled) = 1;
4640
EGVAR(frag,force) = 1;
4741
EGVAR(frag,metal) = 400;
4842
EGVAR(frag,charge) = 56;
4943
EGVAR(frag,gurney_c) = 2440;
5044
EGVAR(frag,gurney_k) = 3/5;
5145
EGVAR(frag,classes)[] = {"ACE_frag_small_HD"};
5246
};
53-
class SPE_US_Mk_2_Yellow: SPE_US_Mk_2 {};
5447
class SPE_US_Mk_3: SPE_GrenadeHand_base {
55-
EGVAR(frag,enabled) = 1;
5648
EGVAR(frag,force) = 1;
5749
EGVAR(frag,metal) = 90;
5850
EGVAR(frag,charge) = 200;
@@ -61,7 +53,6 @@ class SPE_US_Mk_3: SPE_GrenadeHand_base {
6153
EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"};
6254
};
6355
class SPE_G_M9A1: SPE_Grenade_base {
64-
EGVAR(frag,enabled) = 1;
6556
EGVAR(frag,force) = 1;
6657
EGVAR(frag,metal) = 200;
6758
EGVAR(frag,charge) = 113;
@@ -70,7 +61,6 @@ class SPE_G_M9A1: SPE_Grenade_base {
7061
EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"};
7162
};
7263
class SPE_G_MK2: SPE_Grenade_base {
73-
EGVAR(frag,enabled) = 1;
7464
EGVAR(frag,force) = 1;
7565
EGVAR(frag,metal) = 400;
7666
EGVAR(frag,charge) = 56;
@@ -79,7 +69,6 @@ class SPE_G_MK2: SPE_Grenade_base {
7969
EGVAR(frag,classes)[] = {"ACE_frag_small_HD"};
8070
};
8171
class SPE_G_PZGR_30: SPE_Grenade_base {
82-
EGVAR(frag,enabled) = 1;
8372
EGVAR(frag,force) = 1;
8473
EGVAR(frag,metal) = 120;
8574
EGVAR(frag,charge) = 50;
@@ -88,7 +77,6 @@ class SPE_G_PZGR_30: SPE_Grenade_base {
8877
EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"};
8978
};
9079
class SPE_G_PZGR_40: SPE_Grenade_base {
91-
EGVAR(frag,enabled) = 1;
9280
EGVAR(frag,force) = 1;
9381
EGVAR(frag,metal) = 180;
9482
EGVAR(frag,charge) = 75;
@@ -97,7 +85,6 @@ class SPE_G_PZGR_40: SPE_Grenade_base {
9785
EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"};
9886
};
9987
class SPE_G_SPRGR_30_Detonation: SPE_Grenade_base {
100-
EGVAR(frag,enabled) = 1;
10188
EGVAR(frag,force) = 1;
10289
EGVAR(frag,metal) = 150;
10390
EGVAR(frag,charge) = 200;

0 commit comments

Comments
 (0)