Compatibility with CK3 1.18, Invictus 1.7 and Invictus 1.11 (#2820) #major

closes #2784 
closes #2799
closes #2862

---------

Co-authored-by: tanner918 <30297148+tanner918@users.noreply.github.com>
Co-authored-by: codefactor-io <support@codefactor.io>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: IhateTrains <29546927+IhateTrains@users.noreply.github.com>

Author: 4 people

.github/workflows/ck3-tiger.conf

@@ -180,6 +180,15 @@ filter = {
                 text = "missing english localization key NEGOTIATE_LAND_DISTANCE_REASON"
                 text = "missing english localization key hinduism_trickster_god_namepossessive"
                 text = "missing english localization key urartuism_fertility_god_name_possessiv"
+            
+                # vanilla problems as of CK3 1.18
+                text = "missing english localization key Builder or Pious Builder"
+                text = "missing english localization key lesser ruler, high medieval"
+                text = "missing english localization key significant ruler, high medieval"
+                text = "missing english localization key lesser ruler, high medieval"
+                text = "missing english localization key lesser ruler, late medieval"
+                text = "missing english localization key ai_directive"
+                text = "missing english localization key default value"
             }
         }
     }

.github/workflows/integration_tests.yml

@@ -60,7 +60,7 @@ jobs:
 
     - name: "Download and unzip ck3-tiger"
       run: |
-        Invoke-WebRequest -Uri "https://github.com/amtep/tiger/releases/download/v1.12.0/ck3-tiger-windows-v1.12.0.zip" -OutFile "ck3-tiger.zip"
+        Invoke-WebRequest -Uri "https://github.com/amtep/tiger/releases/download/v1.15.0/ck3-tiger-windows-v1.15.0.zip" -OutFile "ck3-tiger.zip"
         Expand-Archive -Path "ck3-tiger.zip" -DestinationPath "ck3-tiger"
         Remove-Item -Path "ck3-tiger.zip"
 

.github/workflows/spelling.yml

@@ -13,3 +13,4 @@ jobs:
           locale: "US"
           reporter: github-pr-review
           level: warning
+          ignore: councillor,favour,flavour,favourable,prioritised

.gitignore

@@ -27,6 +27,7 @@
 /ImperatorToCK3/obj/
 /Publish/
 /Output/
+/TestResults/
 
 DocsGenerator/bin/
 DocsGenerator/obj/
@@ -43,3 +44,8 @@ validate-with-ck3-tiger.ps1
 result-error.txt
 result.txt
 validate-with-ck3-tiger_wtwsms.ps1
+previous-problem-count.txt
+
+# Benchmark stuff
+/ImperatorToCK3.Benchmarks/
+/BenchmarkDotNet.Artifacts/

ImperatorToCK3.UnitTests/CK3/Characters/CharacterCollectionTests.cs

@@ -8,6 +8,7 @@
 using ImperatorToCK3.CK3.Provinces;
 using ImperatorToCK3.CK3.Titles;
 using ImperatorToCK3.CommonUtils.Map;
+using ImperatorToCK3.CK3.Dynasties;
 using ImperatorToCK3.Imperator.Countries;
 using ImperatorToCK3.Imperator.Diplomacy;
 using ImperatorToCK3.Imperator.Geography;
@@ -30,6 +31,10 @@
 using Xunit;
 using System;
 using System.IO;
+using System.Globalization;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using ImperatorRulerTerm = ImperatorToCK3.Imperator.Countries.RulerTerm;
 
 namespace ImperatorToCK3.UnitTests.CK3.Characters;
 
@@ -208,6 +213,31 @@ public void OnlyEarlyPregnanciesAreImportedFromImperator() {
 		ck3Characters["imperator4"].Pregnancies.Should().BeEmpty();
 	}
 
+	[Fact]
+	public void RemoveInvalidDynastiesFromHistory_FiltersCorrectly() {
+		var cc = new CharacterCollection();
+		var date = new Date(1, 1, 1, AUC: true);
+		var char1 = new Character("c1", "one", date, cc) { FromImperator = false };
+		char1.History.Fields["dynasty"].InitialEntries.Add(new KeyValuePair<string, object>("dynasty", "valid"));
+		char1.History.Fields["dynasty"].InitialEntries.Add(new KeyValuePair<string, object>("dynasty", ""));
+		char1.History.Fields["dynasty"].InitialEntries.Add(new KeyValuePair<string, object>("dynasty", "invalid"));
+		cc.AddOrReplace(char1);
+
+		var char2 = new Character("c2", "two", date, cc) { FromImperator = true };
+		char2.History.Fields["dynasty"].InitialEntries.Add(new KeyValuePair<string, object>("dynasty", "valid"));
+		cc.AddOrReplace(char2);
+
+		var dyns = new DynastyCollection();
+		dyns.AddOrReplace(new Dynasty("valid", new BufferedReader("")));
+
+		cc.RemoveInvalidDynastiesFromHistory(dyns);
+
+		var entries = char1.History.Fields["dynasty"].InitialEntries.Select(kvp => kvp.Value.ToString()).ToList();
+		entries.Should().Equal(new[] { "valid" });
+		var entries2 = char2.History.Fields["dynasty"].InitialEntries.Select(kvp => kvp.Value.ToString()).ToList();
+		entries2.Should().Equal(new[] { "valid" });
+	}
+
 	[Fact]
 	public void ImperatorCountriesGoldCanBeDistributedAmongRulerAndVassals() {
 		var conversionDate = new Date(470, 2, 1, AUC: true);
@@ -415,4 +445,75 @@ public void ImperatorCharacterNamesCanBeOverriddenByConfigurable() {
 		// Clean up.
 		File.Delete(overridesFilePath);
 	}
+
+	[Fact]
+	public void ChineseDynasticCycleVariablesAreCorrectlyCalculatedForChineseEmpireCountryRulers() {
+		Date ck3BookmarkDate = new(810, 1, 1);
+		Date irEndDate = new(780, 1, 1);
+
+		var characters = new CharacterCollection();
+		var holder = new Character("imperator_han_emperor", "Han Emperor", new Date(760, 1, 1), characters) {
+			FromImperator = true
+		};
+		characters.Add(holder);
+
+		var landedTitles = new Title.LandedTitles();
+		var celestialEmpire = landedTitles.Add("e_chinese_empire");
+		celestialEmpire.SetHolder(holder, ck3BookmarkDate);
+
+		var imperatorCountry = new Country(1) { Tag = "HAN" };
+		SetPrivateProperty(imperatorCountry, nameof(Country.Government), "chinese_empire");
+		imperatorCountry.TotalPowerBase = 60f;
+		imperatorCountry.NonLoyalPowerBase = 15f;
+
+		var precedingNonChineseStartDate = new Date(700, 3, 1);
+		var earliestChineseStartDate = new Date(720, 6, 1);
+		var laterChineseStartDate = new Date(760, 2, 1);
+
+		imperatorCountry.RulerTerms.Add(CreateRulerTerm(precedingNonChineseStartDate, "tribal"));
+		imperatorCountry.RulerTerms.Add(CreateRulerTerm(earliestChineseStartDate, "chinese_empire"));
+		imperatorCountry.RulerTerms.Add(CreateRulerTerm(laterChineseStartDate, "chinese_empire"));
+
+		imperatorCountry.CK3Title = celestialEmpire;
+		SetPrivateProperty(celestialEmpire, nameof(Title.ImperatorCountry), imperatorCountry);
+
+		characters.CalculateChineseDynasticCycleVariables(landedTitles, irEndDate, ck3BookmarkDate);
+
+		var effectsField = holder.History.Fields["effects"];
+		var effectEntry = Assert.Single(effectsField.DateToEntriesDict);
+		Assert.Equal(ck3BookmarkDate, effectEntry.Key);
+		var effectString = Assert.IsType<StringOfItem>(Assert.Single(effectEntry.Value).Value).ToString();
+
+		var expectedYearsWithGovernment = ck3BookmarkDate.DiffInYears(earliestChineseStartDate) + (earliestChineseStartDate.DiffInYears(precedingNonChineseStartDate) / 2);
+		var expectedUnrest = imperatorCountry.NonLoyalPowerBase / imperatorCountry.TotalPowerBase;
+		var effectLines = effectString.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+		var yearsLine = Assert.Single(effectLines, line => line.Contains("years_with_government", StringComparison.Ordinal));
+		var yearsValue = ExtractVariableValue(yearsLine);
+		Assert.Equal(expectedYearsWithGovernment, yearsValue, precision: 5);
+		var unrestLine = Assert.Single(effectLines, line => line.Contains("imperator_unrest", StringComparison.Ordinal));
+		var unrestValue = ExtractVariableValue(unrestLine);
+		Assert.Equal(expectedUnrest, unrestValue, precision: 5);
+	}
+
+	private static void SetPrivateProperty(object target, string propertyName, object? value) {
+		var targetType = target.GetType();
+		var property = targetType.GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+		Assert.NotNull(property);
+		var setter = property!.GetSetMethod(nonPublic: true);
+		Assert.NotNull(setter);
+		setter!.Invoke(target, new[] { value });
+	}
+
+	private static ImperatorRulerTerm CreateRulerTerm(Date startDate, string governmentId) {
+		var term = new ImperatorRulerTerm();
+		SetPrivateProperty(term, nameof(ImperatorRulerTerm.StartDate), startDate);
+		SetPrivateProperty(term, nameof(ImperatorRulerTerm.Government), governmentId);
+		return term;
+	}
+
+	private static double ExtractVariableValue(string line) {
+		var match = Regex.Match(line, "value\\s*=\\s*(?<value>[-+]?[0-9]*\\.?[0-9]+)");
+		Assert.True(match.Success, $"Could not parse value from line '{line}'.");
+		return double.Parse(match.Groups["value"].Value, CultureInfo.InvariantCulture);
+	}
 }