Skip to content

Commit

Permalink
Fix some errors found in CK3's error.log (#2228) #patch
Browse files Browse the repository at this point in the history
  • Loading branch information
IhateTrains authored Sep 24, 2024
1 parent 63105d8 commit 230e4a1
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 18 deletions.
4 changes: 2 additions & 2 deletions ImperatorToCK3/CK3/Characters/CharactersLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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 }
Expand All @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions ImperatorToCK3/Data_Files/configurables/converter_cultures.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -669,7 +669,7 @@ hellenistic = {
}

coa_gfx = {
byzantine_group_coa_gfx western_coa_gfx
byzantine_group_coa_gfx
# iranian_group_coa_gfx
}
building_gfx = {
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
613 # Seljuk, referenced in events\yearly_events\yearly_events_persia.txt
25061 # Karling, referenced in common/achievements/standard_achievements.txt
1 change: 1 addition & 0 deletions ImperatorToCK3/Outputter/WorldOutputter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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\"");
Expand Down

0 comments on commit 230e4a1

Please sign in to comment.