diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-10-31 21:20:11 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-10-31 21:20:11 +0100 |
| commit | 968c60580997d26035496cc675138e580354332f (patch) | |
| tree | a0340ae5e92e219c5e0f5ddc825e28465f22a29e /src/openvic-simulation/research/Invention.cpp | |
| parent | c6f7c8047abbe0a91b2a88365eee2259d8a91a65 (diff) | |
| parent | 84deeffe04d730064e89b4ceaf508f3f30113ea9 (diff) | |
Merge pull request #218 from OpenVicProject/condition-scripts-prep-work
Condition scripts prep work
Diffstat (limited to 'src/openvic-simulation/research/Invention.cpp')
| -rw-r--r-- | src/openvic-simulation/research/Invention.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/openvic-simulation/research/Invention.cpp b/src/openvic-simulation/research/Invention.cpp index 1076a62..4351337 100644 --- a/src/openvic-simulation/research/Invention.cpp +++ b/src/openvic-simulation/research/Invention.cpp @@ -62,6 +62,8 @@ bool InventionManager::load_inventions_file( inventions, [this, &modifier_manager, &unit_type_manager, &building_type_manager, &crime_manager]( std::string_view identifier, ast::NodeCPtr value ) -> bool { + using enum scope_type_t; + // TODO - use the same variable for all modifiers rather than combining them at the end? ModifierValue loose_modifiers; ModifierValue modifiers; @@ -74,8 +76,8 @@ bool InventionManager::load_inventions_file( bool unlock_gas_defence = false; bool news = true; //defaults to true! - ConditionScript limit { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::NO_SCOPE }; - ConditionalWeight chance { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::NO_SCOPE }; + ConditionScript limit { COUNTRY, COUNTRY, NO_SCOPE }; + ConditionalWeight chance { COUNTRY, COUNTRY, NO_SCOPE }; bool ret = NodeTools::expect_dictionary_keys_and_default( modifier_manager.expect_base_country_modifier(loose_modifiers), |