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

Allow toggling brand names of drugs #70968

Merged
merged 1 commit into from
Jan 24, 2024

Conversation

ehughsbaird
Copy link
Contributor

Summary

Interface "Allow toggling on drug brand names"

Purpose of change

Fixes #51689

In #45308, the names of various pharmaceutical items were changed from brand names to generic names describing their active ingredients.

In #46814, the names of various guns were changed from specific brand names to generic versions, and many guns were collapsed into the generic versions. However, variants were added, allowing a toggle to bring back all those names.

We can follow that same approach for drugs, using variants to allow toggling between the generic names and brand names.

Describe the solution

To do this, simply add a new variant type, a new option, and then change whether that type is shown based on the value of that option. Then, add the variants for brand names.

Testing

image
image
image

Additional context

I didn't add back the non-generic names for the antibiotics because

  1. Only strong/weak antibiotics had them
  2. They didn't seem to be real names

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 15, 2024
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • Its generic name is fluoxetine.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@worm-girl
Copy link
Contributor

worm-girl commented Jan 15, 2024

Antibiotics probably shouldn't get real names until we differentiate them more. IRL antibiotics only work vs specific sets of bacteria, and currently our game models infections and other antibiotic-treatable illnesses very vaguely.

@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jan 15, 2024
In PR 45308, the names of various pharmaceutical items were changed from
brand names to generic names describing their active ingredients.

In PR 46814, the names of various guns were changed from specific brand
names to generic versions, and many guns were collapsed into the generic
versions. However, variants were added, allowing a toggle to brind back
all those names.

We can follow that same approach for drugs, using variants to allow
toggling between the generic names and brand names.

To do this, simply add a new variant type, a new option, and then change
whether that type is shown based on the value of that option.
Then, add the variants for brand names.

I didn't add back the non-generic names for the antibiotics because
1. Only strong/weak antibiotics had them
2. They didn't seem to be real names
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 23, 2024
@Maleclypse Maleclypse merged commit dcb7ad3 into CleverRaven:master Jan 24, 2024
23 of 27 checks passed
@ehughsbaird ehughsbaird deleted the branding-the-drugs branch January 26, 2024 01:43
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 [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bring drug brand names back
3 participants