3 files changed, 39 insertions, 14 deletions
diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp
index c421de3..9221485 100644
--- a/src/openvic-simulation/pop/Pop.cpp
+++ b/src/openvic-simulation/pop/Pop.cpp
@@ -4,6 +4,7 @@
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
+#include "openvic-simulation/misc/Define.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
 #include "openvic-simulation/politics/Issue.hpp"
 #include "openvic-simulation/politics/Rebel.hpp"
@@ -40,9 +41,8 @@ Pop::Pop(PopBase const& pop_base, decltype(ideologies)::keys_t const& ideology_k
 	savings { 0 },
 	life_needs_fulfilled { 0 },
 	everyday_needs_fulfilled { 0 },
-	luxury_needs_fulfilled { 0 } {
-	assert(size > 0);
-}
+	luxury_needs_fulfilled { 0 },
+	max_supported_regiments { 0 } {}
 
 void Pop::setup_pop_test_values(IssueManager const& issue_manager) {
 	/* Returns +/- range% of size. */
@@ -127,6 +127,23 @@ void Pop::set_location(ProvinceInstance const& new_location) {
 	}
 }
 
+void Pop::update_gamestate(
+	DefineManager const& define_manager, CountryInstance const* owner, fixed_point_t const& pop_size_per_regiment_multiplier
+) {
+	if (type.get_can_be_recruited()) {
+		if (
+			size < define_manager.get_min_pop_size_for_regiment() || owner == nullptr ||
+			!RegimentType::allowed_cultures_check_culture_in_country(owner->get_allowed_regiment_cultures(), culture, *owner)
+		) {
+			max_supported_regiments = 0;
+		} else {
+			max_supported_regiments = (fixed_point_t::parse(size) / (
+				fixed_point_t::parse(define_manager.get_pop_size_per_regiment()) * pop_size_per_regiment_multiplier
+			)).to_int64_t() + 1;
+		}
+	}
+}
+
 Strata::Strata(std::string_view new_identifier) : HasIdentifier { new_identifier } {}
 
 PopType::PopType(
@@ -198,11 +215,7 @@ PopType::PopType(
 	migration_target { std::move(new_migration_target) },
 	promote_to { std::move(new_promote_to) },
 	ideologies { std::move(new_ideologies) },
-	issues { std::move(new_issues) } {
-	assert(sprite > 0);
-	assert(max_size >= 0);
-	assert(merge_max_size >= 0);
-}
+	issues { std::move(new_issues) } {}
 
 bool PopType::parse_scripts(DefinitionManager const& definition_manager) {
 	bool ret = true;
diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp
index c74840f..e8cab42 100644
--- a/src/openvic-simulation/pop/Pop.hpp
+++ b/src/openvic-simulation/pop/Pop.hpp
@@ -26,6 +26,8 @@ namespace OpenVic {
 	struct IssueManager;
 	struct ProvinceInstance;
 	struct CountryParty;
+	struct DefineManager;
+	struct CountryInstance;
 
 	struct PopBase {
 		friend struct PopManager;
@@ -82,6 +84,8 @@ namespace OpenVic {
 		fixed_point_t PROPERTY(everyday_needs_fulfilled);
 		fixed_point_t PROPERTY(luxury_needs_fulfilled);
 
+		size_t PROPERTY(max_supported_regiments);
+
 		Pop(PopBase const& pop_base, decltype(ideologies)::keys_t const& ideology_keys);
 
 	public:
@@ -93,6 +97,11 @@ namespace OpenVic {
 		void setup_pop_test_values(IssueManager const& issue_manager);
 
 		void set_location(ProvinceInstance const& new_location);
+
+		void update_gamestate(
+			DefineManager const& define_manager, CountryInstance const* owner,
+			fixed_point_t const& pop_size_per_regiment_multiplier
+		);
 	};
 
 	struct Strata : HasIdentifier {
diff --git a/src/openvic-simulation/pop/Religion.cpp b/src/openvic-simulation/pop/Religion.cpp
index 3fa81bf..2283821 100644
--- a/src/openvic-simulation/pop/Religion.cpp
+++ b/src/openvic-simulation/pop/Religion.cpp
@@ -1,7 +1,5 @@
 #include "Religion.hpp"
 
-#include <cassert>
-
 #include "openvic-simulation/types/Colour.hpp"
 
 using namespace OpenVic;
@@ -10,10 +8,15 @@ using namespace OpenVic::NodeTools;
 ReligionGroup::ReligionGroup(std::string_view new_identifier) : HasIdentifier { new_identifier } {}
 
 Religion::Religion(
-	std::string_view new_identifier, colour_t new_colour, ReligionGroup const& new_group, icon_t new_icon, bool new_pagan
-) : HasIdentifierAndColour { new_identifier, new_colour, false }, group { new_group }, icon { new_icon }, pagan { new_pagan } {
-	assert(icon > 0);
-}
+	std::string_view new_identifier,
+	colour_t new_colour,
+	ReligionGroup const& new_group,
+	icon_t new_icon,
+	bool new_pagan
+) : HasIdentifierAndColour { new_identifier, new_colour, false },
+	group { new_group },
+	icon { new_icon },
+	pagan { new_pagan } {}
 
 bool ReligionManager::add_religion_group(std::string_view identifier) {
 	if (identifier.empty()) {