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/military/Unit.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/openvic-simulation/military/Unit.cpp') diff --git a/src/openvic-simulation/military/Unit.cpp b/src/openvic-simulation/military/Unit.cpp index 7995aeb..ed3d37b 100644 --- a/src/openvic-simulation/military/Unit.cpp +++ b/src/openvic-simulation/military/Unit.cpp @@ -191,12 +191,11 @@ bool UnitManager::load_unit_file(GoodManager const& good_manager, ast::NodeCPtr } #define STAT_MODIFIER(name, positive_good, format) \ - ret &= modifier_manager.add_modifier_effect(base_name + name, positive_good, ModifierEffect::format_t::format) + ret &= modifier_manager.add_modifier_effect(StringUtils::append_string_views(identifier, "_", name), positive_good, ModifierEffect::format_t::format) bool UnitManager::generate_modifiers(ModifierManager& modifier_manager) { std::function generate_stat_modifiers = [this, &modifier_manager](std::string_view identifier, Unit::type_t type) -> bool { modifier_manager.register_complex_modifier(identifier); - std::string base_name = std::string(identifier) + "_"; bool ret = true; STAT_MODIFIER("default_organisation", true, RAW_DECIMAL); @@ -237,4 +236,6 @@ bool UnitManager::generate_modifiers(ModifierManager& modifier_manager) { ret &= generate_stat_modifiers(unit.get_identifier(), unit.get_type()); return ret; -} \ No newline at end of file +} + +#undef STAT_MODIFIER \ No newline at end of file -- cgit v1.2.3-56-ga3b1