Magazine Audit - 66mm, 40mm, .357SIG, .40S&W, .380, .303, .300WM #71099
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Balance "Audit 66mm, 40mm, .357SIG, .40S&W, .380, .303, .300WM Magazines"
Purpose of change
Magazines are the wrong size and weight, this PR has better sizes and weights.
Describe the solution
Give these magazines the correct dimensions and weight.
Describe alternatives you've considered
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Testing
TBD
Additional context
This PR is part of issue #70784
Auditing information available below as per my post in that issue:
.300 Winchester Magnum
https://accurate-mag.com/shop/magazines/300-win-mag-sssf-magazine/
https://xlrindustries.com/products/long-action-3-850-300wm-box-magazine#:~:text=Magazine%20Capacity%3A%205%20Cartridges,Magazine%20Weight%3A%207.3%20Ounces
M2010 5rd Magazine
10.1854 cm * 9.779 cm * 1.86944 cm
186 ml
207 g
https://shopruger.com/Ruger-Precision-Rifle-300-Win-Mag-_-300-PRC-5-Round-Magazine/productinfo/90682/
Same length per site, other dimensions are ImageJ. Weight is ratio of M2010 magazine.
10.10 cm * 9.779 cm * 1.71 cm
169 ml
188g
.303 British
https://riflemags.co.uk/lee-enfield-no-4-10-round-303-magazine/
Dimensions from Royal Armory schematics, weight from vendor.
Enfield 10rd. (Magazine is heavily sloped, so will cut final to 80%)
8.5 cm tall * 7.5cm deep * 2.7cm
138 ml
160g
.380 ACP
P-3AT 6rd
Previously ImageJ'd by someone.
FN 1910 6rd
ImageJ'd magazine
9.3 cm tall * 3 cm deep * 1.2cm
33 ml
40g (weight estimate)
LCP1 6rd (ImageJ'd)
8.6cm tall * 2.8 cm deep * 1.2 cm wide
29 ml
35g (estimate)
MAC 11 32rd Magazine
Copied values from MAC 10 30rd magazine, not 100% but probably 80% accurate.
"weight": "221 g",
"volume": "184 ml",
"longest_side": "21 cm",
Hi Point CF380
8rd (ImageJ)
9 cm tall * 3 cm deep * 1.1 cm wide * 1.1 (baseplate)
33mL
40g (estimate)
10rd (ImageJ)
Two parts (Thanks Hi-Point!)
Mag: 9.3 cm tall * 3 cm deep * 1.1 cm wide = 30.69
Massive Baseplate: 2.6cm tall * 5.3cm deep * 2.4cm wide = 33.072
64ml
77g (1.2 g/ml ratio estimate)
Taurus Spectrum 6rd (Comparison with other .380 mags)
30ml
36g
.40 S&W
Beretta 92/96 12rd Magazine
12rd (ImageJ Dimensions, Weight from Spec Sheet of a 92 magazine)
12.05 cm tall * 3.2 cm deep * 2 cm wide
77 ml
95g
Glock makes it a point to make their grips the same size to make using a different model easier.
The 17, 22, 34, 35, 31, and 37 all have the same frames, the magazine bodies are the same as well with the
exception of different feed lips and witness hole spacing,
which I won't be taking into account.
Glock Fullsize Magazine (Based on 17 mag) (ImageJ)
12.065 cm tall * 3.33 cm deep * 2.26 cm wide = 90.798
91ml
78g
Glock 22rd .40S&W/.357SIG Magazine (ImageJ Dimensions, Weight is 15rd mag ratio)
15 cm tall * 3.33 cm deep * 2.26 cm wide
113 ml
97g
PX4 14rd (ImageJ, weight from Beretta 12rd Ratio)
12 cm * 3.2 cm deep * 2.1 cm wide
81 ml
100g
SIG Pro .40 12rd
Values copied from Beretta 12rd.
Luty 20rd Magazine
Used the length of 22 .40S&W rounds stacked, other dimensions from similar mags. Weight is 1.2x volume
23.76cm * 3.3cm deep * 2.2cm wide
172 ml
207 g
UMP .40S&W 30rd (Values copied from .45 UMP Magazine)
206 ml
150 g
22cm longest
Browning HP .40 10rd (ImageJ)
10 cm tall * 3.3 cm deep * 2.25 cm wide
74 ml
100g (estimate)
Walther PPQ .40 10rd (Values copied from .45 PPQ)
"weight": "80 g",
"volume": "105 ml",
"longest_side": "128 mm",
Walther PPQ .40 12rd (Multiply 10rd by 1.1)
88 g
116 ml
128 longest side
Walther PPQ .40 14rd (Multiply 10rd by 1.2)
96g
126 ml
128 longest side
Hi-Point JCP 10rd (Copied from .45 JHP Magazine)
"weight": "110 g",
"volume": "92 ml",
"longest_side": "132 mm",
"longest_side": "12 cm",
10mm (This section is surprisingly awesome! Only needed to change speedloader.)
.40/10mm speedloader (Values copied from .44 speedloader)
28 g
25 ml
.357 SIG
Sig P226 12rd Magazine (Values copied from Beretta 12rd .40 magazine)
77 ml
95g
12cm longest
Sig P320 (Values copied from Beretta 12rd .40 magazine)
77 ml
95g
12cm longest
66mm
Estimate from photographs
8 in height x 8 in width x 2 in deep
20.32cm * 20.32cm * 5.08cm = 2097 ml, 500g estimate
Tactical Vest Changes:
To accommodate some of the changes to magazine sizes the pockets in item "tacvest" are being reworked. Previously these were assumed to be open pocket vests, now they've been changed to the type of vest that has elastics/straps/velcro to close the pocket properly. Accordingly there's no reason to limit items being placed to just magazines anymore. If you want to place a mid-mission snack banana into your vest I won't stop you. Time to move items in and out of the pockets was changed to 1 second from 0.6 seconds, to represent opening the pocket or unhooking straps instead of directly grabbing the item.