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

Extend/delete support for harvest lists #76047

Merged
merged 2 commits into from
Sep 1, 2024

Conversation

mqrause
Copy link
Contributor

@mqrause mqrause commented Aug 30, 2024

Summary

Infrastructure "Extend/delete support for harvest lists"

Purpose of change

Fixes #75958
Fixes #61525

Describe the solution

Add and use harvest_entry_reader. Readers apparently can't handle std::list containers, so I changed the harvest_list::entries_ member to std::vector.
Since the equality check for harvest entries only checks the drop member, giving that should be enough for delete.
Also changed the rabbit_with_skull harvest to copy-from mammal_small_fur and extend with the skull to test functionality.

Describe alternatives you've considered

Testing

Butchered a rabbit to check results.

Additional context

Result of full butchery of mon_rabbit
grafik

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Aug 30, 2024
@mqrause mqrause force-pushed the harvest_extend_delete branch from 4748cfa to ccde1a0 Compare August 30, 2024 10:25
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 30, 2024
@Karol1223
Copy link
Contributor

This solves #61525

@dseguin dseguin merged commit f59d7e9 into CleverRaven:master Sep 1, 2024
23 of 28 checks passed
@mqrause mqrause deleted the harvest_extend_delete branch September 1, 2024 12:49
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) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
3 participants