Skip to content

UI for budget cuts #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2025
Merged

UI for budget cuts #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions extension/src/openvic-extension/components/budget/AdministrationBudget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,6 @@ AdministrationBudget::AdministrationBudget(
"ADMINISTRATION","ADM_DESC"
);

if (budget_label != nullptr) {
budget_label->set_tooltip_string(
Utilities::format(
"%s\n--------------\n%s",
budget_label->tr("DIST_ADMINISTRATION"),
budget_label->tr("ADM_DESC")
)
);
}

administrative_efficiency_tooltip_args.resize(7);
administrative_efficiency_tooltip_args[1] = administrative_efficiency_label.tr("BUDGET_ADMIN_EFFICIENCY_DESC2");
administrative_efficiency_tooltip_args[4] = administrative_efficiency_label.tr("ADM_EXPLAIN_DESC");
Expand All @@ -57,6 +47,10 @@ fixed_point_t AdministrationBudget::get_expenses() const {
return std::max(fixed_point_t::_0, -get_balance());
}

bool AdministrationBudget::was_budget_cut(CountryInstance const& country) const {
return country.get_was_administration_budget_cut_yesterday();
}

fixed_point_t AdministrationBudget::calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
Expand Down Expand Up @@ -146,6 +140,24 @@ fixed_point_t AdministrationBudget::calculate_budget_and_update_custom(
administrative_efficiency_template % administrative_efficiency_tooltip_args
);

if (budget_label != nullptr) {
budget_label->set_tooltip_string(
Utilities::format(
"%s\n--------------\n%s%s",
budget_label->tr("DIST_ADMINISTRATION"),
was_budget_cut(country)
? budget_label->tr("EXPENSE_NO_AFFORD").replace(
Utilities::get_short_value_placeholder(),
Utilities::float_to_string_dp_dynamic(
country.get_actual_administration_spending().load()
)
) + "\n"
: "",
budget_label->tr("ADM_DESC")
)
);
}

return scaled_value * country.get_projected_administration_spending_unscaled_by_slider_untracked();
}

Expand Down
2 changes: 2 additions & 0 deletions extension/src/openvic-extension/components/budget/AdministrationBudget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ namespace OpenVic {
CountryDefines const& country_defines;
godot::Array administrative_efficiency_tooltip_args;
GUILabel& administrative_efficiency_label;

bool was_budget_cut(CountryInstance const& country) const override;
fixed_point_t calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
Expand Down
33 changes: 23 additions & 10 deletions extension/src/openvic-extension/components/budget/EducationBudget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "openvic-extension/classes/GUILabel.hpp"
#include "openvic-extension/classes/GUIScrollbar.hpp"
#include "openvic-extension/singletons/PlayerSingleton.hpp"
#include "openvic-extension/utility/Utilities.hpp"

using namespace OpenVic;

Expand All @@ -27,26 +28,38 @@ EducationBudget::EducationBudget(GUINode const& parent):
parent, "./country_budget/education_desc",
"EDUCATION","EDU_DESC"
);

if (budget_label != nullptr) {
budget_label->set_tooltip_string(
Utilities::format(
"%s\n--------------\n%s",
budget_label->tr("DIST_EDUCATION"),
budget_label->tr("EDU_DESC")
)
);
}
}

fixed_point_t EducationBudget::get_expenses() const {
return std::max(fixed_point_t::_0, -get_balance());
}

bool EducationBudget::was_budget_cut(CountryInstance const& country) const {
return country.get_was_education_budget_cut_yesterday();
}

fixed_point_t EducationBudget::calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
) {
if (budget_label != nullptr) {
budget_label->set_tooltip_string(
Utilities::format(
"%s\n--------------\n%s%s",
budget_label->tr("DIST_EDUCATION"),
was_budget_cut(country)
? budget_label->tr("EXPENSE_NO_AFFORD").replace(
Utilities::get_short_value_placeholder(),
Utilities::float_to_string_dp_dynamic(
country.get_actual_education_spending().load()
)
) + "\n"
: "",
budget_label->tr("EDU_DESC")
)
);
}

return scaled_value * country.get_projected_education_spending_unscaled_by_slider_untracked();
}

Expand Down
1 change: 1 addition & 0 deletions extension/src/openvic-extension/components/budget/EducationBudget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
namespace OpenVic {
struct EducationBudget : public SliderBudgetComponent, public BudgetExpenseComponent {
private:
bool was_budget_cut(CountryInstance const& country) const override;
fixed_point_t calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
Expand Down
33 changes: 23 additions & 10 deletions extension/src/openvic-extension/components/budget/MilitaryBudget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "openvic-extension/classes/GUILabel.hpp"
#include "openvic-extension/classes/GUIScrollbar.hpp"
#include "openvic-extension/singletons/PlayerSingleton.hpp"
#include "openvic-extension/utility/Utilities.hpp"

using namespace OpenVic;

Expand All @@ -27,26 +28,38 @@ MilitaryBudget::MilitaryBudget(GUINode const& parent):
parent, "./country_budget/mil_spend_desc",
"MILITARY_SPENDING","DEFENCE_DESC"
);

if (budget_label != nullptr) {
budget_label->set_tooltip_string(
Utilities::format(
"%s\n--------------\n%s",
budget_label->tr("DIST_DEFENCE"),
budget_label->tr("DEFENCE_DESC")
)
);
}
}

fixed_point_t MilitaryBudget::get_expenses() const {
return std::max(fixed_point_t::_0, -get_balance());
}

bool MilitaryBudget::was_budget_cut(CountryInstance const& country) const {
return country.get_was_military_budget_cut_yesterday();
}

fixed_point_t MilitaryBudget::calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
) {
if (budget_label != nullptr) {
budget_label->set_tooltip_string(
Utilities::format(
"%s\n--------------\n%s%s",
budget_label->tr("DIST_DEFENCE"),
was_budget_cut(country)
? budget_label->tr("EXPENSE_NO_AFFORD").replace(
Utilities::get_short_value_placeholder(),
Utilities::float_to_string_dp_dynamic(
country.get_actual_military_spending().load()
)
) + "\n"
: "",
budget_label->tr("DEFENCE_DESC")
)
);
}

return scaled_value * country.get_projected_military_spending_unscaled_by_slider_untracked();
}

Expand Down
1 change: 1 addition & 0 deletions extension/src/openvic-extension/components/budget/MilitaryBudget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
namespace OpenVic {
struct MilitaryBudget : public SliderBudgetComponent, public BudgetExpenseComponent {
private:
bool was_budget_cut(CountryInstance const& country) const override;
fixed_point_t calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
Expand Down
34 changes: 24 additions & 10 deletions extension/src/openvic-extension/components/budget/SocialBudget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "openvic-extension/classes/GUINode.hpp"
#include "openvic-extension/classes/GUIScrollbar.hpp"
#include "openvic-extension/singletons/PlayerSingleton.hpp"
#include "openvic-extension/utility/Utilities.hpp"

using namespace OpenVic;

Expand All @@ -31,26 +32,39 @@ SocialBudget::SocialBudget(GUINode const& parent):
parent, "./country_budget/soc_stand_desc",
"SOCIAL_SPENDING","SOCIAL_DESC2"
);

if (budget_label != nullptr) {
budget_label->set_tooltip_string(
Utilities::format(
"%s\n--------------\n%s",
budget_label->tr("DIST_SOCIAL"),
budget_label->tr("SOCIAL_DESC2")
)
);
}
}

fixed_point_t SocialBudget::get_expenses() const {
return std::max(fixed_point_t::_0, -get_balance());
}

bool SocialBudget::was_budget_cut(CountryInstance const& country) const {
return country.get_was_social_budget_cut_yesterday();
}

fixed_point_t SocialBudget::calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
) {
if (budget_label != nullptr) {
budget_label->set_tooltip_string(
Utilities::format(
"%s\n--------------\n%s%s",
budget_label->tr("DIST_SOCIAL"),
was_budget_cut(country)
? budget_label->tr("EXPENSE_NO_AFFORD").replace(
Utilities::get_short_value_placeholder(),
Utilities::float_to_string_dp_dynamic(
country.get_actual_pensions_spending().load()
+ country.get_actual_unemployment_subsidies_spending().load()
)
) + "\n"
: "",
budget_label->tr("SOCIAL_DESC2")
)
);
}

const fixed_point_t pensions = scaled_value * country.get_projected_pensions_spending_unscaled_by_slider_untracked();
pensions_label.set_text(
Utilities::cash_to_string_dp_dynamic(pensions)
Expand Down
2 changes: 2 additions & 0 deletions extension/src/openvic-extension/components/budget/SocialBudget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ namespace OpenVic {
private:
GUILabel& pensions_label;
GUILabel& unemployment_subsidies_label;

bool was_budget_cut(CountryInstance const& country) const override;
fixed_point_t calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
Expand Down
4 changes: 4 additions & 0 deletions extension/src/openvic-extension/components/budget/TariffBudget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ fixed_point_t TariffBudget::get_income() const {
return std::max(fixed_point_t::_0, get_balance());
}

bool TariffBudget::was_budget_cut(CountryInstance const& country) const {
return country.get_was_import_subsidies_budget_cut_yesterday();
}

fixed_point_t TariffBudget::calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
Expand Down
1 change: 1 addition & 0 deletions extension/src/openvic-extension/components/budget/TariffBudget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace OpenVic {
private:
godot::Array slider_tooltip_args;

bool was_budget_cut(CountryInstance const& country) const override;
fixed_point_t calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
Expand Down
6 changes: 5 additions & 1 deletion extension/src/openvic-extension/components/budget/abstract/SliderBudgetComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "openvic-extension/classes/GUINode.hpp"
#include "openvic-extension/classes/GUIScrollbar.hpp"
#include "openvic-extension/singletons/PlayerSingleton.hpp"
#include "openvic-extension/utility/Utilities.hpp"

using namespace OpenVic;

Expand Down Expand Up @@ -59,8 +60,11 @@ void SliderBudgetComponent::full_update(CountryInstance& country) {
void SliderBudgetComponent::update_labels(CountryInstance& country, const fixed_point_t scaled_value) {
const fixed_point_t budget = calculate_budget_and_update_custom(country, scaled_value);
if (budget_label != nullptr) {
const godot::String budget_text = Utilities::cash_to_string_dp_dynamic(budget);
budget_label->set_text(
Utilities::cash_to_string_dp_dynamic(budget)
was_budget_cut(country)
? Utilities::format(godot::String::utf8("§R%s§W"), budget_text)
: budget_text
);
};

Expand Down
3 changes: 3 additions & 0 deletions extension/src/openvic-extension/components/budget/abstract/SliderBudgetComponent.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ namespace OpenVic {
godot::NodePath const& percent_label_path = {}
);

virtual bool was_budget_cut(CountryInstance const& country) const {
return false;
}
virtual fixed_point_t calculate_budget_and_update_custom(
CountryInstance& country,
const fixed_point_t scaled_value
Expand Down
Loading