Update revolution_target detection (ParadoxGameConverters#1031)

* Fixes ParadoxGameConverters#908
Zemurin · Apr 4, 2024 · 69fdd4d · 69fdd4d
1 parent 7a2ce55
commit 69fdd4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/EU4ToVic2/Source/EU4World/World.cpp b/EU4ToVic2/Source/EU4World/World.cpp
@@ -148,6 +148,11 @@ EU4::World::World(const mappers::IdeaEffectMapper& ideaEffectMapper, const commo
 
 void EU4::World::registerKeys(const mappers::IdeaEffectMapper& ideaEffectMapper, const commonItems::ConverterVersion& converterVersion)
 {
+	revolutionParser.registerKeyword("revolution_target", [this](std::istream& theStream) {
+		revolutionTargetString = commonItems::getString(theStream);
+	});
+	revolutionParser.registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
+
 	registerKeyword("EU4txt", [](std::istream& theStream) {
 	});
 	registerKeyword("date", [this](std::istream& theStream) {
@@ -272,9 +277,14 @@ void EU4::World::registerKeys(const mappers::IdeaEffectMapper& ideaEffectMapper,
 			}
 		}
 	});
+	// Old Style (up to 1.32)
 	registerKeyword("revolution_target", [this](std::istream& theStream) {
 		revolutionTargetString = commonItems::getString(theStream);
 	});
+	// New style (1.33 and onwards)
+	registerKeyword("revolution", [this](std::istream& theStream) {
+		revolutionParser.parseStream(theStream);
+	});
 	registerKeyword("celestial_empire", [this](std::istream& theStream) {
 		const EU4Empire empireBlock(theStream);
 		celestialEmperor = empireBlock.getEmperor();

diff --git a/EU4ToVic2/Source/EU4World/World.h b/EU4ToVic2/Source/EU4World/World.h
@@ -105,6 +105,8 @@ class World: commonItems::parser
 
 	// export data for hoi4
 	std::vector<std::pair<std::string, HistoricalEntry>> historicalData;
+
+	parser revolutionParser;
 };
 } // namespace EU4