Skip to content

Commit f867a0e

Browse files
Redzitusjohnb432PabstMirror
authored
Compat GM - Add more compatibility and fixes. (#11281)
* Update CfgWeapons.hpp first commit most guns barrel length and twist added. * Create CfgAmmo.hpp another commit cuz idk how to stash yet most ammo adv ballistics compat * Create CfgGlasses create tints and overlays and protection levels to glasses/masks * Rename CfgGlasses to CfgGlasses.hpp * Refactor bullet properties in CfgAmmo.hpp * Add bullet length to gm_bullet_556x45mm_B_T_dm21 * Refactor bullet class definitions in CfgAmmo.hpp * Update CfgWeapons.hpp * Refactor CfgAmmo.hpp for consistency in bullet data * Add gm_mp5sd_base class with barrel specifications * Change hearing protection type for army headgear * Update hearing protection types for headgear classes * Add ACE goggles compatibility for GM dust goggles * Added/updated more bullet types in CfgAmmo.hpp Updated bullet specifications for various ammunition types, including changes to bullet lengths, masses, and muzzle velocities. * Add new weapon classes with barrel specifications * Add includes for CfgAmmo and CfgGlasses * Add 'Redzitus' to authors list in config.cpp * Fix undefined base classes Reorganized pistol classes by removing and re-adding definitions. * Update addons/compat_gm/CfgAmmo.hpp Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/compat_gm/CfgAmmo.hpp Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/compat_gm/CfgWeapons.hpp Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/compat_gm/CfgAmmo.hpp Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Refactor include statements in config.cpp Reordered includes for better organization and removed duplicates. * Refine bullet parameters in CfgAmmo.hpp * Update bullet properties in CfgAmmo.hpp * fix texture path, config style * Update hearing protection types, add more hearing protection gear * Fix tabsCfgWeapons.hpp * Fix class spacing, arrays * Fix undefined base classes on CfgAmmo.hpp * Fix undefined base classes in CfgWeapons.hpp * correct undefined base classes in CfgWeapons (again) --------- Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
1 parent 6d20a30 commit f867a0e

File tree

6 files changed

+464
-45
lines changed

6 files changed

+464
-45
lines changed

‎addons/compat_gm/CfgAmmo.hpp‎

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
class CfgAmmo {
2+
class gm_bullet_base;
3+
class gm_bullet_556x45mm_base: gm_bullet_base {
4+
ACE_ammoTempMuzzleVelocityShifts[] = {-27.2, -26.44, -23.76, -21, -17.54, -13.1, -7.95, -1.62, 6.24, 15.48, 27.75};
5+
ACE_ballisticCoefficients[] = {0.151};
6+
ACE_barrelLengths[] = {210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508, 609.6};
7+
ACE_bulletLength = 23.012;
8+
ACE_bulletMass = 4.0176;
9+
ACE_caliber = 5.69;
10+
ACE_dragModel = 7;
11+
ACE_muzzleVelocities[] = {723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900};
12+
ACE_standardAtmosphere = "ASM";
13+
};
14+
class gm_bullet_556x45mm_B_dm11: gm_bullet_556x45mm_base { // https://pt.scribd.com/doc/194927638/5-56mmx45-NATO-DualCore-DM11
15+
ACE_bulletMass = 4.1;
16+
};
17+
class gm_bullet_556x45mm_B_T_dm21: gm_bullet_556x45mm_B_dm11 { // https://web.archive.org/web/20090617170413/http://www.ruag.com/de/Defence_Security/Amunition/PDF_Munition/5.56mmx45_NATO_Tracer_DM21.pdf
18+
ACE_barrelLengths[] = {210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508, 609.6};
19+
ACE_bulletLength = 29.31;
20+
ACE_bulletMass = 4.0176;
21+
ACE_muzzleVelocities[] = {691, 764, 764, 770, 793, 811,834, 846, 860, 874, 883, 890, 870};
22+
};
23+
class gm_bullet_556x45mm_B_m193: gm_bullet_556x45mm_base {
24+
ACE_bulletLength = 19.3;
25+
ACE_bulletMass = 3.6;
26+
ACE_ballisticCoefficients[] = {0.118}; // https://internationalshootingsupplies.com/product/winchester-5-56-55gr-fmj-600-round-bulk-pack/
27+
ACE_barrelLengths[] = {190.5, 266.7, 368.3, 406.4, 508, 558.8};
28+
ACE_muzzleVelocities[] = {712.93, 829.97, 921.71, 954.33, 992.73, 1018.94};
29+
};
30+
class gm_bullet_556x45mm_B_T_m196: gm_bullet_556x45mm_B_m193 {
31+
ACE_bulletLength = 23.1;
32+
ACE_bulletMass = 3.5;
33+
ACE_ballisticCoefficients[] = {0.118};
34+
ACE_barrelLengths[] = {190.5, 266.7, 368.3, 406.4, 508, 558.8};
35+
ACE_muzzleVelocities[] = {712.93, 829.97, 921.71, 954.33, 992.73, 1018.94};
36+
};
37+
class gm_bullet_556x45mm_B_M855;
38+
class gm_bullet_556x45mm_B_T_m856: gm_bullet_556x45mm_B_M855 {
39+
ACE_bulletLength = 29.3;
40+
ACE_bulletMass = 4.13;
41+
};
42+
class gm_bullet_545x39mm_base: gm_bullet_base {
43+
ACE_ammoTempMuzzleVelocityShifts[] = {-26.55, -25.47, -22.85, -20.12, -16.98, -12.8, -7.64, -1.53, 5.96, 15.17, 26.19};
44+
ACE_ballisticCoefficients[] = {0.168};
45+
ACE_barrelLengths[] = {254, 414.02, 508};
46+
ACE_bulletLength = 25.55;
47+
ACE_bulletMass = 3.42792;
48+
ACE_caliber = 5.588;
49+
ACE_dragModel = 7;
50+
ACE_muzzleVelocities[] = {780, 880, 920};
51+
ACE_standardAtmosphere = "ASM";
52+
};
53+
class gm_bullet_545x39mm_B_7N6;
54+
class gm_bullet_545x39mm_B_T_7T3: gm_bullet_545x39mm_B_7N6 {
55+
ACE_barrelLengths[] = {254, 414.02, 508};
56+
ACE_bulletLength = 25.32;
57+
ACE_bulletMass = 3.2;
58+
ACE_muzzleVelocities[] = {785, 883, 925};
59+
};
60+
class gm_bullet_762x54mmR_base: gm_bullet_base {
61+
ACE_ammoTempMuzzleVelocityShifts[] = {-26.55, -25.47, -22.85, -20.12, -16.98, -12.8, -7.64, -1.53, 5.96, 15.17, 26.19};
62+
ACE_ballisticCoefficients[] = {0.411};
63+
ACE_barrelLengths[] = {406.4, 508, 604.5, 736.6};
64+
ACE_bulletLength = 32.385;
65+
ACE_bulletMass = 9.7975952;
66+
ACE_caliber = 7.925;
67+
ACE_dragModel = 1;
68+
ACE_muzzleVelocities[] = {735, 770, 809, 838};
69+
ACE_standardAtmosphere = "ICAO";
70+
};
71+
class gm_bullet_762x54mmR_API_7bz3: gm_bullet_762x54mmR_base {
72+
ACE_ballisticCoefficients[] = {0.401};
73+
ACE_bulletLength = 36.83;
74+
ACE_bulletMass = 10.39;
75+
ace_vehicle_damage_incendiary = 1;
76+
};
77+
class gm_bullet_762x54mmR_B_57N323S: gm_bullet_762x54mmR_base {
78+
ACE_ballisticCoefficients[] = {0.374};
79+
ACE_bulletMass = 9.6;
80+
ACE_barrelLengths[] = {550, 605, 650, 658};
81+
ACE_bulletLength = 32.385;
82+
ACE_muzzleVelocities[] = {810, 825, 830, 825};
83+
};
84+
class gm_bullet_762x54mmR_B_T_7t2: gm_bullet_762x54mmR_B_57N323S {
85+
ACE_ballisticCoefficients[] = {0.395};
86+
ACE_barrelLengths[] = {406.4, 508, 604.5, 736.6};
87+
ACE_bulletLength = 35.55;
88+
ACE_bulletMass = 9.65;
89+
ACE_muzzleVelocities[] = {735, 770, 809, 838};
90+
};
91+
class gm_bullet_762x51mm_base: gm_bullet_base {
92+
ACE_ammoTempMuzzleVelocityShifts[] = {-26.55, -25.47, -22.85, -20.12, -16.98, -12.8, -7.64, -1.53, 5.96, 15.17, 26.19};
93+
ACE_ballisticCoefficients[] = {0.2};
94+
ACE_barrelLengths[] = {419.1, 431.8, 457.2, 482.6, 508, 533.4, 558.8, 584.2, 609.6, 635, 660.4, 685.8, 711.2};
95+
ACE_bulletLength = 26.46;
96+
ACE_bulletMass = 9.52544;
97+
ACE_caliber = 7.823;
98+
ACE_dragModel = 7;
99+
ACE_muzzleVelocities[] = {780.593, 785.47, 790.956, 802.843, 816.559, 817.778, 828.446, 836.371, 843.077, 843.991, 853.745, 853.44, 860.45};
100+
ACE_standardAtmosphere = "ICAO";
101+
};
102+
class gm_bullet_762x51mm_AP_DM151: gm_bullet_762x51mm_base {
103+
ACE_bulletLength = 31.496;
104+
ACE_bulletMass = 9.8;
105+
};
106+
class gm_bullet_762x51mm_B_DM41;
107+
class gm_bullet_762x51mm_B_T_DM21: gm_bullet_762x51mm_B_DM41 {
108+
ACE_bulletLength = 33.8;
109+
ACE_bulletMass = 9.20145;
110+
};
111+
class gm_bullet_9x18mm_base;
112+
class gm_bullet_9x18mm_B_pst: gm_bullet_9x18mm_base {
113+
ACE_ammoTempMuzzleVelocityShifts[] = {-2.655, -2.547, -2.285, -2.012, -1.698, -1.28, -0.764, -0.153, 0.596, 1.517, 2.619};
114+
ACE_ballisticCoefficients[] = {0.135};
115+
ACE_barrelLengths[] = {50.8, 76.2, 101.6, 127, 152.4, 177.8, 203.2, 228.6, 254, 279.4, 304.8, 330.2, 355.6, 381, 406.4, 431.8, 457.2};
116+
ACE_bulletLength = 10.541;
117+
ACE_bulletMass = 6.1559;
118+
ACE_caliber = 9.27;
119+
ACE_dragModel = 1;
120+
ACE_muzzleVelocities[] = {253.289, 271.272, 294.132, 296.57, 301.142, 313.334, 317.297, 321.259, 324.002, 325.526, 329.489, 327.965, 337.109, 335.28, 338.938, 329.794, 327.66};
121+
ACE_standardAtmosphere = "ICAO";
122+
};
123+
class gm_bullet_9x19mm_base: gm_bullet_base {
124+
ACE_ammoTempMuzzleVelocityShifts[] = {-2.655, -2.547, -2.285, -2.012, -1.698, -1.28, -0.764, -0.153, 0.596, 1.517, 2.619};
125+
ACE_ballisticCoefficients[] = {0.165};
126+
ACE_barrelLengths[] = {101.6,127,228.6};
127+
ACE_bulletLength = 15.494;
128+
ACE_bulletMass = 8.0352;
129+
ACE_caliber = 9.017;
130+
ACE_dragModel = 1;
131+
ACE_muzzleVelocities[] = {340, 370, 400};
132+
ACE_standardAtmosphere = "ASM";
133+
};
134+
class gm_bullet_9x19mm_AP_dm91: gm_bullet_9x19mm_base {
135+
ACE_bulletMass = 5.7023;
136+
ACE_muzzleVelocities[] = {410,440,480};
137+
};
138+
class gm_bullet_9x19mm_B_dm51;
139+
class gm_bullet_9x19mm_BSD_dm81: gm_bullet_9x19mm_B_dm51 {
140+
ACE_bulletMass = 9.52544;
141+
ACE_muzzleVelocities[] = {220, 250, 290};
142+
};
143+
class gm_bullet_762x39mm_base;
144+
class gm_bullet_762x39mm_B_57N231: gm_bullet_762x39mm_base {
145+
ACE_ammoTempMuzzleVelocityShifts[] = {-26.55, -25.47, -22.85, -20.12, -16.98, -12.8, -7.64, -1.53, 5.96, 15.17, 26.19};
146+
ACE_ballisticCoefficients[] = {0.275};
147+
ACE_barrelLengths[] = {254, 414.02, 508};
148+
ACE_bulletLength = 26.8;
149+
ACE_bulletMass = 7.899;
150+
ACE_caliber = 7.92;
151+
ACE_dragModel = 1;
152+
ACE_muzzleVelocities[] = {650, 716, 750};
153+
ACE_standardAtmosphere = "ICAO";
154+
};
155+
class gm_bullet_762x39mm_B_M43: gm_bullet_762x39mm_B_57N231 {
156+
ACE_ballisticCoefficients[] = {0.138};
157+
ACE_dragModel = 7;
158+
ACE_bulletMass = 7.97027;
159+
};
160+
class gm_bullet_762x39mm_B_T_57N231P: gm_bullet_762x39mm_B_57N231 {
161+
ACE_bulletLength = 27.48;
162+
ACE_bulletMass = 7.5685127;
163+
};
164+
class gm_bullet_762x39mm_AP_7N23: gm_bullet_762x39mm_B_57N231 {
165+
ACE_bulletLength = 27.4;
166+
};
167+
class gm_bullet_762x39mm_AP_M43: gm_bullet_762x39mm_AP_7N23 {
168+
ACE_bulletLength = 28.3;
169+
ACE_bulletMass = 7.87;
170+
ACE_ballisticCoefficients[] = {0.138};
171+
ACE_dragModel = 7;
172+
};
173+
class gm_bullet_762x39mm_BSD_57N231U: gm_bullet_762x39mm_B_57N231 {
174+
ACE_bulletLength = 33.62;
175+
ACE_bulletMass = 12.5;
176+
ACE_muzzleVelocities[] = {270, 290, 320};
177+
};
178+
class gm_bullet_473x33mm_base;
179+
class gm_bullet_473x33mm_B_dm11: gm_bullet_473x33mm_base {
180+
ACE_ammoTempMuzzleVelocityShifts[] = {-26.55, -25.47, -22.85, -20.12, -16.98, -12.8, -7.64, -1.53, 5.96, 15.17, 26.19};
181+
ACE_ballisticCoefficients[] = {0.115};
182+
ACE_barrelLengths[] = {540};
183+
ACE_bulletLength = 21.88;
184+
ACE_bulletMass = 3.33;
185+
ACE_caliber = 4.92;
186+
ACE_dragModel = 7;
187+
ACE_muzzleVelocities[] = {925};
188+
ACE_standardAtmosphere = "ASM";
189+
};
190+
191+
//Not in use by the CDLC
192+
class gm_bullet_762x39mm_API_M43: gm_bullet_762x39mm_AP_7N23 {
193+
ACE_bulletLength = 28.57;
194+
EGVAR(vehicle_damage,incendiary) = 1;
195+
ACE_bulletMass = 7.67;
196+
ACE_ballisticCoefficients[] = {0.138};
197+
ACE_dragModel = 7;
198+
};
199+
class gm_bullet_762x39mm_API_T_M43: gm_bullet_762x39mm_AP_7N23 {
200+
ACE_bulletLength = 28.57;
201+
ace_vehicle_damage_incendiary = 1;
202+
ACE_bulletMass = 7.67;
203+
ACE_ballisticCoefficients[] = {0.138};
204+
ACE_dragModel = 7;
205+
};
206+
class gm_bullet_762x39mm_B_T_M43: gm_bullet_762x39mm_B_T_57N231P {
207+
ACE_bulletLength = 27.48;
208+
ACE_bulletMass = 7.97;
209+
ACE_ballisticCoefficients[] = {0.138};
210+
ACE_dragModel = 7;
211+
};
212+
};

‎addons/compat_gm/CfgGlasses.hpp‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
class CfgGlasses {
2+
class gm_ge_facewear_stormhood_base;
3+
class gm_glasses_base;
4+
class gm_gasmask_base;
5+
class gm_ge_facewear_stormhood_dustglasses_blk: gm_ge_facewear_stormhood_base {
6+
ACE_Color[] = {0,0,-1.5};
7+
ACE_TintAmount = 8;
8+
ACE_Protection = 1;
9+
ACE_Resistance = 2;
10+
ACE_Overlay = QPATHTOEF(goggles,textures\HUD\CombatGoggles.paa);
11+
ACE_OverlayCracked = QPATHTOEF(goggles,textures\HUD\Cracked.paa);
12+
};
13+
14+
class gm_ge_facewear_sunglasses: gm_glasses_base {
15+
ACE_Color[] = {1,0.5,0};
16+
ACE_TintAmount = 8;
17+
ACE_Protection = 1;
18+
ACE_Resistance = 1;
19+
};
20+
21+
class gm_ge_facewear_glacierglasses: gm_glasses_base {
22+
ACE_Color[] = {1,0.5,0};
23+
ACE_TintAmount = 32;
24+
ACE_Protection = 1;
25+
ACE_Resistance = 1;
26+
};
27+
28+
class gm_ge_facewear_dustglasses: gm_glasses_base {
29+
ACE_Color[] = {0,0,-1.5};
30+
ACE_TintAmount = 8;
31+
ACE_Protection = 1;
32+
ACE_Resistance = 2;
33+
ACE_Overlay = QPATHTOEF(goggles,textures\HUD\CombatGoggles.paa);
34+
ACE_OverlayCracked = QPATHTOEF(goggles,textures\HUD\Cracked.paa);
35+
};
36+
37+
class gm_gc_army_facewear_dustglasses: gm_glasses_base {
38+
ACE_Protection = 1;
39+
ACE_Resistance = 2;
40+
ACE_Overlay = QPATHTOEF(goggles,textures\HUD\CombatGoggles.paa);
41+
ACE_OverlayCracked = QPATHTOEF(goggles,textures\HUD\Cracked.paa);
42+
};
43+
44+
class gm_ge_facewear_m65: gm_gasmask_base {
45+
ACE_Protection = 1;
46+
ACE_Resistance = 1;
47+
};
48+
49+
class gm_ge_facewear_acidgoggles: gm_glasses_base {
50+
ACE_Protection = 1;
51+
ACE_Resistance = 1;
52+
};
53+
54+
class gm_gc_army_facewear_schm41m: gm_gasmask_base {
55+
ACE_Protection = 1;
56+
ACE_Resistance = 1;
57+
};
58+
};

0 commit comments

Comments
 (0)