diff options
37 files changed, 720 insertions, 135 deletions
diff --git a/.clang-format b/.clang-format index 8f3b82a..62a949f 100644 --- a/.clang-format +++ b/.clang-format @@ -1,13 +1,16 @@ --- +Language: Cpp UseCRLF: false Standard: c++20 UseTab: Always TabWidth: 4 -SpacesInParentheses: false +IndentWidth: 4 +ColumnLimit: 0 SpacesInSquareBrackets: false +SpacesInParentheses: false +SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInConditionalStatement: false -SpacesInCStyleCastParentheses: false SpacesInAngles: false SpaceInEmptyParentheses: false SpaceInEmptyBlock: false @@ -21,15 +24,36 @@ SpaceBeforeAssignmentOperators: true SpaceAfterTemplateKeyword: false SpaceAfterLogicalNot: false PointerAlignment: Left +PackConstructorInitializers: CurrentLine NamespaceIndentation: All -IndentWidth: 4 -Language: Cpp +LambdaBodyIndentation: Signature +IndentExternBlock: Indent IndentCaseLabels: true +IndentAccessModifiers: false +IncludeBlocks: Regroup FixNamespaceComments: false +EmptyLineBeforeAccessModifier: LogicalBlock Cpp11BracedListStyle: false -ColumnLimit: 0 CompactNamespaces: false +BreakConstructorInitializers: BeforeColon BreakBeforeBraces: Attach AlwaysBreakTemplateDeclarations: Yes +AllowShortLambdasOnASingleLine: All +AllowShortIfStatementsOnASingleLine: AllIfsAndElse +AllowShortEnumsOnASingleLine: true +AllowShortCaseLabelsOnASingleLine: true AlignTrailingComments: true AlignEscapedNewlines: Left +AlignAfterOpenBracket: DontAlign +AccessModifierOffset: -4 +IncludeCategories: + - Regex: <[[:alnum:]_]+> + Priority: 1 + - Regex: <[[:alnum:]_]+[.]h> + Priority: 2 + - Regex: ^<godot_cpp/ + Priority: 3 + - Regex: ^"openvic2/ + Priority: 4 + - Regex: .* + Priority: 5 diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..7d999da --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = tab +insert_final_newline = true + +[*.{cpp,hpp,c,h,mm}] +trim_trailing_whitespace = true +indent_size = 4
\ No newline at end of file diff --git a/extension/src/Checksum.hpp b/extension/src/Checksum.hpp index 717910e..a0b1504 100644 --- a/extension/src/Checksum.hpp +++ b/extension/src/Checksum.hpp @@ -6,7 +6,7 @@ namespace OpenVic2 { class Checksum : public godot::Object { GDCLASS(Checksum, godot::Object) - //BEGIN BOILERPLATE + // BEGIN BOILERPLATE inline static Checksum* _checksum = nullptr; protected: @@ -25,7 +25,7 @@ namespace OpenVic2 { ERR_FAIL_COND(_checksum != this); _checksum = nullptr; } - //END BOILERPLATE + // END BOILERPLATE inline godot::String get_checksum_text() { return godot::String("1234abcd"); diff --git a/extension/src/GameSingleton.cpp b/extension/src/GameSingleton.cpp index 3476ac5..56f7ac5 100644 --- a/extension/src/GameSingleton.cpp +++ b/extension/src/GameSingleton.cpp @@ -1,8 +1,8 @@ #include "GameSingleton.hpp" -#include <godot_cpp/variant/utility_functions.hpp> #include <godot_cpp/classes/file_access.hpp> #include <godot_cpp/classes/json.hpp> +#include <godot_cpp/variant/utility_functions.hpp> #include "openvic2/Logger.hpp" @@ -58,7 +58,8 @@ GameSingleton* GameSingleton::get_singleton() { /* REQUIREMENTS: * MAP-21, MAP-25 */ -GameSingleton::GameSingleton() : game_manager{ [this]() { emit_signal("state_updated"); } }, terrain_variants{ "terrain variants" } { +GameSingleton::GameSingleton() : game_manager { [this]() { emit_signal("state_updated"); } }, + terrain_variants { "terrain variants" } { ERR_FAIL_COND(singleton != nullptr); singleton = this; @@ -69,21 +70,25 @@ GameSingleton::GameSingleton() : game_manager{ [this]() { emit_signal("state_upd static constexpr colour_t LOW_ALPHA_VALUE = to_alpha_value(0.2f); using mapmode_t = std::pair<std::string, Mapmode::colour_func_t>; const std::vector<mapmode_t> mapmodes = { - { "mapmode_terrain", [](Map const&, Province const& province) -> colour_t { - return LOW_ALPHA_VALUE | (province.is_water() ? 0x4287F5 : 0x0D7017); - } }, - { "mapmode_province", [](Map const&, Province const& province) -> colour_t { - return HIGH_ALPHA_VALUE | province.get_colour(); - } }, - { "mapmode_region", [](Map const&, Province const& province) -> colour_t { - Region const* region = province.get_region(); - if (region != nullptr) return (0xCC << 24) | region->get_colour(); - return NULL_COLOUR; - } }, - { "mapmode_index", [](Map const& map, Province const& province) -> colour_t { - const uint8_t f = static_cast<float>(province.get_index()) / static_cast<float>(map.get_province_count()) * 255.0f; - return HIGH_ALPHA_VALUE | (f << 16) | (f << 8) | f; - } } + { "mapmode_terrain", + [](Map const&, Province const& province) -> colour_t { + return LOW_ALPHA_VALUE | (province.is_water() ? 0x4287F5 : 0x0D7017); + } }, + { "mapmode_province", + [](Map const&, Province const& province) -> colour_t { + return HIGH_ALPHA_VALUE | province.get_colour(); + } }, + { "mapmode_region", + [](Map const&, Province const& province) -> colour_t { + Region const* region = province.get_region(); + if (region != nullptr) return (0xCC << 24) | region->get_colour(); + return NULL_COLOUR; + } }, + { "mapmode_index", + [](Map const& map, Province const& province) -> colour_t { + const uint8_t f = static_cast<float>(province.get_index()) / static_cast<float>(map.get_province_count()) * 255.0f; + return HIGH_ALPHA_VALUE | (f << 16) | (f << 8) | f; + } } }; for (mapmode_t const& mapmode : mapmodes) game_manager.map.add_mapmode(mapmode.first, mapmode.second); @@ -96,7 +101,6 @@ GameSingleton::GameSingleton() : game_manager{ [this]() { emit_signal("state_upd 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)); game_manager.building_manager.lock_building_types(); - } GameSingleton::~GameSingleton() { @@ -125,7 +129,7 @@ static Error _load_json_file(String const& file_description, String const& file_ return err; } -using parse_json_entry_func_t = std::function<godot::Error (godot::String const&, godot::Variant const&)>; +using parse_json_entry_func_t = std::function<godot::Error(godot::String const&, godot::Variant const&)>; 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) { @@ -172,8 +176,7 @@ static colour_t _parse_colour(Variant const& var) { } return colour; } - } - else if (type == Variant::STRING) { + } else if (type == Variant::STRING) { String const& colour_string = var; if (colour_string.is_valid_hex_number()) { const int64_t colour_int = colour_string.hex_to_int(); @@ -214,8 +217,7 @@ Error GameSingleton::_parse_region_entry(String const& identifier, Variant const if (type == Variant::STRING) { String const& province_string = province_var; province_identifiers.push_back(province_string.utf8().get_data()); - } - else { + } else { UtilityFunctions::push_error("Invalid province identifier for region \"", identifier, "\": ", entry); err = FAILED; } @@ -238,7 +240,9 @@ Error GameSingleton::load_region_file(String const& file_path) { } TerrainVariant::TerrainVariant(std::string const& new_identfier, colour_t new_colour, Ref<Image> const& new_image) - : HasIdentifier(new_identfier), HasColour(new_colour), image(new_image) {} + : HasIdentifier(new_identfier), + HasColour(new_colour), + image(new_image) {} Ref<Image> TerrainVariant::get_image() const { return image; } @@ -329,12 +333,14 @@ Error GameSingleton::load_map_images(String const& province_image_path, String c // Generate interleaved province and terrain ID image if (game_manager.map.generate_province_shape_image(province_dims.x, province_dims.y, province_image->get_data().ptr(), - terrain_image->get_data().ptr(), terrain_variant_map) != SUCCESS) return FAILED; + terrain_image->get_data().ptr(), terrain_variant_map) != SUCCESS) return FAILED; static constexpr int32_t GPU_DIM_LIMIT = 0x3FFF; // For each dimension of the image, this finds the small number of equal subdivisions required get the individual texture dims under GPU_DIM_LIMIT - for (int i = 0; i < 2; ++i) for (image_subdivisions[i] = 1; - province_dims[i] / image_subdivisions[i] > GPU_DIM_LIMIT || province_dims[i] % image_subdivisions[i] != 0; ++image_subdivisions[i]); + for (int i = 0; i < 2; ++i) + for (image_subdivisions[i] = 1; + province_dims[i] / image_subdivisions[i] > GPU_DIM_LIMIT || province_dims[i] % image_subdivisions[i] != 0; ++image_subdivisions[i]) + ; Map::shape_pixel_t const* province_shape_data = game_manager.map.get_province_shape_image().data(); const Vector2i divided_dims = province_dims / image_subdivisions; @@ -383,8 +389,7 @@ Error GameSingleton::load_water_province_file(String const& file_path) { UtilityFunctions::push_error("Invalid water province JSON: root has type ", Variant::get_type_name(type), " (expected Array)"); err = FAILED; - } - else { + } else { Array const& array = json_var; for (int64_t idx = 0; idx < array.size(); ++idx) { Variant const& entry = array[idx]; @@ -409,11 +414,14 @@ int32_t GameSingleton::get_province_index_from_uv_coords(Vector2 const& coords) return game_manager.map.get_province_index_at(x_mod_w, y_mod_h); } -#define KEY(x) static const StringName x##_key = #x; +#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) + KEY(province); + KEY(region); + KEY(life_rating); + KEY(buildings); Dictionary ret; ret[province_key] = province->get_identifier().c_str(); @@ -428,7 +436,12 @@ Dictionary GameSingleton::get_province_info_from_index(int32_t index) const { 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) + KEY(building); + KEY(level); + KEY(expansion_state); + KEY(start_date); + KEY(end_date); + KEY(expansion_progress); Dictionary building_dict; Building const& building = buildings[idx]; @@ -507,7 +520,7 @@ int32_t GameSingleton::get_mapmode_count() const { 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{}; + return String {}; } Error GameSingleton::set_mapmode(godot::String const& identifier) { diff --git a/extension/src/GameSingleton.hpp b/extension/src/GameSingleton.hpp index 80b2d95..21ca2d1 100644 --- a/extension/src/GameSingleton.hpp +++ b/extension/src/GameSingleton.hpp @@ -9,6 +9,7 @@ namespace OpenVic2 { struct TerrainVariant : HasIdentifier, HasColour { private: const godot::Ref<godot::Image> image; + public: TerrainVariant(std::string const& new_identfier, colour_t new_colour, godot::Ref<godot::Image> const& new_image); @@ -36,6 +37,7 @@ namespace OpenVic2 { godot::Error _parse_region_entry(godot::String const& identifier, godot::Variant const& entry); godot::Error _parse_terrain_entry(godot::String const& identifier, godot::Variant const& entry); void _tick(); + protected: static void _bind_methods(); diff --git a/extension/src/LoadLocalisation.cpp b/extension/src/LoadLocalisation.cpp index 8698bb2..789a476 100644 --- a/extension/src/LoadLocalisation.cpp +++ b/extension/src/LoadLocalisation.cpp @@ -1,9 +1,9 @@ #include "LoadLocalisation.hpp" -#include <godot_cpp/variant/utility_functions.hpp> -#include <godot_cpp/classes/file_access.hpp> #include <godot_cpp/classes/dir_access.hpp> +#include <godot_cpp/classes/file_access.hpp> #include <godot_cpp/classes/translation_server.hpp> +#include <godot_cpp/variant/utility_functions.hpp> using namespace godot; using namespace OpenVic2; diff --git a/extension/src/MapMesh.cpp b/extension/src/MapMesh.cpp index 6d94973..84149b9 100644 --- a/extension/src/MapMesh.cpp +++ b/extension/src/MapMesh.cpp @@ -69,8 +69,8 @@ int32_t MapMesh::get_subdivide_depth() const { } AABB MapMesh::get_core_aabb() const { - const Vector3 size{ aspect_ratio, 0.0f, 1.0f }; - return AABB{ size * -0.5f, size }; + const Vector3 size { aspect_ratio, 0.0f, 1.0f }; + return AABB { size * -0.5f, size }; } bool MapMesh::is_valid_uv_coord(godot::Vector2 const& uv) const { @@ -96,15 +96,15 @@ Array MapMesh::_create_mesh_array() const { uvs.resize(vertex_count); indices.resize(indice_count); - static const Vector3 normal{ 0.0f, 1.0f, 0.0f }; - const Size2 uv_size{ 1.0f + 2.0f * repeat_proportion, 1.0f }; - const Size2 size{ aspect_ratio * uv_size.x, uv_size.y }, start_pos = size * -0.5f; + static const Vector3 normal { 0.0f, 1.0f, 0.0f }; + const Size2 uv_size { 1.0f + 2.0f * repeat_proportion, 1.0f }; + const Size2 size { aspect_ratio * uv_size.x, uv_size.y }, start_pos = size * -0.5f; int32_t point_index = 0, thisrow = 0, prevrow = 0, indice_index = 0; - Vector2 subdivide_step{ 1.0f / (subdivide_w + 1.0f) , 1.0f / (subdivide_d + 1.0f) }; - Vector3 point{ 0.0f, 0.0f, start_pos.y }; + Vector2 subdivide_step { 1.0f / (subdivide_w + 1.0f), 1.0f / (subdivide_d + 1.0f) }; + Vector3 point { 0.0f, 0.0f, start_pos.y }; Vector2 point_step = subdivide_step * size; - Vector2 uv{}, uv_step = subdivide_step * uv_size; + Vector2 uv {}, uv_step = subdivide_step * uv_size; for (int32_t j = 0; j <= subdivide_d + 1; ++j) { point.x = start_pos.x; diff --git a/extension/src/openvic2/Date.cpp b/extension/src/openvic2/Date.cpp index ed800d5..11e4b36 100644 --- a/extension/src/openvic2/Date.cpp +++ b/extension/src/openvic2/Date.cpp @@ -1,13 +1,13 @@ #include "Date.hpp" -#include <cctype> #include <algorithm> +#include <cctype> #include "Logger.hpp" using namespace OpenVic2; -Timespan::Timespan(day_t value) : days{value} {} +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; }; @@ -67,14 +67,14 @@ Timespan Date::_dateToTimespan(year_t year, month_t month, day_t day) { return year * DAYS_IN_YEAR + DAYS_UP_TO_MONTH[month - 1] + day - 1; } -Date::Date(Timespan total_days) : timespan{ total_days } { +Date::Date(Timespan total_days) : timespan { total_days } { if (timespan < 0) { Logger::error("Invalid timespan for date: ", timespan, " (cannot be negative)"); timespan = 0; } } -Date::Date(year_t year, month_t month, day_t day) : timespan{ _dateToTimespan(year, month, day) } {} +Date::Date(year_t year, month_t month, day_t day) : timespan { _dateToTimespan(year, month, day) } {} Date::year_t Date::getYear() const { return static_cast<Timespan::day_t>(timespan) / DAYS_IN_YEAR; @@ -89,7 +89,6 @@ Date::day_t Date::getDay() const { return days_in_year - DAYS_UP_TO_MONTH[days_in_year / 32] + 1; } - 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; }; @@ -129,7 +128,7 @@ Date::operator std::string() const { } std::ostream& OpenVic2::operator<<(std::ostream& out, Date date) { - return out << (int) date.getYear() << '.' << (int) date.getMonth() << '.' << (int) date.getDay(); + return out << (int)date.getYear() << '.' << (int)date.getMonth() << '.' << (int)date.getDay(); } // Parsed from string of the form YYYY.MM.DD @@ -139,17 +138,20 @@ Date Date::from_string(std::string const& date) { day_t day = 1; size_t first_pos = 0; - while (first_pos < date.length() && std::isdigit(date[first_pos++])); + 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++])); + 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++])); + 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); diff --git a/extension/src/openvic2/Date.hpp b/extension/src/openvic2/Date.hpp index b19602b..b7b45a3 100644 --- a/extension/src/openvic2/Date.hpp +++ b/extension/src/openvic2/Date.hpp @@ -1,15 +1,17 @@ #pragma once #include <cstdint> -#include <string> #include <ostream> +#include <string> namespace OpenVic2 { // A relative period between points in time, measured in days struct Timespan { using day_t = int64_t; + private: day_t days; + public: Timespan(day_t value = 0); @@ -33,7 +35,7 @@ namespace OpenVic2 { explicit operator double() const; explicit operator std::string() const; }; - std::ostream& operator<< (std::ostream& out, Timespan timespan); + std::ostream& operator<<(std::ostream& out, Timespan timespan); // Represents an in-game date // Note: Current implementation does not account for leap-years, or dates before Year 0 @@ -46,11 +48,13 @@ namespace OpenVic2 { 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); @@ -79,5 +83,5 @@ namespace OpenVic2 { // 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); + std::ostream& operator<<(std::ostream& out, Date date); } diff --git a/extension/src/openvic2/GameAdvancementHook.cpp b/extension/src/openvic2/GameAdvancementHook.cpp index d90b7b1..a68f55c 100644 --- a/extension/src/openvic2/GameAdvancementHook.cpp +++ b/extension/src/openvic2/GameAdvancementHook.cpp @@ -3,15 +3,18 @@ using namespace OpenVic2; const std::vector<std::chrono::milliseconds> 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 } }; + std::chrono::milliseconds { 4000 }, + std::chrono::milliseconds { 3000 }, + std::chrono::milliseconds { 2000 }, + std::chrono::milliseconds { 1000 }, + std::chrono::milliseconds { 100 }, + std::chrono::milliseconds { 1 } +}; GameAdvancementHook::GameAdvancementHook(AdvancementFunction tickFunction, RefreshFunction updateFunction, bool startPaused, speed_t startingSpeed) - : triggerFunction{ tickFunction }, refreshFunction{ updateFunction }, isPaused{ startPaused } { + : triggerFunction { tickFunction }, + refreshFunction { updateFunction }, + isPaused { startPaused } { lastPolledTime = std::chrono::high_resolution_clock::now(); setSimulationSpeed(startingSpeed); } diff --git a/extension/src/openvic2/GameAdvancementHook.hpp b/extension/src/openvic2/GameAdvancementHook.hpp index 07f8414..1fe7737 100644 --- a/extension/src/openvic2/GameAdvancementHook.hpp +++ b/extension/src/openvic2/GameAdvancementHook.hpp @@ -5,25 +5,25 @@ #include <vector> namespace OpenVic2 { - //Conditionally advances game with provided behaviour - //Class governs game speed and pause state + // Conditionally advances game with provided behaviour + // Class governs game speed and pause state class GameAdvancementHook { - public: + public: using AdvancementFunction = std::function<void()>; using RefreshFunction = std::function<void()>; using speed_t = int8_t; - //Minimum number of miliseconds before the simulation advances + // Minimum number of miliseconds before the simulation advances static const std::vector<std::chrono::milliseconds> GAME_SPEEDS; - private: + private: std::chrono::time_point<std::chrono::high_resolution_clock> lastPolledTime; - //A function pointer that advances the simulation, intended to be a capturing lambda or something similar. May need to be reworked later + // 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: + public: bool isPaused; GameAdvancementHook(AdvancementFunction tickFunction, RefreshFunction updateFunction, bool startPaused = true, speed_t startingSpeed = 0); diff --git a/extension/src/openvic2/GameManager.cpp b/extension/src/openvic2/GameManager.cpp index 58e40bb..036e610 100644 --- a/extension/src/openvic2/GameManager.cpp +++ b/extension/src/openvic2/GameManager.cpp @@ -5,7 +5,8 @@ using namespace OpenVic2; GameManager::GameManager(state_updated_func_t state_updated_callback) - : clock{ [this]() { tick(); }, [this]() { update_state(); } }, state_updated{ state_updated_callback } {} + : clock { [this]() { tick(); }, [this]() { update_state(); } }, + state_updated { state_updated_callback } {} void GameManager::set_needs_update() { needs_update = true; diff --git a/extension/src/openvic2/GameManager.hpp b/extension/src/openvic2/GameManager.hpp index 70e98bd..32183e3 100644 --- a/extension/src/openvic2/GameManager.hpp +++ b/extension/src/openvic2/GameManager.hpp @@ -10,6 +10,7 @@ namespace OpenVic2 { Map map; BuildingManager building_manager; GameAdvancementHook clock; + private: Date today; state_updated_func_t state_updated; @@ -18,6 +19,7 @@ namespace OpenVic2 { void set_needs_update(); void update_state(); void tick(); + public: GameManager(state_updated_func_t state_updated_callback); diff --git a/extension/src/openvic2/Good.hpp b/extension/src/openvic2/Good.hpp index 378bbc4..1e2bd5e 100644 --- a/extension/src/openvic2/Good.hpp +++ b/extension/src/openvic2/Good.hpp @@ -4,18 +4,23 @@ namespace OpenVic2 { class Good : HasIdentifier { - public: - std::string category; - price_t cost; - std::string colour; - bool isAvailable; - bool isTradable; - bool isMoney; - bool hasOverseasPenalty; + public: + std::string category; + price_t cost; + std::string colour; + bool isAvailable; + bool isTradable; + bool isMoney; + bool hasOverseasPenalty; - Good(Good&&) = default; - Good(std::string const& identifier,std::string const& category, price_t cost, std::string const& colour, - bool isAvailable, bool isTradable, bool isMoney, bool hasOverseasPenalty) : HasIdentifier(identifier), - category(category), cost(cost), colour(colour), isAvailable(isAvailable), isMoney(isMoney), hasOverseasPenalty(hasOverseasPenalty) {}; + Good(Good&&) = default; + Good(std::string const& identifier, std::string const& category, price_t cost, std::string const& colour, + bool isAvailable, bool isTradable, bool isMoney, bool hasOverseasPenalty) : HasIdentifier(identifier), + category(category), + cost(cost), + colour(colour), + isAvailable(isAvailable), + isMoney(isMoney), + hasOverseasPenalty(hasOverseasPenalty) {}; }; } diff --git a/extension/src/openvic2/Logger.hpp b/extension/src/openvic2/Logger.hpp index 624df29..d097cc6 100644 --- a/extension/src/openvic2/Logger.hpp +++ b/extension/src/openvic2/Logger.hpp @@ -8,76 +8,80 @@ namespace OpenVic2 { - #ifndef __cpp_lib_source_location - #include <string> - //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 +#ifndef __cpp_lib_source_location +#include <string> + // 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) {} + 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 char const* file_name() const { return _file.c_str(); } - inline int line() const {return _line; } + inline int line() const { return _line; } inline char const* function_name() const { return _function.c_str(); } }; - #endif +#endif class Logger { using log_func_t = std::function<void(std::string&&)>; - #ifdef __cpp_lib_source_location +#ifdef __cpp_lib_source_location using source_location = std::source_location; - #else +#else using source_location = OpenVic2::source_location; - #endif +#endif static log_func_t info_func, error_func; static char const* get_filename(char const* filepath); - template <typename... Ts> + template<typename... Ts> 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::endl + << get_filename(location.file_name()) << "(" << location.line() << ") `" << location.function_name() << "`: "; ((stream << std::forward<Ts>(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 <typename... Ts> + template<typename... Ts> struct info { info(Ts&&... ts, const source_location& location = source_location::current()) { - log<Ts...>{ info_func, std::forward<Ts>(ts)..., location }; + log<Ts...> { info_func, std::forward<Ts>(ts)..., location }; } }; - template <typename... Ts> + template<typename... Ts> info(Ts&&...) -> info<Ts...>; - template <typename... Ts> + template<typename... Ts> struct error { error(Ts&&... ts, const source_location& location = source_location::current()) { - log<Ts...>{ error_func, std::forward<Ts>(ts)..., location }; + log<Ts...> { error_func, std::forward<Ts>(ts)..., location }; } }; - template <typename... Ts> + template<typename... Ts> error(Ts&&...) -> error<Ts...>; }; } diff --git a/extension/src/openvic2/Types.cpp b/extension/src/openvic2/Types.cpp index f51ad7c..58fee7b 100644 --- a/extension/src/openvic2/Types.cpp +++ b/extension/src/openvic2/Types.cpp @@ -1,12 +1,12 @@ #include "Types.hpp" #include <cassert> -#include <sstream> #include <iomanip> +#include <sstream> 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 e4a0e2d..a01bae4 100644 --- a/extension/src/openvic2/Types.hpp +++ b/extension/src/openvic2/Types.hpp @@ -1,9 +1,9 @@ #pragma once -#include <vector> -#include <cstdint> #include <algorithm> +#include <cstdint> #include <map> +#include <vector> #include "Logger.hpp" @@ -37,8 +37,10 @@ namespace OpenVic2 { */ class HasIdentifier { const std::string identifier; + protected: HasIdentifier(std::string const& new_identifier); + public: HasIdentifier(HasIdentifier const&) = delete; HasIdentifier(HasIdentifier&&) = default; @@ -53,8 +55,10 @@ namespace OpenVic2 { */ class HasColour { const colour_t colour; + protected: HasColour(colour_t const new_colour); + public: HasColour(HasColour const&) = delete; HasColour(HasColour&&) = default; @@ -80,6 +84,7 @@ namespace OpenVic2 { std::vector<T> items; bool locked = false; identifier_index_map_t identifier_index_map; + public: IdentifierRegistry(std::string const& new_name) : name(new_name) {} return_t add_item(T&& item) { diff --git a/extension/src/openvic2/map/Building.cpp b/extension/src/openvic2/map/Building.cpp index 1e26873..a2694b9 100644 --- a/extension/src/openvic2/map/Building.cpp +++ b/extension/src/openvic2/map/Building.cpp @@ -7,7 +7,8 @@ using namespace OpenVic2; -Building::Building(BuildingType const& new_type) : HasIdentifier{ new_type.get_identifier() }, type{ new_type } {} +Building::Building(BuildingType const& new_type) : HasIdentifier { new_type.get_identifier() }, + type { new_type } {} bool Building::_can_expand() const { return level < type.get_max_level(); @@ -74,8 +75,9 @@ void Building::tick(Date const& today) { } } -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 } { +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); } @@ -88,7 +90,7 @@ Timespan BuildingType::get_build_time() const { return build_time; } -BuildingManager::BuildingManager() : building_types{ "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()) { diff --git a/extension/src/openvic2/map/Building.hpp b/extension/src/openvic2/map/Building.hpp index 78d08ae..492cbc6 100644 --- a/extension/src/openvic2/map/Building.hpp +++ b/extension/src/openvic2/map/Building.hpp @@ -2,8 +2,8 @@ #include <vector> -#include "../Types.hpp" #include "../Date.hpp" +#include "../Types.hpp" namespace OpenVic2 { struct Province; @@ -19,7 +19,13 @@ namespace OpenVic2 { using level_t = int8_t; - enum class ExpansionState { CannotExpand, CanExpand, Preparing, Expanding }; + enum class ExpansionState { + CannotExpand, + CanExpand, + Preparing, + Expanding + }; + private: BuildingType const& type; level_t level = 0; @@ -30,6 +36,7 @@ namespace OpenVic2 { Building(BuildingType const& new_type); bool _can_expand() const; + public: Building(Building&&) = default; @@ -49,11 +56,13 @@ namespace OpenVic2 { struct BuildingType : HasIdentifier { friend struct BuildingManager; + private: 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; @@ -64,6 +73,7 @@ namespace OpenVic2 { struct BuildingManager { private: IdentifierRegistry<BuildingType> building_types; + public: BuildingManager(); diff --git a/extension/src/openvic2/map/Map.cpp b/extension/src/openvic2/map/Map.cpp index 1f44c43..f920ccc 100644 --- a/extension/src/openvic2/map/Map.cpp +++ b/extension/src/openvic2/map/Map.cpp @@ -8,7 +8,9 @@ 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 } { + : HasIdentifier { new_identifier }, + index { new_index }, + colour_func { new_colour_func } { assert(colour_func != nullptr); } @@ -20,7 +22,9 @@ colour_t Mapmode::get_colour(Map const& map, Province const& province) const { return colour_func ? colour_func(map, province) : NULL_COLOUR; } -Map::Map() : provinces{ "provinces" }, regions{ "regions" }, mapmodes{ "mapmodes" } {} +Map::Map() : provinces { "provinces" }, + regions { "regions" }, + mapmodes { "mapmodes" } {} return_t Map::add_province(std::string const& identifier, colour_t colour) { if (provinces.get_item_count() >= MAX_INDEX) { @@ -35,7 +39,7 @@ return_t Map::add_province(std::string const& identifier, colour_t colour) { Logger::error("Invalid province colour: ", Province::colour_to_hex_string(colour)); return FAILURE; } - Province new_province{ static_cast<index_t>(provinces.get_item_count() + 1), identifier, colour }; + Province new_province { static_cast<index_t>(provinces.get_item_count() + 1), identifier, colour }; const index_t index = get_index_from_colour(colour); if (index != NULL_INDEX) { Logger::error("Duplicate province colours: ", get_province_by_index(index)->to_string(), " and ", new_province.to_string()); @@ -78,7 +82,7 @@ return_t Map::add_region(std::string const& identifier, std::vector<std::string> Logger::error("Invalid region identifier - empty!"); return FAILURE; } - Region new_region{ identifier }; + Region new_region { identifier }; return_t ret = SUCCESS; for (std::string const& province_identifier : province_identifiers) { Province* province = get_province_by_identifier(province_identifier); diff --git a/extension/src/openvic2/map/Map.hpp b/extension/src/openvic2/map/Map.hpp index cb8dcb1..4fc97c9 100644 --- a/extension/src/openvic2/map/Map.hpp +++ b/extension/src/openvic2/map/Map.hpp @@ -9,13 +9,15 @@ namespace OpenVic2 { struct Mapmode : HasIdentifier { friend struct Map; - using colour_func_t = std::function<colour_t (Map const&, Province const&)>; + using colour_func_t = std::function<colour_t(Map const&, Province const&)>; using index_t = size_t; + private: const index_t index; const 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_t get_colour(Map const& map, Province const& province) const; @@ -28,12 +30,12 @@ namespace OpenVic2 { using terrain_t = uint8_t; using terrain_variant_map_t = std::map<colour_t, terrain_t>; - #pragma pack(push, 1) +#pragma pack(push, 1) struct shape_pixel_t { index_t index; terrain_t terrain; }; - #pragma pack(pop) +#pragma pack(pop) private: using colour_index_map_t = std::map<colour_t, index_t>; @@ -48,6 +50,7 @@ namespace OpenVic2 { colour_index_map_t colour_index_map; index_t get_index_from_colour(colour_t colour) const; + public: Map(); diff --git a/extension/src/openvic2/map/Province.cpp b/extension/src/openvic2/map/Province.cpp index b3d455b..79f3ddd 100644 --- a/extension/src/openvic2/map/Province.cpp +++ b/extension/src/openvic2/map/Province.cpp @@ -1,13 +1,15 @@ #include "Province.hpp" #include <cassert> -#include <sstream> #include <iomanip> +#include <sstream> using namespace OpenVic2; -Province::Province(index_t new_index, std::string const& new_identifier, colour_t new_colour) : - HasIdentifier{ new_identifier }, HasColour{ new_colour }, index{ new_index }, buildings{ "buildings" } { +Province::Province(index_t new_index, std::string const& new_identifier, colour_t new_colour) : HasIdentifier { new_identifier }, + HasColour { new_colour }, + index { new_index }, + buildings { "buildings" } { assert(index != NULL_INDEX); assert(new_colour != NULL_COLOUR); } @@ -59,7 +61,6 @@ std::string Province::to_string() const { void Province::update_state(Date const& today) { for (Building& building : buildings.get_items()) building.update_state(today); - } void Province::tick(Date const& today) { diff --git a/extension/src/openvic2/map/Province.hpp b/extension/src/openvic2/map/Province.hpp index 9b07fc1..dd1742c 100644 --- a/extension/src/openvic2/map/Province.hpp +++ b/extension/src/openvic2/map/Province.hpp @@ -22,6 +22,7 @@ namespace OpenVic2 { IdentifierRegistry<Building> buildings; Province(index_t new_index, std::string const& new_identifier, colour_t new_colour); + public: Province(Province&&) = default; diff --git a/extension/src/openvic2/map/Region.cpp b/extension/src/openvic2/map/Region.cpp index da0dfdd..bd87479 100644 --- a/extension/src/openvic2/map/Region.cpp +++ b/extension/src/openvic2/map/Region.cpp @@ -16,7 +16,7 @@ std::set<Province*> const& ProvinceSet::get_provinces() const { return provinces; } -Region::Region(std::string const& new_identifier) : HasIdentifier{ new_identifier } {} +Region::Region(std::string const& new_identifier) : HasIdentifier { new_identifier } {} colour_t Region::get_colour() const { if (provinces.empty()) return 0xFF0000; diff --git a/extension/src/openvic2/map/Region.hpp b/extension/src/openvic2/map/Region.hpp index 3920dfc..8f1af70 100644 --- a/extension/src/openvic2/map/Region.hpp +++ b/extension/src/openvic2/map/Region.hpp @@ -9,6 +9,7 @@ namespace OpenVic2 { struct ProvinceSet { protected: std::set<Province*> provinces; + public: size_t get_province_count() const; bool contains_province(Province const* province) const; @@ -20,8 +21,10 @@ namespace OpenVic2 { */ struct Region : HasIdentifier, ProvinceSet { friend struct Map; + private: Region(std::string const& new_identifier); + public: Region(Region&&) = default; diff --git a/extension/src/register_types.cpp b/extension/src/register_types.cpp index b99f1a8..8ef89ec 100644 --- a/extension/src/register_types.cpp +++ b/extension/src/register_types.cpp @@ -3,8 +3,8 @@ #include <godot_cpp/classes/engine.hpp> #include "Checksum.hpp" -#include "LoadLocalisation.hpp" #include "GameSingleton.hpp" +#include "LoadLocalisation.hpp" #include "MapMesh.hpp" using namespace godot; diff --git a/game/project.godot b/game/project.godot index c10465d..a14f910 100644 --- a/game/project.godot +++ b/game/project.godot @@ -11,6 +11,7 @@ config_version=5 [application] config/name="OpenVic2" +config/description="A faithful recreation of Victoria 2: Heart of Darkness with a focus on enhancing performance, multiplayer stability, and modability for modern machines." run/main_scene="res://src/GameStart.tscn" config/features=PackedStringArray("4.0", "Forward Plus") boot_splash/bg_color=Color(0.380392, 0.145098, 0.14902, 1) diff --git a/game/src/ArgumentOption.gd b/game/src/ArgumentOption.gd new file mode 100644 index 0000000..f14cef0 --- /dev/null +++ b/game/src/ArgumentOption.gd @@ -0,0 +1,60 @@ +@tool +class_name ArgumentOption +extends Resource + +@export var name : StringName +@export var aliases : Array[StringName] = [] +@export var type : Variant.Type : + get: return type + set(v): + type = v + match v: + TYPE_BOOL: default_value = false + TYPE_INT: default_value = 0 + TYPE_FLOAT: default_value = 0.0 + TYPE_STRING: default_value = "" + TYPE_STRING_NAME: default_value = &"" + TYPE_COLOR: default_value = Color() + _: default_value = null + notify_property_list_changed() +var default_value +@export var description : String + +func _init(_name = "", _type = TYPE_NIL, _description = "", default = null): + name = _name + type = _type + if default != null and typeof(default) == type: + default_value = default + description = _description + +func add_alias(alias : StringName) -> ArgumentOption: + aliases.append(alias) + return self + +func get_type_string() -> StringName: + match type: + TYPE_NIL: return "null" + TYPE_BOOL: return "boolean" + TYPE_INT: return "integer" + TYPE_FLOAT: return "float" + TYPE_STRING, TYPE_STRING_NAME: return "string" + TYPE_COLOR: return "color" + return "<invalid type>" + +func _get(property): + if property == "default_value": return default_value + +func _set(property, value): + if property == "default_value": + default_value = value + return true + +func _get_property_list(): + var properties := [] + + properties.append({ + "name": "default_value", + "type": type + }) + + return properties diff --git a/game/src/ArgumentParser.gd b/game/src/ArgumentParser.gd new file mode 100644 index 0000000..3f77919 --- /dev/null +++ b/game/src/ArgumentParser.gd @@ -0,0 +1,259 @@ +@tool +extends Node + +const argument_setting_path := &"openvic2/data/arguments" + +@export var option_array : Array[ArgumentOption] = [ + ArgumentOption.new( + "help", + TYPE_BOOL, + "Displays help and quits.", + false + ).add_alias(&"h") +] + +const color_name_array : PackedStringArray =[ + "aliceblue", "antiquewhite", "aqua", "aquamarine", + "azure", "beige", "bisque", "black", "blanchedalmond", + "blue", "blueviolet", "brown", "burlywood", "cadetblue", + "chartreuse", "chocolate", "coral", "cornflower", "cornsilk", + "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod", + "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen", + "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", + "darkslateblue", "darkslategray", "darkturquoise", "darkviolet", + "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick", + "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite", + "gold", "goldenrod", "gray", "green", "greenyellow", "honeydew", + "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender", + "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral", + "lightcyan", "lightgoldenrod", "lightgray", "lightgreen", "lightpink", + "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", + "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta", + "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", + "mediumpurple", "mediumseagreen", "mediumslateblue", "mediumspringgreen", + "mediumturquoise", "mediumvioletred", "midnightblue", "mintcream", + "mistyrose", "moccasin", "navajowhite", "navyblue", "oldlace", "olive", + "olivedrab", "orange", "orangered", "orchid", "palegoldenrod", + "palegreen", "paleturquoise", "palevioletred", "papayawhip", + "peachpuff", "peru", "pink", "plum", "powderblue", "purple", + "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown", + "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", + "skyblue", "slateblue", "slategray", "snow", "springgreen", "steelblue", + "tan", "teal", "thistle", "tomato", "transparent", "turquoise", "violet", + "webgray", "webgreen", "webmaroon", "webpurple", "wheat", "white", + "whitesmoke", "yellow", "yellowgreen" +] + +func _parse_value(arg_name : StringName, value_string : String, type : Variant.Type) -> Variant: + match type: + TYPE_NIL: return null + TYPE_BOOL: + value_string = value_string.to_lower() + if value_string == "true" or value_string == "t" or value_string == "yes" or value_string == "y": + return true + if value_string == "false" or value_string == "f" or value_string == "no" or value_string == "n": + return false + return true + TYPE_INT: + return value_string.to_int() + TYPE_FLOAT: + return value_string.to_float() + TYPE_STRING, TYPE_STRING_NAME: + return value_string + TYPE_COLOR: + if Color.html_is_valid(value_string) or value_string.to_lower() in color_name_array: + return Color.from_string(value_string, Color()) + push_error("'%s' must be an html Color or Color name, '%s' is an invalid value." % [arg_name, value_string]) + return null + # Unsupported types + TYPE_VECTOR2, \ + TYPE_VECTOR2I, \ + TYPE_VECTOR3, \ + TYPE_VECTOR3I, \ + TYPE_VECTOR4, \ + TYPE_VECTOR4I, \ + TYPE_RECT2, \ + TYPE_RECT2I: + push_warning("Value type '%s' may not be supported." % type) + var data_array = value_string.lstrip("(").rstrip(")").split(",", false) + for index in range(data_array.size()): + data_array[index] = " " + data_array[index].strip_edges() + match type: + TYPE_VECTOR2: + if data_array.size() != 2: + push_error("'%s' value must be a Vector2, '%s' is an invalid value." % [arg_name, value_string]) + return null + return str_to_var("Vector2(%s )" % ",".join(data_array)) + TYPE_VECTOR2I: + if data_array.size() != 2: + push_error("'%s' value must be a Vector2i, '%s' is an invalid value." % [arg_name, value_string]) + return null + return str_to_var("Vector2i(%s )" % ",".join(data_array)) + TYPE_VECTOR3: + if data_array.size() != 2: + push_error("'%s' value must be a Vector3, '%s' is an invalid value." % [arg_name, value_string]) + return null + return str_to_var("Vector3(%s )" % ",".join(data_array)) + TYPE_VECTOR3I: + if data_array.size() != 2: + push_error("'%s' value must be a Vector3i, '%s' is an invalid value." % [arg_name, value_string]) + return null + return str_to_var("Vector3i(%s )" % ",".join(data_array)) + TYPE_VECTOR4: + if data_array.size() != 2: + push_error("'%s' value must be a Vector4, '%s' is an invalid value." % [arg_name, value_string]) + return null + return str_to_var("Vector4(%s )" % ",".join(data_array)) + TYPE_VECTOR4I: + if data_array.size() != 2: + push_error("'%s' value must be a Vector4i, '%s' is an invalid value." % [arg_name, value_string]) + return null + return str_to_var("Vector4i(%s )" % ",".join(data_array)) + TYPE_RECT2: + if data_array.size() != 2: + push_error("'%s' value must be a Rect2, '%s' is an invalid value." % [arg_name, value_string]) + return null + return str_to_var("Rect2(%s )" % ",".join(data_array)) + TYPE_RECT2I: + if data_array.size() != 2: + push_error("'%s' value must be a Rect2i, '%s' is an invalid value." % [arg_name, value_string]) + return null + return str_to_var("Rect2i(%s )" % ",".join(data_array)) + _: + push_error("'%s' value of type '%s' requested but could not be parsed." % [arg_name, type]) + return null + + return null + +# Missing types +# TYPE_TRANSFORM2D = 11 +# TYPE_VECTOR4 = 12 +# TYPE_VECTOR4I = 13 +# TYPE_PLANE = 14 +# TYPE_QUATERNION = 15 +# TYPE_AABB = 16 +# TYPE_BASIS = 17 +# TYPE_TRANSFORM3D = 18 +# TYPE_PROJECTION = 19 +# TYPE_NODE_PATH = 22 +# TYPE_RID = 23 +# TYPE_OBJECT = 24 +# TYPE_CALLABLE = 25 +# TYPE_SIGNAL = 26 +# TYPE_DICTIONARY = 27 +# TYPE_ARRAY = 28 +# TYPE_PACKED_BYTE_ARRAY = 29 +# TYPE_PACKED_INT32_ARRAY = 30 +# TYPE_PACKED_INT64_ARRAY = 31 +# TYPE_PACKED_FLOAT32_ARRAY = 32 +# TYPE_PACKED_FLOAT64_ARRAY = 33 +# TYPE_PACKED_STRING_ARRAY = 34 +# TYPE_PACKED_VECTOR2_ARRAY = 35 +# TYPE_PACKED_VECTOR3_ARRAY = 36 +# TYPE_PACKED_COLOR_ARRAY = 37 + +func _parse_argument_list(dictionary : Dictionary, arg_list : PackedStringArray) -> Dictionary: + var current_key : String = "" + var current_option : ArgumentOption = null + for arg in arg_list: + if current_option != null and not arg.begins_with("-"): + var result = _parse_value(current_key, arg, current_option.type) + if result != null: + dictionary[current_option.name] = result + current_option = null + continue + + if current_option != null: + push_warning("Valid argument '%s' was not set as a value, skipping." % current_key) + + if arg.begins_with("-"): + current_option = null + arg = arg.substr(1) + var key := &"" + var value := &"" + + # Support for Unix shorthand of multiple boolean arguments + # eg: "-abc" means a == true, b == true, c == true + if arg.length() > 1 and arg[0] != "-" and arg[1] != "=": + for c in arg: + for o in option_array: + if o.aliases.any(func(v): return c == v): + dictionary[o.name] = true + continue + + # Support for = key/value split + # eg: "-v=5" and "--value=5" means v == 5 and value == 5 + var first_equal := arg.find("=") + if first_equal > -1: + key = arg.substr(0, first_equal - 1) + value = arg.substr(first_equal + 1) + else: + key = arg + + # Removes - for full name arguments + if key.begins_with("-"): + key = key.substr(1) + + for o in option_array: + if key == o.name or o.aliases.any(func(v): return key == v): + current_option = o + break + + if current_option == null: + push_warning("Invalid argument '%s' found, skipping." % key) + continue + + current_key = key + var arg_result = _parse_value(key, value, current_option.type) + if arg_result != null: + dictionary[current_option.name] = arg_result + current_option = null + + return dictionary + +func _print_help(): + var project_name : StringName = ProjectSettings.get_setting_with_override(&"application/config/name") + var project_version : String = _GIT_INFO_.tag + var project_hash : String = _GIT_INFO_.short_hash + var project_website : String = "https://openvic2.com" + var project_description : String = ProjectSettings.get_setting_with_override(&"application/config/description") + print_rich( +""" +%s - %s - %s - %s +%s + +%s + +Options: +""" + % [ + project_name, + project_version, + project_hash, + project_website, + project_description, + "usage: %s [options]" % OS.get_executable_path().get_file() + ] + ) + for option in option_array: + print_rich(" --%s%s%s" % [ + (option.name + (",-%s" % (",-".join(option.aliases)) if option.aliases.size() > 0 else "")).rpad(45), + ("Type: %s - Default Value: %s" % [option.get_type_string(), option.default_value]).rpad(45), + option.description + ]) +func _ready(): + if Engine.is_editor_hint(): return + + var argument_dictionary : Dictionary = {} + if ProjectSettings.has_setting(argument_setting_path): + argument_dictionary = ProjectSettings.get_setting_with_override(argument_setting_path) + for option in option_array: + argument_dictionary[option.name] = option.default_value + + _parse_argument_list(argument_dictionary, OS.get_cmdline_args()) + _parse_argument_list(argument_dictionary, OS.get_cmdline_user_args()) + + ProjectSettings.set_setting(argument_setting_path, argument_dictionary) + if argument_dictionary[&"help"]: + _print_help() + get_tree().quit() diff --git a/game/src/ArgumentParser.tscn b/game/src/ArgumentParser.tscn new file mode 100644 index 0000000..964c19e --- /dev/null +++ b/game/src/ArgumentParser.tscn @@ -0,0 +1,24 @@ +[gd_scene load_steps=5 format=3 uid="uid://dayjmgc34tqo6"] + +[ext_resource type="Script" path="res://src/ArgumentParser.gd" id="1_8e7gi"] +[ext_resource type="Script" path="res://src/ArgumentOption.gd" id="2_f3c26"] + +[sub_resource type="Resource" id="Resource_tq3y4"] +script = ExtResource("2_f3c26") +name = &"help" +aliases = Array[StringName]([&"h"]) +type = 1 +description = "Displays help and quits." +default_value = false + +[sub_resource type="Resource" id="Resource_j1to4"] +script = ExtResource("2_f3c26") +name = &"game-debug" +aliases = Array[StringName]([&"d", &"-debug", &"-debug-mode"]) +type = 1 +description = "Start in debug mode." +default_value = false + +[node name="ArgumentParser" type="Node"] +script = ExtResource("1_8e7gi") +option_array = Array[ExtResource("2_f3c26")]([SubResource("Resource_tq3y4"), SubResource("Resource_j1to4")]) diff --git a/game/src/CreditsMenu/CreditsMenu.gd b/game/src/CreditsMenu/CreditsMenu.gd index 52c1711..0e9df6b 100644 --- a/game/src/CreditsMenu/CreditsMenu.gd +++ b/game/src/CreditsMenu/CreditsMenu.gd @@ -17,6 +17,9 @@ signal back_button_pressed @export_file("*.csv") var core_credits_path : String +@export +var godot_engine_scene : PackedScene + @export_group("Label Variants", "label_variants_") @export var label_variants_project : StringName @@ -114,10 +117,81 @@ func _add_project_credits(project : Dictionary) -> void: credits_list.add_child(project_credits_list) +func _add_godot_credits() -> void: + var godot_credits_list = VBoxContainer.new() + godot_credits_list.name = 'CreditsGodot' + var godot_engine = godot_engine_scene.instantiate() + godot_credits_list.add_child(godot_engine) + godot_credits_list.add_child(HSeparator.new()) + + var author_dict := Engine.get_author_info() + _add_label(godot_credits_list, "Contributors", label_variants_role) + + for role in author_dict: + var role_parent = VBoxContainer.new() + + for person in author_dict[role]: + _add_label(role_parent, person, label_variants_person) + + _add_label(godot_credits_list, role.replace("_", " ").capitalize(), label_variants_role) + godot_credits_list.add_child(role_parent) + godot_credits_list.add_child(HSeparator.new()) + + var donor_dict := Engine.get_donor_info() + _add_label(godot_credits_list, "Donors", label_variants_role) + + for role in donor_dict: + if donor_dict[role].size() == 0 or donor_dict[role][0].begins_with("None"): continue + var role_parent = VBoxContainer.new() + + for person in donor_dict[role]: + _add_label(role_parent, person, label_variants_person) + + _add_label(godot_credits_list, role.replace("_", " ").capitalize(), label_variants_role) + godot_credits_list.add_child(role_parent) + godot_credits_list.add_child(HSeparator.new()) + + credits_list.add_child(godot_credits_list) + +func _add_link_button(node : Node, text : String, url: String, type_variation : StringName) -> void: + var button := LinkButton.new() + button.name = 'LinkButton' + text + button.text = text + button.uri = url + button.size_flags_horizontal = SIZE_SHRINK_CENTER + button.theme_type_variation = type_variation + node.add_child(button) + +func _add_licenses() -> void: + var license_list = VBoxContainer.new() + license_list.name = 'Licenses' + _add_label(license_list, "Third-Party Licenses", label_variants_project) + license_list.add_child(HSeparator.new()) + + var license_info := { + "OpenVic2": ["GPLv3", "https://github.com/OpenVic2Project/OpenVic2/blob/main/LICENSE.md"], + "Godot": ["MIT", "https://github.com/godotengine/godot/blob/master/LICENSE.txt"], + "FreeType": ["FreeType License", "https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT"], + "ENet": ["MIT", "http://enet.bespin.org/License.html"], + "mbed TLS": ["APLv2", "https://github.com/Mbed-TLS/mbedtls/blob/development/LICENSE"] + } + # Add additional licenses required for attribution here + # These licenses should also either be displayed or exported alongside this project + + for project in license_info: + _add_label(license_list, project, label_variants_role) + _add_link_button(license_list, license_info[project][0], license_info[project][1], label_variants_person) + license_list.add_child(HSeparator.new()) + + credits_list.add_child(license_list) + + # REQUIREMENTS: # * SS-17 func _ready(): _add_project_credits(_load_credit_file(core_credits_path)) + _add_godot_credits() + _add_licenses() # REQUIREMENTS: # * UI-38 diff --git a/game/src/CreditsMenu/CreditsMenu.tscn b/game/src/CreditsMenu/CreditsMenu.tscn index 6c5f36b..2d10d2e 100644 --- a/game/src/CreditsMenu/CreditsMenu.tscn +++ b/game/src/CreditsMenu/CreditsMenu.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://c8knthxkwj1uj"] +[gd_scene load_steps=4 format=3 uid="uid://c8knthxkwj1uj"] [ext_resource type="Theme" uid="uid://stfxt4hpsify" path="res://theme/credits_menu.tres" id="1_7y4l8"] [ext_resource type="Script" path="res://src/CreditsMenu/CreditsMenu.gd" id="1_csd7i"] +[ext_resource type="PackedScene" uid="uid://ddjbee5gj6bkv" path="res://src/CreditsMenu/GodotEngineButton.tscn" id="3_fl02a"] [node name="CreditsMenu" type="Control" node_paths=PackedStringArray("credits_list")] editor_description = "UI-34" @@ -14,6 +15,7 @@ grow_vertical = 2 theme = ExtResource("1_7y4l8") script = ExtResource("1_csd7i") core_credits_path = "res://common/credits.csv" +godot_engine_scene = ExtResource("3_fl02a") label_variants_project = &"ProjectLabel" label_variants_role = &"RoleLabel" label_variants_person = &"PersonLabel" diff --git a/game/src/CreditsMenu/GodotEngineButton.gd b/game/src/CreditsMenu/GodotEngineButton.gd new file mode 100644 index 0000000..ca3a958 --- /dev/null +++ b/game/src/CreditsMenu/GodotEngineButton.gd @@ -0,0 +1,4 @@ +extends Button + +func _on_pressed(): + OS.shell_open("https://godotengine.org") diff --git a/game/src/CreditsMenu/GodotEngineButton.tscn b/game/src/CreditsMenu/GodotEngineButton.tscn new file mode 100644 index 0000000..8b0c46b --- /dev/null +++ b/game/src/CreditsMenu/GodotEngineButton.tscn @@ -0,0 +1,20 @@ +[gd_scene load_steps=3 format=3 uid="uid://ddjbee5gj6bkv"] + +[ext_resource type="Texture2D" uid="uid://rh7l4xuh4ali" path="res://src/CreditsMenu/logo_vertical_color_dark.svg" id="1_b0brk"] +[ext_resource type="Script" path="res://src/CreditsMenu/GodotEngineButton.gd" id="3_gi8fv"] + +[node name="GodotEngineButton" type="Button"] +custom_minimum_size = Vector2(0, 200) +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_vertical = 3 +icon = ExtResource("1_b0brk") +flat = true +icon_alignment = 1 +expand_icon = true +script = ExtResource("3_gi8fv") + +[connection signal="pressed" from="." to="." method="_on_pressed"] diff --git a/game/src/CreditsMenu/logo_vertical_color_dark.svg b/game/src/CreditsMenu/logo_vertical_color_dark.svg new file mode 100644 index 0000000..00e50cd --- /dev/null +++ b/game/src/CreditsMenu/logo_vertical_color_dark.svg @@ -0,0 +1 @@ +<svg height="713.37085" viewBox="0 0 584.81677 668.78517" width="623.80457" xmlns="http://www.w3.org/2000/svg"><g fill="#eee" transform="matrix(1.25 0 0 -1.25 -469.43319 897.49284)"><path d="m0 0c-3.611 0-6.636-1.659-9.09-4.967-2.441-3.311-3.668-7.958-3.668-13.938 0-5.993 1.166-10.581 3.503-13.778 2.333-3.207 5.398-4.804 9.2-4.804 3.8 0 6.887 1.617 9.258 4.862 2.371 3.233 3.559 7.861 3.559 13.886 0 6.02-1.227 10.654-3.673 13.89-2.443 3.232-5.473 4.849-9.089 4.849m-.055-59.493c-10.573 0-19.195 3.46-25.859 10.379-6.655 6.925-9.984 17.03-9.984 30.314 0 13.292 3.367 23.356 10.101 30.209 6.736 6.844 15.431 10.269 26.082 10.269 10.649 0 19.251-3.363 25.794-10.109 6.555-6.733 9.827-16.94 9.827-30.591 0-13.661-3.348-23.822-10.05-30.49-6.702-6.654-15.333-9.981-25.911-9.981" transform="matrix(1.1310535 0 0 1.1310535 531.44953 355.31567)"/><path d="m0 0v-33.768c0-1.577.116-2.571.342-2.988.224-.415.903-.623 2.029-.623 4.144 0 7.283 1.548 9.429 4.634 2.151 3.083 3.215 8.216 3.215 15.405 0 7.192-1.113 11.878-3.325 14.055-2.223 2.183-5.744 3.285-10.561 3.285zm-21.675-52.392v67.735c0 1.883.468 3.369 1.413 4.471.939 1.085 2.161 1.636 3.671 1.636h18.854c11.965 0 21.053-3.018 27.257-9.04 6.215-6.02 9.322-15.499 9.322-28.447 0-27.7-11.821-41.547-35.456-41.547h-19.302c-3.836 0-5.759 1.727-5.759 5.192" transform="matrix(1.1310535 0 0 1.1310535 607.8515 354.43097)"/><path d="m0 0c-3.612 0-6.645-1.659-9.095-4.967-2.44-3.311-3.662-7.958-3.662-13.938 0-5.993 1.169-10.581 3.499-13.778 2.33-3.207 5.398-4.804 9.2-4.804 3.801 0 6.89 1.617 9.258 4.862 2.372 3.233 3.56 7.861 3.56 13.886 0 6.02-1.225 10.654-3.671 13.89-2.447 3.232-5.473 4.849-9.089 4.849m-.058-59.493c-10.577 0-19.193 3.46-25.851 10.379-6.663 6.925-9.993 17.03-9.993 30.314 0 13.292 3.367 23.356 10.1 30.209 6.741 6.844 15.431 10.269 26.086 10.269 10.651 0 19.246-3.363 25.797-10.109 6.55-6.733 9.822-16.94 9.822-30.591 0-13.661-3.349-23.822-10.05-30.49-6.699-6.654-15.338-9.981-25.911-9.981" transform="matrix(1.1310535 0 0 1.1310535 700.81066 355.31567)"/><path d="m0 0c0-1.496-3.721-2.255-11.176-2.255-7.448 0-11.18.759-11.18 2.255v56.681h-13.545c-1.281 0-2.185 1.727-2.71 5.198-.226 1.652-.334 3.343-.334 5.077 0 1.724.108 3.422.334 5.077.525 3.462 1.429 5.202 2.71 5.202h49.112c1.279 0 2.179-1.74 2.712-5.202.221-1.655.335-3.353.335-5.077 0-1.734-.114-3.425-.335-5.077-.533-3.471-1.433-5.198-2.712-5.198h-13.211z" transform="matrix(1.1310535 0 0 1.1310535 789.01132 291.33514)"/><path d="m0 0c-6.078.094-13.034-1.173-13.034-1.173v-11.863h6.995l-.078-5.288c0-1.959-1.942-2.943-5.815-2.943-3.878 0-7.303 1.642-10.274 4.917-2.978 3.279-4.459 8.072-4.459 14.388 0 6.329 1.447 10.995 4.345 14.006 2.892 3.008 6.683 4.517 11.346 4.517 1.959 0 3.987-.316 6.096-.961 2.11-.639 3.519-1.238 4.238-1.799.713-.577 1.391-.85 2.032-.85.638 0 1.671.746 3.1 2.255 1.431 1.505 2.713 3.786 3.844 6.827 1.126 3.057 1.69 5.4 1.69 7.062 0 1.649-.036 2.786-.109 3.386-1.581 1.73-4.499 3.102-8.755 4.122-4.248 1.017-9.011 1.522-14.28 1.522-11.594 0-20.66-3.65-27.207-10.95-6.552-7.303-9.822-16.783-9.822-28.452 0-13.701 3.347-24.087 10.041-31.162 6.706-7.074 15.51-10.607 26.425-10.607 5.87 0 11.08.505 15.632 1.522 4.557 1.013 7.586 2.053 9.093 3.105l.452 35.33c0 2.053-5.418 2.985-11.496 3.089" transform="matrix(1.1310535 0 0 1.1310535 468.26549 336.71278)"/></g><g fill="#ddd" transform="matrix(1.25 0 0 -1.25 -392.9327 897.49284)"><path d="m0 0c-.624-1.28-1.771-2.454-3.449-3.516-1.676-1.069-3.805-1.6-6.391-1.6-3.412 0-6.156 1.075-8.24 3.249-2.076 2.157-3.116 5.266-3.116 9.323v10.116c0 3.969.98 7.013 2.946 9.138 1.962 2.108 4.59 3.177 7.872 3.177 3.208 0 5.695-.844 7.455-2.513 1.755-1.675 2.677-4.015 2.757-7.003l-.044-.133h-2.619c-.094 2.29-.759 4.057-2.01 5.305-1.244 1.238-3.095 1.864-5.539 1.864-2.473 0-4.432-.837-5.866-2.516-1.43-1.675-2.143-4.103-2.143-7.293v-10.174c0-3.308.771-5.83 2.311-7.567 1.54-1.724 3.616-2.588 6.236-2.588 1.913 0 3.451.339 4.602 1.033 1.155.684 1.956 1.519 2.409 2.51v8.861h-7.06v2.463h9.889z" transform="matrix(1.1310535 0 0 1.1310535 441.34721 235.75121)"/><path d="m0 0c1.553 0 2.936.44 4.144 1.336 1.21.9 2.058 2.037 2.561 3.422v5.468h-4.492c-1.91 0-3.44-.541-4.585-1.623-1.148-1.075-1.716-2.418-1.716-4.015 0-1.349.355-2.457 1.074-3.311.718-.857 1.722-1.277 3.014-1.277m7.124-2.04c-.14.876-.249 1.587-.318 2.144-.067.567-.101 1.131-.101 1.704-.767-1.254-1.757-2.294-2.98-3.109-1.221-.821-2.579-1.228-4.075-1.228-2.092 0-3.701.648-4.84 1.946-1.132 1.303-1.704 3.059-1.704 5.276 0 2.343.823 4.223 2.473 5.618 1.649 1.395 3.89 2.092 6.709 2.092h4.417v3.106c0 1.786-.456 3.193-1.351 4.21-.914 1.004-2.17 1.512-3.791 1.512-1.508 0-2.752-.479-3.728-1.45-.973-.965-1.456-2.144-1.456-3.549l-2.623.023-.046.137c-.074 1.906.647 3.591 2.168 5.084 1.515 1.489 3.459 2.229 5.825 2.229 2.338 0 4.22-.711 5.657-2.128 1.429-1.431 2.146-3.471 2.146-6.124v-12.396c0-.903.042-1.78.121-2.617.081-.848.212-1.665.417-2.48z" transform="matrix(1.1310535 0 0 1.1310535 456.01527 232.82495)"/><path d="m0 0 .24-3.923c.664 1.404 1.554 2.486 2.657 3.255 1.107.759 2.41 1.138 3.906 1.138 1.527 0 2.814-.444 3.852-1.343 1.039-.896 1.805-2.252 2.292-4.074.623 1.682 1.505 3.011 2.65 3.973 1.145.964 2.534 1.444 4.143 1.444 2.217 0 3.937-.897 5.156-2.692 1.224-1.799 1.834-4.559 1.834-8.288v-14.765h-2.823v14.814c0 3.1-.429 5.283-1.263 6.538-.839 1.257-2.042 1.89-3.598 1.89-1.637 0-2.915-.691-3.834-2.096-.914-1.405-1.478-3.161-1.683-5.282v-.655-15.209h-2.809v14.798c0 3.027-.424 5.194-1.292 6.488-.864 1.294-2.066 1.936-3.609 1.936-1.475 0-2.668-.45-3.562-1.342-.9-.897-1.54-2.125-1.928-3.683v-18.197h-2.806v25.275z" transform="matrix(1.1310535 0 0 1.1310535 476.7303 259.10521)"/><path d="m0 0c-1.758 0-3.202-.802-4.334-2.402-1.133-1.606-1.718-3.585-1.765-5.944h11.66v1.082c0 2.086-.489 3.823-1.469 5.201-.986 1.379-2.347 2.063-4.092 2.063m.397-23.76c-2.725 0-4.954 1.026-6.685 3.073-1.726 2.043-2.591 4.657-2.591 7.841v4.197c0 3.19.867 5.85 2.602 7.965 1.739 2.105 3.828 3.158 6.277 3.158 2.648 0 4.699-.939 6.164-2.823 1.468-1.887 2.201-4.422 2.201-7.603v-2.773h-14.464v-2.102c0-2.447.586-4.484 1.752-6.11 1.168-1.63 2.755-2.438 4.744-2.438 1.382 0 2.585.244 3.588.724 1.003.491 1.863 1.179 2.578 2.082l1.149-1.988c-.763-.968-1.752-1.75-2.959-2.33-1.204-.577-2.659-.873-4.356-.873" transform="matrix(1.1310535 0 0 1.1310535 522.82277 256.83868)"/><path d="m0 0c-1.763 0-3.21-.802-4.341-2.402-1.126-1.606-1.712-3.585-1.763-5.944h11.663v1.082c0 2.086-.488 3.823-1.474 5.201-.981 1.379-2.341 2.063-4.085 2.063m.394-23.76c-2.726 0-4.951 1.026-6.679 3.073-1.733 2.043-2.6 4.657-2.6 7.841v4.197c0 3.19.871 5.85 2.602 7.965 1.744 2.105 3.834 3.158 6.283 3.158 2.643 0 4.703-.939 6.164-2.823 1.463-1.887 2.197-4.422 2.197-7.603v-2.773h-14.465v-2.102c0-2.447.587-4.484 1.76-6.11 1.162-1.63 2.742-2.438 4.738-2.438 1.387 0 2.585.244 3.585.724 1.007.491 1.866 1.179 2.589 2.082l1.141-1.988c-.764-.968-1.75-1.75-2.959-2.33-1.204-.577-2.658-.873-4.356-.873" transform="matrix(1.1310535 0 0 1.1310535 558.0805 256.83868)"/><path d="m0 0 .23-4.178c.674 1.483 1.564 2.634 2.682 3.435 1.108.805 2.413 1.213 3.914 1.213 2.258 0 3.988-.835 5.189-2.513 1.214-1.675 1.815-4.279 1.815-7.812v-15.42h-2.825v15.394c0 2.888-.423 4.905-1.264 6.075-.836 1.17-2.065 1.753-3.665 1.753-1.435 0-2.638-.466-3.603-1.414-.969-.939-1.691-2.19-2.172-3.767v-18.041h-2.805v25.275z" transform="matrix(1.1310535 0 0 1.1310535 575.91679 259.10521)"/><path d="m0 0c0-2.565.486-4.605 1.472-6.123.974-1.532 2.457-2.288 4.436-2.288 1.356 0 2.498.361 3.435 1.101.934.74 1.672 1.77 2.218 3.077v12.52c-.525 1.346-1.246 2.434-2.157 3.272-.91.824-2.062 1.238-3.448 1.238-1.975 0-3.468-.86-4.46-2.587-.999-1.73-1.496-3.986-1.496-6.756zm-2.833 3.454c0 3.582.723 6.459 2.177 8.627 1.442 2.157 3.448 3.239 6.004 3.239 1.419 0 2.664-.346 3.728-1.04 1.066-.681 1.947-1.678 2.654-2.946l.274 3.516h2.381v-25.298c0-3.239-.751-5.749-2.26-7.525-1.511-1.769-3.657-2.665-6.428-2.665-.996 0-2.067.156-3.212.459-1.147.303-2.162.701-3.052 1.2l.776 2.463c.759-.492 1.608-.873 2.548-1.141.932-.277 1.895-.41 2.894-.41 2.009 0 3.498.645 4.46 1.932.966 1.304 1.45 3.19 1.45 5.687v3.057c-.717-1.138-1.597-2.011-2.64-2.614-1.039-.606-2.253-.909-3.622-.909-2.539 0-4.53.994-5.968 2.982-1.441 1.984-2.164 4.631-2.164 7.932z" transform="matrix(1.1310535 0 0 1.1310535 600.8685 242.30884)"/><path d="m627.82321 230.5176h-3.20089v28.58738h3.20089zm0 36.72644h-3.20089v4.50385h3.20089z"/><path d="m0 0 .23-4.178c.676 1.483 1.562 2.634 2.678 3.435 1.115.805 2.422 1.213 3.916 1.213 2.258 0 3.995-.835 5.199-2.513 1.211-1.675 1.807-4.279 1.807-7.812v-15.42h-2.825v15.394c0 2.888-.422 4.905-1.261 6.075-.843 1.17-2.063 1.753-3.668 1.753-1.434 0-2.635-.466-3.599-1.414-.967-.939-1.692-2.19-2.171-3.767v-18.041h-2.809v25.275z" transform="matrix(1.1310535 0 0 1.1310535 638.15379 259.10521)"/><path d="m0 0c-1.763 0-3.208-.802-4.334-2.402-1.129-1.606-1.718-3.585-1.768-5.944h11.662v1.082c0 2.086-.486 3.823-1.47 5.201-.981 1.379-2.343 2.063-4.09 2.063m.401-23.76c-2.733 0-4.958 1.026-6.681 3.073-1.73 2.043-2.595 4.657-2.595 7.841v4.197c0 3.19.865 5.85 2.6 7.965 1.739 2.105 3.831 3.158 6.275 3.158 2.646 0 4.706-.939 6.172-2.823 1.462-1.887 2.195-4.422 2.195-7.603v-2.773h-14.469v-2.102c0-2.447.59-4.484 1.757-6.11 1.166-1.63 2.748-2.438 4.746-2.438 1.382 0 2.579.244 3.578.724 1.012.491 1.869 1.179 2.591 2.082l1.147-1.988c-.769-.968-1.755-1.75-2.962-2.33-1.203-.577-2.658-.873-4.354-.873" transform="matrix(1.1310535 0 0 1.1310535 669.70883 256.83868)"/></g><g stroke-width="1.41382" transform="translate(89.812354 -.891698)"><path d="m340.91387 248.41524s-.45949-2.81915-.72812-2.7937l-51.15472 4.93563c-4.07038.39304-7.23167 3.63917-7.51726 7.71803l-1.40534 20.14265-39.57556 2.82339-2.69191-18.2552c-.59946-4.06049-4.14531-7.1214-8.24962-7.1214h-53.99084c-4.1029 0-7.64875 3.06091-8.24821 7.1214l-2.69332 18.2552-39.57556-2.82339-1.40533-20.14265c-.2856-4.08028-3.44689-7.3264-7.51727-7.71944l-51.180171-4.93422c-.264383-.0255-.458076 2.79653-.72246 2.79653l-.06928 11.07018 43.344801 6.98991 1.41947 20.32221c.28701 4.11421 3.60665 7.44092 7.72368 7.7364l54.50406 3.888c.20642.0141.41001.0226.6136.0226 4.09582 0 7.63602-3.06232 8.23548-7.12281l2.76967-18.78397h39.59394l2.76967 18.78397c.59804 4.05907 4.14248 7.1214 8.24396 7.1214.20076 0 .40153-.007.59805-.0212l54.51112-3.888c4.11562-.29548 7.43668-3.62219 7.72368-7.7364l1.41806-20.32221 43.32642-7.02101z" fill="#fff"/><path d="m64.257603 164.94208v67.1761 8.53238 7.76468c.152692.001.305384.007.456663.0212l51.174514 4.93422c2.6806.25873 4.78153 2.41621 4.96815 5.10247l1.57782 22.58996 44.63986 3.18533 3.07505-20.84955c.3987-2.70322 2.71736-4.7066 5.45168-4.7066h53.99084c2.73291 0 5.05157 2.00338 5.45026 4.7066l3.07505 20.84955 44.64127-3.18533 1.57641-22.58996c.18804-2.68626 2.28756-4.84233 4.96815-5.10247l51.15472-4.93422c.15128-.0141.30256-.0198.45525-.0212v-6.66049l.0212-.007v-76.8056c7.20611-9.07172 14.02963-19.07834 19.2576-27.49732-7.98948-13.60092-17.77875-25.75551-28.24241-37.01656-9.70443 4.88474-19.13035 10.41842-28.03316 16.30697-4.45493-4.42808-9.47257-8.05028-14.40114-11.83648-4.84232-3.88941-10.29965-6.741079-15.47564-10.063549 1.54107-11.475951 2.30311-22.773762 2.60991-34.564995-13.35491-6.721286-27.59629-11.177637-42.00167-14.378518-5.75141 9.666266-11.01081 20.134166-15.59157 30.367373-5.43189-.90767-10.88922-1.244159-16.35362-1.309194v-.0085c-.0382 0-.0735.0085-.10604.0085-.0339 0-.0693-.0085-.10321-.0085v.0085c-5.4743.06503-10.92739.401524-16.36069 1.309194-4.57794-10.233207-9.83451-20.701107-15.5944-30.367373-14.39831 3.200881-28.6411 7.657232-41.9946 14.378518.30538 11.791233 1.06743 23.089044 2.61273 34.564995-5.18588 3.32247-10.63614 6.174139-15.47988 10.063549-4.9215 3.7862-9.94762 7.4084-14.40397 11.83648-8.902802-5.88855-18.325891-11.42223-28.033158-16.30697-10.463659 11.26105-20.247272 23.41564-28.239579 37.01656 6.281105 9.85952 13.018384 19.76924 19.2576 27.49732z" fill="#478cbf"/><path d="m295.00412 263.89328-1.58489 22.71014c-.19086 2.73715-2.36814 4.91584-5.10529 5.11236l-54.50971 3.88941c-.1329.01-.2658.0141-.39728.0141-2.70888 0-5.04592-1.98783-5.44603-4.70801l-3.12595-21.19877h-44.47726l-3.12595 21.19877c-.41991 2.85308-2.97043 4.90453-5.84331 4.69387l-54.50971-3.88941c-2.73715-.19652-4.91442-2.37521-5.10529-5.11236l-1.58489-22.71014-46.015498-4.43656c.02121 4.94553.08483 10.36328.08483 11.44202 0 48.59854 61.649488 71.95763 138.244428 72.22625h.0933.0947c76.59494-.26862 138.22322-23.62771 138.22322-72.22625 0-1.09853.0664-6.49366.0891-11.44202z" fill="#478cbf"/><path d="m160.89242 198.8266c0 17.03932-13.80592 30.84242-30.83959 30.84242-17.02518 0-30.835345-13.8031-30.835345-30.84242 0-17.02801 13.810165-30.82404 30.835345-30.82404 17.03367 0 30.83959 13.79603 30.83959 30.82404" fill="#fff"/><path d="m153.47185 200.6558c0 11.30205-9.16012 20.46217-20.47065 20.46217-11.30488 0-20.47066-9.16012-20.47066-20.46217s9.16578-20.47065 20.47066-20.47065c11.31053 0 20.47065 9.1686 20.47065 20.47065" fill="#414042"/><path d="m202.59379 232.47488c-5.48278 0-9.92641-4.04069-9.92641-9.02157v-28.39085c0-4.97664 4.44363-9.02157 9.92641-9.02157s9.93631 4.04493 9.93631 9.02157v28.39085c0 4.98088-4.45353 9.02157-9.93631 9.02157" fill="#fff"/><path d="m244.30027 198.8266c0 17.03932 13.80592 30.84242 30.84242 30.84242 17.02376 0 30.83251-13.8031 30.83251-30.84242 0-17.02801-13.80875-30.82404-30.83251-30.82404-17.0365 0-30.84242 13.79603-30.84242 30.82404" fill="#fff"/><path d="m251.72267 200.6558c0 11.30205 9.15729 20.46217 20.45934 20.46217 11.31337 0 20.47066-9.16012 20.47066-20.46217s-9.15729-20.47065-20.47066-20.47065c-11.30205 0-20.45934 9.1686-20.45934 20.47065" fill="#414042"/></g></svg> diff --git a/game/src/CreditsMenu/logo_vertical_color_dark.svg.import b/game/src/CreditsMenu/logo_vertical_color_dark.svg.import new file mode 100644 index 0000000..a4fb09a --- /dev/null +++ b/game/src/CreditsMenu/logo_vertical_color_dark.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://rh7l4xuh4ali" +path="res://.godot/imported/logo_vertical_color_dark.svg-1167b3ce62f0747c0e76b17bdbb9f218.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/CreditsMenu/logo_vertical_color_dark.svg" +dest_files=["res://.godot/imported/logo_vertical_color_dark.svg-1167b3ce62f0747c0e76b17bdbb9f218.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/game/src/GameStart.tscn b/game/src/GameStart.tscn index 2046bb5..d5f9d45 100644 --- a/game/src/GameStart.tscn +++ b/game/src/GameStart.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=6 format=3 uid="uid://1udsn4mggep2"] +[gd_scene load_steps=7 format=3 uid="uid://1udsn4mggep2"] +[ext_resource type="PackedScene" uid="uid://dayjmgc34tqo6" path="res://src/ArgumentParser.tscn" id="1_oe61r"] [ext_resource type="PackedScene" uid="uid://o4u142w4qkln" path="res://src/GameMenu.tscn" id="1_wlojq"] [ext_resource type="Script" path="res://src/SplashContainer.gd" id="2_xmcgv"] [ext_resource type="Texture2D" uid="uid://deef5hufq0j61" path="res://splash_assets/splash_end.png" id="3_qfv12"] @@ -14,6 +15,8 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +[node name="ArgumentParser" parent="." instance=ExtResource("1_oe61r")] + [node name="GameMenu" parent="." instance=ExtResource("1_wlojq")] visible = false layout_mode = 1 |
