Title history removal fix (#63)

* Vanilla CK3 title history: store current title holder * Update commonItems * Remove invalid landless titles * Fixed mod copying * Update CK3World.cpp
ParadoxGameConverters · Oct 11, 2020 · 8c78f8f · 8c78f8f
1 parent a130faa
commit 8c78f8f
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 20 deletions.
diff --git a/ImperatorToCK3.sln.DotSettings b/ImperatorToCK3.sln.DotSettings
@@ -8,6 +8,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=IMPERATOR/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Incontinentia/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Invicta/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jure/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=librakaly/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=paradoxian/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=passant/@EntryIndexedValue">True</s:Boolean>

diff --git a/ImperatorToCK3/Data_Files/fronter-configuration.txt b/ImperatorToCK3/Data_Files/fronter-configuration.txt
@@ -29,7 +29,7 @@ requiredFolder = {
 	searchPathID = 1158310
 }
 requiredFolder = {
-	name = CK3ModsDirectory
+	name = targetGameModPath
 	displayName = CK3MOD
 	tooltip = CK3MODTIP
 	mandatory = true

diff --git a/ImperatorToCK3/Source/CK3/CK3World.cpp b/ImperatorToCK3/Source/CK3/CK3World.cpp
@@ -26,7 +26,7 @@ CK3::World::World(const ImperatorWorld::World& impWorld, const Configuration& th
 	landedTitles.loadTitles(theConfiguration.getCK3Path() + "/game/common/landed_titles/00_landed_titles.txt");
 	// Load vanilla titles history
 	titlesHistory = TitlesHistory(theConfiguration);
-	
+
 	importImperatorCountries(impWorld);
 
 	// Now we can deal with provinces since we know to whom to assign them. We first import vanilla province data.
@@ -43,7 +43,8 @@ CK3::World::World(const ImperatorWorld::World& impWorld, const Configuration& th
 
 
 	linkCountiesToTitleHolders(impWorld);
-	insertVanillaNonCountiesToTitles(impWorld);
+	importVanillaNonCountyNonBaronyTitles(impWorld);
+	removeInvalidLandlessTitles();
 }
 
 void CK3::World::importImperatorCharacters(const ImperatorWorld::World& impWorld, const bool ConvertBirthAndDeathDates = true, const date endDate = date(867,1,1))
@@ -263,6 +264,7 @@ void CK3::World::linkCountiesToTitleHolders(const ImperatorWorld::World& impWorl
 					else // county is probably outside of Imperator map
 					{
 						auto vanillaHistory = titlesHistory.popTitleHistory(name);
+						if (titlesHistory.currentHolderIdMap[name]) countyTitle->holder = *titlesHistory.currentHolderIdMap[name];
 						if (vanillaHistory) countyTitle->historyString = *vanillaHistory;
 					}
 				}
@@ -273,27 +275,34 @@ void CK3::World::linkCountiesToTitleHolders(const ImperatorWorld::World& impWorl
 }
 
 
-void CK3::World::insertVanillaNonCountiesToTitles(const ImperatorWorld::World& impWorld)
-{
+void CK3::World::importVanillaNonCountyNonBaronyTitles(const ImperatorWorld::World& impWorld)
+{	
 	for (const auto& [name, landedTitle] : landedTitles.getFoundTitles())
 	{
 		if (name.find("c_") != 0 && name.find("b_") != 0 ) // title is a duchy or higher
 		{
 			auto toInsert = true;
-			// important check: if any of the title's de jure counties' holder is "0", don't insert the title
 			for (const auto& [vassalTitleName, deJureVassal] : landedTitle.getFoundTitles())
 			{
-				if (vassalTitleName.find("c_")==0 && titles.count(vassalTitleName) && titles[vassalTitleName]->holder == "0")
+				if (vassalTitleName.find("c_")==0 && titles.count(vassalTitleName)) // vassalTitle is a valid county
 				{
-					toInsert = false;
-					break;
+					auto countyHolder = titles[vassalTitleName]->holder;
+					countyHoldersCache.insert(countyHolder);
+
+					// important check: if any of the title's de jure counties' holder is "0", don't insert the title
+					if (countyHolder == "0")
+					{
+						toInsert = false;
+						break;
+					}
 				}
 			}
 
 			if(toInsert)
 			{
 				auto vanillaTitle = std::make_shared<Title>();
 				vanillaTitle->titleName = name;
+				if (titlesHistory.currentHolderIdMap[name]) vanillaTitle->holder = *titlesHistory.currentHolderIdMap[name];
 				auto vanillaHistory = titlesHistory.popTitleHistory(name);
 				if (vanillaHistory) vanillaTitle->historyString = *vanillaHistory;
 				titles.insert(std::pair(name, vanillaTitle));
@@ -302,6 +311,22 @@ void CK3::World::insertVanillaNonCountiesToTitles(const ImperatorWorld::World& i
 	}
 }
 
+void CK3::World::removeInvalidLandlessTitles()
+{
+	for (const auto& [name, title] : titles)
+	{	//important check: if duchy/kingdom/empire title holder holds no county (is landless), remove the title
+		// this also removes landless titles initialized from Imperator
+		if (name.find("c_") != 0 && name.find("b_") != 0 && countyHoldersCache.find(title->holder) == countyHoldersCache.end())
+		{
+			if (!landedTitles.getFoundTitles().find(name)->second.isLandless()) // does not have landless attribute set to true
+			{
+				Log(LogLevel::Info) << "Removing landless title that can't be landless: " << name;
+				titles.erase(name);
+			}
+		}
+	}
+}
+
 void CK3::World::linkSpouses(const ImperatorWorld::World& impWorld)
 {
 	auto counterSpouse = 0;

diff --git a/ImperatorToCK3/Source/CK3/CK3World.h b/ImperatorToCK3/Source/CK3/CK3World.h
@@ -33,14 +33,15 @@ class World
 	private:
 		void importImperatorCharacters(const ImperatorWorld::World& impWorld, bool ConvertBirthAndDeathDates, date endDate);
 		void importImperatorCharacter(const std::pair<int, std::shared_ptr<ImperatorWorld::Character>>& character, bool ConvertBirthAndDeathDates, date endDate);
+		void importVanillaNonCountyNonBaronyTitles(const ImperatorWorld::World& impWorld);
 		void importImperatorCountries(const ImperatorWorld::World& impWorld);
 		void importImperatorCountry(const std::pair<int, std::shared_ptr<ImperatorWorld::Country>>& country);
 		void importVanillaProvinces(const std::string& ck3Path);
 		void importImperatorProvinces(const ImperatorWorld::World& impWorld);
 		void linkCountiesToTitleHolders(const ImperatorWorld::World& impWorld);
-		void insertVanillaNonCountiesToTitles(const ImperatorWorld::World& impWorld);
 		void linkSpouses(const ImperatorWorld::World& impWorld);
 		void linkMothersAndFathers(const ImperatorWorld::World& impWorld);
+		void removeInvalidLandlessTitles();
 
 		[[nodiscard]] std::optional<std::pair<int, std::shared_ptr<ImperatorWorld::Province>>> determineProvinceSource(const std::vector<int>& impProvinceNumbers,
 			const ImperatorWorld::World& impWorld) const;
@@ -60,6 +61,8 @@ class World
 		TitlesHistory titlesHistory;
 
 		LandedTitles landedTitles;
+
+		std::set<std::string> countyHoldersCache; // used by removeInvalidLandlessTitles
 };
 
 }

diff --git a/ImperatorToCK3/Source/CK3/Titles/TitlesHistory.cpp b/ImperatorToCK3/Source/CK3/Titles/TitlesHistory.cpp
@@ -29,8 +29,15 @@ void CK3::TitlesHistory::TitlesHistory::registerKeys()
 	registerRegex(R"((e|k|d|c|b)_[A-Za-z0-9_\-\']+)", [this](const std::string& titleName, std::istream& theStream) {
 		const auto historyItem = commonItems::stringOfItem(theStream).getString();
 		historyMap.insert(std::pair(titleName, historyItem.substr(3, historyItem.size()-4))); // inserts without the opening and closing bracket
+
+		std::stringstream tempStream(historyItem);
+		if (historyItem.find('{') != std::string::npos)
+		{
+			const auto titleHistory = TitleHistory(tempStream);
+			currentHolderIdMap[titleName] = titleHistory.currentHolderEntryWithDate.second.holder;
+		}
 	});
-	registerKeyword(commonItems::catchallRegex, commonItems::ignoreItem);
+	registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
 }
 
 std::optional<std::string> CK3::TitlesHistory::popTitleHistory(const std::string& titleName)
@@ -42,4 +49,38 @@ std::optional<std::string> CK3::TitlesHistory::popTitleHistory(const std::string
 		return history;
 	}
 	return std::nullopt;
+}
+
+
+
+CK3::TitleHistory::TitleHistory(std::istream& theStream)
+{
+	registerKeys();
+	parseStream(theStream);
+	clearRegisteredKeywords();
+}
+void CK3::TitleHistory::TitleHistory::registerKeys()
+{
+	registerRegex(R"(\d+[.]\d+[.]\d+)", [this](const std::string& dateStr, std::istream& theStream) {
+		auto historyEntry = DatedHistoryEntry(theStream);
+		if (date(dateStr) >= currentHolderEntryWithDate.first && date(dateStr) <= date(867, 1, 1) && historyEntry.holder)
+			currentHolderEntryWithDate = std::pair(date(dateStr), historyEntry);
+	});
+	registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
+}
+
+
+
+CK3::DatedHistoryEntry::DatedHistoryEntry(std::istream& theStream)
+{
+	registerKeys();
+	parseStream(theStream);
+	clearRegisteredKeywords();
+}
+void CK3::DatedHistoryEntry::DatedHistoryEntry::registerKeys()
+{
+	registerKeyword("holder", [this](const std::string& unused, std::istream& theStream) {
+		holder = commonItems::singleString(theStream).getString();
+	});
+	registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
 }
diff --git a/ImperatorToCK3/Source/CK3/Titles/TitlesHistory.h b/ImperatorToCK3/Source/CK3/Titles/TitlesHistory.h
@@ -9,23 +9,57 @@
 
 namespace CK3
 {
-class TitlesHistory: commonItems::parser
+class DatedHistoryEntry : commonItems::parser
 {
-  /// <summary>
-  /// This class stores vanilla titles history as strings. To save memory, title's history is removed from the map before being returned.
-  /// </summary>
-  public:
+	/// <summary>
+	/// This class stores the holder from a single history entry (if there is one).
+	/// Example entry: 856.1.1 = { holder = akan707 }
+	/// What's saved in the class: holder = akan707
+	/// </summary>
+public:
+	DatedHistoryEntry() = default;
+	explicit DatedHistoryEntry(std::istream& theStream);
+
+	std::optional<std::string> holder;
+
+private:
+	void registerKeys();
+}; // class DatedHistoryEntry
+
+
+class TitleHistory : commonItems::parser
+{
+	/// <summary>
+	/// This class stores the dated history entries for a single title
+	/// </summary>
+public:
+	TitleHistory() = default;
+	explicit TitleHistory(std::istream& theStream);
+
+	std::pair<date, DatedHistoryEntry> currentHolderEntryWithDate = { date(1,1,1), DatedHistoryEntry()}; // entry with the closest date <= 867.1.1
+private:
+	void registerKeys();
+}; // class TitleHistory
+
+
+class TitlesHistory : commonItems::parser
+{
+	/// <summary>
+	/// This class stores vanilla titles history as strings. To save memory, title's history string is removed from the map before being returned.
+	/// </summary>
+public:
 	TitlesHistory() = default;
 	explicit TitlesHistory(const Configuration& theConfiguration);
 	explicit TitlesHistory(const std::string& historyFilePath);
 
-	[[nodiscard]] std::optional<std::string> popTitleHistory(const std::string& titleName);
+	[[nodiscard]] std::optional<std::string> popTitleHistory(const std::string& titleName); // "pop" as from stack, not Imperator Pop ;)
+	std::map<std::string, std::optional<std::string>> currentHolderIdMap; // value is nullopt only when there is no holder registered before or at CK3 start date
 
-  private:
+private:
 	void registerKeys();
 
 	std::map<std::string, std::string> historyMap;
-};
+}; // class TitlesHistory
 } // namespace CK3
 
 #endif // CK3_TITLES_HISTORY_H
diff --git a/commonItems b/commonItems