Merge pull request #204 from OpenVicProject/fix-modifiers

Fix modifiers

5 files changed, 89 insertions, 13 deletions

diff --git a/src/openvic-simulation/politics/Issue.cpp b/src/openvic-simulation/politics/Issue.cpp
index 4a08dea..3174e23 100644
--- a/src/openvic-simulation/politics/Issue.cpp
+++ b/src/openvic-simulation/politics/Issue.cpp
@@ -7,8 +7,8 @@ IssueGroup::IssueGroup(std::string_view new_identifier) : HasIdentifier { new_id
 
 Issue::Issue(
 	std::string_view new_identifier, colour_t new_colour, ModifierValue&& new_values, IssueGroup const& new_group,
-	RuleSet&& new_rules, bool new_jingoism
-) : Modifier { new_identifier, std::move(new_values) }, HasColour { new_colour, false }, group { new_group },
+	RuleSet&& new_rules, bool new_jingoism, modifier_type_t new_type
+) : Modifier { new_identifier, std::move(new_values), new_type }, HasColour { new_colour, false }, group { new_group },
 	rules { std::move(new_rules) }, jingoism { new_jingoism } {}
 
 ReformType::ReformType(std::string_view new_identifier, bool new_uncivilised)
@@ -21,16 +21,19 @@ Reform::Reform(
 	std::string_view new_identifier, colour_t new_colour, ModifierValue&& new_values, ReformGroup const& new_group,
 	size_t new_ordinal, fixed_point_t new_administrative_multiplier, RuleSet&& new_rules, tech_cost_t new_technology_cost,
 	ConditionScript&& new_allow, ConditionScript&& new_on_execute_trigger, EffectScript&& new_on_execute_effect
-) : Issue { new_identifier, new_colour, std::move(new_values), new_group, std::move(new_rules), false },
-	reform_group { new_group }, ordinal { new_ordinal }, administrative_multiplier { new_administrative_multiplier },
+) : Issue {
+		new_identifier, new_colour, std::move(new_values), new_group, std::move(new_rules), false, modifier_type_t::REFORM
+	}, reform_group { new_group }, ordinal { new_ordinal }, administrative_multiplier { new_administrative_multiplier },
 	technology_cost { new_technology_cost }, allow { std::move(new_allow) },
 	on_execute_trigger { std::move(new_on_execute_trigger) }, on_execute_effect { std::move(new_on_execute_effect) } {}
 
 bool Reform::parse_scripts(DefinitionManager const& definition_manager) {
 	bool ret = true;
+
 	ret &= allow.parse_script(true, definition_manager);
 	ret &= on_execute_trigger.parse_script(true, definition_manager);
 	ret &= on_execute_effect.parse_script(true, definition_manager);
+
 	return ret;
 }
 
@@ -176,14 +179,17 @@ bool IssueManager::_load_issue(
 	ModifierValue values;
 	RuleSet rules;
 	bool jingoism = false;
+
 	bool ret = modifier_manager.expect_modifier_value_and_keys(move_variable_callback(values),
 		"is_jingoism", ZERO_OR_ONE, expect_bool(assign_variable_callback(jingoism)),
 		"rules", ZERO_OR_ONE, rule_manager.expect_rule_set(move_variable_callback(rules))
 	)(node);
+
 	ret &= add_issue(
 		identifier, create_issue_reform_colour(get_issue_count() + get_reform_count()), std::move(values), group,
 		std::move(rules), jingoism
 	);
+
 	return ret;
 }
 
@@ -191,12 +197,15 @@ bool IssueManager::_load_reform_group(
 	size_t& expected_reforms, std::string_view identifier, ReformType const* type, ast::NodeCPtr node
 ) {
 	bool ordered = false, administrative = false;
+
 	bool ret = expect_dictionary_keys_and_default(
 		increment_callback(expected_reforms),
 		"next_step_only", ZERO_OR_ONE, expect_bool(assign_variable_callback(ordered)),
 		"administrative", ZERO_OR_ONE, expect_bool(assign_variable_callback(administrative))
 	)(node);
+
 	ret &= add_reform_group(identifier, type, ordered, administrative);
+
 	return ret;
 }
 
@@ -223,11 +232,13 @@ bool IssueManager::_load_reform(
 			"effect", ONE_EXACTLY, on_execute_effect.expect_script()
 		)
 	)(node);
+
 	ret &= add_reform(
 		identifier, create_issue_reform_colour(get_issue_count() + get_reform_count()), std::move(values), group, ordinal,
 		administrative_multiplier, std::move(rules), technology_cost, std::move(allow), std::move(on_execute_trigger),
 		std::move(on_execute_effect)
 	);
+
 	return ret;
 }
 
@@ -272,6 +283,7 @@ bool IssueManager::load_issues_file(
 			}
 		}
 	)(root);
+
 	lock_reform_types();
 
 	reserve_more_issue_groups(expected_issue_groups);
@@ -306,6 +318,7 @@ bool IssueManager::load_issues_file(
 			}
 		}
 	)(root);
+
 	lock_issue_groups();
 	lock_reform_groups();
 
@@ -356,6 +369,7 @@ bool IssueManager::load_issues_file(
 			}
 		}
 	)(root);
+
 	lock_issues();
 	lock_reforms();
 
@@ -364,8 +378,10 @@ bool IssueManager::load_issues_file(
 
 bool IssueManager::parse_scripts(DefinitionManager const& definition_manager) {
 	bool ret = true;
+
 	for (Reform& reform : reforms.get_items()) {
 		ret &= reform.parse_scripts(definition_manager);
 	}
+
 	return ret;
 }
diff --git a/src/openvic-simulation/politics/Issue.hpp b/src/openvic-simulation/politics/Issue.hpp
index 9f2d842..c0ab86c 100644
--- a/src/openvic-simulation/politics/Issue.hpp
+++ b/src/openvic-simulation/politics/Issue.hpp
@@ -32,7 +32,7 @@ namespace OpenVic {
 	protected:
 		Issue(
 			std::string_view new_identifier, colour_t new_colour, ModifierValue&& new_values, IssueGroup const& new_group,
-			RuleSet&& new_rules, bool new_jingoism
+			RuleSet&& new_rules, bool new_jingoism, modifier_type_t new_type = modifier_type_t::ISSUE
 		);
 
 	public:
diff --git a/src/openvic-simulation/politics/NationalFocus.cpp b/src/openvic-simulation/politics/NationalFocus.cpp
index 3132c3e..4887ed6 100644
--- a/src/openvic-simulation/politics/NationalFocus.cpp
+++ b/src/openvic-simulation/politics/NationalFocus.cpp
@@ -1,6 +1,8 @@
 #include "NationalFocus.hpp"
 
+#include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
+#include "openvic-simulation/pop/Pop.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
@@ -12,20 +14,28 @@ NationalFocus::NationalFocus(
 	NationalFocusGroup const& new_group,
 	uint8_t new_icon,
 	bool new_has_flashpoint,
+	fixed_point_t new_flashpoint_tension,
 	bool new_own_provinces,
 	bool new_outliner_show_as_percent,
 	ModifierValue&& new_modifiers,
 	Ideology const* new_loyalty_ideology,
 	fixed_point_t new_loyalty_value,
+	fixed_point_t new_encourage_railroads,
+	fixed_point_map_t<GoodDefinition const*>&& new_encourage_goods,
+	fixed_point_map_t<PopType const*>&& new_encourage_pop_types,
 	ConditionScript&& new_limit
-) : Modifier { new_identifier, std::move(new_modifiers) },
+) : Modifier { new_identifier, std::move(new_modifiers), modifier_type_t::NATIONAL_FOCUS },
 	group { new_group },
 	icon { new_icon },
 	has_flashpoint { new_has_flashpoint },
+	flashpoint_tension { new_flashpoint_tension },
 	own_provinces { new_own_provinces },
 	outliner_show_as_percent { new_outliner_show_as_percent },
 	loyalty_ideology { new_loyalty_ideology },
 	loyalty_value { new_loyalty_value },
+	encourage_railroads { new_encourage_railroads },
+	encourage_goods { std::move(new_encourage_goods) },
+	encourage_pop_types { std::move(new_encourage_pop_types) },
 	limit { std::move(new_limit) } {}
 
 bool NationalFocus::parse_scripts(DefinitionManager const& definition_manager) {
@@ -37,6 +47,7 @@ inline bool NationalFocusManager::add_national_focus_group(std::string_view iden
 		Logger::error("No identifier for national focus group!");
 		return false;
 	}
+
 	return national_focus_groups.add_item({ identifier });
 }
 
@@ -45,30 +56,38 @@ inline bool NationalFocusManager::add_national_focus(
 	NationalFocusGroup const& group,
 	uint8_t icon,
 	bool has_flashpoint,
+	fixed_point_t flashpoint_tension,
 	bool own_provinces,
 	bool outliner_show_as_percent,
 	ModifierValue&& modifiers,
 	Ideology const* loyalty_ideology,
 	fixed_point_t loyalty_value,
+	fixed_point_t encourage_railroads,
+	fixed_point_map_t<GoodDefinition const*>&& encourage_goods,
+	fixed_point_map_t<PopType const*>&& encourage_pop_types,
 	ConditionScript&& limit
 ) {
 	if (identifier.empty()) {
 		Logger::error("No identifier for national focus!");
 		return false;
 	}
+
 	if (icon < 1) {
 		Logger::error("Invalid icon ", icon, " for national focus ", identifier);
 		return false;
 	}
+
 	if ((loyalty_ideology == nullptr) != (loyalty_value == 0)) {
 		Logger::warning(
 			"Party loyalty incorrectly defined for national focus ", identifier, ": ideology = ", loyalty_ideology,
 			", value = ", loyalty_value
 		);
 	}
+
 	return national_foci.add_item({
-		identifier, group, icon, has_flashpoint, own_provinces, outliner_show_as_percent, std::move(modifiers),
-		loyalty_ideology, loyalty_value, std::move(limit)
+		identifier, group, icon, has_flashpoint, flashpoint_tension, own_provinces, outliner_show_as_percent,
+		std::move(modifiers), loyalty_ideology, loyalty_value, encourage_railroads, std::move(encourage_goods),
+		std::move(encourage_pop_types), std::move(limit)
 	});
 }
 
@@ -77,12 +96,14 @@ bool NationalFocusManager::load_national_foci_file(
 	GoodDefinitionManager const& good_definition_manager, ModifierManager const& modifier_manager, ast::NodeCPtr root
 ) {
 	size_t expected_national_foci = 0;
+
 	bool ret = expect_dictionary_reserve_length(
 		national_focus_groups,
 		[this, &expected_national_foci](std::string_view identifier, ast::NodeCPtr node) -> bool {
 			return expect_length(add_variable_callback(expected_national_foci))(node) & add_national_focus_group(identifier);
 		}
 	)(root);
+
 	lock_national_focus_groups();
 
 	reserve_more_national_foci(expected_national_foci);
@@ -97,29 +118,51 @@ bool NationalFocusManager::load_national_foci_file(
 				) -> bool {
 					uint8_t icon = 0;
 					bool has_flashpoint = false, own_provinces = true, outliner_show_as_percent = false;
+					fixed_point_t flashpoint_tension = 0;
 					ModifierValue modifiers;
 					Ideology const* loyalty_ideology = nullptr;
 					fixed_point_t loyalty_value = 0;
+					fixed_point_t encourage_railroads = 0;
+					fixed_point_map_t<GoodDefinition const*> encourage_goods;
+					fixed_point_map_t<PopType const*> encourage_pop_types;
 					ConditionScript limit {
 						scope_t::PROVINCE | scope_t::COUNTRY, scope_t::PROVINCE | scope_t::COUNTRY, scope_t::NO_SCOPE
 					};
 
-					bool ret = modifier_manager.expect_modifier_value_and_keys(
+					bool ret = modifier_manager.expect_modifier_value_and_keys_and_default(
 						move_variable_callback(modifiers),
+						[&good_definition_manager, &encourage_goods, &pop_manager, &encourage_pop_types](
+							std::string_view key, ast::NodeCPtr value
+						) -> bool {
+							GoodDefinition const* good = good_definition_manager.get_good_definition_by_identifier(key);
+							if (good != nullptr) {
+								return expect_fixed_point(map_callback(encourage_goods, good))(value);
+							}
+
+							PopType const* pop_type = pop_manager.get_pop_type_by_identifier(key);
+							if (pop_type != nullptr) {
+								return expect_fixed_point(map_callback(encourage_pop_types, pop_type))(value);
+							}
+
+							return key_value_invalid_callback(key, value);
+						},
 						"icon", ONE_EXACTLY, expect_uint(assign_variable_callback(icon)),
 						"ideology", ZERO_OR_ONE,
 							ideology_manager.expect_ideology_identifier(assign_variable_callback_pointer(loyalty_ideology)),
 						"loyalty_value", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(loyalty_value)),
 						"limit", ZERO_OR_ONE, limit.expect_script(),
 						"has_flashpoint", ZERO_OR_ONE, expect_bool(assign_variable_callback(has_flashpoint)),
+						"flashpoint_tension", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(flashpoint_tension)),
 						"own_provinces", ZERO_OR_ONE, expect_bool(assign_variable_callback(own_provinces)),
 						"outliner_show_as_percent", ZERO_OR_ONE,
-							expect_bool(assign_variable_callback(outliner_show_as_percent))
+							expect_bool(assign_variable_callback(outliner_show_as_percent)),
+						"railroads", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(encourage_railroads))
 					)(node);
 
 					ret &= add_national_focus(
-						identifier, group, icon, has_flashpoint, own_provinces, outliner_show_as_percent, std::move(modifiers),
-						loyalty_ideology, loyalty_value, std::move(limit)
+						identifier, group, icon, has_flashpoint, flashpoint_tension, own_provinces, outliner_show_as_percent,
+						std::move(modifiers), loyalty_ideology, loyalty_value, encourage_railroads,
+						std::move(encourage_goods), std::move(encourage_pop_types), std::move(limit)
 					);
 
 					return ret;
@@ -127,6 +170,7 @@ bool NationalFocusManager::load_national_foci_file(
 			)(group_node);
 		}
 	)(root);
+
 	lock_national_foci();
 
 	return ret;
@@ -134,8 +178,10 @@ bool NationalFocusManager::load_national_foci_file(
 
 bool NationalFocusManager::parse_scripts(DefinitionManager const& definition_manager) {
 	bool ret = true;
+
 	for (NationalFocus& national_focus : national_foci.get_items()) {
 		ret &= national_focus.parse_scripts(definition_manager);
 	}
+
 	return ret;
 }
diff --git a/src/openvic-simulation/politics/NationalFocus.hpp b/src/openvic-simulation/politics/NationalFocus.hpp
index 327b25b..e046c7a 100644
--- a/src/openvic-simulation/politics/NationalFocus.hpp
+++ b/src/openvic-simulation/politics/NationalFocus.hpp
@@ -16,6 +16,8 @@ namespace OpenVic {
 	};
 
 	struct Ideology;
+	struct GoodDefinition;
+	struct PopType;
 
 	struct NationalFocus : Modifier {
 		friend struct NationalFocusManager;
@@ -24,10 +26,14 @@ namespace OpenVic {
 		NationalFocusGroup const& PROPERTY(group);
 		uint8_t PROPERTY(icon);
 		bool PROPERTY(has_flashpoint);
+		fixed_point_t PROPERTY(flashpoint_tension);
 		bool PROPERTY(own_provinces);
 		bool PROPERTY(outliner_show_as_percent);
 		Ideology const* PROPERTY(loyalty_ideology);
 		fixed_point_t PROPERTY(loyalty_value);
+		fixed_point_t PROPERTY(encourage_railroads);
+		fixed_point_map_t<GoodDefinition const*> PROPERTY(encourage_goods);
+		fixed_point_map_t<PopType const*> PROPERTY(encourage_pop_types);
 		ConditionScript PROPERTY(limit);
 
 		NationalFocus(
@@ -35,11 +41,15 @@ namespace OpenVic {
 			NationalFocusGroup const& new_group,
 			uint8_t new_icon,
 			bool new_has_flashpoint,
+			fixed_point_t new_flashpoint_tension,
 			bool new_own_provinces,
 			bool new_outliner_show_as_percent,
 			ModifierValue&& new_modifiers,
 			Ideology const* new_loyalty_ideology,
 			fixed_point_t new_loyalty_value,
+			fixed_point_t new_encourage_railroads,
+			fixed_point_map_t<GoodDefinition const*>&& new_encourage_goods,
+			fixed_point_map_t<PopType const*>&& new_encourage_pop_types,
 			ConditionScript&& new_limit
 		);
 
@@ -66,11 +76,15 @@ namespace OpenVic {
 			NationalFocusGroup const& group,
 			uint8_t icon,
 			bool has_flashpoint,
+			fixed_point_t flashpoint_tension,
 			bool own_provinces,
 			bool outliner_show_as_percent,
 			ModifierValue&& modifiers,
 			Ideology const* loyalty_ideology,
 			fixed_point_t loyalty_value,
+			fixed_point_t encourage_railroads,
+			fixed_point_map_t<GoodDefinition const*>&& encourage_goods,
+			fixed_point_map_t<PopType const*>&& encourage_pop_types,
 			ConditionScript&& limit
 		);
 
diff --git a/src/openvic-simulation/politics/NationalValue.cpp b/src/openvic-simulation/politics/NationalValue.cpp
index b780195..e9f7f2a 100644
--- a/src/openvic-simulation/politics/NationalValue.cpp
+++ b/src/openvic-simulation/politics/NationalValue.cpp
@@ -4,7 +4,7 @@ using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
 NationalValue::NationalValue(std::string_view new_identifier, ModifierValue&& new_modifiers)
-	: Modifier { new_identifier, std::move(new_modifiers) } {}
+	: Modifier { new_identifier, std::move(new_modifiers), modifier_type_t::NATIONAL_VALUE } {}
 
 bool NationalValueManager::add_national_value(std::string_view identifier, ModifierValue&& modifiers) {
 	if (identifier.empty()) {