Set up trade ports if possible. (#387)

Co-authored-by: Zemurin <ivo@elezovic.su>
ParadoxGameConverters · Apr 29, 2023 · 3b30f82 · 3b30f82
1 parent 26187cf
commit 3b30f82
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 66 deletions.
diff --git a/EU4ToVic3/Data_Files/configurables/province_mappings.txt b/EU4ToVic3/Data_Files/configurables/province_mappings.txt
diff --git a/EU4ToVic3/Source/V3World/ClayManager/State/Province.h b/EU4ToVic3/Source/V3World/ClayManager/State/Province.h
@@ -17,6 +17,7 @@ class Province
 	[[nodiscard]] auto isCoastal() const { return coastal; }
 	[[nodiscard]] auto isPrime() const { return prime; }
 	[[nodiscard]] auto isImpassable() const { return impassable; }
+	[[nodiscard]] auto isPort() const { return port; }
 
 	void setSea() { sea = true; }
 	void setLake()
@@ -27,6 +28,7 @@ class Province
 	void setCoastal() { coastal = true; }
 	void setPrime() { prime = true; }
 	void setImpassable() { impassable = true; }
+	void setPort() { port = true; }
 	void setName(const std::string& theName) { name = theName; }
 	void setTerrain(const std::string& theTerrain) { terrain = theTerrain; };
 
@@ -40,6 +42,7 @@ class Province
 	bool coastal = false;
 	bool prime = false;
 	bool impassable = false;
+	bool port = false;
 };
 } // namespace V3
 

diff --git a/EU4ToVic3/Source/V3World/ClayManager/State/State.cpp b/EU4ToVic3/Source/V3World/ClayManager/State/State.cpp
@@ -93,6 +93,18 @@ void V3::State::registerKeys()
 		navalExitID = commonItems::getInt(theStream);
 		coastal = true;
 	});
+	registerKeyword("port", [this](std::istream& theStream) {
+		auto theProvinceName = commonItems::getString(theStream);
+		std::transform(theProvinceName.begin(), theProvinceName.end(), theProvinceName.begin(), ::toupper);
+		if (theProvinceName.starts_with("X") && theProvinceName.size() == 7)
+			theProvinceName = "x" + theProvinceName.substr(1, theProvinceName.length() - 1);
+		else
+			Log(LogLevel::Warning) << "Encountered port " << theProvinceName << " in unknown format!";
+		if (provinces.contains(theProvinceName))
+			provinces.at(theProvinceName)->setPort();
+		else
+			Log(LogLevel::Warning) << "Port province " << theProvinceName << " isn't defined in the state! (Vanilla?) Map error. Ignoring port.";
+	});
 	registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
 }
 

diff --git a/EU4ToVic3/Source/V3World/ClayManager/State/SubState.cpp b/EU4ToVic3/Source/V3World/ClayManager/State/SubState.cpp
@@ -647,3 +647,10 @@ void V3::SubState::setIncorporated(bool status)
 	else
 		subStateTypes.emplace("unincorporated");
 }
+
+void V3::SubState::setTreatyPort()
+{
+	subStateTypes.clear();
+	subStateTypes.emplace("unincorporated");
+	subStateTypes.emplace("treaty_port");
+}
diff --git a/EU4ToVic3/Source/V3World/ClayManager/State/SubState.h b/EU4ToVic3/Source/V3World/ClayManager/State/SubState.h
@@ -54,7 +54,6 @@ class SubState
 	void setSourceProvinceData(const std::vector<std::pair<SourceProvinceData, double>>& theData) { weightedSourceProvinceData = theData; }
 
 	void setMarketCapital() { marketCapital = true; }
-	void setTreatyPort() { subStateTypes.emplace("treaty_port"); }
 	void setVanillaSubState() { vanillaSubState = true; }
 	void setLandshare(const double theLandshare) { landshare = theLandshare; }
 	void setResource(const std::string& theResource, const int theAmount) { resources[theResource] = theAmount; }
@@ -141,7 +140,7 @@ class SubState
 
 	[[nodiscard]] auto isVanillaSubState() const { return vanillaSubState; }
 	[[nodiscard]] auto isIncorporated() const { return subStateTypes.contains("incorporated"); }
-	[[nodiscard]] auto isTreatyPort() const { return !subStateTypes.contains("treaty_port"); }
+	[[nodiscard]] auto isTreatyPort() const { return subStateTypes.contains("treaty_port"); }
 	[[nodiscard]] auto isMarketCapital() const { return marketCapital; }
 	[[nodiscard]] bool isCoastal() const;
 
@@ -154,6 +153,7 @@ class SubState
 	[[nodiscard]] static bool greaterBudget(const std::shared_ptr<SubState>& lhs, const std::shared_ptr<SubState>& rhs);
 
 	void setIncorporated(bool status);
+	void setTreatyPort();
 
   private:
 	void calculateTerrainFrequency();

diff --git a/EU4ToVic3/Source/V3World/PoliticalManager/PoliticalManager.cpp b/EU4ToVic3/Source/V3World/PoliticalManager/PoliticalManager.cpp
@@ -1,5 +1,6 @@
 #include "PoliticalManager.h"
 #include "ClayManager/ClayManager.h"
+#include "ClayManager/State/Province.h"
 #include "ClayManager/State/State.h"
 #include "ClayManager/State/SubState.h"
 #include "ColonialRegionMapper/ColonialRegionMapper.h"
@@ -1129,3 +1130,45 @@ void V3::PoliticalManager::incorporateStates(const mappers::CultureMapper& cultu
 
 	Log(LogLevel::Info) << "<> Incorporated " << incorporated << " states, " << unIncorporated << " are unincorporated.";
 }
+
+void V3::PoliticalManager::designateTreatyPorts(const ClayManager& clayManager)
+{
+	Log(LogLevel::Info) << "-> Designating Treaty Ports.";
+
+	auto count = 0;
+
+	for (const auto& country: countries | std::views::values)
+	{
+		const auto capitalState = country->getProcessedData().capitalStateName;
+		const auto capitalRegionName = clayManager.getParentRegionName(capitalState);
+
+		for (const auto& subState: country->getSubStates())
+		{
+			// If the state is in same region as capital, skip!
+
+			if (capitalRegionName)
+			{
+				const auto actualRegionName = clayManager.getParentRegionName(subState->getHomeStateName());
+				if (*actualRegionName == *capitalRegionName)
+				{
+					continue;
+				}
+			}
+
+			// Otherwise check if it's a single-province state and a named port.
+
+			if (subState->getProvinces().size() != 1)
+				continue;
+
+			const auto& theProvince = subState->getProvinces().begin()->second;
+
+			if (theProvince->isPort())
+			{
+				subState->setTreatyPort();
+				++count;
+			}
+		}
+	}
+
+	Log(LogLevel::Info) << "<> Designated " << count << " treaty ports.";
+}
diff --git a/EU4ToVic3/Source/V3World/PoliticalManager/PoliticalManager.h b/EU4ToVic3/Source/V3World/PoliticalManager/PoliticalManager.h
@@ -119,6 +119,7 @@ class PoliticalManager
 	void generateAISecretGoals(const ClayManager& clayManager);
 	void attemptColonialTagReplacement(const mappers::ColonialRegionMapper& colonialRegionMapper, const ClayManager& clayManager);
 	void incorporateStates(const mappers::CultureMapper& cultureMapper, const ClayManager& clayManager);
+	void designateTreatyPorts(const ClayManager& clayManager);
 
 	// VN specifics
 	void importVNColonialDiplomacy(const ClayManager& clayManager);

diff --git a/EU4ToVic3/Source/V3World/V3World.cpp b/EU4ToVic3/Source/V3World/V3World.cpp
@@ -184,6 +184,7 @@ V3::World::World(const Configuration& configuration, const EU4::World& sourceWor
 	popManager.alterSlaveCultures(politicalManager, clayManager, cultureMapper.getV3CultureDefinitions());
 
 	politicalManager.incorporateStates(cultureMapper, clayManager);
+	politicalManager.designateTreatyPorts(clayManager);
 
 	// Place starting buildings for all centralized countries
 	Log(LogLevel::Progress) << "71 %";