Adds RequiredCountryBuy for Crafts and Soldiers. #118
Conversation
| @@ -54,6 +54,22 @@ | |||
| namespace OpenXcom | |||
| { | |||
|
|
|||
| /** | |||
| * @brief Combines any number of functions into a functions that returns true if all of them are true. | |||
There was a problem hiding this comment.
"into a function" without the plural s
| template <typename... Functions> | ||
| inline constexpr auto allOf(Functions... funcs) | ||
| { | ||
| return [=](const auto &x) |
There was a problem hiding this comment.
Please left-align the * and &
In all new code.
I have also changed the clang format few days ago to help with this.
| @@ -159,12 +175,39 @@ PurchaseState::PurchaseState(Base *base, CannotReequipState *parent) : _base(bas | |||
| _cats.push_back("STR_FILTER_MISSING"); | |||
| } | |||
|
|
|||
| RuleBaseFacilityFunctions providedBaseFunc = _base->getProvidedBaseFunc({}); | |||
| auto providedBaseFunc = _base->getProvidedBaseFunc({}); | |||
There was a problem hiding this comment.
Please leave the explicit type name (RuleBaseFacilityFunctions).
I try to use auto only for pointers, references, lambdas, etc.
For simple ints, bools, etc. I try to avoid auto.
I also try to avoid auto when a copy is made; or where there is a chance of any confusion; or lack of specificity.
See 9a90fab
| }; | ||
| constexpr auto requiredCountryAllied = [](const auto *rule) | ||
| { | ||
| std::string_view requiredCountry = rule->getRequiresBuyCountry(); |
There was a problem hiding this comment.
This is OK, but we don't use std::string_view (yet).
Maybe replace with const std::string& just for the oldtimers :)
@Yankes any opinion on that?
| return true; | ||
| }; | ||
|
|
||
| auto standardFilter = allOf(costIsNotZero, requirementsAreResearched, necessaryBaseFunctionsPresent, requiredCountryAllied); |
There was a problem hiding this comment.
probably missing a function for item's "buy requirements"?
see below
or maybe something else was intended and forgotten...
| @@ -215,8 +257,7 @@ PurchaseState::PurchaseState(Base *base, CannotReequipState *parent) : _base(bas | |||
| for (auto& itemType : _game->getMod()->getItemsList()) | |||
| { | |||
| RuleItem *rule = _game->getMod()->getItem(itemType); | |||
| RuleBaseFacilityFunctions purchaseBaseFunc = rule->getRequiresBuyBaseFunc(); | |||
| if (rule->getBuyCost() != 0 && _game->getSavedGame()->isResearched(rule->getRequirements()) && _game->getSavedGame()->isResearched(rule->getBuyRequirements()) && (~providedBaseFunc & purchaseBaseFunc).none()) | |||
| if (standardFilter(rule)) | |||
There was a problem hiding this comment.
BUG:
_game->getSavedGame()->isResearched(rule->getBuyRequirements())
was incorrectly removed
| @@ -165,6 +165,7 @@ class RuleCraft | |||
| std::string _type; | |||
| std::vector<std::string> _requires; | |||
| RuleBaseFacilityFunctions _requiresBuyBaseFunc; | |||
| std::string _requiresBuyCountry; | |||
There was a problem hiding this comment.
add also to StatsForNerdsState::initCraftList()
|
Fixed and merged manually: 80c02c6 |
As the title says, it implements the feature requested here. It also adds the feature to craft. The filtering function is also reworked. The main improvement is that filtering for RequiredCountryBuy for items is processed when the items are added to the list, rather than whenever the list is updated. Also, the logic is centralized and standardized between Crafts, Soldiers, and Items.