Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 15 additions & 15 deletions src/headless/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,18 @@ static void print_rgo(ProvinceInstance const& province) {
SPDLOG_INFO(
"\tgood: {}, "
"production_type: {}, "
"size_multiplier: {}, "
"output_quantity_yesterday: {}, "
"revenue_yesterday: {}, "
"total owner income: {}, "
"total employee income: {}",
"size_multiplier: {:.3}, "
"output_quantity_yesterday: {:.3}, "
"revenue_yesterday: {:.3}, "
"total owner income: {:.3}, "
"total employee income: {:.3}",
production_type.output_good, //
production_type, //
rgo.get_size_multiplier().to_string(3), //
rgo.get_output_quantity_yesterday().to_string(3), //
rgo.get_revenue_yesterday().to_string(3), //
rgo.get_total_owner_income_cache().to_string(3), //
rgo.get_total_employee_income_cache().to_string(3)
rgo.get_size_multiplier(), //
rgo.get_output_quantity_yesterday(), //
rgo.get_revenue_yesterday(), //
rgo.get_total_owner_income_cache(), //
rgo.get_total_employee_income_cache()
);

bool logged_employees = false;
Expand Down Expand Up @@ -264,12 +264,12 @@ static bool run_headless(fs::path const& root, memory::vector<memory::string>& m
memory::string countries_str;
for (CountryInstance& country : countries) {
countries_str += fmt::format(
"\n\t{} - Total #{} ({}), Prestige #{} ({}), Industry #{} ({}), Military #{} ({})", //
"\n\t{} - Total #{} ({:.1}), Prestige #{} ({:.1}), Industry #{} ({:.1}), Military #{} ({:.1})", //
country, //
country.get_total_rank(), country.total_score.get_untracked().to_string(1), //
country.get_prestige_rank(), country.get_prestige_untracked().to_string(1),
country.get_industrial_rank(), country.get_industrial_power_untracked().to_string(1),
country.get_military_rank(), country.military_power.get_untracked().to_string(1)
country.get_total_rank(), country.total_score.get_untracked(), //
country.get_prestige_rank(), country.get_prestige_untracked(),
country.get_industrial_rank(), country.get_industrial_power_untracked(),
country.get_military_rank(), country.military_power.get_untracked()
);
}
SPDLOG_INFO("{}:{}", title, countries_str);
Expand Down
6 changes: 3 additions & 3 deletions src/openvic-simulation/military/UnitInstanceGroup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -513,11 +513,11 @@ bool UnitInstanceManager::create_leader(
const fixed_point_t leader_creation_cost = military_defines.get_leader_recruit_cost();
if (country.get_leadership_point_stockpile() < leader_creation_cost) {
spdlog::error_s(
"Country \"{}\" does not have enough leadership points ({}) to create a {} (cost: {})",
"Country \"{}\" does not have enough leadership points ({:.2}) to create a {} (cost: {:.2})",
country,
country.get_leadership_point_stockpile().to_string(2),
country.get_leadership_point_stockpile(),
get_branched_leader_name(branch),
leader_creation_cost.to_string(2)
leader_creation_cost
);
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions src/openvic-simulation/misc/GameAction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ bool GameActionManager::VariantVisitor::operator() (create_leader_argument_t con

if (country->get_create_leader_count() < 1) {
spdlog::error_s(
"GAME_ACTION_CREATE_LEADER called for country \"{}\" without enough leadership points ({}) to create any leaders!",
*country, country->get_leadership_point_stockpile().to_string(2)
"GAME_ACTION_CREATE_LEADER called for country \"{}\" without enough leadership points ({:.2}) to create any leaders!",
*country, country->get_leadership_point_stockpile()
);
return false;
}
Expand Down
Loading