Filter monuments (#598)

EU4ToVic3/Source/V3World/ClayManager/State/SubState.cpp

@@ -376,7 +376,7 @@ bool V3::SubState::isBuildingValid(const Building& building,
 		return false;
 	}
 	// Economy builder will ignore all monuments, canals, and power block statues.
-	if (building.isUnique() || building.isStatue())
+	if (building.isUnique() || building.isStatue() || building.isMonumental())
 	{
 		return false;
 	}

EU4ToVic3/Source/V3World/EconomyManager/Building/Building.cpp

@@ -39,6 +39,10 @@ void V3::Building::registerKeys(const std::map<std::string, int>& costTiers)
 		if (const auto costTier = commonItems::getString(theStream); costTiers.contains(costTier))
 		{
 			constructionCost = costTiers.at(costTier);
+			if (costTier == "construction_cost_monument")
+			{
+				monumental = true;
+			}
 		}
 		else
 		{

EU4ToVic3/Source/V3World/EconomyManager/Building/Building.h

@@ -28,6 +28,7 @@ class Building: commonItems::parser
 	[[nodiscard]] const auto& isCappedByGov() const { return governmentCapped; }
 	[[nodiscard]] const auto& isUnique() const { return unique; }
 	[[nodiscard]] const auto& isStatue() const { return statue; }
+	[[nodiscard]] const auto& isMonumental() const { return monumental; }
 
 	[[nodiscard]] const auto& getLevel() const { return level; }
 	[[nodiscard]] const auto& getShareholders() const { return shareholders; }
@@ -46,6 +47,7 @@ class Building: commonItems::parser
 	bool governmentCapped = false; // barracks, ports, other caps done at the building not building group level by techs/laws/traits.
 	bool unique = false;				 // Monument or Canal.
 	bool statue = false;				 // Power Block
+	bool monumental = false;		 // Misc monumental stuff eg. skyscrapers
 
 	// Specific to instance of building in SubState e.g. The port in New York
 	std::set<std::string> PMs; // Only Production Methods that are different from default

EU4ToVic3Tests/TestFiles/vic3installation/game/common/script_values/building_values.txt

@@ -1,5 +1,6 @@
 construction_cost_medium = 300
 construction_cost_low = 150
 construction_cost_very_low = 50
+construction_cost_monument = 2500
 
 max_autoexpand_queue_weeks = 26

EU4ToVic3Tests/V3WorldTests/EconomyManagerTests/BuildingTests/BuildingTests.cpp

@@ -114,4 +114,19 @@ TEST(V3World_BuildingTests, UnkownConstructionCostIsCaught)
 	EXPECT_EQ(50, building.getConstructionCost());
 
 	std::cout.rdbuf(cout_buffer);
-}
+}
+
+TEST(V3World_BuildingTests, MonumentsAreRecognized)
+{
+	V3::BuildingScriptValuesLoader buildingScriptValuesLoader;
+	buildingScriptValuesLoader.loadBuildingScriptValues(modFS);
+	const auto& costTiers = buildingScriptValuesLoader.getBuildingCostConstants();
+
+	std::stringstream input;
+	input << "\trequired_construction = construction_cost_monument\n";
+
+	V3::Building building;
+	building.loadBuilding(input, costTiers);
+
+	EXPECT_TRUE(building.isMonumental());
+}

EU4ToVic3Tests/V3WorldTests/LoaderTests/DefinesLoaderTests/BuildingScriptValuesLoaderTests.cpp

@@ -13,10 +13,11 @@ TEST(V3World_BuildingScriptValuesLoaderTests, CostTiersCanBeLoaded)
 	EXPECT_TRUE(buildingScriptValuesLoader.getBuildingCostConstants().empty());
 	buildingScriptValuesLoader.loadBuildingScriptValues(modFS);
 	const auto costTiers = buildingScriptValuesLoader.getBuildingCostConstants();
-	EXPECT_EQ(3, costTiers.size());
+	EXPECT_EQ(4, costTiers.size());
 
 	EXPECT_THAT(costTiers,
 		 testing::UnorderedElementsAre(std::pair("construction_cost_very_low", 50),
 			  std::pair("construction_cost_low", 150),
-			  std::pair("construction_cost_medium", 300)));
+			  std::pair("construction_cost_medium", 300),
+			  std::pair("construction_cost_monument", 2500)));
 }