diff --git a/EU4ToVic3/Data_Files/configurables/colonial_regions.txt b/EU4ToVic3/Data_Files/configurables/colonial_regions.txt index ef51a96af..3c8ff9b9e 100644 --- a/EU4ToVic3/Data_Files/configurables/colonial_regions.txt +++ b/EU4ToVic3/Data_Files/configurables/colonial_regions.txt @@ -61,7 +61,7 @@ argentine_colony = { split_name = "$PARENT$-Platinean" } africa_colony = { - region = niger_region region = guinea_region region = central_africa_region region = sahel_region region = horn_of_africa_region region = east_africa_region region = kongo_region region = south_africa_region + region = region_nile_basin region = region_ethiopia region = region_north_africa region = region_senegal region = region_niger region = region_congo region = region_southern_africa region = region_zanj alone_name = "Neo-African" split_name = "$PARENT$-African" } diff --git a/EU4ToVic3/Data_Files/configurables/Extended Timeline_province_mappings.txt b/EU4ToVic3/Data_Files/configurables/et_province_mappings.txt similarity index 100% rename from EU4ToVic3/Data_Files/configurables/Extended Timeline_province_mappings.txt rename to EU4ToVic3/Data_Files/configurables/et_province_mappings.txt diff --git a/EU4ToVic3/Source/Configuration/Configuration.h b/EU4ToVic3/Source/Configuration/Configuration.h index a64460de9..98394f011 100644 --- a/EU4ToVic3/Source/Configuration/Configuration.h +++ b/EU4ToVic3/Source/Configuration/Configuration.h @@ -66,13 +66,15 @@ class Configuration: commonItems::parser bool downTiers = true; double shapingFactor = 1.0; // runtime options. - bool vn = false; // Voltaire's Nightmare - bool thirdOdyssey = false; // Third Odyssey: Back to the Motherland + bool vn = false; // Voltaire's Nightmare + bool thirdOdyssey = false; // Third Odyssey: Back to the Motherland + bool extendedTimeline = false; // Extended Timeline } configBlock; void setOutputName(const std::string& name) { outputName = name; } void setVN() { configBlock.vn = true; } void setTO() { configBlock.thirdOdyssey = true; } + void setET() { configBlock.extendedTimeline = true; } void setEurocentric() { configBlock.euroCentric = EUROCENTRISM::EuroCentric; } void setVanillaStartDate() { configBlock.startDate = STARTDATE::Vanilla; } diff --git a/EU4ToVic3/Source/EU4World/World.cpp b/EU4ToVic3/Source/EU4World/World.cpp index bb3fd3520..bba17fb39 100644 --- a/EU4ToVic3/Source/EU4World/World.cpp +++ b/EU4ToVic3/Source/EU4World/World.cpp @@ -220,7 +220,6 @@ 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) @@ -229,6 +228,11 @@ void EU4::World::registerKeys(const std::shared_ptr& theConfigura theConfiguration->setEurocentric(); } } + if (mod.name == "Extended Timeline") + { + Log(LogLevel::Notice) << "Extended Timeline detected. Enabling ET support."; + theConfiguration->setET(); + } } }); registerKeyword("provinces", [this](std::istream& theStream) { diff --git a/EU4ToVic3/Source/V3World/V3World.cpp b/EU4ToVic3/Source/V3World/V3World.cpp index 11a2b465a..1df8898cc 100644 --- a/EU4ToVic3/Source/V3World/V3World.cpp +++ b/EU4ToVic3/Source/V3World/V3World.cpp @@ -45,6 +45,10 @@ V3::World::World(const Configuration& configuration, const EU4::World& sourceWor { provinceMapper.loadProvinceMappings("configurables/third_odyssey_province_mappings.txt"); } + else if (configuration.configBlock.extendedTimeline) + { + provinceMapper.loadProvinceMappings("configurables/et_province_mappings.txt"); + } else { provinceMapper.loadProvinceMappings("configurables/province_mappings.txt");