More refactoring and duplicate code removal

6 files changed, 0 insertions, 825 deletions

diff --git a/src/openvic/pop/Culture.cpp b/src/openvic/pop/Culture.cpp
deleted file mode 100644
index d86d608..0000000
--- a/src/openvic/pop/Culture.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-#include "Culture.hpp"
-
-#include "openvic/dataloader/NodeTools.hpp"
-
-using namespace OpenVic;
-using namespace OpenVic::NodeTools;
-
-GraphicalCultureType::GraphicalCultureType(const std::string_view new_identifier) : HasIdentifier { new_identifier } {}
-
-CultureGroup::CultureGroup(const std::string_view new_identifier, const std::string_view new_leader,
-	GraphicalCultureType const& new_unit_graphical_culture_type, bool new_is_overseas)
-	: HasIdentifier { new_identifier }, leader { new_leader },
-	  unit_graphical_culture_type { new_unit_graphical_culture_type },
-	  is_overseas { new_is_overseas } {}
-
-
-std::string const& CultureGroup::get_leader() const {
-	return leader;
-}
-
-GraphicalCultureType const& CultureGroup::get_unit_graphical_culture_type() const {
-	return unit_graphical_culture_type;
-}
-
-bool CultureGroup::get_is_overseas() const {
-	return is_overseas;
-}
-
-Culture::Culture(const std::string_view new_identifier, colour_t new_colour, CultureGroup const& new_group,
-	std::vector<std::string> const& new_first_names, std::vector<std::string> const& new_last_names)
-	: HasIdentifierAndColour { new_identifier, new_colour, true },
-	  group { new_group },
-	  first_names { new_first_names },
-	  last_names { new_last_names } {}
-
-CultureGroup const& Culture::get_group() const {
-	return group;
-}
-
-std::vector<std::string> const& Culture::get_first_names() const {
-	return first_names;
-}
-
-std::vector<std::string> const& Culture::get_last_names() const {
-	return last_names;
-}
-
-CultureManager::CultureManager()
-	: graphical_culture_types { "graphical culture types" },
-	  culture_groups { "culture groups" },
-	  cultures { "cultures" } {}
-
-bool CultureManager::add_graphical_culture_type(const std::string_view identifier) {
-	if (identifier.empty()) {
-		Logger::error("Invalid culture group identifier - empty!");
-		return false;
-	}
-	return graphical_culture_types.add_item({ identifier });
-}
-
-void CultureManager::lock_graphical_culture_types() {
-	graphical_culture_types.lock();
-}
-
-GraphicalCultureType const* CultureManager::get_graphical_culture_type_by_identifier(const std::string_view identifier) const {
-	return graphical_culture_types.get_item_by_identifier(identifier);
-}
-
-size_t CultureManager::get_graphical_culture_type_count() const {
-	return graphical_culture_types.size(); 
-}
-
-std::vector<GraphicalCultureType> const& CultureManager::get_graphical_culture_types() const {
-	return graphical_culture_types.get_items();
-}
-
-bool CultureManager::add_culture_group(const std::string_view identifier, const std::string_view leader, GraphicalCultureType const* graphical_culture_type, bool is_overseas) {
-	if (!graphical_culture_types.is_locked()) {
-		Logger::error("Cannot register culture groups until graphical culture types are locked!");
-		return false;
-	}
-	if (identifier.empty()) {
-		Logger::error("Invalid culture group identifier - empty!");
-		return false;
-	}
-	if (leader.empty()) {
-		Logger::error("Invalid culture group leader - empty!");
-		return false;
-	}
-	if (graphical_culture_type == nullptr) {
-		Logger::error("Null graphical culture type for ", identifier);
-		return false;
-	}
-	return culture_groups.add_item({ identifier, leader, *graphical_culture_type, is_overseas });
-}
-
-void CultureManager::lock_culture_groups() {
-	culture_groups.lock();
-}
-
-CultureGroup const* CultureManager::get_culture_group_by_identifier(const std::string_view identifier) const {
-	return culture_groups.get_item_by_identifier(identifier);
-}
-
-size_t CultureManager::get_culture_group_count() const {
-	return culture_groups.size(); 
-}
-
-std::vector<CultureGroup> const& CultureManager::get_culture_groups() const {
-	return culture_groups.get_items();
-}
-
-bool CultureManager::add_culture(const std::string_view identifier, colour_t colour, CultureGroup const* group, std::vector<std::string> const& first_names, std::vector<std::string> const& last_names) {
-	if (!culture_groups.is_locked()) {
-		Logger::error("Cannot register cultures until culture groups are locked!");
-		return false;
-	}
-	if (identifier.empty()) {
-		Logger::error("Invalid culture identifier - empty!");
-		return false;
-	}
-	if (group == nullptr) {
-		Logger::error("Null culture group for ", identifier);
-		return false;
-	}
-	if (colour > MAX_COLOUR_RGB) {
-		Logger::error("Invalid culture colour for ", identifier, ": ", colour_to_hex_string(colour));
-		return false;
-	}
-	return cultures.add_item({ identifier, colour, *group, first_names, last_names });
-}
-
-void CultureManager::lock_cultures() {
-	cultures.lock();
-}
-
-Culture const* CultureManager::get_culture_by_identifier(const std::string_view identifier) const {
-	return cultures.get_item_by_identifier(identifier);
-}
-
-size_t CultureManager::get_culture_count() const {
-	return cultures.size(); 
-}
-
-std::vector<Culture> const& CultureManager::get_cultures() const {
-	return cultures.get_items();
-}
-
-bool CultureManager::load_graphical_culture_type_file(ast::NodeCPtr root) {
-	const bool ret = expect_list_reserve_length(
-		graphical_culture_types,
-		expect_identifier(
-			std::bind(&CultureManager::add_graphical_culture_type, this, std::placeholders::_1)
-		)
-	)(root);
-	lock_graphical_culture_types();
-	return ret;
-}
-
-bool CultureManager::load_culture_file(ast::NodeCPtr root) {
-	if (!graphical_culture_types.is_locked()) {
-		Logger::error("Cannot load culture groups until graphical culture types are locked!");
-		return false;
-	}
-
-	static const std::string default_unit_graphical_culture_type_identifier = "Generic";
-	GraphicalCultureType const* const default_unit_graphical_culture_type = get_graphical_culture_type_by_identifier(default_unit_graphical_culture_type_identifier);
-	if (default_unit_graphical_culture_type == nullptr) {
-		Logger::error("Failed to find default unit graphical culture type: ", default_unit_graphical_culture_type_identifier);
-	}
-
-	size_t total_expected_cultures = 0;
-	bool ret = expect_dictionary_reserve_length(
-		culture_groups,
-		[this, default_unit_graphical_culture_type, &total_expected_cultures](std::string_view key, ast::NodeCPtr value) -> bool {
-			std::string_view leader;
-			GraphicalCultureType const* unit_graphical_culture_type = default_unit_graphical_culture_type;
-			bool is_overseas = true;
-
-			bool ret = expect_dictionary_keys_and_length(
-				[&total_expected_cultures](size_t size) -> size_t {
-					total_expected_cultures += size;
-					return size;
-				},
-				ALLOW_OTHER_KEYS,
-				"leader", ONE_EXACTLY, expect_identifier(assign_variable_callback(leader)),
-				"unit", ZERO_OR_ONE,
-					expect_identifier(
-						[this, &unit_graphical_culture_type](std::string_view identifier) -> bool {
-							unit_graphical_culture_type = get_graphical_culture_type_by_identifier(identifier);
-							if (unit_graphical_culture_type != nullptr) return true;
-							Logger::error("Invalid unit graphical culture type: ", identifier);
-							return false;
-						}
-					),
-				"union", ZERO_OR_ONE, success_callback,
-				"is_overseas", ZERO_OR_ONE, expect_bool(assign_variable_callback(is_overseas))
-			)(value);
-			ret &= add_culture_group(key, leader, unit_graphical_culture_type, is_overseas);
-			return ret;
-		}
-	)(root);
-	lock_culture_groups();
-	cultures.reserve(cultures.size() + total_expected_cultures);
-
-	ret &= expect_dictionary(
-		[this](std::string_view culture_group_key, ast::NodeCPtr culture_group_value) -> bool {
-
-			CultureGroup const* culture_group = get_culture_group_by_identifier(culture_group_key);
-
-			return expect_dictionary(
-				[this, culture_group](std::string_view key, ast::NodeCPtr value) -> bool {
-					if (key == "leader" || key == "unit" || key == "union" || key == "is_overseas") return true;
-
-					colour_t colour = NULL_COLOUR;
-					std::vector<std::string> first_names, last_names;
-
-					bool ret = expect_dictionary_keys(
-						"color", ONE_EXACTLY, expect_colour(assign_variable_callback(colour)),
-						"first_names", ONE_EXACTLY, name_list_callback(first_names),
-						"last_names", ONE_EXACTLY, name_list_callback(last_names),
-						"radicalism", ZERO_OR_ONE, success_callback,
-						"primary", ZERO_OR_ONE, success_callback
-					)(value);
-					ret &= add_culture(key, colour, culture_group, first_names, last_names);
-					return ret;
-				}
-			)(culture_group_value);
-		}
-	)(root);
-	lock_cultures();
-	return ret;
-}
diff --git a/src/openvic/pop/Culture.hpp b/src/openvic/pop/Culture.hpp
deleted file mode 100644
index cc6c2a6..0000000
--- a/src/openvic/pop/Culture.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-
-#include "openvic/dataloader/NodeTools.hpp"
-#include "openvic/types/IdentifierRegistry.hpp"
-
-namespace OpenVic {
-
-	struct CultureManager;
-
-	struct GraphicalCultureType : HasIdentifier {
-		friend struct CultureManager;
-
-	private:
-		GraphicalCultureType(const std::string_view new_identifier);
-
-	public:
-		GraphicalCultureType(GraphicalCultureType&&) = default;
-	};
-
-	struct CultureGroup : HasIdentifier {
-		friend struct CultureManager;
-
-	private:
-		const std::string leader;
-		GraphicalCultureType const& unit_graphical_culture_type;
-		const bool is_overseas;
-
-		// TODO - union tag
-
-		CultureGroup(const std::string_view new_identifier, const std::string_view new_leader, GraphicalCultureType const& new_unit_graphical_culture_type, bool new_is_overseas);
-
-	public:
-		CultureGroup(CultureGroup&&) = default;
-
-		std::string const& get_leader() const;
-		GraphicalCultureType const& get_unit_graphical_culture_type() const;
-		bool get_is_overseas() const;
-	};
-
-	struct Culture : HasIdentifierAndColour {
-		friend struct CultureManager;
-
-	private:
-		CultureGroup const& group;
-		const std::vector<std::string> first_names, last_names;
-
-		// TODO - radicalism, primary tag
-
-		Culture(const std::string_view new_identifier, colour_t new_colour, CultureGroup const& new_group, std::vector<std::string> const& new_first_names, std::vector<std::string> const& new_last_names);
-
-	public:
-		Culture(Culture&&) = default;
-
-		CultureGroup const& get_group() const;
-		std::vector<std::string> const& get_first_names() const;
-		std::vector<std::string> const& get_last_names() const;
-	};
-
-	struct CultureManager {
-	private:
-		IdentifierRegistry<GraphicalCultureType> graphical_culture_types;
-		IdentifierRegistry<CultureGroup> culture_groups;
-		IdentifierRegistry<Culture> cultures;
-
-	public:
-		CultureManager();
-
-		bool add_graphical_culture_type(const std::string_view identifier);
-		void lock_graphical_culture_types();
-		GraphicalCultureType const* get_graphical_culture_type_by_identifier(const std::string_view identifier) const;
-		size_t get_graphical_culture_type_count() const;
-		std::vector<GraphicalCultureType> const& get_graphical_culture_types() const;
-
-		bool add_culture_group(const std::string_view identifier, const std::string_view leader, GraphicalCultureType const* new_graphical_culture_type, bool is_overseas);
-		void lock_culture_groups();
-		CultureGroup const* get_culture_group_by_identifier(const std::string_view identifier) const;
-		size_t get_culture_group_count() const;
-		std::vector<CultureGroup> const& get_culture_groups() const;
-
-		bool add_culture(const std::string_view identifier, colour_t colour, CultureGroup const* group, std::vector<std::string> const& first_names, std::vector<std::string> const& last_names);
-		void lock_cultures();
-		Culture const* get_culture_by_identifier(const std::string_view identifier) const;
-		size_t get_culture_count() const;
-		std::vector<Culture> const& get_cultures() const;
-
-		bool load_graphical_culture_type_file(ast::NodeCPtr root);
-		bool load_culture_file(ast::NodeCPtr root);
-	};
-}
diff --git a/src/openvic/pop/Pop.cpp b/src/openvic/pop/Pop.cpp
deleted file mode 100644
index fbe8708..0000000
--- a/src/openvic/pop/Pop.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "Pop.hpp"
-
-#include <cassert>
-
-#include "openvic/dataloader/NodeTools.hpp"
-#include "openvic/map/Province.hpp"
-#include "openvic/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 } {
-	assert(size > 0);
-}
-
-PopType const& Pop::get_type() const {
-	return type;
-}
-
-Culture const& Pop::get_culture() const {
-	return culture;
-}
-
-Religion const& Pop::get_religion() const {
-	return religion;
-}
-
-Pop::pop_size_t Pop::get_size() const {
-	return size;
-}
-
-Pop::pop_size_t Pop::get_num_promoted() const {
-	return num_promoted;
-}
-
-Pop::pop_size_t Pop::get_num_demoted() const {
-	return num_demoted;
-}
-
-Pop::pop_size_t Pop::get_num_migrated() const {
-	return num_migrated;
-}
-
-Pop::pop_size_t Pop::get_pop_daily_change() const {
-	return Pop::get_num_promoted() - (Pop::get_num_demoted() + Pop::get_num_migrated());
-}
-
-PopType::PopType(const std::string_view 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)
-	: HasIdentifierAndColour { new_identifier, new_colour, true },
-	  strata { new_strata },
-	  sprite { new_sprite },
-	  max_size { new_max_size },
-	  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_slave { new_is_slave } {
-	assert(sprite > 0);
-	assert(max_size > 0);
-	assert(merge_max_size > 0);
-}
-
-PopType::sprite_t PopType::get_sprite() const {
-	return sprite;
-}
-
-PopType::strata_t PopType::get_strata() const {
-	return strata;
-}
-
-Pop::pop_size_t PopType::get_max_size() const {
-	return max_size;
-}
-
-Pop::pop_size_t PopType::get_merge_max_size() const {
-	return merge_max_size;
-}
-
-bool PopType::get_state_capital_only() const {
-	return state_capital_only;
-}
-
-bool PopType::get_demote_migrant() const {
-	return demote_migrant;
-}
-
-bool PopType::get_is_artisan() const {
-	return is_artisan;
-}
-
-bool PopType::get_is_slave() const {
-	return is_slave;
-}
-
-PopManager::PopManager() : pop_types { "pop types" } {}
-
-bool PopManager::add_pop_type(const std::string_view 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 false;
-	}
-	if (colour > MAX_COLOUR_RGB) {
-		Logger::error("Invalid pop type colour for ", identifier, ": ", colour_to_hex_string(colour));
-		return false;
-	}
-	if (sprite <= 0) {
-		Logger::error("Invalid pop type sprite index for ", identifier, ": ", sprite);
-		return false;
-	}
-	if (max_size <= 0) {
-		Logger::error("Invalid pop type max size for ", identifier, ": ", max_size);
-		return false;
-	}
-	if (merge_max_size <= 0) {
-		Logger::error("Invalid pop type merge max size for ", identifier, ": ", merge_max_size);
-		return false;
-	}
-	return pop_types.add_item({ identifier, colour, strata, sprite, max_size, merge_max_size, state_capital_only, demote_migrant, is_artisan, is_slave });
-}
-
-void PopManager::lock_pop_types() {
-	pop_types.lock();
-}
-
-PopType const* PopManager::get_pop_type_by_identifier(const std::string_view identifier) const {
-	return pop_types.get_item_by_identifier(identifier);
-}
-
-size_t PopManager::get_pop_type_count() const {
-	return pop_types.size(); 
-}
-
-std::vector<PopType> const& PopManager::get_pop_types() const {
-	return pop_types.get_items();
-}
-
-bool PopManager::load_pop_type_file(std::filesystem::path const& path, ast::NodeCPtr root) {
-
-	// TODO - pop type loading
-
-	if (pop_types.empty())
-		return add_pop_type("test_pop_type", 0xFF0000, PopType::strata_t::POOR, 1, 1, 1, false, false, false, false);
-	return true;
-}
-
-bool PopManager::load_pop_into_province(Province& province, ast::NodeCPtr root) const {
-	static PopType const* type = get_pop_type_by_identifier("test_pop_type");
-	Culture const* culture = nullptr;
-	Religion const* religion = nullptr;
-	Pop::pop_size_t size = 0;
-
-	bool ret = expect_assign(
-		[this, &culture, &religion, &size](std::string_view, ast::NodeCPtr pop_node) -> bool {
-			return expect_dictionary_keys(
-				"culture", ONE_EXACTLY,
-					expect_identifier(
-						[&culture, this](std::string_view identifier) -> bool {
-							culture = culture_manager.get_culture_by_identifier(identifier);
-							if (culture != nullptr) return true;
-							Logger::error("Invalid pop culture: ", identifier);
-							return false;
-						}
-					),
-				"religion", ONE_EXACTLY,
-					expect_identifier(
-						[&religion, this](std::string_view identifier) -> bool {
-							religion = religion_manager.get_religion_by_identifier(identifier);
-							if (religion != nullptr) return true;
-							Logger::error("Invalid pop religion: ", identifier);
-							return false;
-						}
-					),
-				"size", ONE_EXACTLY, expect_uint(assign_variable_callback_uint("pop size", size)),
-				"militancy", ZERO_OR_ONE, success_callback,
-				"rebel_type", ZERO_OR_ONE, success_callback
-			)(pop_node);
-		}
-	)(root);
-
-	if (type != nullptr && culture != nullptr && religion != nullptr && size > 0) {
-		ret &= province.add_pop({ *type, *culture, *religion, size });
-	} else {
-		Logger::error("Some pop arguments are invalid: type = ", type, ", culture = ", culture, ", religion = ", religion, ", size = ", size);
-		ret = false;
-	}
-	return ret;
-}
diff --git a/src/openvic/pop/Pop.hpp b/src/openvic/pop/Pop.hpp
deleted file mode 100644
index f4694f0..0000000
--- a/src/openvic/pop/Pop.hpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#pragma once
-
-#include <filesystem>
-
-#include "openvic/pop/Culture.hpp"
-#include "openvic/pop/Religion.hpp"
-
-namespace OpenVic {
-
-	struct PopManager;
-	struct PopType;
-
-	/* REQUIREMENTS:
-	 * POP-18, POP-19, POP-20, POP-21
-	 */
-	struct Pop {
-		friend struct PopManager;
-
-		using pop_size_t = int64_t;
-
-	private:
-		PopType const& type;
-		Culture const& culture;
-		Religion const& religion;
-		pop_size_t size, num_promoted, num_demoted, num_migrated;
-
-		Pop(PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size);
-
-	public:
-		Pop(Pop const&) = delete;
-		Pop(Pop&&) = default;
-		Pop& operator=(Pop const&) = delete;
-		Pop& operator=(Pop&&) = delete;
-
-		PopType const& get_type() const;
-		Culture const& get_culture() const;
-		Religion const& get_religion() const;
-		pop_size_t get_size() const;
-		pop_size_t get_num_promoted() const;
-		pop_size_t get_num_demoted() const;
-		pop_size_t get_num_migrated() const;
-		pop_size_t get_pop_daily_change() const;
-	};
-
-	/* REQUIREMENTS:
-	 * POP-26
-	 */
-	struct PopType : HasIdentifierAndColour {
-		friend struct PopManager;
-
-		using sprite_t = uint8_t;
-
-	private:
-		const enum class strata_t {
-			POOR,
-			MIDDLE,
-			RICH
-		} strata;
-		const sprite_t sprite;
-		const Pop::pop_size_t max_size, merge_max_size;
-		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(const std::string_view 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;
-
-		strata_t get_strata() const;
-		sprite_t get_sprite() const;
-		Pop::pop_size_t get_max_size() const;
-		Pop::pop_size_t get_merge_max_size() const;
-		bool get_state_capital_only() const;
-		bool get_demote_migrant() const;
-		bool get_is_artisan() const;
-		bool get_is_slave() const;
-	};
-
-	struct Province;
-
-	struct PopManager {
-	private:
-		IdentifierRegistry<PopType> pop_types;
-
-	public:
-		CultureManager culture_manager;
-		ReligionManager religion_manager;
-
-		PopManager();
-
-		bool add_pop_type(const std::string_view 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(const std::string_view identifier) const;
-		size_t get_pop_type_count() const;
-		std::vector<PopType> const& get_pop_types() const;
-
-		bool load_pop_type_file(std::filesystem::path const& path, ast::NodeCPtr root);
-		bool load_pop_into_province(Province& province, ast::NodeCPtr root) const;
-	};
-}
diff --git a/src/openvic/pop/Religion.cpp b/src/openvic/pop/Religion.cpp
deleted file mode 100644
index f7c657a..0000000
--- a/src/openvic/pop/Religion.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "Religion.hpp"
-
-#include <cassert>
-
-using namespace OpenVic;
-using namespace OpenVic::NodeTools;
-
-ReligionGroup::ReligionGroup(const std::string_view new_identifier) : HasIdentifier { new_identifier } {}
-
-Religion::Religion(const 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, true },
-	  group { new_group },
-	  icon { new_icon },
-	  pagan { new_pagan } {
-	assert(icon > 0);
-}
-
-ReligionGroup const& Religion::get_group() const {
-	return group;
-}
-
-Religion::icon_t Religion::get_icon() const {
-	return icon;
-}
-
-bool Religion::get_pagan() const {
-	return pagan;
-}
-
-ReligionManager::ReligionManager()
-	: religion_groups { "religion groups" },
-	  religions { "religions" } {}
-
-bool ReligionManager::add_religion_group(const std::string_view identifier) {
-	if (identifier.empty()) {
-		Logger::error("Invalid religion group identifier - empty!");
-		return false;
-	}
-	return religion_groups.add_item({ identifier });
-}
-
-void ReligionManager::lock_religion_groups() {
-	religion_groups.lock();
-}
-
-ReligionGroup const* ReligionManager::get_religion_group_by_identifier(const std::string_view identifier) const {
-	return religion_groups.get_item_by_identifier(identifier);
-}
-
-size_t ReligionManager::get_religion_group_count() const {
-	return religion_groups.size(); 
-}
-
-std::vector<ReligionGroup> const& ReligionManager::get_religion_groups() const {
-	return religion_groups.get_items();
-}
-
-bool ReligionManager::add_religion(const std::string_view 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 false;
-	}
-	if (identifier.empty()) {
-		Logger::error("Invalid religion identifier - empty!");
-		return false;
-	}
-	if (group == nullptr) {
-		Logger::error("Null religion group for ", identifier);
-		return false;
-	}
-	if (colour > MAX_COLOUR_RGB) {
-		Logger::error("Invalid religion colour for ", identifier, ": ", colour_to_hex_string(colour));
-		return false;
-	}
-	if (icon <= 0) {
-		Logger::error("Invalid religion icon for ", identifier, ": ", icon);
-		return false;
-	}
-	return religions.add_item({ identifier, colour, *group, icon, pagan });
-}
-
-void ReligionManager::lock_religions() {
-	religions.lock();
-}
-
-Religion const* ReligionManager::get_religion_by_identifier(const std::string_view identifier) const {
-	return religions.get_item_by_identifier(identifier);
-}
-
-size_t ReligionManager::get_religion_count() const {
-	return religions.size(); 
-}
-
-std::vector<Religion> const& ReligionManager::get_religions() const {
-	return religions.get_items();
-}
-
-bool ReligionManager::load_religion_file(ast::NodeCPtr root) {
-
-	size_t total_expected_religions = 0;
-	bool ret = expect_dictionary_reserve_length(
-		religion_groups,
-		[this, &total_expected_religions](std::string_view key, ast::NodeCPtr value) -> bool {
-			bool ret = expect_list_and_length(
-				[&total_expected_religions](size_t size) -> size_t {
-					total_expected_religions += size;
-					return 0;
-				},
-				success_callback
-			)(value);
-			ret &= add_religion_group(key);
-			return ret;
-		}
-	)(root);
-	lock_religion_groups();
-	religions.reserve(religions.size() + total_expected_religions);
-	ret &= expect_dictionary(
-		[this](std::string_view religion_group_key, ast::NodeCPtr religion_group_value) -> bool {
-
-			ReligionGroup const* religion_group = get_religion_group_by_identifier(religion_group_key);
-
-			return expect_dictionary(
-				[this, religion_group](std::string_view key, ast::NodeCPtr value) -> bool {
-					colour_t colour = NULL_COLOUR;
-					Religion::icon_t icon = 0;
-					bool pagan = false;
-
-					bool ret = expect_dictionary_keys(
-						"icon", ONE_EXACTLY, expect_uint(assign_variable_callback_uint("religion icon", icon)),
-						"color", ONE_EXACTLY, expect_colour(assign_variable_callback(colour)),
-						"pagan", ZERO_OR_ONE, expect_bool(assign_variable_callback(pagan))
-					)(value);
-					ret &= add_religion(key, colour, religion_group, icon, pagan);
-					return ret;
-				}
-			)(religion_group_value);
-		}
-	)(root);
-	lock_religions();
-	return ret;
-}
diff --git a/src/openvic/pop/Religion.hpp b/src/openvic/pop/Religion.hpp
deleted file mode 100644
index f04b035..0000000
--- a/src/openvic/pop/Religion.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include "openvic/types/IdentifierRegistry.hpp"
-#include "openvic/dataloader/NodeTools.hpp"
-
-namespace OpenVic {
-
-	struct ReligionManager;
-
-	struct ReligionGroup : HasIdentifier {
-		friend struct ReligionManager;
-
-	private:
-		ReligionGroup(const std::string_view new_identifier);
-
-	public:
-		ReligionGroup(ReligionGroup&&) = default;
-	};
-
-	struct Religion : HasIdentifierAndColour {
-		friend struct ReligionManager;
-
-		using icon_t = uint8_t;
-
-	private:
-		ReligionGroup const& group;
-		const icon_t icon;
-		const bool pagan;
-
-		Religion(const std::string_view new_identifier, colour_t new_colour, ReligionGroup const& new_group, icon_t new_icon, bool new_pagan);
-
-	public:
-		Religion(Religion&&) = default;
-
-		ReligionGroup const& get_group() const;
-		icon_t get_icon() const;
-		bool get_pagan() const;
-	};
-
-	struct ReligionManager {
-	private:
-		IdentifierRegistry<ReligionGroup> religion_groups;
-		IdentifierRegistry<Religion> religions;
-
-	public:
-		ReligionManager();
-
-		bool add_religion_group(const std::string_view identifier);
-		void lock_religion_groups();
-		ReligionGroup const* get_religion_group_by_identifier(const std::string_view identifier) const;
-		size_t get_religion_group_count() const;
-		std::vector<ReligionGroup> const& get_religion_groups() const;
-
-		bool add_religion(const std::string_view identifier, colour_t colour, ReligionGroup const* group, Religion::icon_t icon, bool pagan);
-		void lock_religions();
-		Religion const* get_religion_by_identifier(const std::string_view identifier) const;
-		size_t get_religion_count() const;
-		std::vector<Religion> const& get_religions() const;
-
-		bool load_religion_file(ast::NodeCPtr root);
-	};
-}