Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reenabling TO #613

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 = {}
Expand Down
18 changes: 8 additions & 10 deletions EU4ToVic3/Source/EU4World/World.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
});
Expand Down
11 changes: 6 additions & 5 deletions EU4ToVic3/Source/Output/outWorld.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 %";
Expand Down
Loading