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

Fixed camp trapping #55478

Merged
merged 10 commits into from
Feb 21, 2022
Merged

Conversation

PatrikLundell
Copy link
Contributor

@PatrikLundell PatrikLundell commented Feb 18, 2022

Summary

None

Purpose of change

Fix bug introduced in previous PR (ordering trapping resulted in foraging).

Describe the solution

Replaced "Foraging" with "Trapping" in three places.

Describe alternatives you've considered

Wait until the next rework PR is done.

Testing

Sent companion to trap small animals before the change and saw it resulted in foraging. Fixed the bug and tried again. Saw trapping actually resulted in trapping, including the returned items were actually dead animals (the beaver only temporarily so...).

Additional context

Both foraging and trapping results in double return entries on the bulletin board, and this PR does nothing to address that. My current theory is that it probably happens with tasks that can be ordered both from the base camp and from an expansion (in my case the kitchen), but it hasn't been verified. I consider that to be an annoyance that's better dealt with after the next rework of the faction camp mess, when the code might be slightly less incomprehensible.

I'd be grateful if this PR was reviewed without waiting for the RNGs to happen to generate a successful test run, as it's rather cumbersome to trigger new tests from this branch as it's used for the next rework step.

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Feb 18, 2022
@PatrikLundell
Copy link
Contributor Author

As expected General build matrix / GCC 9, Curses, LTO (pull_request) fails due to tests unrelated to this PR:
../tests/coverage_test.cpp:42: FAILED:
(~[slow] [.],starting_items)=> CHECK_FALSE( actual == Approx( undesired ).margin( tolerance ) )
(
[slow] [.],starting_items)=> with expansion:
Error: (
[slow] ~[.],starting_items)=> !(5.9258f == Approx( 6.0 ))

@Maleclypse Maleclypse added Missions Quests and missions Player Faction Base / Camp All about the player faction base/camp/site <Bugfix> This is a fix for a bug (or closes open issue) labels Feb 18, 2022
@ZhilkinSerg ZhilkinSerg merged commit f5cd415 into CleverRaven:master Feb 21, 2022
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 <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions Missions Quests and missions Player Faction Base / Camp All about the player faction base/camp/site
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants