From 89c93f98b865c20cd3c3486a9b91323565e759fc Mon Sep 17 00:00:00 2001 From: hop311 Date: Tue, 12 Dec 2023 00:34:53 +0000 Subject: Province pop history + country government flag override refactors --- src/openvic-simulation/pop/Pop.cpp | 41 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) (limited to 'src/openvic-simulation/pop/Pop.cpp') diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp index eae2e52..2d85dce 100644 --- a/src/openvic-simulation/pop/Pop.cpp +++ b/src/openvic-simulation/pop/Pop.cpp @@ -4,14 +4,18 @@ #include "openvic-simulation/dataloader/NodeTools.hpp" #include "openvic-simulation/map/Province.hpp" +#include "openvic-simulation/politics/Rebel.hpp" #include "openvic-simulation/utility/Logger.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; Pop::Pop( - PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size -) : type { new_type }, culture { new_culture }, religion { new_religion }, size { new_size } { + PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size, + fixed_point_t new_militancy, fixed_point_t new_consciousness, RebelType const* new_rebel_type +) : type { new_type }, culture { new_culture }, religion { new_religion }, size { new_size }, num_promoted { 0 }, + num_demoted { 0 }, num_migrated { 0 }, militancy { new_militancy }, consciousness { new_consciousness }, + rebel_type { new_rebel_type } { assert(size > 0); } @@ -156,3 +160,36 @@ bool PopManager::load_pop_type_file( ); return ret; } + +bool PopManager::load_pop_into_vector( + RebelManager const& rebel_manager, std::vector& vec, PopType const& type, ast::NodeCPtr pop_node, + bool *non_integer_size +) const { + Culture const* culture = nullptr; + Religion const* religion = nullptr; + fixed_point_t size = 0; /* Some genius filled later start dates with non-integer sized pops */ + fixed_point_t militancy = 0, consciousness = 0; + RebelType const* rebel_type = nullptr; + + bool ret = expect_dictionary_keys( + "culture", ONE_EXACTLY, culture_manager.expect_culture_identifier(assign_variable_callback_pointer(culture)), + "religion", ONE_EXACTLY, religion_manager.expect_religion_identifier(assign_variable_callback_pointer(religion)), + "size", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(size)), + "militancy", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(militancy)), + "consciousness", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(consciousness)), + "rebel_type", ZERO_OR_ONE, rebel_manager.expect_rebel_type_identifier(assign_variable_callback_pointer(rebel_type)) + )(pop_node); + + if (non_integer_size != nullptr && !size.is_integer()) { + *non_integer_size = true; + } + + if (culture != nullptr && religion != nullptr && size >= 1) { + vec.emplace_back(Pop { type, *culture, *religion, size.to_int64_t(), militancy, consciousness, rebel_type }); + } else { + Logger::warning( + "Some pop arguments are invalid: culture = ", culture, ", religion = ", religion, ", size = ", size + ); + } + return ret; +} -- cgit v1.2.3-56-ga3b1