From 0734944f7e65f6a39c5a9267c8cc1eb2b691916f Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Fri, 27 Dec 2024 13:37:53 +0000 Subject: [PATCH] Don't convert forts to feudal holdings in non-capital baronies for tribal realms (#2381) #patch --- ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs | 4 +++- ImperatorToCK3/CK3/Provinces/Province.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs b/ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs index 17fc7d421..26ac43208 100644 --- 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 index 56752f25f..32fae4f06 100644 --- 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", {