diff --git a/Converter Mod/CK2toEU3 Converter Mod/Converter Files/religion_mappings.txt b/Converter Mod/CK2toEU3 Converter Mod/Converter Files/religion_mappings.txt index 53004a53b..4d1bd1e68 100644 --- a/Converter Mod/CK2toEU3 Converter Mod/Converter Files/religion_mappings.txt +++ b/Converter Mod/CK2toEU3 Converter Mod/Converter Files/religion_mappings.txt @@ -9,6 +9,7 @@ link = { ck2 = lollard eu3 = lollard } link = { ck2 = orthodox eu3 = orthodox } link = { ck2 = bogomilist eu3 = bogomilist } link = { ck2 = iconoclast eu3 = iconoclast } +link = { ck2 = miaphysite eu3 = misphysite } link = { ck2 = monophysite eu3 = monophysite } link = { ck2 = nestorian eu3 = nestorian } link = { ck2 = sunni eu3 = sunni } diff --git a/Converter Mod/CK2toEU3 Converter Mod/Mod Files/Converter/common/religion.txt b/Converter Mod/CK2toEU3 Converter Mod/Mod Files/Converter/common/religion.txt index ac918aa8a..bec7cecd4 100644 --- a/Converter Mod/CK2toEU3 Converter Mod/Mod Files/Converter/common/religion.txt +++ b/Converter Mod/CK2toEU3 Converter Mod/Mod Files/Converter/common/religion.txt @@ -226,6 +226,25 @@ christian = { } } + + miaphysite = { + color = { 0.8 0.4 0.1 } + + allowed_conversion = { + orthodox + } + + province = { + stability_cost = 30 + } + + country = { + missionaries = 0.25 + missionary_placement_chance = 0.05 + tolerance_heretic = 1 + } + + } nestorian = { color = { 0.6 0.2 0.2 } diff --git a/Data Files/Changelog.txt b/Data Files/Changelog.txt index 2d7c8b2a1..df340509d 100644 --- a/Data Files/Changelog.txt +++ b/Data Files/Changelog.txt @@ -218,4 +218,5 @@ Revision Log Message 214 1.06 saves don't lose muslim buildings when converted by a 1.07 install 215 Apply change 213 to test configs 216 Convert tech -217 Tech investment \ No newline at end of file +217 Tech investment +218 Add miaphysite religion mapping \ No newline at end of file diff --git a/Data Files/religion_mappings.txt b/Data Files/religion_mappings.txt index 05be7646d..3a98cd4db 100644 --- a/Data Files/religion_mappings.txt +++ b/Data Files/religion_mappings.txt @@ -9,6 +9,7 @@ link = { ck2 = lollard eu3 = catholic } link = { ck2 = orthodox eu3 = orthodox } link = { ck2 = bogomilist eu3 = orthodox } link = { ck2 = iconoclast eu3 = orthodox } +link = { ck2 = miaphysite eu3 = orthodox } link = { ck2 = monophysite eu3 = orthodox } link = { ck2 = nestorian eu3 = orthodox } link = { ck2 = sunni eu3 = sunni } diff --git a/Source/EU3World/EU3Province.cpp b/Source/EU3World/EU3Province.cpp index 93b70e66b..b4fe6f830 100644 --- a/Source/EU3World/EU3Province.cpp +++ b/Source/EU3World/EU3Province.cpp @@ -467,7 +467,7 @@ void EU3Province::determineCulture(const cultureMapping& cultureMap, const vecto culture = topCulture; } - +#pragma optimize("", off) void EU3Province::determineReligion(const religionMapping& religionMap, const vector& srcProvinces) { @@ -631,7 +631,7 @@ void EU3Province::determineReligion(const religionMapping& religionMap, const ve log("\tError: could not map religion %s to any EU3 religions (province %d: %s)\n", topReligion.c_str(), num, capital.c_str()); } } - +#pragma optimize("", off) void EU3Province::setManpower(double _manpower) {