Skip to content

Fix error.log spam about illegal government for filler counts #2126

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 1 commit into from
Sep 1, 2024
Merged

Fix error.log spam about illegal government for filler counts #2126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions ImperatorToCK3/CK3/World.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,9 +925,19 @@ private void GenerateFillerHoldersForUnownedLands(CultureCollection cultures, Co
};
holder.SetFaithId(faithId, null);
holder.SetCultureId(culture.Id, null);
holder.History.AddFieldValue(date, "government", "change_government", "tribal_government");
Characters.AddOrReplace(holder);

var countyHoldingTypes = county.CountyProvinceIds
.Select(id => Provinces.TryGetValue(id, out var province) ? province : null)
.Where(p => p is not null)
.Select(p => p!.GetHoldingType(date))
.Where(t => t is not null)
.Select(t => t!)
.ToHashSet();
string government = countyHoldingTypes.Contains("castle_holding")
? "feudal_government"
: "tribal_government";

county.SetHolder(holder, date);
if (config.FillerDukes) {
var duchy = county.DeJureLiege;
Expand All @@ -936,10 +946,10 @@ private void GenerateFillerHoldersForUnownedLands(CultureCollection cultures, Co
}

duchy.SetHolder(holder, date);
duchy.SetGovernment("tribal_government", date);
duchy.SetGovernment(government, date);
duchyIdToHolderDict[duchy.Id] = holder;
} else {
county.SetGovernment("tribal_government", date);
county.SetGovernment(government, date);
}
}
}
Expand Down
Loading