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 multiple flags to reduce description string duplication #56361

Merged
merged 6 commits into from
Mar 27, 2022

Conversation

haveric
Copy link
Contributor

@haveric haveric commented Mar 26, 2022

Summary

Infrastructure "Add multiple flags to reduce description string duplication"

Purpose of change

  • Reduce duplication of strings that make sense within the flags section. Related to Deduplicating more things in descriptions #55821
  • Fixes irradiated celery and irradiated cucumber stats (weren't copying from originals)
  • Minor grammar fixes in docs.

Describe the solution

Added seven new flags and updated items to use them instead of duplicating text across items.

Describe alternatives you've considered

  • Parse descriptions by sentence for the translator.
  • Allow descriptions to be an array of sentences which each get translated separately.
  • Create a new type of flag that appends to the description.

Testing

Loaded the game with no errors. Looked through some of the items in debug mode.

Additional context

image
image
image
image
image

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Aftershock Anything to do with the Aftershock mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Magiclysm Anything to do with the Magiclysm mod astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Mar 26, 2022
@NetSysFire
Copy link
Member

Looks fine so far, but your last two screenshots showing the mutagenic primers have "you need a syringe" twice in their attributes.

@haveric
Copy link
Contributor Author

haveric commented Mar 26, 2022

mutagenic primers have "you need a syringe" twice in their attributes.

Interesting. It must be pulling the activate component already. I'll take a look to see if I can just remove that (my version) entirely then or if some are missing it.

@haveric haveric marked this pull request as draft March 26, 2022 19:53
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 26, 2022
@haveric
Copy link
Contributor Author

haveric commented Mar 26, 2022

@NetSysFire I've simply removed my NEED_SYRINGE. There's code applying the other message based on the use_action having a syringe, so there's no need to duplicate it.

@haveric haveric marked this pull request as ready for review March 26, 2022 21:19
@kevingranade kevingranade merged commit 0c30b15 into CleverRaven:master Mar 27, 2022
@haveric haveric deleted the description-flags branch March 27, 2022 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Documentation> Design documents, internal info, guides and help. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Magiclysm Anything to do with the Magiclysm mod
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants