Merge branch 'master' into treasures

Author: IhateTrains

Fronter.NET

@@ -0,0 +1 @@
+7e8f6e4a8e49a8ad79abd2d7d1782e2f11aa44d5

Fronter.NET

@@ -12,14 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AwesomeAssertions" Version="8.0.0" />
+    <PackageReference Include="AwesomeAssertions" Version="8.0.1" />
     <PackageReference Include="coverlet.msbuild" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj

@@ -3,6 +3,7 @@
 using commonItems.Localization;
 using commonItems.Mods;
 using ImperatorToCK3.CK3.Localization;
+using Murmur;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -83,6 +84,15 @@ public CK3LocBlock GetOrCreateLocBlock(string id) {
 				return locBlock;
 			}
 
+			// Check for hash collision.
+			var murmur3A = MurmurHash.Create32();
+			var hashStr = GetHashStrForKey(murmur3A, id);
+			if (hashToKeyDict.TryGetValue(hashStr, out var existingKey)) {
+				Logger.Warn($"Hash collision detected for loc key: {id}. Existing key: {existingKey}");
+			} else {
+				hashToKeyDict[hashStr] = id;
+			}
+			
 			// Create new loc block.
 			locBlock = new CK3LocBlock(id, ConverterGlobals.PrimaryLanguage);
 			Add(locBlock);
@@ -144,4 +154,17 @@ public List<string> GetLocLinesToOutputForLanguage(string language) {
 
 		return locLinesToOutput;
 	}
+	
+	public bool KeyHasConflictingHash(string key) {
+		var murmur3A = MurmurHash.Create32();
+		return hashToKeyDict.ContainsKey(GetHashStrForKey(murmur3A, key));
+	}
+
+	private string GetHashStrForKey(Murmur32 murmur32, string key) {
+		var keyBytes = System.Text.Encoding.UTF8.GetBytes(key);
+		var hash = murmur32.ComputeHash(keyBytes);
+		return string.Join("", hash.Select(b => b.ToString("X2")));
+	}
+	
+	private readonly Dictionary<string, string> hashToKeyDict = new(); // stores MurmurHash3A hash to key mapping
 }

ImperatorToCK3/CK3/CK3LocDB.cs

@@ -119,8 +119,7 @@ private void InitPillarDataParser(ColorFactory colorFactory, OrderedDictionary<s
 			}
 		});
 		pillarDataParser.RegisterKeyword("parameters", reader => {
-			pillarData.Parameters = reader.GetAssignments()
-				.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+			pillarData.Parameters = reader.GetAssignmentsAsDict();
 		});
 		pillarDataParser.RegisterRegex(CommonRegexes.String, (reader, keyword) => {
 			pillarData.Attributes.Add(new KeyValuePair<string, StringOfItem>(keyword, reader.GetStringOfItem()));

ImperatorToCK3/CK3/Cultures/PillarCollection.cs

@@ -39,7 +39,13 @@ public Dynasty(Family irFamily, CharacterCollection irCharacters, CulturesDB irC
 
 	public Dynasty(CK3.Characters.Character character, string irFamilyName, ImperatorCharacter[] irMembers, CulturesDB irCulturesDB, LocDB irLocDB, CK3LocDB ck3LocDB, Date date) {
 		FromImperator = true;
-		Id = $"dynn_irtock3_from_{character.Id}";
+
+		string id = $"dynn_irtock3_from_{character.Id}";
+		uint counter = 0;
+		while (ck3LocDB.KeyHasConflictingHash(id)) {
+			id = $"dynn_irtock3_from_{character.Id}_{counter++}";
+		}
+		Id = id;
 		Name = Id;
 
 		CultureId = character.GetCultureId(date) ?? character.Father?.GetCultureId(date);

ImperatorToCK3/CK3/Dynasties/Dynasty.cs

@@ -1727,9 +1727,7 @@ public void LoadCulturalNamesFromConfigurables() {
 
 			var parser = new Parser();
 			parser.RegisterRegex(CommonRegexes.String, (reader, titleId) => {
-				var nameListToLocKeyDict = reader.GetAssignments()
-					.GroupBy(a => a.Key)
-					.ToDictionary(g => g.Key, g => g.Last().Value);
+				var nameListToLocKeyDict = reader.GetAssignmentsAsDict();
 
 				if (!TryGetValue(titleId, out var title)) {
 					return;
@@ -1762,5 +1760,20 @@ internal void SetCoatsOfArms(CoaMapper coaMapper) {
 
 			Logger.Debug($"Set coats of arms for {counter} CK3 titles.");
 		}
+
+		public void RemoveLiegeEntriesFromReligiousHeadHistory(ReligionCollection religions) {
+			var religiousHeadTitleIds = religions.Faiths
+				.Select(f => f.ReligiousHeadTitleId)
+				.Distinct()
+				.Where(id => id is not null)
+				.Select(id => id!);
+			foreach (var religiousHeadTitleId in religiousHeadTitleIds) {
+				if (!TryGetValue(religiousHeadTitleId, out var religiousHeadTitle)) {
+					continue;
+				}
+				
+				religiousHeadTitle.History.Fields.Remove("liege");
+			}
+		}
 	}
 }

ImperatorToCK3/CK3/Titles/LandedTitles.cs

@@ -1153,9 +1153,7 @@ private void RegisterKeys(Parser parser) {
 		parser.RegisterKeyword("de_jure_drift_disabled", reader => DeJureDriftDisabled = reader.GetBool());
 		parser.RegisterKeyword("can_be_named_after_dynasty", reader => CanBeNamedAfterDynasty = reader.GetBool());
 		parser.RegisterKeyword("male_names", reader => MaleNames = reader.GetStrings());
-		parser.RegisterKeyword("cultural_names", reader => CulturalNames = reader.GetAssignments()
-			.GroupBy(a => a.Key)
-			.ToDictionary(g => g.Key, g => g.Last().Value));
+		parser.RegisterKeyword("cultural_names", reader => CulturalNames = reader.GetAssignmentsAsDict());
 
 		parser.RegisterRegex(CommonRegexes.Catchall, (reader, token) => {
 			IgnoredTokens.Add(token);

ImperatorToCK3/CK3/Titles/Title.cs

@@ -193,6 +193,8 @@ public World(Imperator.World impWorld, Configuration config, Thread? irCoaExtrac
 				Logger.Info("Loaded converter faiths.");
 				Logger.IncrementProgress();
 				Religions.RemoveChristianAndIslamicSyncretismFromAllFaiths();
+				// Now that all the faiths are loaded, remove liege entries from the history of religious head titles.
+				LandedTitles.RemoveLiegeEntriesFromReligiousHeadHistory(Religions);
 
 				Religions.LoadReplaceableHolySites("configurables/replaceable_holy_sites.txt");
 				Logger.Info("Loaded replaceable holy sites.");
@@ -1147,6 +1149,8 @@ private void DetermineCK3Dlcs(Configuration config) {
 			{"dlc014.dlc", "roads_to_power"},
 			{"dlc015.dlc", "wandering_nobles"},
 			{"dlc016.dlc", "west_slavic_attire"},
+			{"dlc017.dlc", "medieval_monuments"},
+			{"dlc018.dlc", "arctic_attire"},
 		};
 
 		var dlcFiles = Directory.GetFiles(dlcFolderPath, "*.dlc", SearchOption.AllDirectories);

ImperatorToCK3/CK3/World.cs

@@ -0,0 +1,13 @@
+using commonItems;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ImperatorToCK3.CommonUtils;
+
+internal static class BufferedReaderExtensions {
+	internal static Dictionary<string, string> GetAssignmentsAsDict(this BufferedReader reader) {
+		return reader.GetAssignments()
+			.GroupBy(a => a.Key)
+			.ToDictionary(g => g.Key, g => g.Last().Value);
+	}
+}

ImperatorToCK3/CommonUtils/BufferedReaderExtensions.cs

@@ -171,6 +171,7 @@ anatolian = {
 		}
 	}
 }
+
 euxinian = {
 	name = euxinian
 	trigger = {
@@ -200,6 +201,7 @@ euxinian = {
 		}
 	}
 }
+
 hyperborean = {
 	name = hyperborean
 	trigger = {
@@ -223,3 +225,17 @@ hyperborean = {
 		}
 	}
 }
+
+coptic = {
+	trigger = {
+		religion = religion:christianity
+		culture = culture:ancient_egyptian
+		any_sub_realm_county = {
+			AND = {
+				culture = culture:ancient_egyptian
+				religion = religion:christianity
+			}
+		}
+	}
+}
+