aboutsummaryrefslogtreecommitdiff
path: root/game/src/Game/GameSession
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-05-08 01:27:20 +0200
committer hop311 <hop3114@gmail.com>2024-05-08 01:27:20 +0200
commit719610ccebc023a4b21b5b8c716e73c2fe563c6d (patch)
tree5477212120bb0635ce61b6369267d5e59346cd98 /game/src/Game/GameSession
parentc29cc0dabe3e3c7d03280e74d2d10fc3cc479c7f (diff)
Updated number formatting functions
Diffstat (limited to 'game/src/Game/GameSession')
-rw-r--r--game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd16
-rw-r--r--game/src/Game/GameSession/ProvinceOverviewPanel.gd7
2 files changed, 11 insertions, 12 deletions
diff --git a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
index 5de2d25..ef0f404 100644
--- a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
+++ b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
@@ -436,7 +436,7 @@ func _update_province_list(scroll_index : int = -1) -> void:
)
if _province_list_size_labels[index]:
- _province_list_size_labels[index].set_text(GUINode.int_to_formatted_string(province_list_info[size_key]))
+ _province_list_size_labels[index].set_text(GUINode.int_to_string_suffixed(province_list_info[size_key]))
if _province_list_growth_icons[index]:
_province_list_growth_icons[index].set_icon_index(get_growth_icon_index(province_list_info[change_key]))
@@ -529,7 +529,7 @@ func _update_distributions():
var weight_label : Label = GUINode.get_label_from_node(child.get_node(^"./legend_value"))
if weight_label:
- weight_label.set_text("%s%%" % GUINode.float_to_formatted_string(distribution_row[slice_weight_key] * 100.0, 1))
+ weight_label.set_text("%s%%" % GUINode.float_to_string_dp(distribution_row[slice_weight_key] * 100.0, 1))
func _update_pop_list() -> void:
if _pop_list_scrollbar:
@@ -567,7 +567,7 @@ func _update_pop_list() -> void:
var pop_row : Dictionary = pop_rows[index]
if _pop_list_size_labels[index]:
- _pop_list_size_labels[index].set_text(GUINode.int_to_formatted_string(pop_row[pop_size_key]))
+ _pop_list_size_labels[index].set_text(GUINode.int_to_string_suffixed(pop_row[pop_size_key]))
if _pop_list_type_icons[index]:
_pop_list_type_icons[index].set_icon_index(pop_row[pop_type_icon_key])
if _pop_list_culture_labels[index]:
@@ -575,11 +575,11 @@ func _update_pop_list() -> void:
if _pop_list_religion_icons[index]:
_pop_list_religion_icons[index].set_icon_index(pop_row[pop_religion_icon_key])
if _pop_list_location_labels[index]:
- _pop_list_location_labels[index].set_text(GUINode.format_province_name(pop_row[pop_location_key]))
+ _pop_list_location_labels[index].set_text(GUINode.format_province_name(pop_row.get(pop_location_key, "")))
if _pop_list_militancy_labels[index]:
- _pop_list_militancy_labels[index].set_text(GUINode.float_to_formatted_string(pop_row[pop_militancy_key], 2))
+ _pop_list_militancy_labels[index].set_text(GUINode.float_to_string_dp(pop_row[pop_militancy_key], 2))
if _pop_list_consciousness_labels[index]:
- _pop_list_consciousness_labels[index].set_text(GUINode.float_to_formatted_string(pop_row[pop_consciousness_key], 2))
+ _pop_list_consciousness_labels[index].set_text(GUINode.float_to_string_dp(pop_row[pop_consciousness_key], 2))
if _pop_list_ideology_charts[index]:
_pop_list_ideology_charts[index].set_slices_array(pop_row[pop_ideology_key])
if _pop_list_issues_charts[index]:
@@ -587,7 +587,7 @@ func _update_pop_list() -> void:
if _pop_list_unemployment_progressbars[index]:
_pop_list_unemployment_progressbars[index].set_value_no_signal(pop_row[pop_unemployment_key])
if _pop_list_cash_labels[index]:
- _pop_list_cash_labels[index].set_text(GUINode.float_to_formatted_string(pop_row[pop_cash_key], 2))
+ _pop_list_cash_labels[index].set_text(GUINode.float_to_string_dp(pop_row[pop_cash_key], 2))
if _pop_list_life_needs_progressbars[index]:
_pop_list_life_needs_progressbars[index].set_value_no_signal(pop_row[pop_life_needs_key])
if _pop_list_everyday_needs_progressbars[index]:
@@ -597,7 +597,7 @@ func _update_pop_list() -> void:
if _pop_list_size_change_icons[index]:
_pop_list_size_change_icons[index].set_icon_index(get_growth_icon_index(pop_row[pop_size_change_key]))
if _pop_list_literacy_labels[index]:
- _pop_list_literacy_labels[index].set_text("%s%%" % GUINode.float_to_formatted_string(pop_row[pop_literacy_key], 2))
+ _pop_list_literacy_labels[index].set_text("%s%%" % GUINode.float_to_string_dp(pop_row[pop_literacy_key], 2))
_pop_list_rows[index].show()
else:
diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel.gd
index 42f6765..fd089e7 100644
--- a/game/src/Game/GameSession/ProvinceOverviewPanel.gd
+++ b/game/src/Game/GameSession/ProvinceOverviewPanel.gd
@@ -176,7 +176,6 @@ func _ready() -> void:
if population_menu_button:
population_menu_button.pressed.connect(
func() -> void:
- pass
MenuSingleton.population_menu_select_province(_selected_index)
_on_close_button_pressed()
Events.NationManagementScreens.open_nation_management_screen(NationManagement.Screen.POPULATION)
@@ -323,14 +322,14 @@ func _update_info() -> void:
if _rgo_income_label:
# TODO - add £ sign and replace placeholder with actual value
- _rgo_income_label.text = GUINode.float_to_formatted_string(12.34567, 3)
+ _rgo_income_label.text = "%s £" % GUINode.float_to_string_dp(12.34567, 3)
if _rgo_employment_percentage_texture:
pass
if _rgo_employment_population_label:
# TODO - replace placeholder with actual value
- _rgo_employment_population_label.text = GUINode.int_to_formatted_string(_province_info.get(_province_info_total_population_key, 0) / 10)
+ _rgo_employment_population_label.text = GUINode.int_to_string_suffixed(_province_info.get(_province_info_total_population_key, 0) / 10)
if _rgo_employment_percentage_label:
pass
@@ -345,7 +344,7 @@ func _update_info() -> void:
pass
if _total_population_label:
- _total_population_label.text = GUINode.int_to_formatted_string(_province_info.get(_province_info_total_population_key, 0))
+ _total_population_label.text = GUINode.int_to_string_suffixed(_province_info.get(_province_info_total_population_key, 0))
if _migration_label:
pass