Added pops to provinces

14 files changed, 158 insertions, 39 deletions

diff --git a/src/openvic/GameManager.cpp b/src/openvic/GameManager.cpp
index 2784d1c..9ab59a3 100644
--- a/src/openvic/GameManager.cpp
+++ b/src/openvic/GameManager.cpp
@@ -36,7 +36,7 @@ return_t GameManager::setup() {
 	clock.reset();
 	today = { 1836 };
 	good_manager.reset_to_defaults();
-	return_t ret = map.setup(good_manager, building_manager);
+	return_t ret = map.setup(good_manager, building_manager, pop_manager);
 	set_needs_update();
 	return ret;
 }
diff --git a/src/openvic/GameManager.hpp b/src/openvic/GameManager.hpp
index b8dfbf6..6a061e6 100644
--- a/src/openvic/GameManager.hpp
+++ b/src/openvic/GameManager.hpp
@@ -11,6 +11,7 @@ namespace OpenVic {
 		Map map;
 		BuildingManager building_manager;
 		GoodManager good_manager;
+		PopManager pop_manager;
 		GameAdvancementHook clock;
 
 	private:
diff --git a/src/openvic/map/Building.cpp b/src/openvic/map/Building.cpp
index 07cbac9..81532c4 100644
--- a/src/openvic/map/Building.cpp
+++ b/src/openvic/map/Building.cpp
@@ -127,7 +127,7 @@ return_t BuildingManager::generate_province_buildings(Province& province) const
 	if (province.is_water()) return SUCCESS;
 	return_t ret = SUCCESS;
 	for (BuildingType const& type : building_types.get_items())
-		if (province.add_building(type) != SUCCESS) ret = FAILURE;
+		if (province.add_building({ type }) != SUCCESS) ret = FAILURE;
 	province.lock_buildings();
 	return ret;
 }
diff --git a/src/openvic/map/Building.hpp b/src/openvic/map/Building.hpp
index 98c3991..c4f8950 100644
--- a/src/openvic/map/Building.hpp
+++ b/src/openvic/map/Building.hpp
@@ -6,7 +6,8 @@
 #include "../Types.hpp"
 
 namespace OpenVic {
-	struct Province;
+
+	struct BuildingManager;
 	struct BuildingType;
 
 	/* REQUIREMENTS:
@@ -15,7 +16,7 @@ namespace OpenVic {
 	 * MAP-13, MAP-78, MAP-79
 	 */
 	struct Building : HasIdentifier {
-		friend struct Province;
+		friend struct BuildingManager;
 
 		using level_t = int8_t;
 
@@ -52,8 +53,6 @@ namespace OpenVic {
 		void tick(Date const& today);
 	};
 
-	struct BuildingManager;
-
 	struct BuildingType : HasIdentifier {
 		friend struct BuildingManager;
 
@@ -70,6 +69,8 @@ namespace OpenVic {
 		Timespan get_build_time() const;
 	};
 
+	struct Province;
+
 	struct BuildingManager {
 	private:
 		IdentifierRegistry<BuildingType> building_types;
diff --git a/src/openvic/map/Map.cpp b/src/openvic/map/Map.cpp
index 936add0..0f4ed46 100644
--- a/src/openvic/map/Map.cpp
+++ b/src/openvic/map/Map.cpp
@@ -341,13 +341,37 @@ return_t Map::generate_mapmode_colours(Mapmode::index_t index, uint8_t* target)
 	return ret;
 }
 
-return_t Map::setup(GoodManager const& good_manager, BuildingManager const& building_manager) {
+void Map::update_highest_province_population() {
+	highest_province_population = 0;
+	for (Province const& province : provinces.get_items()) {
+		highest_province_population = std::max(highest_province_population, province.get_total_population());
+	}
+}
+
+Pop::pop_size_t Map::get_highest_province_population() const {
+	return highest_province_population;
+}
+
+void Map::update_total_map_population() {
+	total_map_population = 0;
+	for (Province const& province : provinces.get_items()) {
+		total_map_population += province.get_total_population();
+	}
+}
+
+Pop::pop_size_t Map::get_total_map_population() const {
+	return total_map_population;
+}
+
+return_t Map::setup(GoodManager const& good_manager, BuildingManager const& building_manager, PopManager const& pop_manager) {
 	return_t ret = SUCCESS;
 	for (Province& province : provinces.get_items()) {
 		// Set all land provinces to have an RGO based on their index to test them
 		if (!province.is_water() && good_manager.get_good_count() > 0)
 			province.rgo = good_manager.get_good_by_index(province.get_index() % good_manager.get_good_count());
 		if (building_manager.generate_province_buildings(province) != SUCCESS) ret = FAILURE;
+		// Add some pops to the province (for testing purposes)
+		pop_manager.generate_test_pops(province);
 	}
 	return ret;
 }
@@ -355,6 +379,8 @@ return_t Map::setup(GoodManager const& good_manager, BuildingManager const& buil
 void Map::update_state(Date const& today) {
 	for (Province& province : provinces.get_items())
 		province.update_state(today);
+	update_highest_province_population();
+	update_total_map_population();
 }
 
 void Map::tick(Date const& today) {
diff --git a/src/openvic/map/Map.hpp b/src/openvic/map/Map.hpp
index 3533a14..3e1370b 100644
--- a/src/openvic/map/Map.hpp
+++ b/src/openvic/map/Map.hpp
@@ -54,6 +54,8 @@ namespace OpenVic {
 		colour_index_map_t colour_index_map;
 		index_t selected_province = NULL_INDEX;
 
+		Pop::pop_size_t highest_province_population, total_map_population;
+
 		index_t get_index_from_colour(colour_t colour) const;
 
 	public:
@@ -93,7 +95,12 @@ namespace OpenVic {
 		static constexpr size_t MAPMODE_COLOUR_SIZE = 4;
 		return_t generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) const;
 
-		return_t setup(GoodManager const& good_manager, BuildingManager const& building_manager);
+		return_t setup(GoodManager const& good_manager, BuildingManager const& building_manager, PopManager const& pop_manager);
+
+		void update_highest_province_population();
+		Pop::pop_size_t get_highest_province_population() const;
+		void update_total_map_population();
+		Pop::pop_size_t get_total_map_population() const;
 
 		void update_state(Date const& today);
 		void tick(Date const& today);
diff --git a/src/openvic/map/Province.cpp b/src/openvic/map/Province.cpp
index 06f1c98..75612ad 100644
--- a/src/openvic/map/Province.cpp
+++ b/src/openvic/map/Province.cpp
@@ -30,8 +30,8 @@ Province::life_rating_t Province::get_life_rating() const {
 	return life_rating;
 }
 
-return_t Province::add_building(BuildingType const& type) {
-	return buildings.add_item({ type });
+return_t Province::add_building(Building&& building) {
+	return buildings.add_item(std::move(building));
 }
 
 void Province::lock_buildings() {
@@ -66,9 +66,28 @@ std::string Province::to_string() const {
 	return stream.str();
 }
 
+void Province::add_pop(Pop&& pop) {
+	pops.push_back(std::move(pop));
+}
+
+/* REQUIREMENTS:
+ * MAP-65
+ */
+void Province::update_total_population() {
+	total_population = 0;
+	for (Pop const& pop : pops) {
+		total_population += pop.get_size();
+	}
+}
+
+Pop::pop_size_t Province::get_total_population() const {
+	return total_population;
+}
+
 void Province::update_state(Date const& today) {
 	for (Building& building : buildings.get_items())
 		building.update_state(today);
+	update_total_population();
 }
 
 void Province::tick(Date const& today) {
diff --git a/src/openvic/map/Province.hpp b/src/openvic/map/Province.hpp
index f1f87a2..cd90f7d 100644
--- a/src/openvic/map/Province.hpp
+++ b/src/openvic/map/Province.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "../pop/Pop.hpp"
 #include "Building.hpp"
 
 namespace OpenVic {
@@ -24,6 +25,9 @@ namespace OpenVic {
 		// TODO - change this into a factory-like structure
 		Good const* rgo = nullptr;
 
+		std::vector<Pop> pops;
+		Pop::pop_size_t total_population;
+
 		Province(index_t new_index, std::string const& new_identifier, colour_t new_colour);
 
 	public:
@@ -33,7 +37,7 @@ namespace OpenVic {
 		Region* get_region() const;
 		bool is_water() const;
 		life_rating_t get_life_rating() const;
-		return_t add_building(BuildingType const& type);
+		return_t add_building(Building&& building);
 		void lock_buildings();
 		void reset_buildings();
 		Building const* get_building_by_identifier(std::string const& identifier) const;
@@ -42,6 +46,10 @@ namespace OpenVic {
 		Good const* get_rgo() const;
 		std::string to_string() const;
 
+		void add_pop(Pop&& pop);
+		void update_total_population();
+		Pop::pop_size_t get_total_population() const;
+
 		void update_state(Date const& today);
 		void tick(Date const& today);
 	};
diff --git a/src/openvic/pop/Culture.cpp b/src/openvic/pop/Culture.cpp
index 05fc5fe..8f72f20 100644
--- a/src/openvic/pop/Culture.cpp
+++ b/src/openvic/pop/Culture.cpp
@@ -49,7 +49,7 @@ GraphicalCultureType const* CultureManager::get_graphical_culture_type_by_identi
 	return graphical_culture_types.get_item_by_identifier(identifier);
 }
 
-return_t CultureManager::add_culture_group(std::string const& identifier, GraphicalCultureType const& graphical_culture_type) {
+return_t CultureManager::add_culture_group(std::string const& identifier, GraphicalCultureType const* graphical_culture_type) {
 	if (!graphical_culture_types.is_locked()) {
 		Logger::error("Cannot register culture groups until graphical culture types are locked!");
 		return FAILURE;
@@ -58,7 +58,11 @@ return_t CultureManager::add_culture_group(std::string const& identifier, Graphi
 		Logger::error("Invalid culture group identifier - empty!");
 		return FAILURE;
 	}
-	return culture_groups.add_item({ identifier, graphical_culture_type });
+	if (graphical_culture_type == nullptr) {
+		Logger::error("Null graphical culture type for ", identifier);
+		return FAILURE;
+	}
+	return culture_groups.add_item({ identifier, *graphical_culture_type });
 }
 
 void CultureManager::lock_culture_groups() {
@@ -69,7 +73,7 @@ CultureGroup const* CultureManager::get_culture_group_by_identifier(std::string
 	return culture_groups.get_item_by_identifier(identifier);
 }
 
-return_t CultureManager::add_culture(CultureGroup const* group, std::string const& identifier, colour_t colour, Culture::name_list_t const& first_names, Culture::name_list_t const& last_names) {
+return_t CultureManager::add_culture(std::string const& identifier, colour_t colour, CultureGroup const* group, Culture::name_list_t const& first_names, Culture::name_list_t const& last_names) {
 	if (!culture_groups.is_locked()) {
 		Logger::error("Cannot register cultures until culture groups are locked!");
 		return FAILURE;
diff --git a/src/openvic/pop/Culture.hpp b/src/openvic/pop/Culture.hpp
index ce49cd0..971ef71 100644
--- a/src/openvic/pop/Culture.hpp
+++ b/src/openvic/pop/Culture.hpp
@@ -63,10 +63,10 @@ namespace OpenVic {
 		return_t add_graphical_culture_type(std::string const& identifier);
 		void lock_graphical_culture_types();
 		GraphicalCultureType const* get_graphical_culture_type_by_identifier(std::string const& identifier) const;
-		return_t add_culture_group(std::string const& identifier, GraphicalCultureType const& new_graphical_culture_type);
+		return_t add_culture_group(std::string const& identifier, GraphicalCultureType const* new_graphical_culture_type);
 		void lock_culture_groups();
 		CultureGroup const* get_culture_group_by_identifier(std::string const& identifier) const;
-		return_t add_culture(CultureGroup const* group, std::string const& identifier, colour_t colour, Culture::name_list_t const& first_names, Culture::name_list_t const& last_names);
+		return_t add_culture(std::string const& identifier, colour_t colour, CultureGroup const* group, Culture::name_list_t const& first_names, Culture::name_list_t const& last_names);
 		void lock_cultures();
 		Culture const* get_culture_by_identifier(std::string const& identifier) const;
 	};
diff --git a/src/openvic/pop/Pop.cpp b/src/openvic/pop/Pop.cpp
index b095358..babcd25 100644
--- a/src/openvic/pop/Pop.cpp
+++ b/src/openvic/pop/Pop.cpp
@@ -2,15 +2,16 @@
 
 #include <cassert>
 
+#include "../map/Province.hpp"
 #include "../utility/Logger.hpp"
 
 using namespace OpenVic;
 
-Pop::Pop(PopType const& new_type, Culture const& new_culture, Religion const& new_religion)
+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 { 1 } {
+	  size { new_size } {
 	assert(size > 0);
 }
 
@@ -33,7 +34,7 @@ Pop::pop_size_t Pop::get_size() const {
 PopType::PopType(std::string const& new_identifier, colour_t new_colour,
 	strata_t new_strata, sprite_t new_sprite,
 	Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size,
-	bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan)
+	bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan, bool new_is_slave)
 	: HasIdentifier { new_identifier },
 	  HasColour { new_colour, true },
 	  strata { new_strata },
@@ -42,7 +43,8 @@ PopType::PopType(std::string const& new_identifier, colour_t new_colour,
 	  merge_max_size { new_merge_max_size },
 	  state_capital_only { new_state_capital_only },
 	  demote_migrant { new_demote_migrant },
-	  is_artisan { new_is_artisan } {
+	  is_artisan { new_is_artisan },
+	  is_slave { new_is_slave } {
 	assert(sprite > 0);
 	assert(max_size > 0);
 	assert(merge_max_size > 0);
@@ -72,9 +74,35 @@ bool PopType::get_is_artisan() const {
 	return is_artisan;
 }
 
-PopTypeManager::PopTypeManager() : pop_types { "pop types" } {}
+bool PopType::get_is_slave() const {
+	return is_slave;
+}
+
+PopManager::PopManager() : pop_types { "pop types" } {
+	culture_manager.add_graphical_culture_type("test_graphical_culture_type");
+	culture_manager.lock_graphical_culture_types();
+
+	culture_manager.add_culture_group("test_culture_group", culture_manager.get_graphical_culture_type_by_identifier("test_graphical_culture_type"));
+	culture_manager.lock_culture_groups();
+
+	culture_manager.add_culture("test_culture", 0x0000FF, culture_manager.get_culture_group_by_identifier("test_culture_group"),
+		{ "john" }, { "smith" });
+	culture_manager.lock_cultures();
+
+	religion_manager.add_religion_group("test_religion_group");
+	religion_manager.lock_religion_groups();
+
+	religion_manager.add_religion("test_religion", 0xFF0000, religion_manager.get_religion_group_by_identifier("test_religion_group"), 1, false);
+	religion_manager.lock_religions();
 
-return_t PopTypeManager::add_pop_type(std::string const& identifier, colour_t colour, PopType::strata_t strata, PopType::sprite_t sprite, Pop::pop_size_t max_size, Pop::pop_size_t merge_max_size, bool state_capital_only, bool demote_migrant, bool is_artisan) {
+	add_pop_type("test_pop_type_poor", 0xFF0000, PopType::strata_t::POOR, 1, 1, 1, false, false, false, false);
+	add_pop_type("test_pop_type_middle", 0x00FF00, PopType::strata_t::MIDDLE, 1, 1, 1, false, false, false, false);
+	add_pop_type("test_pop_type_rich", 0x0000FF, PopType::strata_t::RICH, 1, 1, 1, false, false, false, false);
+	lock_pop_types();
+}
+
+return_t PopManager::add_pop_type(std::string const& identifier, colour_t colour, PopType::strata_t strata, PopType::sprite_t sprite,
+	Pop::pop_size_t max_size, Pop::pop_size_t merge_max_size, bool state_capital_only, bool demote_migrant, bool is_artisan, bool is_slave) {
 	if (identifier.empty()) {
 		Logger::error("Invalid pop type identifier - empty!");
 		return FAILURE;
@@ -95,13 +123,28 @@ return_t PopTypeManager::add_pop_type(std::string const& identifier, colour_t co
 		Logger::error("Invalid pop type merge max size for ", identifier, ": ", merge_max_size);
 		return FAILURE;
 	}
-	return pop_types.add_item({ identifier, colour, strata, sprite, max_size, merge_max_size, state_capital_only, demote_migrant, is_artisan });
+	return pop_types.add_item({ identifier, colour, strata, sprite, max_size, merge_max_size, state_capital_only, demote_migrant, is_artisan, is_slave });
 }
 
-void PopTypeManager::lock_pop_types() {
+void PopManager::lock_pop_types() {
 	pop_types.lock();
 }
 
-PopType const* PopTypeManager::get_pop_type_by_identifier(std::string const& identifier) const {
+PopType const* PopManager::get_pop_type_by_identifier(std::string const& identifier) const {
 	return pop_types.get_item_by_identifier(identifier);
 }
+
+void PopManager::generate_test_pops(Province& province) const {
+	if (pop_types.is_locked()) {
+		static PopType const& type_poor = *get_pop_type_by_identifier("test_pop_type_poor");
+		static PopType const& type_middle = *get_pop_type_by_identifier("test_pop_type_middle");
+		static PopType const& type_rich = *get_pop_type_by_identifier("test_pop_type_rich");
+		static Culture const& culture = *culture_manager.get_culture_by_identifier("test_culture");
+		static Religion const& religion = *religion_manager.get_religion_by_identifier("test_religion");
+		province.add_pop({ type_poor, culture, religion, static_cast<Pop::pop_size_t>(province.get_index() * province.get_index() * province.get_index()) * 1000 });
+		province.add_pop({ type_middle, culture, religion, static_cast<Pop::pop_size_t>(province.get_index() * province.get_index()) * 1000 });
+		province.add_pop({ type_rich, culture, religion, static_cast<Pop::pop_size_t>(province.get_index()) * 1000 });
+	} else {
+		Logger::error("Cannot generate pops before pop types registry is locked!");
+	}
+}
diff --git a/src/openvic/pop/Pop.hpp b/src/openvic/pop/Pop.hpp
index 4d3f3e0..626cd8c 100644
--- a/src/openvic/pop/Pop.hpp
+++ b/src/openvic/pop/Pop.hpp
@@ -1,17 +1,19 @@
 #pragma once
 
 #include "../Types.hpp"
+#include "Culture.hpp"
+#include "Religion.hpp"
 
 namespace OpenVic {
 
+	struct PopManager;
 	struct PopType;
-	struct Culture;
-	struct Religion;
 
 	/* REQUIREMENTS:
-	 * POP-18, POP-19, POP-21
+	 * POP-18, POP-19, POP-20, POP-21
 	 */
 	struct Pop {
+		friend struct PopManager;
 
 		using pop_size_t = uint32_t;
 
@@ -21,7 +23,7 @@ namespace OpenVic {
 		Religion const& religion;
 		pop_size_t size;
 
-		Pop(PopType const& new_type, Culture const& new_culture, Religion const& new_religion);
+		Pop(PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size);
 
 	public:
 		Pop(Pop const&) = delete;
@@ -35,13 +37,11 @@ namespace OpenVic {
 		pop_size_t get_size() const;
 	};
 
-	struct PopTypeManager;
-
 	/* REQUIREMENTS:
 	 * POP-26
 	 */
 	struct PopType : HasIdentifier, HasColour {
-		friend struct PopTypeManager;
+		friend struct PopManager;
 
 		using sprite_t = uint8_t;
 
@@ -53,11 +53,12 @@ namespace OpenVic {
 		} strata;
 		const sprite_t sprite;
 		const Pop::pop_size_t max_size, merge_max_size;
-		const bool state_capital_only, demote_migrant, is_artisan;
+		const bool state_capital_only, demote_migrant, is_artisan, is_slave;
 
 		// TODO - rebel composition, life/everyday/luxury needs, country and province migration targets, promote_to targets, ideologies and issues
 
-		PopType(std::string const& new_identifier, colour_t new_colour, strata_t new_strata, sprite_t new_sprite, Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size, bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan);
+		PopType(std::string const& new_identifier, colour_t new_colour, strata_t new_strata, sprite_t new_sprite, Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size,
+			bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan, bool new_is_slave);
 
 	public:
 		PopType(PopType&&) = default;
@@ -68,17 +69,26 @@ namespace OpenVic {
 		bool get_state_capital_only() const;
 		bool get_demote_migrant() const;
 		bool get_is_artisan() const;
+		bool get_is_slave() const;
 	};
 
-	struct PopTypeManager {
+	struct Province;
+
+	struct PopManager {
 	private:
 		IdentifierRegistry<PopType> pop_types;
+		CultureManager culture_manager;
+		ReligionManager religion_manager;
 
 	public:
-		PopTypeManager();
+		PopManager();
 
-		return_t add_pop_type(std::string const& identifier, colour_t new_colour, PopType::strata_t new_strata, PopType::sprite_t new_sprite, Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size, bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan);
+		return_t add_pop_type(std::string const& identifier, colour_t new_colour, PopType::strata_t strata, PopType::sprite_t sprite,
+			Pop::pop_size_t max_size, Pop::pop_size_t merge_max_size, bool state_capital_only, bool demote_migrant,
+			bool is_artisan, bool is_slave);
 		void lock_pop_types();
 		PopType const* get_pop_type_by_identifier(std::string const& identifier) const;
+
+		void generate_test_pops(Province& province) const;
 	};
 }
diff --git a/src/openvic/pop/Religion.cpp b/src/openvic/pop/Religion.cpp
index dddabf4..a5b2abb 100644
--- a/src/openvic/pop/Religion.cpp
+++ b/src/openvic/pop/Religion.cpp
@@ -48,7 +48,7 @@ ReligionGroup const* ReligionManager::get_religion_group_by_identifier(std::stri
 	return religion_groups.get_item_by_identifier(identifier);
 }
 
-return_t ReligionManager::add_religion(ReligionGroup const* group, std::string const& identifier, colour_t colour, Religion::icon_t icon, bool pagan) {
+return_t ReligionManager::add_religion(std::string const& identifier, colour_t colour, ReligionGroup const* group, Religion::icon_t icon, bool pagan) {
 	if (!religion_groups.is_locked()) {
 		Logger::error("Cannot register religions until religion groups are locked!");
 		return FAILURE;
diff --git a/src/openvic/pop/Religion.hpp b/src/openvic/pop/Religion.hpp
index f141f45..2a67ce3 100644
--- a/src/openvic/pop/Religion.hpp
+++ b/src/openvic/pop/Religion.hpp
@@ -47,7 +47,7 @@ namespace OpenVic {
 		return_t add_religion_group(std::string const& identifier);
 		void lock_religion_groups();
 		ReligionGroup const* get_religion_group_by_identifier(std::string const& identifier) const;
-		return_t add_religion(ReligionGroup const* group, std::string const& identifier, colour_t colour, Religion::icon_t icon, bool pagan);
+		return_t add_religion(std::string const& identifier, colour_t colour, ReligionGroup const* group, Religion::icon_t icon, bool pagan);
 		void lock_religions();
 		Religion const* get_religion_by_identifier(std::string const& identifier) const;
 	};