aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extension/src/GameSingleton.cpp35
-rw-r--r--extension/src/openvic2/GameManager.cpp2
-rw-r--r--extension/src/openvic2/GameManager.hpp3
-rw-r--r--extension/src/openvic2/Good.cpp3
-rw-r--r--extension/src/openvic2/Good.hpp22
-rw-r--r--extension/src/openvic2/Types.cpp19
-rw-r--r--extension/src/openvic2/Types.hpp29
-rw-r--r--extension/src/openvic2/map/Map.cpp52
-rw-r--r--extension/src/openvic2/map/Map.hpp19
-rw-r--r--extension/src/openvic2/map/Province.cpp18
-rw-r--r--extension/src/openvic2/map/Province.hpp11
-rw-r--r--extension/src/openvic2/map/Region.cpp5
-rw-r--r--extension/src/openvic2/map/Region.hpp3
-rw-r--r--game/common/data/goods-jca.json2
-rw-r--r--game/common/data/goods.json2
15 files changed, 145 insertions, 80 deletions
diff --git a/extension/src/GameSingleton.cpp b/extension/src/GameSingleton.cpp
index 4d5728a..64f6fc1 100644
--- a/extension/src/GameSingleton.cpp
+++ b/extension/src/GameSingleton.cpp
@@ -5,6 +5,7 @@
#include <godot_cpp/classes/json.hpp>
#include "openvic2/Logger.hpp"
+#include "openvic2/Types.hpp"
using namespace godot;
using namespace OpenVic2;
@@ -65,16 +66,16 @@ GameSingleton::GameSingleton() : game_manager{ [this]() { emit_signal("state_upd
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 {
+ { "mapmode_province", [](Map const&, Province const& province) -> colour_t { return province.get_colour(); } },
+ { "mapmode_region", [](Map const&, Province const& province) -> colour_t {
Region const* region = province.get_region();
if (region != nullptr) return region->get_colour();
return province.get_colour();
} },
- { "mapmode_terrain", [](Map const&, Province const& province) -> Province::colour_t {
+ { "mapmode_terrain", [](Map const&, Province const& province) -> colour_t {
return province.is_water() ? 0x4287F5 : 0x0D7017;
} },
- { "mapmode_index", [](Map const& map, Province const& province) -> Province::colour_t {
+ { "mapmode_index", [](Map const& map, Province const& province) -> colour_t {
const uint8_t f = static_cast<float>(province.get_index()) / static_cast<float>(map.get_province_count()) * 255.0f;
return (f << 16) | (f << 8) | f;
} }
@@ -151,30 +152,31 @@ static Error parse_json_dictionary_file(String const& file_description, String c
Error GameSingleton::_parse_province_identifier_entry(String const& identifier, Variant const& entry) {
const Variant::Type type = entry.get_type();
- Province::colour_t colour = Province::NULL_COLOUR;
+ colour_t colour = NULL_COLOUR;
if (type == Variant::ARRAY) {
Array const& colour_array = entry;
if (colour_array.size() == 3) {
for (int jdx = 0; jdx < 3; ++jdx) {
Variant const& var = colour_array[jdx];
if (var.get_type() != Variant::FLOAT) {
- colour = Province::NULL_COLOUR;
+ colour = NULL_COLOUR;
break;
}
const double colour_double = var;
if (std::trunc(colour_double) != colour_double) {
- colour = Province::NULL_COLOUR;
+ colour = NULL_COLOUR;
break;
}
const int64_t colour_int = static_cast<int64_t>(colour_double);
if (colour_int < 0 || colour_int > 255) {
- colour = Province::NULL_COLOUR;
+ colour = NULL_COLOUR;
break;
}
colour = (colour << 8) | colour_int;
}
}
- } else if (type == Variant::STRING) {
+ }
+ else if (type == Variant::STRING) {
String const& colour_string = entry;
if (colour_string.is_valid_hex_number()) {
const int64_t colour_int = colour_string.hex_to_int();
@@ -182,7 +184,7 @@ Error GameSingleton::_parse_province_identifier_entry(String const& identifier,
colour = colour_int;
}
}
- if (colour == Province::NULL_COLOUR) {
+ if (colour == NULL_COLOUR) {
UtilityFunctions::push_error("Invalid colour for province identifier \"", identifier, "\": ", entry);
return FAILED;
}
@@ -210,7 +212,8 @@ Error GameSingleton::_parse_region_entry(String const& identifier, Variant const
if (type == Variant::STRING) {
String const& province_string = province_var;
province_identifiers.push_back(province_string.utf8().get_data());
- } else {
+ }
+ else {
UtilityFunctions::push_error("Invalid province identifier for region \"", identifier, "\": ", entry);
err = FAILED;
}
@@ -309,7 +312,8 @@ Error GameSingleton::load_water_province_file(String const& file_path) {
UtilityFunctions::push_error("Invalid water province JSON: root has type ",
Variant::get_type_name(type), " (expected Array)");
err = FAILED;
- } else {
+ }
+ else {
Array const& array = json_var;
for (int64_t idx = 0; idx < array.size(); ++idx) {
Variant const& entry = array[idx];
@@ -398,15 +402,16 @@ Ref<Texture> GameSingleton::get_province_colour_texture() const {
Error GameSingleton::update_colour_image() {
static PackedByteArray colour_data_array;
- static constexpr int64_t colour_data_array_size = (Province::MAX_INDEX + 1) * Map::MAPMODE_COLOUR_SIZE;
+ static constexpr int64_t colour_data_array_size = (MAX_INDEX + 1) * Map::MAPMODE_COLOUR_SIZE;
colour_data_array.resize(colour_data_array_size);
Error err = OK;
if (game_manager.map.generate_mapmode_colours(mapmode_index, colour_data_array.ptrw()) != SUCCESS)
err = FAILED;
- static constexpr int32_t PROVINCE_INDEX_SQRT = 1 << (sizeof(Province::index_t) * 4);
- if (province_colour_image.is_null()) province_colour_image.instantiate();
+ static constexpr int32_t PROVINCE_INDEX_SQRT = 1 << (sizeof(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()) {
diff --git a/extension/src/openvic2/GameManager.cpp b/extension/src/openvic2/GameManager.cpp
index 78992f1..ca6e8ab 100644
--- a/extension/src/openvic2/GameManager.cpp
+++ b/extension/src/openvic2/GameManager.cpp
@@ -38,7 +38,7 @@ Date const& GameManager::get_today() const {
return today;
}
-return_t GameManager::expand_building(Province::index_t province_index, std::string const& building_type_identifier) {
+return_t GameManager::expand_building(index_t province_index, std::string const& building_type_identifier) {
set_needs_update();
Province* province = map.get_province_by_index(province_index);
if (province == nullptr) return FAILURE;
diff --git a/extension/src/openvic2/GameManager.hpp b/extension/src/openvic2/GameManager.hpp
index 65cd566..7b15dc8 100644
--- a/extension/src/openvic2/GameManager.hpp
+++ b/extension/src/openvic2/GameManager.hpp
@@ -2,6 +2,7 @@
#include "openvic2/GameAdvancementHook.hpp"
#include "openvic2/map/Map.hpp"
+#include "openvic2/Types.hpp"
namespace OpenVic2 {
struct GameManager {
@@ -24,6 +25,6 @@ namespace OpenVic2 {
return_t setup();
Date const& get_today() const;
- return_t expand_building(Province::index_t province_index, std::string const& building_type_identifier);
+ return_t expand_building(index_t province_index, std::string const& building_type_identifier);
};
}
diff --git a/extension/src/openvic2/Good.cpp b/extension/src/openvic2/Good.cpp
new file mode 100644
index 0000000..e3389de
--- /dev/null
+++ b/extension/src/openvic2/Good.cpp
@@ -0,0 +1,3 @@
+#include "Good.hpp"
+
+using namespace OpenVic2;
diff --git a/extension/src/openvic2/Good.hpp b/extension/src/openvic2/Good.hpp
new file mode 100644
index 0000000..54078dd
--- /dev/null
+++ b/extension/src/openvic2/Good.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <string>
+#include "Types.hpp"
+
+namespace OpenVic2 {
+ class Good : HasIdentifier {
+ public:
+ std::string category;
+ price_t cost;
+ std::string colour;
+ bool isAvailable;
+ bool isTradable;
+ bool isMoney;
+ bool hasOverseasPenalty;
+
+ Good(Good&&) = default;
+ Good(std::string const& identifier,std::string const& category, price_t cost, std::string const& colour,
+ bool isAvailable, bool isTradable, bool isMoney, bool hasOverseasPenalty) : HasIdentifier(identifier),
+ category(category), cost(cost), colour(colour), isAvailable(isAvailable), isMoney(isMoney), hasOverseasPenalty(hasOverseasPenalty) {};
+ };
+}
diff --git a/extension/src/openvic2/Types.cpp b/extension/src/openvic2/Types.cpp
index 861ab50..42aa5a4 100644
--- a/extension/src/openvic2/Types.cpp
+++ b/extension/src/openvic2/Types.cpp
@@ -1,6 +1,9 @@
#include "openvic2/Types.hpp"
#include <cassert>
+#include <sstream>
+#include <iomanip>
+#include "Types.hpp"
using namespace OpenVic2;
@@ -11,3 +14,19 @@ HasIdentifier::HasIdentifier(std::string const& new_identifier) : identifier{ ne
std::string const& HasIdentifier::get_identifier() const {
return identifier;
}
+
+HasColour::HasColour(colour_t const new_colour) : colour(new_colour) {
+ assert(colour <= MAX_COLOUR && colour != NULL_COLOUR);
+}
+
+colour_t HasColour::get_colour() const { return colour; }
+
+std::string OpenVic2::HasColour::colour_to_hex_string(colour_t const colour) {
+ std::ostringstream stream;
+ stream << std::hex << std::setfill('0') << std::setw(6) << colour;
+ return stream.str();
+}
+
+std::string HasColour::colour_to_hex_string() const {
+ return colour_to_hex_string(colour);
+} \ No newline at end of file
diff --git a/extension/src/openvic2/Types.hpp b/extension/src/openvic2/Types.hpp
index 98e92ce..f1ba639 100644
--- a/extension/src/openvic2/Types.hpp
+++ b/extension/src/openvic2/Types.hpp
@@ -2,11 +2,22 @@
#include <string>
#include <vector>
+#include <cstdint>
#include "openvic2/Logger.hpp"
namespace OpenVic2 {
+ //Represents a 24-bit RGB integer
+ using colour_t = uint32_t;
+ using index_t = uint16_t;
+
+ static constexpr colour_t NULL_COLOUR = 0, MAX_COLOUR = 0xFFFFFF;
+ static constexpr index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF;
+
+ //TODO: price_t must be changed to a fixed-point numeric type before multiplayer
+ using price_t = double;
using return_t = bool;
+
// This mirrors godot::Error, where `OK = 0` and `FAILED = 1`.
static constexpr return_t SUCCESS = false, FAILURE = true;
@@ -29,6 +40,24 @@ namespace OpenVic2 {
};
/*
+ * Base class for objects with associated colour information
+ */
+ class HasColour {
+ const colour_t colour;
+ protected:
+ HasColour(colour_t const new_colour);
+ public:
+ HasColour(HasColour const&) = delete;
+ HasColour(HasColour&&) = default;
+ HasColour& operator=(HasColour const&) = delete;
+ HasColour& operator=(HasColour&&) = delete;
+
+ colour_t get_colour() const;
+ std::string colour_to_hex_string() const;
+ static std::string colour_to_hex_string(colour_t const colour);
+ };
+
+ /*
* Template for a list of objects with unique string identifiers that can
* be locked to prevent any further additions. The template argument T is
* the type of object that the registry will store, and the second part ensures
diff --git a/extension/src/openvic2/map/Map.cpp b/extension/src/openvic2/map/Map.cpp
index 428b749..4e7c0bb 100644
--- a/extension/src/openvic2/map/Map.cpp
+++ b/extension/src/openvic2/map/Map.cpp
@@ -16,26 +16,26 @@ Mapmode::index_t Mapmode::get_index() const {
return index;
}
-Province::colour_t Mapmode::get_colour(Map const& map, Province const& province) const {
- return colour_func ? colour_func(map, province) : Province::NULL_COLOUR;
+colour_t Mapmode::get_colour(Map const& map, Province const& province) const {
+ return colour_func ? colour_func(map, province) : NULL_COLOUR;
}
Map::Map() : provinces{ "provinces" }, regions{ "regions" }, mapmodes{ "mapmodes" } {}
-return_t Map::add_province(std::string const& identifier, Province::colour_t colour) {
- if (provinces.get_item_count() >= Province::MAX_INDEX) {
- Logger::error("The map's province list is full - there can be at most ", Province::MAX_INDEX, " provinces");
+return_t Map::add_province(std::string const& identifier, colour_t colour) {
+ if (provinces.get_item_count() >= MAX_INDEX) {
+ Logger::error("The map's province list is full - there can be at most ", MAX_INDEX, " provinces");
return FAILURE;
}
if (identifier.empty()) {
Logger::error("Invalid province identifier - empty!");
return FAILURE;
}
- if (colour == Province::NULL_COLOUR || colour > Province::MAX_COLOUR) {
+ if (colour == NULL_COLOUR || colour > MAX_COLOUR) {
Logger::error("Invalid province colour: ", Province::colour_to_hex_string(colour));
return FAILURE;
}
- Province new_province{ static_cast<Province::index_t>(provinces.get_item_count() + 1), identifier, colour };
+ Province new_province{ static_cast<index_t>(provinces.get_item_count() + 1), identifier, colour };
Province const* old_province = get_province_by_colour(colour);
if (old_province != nullptr) {
Logger::error("Duplicate province colours: ", old_province->to_string(), " and ", new_province.to_string());
@@ -126,12 +126,12 @@ size_t Map::get_province_count() const {
return provinces.get_item_count();
}
-Province* Map::get_province_by_index(Province::index_t index) {
- return index != Province::NULL_INDEX ? provinces.get_item_by_index(index - 1) : nullptr;
+Province* Map::get_province_by_index(index_t index) {
+ return index != NULL_INDEX ? provinces.get_item_by_index(index - 1) : nullptr;
}
-Province const* Map::get_province_by_index(Province::index_t index) const {
- return index != Province::NULL_INDEX ? provinces.get_item_by_index(index - 1) : nullptr;
+Province const* Map::get_province_by_index(index_t index) const {
+ return index != NULL_INDEX ? provinces.get_item_by_index(index - 1) : nullptr;
}
Province* Map::get_province_by_identifier(std::string const& identifier) {
@@ -142,23 +142,25 @@ Province const* Map::get_province_by_identifier(std::string const& identifier) c
return provinces.get_item_by_identifier(identifier);
}
-Province* Map::get_province_by_colour(Province::colour_t colour) {
- if (colour != Province::NULL_COLOUR)
+Province* Map::get_province_by_colour(colour_t colour) {
+ if (colour != NULL_COLOUR)
for (Province& province : provinces.get_items())
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.get_items())
- if (province.get_colour() == colour) return &province;
+Province const* Map::get_province_by_colour(colour_t colour) const {
+ if (colour == NULL_COLOUR) { return nullptr; }
+ for (Province const& province : provinces.get_items()) {
+ if (province.get_colour() == colour)
+ return &province;
+ }
return nullptr;
}
-Province::index_t Map::get_province_index_at(size_t x, size_t y) const {
+index_t Map::get_province_index_at(size_t x, size_t y) const {
if (x < width && y < height) return province_shape_image[x + y * width].index;
- return Province::NULL_INDEX;
+ return NULL_INDEX;
}
Region* Map::get_region_by_identifier(std::string const& identifier) {
@@ -169,7 +171,7 @@ Region const* Map::get_region_by_identifier(std::string const& identifier) const
return regions.get_item_by_identifier(identifier);
}
-static Province::colour_t colour_at(uint8_t const* colour_data, int32_t idx) {
+static 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];
}
@@ -196,12 +198,12 @@ return_t Map::generate_province_shape_image(size_t new_width, size_t new_height,
std::vector<bool> province_checklist(provinces.get_item_count());
return_t ret = SUCCESS;
- std::unordered_set<Province::colour_t> unrecognised_colours;
+ std::unordered_set<colour_t> unrecognised_colours;
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);
+ const colour_t colour = colour_at(colour_data, idx);
if (x > 0) {
const int32_t jdx = idx - 1;
if (colour_at(colour_data, jdx) == colour) {
@@ -218,7 +220,7 @@ return_t Map::generate_province_shape_image(size_t new_width, size_t new_height,
}
Province const* province = get_province_by_colour(colour);
if (province != nullptr) {
- const Province::index_t index = province->get_index();
+ const index_t index = province->get_index();
province_checklist[index - 1] = true;
province_shape_image[idx].index = index;
province_shape_image[idx].terrain = !province->is_water();
@@ -229,7 +231,7 @@ return_t Map::generate_province_shape_image(size_t new_width, size_t new_height,
Logger::error("Unrecognised province colour ", Province::colour_to_hex_string(colour), " at (", x, ", ", y, ")");
ret = FAILURE;
}
- province_shape_image[idx].index = Province::NULL_INDEX;
+ province_shape_image[idx].index = NULL_INDEX;
province_shape_image[idx].terrain = 0;
}
}
@@ -297,7 +299,7 @@ return_t Map::generate_mapmode_colours(Mapmode::index_t index, uint8_t* target)
for (size_t i = 0; i < MAPMODE_COLOUR_SIZE; ++i)
*target++ = 0;
for (Province const& province : provinces.get_items()) {
- const Province::colour_t colour = mapmode->get_colour(*this, province);
+ const colour_t colour = mapmode->get_colour(*this, province);
*target++ = (colour >> 16) & 0xFF;
*target++ = (colour >> 8) & 0xFF;
*target++ = colour & 0xFF;
diff --git a/extension/src/openvic2/map/Map.hpp b/extension/src/openvic2/map/Map.hpp
index dea9b29..e5be9c7 100644
--- a/extension/src/openvic2/map/Map.hpp
+++ b/extension/src/openvic2/map/Map.hpp
@@ -3,13 +3,14 @@
#include <functional>
#include "openvic2/map/Region.hpp"
+#include "openvic2/Types.hpp"
namespace OpenVic2 {
struct Mapmode : HasIdentifier {
friend struct Map;
- using colour_func_t = std::function<Province::colour_t (Map const&, Province const&)>;
+ using colour_func_t = std::function<colour_t (Map const&, Province const&)>;
using index_t = size_t;
private:
const index_t index;
@@ -18,7 +19,7 @@ namespace OpenVic2 {
Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func);
public:
index_t get_index() const;
- Province::colour_t get_colour(Map const& map, Province const& province) const;
+ colour_t get_colour(Map const& map, Province const& province) const;
};
/* REQUIREMENTS:
@@ -27,7 +28,7 @@ namespace OpenVic2 {
struct Map {
#pragma pack(push, 1)
struct shape_pixel_t {
- Province::index_t index;
+ index_t index;
uint8_t terrain;
};
#pragma pack(pop)
@@ -43,7 +44,7 @@ namespace OpenVic2 {
public:
Map();
- return_t add_province(std::string const& identifier, Province::colour_t colour);
+ return_t add_province(std::string const& identifier, colour_t colour);
void lock_provinces();
return_t set_water_province(std::string const& identifier);
void lock_water_provinces();
@@ -51,13 +52,13 @@ namespace OpenVic2 {
void lock_regions();
size_t get_province_count() const;
- Province* get_province_by_index(Province::index_t index);
- Province const* get_province_by_index(Province::index_t index) const;
+ Province* get_province_by_index(index_t index);
+ Province const* get_province_by_index(index_t index) const;
Province* get_province_by_identifier(std::string const& identifier);
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;
- Province::index_t get_province_index_at(size_t x, size_t y) const;
+ Province* get_province_by_colour(colour_t colour);
+ Province const* get_province_by_colour(colour_t colour) const;
+ index_t get_province_index_at(size_t x, size_t y) const;
Region* get_region_by_identifier(std::string const& identifier);
Region const* get_region_by_identifier(std::string const& identifier) const;
diff --git a/extension/src/openvic2/map/Province.cpp b/extension/src/openvic2/map/Province.cpp
index 4360bce..472cccb 100644
--- a/extension/src/openvic2/map/Province.cpp
+++ b/extension/src/openvic2/map/Province.cpp
@@ -7,25 +7,15 @@
using namespace OpenVic2;
Province::Province(index_t new_index, std::string const& new_identifier, colour_t new_colour) :
- HasIdentifier{ new_identifier }, index{ new_index }, colour{ new_colour }, buildings{ "buildings" } {
+ HasIdentifier{ new_identifier }, HasColour{ new_colour }, index{ new_index }, buildings{ "buildings" } {
assert(index != NULL_INDEX);
- assert(colour != NULL_COLOUR);
+ assert(new_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 {
+index_t Province::get_index() const {
return index;
}
-Province::colour_t Province::get_colour() const {
- return colour;
-}
-
Region* Province::get_region() const {
return region;
}
@@ -62,7 +52,7 @@ return_t Province::expand_building(std::string const& building_type_identifier)
std::string Province::to_string() const {
std::stringstream stream;
- stream << "(#" << std::to_string(index) << ", " << get_identifier() << ", 0x" << colour_to_hex_string(colour) << ")";
+ stream << "(#" << std::to_string(index) << ", " << get_identifier() << ", 0x" << colour_to_hex_string() << ")";
return stream.str();
}
diff --git a/extension/src/openvic2/map/Province.hpp b/extension/src/openvic2/map/Province.hpp
index aa0329c..65eaa09 100644
--- a/extension/src/openvic2/map/Province.hpp
+++ b/extension/src/openvic2/map/Province.hpp
@@ -1,6 +1,7 @@
#pragma once
#include "openvic2/map/Building.hpp"
+#include "openvic2/Types.hpp"
namespace OpenVic2 {
struct Map;
@@ -9,18 +10,13 @@ namespace OpenVic2 {
/* REQUIREMENTS:
* MAP-5, MAP-8, MAP-43, MAP-47
*/
- struct Province : HasIdentifier {
+ struct Province : HasIdentifier, HasColour {
friend struct Map;
- using colour_t = uint32_t;
- using index_t = uint16_t;
using life_rating_t = int8_t;
- static constexpr colour_t NULL_COLOUR = 0, MAX_COLOUR = 0xFFFFFF;
- static constexpr index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF;
private:
const index_t index;
- const colour_t colour;
Region* region = nullptr;
bool water = false;
life_rating_t life_rating = 0;
@@ -28,12 +24,9 @@ namespace OpenVic2 {
Province(index_t new_index, std::string const& new_identifier, colour_t new_colour);
public:
- static std::string colour_to_hex_string(colour_t colour);
-
Province(Province&&) = default;
index_t get_index() const;
- colour_t get_colour() const;
Region* get_region() const;
bool is_water() const;
life_rating_t get_life_rating() const;
diff --git a/extension/src/openvic2/map/Region.cpp b/extension/src/openvic2/map/Region.cpp
index 3e5bee7..6839a10 100644
--- a/extension/src/openvic2/map/Region.cpp
+++ b/extension/src/openvic2/map/Region.cpp
@@ -19,8 +19,7 @@ std::set<Province*> const& ProvinceSet::get_provinces() const {
Region::Region(std::string const& new_identifier) : HasIdentifier{ new_identifier } {}
-Province::colour_t Region::get_colour() const {
+colour_t Region::get_colour() const {
if (provinces.empty()) return 0xFF0000;
- Province const* province = *provinces.cbegin();
- return province->get_colour();
+ return (*provinces.cbegin())->get_colour();
}
diff --git a/extension/src/openvic2/map/Region.hpp b/extension/src/openvic2/map/Region.hpp
index 04564fc..58fad31 100644
--- a/extension/src/openvic2/map/Region.hpp
+++ b/extension/src/openvic2/map/Region.hpp
@@ -3,6 +3,7 @@
#include <set>
#include "openvic2/map/Province.hpp"
+#include "openvic2/Types.hpp"
namespace OpenVic2 {
@@ -25,6 +26,6 @@ namespace OpenVic2 {
public:
Region(Region&&) = default;
- Province::colour_t get_colour() const;
+ colour_t get_colour() const;
};
}
diff --git a/game/common/data/goods-jca.json b/game/common/data/goods-jca.json
index 3a0390a..5017d7e 100644
--- a/game/common/data/goods-jca.json
+++ b/game/common/data/goods-jca.json
@@ -15,7 +15,7 @@
{"id": "precious_goods", "category": "Raw", "cost": 7.00, "colour": "247 241 61", "isAvailableAtStart": true, "isTradeable": false, "isMoney": true, "hasOverseasPenalty": false},
{"id": "rubber", "category": "Raw", "cost": 7.00, "colour": "123 110 86", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
{"id": "silk", "category": "Raw", "cost": 10.00, "colour": "125 158 43", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
- {"id": "sulpher", "category": "Raw", "cost": 6.00, "colour": "181 228 102", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
+ {"id": "sulphur", "category": "Raw", "cost": 6.00, "colour": "181 228 102", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
{"id": "timber", "category": "Raw", "cost": 0.90, "colour": "146 72 17", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
{"id": "tropical_wood", "category": "Raw", "cost": 5.40, "colour": "213 177 118", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
{"id": "wool", "category": "Raw", "cost": 0.70, "colour": "234 195 158", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
diff --git a/game/common/data/goods.json b/game/common/data/goods.json
index 4954fb0..9d8e0e3 100644
--- a/game/common/data/goods.json
+++ b/game/common/data/goods.json
@@ -14,7 +14,7 @@
{"id": "precious_metal", "category": "Raw", "cost": 8.00, "colour": "253 199 110", "isAvailableAtStart": true, "isTradeable": false, "isMoney": true, "hasOverseasPenalty": false},
{"id": "rubber", "category": "Raw", "cost": 7.00, "colour": "123 110 86", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
{"id": "silk", "category": "Raw", "cost": 10.00, "colour": "125 158 43", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
- {"id": "sulpher", "category": "Raw", "cost": 6.00, "colour": "181 228 102", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
+ {"id": "sulphur", "category": "Raw", "cost": 6.00, "colour": "181 228 102", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
{"id": "timber", "category": "Raw", "cost": 0.90, "colour": "146 72 17", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
{"id": "tropical_wood", "category": "Raw", "cost": 5.40, "colour": "213 177 118", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
{"id": "wool", "category": "Raw", "cost": 0.70, "colour": "234 195 158", "isAvailableAtStart": true, "isTradeable": true, "isMoney": false, "hasOverseasPenalty": false},
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100