Sleep deprivation cleanup #37423
Merged
Sleep deprivation cleanup #37423
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
There wasn't really any reason for the melatonin tablet to have a separate iuse, instead of using the consume drug actor. The external option for sleep deprivation was also not very useful, and was removed as such. While converting the melatonin tablet to the consume drug iuse, I noticed it could not use time_duration strings, so I enabled the use of those for it. Making these changes trigerred test failures, so I made adjustments to the tests to fix those.
ZhilkinSerg
added
[C++]
ymber
approved these changes
Jan 27, 2020
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: None
Purpose of change
There wasn't really any reason for the melatonin tablet to have a separate iuse, instead of using the consume drug actor.
Because there no longer is a sleep deprivation mod, there is no longer a need for an external option toggling it.
While converting the melatonin tablet to the consume drug iuse, I noticed it could not use time_duration strings, so I enabled the use of those for it.
This caused tests to fail again, so I added more clearing of effects to prevent the test failures.
Describe the solution
Remove
MELATONIN_TABLETuse action.Remove
SLEEP_DEPRIVATIONexternal option.Remove unused code left after that.
Convert the melatonin tablet to the
consume_drug, iuse and make changes necessary toload_effect_datafor it to accept time durations.Clear fatigue and sleep deprivation when passing time in tests.
Testing
Tests run correctly.
Melatonin tablet applies melatonin effect.