diff options
Diffstat (limited to 'game/src/Game/GameSession')
4 files changed, 154 insertions, 154 deletions
diff --git a/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd b/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd index 90df650..20eb198 100644 --- a/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd +++ b/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd @@ -4,36 +4,36 @@ var _active : bool = false var _incVal : int = 0 # incremental value to see the UI update, replace later by real values # income -var _lower_class_label : GUITextLabel -var _middle_class_label : GUITextLabel -var _upper_class_label : GUITextLabel -var _gold_label : GUITextLabel -var _total_inc_label : GUITextLabel +var _lower_class_label : GUILabel +var _middle_class_label : GUILabel +var _upper_class_label : GUILabel +var _gold_label : GUILabel +var _total_inc_label : GUILabel # debt -var _national_bank_label : GUITextLabel -var _total_funds_label : GUITextLabel -var _debt_val_label : GUITextLabel -var _interest_val_label : GUITextLabel +var _national_bank_label : GUILabel +var _total_funds_label : GUILabel +var _debt_val_label : GUILabel +var _interest_val_label : GUILabel # costs -var _nat_stock_val_label : GUITextLabel -var _nat_stock_exp_label : GUITextLabel -var _mil_cost_val_label : GUITextLabel -var _overseas_cost_val_label : GUITextLabel -var _ind_sub_val_label : GUITextLabel -var _admin_efficiency_label : GUITextLabel -var _education_exp_label : GUITextLabel -var _administration_exp_label : GUITextLabel -var _social_exp_label : GUITextLabel -var _military_exp_label : GUITextLabel -var _total_exp_label : GUITextLabel +var _nat_stock_val_label : GUILabel +var _nat_stock_exp_label : GUILabel +var _mil_cost_val_label : GUILabel +var _overseas_cost_val_label : GUILabel +var _ind_sub_val_label : GUILabel +var _admin_efficiency_label : GUILabel +var _education_exp_label : GUILabel +var _administration_exp_label : GUILabel +var _social_exp_label : GUILabel +var _military_exp_label : GUILabel +var _total_exp_label : GUILabel # others -var _tariffs_percent_label : GUITextLabel -var _tariff_val_label : GUITextLabel -var _diplomatic_balance_label : GUITextLabel -var _balance_label : GUITextLabel +var _tariffs_percent_label : GUILabel +var _tariff_val_label : GUILabel +var _diplomatic_balance_label : GUILabel +var _balance_label : GUILabel var _lower_class_chart : GFXPieChartTexture var _middle_class_chart : GFXPieChartTexture @@ -55,33 +55,33 @@ func _ready() -> void: # labels # income - _lower_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_0_inc") - _middle_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_1_inc") - _upper_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_2_inc") - _gold_label = get_gui_text_label_from_nodepath(^"./country_budget/gold_inc") - _total_inc_label = get_gui_text_label_from_nodepath(^"./country_budget/total_inc") + _lower_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_0_inc") + _middle_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_1_inc") + _upper_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_2_inc") + _gold_label = get_gui_label_from_nodepath(^"./country_budget/gold_inc") + _total_inc_label = get_gui_label_from_nodepath(^"./country_budget/total_inc") # debt - _national_bank_label = get_gui_text_label_from_nodepath(^"./country_budget/national_bank_val") - _total_funds_label = get_gui_text_label_from_nodepath(^"./country_budget/total_funds_val") - _debt_val_label = get_gui_text_label_from_nodepath(^"./country_budget/debt_val") - _interest_val_label = get_gui_text_label_from_nodepath(^"./country_budget/interest_val") + _national_bank_label = get_gui_label_from_nodepath(^"./country_budget/national_bank_val") + _total_funds_label = get_gui_label_from_nodepath(^"./country_budget/total_funds_val") + _debt_val_label = get_gui_label_from_nodepath(^"./country_budget/debt_val") + _interest_val_label = get_gui_label_from_nodepath(^"./country_budget/interest_val") # costs - _nat_stock_val_label = get_gui_text_label_from_nodepath(^"./country_budget/nat_stock_val") - _nat_stock_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/nat_stock_est") - _mil_cost_val_label = get_gui_text_label_from_nodepath(^"./country_budget/mil_cost_val") - _overseas_cost_val_label = get_gui_text_label_from_nodepath(^"./country_budget/overseas_cost_val") - _ind_sub_val_label = get_gui_text_label_from_nodepath(^"./country_budget/ind_sub_val") - _admin_efficiency_label = get_gui_text_label_from_nodepath(^"./country_budget/admin_efficiency") - _education_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_0") - _administration_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_1") - _social_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_2") - _military_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_3") - _total_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/total_exp") + _nat_stock_val_label = get_gui_label_from_nodepath(^"./country_budget/nat_stock_val") + _nat_stock_exp_label = get_gui_label_from_nodepath(^"./country_budget/nat_stock_est") + _mil_cost_val_label = get_gui_label_from_nodepath(^"./country_budget/mil_cost_val") + _overseas_cost_val_label = get_gui_label_from_nodepath(^"./country_budget/overseas_cost_val") + _ind_sub_val_label = get_gui_label_from_nodepath(^"./country_budget/ind_sub_val") + _admin_efficiency_label = get_gui_label_from_nodepath(^"./country_budget/admin_efficiency") + _education_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_0") + _administration_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_1") + _social_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_2") + _military_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_3") + _total_exp_label = get_gui_label_from_nodepath(^"./country_budget/total_exp") # others - _tariffs_percent_label = get_gui_text_label_from_nodepath(^"./country_budget/tariffs_percent") - _tariff_val_label = get_gui_text_label_from_nodepath(^"./country_budget/tariff_val") - _diplomatic_balance_label = get_gui_text_label_from_nodepath(^"./country_budget/diplomatic_balance") - _balance_label = get_gui_text_label_from_nodepath(^"./country_budget/balance") + _tariffs_percent_label = get_gui_label_from_nodepath(^"./country_budget/tariffs_percent") + _tariff_val_label = get_gui_label_from_nodepath(^"./country_budget/tariff_val") + _diplomatic_balance_label = get_gui_label_from_nodepath(^"./country_budget/diplomatic_balance") + _balance_label = get_gui_label_from_nodepath(^"./country_budget/balance") # sliders # income diff --git a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd index 92ae6e2..e078934 100644 --- a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd +++ b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd @@ -14,8 +14,8 @@ var _province_list_types : Array[MenuSingleton.ProvinceListEntry] var _province_list_indices : PackedInt32Array var _province_list_panels : Array[Panel] var _province_list_button_icons : Array[GFXSpriteTexture] -var _province_list_name_labels : Array[GUITextLabel] -var _province_list_size_labels : Array[GUITextLabel] +var _province_list_name_labels : Array[GUILabel] +var _province_list_size_labels : Array[GUILabel] var _province_list_growth_icons : Array[GFXSpriteTexture] var _province_list_colony_buttons : Array[Button] var _province_list_national_focus_icons : Array[GFXSpriteTexture] @@ -33,19 +33,19 @@ var _pop_list_scrollbar : GUIScrollbar var _pop_list_scroll_index : int = 0 var _pop_list_rows : Array[Panel] -var _pop_list_size_labels : Array[GUITextLabel] +var _pop_list_size_labels : Array[GUILabel] var _pop_list_type_buttons : Array[Button] var _pop_list_type_icons : Array[GFXSpriteTexture] var _pop_list_producing_icons : Array[GFXSpriteTexture] -var _pop_list_culture_labels : Array[GUITextLabel] +var _pop_list_culture_labels : Array[GUILabel] var _pop_list_religion_icons : Array[GFXSpriteTexture] -var _pop_list_location_labels : Array[GUITextLabel] -var _pop_list_militancy_labels : Array[GUITextLabel] -var _pop_list_consciousness_labels : Array[GUITextLabel] +var _pop_list_location_labels : Array[GUILabel] +var _pop_list_militancy_labels : Array[GUILabel] +var _pop_list_consciousness_labels : Array[GUILabel] var _pop_list_ideology_charts : Array[GFXPieChartTexture] var _pop_list_issues_charts : Array[GFXPieChartTexture] var _pop_list_unemployment_progressbars : Array[TextureProgressBar] -var _pop_list_cash_labels : Array[GUITextLabel] +var _pop_list_cash_labels : Array[GUILabel] var _pop_list_life_needs_progressbars : Array[TextureProgressBar] var _pop_list_everyday_needs_progressbars : Array[TextureProgressBar] var _pop_list_luxury_needs_progressbars : Array[TextureProgressBar] @@ -58,7 +58,7 @@ var _pop_list_political_movement_icons : Array[GFXSpriteTexture] var _pop_list_national_movement_texture_rects : Array[TextureRect] var _pop_list_national_movement_flags : Array[GFXMaskedFlagTexture] var _pop_list_size_change_icons : Array[GFXSpriteTexture] -var _pop_list_literacy_labels : Array[GUITextLabel] +var _pop_list_literacy_labels : Array[GUILabel] func _ready() -> void: GameSingleton.gamestate_updated.connect(_update_info) @@ -142,9 +142,9 @@ func _generate_province_list_row(index : int, type : MenuSingleton.ProvinceListE ) _province_list_button_icons[index] = GUINode.get_gfx_sprite_texture_from_node(base_button) - _province_list_name_labels[index] = GUINode.get_gui_text_label_from_node(entry_panel.get_node(^"./poplist_name")) + _province_list_name_labels[index] = GUINode.get_gui_label_from_node(entry_panel.get_node(^"./poplist_name")) - _province_list_size_labels[index] = GUINode.get_gui_text_label_from_node(entry_panel.get_node(^"./poplist_numpops")) + _province_list_size_labels[index] = GUINode.get_gui_label_from_node(entry_panel.get_node(^"./poplist_numpops")) _province_list_growth_icons[index] = GUINode.get_gfx_sprite_texture_from_node(entry_panel.get_node(^"./growth_indicator")) @@ -273,7 +273,7 @@ func _setup_distribution_windows() -> void: _pop_screen_panel.add_child(distribution_panel) distribution_panel.set_position(distribution_start + distribution_step * Vector2(index % columns, index / columns)) - var name_label : GUITextLabel = GUINode.get_gui_text_label_from_node(distribution_panel.get_node(^"./item_name")) + var name_label : GUILabel = GUINode.get_gui_label_from_node(distribution_panel.get_node(^"./item_name")) if name_label: name_label.set_text(distribution_names[index]) @@ -318,7 +318,7 @@ func _setup_pop_list() -> void: height += pop_row_panel.size.y _pop_list_rows.push_back(pop_row_panel) - _pop_list_size_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_size"))) + _pop_list_size_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_size"))) var pop_type_button : Button = GUINode.get_button_from_node(pop_row_panel.get_node(^"./pop_type")) # TODO - open pop details menu on pop type button press @@ -328,17 +328,17 @@ func _setup_pop_list() -> void: _pop_list_producing_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./pop_producing_icon"))) - var culture_label : GUITextLabel = GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_nation")) + var culture_label : GUILabel = GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_nation")) _pop_list_culture_labels.push_back(culture_label) _pop_list_religion_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./pop_religion"))) - var location_label : GUITextLabel = GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_location")) + var location_label : GUILabel = GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_location")) _pop_list_location_labels.push_back(location_label) - _pop_list_militancy_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_mil"))) + _pop_list_militancy_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_mil"))) - _pop_list_consciousness_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_con"))) + _pop_list_consciousness_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_con"))) _pop_list_ideology_charts.push_back(GUINode.get_gfx_pie_chart_texture_from_node(pop_row_panel.get_node(^"./pop_ideology"))) @@ -346,7 +346,7 @@ func _setup_pop_list() -> void: _pop_list_unemployment_progressbars.push_back(GUINode.get_progress_bar_from_node(pop_row_panel.get_node(^"./pop_unemployment_bar"))) - _pop_list_cash_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_cash"))) + _pop_list_cash_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_cash"))) var pop_list_life_needs_progressbar : TextureProgressBar = GUINode.get_progress_bar_from_node(pop_row_panel.get_node(^"./lifeneed_progress")) if pop_list_life_needs_progressbar: @@ -390,7 +390,7 @@ func _setup_pop_list() -> void: _pop_list_size_change_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./growth_indicator"))) - _pop_list_literacy_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_literacy"))) + _pop_list_literacy_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_literacy"))) func _notification(what : int) -> void: match what: @@ -546,11 +546,11 @@ func _update_distributions(): if colour_icon_rect: colour_icon_rect.set_modulate(distribution_row[slice_colour_key]) - var identifier_label : GUITextLabel = GUINode.get_gui_text_label_from_node(child.get_node(^"./legend_title")) + var identifier_label : GUILabel = GUINode.get_gui_label_from_node(child.get_node(^"./legend_title")) if identifier_label: identifier_label.set_text(distribution_row[slice_identifier_key]) - var weight_label : GUITextLabel = GUINode.get_gui_text_label_from_node(child.get_node(^"./legend_value")) + var weight_label : GUILabel = GUINode.get_gui_label_from_node(child.get_node(^"./legend_value")) if weight_label: weight_label.set_text("%s%%" % GUINode.float_to_string_dp(distribution_row[slice_weight_key] * 100.0, 1)) diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel.gd index f953c56..f2669c0 100644 --- a/game/src/Game/GameSession/ProvinceOverviewPanel.gd +++ b/game/src/Game/GameSession/ProvinceOverviewPanel.gd @@ -1,13 +1,13 @@ extends GUINode # Header -var _province_name_label : GUITextLabel -var _state_name_label : GUITextLabel +var _province_name_label : GUILabel +var _state_name_label : GUILabel var _slave_status_icon : TextureRect var _colony_status_button : Button var _colony_status_button_texture : GFXSpriteTexture -var _administrative_percentage_label : GUITextLabel -var _owner_percentage_label : GUITextLabel +var _administrative_percentage_label : GUILabel +var _owner_percentage_label : GUILabel var _province_modifiers_overlapping_elements_box : GUIOverlappingElementsBox var _terrain_type_texture : GFXSpriteTexture var _life_rating_bar : TextureProgressBar @@ -15,21 +15,21 @@ var _controller_flag_texture : GFXMaskedFlagTexture # Statistics var _rgo_icon_texture : GFXSpriteTexture -var _rgo_produced_label : GUITextLabel -var _rgo_income_label : GUITextLabel +var _rgo_produced_label : GUILabel +var _rgo_income_label : GUILabel var _rgo_employment_percentage_texture : GFXSpriteTexture -var _rgo_employment_population_label : GUITextLabel -var _rgo_employment_percentage_label : GUITextLabel -var _crime_name_label : GUITextLabel +var _rgo_employment_population_label : GUILabel +var _rgo_employment_percentage_label : GUILabel +var _crime_name_label : GUILabel var _crime_icon_texture : GFXSpriteTexture -var _crime_fighting_label : GUITextLabel -var _total_population_label : GUITextLabel -var _migration_label : GUITextLabel -var _population_growth_label : GUITextLabel +var _crime_fighting_label : GUILabel +var _total_population_label : GUILabel +var _migration_label : GUILabel +var _population_growth_label : GUILabel var _pop_types_piechart : GFXPieChartTexture var _pop_ideologies_piechart : GFXPieChartTexture var _pop_cultures_piechart : GFXPieChartTexture -var _supply_limit_label : GUITextLabel +var _supply_limit_label : GUILabel var _cores_overlapping_elements_box : GUIOverlappingElementsBox # Buildings @@ -48,7 +48,7 @@ class BuildingSlot: var _expand_button : Button var _expanding_icon : TextureRect var _expanding_progress_bar : TextureProgressBar - var _expanding_label : GUITextLabel + var _expanding_label : GUILabel func _init(new_slot_index : int, new_slot_node : Control) -> void: if new_slot_index < 0: @@ -68,7 +68,7 @@ class BuildingSlot: else: icon.hide() - var building_name := GUINode.get_gui_text_label_from_node(_slot_node.get_node(^"./description")) + var building_name := GUINode.get_gui_label_from_node(_slot_node.get_node(^"./description")) if building_name: building_name.text = MenuSingleton.get_province_building_identifier(_slot_index) _expand_button = GUINode.get_button_from_node(_slot_node.get_node(^"./expand")) @@ -79,7 +79,7 @@ class BuildingSlot: if _expanding_progress_bar: _expanding_progress_bar.max_value = 1.0 _expanding_progress_bar.step = _expanding_progress_bar.max_value / 100 - _expanding_label = GUINode.get_gui_text_label_from_node(_slot_node.get_node(^"./expand_text")) + _expanding_label = GUINode.get_gui_label_from_node(_slot_node.get_node(^"./expand_text")) enum ExpansionState { CannotExpand, CanExpand, Preparing, Expanding } @@ -136,8 +136,8 @@ func _ready() -> void: close_button.pressed.connect(_on_close_button_pressed) # Header - _province_name_label = get_gui_text_label_from_nodepath(^"./province_view/province_view_header/province_name") - _state_name_label = get_gui_text_label_from_nodepath(^"./province_view/province_view_header/state_name") + _province_name_label = get_gui_label_from_nodepath(^"./province_view/province_view_header/province_name") + _state_name_label = get_gui_label_from_nodepath(^"./province_view/province_view_header/state_name") if _state_name_label: # State names are already translated in the MenuSingleton _state_name_label.auto_translate = false @@ -150,8 +150,8 @@ func _ready() -> void: var admin_icon_texture : GFXSpriteTexture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_view_header/admin_icon") if admin_icon_texture: admin_icon_texture.set_icon_index(MenuSingleton.get_administrative_pop_icon_index()) - _administrative_percentage_label = get_gui_text_label_from_nodepath(^"./province_view/province_view_header/admin_efficiency") - _owner_percentage_label = get_gui_text_label_from_nodepath(^"./province_view/province_view_header/owner_presence") + _administrative_percentage_label = get_gui_label_from_nodepath(^"./province_view/province_view_header/admin_efficiency") + _owner_percentage_label = get_gui_label_from_nodepath(^"./province_view/province_view_header/owner_presence") _province_modifiers_overlapping_elements_box = get_gui_overlapping_elements_box_from_nodepath(^"./province_view/province_view_header/province_modifiers") if _province_modifiers_overlapping_elements_box and _province_modifiers_overlapping_elements_box.set_gui_child_element_name("province_interface", "prov_state_modifier") != OK: _province_modifiers_overlapping_elements_box = null # hide province modifiers box since we can't do anything with it @@ -161,17 +161,17 @@ func _ready() -> void: # Statistics _rgo_icon_texture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_statistics/goods_type") - _rgo_produced_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/produced") - _rgo_income_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/income") + _rgo_produced_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/produced") + _rgo_income_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/income") _rgo_employment_percentage_texture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_statistics/employment_ratio") - _rgo_employment_population_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/rgo_population") - _rgo_employment_percentage_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/rgo_percent") - _crime_name_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/crime_name") + _rgo_employment_population_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/rgo_population") + _rgo_employment_percentage_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/rgo_percent") + _crime_name_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/crime_name") _crime_icon_texture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_statistics/crime_icon") - _crime_fighting_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/crimefight_percent") - _total_population_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/total_population") - _migration_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/migration") - _population_growth_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/growth") + _crime_fighting_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/crimefight_percent") + _total_population_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/total_population") + _migration_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/migration") + _population_growth_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/growth") _pop_types_piechart = get_gfx_pie_chart_texture_from_nodepath(^"./province_view/province_statistics/workforce_chart") _pop_ideologies_piechart = get_gfx_pie_chart_texture_from_nodepath(^"./province_view/province_statistics/ideology_chart") _pop_cultures_piechart = get_gfx_pie_chart_texture_from_nodepath(^"./province_view/province_statistics/culture_chart") @@ -183,7 +183,7 @@ func _ready() -> void: _on_close_button_pressed() Events.NationManagementScreens.open_nation_management_screen(NationManagement.Screen.POPULATION) ) - _supply_limit_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/supply_limit_label") + _supply_limit_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/supply_limit_label") _cores_overlapping_elements_box = get_gui_overlapping_elements_box_from_nodepath(^"./province_view/province_statistics/core_icons") if _cores_overlapping_elements_box and _cores_overlapping_elements_box.set_gui_child_element_name("province_interface", "province_core") != OK: _cores_overlapping_elements_box = null # hide cores box since we can't do anything with it diff --git a/game/src/Game/GameSession/Topbar.gd b/game/src/Game/GameSession/Topbar.gd index a173ccd..d6cc358 100644 --- a/game/src/Game/GameSession/Topbar.gd +++ b/game/src/Game/GameSession/Topbar.gd @@ -3,21 +3,21 @@ extends GUINode # Country info var _country_flag_texture : GFXMaskedFlagTexture var _country_flag_overlay_texture : GFXSpriteTexture -var _country_name_label : GUITextLabel -var _country_rank_label : GUITextLabel -var _country_prestige_label : GUITextLabel -var _country_prestige_rank_label : GUITextLabel -var _country_industrial_power_label : GUITextLabel -var _country_industrial_power_rank_label : GUITextLabel -var _country_military_power_label : GUITextLabel -var _country_military_power_rank_label : GUITextLabel -var _country_colonial_power_label : GUITextLabel +var _country_name_label : GUILabel +var _country_rank_label : GUILabel +var _country_prestige_label : GUILabel +var _country_prestige_rank_label : GUILabel +var _country_industrial_power_label : GUILabel +var _country_industrial_power_rank_label : GUILabel +var _country_military_power_label : GUILabel +var _country_military_power_rank_label : GUILabel +var _country_colonial_power_label : GUILabel # Time controls var _speed_up_button : Button var _speed_down_button : Button var _speed_indicator_texture : GFXSpriteTexture -var _date_label : GUITextLabel +var _date_label : GUILabel # NationManagement.Screen-Button var _nation_management_buttons : Dictionary @@ -32,48 +32,48 @@ var _production_alert_unemployment_texture : GFXSpriteTexture # Budget # TODO - line chart -var _budget_funds_label : GUITextLabel +var _budget_funds_label : GUILabel # Technology var _technology_progress_bar : TextureProgressBar -var _technology_current_research_label : GUITextLabel -var _technology_literacy_label : GUITextLabel -var _technology_research_points_label : GUITextLabel +var _technology_current_research_label : GUILabel +var _technology_literacy_label : GUILabel +var _technology_research_points_label : GUILabel # Politics var _politics_party_icon : TextureRect -var _politics_party_label : GUITextLabel -var _politics_suppression_points_label : GUITextLabel -var _politics_infamy_label : GUITextLabel +var _politics_party_label : GUILabel +var _politics_suppression_points_label : GUILabel +var _politics_infamy_label : GUILabel var _politics_reforms_texture : GFXSpriteTexture var _politics_decisions_texture : GFXSpriteTexture var _politics_election_texture : GFXSpriteTexture var _politics_rebels_texture : GFXSpriteTexture # Population -var _population_total_size_label : GUITextLabel -var _population_national_foci_label : GUITextLabel -var _population_militancy_label : GUITextLabel -var _population_consciousness_label : GUITextLabel +var _population_total_size_label : GUILabel +var _population_national_foci_label : GUILabel +var _population_militancy_label : GUILabel +var _population_consciousness_label : GUILabel # Trade var _trade_imported_textures : Array[GFXSpriteTexture] var _trade_exported_textures : Array[GFXSpriteTexture] # Diplomacy -var _diplomacy_peace_label : GUITextLabel +var _diplomacy_peace_label : GUILabel var _diplomacy_war_enemies_overlapping_elements_box : GUIOverlappingElementsBox -var _diplomacy_diplomatic_points_label : GUITextLabel +var _diplomacy_diplomatic_points_label : GUILabel var _diplomacy_alert_colony_texture : GFXSpriteTexture var _diplomacy_alert_crisis_texture : GFXSpriteTexture var _diplomacy_alert_sphere_texture : GFXSpriteTexture var _diplomacy_alert_great_power_texture : GFXSpriteTexture # Military -var _military_army_size_label : GUITextLabel -var _military_navy_size_label : GUITextLabel -var _military_mobilisation_size_label : GUITextLabel -var _military_leadership_points_label : GUITextLabel +var _military_army_size_label : GUILabel +var _military_navy_size_label : GUILabel +var _military_mobilisation_size_label : GUILabel +var _military_leadership_points_label : GUILabel func _ready() -> void: GameSingleton.gamestate_updated.connect(_update_info) @@ -102,15 +102,15 @@ func _ready() -> void: ) _country_flag_texture = GUINode.get_gfx_masked_flag_texture_from_node(country_flag_button) _country_flag_overlay_texture = get_gfx_sprite_texture_from_nodepath(^"./topbar/topbar_flag_overlay") - _country_name_label = get_gui_text_label_from_nodepath(^"./topbar/CountryName") - _country_rank_label = get_gui_text_label_from_nodepath(^"./topbar/nation_totalrank") - _country_prestige_label = get_gui_text_label_from_nodepath(^"./topbar/country_prestige") - _country_prestige_rank_label = get_gui_text_label_from_nodepath(^"./topbar/selected_prestige_rank") - _country_industrial_power_label = get_gui_text_label_from_nodepath(^"./topbar/country_economic") - _country_industrial_power_rank_label = get_gui_text_label_from_nodepath(^"./topbar/selected_industry_rank") - _country_military_power_label = get_gui_text_label_from_nodepath(^"./topbar/country_military") - _country_military_power_rank_label = get_gui_text_label_from_nodepath(^"./topbar/selected_military_rank") - _country_colonial_power_label = get_gui_text_label_from_nodepath(^"./topbar/country_colonial_power") + _country_name_label = get_gui_label_from_nodepath(^"./topbar/CountryName") + _country_rank_label = get_gui_label_from_nodepath(^"./topbar/nation_totalrank") + _country_prestige_label = get_gui_label_from_nodepath(^"./topbar/country_prestige") + _country_prestige_rank_label = get_gui_label_from_nodepath(^"./topbar/selected_prestige_rank") + _country_industrial_power_label = get_gui_label_from_nodepath(^"./topbar/country_economic") + _country_industrial_power_rank_label = get_gui_label_from_nodepath(^"./topbar/selected_industry_rank") + _country_military_power_label = get_gui_label_from_nodepath(^"./topbar/country_military") + _country_military_power_rank_label = get_gui_label_from_nodepath(^"./topbar/selected_military_rank") + _country_colonial_power_label = get_gui_label_from_nodepath(^"./topbar/country_colonial_power") # Time controls _speed_up_button = get_button_from_nodepath(^"./topbar/button_speedup") @@ -126,7 +126,7 @@ func _ready() -> void: if speed_indicator_button: speed_indicator_button.pressed.connect(_on_play_pause_button_pressed) _speed_indicator_texture = GUINode.get_gfx_sprite_texture_from_node(speed_indicator_button) - _date_label = get_gui_text_label_from_nodepath(^"./topbar/DateText") + _date_label = get_gui_label_from_nodepath(^"./topbar/DateText") # Nation management screens const screen_nodepaths : Dictionary = { @@ -162,17 +162,17 @@ func _ready() -> void: _production_alert_unemployment_texture = get_gfx_sprite_texture_from_nodepath(^"./topbar/alert_unemployed_workers") # Budget - _budget_funds_label = get_gui_text_label_from_nodepath(^"./topbar/budget_funds") + _budget_funds_label = get_gui_label_from_nodepath(^"./topbar/budget_funds") # Technology _technology_progress_bar = get_progress_bar_from_nodepath(^"./topbar/topbar_tech_progress") - _technology_current_research_label = get_gui_text_label_from_nodepath(^"./topbar/tech_current_research") - _technology_literacy_label = get_gui_text_label_from_nodepath(^"./topbar/tech_literacy_value") - _technology_research_points_label = get_gui_text_label_from_nodepath(^"./topbar/topbar_researchpoints_value") + _technology_current_research_label = get_gui_label_from_nodepath(^"./topbar/tech_current_research") + _technology_literacy_label = get_gui_label_from_nodepath(^"./topbar/tech_literacy_value") + _technology_research_points_label = get_gui_label_from_nodepath(^"./topbar/topbar_researchpoints_value") # Politics _politics_party_icon = get_texture_rect_from_nodepath(^"./topbar/politics_party_icon") - _politics_party_label = get_gui_text_label_from_nodepath(^"./topbar/politics_ruling_party") + _politics_party_label = get_gui_label_from_nodepath(^"./topbar/politics_ruling_party") var politics_suppression_button : Button = get_button_from_nodepath(^"./topbar/topbar_supression_icon") if politics_suppression_button: politics_suppression_button.pressed.connect( @@ -180,8 +180,8 @@ func _ready() -> void: # TODO - open the politics menu on the Movements tab Events.NationManagementScreens.toggle_nation_management_screen(NationManagement.Screen.POLITICS) ) - _politics_suppression_points_label = get_gui_text_label_from_nodepath(^"./topbar/politics_supressionpoints_value") - _politics_infamy_label = get_gui_text_label_from_nodepath(^"./topbar/politics_infamy_value") + _politics_suppression_points_label = get_gui_label_from_nodepath(^"./topbar/politics_supressionpoints_value") + _politics_infamy_label = get_gui_label_from_nodepath(^"./topbar/politics_infamy_value") var politics_reforms_button : Button = get_button_from_nodepath(^"./topbar/alert_can_do_reforms") if politics_reforms_button: politics_reforms_button.pressed.connect( @@ -209,10 +209,10 @@ func _ready() -> void: _politics_rebels_texture = GUINode.get_gfx_sprite_texture_from_node(politics_rebels_button) # Population - _population_total_size_label = get_gui_text_label_from_nodepath(^"./topbar/population_total_value") - _population_national_foci_label = get_gui_text_label_from_nodepath(^"./topbar/topbar_focus_value") - _population_militancy_label = get_gui_text_label_from_nodepath(^"./topbar/population_avg_mil_value") - _population_consciousness_label = get_gui_text_label_from_nodepath(^"./topbar/population_avg_con_value") + _population_total_size_label = get_gui_label_from_nodepath(^"./topbar/population_total_value") + _population_national_foci_label = get_gui_label_from_nodepath(^"./topbar/topbar_focus_value") + _population_militancy_label = get_gui_label_from_nodepath(^"./topbar/population_avg_mil_value") + _population_consciousness_label = get_gui_label_from_nodepath(^"./topbar/population_avg_con_value") # Trade const TRADE_GOOD_COUNT : int = 3 @@ -221,9 +221,9 @@ func _ready() -> void: _trade_exported_textures.push_back(get_gfx_sprite_texture_from_nodepath("./topbar/topbar_export%d" % idx)) # Diplomacy - _diplomacy_peace_label = get_gui_text_label_from_nodepath(^"./topbar/diplomacy_status") + _diplomacy_peace_label = get_gui_label_from_nodepath(^"./topbar/diplomacy_status") _diplomacy_war_enemies_overlapping_elements_box = get_gui_overlapping_elements_box_from_nodepath(^"./topbar/diplomacy_at_war") - _diplomacy_diplomatic_points_label = get_gui_text_label_from_nodepath(^"./topbar/diplomacy_diplopoints_value") + _diplomacy_diplomatic_points_label = get_gui_label_from_nodepath(^"./topbar/diplomacy_diplopoints_value") var diplomacy_alert_colony_button : Button = get_button_from_nodepath(^"./topbar/alert_colony") if diplomacy_alert_colony_button: diplomacy_alert_colony_button.pressed.connect( @@ -237,10 +237,10 @@ func _ready() -> void: _diplomacy_alert_great_power_texture = get_gfx_sprite_texture_from_nodepath(^"./topbar/alert_loosing_gp") # Military - _military_army_size_label = get_gui_text_label_from_nodepath(^"./topbar/military_army_value") - _military_navy_size_label = get_gui_text_label_from_nodepath(^"./topbar/military_navy_value") - _military_mobilisation_size_label = get_gui_text_label_from_nodepath(^"./topbar/military_manpower_value") - _military_leadership_points_label = get_gui_text_label_from_nodepath(^"./topbar/military_leadership_value") + _military_army_size_label = get_gui_label_from_nodepath(^"./topbar/military_army_value") + _military_navy_size_label = get_gui_label_from_nodepath(^"./topbar/military_navy_value") + _military_mobilisation_size_label = get_gui_label_from_nodepath(^"./topbar/military_manpower_value") + _military_leadership_points_label = get_gui_label_from_nodepath(^"./topbar/military_leadership_value") _update_info() _update_speed_controls() |