Merge pull request #198 from OpenVicProject/resultant-modifier

Calculate country and province modifier sums

3 files changed, 92 insertions, 31 deletions

diff --git a/src/openvic-simulation/economy/BuildingType.cpp b/src/openvic-simulation/economy/BuildingType.cpp
index e7c0d59..a21361f 100644
--- a/src/openvic-simulation/economy/BuildingType.cpp
+++ b/src/openvic-simulation/economy/BuildingType.cpp
@@ -1,5 +1,7 @@
 #include "BuildingType.hpp"
 
+#include "openvic-simulation/modifier/ModifierManager.hpp"
+
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
@@ -59,9 +61,13 @@ bool BuildingTypeManager::load_buildings_file(
 		building_types, [this, &good_definition_manager, &production_type_manager, &modifier_manager](
 			std::string_view key, ast::NodeCPtr value
 		) -> bool {
+			using enum Modifier::modifier_type_t;
+
 			BuildingType::building_type_args_t building_type_args {};
 
-			bool ret = modifier_manager.expect_modifier_value_and_keys(move_variable_callback(building_type_args.modifier),
+			bool ret = modifier_manager.expect_modifier_value_and_keys(
+				move_variable_callback(building_type_args.modifier),
+				BUILDING,
 				"type", ONE_EXACTLY, expect_identifier(assign_variable_callback(building_type_args.type)),
 				"on_completion", ZERO_OR_ONE, expect_identifier(assign_variable_callback(building_type_args.on_completion)),
 				"completion_size", ZERO_OR_ONE,
@@ -112,18 +118,27 @@ bool BuildingTypeManager::load_buildings_file(
 	)(root);
 	lock_building_types();
 
-	for (BuildingType const& building_type : building_types.get_items()) {
+	IndexedMap<BuildingType, ModifierEffectCache::building_type_effects_t>& building_type_effects =
+		modifier_manager.modifier_effect_cache.building_type_effects;
+
+	building_type_effects.set_keys(&get_building_types());
+
+	for (BuildingType const& building_type : get_building_types()) {
 		using enum ModifierEffect::format_t;
+		using enum ModifierEffect::target_t;
+
+		ModifierEffectCache::building_type_effects_t& this_building_type_effects = building_type_effects[building_type];
 
 		static constexpr std::string_view max_prefix = "max_";
 		static constexpr std::string_view min_prefix = "min_build_";
 		ret &= modifier_manager.add_modifier_effect(
-			StringUtils::append_string_views(max_prefix, building_type.get_identifier()), true, INT,
-			StringUtils::append_string_views("$", building_type.get_identifier(), "$ $TECH_MAX_LEVEL$")
+			this_building_type_effects.max_level, StringUtils::append_string_views(max_prefix, building_type.get_identifier()),
+			true, INT, PROVINCE, StringUtils::append_string_views("$", building_type.get_identifier(), "$ $TECH_MAX_LEVEL$")
 		);
 		// TODO - add custom localisation for "min_build_$building_type$" modifiers
 		ret &= modifier_manager.add_modifier_effect(
-			StringUtils::append_string_views(min_prefix, building_type.get_identifier()), false, INT
+			this_building_type_effects.min_level, StringUtils::append_string_views(min_prefix, building_type.get_identifier()),
+			false, INT, PROVINCE
 		);
 
 		if (building_type.is_in_province()) {
diff --git a/src/openvic-simulation/economy/GoodDefinition.cpp b/src/openvic-simulation/economy/GoodDefinition.cpp
index ed24549..f8bd9b7 100644
--- a/src/openvic-simulation/economy/GoodDefinition.cpp
+++ b/src/openvic-simulation/economy/GoodDefinition.cpp
@@ -1,5 +1,7 @@
 #include "GoodDefinition.hpp"
 
+#include "openvic-simulation/modifier/ModifierManager.hpp"
+
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
@@ -89,39 +91,82 @@ bool GoodDefinitionManager::load_goods_file(ast::NodeCPtr root) {
 
 bool GoodDefinitionManager::generate_modifiers(ModifierManager& modifier_manager) const {
 	using enum ModifierEffect::format_t;
+	using enum ModifierEffect::target_t;
+
+	IndexedMap<GoodDefinition, ModifierEffectCache::good_effects_t>& good_effects =
+		modifier_manager.modifier_effect_cache.good_effects;
+
+	good_effects.set_keys(&get_good_definitions());
 
 	bool ret = true;
 
-	const auto good_modifier = [this, &modifier_manager, &ret](
-		std::string_view name, bool is_positive_good, auto make_localisation_suffix
-	) -> void {
-		ret &= modifier_manager.register_complex_modifier(name);
+	ret &= modifier_manager.register_complex_modifier("artisan_goods_input");
+	ret &= modifier_manager.register_complex_modifier("artisan_goods_output");
+	ret &= modifier_manager.register_complex_modifier("artisan_goods_throughput");
+	ret &= modifier_manager.register_complex_modifier("factory_goods_input");
+	ret &= modifier_manager.register_complex_modifier("factory_goods_output");
+	ret &= modifier_manager.register_complex_modifier("factory_goods_throughput");
+	ret &= modifier_manager.register_complex_modifier("rgo_goods_output");
+	ret &= modifier_manager.register_complex_modifier("rgo_goods_throughput");
+	ret &= modifier_manager.register_complex_modifier("rgo_size");
 
-		for (GoodDefinition const& good : get_good_definitions()) {
+	for (GoodDefinition const& good : get_good_definitions()) {
+		const std::string_view good_identifier = good.get_identifier();
+		ModifierEffectCache::good_effects_t& this_good_effects = good_effects[good];
+
+		const auto good_modifier = [&modifier_manager, &ret, &good_identifier](
+			ModifierEffect const*& effect_cache, std::string_view name, bool is_positive_good,
+			std::string_view localisation_key
+		) -> void {
 			ret &= modifier_manager.add_modifier_effect(
-				ModifierManager::get_flat_identifier(name, good.get_identifier()), is_positive_good, PROPORTION_DECIMAL,
-				make_localisation_suffix(good.get_identifier())
+				effect_cache, ModifierManager::get_flat_identifier(name, good_identifier), is_positive_good,
+				PROPORTION_DECIMAL, COUNTRY, localisation_key
 			);
-		}
-	};
+		};
 
-	const auto make_production_localisation_suffix = [](std::string_view localisation_suffix) -> auto {
-		return [localisation_suffix](std::string_view good_identifier) -> std::string {
-			return StringUtils::append_string_views("$", good_identifier,  "$ $", localisation_suffix, "$");
+		const auto make_production_localisation_suffix = [&good_identifier](
+			std::string_view localisation_suffix
+		) -> std::string {
+			return StringUtils::append_string_views("$", good_identifier, "$ $", localisation_suffix, "$");
 		};
-	};
-
-	good_modifier("artisan_goods_input", false, make_production_localisation_suffix("TECH_INPUT"));
-	good_modifier("artisan_goods_output", true, make_production_localisation_suffix("TECH_OUTPUT"));
-	good_modifier("artisan_goods_throughput", true, make_production_localisation_suffix("TECH_THROUGHPUT"));
-	good_modifier("factory_goods_input", false, make_production_localisation_suffix("TECH_INPUT"));
-	good_modifier("factory_goods_output", true, make_production_localisation_suffix("TECH_OUTPUT"));
-	good_modifier("factory_goods_throughput", true, make_production_localisation_suffix("TECH_THROUGHPUT"));
-	good_modifier("rgo_goods_output", true, make_production_localisation_suffix("TECH_OUTPUT"));
-	good_modifier("rgo_goods_throughput", true, make_production_localisation_suffix("TECH_THROUGHPUT"));
-	good_modifier("rgo_size", true, [](std::string_view good_identifier) -> std::string {
-		return StringUtils::append_string_views(good_identifier, "_RGO_SIZE");
-	});
+
+		good_modifier(
+			this_good_effects.artisan_goods_input, "artisan_goods_input", false,
+			make_production_localisation_suffix("TECH_INPUT")
+		);
+		good_modifier(
+			this_good_effects.artisan_goods_output, "artisan_goods_output", true,
+			make_production_localisation_suffix("TECH_OUTPUT")
+		);
+		good_modifier(
+			this_good_effects.artisan_goods_throughput, "artisan_goods_throughput", true,
+			make_production_localisation_suffix("TECH_THROUGHPUT")
+		);
+		good_modifier(
+			this_good_effects.factory_goods_input, "factory_goods_input", false,
+			make_production_localisation_suffix("TECH_INPUT")
+		);
+		good_modifier(
+			this_good_effects.factory_goods_output, "factory_goods_output", true,
+			make_production_localisation_suffix("TECH_OUTPUT")
+		);
+		good_modifier(
+			this_good_effects.factory_goods_throughput, "factory_goods_throughput", true,
+			make_production_localisation_suffix("TECH_THROUGHPUT")
+		);
+		good_modifier(
+			this_good_effects.rgo_goods_output, "rgo_goods_output", true,
+			make_production_localisation_suffix("TECH_OUTPUT")
+		);
+		good_modifier(
+			this_good_effects.rgo_goods_throughput, "rgo_goods_throughput", true,
+			make_production_localisation_suffix("TECH_THROUGHPUT")
+		);
+		good_modifier(
+			this_good_effects.rgo_size, "rgo_size", true,
+			StringUtils::append_string_views(good_identifier, "_RGO_SIZE")
+		);
+	}
 
 	return ret;
 }
diff --git a/src/openvic-simulation/economy/GoodDefinition.hpp b/src/openvic-simulation/economy/GoodDefinition.hpp
index bc231cb..823c1a3 100644
--- a/src/openvic-simulation/economy/GoodDefinition.hpp
+++ b/src/openvic-simulation/economy/GoodDefinition.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "openvic-simulation/modifier/Modifier.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 
 namespace OpenVic {
@@ -51,6 +50,8 @@ namespace OpenVic {
 		GoodDefinition(GoodDefinition&&) = default;
 	};
 
+	struct ModifierManager;
+
 	struct GoodDefinitionManager {
 	private:
 		IdentifierRegistry<GoodCategory> IDENTIFIER_REGISTRY_CUSTOM_PLURAL(good_category, good_categories);