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

Convert 10mm guns to variants #49600

Merged
merged 1 commit into from
Jul 6, 2021
Merged

Conversation

anothersimulacrum
Copy link
Member

Summary

None

Purpose of change

Continue work of #46814

Describe the solution

Remove the Glock 40 and replace it with a variant of the Glock 20. Genericize guns and magazines for the rest of the 10mm lot.

Describe alternatives you've considered

Some of the generic names could make be looked at (Colt Delta Elite, EAA Witness in particular could be different), but I think they're fine.

Testing

Spawn in all of the 10mm firearms, without this applied, load the same save with it applied.
image

Additional context

I am not sure what I need to do, but the name in variants does not accept plural forms, so I needed to convert the 610 to use just 'str'.
@Qrox If you have any advice about the above, I would appreciate it.

I am not sure what I need to do, but the name in variants does not
accept plural forms, so I needed to convert the 610 to use just 'str'.

The Glock 40 is the only item defintion being dropped here - some of the
generic names could make be looked at (Colt Delta Elite, EAA Witness in
particular could be different), but I think they're fine.
@anothersimulacrum anothersimulacrum added the [JSON] Changes (can be) made in JSON label Jul 5, 2021
@Qrox
Copy link
Contributor

Qrox commented Jul 6, 2021

To read a plural string you need to call translation::make_plural before reading it. The translation class needs to know whether a string has a plural to call the correct gettext function.

@anothersimulacrum
Copy link
Member Author

Thank you!

@ZhilkinSerg ZhilkinSerg merged commit 488492f into CleverRaven:master Jul 6, 2021
@anothersimulacrum anothersimulacrum deleted the 10mm branch July 6, 2021 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants