Merge pull request #652 from OpenVicProject/add_artisans_discard_unsold_non_inputs_game_rule

Add should_artisans_discard_unsold_non_inputs game rule

Author: wvpm

src/openvic-simulation/economy/production/ArtisanalProducer.cpp

@@ -10,6 +10,7 @@
 #include "openvic-simulation/economy/production/ProductionType.hpp"
 #include "openvic-simulation/economy/trading/MarketInstance.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
+#include "openvic-simulation/misc/GameRulesManager.hpp"
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/population/PopValuesFromProvince.hpp"
@@ -297,6 +298,20 @@ void ArtisanalProducer::artisan_tick(
 	memory::vector<fixed_point_t>& demand_per_input = reusable_map_1;
 
 	ProductionType const* const old_production_type_ptr = production_type_nullable;
+
+	if (values_from_province.game_rules_manager.get_should_artisans_discard_unsold_non_inputs()) {
+		if (old_production_type_ptr == nullptr) {
+			stockpile.fill(0);
+		} else {
+			fixed_point_map_t<GoodDefinition const*> const& input_goods = old_production_type_ptr->get_input_goods();
+			for (auto [good, stockpiled_quantity] : stockpile) {
+				if (!input_goods.contains(&good)) {
+					stockpiled_quantity = 0;
+				}
+			}
+		}
+	}
+
 	ProductionType const* new_production_type_ptr = pick_production_type(
 		pop,
 		values_from_province,

src/openvic-simulation/misc/GameRulesManager.hpp

@@ -40,6 +40,7 @@ namespace OpenVic {
 		// if changed during a session, call on_use_exponential_price_changes_changed for each GoodInstance.
 		bool PROPERTY_RW(use_exponential_price_changes);
 		bool PROPERTY_RW(prevent_negative_administration_efficiency);
+		bool PROPERTY_RW(should_artisans_discard_unsold_non_inputs);
 		demand_category PROPERTY_RW(artisanal_input_demand_category);
 		country_to_report_economy_t PROPERTY_RW(country_to_report_economy);
 		artisan_coastal_restriction_t PROPERTY_RW(coastal_restriction_for_artisans);
@@ -61,6 +62,7 @@ namespace OpenVic {
 			use_simple_farm_mine_logic = true;
 			use_exponential_price_changes = true;
 			prevent_negative_administration_efficiency = true;
+			should_artisans_discard_unsold_non_inputs = false;
 			artisanal_input_demand_category = demand_category::FactoryNeeds;
 			country_to_report_economy = country_to_report_economy_t::Controller;
 			coastal_restriction_for_artisans = artisan_coastal_restriction_t::CoastalProvinces;
@@ -71,6 +73,7 @@ namespace OpenVic {
 			use_simple_farm_mine_logic = false;
 			use_exponential_price_changes = false;
 			prevent_negative_administration_efficiency = false;
+			should_artisans_discard_unsold_non_inputs = true;
 			artisanal_input_demand_category = demand_category::None;
 			country_to_report_economy = country_to_report_economy_t::Owner;
 			coastal_restriction_for_artisans = artisan_coastal_restriction_t::CountriesWithCoast;

src/openvic-simulation/population/PopValuesFromProvince.hpp

@@ -31,8 +31,6 @@ namespace OpenVic {
 
 	struct PopValuesFromProvince {
 	private:
-
-		GameRulesManager const& game_rules_manager;
 		GoodInstanceManager const& good_instance_manager;
 		ModifierEffectCache const& modifier_effect_cache;
 		ProductionTypeManager const& production_type_manager;
@@ -42,6 +40,7 @@ namespace OpenVic {
 		memory::vector<std::pair<ProductionType const*, fixed_point_t>> SPAN_PROPERTY(ranked_artisanal_production_types);
 	public:
 		PopsDefines const& defines;
+		GameRulesManager const& game_rules_manager;
 
 		PopValuesFromProvince(
 			GameRulesManager const& new_game_rules_manager,