Change milking to an activity, restore udders on load catchup #37523
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
|
I feel slightly guilty for sending you off course into this rabbit hole and very thankful that you got it done. Don't have a equal/better understanding of the code than you to do a meaningful review of it but the milking time changes seem perfect. |
ghost
mentioned this pull request
codemime
reviewed
Jan 30, 2020
| @@ -548,6 +549,7 @@ class monster : public Creature | |||
| cata::optional<time_point> baby_timer; | |||
| bool biosignatures; | |||
| cata::optional<time_point> biosig_timer; | |||
| time_point udder_timer; | |||
There was a problem hiding this comment.
The previous approach (adding an effect) was sound. Can it still be used?
There was a problem hiding this comment.
Effects do not progress outside of the reality bubble.
There was a problem hiding this comment.
Isn't it fast-forwarded when the player re-enters the reality bubble. If it's not, I'd consider that a bug.
BevapDin
reviewed
Jan 30, 2020
BevapDin
reviewed
Jan 30, 2020
ZhilkinSerg
added
<Bugfix>
erroneous edit to mtype.h from review: use iterator instead of map directly add check for udders being empty in milk_finish add serialization for udder timer from review : const int and use iterator instead of map directly add checking for temp_tie effect removal Update src/activity_handlers.cpp Co-Authored-By: BevapDin <tho_ki@gmx.de>
This was referenced Feb 9, 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: Bugfixes "Change milking to an activity, restore udders on load catchup"Purpose of change
Fixes #36826
Describe the solution
Instead of subtracting moves and adding a timed effect to the cow, turn milking into an interruptable activity.
This now takes around 25 minutes in-game ( as per googling hand-milking cow time tells me ) but the real time it takes is around the same, as before subtracting movs just made the seconds tick by slowly.
also , the udders now refill every day, either oncatchup on load, or in reality bubble, which acts the same as the checking for the effect did in monexamine.cpp but is more robust now, and potentially ready for NPC milking activities in the future.
also added try_reproduce() and biosig ( poop ) to the monster do turn once_every( 1_days ) check, so now animals can poop and lay eggs whilst in reality bubble too.
Describe alternatives you've considered
N/A
Testing
I did a lot of milking, teleporting, and waiting. all seems ok.
Additional context
N/A