Merge branch 'master' into variables-conversion

Author: IhateTrains

.github/workflows/build_dev_version.yml

@@ -14,16 +14,16 @@ jobs:
       matrix:
         build:
         - win-x64
-        - linux-x64
+        #- linux-x64
         include:
         - build: win-x64
           os: [self-hosted, windows]
           archive_type: zip
           archive_extension: .zip
-        - build: linux-x64
-          os: ubuntu-latest
-          archive_type: tar
-          archive_extension: .tgz
+        #- build: linux-x64
+        #  os: ubuntu-latest
+        #  archive_type: tar
+        #  archive_extension: .tgz
     steps:
     - name: Get branch name (Windows)
       if: runner.os == 'Windows'

Fronter.NET

@@ -147,7 +147,7 @@ public void PurgeUnneededDynasties(CharacterCollection characters, HouseCollecti
 	public void FlattenDynastiesWithNoFounders(CharacterCollection characters, HouseCollection houses, Date date) {
 		Logger.Info("Flattening dynasties with no founders...");
 		int count = 0;
-		
+
 		var dynastiesWithMainBranchMembers = new HashSet<string>(StringComparer.Ordinal);
 		var charactersByHouseId = new Dictionary<string, List<Character>>(StringComparer.Ordinal);
 		foreach (var character in characters) {
@@ -168,24 +168,13 @@ public void FlattenDynastiesWithNoFounders(CharacterCollection characters, House
 			houseMembers.Add(character);
 		}
 
-		var houseIdsByDynasty = new Dictionary<string, List<string>>(StringComparer.Ordinal);
-		foreach (var house in houses) {
-			if (house.DynastyId is not string dynastyId) {
-				continue;
-			}
+		Dictionary<string, List<string>> houseIdsByDynasty = GetHouseIdsByDynasty(houses);
 
-			if (!houseIdsByDynasty.TryGetValue(dynastyId, out var dynastyHouseIds)) {
-				dynastyHouseIds = [];
-				houseIdsByDynasty[dynastyId] = dynastyHouseIds;
-			}
-			dynastyHouseIds.Add(house.Id);
-		}
-		
 		foreach (var dynasty in this) {
 			if (dynastiesWithMainBranchMembers.Contains(dynasty.Id)) {
 				continue;
 			}
-			
+
 			if (!houseIdsByDynasty.TryGetValue(dynasty.Id, out var dynastyHouseIds)) {
 				continue;
 			}
@@ -200,20 +189,37 @@ public void FlattenDynastiesWithNoFounders(CharacterCollection characters, House
 			if (cadetHouseMembers.Count == 0) {
 				continue;
 			}
-			
+
 			foreach (var character in cadetHouseMembers) {
 				character.ClearDynastyHouse();
 				character.SetDynastyId(dynasty.Id, null);
 			}
-			
+
 			// Remove all the cadet houses.
 			foreach (var houseId in dynastyHouseIds) {
 				houses.RemoveUnlessConfiguredToPreserve(houseId);
 			}
-			
+
 			++count;
 		}
-		
+
 		Logger.Info($"Flattened {count} dynasties with no founders.");
 	}
+
+	private static Dictionary<string, List<string>> GetHouseIdsByDynasty(HouseCollection houses) {
+		var houseIdsByDynasty = new Dictionary<string, List<string>>(StringComparer.Ordinal);
+		foreach (var house in houses) {
+			if (house.DynastyId is not string dynastyId) {
+				continue;
+			}
+
+			if (!houseIdsByDynasty.TryGetValue(dynastyId, out var dynastyHouseIds)) {
+				dynastyHouseIds = [];
+				houseIdsByDynasty[dynastyId] = dynastyHouseIds;
+			}
+			dynastyHouseIds.Add(house.Id);
+		}
+
+		return houseIdsByDynasty;
+	}
 }

ImperatorToCK3/CK3/Dynasties/DynastyCollection.cs

@@ -13,10 +13,8 @@ internal sealed class ProvinceDefinitions : IdObjectCollection<ulong, ProvinceDe
 	internal Dictionary<ulong, Rgb24> ProvinceToColorDict { get; } = [];
 
 	internal void LoadDefinitions(string definitionsFilename, ModFilesystem modFS) {
-		var relativePath = Path.Combine("map_data", definitionsFilename);
-		string? definitionsFilePath = modFS.GetActualFileLocation(relativePath);
+		string? definitionsFilePath = GetDefinitionsFilePath(definitionsFilename, modFS);
 		if (definitionsFilePath is null) {
-			Logger.Warn($"Province definitions file {definitionsFilename} not found!");
 			return;
 		}
 
@@ -30,58 +28,73 @@ internal void LoadDefinitions(string definitionsFilename, ModFilesystem modFS) {
 			if (line is null) {
 				continue;
 			}
+
 			line = line.TrimStart();
-			if (line.Length < 4 || line[0] == '#') {
+			if (ShouldSkipLine(line)) {
 				continue;
 			}
 
 			try {
-				var span = line.AsSpan();
-				int pos = 0;
-
-				// id
-				var idEnd = span.IndexOf(';');
-				if (idEnd < 0) throw new FormatException("Missing separators");
-				var idSpan = span[pos..idEnd];
-				pos = idEnd + 1;
-				if (!ulong.TryParse(idSpan, out var id)) {
-					throw new FormatException($"Invalid id: {idSpan}");
-				}
-				AddOrReplace(new ProvinceDefinition(id));
-
-				// r
-				var rEnd = span[pos..].IndexOf(';');
-				if (rEnd < 0) throw new FormatException("Missing separators");
-				var rSpan = span[pos..(pos + rEnd)];
-				pos += rEnd + 1;
-				if (!byte.TryParse(rSpan, out var r)) {
-					throw new FormatException($"Invalid r: {rSpan}");
-				}
-
-				// g
-				var gEnd = span[pos..].IndexOf(';');
-				if (gEnd < 0) throw new FormatException("Missing separators");
-				var gSpan = span[pos..(pos + gEnd)];
-				pos += gEnd + 1;
-				if (!byte.TryParse(gSpan, out var g)) {
-					throw new FormatException($"Invalid g: {gSpan}");
-				}
-
-				// b
-				var bEnd = span[pos..].IndexOf(';');
-				if (bEnd < 0) throw new FormatException("Missing separators");
-				var bSpan = span[pos..(pos + bEnd)];
-				pos += bEnd + 1;
-				if (!byte.TryParse(bSpan, out var b)) {
-					throw new FormatException($"Invalid b: {bSpan}");
-				}
-
-				var color = new Rgb24(r, g, b);
-				ProvinceToColorDict.Add(id, color);
-				ColorToProvinceDict[color] = id;
+				ParseDefinitionLine(line);
 			} catch (Exception e) {
 				throw new FormatException($"Line: |{line}| is unparseable! Breaking. ({e})");
 			}
 		}
 	}
+
+	private static string? GetDefinitionsFilePath(string definitionsFilename, ModFilesystem modFS) {
+		var relativePath = Path.Combine("map_data", definitionsFilename);
+		string? definitionsFilePath = modFS.GetActualFileLocation(relativePath);
+		if (definitionsFilePath is null) {
+			Logger.Warn($"Province definitions file {definitionsFilename} not found!");
+		}
+		return definitionsFilePath;
+	}
+
+	private static bool ShouldSkipLine(string line) {
+		return line.Length < 4 || line[0] == '#';
+	}
+
+	private void ParseDefinitionLine(string line) {
+		var span = line.AsSpan();
+		int pos = 0;
+
+		var id = ParseProvinceId(span, ref pos);
+		AddOrReplace(new ProvinceDefinition(id));
+
+		var color = new Rgb24(
+			ParseColorComponent(span, ref pos, "r"),
+			ParseColorComponent(span, ref pos, "g"),
+			ParseColorComponent(span, ref pos, "b")
+		);
+		ProvinceToColorDict.Add(id, color);
+		ColorToProvinceDict[color] = id;
+	}
+
+	private static ulong ParseProvinceId(ReadOnlySpan<char> span, ref int pos) {
+		var idSpan = ReadNextField(span, ref pos);
+		if (ulong.TryParse(idSpan, out var id)) {
+			return id;
+		}
+		throw new FormatException($"Invalid id: {idSpan}");
+	}
+
+	private static byte ParseColorComponent(ReadOnlySpan<char> span, ref int pos, string componentName) {
+		var componentSpan = ReadNextField(span, ref pos);
+		if (byte.TryParse(componentSpan, out var component)) {
+			return component;
+		}
+		throw new FormatException($"Invalid {componentName}: {componentSpan}");
+	}
+
+	private static ReadOnlySpan<char> ReadNextField(ReadOnlySpan<char> span, ref int pos) {
+		var fieldEnd = span[pos..].IndexOf(';');
+		if (fieldEnd < 0) {
+			throw new FormatException("Missing separators");
+		}
+
+		var fieldSpan = span[pos..(pos + fieldEnd)];
+		pos += fieldEnd + 1;
+		return fieldSpan;
+	}
 }

ImperatorToCK3/CommonUtils/Map/ProvinceDefinitions.cs

@@ -5,18 +5,18 @@ name_list_oscan = {
 	    #Central Italic & Samnite
         dynn_Arkius dynn_Aadiis dynn_Adariis dynn_Anniis dynn_Asinis dynn_Atriis dynn_Babbiis dynn_Basis dynn_Beniis dynn_Beitiis dynn_Brutiis dynn_Cusies dynn_Dekiis dynn_Dekitiis dynn_Diriis dynn_Duiis dynn_Enniis dynn_Fisanis dynn_Fuvfdis dynn_Flaviis dynn_Galliis dynn_Gaviis dynn_Gnaiviis dynn_Heiis dynn_Heleviis dynn_Hurtiis dynn_Husidiis dynn_Husiniis dynn_Kalaviis dynn_Kampaniis dynn_Kattiis dynn_Kepiis dynn_Kiipiis dynn_Kluvatiis dynn_Klippiis dynn_Kudiis dynn_Kureliis dynn_Luvkiis dynn_Magiis dynn_Mamios dynn_Mahiis dynn_Metiis dynn_Niumeriis dynn_Niumediis dynn_Niumsdiis dynn_Nuviis dynn_Pupaiis dynn_Paapaiis dynn_Pakkuiis dynn_Pumptiis dynn_Pupeliis dynn_Pafiis dynn_Peracis dynn_Rufriis dynn_Sattiis dynn_Statiis dynn_Staiis dynn_Tanunis dynn_Tintiriis dynn_Variis dynn_Valavennis dynn_Veleiis dynn_Vesulliais dynn_Urufiis dynn_Uviis dynn_Vuliis dynn_Accaes dynn_Alfius dynn_Allius dynn_Annaes dynn_Anaiedius dynn_Annius dynn_Anniaes dynn_Aies dynn_Aninius dynn_Apidius dynn_Apunius dynn_Atius dynn_Atiedius dynn_Aufidius dynn_Burtius dynn_Caeedius dynn_Caesius dynn_Cantouius dynn_Catis dynn_Cisiedius dynn_Cossutius dynn_Cristidis dynn_Comenius dynn_Decrius dynn_Decirius dynn_Ebedius dynn_Fadatronius dynn_Helevius dynn_Licinius dynn_Lucius dynn_Magius dynn_Metius dynn_Musesus dynn_Obellius dynn_Optorius dynn_Ouius dynn_Oviedius dynn_Pacuuius dynn_Pacius dynn_Papius dynn_Pedlies dynn_Peticius dynn_Petiedius dynn_Petronius dynn_Pomponius dynn_Plautius dynn_Polfenis dynn_Pontius dynn_Popidius dynn_Rufrius dynn_Sabidius dynn_Salvidienus dynn_Salvidius dynn_Sarius dynn_Scaefius dynn_Sontius dynn_Sullius dynn_Seius dynn_Staedius dynn_Sucidius dynn_Suellius dynn_Suetedius dynn_Taflenius dynn_Tatius dynn_Tettius dynn_Titis dynn_Valerius dynn_Vettius dynn_Vibidius dynn_Vibius dynn_Umbrenus
 	    #Lucanian & Bruttian
-        dynn_Aboliis dynn_Afaries dynn_Alafis dynn_Alaponies dynn_Arriis dynn_Arrontiis dynn_Artoriis dynn_Aselliis dynn_Audadis dynn_Audais dynn_Avdiis dynn_Barabiis dynn_Bividis dynn_Bothroniis dynn_Caedikis dynn_Caisidis dynn_Comnis dynn_Dekkiis dynn_Datiis dynn_Diris dynn_Erounts dynn_Fadis dynn_Festies dynn_Gaukiis dynn_Heriis dynn_Horiis dynn_Hortis dynn_Imiis dynn_Kaidikis dynn_Kailiis dynn_Kepiis dynn_Kotteis dynn_Loikis dynn_Maraiis dynn_Maisis dynn_Mamerekies dynn_Nanonis dynn_Opsiis dynn_Platorius dynn_Pumpunis dynn_Pakidiis dynn_pakulliis dynn_Percenniis dynn_Puinikis dynn_Pokidis dynn_Polliis dynn_Poppalais dynn_Pomponis dynn_Rais dynn_Soies dynn_Statiis dynn_Sabidis dynn_Scalaponiis dynn_Slabiis dynn_Spelis dynn_Stalliis dynn_Statiis dynn_Suriis dynn_Titidiis dynn_Toureiis dynn_Touriis dynn_Trebatiis dynn_Upsiis dynn_Viris dynn_Variis dynn_Vinlenis       
+        dynn_Aboliis dynn_Afaries dynn_Alafis dynn_Alaponies dynn_Arriis dynn_Arrontiis dynn_Artoriis dynn_Aselliis dynn_Audadis dynn_Audais dynn_Avdiis dynn_Barabiis dynn_Bividis dynn_Bothroniis dynn_Caedikis dynn_Caisidis dynn_Comnis dynn_Dekkiis dynn_Datiis dynn_Diris dynn_Erounts dynn_Fadis dynn_Festies dynn_Gaukiis dynn_Heriis dynn_Horiis dynn_Hortis dynn_Imiis dynn_Kaidikis dynn_Kailiis dynn_Kepiis dynn_Kotteis dynn_Loikis dynn_Maraiis dynn_Maisis dynn_Mamerekies dynn_Nanonis dynn_Opsiis dynn_Platorius dynn_Pumpunis dynn_Pakidiis dynn_pakulliis dynn_Percenniis dynn_Puinikis dynn_Pokidis dynn_Polliis dynn_Poppalais dynn_Pomponis dynn_Rais dynn_Soies dynn_Statiis dynn_Sabidis dynn_Scalaponiis dynn_Slabiis dynn_Spelis dynn_Stalliis dynn_Statiis dynn_Suriis dynn_Titidiis dynn_Toureiis dynn_Touriis dynn_Trebatiis dynn_Upsiis dynn_Viris dynn_Variis dynn_Vinlenis
 	}
 	dynasty_names = {
         #Central Italic & Samnite
         dynn_Arkius dynn_Aadiis dynn_Adariis dynn_Anniis dynn_Asinis dynn_Atriis dynn_Babbiis dynn_Basis dynn_Beniis dynn_Beitiis dynn_Brutiis dynn_Cusies dynn_Dekiis dynn_Dekitiis dynn_Diriis dynn_Duiis dynn_Enniis dynn_Fisanis dynn_Fuvfdis dynn_Flaviis dynn_Galliis dynn_Gaviis dynn_Gnaiviis dynn_Heiis dynn_Heleviis dynn_Hurtiis dynn_Husidiis dynn_Husiniis dynn_Kalaviis dynn_Kampaniis dynn_Kattiis dynn_Kepiis dynn_Kiipiis dynn_Kluvatiis dynn_Klippiis dynn_Kudiis dynn_Kureliis dynn_Luvkiis dynn_Magiis dynn_Mamios dynn_Mahiis dynn_Metiis dynn_Niumeriis dynn_Niumediis dynn_Niumsdiis dynn_Nuviis dynn_Pupaiis dynn_Paapaiis dynn_Pakkuiis dynn_Pumptiis dynn_Pupeliis dynn_Pafiis dynn_Peracis dynn_Rufriis dynn_Sattiis dynn_Statiis dynn_Staiis dynn_Tanunis dynn_Tintiriis dynn_Variis dynn_Valavennis dynn_Veleiis dynn_Vesulliais dynn_Urufiis dynn_Uviis dynn_Vuliis dynn_Accaes dynn_Alfius dynn_Allius dynn_Annaes dynn_Anaiedius dynn_Annius dynn_Anniaes dynn_Aies dynn_Aninius dynn_Apidius dynn_Apunius dynn_Atius dynn_Atiedius dynn_Aufidius dynn_Burtius dynn_Caeedius dynn_Caesius dynn_Cantouius dynn_Catis dynn_Cisiedius dynn_Cossutius dynn_Cristidis dynn_Comenius dynn_Decrius dynn_Decirius dynn_Ebedius dynn_Fadatronius dynn_Helevius dynn_Licinius dynn_Lucius dynn_Magius dynn_Metius dynn_Musesus dynn_Obellius dynn_Optorius dynn_Ouius dynn_Oviedius dynn_Pacuuius dynn_Pacius dynn_Papius dynn_Pedlies dynn_Peticius dynn_Petiedius dynn_Petronius dynn_Pomponius dynn_Plautius dynn_Polfenis dynn_Pontius dynn_Popidius dynn_Rufrius dynn_Sabidius dynn_Salvidienus dynn_Salvidius dynn_Sarius dynn_Scaefius dynn_Sontius dynn_Sullius dynn_Seius dynn_Staedius dynn_Sucidius dynn_Suellius dynn_Suetedius dynn_Taflenius dynn_Tatius dynn_Tettius dynn_Titis dynn_Valerius dynn_Vettius dynn_Vibidius dynn_Vibius dynn_Umbrenus
 	    #Lucanian & Bruttian
-        dynn_Aboliis dynn_Afaries dynn_Alafis dynn_Alaponies dynn_Arriis dynn_Arrontiis dynn_Artoriis dynn_Aselliis dynn_Audadis dynn_Audais dynn_Avdiis dynn_Barabiis dynn_Bividis dynn_Bothroniis dynn_Caedikis dynn_Caisidis dynn_Comnis dynn_Dekkiis dynn_Datiis dynn_Diris dynn_Erounts dynn_Fadis dynn_Festies dynn_Gaukiis dynn_Heriis dynn_Horiis dynn_Hortis dynn_Imiis dynn_Kaidikis dynn_Kailiis dynn_Kepiis dynn_Kotteis dynn_Loikis dynn_Maraiis dynn_Maisis dynn_Mamerekies dynn_Nanonis dynn_Opsiis dynn_Platorius dynn_Pumpunis dynn_Pakidiis dynn_pakulliis dynn_Percenniis dynn_Puinikis dynn_Pokidis dynn_Polliis dynn_Poppalais dynn_Pomponis dynn_Rais dynn_Soies dynn_Statiis dynn_Sabidis dynn_Scalaponiis dynn_Slabiis dynn_Spelis dynn_Stalliis dynn_Statiis dynn_Suriis dynn_Titidiis dynn_Toureiis dynn_Touriis dynn_Trebatiis dynn_Upsiis dynn_Viris dynn_Variis dynn_Vinlenis       
+        dynn_Aboliis dynn_Afaries dynn_Alafis dynn_Alaponies dynn_Arriis dynn_Arrontiis dynn_Artoriis dynn_Aselliis dynn_Audadis dynn_Audais dynn_Avdiis dynn_Barabiis dynn_Bividis dynn_Bothroniis dynn_Caedikis dynn_Caisidis dynn_Comnis dynn_Dekkiis dynn_Datiis dynn_Diris dynn_Erounts dynn_Fadis dynn_Festies dynn_Gaukiis dynn_Heriis dynn_Horiis dynn_Hortis dynn_Imiis dynn_Kaidikis dynn_Kailiis dynn_Kepiis dynn_Kotteis dynn_Loikis dynn_Maraiis dynn_Maisis dynn_Mamerekies dynn_Nanonis dynn_Opsiis dynn_Platorius dynn_Pumpunis dynn_Pakidiis dynn_pakulliis dynn_Percenniis dynn_Puinikis dynn_Pokidis dynn_Polliis dynn_Poppalais dynn_Pomponis dynn_Rais dynn_Soies dynn_Statiis dynn_Sabidis dynn_Scalaponiis dynn_Slabiis dynn_Spelis dynn_Stalliis dynn_Statiis dynn_Suriis dynn_Titidiis dynn_Toureiis dynn_Touriis dynn_Trebatiis dynn_Upsiis dynn_Viris dynn_Variis dynn_Vinlenis
 	}
 	male_names = {
         #Central Italic & Samnite
-        Aulis Aufilus Baitis Banttieis Bantieis Caisidis Cauius Ceis Efiis Eviis Gavis Gaavis Gnaivis Gaius Heirene Heirens Heris Kailenus Kaisillieis Kerins Kerrins Kluvatz Kumnis Luvkis Lukidel Mamercis Maras Maraeus Minaz Minis Marius Mettius Minatus Minathis Mais Marahis Minis Mitilis Mudis Melmis Nuvis Niumsis Oufilus Ovisos Pakis Rufiis Stenis Statis Stenis Titus Trebis Uvis Veliis Venelis Vinux Uhtavis Vibis Uvis 
-        Arghillus Cauius Caeso Charitus Egnatius Lucius Minas Minis Niumsis Numerius Nounis Obellius Publius Pompo Popdis Postumus Sextus Seppius Statis Titus Trebius Vibius 
+        Aulis Aufilus Baitis Banttieis Bantieis Caisidis Cauius Ceis Efiis Eviis Gavis Gaavis Gnaivis Gaius Heirene Heirens Heris Kailenus Kaisillieis Kerins Kerrins Kluvatz Kumnis Luvkis Lukidel Mamercis Maras Maraeus Minaz Minis Marius Mettius Minatus Minathis Mais Marahis Minis Mitilis Mudis Melmis Nuvis Niumsis Oufilus Ovisos Pakis Rufiis Stenis Statis Stenis Titus Trebis Uvis Veliis Venelis Vinux Uhtavis Vibis Uvis
+        Arghillus Cauius Caeso Charitus Egnatius Lucius Minas Minis Niumsis Numerius Nounis Obellius Publius Pompo Popdis Postumus Sextus Seppius Statis Titus Trebius Vibius
         #Lucanian & Bruttian
         Alaponis Arax Avis Avdiis Auilis Bannis Bantinis Cauius Caris Gavis Gnaius Heirens Helvos Heris Itiis Itius Kerrins Keis Kluvaz Luvkis Loikis Luktiis Maras Minaz Minis Minios Mais Mamereks Marahis Makis Metis Numsis Niumsis Numpsius Nympsius Nouios Nopsis Uvis Uhtavis Pakis pakul Pumpuf Perkens Plasos Polliis Silis Sossos Spedis Spellis Stenis Trebis Trebas Ouddiis Ovidius Varis Vibis
 	}

ImperatorToCK3/Data_Files/blankMod/output/common/culture/name_lists/00_oscan.txt

@@ -5,22 +5,22 @@ name_list_raetic = {
 			"dynn_Arussnu" "dynn_Esiumninu" "dynn_Esminu" "dynn_Esthu" "dynn_Ethunnu" "dynn_Helanu" "dynn_Kanissnu" "dynn_Kapassunu" "dynn_Kaszrinu" "dynn_Kuhilinu" "dynn_Lassanu" "dynn_Lavisealu" "dynn_Lavisnu" "dynn_Lumennu" "dynn_Lupnu" "dynn_Metinu" "dynn_Nutsnu" "dynn_Phausu" "dynn_Phelvinu" "dynn_Phutikginu" "dynn_Pithamnu" "dynn_Reithussnu" "dynn_Reminu" "dynn_Ssikganu" "dynn_Susinu" "dynn_Tassnu" "dynn_Tenaginu" "dynn_Tharnu" "dynn_Thaukgrilinu" "dynn_Thianu" "dynn_Tiprukgnu" "dynn_Tulanu" "dynn_Valthikinu" "dynn_Velkganu" "dynn_Vinuthalinu" "dynn_Vistekganu"
 		}
 
-		dynasty_names = { 
+		dynasty_names = {
 	        "dynn_Arussnu" "dynn_Esiumninu" "dynn_Esminu" "dynn_Esthu" "dynn_Ethunnu" "dynn_Helanu" "dynn_Kanissnu" "dynn_Kapassunu" "dynn_Kaszrinu" "dynn_Kuhilinu" "dynn_Lassanu" "dynn_Lavisealu" "dynn_Lavisnu" "dynn_Lumennu" "dynn_Lupnu" "dynn_Metinu" "dynn_Nutsnu" "dynn_Phausu" "dynn_Phelvinu" "dynn_Phutikginu" "dynn_Pithamnu" "dynn_Reithussnu" "dynn_Reminu" "dynn_Ssikganu" "dynn_Susinu" "dynn_Tassnu" "dynn_Tenaginu" "dynn_Tharnu" "dynn_Thaukgrilinu" "dynn_Thianu" "dynn_Tiprukgnu" "dynn_Tulanu" "dynn_Valthikinu" "dynn_Velkganu" "dynn_Vinuthalinu" "dynn_Vistekganu"
-		} 
+		}
 
 		male_names = {
 		    Atilius Azi Elkganu Enike Esimne Essthu Estanu Esumne Kanise Kathiave Ketanu Kgaisuru Kgika Klevie Knuse
 			Laseke Lassanu Lasta Lasthe Lathur Lavise Lavisie Lumene Munie Phausu Phelturie Phelzurie Phrima Phutikgi
-			Pitale Pithamne Pithiave Pithie Piti Pitie Piri Reithe Reituse Remie Tarie Tenakgi Terunie Tnake Tharie Tula 
-			Tulanu Ustitsu Valthikie Vassa Vatsanu Velthie 
+			Pitale Pithamne Pithiave Pithie Piti Pitie Piri Reithe Reituse Remie Tarie Tenakgi Terunie Tnake Tharie Tula
+			Tulanu Ustitsu Valthikie Vassa Vatsanu Velthie
 		}
 
-		female_names = {	
+		female_names = {
 		    Aruse Arusna Kara Kari Kgari Kgeli Kgevisiana Lavise Lavissa Perkusi Phelna Piri Remi Siara
-		}		
+		}
 		patronym_suffix_male = "dynnpat_suf_nu"
 		patronym_suffix_female = "dynnpat_suf_na"
-	
-		always_use_patronym = yes		
+
+		always_use_patronym = yes
 }

ImperatorToCK3/Data_Files/blankMod/output/common/culture/name_lists/00_raetic.txt

@@ -198,7 +198,7 @@ name_list_anatolian = {
 
 	female_names = {
 		Nysa Aryenis Ada Glaphyra Pythodorida Etazeta Drypetina Orsabaris Hypsicratea Boa Amasia
-	} 
+	}
 
 	# Patronymics (Apparently comes from Hittite/Luwian words for "descendant". Best I could find without being really repetitive)
 	patronym_prefix_male = prefix_hams