diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-09-23 22:53:40 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-09-23 22:53:40 +0200 |
| commit | 0b4c30aa02c3ec1dacfc3ac190af4733531753ea (patch) | |
| tree | 41aacf220a1f7085c81f2b0f522ad9f36991947b /game/src | |
| parent | d56941e60016bf73587c63a36ac5ca9da3f6023e (diff) | |
| parent | 6e2ba19d77c36ddc4767a20de040489b574ae0c3 (diff) | |
Merge pull request #157 from OpenVicProject/more-dataloading
More dataloading
Diffstat (limited to 'game/src')
| -rw-r--r-- | game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd | 4 | ||||
| -rw-r--r-- | game/src/Game/Theme/PieChart/PieChart.gd | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd index 0220be2..01175d0 100644 --- a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd +++ b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd @@ -104,7 +104,7 @@ func _set_building_row(index : int, building : Dictionary) -> void: func _update_info() -> void: _province_info = GameSingleton.get_province_info_from_index(_selected_index) if _province_info: - _province_name_label.text = _province_info.get(GameSingleton.get_province_info_province_key(), + _province_name_label.text = "PROV" + _province_info.get(GameSingleton.get_province_info_province_key(), GameSingleton.get_province_info_province_key() + _missing_suffix) _region_name_label.text = _province_info.get(GameSingleton.get_province_info_region_key(), GameSingleton.get_province_info_region_key() + _missing_suffix) @@ -122,7 +122,7 @@ func _update_info() -> void: _rgo_name_label.text = _province_info.get(GameSingleton.get_province_info_rgo_key(), GameSingleton.get_province_info_rgo_key() + _missing_suffix) - _rgo_icon_texture_rect.texture = GameSingleton.get_good_icon_texture(_rgo_name_label.text) + _rgo_icon_texture_rect.texture = null var buildings : Array = _province_info.get(GameSingleton.get_province_info_buildings_key(), []) for i in max(buildings.size(), _building_rows.size()): diff --git a/game/src/Game/Theme/PieChart/PieChart.gd b/game/src/Game/Theme/PieChart/PieChart.gd index cfd7917..4b81b28 100644 --- a/game/src/Game/Theme/PieChart/PieChart.gd +++ b/game/src/Game/Theme/PieChart/PieChart.gd @@ -193,13 +193,13 @@ func _create_tooltip(labelHovered : String) -> String: for label in _slice_order: var slice : SliceData = _slices.get(label) var percent := _format_percent(slice.percentage) - var entry : String = "%s %s%%" % [label, percent] + var entry : String = "%s %s%%" % [tr(label), percent] if label == labelHovered: entry = "[i][u][b]>>%s<<[/b][/u][/i]" % entry slice_tooltips.push_back(entry) # Slices are ordered smallest to largest, but here we want the opposite slice_tooltips.reverse() - return "[font_size=10]%s[/font_size]" % "\n".join(slice_tooltips) + return "[font_size=14]%s[/font_size]" % "\n".join(slice_tooltips) # Angle from center.angle_to_point is measured from the +x axis, # but the chart starts from +y |