Handle hegemony rank titles in common/landed_titles

Author: IhateTrains

ImperatorToCK3.UnitTests/CK3/Titles/TitleRankUtilsTests.cs

@@ -6,6 +6,7 @@ namespace ImperatorToCK3.UnitTests.CK3.Titles;
 
 public class TitleRankUtilsTests {
 	[Theory]
+	[InlineData('h', TitleRank.hegemony)]
 	[InlineData('e', TitleRank.empire)]
 	[InlineData('k', TitleRank.kingdom)]
 	[InlineData('d', TitleRank.duchy)]

ImperatorToCK3/CK3/Regexes.cs

@@ -5,6 +5,6 @@ namespace ImperatorToCK3.CK3;
 public static partial class Regexes {
 	public static Regex TitleId => TitleIdRegex();
 
-	[GeneratedRegex(@"^(e|k|d|c|b)_[A-Za-z0-9_\-\']+$")]
+	[GeneratedRegex(@"^(h|e|k|d|c|b)_[A-Za-z0-9_\-\']+$")]
 	private static partial Regex TitleIdRegex();
 }

ImperatorToCK3/CK3/Titles/Title.cs

@@ -1004,7 +1004,7 @@ public void SetDeFactoLiege(Title? newLiege, Date date) {
 	private readonly TitleCollection deJureVassals = [];
 	[SerializeOnlyValue] public IReadOnlyTitleCollection DeJureVassals => deJureVassals; // DIRECT de jure vassals
 	public Dictionary<string, Title> GetDeJureVassalsAndBelow() {
-		return GetDeJureVassalsAndBelow("bcdke");
+		return GetDeJureVassalsAndBelow("bcdkeh");
 	}
 	public Dictionary<string, Title> GetDeJureVassalsAndBelow(string rankFilter) {
 		var rankFilterAsArray = rankFilter.ToCharArray();
@@ -1031,7 +1031,7 @@ public Dictionary<string, Title> GetDeFactoVassals(Date date) { // DIRECT de fac
 			.ToDictionary(t => t.Id, t => t);
 	}
 	public Dictionary<string, Title> GetDeFactoVassalsAndBelow(Date date) {
-		return GetDeFactoVassalsAndBelow(date, "bcdke");
+		return GetDeFactoVassalsAndBelow(date, "bcdkeh");
 	}
 	public Dictionary<string, Title> GetDeFactoVassalsAndBelow(Date date, string rankFilter) {
 		var rankFilterAsArray = rankFilter.ToCharArray();
@@ -1354,6 +1354,7 @@ public static TitleRank GetRankForId(string titleId) {
 			'd' => TitleRank.duchy,
 			'k' => TitleRank.kingdom,
 			'e' => TitleRank.empire,
+			'h' => TitleRank.hegemony,
 			_ => throw new FormatException($"Title {titleId}: unknown rank!")
 		};
 	}

ImperatorToCK3/CK3/Titles/TitleRank.cs

@@ -1,3 +1,3 @@
 namespace ImperatorToCK3.CK3.Titles;
 
-public enum TitleRank { barony, county, duchy, kingdom, empire }
+public enum TitleRank { barony, county, duchy, kingdom, empire, hegemony }

ImperatorToCK3/CK3/Titles/TitleRankUtils.cs

@@ -5,11 +5,12 @@ namespace ImperatorToCK3.CK3.Titles;
 public static class TitleRankUtils {
 	public static TitleRank CharToTitleRank(char rankChar) {
 		return rankChar switch {
-			'e' => TitleRank.empire,
-			'k' => TitleRank.kingdom,
-			'd' => TitleRank.duchy,
-			'c' => TitleRank.county,
 			'b' => TitleRank.barony,
+			'c' => TitleRank.county,
+			'd' => TitleRank.duchy,
+			'k' => TitleRank.kingdom,
+			'e' => TitleRank.empire,
+			'h' => TitleRank.hegemony,
 			_ => throw new ArgumentOutOfRangeException(nameof(rankChar), $"Unknown title rank character: {rankChar}")
 		};
 	}

ImperatorToCK3/Mappers/TagTitle/TagTitleMapper.cs

@@ -226,6 +226,7 @@ private static TitleRank GetCK3GovernorshipRank(string ck3LiegeTitleId) {
 		var ck3LiegeRank = Title.GetRankForId(ck3LiegeTitleId);
 
 		return ck3LiegeRank switch {
+			TitleRank.hegemony => TitleRank.kingdom,
 			TitleRank.empire => TitleRank.kingdom,
 			TitleRank.kingdom => TitleRank.duchy,
 			TitleRank.duchy => TitleRank.county,
@@ -271,11 +272,12 @@ private static string GenerateNewTitleId(string imperatorRegion, string imperato
 
 	private static string GetTitlePrefixForRank(TitleRank titleRank) {
 		return titleRank switch {
-			TitleRank.empire => "e_",
-			TitleRank.kingdom => "k_",
-			TitleRank.duchy => "d_",
-			TitleRank.county => "c_",
 			TitleRank.barony => "b_",
+			TitleRank.county => "c_",
+			TitleRank.duchy => "d_",
+			TitleRank.kingdom => "k_",
+			TitleRank.empire => "e_",
+			TitleRank.hegemony => "h_",
 			_ => throw new ArgumentOutOfRangeException(nameof(titleRank))
 		};
 	}