diff options
3 files changed, 199 insertions, 53 deletions
diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.cpp b/extension/src/openvic-extension/singletons/MenuSingleton.cpp index f3b6d3d..ab7c217 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.cpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.cpp @@ -17,6 +17,7 @@ #include "openvic-extension/singletons/GameSingleton.hpp" #include "openvic-extension/utility/ClassBindings.hpp" #include "openvic-extension/utility/Utilities.hpp" +#include "godot_cpp/core/error_macros.hpp" #include "godot_cpp/variant/array.hpp" #include "godot_cpp/variant/dictionary.hpp" #include "godot_cpp/variant/string.hpp" @@ -132,47 +133,55 @@ String MenuSingleton::make_modifier_effects_tooltip(ModifierValue const& modifie result += "\n"; } - result += tr(Utilities::std_to_godot_string(effect->get_localisation_key())); + make_modifier_effect_tooltip(*effect, value); + } - static const String post_name_text = ": " + GUILabel::get_colour_marker(); - result += post_name_text; + return result; +} - if (value == 0) { - result += "Y"; - } else if (effect->is_positive_good() == value > 0) { - result += "G"; - } else { - result += "R"; - } +String MenuSingleton::make_modifier_effect_tooltip(ModifierEffect const& effect, fixed_point_t value) const { + String result; - if (value >= 0) { - result += "+"; - } + result += tr(Utilities::std_to_godot_string(effect.get_localisation_key())); - static constexpr int32_t DECIMAL_PLACES = 2; - - using enum ModifierEffect::format_t; - - switch (effect->get_format()) { - case PROPORTION_DECIMAL: - result += GUINode::float_to_string_dp((value * 100).to_float(), DECIMAL_PLACES) + "%"; - break; - case PERCENTAGE_DECIMAL: - result += GUINode::float_to_string_dp(value.to_float(), DECIMAL_PLACES) + "%"; - break; - case INT: - result += String::num_int64(value.to_int64_t()); - break; - case RAW_DECIMAL: [[fallthrough]]; - default: // Use raw decimal as fallback format - result += GUINode::float_to_string_dp(value.to_float(), DECIMAL_PLACES); - break; - } + static const String post_name_text = ": " + GUILabel::get_colour_marker(); + result += post_name_text; + + if (value == 0) { + result += "Y"; + } else if (effect.is_positive_good() == value > 0) { + result += "G"; + } else { + result += "R"; + } - static const String end_text = GUILabel::get_colour_marker() + String { "!" }; - result += end_text; + if (value >= 0) { + result += "+"; } + static constexpr int32_t DECIMAL_PLACES = 2; + + using enum ModifierEffect::format_t; + + switch (effect.get_format()) { + case PROPORTION_DECIMAL: + result += GUINode::float_to_string_dp((value * 100).to_float(), DECIMAL_PLACES) + "%"; + break; + case PERCENTAGE_DECIMAL: + result += GUINode::float_to_string_dp(value.to_float(), DECIMAL_PLACES) + "%"; + break; + case INT: + result += String::num_int64(value.to_int64_t()); + break; + case RAW_DECIMAL: [[fallthrough]]; + default: // Use raw decimal as fallback format + result += GUINode::float_to_string_dp(value.to_float(), DECIMAL_PLACES); + break; + } + + static const String end_text = GUILabel::get_colour_marker() + String { "!" }; + result += end_text; + return result; } @@ -309,6 +318,7 @@ void MenuSingleton::_bind_methods() { ADD_SIGNAL(MethodInfo(_signal_search_cache_changed())); /* TECHNOLOGY MENU */ + OV_BIND_METHOD(MenuSingleton::get_technology_menu_defines); OV_BIND_METHOD(MenuSingleton::get_technology_menu_info); } @@ -991,29 +1001,51 @@ Vector2 MenuSingleton::get_search_result_position(int32_t result_index) const { } /* TECHNOLOGY MENU */ -godot::Dictionary MenuSingleton::get_technology_menu_info() const { +godot::Dictionary MenuSingleton::get_technology_menu_defines() const { GameSingleton const* game_singleton = GameSingleton::get_singleton(); ERR_FAIL_NULL_V(game_singleton, {}); static const StringName tech_folders_key = "tech_folders"; + static const StringName tech_areas_key = "tech_areas"; + + Dictionary ret; + + const std::vector<OpenVic::TechnologyFolder>& tech_folders = game_singleton->get_definition_manager().get_research_manager().get_technology_manager().get_technology_folders(); + + Array tech_folder_identifiers {}; + Array tech_area_identifiers {}; + for (TechnologyFolder const& folder : tech_folders) { + tech_folder_identifiers.push_back(Utilities::std_to_godot_string(folder.get_identifier())); + Array folder_areas {}; + for (TechnologyArea const* area : folder.get_technology_areas()) { + folder_areas.push_back(Utilities::std_to_godot_string(area->get_identifier())); + } + tech_area_identifiers.push_back(folder_areas); + } + ret[tech_folders_key] = tech_folder_identifiers; + ret[tech_areas_key] = tech_area_identifiers; + + return ret; +} +godot::Dictionary MenuSingleton::get_technology_menu_info() const { + GameSingleton const* game_singleton = GameSingleton::get_singleton(); + ERR_FAIL_NULL_V(game_singleton, {}); + static const StringName tech_school_key = "tech_school"; - static const StringName tech_school_mod_names = "tech_school_mod_names"; static const StringName tech_school_mod_values = "tech_school_mod_values"; static const StringName tech_school_mod_icons = "tech_school_mod_icons"; + static const StringName tech_school_mod_tt = "tech_school_mod_tt"; + + static const StringName current_research_tech = "current_research_tech"; + static const StringName current_research_cat = "current_research_cat"; Dictionary ret; std::vector<std::string_view> tech_folder_identifiers = game_singleton->get_definition_manager().get_research_manager().get_technology_manager().get_technology_folder_identifiers(); - Array tech_folders {}; - for (auto folder : tech_folder_identifiers) { - tech_folders.push_back(Utilities::std_to_godot_string(folder)); - } - ret[tech_folders_key] = tech_folders; const CountryInstance* country = game_singleton->get_viewed_country(); if (country == nullptr) { ret[tech_school_key] = String("traditional_academic"); - ret[tech_school_mod_names] = Array {}; ret[tech_school_mod_values] = Array {}; return ret; } @@ -1035,22 +1067,35 @@ godot::Dictionary MenuSingleton::get_technology_menu_info() const { } } } + if (country->get_tech_school()->get_effect_count() > 0) { + std::sort(school_modifiers.begin(), school_modifiers.end(), compareFolders); + } } - std::sort(school_modifiers.begin(), school_modifiers.end(), compareFolders); - Array school_modifier_names {}; Array school_modifier_values {}; Array school_modifier_icons {}; + Array school_modifier_tt {}; for (auto modifier : school_modifiers) { - school_modifier_names.push_back(Utilities::std_to_godot_string(modifier.first)); + size_t folder_id = std::find(tech_folder_identifiers.begin(), tech_folder_identifiers.end(), modifier.first.substr(0, modifier.first.find(bonus_suffix))) - tech_folder_identifiers.begin(); + school_modifier_values.push_back(modifier.second.to_float()); - school_modifier_icons.push_back(1 + std::find(tech_folder_identifiers.begin(), tech_folder_identifiers.end(), modifier.first.substr(0, modifier.first.find(bonus_suffix))) - tech_folder_identifiers.begin()); + school_modifier_icons.push_back(1 + folder_id); + school_modifier_tt.push_back(make_modifier_effect_tooltip(**game_singleton->get_definition_manager().get_modifier_manager().get_modifier_effect_cache().get_research_bonus_effects().get_item_by_key(*game_singleton->get_definition_manager().get_research_manager().get_technology_manager().get_technology_folder_by_index(folder_id)), modifier.second)); } - ret[tech_school_mod_names] = school_modifier_names; ret[tech_school_mod_values] = school_modifier_values; ret[tech_school_mod_icons] = school_modifier_icons; + ret[tech_school_mod_tt] = school_modifier_tt; + + Technology const* current_research = country->get_current_research(); + if (current_research != nullptr) { + ret[current_research_tech] = Utilities::std_to_godot_string(current_research->get_identifier()); + ret[current_research_cat] = tr(Utilities::std_to_godot_string(current_research->get_area().get_folder().get_identifier())) + ", " + tr(Utilities::std_to_godot_string(current_research->get_area().get_identifier())); + } else { + ret[current_research_tech] = tr("TECHNOLOGYVIEW_NO_RESEARCH"); + ret[current_research_cat] = ""; + } return ret; }
\ No newline at end of file diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.hpp b/extension/src/openvic-extension/singletons/MenuSingleton.hpp index 198c900..50b5400 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.hpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.hpp @@ -3,11 +3,13 @@ #include <cstdint> #include <godot_cpp/classes/control.hpp> #include <godot_cpp/classes/image.hpp> +#include <godot_cpp/variant/dictionary.hpp> -#include <openvic-simulation/pop/Pop.hpp> #include <openvic-simulation/types/IndexedMap.hpp> #include <openvic-simulation/types/OrderedContainers.hpp> -#include "godot_cpp/variant/dictionary.hpp" +#include <openvic-simulation/types/fixed_point/FixedPoint.hpp> +#include <openvic-simulation/modifier/ModifierEffect.hpp> +#include <openvic-simulation/pop/Pop.hpp> namespace OpenVic { struct CountryInstance; @@ -115,6 +117,7 @@ namespace OpenVic { godot::String get_country_adjective(CountryInstance const& country) const; godot::String make_modifier_effects_tooltip(ModifierValue const& modifier) const; + godot::String make_modifier_effect_tooltip(ModifierEffect const& effect, fixed_point_t value) const; godot::String make_rules_tooltip(RuleSet const& rules) const; protected: @@ -194,6 +197,7 @@ namespace OpenVic { godot::TypedArray<godot::Array> get_population_menu_distribution_info() const; /* TECHNOLOGY MENU */ + godot::Dictionary get_technology_menu_defines() const; godot::Dictionary get_technology_menu_info() const; /* Find/Search Panel */ diff --git a/game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd b/game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd index 3d2275b..8498621 100644 --- a/game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd +++ b/game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd @@ -4,8 +4,18 @@ var _active : bool = false const _screen : NationManagement.Screen = NationManagement.Screen.TECHNOLOGY +var _tech_defines : Dictionary = MenuSingleton.get_technology_menu_defines() + +var _tech_folder_buttons : Array +var _tech_folder_progressbars : Array +var _tech_folder_number_discovered_labels : Array +var _selected_folder = 0 + var _tech_school : GUILabel var _tech_school_modifiers : GUIOverlappingElementsBox +var _current_research_label : GUILabel +var _current_research_cat_label : GUILabel +var _current_research_progressbar : GUIProgressBar func _ready() -> void: GameSingleton.gamestate_updated.connect(_update_info) @@ -19,6 +29,80 @@ func _ready() -> void: if _tech_school_modifiers: _tech_school_modifiers.set_gui_child_element_name("country_technology", "school_icon_window") + _current_research_label = get_gui_label_from_nodepath(^"./country_technology/research_progress_name") + _current_research_cat_label = get_gui_label_from_nodepath(^"./country_technology/research_progress_category") + _current_research_progressbar = get_gui_progress_bar_from_nodepath(^"./country_technology/research_progress") + + var tech_folders : Array = _tech_defines.get("tech_folders") + var tech_areas : Array = _tech_defines.get("tech_areas") + for i in range(tech_folders.size()): + add_gui_element("country_technology", "folder_window") + + var folder_node = get_node(^"./folder_window") + var root_node = get_node(^"./country_technology") + + folder_node.reparent(root_node) + folder_node.name = tech_folders[i] + "_folder" + + var pos = GUINode.get_gui_position("country_technology", "folder_offset") + pos.x += folder_node.get_size().x * i + folder_node.set_position(pos) + + var icon = GUINode.get_gui_icon_from_node(folder_node.get_node(^"./folder_icon")) + if icon: + icon.set_icon_index(i+1) + + var title = GUINode.get_gui_label_from_node(folder_node.get_node(^"./folder_category")) + if title: + title.set_text(tr(tech_folders[i])) + + var button = GUINode.get_gui_icon_button_from_node(folder_node.get_node(^"./folder_button")) + var button_tooltip: String = tr("TECHNOLOGYVIEW_SHOW_FOLDER_TOOLTIP") + var button_dict: Dictionary = { "FOLDER" : tech_folders[i] } + if button: + if i == 0: + button.set_icon_index(2) + button.pressed.connect( + func() -> void: + _tech_folder_buttons[_selected_folder].set_icon_index(1) + for x in range(tech_areas[_selected_folder].size()): + root_node.get_node("./" + tech_areas[_selected_folder][x]).visible = false + _selected_folder = i + button.set_icon_index(2) + for x in range(tech_areas[_selected_folder].size()): + root_node.get_node("./" + tech_areas[_selected_folder][x]).visible = true + ) + button.set_tooltip_string_and_substitution_dict(button_tooltip, button_dict) + _tech_folder_buttons.push_back(button) + + var progressbar = GUINode.get_gui_progress_bar_from_node(folder_node.get_node(^"./folder_progress")) + if progressbar: + progressbar.mouse_filter = Control.MOUSE_FILTER_IGNORE + _tech_folder_progressbars.push_back(progressbar) + + var discovered = GUINode.get_gui_label_from_node(folder_node.get_node(^"folder_number_discovered")) + if discovered: + _tech_folder_number_discovered_labels.push_back(discovered) + + var folder_areas : Array = tech_areas[i] + for area_index in range(folder_areas.size()): + add_gui_element("country_technology", "tech_group") + + var area_node = get_node(^"./tech_group") + + area_node.reparent(root_node) + area_node.name = tech_areas[i][area_index] + if i != 0: + area_node.set_visible(false) + + pos = GUINode.get_gui_position("country_technology", "tech_group_offset") + pos.x += area_node.get_size().x * area_index + area_node.set_position(pos) + + var area_title = GUINode.get_gui_label_from_node(area_node.get_node(^"./group_name")) + if area_title: + area_title.set_text(tr(tech_areas[i][area_index])) + var close_button : GUIIconButton = get_gui_icon_button_from_nodepath(^"./country_technology/close_button") if close_button: close_button.pressed.connect(Events.NationManagementScreens.close_nation_management_screen.bind(_screen)) @@ -37,18 +121,31 @@ func _on_update_active_nation_management_screen(active_screen : NationManagement func _update_info() -> void: if _active: var info : Dictionary = MenuSingleton.get_technology_menu_info() + if _tech_school: _tech_school.set_text(info.get("tech_school")) if _tech_school_modifiers: - var mod_names : Array = info.get("tech_school_mod_names") var mod_values : Array = info.get("tech_school_mod_values") var mod_icons : Array = info.get("tech_school_mod_icons") - var mod_count = mod_names.size() + var mod_tooltips : Array = info.get("tech_school_mod_tt") + var mod_count = mod_values.size() _tech_school_modifiers.set_child_count(mod_count) for i in range(mod_count): - get_gui_icon_from_nodepath("./country_technology/school_bonus_icons/school_icon_window_{x}/main_icon".format({"x": i})).set_icon_index(mod_icons[i]) - get_gui_icon_from_nodepath("./country_technology/school_bonus_icons/school_icon_window_{x}/plusminus_icon".format({"x": i})).set_icon_index(2 if mod_values[i] > 0 else 1) + var main_icon = get_gui_icon_from_nodepath("./country_technology/school_bonus_icons/school_icon_window_{x}/main_icon".format({"x": i})) + main_icon.set_icon_index(mod_icons[i]) + main_icon.mouse_filter = Control.MOUSE_FILTER_PASS + main_icon.set_tooltip_string(mod_tooltips[i]) + var plusminus_icon = get_gui_icon_from_nodepath("./country_technology/school_bonus_icons/school_icon_window_{x}/plusminus_icon".format({"x": i})) + plusminus_icon.set_icon_index(2 if mod_values[i] > 0 else 1) + plusminus_icon.mouse_filter = Control.MOUSE_FILTER_PASS + plusminus_icon.set_tooltip_string(mod_tooltips[i]) + + if _current_research_label: + _current_research_label.set_text(info.get("current_research_tech")) + + if _current_research_cat_label: + _current_research_cat_label.set_text(info.get("current_research_cat")) show() else: |