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

Standardize spelling: "sulfur" #63378

Merged
merged 1 commit into from
Mar 2, 2023
Merged

Conversation

cake-pie
Copy link
Contributor

Summary

None

Purpose of change

It might be good to standardize the use of sulfate vs sulphate --Tox

The spelling "sulphur" and its variants appear in json ids of items, but user-facing text has largely been standardized to "sulfur". There remain a few stray instances that do not follow this spelling.

Describe the solution

Hunt them down and standardize

~/dev/Cataclysm-DDA$ grep -rnE '[^_]sulph' src/ data/json/ data/mods
data/json/items/chemicals_and_resources.json:929:    "//0": "It might be good to standardize the use of sulfate vs sulphate --Tox",
data/json/items/book/misc.json:379:    "description": "When the devil falls in love with a warlock, his proposal must be infernally wicked.  Will hooves, horns, and the scent of sulphur condemn love's flames to hellfire?",
data/json/snippets/lab.json:351:      "We got a sample of what I can only describe as \"alien hamburger\" from XEDRA-40 today.  They say the probe was being chased by some kind of enormous creature in 079XE.  It managed to get an appendage through the portal, but they shut it down and it was sliced off.  The bit of claw that remained on this side rapidly degraded to mush.  We haven't been able to ascertain exactly why, but Melchior helped us model molecular coherence with the physical laws applying in 079XE: this has yielded the working hypothesis that in 079XE, it is possible for nitrogen groups to form a stable durable bond akin to a disulphide bridge.  These bonds might have been critical to holding the thing together, and when the became less stable in our world, the creature collapsed.",
data/json/recipes/recipe_medsandchemicals.json:1096:    "id_suffix": "sulpherless",
data/mods/Aftershock/items/mutagen.json:23:    "description": "An extremely rare mutagen cocktail, it smells of sulphur and glows orange.",

Also removed that comment from JSON since it's clearly been done already apart from these few stragglers.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Mods Issues related to mods or modding Mods: Aftershock Anything to do with the Aftershock mod json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jan 31, 2023
@github-actions
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
  • We got a sample of what I can only describe as "alien hamburger" from XEDRA-40 today. They say the probe was being chased by some kind of enormous creature in 079XE. It managed to get an appendage through the portal, but they shut it down and it was sliced off. The bit of claw that remained on this side rapidly degraded to mush. We haven't been able to ascertain exactly why, but Melchior helped us model molecular coherence with the physical laws applying in 079XE: this has yielded the working hypothesis that in 079XE, it is possible for nitrogen groups to form a stable durable bond akin to a disulfide bridge. These bonds might have been critical to holding the thing together, and when the became less stable in our world, the creature collapsed.

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.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 31, 2023
@GuardianDll
Copy link
Member

We need a unit test to catch a wrong spelling XD

@cake-pie cake-pie changed the title Standardize "sulfur" Standardize spelling: "sulfur" Feb 1, 2023
@ZhilkinSerg ZhilkinSerg merged commit 782943e into CleverRaven:master Mar 2, 2023
@cake-pie cake-pie deleted the sulf branch March 2, 2023 09:17
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 Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [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 Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants