feat: implemented basic technology and school loading (modifier processing is still missing)

2 files changed, 201 insertions, 0 deletions

diff --git a/src/openvic-simulation/tech/Technology.cpp b/src/openvic-simulation/tech/Technology.cpp
new file mode 100644
index 0000000..71d026e
--- /dev/null
+++ b/src/openvic-simulation/tech/Technology.cpp
@@ -0,0 +1,121 @@
+#include "Technology.hpp"
+
+using namespace OpenVic;
+using namespace OpenVic::NodeTools;
+
+TechnologyFolder::TechnologyFolder(std::string_view identifier) : HasIdentifier { identifier } {}
+
+TechnologyArea::TechnologyArea(std::string_view identifier, TechnologyFolder const& folder) : HasIdentifier { identifier }, folder { folder } {}
+
+Technology::Technology(std::string_view identifier, TechnologyArea const& area, year_t year, fixed_point_t cost, bool unciv_military, ModifierValue&& values)
+	: Modifier { identifier, std::move(values), 0 }, area { area }, year { year }, cost { cost }, unciv_military { unciv_military } {}
+
+TechnologySchool::TechnologySchool(std::string_view new_identifier, ModifierValue&& new_values) 
+	: Modifier { new_identifier, std::move(new_values), 0 } {} //TODO: school icon
+
+TechnologyManager::TechnologyManager() : technology_folders { "technology folders" }, technology_areas { "technology areas" }, 
+	technologies { "technologies" }, technology_schools { "technology schools" } {}
+
+bool TechnologyManager::add_technology_folder(std::string_view identifier) {
+	if (identifier.empty()) {
+		Logger::error("Invalid technology folder identifier - empty!");
+		return false;
+	}
+
+	return technology_folders.add_item({ identifier });
+}
+
+bool TechnologyManager::add_technology_area(std::string_view identifier, TechnologyFolder const* folder) {
+	if (identifier.empty()) {
+		Logger::error("Invalid technology area identifier - empty!");
+		return false;
+	}
+
+	if (folder == nullptr) {
+		Logger::error("Null folder for technology area \"", identifier, "\"!");
+		return false;
+	}
+
+	return technology_areas.add_item({ identifier, *folder });
+}
+
+bool TechnologyManager::add_technology(std::string_view identifier, TechnologyArea const* area, Technology::year_t year, fixed_point_t cost, bool unciv_military, ModifierValue&& values) {
+	if (identifier.empty()) {
+		Logger::error("Invalid technology identifier - empty!");
+		return false;
+	}
+
+	if (area == nullptr) {
+		Logger::error("Null area for technology \"", identifier, "\"!");
+		return false;
+	}
+
+	return technologies.add_item({ identifier, *area, year, cost, unciv_military, std::move(values) });
+}
+
+bool TechnologyManager::add_technology_school(std::string_view identifier, ModifierValue&& values) {
+	if (identifier.empty()) {
+		Logger::error("Invalid modifier effect identifier - empty!");
+		return false;
+	}
+
+	return technology_schools.add_item({ identifier, std::move(values) });
+}
+
+bool TechnologyManager::load_technology_file(ModifierManager const& modifier_manager, ast::NodeCPtr root) {
+	return expect_dictionary([this, &modifier_manager](std::string_view root_key, ast::NodeCPtr root_value) -> bool {
+		if (root_key == "folders") {
+			return expect_dictionary([this](std::string_view folder_key, ast::NodeCPtr folder_value) -> bool {
+				bool ret = add_technology_folder(folder_key);
+				TechnologyFolder const* current_folder = get_technology_folder_by_identifier(folder_key);
+				if (current_folder == nullptr)
+					return false;
+				ret &= expect_list(expect_identifier([this, current_folder](std::string_view area) -> bool {
+					return add_technology_area(area, current_folder);
+				}))(folder_value);
+				return ret;
+			})(root_value);
+			lock_technology_folders();
+			lock_technology_areas();
+		} else if (root_key == "schools") {
+			return expect_dictionary([this, &modifier_manager](std::string_view school_key, ast::NodeCPtr school_value) -> bool {
+				ModifierValue modifiers;
+				bool ret = modifier_manager.expect_modifier_value(move_variable_callback(modifiers))(school_value);
+				ret &= add_technology_school(school_key, std::move(modifiers));
+				return ret;
+			})(root_value);
+			lock_technology_schools();
+		} else return false;
+	})(root);
+}
+
+bool TechnologyManager::load_technologies_file(ModifierManager const& modifier_manager, ast::NodeCPtr root) {
+	size_t expected_technologies = 0;
+	bool ret = expect_dictionary_reserve_length(technologies, [this, &expected_technologies](std::string_view key, ast::NodeCPtr value) -> bool {
+		return expect_length(add_variable_callback(expected_technologies))(value);
+	})(root);
+	technologies.reserve(technologies.size() + expected_technologies);
+
+	ret &= expect_dictionary([this, &modifier_manager](std::string_view tech_key, ast::NodeCPtr tech_value) -> bool {
+		ModifierValue modifiers;
+		std::string_view area_identifier;
+		Technology::year_t year;
+		fixed_point_t cost;
+		bool unciv_military = false;
+		
+		bool ret = modifier_manager.expect_modifier_value_and_keys(move_variable_callback(modifiers),
+			"area", ONE_EXACTLY, expect_identifier(assign_variable_callback(area_identifier)),
+			"year", ONE_EXACTLY, expect_uint(assign_variable_callback(year)),
+			"cost", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(cost)),
+			"unciv_military", ZERO_OR_ONE, expect_bool(assign_variable_callback(unciv_military)),
+			"ai_chance", ONE_EXACTLY, expect_dictionary([this](std::string_view school_key, ast::NodeCPtr school_value) -> bool { return true; })
+		)(tech_value);
+
+		TechnologyArea const* area = get_technology_area_by_identifier(area_identifier);
+
+		ret &= add_technology(tech_key, area, year, cost, unciv_military, std::move(modifiers));
+		return ret;
+	})(root);
+
+	return ret;
+}
\ No newline at end of file
diff --git a/src/openvic-simulation/tech/Technology.hpp b/src/openvic-simulation/tech/Technology.hpp
new file mode 100644
index 0000000..e6ce2fa
--- /dev/null
+++ b/src/openvic-simulation/tech/Technology.hpp
@@ -0,0 +1,80 @@
+#pragma once
+
+#include "misc/Modifier.hpp"
+#include "types/Date.hpp"
+#include "types/IdentifierRegistry.hpp"
+#include "types/fixed_point/FixedPoint.hpp"
+
+namespace OpenVic {
+	struct TechnologyFolder : HasIdentifier {
+		friend struct TechnologyManager;
+
+	private:
+		TechnologyFolder(std::string_view identifier);
+
+	public:
+		TechnologyFolder(TechnologyFolder&&) = default;
+	};
+
+	struct TechnologyArea : HasIdentifier {
+		friend struct TechnologyManager;
+
+	private:
+		TechnologyFolder const& PROPERTY(folder);
+
+		TechnologyArea(std::string_view identifier, TechnologyFolder const& folder);
+
+	public:
+		TechnologyArea(TechnologyArea&&) = default;
+	};
+
+	struct Technology : Modifier {
+		friend struct TechnologyManager;
+		using year_t = Date::year_t;
+
+	private:
+		TechnologyArea const& PROPERTY(area);
+		const year_t PROPERTY(year);
+		const fixed_point_t PROPERTY(cost);
+		const bool PROPERTY(unciv_military);
+
+		//TODO: implement rules/modifiers and ai_chance
+
+		Technology(std::string_view identifier, TechnologyArea const& area, year_t year, fixed_point_t cost, bool unciv_military, ModifierValue&& values);
+	
+	public:
+		Technology(Technology&&) = default;
+	};
+
+	struct TechnologySchool : Modifier {
+		friend struct TechnologyManager;
+
+	private:
+		TechnologySchool(std::string_view new_identifier, ModifierValue&& new_values);
+	};
+
+	struct TechnologyManager {
+		IdentifierRegistry<TechnologyFolder> technology_folders;
+		IdentifierRegistry<TechnologyArea> technology_areas;
+		IdentifierRegistry<Technology> technologies;
+		IdentifierRegistry<TechnologySchool> technology_schools;
+
+	public:
+		TechnologyManager();
+
+		bool add_technology_folder(std::string_view identifier);
+		IDENTIFIER_REGISTRY_ACCESSORS(technology_folder)
+
+		bool add_technology_area(std::string_view identifier, TechnologyFolder const* folder);
+		IDENTIFIER_REGISTRY_ACCESSORS(technology_area)
+
+		bool add_technology(std::string_view identifier, TechnologyArea const* area, Technology::year_t year, fixed_point_t cost, bool unciv_military, ModifierValue&& values);
+		IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(technology, technologies)
+
+		bool add_technology_school(std::string_view identifier, ModifierValue&& values); //, Modifier::icon_t icon);
+		IDENTIFIER_REGISTRY_ACCESSORS(technology_school);
+
+		bool load_technology_file(ModifierManager const& modifier_manager, ast::NodeCPtr root); // common/technology.txt
+		bool load_technologies_file(ModifierManager const& modifier_manager, ast::NodeCPtr root); // technologies/*.txt
+	};
+}
\ No newline at end of file