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

Move all ammo attributes to arrays #40208

Merged
merged 2 commits into from
May 6, 2020
Merged

Conversation

ymber
Copy link
Member

@ymber ymber commented May 5, 2020

Summary

SUMMARY: None

Purpose of change

As I'm working on the reloading and ammo consumption code it's easier to write JSON editing scripts when types aren't all over the place.

Describe the solution

Make all string type ammo values arrays. Use assign for loading these attributes.

Testing

Game loads fine.

@ymber ymber added [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` labels May 5, 2020
@KorGgenT
Copy link
Member

KorGgenT commented May 5, 2020

don't know if the deletion of the json comments were intentional, but the rest of the json and the adjustment to assign LGTM.

@ymber
Copy link
Member Author

ymber commented May 6, 2020

Also turned ammo_type in magazine definitions to arrays now.

@KorGgenT KorGgenT merged commit 7e2c59c into CleverRaven:master May 6, 2020
@ymber ymber deleted the ammo_array branch May 6, 2020 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants