Map modes + moved province index image to SIM side

15 files changed, 448 insertions, 187 deletions

diff --git a/extension/src/MapMesh.cpp b/extension/src/MapMesh.cpp
index f0fc819..91c7611 100644
--- a/extension/src/MapMesh.cpp
+++ b/extension/src/MapMesh.cpp
@@ -111,7 +111,6 @@ Array MapMesh::_create_mesh_array() const {
 		uv.x = -repeat_proportion;
 
 		for (int i = 0; i <= subdivide_w + 1; ++i) {
-
 			points[point_index] = point;
 			normals[point_index] = normal;
 			tangents[point_index * 4 + 0] = 1.0f;
diff --git a/extension/src/MapSingleton.cpp b/extension/src/MapSingleton.cpp
index 0d4191e..982ad78 100644
--- a/extension/src/MapSingleton.cpp
+++ b/extension/src/MapSingleton.cpp
@@ -13,11 +13,17 @@ void MapSingleton::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("load_province_identifier_file", "file_path"), &MapSingleton::load_province_identifier_file);
 	ClassDB::bind_method(D_METHOD("load_region_file", "file_path"), &MapSingleton::load_region_file);
 	ClassDB::bind_method(D_METHOD("load_province_shape_file", "file_path"), &MapSingleton::load_province_shape_file);
+
 	ClassDB::bind_method(D_METHOD("get_province_identifier_from_pixel_coords", "coords"), &MapSingleton::get_province_identifier_from_pixel_coords);
 	ClassDB::bind_method(D_METHOD("get_width"), &MapSingleton::get_width);
 	ClassDB::bind_method(D_METHOD("get_height"), &MapSingleton::get_height);
 	ClassDB::bind_method(D_METHOD("get_province_index_image"), &MapSingleton::get_province_index_image);
 	ClassDB::bind_method(D_METHOD("get_province_colour_image"), &MapSingleton::get_province_colour_image);
+
+	ClassDB::bind_method(D_METHOD("update_colour_image"), &MapSingleton::update_colour_image);
+	ClassDB::bind_method(D_METHOD("get_mapmode_count"), &MapSingleton::get_mapmode_count);
+	ClassDB::bind_method(D_METHOD("get_mapmode_identifier", "index"), &MapSingleton::get_mapmode_identifier);
+	ClassDB::bind_method(D_METHOD("set_mapmode", "identifier"), &MapSingleton::set_mapmode);
 }
 
 MapSingleton* MapSingleton::get_singleton() {
@@ -27,6 +33,24 @@ MapSingleton* MapSingleton::get_singleton() {
 MapSingleton::MapSingleton() {
 	ERR_FAIL_COND(singleton != nullptr);
 	singleton = this;
+
+	using mapmode_t = std::pair<std::string, Mapmode::colour_func_t>;
+	const std::vector<mapmode_t> mapmodes = {
+		{ "mapmode_province", [](Map const&, Province const& province) -> Province::colour_t { return province.get_colour(); } },
+		{ "mapmode_region", [](Map const&, Province const& province) -> Province::colour_t {
+			Region const* region = province.get_region();
+			if (region != nullptr) return region->get_provinces().front()->get_colour();
+			return province.get_colour();
+		} },
+		{ "mapmode_index", [](Map const& map, Province const& province) -> Province::colour_t {
+			const uint8_t f = float(province.get_index()) / float(map.get_province_count()) * 255.0f;
+			return (f << 16) | (f << 8) | f;
+		} }
+	};
+	std::string error_message = "";
+	for (mapmode_t mapmode : mapmodes)
+		if (map.add_mapmode(mapmode.first, mapmode.second, error_message) != SUCCESS)
+			UtilityFunctions::push_error(error_message.c_str());
 }
 
 MapSingleton::~MapSingleton() {
@@ -34,10 +58,8 @@ MapSingleton::~MapSingleton() {
 	singleton = nullptr;
 }
 
-typedef Error (MapSingleton::* parse_json_entry_function)(String const& identifier, Variant const& entry);
-
-static Error parse_json_dictionary_file(String const& file_description, String const& file_path,
-	String const& identifier_prefix, MapSingleton* map_singleton, parse_json_entry_function parse_entry) {
+Error MapSingleton::parse_json_dictionary_file(String const& file_description, String const& file_path,
+	String const& identifier_prefix, parse_json_entry_func_t parse_entry) {
 	UtilityFunctions::print("Loading ", file_description, " file: ", file_path);
 	Ref<FileAccess> file = FileAccess::open(file_path, FileAccess::ModeFlags::READ);
 	Error err = FileAccess::get_open_error();
@@ -49,7 +71,7 @@ static Error parse_json_dictionary_file(String const& file_description, String c
 	Ref<JSON> json;
 	json.instantiate();
 	err = json->parse(json_string);
-	if (err) {
+	if (err != OK) {
 		UtilityFunctions::push_error("Failed to parse ", file_description, " file as JSON: ", file_path,
 			"\nError at line ", json->get_error_line(), ": ", json->get_error_message());
 		return err;
@@ -73,7 +95,7 @@ static Error parse_json_dictionary_file(String const& file_description, String c
 		}
 		if (!identifier.begins_with(identifier_prefix))
 			UtilityFunctions::push_warning("Identifier in ", file_description, " file missing \"", identifier_prefix, "\" prefix: ", identifier);
-		if ((map_singleton->*parse_entry)(identifier, entry) != OK) err = FAILED;
+		if ((this->*parse_entry)(identifier, entry) != OK) err = FAILED;
 	}
 	return err;
 }
@@ -114,8 +136,8 @@ Error MapSingleton::_parse_province_identifier_entry(String const& identifier, V
 		UtilityFunctions::push_error("Invalid colour for province identifier \"", identifier, "\": ", entry);
 		return FAILED;
 	}
-	std::string error_message;
-	if (!map.add_province(identifier.utf8().get_data(), colour, error_message)) {
+	std::string error_message = "";
+	if (map.add_province(identifier.utf8().get_data(), colour, error_message) != SUCCESS) {
 		UtilityFunctions::push_error(error_message.c_str());
 		return FAILED;
 	}
@@ -124,7 +146,7 @@ Error MapSingleton::_parse_province_identifier_entry(String const& identifier, V
 
 Error MapSingleton::load_province_identifier_file(String const& file_path) {
 	const Error err = parse_json_dictionary_file("province identifier",
-		file_path, "prov_", this, &MapSingleton::_parse_province_identifier_entry);
+		file_path, "prov_", &MapSingleton::_parse_province_identifier_entry);
 	map.lock_provinces();
 	return err;
 }
@@ -147,8 +169,8 @@ Error MapSingleton::_parse_region_entry(String const& identifier, Variant const&
 			}
 		}
 	}
-	std::string error_message;
-	if (!map.add_region(identifier.utf8().get_data(), province_identifiers, error_message)) {
+	std::string error_message = "";
+	if (map.add_region(identifier.utf8().get_data(), province_identifiers, error_message) != SUCCESS) {
 		UtilityFunctions::push_error(error_message.c_str());
 		return FAILED;
 	}
@@ -157,29 +179,25 @@ Error MapSingleton::_parse_region_entry(String const& identifier, Variant const&
 
 Error MapSingleton::load_region_file(String const& file_path) {
 	const Error err = parse_json_dictionary_file("region",
-		file_path, "region_", this, &MapSingleton::_parse_region_entry);
+		file_path, "region_", &MapSingleton::_parse_region_entry);
 	map.lock_regions();
 	return err;
 }
 
-static Province::colour_t colour_at(PackedByteArray const& colour_data_array, int32_t idx) {
-	return (colour_data_array[idx * 3] << 16) | (colour_data_array[idx * 3 + 1] << 8) | colour_data_array[idx * 3 + 2];
-}
-
 Error MapSingleton::load_province_shape_file(String const& file_path) {
-	if (province_shape_image.is_valid()) {
+	if (province_index_image.is_valid()) {
 		UtilityFunctions::push_error("Province shape file has already been loaded, cannot load: ", file_path);
 		return FAILED;
 	}
+	Ref<Image> province_shape_image;
 	province_shape_image.instantiate();
 	Error err = province_shape_image->load(file_path);
 	if (err != OK) {
 		UtilityFunctions::push_error("Failed to load province shape file: ", file_path);
-		province_shape_image.unref();
 		return err;
 	}
-	width = province_shape_image->get_width();
-	height = province_shape_image->get_height();
+	int32_t width = province_shape_image->get_width();
+	int32_t height = province_shape_image->get_height();
 	if (width < 1 || height < 1) {
 		UtilityFunctions::push_error("Invalid dimensions (", width, "x", height, ") for province shape file: ", file_path);
 		err = FAILED;
@@ -190,61 +208,17 @@ Error MapSingleton::load_province_shape_file(String const& file_path) {
 		UtilityFunctions::push_error("Invalid format (", format, ", should be ", expected_format, ") for province shape file: ", file_path);
 		err = FAILED;
 	}
-	if (err) {
-		province_shape_image.unref();
-		return err;
-	}
+	if (err != OK) return err;
 
-	std::vector<bool> province_checklist(map.get_province_count());
+	std::string error_message = "";
+	if (map.generate_province_index_image(width, height, province_shape_image->get_data().ptr(), error_message) != SUCCESS) {
+		UtilityFunctions::push_error(error_message.c_str());
+		err = FAILED;
+	}
 
-	const PackedByteArray shape_data_array = province_shape_image->get_data();
 	PackedByteArray index_data_array;
 	index_data_array.resize(width * height * sizeof(Province::index_t));
-	Province::index_t* index_data = reinterpret_cast<Province::index_t*>(index_data_array.ptrw());
-
-	for (int32_t y = 0; y < height; ++y) {
-		for (int32_t x = 0; x < width; ++x) {
-			const int32_t idx = x + y * width;
-			const Province::colour_t colour = colour_at(shape_data_array, idx);
-			if (colour == Province::NULL_COLOUR) {
-				index_data[idx] = Province::NULL_INDEX;
-				continue;
-			}
-			if (x > 0) {
-				const int32_t jdx = idx - 1;
-				if (colour_at(shape_data_array, jdx) == colour) {
-					index_data[idx] = index_data[jdx];
-					continue;
-				}
-			}
-			if (y > 0) {
-				const int32_t jdx = idx - width;
-				if (colour_at(shape_data_array, jdx) == colour) {
-					index_data[idx] = index_data[jdx];
-					continue;
-				}
-			}
-			Province const* province = map.get_province_by_colour(colour);
-			if (province) {
-				const Province::index_t index = province->get_index();
-				index_data[idx] = index;
-				province_checklist[index - 1] = true;
-				continue;
-			}
-			UtilityFunctions::push_error("Unrecognised province colour ", Province::colour_to_hex_string(colour).c_str(), " at (", x, ", ", y, ")");
-			err = FAILED;
-			index_data[idx] = Province::NULL_INDEX;
-		}
-	}
-
-	for (size_t idx = 0; idx < province_checklist.size(); ++idx) {
-		if (!province_checklist[idx]) {
-			Province const* province = map.get_province_by_index(idx + 1);
-			if (province) UtilityFunctions::push_error("Province missing from shape image: ", province->to_string().c_str());
-			else UtilityFunctions::push_error("Province missing for index: ", static_cast<int32_t>(idx + 1));
-			err = FAILED;
-		}
-	}
+	memcpy(index_data_array.ptrw(), map.get_province_index_image().data(), index_data_array.size());
 
 	province_index_image = Image::create_from_data(width, height, false, Image::FORMAT_RG8, index_data_array);
 	if (province_index_image.is_null()) {
@@ -252,25 +226,7 @@ Error MapSingleton::load_province_shape_file(String const& file_path) {
 		err = FAILED;
 	}
 
-	PackedByteArray colour_data_array;
-	colour_data_array.resize((Province::MAX_INDEX + 1) * 3);
-	for (size_t idx = 1; idx <= map.get_province_count(); ++idx) {
-		Province const* province = map.get_province_by_index(idx);
-		if (province) {
-			Province::colour_t colour = colour = province->get_colour();
-			const Region* region = province->get_region();
-			if (region) colour = region->get_provinces().front()->get_colour();
-			colour_data_array[3 * idx + 0] = (colour >> 16) & 0xFF;
-			colour_data_array[3 * idx + 1] = (colour >> 8) & 0xFF;
-			colour_data_array[3 * idx + 2] = colour & 0xFF;
-		} else UtilityFunctions::push_error("Missing province at index ", static_cast<int32_t>(idx));
-	}
-	static const int32_t PROVINCE_INDEX_SQRT = 1 << (sizeof(Province::index_t) * 4);
-	province_colour_image = Image::create_from_data(PROVINCE_INDEX_SQRT, PROVINCE_INDEX_SQRT, false, Image::FORMAT_RGB8, colour_data_array);
-	if (province_colour_image.is_null()) {
-		UtilityFunctions::push_error("Failed to create province colour image");
-		err = FAILED;
-	}
+	if (update_colour_image() != OK) err = FAILED;
 
 	return err;
 }
@@ -279,20 +235,20 @@ String MapSingleton::get_province_identifier_from_pixel_coords(Vector2i const& c
 	if (province_index_image.is_valid()) {
 		const PackedByteArray index_data_array = province_index_image->get_data();
 		Province::index_t const* index_data = reinterpret_cast<Province::index_t const*>(index_data_array.ptr());
-		const int32_t x_mod_w = UtilityFunctions::posmod(coords.x, width);
-		const int32_t y_mod_h = UtilityFunctions::posmod(coords.y, height);
-		Province const* province = map.get_province_by_index(index_data[x_mod_w + y_mod_h * width]);
-		if (province) return province->get_identifier().c_str();
+		const int32_t x_mod_w = UtilityFunctions::posmod(coords.x, get_width());
+		const int32_t y_mod_h = UtilityFunctions::posmod(coords.y, get_height());
+		Province const* province = map.get_province_by_index(index_data[x_mod_w + y_mod_h * get_width()]);
+		if (province != nullptr) return province->get_identifier().c_str();
 	}
 	return String{};
 }
 
 int32_t MapSingleton::get_width() const {
-	return width;
+	return map.get_width();
 }
 
 int32_t MapSingleton::get_height() const {
-	return height;
+	return map.get_height();
 }
 
 Ref<Image> MapSingleton::get_province_index_image() const {
@@ -302,3 +258,48 @@ Ref<Image> MapSingleton::get_province_index_image() const {
 Ref<Image> MapSingleton::get_province_colour_image() const {
 	return province_colour_image;
 }
+
+Error MapSingleton::update_colour_image() {
+	static PackedByteArray colour_data_array;
+	static const int64_t colour_data_array_size = (Province::MAX_INDEX + 1) * 3;
+	colour_data_array.resize(colour_data_array_size);
+
+	Error err = OK;
+	std::string error_message = "";
+	if (map.generate_mapmode_colours(mapmode_index, colour_data_array.ptrw(), error_message) != SUCCESS) {
+		UtilityFunctions::push_error(error_message.c_str());
+		err = FAILED;
+	}
+
+	static const int32_t PROVINCE_INDEX_SQRT = 1 << (sizeof(Province::index_t) * 4);
+	if (province_colour_image.is_null())
+		province_colour_image.instantiate();
+	province_colour_image->set_data(PROVINCE_INDEX_SQRT, PROVINCE_INDEX_SQRT,
+		false, Image::FORMAT_RGB8, colour_data_array);
+	if (province_colour_image.is_null()) {
+		UtilityFunctions::push_error("Failed to update province colour image");
+		return FAILED;
+	}
+	return err;
+}
+
+int32_t MapSingleton::get_mapmode_count() const {
+	return map.get_mapmode_count();
+}
+
+String MapSingleton::get_mapmode_identifier(int32_t index) const {
+	Mapmode const* mapmode = map.get_mapmode_by_index(index);
+	if (mapmode != nullptr) return mapmode->get_identifier().c_str();
+	return String{};
+}
+
+Error MapSingleton::set_mapmode(godot::String const& identifier) {
+	Mapmode const* mapmode = map.get_mapmode_by_identifier(identifier.utf8().get_data());
+	if (mapmode != nullptr) {
+		mapmode_index = mapmode->get_index();
+		return OK;
+	} else {
+		UtilityFunctions::push_error("Failed to set mapmode to: ", identifier);
+		return FAILED;
+	}
+}
diff --git a/extension/src/MapSingleton.hpp b/extension/src/MapSingleton.hpp
index d0f4dc3..55d2883 100644
--- a/extension/src/MapSingleton.hpp
+++ b/extension/src/MapSingleton.hpp
@@ -6,15 +6,18 @@
 
 namespace OpenVic2 {
 	class MapSingleton : public godot::Object {
+		using parse_json_entry_func_t = godot::Error (MapSingleton::*)(godot::String const& identifier, godot::Variant const& entry);
 
 		GDCLASS(MapSingleton, godot::Object)
 
 		static MapSingleton* singleton;
 
-		godot::Ref<godot::Image> province_shape_image, province_index_image, province_colour_image;
-		int32_t width = 0, height = 0;
+		godot::Ref<godot::Image> province_index_image, province_colour_image;
 		Map map;
+		Mapmode::index_t mapmode_index = 0;
 
+		godot::Error parse_json_dictionary_file(godot::String const& file_description, godot::String const& file_path,
+			godot::String const& identifier_prefix, parse_json_entry_func_t parse_entry);
 		godot::Error _parse_province_identifier_entry(godot::String const& identifier, godot::Variant const& entry);
 		godot::Error _parse_region_entry(godot::String const& identifier, godot::Variant const& entry);
 	protected:
@@ -29,10 +32,16 @@ namespace OpenVic2 {
 		godot::Error load_province_identifier_file(godot::String const& file_path);
 		godot::Error load_region_file(godot::String const& file_path);
 		godot::Error load_province_shape_file(godot::String const& file_path);
+
 		godot::String get_province_identifier_from_pixel_coords(godot::Vector2i const& coords) const;
 		int32_t get_width() const;
 		int32_t get_height() const;
 		godot::Ref<godot::Image> get_province_index_image() const;
 		godot::Ref<godot::Image> get_province_colour_image() const;
+
+		godot::Error update_colour_image();
+		int32_t get_mapmode_count() const;
+		godot::String get_mapmode_identifier(int32_t index) const;
+		godot::Error set_mapmode(godot::String const& identifier);
 	};
 }
diff --git a/extension/src/openvic2/Map.cpp b/extension/src/openvic2/Map.cpp
index 6e1c08a..921f371 100644
--- a/extension/src/openvic2/Map.cpp
+++ b/extension/src/openvic2/Map.cpp
@@ -1,126 +1,91 @@
 #include "Map.hpp"
 
 #include <cassert>
-#include <sstream>
-#include <iomanip>
 
 using namespace OpenVic2;
 
-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);
-}
+static const std::string SEPARATOR = "\n - ";
 
-std::string Province::colour_to_hex_string(colour_t colour) {
-	std::ostringstream stream;
-	stream << std::hex << std::setfill('0') << std::setw(6) << colour;
-	return stream.str();
+Mapmode::Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func)
+	: index(new_index), identifier(new_identifier), colour_func(new_colour_func) {
+	assert(!identifier.empty());
+	assert(colour_func != nullptr);
 }
 
-Province::index_t Province::get_index() const {
+Mapmode::index_t Mapmode::get_index() const {
 	return index;
 }
 
-std::string const& Province::get_identifier() const {
+std::string const& Mapmode::get_identifier() const {
 	return identifier;
 }
 
-Province::colour_t Province::get_colour() const {
-	return colour;
-}
-
-Region* Province::get_region() const {
-	return region;
-}
-
-std::string Province::to_string() const {
-	return "(#" + std::to_string(index) + ", " + identifier + ", 0x" + colour_to_hex_string(colour) + ")";
-}
-
-Region::Region(std::string const& new_identifier) : identifier(new_identifier) {
-	assert(!identifier.empty());
-}
-
-std::string const& Region::get_identifier() const {
-	return identifier;
-}
-
-size_t Region::get_province_count() const {
-	return provinces.size();
-}
-
-bool Region::contains_province(Province const* province) const {
-	return province && std::find(provinces.begin(), provinces.end(), province) != provinces.end();
-}
-
-std::vector<Province*> const& Region::get_provinces() const {
-	return provinces;
+Mapmode::colour_func_t Mapmode::get_colour_func() const {
+	return colour_func;
 }
 
-bool Map::add_province(std::string const& identifier, Province::colour_t colour, std::string& error_message) {
+return_t 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;
+		return FAILURE;
 	}
 	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;
+		return FAILURE;
 	}
 	if (identifier.empty()) {
 		error_message = "Empty province identifier for colour " + Province::colour_to_hex_string(colour);
-		return false;
+		return FAILURE;
 	}
 	if (colour == Province::NULL_COLOUR || colour > Province::MAX_COLOUR) {
 		error_message = "Invalid province colour: " + Province::colour_to_hex_string(colour);
-		return false;
+		return FAILURE;
 	}
 	Province new_province{ static_cast<Province::index_t>(provinces.size() + 1), identifier, colour };
 	for (Province const& province : provinces) {
-		if (province.identifier == identifier) {
+		if (province.get_identifier() == identifier) {
 			error_message = "Duplicate province identifiers: " + province.to_string() + " and " + new_province.to_string();
-			return false;
+			return FAILURE;
 		}
-		if (province.colour == colour) {
+		if (province.get_colour() == colour) {
 			error_message = "Duplicate province colours: " + province.to_string() + " and " + new_province.to_string();
-			return false;
+			return FAILURE;
 		}
 	}
 	provinces.push_back(new_province);
 	error_message = "Added province: " + new_province.to_string();
-	return true;
+	return SUCCESS;
 }
 
 void Map::lock_provinces() {
 	provinces_locked = true;
 }
 
-bool Map::add_region(std::string const& identifier, std::vector<std::string> const& province_identifiers, std::string& error_message) {
+return_t Map::add_region(std::string const& identifier, std::vector<std::string> const& province_identifiers, std::string& error_message) {
 	if (regions_locked) {
 		error_message = "The map's region list has already been locked!";
-		return false;
+		return FAILURE;
 	}
 	if (identifier.empty()) {
 		error_message = "Empty region identifier!";
-		return false;
+		return FAILURE;
 	}
 	if (provinces.empty()) {
 		error_message = "Empty province list for region " + identifier;
-		return false;
+		return FAILURE;
 	}
 	Region new_region{ identifier };
 	error_message = "Error message for region: " + identifier;
-	static const std::string SEPARATOR = "\n - ";
 	for (std::string const& province_identifier : province_identifiers) {
 		Province* province = get_province_by_identifier(province_identifier);
-		if (province) {
+		if (province != nullptr) {
 			if (new_region.contains_province(province))
 				error_message += SEPARATOR + "Duplicate province identifier " + province_identifier;
 			else {
-				if (province->region) {
+				size_t other_region_index = reinterpret_cast<size_t>(province->get_region());
+				if (other_region_index != 0) {
+					other_region_index--;
 					error_message += SEPARATOR + "Province " + province_identifier + " is already part of ";
-					const size_t other_region_index = reinterpret_cast<size_t>(province->region) - 1;
 					if (other_region_index < regions.size())
 						error_message += regions[other_region_index].get_identifier();
 					else
@@ -131,12 +96,12 @@ bool Map::add_region(std::string const& identifier, std::vector<std::string> con
 	}
 	if (!new_region.get_province_count()) {
 		error_message += SEPARATOR + "No valid provinces in region's list";
-		return false;
+		return FAILURE;
 	}
 	for (Region const& region : regions) {
-		if (region.identifier == identifier) {
+		if (region.get_identifier() == identifier) {
 			error_message += SEPARATOR + "Duplicate region identifiers: " + region.get_identifier() + " and " + identifier;
-			return false;
+			return FAILURE;
 		}
 	}
 	regions.push_back(new_region);
@@ -144,15 +109,15 @@ bool Map::add_region(std::string const& identifier, std::vector<std::string> con
 	// Used to detect provinces listed in multiple regions, will
 	// be corrected once regions is stable (i.e. lock_regions).
 	Region* tmp_region_index = reinterpret_cast<Region*>(regions.size());
-	for (Province* province : new_region.provinces)
+	for (Province* province : new_region.get_provinces())
 		province->region = tmp_region_index;
-	return true;
+	return SUCCESS;
 }
 
 void Map::lock_regions() {
 	regions_locked = true;
 	for (Region& region : regions)
-		for (Province* province : region.provinces)
+		for (Province* province : region.get_provinces())
 			province->region = &region;
 }
 
@@ -171,27 +136,171 @@ Province const* Map::get_province_by_index(Province::index_t index) const {
 Province* Map::get_province_by_identifier(std::string const& identifier) {
 	if (!identifier.empty())
 		for (Province& province : provinces)
-			if (province.identifier == identifier) return &province;
+			if (province.get_identifier() == identifier) return &province;
 	return nullptr;
 }
 
 Province const* Map::get_province_by_identifier(std::string const& identifier) const {
 	if (!identifier.empty())
 		for (Province const& province : provinces)
-			if (province.identifier == identifier) return &province;
+			if (province.get_identifier() == identifier) return &province;
 	return nullptr;
 }
 
 Province* Map::get_province_by_colour(Province::colour_t colour) {
 	if (colour != Province::NULL_COLOUR)
 		for (Province& province : provinces)
-			if (province.colour == colour) return &province;
+			if (province.get_colour() == colour) return &province;
 	return nullptr;
 }
 
 Province const* Map::get_province_by_colour(Province::colour_t colour) const {
 	if (colour != Province::NULL_COLOUR)
 		for (Province const& province : provinces)
-			if (province.colour == colour) return &province;
+			if (province.get_colour() == colour) return &province;
+	return nullptr;
+}
+
+static Province::colour_t colour_at(uint8_t const* colour_data, int32_t idx) {
+	return (colour_data[idx * 3] << 16) | (colour_data[idx * 3 + 1] << 8) | colour_data[idx * 3 + 2];
+}
+
+return_t Map::generate_province_index_image(size_t new_width, size_t new_height, uint8_t const* colour_data, std::string& error_message) {
+	if (!province_index_image.empty()) {
+		error_message = "Province index image has already been generated!";
+		return FAILURE;
+	}
+	if (!provinces_locked) {
+		error_message = "Province index image cannot be generated until after provinces are locked!";
+		return FAILURE;
+	}
+	if (new_width < 1 || new_height < 1) {
+		error_message = "Invalid province image dimensions: " + std::to_string(new_width) + "x" + std::to_string(new_height);
+		return FAILURE;
+	}
+	if (colour_data == nullptr) {
+		error_message = "Province colour data pointer is null!";
+		return FAILURE;
+	}
+	width = new_width;
+	height = new_height;
+	province_index_image.resize(width * height);
+
+	std::vector<bool> province_checklist(provinces.size());
+	return_t ret = SUCCESS;
+
+	error_message = "Error message for province index image generation:";
+
+	for (int32_t y = 0; y < height; ++y) {
+		for (int32_t x = 0; x < width; ++x) {
+			const int32_t idx = x + y * width;
+			const Province::colour_t colour = colour_at(colour_data, idx);
+			if (colour == Province::NULL_COLOUR) {
+				province_index_image[idx] = Province::NULL_INDEX;
+				continue;
+			}
+			if (x > 0) {
+				const int32_t jdx = idx - 1;
+				if (colour_at(colour_data, jdx) == colour) {
+					province_index_image[idx] = province_index_image[jdx];
+					continue;
+				}
+			}
+			if (y > 0) {
+				const int32_t jdx = idx - width;
+				if (colour_at(colour_data, jdx) == colour) {
+					province_index_image[idx] = province_index_image[jdx];
+					continue;
+				}
+			}
+			Province const* province = get_province_by_colour(colour);
+			if (province != nullptr) {
+				const Province::index_t index = province->get_index();
+				province_index_image[idx] = index;
+				province_checklist[index - 1] = true;
+				continue;
+			}
+			error_message += SEPARATOR + "Unrecognised province colour " + Province::colour_to_hex_string(colour) + " at (" + std::to_string(x) + ", " + std::to_string(x) + ")";
+			ret = FAILURE;
+			province_index_image[idx] = Province::NULL_INDEX;
+		}
+	}
+
+	for (size_t idx = 0; idx < province_checklist.size(); ++idx) {
+		if (!province_checklist[idx]) {
+			error_message += SEPARATOR + "Province missing from shape image: " + provinces[idx].to_string();
+			ret = FAILURE;
+		}
+	}
+
+	error_message += SEPARATOR + "Generated province index image";
+	return ret;
+}
+
+size_t Map::get_width() const {
+	return width;
+}
+
+size_t Map::get_height() const {
+	return height;
+}
+
+std::vector<Province::index_t> const& Map::get_province_index_image() const {
+	return province_index_image;
+}
+
+return_t Map::add_mapmode(std::string const& identifier, Mapmode::colour_func_t colour_func, std::string& error_message) {
+	if (identifier.empty()) {
+		error_message = "Empty mapmode identifier!";
+		return FAILURE;
+	}
+	if (colour_func == nullptr) {
+		error_message = "Mapmode colour function is null for identifier: " + identifier;
+		return FAILURE;
+	}
+	Mapmode new_mapmode{ mapmodes.size(), identifier, colour_func };
+	for (Mapmode const& mapmode : mapmodes) {
+		if (mapmode.get_identifier() == identifier) {
+			error_message = "Duplicate mapmode identifiers: " + mapmode.get_identifier() + " and " + identifier;
+			return FAILURE;
+		}
+	}
+	mapmodes.push_back(new_mapmode);
+	error_message = "Added mapmode: " + identifier;
+	return SUCCESS;
+}
+
+size_t Map::get_mapmode_count() const {
+	return mapmodes.size();
+}
+
+Mapmode const* Map::get_mapmode_by_index(size_t index) const {
+	return index < mapmodes.size() ? &mapmodes[index] : nullptr;
+}
+
+Mapmode const* Map::get_mapmode_by_identifier(std::string const& identifier) const {
+	if (!identifier.empty())
+		for (Mapmode const& mapmode : mapmodes)
+			if (mapmode.get_identifier() == identifier) return &mapmode;
 	return nullptr;
 }
+
+return_t Map::generate_mapmode_colours(Mapmode::index_t index, uint8_t* target, std::string& error_message) const {
+	if (target == nullptr) {
+		error_message = "Mapmode colour target pointer is null!";
+		return FAILURE;
+	}
+	if (index >= mapmodes.size()) {
+		error_message = "Invalid mapmode index: " + std::to_string(index);
+		return FAILURE;
+	}
+	Mapmode const& mapmode = mapmodes[index];
+	target += 3; // Skip past Province::NULL_INDEX
+	for (Province const& province : provinces) {
+		const Province::colour_t colour = (*mapmode.get_colour_func())(*this, province);
+		*target++ = (colour >> 16) & 0xFF;
+		*target++ = (colour >> 8) & 0xFF;
+		*target++ = colour & 0xFF;
+	}
+	return SUCCESS;
+}
diff --git a/extension/src/openvic2/Map.hpp b/extension/src/openvic2/Map.hpp
index 1527f1a..2fa8bc8 100644
--- a/extension/src/openvic2/Map.hpp
+++ b/extension/src/openvic2/Map.hpp
@@ -4,8 +4,9 @@
 #include <cstdint>
 #include <vector>
 
-namespace OpenVic2 {
+#include "Types.hpp"
 
+namespace OpenVic2 {
 	struct Region;
 
 	struct Province {
@@ -45,16 +46,35 @@ namespace OpenVic2 {
 		std::vector<Province*> const& get_provinces() const;
 	};
 
+	struct Mapmode {
+		using colour_func_t = Province::colour_t (*)(Map const& map, Province const& province);
+		using index_t = size_t;
+		friend struct Map;
+	private:
+		index_t index;
+		std::string identifier;
+		colour_func_t colour_func;
+
+		Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func);
+	public:
+		index_t get_index() const;
+		std::string const& get_identifier() const;
+		colour_func_t get_colour_func() const;
+	};
+
 	struct Map {
 	private:
 		std::vector<Province> provinces;
 		std::vector<Region> regions;
 		bool provinces_locked = false, regions_locked = false;
 
+		size_t width = 0, height = 0;
+		std::vector<Province::index_t> province_index_image;
+		std::vector<Mapmode> mapmodes;
 	public:
-		bool add_province(std::string const& identifier, Province::colour_t colour, std::string& error_message);
+		return_t add_province(std::string const& identifier, Province::colour_t colour, std::string& error_message);
 		void lock_provinces();
-		bool add_region(std::string const& identifier, std::vector<std::string> const& province_identifiers, std::string& error_message);
+		return_t add_region(std::string const& identifier, std::vector<std::string> const& province_identifiers, std::string& error_message);
 		void lock_regions();
 		size_t get_province_count() const;
 
@@ -64,6 +84,16 @@ namespace OpenVic2 {
 		Province const* get_province_by_identifier(std::string const& identifier) const;
 		Province* get_province_by_colour(Province::colour_t colour);
 		Province const* get_province_by_colour(Province::colour_t colour) const;
-	};
 
+		return_t generate_province_index_image(size_t new_width, size_t new_height, uint8_t const* colour_data, std::string& error_message);
+		size_t get_width() const;
+		size_t get_height() const;
+		std::vector<Province::index_t> const& get_province_index_image() const;
+
+		return_t add_mapmode(std::string const& identifier, Mapmode::colour_func_t colour_func, std::string& error_message);
+		size_t get_mapmode_count() const;
+		Mapmode const* get_mapmode_by_index(Mapmode::index_t index) const;
+		Mapmode const* get_mapmode_by_identifier(std::string const& identifier) const;
+		return_t generate_mapmode_colours(Mapmode::index_t index, uint8_t* target, std::string& error_message) const;
+	};
 }
diff --git a/extension/src/openvic2/Province.cpp b/extension/src/openvic2/Province.cpp
new file mode 100644
index 0000000..49f1b0e
--- /dev/null
+++ b/extension/src/openvic2/Province.cpp
@@ -0,0 +1,40 @@
+#include "Map.hpp"
+
+#include <cassert>
+#include <sstream>
+#include <iomanip>
+
+using namespace OpenVic2;
+
+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;
+	stream << std::hex << std::setfill('0') << std::setw(6) << colour;
+	return stream.str();
+}
+
+Province::index_t Province::get_index() const {
+	return index;
+}
+
+std::string const& Province::get_identifier() const {
+	return identifier;
+}
+
+Province::colour_t Province::get_colour() const {
+	return colour;
+}
+
+Region* Province::get_region() const {
+	return region;
+}
+
+std::string Province::to_string() const {
+	return "(#" + std::to_string(index) + ", " + identifier + ", 0x" + colour_to_hex_string(colour) + ")";
+}
diff --git a/extension/src/openvic2/Region.cpp b/extension/src/openvic2/Region.cpp
new file mode 100644
index 0000000..6ee05f5
--- /dev/null
+++ b/extension/src/openvic2/Region.cpp
@@ -0,0 +1,26 @@
+#include "Map.hpp"
+
+#include <cassert>
+#include <algorithm>
+
+using namespace OpenVic2;
+
+Region::Region(std::string const& new_identifier) : identifier(new_identifier) {
+	assert(!identifier.empty());
+}
+
+std::string const& Region::get_identifier() const {
+	return identifier;
+}
+
+size_t Region::get_province_count() const {
+	return provinces.size();
+}
+
+bool Region::contains_province(Province const* province) const {
+	return province && std::find(provinces.begin(), provinces.end(), province) != provinces.end();
+}
+
+std::vector<Province*> const& Region::get_provinces() const {
+	return provinces;
+}
diff --git a/extension/src/openvic2/Types.hpp b/extension/src/openvic2/Types.hpp
new file mode 100644
index 0000000..0fb1c8b
--- /dev/null
+++ b/extension/src/openvic2/Types.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace OpenVic2 {
+	using return_t = bool;
+	// This mirrors godot::Error, where `OK = 0` and `FAILED = 1`.
+	static const return_t SUCCESS = false, FAILURE = true;
+}
diff --git a/game/localisation/en_GB/mapmodes.csv b/game/localisation/en_GB/mapmodes.csv
new file mode 100644
index 0000000..c5b1bb0
--- /dev/null
+++ b/game/localisation/en_GB/mapmodes.csv
@@ -0,0 +1,5 @@
+
+,, Test Mapmodes
+mapmode_province,Province Mapmode
+mapmode_region,Region Mapmode
+mapmode_index,Index Mapmode
diff --git a/game/localisation/en_GB/mapmodes.csv.import b/game/localisation/en_GB/mapmodes.csv.import
new file mode 100644
index 0000000..8dd0c09
--- /dev/null
+++ b/game/localisation/en_GB/mapmodes.csv.import
@@ -0,0 +1,3 @@
+[remap]
+
+importer="keep"
diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn
index 390040e..a645528 100644
--- a/game/src/GameSession/GameSession.tscn
+++ b/game/src/GameSession/GameSession.tscn
@@ -42,3 +42,4 @@ offset_right = 0.0
 [connection signal="province_selected" from="MapView" to="ProvinceOverviewPanel" method="_on_province_selected"]
 [connection signal="close_button_pressed" from="GameSessionMenu" to="." method="_on_game_session_menu_close_button_pressed"]
 [connection signal="game_session_menu_button_pressed" from="MapControlPanel" to="." method="_on_game_session_menu_button_pressed"]
+[connection signal="mapmode_changed" from="MapControlPanel" to="MapView" method="_update_colour_texture"]
diff --git a/game/src/GameSession/MapControlPanel.gd b/game/src/GameSession/MapControlPanel.gd
index ad56536..cfd102c 100644
--- a/game/src/GameSession/MapControlPanel.gd
+++ b/game/src/GameSession/MapControlPanel.gd
@@ -1,8 +1,32 @@
 extends PanelContainer
 
 signal game_session_menu_button_pressed
+signal mapmode_changed
+
+@export var _mapmodes_grid : GridContainer
+var _mapmode_button_group : ButtonGroup
+
+func _add_mapmode_button(identifier : String) -> void:
+	var button := Button.new()
+	button.text = identifier
+	button.tooltip_text = identifier
+	button.toggle_mode = true
+	button.button_group = _mapmode_button_group
+	_mapmodes_grid.add_child(button)
+	if _mapmode_button_group.get_pressed_button() == null:
+		button.button_pressed = true
+
+func _ready():
+	_mapmode_button_group = ButtonGroup.new()
+	_mapmode_button_group.pressed.connect(_mapmode_pressed)
+	for index in MapSingleton.get_mapmode_count():
+		_add_mapmode_button(MapSingleton.get_mapmode_identifier(index))
 
 # REQUIREMENTS:
 # * UIFUN-10
-func _on_game_session_menu_button_pressed():
+func _on_game_session_menu_button_pressed() -> void:
 	game_session_menu_button_pressed.emit()
+
+func _mapmode_pressed(button : BaseButton) -> void:
+	MapSingleton.set_mapmode(button.tooltip_text)
+	mapmode_changed.emit()
diff --git a/game/src/GameSession/MapControlPanel.tscn b/game/src/GameSession/MapControlPanel.tscn
index 2a0c971..e0ba0b2 100644
--- a/game/src/GameSession/MapControlPanel.tscn
+++ b/game/src/GameSession/MapControlPanel.tscn
@@ -8,9 +8,10 @@ action = &"ui_cancel"
 [sub_resource type="Shortcut" id="Shortcut_fc1tk"]
 events = [SubResource("InputEventAction_5nck3")]
 
-[node name="PanelContainer" type="PanelContainer"]
+[node name="PanelContainer" type="PanelContainer" node_paths=PackedStringArray("_mapmodes_grid")]
 editor_description = "SS-103"
 script = ExtResource("1_ign64")
+_mapmodes_grid = NodePath("HBoxContainer/VBoxContainer/MapmodesGrid")
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
 layout_mode = 2
@@ -18,9 +19,9 @@ layout_mode = 2
 [node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"]
 layout_mode = 2
 
-[node name="MapmodesPlaceholder" type="Label" parent="HBoxContainer/VBoxContainer"]
+[node name="MapmodesGrid" type="GridContainer" parent="HBoxContainer/VBoxContainer"]
 layout_mode = 2
-text = "MAPMODES"
+columns = 11
 
 [node name="MinimapPlaceholder" type="Label" parent="HBoxContainer/VBoxContainer"]
 layout_mode = 2
diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd
index 4291191..b13f09d 100644
--- a/game/src/GameSession/MapView.gd
+++ b/game/src/GameSession/MapView.gd
@@ -19,7 +19,7 @@ const _shader_param_selected_pos : StringName = &"selected_pos"
 @export var _camera : Camera3D
 
 @export var _cardinal_move_speed : float = 1.0
-@export var _edge_move_threshold: float = 0.15
+@export var _edge_move_threshold: float = 0.02
 @export var _edge_move_speed: float = 2.5
 var _drag_anchor : Vector2
 var _drag_active : bool = false
@@ -38,6 +38,8 @@ var _map_mesh : MapMesh
 var _map_shader_material : ShaderMaterial
 var _map_image_size : Vector2
 var _map_province_index_image : Image
+var _map_province_colour_image : Image
+var _map_province_colour_texture : ImageTexture
 var _map_mesh_corner : Vector2
 var _map_mesh_dims : Vector2
 
@@ -60,7 +62,7 @@ func _ready():
 		return
 
 	# Shader Material
-	var map_material = _map_mesh_instance.get_active_material(0)
+	var map_material := _map_mesh_instance.get_active_material(0)
 	if map_material == null:
 		push_error("Map mesh is missing material!")
 		return
@@ -78,12 +80,12 @@ func _ready():
 	_map_shader_material.set_shader_parameter(_shader_param_province_index, province_index_texture)
 
 	# Province colour texture
-	var province_colour_image = MapSingleton.get_province_colour_image()
-	if province_colour_image == null:
+	_map_province_colour_image = MapSingleton.get_province_colour_image()
+	if _map_province_colour_image == null:
 		push_error("Failed to get province colour image!")
 		return
-	var province_colour_texture := ImageTexture.create_from_image(province_colour_image)
-	_map_shader_material.set_shader_parameter(_shader_param_province_colour, province_colour_texture)
+	_map_province_colour_texture = ImageTexture.create_from_image(_map_province_colour_image)
+	_map_shader_material.set_shader_parameter(_shader_param_province_colour, _map_province_colour_texture)
 
 	if not _map_mesh_instance.mesh is MapMesh:
 		push_error("Invalid map mesh class: ", _map_mesh_instance.mesh.get_class(), "(expected MapMesh)")
@@ -103,6 +105,10 @@ func _ready():
 		map_mesh_aabb.position.z - map_mesh_aabb.end.z
 	))
 
+func _update_colour_texture() -> void:
+	MapSingleton.update_colour_image()
+	_map_province_colour_texture.update(_map_province_colour_image)
+
 func _unhandled_input(event : InputEvent):
 	if event.is_action_pressed(_action_click):
 		# Check if the mouse is outside of bounds
@@ -151,7 +157,7 @@ func _movement_process(delta : float) -> void:
 func _edge_scrolling_vector() -> Vector2:
 	var viewport_dims := Vector2(Resolution.get_current_resolution())
 	var mouse_vector := _mouse_pos_viewport / viewport_dims - Vector2(0.5, 0.5);
-	if pow(mouse_vector.x, 4) + pow(mouse_vector.y, 4) < pow(0.5 - _edge_move_threshold, 4):
+	if abs(mouse_vector.x) < 0.5 - _edge_move_threshold and abs(mouse_vector.y) < 0.5 - _edge_move_threshold:
 		mouse_vector *= 0
 	return mouse_vector * _edge_move_speed
 
diff --git a/game/src/GameSession/TerrainMap.gdshader b/game/src/GameSession/TerrainMap.gdshader
index a6774fd..f3d0c7d 100644
--- a/game/src/GameSession/TerrainMap.gdshader
+++ b/game/src/GameSession/TerrainMap.gdshader
@@ -37,7 +37,7 @@ void fragment() {
 	uint selected_index = read_uint16(province_index_tex, selected_pos);
 
 	// Boost prov_colour's contribution if it matches hover_colour or selected_colour
-	float mix_val = float(prov_index == hover_index) * 0.3 + float(prov_index == selected_index) * 0.5;
+	float mix_val = 0.3 + float(prov_index == hover_index) * 0.3 + float(prov_index == selected_index) * 0.3;
 	// Don't mix if the province index is 0
 	mix_val *= float(prov_index != 0u);