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

Add magazine wells to items #40668

Merged
merged 6 commits into from
May 23, 2020
Merged

Add magazine wells to items #40668

merged 6 commits into from
May 23, 2020

Conversation

ymber
Copy link
Member

@ymber ymber commented May 18, 2020

Summary

SUMMARY: Infrastructure "Add mag wells to all relevant items"

Purpose of change

#40399 needed it.

Describe the solution

Add MAGAZINE_WELL type pockets to relevant items.

Describe alternatives you've considered

Setting appropriate maximum values for volume and weight.

Testing

Won't work without changes in #40399.

@ymber ymber added [JSON] Changes (can be) made in JSON Items: Magazines Ammo holding items and objects. Items / Item Actions / Item Qualities Items and how they work and interact Items: Containers Things that hold other things labels May 18, 2020
@KorGgenT
Copy link
Member

I haven't had a chance to review it yet, but this probably addresses the comment i made in #40399

Copy link
Member

@KorGgenT KorGgenT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only error related to your changes, which makes sense that it was an error due to the script.

There are technically errors with the following, but they appear to be because the magazine is not watertight, and unrelated directly with this PR.


chemical_thrower
flamethrower_crude
watercannon

Also note: This PR is codependent on #40399 and if it is merged alone it will break gun json

data/json/items/gun/50.json Outdated Show resolved Hide resolved
Matthew Taylor and others added 2 commits May 20, 2020 09:33
Co-authored-by: Curtis Merrill <[email protected]>
Co-authored-by: Curtis Merrill <[email protected]>
"holster": true,
"max_contains_volume": "20 L",
"max_contains_weight": "20 kg",
"item_restriction": [ "38_speedloader6" ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so all of the guns with integral magazines that can be used with speedloaders should still have an integral magazine, not a magazine well - in the reloading code it just allows you to use a speedloader to put the ammo into the gun, so it should be a MAGAZINE type

@kevingranade kevingranade merged commit e382053 into CleverRaven:master May 23, 2020
@ymber ymber deleted the mag_wells branch May 23, 2020 11:37
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 Items / Item Actions / Item Qualities Items and how they work and interact Items: Magazines Ammo holding items and objects. [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants