File-scoped namespaces for CK3 Map, Dynasties, Provinces (#474)

Author: IhateTrains

ImperatorToCK3/CK3/Dynasties/Dynasty.cs

@@ -4,50 +4,42 @@
 using ImperatorToCK3.Imperator.Families;
 using ImperatorToCK3.Mappers.Localization;
 using System.Collections.Generic;
-// ReSharper disable InconsistentNaming
 
-namespace ImperatorToCK3.CK3.Dynasties {
-	public class Dynasty : IPDXSerializable, IIdentifiable<string> {
-		public Dynasty(Family imperatorFamily, LocalizationMapper localizationMapper) {
-			Id = "dynn_IMPTOCK3_" + imperatorFamily.Id;
-			Name = Id;
+namespace ImperatorToCK3.CK3.Dynasties;
 
-			var imperatorMembers = imperatorFamily.Members;
-			if (imperatorMembers.Count > 0) {
-				Imperator.Characters.Character? firstMember = imperatorMembers[0] as Imperator.Characters.Character;
-				if (firstMember?.CK3Character is not null) {
-					Culture = firstMember.CK3Character.Culture; // make head's culture the dynasty culture
-				}
-			} else {
-				Logger.Warn($"Couldn't determine culture for dynasty {Id}, needs manual setting!");
-			}
+public class Dynasty : IPDXSerializable, IIdentifiable<string> {
+	public Dynasty(Family imperatorFamily, LocalizationMapper localizationMapper) {
+		Id = $"dynn_IMPTOCK3_{imperatorFamily.Id}";
+		Name = Id;
 
-			foreach (var member in imperatorMembers.Values) {
-				var ck3Member = (member as Imperator.Characters.Character)?.CK3Character;
-				if (ck3Member is not null) {
-					ck3Member.DynastyId = Id;
-				}
+		var imperatorMembers = imperatorFamily.Members;
+		if (imperatorMembers.Count > 0) {
+			Imperator.Characters.Character? firstMember = imperatorMembers[0] as Imperator.Characters.Character;
+			if (firstMember?.CK3Character is not null) {
+				Culture = firstMember.CK3Character.Culture; // make head's culture the dynasty culture
 			}
+		} else {
+			Logger.Warn($"Couldn't determine culture for dynasty {Id}, needs manual setting!");
+		}
 
-			var impFamilyLocKey = imperatorFamily.Key;
-			var impFamilyLoc = localizationMapper.GetLocBlockForKey(impFamilyLocKey);
-			if (impFamilyLoc is not null) {
-				Localization = new(Name, impFamilyLoc);
-			} else { // fallback: use unlocalized Imperator family key
-				Localization = new(Name, new LocBlock {
-					english = impFamilyLocKey,
-					french = impFamilyLocKey,
-					german = impFamilyLocKey,
-					russian = impFamilyLocKey,
-					simp_chinese = impFamilyLocKey,
-					spanish = impFamilyLocKey
-				});
+		foreach (var member in imperatorMembers.Values) {
+			var ck3Member = (member as Imperator.Characters.Character)?.CK3Character;
+			if (ck3Member is not null) {
+				ck3Member.DynastyId = Id;
 			}
 		}
-		[NonSerialized] public string Id { get; }
-		[SerializedName("name")] public string Name { get; } = string.Empty;
-		[SerializedName("culture")] public string Culture { get; private set; } = string.Empty;
 
-		[NonSerialized] public KeyValuePair<string, LocBlock> Localization { get; } = new();
+		var impFamilyLocKey = imperatorFamily.Key;
+		var impFamilyLoc = localizationMapper.GetLocBlockForKey(impFamilyLocKey);
+		if (impFamilyLoc is not null) {
+			Localization = new(Name, impFamilyLoc);
+		} else { // fallback: use unlocalized Imperator family key
+			Localization = new(Name, new LocBlock(impFamilyLocKey));
+		}
 	}
-}
+	[NonSerialized] public string Id { get; }
+	[SerializedName("name")] public string Name { get; } = string.Empty;
+	[SerializedName("culture")] public string Culture { get; private set; } = string.Empty;
+
+	[NonSerialized] public KeyValuePair<string, LocBlock> Localization { get; } = new();
+}

ImperatorToCK3/CK3/Dynasties/DynastyCollection.cs

@@ -2,21 +2,21 @@
 using commonItems.Collections;
 using ImperatorToCK3.Mappers.Localization;
 
-namespace ImperatorToCK3.CK3.Dynasties {
-	public class DynastyCollection : IdObjectCollection<string, Dynasty> {
-		public void ImportImperatorFamilies(Imperator.World impWorld, LocalizationMapper localizationMapper) {
-			Logger.Info("Importing Imperator Families.");
+namespace ImperatorToCK3.CK3.Dynasties;
 
-			// the collection only holds dynasties converted from Imperator families, as vanilla ones aren't modified
-			foreach (var family in impWorld.Families) {
-				if (family.Minor) {
-					continue;
-				}
+public class DynastyCollection : IdObjectCollection<string, Dynasty> {
+	public void ImportImperatorFamilies(Imperator.World impWorld, LocalizationMapper localizationMapper) {
+		Logger.Info("Importing Imperator Families...");
 
-				var newDynasty = new Dynasty(family, localizationMapper);
-				Add(newDynasty);
+		// the collection only holds dynasties converted from Imperator families, as vanilla ones aren't modified
+		foreach (var family in impWorld.Families) {
+			if (family.Minor) {
+				continue;
 			}
-			Logger.Info($"{Count} total families imported.");
+
+			var newDynasty = new Dynasty(family, localizationMapper);
+			Add(newDynasty);
 		}
+		Logger.Info($"{Count} total families imported.");
 	}
-}
+}