[WIP] Conversion of treasures into artifacts

ImperatorToCK3.UnitTests/CK3/Religions/HolySiteTests.cs

@@ -3,7 +3,7 @@
 using commonItems.Serialization;
 using ImperatorToCK3.CK3.Religions;
 using ImperatorToCK3.CK3.Titles;
-using ImperatorToCK3.Mappers.HolySiteEffect;
+using ImperatorToCK3.Mappers.Modifier;
 using System.Collections.Generic;
 using Xunit;
 
@@ -60,7 +60,7 @@ public void HolySiteCanBeConstructedForBaronyAndFaithWithEffects() {
 		var titlesReader = new BufferedReader("c_county = { b_barony = { province = 1 } }");
 		titles.LoadTitles(titlesReader, colorFactory);
 
-		var holySiteEffectMapper = new HolySiteEffectMapper("TestFiles/configurables/holy_site_effect_mappings.txt");
+		var holySiteEffectMapper = new ModifierMapper("TestFiles/configurables/holy_site_effect_mappings.txt");
 		var imperatorEffects = new OrderedDictionary<string, double> {
 			{"discipline", 0.2f}, // will be converted to knight_effectiveness_mult with factor of 10
 			{"unmapped_effect", 1f}, // will be skipped

ImperatorToCK3.UnitTests/CK3/Religions/ReligionCollectionTests.cs

@@ -6,7 +6,7 @@
 using ImperatorToCK3.CK3.Religions;
 using ImperatorToCK3.CK3.Titles;
 using ImperatorToCK3.Imperator.Pops;
-using ImperatorToCK3.Mappers.HolySiteEffect;
+using ImperatorToCK3.Mappers.Modifier;
 using System;
 using System.Linq;
 using Xunit;
@@ -156,7 +156,7 @@ Province GenerateCK3AndImperatorProvinceWithPops(ulong provId, int popCount, boo
 		religions.DetermineHolySites(
 			provinces,
 			imperatorReligions,
-			new HolySiteEffectMapper("TestFiles/HolySiteEffectMapperTests/mappings.txt"),
+			new ModifierMapper("TestFiles/HolySiteEffectMapperTests/mappings.txt"),
 			new Date("476.1.1")
 		);
 

ImperatorToCK3.UnitTests/Mappers/HolySiteEffect/HolySiteEffectMapperTests.cs

@@ -1,4 +1,4 @@
-using ImperatorToCK3.Mappers.HolySiteEffect;
+using ImperatorToCK3.Mappers.Modifier;
 using System.Collections.Generic;
 using Xunit;
 
@@ -8,7 +8,7 @@ public class HolySiteEffectMapperTests {
 	[Theory, MemberData(nameof(TestData))]
 	public void MapperReturnsCorrectValues(string imperatorEffect, double imperatorValue, KeyValuePair<string, double>? match) {
 		const string mappingsFilePath = "TestFiles/HolySiteEffectMapperTests/mappings.txt";
-		var mapper = new HolySiteEffectMapper(mappingsFilePath);
+		var mapper = new ModifierMapper(mappingsFilePath);
 		Assert.Equal(match, mapper.Match(imperatorEffect, imperatorValue));
 	}
 

ImperatorToCK3/CK3/Characters/CharacterCollection.cs

@@ -2,16 +2,21 @@
 using commonItems.Collections;
 using commonItems.Localization;
 using ImperatorToCK3.CK3.Armies;
+using ImperatorToCK3.CK3.Modifiers;
 using ImperatorToCK3.CK3.Cultures;
 using ImperatorToCK3.CK3.Dynasties;
 using ImperatorToCK3.CK3.Titles;
 using ImperatorToCK3.CommonUtils;
 using ImperatorToCK3.CommonUtils.Map;
 using ImperatorToCK3.Imperator.Armies;
+using ImperatorToCK3.Imperator.Provinces;
+using ImperatorToCK3.Imperator.Religions;
 using ImperatorToCK3.Imperator.Characters;
 using ImperatorToCK3.Imperator.Countries;
+using ImperatorToCK3.Mappers.Artifact;
 using ImperatorToCK3.Mappers.Culture;
 using ImperatorToCK3.Mappers.DeathReason;
+using ImperatorToCK3.Mappers.Modifier;
 using ImperatorToCK3.Mappers.Nickname;
 using ImperatorToCK3.Mappers.Province;
 using ImperatorToCK3.Mappers.Religion;
@@ -184,41 +189,41 @@
 
 			// Remove all empty effect blocks (effect = { }).
 			effectsHistoryField.RemoveAllEntries(entryValue => {
 				if (entryValue is not string valueString) {
 					return false;
 				}
 
 				string trimmedBlock = valueString.Trim();
 				if (!trimmedBlock.StartsWith('{') || !trimmedBlock.EndsWith('}')) {
 					return false;
 				}
 
 				return trimmedBlock[1..^1].Trim().Length == 0;
 			});
 		}
 	}
 
 	private void LinkMothersAndFathers() {
 		var motherCounter = 0;
 		var fatherCounter = 0;
 		foreach (var ck3Character in this) {
 			// make links between Imperator characters
 			if (ck3Character.ImperatorCharacter is null) {
 				// imperatorRegnal characters do not have ImperatorCharacter
 				continue;
 			}
 			var irMotherCharacter = ck3Character.ImperatorCharacter.Mother;
 			if (irMotherCharacter is not null) {
 				var ck3MotherCharacter = irMotherCharacter.CK3Character;
 				if (ck3MotherCharacter is not null) {
 					ck3Character.Mother = ck3MotherCharacter;
 					++motherCounter;
 				} else {
 					Logger.Warn($"Imperator mother {irMotherCharacter.Id} has no CK3 character!");
 				}
 			}
 
 			// make links between Imperator characters
 			var irFatherCharacter = ck3Character.ImperatorCharacter.Father;
 			if (irFatherCharacter is not null) {
 				var ck3FatherCharacter = irFatherCharacter.CK3Character;
@@ -383,54 +388,54 @@
 
 				if (!imperatorCharacters.TryGetValue(unborn.FatherId, out var imperatorFather)) {
 					continue;
 				}
 
 				var ck3Father = imperatorFather.CK3Character;
 				if (ck3Father is null) {
 					continue;
 				}
 
 				female.Pregnancies.Add(new(ck3Father.Id, female.Id, unborn.BirthDate, unborn.IsBastard));
 			}
 		}
 
 		Logger.IncrementProgress();
 	}
 
 	private void SetCharacterCastes(CultureCollection cultures, Date ck3BookmarkDate) {
 		var casteSystemCultureIds = cultures
 			.Where(c => c.TraditionIds.Contains("tradition_caste_system"))
 			.Select(c => c.Id)
 			.ToFrozenSet();
 		var learningEducationTraits = new[]{"education_learning_1", "education_learning_2", "education_learning_3", "education_learning_4"};
 
 		foreach (var character in this.OrderBy(c => c.BirthDate)) {
 			if (character.ImperatorCharacter is null) {
 				continue;
 			}
 
 			var cultureId = character.GetCultureId(ck3BookmarkDate);
 			if (cultureId is null || !casteSystemCultureIds.Contains(cultureId)) {
 				continue;
 			}
 
 			// The caste is hereditary.
 			var father = character.Father;
 			if (father is not null) {
 				var foundTrait = GetCasteTraitFromParent(father);
 				if (foundTrait is not null) {
 					character.AddBaseTrait(foundTrait);
 					continue;
 				}
 			}
 			var mother = character.Mother;
 			if (mother is not null) {
 				var foundTrait = GetCasteTraitFromParent(mother);
 				if (foundTrait is not null) {
 					character.AddBaseTrait(foundTrait);
 					continue;
 				}
 			}
 
 			// Try to set caste based on character's traits.
 			var traitIds = character.BaseTraits.ToFrozenSet();
@@ -469,93 +474,93 @@
 
 				character.IsNonRemovable = true;
 				character.BirthDate = ck3BookmarkDate.ChangeByDays(1);
 				character.DeathDate = ck3BookmarkDate.ChangeByDays(2);
 				// Remove all dated history entries other than birth and death.
 				foreach (var field in character.History.Fields) {
 					if (field.Id == "birth" || field.Id == "death") {
 						continue;
 					}
 					field.DateToEntriesDict.Clear();
 				}
 			}
 		});
 		parser.IgnoreAndLogUnregisteredItems();
 		parser.ParseFile(configurablePath);
 	}
 
 	public void PurgeUnneededCharacters(Title.LandedTitles titles, DynastyCollection dynasties, HouseCollection houses, Date ck3BookmarkDate) {
 		Logger.Info("Purging unneeded characters...");
 
 		// Characters from I:R should be kept (the unimportant ones have already been purged during I:R processing).
 		var charactersToCheck = this.Where(c => !c.FromImperator);
 
 		// Characters from CK3 that hold titles at the bookmark date should be kept.
 		var currentTitleHolderIds = titles.GetHolderIdsForAllTitlesExceptNobleFamilyTitles(ck3BookmarkDate);
 		var landedCharacters = this
 			.Where(character => currentTitleHolderIds.Contains(character.Id))
 			.ToArray();
 		charactersToCheck = charactersToCheck.Except(landedCharacters);
 
 		// Don't purge animation_test characters.
 		charactersToCheck = charactersToCheck
 			.Where(c => !c.Id.StartsWith("animation_test_"));
 
 		// Make some exceptions for characters referenced in game's script files.
 		charactersToCheck = charactersToCheck
 			.Where(character => !character.IsNonRemovable)
 			.ToArray();
 
 		// Members of landed dynasties will be preserved, unless dead and childless.
 		var dynastyIdsOfLandedCharacters = landedCharacters
 			.Select(character => character.GetDynastyId(ck3BookmarkDate))
 			.Distinct()
 			.Where(id => id is not null)
 			.ToFrozenSet();
 
 		var i = 0;
 		var charactersToRemove = new List<Character>();
 		var parentIdsCache = new HashSet<string>();
 		do {
 			Logger.Debug($"Beginning iteration {i} of characters purge...");
 			charactersToRemove.Clear();
 			parentIdsCache.Clear();
 			++i;
 
 			// Build cache of all parent IDs.
 			foreach (var character in this) {
 				var motherId = character.MotherId;
 				if (motherId is not null) {
 					parentIdsCache.Add(motherId);
 				}
 
 				var fatherId = character.FatherId;
 				if (fatherId is not null) {
 					parentIdsCache.Add(fatherId);
 				}
 			}
 
 			// See who can be removed.
 			foreach (var character in charactersToCheck) {
 				// Does the character belong to a dynasty that holds or held titles?
 				if (dynastyIdsOfLandedCharacters.Contains(character.GetDynastyId(ck3BookmarkDate))) {
 					// Is the character dead and childless? Purge.
 					if (!parentIdsCache.Contains(character.Id)) {
 						charactersToRemove.Add(character);
 					}
 
 					continue;
 				}
 
 				charactersToRemove.Add(character);
 			}
 
 			BulkRemove(charactersToRemove.ConvertAll(c => c.Id));
 
 			Logger.Debug($"\tPurged {charactersToRemove.Count} unneeded characters in iteration {i}.");
 			charactersToCheck = charactersToCheck.Except(charactersToRemove).ToArray();
 		} while (charactersToRemove.Count > 0);
 
 		// At this point we probably have many dynasties with no characters left.
 		// Let's purge them.
 		houses.PurgeUnneededHouses(this, ck3BookmarkDate);
 		dynasties.PurgeUnneededDynasties(this, houses, ck3BookmarkDate);
@@ -667,150 +672,339 @@
 		}
 
 		Logger.IncrementProgress();
 	}
 
+	public void ImportArtifacts(
+		ProvinceCollection irProvinces,
+		ProvinceMapper provinceMapper,
+		Title.LandedTitles titles,
+		TreasureManager treasureManager,
+		ModifierMapper modifierMapper,
+		ModifierCollection ck3Modifiers,
+		LocDB irLocDB,
+		CK3LocDB ck3LocDB,
+		Date date
+	) {
+		Logger.Info("Importing Imperator artifacts...");
+		var ck3CharacterIdToTreasureIdsListDict = new Dictionary<string, IList<ulong>>();
+
+		foreach (var irProvince in irProvinces) {
+			var ck3Provinces = provinceMapper.GetCK3ProvinceNumbers(irProvince.Id);
+			if (ck3Provinces.Count == 0) {
+				continue;
+			}
+			var primaryCK3ProvinceId = ck3Provinces.First();
+
+			string? ownerId = null;
+
+			var barony = titles.GetBaronyForProvince(primaryCK3ProvinceId);
+			if (barony is null) {
+				Logger.Warn($"Can't find barony for province {primaryCK3ProvinceId}!");
+				continue;
+			}
+			var baronyHolderId = barony.GetHolderId(date);
+			if (baronyHolderId != "0") {
+				ownerId = baronyHolderId;
+			} else {
+				var county = titles.GetCountyForProvince(primaryCK3ProvinceId);
+				if (county is null) {
+					Logger.Warn($"Can't find county for province {primaryCK3ProvinceId}!");
+					continue;
+				}
+				var countyHolderId = county.GetHolderId(date);
+				if (countyHolderId != "0") {
+					ownerId = countyHolderId;
+				}
+			}
+
+			if (ownerId is null) {
+				Logger.Warn($"Can't find owner for province {primaryCK3ProvinceId}!");
+				continue;
+			}
+
+			if (ck3CharacterIdToTreasureIdsListDict.TryGetValue(ownerId, out var artifactList)) {
+				artifactList.AddRange(irProvince.TreasureIds);
+			} else {
+				ck3CharacterIdToTreasureIdsListDict[ownerId] = irProvince.TreasureIds.ToList();
+			}
+		}
+		// TODO: also import artifacts not assigned to holy sites (search for treasures={ 225 226 } in save)
+
+		// TODO: check if needed: Create visuals for artifacts.
+		/*var treasureIconNames = treasureManager
+			.Select(t => t.IconName)
+			.Distinct()
+			.ToList();
+		foreach (var iconName in treasureIconNames) {
+			throw new NotImplementedException();
+			// example:
+			//		icon: artefact_icons_unique_artifact_cheese
+			//		asset entity: ep1_western_pouch_basic_01_a_entity
+			//		mesh: ep1_western_pouch_basic_01_a_mesh
+		}*/
+
+		var visualsMapper = new ArtifactMapper("configurables/artifact_map.txt");
+
+		var charactersFromImperator = this.Where(c => c.FromImperator).ToList();
+		foreach (var character in charactersFromImperator) {
+			if (!ck3CharacterIdToTreasureIdsListDict.TryGetValue(character.Id, out var irArtifactIds)) {
+				continue;
+			}
+
+			// TODO: try to use create_artifact_sculpture_babr_e_bayan_effect as base
+			foreach (var irArtifactId in irArtifactIds) {
+				var irArtifact = treasureManager[irArtifactId];
+				ImportArtifact(character, irArtifact, modifierMapper, ck3Modifiers, visualsMapper, irLocDB, ck3LocDB, date);
+			}
+
+
+
+			/*
+			 * # Create the artifact
+			create_artifact = {	
+				name = artifact_sculpture_armor_babr_name
+				description = artifact_sculpture_armor_babr
+				type = sculpture
+				template = babr_template
+				visuals = sculpture_babr_e_bayan
+				wealth = scope:wealth
+				quality = scope:quality
+				history = {
+					type = created_before_history
+				}
+				modifier = babr_e_bayan_modifier
+				save_scope_as = newly_created_artifact
+				decaying = yes
+			}
+
+			scope:newly_created_artifact = {
+				set_variable = { name = historical_unique_artifact value = yes }
+				set_variable = babr_e_bayan
+				save_scope_as = epic
+			}	
+			 */
+		}
+
+		Logger.IncrementProgress();
+	}
+
+	private void ImportArtifact(Character character, Treasure irArtifact, ModifierMapper modifierMapper, ModifierCollection ck3Modifiers, ArtifactMapper artifactMapper, LocDB irLocDB, CK3LocDB ck3LocDB, Date date) {
+		var visualAndType = artifactMapper.GetVisualAndType(irArtifact.Key, irArtifact.IconName);
+		if (visualAndType is null) {
+			Logger.Warn($"Can't find a match for I:R artifact key {irArtifact.Key} and icon {irArtifact.IconName}!");
+			return;
+		}
+		var (ck3Visual, ck3Type) = visualAndType.Value;
+
+		var ck3ArtifactName = $"IRToCK3_artifact_{irArtifact.Key}_{irArtifact.Id}";
+		var irNameLoc = irLocDB.GetLocBlockForKey(irArtifact.Key);
+		if (irNameLoc is null) {
+			Logger.Warn($"Can't find name loc for artifact {irArtifact.Key}!");
+		} else {
+			var artifactNameLocBlock = ck3LocDB.GetOrCreateLocBlock(ck3ArtifactName);
+			artifactNameLocBlock.CopyFrom(irNameLoc);
+		}
+
+		var ck3DescKey = $"{ck3ArtifactName}_desc";
+		var irDescLoc = irLocDB.GetLocBlockForKey(irArtifact.Key + "_desc");
+		if (irDescLoc is null) {
+			Logger.Warn($"Can't find description loc for artifact {irArtifact.Key}!");
+		} else {
+			var descLocBlock = ck3LocDB.GetOrCreateLocBlock(ck3DescKey);
+			descLocBlock.CopyFrom(irDescLoc);
+		}
+
+		var artifactScope = $"newly_created_artifact_{irArtifact.Id}";
+
+		var ck3ModifierEffects = new Dictionary<string, double>();
+		foreach (var (irEffect, irEffectValue) in irArtifact.StateModifiers) {
+			var match = modifierMapper.Match(irEffect, irEffectValue);
+			if (match is null) {
+				Logger.Warn($"Can't find CK3 modifier for Imperator modifier {irEffect}!");
+				continue;
+			}
+			ck3ModifierEffects[match.Value.Key] = match.Value.Value;
+		}
+		foreach (var (irEffect, irEffectValue) in irArtifact.CharacterModifiers) {
+			var match = modifierMapper.Match(irEffect, irEffectValue);
+			if (match is null) {
+				Logger.Warn($"Can't find CK3 modifier for Imperator modifier {irEffect}!");
+				continue;
+			}
+			ck3ModifierEffects[match.Value.Key] = match.Value.Value;
+		}
+		var ck3ModifierId = $"{ck3ArtifactName}_modifier";
+		ck3Modifiers.Add(new Modifier(ck3ModifierId, ck3ModifierEffects));
+
+		string createArtifactEffect = $$"""
+			set_artifact_rarity_illustrious = yes
+			create_artifact = {	
+				name = {{ ck3ArtifactName }}
+				description = {{ ck3DescKey }}
+				type = {{ ck3Type }}
+				# template = babr_template # TODO: check if needed
+				visuals = {{ ck3Visual }}
+				wealth = scope:wealth
+				quality = scope:quality
+				history = {
+					type = created_before_history
+				}
+				modifier = {{ ck3ModifierId }}
+				save_scope_as = {{ artifactScope }}
+				decaying = yes
+			}
+			scope:{{ artifactScope }} = {
+				set_variable = {
+					name = historical_unique_artifact
+					value = yes
+				}
+			}
+		""";
+		character.History.AddFieldValue(date, "effects", "effect", createArtifactEffect);
+	}
+
 	public void GenerateSuccessorsForOldCharacters(Title.LandedTitles titles, CultureCollection cultures, Date irSaveDate, Date ck3BookmarkDate, ulong randomSeed) {
 		Logger.Info("Generating successors for old characters...");
 
 		var oldCharacters = this
 			.Where(c => c.BirthDate < ck3BookmarkDate && c.DeathDate is null && ck3BookmarkDate.DiffInYears(c.BirthDate) > 60).ToArray();
 
 		var titleHolderIds = titles.GetHolderIdsForAllTitlesExceptNobleFamilyTitles(ck3BookmarkDate);
 
 		var oldTitleHolders = oldCharacters
 			.Where(c => titleHolderIds.Contains(c.Id))
 			.ToArray();
 
 		// For characters that don't hold any titles, just set up a death date.
 		var randomForCharactersWithoutTitles = new Random((int)randomSeed);
 		foreach (var oldCharacter in oldCharacters.Except(oldTitleHolders)) {
 			// Roll a dice to determine how much longer the character will live.
 			var monthsToLive = randomForCharactersWithoutTitles.Next(1, 30 * 12); // Can live up to 30 years more.
 
 			// If the character is female and pregnant, make sure she doesn't die before the pregnancy ends.
 			if (oldCharacter is {Female: true, ImperatorCharacter: not null}) {
 				var lastPregnancy = oldCharacter.Pregnancies.OrderBy(p => p.BirthDate).LastOrDefault();
 				if (lastPregnancy is not null) {
 					oldCharacter.DeathDate = lastPregnancy.BirthDate.ChangeByMonths(monthsToLive);
 					continue;
 				}
 			}
 
 			oldCharacter.DeathDate = irSaveDate.ChangeByMonths(monthsToLive);
 		}
 
 		ConcurrentDictionary<string, Title[]> titlesByHolderId = new(titles
 			.Select(t => new {Title = t, HolderId = t.GetHolderId(ck3BookmarkDate)})
 			.Where(t => t.HolderId != "0")
 			.GroupBy(t => t.HolderId)
 			.ToDictionary(g => g.Key, g => g.Select(t => t.Title).ToArray()));
 
 		ConcurrentDictionary<string, string[]> cultureIdToMaleNames = new(cultures
 			.ToDictionary(c => c.Id, c => c.MaleNames.ToArray()));
 
 		// For title holders, generate successors and add them to title history.
 		Parallel.ForEach(oldTitleHolders, oldCharacter => {
 			// Get all titles held by the character.
 			var heldTitles = titlesByHolderId[oldCharacter.Id];
 			string? dynastyId = oldCharacter.GetDynastyId(ck3BookmarkDate);
 			string? dynastyHouseId = oldCharacter.GetDynastyHouseId(ck3BookmarkDate);
 			string? faithId = oldCharacter.GetFaithId(ck3BookmarkDate);
 			string? cultureId = oldCharacter.GetCultureId(ck3BookmarkDate);
 			string[] maleNames;
 			if (cultureId is not null) {
 				maleNames = cultureIdToMaleNames[cultureId];
 			} else {
 				Logger.Debug($"Failed to find male names for successors of {oldCharacter.Id}.");
 				if (oldCharacter.Female) {
 					maleNames = [oldCharacter.Father?.GetName(ck3BookmarkDate) ?? "Alexander"];
 				} else {
 					maleNames = [oldCharacter.GetName(ck3BookmarkDate) ?? "Alexander"];
 				}
 			}
 
 			var randomSeedForCharacter = randomSeed ^ (oldCharacter.ImperatorCharacter?.Id ?? 0);
 			var random = new Random((int)randomSeedForCharacter);
 
 			int successorCount = 0;
 			Character currentCharacter = oldCharacter;
 			Date currentCharacterBirthDate = currentCharacter.BirthDate;
 			while (ck3BookmarkDate.DiffInYears(currentCharacterBirthDate) >= 90) {
 				// If the character has living male children, the oldest one will be the successor.
 				var successorAndBirthDate = currentCharacter.Children
 					.Where(c => c is {Female: false, DeathDate: null})
 					.Select(c => new { Character = c, c.BirthDate })
 					.OrderBy(x => x.BirthDate)
 					.FirstOrDefault();
 
 				Character successor;
 				Date currentCharacterDeathDate;
 				Date successorBirthDate;
 				if (successorAndBirthDate is not null) {
 					successor = successorAndBirthDate.Character;
 					successorBirthDate = successorAndBirthDate.BirthDate;
 
 					// Roll a dice to determine how much longer the character will live.
 					// But make sure the successor is at least 16 years old when the old character dies.
 					var successorAgeAtBookmarkDate = ck3BookmarkDate.DiffInYears(successorBirthDate);
 					var yearsUntilSuccessorBecomesAnAdult = Math.Max(16 - successorAgeAtBookmarkDate, 0);
 
 					var yearsToLive = random.Next((int)Math.Ceiling(yearsUntilSuccessorBecomesAnAdult), 25);
 					int currentCharacterAge = random.Next(30 + yearsToLive, 80);
 					currentCharacterDeathDate = currentCharacterBirthDate.ChangeByYears(currentCharacterAge);
 					// Needs to be after the save date.
 					if (currentCharacterDeathDate <= irSaveDate) {
 						currentCharacterDeathDate = irSaveDate.ChangeByDays(1);
 					}
 				} else {
 					// We don't want all the generated successors on the map to have the same birth date.
 					var yearsUntilHeir = random.Next(1, 5);
 
 					// Make the old character live until the heir is at least 16 years old.
 					var successorAge = random.Next(yearsUntilHeir + 16, 30);
 					int currentCharacterAge = random.Next(30 + successorAge, 80);
 					currentCharacterDeathDate = currentCharacterBirthDate.ChangeByYears(currentCharacterAge);
 					if (currentCharacterDeathDate <= irSaveDate) {
 						currentCharacterDeathDate = irSaveDate.ChangeByDays(1);
 					}
 
 					// Generate a new successor.
 					string id = $"irtock3_{oldCharacter.Id}_successor_{successorCount}";
 					string firstName = maleNames[random.Next(0, maleNames.Length)];
 
 					successorBirthDate = currentCharacterDeathDate.ChangeByYears(-successorAge);
 					successor = new Character(id, firstName, successorBirthDate, this) {FromImperator = true};
 					Add(successor);
 					if (currentCharacter.Female) {
 						successor.Mother = currentCharacter;
 					} else {
 						successor.Father = currentCharacter;
 					}
 					if (cultureId is not null) {
 						successor.SetCultureId(cultureId, null);
 					}
 					if (faithId is not null) {
 						successor.SetFaithId(faithId, null);
 					}
 					if (dynastyId is not null) {
 						successor.SetDynastyId(dynastyId, null);
 					}
 					if (dynastyHouseId is not null) {
 						successor.SetDynastyHouseId(dynastyHouseId, null);
 					}
 				}
 
 				currentCharacter.DeathDate = currentCharacterDeathDate;
 				// On the old character death date, the successor should inherit all titles.
 				foreach (var heldTitle in heldTitles) {
 					heldTitle.SetHolder(successor, currentCharacterDeathDate);
 				}
 
 				// Move to the successor and repeat the process.
 				currentCharacter = successor;
 				currentCharacterBirthDate = successorBirthDate;
 				++successorCount;
 			}
 
 			// After the loop, currentCharacter should represent the successor at bookmark date.
 			// Set his DNA to avoid weird looking character on the bookmark screen in CK3.
 			currentCharacter.DNA = oldCharacter.DNA;

ImperatorToCK3/CK3/Modifiers/Modifier.cs

@@ -0,0 +1,25 @@
+using commonItems.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ImperatorToCK3.CK3.Modifiers; 
+
+public class Modifier : IIdentifiable<string> {
+	public string Id { get; }
+	private readonly Dictionary<string, double> effects = new();
+
+	public Modifier(string id, IDictionary<string, double> effects) {
+		Id = id;
+		this.effects = new Dictionary<string, double>(effects);
+	}
+
+	public override string ToString() {
+		var output = new StringBuilder();
+		output.AppendLine($"{Id} = {{");
+		foreach (var effect in effects) {
+			output.AppendLine($"\t{effect.Key} = {effect.Value}");
+		}
+		output.AppendLine("}");
+		return output.ToString();
+	}
+}

ImperatorToCK3/CK3/Modifiers/ModifierCollection.cs

@@ -0,0 +1,14 @@
+using commonItems.Collections;
+using System.Text;
+
+namespace ImperatorToCK3.CK3.Modifiers; 
+
+public class ModifierCollection : IdObjectCollection<string, Modifier> {
+	public override string ToString() {
+		var output = new StringBuilder();
+		foreach (var modifier in this) {
+			output.AppendLine(modifier.ToString());
+		}
+		return output.ToString();
+	}
+}

ImperatorToCK3/CK3/Religions/HolySite.cs

@@ -3,7 +3,7 @@
 using commonItems.Serialization;
 using commonItems.SourceGenerators;
 using ImperatorToCK3.CK3.Titles;
-using ImperatorToCK3.Mappers.HolySiteEffect;
+using ImperatorToCK3.Mappers.Modifier;
 using System.Collections.Generic;
 
 namespace ImperatorToCK3.CK3.Religions;
@@ -82,10 +82,10 @@ public HolySite(
 		Faith faith,
 		Title.LandedTitles titles,
 		OrderedDictionary<string, double> imperatorEffects,
-		HolySiteEffectMapper holySiteEffectMapper
+		ModifierMapper modifierMapper
 	) : this(barony, faith, titles) {
 		foreach (var (effect, value) in imperatorEffects) {
-			var ck3EffectOpt = holySiteEffectMapper.Match(effect, value);
+			var ck3EffectOpt = modifierMapper.Match(effect, value);
 			if (ck3EffectOpt is not { } ck3Effect) {
 				continue;
 			}

ImperatorToCK3/CK3/Religions/ReligionCollection.cs

@@ -6,7 +6,7 @@
 using ImperatorToCK3.CK3.Cultures;
 using ImperatorToCK3.CK3.Titles;
 using ImperatorToCK3.CK3.Provinces;
-using ImperatorToCK3.Mappers.HolySiteEffect;
+using ImperatorToCK3.Mappers.Modifier;
 using Open.Collections;
 using System;
 using System.Collections.Generic;
@@ -38,79 +38,79 @@
 		parser.ParseGameFolder("common/religion/religions", ck3ModFS, "txt", recursive: true);
 	}
 
 	public void LoadConverterFaiths(string converterFaithsPath, ColorFactory colorFactory) {
 		OrderedSet<Faith> loadedConverterFaiths = [];
 
 		var parser = new Parser();
 		parser.RegisterRegex(CommonRegexes.String, (religionReader, religionId) => {
 			var optReligion = new Religion(religionId, religionReader, this, colorFactory);
 
 			// For validation, store all faiths loaded inside the converter religion.
 			loadedConverterFaiths.UnionWith(optReligion.Faiths);
 
 			// Check if religion already exists. If it does, add converter faiths to it.
 			// Otherwise, add the converter faith's religion.
 			if (TryGetValue(religionId, out var religion)) {
 				foreach (var faith in optReligion.Faiths) {
 					faith.Religion = religion;
 					religion.Faiths.Add(faith);
 				}
 			} else {
 				Add(optReligion);
 			}
 		});
 		parser.RegisterRegex(CommonRegexes.Catchall, ParserHelpers.IgnoreAndLogItem);
 		parser.ParseFile(converterFaithsPath);
 
 		// Validation: every faith should have a pilgrimage doctrine.
 		string? pilgrimageFallback = DoctrineCategories.TryGetValue("doctrine_pilgrimage", out var pilgrimageCategory)
 			? pilgrimageCategory.DoctrineIds.FirstOrDefault(d => d == "doctrine_pilgrimage_encouraged")
 			: null;
 		foreach (var converterFaith in loadedConverterFaiths) {
 			var pilgrimageDoctrine = converterFaith.GetDoctrineIdsForDoctrineCategoryId("doctrine_pilgrimage");
 			if (pilgrimageDoctrine.Count == 0) {
 				if (pilgrimageFallback is not null) {
 					Logger.Warn($"Faith {converterFaith.Id} has no pilgrimage doctrine! Setting {pilgrimageFallback}");
 					converterFaith.DoctrineIds.Add(pilgrimageFallback);
 				} else {
 					Logger.Warn($"Faith {converterFaith.Id} has no pilgrimage doctrine!");
 				}
 			}
 		}
 
 		// Validation: every faith should have a funeral doctrine.
 		string? funeralFallback = DoctrineCategories.TryGetValue("doctrine_funeral", out var funeralCategory)
 			? funeralCategory.DoctrineIds.FirstOrDefault(d => d == "doctrine_funeral_stoic")
 			: null;
 		foreach (var converterFaith in loadedConverterFaiths) {
 			var funeralDoctrine = converterFaith.GetDoctrineIdsForDoctrineCategoryId("doctrine_funeral");
 			if (funeralDoctrine.Count == 0) {
 				if (funeralFallback is not null) {
 					Logger.Warn($"Faith {converterFaith.Id} has no funeral doctrine! Setting {funeralFallback}");
 					converterFaith.DoctrineIds.Add(funeralFallback);
 				} else {
 					Logger.Warn($"Faith {converterFaith.Id} has no funeral doctrine!");
 				}
 			}
 		}
 
 		// Validation: every faith should have a coronation doctrine.
 		string? coronationFallback = DoctrineCategories.TryGetValue("doctrine_coronation", out var coronationCategory)
 			? coronationCategory.DoctrineIds.FirstOrDefault(d => d == "doctrine_no_anointment")
 			: null;
 		foreach (var converterFaith in loadedConverterFaiths) {
 			var coronationDoctrine = converterFaith.GetDoctrineIdsForDoctrineCategoryId("doctrine_coronation");
 			if (coronationDoctrine.Count == 0) {
 				if (coronationFallback is not null) {
 					Logger.Warn($"Faith {converterFaith.Id} has no coronation doctrine! Setting {coronationFallback}");
 					converterFaith.DoctrineIds.Add(coronationFallback);
 				} else {
 					Logger.Warn($"Faith {converterFaith.Id} has no coronation doctrine!");
 				}
 			}
 		}
 	}
 
 	public void RemoveChristianAndIslamicSyncretismFromAllFaiths() {
 		Logger.Info("Removing Christian and Islamic syncretism tenets from all faiths...");
 		string[] tenetsToRemove = ["tenet_christian_syncretism", "tenet_islamic_syncretism"];
@@ -233,7 +233,7 @@
 		Faith ck3Faith,
 		ProvinceCollection ck3Provinces,
 		Imperator.Religions.ReligionCollection imperatorReligions,
-		HolySiteEffectMapper holySiteEffectMapper
+		ModifierMapper modifierMapper
 	) {
 		var imperatorProvince = GetImperatorProvinceForBarony(barony, ck3Provinces);
 		if (imperatorProvince is null) {
@@ -255,76 +255,76 @@
 			}
 		}
 
-		return new HolySite(barony, ck3Faith, landedTitles, imperatorModifiers, holySiteEffectMapper);
+		return new HolySite(barony, ck3Faith, landedTitles, imperatorModifiers, modifierMapper);
 	}
 
 	public void DetermineHolySites(
 		ProvinceCollection ck3Provinces,
 		Imperator.Religions.ReligionCollection imperatorReligions,
-		HolySiteEffectMapper holySiteEffectMapper,
+		ModifierMapper modifierMapper,
 		Date date
 	) {
 		var provincesByFaith = GetProvincesFromImperatorByFaith(ck3Provinces, date);
 
 		foreach (var faith in Faiths) {
 			if (!ReplaceableHolySitesByFaith.TryGetValue(faith.Id, out var replaceableSiteIds)) {
 				continue;
 			}
 			Logger.Info($"Determining holy sites for faith {faith.Id}...");
 
 			var dynamicHolySiteBaronies = GetDynamicHolySiteBaroniesForFaith(faith, provincesByFaith);
 			foreach (var holySiteId in faith.HolySiteIds.ToArray()) {
 				if (!HolySites.TryGetValue(holySiteId, out var holySite)) {
 					Logger.Warn($"Holy site with ID {holySiteId} not found!");
 					continue;
 				}
 
 				var holySiteBarony = GetHolySiteBarony(holySite);
 				if (holySiteBarony is not null && dynamicHolySiteBaronies.Contains(holySiteBarony)) {
 					// One of dynamic holy site baronies is same as an exising holy site's barony.
 					// We need to avoid faith having two holy sites in one barony.
 
 					if (replaceableSiteIds.Contains(holySiteId)) {
 						var newHolySiteInSameBarony = GenerateHolySiteForBarony(
 							holySiteBarony,
 							faith,
 							ck3Provinces,
 							imperatorReligions,
-							holySiteEffectMapper
+							modifierMapper
 						);
 						if (HolySites.ContainsKey(newHolySiteInSameBarony.Id)) {
 							Logger.Warn($"Created duplicate holy site: {newHolySiteInSameBarony.Id}!");
 						}
 						HolySites.AddOrReplace(newHolySiteInSameBarony);
 
 						faith.ReplaceHolySiteId(holySiteId, newHolySiteInSameBarony.Id);
 					}
 					dynamicHolySiteBaronies.Remove(holySiteBarony);
 				} else if (!replaceableSiteIds.Contains(holySiteId)) {
 					continue;
 				} else if (dynamicHolySiteBaronies.Count != 0) {
 					var selectedDynamicBarony = dynamicHolySiteBaronies[0];
 					dynamicHolySiteBaronies.Remove(selectedDynamicBarony);
 
 					var replacementSite = GenerateHolySiteForBarony(
 						selectedDynamicBarony,
 						faith,
 						ck3Provinces,
 						imperatorReligions,
-						holySiteEffectMapper
+						modifierMapper
 					);
 					if (HolySites.ContainsKey(replacementSite.Id)) {
 						Logger.Warn($"Created duplicate holy site: {replacementSite.Id}!");
 					}
 					HolySites.AddOrReplace(replacementSite);
 
 					faith.ReplaceHolySiteId(holySiteId, replacementSite.Id);
 				}
 			}
 		}
 	}
 
 	// Returns a dictionary with CK3 provinces that are mapped to Imperator provinces, grouped by faith.
 	public static Dictionary<string, HashSet<Province>> GetProvincesFromImperatorByFaith(ProvinceCollection ck3Provinces, Date date) {
 		var provincesByFaith = new Dictionary<string, HashSet<Province>>();
 
@@ -384,106 +384,106 @@
 		}
 	}
 
 	private static string GetCultureIdForGeneratedHeadOfFaith(Faith faith,
 		CharacterCollection characters,
 		ProvinceCollection provinces,
 		Title.LandedTitles titles,
 		CultureCollection cultures,
 		Date date) {
 		var cultureId = provinces
 			.Where(p => p.GetFaithId(date) == faith.Id)
 			.Select(p => p.GetCultureId(date))
 			.FirstOrDefault();
 		if (cultureId is null) {
 			cultureId = characters
 				.Where(c => c.BirthDate <= date && (c.DeathDate is null || c.DeathDate > date))
 				.Where(c => c.GetFaithId(date) == faith.Id)
 				.Select(c => c.GetCultureId(date))
 				.FirstOrDefault();
 		}
 		if (cultureId is null && faith.ReligiousHeadTitleId is not null) {
 			if (titles.TryGetValue(faith.ReligiousHeadTitleId, out var title)) {
 				var capitalCounty = title.CapitalCounty;
 				var capitalProvince = capitalCounty?.CapitalBaronyProvinceId;
 				if (capitalProvince is not null) {
 					cultureId = provinces[capitalProvince.Value].GetCultureId(date);
 				}
 			}
 		}
 		if (cultureId is null) {
 			Logger.Warn($"Found no matching culture for religious head of {faith.Id}, using first one in database!");
 			cultureId = cultures.First().Id;
 		}
 
 		return cultureId;
 	}
 
 	private static void GenerateReligiousHeadForFaithIfMissing(
 		Faith faith,
 		Title.LandedTitles titles,
 		CharacterCollection characters,
 		ProvinceCollection provinces,
 		CultureCollection cultures,
 		Date date
 	) {
 		var religiousHeadTitleId = faith.ReligiousHeadTitleId;
 		if (religiousHeadTitleId is null) {
 			return;
 		}
 
 		if (!titles.TryGetValue(religiousHeadTitleId, out var title)) {
 			Logger.Warn($"Religious head title {religiousHeadTitleId} for {faith.Id} not found!");
 			return;
 		}
 		var holderId = title.GetHolderId(date);
 		if (holderId != "0") {
 			if (!characters.TryGetValue(holderId, out var holder)) {
 				Logger.Warn($"Religious head {holderId} of title {title.Id} for {faith.Id} not found!");
 				return;
 			}
 
 			var holderDeathDate = holder.DeathDate;
 			if (holderDeathDate is null || holderDeathDate > date) {
 				return;
 			}
 		}
 
 		// Generate title holder.
 		Logger.Debug($"Generating religious head for faith {faith.Id}...");
 
 		// Determine culture.
 		string cultureId = GetCultureIdForGeneratedHeadOfFaith(faith, characters, provinces, titles, cultures, date);
 		if (!cultures.TryGetValue(cultureId, out var culture)) {
 			Logger.Warn($"Culture {cultureId} not found!");
 			return;
 		}
 
 		// If title has male_names defined, use one of them for character's name.
 		// Otherwise, get name from culture.
 		var name = title.MaleNames?.FirstOrDefault();
 		if (name is null) {
 			var maleNames = culture.MaleNames.ToImmutableList();
 			if (maleNames.Count > 0) {
 				name = maleNames.ElementAtOrDefault(Math.Abs(date.Year) % maleNames.Count);
 			}
 		}
 		if (name is null) {
 			const string fallbackName = "Alexandros";
 			Logger.Warn($"Found no name for religious head of {faith.Id}, defaulting to {fallbackName}!");
 			name = fallbackName;
 		}
 		var age = 30 + (Math.Abs(date.Year) % 50);
 		var character = new Character($"IRToCK3_head_of_faith_{faith.Id}", name, date.ChangeByYears(-age), characters);
 		character.SetFaithId(faith.Id, date: null);
 		character.SetCultureId(cultureId, date: null);
 		var traitsToAdd = new[] {"chaste", "celibate", "devoted"};
 		foreach (var traitId in traitsToAdd) {
 			character.History.AddFieldValue(date: null, "traits", "trait", traitId);
 		}
 		characters.Add(character);
 		title.SetHolder(character, date);
 	}
 
 	private List<Title> GetDynamicHolySiteBaroniesForFaith(Faith faith, Dictionary<string, HashSet<Province>> provincesByFaith) {
 		// Collect all Imperator territories that are mapped to this faith.
 		HashSet<Province> faithTerritories;