Open
Conversation
BrickPi
force-pushed
the
topbar-tech
branch
2 times, most recently
from
891c6c1 to
0f67b06
Compare
BrickPi
changed the title
Spartan322
reviewed
Feb 2, 2025
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
Spartan322
reviewed
Feb 2, 2025
BrickPi
force-pushed
the
topbar-tech
branch
2 times, most recently
from
cae21ea to
6b9a012
Compare
Hop311
reviewed
Feb 3, 2025
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
Hop311
reviewed
Feb 3, 2025
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
BrickPi
force-pushed
the
topbar-tech
branch
2 times, most recently
from
0375be8 to
1a82237
Compare
Hop311
reviewed
Feb 3, 2025
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
Comment on lines
+116
to
+130
| add_gui_element("country_technology", "tech_group") | ||
|
|
||
| var area_node : Node = get_node(^"./tech_group") | ||
|
|
||
| area_node.reparent(root_node) |
Contributor
There was a problem hiding this comment.
Rather than generating at the top level and reparenting, you can use GUINode.generate_gui_element, store the result in a variable, and then add_child it to the desired parent if it's not null (applies to similar cases throughout this file)
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
Comment on lines
209
to
210
| main_icon.mouse_filter = Control.MOUSE_FILTER_PASS | ||
| main_icon.set_tooltip_string(mod_tooltips[i]) |
Contributor
There was a problem hiding this comment.
set_tooltip_string automatically changes mouse filter to PASS if it's currently IGNORE, so the change above isn't necessary unless you're changing it from something other than IGNORE
Comment on lines
226
to
257
| _current_research_progressbar.set_tooltip_string_and_substitution_dict( | ||
| tr("TECHNOLOGYVIEW_RESEARCH_TOOLTIP") + "\n" + | ||
| tr("TECHNOLOGYVIEW_RESEARCH_INVESTED_TOOLTIP") + | ||
| MenuSingleton.get_tooltip_separator() + | ||
| info.get("current_research_effect_tt", ""), | ||
| { | ||
| "TECH": tr(current_research), | ||
| "DATE": info.get("current_research_finish_date", "1836.1.1"), | ||
| "INVESTED": info.get("current_research_invested", 0), | ||
| "COST": info.get("current_research_cost", 0) | ||
| } | ||
| ) |
Contributor
There was a problem hiding this comment.
We already generate the top half of this tooltip here, so you could separate out that code into a helper function under MenuSingleton then store its result in the info dictionary rather than passing up all the constituent parts
game/src/Game/GameSession/NationManagementScreen/TechnologyMenu.gd
Outdated
Show resolved
Hide resolved
Contributor
|
Also you'll probably have to rebase onto master to account for the submodule already being updated |
Contributor
|
Also needs for techs:
And for inventions:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
_make_modifier_effect_tooltipfor single modifiers