Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Audit guns 22lr #42285

Merged
merged 9 commits into from
Jul 20, 2020
Merged

Audit guns 22lr #42285

merged 9 commits into from
Jul 20, 2020

Conversation

feinorgh
Copy link
Contributor

Summary

SUMMARY: Content "Audit volume, weight, and longest side for .22 LR guns"

Purpose of change

Contribute to #41691, for adding longest_side to gun items.

Describe the solution

Added longest_side, and verified weighs and volumes to data/json/items/gun/22.json

Describe alternatives you've considered

n/a

Testing

Ran the test suite without any problems. The relevant weapons could be spawned in debug mode in-game, and had the correct properties.

Additional context

The complete data source is located here: https://docs.google.com/spreadsheets/d/10TeuTTjwusbWB9SaH-nq03bMWDyILylU9Btvtu3uTDM/edit?usp=sharing

Images for the weapons involved are located here: https://drive.google.com/drive/folders/1RwRXxj5Rg8UmnPbAFz8YzOU2VT7tBWWu?usp=sharing

The image folder also contains a CSV file with measurements from ImageJ (Measurements.csv) but the same data is included in the spreadsheet.

The files involved are:

  • 84 - American-180.jpg
  • 85 - Marlin 39A.jpg
  • 86 - Mossberg Brownie.jpg
  • 87 - Ruger 10_22.jpg
  • 88 - SIG Mosquito.jpg
  • 89 - S&W 22A.jpg
  • 90 - Jennings J-22.jpg
  • 91 - Walther P22.jpg

The .22 pipe rifle does not have any sources, so I set "longest_side" to 1000 mm.

@anothersimulacrum anothersimulacrum added [JSON] Changes (can be) made in JSON Items: Containers Things that hold other things labels Jul 20, 2020
@kevingranade kevingranade merged commit c7e03e1 into CleverRaven:master Jul 20, 2020
@feinorgh feinorgh deleted the audit_guns_22lr branch July 20, 2020 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items: Containers Things that hold other things [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants