From b21bd9230a0cd169497438aaaa4a7c9052472816 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Mon, 25 Sep 2023 19:19:02 +0100 Subject: Terrain types calculation, label and mapmode --- game/localisation/en_GB/mapmodes.csv | 1 + game/localisation/en_GB/menus.csv | 1 + .../GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd | 4 +++- .../GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn | 8 +++++++- 4 files changed, 12 insertions(+), 2 deletions(-) (limited to 'game') diff --git a/game/localisation/en_GB/mapmodes.csv b/game/localisation/en_GB/mapmodes.csv index bcb466f..2aa4cd2 100644 --- a/game/localisation/en_GB/mapmodes.csv +++ b/game/localisation/en_GB/mapmodes.csv @@ -4,6 +4,7 @@ mapmode_province;Province mapmode_region;Region mapmode_terrain;Terrain mapmode_index;Index +mapmode_terrain_type;Terrain Type mapmode_rgo;RGO mapmode_infrastructure;Infrastructure mapmode_population;Population Density diff --git a/game/localisation/en_GB/menus.csv b/game/localisation/en_GB/menus.csv index 57994ad..f81decf 100644 --- a/game/localisation/en_GB/menus.csv +++ b/game/localisation/en_GB/menus.csv @@ -123,6 +123,7 @@ DIALOG_SAVE_AND_QUIT;Save and Quit province_MISSING;No Province region_MISSING;No Region LIFE_RATING_TOOLTIP;Liferating: {life_rating} +terrain_type_MISSING;No Terrain Type total_population_MISSING;No Population PROVINCE_POPULATION_TOOLTIP;Province population rgo_MISSING;No RGO diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd index 01175d0..ae42450 100644 --- a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd +++ b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd @@ -3,6 +3,7 @@ extends PanelContainer @export var _province_name_label : Label @export var _region_name_label : Label @export var _life_rating_bar : ProgressBar +@export var _terrain_type_name_label : Label @export var _total_population_label : Label @export var _rgo_icon_texture_rect : TextureRect @export var _rgo_name_label : Label @@ -108,11 +109,12 @@ func _update_info() -> void: 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) - _life_rating_bar.value = _province_info.get(GameSingleton.get_province_info_life_rating_key(), 0) _life_rating_bar.tooltip_text = tr("LIFE_RATING_TOOLTIP").format({ "life_rating": Localisation.tr_number(_life_rating_bar.value) }) + _terrain_type_name_label.text = _province_info.get(GameSingleton.get_province_info_terrain_type_key(), + GameSingleton.get_province_info_terrain_type_key() + _missing_suffix) _total_population_label.text = Localisation.tr_number(_province_info.get(GameSingleton.get_province_info_total_population_key(), 0)) diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn index 7a982e9..bbd0b95 100644 --- a/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn +++ b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd" id="1_3n8k5"] [ext_resource type="PackedScene" uid="uid://cr7p1k2xm7mum" path="res://src/Game/Theme/PieChart/PieChart.tscn" id="2_3oytt"] -[node name="ProvinceOverviewPanel" type="PanelContainer" node_paths=PackedStringArray("_province_name_label", "_region_name_label", "_life_rating_bar", "_total_population_label", "_rgo_icon_texture_rect", "_rgo_name_label", "_buildings_container", "_pop_type_chart", "_pop_ideology_chart", "_pop_culture_chart")] +[node name="ProvinceOverviewPanel" type="PanelContainer" node_paths=PackedStringArray("_province_name_label", "_region_name_label", "_life_rating_bar", "_terrain_type_name_label", "_total_population_label", "_rgo_icon_texture_rect", "_rgo_name_label", "_buildings_container", "_pop_type_chart", "_pop_ideology_chart", "_pop_culture_chart")] editor_description = "UI-56" anchors_preset = 2 anchor_top = 1.0 @@ -16,6 +16,7 @@ script = ExtResource("1_3n8k5") _province_name_label = NodePath("PanelList/TopBarList/NameList/ProvinceName") _region_name_label = NodePath("PanelList/TopBarList/NameList/RegionName") _life_rating_bar = NodePath("PanelList/TopBarList/NameList/LifeRatingBar") +_terrain_type_name_label = NodePath("PanelList/TopBarList/NameList/TerrainTypeName") _total_population_label = NodePath("PanelList/InteractList/TotalPopulation") _rgo_icon_texture_rect = NodePath("PanelList/InteractList/RGOInfo/RGOIcon") _rgo_name_label = NodePath("PanelList/InteractList/RGOInfo/RGOName") @@ -52,6 +53,11 @@ editor_description = "UI-62" layout_mode = 2 mouse_filter = 1 +[node name="TerrainTypeName" type="Label" parent="PanelList/TopBarList/NameList"] +layout_mode = 2 +text = "terrain_type_MISSING" +vertical_alignment = 1 + [node name="CloseButton" type="Button" parent="PanelList/TopBarList"] custom_minimum_size = Vector2(30, 30) layout_mode = 2 -- cgit v1.2.3-56-ga3b1