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

Rename fatigue to sleepiness #72708

Merged
merged 14 commits into from
Apr 5, 2024
Merged

Conversation

I-am-Erk
Copy link
Member

@I-am-Erk I-am-Erk commented Mar 30, 2024

Summary

Infrastructure "Rename 'fatigue' to 'sleepiness', mostly on the back end, to avoid confusing different ways of being knackered"

Purpose of change

Part of #59858, see that issue for more details. Basically, we are modeling a lot of things already that are different ways of exhausting physical and mental resources: stamina, fatigue, weariness, focus... it gets very confusing, and unfortunately I really want to add one more. I think before doing that, we should try to do what we can to make it harder to confuse these things for each other.

Venera is more of an expert on airways than me and doesn't want me to name 'stamina' into 'breath' so I guess let's say:

closes #59858

Describe the solution

Renames "fatigue", which is very vague and describes anything from "my arms are tired" to "I need to sleep" to "that steel support is going to give way", into "sleepiness", which isn't my favourite term - it is a bit clunky - but should be hard to confuse for anything else.

This is the result of a large find-and-replace. i have tried to read through every change and make sure I didn't miss anything, but it definitely needs another look-over by someone else. I have made sure we didn't describe someone as wearing 'combat sleepiness', and in most descriptive text I've kept the word 'fatigue' unless I'm certain it's talking about need for sleep alone.

Also renamed fd_fatigue to fd_reality_tear, which may cause a json error or two, but I think is worth it for the clarity in code.

Describe alternatives you've considered

I considered 'drowsiness' as another option. I considered calling it just 'sleep' or 'sleepy' but they don't fit the structure we're using it in. "mod_sleepy" sounds stupid and unintuitive as a method.

Testing

The game compiles and runs without error

Additional context

I am fairly sure this is going to break something, but I haven't figured out what yet.

I feel like this is going to break some stuff?
@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. NPC / Factions NPCs, AI, Speech, Factions, Ownership Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON Bionics CBM (Compact Bionic Modules) labels Mar 30, 2024
@github-actions github-actions bot requested a review from dseguin March 30, 2024 05:29
@github-actions github-actions bot added Map / Mapgen Overmap, Mapgen, Map extras, Map display Items: Food / Vitamins Comestibles and drinks labels Mar 30, 2024
@github-actions github-actions bot added the Crafting / Construction / Recipes Includes: Uncrafting / Disassembling label Mar 30, 2024
@github-actions github-actions bot requested a review from KorGgenT March 30, 2024 05:29
@github-actions github-actions bot added Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies labels Mar 30, 2024
@github-actions github-actions bot added Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [Markdown] Markdown issues and PRs Player Faction Base / Camp All about the player faction base/camp/site Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Aftershock Anything to do with the Aftershock mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Items: Containers Things that hold other things Mechanics: Enchantments / Spells Enchantments and spells Mods: No Hope Relating to the mod No Hope Game: Defense Mode Special game mode, only accessible via main menu EOC: Effects On Condition Anything concerning Effects On Condition Mods: Xedra Evolved Anything to do with Xedra Evolved labels Mar 30, 2024
@I-am-Erk I-am-Erk marked this pull request as ready for review March 30, 2024 06:03
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @bombasticSlacks

@IdleSol
Copy link

IdleSol commented Mar 30, 2024

Did you forget about the documentation? Or in a separate PR?

@I-am-Erk
Copy link
Member Author

Ugh. Forgot about it, thanks for the reminder

This comment was marked as outdated.

@IdleSol
Copy link

IdleSol commented Mar 30, 2024

data/json/ui/fatigue.json --> data/json/ui/sleepiness.json ?

also catches a few bad f+r I missed
@I-am-Erk
Copy link
Member Author

good catch, thanks idlesol

@Standing-Storm
Copy link
Contributor

Is renaming the field fd_fatigue (aka Tears in Reality) to fd_sleepiness (plus related things like mongroups etc) intended?

@I-am-Erk
Copy link
Member Author

I had assumed the field was causing fatigue, but if it's supposed to be something else we should probably give it a different name entirely.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 31, 2024
@github-actions github-actions bot removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 31, 2024
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Apr 2, 2024
I really thought I got these already gr.
doc/MAGIC.md Outdated Show resolved Hide resolved
@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) BasicBuildPassed This PR builds correctly, label assigned by github actions labels Apr 3, 2024
@Maleclypse Maleclypse merged commit 0898a35 into CleverRaven:master Apr 5, 2024
27 checks passed
@I-am-Erk I-am-Erk deleted the fatigue-rename branch April 5, 2024 02:06
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 Bionics CBM (Compact Bionic Modules) <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Documentation> Design documents, internal info, guides and help. EOC: Effects On Condition Anything concerning Effects On Condition Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Game: Defense Mode Special game mode, only accessible via main menu Info / User Interface Game - player communication, menus, etc. Items: Containers Things that hold other things Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display [Markdown] Markdown issues and PRs Mechanics: Enchantments / Spells Enchantments and spells Mods: Aftershock Anything to do with the Aftershock mod Mods: Bombastic Perks Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: No Hope Relating to the mod No Hope Mods: Xedra Evolved Anything to do with Xedra Evolved Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership Player Faction Base / Camp All about the player faction base/camp/site Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename fatigue and stamina to allow expansion of terms
4 participants