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

fix practice recipes giving progress item #79278

Merged
merged 5 commits into from
Jan 23, 2025

Conversation

marilynias
Copy link
Contributor

@marilynias marilynias commented Jan 21, 2025

Summary

bugfixes "Allow nested recipes to delete the item, if they dont yield any results."

Purpose of change

Some practice recipes were giving in-progress items even though they didn't require components and yielded no items.
fix #79249
fix #75226

Describe the solution

Check if they require and produce no items, not if they are in the practice category.

Testing

Practice of those recipes now leaves no item if canceled. Normal recipe still leaves in-progress item.

Additional context

Practice recipes should be the only ones affected, but if some other recipes don't require and yield any items they are probably safe to delete aswell.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Melee Melee weapons, tactics, techniques, reach attack <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 21, 2025
Copy link
Contributor

@Karol1223 Karol1223 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While this fixes the issue, it just sweeps the actual problem under the rug.

These recipes should be allowed to remain as nested recipes. The underlying problem should be fixed in C++, not hidden. You didn't "assign actual categories" to them, you just unnested them.

@marilynias
Copy link
Contributor Author

While this fixes the issue, it just sweeps the actual problem under the rug.

These recipes should be allowed to remain as nested recipes. The underlying problem should be fixed in C++, not hidden. You didn't "assign actual categories" to them, you just unnested them.

Ah okay I misunderstood the categories, will fix in cpp

@github-actions github-actions bot added the [C++] Changes (can be) made in C++. Previously named `Code` label Jan 21, 2025
@marilynias marilynias requested a review from Karol1223 January 21, 2025 14:06
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 22, 2025
@marilynias
Copy link
Contributor Author

ready for re-review

@Karol1223
Copy link
Contributor

ready for re-review

For the record, since I feel like you're waiting for my review - you shouldn't. I know what gets accepted, I know the development direction, but I do NOT know C++. I could not tell you whether something you wrote fixes the bug or sends scam emails if I wanted to. You're gonna want someone who knows how to read for this one.

@marilynias
Copy link
Contributor Author

marilynias commented Jan 23, 2025

ready for re-review

For the record, since I feel like you're waiting for my review - you shouldn't. I know what gets accepted, I know the development direction, but I do NOT know C++. I could not tell you whether something you wrote fixes the bug or sends scam emails if I wanted to. You're gonna want someone who knows how to read for this one.

not entirely sure how the review system works, can you take back your requested changes, since they dont apply anymore? Or how do you change reviewer?

src/activity_actor.cpp Outdated Show resolved Hide resolved
marilynias and others added 2 commits January 23, 2025 12:15
formatting

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot removed the astyled astyled PR, label is assigned by github actions label Jan 23, 2025
@GuardianDll GuardianDll merged commit 13b002c into CleverRaven:master Jan 23, 2025
22 of 27 checks passed
@marilynias marilynias deleted the fix-practice branch January 23, 2025 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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` [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Melee Melee weapons, tactics, techniques, reach attack
Projects
None yet
3 participants