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 index 9a2c3ca0c..054cecad6 100644 --- 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/EU4ToVic3/Data_Files/configurables/decentralized_world/common/discrimination_traits/zzz_converter_cultural_descriptive.txt b/EU4ToVic3/Data_Files/configurables/decentralized_world/common/discrimination_traits/zzz_converter_cultural_descriptive.txt index b4852055b..680a5f42e 100644 --- a/EU4ToVic3/Data_Files/configurables/decentralized_world/common/discrimination_traits/zzz_converter_cultural_descriptive.txt +++ b/EU4ToVic3/Data_Files/configurables/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/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_city.txt b/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_city.txt similarity index 100% rename from EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_city.txt rename to EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_city.txt diff --git a/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_farm.txt b/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_farm.txt similarity index 100% rename from EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_farm.txt rename to EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_farm.txt diff --git a/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_mine.txt b/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_mine.txt similarity index 100% rename from EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_mine.txt rename to EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_mine.txt diff --git a/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_port.txt b/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_port.txt similarity index 100% rename from EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_port.txt rename to EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_port.txt diff --git a/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_wood.txt b/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_wood.txt similarity index 100% rename from EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/map_object_data/generated_map_object_locators_wood.txt rename to EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/map_object_data/generated_map_object_locators_wood.txt diff --git a/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/spline_network/spline_network.splnet b/EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/spline_network/spline_network.splnet similarity index 100% rename from EU4ToVic3/Data_Files/configurables/third_odyssey/gfx/map/spline_network/spline_network.splnet rename to EU4ToVic3/Data_Files/configurables/third_odyssey/gfx.bak/map/spline_network/spline_network.splnet diff --git a/EU4ToVic3/Data_Files/configurables/third_odyssey/map_data/state_regions/05_north_america.txt b/EU4ToVic3/Data_Files/configurables/third_odyssey/map_data.bak/state_regions/05_north_america.txt similarity index 100% rename from EU4ToVic3/Data_Files/configurables/third_odyssey/map_data/state_regions/05_north_america.txt rename to EU4ToVic3/Data_Files/configurables/third_odyssey/map_data.bak/state_regions/05_north_america.txt diff --git a/EU4ToVic3/Source/EU4World/World.cpp b/EU4ToVic3/Source/EU4World/World.cpp index f2b6a6cf7..bb3fd3520 100644 --- a/EU4ToVic3/Source/EU4World/World.cpp +++ b/EU4ToVic3/Source/EU4World/World.cpp @@ -220,16 +220,14 @@ void EU4::World::registerKeys(const std::shared_ptr& 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 index ba71b8317..9337d22ca 100644 --- 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 %";