From fa2ca50905f327713207069cf9a2e66cf6c00076 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Tue, 5 Dec 2023 10:16:27 +0100 Subject: feat: implemented invention dataloading --- src/openvic-simulation/economy/Good.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/openvic-simulation/economy') diff --git a/src/openvic-simulation/economy/Good.cpp b/src/openvic-simulation/economy/Good.cpp index 2aa5d42..02c4f0b 100644 --- a/src/openvic-simulation/economy/Good.cpp +++ b/src/openvic-simulation/economy/Good.cpp @@ -99,16 +99,20 @@ bool GoodManager::load_goods_file(ast::NodeCPtr root) { #define GOOD_MODIFIER(name) \ modifier_manager.register_complex_modifier(name); \ for (Good const& good : this->get_goods()) { \ - std::string modifier_name = name; \ - modifier_name += "_"; \ - modifier_name += good.get_identifier(); \ - ret &= modifier_manager.add_modifier_effect(modifier_name, true, ModifierEffect::format_t::PROPORTION_DECIMAL); \ + ret &= modifier_manager.add_modifier_effect( \ + StringUtils::append_string_views(name, "_", good.get_identifier()), \ + true, \ + ModifierEffect::format_t::PROPORTION_DECIMAL \ + ); \ } bool GoodManager::generate_modifiers(ModifierManager& modifier_manager) { bool ret = true; GOOD_MODIFIER("factory_goods_output"); + GOOD_MODIFIER("factory_goods_throughput"); GOOD_MODIFIER("rgo_goods_output"); GOOD_MODIFIER("rgo_size"); return ret; -} \ No newline at end of file +} + +#undef GOOD_MODIFIER \ No newline at end of file -- cgit v1.2.3-56-ga3b1