Big Dataloader Commit (openvic-simulation)

1 files changed, 8 insertions, 3 deletions

diff --git a/src/openvic/pop/Culture.hpp b/src/openvic/pop/Culture.hpp
index 645e226..7012512 100644
--- a/src/openvic/pop/Culture.hpp
+++ b/src/openvic/pop/Culture.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "../Types.hpp"
+#include "openvic/types/IdentifierRegistry.hpp"
+#include "openvic/dataloader/NodeTools.hpp"
 
 namespace OpenVic {
 
@@ -21,10 +22,11 @@ namespace OpenVic {
 
 	private:
 		GraphicalCultureType const& unit_graphical_culture_type;
+		bool is_overseas;
 
 		// TODO - leader type, union tag
 
-		CultureGroup(const std::string_view new_identifier, GraphicalCultureType const& new_unit_graphical_culture_type);
+		CultureGroup(const std::string_view new_identifier, GraphicalCultureType const& new_unit_graphical_culture_type, bool new_is_overseas);
 
 	public:
 		CultureGroup(CultureGroup&&) = default;
@@ -63,11 +65,14 @@ namespace OpenVic {
 		return_t add_graphical_culture_type(const std::string_view identifier);
 		void lock_graphical_culture_types();
 		GraphicalCultureType const* get_graphical_culture_type_by_identifier(const std::string_view identifier) const;
-		return_t add_culture_group(const std::string_view identifier, GraphicalCultureType const* new_graphical_culture_type);
+		return_t add_culture_group(const std::string_view identifier, GraphicalCultureType const* new_graphical_culture_type, bool is_overseas);
 		void lock_culture_groups();
 		CultureGroup const* get_culture_group_by_identifier(const std::string_view identifier) const;
 		return_t add_culture(const std::string_view identifier, colour_t colour, CultureGroup const* group, Culture::name_list_t const& first_names, Culture::name_list_t const& last_names);
 		void lock_cultures();
 		Culture const* get_culture_by_identifier(const std::string_view identifier) const;
+
+		return_t load_graphical_culture_type_file(ast::NodeCPtr node);
+		return_t load_culture_file(ast::NodeCPtr node);
 	};
 }