Merge pull request #204 from OpenVicProject/fix-modifiers

Fix modifiers

2 files changed, 2 insertions, 8 deletions

diff --git a/src/openvic-simulation/economy/BuildingType.cpp b/src/openvic-simulation/economy/BuildingType.cpp
index a20aa36..e7c0d59 100644
--- a/src/openvic-simulation/economy/BuildingType.cpp
+++ b/src/openvic-simulation/economy/BuildingType.cpp
@@ -5,7 +5,7 @@ using namespace OpenVic::NodeTools;
 
 BuildingType::BuildingType(
 	std::string_view identifier, building_type_args_t& building_type_args
-) : Modifier { identifier, std::move(building_type_args.modifier) },
+) : Modifier { identifier, std::move(building_type_args.modifier), modifier_type_t::BUILDING },
 	type { building_type_args.type },
 	on_completion { building_type_args.on_completion },
 	completion_size { building_type_args.completion_size },
@@ -154,6 +154,7 @@ bool BuildingTypeManager::load_buildings_file(
 		Logger::error("No port building type found!");
 		ret = false;
 	}
+
 	if (province_building_types.empty()) {
 		Logger::error("No province building types found!");
 		ret = false;
diff --git a/src/openvic-simulation/economy/GoodDefinition.cpp b/src/openvic-simulation/economy/GoodDefinition.cpp
index 82d3719..ed24549 100644
--- a/src/openvic-simulation/economy/GoodDefinition.cpp
+++ b/src/openvic-simulation/economy/GoodDefinition.cpp
@@ -123,12 +123,5 @@ bool GoodDefinitionManager::generate_modifiers(ModifierManager& modifier_manager
 		return StringUtils::append_string_views(good_identifier, "_RGO_SIZE");
 	});
 
-	for (GoodDefinition const& good : get_good_definitions()) {
-		ret &= modifier_manager.add_modifier_effect(
-			good.get_identifier(), true, PERCENTAGE_DECIMAL,
-			StringUtils::append_string_views("$ENCOURAGEMENT_FOR$$", good.get_identifier(), "$")
-		);
-	}
-
 	return ret;
 }