From 1fdd198f943a41468b03b2cdc62c24147f707239 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Tue, 18 Apr 2023 18:49:37 +0100 Subject: Better province image + terrain + some buttons --- game/src/GameSession/GameSessionMenu.gd | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'game/src/GameSession/GameSessionMenu.gd') diff --git a/game/src/GameSession/GameSessionMenu.gd b/game/src/GameSession/GameSessionMenu.gd index 3722b52..8a76c0f 100644 --- a/game/src/GameSession/GameSessionMenu.gd +++ b/game/src/GameSession/GameSessionMenu.gd @@ -1,19 +1,24 @@ extends PanelContainer -signal close_button_pressed - @export var _main_menu_scene : PackedScene -func _ready(): - print("GameSessionMenu ready") +signal options_button_pressed # REQUIREMENTS: # * SS-47 # * UIFUN-69 -func _on_to_main_menu_pressed(): +func _on_main_menu_confirmed() -> void: get_tree().change_scene_to_packed(_main_menu_scene) # REQUIREMENTS: -# * UIFUN-69 -func _on_close_button_pressed(): - close_button_pressed.emit() +# * SS-48 +# * UIFUN-70 +func _on_quit_confirmed() -> void: + get_tree().quit() + +# REQUIREMENTS: +# * SS-7, SS-46 +# * UIFUN-11 +func _on_options_button_pressed() -> void: + hide() + options_button_pressed.emit() -- cgit v1.2.3-56-ga3b1 From d3f3187209cb4085f27f95ce8ad2a77af25704fd Mon Sep 17 00:00:00 2001 From: Hop311 Date: Sun, 23 Apr 2023 19:49:01 +0100 Subject: C++ refactoring + simulation prototype --- .github/workflows/builds.yml | 4 + SConstruct | 6 + extension/src/GameSingleton.cpp | 449 ++++++++++++++++++++++++ extension/src/GameSingleton.hpp | 62 ++++ extension/src/MapSingleton.cpp | 394 --------------------- extension/src/MapSingleton.hpp | 50 --- extension/src/openvic2/Date.cpp | 190 ++++++---- extension/src/openvic2/Date.hpp | 139 ++++---- extension/src/openvic2/GameAdvancementHook.cpp | 120 ++++--- extension/src/openvic2/GameAdvancementHook.hpp | 29 +- extension/src/openvic2/GameManager.cpp | 43 +++ extension/src/openvic2/GameManager.hpp | 29 ++ extension/src/openvic2/Logger.cpp | 26 ++ extension/src/openvic2/Logger.hpp | 83 +++++ extension/src/openvic2/Map.cpp | 348 ------------------ extension/src/openvic2/Map.hpp | 67 ---- extension/src/openvic2/Province.cpp | 43 --- extension/src/openvic2/Province.hpp | 39 -- extension/src/openvic2/Region.cpp | 26 -- extension/src/openvic2/Region.hpp | 29 -- extension/src/openvic2/Types.cpp | 4 +- extension/src/openvic2/Types.hpp | 8 +- extension/src/openvic2/map/Building.cpp | 129 +++++++ extension/src/openvic2/map/Building.hpp | 63 ++++ extension/src/openvic2/map/Map.cpp | 359 +++++++++++++++++++ extension/src/openvic2/map/Map.hpp | 73 ++++ extension/src/openvic2/map/Province.cpp | 67 ++++ extension/src/openvic2/map/Province.hpp | 45 +++ extension/src/openvic2/map/Region.cpp | 26 ++ extension/src/openvic2/map/Region.hpp | 28 ++ extension/src/register_types.cpp | 14 +- game/localisation/en_GB/menus.csv | 9 + game/localisation/en_GB/provinces.csv | 374 ++++++++++---------- game/localisation/en_GB/regions.csv | 12 +- game/src/Autoload/Events.gd | 9 +- game/src/GameSession/GameSession.gd | 5 +- game/src/GameSession/GameSessionMenu.gd | 1 + game/src/GameSession/GameSpeedPanel.gd | 29 +- game/src/GameSession/MapControlPanel.gd | 6 +- game/src/GameSession/MapView.gd | 21 +- game/src/GameSession/ProvinceOverviewPanel.gd | 82 ++++- game/src/GameSession/ProvinceOverviewPanel.tscn | 14 +- 42 files changed, 2086 insertions(+), 1468 deletions(-) create mode 100644 extension/src/GameSingleton.cpp create mode 100644 extension/src/GameSingleton.hpp delete mode 100644 extension/src/MapSingleton.cpp delete mode 100644 extension/src/MapSingleton.hpp create mode 100644 extension/src/openvic2/GameManager.cpp create mode 100644 extension/src/openvic2/GameManager.hpp create mode 100644 extension/src/openvic2/Logger.cpp create mode 100644 extension/src/openvic2/Logger.hpp delete mode 100644 extension/src/openvic2/Map.cpp delete mode 100644 extension/src/openvic2/Map.hpp delete mode 100644 extension/src/openvic2/Province.cpp delete mode 100644 extension/src/openvic2/Province.hpp delete mode 100644 extension/src/openvic2/Region.cpp delete mode 100644 extension/src/openvic2/Region.hpp create mode 100644 extension/src/openvic2/map/Building.cpp create mode 100644 extension/src/openvic2/map/Building.hpp create mode 100644 extension/src/openvic2/map/Map.cpp create mode 100644 extension/src/openvic2/map/Map.hpp create mode 100644 extension/src/openvic2/map/Province.cpp create mode 100644 extension/src/openvic2/map/Province.hpp create mode 100644 extension/src/openvic2/map/Region.cpp create mode 100644 extension/src/openvic2/map/Region.hpp (limited to 'game/src/GameSession/GameSessionMenu.gd') diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 772b16c..664f8e4 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -80,6 +80,10 @@ jobs: run: | sudo apt-get update -qq sudo apt-get install -qqq build-essential pkg-config + g++ --version + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + sudo update-alternatives --set g++ /usr/bin/g++-12 + g++ --version - name: Setup MinGW for Windows/MinGW build if: ${{ matrix.platform == 'windows' }} diff --git a/SConstruct b/SConstruct index 4e6fe70..3213efd 100644 --- a/SConstruct +++ b/SConstruct @@ -10,6 +10,12 @@ ARGUMENTS.pop('intermediate_delete', True) env = SConscript("godot-cpp/SConstruct") +# Require C++20 +if env.get("is_msvc", False): + env.Replace(CXXFLAGS=["/std:c++20"]) +else: + env.Replace(CXXFLAGS=["-std=c++20"]) + ARGUMENTS = SAVED_ARGUMENTS # Custom options and profile flags. diff --git a/extension/src/GameSingleton.cpp b/extension/src/GameSingleton.cpp new file mode 100644 index 0000000..68eb252 --- /dev/null +++ b/extension/src/GameSingleton.cpp @@ -0,0 +1,449 @@ +#include "GameSingleton.hpp" + +#include +#include +#include + +#include "openvic2/Logger.hpp" + +using namespace godot; +using namespace OpenVic2; + +#define ERR(x) ((x) == SUCCESS ? OK : FAILED) + +GameSingleton* GameSingleton::singleton = nullptr; + +void GameSingleton::_bind_methods() { + ClassDB::bind_method(D_METHOD("load_province_identifier_file", "file_path"), &GameSingleton::load_province_identifier_file); + ClassDB::bind_method(D_METHOD("load_water_province_file", "file_path"), &GameSingleton::load_water_province_file); + ClassDB::bind_method(D_METHOD("load_region_file", "file_path"), &GameSingleton::load_region_file); + ClassDB::bind_method(D_METHOD("load_province_shape_file", "file_path"), &GameSingleton::load_province_shape_file); + ClassDB::bind_method(D_METHOD("finished_loading_data"), &GameSingleton::finished_loading_data); + + ClassDB::bind_method(D_METHOD("get_province_index_from_uv_coords", "coords"), &GameSingleton::get_province_index_from_uv_coords); + ClassDB::bind_method(D_METHOD("get_province_info_from_index", "index"), &GameSingleton::get_province_info_from_index); + ClassDB::bind_method(D_METHOD("get_width"), &GameSingleton::get_width); + ClassDB::bind_method(D_METHOD("get_height"), &GameSingleton::get_height); + ClassDB::bind_method(D_METHOD("get_province_index_image"), &GameSingleton::get_province_index_image); + ClassDB::bind_method(D_METHOD("get_province_colour_image"), &GameSingleton::get_province_colour_image); + + ClassDB::bind_method(D_METHOD("update_colour_image"), &GameSingleton::update_colour_image); + ClassDB::bind_method(D_METHOD("get_mapmode_count"), &GameSingleton::get_mapmode_count); + ClassDB::bind_method(D_METHOD("get_mapmode_identifier", "index"), &GameSingleton::get_mapmode_identifier); + ClassDB::bind_method(D_METHOD("set_mapmode", "identifier"), &GameSingleton::set_mapmode); + + ClassDB::bind_method(D_METHOD("expand_building", "province_index", "building_type_identifier"), &GameSingleton::expand_building); + + ClassDB::bind_method(D_METHOD("set_paused", "paused"), &GameSingleton::set_paused); + ClassDB::bind_method(D_METHOD("toggle_paused"), &GameSingleton::toggle_paused); + ClassDB::bind_method(D_METHOD("is_paused"), &GameSingleton::is_paused); + ClassDB::bind_method(D_METHOD("increase_speed"), &GameSingleton::increase_speed); + ClassDB::bind_method(D_METHOD("decrease_speed"), &GameSingleton::decrease_speed); + ClassDB::bind_method(D_METHOD("can_increase_speed"), &GameSingleton::can_increase_speed); + ClassDB::bind_method(D_METHOD("can_decrease_speed"), &GameSingleton::can_decrease_speed); + ClassDB::bind_method(D_METHOD("get_longform_date"), &GameSingleton::get_longform_date); + ClassDB::bind_method(D_METHOD("try_tick"), &GameSingleton::try_tick); + + ADD_SIGNAL(MethodInfo("state_updated")); +} + +GameSingleton* GameSingleton::get_singleton() { + return singleton; +} + +/* REQUIREMENTS: + * MAP-21, MAP-25 + */ +GameSingleton::GameSingleton() : game_manager{ [this]() { emit_signal("state_updated"); } } { + ERR_FAIL_COND(singleton != nullptr); + singleton = this; + + Logger::set_info_func([](std::string&& str) { UtilityFunctions::print(str.c_str()); }); + Logger::set_error_func([](std::string&& str) { UtilityFunctions::push_error(str.c_str()); }); + + using mapmode_t = std::pair; + const std::vector 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_colour(); + return province.get_colour(); + } }, + { "mapmode_terrain", [](Map const&, Province const& province) -> Province::colour_t { + return province.is_water() ? 0x4287F5 : 0x0D7017; + } }, + { "mapmode_index", [](Map const& map, Province const& province) -> Province::colour_t { + const uint8_t f = static_cast(province.get_index()) / static_cast(map.get_province_count()) * 255.0f; + return (f << 16) | (f << 8) | f; + } } + }; + for (mapmode_t const& mapmode : mapmodes) + game_manager.map.add_mapmode(mapmode.first, mapmode.second); + + using building_type_t = std::tuple; + const std::vector building_types = { + { "building_fort", 4, 8 }, { "building_naval_base", 6, 15 }, { "building_railroad", 5, 10 } + }; + for (building_type_t const& type : building_types) + game_manager.building_manager.add_building_type(std::get<0>(type), std::get<1>(type), std::get<2>(type)); + +} + +GameSingleton::~GameSingleton() { + ERR_FAIL_COND(singleton != this); + singleton = nullptr; +} + +static Error load_json_file(String const& file_description, String const& file_path, Variant& result) { + result.clear(); + UtilityFunctions::print("Loading ", file_description, " file: ", file_path); + const Ref file = FileAccess::open(file_path, FileAccess::ModeFlags::READ); + Error err = FileAccess::get_open_error(); + if (err != OK || file.is_null()) { + UtilityFunctions::push_error("Failed to load ", file_description, " file: ", file_path); + return err == OK ? FAILED : err; + } + const String json_string = file->get_as_text(); + JSON json; + err = json.parse(json_string); + 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; + } + result = json.get_data(); + return err; +} + +using parse_json_entry_func_t = std::function; + +static Error parse_json_dictionary_file(String const& file_description, String const& file_path, + String const& identifier_prefix, parse_json_entry_func_t parse_entry) { + Variant json_var; + Error err = load_json_file(file_description, file_path, json_var); + if (err != OK) return err; + const Variant::Type type = json_var.get_type(); + if (type != Variant::DICTIONARY) { + UtilityFunctions::push_error("Invalid ", file_description, " JSON: root has type ", + Variant::get_type_name(type), " (expected Dictionary)"); + return FAILED; + } + Dictionary const& dict = json_var; + const Array identifiers = dict.keys(); + for (int64_t idx = 0; idx < identifiers.size(); ++idx) { + String const& identifier = identifiers[idx]; + Variant const& entry = dict[identifier]; + if (identifier.is_empty()) { + UtilityFunctions::push_error("Empty identifier in ", file_description, " file with entry: ", entry); + err = FAILED; + continue; + } + if (!identifier.begins_with(identifier_prefix)) + UtilityFunctions::push_warning("Identifier in ", file_description, " file missing \"", identifier_prefix, "\" prefix: ", identifier); + if (parse_entry(identifier, entry) != OK) err = FAILED; + } + return err; +} + +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; + 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; + break; + } + const double colour_double = var; + if (std::trunc(colour_double) != colour_double) { + colour = Province::NULL_COLOUR; + break; + } + const int64_t colour_int = static_cast(colour_double); + if (colour_int < 0 || colour_int > 255) { + colour = Province::NULL_COLOUR; + break; + } + colour = (colour << 8) | colour_int; + } + } + } 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(); + if (0 <= colour_int && colour_int <= 0xFFFFFF) + colour = colour_int; + } + } + if (colour == Province::NULL_COLOUR) { + UtilityFunctions::push_error("Invalid colour for province identifier \"", identifier, "\": ", entry); + return FAILED; + } + return ERR(game_manager.map.add_province(identifier.utf8().get_data(), colour)); +} + +Error GameSingleton::load_province_identifier_file(String const& file_path) { + const Error err = parse_json_dictionary_file("province identifier", file_path, "prov_", + [this](String const& identifier, Variant const& entry) -> Error { + return _parse_province_identifier_entry(identifier, entry); + }); + game_manager.map.lock_provinces(); + return err; +} + +Error GameSingleton::_parse_region_entry(String const& identifier, Variant const& entry) { + Error err = OK; + Variant::Type type = entry.get_type(); + std::vector province_identifiers; + if (type == Variant::ARRAY) { + Array const& province_array = entry; + for (int64_t idx = 0; idx < province_array.size(); ++idx) { + Variant const& province_var = province_array[idx]; + type = province_var.get_type(); + if (type == Variant::STRING) { + String const& province_string = province_var; + province_identifiers.push_back(province_string.utf8().get_data()); + } else { + UtilityFunctions::push_error("Invalid province identifier for region \"", identifier, "\": ", entry); + err = FAILED; + } + } + } + if (province_identifiers.empty()) { + UtilityFunctions::push_error("Invalid province list for region \"", identifier, "\": ", entry); + return FAILED; + } + return ERR(game_manager.map.add_region(identifier.utf8().get_data(), province_identifiers)); +} + +Error GameSingleton::load_region_file(String const& file_path) { + const Error err = parse_json_dictionary_file("region", file_path, "region_", + [this](String const& identifier, Variant const& entry) -> Error { + return _parse_region_entry(identifier, entry); + }); + game_manager.map.lock_regions(); + return err; +} + +Error GameSingleton::load_province_shape_file(String const& file_path) { + if (province_index_image.is_valid()) { + UtilityFunctions::push_error("Province shape file has already been loaded, cannot load: ", file_path); + return FAILED; + } + Ref 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); + return err; + } + 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; + } + static constexpr Image::Format expected_format = Image::FORMAT_RGB8; + const Image::Format format = province_shape_image->get_format(); + if (format != expected_format) { + UtilityFunctions::push_error("Invalid format (", format, ", should be ", expected_format, ") for province shape file: ", file_path); + err = FAILED; + } + if (err != OK) return err; + err = ERR(game_manager.map.generate_province_index_image(width, height, province_shape_image->get_data().ptr())); + + PackedByteArray index_data_array; + index_data_array.resize(width * height * sizeof(Province::index_t)); + std::vector const& province_index_data = game_manager.map.get_province_index_image(); + memcpy(index_data_array.ptrw(), province_index_data.data(), province_index_data.size()); + + province_index_image = Image::create_from_data(width, height, false, Image::FORMAT_RG8, index_data_array); + if (province_index_image.is_null()) { + UtilityFunctions::push_error("Failed to create province ID image"); + err = FAILED; + } + + if (update_colour_image() != OK) err = FAILED; + + return err; +} + +void GameSingleton::finished_loading_data() { + game_manager.finished_loading_data(); +} + +Error GameSingleton::load_water_province_file(String const& file_path) { + Variant json_var; + Error err = load_json_file("water province", file_path, json_var); + if (err != OK) return err; + Variant::Type type = json_var.get_type(); + if (type != Variant::ARRAY) { + UtilityFunctions::push_error("Invalid water province JSON: root has type ", + Variant::get_type_name(type), " (expected Array)"); + err = FAILED; + } else { + Array const& array = json_var; + for (int64_t idx = 0; idx < array.size(); ++idx) { + Variant const& entry = array[idx]; + type = entry.get_type(); + if (type != Variant::STRING) { + UtilityFunctions::push_error("Invalid water province identifier: ", entry); + err = FAILED; + continue; + } + String const& identifier = entry; + if (game_manager.map.set_water_province(identifier.utf8().get_data()) != SUCCESS) + err = FAILED; + } + } + game_manager.map.lock_water_provinces(); + return err; +} + +int32_t GameSingleton::get_province_index_from_uv_coords(Vector2 const& coords) const { + const size_t x_mod_w = UtilityFunctions::fposmod(coords.x, 1.0f) * get_width(); + const size_t y_mod_h = UtilityFunctions::fposmod(coords.y, 1.0f) * get_height(); + return game_manager.map.get_province_index_at(x_mod_w, y_mod_h); +} + +#define KEY(x) static const StringName x##_key = #x; +Dictionary GameSingleton::get_province_info_from_index(int32_t index) const { + Province const* province = game_manager.map.get_province_by_index(index); + if (province == nullptr) return {}; + KEY(province) KEY(region) KEY(life_rating) KEY(buildings) + Dictionary ret; + + ret[province_key] = province->get_identifier().c_str(); + + Region const* region = province->get_region(); + if (region != nullptr) ret[region_key] = region->get_identifier().c_str(); + + ret[life_rating_key] = province->get_life_rating(); + + std::vector const& buildings = province->get_buildings(); + if (!buildings.empty()) { + Array buildings_array; + buildings_array.resize(buildings.size()); + for (size_t idx = 0; idx < buildings.size(); ++idx) { + KEY(building) KEY(level) KEY(expansion_state) KEY(start_date) KEY(end_date) KEY(expansion_progress) + + Dictionary building_dict; + Building const& building = buildings[idx]; + building_dict[building_key] = building.get_type().get_identifier().c_str(); + building_dict[level_key] = static_cast(building.get_level()); + building_dict[expansion_state_key] = static_cast(building.get_expansion_state()); + building_dict[start_date_key] = static_cast(building.get_start_date()).c_str(); + building_dict[end_date_key] = static_cast(building.get_end_date()).c_str(); + building_dict[expansion_progress_key] = building.get_expansion_progress(); + + buildings_array[idx] = building_dict; + } + ret[buildings_key] = buildings_array; + } + return ret; +} +#undef KEY + +int32_t GameSingleton::get_width() const { + return game_manager.map.get_width(); +} + +int32_t GameSingleton::get_height() const { + return game_manager.map.get_height(); +} + +Ref GameSingleton::get_province_index_image() const { + return province_index_image; +} + +Ref GameSingleton::get_province_colour_image() const { + return province_colour_image; +} + +Error GameSingleton::update_colour_image() { + static PackedByteArray colour_data_array; + static constexpr int64_t colour_data_array_size = (Province::MAX_INDEX + 1) * 4; + 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(); + province_colour_image->set_data(PROVINCE_INDEX_SQRT, PROVINCE_INDEX_SQRT, + false, Image::FORMAT_RGBA8, colour_data_array); + if (province_colour_image.is_null()) { + UtilityFunctions::push_error("Failed to update province colour image"); + return FAILED; + } + return err; +} + +int32_t GameSingleton::get_mapmode_count() const { + return game_manager.map.get_mapmode_count(); +} + +String GameSingleton::get_mapmode_identifier(int32_t index) const { + Mapmode const* mapmode = game_manager.map.get_mapmode_by_index(index); + if (mapmode != nullptr) return mapmode->get_identifier().c_str(); + return String{}; +} + +Error GameSingleton::set_mapmode(godot::String const& identifier) { + Mapmode const* mapmode = game_manager.map.get_mapmode_by_identifier(identifier.utf8().get_data()); + if (mapmode == nullptr) { + UtilityFunctions::push_error("Failed to set mapmode to: ", identifier); + return FAILED; + } + mapmode_index = mapmode->get_index(); + return OK; +} + +Error GameSingleton::expand_building(int32_t province_index, String const& building_type_identifier) { + if (game_manager.expand_building(province_index, building_type_identifier.utf8().get_data()) != SUCCESS) { + UtilityFunctions::push_error("Failed to expand ", building_type_identifier, " at province index ", province_index); + return FAILED; + } + return OK; +} + +void GameSingleton::set_paused(bool paused) { + game_manager.clock.isPaused = paused; +} + +void GameSingleton::toggle_paused() { + game_manager.clock.isPaused = !game_manager.clock.isPaused; +} + +bool GameSingleton::is_paused() const { + return game_manager.clock.isPaused; +} + +void GameSingleton::increase_speed() { + game_manager.clock.increaseSimulationSpeed(); +} + +void GameSingleton::decrease_speed() { + game_manager.clock.decreaseSimulationSpeed(); +} + +bool GameSingleton::can_increase_speed() const { + return game_manager.clock.canIncreaseSimulationSpeed(); +} + +bool GameSingleton::can_decrease_speed() const { + return game_manager.clock.canDecreaseSimulationSpeed(); +} + +String GameSingleton::get_longform_date() const { + return static_cast(game_manager.get_today()).c_str(); +} + +void GameSingleton::try_tick() { + game_manager.clock.conditionallyAdvanceGame(); +} diff --git a/extension/src/GameSingleton.hpp b/extension/src/GameSingleton.hpp new file mode 100644 index 0000000..0e2cfd1 --- /dev/null +++ b/extension/src/GameSingleton.hpp @@ -0,0 +1,62 @@ +#pragma once + +#include + +#include + +#include "openvic2/GameManager.hpp" + +namespace OpenVic2 { + class GameSingleton : public godot::Object { + GDCLASS(GameSingleton, godot::Object) + + static GameSingleton* singleton; + + GameManager game_manager; + + godot::Ref province_index_image, province_colour_image; + Mapmode::index_t mapmode_index = 0; + + 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); + void _tick(); + protected: + static void _bind_methods(); + + public: + static GameSingleton* get_singleton(); + + GameSingleton(); + ~GameSingleton(); + + godot::Error load_province_identifier_file(godot::String const& file_path); + godot::Error load_water_province_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); + void finished_loading_data(); + + int32_t get_province_index_from_uv_coords(godot::Vector2 const& coords) const; + godot::Dictionary get_province_info_from_index(int32_t index) const; + int32_t get_width() const; + int32_t get_height() const; + godot::Ref get_province_index_image() const; + godot::Ref 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); + + godot::Error expand_building(int32_t province_index, godot::String const& building_type_identifier); + + void set_paused(bool paused); + void toggle_paused(); + bool is_paused() const; + void increase_speed(); + void decrease_speed(); + bool can_increase_speed() const; + bool can_decrease_speed() const; + godot::String get_longform_date() const; + void try_tick(); + }; +} diff --git a/extension/src/MapSingleton.cpp b/extension/src/MapSingleton.cpp deleted file mode 100644 index 6f90dee..0000000 --- a/extension/src/MapSingleton.cpp +++ /dev/null @@ -1,394 +0,0 @@ -#include "MapSingleton.hpp" - -#include -#include -#include - -using namespace godot; -using namespace OpenVic2; - -MapSingleton* MapSingleton::singleton = nullptr; - -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_water_province_file", "file_path"), &MapSingleton::load_water_province_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_index_from_uv_coords", "coords"), &MapSingleton::get_province_index_from_uv_coords); - ClassDB::bind_method(D_METHOD("get_province_identifier_from_uv_coords", "coords"), &MapSingleton::get_province_identifier_from_uv_coords); - ClassDB::bind_method(D_METHOD("get_region_identifier_from_province_identifier", "identifier"), &MapSingleton::get_region_identifier_from_province_identifier); - 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() { - return singleton; -} - -/* REQUIREMENTS: - * MAP-21, MAP-25 - */ -MapSingleton::MapSingleton() { - ERR_FAIL_COND(singleton != nullptr); - singleton = this; - - using mapmode_t = std::pair; - const std::vector 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_colour(); - return province.get_colour(); - } }, - { "mapmode_terrain", [](Map const&, Province const& province) -> Province::colour_t { - return province.is_water() ? 0x4287F5 : 0x0D7017; - } }, - { "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 const& mapmode : mapmodes) - if (map.add_mapmode(mapmode.first, mapmode.second, error_message) != SUCCESS) - UtilityFunctions::push_error(error_message.c_str()); -} - -MapSingleton::~MapSingleton() { - ERR_FAIL_COND(singleton != this); - singleton = nullptr; -} - -static Error load_json_file(String const& file_description, String const& file_path, Variant& result) { - result.clear(); - UtilityFunctions::print("Loading ", file_description, " file: ", file_path); - const Ref file = FileAccess::open(file_path, FileAccess::ModeFlags::READ); - Error err = FileAccess::get_open_error(); - if (err != OK || file.is_null()) { - UtilityFunctions::push_error("Failed to load ", file_description, " file: ", file_path); - return err == OK ? FAILED : err; - } - const String json_string = file->get_as_text(); - JSON json; - err = json.parse(json_string); - 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; - } - result = json.get_data(); - return err; -} - -using parse_json_entry_func_t = std::function; - -static Error parse_json_dictionary_file(String const& file_description, String const& file_path, - String const& identifier_prefix, parse_json_entry_func_t parse_entry) { - Variant json_var; - Error err = load_json_file(file_description, file_path, json_var); - if (err != OK) return err; - const Variant::Type type = json_var.get_type(); - if (type != Variant::DICTIONARY) { - UtilityFunctions::push_error("Invalid ", file_description, " JSON: root has type ", - Variant::get_type_name(type), " (expected Dictionary)"); - return FAILED; - } - Dictionary const& dict = json_var; - const Array identifiers = dict.keys(); - for (int64_t idx = 0; idx < identifiers.size(); ++idx) { - String const& identifier = identifiers[idx]; - Variant const& entry = dict[identifier]; - if (identifier.is_empty()) { - UtilityFunctions::push_error("Empty identifier in ", file_description, " file with entry: ", entry); - err = FAILED; - continue; - } - if (!identifier.begins_with(identifier_prefix)) - UtilityFunctions::push_warning("Identifier in ", file_description, " file missing \"", identifier_prefix, "\" prefix: ", identifier); - if (parse_entry(identifier, entry) != OK) err = FAILED; - } - return err; -} - -Error MapSingleton::_parse_province_identifier_entry(String const& identifier, Variant const& entry) { - const Variant::Type type = entry.get_type(); - Province::colour_t colour = Province::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; - break; - } - const double colour_double = var; - if (std::trunc(colour_double) != colour_double) { - colour = Province::NULL_COLOUR; - break; - } - const int64_t colour_int = static_cast(colour_double); - if (colour_int < 0 || colour_int > 255) { - colour = Province::NULL_COLOUR; - break; - } - colour = (colour << 8) | colour_int; - } - } - } 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(); - if (0 <= colour_int && colour_int <= 0xFFFFFF) - colour = colour_int; - } - } - if (colour == Province::NULL_COLOUR) { - 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) != SUCCESS) { - UtilityFunctions::push_error(error_message.c_str()); - return FAILED; - } - return OK; -} - -Error MapSingleton::load_province_identifier_file(String const& file_path) { - const Error err = parse_json_dictionary_file("province identifier", file_path, "prov_", - [this](String const& identifier, Variant const& entry) -> Error { - return this->_parse_province_identifier_entry(identifier, entry); - }); - map.lock_provinces(); - return err; -} - -Error MapSingleton::_parse_region_entry(String const& identifier, Variant const& entry) { - Error err = OK; - Variant::Type type = entry.get_type(); - std::vector province_identifiers; - if (type == Variant::ARRAY) { - Array const& province_array = entry; - for (int64_t idx = 0; idx < province_array.size(); ++idx) { - Variant const& province_var = province_array[idx]; - type = province_var.get_type(); - if (type == Variant::STRING) { - String const& province_string = province_var; - province_identifiers.push_back(province_string.utf8().get_data()); - } else { - UtilityFunctions::push_error("Invalid province identifier for region \"", identifier, "\": ", entry); - err = FAILED; - } - } - } - if (province_identifiers.empty()) { - UtilityFunctions::push_error("Invalid province list for region \"", identifier, "\": ", entry); - return FAILED; - } - 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; - } - return err; -} - -Error MapSingleton::load_region_file(String const& file_path) { - const Error err = parse_json_dictionary_file("region", file_path, "region_", - [this](String const& identifier, Variant const& entry) -> Error { - return this->_parse_region_entry(identifier, entry); - }); - map.lock_regions(); - return err; -} - -Error MapSingleton::load_province_shape_file(String const& file_path) { - if (province_index_image.is_valid()) { - UtilityFunctions::push_error("Province shape file has already been loaded, cannot load: ", file_path); - return FAILED; - } - Ref 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); - return err; - } - 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; - } - static const Image::Format expected_format = Image::FORMAT_RGB8; - const Image::Format format = province_shape_image->get_format(); - if (format != expected_format) { - UtilityFunctions::push_error("Invalid format (", format, ", should be ", expected_format, ") for province shape file: ", file_path); - err = FAILED; - } - if (err != OK) return err; - - 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; - } - - PackedByteArray index_data_array; - index_data_array.resize(width * height * sizeof(Province::index_t)); - 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()) { - UtilityFunctions::push_error("Failed to create province ID image"); - err = FAILED; - } - - if (update_colour_image() != OK) err = FAILED; - - return err; -} - -Error MapSingleton::load_water_province_file(String const& file_path) { - Variant json_var; - Error err = load_json_file("water province", file_path, json_var); - if (err != OK) return err; - Variant::Type type = json_var.get_type(); - if (type != Variant::ARRAY) { - UtilityFunctions::push_error("Invalid water province JSON: root has type ", - Variant::get_type_name(type), " (expected Array)"); - err = FAILED; - } else { - Array const& array = json_var; - std::string error_message; - for (int64_t idx = 0; idx < array.size(); ++idx) { - Variant const& entry = array[idx]; - type = entry.get_type(); - if (type != Variant::STRING) { - UtilityFunctions::push_error("Invalid water province identifier: ", entry); - err = FAILED; - continue; - } - String const& identifier = entry; - if (map.set_water_province(identifier.utf8().get_data(), error_message) != SUCCESS) { - UtilityFunctions::push_error(error_message.c_str()); - err = FAILED; - } - } - } - map.lock_water_provinces(); - return err; -} - -Province* MapSingleton::get_province_from_uv_coords(godot::Vector2 const& coords) { - if (province_index_image.is_valid()) { - const PackedByteArray index_data_array = province_index_image->get_data(); - Province::index_t const* index_data = reinterpret_cast(index_data_array.ptr()); - const int32_t x_mod_w = UtilityFunctions::fposmod(coords.x, 1.0f) * get_width(); - const int32_t y_mod_h = UtilityFunctions::fposmod(coords.y, 1.0f) * get_height(); - return map.get_province_by_index(index_data[x_mod_w + y_mod_h * get_width()]); - } - return nullptr; -} - -Province const* MapSingleton::get_province_from_uv_coords(godot::Vector2 const& coords) const { - if (province_index_image.is_valid()) { - const PackedByteArray index_data_array = province_index_image->get_data(); - Province::index_t const* index_data = reinterpret_cast(index_data_array.ptr()); - const int32_t x_mod_w = UtilityFunctions::fposmod(coords.x, 1.0f) * get_width(); - const int32_t y_mod_h = UtilityFunctions::fposmod(coords.y, 1.0f) * get_height(); - return map.get_province_by_index(index_data[x_mod_w + y_mod_h * get_width()]); - } - return nullptr; -} - -int32_t MapSingleton::get_province_index_from_uv_coords(Vector2 const& coords) const { - Province const* province = get_province_from_uv_coords(coords); - if (province != nullptr) return province->get_index(); - return Province::NULL_INDEX; -} - -String MapSingleton::get_province_identifier_from_uv_coords(Vector2 const& coords) const { - Province const* province = get_province_from_uv_coords(coords); - if (province != nullptr) return province->get_identifier().c_str(); - return String{}; -} - -String MapSingleton::get_region_identifier_from_province_identifier(String const& identifier) const { - Province const* province = map.get_province_by_identifier(identifier.utf8().get_data()); - if (province != nullptr) { - Region const* region = province->get_region(); - if (region != nullptr) return region->get_identifier().c_str(); - } - return String{}; -} - -int32_t MapSingleton::get_width() const { - return map.get_width(); -} - -int32_t MapSingleton::get_height() const { - return map.get_height(); -} - -Ref MapSingleton::get_province_index_image() const { - return province_index_image; -} - -Ref 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) * 4; - 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_RGBA8, 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 deleted file mode 100644 index 6ec2ea4..0000000 --- a/extension/src/MapSingleton.hpp +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once - -#include - -#include - -#include "openvic2/Map.hpp" - -namespace OpenVic2 { - class MapSingleton : public godot::Object { - GDCLASS(MapSingleton, godot::Object) - - static MapSingleton* singleton; - - godot::Ref province_index_image, province_colour_image; - Map map; - Mapmode::index_t mapmode_index = 0; - - 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: - static void _bind_methods(); - - public: - static MapSingleton* get_singleton(); - - MapSingleton(); - ~MapSingleton(); - - godot::Error load_province_identifier_file(godot::String const& file_path); - godot::Error load_water_province_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); - - Province* get_province_from_uv_coords(godot::Vector2 const& coords); - Province const* get_province_from_uv_coords(godot::Vector2 const& coords) const; - int32_t get_province_index_from_uv_coords(godot::Vector2 const& coords) const; - godot::String get_province_identifier_from_uv_coords(godot::Vector2 const& coords) const; - godot::String get_region_identifier_from_province_identifier(godot::String const& identifier) const; - int32_t get_width() const; - int32_t get_height() const; - godot::Ref get_province_index_image() const; - godot::Ref 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/Date.cpp b/extension/src/openvic2/Date.cpp index e1cef72..bb891fd 100644 --- a/extension/src/openvic2/Date.cpp +++ b/extension/src/openvic2/Date.cpp @@ -1,115 +1,161 @@ -#include -#include "Date.hpp" +#include "openvic2/Date.hpp" + +#include +#include + +#include "openvic2/Logger.hpp" using namespace OpenVic2; -bool Timespan::operator< (Timespan const& other) const { return days < other.days; } -bool Timespan::operator> (Timespan const& other) const { return days > other.days; } -bool Timespan::operator<= (Timespan const& other) const { return days <= other.days; } -bool Timespan::operator>= (Timespan const& other) const { return days >= other.days; } -bool Timespan::operator== (Timespan const& other) const { return days == other.days; } -bool Timespan::operator!= (Timespan const& other) const { return days != other.days; } +Timespan::Timespan(day_t value) : days{value} {} + +bool Timespan::operator<(Timespan other) const { return days < other.days; }; +bool Timespan::operator>(Timespan other) const { return days > other.days; }; +bool Timespan::operator<=(Timespan other) const { return days <= other.days; }; +bool Timespan::operator>=(Timespan other) const { return days >= other.days; }; +bool Timespan::operator==(Timespan other) const { return days == other.days; }; +bool Timespan::operator!=(Timespan other) const { return days != other.days; }; + +Timespan Timespan::operator+(Timespan other) const { return days + other.days; } + +Timespan Timespan::operator-(Timespan other) const { return days - other.days; } -Timespan Timespan::operator+ (Timespan const& other) const { return Timespan(days + other.days); } -Timespan Timespan::operator- (Timespan const& other) const { return Timespan(days - other.days); } -Timespan Timespan::operator* (int64_t const& factor) const { return Timespan(days * factor); } -Timespan Timespan::operator/ (int64_t const& factor) const { return Timespan(days / factor); } +Timespan Timespan::operator*(day_t factor) const { return days * factor; } -Timespan& Timespan::operator+= (Timespan const& other) { +Timespan Timespan::operator/(day_t factor) const { return days / factor; } + +Timespan& Timespan::operator+=(Timespan other) { days += other.days; return *this; } -Timespan& Timespan::operator-= (Timespan const& other) { + +Timespan& Timespan::operator-=(Timespan other) { days -= other.days; return *this; } -Timespan::operator std::string() const { - return std::to_string(days); +Timespan& Timespan::operator++() { + days++; + return *this; } -std::ostream &operator<<(std::ostream &out, Timespan const& timespan) { - return out << static_cast(timespan); + +Timespan Timespan::operator++(int) { + Timespan old = *this; + ++(*this); + return old; } -Timespan fromYearZero(year_t year, month_t month, date_t day) { - int64_t daysElapsed = year * DAYS_IN_YEAR; - size_t daysSinceMonthStart = (day == 0) ? 0 : day - 1; //Underflow protection - for (size_t x = 0; x < month && x < MONTHS_IN_YEAR; x++) { - daysElapsed += DAYS_IN_MONTH[x]; - } - daysElapsed += daysSinceMonthStart; - return Timespan(daysElapsed); +Timespan::operator day_t() const { + return days; } -//This function is not set up to handle dates before Year 0 -YearMonthDayBundle toGregorianDate(Timespan const& timespan) { - year_t year = 0; - month_t month = 0; - date_t day = 0; +Timespan::operator double() const { + return days; +} - if (timespan >= 0) { - year = timespan.days / DAYS_IN_YEAR; - int64_t remainingDays = timespan.days % DAYS_IN_YEAR; +Timespan::operator std::string() const { + return std::to_string(days); +} + +std::ostream& OpenVic2::operator<<(std::ostream& out, Timespan timespan) { + return out << static_cast(timespan); +} - for (size_t x = 0; x < MONTHS_IN_YEAR && remainingDays >= DAYS_IN_MONTH[x]; x++) { - remainingDays -= DAYS_IN_MONTH[x]; - month++; - } +Timespan Date::_dateToTimespan(year_t year, month_t month, day_t day) { + month = std::clamp(month, 1, MONTHS_IN_YEAR); + day = std::clamp(day, 1, DAYS_IN_MONTH[month - 1]); + return year * DAYS_IN_YEAR + DAYS_UP_TO_MONTH[month - 1] + day - 1; +} - //Corrects month and day to be 1-indexed - month++; - day++; +Date::Date(Timespan total_days) : timespan{ total_days } { + if (timespan < 0) { + Logger::error("Invalid timespan for date: ", timespan, " (cannot be negative)"); + timespan = 0; } - return std::make_tuple(year, month, day); } +Date::Date(year_t year, month_t month, day_t day) : timespan{ _dateToTimespan(year, month, day) } {} -Date::Date(Timespan const& timespan) : ts(timespan) { updateDate(ts); } +Date::year_t Date::getYear() const { + return static_cast(timespan) / DAYS_IN_YEAR; +} -Date::Date(year_t year, month_t month, date_t day) { - ts = fromYearZero(year, month, day); - updateDate(ts); +Date::month_t Date::getMonth() const { + return ((static_cast(timespan) % DAYS_IN_YEAR) / 32) + 1; } -void Date::updateDate(Timespan const& timespan) { - gregorianDate = toGregorianDate(timespan); +Date::day_t Date::getDay() const { + const Timespan::day_t days_in_year = static_cast(timespan) % DAYS_IN_YEAR; + return days_in_year - DAYS_UP_TO_MONTH[days_in_year / 32] + 1; } -size_t Date::getDay() const { return std::get<2>(gregorianDate); } -size_t Date::getMonth() const { return std::get<1>(gregorianDate); } -size_t Date::getYear() const { return std::get<0>(gregorianDate); } -bool Date::operator< (Date const& other) const { return ts < other.ts; } -bool Date::operator> (Date const& other) const { return ts > other.ts; } -bool Date::operator<= (Date const& other) const { return ts <= other.ts; } -bool Date::operator>= (Date const& other) const { return ts >= other.ts; } -bool Date::operator== (Date const& other) const { return ts == other.ts; } -bool Date::operator!= (Date const& other) const { return ts != other.ts; } +bool Date::operator<(Date other) const { return timespan < other.timespan; }; +bool Date::operator>(Date other) const { return timespan > other.timespan; }; +bool Date::operator<=(Date other) const { return timespan <= other.timespan; }; +bool Date::operator>=(Date other) const { return timespan >= other.timespan; }; +bool Date::operator==(Date other) const { return timespan == other.timespan; }; +bool Date::operator!=(Date other) const { return timespan != other.timespan; }; + +Date Date::operator+(Timespan other) const { return timespan + other; } + +Timespan Date::operator-(Date other) const { return timespan - other.timespan; } -Date Date::operator+ (Timespan timespan) const { return Date(ts + timespan); } -Timespan Date::operator- (Date const& other) const { return ts - other.ts; } +Date& Date::operator+=(Timespan other) { + timespan += other; + return *this; +} -Date& Date::operator+= (Timespan const& timespan) { - ts += timespan; - updateDate(ts); +Date& Date::operator-=(Timespan other) { + timespan -= other; return *this; } -Date& Date::operator-= (Timespan const& timespan) { - ts -= timespan; - updateDate(ts); + +Date& Date::operator++() { + timespan++; return *this; } -Date Date::operator++ (int) { - Date oldCopy = *this; - (*this) += 1; - return oldCopy; + +Date Date::operator++(int) { + Date old = *this; + ++(*this); + return old; } Date::operator std::string() const { std::stringstream ss; - ss << getYear() << '.' << getMonth() << '.' << getDay(); + ss << *this; return ss.str(); } -std::ostream &operator<<(std::ostream &out, Date const& date) { - return out << static_cast(date); + +std::ostream& OpenVic2::operator<<(std::ostream& out, Date date) { + return out << (int) date.getYear() << '.' << (int) date.getMonth() << '.' << (int) date.getDay(); } + +// Parsed from string of the form YYYY.MM.DD +Date Date::from_string(std::string const& date) { + year_t year = 0; + month_t month = 1; + day_t day = 1; + + size_t first_pos = 0; + while (first_pos < date.length() && std::isdigit(date[first_pos++])); + year = atoi(date.substr(0, first_pos).c_str()); + if (first_pos < date.length()) { + if (date[first_pos] == '.') { + size_t second_pos = first_pos + 1; + while (second_pos < date.length() && std::isdigit(date[second_pos++])); + month = atoi(date.substr(first_pos, second_pos - first_pos).c_str()); + if (second_pos < date.length()) { + if (date[second_pos] == '.') { + size_t third_pos = second_pos + 1; + while (third_pos < date.length() && std::isdigit(date[third_pos++])); + day = atoi(date.substr(second_pos, third_pos - second_pos).c_str()); + if (third_pos < date.length()) + Logger::error("Unexpected string \"", date.substr(third_pos), "\" at the end of date ", date); + } else Logger::error("Unexpected character \"", date[second_pos], "\" in date ", date); + } + } else Logger::error("Unexpected character \"", date[first_pos], "\" in date ", date); + } + return _dateToTimespan(year, month, day); +}; diff --git a/extension/src/openvic2/Date.hpp b/extension/src/openvic2/Date.hpp index 9ed5963..b19602b 100644 --- a/extension/src/openvic2/Date.hpp +++ b/extension/src/openvic2/Date.hpp @@ -1,86 +1,83 @@ #pragma once #include -#include -#include #include -#include +#include namespace OpenVic2 { - //A relative period between points in time, measured in days + // A relative period between points in time, measured in days struct Timespan { - int64_t days; - - Timespan() : days(0) {} - Timespan(int64_t const& value) : days(value) {} - - bool operator< (Timespan const& other) const; - bool operator> (Timespan const& other) const; - bool operator<= (Timespan const& other) const; - bool operator>= (Timespan const& other) const; - bool operator== (Timespan const& other) const; - bool operator!= (Timespan const& other) const; - - Timespan operator+ (Timespan const& other) const; - Timespan operator- (Timespan const& other) const; - Timespan operator* (int64_t const& factor) const; - Timespan operator/ (int64_t const& factor) const; - - Timespan& operator+= (Timespan const& other); - Timespan& operator-= (Timespan const& other); - + using day_t = int64_t; + private: + day_t days; + public: + Timespan(day_t value = 0); + + bool operator<(Timespan other) const; + bool operator>(Timespan other) const; + bool operator<=(Timespan other) const; + bool operator>=(Timespan other) const; + bool operator==(Timespan other) const; + bool operator!=(Timespan other) const; + + Timespan operator+(Timespan other) const; + Timespan operator-(Timespan other) const; + Timespan operator*(day_t factor) const; + Timespan operator/(day_t factor) const; + Timespan& operator+=(Timespan other); + Timespan& operator-=(Timespan other); + Timespan& operator++(); + Timespan operator++(int); + + explicit operator day_t() const; + explicit operator double() const; explicit operator std::string() const; - friend std::ostream& operator<< (std::ostream& out, Timespan const& timespan); }; + std::ostream& operator<< (std::ostream& out, Timespan timespan); - static constexpr size_t MONTHS_IN_YEAR = 12; - static constexpr size_t DAYS_IN_YEAR = 365; - static constexpr size_t DAYS_IN_MONTH[MONTHS_IN_YEAR] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - - using date_t = uint8_t; - using month_t = uint8_t; - using year_t = uint16_t; - using YearMonthDayBundle = std::tuple; - - //Represents an in-game date - //Note: Current implementation does not account for leap-years, or dates before Year 0 + // Represents an in-game date + // Note: Current implementation does not account for leap-years, or dates before Year 0 struct Date { - private: - YearMonthDayBundle gregorianDate; - //Number of days since Jan 1st, Year 0 - Timespan ts; - - public: - //The Timespan is considered to be the number of days since Jan 1st, Year 0 - Date(Timespan const& timespan); - - //Year month day specification - Date(year_t year = 1836, month_t month = 1, date_t day = 1); - - private: - void updateDate(Timespan const& timespan); - - public: - size_t getDay() const; - size_t getMonth() const; - size_t getYear() const; - - bool operator< (Date const& other) const; - bool operator> (Date const& other) const; - bool operator<= (Date const& other) const; - bool operator>= (Date const& other) const; - bool operator== (Date const& other) const; - bool operator!= (Date const& other) const; - - Date operator+ (Timespan timespan) const; - Timespan operator- (Date const& other) const; - - Date& operator+= (Timespan const& timespan); - Date& operator-= (Timespan const& timespan); - //Postfix increment - Date operator++ (int); + using year_t = uint16_t; + using month_t = uint8_t; + using day_t = uint8_t; + + static constexpr Timespan::day_t MONTHS_IN_YEAR = 12; + static constexpr Timespan::day_t DAYS_IN_YEAR = 365; + static constexpr Timespan::day_t DAYS_IN_MONTH[MONTHS_IN_YEAR] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + static constexpr Timespan::day_t DAYS_UP_TO_MONTH[MONTHS_IN_YEAR] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; + private: + // Number of days since Jan 1st, Year 0 + Timespan timespan; + + static Timespan _dateToTimespan(year_t year, month_t month, day_t day); + public: + // The Timespan is considered to be the number of days since Jan 1st, Year 0 + Date(Timespan total_days); + // Year month day specification + Date(year_t year = 0, month_t month = 1, day_t day = 1); + + year_t getYear() const; + month_t getMonth() const; + day_t getDay() const; + + bool operator<(Date other) const; + bool operator>(Date other) const; + bool operator<=(Date other) const; + bool operator>=(Date other) const; + bool operator==(Date other) const; + bool operator!=(Date other) const; + + Date operator+(Timespan other) const; + Timespan operator-(Date other) const; + Date& operator+=(Timespan other); + Date& operator-=(Timespan other); + Date& operator++(); + Date operator++(int); explicit operator std::string() const; - friend std::ostream& operator<< (std::ostream& out, Date const& date); + // Parsed from string of the form YYYY.MM.DD + static Date from_string(std::string const& date); }; + std::ostream& operator<< (std::ostream& out, Date date); } diff --git a/extension/src/openvic2/GameAdvancementHook.cpp b/extension/src/openvic2/GameAdvancementHook.cpp index 3db3224..c78847b 100644 --- a/extension/src/openvic2/GameAdvancementHook.cpp +++ b/extension/src/openvic2/GameAdvancementHook.cpp @@ -1,69 +1,67 @@ -#include "GameAdvancementHook.hpp" +#include "openvic2/GameAdvancementHook.hpp" -namespace OpenVic2 { - GameAdvancementHook::GameAdvancementHook(AdvancementFunction function, bool startPaused, GameSpeed startingSpeed) { - triggerFunction = function; - lastPolledTime = std::chrono::high_resolution_clock::now(); - isPaused = startPaused; - currentSpeed = startingSpeed; - } +using namespace OpenVic2; - void GameAdvancementHook::increaseSimulationSpeed() { - switch (currentSpeed) { - case(GameSpeed::Speed1): - currentSpeed = GameSpeed::Speed2; - break; - case(GameSpeed::Speed2): - currentSpeed = GameSpeed::Speed3; - break; - case(GameSpeed::Speed3): - currentSpeed = GameSpeed::Speed4; - break; - case(GameSpeed::Speed4): - currentSpeed = GameSpeed::Speed5; - break; - } - } +const std::vector GameAdvancementHook::GAME_SPEEDS = { + std::chrono::milliseconds{ 4000 }, + std::chrono::milliseconds{ 3000 }, + std::chrono::milliseconds{ 2000 }, + std::chrono::milliseconds{ 1000 }, + std::chrono::milliseconds{ 100 }, + std::chrono::milliseconds{ 1 } }; - void GameAdvancementHook::decreaseSimulationSpeed() { - switch (currentSpeed) { - case(GameSpeed::Speed2): - currentSpeed = GameSpeed::Speed1; - break; - case(GameSpeed::Speed3): - currentSpeed = GameSpeed::Speed2; - break; - case(GameSpeed::Speed4): - currentSpeed = GameSpeed::Speed3; - break; - case(GameSpeed::Speed5): - currentSpeed = GameSpeed::Speed4; - break; - } - } +GameAdvancementHook::GameAdvancementHook(AdvancementFunction tickFunction, RefreshFunction updateFunction, bool startPaused, speed_t startingSpeed) + : triggerFunction{ tickFunction }, refreshFunction{ updateFunction }, isPaused{ startPaused } { + lastPolledTime = std::chrono::high_resolution_clock::now(); + setSimulationSpeed(startingSpeed); +} + +void GameAdvancementHook::setSimulationSpeed(speed_t speed) { + if (speed < 0) + currentSpeed = 0; + else if (speed >= GAME_SPEEDS.size()) + currentSpeed = GAME_SPEEDS.size() - 1; + else + currentSpeed = speed; +} + +GameAdvancementHook::speed_t GameAdvancementHook::getSimulationSpeed() const { + return currentSpeed; +} + +void GameAdvancementHook::increaseSimulationSpeed() { + setSimulationSpeed(currentSpeed + 1); +} + +void GameAdvancementHook::decreaseSimulationSpeed() { + setSimulationSpeed(currentSpeed - 1); +} + +bool GameAdvancementHook::canIncreaseSimulationSpeed() const { + return currentSpeed + 1 < GAME_SPEEDS.size(); +} + +bool GameAdvancementHook::canDecreaseSimulationSpeed() const { + return currentSpeed > 0; +} - GameAdvancementHook GameAdvancementHook::operator++(int) { - GameAdvancementHook oldCopy = *this; - increaseSimulationSpeed(); - return oldCopy; - }; +GameAdvancementHook& GameAdvancementHook::operator++() { + increaseSimulationSpeed(); + return *this; +}; - GameAdvancementHook GameAdvancementHook::operator--(int) { - GameAdvancementHook oldCopy = *this; - decreaseSimulationSpeed(); - return oldCopy; - }; +GameAdvancementHook& GameAdvancementHook::operator--() { + decreaseSimulationSpeed(); + return *this; +}; - void GameAdvancementHook::conditionallyAdvanceGame() { - if (!isPaused) { - std::chrono::time_point previousTime = lastPolledTime; - std::chrono::time_point currentTime = std::chrono::high_resolution_clock::now(); - if (std::chrono::duration_cast(currentTime - previousTime).count() >= static_cast(currentSpeed)) { - lastPolledTime = currentTime; - if (triggerFunction) { - triggerFunction(); - } - } +void GameAdvancementHook::conditionallyAdvanceGame() { + if (!isPaused) { + std::chrono::time_point currentTime = std::chrono::high_resolution_clock::now(); + if (std::chrono::duration_cast(currentTime - lastPolledTime) >= GAME_SPEEDS[currentSpeed]) { + lastPolledTime = currentTime; + if (triggerFunction) triggerFunction(); } } -} \ No newline at end of file + if (refreshFunction) refreshFunction(); +} diff --git a/extension/src/openvic2/GameAdvancementHook.hpp b/extension/src/openvic2/GameAdvancementHook.hpp index 72af4ac..572494a 100644 --- a/extension/src/openvic2/GameAdvancementHook.hpp +++ b/extension/src/openvic2/GameAdvancementHook.hpp @@ -2,39 +2,40 @@ #include #include +#include namespace OpenVic2 { - //Value of different game speeds are the minimum number of miliseconds before the simulation advances - enum class GameSpeed { - Speed1 = 4000, - Speed2 = 3000, - Speed3 = 2000, - Speed4 = 1000, - Speed5 = 100, - Speed6 = 1 - }; - //Conditionally advances game with provided behaviour //Class governs game speed and pause state class GameAdvancementHook { public: using AdvancementFunction = std::function; + using RefreshFunction = std::function; + using speed_t = int8_t; + + //Minimum number of miliseconds before the simulation advances + static const std::vector GAME_SPEEDS; private: std::chrono::time_point lastPolledTime; //A function pointer that advances the simulation, intended to be a capturing lambda or something similar. May need to be reworked later AdvancementFunction triggerFunction; + RefreshFunction refreshFunction; public: bool isPaused; - GameSpeed currentSpeed; + speed_t currentSpeed; - GameAdvancementHook(AdvancementFunction function = nullptr, bool startPaused = false, GameSpeed startingSpeed = GameSpeed::Speed1); + GameAdvancementHook(AdvancementFunction tickFunction, RefreshFunction updateFunction, bool startPaused = false, speed_t startingSpeed = 0); + void setSimulationSpeed(speed_t speed); + speed_t getSimulationSpeed() const; void increaseSimulationSpeed(); void decreaseSimulationSpeed(); - GameAdvancementHook operator++(int); - GameAdvancementHook operator--(int); + bool canIncreaseSimulationSpeed() const; + bool canDecreaseSimulationSpeed() const; + GameAdvancementHook& operator++(); + GameAdvancementHook& operator--(); void conditionallyAdvanceGame(); }; } \ No newline at end of file diff --git a/extension/src/openvic2/GameManager.cpp b/extension/src/openvic2/GameManager.cpp new file mode 100644 index 0000000..da742ca --- /dev/null +++ b/extension/src/openvic2/GameManager.cpp @@ -0,0 +1,43 @@ +#include "openvic2/GameManager.hpp" + +#include "openvic2/Logger.hpp" + +using namespace OpenVic2; + +GameManager::GameManager(state_updated_func_t state_updated_callback) + : clock{ [this]() { tick(); }, [this]() { update_state(); }, true }, today{ 1836 }, state_updated{ state_updated_callback } {} + +void GameManager::set_needs_update() { + needs_update = true; +} + +void GameManager::update_state() { + if (needs_update) { + Logger::info("Update: ", today); + map.update_state(today); + if (state_updated) state_updated(); + needs_update = false; + } +} + +void GameManager::tick() { + today++; + Logger::info("Tick: ", today); + map.tick(today); + set_needs_update(); +} + +void GameManager::finished_loading_data() { + map.generate_province_buildings(building_manager); +} + +Date const& GameManager::get_today() const { + return today; +} + +return_t GameManager::expand_building(Province::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; + return province->expand_building(building_type_identifier); +} diff --git a/extension/src/openvic2/GameManager.hpp b/extension/src/openvic2/GameManager.hpp new file mode 100644 index 0000000..cba0180 --- /dev/null +++ b/extension/src/openvic2/GameManager.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include "openvic2/GameAdvancementHook.hpp" +#include "openvic2/map/Map.hpp" + +namespace OpenVic2 { + struct GameManager { + using state_updated_func_t = std::function; + + Map map; + BuildingManager building_manager; + GameAdvancementHook clock; + private: + Date today; + state_updated_func_t state_updated; + bool needs_update = true; + + void set_needs_update(); + void update_state(); + void tick(); + public: + GameManager(state_updated_func_t state_updated_callback); + + void finished_loading_data(); + + Date const& get_today() const; + return_t expand_building(Province::index_t province_index, std::string const& building_type_identifier); + }; +} diff --git a/extension/src/openvic2/Logger.cpp b/extension/src/openvic2/Logger.cpp new file mode 100644 index 0000000..f211e7e --- /dev/null +++ b/extension/src/openvic2/Logger.cpp @@ -0,0 +1,26 @@ +#include "openvic2/Logger.hpp" + +#include + +using namespace OpenVic2; + +Logger::log_func_t Logger::info_func = [](std::string&& str) { std::cout << str; }; +Logger::log_func_t Logger::error_func = [](std::string&& str) { std::cerr << str; }; + +const char* Logger::get_filename(const char* filepath) { + if (filepath == nullptr) return nullptr; + const char *last_slash = filepath; + while (*filepath != '\0') { + if (*filepath == '\\' || *filepath == '/') last_slash = filepath + 1; + filepath++; + } + return last_slash; +} + +void Logger::set_info_func(log_func_t log_func) { + info_func = log_func; +} + +void Logger::set_error_func(log_func_t log_func) { + error_func = log_func; +} diff --git a/extension/src/openvic2/Logger.hpp b/extension/src/openvic2/Logger.hpp new file mode 100644 index 0000000..749c67f --- /dev/null +++ b/extension/src/openvic2/Logger.hpp @@ -0,0 +1,83 @@ +#pragma once + +#include +#include +#ifdef __cpp_lib_source_location +#include +#endif + +namespace OpenVic2 { + + #ifndef __cpp_lib_source_location + #include + //Implementation of std::source_location for compilers that do not support it + //Note: uses non-standard extensions that are supported by Clang, GCC, and MSVC + //https://clang.llvm.org/docs/LanguageExtensions.html#source-location-builtins + //https://stackoverflow.com/a/67970107 + class source_location { + std::string _file; + int _line; + std::string _function; + + public: + source_location(std::string f, int l, std::string n) : _file(f), _line(l), _function(n) {} + static source_location current(std::string f = __builtin_FILE(), int l = __builtin_LINE(), std::string n = __builtin_FUNCTION()) { + return source_location(f, l, n); + } + + inline const char* file_name() const { return _file.c_str(); } + inline int line() const {return _line; } + inline const char* function_name() const { return _function.c_str(); } + }; + #endif + + class Logger { + using log_func_t = std::function; + + #ifdef __cpp_lib_source_location + using source_location = std::source_location; + #else + using source_location = OpenVic2::source_location; + #endif + + static log_func_t info_func, error_func; + + static const char* get_filename(const char* filepath); + + template + struct log { + log(log_func_t log_func, Ts&&... ts, const source_location& location) { + if (log_func) { + std::stringstream stream; + stream << std::endl << get_filename(location.file_name()) << "(" << location.line() << ") `" << location.function_name() << "`: "; + ((stream << std::forward(ts)), ...); + stream << std::endl; + log_func(stream.str()); + } + } + }; + public: + static void set_info_func(log_func_t log_func); + static void set_error_func(log_func_t log_func); + + template + struct info { + info(Ts&&... ts, const source_location& location = source_location::current()) { + log{ info_func, std::forward(ts)..., location }; + } + }; + + template + info(Ts&&...) -> info; + + template + struct error { + error(Ts&&... ts, const source_location& location = source_location::current()) { + log{ error_func, std::forward(ts)..., location }; + } + }; + + template + error(Ts&&...) -> error; + }; +} diff --git a/extension/src/openvic2/Map.cpp b/extension/src/openvic2/Map.cpp deleted file mode 100644 index 0ac8091..0000000 --- a/extension/src/openvic2/Map.cpp +++ /dev/null @@ -1,348 +0,0 @@ -#include "Map.hpp" - -#include -#include - -using namespace OpenVic2; - -static const std::string SEPARATOR = "\n - "; - -Mapmode::Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func) - : HasIdentifier(new_identifier), index(new_index), colour_func(new_colour_func) { - assert(colour_func != nullptr); -} - -Mapmode::index_t Mapmode::get_index() const { - return index; -} - -Mapmode::colour_func_t Mapmode::get_colour_func() const { - return colour_func; -} - -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 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 FAILURE; - } - if (identifier.empty()) { - error_message = "Empty province identifier for colour " + Province::colour_to_hex_string(colour); - return FAILURE; - } - if (colour == Province::NULL_COLOUR || colour > Province::MAX_COLOUR) { - error_message = "Invalid province colour: " + Province::colour_to_hex_string(colour); - return FAILURE; - } - Province new_province{ static_cast(provinces.size() + 1), identifier, colour }; - Province const* old_province = get_province_by_identifier(identifier); - if (old_province != nullptr) { - error_message = "Duplicate province identifiers: " + old_province->to_string() + " and " + new_province.to_string(); - return FAILURE; - } - old_province = get_province_by_colour(colour); - if (old_province != nullptr) { - error_message = "Duplicate province colours: " + old_province->to_string() + " and " + new_province.to_string(); - return FAILURE; - } - provinces.push_back(new_province); - error_message = "Added province: " + new_province.to_string(); - return SUCCESS; -} - -void Map::lock_provinces() { - provinces_locked = true; -} - -return_t Map::set_water_province(std::string const& identifier, std::string& error_message) { - if (water_provinces_locked) { - error_message = "The map's water provinces have already been locked!"; - return FAILURE; - } - Province* province = get_province_by_identifier(identifier); - if (province == nullptr) { - error_message = "Unrecognised water province identifier: " + identifier; - return FAILURE; - } - if (province->is_water()) { - error_message = "Province " + identifier + " is already a water province!"; - return FAILURE; - } - province->water = true; - error_message = "Set province " + identifier + " as a water province"; - return SUCCESS; -} - -void Map::lock_water_provinces() { - water_provinces_locked = true; -} - -return_t Map::add_region(std::string const& identifier, std::vector const& province_identifiers, std::string& error_message) { - if (regions_locked) { - error_message = "The map's region list has already been locked!"; - return FAILURE; - } - if (identifier.empty()) { - error_message = "Empty region identifier!"; - return FAILURE; - } - if (provinces.empty()) { - error_message = "Empty province list for region " + identifier; - return FAILURE; - } - Region new_region{ identifier }; - error_message.clear(); - for (std::string const& province_identifier : province_identifiers) { - Province* province = get_province_by_identifier(province_identifier); - if (province != nullptr) { - if (new_region.contains_province(province)) - error_message += SEPARATOR + "Duplicate province identifier " + province_identifier; - else { - size_t other_region_index = reinterpret_cast(province->get_region()); - if (other_region_index != 0) { - other_region_index--; - error_message += SEPARATOR + "Province " + province_identifier + " is already part of "; - if (other_region_index < regions.size()) - error_message += regions[other_region_index].get_identifier(); - else - error_message += "an unknown region with index " + std::to_string(other_region_index); - } else new_region.provinces.insert(province); - } - } else error_message += SEPARATOR + "Invalid province identifier " + province_identifier; - } - return_t ret = SUCCESS; - if (!new_region.get_province_count()) { - error_message += SEPARATOR + "No valid provinces in region's list"; - ret = FAILURE; - } - Region const* old_region = get_region_by_identifier(identifier); - if (old_region != nullptr) { - error_message += SEPARATOR + "Duplicate region identifiers: " + old_region->get_identifier() + " and " + identifier; - ret = FAILURE; - } - - if (ret == SUCCESS) { - regions.push_back(new_region); - // 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(regions.size()); - for (Province* province : new_region.get_provinces()) - province->region = tmp_region_index; - if (!error_message.empty()) { - error_message += SEPARATOR; - ret = FAILURE; - } - error_message += "Added region: " + identifier; - } - if (ret != SUCCESS) error_message = "Error message for region: " + identifier + error_message; - return ret; -} - -void Map::lock_regions() { - regions_locked = true; - for (Region& region : regions) - for (Province* province : region.get_provinces()) - province->region = ®ion; -} - -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 const* Map::get_province_by_index(Province::index_t index) const { - return index != Province::NULL_INDEX && index <= provinces.size() ? &provinces[index - 1] : nullptr; -} - -Province* Map::get_province_by_identifier(std::string const& identifier) { - if (!identifier.empty()) - for (Province& province : provinces) - 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.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.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.get_colour() == colour) return &province; - return nullptr; -} - -Region* Map::get_region_by_identifier(std::string const& identifier) { - if (!identifier.empty()) - for (Region& region : regions) - if (region.get_identifier() == identifier) return ®ion; - return nullptr; -} - -Region const* Map::get_region_by_identifier(std::string const& identifier) const { - if (!identifier.empty()) - for (Region const& region : regions) - if (region.get_identifier() == identifier) return ®ion; - 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 province_checklist(provinces.size()); - return_t ret = SUCCESS; - std::unordered_set unrecognised_colours; - error_message.clear(); - - 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 (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; - } - if (unrecognised_colours.find(colour) == unrecognised_colours.end()) { - unrecognised_colours.insert(colour); - error_message += SEPARATOR + "Unrecognised province colour " + Province::colour_to_hex_string(colour) + " at (" + std::to_string(x) + ", " + std::to_string(y) + ")"; - 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; - } - } - - if (!error_message.empty()) error_message = "Error message for province index image generation:" + error_message + SEPARATOR; - error_message += "Generated province index image"; - return ret; -} - -size_t Map::get_width() const { - return width; -} - -size_t Map::get_height() const { - return height; -} - -std::vector 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 }; - Mapmode const* old_mapmode = get_mapmode_by_identifier(identifier); - if (old_mapmode != nullptr) { - error_message = "Duplicate mapmode identifiers: " + old_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 += 4; // 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; - *target++ = province.is_water() ? 0 : 255; - } - error_message = "Generated province colours for mapmode " + mapmode.get_identifier(); - return SUCCESS; -} diff --git a/extension/src/openvic2/Map.hpp b/extension/src/openvic2/Map.hpp deleted file mode 100644 index 73ab8fd..0000000 --- a/extension/src/openvic2/Map.hpp +++ /dev/null @@ -1,67 +0,0 @@ -#pragma once - -#include -#include - -#include "Region.hpp" - -namespace OpenVic2 { - - struct Mapmode : HasIdentifier { - friend struct Map; - - using colour_func_t = std::function; - using index_t = size_t; - private: - index_t index; - 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; - colour_func_t get_colour_func() const; - }; - - /* REQUIREMENTS: - * MAP-4 - */ - struct Map { - private: - std::vector provinces; - std::vector regions; - bool provinces_locked = false, water_provinces_locked = false, regions_locked = false; - - size_t width = 0, height = 0; - std::vector province_index_image; - std::vector mapmodes; - public: - return_t add_province(std::string const& identifier, Province::colour_t colour, std::string& error_message); - void lock_provinces(); - return_t set_water_province(std::string const& identifier, std::string& error_message); - void lock_water_provinces(); - return_t add_region(std::string const& identifier, std::vector const& province_identifiers, std::string& error_message); - 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_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; - - Region* get_region_by_identifier(std::string const& identifier); - Region const* get_region_by_identifier(std::string const& identifier) 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 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 deleted file mode 100644 index 7d55708..0000000 --- a/extension/src/openvic2/Province.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "Province.hpp" - -#include -#include -#include - -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) { - assert(index != NULL_INDEX); - 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; -} - -Province::colour_t Province::get_colour() const { - return colour; -} - -Region* Province::get_region() const { - return region; -} - -bool Province::is_water() const { - return water; -} - -Province::life_rating_t Province::get_life_rating() const { - return life_rating; -} - -std::string Province::to_string() const { - return "(#" + std::to_string(index) + ", " + get_identifier() + ", 0x" + colour_to_hex_string(colour) + ")"; -} diff --git a/extension/src/openvic2/Province.hpp b/extension/src/openvic2/Province.hpp deleted file mode 100644 index deebd8c..0000000 --- a/extension/src/openvic2/Province.hpp +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once - -#include "Types.hpp" - -namespace OpenVic2 { - struct Region; - struct Map; - - /* REQUIREMENTS: - * MAP-5, MAP-8, MAP-43, MAP-47 - */ - struct Province : HasIdentifier { - friend struct Map; - - using colour_t = uint32_t; - using index_t = uint16_t; - using life_rating_t = int8_t; - - static const colour_t NULL_COLOUR = 0, MAX_COLOUR = 0xFFFFFF; - static const index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF; - private: - index_t index; - colour_t colour; - Region* region = nullptr; - bool water = false; - life_rating_t life_rating = 0; - - 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); - - 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; - std::string to_string() const; - }; -} diff --git a/extension/src/openvic2/Region.cpp b/extension/src/openvic2/Region.cpp deleted file mode 100644 index 67a75a9..0000000 --- a/extension/src/openvic2/Region.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Region.hpp" - -#include -#include - -using namespace OpenVic2; - -size_t ProvinceSet::get_province_count() const { - return provinces.size(); -} - -bool ProvinceSet::contains_province(Province const* province) const { - return province && std::find(provinces.begin(), provinces.end(), province) != provinces.end(); -} - -std::set const& ProvinceSet::get_provinces() const { - return provinces; -} - -Region::Region(std::string const& new_identifier) : HasIdentifier(new_identifier) {} - -Province::colour_t Region::get_colour() const { - if (provinces.empty()) return 0xFF0000; - Province const* province = *provinces.cbegin(); - return province->get_colour(); -} diff --git a/extension/src/openvic2/Region.hpp b/extension/src/openvic2/Region.hpp deleted file mode 100644 index 4ebabd1..0000000 --- a/extension/src/openvic2/Region.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include - -#include "Province.hpp" - -namespace OpenVic2 { - struct Map; - - struct ProvinceSet { - protected: - std::set provinces; - public: - size_t get_province_count() const; - bool contains_province(Province const* province) const; - std::set const& get_provinces() const; - }; - - /* REQUIREMENTS: - * MAP-6, MAP-44, MAP-48 - */ - struct Region : HasIdentifier, ProvinceSet { - friend struct Map; - private: - Region(std::string const& new_identifier); - public: - Province::colour_t get_colour() const; - }; -} diff --git a/extension/src/openvic2/Types.cpp b/extension/src/openvic2/Types.cpp index 67c7a21..861ab50 100644 --- a/extension/src/openvic2/Types.cpp +++ b/extension/src/openvic2/Types.cpp @@ -1,10 +1,10 @@ -#include "Types.hpp" +#include "openvic2/Types.hpp" #include using namespace OpenVic2; -HasIdentifier::HasIdentifier(std::string const& new_identifier) : identifier(new_identifier) { +HasIdentifier::HasIdentifier(std::string const& new_identifier) : identifier{ new_identifier } { assert(!identifier.empty()); } diff --git a/extension/src/openvic2/Types.hpp b/extension/src/openvic2/Types.hpp index bf5ee27..b20db10 100644 --- a/extension/src/openvic2/Types.hpp +++ b/extension/src/openvic2/Types.hpp @@ -1,14 +1,16 @@ #pragma once #include +#include + +#include "openvic2/Logger.hpp" namespace OpenVic2 { using return_t = bool; // This mirrors godot::Error, where `OK = 0` and `FAILED = 1`. - static const return_t SUCCESS = false, FAILURE = true; + static constexpr return_t SUCCESS = false, FAILURE = true; - struct HasIdentifier { - private: + class HasIdentifier { std::string identifier; protected: HasIdentifier(std::string const& new_identifier); diff --git a/extension/src/openvic2/map/Building.cpp b/extension/src/openvic2/map/Building.cpp new file mode 100644 index 0000000..f453a0f --- /dev/null +++ b/extension/src/openvic2/map/Building.cpp @@ -0,0 +1,129 @@ +#include "openvic2/map/Building.hpp" + +#include + +#include "openvic2/Logger.hpp" + +using namespace OpenVic2; + +Building::Building(BuildingType const& new_type) : type{ new_type } {} + +bool Building::_can_expand() const { + return level < type.get_max_level(); +} + +BuildingType const& Building::get_type() const { + return type; +} + +Building::level_t Building::get_level() const { + return level; +} + +Building::ExpansionState Building::get_expansion_state() const { + return expansion_state; +} + +Date const& Building::get_start_date() const { + return start; +} + +Date const& Building::get_end_date() const { + return end; +} + +float Building::get_expansion_progress() const { + return expansion_progress; +} + +return_t Building::expand() { + if (expansion_state == ExpansionState::CanExpand) { + expansion_state = ExpansionState::Preparing; + expansion_progress = 0.0f; + return SUCCESS; + } + return FAILURE; +} + +void Building::update_state(Date const& today) { + switch (expansion_state) { + case ExpansionState::Preparing: + start = today; + end = start + type.get_build_time(); + break; + case ExpansionState::Expanding: + expansion_progress = static_cast(today - start) / static_cast(end - start); + break; + default: expansion_state = _can_expand() ? ExpansionState::CanExpand : ExpansionState::CannotExpand; + } +} + +void Building::tick(Date const& today) { + if (expansion_state == ExpansionState::Preparing) { + expansion_state = ExpansionState::Expanding; + } + if (expansion_state == ExpansionState::Expanding) { + if (end <= today) { + level++; + expansion_state = ExpansionState::CannotExpand; + } + } +} + +BuildingType::BuildingType(std::string const& new_identifier, Building::level_t new_max_level, Timespan new_build_time) : + HasIdentifier{ new_identifier }, max_level{ new_max_level }, build_time{ new_build_time } { + assert(new_max_level >= 0); + assert(build_time >= 0); +} + +Building::level_t BuildingType::get_max_level() const { + return max_level; +} + +Timespan BuildingType::get_build_time() const { + return build_time; +} + +return_t BuildingManager::add_building_type(std::string const& identifier, Building::level_t max_level, Timespan build_time) { + if (building_types_locked) { + Logger::error("The building type list has already been locked!"); + return FAILURE; + } + if (identifier.empty()) { + Logger::error("Empty building type identifier!"); + return FAILURE; + } + if (max_level < 0) { + Logger::error("Invalid building type max level: ", max_level); + return FAILURE; + } + if (build_time < 0) { + Logger::error("Invalid building type build time: ", build_time); + return FAILURE; + } + BuildingType new_building_type{ identifier, max_level, build_time }; + BuildingType const* old_building_type = get_building_type_by_identifier(identifier); + if (old_building_type != nullptr) { + Logger::error("Duplicate building type identifiers: ", old_building_type->get_identifier(), " and ", identifier); + return FAILURE; + } + building_types.push_back(new_building_type); + return SUCCESS; +} + +void BuildingManager::lock_building_types() { + building_types_locked = true; + Logger::info("Locked building types after registering ", building_types.size()); +} + +BuildingType const* BuildingManager::get_building_type_by_identifier(std::string const& identifier) const { + if (!identifier.empty()) + for (BuildingType const& building_type : building_types) + if (building_type.get_identifier() == identifier) return &building_type; + return nullptr; +} + +void BuildingManager::generate_province_buildings(std::vector& buildings) const { + for (BuildingType const& type : building_types) + buildings.push_back(Building{ type }); +} diff --git a/extension/src/openvic2/map/Building.hpp b/extension/src/openvic2/map/Building.hpp new file mode 100644 index 0000000..7a1a777 --- /dev/null +++ b/extension/src/openvic2/map/Building.hpp @@ -0,0 +1,63 @@ +#pragma once + +#include + +#include "openvic2/Types.hpp" +#include "openvic2/Date.hpp" + +namespace OpenVic2 { + struct BuildingManager; + struct BuildingType; + + struct Building { + friend struct BuildingManager; + + using level_t = int8_t; + + enum class ExpansionState { CannotExpand, CanExpand, Preparing, Expanding }; + private: + BuildingType const& type; + level_t level = 0; + ExpansionState expansion_state = ExpansionState::CannotExpand; + Date start, end; + float expansion_progress; + + Building(BuildingType const& new_type); + + bool _can_expand() const; + public: + BuildingType const& get_type() const; + level_t get_level() const; + ExpansionState get_expansion_state() const; + Date const& get_start_date() const; + Date const& get_end_date() const; + float get_expansion_progress() const; + + return_t expand(); + void update_state(Date const& today); + void tick(Date const& today); + }; + + struct BuildingType : HasIdentifier { + friend struct BuildingManager; + private: + Building::level_t max_level; + Timespan build_time; + + BuildingType(std::string const& new_identifier, Building::level_t new_max_level, Timespan new_build_time); + public: + Building::level_t get_max_level() const; + Timespan get_build_time() const; + }; + + struct BuildingManager { + private: + std::vector building_types; + bool building_types_locked = false; + public: + return_t add_building_type(std::string const& identifier, Building::level_t max_level, Timespan build_time); + void lock_building_types(); + BuildingType const* get_building_type_by_identifier(std::string const& identifier) const; + void generate_province_buildings(std::vector& buildings) const; + }; +} diff --git a/extension/src/openvic2/map/Map.cpp b/extension/src/openvic2/map/Map.cpp new file mode 100644 index 0000000..1089d61 --- /dev/null +++ b/extension/src/openvic2/map/Map.cpp @@ -0,0 +1,359 @@ +#include "openvic2/map/Map.hpp" + +#include +#include + +#include "openvic2/Logger.hpp" + +using namespace OpenVic2; + +Mapmode::Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func) + : HasIdentifier{ new_identifier }, index{ new_index }, colour_func{ new_colour_func } { + assert(colour_func != nullptr); +} + +Mapmode::index_t Mapmode::get_index() const { + return index; +} + +Mapmode::colour_func_t Mapmode::get_colour_func() const { + return colour_func; +} + +return_t Map::add_province(std::string const& identifier, Province::colour_t colour) { + if (provinces_locked) { + Logger::error("The map's province list has already been locked!"); + return FAILURE; + } + if (provinces.size() >= Province::MAX_INDEX) { + Logger::error("The map's province list is full - there can be at most ", Province::MAX_INDEX, " provinces"); + return FAILURE; + } + if (identifier.empty()) { + Logger::error("Empty province identifier for colour ", Province::colour_to_hex_string(colour)); + return FAILURE; + } + if (colour == Province::NULL_COLOUR || colour > Province::MAX_COLOUR) { + Logger::error("Invalid province colour: ", Province::colour_to_hex_string(colour)); + return FAILURE; + } + Province new_province{ static_cast(provinces.size() + 1), identifier, colour }; + Province const* old_province = get_province_by_identifier(identifier); + if (old_province != nullptr) { + Logger::error("Duplicate province identifiers: ", old_province->to_string(), " and ", new_province.to_string()); + return FAILURE; + } + 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()); + return FAILURE; + } + provinces.push_back(new_province); + return SUCCESS; +} + +void Map::lock_provinces() { + provinces_locked = true; + Logger::info("Locked provinces after registering ", provinces.size()); +} + +return_t Map::set_water_province(std::string const& identifier) { + if (water_provinces_locked) { + Logger::error("The map's water provinces have already been locked!"); + return FAILURE; + } + Province* province = get_province_by_identifier(identifier); + if (province == nullptr) { + Logger::error("Unrecognised water province identifier: ", identifier); + return FAILURE; + } + if (province->is_water()) { + Logger::error("Province ", identifier, " is already a water province!"); + return FAILURE; + } + province->water = true; + water_province_count++; + return SUCCESS; +} + +void Map::lock_water_provinces() { + water_provinces_locked = true; + Logger::info("Locked water provinces after registering ", water_province_count); +} + +return_t Map::add_region(std::string const& identifier, std::vector const& province_identifiers) { + if (regions_locked) { + Logger::error("The map's region list has already been locked!"); + return FAILURE; + } + if (identifier.empty()) { + Logger::error("Empty region identifier!"); + return FAILURE; + } + if (provinces.empty()) { + Logger::error("Empty province list for region ", identifier); + return FAILURE; + } + return_t ret = SUCCESS; + Region new_region{ identifier }; + for (std::string const& province_identifier : province_identifiers) { + Province* province = get_province_by_identifier(province_identifier); + if (province != nullptr) { + if (new_region.contains_province(province)) { + Logger::error("Duplicate province identifier ", province_identifier); + ret = FAILURE; + } else { + size_t other_region_index = reinterpret_cast(province->get_region()); + if (other_region_index != 0) { + other_region_index--; + if (other_region_index < regions.size()) + Logger::error("Province ", province_identifier, " is already part of ", regions[other_region_index].get_identifier()); + else + Logger::error("Province ", province_identifier, " is already part of an unknown region with index ", other_region_index); + ret = FAILURE; + } else new_region.provinces.insert(province); + } + } else { + Logger::error("Invalid province identifier ", province_identifier); + ret = FAILURE; + } + } + if (!new_region.get_province_count()) { + Logger::error("No valid provinces in region's list"); + return FAILURE; + } + Region const* old_region = get_region_by_identifier(identifier); + if (old_region != nullptr) { + Logger::error("Duplicate region identifiers: ", old_region->get_identifier(), " and ", identifier); + return FAILURE; + } + + regions.push_back(new_region); + // 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(regions.size()); + for (Province* province : new_region.get_provinces()) + province->region = tmp_region_index; + return ret; +} + +void Map::lock_regions() { + regions_locked = true; + for (Region& region : regions) + for (Province* province : region.get_provinces()) + province->region = ®ion; + Logger::info("Locked regions after registering ", regions.size()); +} + +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 const* Map::get_province_by_index(Province::index_t index) const { + return index != Province::NULL_INDEX && index <= provinces.size() ? &provinces[index - 1] : nullptr; +} + +Province* Map::get_province_by_identifier(std::string const& identifier) { + if (!identifier.empty()) + for (Province& province : provinces) + 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.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.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.get_colour() == colour) return &province; + return nullptr; +} + +Province::index_t Map::get_province_index_at(size_t x, size_t y) const { + if (x < width && y < height) return province_index_image[x + y * width]; + return Province::NULL_INDEX; +} + +Region* Map::get_region_by_identifier(std::string const& identifier) { + if (!identifier.empty()) + for (Region& region : regions) + if (region.get_identifier() == identifier) return ®ion; + return nullptr; +} + +Region const* Map::get_region_by_identifier(std::string const& identifier) const { + if (!identifier.empty()) + for (Region const& region : regions) + if (region.get_identifier() == identifier) return ®ion; + 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) { + if (!province_index_image.empty()) { + Logger::error("Province index image has already been generated!"); + return FAILURE; + } + if (!provinces_locked) { + Logger::error("Province index image cannot be generated until after provinces are locked!"); + return FAILURE; + } + if (new_width < 1 || new_height < 1) { + Logger::error("Invalid province image dimensions: ", new_width, "x", new_height); + return FAILURE; + } + if (colour_data == nullptr) { + Logger::error("Province colour data pointer is null!"); + return FAILURE; + } + width = new_width; + height = new_height; + province_index_image.resize(width * height); + + std::vector province_checklist(provinces.size()); + return_t ret = SUCCESS; + std::unordered_set 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); + 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; + } + if (unrecognised_colours.find(colour) == unrecognised_colours.end()) { + unrecognised_colours.insert(colour); + Logger::error("Unrecognised province colour ", Province::colour_to_hex_string(colour), " at (", x, ", ", y, ")"); + ret = FAILURE; + } + province_index_image[idx] = Province::NULL_INDEX; + } + } + + for (size_t idx = 0; idx < province_checklist.size(); ++idx) { + if (!province_checklist[idx]) { + Logger::error("Province missing from shape image: ", provinces[idx].to_string()); + ret = FAILURE; + } + } + return ret; +} + +size_t Map::get_width() const { + return width; +} + +size_t Map::get_height() const { + return height; +} + +std::vector 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) { + if (identifier.empty()) { + Logger::error("Empty mapmode identifier!"); + return FAILURE; + } + if (colour_func == nullptr) { + Logger::error("Mapmode colour function is null for identifier: ", identifier); + return FAILURE; + } + Mapmode new_mapmode{ mapmodes.size(), identifier, colour_func }; + Mapmode const* old_mapmode = get_mapmode_by_identifier(identifier); + if (old_mapmode != nullptr) { + Logger::error("Duplicate mapmode identifiers: ", old_mapmode->get_identifier(), " and ", identifier); + return FAILURE; + } + mapmodes.push_back(new_mapmode); + 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) const { + if (target == nullptr) { + Logger::error("Mapmode colour target pointer is null!"); + return FAILURE; + } + if (index >= mapmodes.size()) { + Logger::error("Invalid mapmode index: ", index); + return FAILURE; + } + Mapmode const& mapmode = mapmodes[index]; + target += 4; // 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; + *target++ = province.is_water() ? 0 : 255; + } + return SUCCESS; +} + +void Map::generate_province_buildings(BuildingManager const& manager) { + for (Province& province : provinces) + manager.generate_province_buildings(province.buildings); +} + +void Map::update_state(Date const& today) { + for (Province& province : provinces) + province.update_state(today); +} + +void Map::tick(Date const& today) { + for (Province& province : provinces) + province.tick(today); +} diff --git a/extension/src/openvic2/map/Map.hpp b/extension/src/openvic2/map/Map.hpp new file mode 100644 index 0000000..b6e7ac2 --- /dev/null +++ b/extension/src/openvic2/map/Map.hpp @@ -0,0 +1,73 @@ +#pragma once + +#include + +#include "openvic2/map/Region.hpp" + +namespace OpenVic2 { + + struct Mapmode : HasIdentifier { + friend struct Map; + + using colour_func_t = std::function; + using index_t = size_t; + private: + index_t index; + 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; + colour_func_t get_colour_func() const; + }; + + /* REQUIREMENTS: + * MAP-4 + */ + struct Map { + private: + std::vector provinces; + std::vector regions; + bool provinces_locked = false, water_provinces_locked = false, regions_locked = false; + size_t water_province_count = 0; + + size_t width = 0, height = 0; + std::vector province_index_image; + std::vector mapmodes; + public: + return_t add_province(std::string const& identifier, Province::colour_t colour); + void lock_provinces(); + return_t set_water_province(std::string const& identifier); + void lock_water_provinces(); + return_t add_region(std::string const& identifier, std::vector const& province_identifiers); + 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_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; + + Region* get_region_by_identifier(std::string const& identifier); + Region const* get_region_by_identifier(std::string const& identifier) const; + + return_t generate_province_index_image(size_t new_width, size_t new_height, uint8_t const* colour_data); + size_t get_width() const; + size_t get_height() const; + std::vector const& get_province_index_image() const; + + return_t add_mapmode(std::string const& identifier, Mapmode::colour_func_t colour_func); + 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) const; + + void generate_province_buildings(BuildingManager const& manager); + + void update_state(Date const& today); + void tick(Date const& today); + }; +} diff --git a/extension/src/openvic2/map/Province.cpp b/extension/src/openvic2/map/Province.cpp new file mode 100644 index 0000000..c641b7e --- /dev/null +++ b/extension/src/openvic2/map/Province.cpp @@ -0,0 +1,67 @@ +#include "openvic2/map/Province.hpp" + +#include +#include +#include + +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 } { + assert(index != NULL_INDEX); + 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; +} + +Province::colour_t Province::get_colour() const { + return colour; +} + +Region* Province::get_region() const { + return region; +} + +bool Province::is_water() const { + return water; +} + +Province::life_rating_t Province::get_life_rating() const { + return life_rating; +} + +std::vector const& Province::get_buildings() const { + return buildings; +} + +return_t Province::expand_building(std::string const& building_type_identifier) { + for (Building& building : buildings) + if (building.get_type().get_identifier() == building_type_identifier) + return building.expand(); + return FAILURE; +} + +std::string Province::to_string() const { + std::stringstream stream; + stream << "(#" << std::to_string(index) << ", " << get_identifier() << ", 0x" << colour_to_hex_string(colour) << ")"; + return stream.str(); +} + +void Province::update_state(Date const& today) { + for (Building& building : buildings) + building.update_state(today); + +} + +void Province::tick(Date const& today) { + for (Building& building : buildings) + building.tick(today); +} diff --git a/extension/src/openvic2/map/Province.hpp b/extension/src/openvic2/map/Province.hpp new file mode 100644 index 0000000..79c6861 --- /dev/null +++ b/extension/src/openvic2/map/Province.hpp @@ -0,0 +1,45 @@ +#pragma once + +#include "openvic2/map/Building.hpp" + +namespace OpenVic2 { + struct Map; + struct Region; + + /* REQUIREMENTS: + * MAP-5, MAP-8, MAP-43, MAP-47 + */ + struct Province : HasIdentifier { + 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: + index_t index; + colour_t colour; + Region* region = nullptr; + bool water = false; + life_rating_t life_rating = 0; + std::vector buildings; + + 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); + + 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; + std::vector const& get_buildings() const; + return_t expand_building(std::string const& building_type_identifier); + std::string to_string() const; + + void update_state(Date const& today); + void tick(Date const& today); + }; +} diff --git a/extension/src/openvic2/map/Region.cpp b/extension/src/openvic2/map/Region.cpp new file mode 100644 index 0000000..3e5bee7 --- /dev/null +++ b/extension/src/openvic2/map/Region.cpp @@ -0,0 +1,26 @@ +#include "openvic2/map/Region.hpp" + +#include +#include + +using namespace OpenVic2; + +size_t ProvinceSet::get_province_count() const { + return provinces.size(); +} + +bool ProvinceSet::contains_province(Province const* province) const { + return province && std::find(provinces.begin(), provinces.end(), province) != provinces.end(); +} + +std::set const& ProvinceSet::get_provinces() const { + return provinces; +} + +Region::Region(std::string const& new_identifier) : HasIdentifier{ new_identifier } {} + +Province::colour_t Region::get_colour() const { + if (provinces.empty()) return 0xFF0000; + Province const* province = *provinces.cbegin(); + return province->get_colour(); +} diff --git a/extension/src/openvic2/map/Region.hpp b/extension/src/openvic2/map/Region.hpp new file mode 100644 index 0000000..2eec1cd --- /dev/null +++ b/extension/src/openvic2/map/Region.hpp @@ -0,0 +1,28 @@ +#pragma once + +#include + +#include "openvic2/map/Province.hpp" + +namespace OpenVic2 { + + struct ProvinceSet { + protected: + std::set provinces; + public: + size_t get_province_count() const; + bool contains_province(Province const* province) const; + std::set const& get_provinces() const; + }; + + /* REQUIREMENTS: + * MAP-6, MAP-44, MAP-48 + */ + struct Region : HasIdentifier, ProvinceSet { + friend struct Map; + private: + Region(std::string const& new_identifier); + public: + Province::colour_t get_colour() const; + }; +} diff --git a/extension/src/register_types.cpp b/extension/src/register_types.cpp index 10ed781..b99f1a8 100644 --- a/extension/src/register_types.cpp +++ b/extension/src/register_types.cpp @@ -4,7 +4,7 @@ #include "Checksum.hpp" #include "LoadLocalisation.hpp" -#include "MapSingleton.hpp" +#include "GameSingleton.hpp" #include "MapMesh.hpp" using namespace godot; @@ -12,7 +12,7 @@ using namespace OpenVic2; static Checksum* _checksum; static LoadLocalisation* _load_localisation; -static MapSingleton* _map_singleton; +static GameSingleton* _map_singleton; void initialize_openvic2_types(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { @@ -27,9 +27,9 @@ void initialize_openvic2_types(ModuleInitializationLevel p_level) { _load_localisation = memnew(LoadLocalisation); Engine::get_singleton()->register_singleton("LoadLocalisation", LoadLocalisation::get_singleton()); - ClassDB::register_class(); - _map_singleton = memnew(MapSingleton); - Engine::get_singleton()->register_singleton("MapSingleton", MapSingleton::get_singleton()); + ClassDB::register_class(); + _map_singleton = memnew(GameSingleton); + Engine::get_singleton()->register_singleton("GameSingleton", GameSingleton::get_singleton()); ClassDB::register_class(); } @@ -45,7 +45,7 @@ void uninitialize_openvic2_types(ModuleInitializationLevel p_level) { Engine::get_singleton()->unregister_singleton("LoadLocalisation"); memdelete(_load_localisation); - Engine::get_singleton()->unregister_singleton("MapSingleton"); + Engine::get_singleton()->unregister_singleton("GameSingleton"); memdelete(_map_singleton); } @@ -60,4 +60,4 @@ extern "C" { return init_obj.init(); } -} \ No newline at end of file +} diff --git a/game/localisation/en_GB/menus.csv b/game/localisation/en_GB/menus.csv index 33e5c42..c637a39 100644 --- a/game/localisation/en_GB/menus.csv +++ b/game/localisation/en_GB/menus.csv @@ -63,3 +63,12 @@ GAMESESSIONMENU_QUIT_DIALOG_TEXT,Are you sure you want to quit and return to des DIALOG_OK,OK DIALOG_CANCEL,Cancel + +,, Province Overview Panel +province_MISSING,No Province +region_MISSING,No Region +building_MISSING,No Building +building_fort,Fort +building_naval_base,Naval Base +building_railroad,Railroad +EXPAND_PROVINCE_BUILDING,Expand diff --git a/game/localisation/en_GB/provinces.csv b/game/localisation/en_GB/provinces.csv index 814b4f9..8f1679d 100644 --- a/game/localisation/en_GB/provinces.csv +++ b/game/localisation/en_GB/provinces.csv @@ -1,51 +1,51 @@ ,, Europe -prov_britain_NAME,Britain -prov_ireland_NAME,Ireland -prov_iceland_NAME,Iceland -prov_corsica_NAME,Corsica -prov_sardinia_NAME,Sardinia -prov_sicily_NAME,Sicily -prov_malta_NAME,Malta -prov_cyprus_NAME,Cyprus -prov_greenland_NAME,Greenland -prov_baleares_NAME,Balearic Islands -prov_gotland_NAME,Gotland -prov_crete_NAME,Crete -prov_jan_mayen_NAME,Jan Mayen -prov_faroes_NAME,Faroe Islands -prov_mann_NAME,Isle of Mann -prov_shetlands_NAME,Shetlands -prov_orkney_NAME,Orkney -prov_channel_islands_NAME,Channel Islands -prov_madiera_NAME,Madiera -prov_canarias_NAME,Canarias -prov_sjaeland_NAME,Sjaeland -prov_bornholm_NAME,Bornholm -prov_bear_island_NAME,Bear Island -prov_pantelleria_NAME,Pantelleria -prov_iberia_NAME,Iberia -prov_scandinavia_NAME,Scandinavia -prov_jutland_NAME,Jutland -prov_fyn_NAME,Fyn -prov_hiiumaa_NAME,Hiiumaa -prov_saaremaa_NAME,Saaremaa -prov_italy_NAME,Italy -prov_elba_NAME,Elba -prov_france_NAME,France -prov_netherlands_NAME,Netherlands -prov_belgium_NAME,Belgium -prov_luxembourg_NAME,Luxembourg -prov_switzerland_NAME,Switzerland -prov_balkans_NAME,Balkans -prov_crimea_NAME,Crimea -prov_germany_NAME,Germany -prov_poland_NAME,Poland -prov_baltics_NAME,Baltics -prov_finland_NAME,Finland -prov_aland_NAME,Åland -prov_ukraine_NAME,Ukraine -prov_russia_NAME,Russia +prov_britain,Britain +prov_ireland,Ireland +prov_iceland,Iceland +prov_corsica,Corsica +prov_sardinia,Sardinia +prov_sicily,Sicily +prov_malta,Malta +prov_cyprus,Cyprus +prov_greenland,Greenland +prov_baleares,Balearic Islands +prov_gotland,Gotland +prov_crete,Crete +prov_jan_mayen,Jan Mayen +prov_faroes,Faroe Islands +prov_mann,Isle of Mann +prov_shetlands,Shetlands +prov_orkney,Orkney +prov_channel_islands,Channel Islands +prov_madiera,Madiera +prov_canarias,Canarias +prov_sjaeland,Sjaeland +prov_bornholm,Bornholm +prov_bear_island,Bear Island +prov_pantelleria,Pantelleria +prov_iberia,Iberia +prov_scandinavia,Scandinavia +prov_jutland,Jutland +prov_fyn,Fyn +prov_hiiumaa,Hiiumaa +prov_saaremaa,Saaremaa +prov_italy,Italy +prov_elba,Elba +prov_france,France +prov_netherlands,Netherlands +prov_belgium,Belgium +prov_luxembourg,Luxembourg +prov_switzerland,Switzerland +prov_balkans,Balkans +prov_crimea,Crimea +prov_germany,Germany +prov_poland,Poland +prov_baltics,Baltics +prov_finland,Finland +prov_aland,Åland +prov_ukraine,Ukraine +prov_russia,Russia ,, North America prov_north_america_NAME,North America @@ -92,154 +92,154 @@ prov_yellowknife_NAME,Yellowknife prov_iqaluit_NAME,Iqaluit ,, South America -prov_south_america_NAME,South America -prov_galapagos_NAME,Galapagos -prov_falklands_NAME,Falklands -prov_south_georgia_NAME,South Georgia +prov_south_america,South America +prov_galapagos,Galapagos +prov_falklands,Falklands +prov_south_georgia,South Georgia ,, Africa -prov_africa_NAME,Africa -prov_madagascar_NAME,Madagascar -prov_socotra_NAME,Socotra -prov_mauritius_NAME,Mauritius -prov_reunion_NAME,Réunion -prov_comoros_NAME,Comoros -prov_sao_tome_NAME,Sao Tome -prov_fernando_po_NAME,Fernando Po -prov_cape_verde_NAME,Cape Verde -prov_ascension_NAME,Ascension -prov_st_helena_NAME,St Helena -prov_tristan_da_cunha_NAME,Tristan da Cunha -prov_seychelles_NAME,Seychelles -prov_prince_edward_islands_NAME,Prince Edward Islands -prov_kerguelen_islands_NAME,Kerguelen Islands -prov_heard_island_NAME,Heard Island -prov_egypt_NAME,Egypt -prov_morocco_NAME,Morocco +prov_africa,Africa +prov_madagascar,Madagascar +prov_socotra,Socotra +prov_mauritius,Mauritius +prov_reunion,Réunion +prov_comoros,Comoros +prov_sao_tome,Sao Tome +prov_fernando_po,Fernando Po +prov_cape_verde,Cape Verde +prov_ascension,Ascension +prov_st_helena,St Helena +prov_tristan_da_cunha,Tristan da Cunha +prov_seychelles,Seychelles +prov_prince_edward_islands,Prince Edward Islands +prov_kerguelen_islands,Kerguelen Islands +prov_heard_island,Heard Island +prov_egypt,Egypt +prov_morocco,Morocco ,, Asia -prov_middle_east_NAME,Middle East -prov_ceylon_NAME,Ceylon -prov_formosa_NAME,Formosa -prov_sakhalin_NAME,Sakhalin -prov_maldives_NAME,Maldives -prov_hainan_NAME,Hainan -prov_hokkaido_NAME,Hokkaido -prov_diego_garcia_NAME,Diego Garcia -prov_philippines_NAME,Philippines -prov_india_NAME,India -prov_andamans_NAME,Andaman Islands -prov_nicobar_islands_NAME,Nicobar Islands -prov_indochina_NAME,Indochina -prov_korea_NAME,Korea -prov_okinawa_NAME,Okinawa -prov_yaeyama_NAME,Yaeyama -prov_kyushu_NAME,Kyushu -prov_shikoku_NAME,Shikoku -prov_japan_NAME,Japan -prov_kurils_NAME,Kuril Islands -prov_manchuria_NAME,Manchuria -prov_china_NAME,China -prov_central_asia_NAME,Central Asia -prov_siberia_NAME,Siberia -prov_iran_NAME,Iran -prov_anatolia_NAME,Anatolia +prov_middle_east,Middle East +prov_ceylon,Ceylon +prov_formosa,Formosa +prov_sakhalin,Sakhalin +prov_maldives,Maldives +prov_hainan,Hainan +prov_hokkaido,Hokkaido +prov_diego_garcia,Diego Garcia +prov_philippines,Philippines +prov_india,India +prov_andamans,Andaman Islands +prov_nicobar_islands,Nicobar Islands +prov_indochina,Indochina +prov_korea,Korea +prov_okinawa,Okinawa +prov_yaeyama,Yaeyama +prov_kyushu,Kyushu +prov_shikoku,Shikoku +prov_japan,Japan +prov_kurils,Kuril Islands +prov_manchuria,Manchuria +prov_china,China +prov_central_asia,Central Asia +prov_siberia,Siberia +prov_iran,Iran +prov_anatolia,Anatolia ,, Oceania -prov_oceania_NAME,Oceania -prov_indonesia_NAME,Indonesia -prov_north_island_NAME,North Island -prov_south_island_NAME,South Island -prov_tasmania_NAME,Tasmania -prov_australia_NAME,Australia -prov_hawaii_NAME,Hawaii +prov_oceania,Oceania +prov_indonesia,Indonesia +prov_north_island,North Island +prov_south_island,South Island +prov_tasmania,Tasmania +prov_australia,Australia +prov_hawaii,Hawaii ,, Lakes -prov_aral_sea_NAME,Aral Sea -prov_caspian_sea_NAME,Caspian Sea -prov_lake_ladoga_NAME,Lake Ladoga -prov_lake_ontario_NAME,Lake Ontario -prov_lake_erie_NAME,Lake Erie -prov_lake_huron_NAME,Lake Huron -prov_lake_michigan_NAME,Lake Michigan -prov_lake_superior_NAME,Lake Superior -prov_lake_baikal_NAME,Lake Baikal -prov_lake_woods_NAME,Lake of the Woods -prov_lake_manitoba_NAME,Lake Manitoba -prov_reindeer_lake_NAME,Reindeer Lake -prov_lake_ronge_NAME,Lac la Ronge -prov_lake_athabasca_NAME,Lake Athabasca -prov_great_slave_lake_NAME,Great Slave Lake -prov_great_bear_lake_NAME,Great Bear Lake +prov_aral_sea,Aral Sea +prov_caspian_sea,Caspian Sea +prov_lake_ladoga,Lake Ladoga +prov_lake_ontario,Lake Ontario +prov_lake_erie,Lake Erie +prov_lake_huron,Lake Huron +prov_lake_michigan,Lake Michigan +prov_lake_superior,Lake Superior +prov_lake_baikal,Lake Baikal +prov_lake_woods,Lake of the Woods +prov_lake_manitoba,Lake Manitoba +prov_reindeer_lake,Reindeer Lake +prov_lake_ronge,Lac la Ronge +prov_lake_athabasca,Lake Athabasca +prov_great_slave_lake,Great Slave Lake +prov_great_bear_lake,Great Bear Lake ,, Seas and Oceans -prov_azov_sea_NAME,Sea of Azov -prov_black_sea_NAME,Black Sea -prov_marmara_sea_NAME,Sea of Marmara -prov_agean_sea_NAME,Agean Sea -prov_ionian_sea_NAME,Ionian Sea -prov_adriatic_sea_NAME,Adriatic Sea -prov_tyrrhenian_sea_NAME,Tyrrhenian Sea -prov_east_mediterranean_NAME,East Mediterranean Sea -prov_central_mediterranean_NAME,Central Mediterranean Sea -prov_west_mediterranean_NAME,West Mediterranean Sea -prov_ligurian_sea_NAME,Ligurian Sea -prov_balearic_sea_NAME,Balearic Sea -prov_alboran_sea_NAME,Alboran Sea -prov_gulf_bothnia_NAME,Gulf of Bothnia -prov_gulf_finland_NAME,Gulf of Finland -prov_gulf_riga_NAME,Gulf of Riga -prov_baltic_sea_NAME,Baltic Sea -prov_danish_straits_NAME,Danish Straits -prov_english_channel_NAME,English Channel -prov_irish_sea_NAME,Irish Sea -prov_biscay_bay_NAME,Bay of Biscay -prov_north_sea_NAME,North Sea -prov_red_sea_NAME,Red Sea -prov_arabian_sea_NAME,Arabian Sea -prov_persian_gulf_NAME,Persian Gulf -prov_andaman_sea_NAME,Andaman Sea -prov_bay_bengal_NAME,Bay of Bengal -prov_okhotsk_sea_NAME,Sea of Okhotsk -prov_japan_sea_NAME,Sea of Japan -prov_east_china_sea_NAME,East China Sea -prov_south_china_sea_NAME,South China Sea -prov_philippine_sea_NAME,Philippine Sea -prov_celebes_sea_NAME,Celebes Sea -prov_java_sea_NAME,Java Sea -prov_banda_sea_NAME,Banda Sea -prov_arafura_sea_NAME,Arafura Sea -prov_gulf_mexico_NAME,Gulf of Mexico -prov_caribbean_sea_NAME,Caribbean Sea -prov_mozambique_channel_NAME,Mozambique Channel -prov_zanj_sea_NAME,Sea of Zanj -prov_kara_sea_NAME,Kara Sea -prov_barents_sea_NAME,Barents Sea -prov_norwegian_sea_NAME,Norwegian Sea -prov_greenland_sea_NAME,Greenland Sea -prov_labrador_sea_NAME,Labrador Sea -prov_hudson_bay_NAME,Hudson Bay -prov_gulf_st_lawrence_NAME,Gulf of St Lawrence -prov_gulf_alaska_NAME,Gulf of Alaska -prov_gulf_california_NAME,Gulf of California -prov_east_siberian_sea_NAME,East Siberian Sea -prov_sargasso_sea_NAME,Sargasso Sea -prov_gulf_guinea_NAME,Gulf of Guinea -prov_celtic_sea_NAME,Celtic Sea -prov_argentine_sea_NAME,Argentine Sea -prov_chilean_sea_NAME,Chilean Sea -prov_north_atlantic_NAME,North Atlantic Ocean -prov_central_atlantic_NAME,Central Atlantic Ocean -prov_south_atlantic_NAME,South Atlantic Ocean -prov_indian_ocean_NAME,Indian Ocean -prov_great_australian_bight_NAME,Great Australian Bight -prov_tasman_sea_NAME,Tasman Sea -prov_coral_sea_NAME,Coral Sea -prov_melanesia_NAME,Melanesia -prov_micronesia_NAME,Micronesia -prov_polynesia_NAME,Polynesia -prov_north_pacific_NAME,North Pacific Ocean -prov_south_pacific_NAME,South Pacific Ocean -prov_bering_sea_NAME,Bering Sea -prov_chukchi_sea_NAME,Chukchi Sea -prov_beaufort_sea_NAME,Beaufort Sea +prov_azov_sea,Sea of Azov +prov_black_sea,Black Sea +prov_marmara_sea,Sea of Marmara +prov_agean_sea,Agean Sea +prov_ionian_sea,Ionian Sea +prov_adriatic_sea,Adriatic Sea +prov_tyrrhenian_sea,Tyrrhenian Sea +prov_east_mediterranean,East Mediterranean Sea +prov_central_mediterranean,Central Mediterranean Sea +prov_west_mediterranean,West Mediterranean Sea +prov_ligurian_sea,Ligurian Sea +prov_balearic_sea,Balearic Sea +prov_alboran_sea,Alboran Sea +prov_gulf_bothnia,Gulf of Bothnia +prov_gulf_finland,Gulf of Finland +prov_gulf_riga,Gulf of Riga +prov_baltic_sea,Baltic Sea +prov_danish_straits,Danish Straits +prov_english_channel,English Channel +prov_irish_sea,Irish Sea +prov_biscay_bay,Bay of Biscay +prov_north_sea,North Sea +prov_red_sea,Red Sea +prov_arabian_sea,Arabian Sea +prov_persian_gulf,Persian Gulf +prov_andaman_sea,Andaman Sea +prov_bay_bengal,Bay of Bengal +prov_okhotsk_sea,Sea of Okhotsk +prov_japan_sea,Sea of Japan +prov_east_china_sea,East China Sea +prov_south_china_sea,South China Sea +prov_philippine_sea,Philippine Sea +prov_celebes_sea,Celebes Sea +prov_java_sea,Java Sea +prov_banda_sea,Banda Sea +prov_arafura_sea,Arafura Sea +prov_gulf_mexico,Gulf of Mexico +prov_caribbean_sea,Caribbean Sea +prov_mozambique_channel,Mozambique Channel +prov_zanj_sea,Sea of Zanj +prov_kara_sea,Kara Sea +prov_barents_sea,Barents Sea +prov_norwegian_sea,Norwegian Sea +prov_greenland_sea,Greenland Sea +prov_labrador_sea,Labrador Sea +prov_hudson_bay,Hudson Bay +prov_gulf_st_lawrence,Gulf of St Lawrence +prov_gulf_alaska,Gulf of Alaska +prov_gulf_california,Gulf of California +prov_east_siberian_sea,East Siberian Sea +prov_sargasso_sea,Sargasso Sea +prov_gulf_guinea,Gulf of Guinea +prov_celtic_sea,Celtic Sea +prov_argentine_sea,Argentine Sea +prov_chilean_sea,Chilean Sea +prov_north_atlantic,North Atlantic Ocean +prov_central_atlantic,Central Atlantic Ocean +prov_south_atlantic,South Atlantic Ocean +prov_indian_ocean,Indian Ocean +prov_great_australian_bight,Great Australian Bight +prov_tasman_sea,Tasman Sea +prov_coral_sea,Coral Sea +prov_melanesia,Melanesia +prov_micronesia,Micronesia +prov_polynesia,Polynesia +prov_north_pacific,North Pacific Ocean +prov_south_pacific,South Pacific Ocean +prov_bering_sea,Bering Sea +prov_chukchi_sea,Chukchi Sea +prov_beaufort_sea,Beaufort Sea diff --git a/game/localisation/en_GB/regions.csv b/game/localisation/en_GB/regions.csv index 8fe8943..258cce6 100644 --- a/game/localisation/en_GB/regions.csv +++ b/game/localisation/en_GB/regions.csv @@ -1,8 +1,8 @@ ,, Regions -region_europe_NAME,Europe -region_north_america_NAME,North America -region_south_america_NAME,South America -region_africa_NAME,Africa -region_asia_NAME,Asia -region_oceania_NAME,Oceania +region_europe,Europe +region_north_america,North America +region_south_america,South America +region_africa,Africa +region_asia,Asia +region_oceania,Oceania diff --git a/game/src/Autoload/Events.gd b/game/src/Autoload/Events.gd index dbd3f9f..0ee2eff 100644 --- a/game/src/Autoload/Events.gd +++ b/game/src/Autoload/Events.gd @@ -11,11 +11,12 @@ const _province_shape_file : String = "res://common/map/provinces.png" # REQUIREMENTS # * FS-333, FS-334, FS-335, FS-341 func _ready(): - if MapSingleton.load_province_identifier_file(_province_identifier_file) != OK: + if GameSingleton.load_province_identifier_file(_province_identifier_file) != OK: push_error("Failed to load province identifiers") - if MapSingleton.load_water_province_file(_water_province_file) != OK: + if GameSingleton.load_water_province_file(_water_province_file) != OK: push_error("Failed to load water provinces") - if MapSingleton.load_region_file(_region_file) != OK: + if GameSingleton.load_region_file(_region_file) != OK: push_error("Failed to load regions") - if MapSingleton.load_province_shape_file(_province_shape_file) != OK: + if GameSingleton.load_province_shape_file(_province_shape_file) != OK: push_error("Failed to load province shapes") + GameSingleton.finished_loading_data() diff --git a/game/src/GameSession/GameSession.gd b/game/src/GameSession/GameSession.gd index fe83a8a..2761815 100644 --- a/game/src/GameSession/GameSession.gd +++ b/game/src/GameSession/GameSession.gd @@ -5,7 +5,10 @@ extends Control func _ready(): Events.Options.load_settings_from_file() +func _process(delta : float): + GameSingleton.try_tick() + # REQUIREMENTS: # * SS-42 -func _on_game_session_menu_button_pressed(): +func _on_game_session_menu_button_pressed() -> void: _game_session_menu.visible = !_game_session_menu.visible diff --git a/game/src/GameSession/GameSessionMenu.gd b/game/src/GameSession/GameSessionMenu.gd index 8a76c0f..7d785ca 100644 --- a/game/src/GameSession/GameSessionMenu.gd +++ b/game/src/GameSession/GameSessionMenu.gd @@ -8,6 +8,7 @@ signal options_button_pressed # * SS-47 # * UIFUN-69 func _on_main_menu_confirmed() -> void: + # TODO - reset map when going back to main menu get_tree().change_scene_to_packed(_main_menu_scene) # REQUIREMENTS: diff --git a/game/src/GameSession/GameSpeedPanel.gd b/game/src/GameSession/GameSpeedPanel.gd index 8dc35d7..c203032 100644 --- a/game/src/GameSession/GameSpeedPanel.gd +++ b/game/src/GameSession/GameSpeedPanel.gd @@ -7,27 +7,32 @@ extends PanelContainer @export var _decrease_speed_button : Button @export var _increase_speed_button : Button -var is_game_paused : bool = true - # Called when the node enters the scene tree for the first time. func _ready(): - _update_playpause_button() + GameSingleton.state_updated.connect(_update_buttons) + _update_buttons() + +func _update_buttons(): + _play_pause_display_button.text = "⏸️" if GameSingleton.is_paused() else "▶" + + _increase_speed_button.disabled = not GameSingleton.can_increase_speed() + _decrease_speed_button.disabled = not GameSingleton.can_decrease_speed() -func _update_playpause_button(): - _play_pause_display_button.text = "⏸️" if is_game_paused else "▶" - print("Game is paused" if is_game_paused else "Game is advancing") + _longform_date_button.text = GameSingleton.get_longform_date() func _on_decrease_speed_button_pressed(): - print("Decrease speed") + GameSingleton.decrease_speed() + _update_buttons() func _on_increase_speed_button_pressed(): - print("Increase speed") + GameSingleton.increase_speed() + _update_buttons() func _on_play_pause_display_button_pressed(): - is_game_paused = !is_game_paused - _update_playpause_button() + GameSingleton.toggle_paused() + _update_buttons() func _on_longform_date_label_pressed(): - is_game_paused = !is_game_paused - _update_playpause_button() + GameSingleton.toggle_paused() + _update_buttons() diff --git a/game/src/GameSession/MapControlPanel.gd b/game/src/GameSession/MapControlPanel.gd index d5810c5..73d7e06 100644 --- a/game/src/GameSession/MapControlPanel.gd +++ b/game/src/GameSession/MapControlPanel.gd @@ -27,8 +27,8 @@ func _add_mapmode_button(identifier : String) -> void: 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)) + for index in GameSingleton.get_mapmode_count(): + _add_mapmode_button(GameSingleton.get_mapmode_identifier(index)) # REQUIREMENTS: # * UIFUN-10 @@ -39,7 +39,7 @@ func _on_game_session_menu_button_pressed() -> void: # * SS-76 # * UIFUN-129, UIFUN-133 func _mapmode_pressed(button : BaseButton) -> void: - MapSingleton.set_mapmode(button.tooltip_text) + GameSingleton.set_mapmode(button.tooltip_text) mapmode_changed.emit() func _on_map_view_camera_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2) -> void: diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd index ae49e82..ac060e1 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -1,6 +1,6 @@ extends Node3D -signal province_selected(identifier : String) +signal province_selected(index : int) signal map_view_camera_changed(near_left : Vector2, far_left : Vector2, far_right : Vector2, near_right : Vector2) const _action_north : StringName = &"map_north" @@ -21,7 +21,7 @@ const _shader_param_terrain_tile_factor : StringName = &"terrain_tile_factor" @export var _camera : Camera3D @export var _cardinal_move_speed : float = 1.0 -@export var _edge_move_threshold: float = 0.02 +@export var _edge_move_threshold: float = 0.01 @export var _edge_move_speed: float = 2.5 var _drag_anchor : Vector2 var _drag_active : bool = false @@ -53,7 +53,7 @@ var _viewport_dims : Vector2 = Vector2(1, 1) # ??? Strange Godot/GDExtension Bug ??? # Upon first opening a clone of this repo with the Godot Editor, -# if MapSingleton.get_province_index_image is called before MapMesh +# if GameSingleton.get_province_index_image is called before MapMesh # is referenced in the script below, then the editor will crash due # to a failed HashMap lookup. I'm not sure if this is a bug in the # editor, GDExtension, my own extension, or a combination of them. @@ -78,7 +78,7 @@ func _ready(): _map_shader_material = map_material # Province index texture - _map_province_index_image = MapSingleton.get_province_index_image() + _map_province_index_image = GameSingleton.get_province_index_image() if _map_province_index_image == null: push_error("Failed to get province index image!") return @@ -86,7 +86,7 @@ func _ready(): _map_shader_material.set_shader_parameter(_shader_param_province_index, province_index_texture) # Province colour texture - _map_province_colour_image = MapSingleton.get_province_colour_image() + _map_province_colour_image = GameSingleton.get_province_colour_image() if _map_province_colour_image == null: push_error("Failed to get province colour image!") return @@ -99,7 +99,7 @@ func _ready(): _map_mesh = _map_mesh_instance.mesh # Set map mesh size and get bounds - _map_image_size = Vector2(Vector2i(MapSingleton.get_width(), MapSingleton.get_height())) + _map_image_size = Vector2(Vector2i(GameSingleton.get_width(), GameSingleton.get_height())) _map_mesh.aspect_ratio = _map_image_size.x / _map_image_size.y _map_shader_material.set_shader_parameter(_shader_param_terrain_tile_factor, _map_image_size.y / 64.0) var map_mesh_aabb := _map_mesh.get_core_aabb() * _map_mesh_instance.transform @@ -120,7 +120,7 @@ func _notification(what : int): _on_mouse_exited_viewport() func _update_colour_texture() -> void: - MapSingleton.update_colour_image() + GameSingleton.update_colour_image() _map_province_colour_texture.update(_map_province_colour_image) func _world_to_map_coords(pos : Vector3) -> Vector2: @@ -151,10 +151,9 @@ func _unhandled_input(event : InputEvent): if _mouse_over_viewport and event.is_action_pressed(_action_click): # Check if the mouse is outside of bounds if _map_mesh.is_valid_uv_coord(_mouse_pos_map): - var selected_index := MapSingleton.get_province_index_from_uv_coords(_mouse_pos_map) + var selected_index := GameSingleton.get_province_index_from_uv_coords(_mouse_pos_map) _map_shader_material.set_shader_parameter(_shader_param_selected_index, selected_index) - var province_identifier := MapSingleton.get_province_identifier_from_uv_coords(_mouse_pos_map) - province_selected.emit(province_identifier) + province_selected.emit(selected_index) else: print("Clicked outside the map!") elif event.is_action_pressed(_action_drag): @@ -248,7 +247,7 @@ func _update_minimap_viewport() -> void: func _update_mouse_map_position() -> void: _mouse_pos_map = _viewport_to_map_coords(_mouse_pos_viewport) - var hover_index := MapSingleton.get_province_index_from_uv_coords(_mouse_pos_map) + var hover_index := GameSingleton.get_province_index_from_uv_coords(_mouse_pos_map) if _mouse_over_viewport: _map_shader_material.set_shader_parameter(_shader_param_hover_index, hover_index) diff --git a/game/src/GameSession/ProvinceOverviewPanel.gd b/game/src/GameSession/ProvinceOverviewPanel.gd index 4615df9..832f21c 100644 --- a/game/src/GameSession/ProvinceOverviewPanel.gd +++ b/game/src/GameSession/ProvinceOverviewPanel.gd @@ -2,32 +2,84 @@ extends Panel @export var _province_name_label : Label @export var _region_name_label : Label +@export var _buildings_container : Container -var _province_identifier: String = "": - get: return _province_identifier +const _missing_suffix : String = "_MISSING" + +var _selected_index : int: + get: return _selected_index set(v): - _province_identifier = v + _selected_index = v update_info() - -const _name_suffix : String = "_NAME" +var _province_info : Dictionary func _ready(): + GameSingleton.state_updated.connect(update_info) update_info() +enum { CANNOT_EXPAND, CAN_EXPAND, PREPARING, EXPANDING } + +func _expand_building(building_identifier : String) -> void: + if GameSingleton.expand_building(_selected_index, building_identifier) != OK: + push_error("Failed to expand ", building_identifier, " in province #", _selected_index); + +func _add_building(building : Dictionary) -> void: + const _building_key : StringName = &"building" + const _level_key : StringName = &"level" + const _expansion_state_key : StringName = &"expansion_state" + const _start_key : StringName = &"start" + const _end_key : StringName = &"end" + const _expansion_progress_key : StringName = &"expansion_progress" + + const _expand_province_building : String = "EXPAND_PROVINCE_BUILDING" + + var level_label := Label.new() + level_label.text = str(building.get(_level_key, 0)) + _buildings_container.add_child(level_label) + + var building_label := Label.new() + building_label.text = building.get(_building_key, _building_key + _missing_suffix) + _buildings_container.add_child(building_label) + + var expansion_state : int = building.get(_expansion_state_key, CANNOT_EXPAND) + if expansion_state == PREPARING or expansion_state == EXPANDING: + var progress_bar := ProgressBar.new() + progress_bar.max_value = 1 + progress_bar.value = building.get(_expansion_progress_key, 0) + progress_bar.size_flags_horizontal = Control.SIZE_EXPAND_FILL + _buildings_container.add_child(progress_bar) + else: + var expand_button := Button.new() + expand_button.text = _expand_province_building + expand_button.size_flags_horizontal = Control.SIZE_EXPAND_FILL + expand_button.disabled = expansion_state != CAN_EXPAND + expand_button.pressed.connect(func(): _expand_building(building_label.text)) + _buildings_container.add_child(expand_button) + func update_info() -> void: - if _province_identifier: - _province_name_label.text = _province_identifier + _name_suffix - var region_identifier := MapSingleton.get_region_identifier_from_province_identifier(_province_identifier) - if region_identifier: - _region_name_label.text = region_identifier + _name_suffix - else: - _region_name_label.text = "NO REGION" + const _province_key : StringName = &"province" + const _region_key : StringName = &"region" + const _life_rating_key : StringName = &"life_rating" + const _buildings_key : StringName = &"buildings" + + _province_info = GameSingleton.get_province_info_from_index(_selected_index) + if _province_info: + _province_name_label.text = _province_info.get(_province_key, _province_key + _missing_suffix) + _region_name_label.text = _province_info.get(_region_key, _region_key + _missing_suffix) + + for child in _buildings_container.get_children(): + _buildings_container.remove_child(child) + child.queue_free() + var buildings : Array = _province_info.get(_buildings_key, []) + for building in buildings: + _add_building(building) + show() else: hide() -func _on_province_selected(identifier : String) -> void: - _province_identifier = identifier +func _on_province_selected(index : int) -> void: + _selected_index = index func _on_close_button_pressed() -> void: - _province_identifier = "" + _selected_index = 0 diff --git a/game/src/GameSession/ProvinceOverviewPanel.tscn b/game/src/GameSession/ProvinceOverviewPanel.tscn index 7d21edc..dacdc4b 100644 --- a/game/src/GameSession/ProvinceOverviewPanel.tscn +++ b/game/src/GameSession/ProvinceOverviewPanel.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/GameSession/ProvinceOverviewPanel.gd" id="1_3n8k5"] -[node name="ProvinceOverviewPanel" type="Panel" node_paths=PackedStringArray("_province_name_label", "_region_name_label")] +[node name="ProvinceOverviewPanel" type="Panel" node_paths=PackedStringArray("_province_name_label", "_region_name_label", "_buildings_container")] editor_description = "UI-56" anchors_preset = 2 anchor_top = 1.0 @@ -13,6 +13,7 @@ grow_vertical = 0 script = ExtResource("1_3n8k5") _province_name_label = NodePath("VBoxContainer/ProvinceName") _region_name_label = NodePath("VBoxContainer/RegionName") +_buildings_container = NodePath("VBoxContainer/BuildingsContainer") [node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 1 @@ -27,15 +28,22 @@ offset_bottom = -5.0 [node name="ProvinceName" type="Label" parent="VBoxContainer"] editor_description = "UI-57" layout_mode = 2 -text = "PROVINCE_NAME" +text = "province_MISSING" vertical_alignment = 1 [node name="RegionName" type="Label" parent="VBoxContainer"] editor_description = "UI-58" layout_mode = 2 -text = "REGION_NAME" +text = "region_MISSING" vertical_alignment = 1 +[node name="HSeparator" type="HSeparator" parent="VBoxContainer"] +layout_mode = 2 + +[node name="BuildingsContainer" type="GridContainer" parent="VBoxContainer"] +layout_mode = 2 +columns = 3 + [node name="CloseButton" type="Button" parent="."] custom_minimum_size = Vector2(30, 30) layout_mode = 1 -- cgit v1.2.3-56-ga3b1 From 2c2ee99cf2d304ec28eed8560860267e95ee9017 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Fri, 21 Apr 2023 20:53:42 -0400 Subject: Refurbish UI elements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move GameSession MusicPlayer to below OptionsMenu Ensures the MusicPlayer appears above the OptionsMenu Add Save and Quit/Resign to GameSessionMenu resign/quit popup To allow the player to save and resign/quit more quicker Remove GameSessionMenu hide on OptionsMenu open Renamed many UI elements to better reflect their purpose Add SessionButton theme_type_variation to GameSession buttons Add SessionButton style similar to TitleButton Disable 3D for dialog windows Change _play_pause_display_button pause text to "⏸ " Change IncreaseSpeedButton text to + Change DecreaseSpeedButton text to - Change Minimap NinePatch frame to function like a nine patch Rename actions map_zoomin and map_zoomout to map_zoom_in and map_zoom_out Change ProvinceOverviewPanel to a PanelContainer Reorganize ProvinceOverviewPanel to better use container functionality Optimize MusicPlayer Enables one line support for MusicPlayer Add warning to StyleBoxWithSound to avoid UI elements with toggle functionality --- game/localisation/en_GB/menus.csv | 2 + game/project.godot | 4 +- game/src/GameMenu.tscn | 1 - game/src/GameSession/GameSession.tscn | 24 +++---- game/src/GameSession/GameSessionMenu.gd | 48 +++++++++++++- game/src/GameSession/GameSessionMenu.tscn | 48 +++++++++----- game/src/GameSession/GameSpeedPanel.gd | 2 +- game/src/GameSession/GameSpeedPanel.tscn | 32 +++++----- game/src/GameSession/MapControlPanel.tscn | 51 ++++++++------- game/src/GameSession/MapView.gd | 8 +-- game/src/GameSession/ProvinceOverviewPanel.gd | 2 +- game/src/GameSession/ProvinceOverviewPanel.tscn | 59 ++++++++--------- game/src/MainMenu/MainMenu.tscn | 46 +++++++------- game/src/MusicConductor/MusicPlayer.tscn | 54 ++++++++-------- game/src/Utility/StyleBoxWithSound.gd | 1 + game/theme/game_session_menu.tres | 84 +++++++++++++++++++++++++ game/theme/main_menu.tres | 6 +- 17 files changed, 317 insertions(+), 155 deletions(-) create mode 100644 game/theme/game_session_menu.tres (limited to 'game/src/GameSession/GameSessionMenu.gd') diff --git a/game/localisation/en_GB/menus.csv b/game/localisation/en_GB/menus.csv index c637a39..0009acd 100644 --- a/game/localisation/en_GB/menus.csv +++ b/game/localisation/en_GB/menus.csv @@ -63,6 +63,8 @@ GAMESESSIONMENU_QUIT_DIALOG_TEXT,Are you sure you want to quit and return to des DIALOG_OK,OK DIALOG_CANCEL,Cancel +DIALOG_SAVE_AND_RESIGN,Save and Resign +DIALOG_SAVE_AND_QUIT,Save and Quit ,, Province Overview Panel province_MISSING,No Province diff --git a/game/project.godot b/game/project.godot index fa2871f..ff4081e 100644 --- a/game/project.godot +++ b/game/project.godot @@ -70,13 +70,13 @@ map_west={ , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"key_label":0,"unicode":97,"echo":false,"script":null) ] } -map_zoomin={ +map_zoom_in={ "deadzone": 0.5, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":8,"position":Vector2(174, 17),"global_position":Vector2(180, 80),"factor":1.0,"button_index":4,"pressed":true,"double_click":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":81,"physical_keycode":0,"key_label":0,"unicode":113,"echo":false,"script":null) ] } -map_zoomout={ +map_zoom_out={ "deadzone": 0.5, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":16,"position":Vector2(325, 24),"global_position":Vector2(331, 87),"factor":1.0,"button_index":5,"pressed":true,"double_click":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":69,"physical_keycode":0,"key_label":0,"unicode":101,"echo":false,"script":null) diff --git a/game/src/GameMenu.tscn b/game/src/GameMenu.tscn index aabb29c..c642351 100644 --- a/game/src/GameMenu.tscn +++ b/game/src/GameMenu.tscn @@ -43,7 +43,6 @@ anchor_left = 1.0 anchor_right = 1.0 offset_left = -184.0 offset_right = -34.0 -offset_bottom = 110.0 grow_horizontal = 0 [connection signal="credits_button_pressed" from="MainMenu" to="." method="_on_main_menu_credits_button_pressed"] diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn index 8a8b18c..b993acf 100644 --- a/game/src/GameSession/GameSession.tscn +++ b/game/src/GameSession/GameSession.tscn @@ -21,15 +21,6 @@ mouse_filter = 2 script = ExtResource("1_eklvp") _game_session_menu = NodePath("GameSessionMenu") -[node name="MusicPlayer" parent="." instance=ExtResource("2_kt6aa")] -layout_mode = 1 -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -150.0 -offset_bottom = 110.0 -grow_horizontal = 0 - [node name="MapView" parent="." instance=ExtResource("4_xkg5j")] [node name="GameSessionMenu" parent="." instance=ExtResource("3_bvmqh")] @@ -56,12 +47,23 @@ grow_vertical = 0 [node name="ProvinceOverviewPanel" parent="." instance=ExtResource("5_osjnn")] layout_mode = 1 +[node name="GameSpeedPanel" parent="." instance=ExtResource("7_myy4q")] +layout_mode = 0 +offset_right = 302.0 +offset_bottom = 31.0 + [node name="OptionsMenu" parent="." instance=ExtResource("6_p5mnx")] visible = false layout_mode = 1 -[node name="GameSpeedPanel" parent="." instance=ExtResource("7_myy4q")] -layout_mode = 0 +[node name="MusicPlayer" parent="." instance=ExtResource("2_kt6aa")] +layout_mode = 1 +anchors_preset = 1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -150.0 +offset_right = 0.0 +grow_horizontal = 0 [connection signal="map_view_camera_changed" from="MapView" to="MapControlPanel" method="_on_map_view_camera_changed"] [connection signal="province_selected" from="MapView" to="ProvinceOverviewPanel" method="_on_province_selected"] diff --git a/game/src/GameSession/GameSessionMenu.gd b/game/src/GameSession/GameSessionMenu.gd index 7d785ca..70a1630 100644 --- a/game/src/GameSession/GameSessionMenu.gd +++ b/game/src/GameSession/GameSessionMenu.gd @@ -2,8 +2,45 @@ extends PanelContainer @export var _main_menu_scene : PackedScene +@export var _main_menu_dialog : AcceptDialog +@export var _quit_dialog : AcceptDialog + +var _main_menu_save_button : Button +var _main_menu_save_separator : Control +var _quit_save_button : Button +var _quit_save_separator : Control + signal options_button_pressed +func _ready() -> void: + _main_menu_save_button = _main_menu_dialog.add_button("DIALOG_SAVE_AND_RESIGN", true, &"save_and_main_menu") + _quit_save_button = _quit_dialog.add_button("DIALOG_SAVE_AND_QUIT", true, &"save_and_quit") + + # Neccessary to center the save buttons and preserve the reference to the separator elements + var dialog_hbox : HBoxContainer = _main_menu_dialog.get_child(2, true) + var index := _main_menu_save_button.get_index(true) + dialog_hbox.move_child(_main_menu_save_button, _main_menu_dialog.get_ok_button().get_index(true)) + dialog_hbox.move_child(_main_menu_dialog.get_ok_button(), index) + _main_menu_save_separator = dialog_hbox.get_child(_main_menu_save_button.get_index(true) - 1) + + dialog_hbox = _quit_dialog.get_child(2, true) + index = _quit_save_button.get_index(true) + dialog_hbox.move_child(_quit_save_button, _quit_dialog.get_ok_button().get_index(true)) + dialog_hbox.move_child(_quit_dialog.get_ok_button(), index) + _quit_save_separator = dialog_hbox.get_child(_quit_save_button.get_index(true) - 1) + +func hide_save_dialog_button() -> void: + _main_menu_save_button.hide() + _main_menu_save_separator.hide() + _quit_save_button.hide() + _quit_save_separator.hide() + +func show_save_dialog_button() -> void: + _main_menu_save_button.show() + _main_menu_save_separator.show() + _quit_save_button.show() + _quit_save_separator.show() + # REQUIREMENTS: # * SS-47 # * UIFUN-69 @@ -21,5 +58,14 @@ func _on_quit_confirmed() -> void: # * SS-7, SS-46 # * UIFUN-11 func _on_options_button_pressed() -> void: - hide() options_button_pressed.emit() + +func _on_main_menu_dialog_custom_action(action) -> void: + match action: + &"save_and_main_menu": + _on_main_menu_confirmed() + +func _on_quit_dialog_custom_action(action : StringName) -> void: + match action: + &"save_and_quit": + _on_quit_confirmed() diff --git a/game/src/GameSession/GameSessionMenu.tscn b/game/src/GameSession/GameSessionMenu.tscn index a753184..99f38df 100644 --- a/game/src/GameSession/GameSessionMenu.tscn +++ b/game/src/GameSession/GameSessionMenu.tscn @@ -1,71 +1,89 @@ -[gd_scene load_steps=3 format=3 uid="uid://dvdynl6eir40o"] +[gd_scene load_steps=4 format=3 uid="uid://dvdynl6eir40o"] +[ext_resource type="Theme" uid="uid://dndova5cw036e" path="res://theme/game_session_menu.tres" id="1_2onog"] [ext_resource type="Script" path="res://src/GameSession/GameSessionMenu.gd" id="1_usq6o"] [ext_resource type="PackedScene" uid="uid://o4u142w4qkln" path="res://src/GameMenu.tscn" id="2_xi6a4"] -[node name="GameSessionMenu" type="PanelContainer"] +[node name="GameSessionMenu" type="PanelContainer" node_paths=PackedStringArray("_main_menu_dialog", "_quit_dialog")] +process_mode = 3 editor_description = "UI-68" +theme = ExtResource("1_2onog") +theme_type_variation = &"SessionPanel" script = ExtResource("1_usq6o") _main_menu_scene = ExtResource("2_xi6a4") +_main_menu_dialog = NodePath("MainMenuDialog") +_quit_dialog = NodePath("QuitDialog") -[node name="MarginContainer" type="MarginContainer" parent="."] +[node name="ButtonListMargin" type="MarginContainer" parent="."] layout_mode = 2 theme_override_constants/margin_left = 10 theme_override_constants/margin_top = 10 theme_override_constants/margin_right = 10 theme_override_constants/margin_bottom = 10 -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] +[node name="ButtonList" type="VBoxContainer" parent="ButtonListMargin"] layout_mode = 2 -[node name="SaveButton" type="Button" parent="MarginContainer/VBoxContainer"] +[node name="SaveButton" type="Button" parent="ButtonListMargin/ButtonList"] editor_description = "UI-69" layout_mode = 2 +theme_type_variation = &"SessionButton" text = "GAMESESSIONMENU_SAVE" -[node name="LoadButton" type="Button" parent="MarginContainer/VBoxContainer"] +[node name="LoadButton" type="Button" parent="ButtonListMargin/ButtonList"] editor_description = "UI-70" layout_mode = 2 +theme_type_variation = &"SessionButton" text = "GAMESESSIONMENU_LOAD" -[node name="OptionsButton" type="Button" parent="MarginContainer/VBoxContainer"] +[node name="OptionsButton" type="Button" parent="ButtonListMargin/ButtonList"] editor_description = "UI-10" layout_mode = 2 +theme_type_variation = &"SessionButton" text = "GAMESESSIONMENU_OPTIONS" -[node name="MainMenuButton" type="Button" parent="MarginContainer/VBoxContainer"] +[node name="MainMenuButton" type="Button" parent="ButtonListMargin/ButtonList"] editor_description = "UI-71" layout_mode = 2 +theme_type_variation = &"SessionButton" text = "GAMESESSIONMENU_MAINMENU" -[node name="QuitButton" type="Button" parent="MarginContainer/VBoxContainer"] +[node name="QuitButton" type="Button" parent="ButtonListMargin/ButtonList"] editor_description = "UI-72" layout_mode = 2 +theme_type_variation = &"SessionButton" text = "GAMESESSIONMENU_QUIT" -[node name="HSeparator" type="HSeparator" parent="MarginContainer/VBoxContainer"] +[node name="CloseSeparator" type="HSeparator" parent="ButtonListMargin/ButtonList"] layout_mode = 2 +theme_type_variation = &"SessionSeparator" -[node name="CloseButton" type="Button" parent="MarginContainer/VBoxContainer"] +[node name="CloseButton" type="Button" parent="ButtonListMargin/ButtonList"] editor_description = "SS-64, UI-80, UIFUN-79" layout_mode = 2 +theme_type_variation = &"SessionButton" text = "GAMESESSIONMENU_CLOSE" [node name="MainMenuDialog" type="ConfirmationDialog" parent="."] +disable_3d = true title = "GAMESESSIONMENU_MAINMENU_DIALOG_TITLE" +size = Vector2i(384, 100) ok_button_text = "DIALOG_OK" dialog_text = "GAMESESSIONMENU_MAINMENU_DIALOG_TEXT" cancel_button_text = "DIALOG_CANCEL" [node name="QuitDialog" type="ConfirmationDialog" parent="."] +disable_3d = true title = "GAMESESSIONMENU_QUIT_DIALOG_TITLE" ok_button_text = "DIALOG_OK" dialog_text = "GAMESESSIONMENU_QUIT_DIALOG_TEXT" cancel_button_text = "DIALOG_CANCEL" -[connection signal="pressed" from="MarginContainer/VBoxContainer/OptionsButton" to="." method="_on_options_button_pressed"] -[connection signal="pressed" from="MarginContainer/VBoxContainer/MainMenuButton" to="MainMenuDialog" method="popup_centered"] -[connection signal="pressed" from="MarginContainer/VBoxContainer/QuitButton" to="QuitDialog" method="popup_centered"] -[connection signal="pressed" from="MarginContainer/VBoxContainer/CloseButton" to="." method="hide"] +[connection signal="pressed" from="ButtonListMargin/ButtonList/OptionsButton" to="." method="_on_options_button_pressed"] +[connection signal="pressed" from="ButtonListMargin/ButtonList/MainMenuButton" to="MainMenuDialog" method="popup_centered"] +[connection signal="pressed" from="ButtonListMargin/ButtonList/QuitButton" to="QuitDialog" method="popup_centered"] +[connection signal="pressed" from="ButtonListMargin/ButtonList/CloseButton" to="." method="hide"] [connection signal="confirmed" from="MainMenuDialog" to="." method="_on_main_menu_confirmed"] +[connection signal="custom_action" from="MainMenuDialog" to="." method="_on_main_menu_dialog_custom_action"] [connection signal="confirmed" from="QuitDialog" to="." method="_on_quit_confirmed"] +[connection signal="custom_action" from="QuitDialog" to="." method="_on_quit_dialog_custom_action"] diff --git a/game/src/GameSession/GameSpeedPanel.gd b/game/src/GameSession/GameSpeedPanel.gd index c203032..8b7af29 100644 --- a/game/src/GameSession/GameSpeedPanel.gd +++ b/game/src/GameSession/GameSpeedPanel.gd @@ -13,7 +13,7 @@ func _ready(): _update_buttons() func _update_buttons(): - _play_pause_display_button.text = "⏸️" if GameSingleton.is_paused() else "▶" + _play_pause_display_button.text = "⏸ " if GameSingleton.is_paused() else "▶" _increase_speed_button.disabled = not GameSingleton.can_increase_speed() _decrease_speed_button.disabled = not GameSingleton.can_decrease_speed() diff --git a/game/src/GameSession/GameSpeedPanel.tscn b/game/src/GameSession/GameSpeedPanel.tscn index bfb869c..8a37565 100644 --- a/game/src/GameSession/GameSpeedPanel.tscn +++ b/game/src/GameSession/GameSpeedPanel.tscn @@ -4,35 +4,35 @@ [node name="GameSpeedPanel" type="PanelContainer" node_paths=PackedStringArray("_longform_date_button", "_play_pause_display_button", "_decrease_speed_button", "_increase_speed_button")] script = ExtResource("1_pfs8t") -_longform_date_button = NodePath("HBoxContainer/LongformDateButton") -_play_pause_display_button = NodePath("HBoxContainer/PlayPauseDisplayButton") -_decrease_speed_button = NodePath("HBoxContainer/DecreaseSpeedButton") -_increase_speed_button = NodePath("HBoxContainer/IncreaseSpeedButton") +_longform_date_button = NodePath("ButtonList/LongformDateButton") +_play_pause_display_button = NodePath("ButtonList/PlayPauseDisplayButton") +_decrease_speed_button = NodePath("ButtonList/DecreaseSpeedButton") +_increase_speed_button = NodePath("ButtonList/IncreaseSpeedButton") -[node name="HBoxContainer" type="HBoxContainer" parent="."] +[node name="ButtonList" type="HBoxContainer" parent="."] layout_mode = 2 -[node name="LongformDateButton" type="Button" parent="HBoxContainer"] +[node name="LongformDateButton" type="Button" parent="ButtonList"] custom_minimum_size = Vector2(200, 0) layout_mode = 2 text = "LONGFORM DATE" -[node name="PlayPauseDisplayButton" type="Button" parent="HBoxContainer"] +[node name="PlayPauseDisplayButton" type="Button" parent="ButtonList"] custom_minimum_size = Vector2(30, 0) layout_mode = 2 -text = "⏸" +text = "⏸ " -[node name="DecreaseSpeedButton" type="Button" parent="HBoxContainer"] +[node name="DecreaseSpeedButton" type="Button" parent="ButtonList"] custom_minimum_size = Vector2(30, 0) layout_mode = 2 -text = "➖" +text = "-" -[node name="IncreaseSpeedButton" type="Button" parent="HBoxContainer"] +[node name="IncreaseSpeedButton" type="Button" parent="ButtonList"] custom_minimum_size = Vector2(30, 0) layout_mode = 2 -text = "➕" +text = "+" -[connection signal="pressed" from="HBoxContainer/LongformDateButton" to="." method="_on_longform_date_label_pressed"] -[connection signal="pressed" from="HBoxContainer/PlayPauseDisplayButton" to="." method="_on_play_pause_display_button_pressed"] -[connection signal="pressed" from="HBoxContainer/DecreaseSpeedButton" to="." method="_on_decrease_speed_button_pressed"] -[connection signal="pressed" from="HBoxContainer/IncreaseSpeedButton" to="." method="_on_increase_speed_button_pressed"] +[connection signal="pressed" from="ButtonList/LongformDateButton" to="." method="_on_longform_date_label_pressed"] +[connection signal="pressed" from="ButtonList/PlayPauseDisplayButton" to="." method="_on_play_pause_display_button_pressed"] +[connection signal="pressed" from="ButtonList/DecreaseSpeedButton" to="." method="_on_decrease_speed_button_pressed"] +[connection signal="pressed" from="ButtonList/IncreaseSpeedButton" to="." method="_on_increase_speed_button_pressed"] diff --git a/game/src/GameSession/MapControlPanel.tscn b/game/src/GameSession/MapControlPanel.tscn index 27205e3..18b1c3f 100644 --- a/game/src/GameSession/MapControlPanel.tscn +++ b/game/src/GameSession/MapControlPanel.tscn @@ -15,89 +15,96 @@ events = [SubResource("InputEventAction_5nck3")] editor_description = "SS-103" mouse_filter = 1 script = ExtResource("1_ign64") -_mapmodes_grid = NodePath("MarginContainer/HBoxContainer/VBoxContainer/MapmodesGrid") +_mapmodes_grid = NodePath("MapPanelMargin/MapPanelList/MapDisplayList/MapmodesGrid") -[node name="MarginContainer" type="MarginContainer" parent="."] +[node name="MapPanelMargin" type="MarginContainer" parent="."] layout_mode = 2 theme_override_constants/margin_left = 5 theme_override_constants/margin_top = 5 theme_override_constants/margin_right = 5 theme_override_constants/margin_bottom = 5 -[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"] +[node name="MapPanelList" type="HBoxContainer" parent="MapPanelMargin"] layout_mode = 2 theme_override_constants/separation = 6 alignment = 1 -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/HBoxContainer"] +[node name="MapDisplayList" type="VBoxContainer" parent="MapPanelMargin/MapPanelList"] layout_mode = 2 alignment = 1 -[node name="MapmodesGrid" type="GridContainer" parent="MarginContainer/HBoxContainer/VBoxContainer"] +[node name="MapmodesGrid" type="GridContainer" parent="MapPanelMargin/MapPanelList/MapDisplayList"] editor_description = "UI-750" layout_mode = 2 columns = 11 -[node name="Minimap" type="PanelContainer" parent="MarginContainer/HBoxContainer/VBoxContainer"] +[node name="Minimap" type="PanelContainer" parent="MapPanelMargin/MapPanelList/MapDisplayList"] editor_description = "UI-549" layout_mode = 2 mouse_filter = 1 -[node name="TextureRect" type="TextureRect" parent="MarginContainer/HBoxContainer/VBoxContainer/Minimap"] +[node name="MinimapTexture" type="TextureRect" parent="MapPanelMargin/MapPanelList/MapDisplayList/Minimap"] editor_description = "UI-751, FS-338" layout_mode = 2 texture = ExtResource("2_r613r") -[node name="ViewportQuad" type="Control" parent="MarginContainer/HBoxContainer/VBoxContainer/Minimap"] +[node name="ViewportQuad" type="Control" parent="MapPanelMargin/MapPanelList/MapDisplayList/Minimap"] layout_mode = 2 mouse_filter = 2 script = ExtResource("3_s4dml") -[node name="Frame" type="NinePatchRect" parent="MarginContainer/HBoxContainer/VBoxContainer/Minimap"] +[node name="Frame" type="NinePatchRect" parent="MapPanelMargin/MapPanelList/MapDisplayList/Minimap"] layout_mode = 2 texture = ExtResource("4_f1exl") - -[node name="AuxiliaryPanel" type="VBoxContainer" parent="MarginContainer/HBoxContainer"] +draw_center = false +patch_margin_left = 10 +patch_margin_top = 10 +patch_margin_right = 10 +patch_margin_bottom = 10 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 + +[node name="AuxiliaryPanel" type="VBoxContainer" parent="MapPanelMargin/MapPanelList"] editor_description = "UI-761" layout_mode = 2 -[node name="GameSessionMenuButton" type="Button" parent="MarginContainer/HBoxContainer/AuxiliaryPanel"] +[node name="GameSessionMenuButton" type="Button" parent="MapPanelMargin/MapPanelList/AuxiliaryPanel"] editor_description = "UI-9" layout_mode = 2 mouse_filter = 1 shortcut = SubResource("Shortcut_fc1tk") text = "ESC" -[node name="LedgerButton" type="Button" parent="MarginContainer/HBoxContainer/AuxiliaryPanel"] +[node name="LedgerButton" type="Button" parent="MapPanelMargin/MapPanelList/AuxiliaryPanel"] editor_description = "UI-860" layout_mode = 2 mouse_filter = 1 text = "L" -[node name="FindButton" type="Button" parent="MarginContainer/HBoxContainer/AuxiliaryPanel"] +[node name="FindButton" type="Button" parent="MapPanelMargin/MapPanelList/AuxiliaryPanel"] editor_description = "UI-861" layout_mode = 2 mouse_filter = 1 text = "F" -[node name="ZoomButtonsContainer" type="HBoxContainer" parent="MarginContainer/HBoxContainer/AuxiliaryPanel"] +[node name="ZoomButtonsContainer" type="HBoxContainer" parent="MapPanelMargin/MapPanelList/AuxiliaryPanel"] layout_mode = 2 alignment = 1 -[node name="ZoomInButton" type="Button" parent="MarginContainer/HBoxContainer/AuxiliaryPanel/ZoomButtonsContainer"] +[node name="ZoomInButton" type="Button" parent="MapPanelMargin/MapPanelList/AuxiliaryPanel/ZoomButtonsContainer"] editor_description = "UI-862" layout_mode = 2 mouse_filter = 1 text = "+" -[node name="ZoomOutButton" type="Button" parent="MarginContainer/HBoxContainer/AuxiliaryPanel/ZoomButtonsContainer"] +[node name="ZoomOutButton" type="Button" parent="MapPanelMargin/MapPanelList/AuxiliaryPanel/ZoomButtonsContainer"] editor_description = "UI-863" layout_mode = 2 mouse_filter = 1 text = "-" -[connection signal="map_view_camera_changed" from="." to="MarginContainer/HBoxContainer/VBoxContainer/Minimap/ViewportQuad" method="_on_map_view_camera_changed"] -[connection signal="minimap_clicked" from="MarginContainer/HBoxContainer/VBoxContainer/Minimap/ViewportQuad" to="." method="_on_minimap_clicked"] -[connection signal="pressed" from="MarginContainer/HBoxContainer/AuxiliaryPanel/GameSessionMenuButton" to="." method="_on_game_session_menu_button_pressed"] -[connection signal="pressed" from="MarginContainer/HBoxContainer/AuxiliaryPanel/ZoomButtonsContainer/ZoomInButton" to="." method="_on_zoom_in_button_pressed"] -[connection signal="pressed" from="MarginContainer/HBoxContainer/AuxiliaryPanel/ZoomButtonsContainer/ZoomOutButton" to="." method="_on_zoom_out_button_pressed"] +[connection signal="map_view_camera_changed" from="." to="MapPanelMargin/MapPanelList/MapDisplayList/Minimap/ViewportQuad" method="_on_map_view_camera_changed"] +[connection signal="minimap_clicked" from="MapPanelMargin/MapPanelList/MapDisplayList/Minimap/ViewportQuad" to="." method="_on_minimap_clicked"] +[connection signal="pressed" from="MapPanelMargin/MapPanelList/AuxiliaryPanel/GameSessionMenuButton" to="." method="_on_game_session_menu_button_pressed"] +[connection signal="pressed" from="MapPanelMargin/MapPanelList/AuxiliaryPanel/ZoomButtonsContainer/ZoomInButton" to="." method="_on_zoom_in_button_pressed"] +[connection signal="pressed" from="MapPanelMargin/MapPanelList/AuxiliaryPanel/ZoomButtonsContainer/ZoomOutButton" to="." method="_on_zoom_out_button_pressed"] diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd index ac060e1..510d70a 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -7,8 +7,8 @@ const _action_north : StringName = &"map_north" const _action_east : StringName = &"map_east" const _action_south : StringName = &"map_south" const _action_west : StringName = &"map_west" -const _action_zoomin : StringName = &"map_zoomin" -const _action_zoomout : StringName = &"map_zoomout" +const _action_zoom_in : StringName = &"map_zoom_in" +const _action_zoom_out : StringName = &"map_zoom_out" const _action_drag : StringName = &"map_drag" const _action_click : StringName = &"map_click" @@ -165,9 +165,9 @@ func _unhandled_input(event : InputEvent): if not _drag_active: push_warning("Drag being deactivated while already not active!") _drag_active = false - elif event.is_action_pressed(_action_zoomin, true): + elif event.is_action_pressed(_action_zoom_in, true): zoom_in() - elif event.is_action_pressed(_action_zoomout, true): + elif event.is_action_pressed(_action_zoom_out, true): zoom_out() func _physics_process(delta : float): diff --git a/game/src/GameSession/ProvinceOverviewPanel.gd b/game/src/GameSession/ProvinceOverviewPanel.gd index 832f21c..cbab9d0 100644 --- a/game/src/GameSession/ProvinceOverviewPanel.gd +++ b/game/src/GameSession/ProvinceOverviewPanel.gd @@ -1,4 +1,4 @@ -extends Panel +extends PanelContainer @export var _province_name_label : Label @export var _region_name_label : Label diff --git a/game/src/GameSession/ProvinceOverviewPanel.tscn b/game/src/GameSession/ProvinceOverviewPanel.tscn index dacdc4b..7b28cc1 100644 --- a/game/src/GameSession/ProvinceOverviewPanel.tscn +++ b/game/src/GameSession/ProvinceOverviewPanel.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/GameSession/ProvinceOverviewPanel.gd" id="1_3n8k5"] -[node name="ProvinceOverviewPanel" type="Panel" node_paths=PackedStringArray("_province_name_label", "_region_name_label", "_buildings_container")] +[node name="ProvinceOverviewPanel" type="PanelContainer" node_paths=PackedStringArray("_province_name_label", "_region_name_label", "_buildings_container")] editor_description = "UI-56" anchors_preset = 2 anchor_top = 1.0 @@ -11,47 +11,48 @@ offset_top = -300.0 offset_right = 200.0 grow_vertical = 0 script = ExtResource("1_3n8k5") -_province_name_label = NodePath("VBoxContainer/ProvinceName") -_region_name_label = NodePath("VBoxContainer/RegionName") -_buildings_container = NodePath("VBoxContainer/BuildingsContainer") - -[node name="VBoxContainer" type="VBoxContainer" parent="."] -layout_mode = 1 -anchors_preset = -1 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = 10.0 -offset_top = 5.0 -offset_right = -10.0 -offset_bottom = -5.0 +_province_name_label = NodePath("PanelList/TopBarList/NameList/ProvinceName") +_region_name_label = NodePath("PanelList/TopBarList/NameList/RegionName") +_buildings_container = NodePath("PanelList/InteractList/BuildingsContainer") + +[node name="PanelList" type="VBoxContainer" parent="."] +layout_mode = 2 + +[node name="TopBarList" type="HBoxContainer" parent="PanelList"] +layout_mode = 2 + +[node name="NameList" type="VBoxContainer" parent="PanelList/TopBarList"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 0 -[node name="ProvinceName" type="Label" parent="VBoxContainer"] +[node name="ProvinceName" type="Label" parent="PanelList/TopBarList/NameList"] editor_description = "UI-57" layout_mode = 2 text = "province_MISSING" vertical_alignment = 1 -[node name="RegionName" type="Label" parent="VBoxContainer"] +[node name="RegionName" type="Label" parent="PanelList/TopBarList/NameList"] editor_description = "UI-58" layout_mode = 2 text = "region_MISSING" vertical_alignment = 1 -[node name="HSeparator" type="HSeparator" parent="VBoxContainer"] +[node name="CloseButton" type="Button" parent="PanelList/TopBarList"] +custom_minimum_size = Vector2(30, 30) +layout_mode = 2 +size_flags_vertical = 0 +text = "X" + +[node name="InteractList" type="VBoxContainer" parent="PanelList"] layout_mode = 2 +size_flags_vertical = 3 -[node name="BuildingsContainer" type="GridContainer" parent="VBoxContainer"] +[node name="HSeparator" type="HSeparator" parent="PanelList/InteractList"] layout_mode = 2 -columns = 3 -[node name="CloseButton" type="Button" parent="."] -custom_minimum_size = Vector2(30, 30) -layout_mode = 1 -anchors_preset = -1 -anchor_left = 0.85 -anchor_right = 1.0 -anchor_bottom = 0.103333 -grow_horizontal = 0 -text = "X" +[node name="BuildingsContainer" type="GridContainer" parent="PanelList/InteractList"] +layout_mode = 2 +columns = 3 -[connection signal="pressed" from="CloseButton" to="." method="_on_close_button_pressed"] +[connection signal="pressed" from="PanelList/TopBarList/CloseButton" to="." method="_on_close_button_pressed"] diff --git a/game/src/MainMenu/MainMenu.tscn b/game/src/MainMenu/MainMenu.tscn index a10fa27..0618fe8 100644 --- a/game/src/MainMenu/MainMenu.tscn +++ b/game/src/MainMenu/MainMenu.tscn @@ -16,9 +16,9 @@ grow_horizontal = 2 grow_vertical = 2 theme = ExtResource("1_1yri4") script = ExtResource("2_nm1fq") -_new_game_button = NodePath("Panel/VBox/Margin/ButtonList/NewGameButton") +_new_game_button = NodePath("MenuPanel/MenuList/ButtonListMargin/ButtonList/NewGameButton") -[node name="Panel" type="PanelContainer" parent="."] +[node name="MenuPanel" type="PanelContainer" parent="."] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -27,10 +27,10 @@ grow_horizontal = 2 grow_vertical = 2 theme_type_variation = &"BackgroundPanel" -[node name="VBox" type="VBoxContainer" parent="Panel"] +[node name="MenuList" type="VBoxContainer" parent="MenuPanel"] layout_mode = 2 -[node name="TextureRect" type="TextureRect" parent="Panel/VBox"] +[node name="TitleIcon" type="TextureRect" parent="MenuPanel/MenuList"] layout_mode = 2 size_flags_vertical = 3 size_flags_stretch_ratio = 1.75 @@ -38,19 +38,19 @@ texture = ExtResource("3_58ess") expand_mode = 1 stretch_mode = 5 -[node name="Margin" type="MarginContainer" parent="Panel/VBox"] +[node name="ButtonListMargin" type="MarginContainer" parent="MenuPanel/MenuList"] layout_mode = 2 theme_override_constants/margin_left = 15 theme_override_constants/margin_right = 12 -[node name="ButtonList" type="HBoxContainer" parent="Panel/VBox/Margin"] +[node name="ButtonList" type="HBoxContainer" parent="MenuPanel/MenuList/ButtonListMargin"] custom_minimum_size = Vector2(500, 0) layout_mode = 2 theme_type_variation = &"HBox_MainMenu_ButtonList" theme_override_constants/separation = 18 alignment = 1 -[node name="NewGameButton" type="Button" parent="Panel/VBox/Margin/ButtonList"] +[node name="NewGameButton" type="Button" parent="MenuPanel/MenuList/ButtonListMargin/ButtonList"] editor_description = "UI-26" layout_mode = 2 size_flags_horizontal = 3 @@ -63,7 +63,7 @@ theme_type_variation = &"TitleButton" text = "MAINMENU_NEW_GAME" clip_text = true -[node name="ContinueButton" type="Button" parent="Panel/VBox/Margin/ButtonList"] +[node name="ContinueButton" type="Button" parent="MenuPanel/MenuList/ButtonListMargin/ButtonList"] layout_mode = 2 size_flags_horizontal = 3 focus_neighbor_left = NodePath("../NewGameButton") @@ -75,7 +75,7 @@ disabled = true text = "MAINMENU_CONTINUE" clip_text = true -[node name="MultiplayerButton" type="Button" parent="Panel/VBox/Margin/ButtonList"] +[node name="MultiplayerButton" type="Button" parent="MenuPanel/MenuList/ButtonListMargin/ButtonList"] editor_description = "UI-27" layout_mode = 2 size_flags_horizontal = 3 @@ -87,7 +87,7 @@ theme_type_variation = &"TitleButton" text = "MAINMENU_MULTIPLAYER" clip_text = true -[node name="OptionsButton" type="Button" parent="Panel/VBox/Margin/ButtonList"] +[node name="OptionsButton" type="Button" parent="MenuPanel/MenuList/ButtonListMargin/ButtonList"] editor_description = "UI-5" layout_mode = 2 size_flags_horizontal = 3 @@ -99,7 +99,7 @@ theme_type_variation = &"TitleButton" text = "MAINMENU_OPTIONS" clip_text = true -[node name="CreditsButton" type="Button" parent="Panel/VBox/Margin/ButtonList"] +[node name="CreditsButton" type="Button" parent="MenuPanel/MenuList/ButtonListMargin/ButtonList"] editor_description = "UI-32" layout_mode = 2 size_flags_horizontal = 3 @@ -111,7 +111,7 @@ theme_type_variation = &"TitleButton" text = "MAINMENU_CREDITS" clip_text = true -[node name="ExitButton" type="Button" parent="Panel/VBox/Margin/ButtonList"] +[node name="ExitButton" type="Button" parent="MenuPanel/MenuList/ButtonListMargin/ButtonList"] editor_description = "UI-3" layout_mode = 2 size_flags_horizontal = 3 @@ -123,28 +123,28 @@ theme_type_variation = &"TitleButton" text = "MAINMENU_EXIT" clip_text = true -[node name="BottomSpace" type="Control" parent="Panel/VBox"] +[node name="BottomSpace" type="Control" parent="MenuPanel/MenuList"] layout_mode = 2 size_flags_vertical = 3 size_flags_stretch_ratio = 0.35 -[node name="BottomMargin" type="MarginContainer" parent="Panel/VBox"] +[node name="BottomMargin" type="MarginContainer" parent="MenuPanel/MenuList"] layout_mode = 2 theme_type_variation = &"BottomMargin" -[node name="ReleaseInfoBox" parent="Panel/VBox/BottomMargin" instance=ExtResource("3_km0er")] +[node name="ReleaseInfoBox" parent="MenuPanel/MenuList/BottomMargin" instance=ExtResource("3_km0er")] layout_mode = 2 -[node name="LocaleButton" parent="Panel/VBox/BottomMargin" instance=ExtResource("3_amonp")] +[node name="LocaleButton" parent="MenuPanel/MenuList/BottomMargin" instance=ExtResource("3_amonp")] layout_mode = 2 size_flags_horizontal = 8 alignment = 0 text_overrun_behavior = 4 -[connection signal="pressed" from="Panel/VBox/Margin/ButtonList/NewGameButton" to="." method="_on_new_game_button_pressed"] -[connection signal="visibility_changed" from="Panel/VBox/Margin/ButtonList/NewGameButton" to="." method="_on_new_game_button_visibility_changed"] -[connection signal="pressed" from="Panel/VBox/Margin/ButtonList/ContinueButton" to="." method="_on_continue_button_pressed"] -[connection signal="pressed" from="Panel/VBox/Margin/ButtonList/MultiplayerButton" to="." method="_on_multi_player_button_pressed"] -[connection signal="pressed" from="Panel/VBox/Margin/ButtonList/OptionsButton" to="." method="_on_options_button_pressed"] -[connection signal="pressed" from="Panel/VBox/Margin/ButtonList/CreditsButton" to="." method="_on_credits_button_pressed"] -[connection signal="pressed" from="Panel/VBox/Margin/ButtonList/ExitButton" to="." method="_on_exit_button_pressed"] +[connection signal="pressed" from="MenuPanel/MenuList/ButtonListMargin/ButtonList/NewGameButton" to="." method="_on_new_game_button_pressed"] +[connection signal="visibility_changed" from="MenuPanel/MenuList/ButtonListMargin/ButtonList/NewGameButton" to="." method="_on_new_game_button_visibility_changed"] +[connection signal="pressed" from="MenuPanel/MenuList/ButtonListMargin/ButtonList/ContinueButton" to="." method="_on_continue_button_pressed"] +[connection signal="pressed" from="MenuPanel/MenuList/ButtonListMargin/ButtonList/MultiplayerButton" to="." method="_on_multi_player_button_pressed"] +[connection signal="pressed" from="MenuPanel/MenuList/ButtonListMargin/ButtonList/OptionsButton" to="." method="_on_options_button_pressed"] +[connection signal="pressed" from="MenuPanel/MenuList/ButtonListMargin/ButtonList/CreditsButton" to="." method="_on_credits_button_pressed"] +[connection signal="pressed" from="MenuPanel/MenuList/ButtonListMargin/ButtonList/ExitButton" to="." method="_on_exit_button_pressed"] diff --git a/game/src/MusicConductor/MusicPlayer.tscn b/game/src/MusicConductor/MusicPlayer.tscn index 91b6fd3..80ad641 100644 --- a/game/src/MusicConductor/MusicPlayer.tscn +++ b/game/src/MusicConductor/MusicPlayer.tscn @@ -4,58 +4,60 @@ [node name="MusicPlayer" type="BoxContainer" node_paths=PackedStringArray("_song_selector_button", "_progress_slider", "_previous_song_button", "_play_pause_button", "_next_song_button", "_visbility_button")] editor_description = "UI-104" +offset_right = 150.0 +offset_bottom = 110.0 mouse_filter = 2 +vertical = true script = ExtResource("1_gcm4m") -_song_selector_button = NodePath("Control/SongSelectorButton") -_progress_slider = NodePath("Control/ProgressSlider") -_previous_song_button = NodePath("Control/HBoxContainer/PreviousSongButton") -_play_pause_button = NodePath("Control/HBoxContainer/PlayPauseButton") -_next_song_button = NodePath("Control/HBoxContainer/NextSongButton") -_visbility_button = NodePath("Control/MusicUIVisibilityButton") - -[node name="Control" type="VBoxContainer" parent="."] -custom_minimum_size = Vector2(150, 0) -layout_mode = 2 -mouse_filter = 2 - -[node name="SongSelectorButton" type="OptionButton" parent="Control"] +_song_selector_button = NodePath("SongSelectorButton") +_progress_slider = NodePath("ProgressSlider") +_previous_song_button = NodePath("ButtonList/PreviousSongButton") +_play_pause_button = NodePath("ButtonList/PlayPauseButton") +_next_song_button = NodePath("ButtonList/NextSongButton") +_visbility_button = NodePath("MusicUIVisibilityButton") + +[node name="SongSelectorButton" type="OptionButton" parent="."] editor_description = "UI-107" +custom_minimum_size = Vector2(150, 0) layout_mode = 2 alignment = 1 text_overrun_behavior = 3 fit_to_longest_item = false -[node name="ProgressSlider" type="HSlider" parent="Control"] +[node name="ProgressSlider" type="HSlider" parent="."] +custom_minimum_size = Vector2(150, 0) layout_mode = 2 +size_flags_vertical = 1 -[node name="HBoxContainer" type="HBoxContainer" parent="Control"] +[node name="ButtonList" type="HBoxContainer" parent="."] layout_mode = 2 size_flags_horizontal = 4 mouse_filter = 2 -[node name="PreviousSongButton" type="Button" parent="Control/HBoxContainer"] +[node name="PreviousSongButton" type="Button" parent="ButtonList"] layout_mode = 2 text = "<" -[node name="PlayPauseButton" type="Button" parent="Control/HBoxContainer"] +[node name="PlayPauseButton" type="Button" parent="ButtonList"] custom_minimum_size = Vector2(30, 0) layout_mode = 2 text = "▶" -[node name="NextSongButton" type="Button" parent="Control/HBoxContainer"] +[node name="NextSongButton" type="Button" parent="ButtonList"] layout_mode = 2 text = ">" -[node name="MusicUIVisibilityButton" type="Button" parent="Control"] +[node name="MusicUIVisibilityButton" type="Button" parent="."] editor_description = "UI-106" layout_mode = 2 size_flags_horizontal = 4 +toggle_mode = true text = "⬆" -[connection signal="item_selected" from="Control/SongSelectorButton" to="." method="_on_option_button_item_selected"] -[connection signal="drag_ended" from="Control/ProgressSlider" to="." method="_on_progress_slider_drag_ended"] -[connection signal="drag_started" from="Control/ProgressSlider" to="." method="_on_progress_slider_drag_started"] -[connection signal="pressed" from="Control/HBoxContainer/PreviousSongButton" to="." method="_on_previous_song_button_pressed"] -[connection signal="pressed" from="Control/HBoxContainer/PlayPauseButton" to="." method="_on_play_pause_button_pressed"] -[connection signal="pressed" from="Control/HBoxContainer/NextSongButton" to="." method="_on_next_song_button_pressed"] -[connection signal="pressed" from="Control/MusicUIVisibilityButton" to="." method="_on_music_ui_visibility_button_pressed"] +[connection signal="item_selected" from="SongSelectorButton" to="." method="_on_option_button_item_selected"] +[connection signal="drag_ended" from="ProgressSlider" to="." method="_on_progress_slider_drag_ended"] +[connection signal="drag_started" from="ProgressSlider" to="." method="_on_progress_slider_drag_started"] +[connection signal="pressed" from="ButtonList/PreviousSongButton" to="." method="_on_previous_song_button_pressed"] +[connection signal="pressed" from="ButtonList/PlayPauseButton" to="." method="_on_play_pause_button_pressed"] +[connection signal="pressed" from="ButtonList/NextSongButton" to="." method="_on_next_song_button_pressed"] +[connection signal="pressed" from="MusicUIVisibilityButton" to="." method="_on_music_ui_visibility_button_pressed"] diff --git a/game/src/Utility/StyleBoxWithSound.gd b/game/src/Utility/StyleBoxWithSound.gd index 8de1af1..8c29b34 100644 --- a/game/src/Utility/StyleBoxWithSound.gd +++ b/game/src/Utility/StyleBoxWithSound.gd @@ -1,3 +1,4 @@ +## WARNING: This will not work with togglable UI elements, a special implementation is needed for them. @tool extends StyleBox class_name StyleBoxWithSound diff --git a/game/theme/game_session_menu.tres b/game/theme/game_session_menu.tres new file mode 100644 index 0000000..42775c3 --- /dev/null +++ b/game/theme/game_session_menu.tres @@ -0,0 +1,84 @@ +[gd_resource type="Theme" load_steps=11 format=3 uid="uid://dndova5cw036e"] + +[ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://theme/assets/main_menu_button_normal.tres" id="1_7med2"] +[ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="2_oj3dv"] +[ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="3_j823n"] +[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="4_lno5s"] + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jvvyi"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = ExtResource("4_lno5s") +modulate_color = Color(0.817521, 0.817521, 0.817521, 0.784314) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6ab1x"] +draw_center = false +border_width_left = 10 +border_width_top = 15 +border_width_right = 10 +border_width_bottom = 15 +border_color = Color(0, 0, 0, 0.584314) +border_blend = true +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 +corner_detail = 20 + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jslj0"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = ExtResource("4_lno5s") +modulate_color = Color(0.588235, 0.588235, 0.588235, 1) + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_l2rw3"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = ExtResource("4_lno5s") +modulate_color = Color(0.85098, 0.85098, 0.85098, 1) + +[sub_resource type="StyleBox" id="StyleBox_ptkcj"] +resource_local_to_scene = false +resource_name = "" +content_margin_left = -1.0 +content_margin_top = -1.0 +content_margin_right = -1.0 +content_margin_bottom = -1.0 +script = ExtResource("2_oj3dv") +style_box = SubResource("StyleBoxTexture_l2rw3") +sound = ExtResource("3_j823n") + +[sub_resource type="StyleBoxLine" id="StyleBoxLine_kaw4i"] +color = Color(0.454902, 0.45098, 0.435294, 1) +thickness = 2 + +[resource] +SessionButton/base_type = &"Button" +SessionButton/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1) +SessionButton/colors/font_disabled_color = Color(0.87451, 0.87451, 0.87451, 0.501961) +SessionButton/colors/font_focus_color = Color(0.94902, 0.94902, 0.94902, 1) +SessionButton/colors/font_hover_color = Color(0.94902, 0.94902, 0.94902, 1) +SessionButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1) +SessionButton/colors/font_outline_color = Color(1, 1, 1, 1) +SessionButton/colors/font_pressed_color = Color(1, 1, 1, 1) +SessionButton/colors/icon_disabled_color = Color(1, 1, 1, 0.4) +SessionButton/colors/icon_focus_color = Color(0.94902, 0.94902, 0.94902, 1) +SessionButton/colors/icon_hover_color = Color(0.94902, 0.94902, 0.94902, 1) +SessionButton/colors/icon_hover_pressed_color = Color(1, 1, 1, 1) +SessionButton/colors/icon_normal_color = Color(1, 1, 1, 1) +SessionButton/colors/icon_pressed_color = Color(1, 1, 1, 1) +SessionButton/styles/disabled = SubResource("StyleBoxTexture_jvvyi") +SessionButton/styles/focus = SubResource("StyleBoxFlat_6ab1x") +SessionButton/styles/hover = SubResource("StyleBoxTexture_jslj0") +SessionButton/styles/normal = ExtResource("1_7med2") +SessionButton/styles/pressed = SubResource("StyleBox_ptkcj") +SessionPanel/base_type = &"Panel" +SessionPanel/styles/panel = null +SessionSeparator/base_type = &"HSeparator" +SessionSeparator/styles/separator = SubResource("StyleBoxLine_kaw4i") diff --git a/game/theme/main_menu.tres b/game/theme/main_menu.tres index 6a3f73d..0518cd8 100644 --- a/game/theme/main_menu.tres +++ b/game/theme/main_menu.tres @@ -171,9 +171,9 @@ CommitLabel/styles/normal = SubResource("StyleBoxEmpty_kmfi1") CommitLabel/styles/pressed = SubResource("StyleBoxEmpty_1qcrh") TitleButton/base_type = &"Button" TitleButton/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1) -TitleButton/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5) -TitleButton/colors/font_focus_color = Color(0.95, 0.95, 0.95, 1) -TitleButton/colors/font_hover_color = Color(0.95, 0.95, 0.95, 1) +TitleButton/colors/font_disabled_color = Color(0.87451, 0.87451, 0.87451, 0.501961) +TitleButton/colors/font_focus_color = Color(0.94902, 0.94902, 0.94902, 1) +TitleButton/colors/font_hover_color = Color(0.94902, 0.94902, 0.94902, 1) TitleButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1) TitleButton/colors/font_outline_color = Color(1, 1, 1, 1) TitleButton/colors/font_pressed_color = Color(1, 1, 1, 1) -- cgit v1.2.3-56-ga3b1 From 50327abf33078c44fef85c62ce3d90e23056fb34 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Tue, 25 Apr 2023 21:35:59 +0100 Subject: Further cleanup + reset on return to main menu --- extension/src/GameSingleton.cpp | 6 ++--- extension/src/GameSingleton.hpp | 2 +- extension/src/openvic2/GameAdvancementHook.cpp | 5 ++++ extension/src/openvic2/GameAdvancementHook.hpp | 5 ++-- extension/src/openvic2/GameManager.cpp | 9 ++++--- extension/src/openvic2/GameManager.hpp | 4 ++-- extension/src/openvic2/Types.hpp | 33 +++++++++++++++++++------- extension/src/openvic2/map/Building.cpp | 15 +++++++++--- extension/src/openvic2/map/Building.hpp | 21 ++++++++++------ extension/src/openvic2/map/Map.cpp | 22 +++++++++++++---- extension/src/openvic2/map/Map.hpp | 15 ++++++------ extension/src/openvic2/map/Province.cpp | 16 ++++++++++--- extension/src/openvic2/map/Province.hpp | 12 ++++++---- extension/src/openvic2/map/Region.hpp | 2 ++ game/src/Autoload/Events.gd | 1 - game/src/GameSession/GameSession.gd | 2 ++ game/src/GameSession/GameSessionMenu.gd | 1 - 17 files changed, 121 insertions(+), 50 deletions(-) (limited to 'game/src/GameSession/GameSessionMenu.gd') diff --git a/extension/src/GameSingleton.cpp b/extension/src/GameSingleton.cpp index f596cc2..32d940c 100644 --- a/extension/src/GameSingleton.cpp +++ b/extension/src/GameSingleton.cpp @@ -18,7 +18,7 @@ void GameSingleton::_bind_methods() { ClassDB::bind_method(D_METHOD("load_water_province_file", "file_path"), &GameSingleton::load_water_province_file); ClassDB::bind_method(D_METHOD("load_region_file", "file_path"), &GameSingleton::load_region_file); ClassDB::bind_method(D_METHOD("load_province_shape_file", "file_path"), &GameSingleton::load_province_shape_file); - ClassDB::bind_method(D_METHOD("finished_loading_data"), &GameSingleton::finished_loading_data); + ClassDB::bind_method(D_METHOD("setup"), &GameSingleton::setup); ClassDB::bind_method(D_METHOD("get_province_index_from_uv_coords", "coords"), &GameSingleton::get_province_index_from_uv_coords); ClassDB::bind_method(D_METHOD("get_province_info_from_index", "index"), &GameSingleton::get_province_info_from_index); @@ -273,8 +273,8 @@ Error GameSingleton::load_province_shape_file(String const& file_path) { return err; } -void GameSingleton::finished_loading_data() { - game_manager.finished_loading_data(); +godot::Error GameSingleton::setup() { + return ERR(game_manager.setup()); } Error GameSingleton::load_water_province_file(String const& file_path) { diff --git a/extension/src/GameSingleton.hpp b/extension/src/GameSingleton.hpp index 0e2cfd1..815c92f 100644 --- a/extension/src/GameSingleton.hpp +++ b/extension/src/GameSingleton.hpp @@ -33,7 +33,7 @@ namespace OpenVic2 { godot::Error load_water_province_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); - void finished_loading_data(); + godot::Error setup(); int32_t get_province_index_from_uv_coords(godot::Vector2 const& coords) const; godot::Dictionary get_province_info_from_index(int32_t index) const; diff --git a/extension/src/openvic2/GameAdvancementHook.cpp b/extension/src/openvic2/GameAdvancementHook.cpp index c78847b..4b9bc25 100644 --- a/extension/src/openvic2/GameAdvancementHook.cpp +++ b/extension/src/openvic2/GameAdvancementHook.cpp @@ -65,3 +65,8 @@ void GameAdvancementHook::conditionallyAdvanceGame() { } if (refreshFunction) refreshFunction(); } + +void GameAdvancementHook::reset() { + isPaused = true; + currentSpeed = 0; +} diff --git a/extension/src/openvic2/GameAdvancementHook.hpp b/extension/src/openvic2/GameAdvancementHook.hpp index 572494a..07f8414 100644 --- a/extension/src/openvic2/GameAdvancementHook.hpp +++ b/extension/src/openvic2/GameAdvancementHook.hpp @@ -21,12 +21,12 @@ namespace OpenVic2 { //A function pointer that advances the simulation, intended to be a capturing lambda or something similar. May need to be reworked later AdvancementFunction triggerFunction; RefreshFunction refreshFunction; + speed_t currentSpeed; public: bool isPaused; - speed_t currentSpeed; - GameAdvancementHook(AdvancementFunction tickFunction, RefreshFunction updateFunction, bool startPaused = false, speed_t startingSpeed = 0); + GameAdvancementHook(AdvancementFunction tickFunction, RefreshFunction updateFunction, bool startPaused = true, speed_t startingSpeed = 0); void setSimulationSpeed(speed_t speed); speed_t getSimulationSpeed() const; @@ -37,5 +37,6 @@ namespace OpenVic2 { GameAdvancementHook& operator++(); GameAdvancementHook& operator--(); void conditionallyAdvanceGame(); + void reset(); }; } \ No newline at end of file diff --git a/extension/src/openvic2/GameManager.cpp b/extension/src/openvic2/GameManager.cpp index da742ca..78992f1 100644 --- a/extension/src/openvic2/GameManager.cpp +++ b/extension/src/openvic2/GameManager.cpp @@ -5,7 +5,7 @@ using namespace OpenVic2; GameManager::GameManager(state_updated_func_t state_updated_callback) - : clock{ [this]() { tick(); }, [this]() { update_state(); }, true }, today{ 1836 }, state_updated{ state_updated_callback } {} + : clock{ [this]() { tick(); }, [this]() { update_state(); } }, state_updated{ state_updated_callback } {} void GameManager::set_needs_update() { needs_update = true; @@ -27,8 +27,11 @@ void GameManager::tick() { set_needs_update(); } -void GameManager::finished_loading_data() { - map.generate_province_buildings(building_manager); +return_t GameManager::setup() { + clock.reset(); + today = { 1836 }; + set_needs_update(); + return map.generate_province_buildings(building_manager); } Date const& GameManager::get_today() const { diff --git a/extension/src/openvic2/GameManager.hpp b/extension/src/openvic2/GameManager.hpp index cba0180..65cd566 100644 --- a/extension/src/openvic2/GameManager.hpp +++ b/extension/src/openvic2/GameManager.hpp @@ -13,7 +13,7 @@ namespace OpenVic2 { private: Date today; state_updated_func_t state_updated; - bool needs_update = true; + bool needs_update; void set_needs_update(); void update_state(); @@ -21,7 +21,7 @@ namespace OpenVic2 { public: GameManager(state_updated_func_t state_updated_callback); - void finished_loading_data(); + return_t setup(); Date const& get_today() const; return_t expand_building(Province::index_t province_index, std::string const& building_type_identifier); diff --git a/extension/src/openvic2/Types.hpp b/extension/src/openvic2/Types.hpp index 226dd30..f53f842 100644 --- a/extension/src/openvic2/Types.hpp +++ b/extension/src/openvic2/Types.hpp @@ -10,47 +10,62 @@ namespace OpenVic2 { // This mirrors godot::Error, where `OK = 0` and `FAILED = 1`. static constexpr return_t SUCCESS = false, FAILURE = true; + /* + * Base class for objects with a non-empty string identifier, + * uniquely named instances of which can be entered into an + * IdentifierRegistry instance. + */ class HasIdentifier { - std::string identifier; + const std::string identifier; protected: HasIdentifier(std::string const& new_identifier); public: + HasIdentifier(HasIdentifier const&) = delete; + HasIdentifier(HasIdentifier&&) = default; std::string const& get_identifier() const; }; - template::value>::type* = nullptr> + /* + * 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 + * that HasIdentifier is a base class of T. + */ + template::value>::type* = nullptr> class IdentifierRegistry { + const std::string name; std::vector items; bool locked = false; public: + IdentifierRegistry(std::string const& new_name) : name(new_name) {} return_t add_item(T&& item) { if (locked) { Logger::error("Cannot add item to the ", name, " registry - locked!"); return FAILURE; } - if (item.get_identifier().empty()) { - Logger::error("Cannot add item to the ", name, " registry - empty identifier!"); - return FAILURE; - } T const* old_item = get_item_by_identifier(item.get_identifier()); if (old_item != nullptr) { Logger::error("Cannot add item to the ", name, " registry - an item with the identifier \"", item.get_identifier(), "\" already exists!"); return FAILURE; } - items.push_back(item); + items.push_back(std::move(item)); return SUCCESS; } - void lock() { + void lock(bool log = true) { if (locked) { Logger::error("Failed to lock ", name, " registry - already locked!"); } else { locked = true; - Logger::info("Locked ", name, " registry after registering ", get_item_count(), " items"); + if (log) Logger::info("Locked ", name, " registry after registering ", get_item_count(), " items"); } } bool is_locked() const { return locked; } + void reset() { + items.clear(); + locked = false; + } size_t get_item_count() const { return items.size(); } diff --git a/extension/src/openvic2/map/Building.cpp b/extension/src/openvic2/map/Building.cpp index 3643b4e..00e121b 100644 --- a/extension/src/openvic2/map/Building.cpp +++ b/extension/src/openvic2/map/Building.cpp @@ -3,6 +3,7 @@ #include #include "openvic2/Logger.hpp" +#include "openvic2/map/Province.hpp" using namespace OpenVic2; @@ -87,9 +88,13 @@ Timespan BuildingType::get_build_time() const { return build_time; } -const char BuildingManager::building_types_name[] = "building types"; +BuildingManager::BuildingManager() : building_types{ "building types" } {} return_t BuildingManager::add_building_type(std::string const& identifier, Building::level_t max_level, Timespan build_time) { + if (identifier.empty()) { + Logger::error("Invalid building type identifier - empty!"); + return FAILURE; + } if (max_level < 0) { Logger::error("Invalid building type max level: ", max_level); return FAILURE; @@ -109,7 +114,11 @@ BuildingType const* BuildingManager::get_building_type_by_identifier(std::string return building_types.get_item_by_identifier(identifier); } -void BuildingManager::generate_province_buildings(std::vector& buildings) const { +return_t BuildingManager::generate_province_buildings(Province& province) const { + return_t ret = SUCCESS; + province.reset_buildings(); for (BuildingType const& type : building_types.get_items()) - buildings.push_back(Building{ type }); + if (province.add_building(type) != SUCCESS) ret = FAILURE; + province.lock_buildings(); + return ret; } diff --git a/extension/src/openvic2/map/Building.hpp b/extension/src/openvic2/map/Building.hpp index 08ede3a..1305014 100644 --- a/extension/src/openvic2/map/Building.hpp +++ b/extension/src/openvic2/map/Building.hpp @@ -6,7 +6,7 @@ #include "openvic2/Date.hpp" namespace OpenVic2 { - struct BuildingManager; + struct Province; struct BuildingType; /* REQUIREMENTS: @@ -15,7 +15,7 @@ namespace OpenVic2 { * MAP-13, MAP-78, MAP-79 */ struct Building : HasIdentifier { - friend struct BuildingManager; + friend struct Province; using level_t = int8_t; @@ -31,6 +31,8 @@ namespace OpenVic2 { bool _can_expand() const; public: + Building(Building&&) = default; + BuildingType const& get_type() const; level_t get_level() const; ExpansionState get_expansion_state() const; @@ -43,26 +45,31 @@ namespace OpenVic2 { void tick(Date const& today); }; + struct BuildingManager; + struct BuildingType : HasIdentifier { friend struct BuildingManager; private: - Building::level_t max_level; - Timespan build_time; + const Building::level_t max_level; + const Timespan build_time; BuildingType(std::string const& new_identifier, Building::level_t new_max_level, Timespan new_build_time); public: + BuildingType(BuildingType&&) = default; + Building::level_t get_max_level() const; Timespan get_build_time() const; }; struct BuildingManager { private: - static const char building_types_name[]; - IdentifierRegistry building_types; + IdentifierRegistry building_types; public: + BuildingManager(); + return_t add_building_type(std::string const& identifier, Building::level_t max_level, Timespan build_time); void lock_building_types(); BuildingType const* get_building_type_by_identifier(std::string const& identifier) const; - void generate_province_buildings(std::vector& buildings) const; + return_t generate_province_buildings(Province& province) const; }; } diff --git a/extension/src/openvic2/map/Map.cpp b/extension/src/openvic2/map/Map.cpp index a440f67..b5cf144 100644 --- a/extension/src/openvic2/map/Map.cpp +++ b/extension/src/openvic2/map/Map.cpp @@ -20,13 +20,17 @@ Province::colour_t Mapmode::get_colour(Map const& map, Province const& province) return colour_func ? colour_func(map, province) : Province::NULL_COLOUR; } -const char Map::provinces_name[] = "provinces", Map::regions_name[] = "regions", Map::mapmodes_name[] = "mapmodes"; +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 FAILURE; } + if (identifier.empty()) { + Logger::error("Invalid province identifier - empty!"); + return FAILURE; + } if (colour == Province::NULL_COLOUR || colour > Province::MAX_COLOUR) { Logger::error("Invalid province colour: ", Province::colour_to_hex_string(colour)); return FAILURE; @@ -69,8 +73,12 @@ void Map::lock_water_provinces() { } return_t Map::add_region(std::string const& identifier, std::vector const& province_identifiers) { - return_t ret = SUCCESS; + if (identifier.empty()) { + Logger::error("Invalid region identifier - empty!"); + return FAILURE; + } Region new_region{ identifier }; + return_t ret = SUCCESS; for (std::string const& province_identifier : province_identifiers) { Province* province = get_province_by_identifier(province_identifier); if (province != nullptr) { @@ -246,6 +254,10 @@ std::vector const& Map::get_province_index_image() const { } return_t Map::add_mapmode(std::string const& identifier, Mapmode::colour_func_t colour_func) { + if (identifier.empty()) { + Logger::error("Invalid mapmode identifier - empty!"); + return FAILURE; + } if (colour_func == nullptr) { Logger::error("Mapmode colour function is null for identifier: ", identifier); return FAILURE; @@ -290,9 +302,11 @@ return_t Map::generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) return SUCCESS; } -void Map::generate_province_buildings(BuildingManager const& manager) { +return_t Map::generate_province_buildings(BuildingManager const& manager) { + return_t ret = SUCCESS; for (Province& province : provinces.get_items()) - manager.generate_province_buildings(province.buildings.get_items()); + if (manager.generate_province_buildings(province) != SUCCESS) ret = FAILURE; + return ret; } void Map::update_state(Date const& today) { diff --git a/extension/src/openvic2/map/Map.hpp b/extension/src/openvic2/map/Map.hpp index ed63912..ebc23be 100644 --- a/extension/src/openvic2/map/Map.hpp +++ b/extension/src/openvic2/map/Map.hpp @@ -12,8 +12,8 @@ namespace OpenVic2 { using colour_func_t = std::function; using index_t = size_t; private: - index_t index; - colour_func_t colour_func; + const index_t index; + const colour_func_t colour_func; Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func); public: @@ -26,16 +26,17 @@ namespace OpenVic2 { */ struct Map { private: - static const char provinces_name[], regions_name[], mapmodes_name[]; - IdentifierRegistry provinces; - IdentifierRegistry regions; - IdentifierRegistry mapmodes; + IdentifierRegistry provinces; + IdentifierRegistry regions; + IdentifierRegistry mapmodes; bool water_provinces_locked = false; size_t water_province_count = 0; size_t width = 0, height = 0; std::vector province_index_image; public: + Map(); + return_t add_province(std::string const& identifier, Province::colour_t colour); void lock_provinces(); return_t set_water_province(std::string const& identifier); @@ -67,7 +68,7 @@ namespace OpenVic2 { Mapmode const* get_mapmode_by_identifier(std::string const& identifier) const; return_t generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) const; - void generate_province_buildings(BuildingManager const& manager); + return_t generate_province_buildings(BuildingManager const& manager); void update_state(Date const& today); void tick(Date const& today); diff --git a/extension/src/openvic2/map/Province.cpp b/extension/src/openvic2/map/Province.cpp index 08711af..4360bce 100644 --- a/extension/src/openvic2/map/Province.cpp +++ b/extension/src/openvic2/map/Province.cpp @@ -6,10 +6,8 @@ using namespace OpenVic2; -const char Province::buildings_name[] = "buildings"; - Province::Province(index_t new_index, std::string const& new_identifier, colour_t new_colour) : - HasIdentifier{ new_identifier }, index{ new_index }, colour{ new_colour } { + HasIdentifier{ new_identifier }, index{ new_index }, colour{ new_colour }, buildings{ "buildings" } { assert(index != NULL_INDEX); assert(colour != NULL_COLOUR); } @@ -40,6 +38,18 @@ Province::life_rating_t Province::get_life_rating() const { return life_rating; } +return_t Province::add_building(BuildingType const& type) { + return buildings.add_item({ type }); +} + +void Province::lock_buildings() { + buildings.lock(false); +} + +void Province::reset_buildings() { + buildings.reset(); +} + std::vector const& Province::get_buildings() const { return buildings.get_items(); } diff --git a/extension/src/openvic2/map/Province.hpp b/extension/src/openvic2/map/Province.hpp index 0b7cd4c..aa0329c 100644 --- a/extension/src/openvic2/map/Province.hpp +++ b/extension/src/openvic2/map/Province.hpp @@ -19,23 +19,27 @@ namespace OpenVic2 { static constexpr colour_t NULL_COLOUR = 0, MAX_COLOUR = 0xFFFFFF; static constexpr index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF; private: - index_t index; - colour_t colour; + const index_t index; + const colour_t colour; Region* region = nullptr; bool water = false; life_rating_t life_rating = 0; - static const char buildings_name[]; - IdentifierRegistry buildings; + IdentifierRegistry buildings; 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; + return_t add_building(BuildingType const& type); + void lock_buildings(); + void reset_buildings(); std::vector const& get_buildings() const; return_t expand_building(std::string const& building_type_identifier); std::string to_string() const; diff --git a/extension/src/openvic2/map/Region.hpp b/extension/src/openvic2/map/Region.hpp index 2eec1cd..04564fc 100644 --- a/extension/src/openvic2/map/Region.hpp +++ b/extension/src/openvic2/map/Region.hpp @@ -23,6 +23,8 @@ namespace OpenVic2 { private: Region(std::string const& new_identifier); public: + Region(Region&&) = default; + Province::colour_t get_colour() const; }; } diff --git a/game/src/Autoload/Events.gd b/game/src/Autoload/Events.gd index 0ee2eff..7540d3e 100644 --- a/game/src/Autoload/Events.gd +++ b/game/src/Autoload/Events.gd @@ -19,4 +19,3 @@ func _ready(): push_error("Failed to load regions") if GameSingleton.load_province_shape_file(_province_shape_file) != OK: push_error("Failed to load province shapes") - GameSingleton.finished_loading_data() diff --git a/game/src/GameSession/GameSession.gd b/game/src/GameSession/GameSession.gd index 2761815..556b98e 100644 --- a/game/src/GameSession/GameSession.gd +++ b/game/src/GameSession/GameSession.gd @@ -4,6 +4,8 @@ extends Control func _ready(): Events.Options.load_settings_from_file() + if GameSingleton.setup() != OK: + push_error("Failed to setup game") func _process(delta : float): GameSingleton.try_tick() diff --git a/game/src/GameSession/GameSessionMenu.gd b/game/src/GameSession/GameSessionMenu.gd index 70a1630..6f373d7 100644 --- a/game/src/GameSession/GameSessionMenu.gd +++ b/game/src/GameSession/GameSessionMenu.gd @@ -45,7 +45,6 @@ func show_save_dialog_button() -> void: # * SS-47 # * UIFUN-69 func _on_main_menu_confirmed() -> void: - # TODO - reset map when going back to main menu get_tree().change_scene_to_packed(_main_menu_scene) # REQUIREMENTS: -- cgit v1.2.3-56-ga3b1