Skip to content

Fix NaN when province admin cost is exactly zero #2314

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
schombert merged 2 commits into from
Oct 3, 2026
Merged

Fix NaN when province admin cost is exactly zero #2314

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3812519
Fix NaN when province admin cost is exactly zero
ruggsea Oct 3, 2026
6d8a923
Clamp the admin cost control factor at 0 instead of skipping the cont…
ruggsea Oct 3, 2026
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
4 changes: 2 additions & 2 deletions src/nations/nations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ float admin_cost_of_province(sys::state const& state, dcon::province_id pid) {
population_concentration *= 0.5f;
}
auto current_control = state.world.province_get_control_ratio(pid);
return (population * population_concentration + area * 100.f) * (1.f / (1.01f - current_control) - 1.f) + 100.f;
return (population * population_concentration + area * 100.f) * std::max(0.f, 1.f / (1.01f - current_control) - 1.f) + 100.f;
}
template <typename T>
ve::fp_vector ve_admin_cost_of_province(sys::state& state, T pid) {
Expand All @@ -843,7 +843,7 @@ ve::fp_vector ve_admin_cost_of_province(sys::state& state, T pid) {
population_concentration = ve::select(is_coastal, population_concentration * 0.5f, population_concentration);
population_concentration = ve::select(has_major_river, population_concentration * 0.5f, population_concentration);
auto current_control = state.world.province_get_control_ratio(pid);
return (population * population_concentration + area * 100.f) * (1.f / (1.01f - current_control) - 1.f) + 100.f;
return (population * population_concentration + area * 100.f) * ve::max(0.f, 1.f / (1.01f - current_control) - 1.f) + 100.f;
}

float desire_score_province(sys::state const& state, dcon::province_id pid) {
Expand Down
Loading