diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-01-12 20:44:55 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-01-12 20:44:55 +0100 |
| commit | e79d3e0416e62883c697225b090d03abafc7bb30 (patch) | |
| tree | db11a1c0c0829bb5af6135f855b2af3f6ea095be /src/openvic-simulation/politics/NationalFocus.hpp | |
| parent | 6301a3e47a1a36dd926f7819e9c4c9244851fb0b (diff) | |
| parent | 518ab7b436dcaa2e93eb06cdf9b1e0d17b2113ff (diff) | |
Merge pull request #127 from OpenVicProject/national-focus-modifiers
Added NationalFocus ModifierEffects + bool variables
Diffstat (limited to 'src/openvic-simulation/politics/NationalFocus.hpp')
| -rw-r--r-- | src/openvic-simulation/politics/NationalFocus.hpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/openvic-simulation/politics/NationalFocus.hpp b/src/openvic-simulation/politics/NationalFocus.hpp index 6e064f1..e1bf937 100644 --- a/src/openvic-simulation/politics/NationalFocus.hpp +++ b/src/openvic-simulation/politics/NationalFocus.hpp @@ -21,27 +21,25 @@ namespace OpenVic { struct NationalFocus : HasIdentifier { friend struct NationalFocusManager; - public: - using pop_promotion_map_t = fixed_point_map_t<PopType const*>; - using production_map_t = fixed_point_map_t<Good const*>; - private: - uint8_t PROPERTY(icon); NationalFocusGroup const& PROPERTY(group); + uint8_t PROPERTY(icon); + bool PROPERTY(has_flashpoint); + bool PROPERTY(own_provinces); + bool PROPERTY(outliner_show_as_percent); ModifierValue PROPERTY(modifiers); - pop_promotion_map_t PROPERTY(encouraged_promotion); - production_map_t PROPERTY(encouraged_production); Ideology const* PROPERTY(loyalty_ideology); fixed_point_t PROPERTY(loyalty_value); ConditionScript PROPERTY(limit); NationalFocus( std::string_view new_identifier, - uint8_t new_icon, NationalFocusGroup const& new_group, + uint8_t new_icon, + bool new_has_flashpoint, + bool new_own_provinces, + bool new_outliner_show_as_percent, ModifierValue&& new_modifiers, - pop_promotion_map_t&& new_encouraged_promotion, - production_map_t&& new_encouraged_production, Ideology const* new_loyalty_ideology, fixed_point_t new_loyalty_value, ConditionScript&& new_limit @@ -63,11 +61,12 @@ namespace OpenVic { inline bool add_national_focus( std::string_view identifier, - uint8_t icon, NationalFocusGroup const& group, + uint8_t icon, + bool has_flashpoint, + bool own_provinces, + bool outliner_show_as_percent, ModifierValue&& modifiers, - NationalFocus::pop_promotion_map_t&& encouraged_promotion, - NationalFocus::production_map_t&& encouraged_production, Ideology const* loyalty_ideology, fixed_point_t loyalty_value, ConditionScript&& limit |