aboutsummaryrefslogtreecommitdiff
path: root/game
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-06-04 00:54:38 +0200
committer hop311 <hop3114@gmail.com>2024-06-06 21:30:56 +0200
commit0ba36e6762615d17605a573a036aff5bf84dfc95 (patch)
treeaea64483ffb003d74c0671f9f2a4db878a3b8cb3 /game
parentfb74bc86d194b50cb3277c7f367a5e5a0316c948 (diff)
Province const/mutable + proper State namesprovince-const-mutable
Diffstat (limited to 'game')
-rw-r--r--game/assets/localisation/locales/en_GB/menus.csv2
-rw-r--r--game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd1
-rw-r--r--game/src/Game/GameSession/ProvinceOverviewPanel.gd6
3 files changed, 5 insertions, 4 deletions
diff --git a/game/assets/localisation/locales/en_GB/menus.csv b/game/assets/localisation/locales/en_GB/menus.csv
index e488996..d5db730 100644
--- a/game/assets/localisation/locales/en_GB/menus.csv
+++ b/game/assets/localisation/locales/en_GB/menus.csv
@@ -133,7 +133,7 @@ VIC2_DIR_DIALOG_CANCEL;Cancel
;; Province Overview Panel
PROV_MISSING;No Province
-region_MISSING;No Region
+state_MISSING;No State
LIFE_RATING_TOOLTIP;Liferating: {life_rating}
terrain_type_MISSING;No Terrain Type
total_population_MISSING;No Population
diff --git a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
index 15f8dca..c3e091e 100644
--- a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
+++ b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
@@ -458,6 +458,7 @@ func _update_province_list(scroll_index : int = -1) -> void:
GUINode.format_province_name(province_list_info[name_key]) if type == MenuSingleton.LIST_ENTRY_PROVINCE
else province_list_info[name_key]
)
+ _province_list_name_labels[index].set_text_overrun_behavior(TextServer.OVERRUN_TRIM_ELLIPSIS)
if _province_list_size_labels[index]:
_province_list_size_labels[index].set_text(GUINode.int_to_string_suffixed(province_list_info[size_key]))
diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel.gd
index 7482673..5616927 100644
--- a/game/src/Game/GameSession/ProvinceOverviewPanel.gd
+++ b/game/src/Game/GameSession/ProvinceOverviewPanel.gd
@@ -242,7 +242,7 @@ func _set_core_flag(core_index : int, country : String) -> void:
func _update_info() -> void:
const _province_info_province_key : StringName = &"province"
- const _province_info_region_key : StringName = &"region"
+ const _province_info_state_key : StringName = &"state"
const _province_info_slave_status_key : StringName = &"slave_status"
const _province_info_colony_status_key : StringName = &"colony_status"
const _province_info_terrain_type_key : StringName = &"terrain_type"
@@ -268,8 +268,8 @@ func _update_info() -> void:
_province_name_label.text = GUINode.format_province_name(_province_info.get(_province_info_province_key, _missing_suffix))
if _region_name_label:
- _region_name_label.text = _province_info.get(_province_info_region_key,
- _province_info_region_key + _missing_suffix)
+ _region_name_label.text = _province_info.get(_province_info_state_key,
+ _province_info_state_key + _missing_suffix)
if _slave_status_icon:
_slave_status_icon.visible = _province_info.get(_province_info_slave_status_key, false)