Skip to content

Prevent I:R holding owners that already have counties from being given baronies in counties that are not their own #2137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Prevent I:R holding owners that already have counties from being given baronies in counties that are not their own #2137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c170c58
Fix I:R holding owners getting baronies outside their counties
IhateTrains Sep 4, 2024
427cd49
change the fix logic
IhateTrains Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ImperatorToCK3/CK3/Titles/LandedTitles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,10 @@ public void ImportImperatorHoldings(ProvinceCollection ck3Provinces, Imperator.C
.Where(b => !titleCapitalBaronyIds.Contains(b.Id))
.ToImmutableHashSet();

// In CK3, a county holder shouldn't own baronies in counties that are not their own.
// This dictionary tracks what counties are held by what characters.
Dictionary<string, HashSet<string>> countiesPerCharacter = []; // characterId -> countyIds

foreach (var barony in eligibleBaronies) {
var ck3ProvinceId = barony.ProvinceId;
if (ck3ProvinceId is null) {
Expand Down Expand Up @@ -596,7 +600,23 @@ public void ImportImperatorHoldings(ProvinceCollection ck3Provinces, Imperator.C
}
county.SetHolder(ck3Owner, conversionDate);
county.SetDeFactoLiege(deFactoLiege, conversionDate);

if (!countiesPerCharacter.TryGetValue(ck3Owner.Id, out var countyIds)) {
countyIds = [];
countiesPerCharacter[ck3Owner.Id] = countyIds;
}
countyIds.Add(county.Id);
} else {
var county = barony.DeJureLiege;
if (county is null) {
Logger.Warn($"Barony {barony.Id} has no de jure county!");
continue;
}
// A non-capital barony cannot be held by a character that owns a county but not the county the barony is in.
if (countiesPerCharacter.TryGetValue(ck3Owner.Id, out var countyIds) && !countyIds.Contains(county.Id)) {
continue;
}

barony.SetHolder(ck3Owner, conversionDate);
// No need to set de facto liege for baronies, they are tied to counties.
}
Expand Down
Loading