feat(skymp5-server): Recipe checks #1979
Open
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
OR is not supported to be exact
|
@Pospelove ready for review |
Pospelove
reviewed
May 20, 2024
|
|
||
| if (CalculateOperationResult(itemCount, condition.comparisonValue, | ||
| condition.GetOperator()) == false) { | ||
| if (condition.GetFlags() != espm::CTDA::Flags::OR || requireAnd) { |
There was a problem hiding this comment.
если надо проверить выставлен ли флаг, надо проверять так condition.GetFlags() & espm::CTDA::Flags::OR
There was a problem hiding this comment.
при таком сравнении для enum class сыпется ошибка, что нет такого оператора
Pospelove
requested changes
May 23, 2024
| @@ -456,8 +456,37 @@ void UseCraftRecipe(MpActor* me, const espm::COBJ* recipeUsed, | |||
| spdlog::info("Using craft recipe with EDID {} from espm file with index {}", | |||
| recipeUsed->GetEditorId(cache), espmIdx); | |||
|
|
|||
| std::vector<Condition*> conditions; | |||
There was a problem hiding this comment.
raw pointer detected 🤖
please use std::unique_ptr/std::shared_ptr instead
This is how we usually do it + I see incorrect delete logic which is much easier to replace than fix, re-review, etc
| bool requireAnd = false; | ||
| for (auto& cond : conditions) { | ||
| if (!cond->Evaluate(me)) { | ||
| if (cond->GetFlags() != espm::CTDA::Flags::OR || requireAnd) { |
There was a problem hiding this comment.
If we want checking if the flag is set, we have to use & instead of != no matter how:
static_cast<uint32_t>(cond->GetFlags()) & static_cast<uint32_t>(espm::CTDA::Flags::OR)
== and & is not the same. the first one will check that ALL flags are in the same state
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.
No description provided.