Changed from OpenVic2 to OpenVic

2 files changed, 0 insertions, 134 deletions

diff --git a/src/openvic2/economy/Good.cpp b/src/openvic2/economy/Good.cpp
deleted file mode 100644
index 94cb9e3..0000000
--- a/src/openvic2/economy/Good.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "Good.hpp"
-
-#include <cassert>
-
-using namespace OpenVic2;
-
-Good::Good(std::string const& new_identifier, std::string const& new_category, colour_t new_colour, price_t new_base_price,
-	bool new_default_available, bool new_tradeable, bool new_currency, bool new_overseas_maintenance)
-	: HasIdentifier{ new_identifier }, HasColour{ new_colour, true }, category{ new_category }, base_price{ new_base_price },
-		default_available{ new_default_available }, tradeable{ new_tradeable }, currency{ new_currency },
-		overseas_maintenance{ new_overseas_maintenance } {
-	assert(base_price > NULL_PRICE);
-}
-
-std::string const& Good::get_category() const {
-	return category;
-}
-
-price_t Good::get_base_price() const {
-	return base_price;
-}
-
-price_t Good::get_price() const {
-	return price;
-}
-
-bool Good::is_default_available() const {
-	return default_available;
-}
-
-bool Good::is_available() const {
-	return available;
-}
-
-void Good::reset_to_defaults() {
-	available = default_available;
-	price = base_price;
-}
-
-GoodManager::GoodManager() : goods{ "goods" } {}
-
-return_t GoodManager::add_good(std::string const& identifier, std::string const& category, colour_t colour,
-	price_t base_price, bool default_available, bool tradeable, bool currency, bool overseas_maintenance) {
-	if (identifier.empty()) {
-		Logger::error("Invalid good identifier - empty!");
-		return FAILURE;
-	}
-	if (category.empty()) {
-		Logger::error("Invalid good category - empty!");
-		return FAILURE;
-	}
-	if (base_price <= NULL_PRICE) {
-		Logger::error("Invalid base price for ", identifier, ": ", base_price);
-		return FAILURE;
-	}
-	return goods.add_item({ identifier, category, colour, base_price, default_available, tradeable, currency, overseas_maintenance });
-}
-
-void GoodManager::lock_goods() {
-	goods.lock();
-}
-
-void GoodManager::reset_to_defaults() {
-	for (Good& good : goods.get_items())
-		good.reset_to_defaults();
-}
-
-Good const* GoodManager::get_good_by_index(size_t index) const {
-	return goods.get_item_by_index(index);
-}
-
-size_t GoodManager::get_good_count() const {
-	return goods.get_item_count();
-}
-
-std::vector<Good> const& GoodManager::get_goods() const {
-	return goods.get_items();
-}
-
diff --git a/src/openvic2/economy/Good.hpp b/src/openvic2/economy/Good.hpp
deleted file mode 100644
index a34ffa8..0000000
--- a/src/openvic2/economy/Good.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-#include "../Types.hpp"
-
-namespace OpenVic2 {
-	struct GoodManager;
-
-	/* ECON-3 , ECON-4 , ECON-5 , ECON-6 , ECON-7 , ECON-8 , ECON-9 , ECON-10, ECON-11, ECON-12, ECON-13, ECON-14,
-	 * ECON-15, ECON-16, ECON-17, ECON-18, ECON-19, ECON-20, ECON-21, ECON-22, ECON-23, ECON-24, ECON-25, ECON-26,
-	 * ECON-27, ECON-28, ECON-29, ECON-30, ECON-31, ECON-32, ECON-33, ECON-34, ECON-35, ECON-36, ECON-37, ECON-38,
-	 * ECON-39, ECON-40, ECON-41, ECON-42, ECON-43, ECON-44, ECON-45, ECON-46, ECON-47, ECON-48, ECON-49, ECON-50
-	 * 
-	 * ECON-123, ECON-124, ECON-125, ECON-126, ECON-127, ECON-128, ECON-129, ECON-130, ECON-131, ECON-132, ECON-133, ECON-134,
-	 * ECON-135, ECON-136, ECON-137, ECON-138, ECON-139, ECON-140, ECON-141, ECON-142, ECON-234, ECON-235, ECON-236, ECON-237,
-	 * ECON-238, ECON-239, ECON-240, ECON-241, ECON-242, ECON-243, ECON-244, ECON-245, ECON-246, ECON-247, ECON-248, ECON-249,
-	 * ECON-250, ECON-251, ECON-252, ECON-253, ECON-254, ECON-255, ECON-256, ECON-257, ECON-258, ECON-259, ECON-260, ECON-261
-	 */
-	struct Good : HasIdentifier, HasColour {
-		friend struct GoodManager;
-	private:
-		const std::string category;
-		const price_t base_price;
-		price_t price;
-		const bool default_available, tradeable, currency, overseas_maintenance;
-		bool available;
-
-		Good(std::string const& new_identifier, std::string const& new_category, colour_t new_colour, 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;
-		price_t get_base_price() const;
-		price_t get_price() const;
-		bool is_default_available() const;
-		bool is_available() const;
-		void reset_to_defaults();
-	};
-
-	struct GoodManager {
-	private:
-		IdentifierRegistry<Good> goods;
-	public:
-		GoodManager();
-
-		return_t add_good(std::string const& identifier, std::string const& category, colour_t colour, 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;
-		size_t get_good_count() const;
-		std::vector<Good> const& get_goods() const;
-	};
-}