Link regiment to a POP

Author: wvpm

src/openvic-simulation/country/CountryDefinition.hpp

@@ -10,6 +10,7 @@
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
+#include "core/Typedefs.hpp"
 
 namespace OpenVic {
 	struct CountryDefinitionManager;
@@ -43,6 +44,10 @@ namespace OpenVic {
 	public:
 		GraphicalCultureType const& graphical_culture;
 
+		OV_ALWAYS_INLINE bool is_rebel_country() const {
+			return this->get_identifier() == "REB";
+		}
+
 		CountryDefinition(
 			std::string_view new_identifier, colour_t new_colour, index_t new_index,
 			GraphicalCultureType const& new_graphical_culture, IdentifierRegistry<CountryParty>&& new_parties,

src/openvic-simulation/country/CountryInstance.cpp

@@ -306,6 +306,10 @@ bool CountryInstance::exists() const {
 	return !owned_provinces.empty();
 }
 
+bool CountryInstance::is_rebel_country() const {
+	return country_definition.is_rebel_country();
+}
+
 bool CountryInstance::is_civilised() const {
 	return country_status <= COUNTRY_STATUS_CIVILISED;
 }

src/openvic-simulation/country/CountryInstance.hpp

@@ -444,6 +444,7 @@ namespace OpenVic {
 		std::string_view get_identifier() const;
 
 		bool exists() const;
+		bool is_rebel_country() const;
 		bool is_civilised() const;
 		bool can_colonise() const;
 		bool is_great_power() const;

src/openvic-simulation/military/UnitInstanceGroup.cpp

@@ -9,6 +9,7 @@
 #include "openvic-simulation/military/Deployment.hpp"
 #include "openvic-simulation/military/LeaderTrait.hpp"
 #include "openvic-simulation/population/Culture.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 #include "openvic-simulation/core/FormatValidate.hpp"
@@ -278,17 +279,51 @@ fixed_point_t UnitInstanceGroupBranched<NAVAL>::get_total_consumed_supply() cons
 	return total_consumed_supply;
 }
 
+Pop* UnitInstanceManager::recruit_pop_in(ProvinceInstance& province, const bool is_rebel) const {
+	if (is_rebel) {
+		for (auto& pop : province.get_mutable_pops()) {
+			if (pop.get_rebel_type() != nullptr && pop.try_recruit()) {
+				return &pop;
+			}
+		}
+	} else {
+		for (auto& pop : province.get_mutable_pops()) {
+			if (pop.get_type()->can_be_recruited && pop.try_recruit()) {
+				/*
+				Victoria 2 does not respect cultural restrictions when applying history.
+				*/
+				return &pop;
+			}
+		}
+	}
+
+	return nullptr;
+}
+
 template<unit_branch_t Branch>
-UnitInstanceBranched<Branch>& UnitInstanceManager::generate_unit_instance(UnitDeployment<Branch> const& unit_deployment) {
+UnitInstanceBranched<Branch>& UnitInstanceManager::generate_unit_instance(
+	UnitDeployment<Branch> const& unit_deployment,
+	MapInstance& map_instance,
+	const bool is_rebel
+) {
 	UnitInstanceBranched<Branch>& unit_instance = *get_unit_instances<Branch>().insert(
-		[this, &unit_deployment]() -> UnitInstanceBranched<Branch> {
+		[this, &unit_deployment, &map_instance, is_rebel]() -> UnitInstanceBranched<Branch> {
 			if constexpr (Branch == LAND) {
+				RegimentDeployment const& regiment_deployment = unit_deployment;
+				ProvinceInstance& province = map_instance.get_province_instance_by_definition(*regiment_deployment.get_home());
+				Pop* const pop_ptr = recruit_pop_in(province, is_rebel);
+				if (pop_ptr == nullptr) {		
+					spdlog::warn_s(
+						"Regiment {} in province {} lacks backing pop.", regiment_deployment.get_name(), province.get_identifier()
+					);
+				}
+
 				return {
 					unique_id_counter++,
 					unit_deployment.get_name(),
 					unit_deployment.type,
-					nullptr, // TODO - get pop from Province unit_deployment.get_home()
-					false // Not mobilised
+					pop_ptr,
+					false
 				};
 			} else if constexpr (Branch == NAVAL) {
 				return {
@@ -333,7 +368,7 @@ bool UnitInstanceManager::generate_unit_instance_group(
 	bool ret = true;
 
 	for (UnitDeployment<Branch> const& unit_deployment : unit_deployment_group.get_units()) {
-		ret &= unit_instance_group.add_unit(generate_unit_instance(unit_deployment));
+		ret &= unit_instance_group.add_unit(generate_unit_instance(unit_deployment, map_instance, country.is_rebel_country()));
 	}
 
 	ret &= unit_instance_group.set_position(

src/openvic-simulation/military/UnitInstanceGroup.hpp

@@ -155,6 +155,7 @@ namespace OpenVic {
 	struct CultureManager;
 	struct LeaderTraitManager;
 	struct MilitaryDefines;
+	struct Pop;
 
 	struct UnitInstanceManager {
 	private:
@@ -184,8 +185,13 @@ namespace OpenVic {
 
 		OV_UNIT_BRANCHED_GETTER(get_unit_instance_groups, armies, navies);
 
+		Pop* recruit_pop_in(ProvinceInstance& province, const bool is_rebel) const;
 		template<unit_branch_t Branch>
-		UnitInstanceBranched<Branch>& generate_unit_instance(UnitDeployment<Branch> const& unit_deployment);
+		UnitInstanceBranched<Branch>& generate_unit_instance(
+			UnitDeployment<Branch> const& unit_deployment,
+			MapInstance& map_instance,
+			const bool is_rebel
+		);
 		template<unit_branch_t Branch>
 		bool generate_unit_instance_group(
 			MapInstance& map_instance, CountryInstance& country, UnitDeploymentGroup<Branch> const& unit_deployment_group

src/openvic-simulation/population/Pop.cpp

@@ -10,6 +10,8 @@
 #include <type_safe/strong_typedef.hpp>
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
+#include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/country/CountryParty.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
@@ -38,9 +40,7 @@
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
-#include "openvic-simulation/core/Typedefs.hpp"
 
 
 using namespace OpenVic;
@@ -246,19 +246,17 @@ void Pop::update_gamestate(
 	consciousness = std::clamp(consciousness, MIN_CONSCIOUSNESS, MAX_CONSCIOUSNESS);
 	literacy = std::clamp(literacy, MIN_LITERACY, MAX_LITERACY);
 
-	if (type->can_be_recruited) {
-		MilitaryDefines const& military_defines = define_manager.get_military_defines();
+	MilitaryDefines const& military_defines = define_manager.get_military_defines();
 
-		if (
-			size < military_defines.get_min_pop_size_for_regiment() || owner == nullptr ||
-			!is_culture_status_allowed(owner->get_allowed_regiment_cultures(), culture_status)
-		) {
-			max_supported_regiments = 0;
-		} else {
-			max_supported_regiments = (
-				type_safe::get(size) / (type_safe::get(military_defines.get_pop_size_per_regiment()) * pop_size_per_regiment_multiplier) //
-			).floor<size_t>() + 1;
-		}
+	if (
+		size < military_defines.get_min_pop_size_for_regiment() || owner == nullptr ||
+		!is_culture_status_allowed(owner->get_allowed_regiment_cultures(), culture_status)
+	) {
+		max_supported_regiments = 0;
+	} else {
+		max_supported_regiments = (
+			type_safe::get(size) / (type_safe::get(military_defines.get_pop_size_per_regiment()) * pop_size_per_regiment_multiplier) //
+		).floor<size_t>() + 1;
 	}
 }
 
@@ -765,3 +763,12 @@ void Pop::hire(pop_size_t count) {
 		);
 	}
 }
+
+bool Pop::try_recruit() {
+	if (regiment_count >= max_supported_regiments) {
+		return false;
+	}
+
+	++regiment_count;
+	return true;
+}

src/openvic-simulation/population/Pop.hpp

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstddef>
+
+#include "openvic-simulation/core/portable/ForwardableSpan.hpp"
 #include "openvic-simulation/economy/production/ArtisanalProducer.hpp"
 #include "openvic-simulation/population/PopNeedsMacro.hpp"
 #include "openvic-simulation/types/fixed_point/Atomic.hpp"
@@ -9,7 +12,6 @@
 #include "openvic-simulation/population/PopSize.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/core/portable/ForwardableSpan.hpp"
 
 #include <type_safe/strong_typedef.hpp>
 
@@ -155,7 +157,8 @@ namespace OpenVic {
 		OV_DO_FOR_ALL_TYPES_OF_POP_EXPENSES(DECLARE_POP_MONEY_STORES);
 		#undef DECLARE_POP_MONEY_STORES
 
-		size_t PROPERTY(max_supported_regiments, 0);
+		std::size_t PROPERTY(regiment_count, 0);
+		std::size_t PROPERTY(max_supported_regiments, 0);
 
 		Pop(
 			PopBase const& pop_base,
@@ -227,5 +230,6 @@ namespace OpenVic {
 		);
 		void allocate_cash_for_artisanal_spending(const fixed_point_t money_to_spend);
 		void hire(pop_size_t count);
+		bool try_recruit(); //recruit or conscript
 	};
 }

src/openvic-simulation/population/PopsAggregate.cpp

@@ -191,7 +191,9 @@ void PopsAggregate::add_pops_aggregate(Pop const& pop) {
 	population_by_culture[&pop.culture] += pop_size;
 	population_by_religion[&pop.religion] += pop_size;
 
-	max_supported_regiment_count += pop.get_max_supported_regiments();
+	if (pop.get_type()->can_be_recruited) {
+		max_supported_regiment_count += pop.get_max_supported_regiments();
+	}
 	yesterdays_import_value.set(_yesterdays_import_value_running_total);
 }