Don't convert forts to feudal holdings in non-capital baronies for tr…

…ibal realms (#2381) #patch
ParadoxGameConverters · Dec 27, 2024 · 0734944 · 0734944
1 parent e944c01
commit 0734944
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs b/ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs
@@ -170,14 +170,16 @@ public void SetHoldingLogicWorksCorrectlyForAllGovernmentTypes() {
 			" = { province_rank=city_metropolis holy_site=69 fort=yes }",
 			" = { province_rank=city_metropolis fort=yes }",
 			" = { province_rank=city_metropolis }",
+			" = { province_rank=settlement fort=yes}",
 			" = { province_rank=settlement }",
 		});
 		ck3Provinces = GetCK3ProvincesForIRGovernment(irProvinces, "tribal_federation");
 		holdingTypes = ck3Provinces.Select(p => p.GetHoldingType(ck3BookmarkDate));
 		holdingTypes.Should().Equal(
 			"church_holding",
-			"castle_holding",
+			"city_holding", // For non-capital baronies of tribal realms, forts are not converted to castles.
 			"city_holding",
+			"none", // For non-capital baronies of tribal realms, forts are not converted to castles.
 			"none"
 		);
 	}

diff --git a/ImperatorToCK3/CK3/Provinces/Province.cs b/ImperatorToCK3/CK3/Provinces/Province.cs
@@ -258,7 +258,7 @@ private void SetHoldingFromImperator(Title.LandedTitles landedTitles) {
 			} => "church_holding",
 			{
 				IsCountyCapital: false,
-				GovernmentType: GovernmentType.monarchy or GovernmentType.tribal,
+				GovernmentType: GovernmentType.monarchy,
 				Fort: true
 			} => "castle_holding",
 			{