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

manual labour doesn't make you sleepy #47512

Merged
merged 4 commits into from
Mar 25, 2021
Merged

manual labour doesn't make you sleepy #47512

merged 4 commits into from
Mar 25, 2021

Conversation

s7eamy
Copy link
Contributor

@s7eamy s7eamy commented Feb 14, 2021

Summary

Bugfixes "removed mod_fatigue(), mod_stored_nutr(), mod_thirst() calls from various activities"

Purpose of change

Fixes #47391

Describe the solution

by removing the functions calls, manual labour doesn't make you sleepy anymore

removed mod_fatigue(), mod_stored_nutr(), mod_thirst() calls from various activities
@anothersimulacrum anothersimulacrum added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` labels Feb 14, 2021
@lgtm-com
Copy link

lgtm-com bot commented Feb 15, 2021

This pull request introduces 1 alert when merging f1b6443 into 1e40b42 - view on LGTM.com

new alerts:

  • 1 for Empty branch of conditional

@s7eamy s7eamy changed the title manual labour doesn't make you sleepy [CR] manual labour doesn't make you sleepy Feb 15, 2021
@s7eamy
Copy link
Contributor Author

s7eamy commented Feb 16, 2021

what should I do about this test failing?

../tests/field_test.cpp:357: FAILED:
(~[slow] ~[.])=>	  CHECK( fields_test_duration() < time_limit )
(~[slow] ~[.])=>	with expansion:
Error: (~[slow] ~[.])=>	  {?} < {?}
(~[slow] ~[.])=>	with message:
(~[slow] ~[.])=>	  Terrain should be irradiated under 5 minutes

@actual-nh
Copy link
Contributor

actual-nh commented Feb 16, 2021

what should I do about this test failing?

Sigh... it isn't your doing; some of the fields tests have some randomness involved (whether something spreads to another tile, in this case), so they fail (probably more often than they should, but that's a matter for another PR - check out Aivean's comments in #46256 for a bit more background and #47218 for a couple thoughts on this).

@kevingranade
Copy link
Member

Looks good to me with or without the trog adjustment, just need a quick test to verify that these activities are still suitably exhausting after the adjustment.

decreases the pain a troglobite takes when mining with a pickaxe

Co-authored-by: actual-nh <[email protected]>
@actual-nh
Copy link
Contributor

actual-nh commented Mar 20, 2021

Looks like "CR" can be removed. @kevingranade: What is your definition of "adequately fatiguing"? I can get some exact data by running weary-type tests on the various activities in question (looking at things like stamina, fatigue, and morale as well as weariness via debug_weary_info).

@s7eamy s7eamy changed the title [CR] manual labour doesn't make you sleepy manual labour doesn't make you sleepy Mar 20, 2021
@ZhilkinSerg ZhilkinSerg merged commit 40e93dc into CleverRaven:master Mar 25, 2021
@s7eamy
Copy link
Contributor Author

s7eamy commented Mar 25, 2021

hey, this actually merged! thanks a lot for your help @actual-nh, i appreciate it a lot!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code`
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Manual labor makes you sleepy
5 participants