cap max industry factor to 100%

Author: Zemurin

EU4ToVic3/Data_Files/configurables/et_province_mappings.txt

@@ -766,7 +766,7 @@
 	link = { eu4 = 1869 vic3 = x5FB41E } # Z�rich -> Z�rich [city]
 	link = { eu4 = 165 vic3 = x9080E0 vic3 = xE51E78 vic3 = xED07F7 } # Bern -> Basel [mine], STATE_WEST_SWITZERLAND, Bern [city]
 	link = { eu4 = 4722 eu4 = 1873 eu4 = 4160 vic3 = x90C0E0 } # Illanz, Chur, The Alps -> Chur [mine]
-	link = { eu4 = 166 vic3 = x11C0E0 vic3 = xD00161 } # Waldst�tte -> STATE_EAST_SWITZERLAND, Lucerne [wood]
+	link = { eu4 = 166 vic3 = xD00161 } # Waldst�tte -> Lucerne [wood]
 	link = { eu4 = 4721 vic3 = x117FE0 vic3 = xEBF5B1 } # Fribourg -> STATE_WEST_SWITZERLAND, STATE_WEST_SWITZERLAND
 	link = { eu4 = 4720 vic3 = xA042B5 } # Geneva -> Geneva [wood]
 	link = { eu4 = 1871 eu4 = 4162 vic3 = x508060 vic3 = x7ACC0B vic3 = x9041E0 } # MANY-TO-MANY: Wallis, The Alps -> STATE_WEST_SWITZERLAND, STATE_WEST_SWITZERLAND, STATE_WEST_SWITZERLAND
@@ -778,7 +778,8 @@
 	link = { eu4 = 118 vic3 = xB040A0 vic3 = xB5726E } # Roma -> Viterbo [wood], Rome [city][port]
 	link = { eu4 = 4732 vic3 = x0E8BCC vic3 = xB0C0A0 } # Terracina -> STATE_CAMPANIA, Frosinone [farm]
 	link = { eu4 = 119 vic3 = x30C021 vic3 = x72531E } # Ancona -> Ancona [city][wood], STATE_UMBRIA
-	link = { eu4 = 104 eu4 = 1862 vic3 = xD04060 } # Milan, Cremona -> Milan [city]
+	link = { eu4 = 1862 vic3 = xD04060 } # Cremona -> Milan [city]
+	link = { eu4 = 104 vic3 = x3F1E38 } # Milan -> Como [mine]
 	link = { eu4 = 4728 vic3 = xACB500 } # Pavia -> STATE_PIEDMONT
 	link = { eu4 = 2981 vic3 = x11C061 } # Montferrat -> Alessandria [farm]
 	link = { eu4 = 103 vic3 = xA9397D vic3 = xDA86EA vic3 = x90C060 } # Turin -> Turin [city], STATE_PIEDMONT, STATE_PIEDMONT
@@ -793,7 +794,7 @@
 	link = { eu4 = 107 vic3 = x4713EE } # Brescia -> Bergamo [wood]
 	link = { eu4 = 4739 vic3 = xA40CE9 } # Bergamo -> STATE_LOMBARDY
 	link = { eu4 = 108 vic3 = x3083C8 vic3 = x3080A0 } # Verona -> Verona [city], STATE_VENETIA
-	link = { eu4 = 4740 vic3 = x3F1E38 } # Como -> Como [mine]
+	link = { eu4 = 4740 vic3 = x11C0E0 } # Como -> STATE_EAST_SWITZERLAND
 	link = { eu4 = 2979 vic3 = x1140E0 vic3 = xF00544 } # Novara -> Novara [mine], STATE_PIEDMONT
 	link = { eu4 = 1875 vic3 = xD080E0 } # Cuneo -> Cuneo [wood]
 	link = { eu4 = 4727 eu4 = 4763 vic3 = xAA6958 } # Saluzzo, The Alps -> STATE_PIEDMONT

EU4ToVic3/Source/V3World/EconomyManager/EconomyManager.cpp

@@ -17,6 +17,7 @@
 #include "Log.h"
 #include "PoliticalManager/Country/Country.h"
 #include "PoliticalManager/PoliticalManager.h"
+#include <algorithm>
 #include <cmath>
 #include <iomanip>
 #include <numeric>
@@ -260,7 +261,9 @@ double V3::EconomyManager::calculateDateFactor(const Configuration::STARTDATE st
 {
 	if (startDate == Configuration::STARTDATE::Dynamic)
 	{
-		const double factor = Country::yearCapFactor(dateData.lastEU4Date) - 1.0;
+		double factor = Country::yearCapFactor(dateData.lastEU4Date) - 1.0;
+		// Hard cap factor to 100% as we really don't want *10000% for converting a 1948 ET game.
+		factor = std::min(factor, 1.0);
 		Log(LogLevel::Info) << std::fixed << std::setprecision(0) << "Altering global industry by " << factor * 100 << "% due to start date of "
 								  << dateData.lastEU4Date << ".";
 		return factor;