Reenabling TO (#613)

ParadoxGameConverters · Dec 18, 2024 · 216c248 · 216c248
1 parent aece4e4
commit 216c248
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 18 deletions.
diff --git a/EU4ToVic3/Data_Files/blankMod/output/common/character_templates/country_pra_overwrite.txt b/EU4ToVic3/Data_Files/blankMod/output/common/character_templates/country_pra_overwrite.txt
@@ -7,7 +7,7 @@ PRA_Manuel_Lopes = {
 	birth_date = 1780.1.4
 	is_general = yes
 	female = no
-	commander_rank = 1
+	commander_rank = default
 	interest_group = ig_armed_forces
 	ideology = ideology_reformer
 	traits = {
@@ -55,7 +55,7 @@ fem_PRA_Manuel_Lopes = {
 	birth_date = 1780.1.4
 	is_general = yes
 	female = yes
-	commander_rank = 1
+	commander_rank = default
 	interest_group = ig_armed_forces
 	ideology = ideology_reformer
 	traits = {

diff --git a/...s/decentralized_world/common/discrimination_traits/zzz_converter_cultural_descriptive.txt b/...s/decentralized_world/common/discrimination_traits/zzz_converter_cultural_descriptive.txt
@@ -1,4 +1,9 @@
-latinophone = {}
+coptophone = {}  #Coptic
+illevionophone = {} #Goths/Vandals/Old Bugundians
+ingaevophone = {} #Old English/Old Frisian/Old Saxon
+irminophone = {} #Lombards/Suevii/Bavarii/Alemanni
+istvaeonophone = {} #Frankish/Old Franconian (Old Dutch)
+latinophone = {}
 phoeniciophone = {}
 
 oviparity = {}

diff --git a/...ta/generated_map_object_locators_city.txt → ...ta/generated_map_object_locators_city.txt b/...ta/generated_map_object_locators_city.txt → ...ta/generated_map_object_locators_city.txt
diff --git a/...ta/generated_map_object_locators_farm.txt → ...ta/generated_map_object_locators_farm.txt b/...ta/generated_map_object_locators_farm.txt → ...ta/generated_map_object_locators_farm.txt
diff --git a/...ta/generated_map_object_locators_mine.txt → ...ta/generated_map_object_locators_mine.txt b/...ta/generated_map_object_locators_mine.txt → ...ta/generated_map_object_locators_mine.txt
diff --git a/...ta/generated_map_object_locators_port.txt → ...ta/generated_map_object_locators_port.txt b/...ta/generated_map_object_locators_port.txt → ...ta/generated_map_object_locators_port.txt
diff --git a/...ta/generated_map_object_locators_wood.txt → ...ta/generated_map_object_locators_wood.txt b/...ta/generated_map_object_locators_wood.txt → ...ta/generated_map_object_locators_wood.txt
diff --git a/.../map/spline_network/spline_network.splnet → .../map/spline_network/spline_network.splnet b/.../map/spline_network/spline_network.splnet → .../map/spline_network/spline_network.splnet
diff --git a/...p_data/state_regions/05_north_america.txt → ...ta.bak/state_regions/05_north_america.txt b/...p_data/state_regions/05_north_america.txt → ...ta.bak/state_regions/05_north_america.txt
diff --git a/EU4ToVic3/Source/EU4World/World.cpp b/EU4ToVic3/Source/EU4World/World.cpp
@@ -220,16 +220,14 @@ void EU4::World::registerKeys(const std::shared_ptr<Configuration>& theConfigura
 			}
 			if (mod.name == "Third Odyssey: Back to the Motherland")
 			{
-				throw std::runtime_error("1.8 update broke Third Odyssey: Back to the Motherland support. We're working on re-enabling it.");
-				/*
-					Log(LogLevel::Notice) << "Third Odyssey: Back to the Motherland detected. Enabling TO support.";
-					theConfiguration->setTO();
-					if (theConfiguration->configBlock.euroCentric != Configuration::EUROCENTRISM::EuroCentric)
-					{
-						Log(LogLevel::Notice) << "TO is auto-enabling Eurocentric conversion.";
-						theConfiguration->setEurocentric();
-					}
-					*/
+				// throw std::runtime_error("1.8 update broke Third Odyssey: Back to the Motherland support. We're working on re-enabling it.");
+				Log(LogLevel::Notice) << "Third Odyssey: Back to the Motherland detected. Enabling TO support.";
+				theConfiguration->setTO();
+				if (theConfiguration->configBlock.euroCentric != Configuration::EUROCENTRISM::EuroCentric)
+				{
+					Log(LogLevel::Notice) << "TO is auto-enabling Eurocentric conversion.";
+					theConfiguration->setEurocentric();
+				}
 			}
 		}
 	});

diff --git a/EU4ToVic3/Source/Output/outWorld.cpp b/EU4ToVic3/Source/Output/outWorld.cpp
@@ -42,13 +42,14 @@ void OUT::exportWorld(const Configuration& configuration, const V3::World& world
 
 	if (configuration.configBlock.thirdOdyssey)
 	{
-		if (!commonItems::TryCopyFile("configurables/third_odyssey/map_data/state_regions/05_north_america.txt",
-				  "output/" + outputName + "/map_data/state_regions/05_north_america.txt"))
-			throw std::runtime_error("Error copying TO map_data! Is the output/ folder writable?");
+		// Disabling TO custom mapmodding until vic3 map is stable.
+		// if (!commonItems::TryCopyFile("configurables/third_odyssey/map_data/state_regions/05_north_america.txt",
+		//		  "output/" + outputName + "/map_data/state_regions/05_north_america.txt"))
+		//	throw std::runtime_error("Error copying TO map_data! Is the output/ folder writable?");
 		if (!commonItems::CopyFolder("configurables/third_odyssey/localization", "output/" + outputName + "/localization"))
 			throw std::runtime_error("Error copying TO locs! Is the output/ folder writable?");
-		if (!commonItems::CopyFolder("configurables/third_odyssey/gfx", "output/" + outputName + "/gfx"))
-			throw std::runtime_error("Error copying TO gfx! Is the output/ folder writable?");
+		// if (!commonItems::CopyFolder("configurables/third_odyssey/gfx", "output/" + outputName + "/gfx"))
+		//	throw std::runtime_error("Error copying TO gfx! Is the output/ folder writable?");
 	}
 
 	Log(LogLevel::Progress) << "83 %";