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

Unifies grammar for morale types #56761

Merged
merged 1 commit into from
Apr 18, 2022
Merged

Unifies grammar for morale types #56761

merged 1 commit into from
Apr 18, 2022

Conversation

Ilysen
Copy link
Contributor

@Ilysen Ilysen commented Apr 12, 2022

Summary

Content "Fixed up some grammar with morale events"

Purpose of change

Inconsistent writing is always crummy, I think! A lot of these were capitalized inconsistently or had punctuation where they shouldn't.

Describe the solution

Audited all the entries in morale_types.json to follow standards that the rest of the game uses. There are some exceptions to grammar (for instance, traits that provide a fixed morale bonus/malus are still capitalized the same as the name of their respective traits, not including Mood Swings), but in general, they should all be grammaticized in the right places now.

Also renamed Diazepam Craving to Craving prescription sedatives, since DDA doesn't use trademark names for meds anymore.

Describe alternatives you've considered

  • Some of these might actually be unused. I wasn't sure, though, so I just updated all of them.
  • All of these could be capitalized in each word like a title instead of lowercased like a regular sentence, but I figured this would look strange. Anguished By Memories of Butchering a Human Corpse feels really awkward to read, at least to me, but Anguished by memories of butchering a human a human corpse doesn't!

Testing

Spawned in a bunch of stuff using debug to test various morale types. Murdered the poor starting NPC to make sure that that one worked correctly. I didn't test all of these since they're just string changes, but if requested, I'll totally make sure that all of them work.

Additional context

N/A

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Apr 12, 2022
@bombasticSlacks bombasticSlacks merged commit efc8ef5 into CleverRaven:master Apr 18, 2022
@Ilysen Ilysen deleted the morale-grammarification branch April 18, 2022 16:33
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 [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.

2 participants