diff options
| author |   hop311 <hop3114@gmail.com> | 2024-10-01 00:37:00 +0200 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-10-20 23:05:44 +0200 |
| commit | c8109f2e880a5f66ceaf8097185f52df62c18f31 (patch) | |
| tree | 534f492306d17a6cad494c747abe3c44aa41e5eb | |
| parent | 4d8148a3a06df6b93685222ff3d8f1f9b54c734e (diff) | |
Update SIM submodule to include resultant modifiers + display them in colonial power tooltip for testingresultant-modifier
| m--------- | extension/deps/openvic-simulation | 0 | ||||
| -rw-r--r-- | extension/src/openvic-extension/singletons/MenuSingleton.cpp | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation -Subproject 7fe8ba2b3bd3bafad374a691280bbf5102b5867 +Subproject c88cf59997529cbca008f9a2b629822de9deaa2 diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.cpp b/extension/src/openvic-extension/singletons/MenuSingleton.cpp index c4b704d..3ea3aa2 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.cpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.cpp @@ -3,7 +3,7 @@ #include <godot_cpp/variant/utility_functions.hpp> #include <openvic-simulation/GameManager.hpp> -#include <openvic-simulation/misc/Modifier.hpp> +#include <openvic-simulation/modifier/Modifier.hpp> #include "openvic-extension/classes/GFXPieChartTexture.hpp" #include "openvic-extension/classes/GUINode.hpp" @@ -698,7 +698,10 @@ Dictionary MenuSingleton::get_topbar_info() const { // TODO - colonial power info ret[colonial_power_available_key] = 0; ret[colonial_power_max_key] = 0; - ret[colonial_power_tooltip_key] = String {}; + ret[colonial_power_tooltip_key] = + // TODO - remove these examples eventually + // make_rules_tooltip(country->get_rule_set()) + get_tooltip_separator() + + make_modifier_effects_tooltip(country->get_modifier_sum().get_value_sum()); // Production |