Juniors in a PU never have vassals

ParadoxGameConverters · Jan 19, 2013 · 1c865fc · 1c865fc
1 parent c9c0978
commit 1c865fc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Data Files/Changelog.txt b/Data Files/Changelog.txt
@@ -305,4 +305,5 @@ Revision	Log Message
 299		Output the HRE Emperor
 300		Rename CK2+ readme file
 301		Log when government gets default conversion
-302		EU3 vassals never have vassals
+302		EU3 vassals never have vassals
+303		Juniors in a PU never have vassals
diff --git a/Source/EU3World/EU3Country.cpp b/Source/EU3World/EU3Country.cpp
@@ -1054,6 +1054,20 @@ void EU3Country::determineStartingAgents()
 
 vector<EU3Country*> EU3Country::convertVassals(int initialScore, EU3Diplomacy* diplomacy)
 {
+	if (vassals.size() == 0)
+	{
+		vector<EU3Country*> absorbedCountries;
+		return absorbedCountries;
+	}
+
+	// Am I a junior in a PU?
+	if (src->isIndependent() && (src != src->getHolder()->getPrimaryTitle()))
+	{
+		log("\t%s is completely absorbing all vassals (junior in PU).\n", src->getTitleString().c_str());
+		vector<EU3Country*> absorbedCountries = eatVassals();
+		return absorbedCountries;
+	}
+
 	int score = initialScore;
 	string CA = src->getCA();
 	if ( CA == "centralization_0")