More condition execution callbacks

Author: Hop311

src/openvic-simulation/country/CountryInstance.cpp

@@ -1140,6 +1140,19 @@ void CountryInstance::_update_population() {
 		life_needs_fulfilled_by_strata /= population_by_strata;
 		everyday_needs_fulfilled_by_strata /= population_by_strata;
 		luxury_needs_fulfilled_by_strata /= population_by_strata;
+
+		unemployment_fraction = pop_type_unemployed_count.get_total() / total_population;
+
+		const fixed_point_map_const_iterator_t<Culture const*> largest_culture_it = get_largest_item(culture_distribution);
+		largest_culture = largest_culture_it != culture_distribution.end() ? largest_culture_it->first : nullptr;
+
+		const fixed_point_map_const_iterator_t<Religion const*> largest_religion_it = get_largest_item(religion_distribution);
+		largest_religion = largest_religion_it != religion_distribution.end() ? largest_religion_it->first : nullptr;
+	} else {
+		unemployment_fraction = fixed_point_t::_0();
+
+		largest_culture = nullptr;
+		largest_religion = nullptr;
 	}
 
 	daily_research_points = fixed_point_t::_0();
@@ -1186,9 +1199,16 @@ void CountryInstance::_update_military(
 	MilitaryDefines const& military_defines = define_manager.get_military_defines();
 
 	regiment_count = 0;
+	multi_unit_army_count = 0;
 
 	for (ArmyInstance const* army : armies) {
-		regiment_count += army->get_unit_count();
+		const size_t unit_count = army->get_unit_count();
+
+		regiment_count += unit_count;
+
+		if (unit_count > 1) {
+			multi_unit_army_count++;
+		}
 	}
 
 	ship_count = 0;

src/openvic-simulation/country/CountryInstance.hpp

@@ -198,11 +198,15 @@ namespace OpenVic {
 
 		IndexedMap<PopType, pop_size_t> PROPERTY(pop_type_distribution);
 		IndexedMap<PopType, pop_size_t> PROPERTY(pop_type_unemployed_count);
+		fixed_point_t PROPERTY(unemployment_fraction);
 		IndexedMap<Ideology, fixed_point_t> PROPERTY(ideology_distribution);
 		fixed_point_map_t<Issue const*> PROPERTY(issue_distribution);
 		IndexedMap<CountryParty, fixed_point_t> PROPERTY(vote_distribution);
 		fixed_point_map_t<Culture const*> PROPERTY(culture_distribution);
 		fixed_point_map_t<Religion const*> PROPERTY(religion_distribution);
+		Culture const* PROPERTY(largest_culture, nullptr);
+		Religion const* PROPERTY(largest_religion, nullptr);
+
 		size_t PROPERTY(national_focus_capacity, 0);
 		// TODO - national foci
 
@@ -265,6 +269,7 @@ namespace OpenVic {
 		size_t PROPERTY(max_supported_regiment_count, 0);
 		size_t PROPERTY(mobilisation_potential_regiment_count, 0);
 		size_t PROPERTY(mobilisation_max_regiment_count, 0);
+		size_t PROPERTY(multi_unit_army_count, 0);
 		fixed_point_t PROPERTY(mobilisation_impact);
 		fixed_point_t PROPERTY(mobilisation_economy_impact);
 		fixed_point_t PROPERTY(supply_consumption);

src/openvic-simulation/map/ProvinceInstance.cpp

@@ -332,6 +332,19 @@ void ProvinceInstance::_update_pops(InstanceManager const& instance_manager) {
 		life_needs_fulfilled_by_strata /= population_by_strata;
 		everyday_needs_fulfilled_by_strata /= population_by_strata;
 		luxury_needs_fulfilled_by_strata /= population_by_strata;
+
+		unemployment_fraction = pop_type_unemployed_count.get_total() / total_population;
+
+		const fixed_point_map_const_iterator_t<Culture const*> largest_culture_it = get_largest_item(culture_distribution);
+		largest_culture = largest_culture_it != culture_distribution.end() ? largest_culture_it->first : nullptr;
+
+		const fixed_point_map_const_iterator_t<Religion const*> largest_religion_it = get_largest_item(religion_distribution);
+		largest_religion = largest_religion_it != religion_distribution.end() ? largest_religion_it->first : nullptr;
+	} else {
+		unemployment_fraction = fixed_point_t::_0();
+
+		largest_culture = nullptr;
+		largest_religion = nullptr;
 	}
 }
 

src/openvic-simulation/map/ProvinceInstance.hpp

@@ -123,12 +123,16 @@ namespace OpenVic {
 
 		IndexedMap<PopType, pop_size_t> PROPERTY(pop_type_distribution);
 		IndexedMap<PopType, pop_size_t> PROPERTY(pop_type_unemployed_count);
+		fixed_point_t PROPERTY(unemployment_fraction);
 		IndexedMap<PopType, std::vector<Pop*>> PROPERTY(pops_cache_by_type);
 		IndexedMap<Ideology, fixed_point_t> PROPERTY(ideology_distribution);
 		fixed_point_map_t<Issue const*> PROPERTY(issue_distribution);
 		IndexedMap<CountryParty, fixed_point_t> PROPERTY(vote_distribution);
 		fixed_point_map_t<Culture const*> PROPERTY(culture_distribution);
 		fixed_point_map_t<Religion const*> PROPERTY(religion_distribution);
+		Culture const* PROPERTY(largest_culture, nullptr);
+		Religion const* PROPERTY(largest_religion, nullptr);
+
 		size_t PROPERTY(max_supported_regiments, 0);
 
 		ProvinceInstance(

src/openvic-simulation/map/State.cpp

@@ -156,6 +156,19 @@ void State::update_gamestate() {
 		life_needs_fulfilled_by_strata /= population_by_strata;
 		everyday_needs_fulfilled_by_strata /= population_by_strata;
 		luxury_needs_fulfilled_by_strata /= population_by_strata;
+
+		unemployment_fraction = pop_type_unemployed_count.get_total() / total_population;
+
+		const fixed_point_map_const_iterator_t<Culture const*> largest_culture_it = get_largest_item(culture_distribution);
+		largest_culture = largest_culture_it != culture_distribution.end() ? largest_culture_it->first : nullptr;
+
+		const fixed_point_map_const_iterator_t<Religion const*> largest_religion_it = get_largest_item(religion_distribution);
+		largest_religion = largest_religion_it != religion_distribution.end() ? largest_religion_it->first : nullptr;
+	} else {
+		unemployment_fraction = fixed_point_t::_0();
+
+		largest_culture = nullptr;
+		largest_religion = nullptr;
 	}
 
 	// TODO - use actual values when State has factory data

src/openvic-simulation/map/State.hpp

@@ -38,12 +38,15 @@ namespace OpenVic {
 
 		IndexedMap<PopType, pop_size_t> PROPERTY(pop_type_distribution);
 		IndexedMap<PopType, pop_size_t> PROPERTY(pop_type_unemployed_count);
+		fixed_point_t PROPERTY(unemployment_fraction);
 		IndexedMap<PopType, std::vector<Pop*>> PROPERTY(pops_cache_by_type);
 		IndexedMap<Ideology, fixed_point_t> PROPERTY(ideology_distribution);
 		fixed_point_map_t<Issue const*> PROPERTY(issue_distribution);
 		IndexedMap<CountryParty, fixed_point_t> PROPERTY(vote_distribution);
 		fixed_point_map_t<Culture const*> PROPERTY(culture_distribution);
 		fixed_point_map_t<Religion const*> PROPERTY(religion_distribution);
+		Culture const* PROPERTY(largest_culture, nullptr);
+		Religion const* PROPERTY(largest_religion, nullptr);
 
 		fixed_point_t PROPERTY(industrial_power);
 

src/openvic-simulation/pop/Pop.cpp

@@ -131,6 +131,12 @@ void Pop::generate_political_distributions(InstanceManager const& instance_manag
 		}
 	}
 	ideology_distribution.rescale(size);
+
+	issue_distribution.clear();
+	for (auto const& [issue, conditional_weight] : type->get_issues()) {
+		issue_distribution[issue] = conditional_weight.execute(instance_manager, this, this);
+	}
+	rescale_fixed_point_map(issue_distribution, size);
 }
 
 bool Pop::convert_to_equivalent() {