[CR] Add activity levels to recipes #42873
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anothersimulacrum
added
<Enhancement / Feature>
anothersimulacrum
force-pushed
the
recime
branch
3 times, most recently
from
eaeda34
to
6c9d895
Compare
|
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there: https://discourse.cataclysmdda.org/t/excessive-calorie-burn-while-cooking/24466/2 |
anothersimulacrum
force-pushed
the
recime
branch
from
6c9d895
to
d698a2b
Compare
anothersimulacrum
force-pushed
the
recime
branch
from
d698a2b
to
6cf7259
Compare
anothersimulacrum
force-pushed
the
recime
branch
2 times, most recently
from
c35e493
to
0787150
Compare
Any recipes using blacksmithing_standard are now BRISK_EXERCISE
Automatically change all recipes using forging to BRISK_EXERCISE
Change everything yet unchanged using welding_standard to be BRISK_EXERCISE.
Changed all recipes using soldering to MODERATE_EXERCISE if not already set.
Change all sewing recipes without an exercise value assigned to be LIGHT_EXERCISE
Change all recipes without an activity level using the metal sawing quality to MODERATE_EXERCISE
Change all recipes using wood sawing without an activity level to be MODERATE_EXERCISE
Change all recipes without an activity level using hammering to be MODERATE_EXERCISE
Change all mutagens recipe to be LIGHT_EXERCISE
Make all cooking recipes without activity level be LIGHT_EXERCISE
Convert all recipes without an activity level using boiling to be LIGHT_EXERCISE
Convert all recipes without an activity level that use chemistry to be LIGHT_EXERCISE
Change all recipes using the sew quality that do not already have an activity level to be LIGHT_EXERCISE
Change all chiseling recipes without an activity level to be MODERATE_EXERCISE
All the recipes which there was no easy data on.
These don't actually currently use it, just set it all to LIGHT_EXERCISE. None of them appear to have easy info to automate different changes on.
Some recipes that missed adjustment
Prevent potential unintended behavior and remove the hacks necessary for automation - make all recipes specify an activity level.
anothersimulacrum
force-pushed
the
recime
branch
from
0787150
to
5d2fa1b
Compare
This was referenced Sep 6, 2020
This was referenced Sep 13, 2020
|
We won't be merging this before 0.F (at least, I don't want to), and as is, I think it's just going to accumulate problems. I'll come back when 0.F is out. |
|
Perhaps move the project "card" for this from "in progress" for 0.F to 0.G blockers? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Features "Allow recipes to specify individual activity levels"
Purpose of change
Related to: #42343, #36976
With recent adjustments to activity levels, a problem came up: spending all day sewing is as intensive as spending all day making an anvil, or forging a set of armor.
So, to solve this, specify the activity level of a recipe in the recipe definition, and use that for activity level calculations.
This PR depends on #42794
This PR is NOT ready to merge, and probably never will be - what it currently has should be split out and done over many PRs.
Describe the solution
The real changes that this PR makes:
Allow activity actors in particular to specify and activity level, and access an activity's activity level through the associated player_activity, not the activity_type.
In recipes, when they are marked obsolete, skip loading all other members. This is because I intend to make
activity_levelmandatory for recipes, and it doesn't need to be specified in the obsolete recipe stubs.Add an activity_level member to recipes, and override the
exertion_level()function in the craft_activity_actor to return this.If this activity level is not specified, load it as
MODERATE_EXERCISE. Also allow it to be specified as 'fake', for easier automated changes of it to a proper level. When it is specified as 'fake', it is loaded asMODERATE_EXERCISE.I chose to specify it as 'fake' instead of just adding the key when it did not exist because it meant that I could easily position the activity_level to be near the result of the recipe, making it easier to review the changes.
Add an activity level to all recipes.
Remove the 'fake' hack, and make activity_level a mandatory member of recipes.
Describe alternatives you've considered
Not messing around with this 'fake' stuff, but it makes reviewing it easier, and it'd be fairly hard to back out now.
Testing
No errors on game load, all tests pass.
Crafting knives for 24 hours gives 24 hours of brisk exercise, sewing for 24 hours gives 24 hours of light exercise.
Additional context
While this does not correspond directly to any of the 0.E blocker issues, I'd like this to be merged (well, the parts of it I'll be PR-ing later) before 0.E to help with some of our exertion/calorie problems.