Followup big dataloader commit

1 files changed, 23 insertions, 7 deletions

diff --git a/src/openvic/economy/Good.hpp b/src/openvic/economy/Good.hpp
index 5c8e68c..a3cd10b 100644
--- a/src/openvic/economy/Good.hpp
+++ b/src/openvic/economy/Good.hpp
@@ -1,11 +1,21 @@
 #pragma once
 
 #include "openvic/types/IdentifierRegistry.hpp"
-#include "openvic/types/fixed_point/FP.hpp"
+#include "openvic/dataloader/NodeTools.hpp"
 
 namespace OpenVic {
 	struct GoodManager;
 
+	struct GoodCategory : HasIdentifier {
+		friend struct GoodManager;
+
+	private:
+		GoodCategory(const std::string_view new_identifier);
+
+	public:
+		GoodCategory(GoodCategory&&) = default;
+	};
+
 	/* REQUIREMENTS:
 	 *
 	 * ECON-3 , ECON-4 , ECON-5 , ECON-6 , ECON-7 , ECON-8 , ECON-9 , ECON-10, ECON-11, ECON-12, ECON-13, ECON-14,
@@ -25,19 +35,19 @@ namespace OpenVic {
 		static constexpr price_t NULL_PRICE = FP::_0();
 
 	private:
-		const std::string category;
+		GoodCategory const& category;
 		const price_t base_price;
 		price_t price;
 		const bool default_available, tradeable, currency, overseas_maintenance;
 		bool available;
 
-		Good(const std::string_view new_identifier, colour_t new_colour, const std::string_view new_category, price_t new_base_price,
+		Good(const std::string_view new_identifier, colour_t new_colour, GoodCategory const& new_category, price_t new_base_price,
 			bool new_default_available, bool new_tradeable, bool new_currency, bool new_overseas_maintenance);
 
 	public:
 		Good(Good&&) = default;
 
-		std::string const& get_category() const;
+		GoodCategory const& get_category() const;
 		price_t get_base_price() const;
 		price_t get_price() const;
 		bool is_default_available() const;
@@ -47,19 +57,25 @@ namespace OpenVic {
 
 	struct GoodManager {
 	private:
+		IdentifierRegistry<GoodCategory> good_categories;
 		IdentifierRegistry<Good> goods;
 
 	public:
 		GoodManager();
 
-		return_t add_good(const std::string_view identifier, colour_t colour, const std::string_view category, Good::price_t base_price,
+		return_t add_good_category(const std::string_view identifier);
+		void lock_good_categories();
+		GoodCategory const* get_good_category_by_identifier(const std::string_view identifier) const;
+
+		return_t add_good(const std::string_view identifier, colour_t colour, GoodCategory const* category, Good::price_t base_price,
 			bool default_available, bool tradeable, bool currency, bool overseas_maintenance);
 		void lock_goods();
-		void reset_to_defaults();
-
 		Good const* get_good_by_index(size_t index) const;
 		Good const* get_good_by_identifier(const std::string_view identifier) const;
 		size_t get_good_count() const;
 		std::vector<Good> const& get_goods() const;
+
+		void reset_to_defaults();
+		return_t load_good_file(ast::NodeCPtr root);
 	};
 }