Add GoodInstancegood-instance

1 files changed, 7 insertions, 5 deletions

diff --git a/src/openvic-simulation/economy/ArtisanalProducer.hpp b/src/openvic-simulation/economy/ArtisanalProducer.hpp
index 36de2f2..ed5b231 100644
--- a/src/openvic-simulation/economy/ArtisanalProducer.hpp
+++ b/src/openvic-simulation/economy/ArtisanalProducer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/economy/Good.hpp"
+#include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/economy/ProductionType.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
@@ -9,14 +9,16 @@ namespace OpenVic {
 	class ArtisanalProducer final {
 	private:
 		ProductionType const& PROPERTY(production_type);
-		Good::good_map_t PROPERTY(stockpile);
+		GoodDefinition::good_definition_map_t PROPERTY(stockpile);
 		fixed_point_t PROPERTY(current_production);
-		Good::good_map_t PROPERTY(current_needs);
+		GoodDefinition::good_definition_map_t PROPERTY(current_needs);
 
 	public:
 		ArtisanalProducer(
-			ProductionType const& new_production_type, Good::good_map_t&& new_stockpile,
-			const fixed_point_t new_current_production, Good::good_map_t&& new_current_needs
+			ProductionType const& new_production_type,
+			GoodDefinition::good_definition_map_t&& new_stockpile,
+			fixed_point_t new_current_production,
+			GoodDefinition::good_definition_map_t&& new_current_needs
 		);
 	};
 }