diff --git a/ImperatorToCK3/CK3/Characters/CharactersLoader.cs b/ImperatorToCK3/CK3/Characters/CharactersLoader.cs index eee7c5f6d..62c05bc13 100644 --- a/ImperatorToCK3/CK3/Characters/CharactersLoader.cs +++ b/ImperatorToCK3/CK3/Characters/CharactersLoader.cs @@ -31,8 +31,9 @@ public void LoadCK3Characters(ModFilesystem ck3ModFS, Date bookmarkDate) { "set_relation_lover", "set_relation_soulmate", "set_relation_friend", "set_relation_potential_friend", "set_relation_best_friend", "set_relation_ward", "set_relation_mentor", - "add_opinion", + "add_opinion", "make_concubine", ]; + string[] fieldsToClear = ["friends", "best_friends", "lovers", "rivals", "nemesis", "primary_title"]; foreach (var character in loadedCharacters) { // Remove post-bookmark history except for births and deaths. @@ -67,7 +68,6 @@ public void LoadCK3Characters(ModFilesystem ck3ModFS, Date bookmarkDate) { entry => irrelevantEffects.Any(effect => entry.ToString()?.Contains(effect) ?? false)); // Clear some fields we don't need. - string[] fieldsToClear = ["friends", "best_friends", "lovers", "rivals", "nemesis", "primary_title"]; foreach (var fieldName in fieldsToClear) { character.History.Fields[fieldName].RemoveAllEntries(); } diff --git a/ImperatorToCK3/Data_Files/blankMod/output/common/culture/aesthetics_bundles/IRToCK3_aesthetics.txt b/ImperatorToCK3/Data_Files/blankMod/output/common/culture/aesthetics_bundles/IRToCK3_aesthetics.txt index 19afc6e20..9199e3c1a 100644 --- a/ImperatorToCK3/Data_Files/blankMod/output/common/culture/aesthetics_bundles/IRToCK3_aesthetics.txt +++ b/ImperatorToCK3/Data_Files/blankMod/output/common/culture/aesthetics_bundles/IRToCK3_aesthetics.txt @@ -12,7 +12,7 @@ } } - coa_gfx = { byzantine_group_coa_gfx western_coa_gfx } + coa_gfx = { byzantine_group_coa_gfx } clothing_gfx = { byzantine_clothing_gfx } building_gfx = { mediterranean_building_gfx } unit_gfx = { eastern_unit_gfx } @@ -36,7 +36,7 @@ IRToCK3_aesthetics_euxinian = { } } - coa_gfx = { byzantine_group_coa_gfx western_coa_gfx } + coa_gfx = { byzantine_group_coa_gfx } clothing_gfx = { byzantine_clothing_gfx } building_gfx = { mediterranean_building_gfx } unit_gfx = { eastern_unit_gfx } @@ -59,7 +59,7 @@ IRToCK3_aesthetics_hyperborean = { } } - coa_gfx = { byzantine_group_coa_gfx western_coa_gfx } + coa_gfx = { byzantine_group_coa_gfx } clothing_gfx = { byzantine_clothing_gfx } building_gfx = { mediterranean_building_gfx } unit_gfx = { eastern_unit_gfx } diff --git a/ImperatorToCK3/Data_Files/blankMod/output/common/governments/IRToCK3_governments.liquid b/ImperatorToCK3/Data_Files/blankMod/output/common/governments/IRToCK3_governments.liquid index e08326653..cdfa26c74 100644 --- a/ImperatorToCK3/Data_Files/blankMod/output/common/governments/IRToCK3_governments.liquid +++ b/ImperatorToCK3/Data_Files/blankMod/output/common/governments/IRToCK3_governments.liquid @@ -41,7 +41,6 @@ ai = { use_lifestyle = yes - imprison = no # Imprison & release from prison arrange_marriage = no # Actively arrange marriages. Can still receive marriage requests if disabled. use_goals = no # Use longterm goals (build holdings, perform major decisions, ...) use_decisions = no # Use minor decisions diff --git a/ImperatorToCK3/Data_Files/configurables/converter_cultures.txt b/ImperatorToCK3/Data_Files/configurables/converter_cultures.txt index bb1032255..40420c7cf 100644 --- a/ImperatorToCK3/Data_Files/configurables/converter_cultures.txt +++ b/ImperatorToCK3/Data_Files/configurables/converter_cultures.txt @@ -124,7 +124,7 @@ luwian = { # https://en.wikipedia.org/wiki/Luwians coa_gfx = { byzantine_group_coa_gfx # israelite_group_coa_gfx - western_coa_gfx + # western_coa_gfx } building_gfx = { mena_building_gfx } clothing_gfx = { @@ -160,7 +160,7 @@ cilician = { # https://en.wikipedia.org/wiki/History_of_Cilicia coa_gfx = { byzantine_group_coa_gfx # israelite_group_coa_gfx - western_coa_gfx + # western_coa_gfx } building_gfx = { mena_building_gfx } clothing_gfx = { @@ -196,7 +196,7 @@ lydian = { coa_gfx = { byzantine_group_coa_gfx # israelite_group_coa_gfx - western_coa_gfx + # western_coa_gfx } building_gfx = { mena_building_gfx } clothing_gfx = { @@ -232,7 +232,7 @@ hittite = { coa_gfx = { byzantine_group_coa_gfx # israelite_group_coa_gfx - western_coa_gfx + # western_coa_gfx } building_gfx = { mena_building_gfx } clothing_gfx = { @@ -266,7 +266,7 @@ phrygian = { } coa_gfx = { - byzantine_group_coa_gfx western_coa_gfx + byzantine_group_coa_gfx # israelite_group_coa_gfx } building_gfx = { mena_building_gfx } @@ -430,7 +430,7 @@ dalmatian = { 10 = mediterranean_byzantine } - coa_gfx = { byzantine_group_coa_gfx western_coa_gfx } + coa_gfx = { byzantine_group_coa_gfx } building_gfx = { mediterranean_building_gfx } clothing_gfx = { byzantine_clothing_gfx } unit_gfx = { eastern_unit_gfx } @@ -461,7 +461,7 @@ albanian = { 10 = mediterranean_byzantine } - coa_gfx = { byzantine_group_coa_gfx western_coa_gfx } + coa_gfx = { byzantine_group_coa_gfx } building_gfx = { mediterranean_building_gfx } clothing_gfx = { byzantine_clothing_gfx } unit_gfx = { eastern_unit_gfx } @@ -631,7 +631,7 @@ macedonian = { name_list = name_list_trojan # seems wrong but is localized as "Ancient Greek" - coa_gfx = { byzantine_group_coa_gfx western_coa_gfx } + coa_gfx = { byzantine_group_coa_gfx } building_gfx = { mediterranean_building_gfx } clothing_gfx = { byzantine_clothing_gfx } unit_gfx = { eastern_unit_gfx } @@ -669,7 +669,7 @@ hellenistic = { } coa_gfx = { - byzantine_group_coa_gfx western_coa_gfx + byzantine_group_coa_gfx # iranian_group_coa_gfx } building_gfx = { @@ -725,7 +725,7 @@ italiote = { created = 2.1.1 heritage = heritage_byzantine language = language_greek - coa_gfx = { byzantine_group_coa_gfx western_coa_gfx } + coa_gfx = { byzantine_group_coa_gfx } clothing_gfx = { byzantine_clothing_gfx } building_gfx = { mediterranean_building_gfx } unit_gfx = { eastern_unit_gfx } @@ -1326,7 +1326,7 @@ galatian = { 20 = mediterranean_byzantine } - coa_gfx = { byzantine_group_coa_gfx western_coa_gfx } + coa_gfx = { byzantine_group_coa_gfx } building_gfx = { mediterranean_building_gfx } clothing_gfx = { byzantine_clothing_gfx } unit_gfx = { eastern_unit_gfx } diff --git a/ImperatorToCK3/Data_Files/configurables/dynasties_to_preserve.txt b/ImperatorToCK3/Data_Files/configurables/dynasties_to_preserve.txt index ccb372fa7..43a01914d 100644 --- a/ImperatorToCK3/Data_Files/configurables/dynasties_to_preserve.txt +++ b/ImperatorToCK3/Data_Files/configurables/dynasties_to_preserve.txt @@ -4,4 +4,5 @@ jamshid 1029100 # Sassanid, referenced in events\dlc\fp3\fp3_struggle_events.txt -613 # Seljuk, referenced in events\yearly_events\yearly_events_persia.txt \ No newline at end of file +613 # Seljuk, referenced in events\yearly_events\yearly_events_persia.txt +25061 # Karling, referenced in common/achievements/standard_achievements.txt \ No newline at end of file diff --git a/ImperatorToCK3/Outputter/WorldOutputter.cs b/ImperatorToCK3/Outputter/WorldOutputter.cs index f38392f0f..569176c7c 100644 --- a/ImperatorToCK3/Outputter/WorldOutputter.cs +++ b/ImperatorToCK3/Outputter/WorldOutputter.cs @@ -162,6 +162,7 @@ private static void OutputModFile(string outputName) { modFileBuilder.AppendLine($"name = \"Converted - {outputName}\""); modFileBuilder.AppendLine($"path = \"mod/{outputName}\""); modFileBuilder.AppendLine("replace_path=\"common/bookmarks\""); + modFileBuilder.AppendLine("replace_path=\"common/bookmarks/challenge_characters\""); modFileBuilder.AppendLine("replace_path=\"common/culture/cultures\""); modFileBuilder.AppendLine("replace_path=\"common/culture/pillars\""); modFileBuilder.AppendLine("replace_path=\"common/dynasties\"");