Store national focus encouragement in specific variables rather than modifier effects

1 files changed, 14 insertions, 0 deletions

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
 		);