2 files changed, 43 insertions, 5 deletions

diff --git a/extension/src/openvic2/Map.cpp b/extension/src/openvic2/Map.cpp
index 542a876..d980b88 100644
--- a/extension/src/openvic2/Map.cpp
+++ b/extension/src/openvic2/Map.cpp
@@ -1,12 +1,17 @@
 #include "Map.hpp"
 
+#include <cassert>
 #include <sstream>
 #include <iomanip>
 
 using namespace OpenVic2;
 
-Province::Province(std::string const& new_identifier, colour_t new_colour) :
-	identifier(new_identifier), colour(new_colour) {}
+Province::Province(index_t new_index, std::string const& new_identifier, colour_t new_colour) :
+	index(new_index), identifier(new_identifier), colour(new_colour) {
+	assert(index != NULL_INDEX);
+	assert(!identifier.empty());
+	assert(colour != NULL_COLOUR);
+}
 
 std::string Province::colour_to_hex_string(colour_t colour) {
 	std::ostringstream stream;
@@ -14,6 +19,10 @@ std::string Province::colour_to_hex_string(colour_t colour) {
 	return stream.str();
 }
 
+Province::index_t Province::get_index() const {
+	return index;
+}
+
 std::string const& Province::get_identifier() const {
 	return identifier;
 }
@@ -23,15 +32,23 @@ Province::colour_t Province::get_colour() const {
 }
 
 std::string Province::to_string() const {
-	return "(" + identifier + ", " + colour_to_hex_string(colour) + ")";
+	return "(#" + std::to_string(index) + ", " + identifier + ", 0x" + colour_to_hex_string(colour) + ")";
 }
 
 bool Map::add_province(std::string const& identifier, Province::colour_t colour, std::string& error_message) {
+	if (provinces_locked) {
+		error_message = "The map's province list has already been locked!";
+		return false;
+	}
+	if (provinces.size() >= Province::MAX_INDEX) {
+		error_message = "The map's province list is full - there can be at most " + std::to_string(Province::MAX_INDEX) + " provinces";
+		return false;
+	}
 	if (colour == Province::NULL_COLOUR || colour > Province::MAX_COLOUR) {
 		error_message = "Invalid province colour: " + Province::colour_to_hex_string(colour);
 		return false;
 	}
-	Province new_province{ identifier, colour };
+	Province new_province{ static_cast<Province::index_t>(provinces.size() + 1), identifier, colour };
 	for (Province const& province : provinces) {
 		if (province.identifier == identifier) {
 			error_message = "Duplicate province identifiers: " + province.to_string() + " and " + new_province.to_string();
@@ -47,6 +64,18 @@ bool Map::add_province(std::string const& identifier, Province::colour_t colour,
 	return true;
 }
 
+void Map::lock_provinces() {
+	provinces_locked = true;
+}
+
+size_t Map::get_province_count() const {
+	return provinces.size();
+}
+
+Province* Map::get_province_by_index(Province::index_t index) {
+	return index != Province::NULL_INDEX && index <= provinces.size() ? &provinces[index - 1] : nullptr;
+}
+
 Province* Map::get_province_by_identifier(std::string const& identifier) {
 	for (Province& province : provinces)
 		if (province.identifier == identifier) return &province;
diff --git a/extension/src/openvic2/Map.hpp b/extension/src/openvic2/Map.hpp
index f3fd1ef..365d78b 100644
--- a/extension/src/openvic2/Map.hpp
+++ b/extension/src/openvic2/Map.hpp
@@ -8,16 +8,20 @@ namespace OpenVic2 {
 
 	struct Province {
 		using colour_t = uint32_t;
+		using index_t = uint16_t;
 		friend struct Map;
 		static const colour_t NULL_COLOUR = 0, MAX_COLOUR = 0xFFFFFF;
+		static const index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF;
 	private:
+		index_t index;
 		std::string identifier;
 		colour_t colour;
 
-		Province(std::string const& identifier, colour_t colour);
+		Province(index_t index, std::string const& identifier, colour_t colour);
 	public:
 		static std::string colour_to_hex_string(colour_t colour);
 
+		index_t get_index() const;
 		std::string const& get_identifier() const;
 		colour_t get_colour() const;
 		std::string to_string() const;
@@ -26,9 +30,14 @@ namespace OpenVic2 {
 	struct Map {
 	private:
 		std::vector<Province> provinces;
+		bool provinces_locked = false;
 
 	public:
 		bool add_province(std::string const& identifier, Province::colour_t colour, std::string& error_message);
+		void lock_provinces();
+		size_t get_province_count() const;
+
+		Province* get_province_by_index(Province::index_t index);
 		Province* get_province_by_identifier(std::string const& identifier);
 		Province* get_province_by_colour(Province::colour_t colour);
 	};