Create basic condition script parsing and execution framework

Author: Hop311

src/headless/main.cpp

@@ -90,43 +90,56 @@ static bool run_headless(Dataloader::path_vector_t const& roots, bool run_tests)
 	ret &= game_manager.update_clock();
 
 	// TODO - REMOVE TEST CODE
-	Logger::info("===== Ranking system test... =====");
-	if (game_manager.get_instance_manager()) {
-		const auto print_ranking_list = [](std::string_view title, std::vector<CountryInstance*> const& countries) -> void {
-			std::string text;
-			for (CountryInstance const* country : countries) {
-				text += StringUtils::append_string_views(
-					"\n    ", country->get_identifier(),
-					" - Total #", std::to_string(country->get_total_rank()), " (", country->get_total_score().to_string(1),
-					"), Prestige #", std::to_string(country->get_prestige_rank()), " (", country->get_prestige().to_string(1),
-					"), Industry #", std::to_string(country->get_industrial_rank()), " (", country->get_industrial_power().to_string(1),
-					"), Military #", std::to_string(country->get_military_rank()), " (", country->get_military_power().to_string(1), ")"
-				);
-			}
-			Logger::info(title, ":", text);
-		};
-
-		CountryInstanceManager const& country_instance_manager =
-			game_manager.get_instance_manager()->get_country_instance_manager();
-
-		std::vector<CountryInstance*> const& great_powers = country_instance_manager.get_great_powers();
-		print_ranking_list("Great Powers", great_powers);
-		print_ranking_list("Secondary Powers", country_instance_manager.get_secondary_powers());
-		print_ranking_list("All countries", country_instance_manager.get_total_ranking());
-
-		Logger::info("===== RGO test... =====");
-		for (size_t i = 0; i < std::min<size_t>(3, great_powers.size()); ++i) {
-			CountryInstance const& great_power = *great_powers[i];
-			ProvinceInstance const* const capital_province = great_power.get_capital();
-			if (capital_province == nullptr) {
-				Logger::warning(great_power.get_identifier(), " has no capital ProvinceInstance set.");
-			} else {
-				print_rgo(*capital_province);
-			}
-		}
-	} else {
-		Logger::error("Instance manager not available!");
-		ret = false;
+	// Logger::info("===== Ranking system test... =====");
+	// if (game_manager.get_instance_manager()) {
+	// 	const auto print_ranking_list = [](std::string_view title, std::vector<CountryInstance*> const& countries) -> void {
+	// 		std::string text;
+	// 		for (CountryInstance const* country : countries) {
+	// 			text += StringUtils::append_string_views(
+	// 				"\n    ", country->get_identifier(),
+	// 				" - Total #", std::to_string(country->get_total_rank()), " (", country->get_total_score().to_string(1),
+	// 				"), Prestige #", std::to_string(country->get_prestige_rank()), " (", country->get_prestige().to_string(1),
+	// 				"), Industry #", std::to_string(country->get_industrial_rank()), " (", country->get_industrial_power().to_string(1),
+	// 				"), Military #", std::to_string(country->get_military_rank()), " (", country->get_military_power().to_string(1), ")"
+	// 			);
+	// 		}
+	// 		Logger::info(title, ":", text);
+	// 	};
+
+	// 	CountryInstanceManager const& country_instance_manager =
+	// 		game_manager.get_instance_manager()->get_country_instance_manager();
+
+	// 	std::vector<CountryInstance*> const& great_powers = country_instance_manager.get_great_powers();
+	// 	print_ranking_list("Great Powers", great_powers);
+	// 	print_ranking_list("Secondary Powers", country_instance_manager.get_secondary_powers());
+	// 	print_ranking_list("All countries", country_instance_manager.get_total_ranking());
+
+	// 	Logger::info("===== RGO test... =====");
+	// 	for (size_t i = 0; i < std::min<size_t>(3, great_powers.size()); ++i) {
+	// 		CountryInstance const& great_power = *great_powers[i];
+	// 		ProvinceInstance const* const capital_province = great_power.get_capital();
+	// 		if (capital_province == nullptr) {
+	// 			Logger::warning(great_power.get_identifier(), " has no capital ProvinceInstance set.");
+	// 		} else {
+	// 			print_rgo(*capital_province);
+	// 		}
+	// 	}
+	// } else {
+	// 	Logger::error("Instance manager not available!");
+	// 	ret = false;
+	// }
+
+	Pop const& pop = *game_manager.get_instance_manager()->get_map_instance().get_province_instance_by_index(300)->get_pops().begin();
+
+	Logger::info(
+		"Pop has type ", pop.get_type()->get_identifier(),
+		", size ", pop.get_size(),
+		", culture ", pop.get_culture().get_identifier(),
+		", religion ", pop.get_religion().get_identifier(),
+		", ideology:"
+	);
+	for (auto [ideology, support] : pop.get_ideology_distribution()) {
+		Logger::info("    ", ideology.get_identifier(), " - ", support);
 	}
 
 	if (ret) {
@@ -139,6 +152,26 @@ static bool run_headless(Dataloader::path_vector_t const& roots, bool run_tests)
 		Logger::info("Ran ", --ticks_passed, " ticks in ", end_time - start_time);
 	}
 
+	ProvinceInstance const& province = *pop.get_location();
+	Logger::info("Province ", province.get_identifier(), " has ", province.get_total_population(), " pops with ideology:");
+	for (auto [ideology, support] : province.get_ideology_distribution()) {
+		Logger::info("    ", ideology.get_identifier(), " - ", support);
+	}
+
+	State const& state = *province.get_state();
+	Logger::info("State ", state.get_identifier(), " has ", state.get_total_population(), " pops with ideology:");
+	for (auto [ideology, support] : state.get_ideology_distribution()) {
+		Logger::info("    ", ideology.get_identifier(), " - ", support);
+	}
+
+	CountryInstance const& country = *state.get_owner();
+	Logger::info("Country ", country.get_identifier(), " has ", country.get_total_population(), " pops with ideology:");
+	for (auto [ideology, support] : country.get_ideology_distribution()) {
+		Logger::info("    ", ideology.get_identifier(), " - ", support);
+	}
+
+	Logger::info("National value of ", country.get_identifier(), " is ", country.get_national_value());
+
 	return ret;
 }
 

src/openvic-simulation/DefinitionManager.cpp

@@ -45,6 +45,6 @@ namespace OpenVic {
 		SoundEffectManager PROPERTY_REF(sound_effect_manager);
 
 	public:
-		DefinitionManager();
+		DefinitionManager() : ui_manager { *this }, script_manager { *this } {}
 	};
 }

src/openvic-simulation/DefinitionManager.hpp

@@ -74,7 +74,7 @@ void InstanceManager::update_gamestate() {
 	update_modifier_sums();
 
 	// Update gamestate...
-	map_instance.update_gamestate(today, definition_manager.get_define_manager());
+	map_instance.update_gamestate(*this);
 	country_instance_manager.update_gamestate(*this);
 	unit_instance_manager.update_gamestate();
 
@@ -221,9 +221,7 @@ bool InstanceManager::load_bookmark(Bookmark const* new_bookmark) {
 	// It is important that province history is applied before country history as province history includes
 	// generating pops which then have stats like literacy and consciousness set by country history.
 
-	ret &= country_instance_manager.apply_history_to_countries(
-		definition_manager.get_history_manager().get_country_manager(), *this
-	);
+	ret &= country_instance_manager.apply_history_to_countries(*this);
 
 	ret &= map_instance.get_state_manager().generate_states(
 		map_instance,
@@ -234,10 +232,7 @@ bool InstanceManager::load_bookmark(Bookmark const* new_bookmark) {
 
 	update_modifier_sums();
 	country_instance_manager.update_gamestate(*this);
-	map_instance.initialise_for_new_game(
-		today,
-		definition_manager.get_define_manager()
-	);
+	map_instance.initialise_for_new_game(*this);
 	market_instance.execute_orders();
 
 	return ret;

src/openvic-simulation/InstanceManager.cpp

@@ -925,6 +925,19 @@ bool CountryInstance::apply_history_to_country(CountryHistoryEntry const& entry,
 	for (auto const& [technology, level] : entry.get_technologies()) {
 		ret &= set_technology_unlock_level(*technology, level, good_instance_manager);
 	}
+
+	for (
+		Invention const& invention :
+			instance_manager.get_definition_manager().get_research_manager().get_invention_manager().get_inventions()
+	) {
+		if (
+			invention.get_limit().execute(instance_manager, this, this) &&
+			invention.get_chance().execute(instance_manager, this, this) > 0
+		) {
+			ret &= unlock_invention(invention, good_instance_manager);
+		}
+	}
+
 	for (auto const& [invention, activated] : entry.get_inventions()) {
 		ret &= set_invention_unlock_level(*invention, activated ? 1 : 0, good_instance_manager);
 	}
@@ -1822,9 +1835,10 @@ bool CountryInstanceManager::generate_country_instances(
 	return ret;
 }
 
-bool CountryInstanceManager::apply_history_to_countries(
-	CountryHistoryManager const& history_manager, InstanceManager& instance_manager
-) {
+bool CountryInstanceManager::apply_history_to_countries(InstanceManager& instance_manager) {
+	CountryHistoryManager const& history_manager =
+		instance_manager.get_definition_manager().get_history_manager().get_country_manager();
+
 	bool ret = true;
 
 	const Date today = instance_manager.get_today();

src/openvic-simulation/country/CountryInstance.cpp

@@ -601,7 +601,7 @@ namespace OpenVic {
 			EconomyDefines const& economy_defines
 		);
 
-		bool apply_history_to_countries(CountryHistoryManager const& history_manager, InstanceManager& instance_manager);
+		bool apply_history_to_countries(InstanceManager& instance_manager);
 
 		void update_modifier_sums(Date today, StaticModifierCache const& static_modifier_cache);
 		void update_gamestate(InstanceManager& instance_manager);

src/openvic-simulation/country/CountryInstance.hpp

@@ -1113,7 +1113,7 @@ bool Dataloader::load_defines(
 		Logger::error("Failed to load diplomatic actions!");
 		ret = false;
 	}
-	if (!definition_manager.get_script_manager().get_condition_manager().setup_conditions(definition_manager)) {
+	if (!definition_manager.get_script_manager().get_condition_manager().setup_conditions()) {
 		Logger::error("Failed to set up conditions!");
 		ret = false;
 	}

src/openvic-simulation/dataloader/Dataloader.cpp

@@ -137,12 +137,12 @@ void MapInstance::update_modifier_sums(const Date today, StaticModifierCache con
 	}
 }
 
-void MapInstance::update_gamestate(const Date today, DefineManager const& define_manager) {
+void MapInstance::update_gamestate(InstanceManager const& instance_manager) {
 	highest_province_population = 0;
 	total_map_population = 0;
 
 	for (ProvinceInstance& province : province_instances.get_items()) {
-		province.update_gamestate(today, define_manager);
+		province.update_gamestate(instance_manager);
 
 		// Update population stats
 		const pop_size_t province_population = province.get_total_population();
@@ -162,10 +162,7 @@ void MapInstance::map_tick() {
 	//state tick will update pop employment via factories
 }
 
-void MapInstance::initialise_for_new_game(
-	const Date today,
-	DefineManager const& define_manager
-) {
-	update_gamestate(today, define_manager);
+void MapInstance::initialise_for_new_game(InstanceManager const& instance_manager) {
+	update_gamestate(instance_manager);
 	thread_pool.process_province_initialise_for_new_game();
 }

src/openvic-simulation/map/MapInstance.cpp

@@ -66,8 +66,8 @@ namespace OpenVic {
 		);
 
 		void update_modifier_sums(const Date today, StaticModifierCache const& static_modifier_cache);
-		void update_gamestate(const Date today, DefineManager const& define_manager);
+		void update_gamestate(InstanceManager const& instance_manager);
 		void map_tick();
-		void initialise_for_new_game(const Date today, DefineManager const& define_manager);
+		void initialise_for_new_game(InstanceManager const& instance_manager);
 	};
 }

src/openvic-simulation/map/MapInstance.hpp

@@ -2,9 +2,11 @@
 
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/defines/Define.hpp"
+#include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/economy/production/ProductionType.hpp"
 #include "openvic-simulation/economy/production/ResourceGatheringOperation.hpp"
 #include "openvic-simulation/history/ProvinceHistory.hpp"
+#include "openvic-simulation/InstanceManager.hpp"
 #include "openvic-simulation/map/Crime.hpp"
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
 #include "openvic-simulation/map/Region.hpp"
@@ -244,7 +246,7 @@ size_t ProvinceInstance::get_pop_count() const {
 /* REQUIREMENTS:
  * MAP-65, MAP-68, MAP-70, MAP-234
  */
-void ProvinceInstance::_update_pops(DefineManager const& define_manager) {
+void ProvinceInstance::_update_pops(InstanceManager const& instance_manager) {
 	total_population = 0;
 	average_literacy = 0;
 	average_consciousness = 0;
@@ -269,7 +271,8 @@ void ProvinceInstance::_update_pops(DefineManager const& define_manager) {
 
 	max_supported_regiments = 0;
 
-	MilitaryDefines const& military_defines = define_manager.get_military_defines();
+	MilitaryDefines const& military_defines =
+		instance_manager.get_definition_manager().get_define_manager().get_military_defines();
 
 	using enum colony_status_t;
 
@@ -279,7 +282,7 @@ void ProvinceInstance::_update_pops(DefineManager const& define_manager) {
 		: is_owner_core() ? fixed_point_t::_1() : military_defines.get_pop_size_per_regiment_non_core_multiplier();
 
 	for (Pop& pop : pops) {
-		pop.update_gamestate(define_manager, owner, pop_size_per_regiment_multiplier);
+		pop.update_gamestate(instance_manager, owner, pop_size_per_regiment_multiplier);
 
 		const pop_size_t pop_size_s = pop.get_size();
 		// TODO - change casting if pop_size_t changes type
@@ -413,7 +416,7 @@ bool ProvinceInstance::convert_rgo_worker_pops_to_equivalent(ProductionType cons
 	return is_valid_operation;
 }
 
-void ProvinceInstance::update_gamestate(const Date today, DefineManager const& define_manager) {
+void ProvinceInstance::update_gamestate(InstanceManager const& instance_manager) {
 	land_regiment_count = 0;
 	for (ArmyInstance const* army : armies) {
 		land_regiment_count += army->get_unit_count();
@@ -424,10 +427,12 @@ void ProvinceInstance::update_gamestate(const Date today, DefineManager const& d
 		}
 	}
 
+	const Date today = instance_manager.get_today();
+
 	for (BuildingInstance& building : buildings.get_items()) {
 		building.update_gamestate(today);
 	}
-	_update_pops(define_manager);
+	_update_pops(instance_manager);
 }
 
 void ProvinceInstance::province_tick(const Date today, PopValuesFromProvince& reusable_pop_values) {