From 5b0c2a5a12b74086c7e1716dc91fc54b457cdbd7 Mon Sep 17 00:00:00 2001 From: MeizhouWan Date: Tue, 29 Sep 2026 15:00:32 +0800 Subject: [PATCH] Localize budget categories and province tiles This update localizes the budget window section names for military, education, and administration spending, and adjusts related Chinese translations for consistency. It also replaces generic province tile labels from 'new' to 'build_factory' so factory construction actions are clearer, while cleaning up minor formatting in the budget UI code. --- assets/localisation/en-US/alice.csv | 3 + assets/localisation/zh-CN/alice.csv | 17 +- src/gui/budgetwindow.cpp | 412 +++++++++--------- .../gui_province_tiles_tiles.hpp | 10 +- 4 files changed, 224 insertions(+), 218 deletions(-) diff --git a/assets/localisation/en-US/alice.csv b/assets/localisation/en-US/alice.csv index 4a41c8dce..c21721a34 100644 --- a/assets/localisation/en-US/alice.csv +++ b/assets/localisation/en-US/alice.csv @@ -2043,3 +2043,6 @@ factory_investments_header;Investments total_investments_label;Total investment_efficiency_tooltip;Tools, efficiency inputs and machines investment_expansion_tooltip;Expansion +alice_budget_military_expense;Military Pay +alice_budget_education_expense;Public Education +alice_budget_administration_expense;Official Pay diff --git a/assets/localisation/zh-CN/alice.csv b/assets/localisation/zh-CN/alice.csv index c66780c83..6a0cb42de 100644 --- a/assets/localisation/zh-CN/alice.csv +++ b/assets/localisation/zh-CN/alice.csv @@ -474,8 +474,8 @@ value_mod_product;$val$ 结果： value_mod_sum;$val$ 总计： value_mod_sum_factor;影响力 $val$ 是 $x$（乘积）： admin_explain_1;行政效率修正：$val$ -admin_explain_2;应用于本土官僚比例：$val$ -admin_explain_3;对于需要的官僚人口比例为：$val$（基础 $x$ 加上来自改革的 $y$） +admin_explain_2;应用于本土官员比例：$val$ +admin_explain_3;对于需要的官员人口比例为：$val$（基础 $x$ 加上来自改革的 $y$） factory_condition_1;此国已开化 factory_condition_2;此地区不是一个殖民地区 factory_condition_3;执政党允许修建工厂 @@ -515,7 +515,7 @@ special_rules;特殊规则： voting_rules;投票规则： hide_decision;隐藏此决议通知 sup_point_gain;每月镇压点增加：?G+$val$ -sup_point_explain;来自：基础比例 $x$× 来自官僚的 $y$× 来自镇压点数修正的 $val$ +sup_point_explain;来自：基础比例 $x$× 来自官员的 $y$× 来自镇压点数修正的 $val$ pop_size_1;下月人群变化预计： pop_size_2;来自增长： pop_size_3;来自升降职： @@ -1050,9 +1050,9 @@ alice_budget_scaled_5;陆军维护：?R$value$ alice_budget_scaled_6;海军维护：?R$value$ alice_budget_scaled_7;建设：?R$value$ alice_budget_scaled_8;教育：?R$value$ -alice_budget_scaled_9;公俸：?R$value$ +alice_budget_scaled_9;行政：?R$value$ alice_budget_scaled_10;社会支出：?R$value$ -alice_budget_scaled_11;军饷：?R$value$ +alice_budget_scaled_11;军事支出：?R$value$ alice_budget_scaled_12;国内投资：?R$value$ alice_budget_scaled_13;海外支出：?R$value$ alice_budget_scaled_14;库存买入：?R$value$ @@ -1472,9 +1472,9 @@ payment_received_per_unit;每单位卖方收到 ?Y$val$ merchants_received_per_unit;每单位卖方利润 ?Y$val$ disallow_naval_trade;海上禁运 disallow_land_trade;陆上禁运 -pop_migration_bureaucracy;流动官僚管理地方：$x$ +pop_migration_bureaucracy;流动官员管理地方：$x$ pop_migration_attraction_wage_ratio;工资差距：$x$ -pop_migration_attraction_bureaucracy;官僚基础吸引力：$x$ +pop_migration_attraction_bureaucracy;官员基础吸引力：$x$ ask_free_trade_agreement;贸易协定 revoke_trade_rights;取消贸易权利 msg_trade_rights_revoked;国家 ?Y$y$?W 撤回了 ?Y$x$?! 在其国内的自由贸易权利。 @@ -2036,3 +2036,6 @@ trade_centre_wealth;库存总成本：?Y$val$ trade_centre_wealth_and_money;总资产：?Y$val$ trade_centre_arbitrage;贸易中心获利：?Y$val$ province_market_stockpiles_sales;库存销售目标：?Y$val$?! +alice_budget_military_expense;军人工资 +alice_budget_education_expense;公共教育 +alice_budget_administration_expense;官员工资 diff --git a/src/gui/budgetwindow.cpp b/src/gui/budgetwindow.cpp index e95b1d1c0..77f697b2b 100644 --- a/src/gui/budgetwindow.cpp +++ b/src/gui/budgetwindow.cpp @@ -591,12 +591,12 @@ void budgetwindow_main_income_table_t::add_budget_row(std::string name, float va values.emplace_back(budget_row_option{name, value}); } void budgetwindow_main_income_table_t::on_create(sys::state& state, layout_window_element* parent) { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::income_table::on_create // END } void budgetwindow_main_income_table_t::update(sys::state& state, layout_window_element* parent) { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::income_table::update values.clear(); add_section_header(budget_categories::poor_tax); @@ -613,7 +613,7 @@ void budgetwindow_main_income_table_t::update(sys::state& state, layout_window_ } } add_neutral_spacer(); - + add_section_header(budget_categories::middle_tax); if(budget_categories::expanded[budget_categories::middle_tax]) { add_bottom_spacer(); @@ -626,9 +626,9 @@ void budgetwindow_main_income_table_t::update(sys::state& state, layout_window_ info.mid ); } - } + } add_neutral_spacer(); - + add_section_header(budget_categories::rich_tax); if(budget_categories::expanded[budget_categories::rich_tax]) { add_bottom_spacer(); @@ -641,7 +641,7 @@ void budgetwindow_main_income_table_t::update(sys::state& state, layout_window_ info.rich ); } - } + } add_neutral_spacer(); add_section_header(budget_categories::tariffs_import); @@ -657,7 +657,7 @@ void budgetwindow_main_income_table_t::update(sys::state& state, layout_window_ ) + " (" - + + + text::produce_simple_string(state, state.world.commodity_get_name(item.commodity) ) @@ -666,9 +666,9 @@ void budgetwindow_main_income_table_t::update(sys::state& state, layout_window_ item.tariff ); } - } + } add_neutral_spacer(); - + add_section_header(budget_categories::tariffs_export); if(budget_categories::expanded[budget_categories::tariffs_export]) { add_bottom_spacer(); @@ -691,7 +691,7 @@ void budgetwindow_main_income_table_t::update(sys::state& state, layout_window_ item.tariff ); } - } + } add_neutral_spacer(); add_section_header(budget_categories::diplomatic_income); @@ -703,7 +703,7 @@ void budgetwindow_main_income_table_t::update(sys::state& state, layout_window_ auto transferamt = economy::estimate_subject_payments_paid(state, n.get_subject()); add_budget_row(text::produce_simple_string(state, text::get_name(state, n.get_subject())), transferamt); } - } + } add_neutral_spacer(); add_section_header(budget_categories::gold); @@ -876,12 +876,12 @@ void budgetwindow_main_espenses_table_t::add_budget_row(std::string name, float values.emplace_back(budget_row_option{name, value}); } void budgetwindow_main_espenses_table_t::on_create(sys::state& state, layout_window_element* parent) { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::espenses_table::on_create // END } void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_window_element* parent) { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::espenses_table::update values.clear(); add_section_header(budget_categories::construction); @@ -956,7 +956,7 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo add_budget_row(text::produce_simple_string(state, state.world.commodity_get_name(c)), goods.get(c) * fraction); } } - } + } add_neutral_spacer(); add_section_header(budget_categories::navy_upkeep); @@ -981,7 +981,7 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo add_budget_row(text::produce_simple_string(state, state.world.commodity_get_name(c)), goods.get(c) * fraction); } } - + } add_neutral_spacer(); @@ -1000,9 +1000,9 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo state, state.local_player_nation, budget_per_administration ) ); - } + } add_neutral_spacer(); - + add_section_header(budget_categories::education); if(budget_categories::expanded[budget_categories::education]) { add_bottom_spacer(); @@ -1025,7 +1025,7 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo }); } add_neutral_spacer(); - + add_section_header(budget_categories::social); if(budget_categories::expanded[budget_categories::social]) { add_bottom_spacer(); @@ -1071,9 +1071,9 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo add_budget_row(text::get_dynamic_state_name(state, local_state), total * fraction); } }); - } + } add_neutral_spacer(); - + add_section_header(budget_categories::military); if(budget_categories::expanded[budget_categories::military]) { add_bottom_spacer(); @@ -1109,7 +1109,7 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo }); } add_neutral_spacer(); - + add_section_header(budget_categories::domestic_investment); if(budget_categories::expanded[budget_categories::domestic_investment]) { add_bottom_spacer(); @@ -1166,7 +1166,7 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo } } add_neutral_spacer(); - + add_section_header(budget_categories::diplomatic_expenses); if(budget_categories::expanded[budget_categories::diplomatic_expenses]) { add_bottom_spacer(); @@ -1174,7 +1174,7 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo add_budget_row(text::produce_simple_string(state, "alice_budget_indemnities"), economy::estimate_reparations_spending(state, state.local_player_nation)); add_budget_row(text::produce_simple_string(state, "alice_budget_overlord"), economy::estimate_subject_payments_paid(state, state.local_player_nation)); add_bottom_spacer(); - } + } add_neutral_spacer(); add_section_header(budget_categories::debt_payment); @@ -1182,7 +1182,7 @@ void budgetwindow_main_espenses_table_t::update(sys::state& state, layout_windo // TODO? } add_neutral_spacer(); - + add_section_header(budget_categories::stockpile); if(budget_categories::expanded[budget_categories::stockpile]) { add_bottom_spacer(); @@ -1346,7 +1346,7 @@ void budgetwindow_main_espenses_table_t::reset_pools() { budget_row_pool_used = 0; } void budgetwindow_main_income_amount_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::income_amount::update float total = 0.0f; total += economy::estimate_diplomatic_income(state, state.local_player_nation); @@ -1361,7 +1361,7 @@ void budgetwindow_main_income_amount_t::on_update(sys::state& state) noexcept { // END } void budgetwindow_main_expenses_amount_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::expenses_amount::update auto n = state.local_player_nation; auto spending_details = economy::national_budget::estimate_budget_detailed(state, n, economy::estimate_next_budget(state, n)); @@ -1369,7 +1369,7 @@ void budgetwindow_main_expenses_amount_t::on_update(sys::state& state) noexcept // END } void budgetwindow_main_admin_eff_amount_t::update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::admin_eff_amount::tooltip auto n = state.local_player_nation; @@ -1411,7 +1411,7 @@ void budgetwindow_main_admin_eff_amount_t::update_tooltip(sys::state& state, int // END } void budgetwindow_main_admin_eff_amount_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::admin_eff_amount::update set_text(state, text::format_percentage(state.world.nation_get_administrative_efficiency(state.local_player_nation))); // END @@ -1441,7 +1441,7 @@ void budgetwindow_main_welfare_chart_poor_t::render(sys::state & state, int32_t ogl::render_linegraph(state, ogl::color_modification::none, float(x), float(y), base_data.size.x, base_data.size.y, line_color.r, line_color.g, line_color.b, line_color.a, lines); } void budgetwindow_main_welfare_chart_poor_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::welfare_chart_poor::update float min = 0.f; float max = 0.f; @@ -1516,7 +1516,7 @@ void budgetwindow_main_welfare_chart_middle_t::render(sys::state & state, int32_ ogl::render_linegraph(state, ogl::color_modification::none, float(x), float(y), base_data.size.x, base_data.size.y, line_color.r, line_color.g, line_color.b, line_color.a, lines); } void budgetwindow_main_welfare_chart_middle_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::welfare_chart_middle::update float min = 0.f; float max = 0.f; @@ -1594,7 +1594,7 @@ void budgetwindow_main_welfare_chart_rich_t::render(sys::state & state, int32_t ogl::render_linegraph(state, ogl::color_modification::none, float(x), float(y), base_data.size.x, base_data.size.y, line_color.r, line_color.g, line_color.b, line_color.a, lines); } void budgetwindow_main_welfare_chart_rich_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::welfare_chart_rich::update float min = 0.f; float max = 0.f; @@ -1648,64 +1648,64 @@ void budgetwindow_main_welfare_chart_rich_t::on_create(sys::state& state) noexce // END } void budgetwindow_main_hover_poor_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_poor::update // END } void budgetwindow_main_hover_poor_t::button_on_hover(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_poor::on_hover main.welfare_chart_middle->line_color.a = 0.2f; main.welfare_chart_rich->line_color.a = 0.2f; // END } void budgetwindow_main_hover_poor_t::button_on_hover_end(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_poor::on_hover_end main.welfare_chart_middle->line_color.a = 1.0f; main.welfare_chart_rich->line_color.a = 1.0f; // END } void budgetwindow_main_hover_middle_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_middle::update // END } void budgetwindow_main_hover_middle_t::button_on_hover(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_middle::on_hover main.welfare_chart_poor->line_color.a = 0.2f; main.welfare_chart_rich->line_color.a = 0.2f; // END } void budgetwindow_main_hover_middle_t::button_on_hover_end(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_middle::on_hover_end main.welfare_chart_poor->line_color.a = 1.0f; main.welfare_chart_rich->line_color.a = 1.0f; // END } void budgetwindow_main_hover_rich_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_rich::update // END } void budgetwindow_main_hover_rich_t::button_on_hover(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_rich::on_hover main.welfare_chart_poor->line_color.a = 0.2f; main.welfare_chart_middle->line_color.a = 0.2f; // END } void budgetwindow_main_hover_rich_t::button_on_hover_end(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::hover_rich::on_hover_end main.welfare_chart_poor->line_color.a = 1.0f; main.welfare_chart_middle->line_color.a = 1.0f; // END } void budgetwindow_main_debt_enable_t::update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::debt_enable::tooltip auto last_br = state.world.nation_get_bankrupt_until(state.local_player_nation); if(last_br && state.current_date < last_br) { @@ -1743,7 +1743,7 @@ void budgetwindow_main_debt_enable_t::update_tooltip(sys::state& state, int32_t // END } void budgetwindow_main_debt_enable_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::debt_enable::update set_active(state, state.world.nation_get_is_debt_spending(state.local_player_nation)); disabled = false; @@ -1755,21 +1755,21 @@ void budgetwindow_main_debt_enable_t::on_update(sys::state& state) noexcept { // END } bool budgetwindow_main_debt_enable_t::button_action(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::debt_enable::lbutton_action command::enable_debt(state, state.local_player_nation, !state.world.nation_get_is_debt_spending(state.local_player_nation)); // END return true; } void budgetwindow_main_total_debt_amount_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::total_debt_amount::update auto amount = state.world.nation_get_local_loan(state.local_player_nation); set_text(state, text::prettify_currency(amount)); // END } void budgetwindow_main_max_debt_amount_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::max_debt_amount::update auto amount = economy::max_loan(state, state.local_player_nation); set_text(state, text::prettify_currency(amount)); @@ -1806,7 +1806,7 @@ void budgetwindow_main_debt_chart_t::update_chart(sys::state& state) { data_texture.data_updated = true; } void budgetwindow_main_debt_chart_t::update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); if(template_id == -1) return; alice_ui::layout_window_element* par = static_cast(parent); float temp_total = 0.0f; @@ -1835,7 +1835,7 @@ void budgetwindow_main_debt_chart_t::render(sys::state & state, int32_t x, int32 ogl::render_textured_rect_direct(state, float(x), float(y), float(base_data.size.x), float(base_data.size.y), state.ui_templates.backgrounds[bg_id].renders.get_render(state, float(base_data.size.x) / float(par->grid_size), float(base_data.size.y) / float(par->grid_size), int32_t(par->grid_size), state.user_settings.ui_scale)); } void budgetwindow_main_debt_chart_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::debt_chart::update graph_content.clear(); @@ -1886,7 +1886,7 @@ void budgetwindow_main_chart_bg_t::render(sys::state & state, int32_t x, int32_t ogl::render_textured_rect(state, ui::get_color_modification(this == state.ui_state.under_mouse, false, false), float(x), float(y), float(base_data.size.x), float(base_data.size.y), ogl::get_late_load_texture_handle(state, background_texture, texture_key), base_data.get_rotation(), false, state_is_rtl(state)); } void budgetwindow_main_chart_bg_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent)); // BEGIN main::chart_bg::update // END } @@ -1910,18 +1910,18 @@ void budgetwindow_main_t::on_update(sys::state& state) noexcept { } void budgetwindow_main_t::create_layout_level(sys::state& state, layout_level& lvl, char const* ldata, size_t sz) { serialization::in_buffer buffer(ldata, sz); - buffer.read(lvl.size_x); - buffer.read(lvl.size_y); - buffer.read(lvl.margin_top); - buffer.read(lvl.margin_bottom); - buffer.read(lvl.margin_left); - buffer.read(lvl.margin_right); - buffer.read(lvl.line_alignment); - buffer.read(lvl.line_internal_alignment); - buffer.read(lvl.type); - buffer.read(lvl.page_animation); - buffer.read(lvl.interline_spacing); - buffer.read(lvl.paged); + buffer.read(lvl.size_x); + buffer.read(lvl.size_y); + buffer.read(lvl.margin_top); + buffer.read(lvl.margin_bottom); + buffer.read(lvl.margin_left); + buffer.read(lvl.margin_right); + buffer.read(lvl.line_alignment); + buffer.read(lvl.line_internal_alignment); + buffer.read(lvl.type); + buffer.read(lvl.page_animation); + buffer.read(lvl.interline_spacing); + buffer.read(lvl.paged); if(lvl.paged) { lvl.page_controls = std::make_unique(); lvl.page_controls->for_layout = &lvl; @@ -2134,7 +2134,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "income_label") { income_label = std::make_unique(); income_label->parent = this; @@ -2152,7 +2152,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "income_amount") { income_amount = std::make_unique(); income_amount->parent = this; @@ -2170,7 +2170,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "expenses_label") { expenses_label = std::make_unique(); expenses_label->parent = this; @@ -2188,7 +2188,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "expenses_amount") { expenses_amount = std::make_unique(); expenses_amount->parent = this; @@ -2206,7 +2206,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "admin_eff1") { admin_eff1 = std::make_unique(); admin_eff1->parent = this; @@ -2224,7 +2224,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "admin_eff2") { admin_eff2 = std::make_unique(); admin_eff2->parent = this; @@ -2242,7 +2242,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "admin_eff_amount") { admin_eff_amount = std::make_unique(); admin_eff_amount->parent = this; @@ -2260,7 +2260,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "welfare_label") { welfare_label = std::make_unique(); welfare_label->parent = this; @@ -2278,7 +2278,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "chart_max_a") { chart_max_a = std::make_unique(); chart_max_a->parent = this; @@ -2296,7 +2296,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "chart_min") { chart_min = std::make_unique(); chart_min->parent = this; @@ -2314,7 +2314,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "chart_max_b") { chart_max_b = std::make_unique(); chart_max_b->parent = this; @@ -2332,7 +2332,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "chart_poplabel") { chart_poplabel = std::make_unique(); chart_poplabel->parent = this; @@ -2350,7 +2350,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "chart_needslabel") { chart_needslabel = std::make_unique(); chart_needslabel->parent = this; @@ -2368,7 +2368,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "welfare_chart_poor") { welfare_chart_poor = std::make_unique(); welfare_chart_poor->parent = this; @@ -2382,7 +2382,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "welfare_chart_middle") { welfare_chart_middle = std::make_unique(); welfare_chart_middle->parent = this; @@ -2396,7 +2396,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "welfare_chart_rich") { welfare_chart_rich = std::make_unique(); welfare_chart_rich->parent = this; @@ -2410,7 +2410,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "hover_poor") { hover_poor = std::make_unique(); hover_poor->parent = this; @@ -2430,7 +2430,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "hover_middle") { hover_middle = std::make_unique(); hover_middle->parent = this; @@ -2450,7 +2450,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "hover_rich") { hover_rich = std::make_unique(); hover_rich->parent = this; @@ -2470,7 +2470,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "debt_label") { debt_label = std::make_unique(); debt_label->parent = this; @@ -2488,7 +2488,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "debt_enable") { debt_enable = std::make_unique(); debt_enable->parent = this; @@ -2506,7 +2506,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "total_debt_label") { total_debt_label = std::make_unique(); total_debt_label->parent = this; @@ -2524,7 +2524,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "max_debt_label") { max_debt_label = std::make_unique(); max_debt_label->parent = this; @@ -2542,7 +2542,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "total_debt_amount") { total_debt_amount = std::make_unique(); total_debt_amount->parent = this; @@ -2560,7 +2560,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "max_debt_amount") { max_debt_amount = std::make_unique(); max_debt_amount->parent = this; @@ -2578,7 +2578,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "debt_chart") { debt_chart = std::make_unique(); debt_chart->parent = this; @@ -2593,7 +2593,7 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "chart_bg") { chart_bg = std::make_unique(); chart_bg->parent = this; @@ -2607,12 +2607,12 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == ".tabincome_table") { int16_t running_w_total = 0; auto tbuffer = serialization::in_buffer(pending_children.back().data, pending_children.back().size); auto main_section = tbuffer.read_section(); - main_section.read(); // discard name + main_section.read(); // discard name income_table_ascending_icon_key = main_section.read(); income_table_descending_icon_key = main_section.read(); main_section.read(); @@ -2645,8 +2645,8 @@ void budgetwindow_main_t::on_create(sys::state& state) noexcept { col_section.read(income_table_item_value_header_text_color); col_section.read(income_table_item_value_text_alignment); pending_children.pop_back(); continue; - } else - if (child_data.is_lua) { + } else + if (child_data.is_lua) { std::string str_name {child_data.name}; scripted_elements[str_name] = std::make_unique(); auto cptr = scripted_elements[str_name].get(); @@ -2685,8 +2685,8 @@ std::unique_ptr make_budgetwindow_main(sys::state& state) { return ptr; } void budgetwindow_section_header_label_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::label::update switch(section_header.section_type) { case budget_categories::diplomatic_income: set_text(state, text::produce_simple_string(state, "alice_budget_diplo_income")); break; @@ -2698,9 +2698,9 @@ void budgetwindow_section_header_label_t::on_update(sys::state& state) noexcept case budget_categories::gold: set_text(state, text::produce_simple_string(state, "alice_budget_gold")); break; case budget_categories::diplomatic_expenses: set_text(state, text::produce_simple_string(state, "alice_budget_diplo_expenses")); break; case budget_categories::social: set_text(state, text::produce_simple_string(state, "alice_budget_social_spending")); break; - case budget_categories::military: set_text(state, text::produce_simple_string(state, "military")); break; - case budget_categories::education: set_text(state, text::produce_simple_string(state, "education")); break; - case budget_categories::admin: set_text(state, text::produce_simple_string(state, "administration")); break; + case budget_categories::military: set_text(state, text::produce_simple_string(state, "alice_budget_military_expense")); break; + case budget_categories::education: set_text(state, text::produce_simple_string(state, "alice_budget_education_expense")); break; + case budget_categories::admin: set_text(state, text::produce_simple_string(state, "alice_budget_administration_expense")); break; case budget_categories::domestic_investment: set_text(state, text::produce_simple_string(state, "alice_budget_domestic_investment")); break; case budget_categories::overseas_spending: set_text(state, text::produce_simple_string(state, "alice_budget_overseas_maintanance")); break; case budget_categories::subsidies: set_text(state, text::produce_simple_string(state, "budget_industrial_subsidies")); break; @@ -2714,8 +2714,8 @@ void budgetwindow_section_header_label_t::on_update(sys::state& state) noexcept // END } void budgetwindow_section_header_llbutton_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::llbutton::update switch(section_header.section_type) { case budget_categories::diplomatic_income: set_visible(state, false); break; @@ -2743,8 +2743,8 @@ void budgetwindow_section_header_llbutton_t::on_update(sys::state& state) noexce // END } bool budgetwindow_section_header_llbutton_t::button_action(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::llbutton::lbutton_action auto vals = command::make_empty_budget_settings(); switch(section_header.section_type) { @@ -2775,8 +2775,8 @@ bool budgetwindow_section_header_llbutton_t::button_action(sys::state& state) no return true; } void budgetwindow_section_header_lbutton_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::lbutton::update switch(section_header.section_type) { case budget_categories::diplomatic_income: set_visible(state, false); break; @@ -2804,8 +2804,8 @@ void budgetwindow_section_header_lbutton_t::on_update(sys::state& state) noexcep // END } bool budgetwindow_section_header_lbutton_t::button_action(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::lbutton::lbutton_action auto vals = command::make_empty_budget_settings(); switch(section_header.section_type) { @@ -2836,8 +2836,8 @@ bool budgetwindow_section_header_lbutton_t::button_action(sys::state& state) noe return true; } bool budgetwindow_section_header_lbutton_t::button_shift_action(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::lbutton::lbutton_shift_action auto vals = command::make_empty_budget_settings(); switch(section_header.section_type) { @@ -2868,8 +2868,8 @@ bool budgetwindow_section_header_lbutton_t::button_shift_action(sys::state& stat return true; } void budgetwindow_section_header_rbutton_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::rbutton::update switch(section_header.section_type) { case budget_categories::diplomatic_income: set_visible(state, false); break; @@ -2897,8 +2897,8 @@ void budgetwindow_section_header_rbutton_t::on_update(sys::state& state) noexcep // END } bool budgetwindow_section_header_rbutton_t::button_action(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::rbutton::lbutton_action auto vals = command::make_empty_budget_settings(); switch(section_header.section_type) { @@ -2929,8 +2929,8 @@ bool budgetwindow_section_header_rbutton_t::button_action(sys::state& state) noe return true; } bool budgetwindow_section_header_rbutton_t::button_shift_action(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::rbutton::lbutton_shift_action auto vals = command::make_empty_budget_settings(); switch(section_header.section_type) { @@ -2961,8 +2961,8 @@ bool budgetwindow_section_header_rbutton_t::button_shift_action(sys::state& stat return true; } void budgetwindow_section_header_rrbutton_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::rrbutton::update switch(section_header.section_type) { case budget_categories::diplomatic_income: set_visible(state, false); break; @@ -2990,8 +2990,8 @@ void budgetwindow_section_header_rrbutton_t::on_update(sys::state& state) noexce // END } bool budgetwindow_section_header_rrbutton_t::button_action(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::rrbutton::lbutton_action auto vals = command::make_empty_budget_settings(); switch(section_header.section_type) { @@ -3022,8 +3022,8 @@ bool budgetwindow_section_header_rrbutton_t::button_action(sys::state& state) no return true; } void budgetwindow_section_header_setting_amount_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::setting_amount::update switch(section_header.section_type) { case budget_categories::diplomatic_income: set_text(state, ""); break; @@ -3051,8 +3051,8 @@ void budgetwindow_section_header_setting_amount_t::on_update(sys::state& state) // END } void budgetwindow_section_header_expand_button_t::update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::expand_button::tooltip if(!budget_categories::expanded[section_header.section_type]) text::add_line(state, contents, "alice_budget_expand_tt"); @@ -3061,8 +3061,8 @@ void budgetwindow_section_header_expand_button_t::update_tooltip(sys::state& sta // END } void budgetwindow_section_header_expand_button_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::expand_button::update static auto open_icon = template_project::icon_by_name(state.ui_templates, "list_open.svg"); static auto closed_icon = template_project::icon_by_name(state.ui_templates, "list_closed.svg"); @@ -3098,8 +3098,8 @@ void budgetwindow_section_header_expand_button_t::on_update(sys::state& state) n // END } bool budgetwindow_section_header_expand_button_t::button_action(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::expand_button::lbutton_action budget_categories::expanded[section_header.section_type] = !budget_categories::expanded[section_header.section_type]; state.game_state_updated.store(true, std::memory_order::release); @@ -3107,8 +3107,8 @@ bool budgetwindow_section_header_expand_button_t::button_action(sys::state& stat return true; } void budgetwindow_section_header_total_amount_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::total_amount::update auto info = economy::explain_tax_income(state, state.local_player_nation); @@ -3148,8 +3148,8 @@ void budgetwindow_section_header_total_amount_t::on_update(sys::state& state) no // END } void budgetwindow_section_header_min_setting_t::update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::min_setting::tooltip auto value = 0; switch(section_header.section_type) { @@ -3205,8 +3205,8 @@ void budgetwindow_section_header_min_setting_t::update_tooltip(sys::state& state // END } void budgetwindow_section_header_min_setting_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::min_setting::update auto value = 0; switch(section_header.section_type) { @@ -3242,8 +3242,8 @@ void budgetwindow_section_header_min_setting_t::on_update(sys::state& state) noe // END } void budgetwindow_section_header_max_setting_t::update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::max_setting::tooltip auto value = 100; switch(section_header.section_type) { @@ -3299,8 +3299,8 @@ void budgetwindow_section_header_max_setting_t::update_tooltip(sys::state& state // END } void budgetwindow_section_header_max_setting_t::on_update(sys::state& state) noexcept { - budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_section_header_t& section_header = *((budgetwindow_section_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::max_setting::update auto value = 100; switch(section_header.section_type) { @@ -3342,25 +3342,25 @@ ui::message_result budgetwindow_section_header_t::on_rbutton_down(sys::state& st return ui::message_result::consumed; } void budgetwindow_section_header_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN section_header::update // END remake_layout(state, true); } void budgetwindow_section_header_t::create_layout_level(sys::state& state, layout_level& lvl, char const* ldata, size_t sz) { serialization::in_buffer buffer(ldata, sz); - buffer.read(lvl.size_x); - buffer.read(lvl.size_y); - buffer.read(lvl.margin_top); - buffer.read(lvl.margin_bottom); - buffer.read(lvl.margin_left); - buffer.read(lvl.margin_right); - buffer.read(lvl.line_alignment); - buffer.read(lvl.line_internal_alignment); - buffer.read(lvl.type); - buffer.read(lvl.page_animation); - buffer.read(lvl.interline_spacing); - buffer.read(lvl.paged); + buffer.read(lvl.size_x); + buffer.read(lvl.size_y); + buffer.read(lvl.margin_top); + buffer.read(lvl.margin_bottom); + buffer.read(lvl.margin_left); + buffer.read(lvl.margin_right); + buffer.read(lvl.line_alignment); + buffer.read(lvl.line_internal_alignment); + buffer.read(lvl.type); + buffer.read(lvl.page_animation); + buffer.read(lvl.interline_spacing); + buffer.read(lvl.paged); if(lvl.paged) { lvl.page_controls = std::make_unique(); lvl.page_controls->for_layout = &lvl; @@ -3513,7 +3513,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "llbutton") { llbutton = std::make_unique(); llbutton->parent = this; @@ -3531,7 +3531,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "lbutton") { lbutton = std::make_unique(); lbutton->parent = this; @@ -3549,7 +3549,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "rbutton") { rbutton = std::make_unique(); rbutton->parent = this; @@ -3567,7 +3567,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "rrbutton") { rrbutton = std::make_unique(); rrbutton->parent = this; @@ -3585,7 +3585,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "setting_amount") { setting_amount = std::make_unique(); setting_amount->parent = this; @@ -3603,7 +3603,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "expand_button") { expand_button = std::make_unique(); expand_button->parent = this; @@ -3620,7 +3620,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "total_amount") { total_amount = std::make_unique(); total_amount->parent = this; @@ -3638,7 +3638,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "min_setting") { min_setting = std::make_unique(); min_setting->parent = this; @@ -3656,7 +3656,7 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else + } else if(child_data.name == "max_setting") { max_setting = std::make_unique(); max_setting->parent = this; @@ -3674,8 +3674,8 @@ void budgetwindow_section_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else - if (child_data.is_lua) { + } else + if (child_data.is_lua) { std::string str_name {child_data.name}; scripted_elements[str_name] = std::make_unique(); auto cptr = scripted_elements[str_name].get(); @@ -3718,7 +3718,7 @@ ui::message_result budgetwindow_neutral_spacer_t::on_rbutton_down(sys::state& st return ui::message_result::consumed; } void budgetwindow_neutral_spacer_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN neutral_spacer::update // END } @@ -3735,7 +3735,7 @@ void budgetwindow_neutral_spacer_t::on_create(sys::state& state) noexcept { layout_window_element::initialize_template(state, win_data.template_id, win_data.grid_size, win_data.auto_close_button); while(!pending_children.empty()) { auto child_data = read_child_bytes(pending_children.back().data, pending_children.back().size); - if (child_data.is_lua) { + if (child_data.is_lua) { std::string str_name {child_data.name}; scripted_elements[str_name] = std::make_unique(); auto cptr = scripted_elements[str_name].get(); @@ -3774,7 +3774,7 @@ ui::message_result budgetwindow_bottom_spacer_t::on_rbutton_down(sys::state& sta return ui::message_result::consumed; } void budgetwindow_bottom_spacer_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN bottom_spacer::update // END } @@ -3791,7 +3791,7 @@ void budgetwindow_bottom_spacer_t::on_create(sys::state& state) noexcept { layout_window_element::initialize_template(state, win_data.template_id, win_data.grid_size, win_data.auto_close_button); while(!pending_children.empty()) { auto child_data = read_child_bytes(pending_children.back().data, pending_children.back().size); - if (child_data.is_lua) { + if (child_data.is_lua) { std::string str_name {child_data.name}; scripted_elements[str_name] = std::make_unique(); auto cptr = scripted_elements[str_name].get(); @@ -3853,7 +3853,7 @@ void budgetwindow_budget_row_contents_t::set_item_name_text(sys::state & state, item_name_internal_layout.contents.clear(); item_name_internal_layout.number_of_lines = 0; { - text::single_line_layout sl{ item_name_internal_layout, text::layout_parameters{ 0, 0, int16_t(table_source->income_table_item_name_column_width - 16), static_cast(base_data.size.y), text::make_font_id(state, false, 1.0f * 16), 0, table_source->income_table_item_name_text_alignment, text::text_color::black, true, true }, state_is_rtl(state) ? text::layout_base::rtl_status::rtl : text::layout_base::rtl_status::ltr }; + text::single_line_layout sl{ item_name_internal_layout, text::layout_parameters{ 0, 0, int16_t(table_source->income_table_item_name_column_width - 16), static_cast(base_data.size.y), text::make_font_id(state, false, 1.0f * 16), 0, table_source->income_table_item_name_text_alignment, text::text_color::black, true, true }, state_is_rtl(state) ? text::layout_base::rtl_status::rtl : text::layout_base::rtl_status::ltr }; sl.add_text(state, item_name_cached_text); } } else { @@ -3866,7 +3866,7 @@ void budgetwindow_budget_row_contents_t::set_item_value_text(sys::state & state, item_value_internal_layout.contents.clear(); item_value_internal_layout.number_of_lines = 0; { - text::single_line_layout sl{ item_value_internal_layout, text::layout_parameters{ 0, 0, int16_t(table_source->income_table_item_value_column_width - 16), static_cast(base_data.size.y), text::make_font_id(state, false, 1.0f * 16), 0, table_source->income_table_item_value_text_alignment, text::text_color::black, true, true }, state_is_rtl(state) ? text::layout_base::rtl_status::rtl : text::layout_base::rtl_status::ltr }; + text::single_line_layout sl{ item_value_internal_layout, text::layout_parameters{ 0, 0, int16_t(table_source->income_table_item_value_column_width - 16), static_cast(base_data.size.y), text::make_font_id(state, false, 1.0f * 16), 0, table_source->income_table_item_value_text_alignment, text::text_color::black, true, true }, state_is_rtl(state) ? text::layout_base::rtl_status::rtl : text::layout_base::rtl_status::ltr }; sl.add_text(state, item_value_cached_text); } } else { @@ -3874,7 +3874,7 @@ void budgetwindow_budget_row_contents_t::set_item_value_text(sys::state & state, } void budgetwindow_budget_row_contents_t::render(sys::state & state, int32_t x, int32_t y) noexcept { auto fh = text::make_font_id(state, false, 1.0f * 16); - auto linesz = state.font_collection.line_height(state, fh); + auto linesz = state.font_collection.line_height(state, fh); auto ycentered = (base_data.size.y - linesz) / 2; auto table_source = (budgetwindow_main_t*)(parent->parent); auto abs_location = ui::get_absolute_location(state, *this); @@ -3934,8 +3934,8 @@ void budgetwindow_budget_row_contents_t::render(sys::state & state, int32_t x, i } } void budgetwindow_budget_row_contents_t::on_update(sys::state& state) noexcept { - budgetwindow_budget_row_t& budget_row = *((budgetwindow_budget_row_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_budget_row_t& budget_row = *((budgetwindow_budget_row_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN budget_row::contents::update set_item_name_text(state, budget_row.name); set_item_value_text(state, text::prettify_currency(budget_row.value)); @@ -3955,25 +3955,25 @@ ui::message_result budgetwindow_budget_row_t::on_rbutton_down(sys::state& state, return ui::message_result::consumed; } void budgetwindow_budget_row_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN budget_row::update // END remake_layout(state, true); } void budgetwindow_budget_row_t::create_layout_level(sys::state& state, layout_level& lvl, char const* ldata, size_t sz) { serialization::in_buffer buffer(ldata, sz); - buffer.read(lvl.size_x); - buffer.read(lvl.size_y); - buffer.read(lvl.margin_top); - buffer.read(lvl.margin_bottom); - buffer.read(lvl.margin_left); - buffer.read(lvl.margin_right); - buffer.read(lvl.line_alignment); - buffer.read(lvl.line_internal_alignment); - buffer.read(lvl.type); - buffer.read(lvl.page_animation); - buffer.read(lvl.interline_spacing); - buffer.read(lvl.paged); + buffer.read(lvl.size_x); + buffer.read(lvl.size_y); + buffer.read(lvl.margin_top); + buffer.read(lvl.margin_bottom); + buffer.read(lvl.margin_left); + buffer.read(lvl.margin_right); + buffer.read(lvl.line_alignment); + buffer.read(lvl.line_internal_alignment); + buffer.read(lvl.type); + buffer.read(lvl.page_animation); + buffer.read(lvl.interline_spacing); + buffer.read(lvl.paged); if(lvl.paged) { lvl.page_controls = std::make_unique(); lvl.page_controls->for_layout = &lvl; @@ -4095,8 +4095,8 @@ void budgetwindow_budget_row_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else - if (child_data.is_lua) { + } else + if (child_data.is_lua) { std::string str_name {child_data.name}; scripted_elements[str_name] = std::make_unique(); auto cptr = scripted_elements[str_name].get(); @@ -4190,7 +4190,7 @@ void budgetwindow_budget_header_contents_t::on_reset_text(sys::state& state) noe } void budgetwindow_budget_header_contents_t::render(sys::state & state, int32_t x, int32_t y) noexcept { auto fh = text::make_font_id(state, false, 1.0f * 16); - auto linesz = state.font_collection.line_height(state, fh); + auto linesz = state.font_collection.line_height(state, fh); auto ycentered = (base_data.size.y - linesz) / 2; auto table_source = (budgetwindow_main_t*)(parent->parent); auto abs_location = ui::get_absolute_location(state, *this); @@ -4214,7 +4214,7 @@ void budgetwindow_budget_header_contents_t::render(sys::state & state, int32_t x { auto bg = template_id != -1 ? ((0 <= rel_mouse_y && rel_mouse_y < base_data.size.y && col_um_item_name) ? state.ui_templates.table_t[template_id].active_header_bg : state.ui_templates.table_t[template_id].interactable_header_bg) : -1; if(bg != -1) - ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_name_column_start), float(y), float(table_source->income_table_item_name_column_width), float(base_data.size.y), state.ui_templates.backgrounds[bg].renders.get_render(state, float(table_source->income_table_item_name_column_width) / float(table_source->grid_size), float(base_data.size.y) / float(table_source->grid_size), int32_t(table_source->grid_size), state.user_settings.ui_scale)); + ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_name_column_start), float(y), float(table_source->income_table_item_name_column_width), float(base_data.size.y), state.ui_templates.backgrounds[bg].renders.get_render(state, float(table_source->income_table_item_name_column_width) / float(table_source->grid_size), float(base_data.size.y) / float(table_source->grid_size), int32_t(table_source->grid_size), state.user_settings.ui_scale)); } if(0 <= rel_mouse_y && rel_mouse_y < base_data.size.y && col_um_item_name){ ogl::render_alpha_colored_rect(state, float(x + table_source->income_table_item_name_column_start + table_source->income_table_item_name_column_width - 2), float(y + base_data.size.y - 2), float(2), float(2), ink_color.r, ink_color.g, ink_color.b, 1.0f); @@ -4232,12 +4232,12 @@ void budgetwindow_budget_header_contents_t::render(sys::state & state, int32_t x auto col_color_item_name = state.ui_templates.colors[table_source->income_table_item_name_header_text_color]; if(table_source->income_table_item_name_sort_direction > 0) { auto icon = template_id != -1 ? state.ui_templates.table_t[template_id].arrow_increasing : -1; if(icon != -1) - ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_name_column_start + 0), float(y + base_data.size.y / 2 - 8), float(8), float(16), state.ui_templates.icons[icon].renders.get_render(state, 8, 16, state.user_settings.ui_scale, ink_color.r, ink_color.g, ink_color.b)); + ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_name_column_start + 0), float(y + base_data.size.y / 2 - 8), float(8), float(16), state.ui_templates.icons[icon].renders.get_render(state, 8, 16, state.user_settings.ui_scale, ink_color.r, ink_color.g, ink_color.b)); } if(table_source->income_table_item_name_sort_direction < 0) { auto icon = template_id != -1 ? state.ui_templates.table_t[template_id].arrow_decreasing : -1; if(icon != -1) - ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_name_column_start + 0), float(y + base_data.size.y / 2 - 8), float(8), float(16), state.ui_templates.icons[icon].renders.get_render(state, 8, 16, state.user_settings.ui_scale, ink_color.r, ink_color.g, ink_color.b)); + ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_name_column_start + 0), float(y + base_data.size.y / 2 - 8), float(8), float(16), state.ui_templates.icons[icon].renders.get_render(state, 8, 16, state.user_settings.ui_scale, ink_color.r, ink_color.g, ink_color.b)); } if(!item_name_internal_layout.contents.empty() && linesz > 0.0f) { for(auto& t : item_name_internal_layout.contents) { @@ -4248,7 +4248,7 @@ void budgetwindow_budget_header_contents_t::render(sys::state & state, int32_t x { auto bg = template_id != -1 ? ((0 <= rel_mouse_y && rel_mouse_y < base_data.size.y && col_um_item_value) ? state.ui_templates.table_t[template_id].active_header_bg : state.ui_templates.table_t[template_id].interactable_header_bg) : -1; if(bg != -1) - ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_value_column_start), float(y), float(table_source->income_table_item_value_column_width), float(base_data.size.y), state.ui_templates.backgrounds[bg].renders.get_render(state, float(table_source->income_table_item_value_column_width) / float(table_source->grid_size), float(base_data.size.y) / float(table_source->grid_size), int32_t(table_source->grid_size), state.user_settings.ui_scale)); + ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_value_column_start), float(y), float(table_source->income_table_item_value_column_width), float(base_data.size.y), state.ui_templates.backgrounds[bg].renders.get_render(state, float(table_source->income_table_item_value_column_width) / float(table_source->grid_size), float(base_data.size.y) / float(table_source->grid_size), int32_t(table_source->grid_size), state.user_settings.ui_scale)); } if(0 <= rel_mouse_y && rel_mouse_y < base_data.size.y && col_um_item_value){ ogl::render_alpha_colored_rect(state, float(x + table_source->income_table_item_value_column_start + table_source->income_table_item_value_column_width - 2), float(y + base_data.size.y - 2), float(2), float(2), ink_color.r, ink_color.g, ink_color.b, 1.0f); @@ -4266,12 +4266,12 @@ void budgetwindow_budget_header_contents_t::render(sys::state & state, int32_t x auto col_color_item_value = state.ui_templates.colors[table_source->income_table_item_value_header_text_color]; if(table_source->income_table_item_value_sort_direction > 0) { auto icon = template_id != -1 ? state.ui_templates.table_t[template_id].arrow_increasing : -1; if(icon != -1) - ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_value_column_start + 0), float(y + base_data.size.y / 2 - 8), float(8), float(16), state.ui_templates.icons[icon].renders.get_render(state, 8, 16, state.user_settings.ui_scale, ink_color.r, ink_color.g, ink_color.b)); + ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_value_column_start + 0), float(y + base_data.size.y / 2 - 8), float(8), float(16), state.ui_templates.icons[icon].renders.get_render(state, 8, 16, state.user_settings.ui_scale, ink_color.r, ink_color.g, ink_color.b)); } if(table_source->income_table_item_value_sort_direction < 0) { auto icon = template_id != -1 ? state.ui_templates.table_t[template_id].arrow_decreasing : -1; if(icon != -1) - ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_value_column_start + 0), float(y + base_data.size.y / 2 - 8), float(8), float(16), state.ui_templates.icons[icon].renders.get_render(state, 8, 16, state.user_settings.ui_scale, ink_color.r, ink_color.g, ink_color.b)); + ogl::render_textured_rect_direct(state, float(x + table_source->income_table_item_value_column_start + 0), float(y + base_data.size.y / 2 - 8), float(8), float(16), state.ui_templates.icons[icon].renders.get_render(state, 8, 16, state.user_settings.ui_scale, ink_color.r, ink_color.g, ink_color.b)); } if(!item_value_internal_layout.contents.empty() && linesz > 0.0f) { for(auto& t : item_value_internal_layout.contents) { @@ -4283,8 +4283,8 @@ void budgetwindow_budget_header_contents_t::render(sys::state & state, int32_t x } } void budgetwindow_budget_header_contents_t::on_update(sys::state& state) noexcept { - budgetwindow_budget_header_t& budget_header = *((budgetwindow_budget_header_t*)(parent)); - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_budget_header_t& budget_header = *((budgetwindow_budget_header_t*)(parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN budget_header::contents::update // END } @@ -4302,25 +4302,25 @@ ui::message_result budgetwindow_budget_header_t::on_rbutton_down(sys::state& sta return ui::message_result::consumed; } void budgetwindow_budget_header_t::on_update(sys::state& state) noexcept { - budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); + budgetwindow_main_t& main = *((budgetwindow_main_t*)(parent->parent)); // BEGIN budget_header::update // END remake_layout(state, true); } void budgetwindow_budget_header_t::create_layout_level(sys::state& state, layout_level& lvl, char const* ldata, size_t sz) { serialization::in_buffer buffer(ldata, sz); - buffer.read(lvl.size_x); - buffer.read(lvl.size_y); - buffer.read(lvl.margin_top); - buffer.read(lvl.margin_bottom); - buffer.read(lvl.margin_left); - buffer.read(lvl.margin_right); - buffer.read(lvl.line_alignment); - buffer.read(lvl.line_internal_alignment); - buffer.read(lvl.type); - buffer.read(lvl.page_animation); - buffer.read(lvl.interline_spacing); - buffer.read(lvl.paged); + buffer.read(lvl.size_x); + buffer.read(lvl.size_y); + buffer.read(lvl.margin_top); + buffer.read(lvl.margin_bottom); + buffer.read(lvl.margin_left); + buffer.read(lvl.margin_right); + buffer.read(lvl.line_alignment); + buffer.read(lvl.line_internal_alignment); + buffer.read(lvl.type); + buffer.read(lvl.page_animation); + buffer.read(lvl.interline_spacing); + buffer.read(lvl.paged); if(lvl.paged) { lvl.page_controls = std::make_unique(); lvl.page_controls->for_layout = &lvl; @@ -4442,8 +4442,8 @@ void budgetwindow_budget_header_t::on_create(sys::state& state) noexcept { cptr->on_create(state); children.push_back(cptr); pending_children.pop_back(); continue; - } else - if (child_data.is_lua) { + } else + if (child_data.is_lua) { std::string str_name {child_data.name}; scripted_elements[str_name] = std::make_unique(); auto cptr = scripted_elements[str_name].get(); diff --git a/src/gui/province_tiles/gui_province_tiles_tiles.hpp b/src/gui/province_tiles/gui_province_tiles_tiles.hpp index 1896d5b74..1af44be60 100644 --- a/src/gui/province_tiles/gui_province_tiles_tiles.hpp +++ b/src/gui/province_tiles/gui_province_tiles_tiles.hpp @@ -66,7 +66,7 @@ class empty_tile : public tile_type_logic { void button_action(sys::state& state, province_tile target, ui::element_base* parent) noexcept override { } void update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents, province_tile target) noexcept override { - + } }; @@ -298,7 +298,7 @@ class province_resource_potential_tile : public tile_type_logic { class province_build_new_tile : public tile_type_logic { public: dcon::text_key get_name(sys::state& state, province_tile target) noexcept override { - return state.lookup_key("new"); + return state.lookup_key("build_factory"); } bool is_available(sys::state& state, province_tile target) noexcept override { @@ -314,14 +314,14 @@ class province_build_new_tile : public tile_type_logic { } void update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents, province_tile target) noexcept override { - text::add_line(state, contents, state.lookup_key("new")); + text::add_line(state, contents, state.lookup_key("build_factory")); } }; class factory_construction_tile : public tile_type_logic { public: dcon::text_key get_name(sys::state& state, province_tile target) noexcept override { - return state.lookup_key("new"); + return state.lookup_key("build_factory"); } bool is_available(sys::state& state, province_tile target) noexcept override { @@ -831,7 +831,7 @@ class commodity_tile : public tile_type_logic { text::add_line(state, contents, "province_market_production", text::variable_type::val, text::fp_two_places{ std::max(0.f, state.world.market_get_supply(market, target.commodity) - economy::trade_supply(state, market, target.commodity)) }); text::add_line(state, contents, "province_market_consumption", text::variable_type::val, text::fp_two_places{ std::max(0.f, state.world.market_get_demand(market, target.commodity) - economy::trade_demand(state, market, target.commodity)) }); text::add_line(state, contents, "province_market_stockpiles", text::variable_type::val, text::fp_two_places{ state.world.market_get_stockpile(market, target.commodity) }); - text::add_line(state, contents, "province_market_stockpiles_sales", text::variable_type::val, text::fp_two_places{ state.world.market_get_stockpile_sales(market, target.commodity) }); + text::add_line(state, contents, "province_market_stockpiles_sales", text::variable_type::val, text::fp_two_places{ state.world.market_get_stockpile_sales(market, target.commodity) }); { auto supply = state.world.market_get_supply(market, target.commodity); auto demand = state.world.market_get_demand(market, target.commodity);