Skip to content

Commit 78ba2f0

Browse files
authored
Compatibility with CK3 1.15 (#2526) #major
closes #2522
1 parent fdb79f8 commit 78ba2f0

File tree

7 files changed

+22
-24
lines changed

7 files changed

+22
-24
lines changed

ImperatorToCK3/CK3/Characters/DNAFactory.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,19 @@ internal DNA GenerateDNA(Imperator.Characters.Character irCharacter, PortraitDat
156156
}
157157

158158
// Convert eye accessories.
159-
const string blindfoldGeneId = "special_headgear_blindfold";
159+
const string blindfoldGeneId = "special_headgear_spectacles";
160160
const string blindfoldTemplateId = "blindfold";
161161
var irEyeAccessoryGeneTemplateName = irPortraitData.AccessoryGenesDict["eye_accessory"].GeneTemplate;
162162
switch (irEyeAccessoryGeneTemplateName) {
163163
case "normal_eyes":
164164
break;
165165
case "eyepatch_1":
166166
case "eyepatch_2": // TODO: check if this is correctly added to portrait modifiers if needed
167-
var eyePatchTemplate = ck3GenesDB.SpecialAccessoryGenes["special_headgear_eye_patch"]
167+
var eyePatchTemplate = ck3GenesDB.SpecialAccessoryGenes["special_headgear_spectacles"]
168168
.GeneTemplates["eye_patch"];
169169
if (eyePatchTemplate.AgeSexWeightBlocks.TryGetValue(irCharacter.AgeSex, out WeightBlock? eyePatchWeightBlock)) {
170170
var eyePatchObjectName = eyePatchWeightBlock.GetMatchingObject(1) ?? eyePatchWeightBlock.ObjectNames.Last();
171-
accessoryDNAValues["special_headgear_eye_patch"] = new(eyePatchTemplate.Id, eyePatchObjectName, eyePatchWeightBlock);
171+
accessoryDNAValues["special_headgear_spectacles"] = new(eyePatchTemplate.Id, eyePatchObjectName, eyePatchWeightBlock);
172172
}
173173

174174
break;
@@ -225,11 +225,11 @@ internal DNA GenerateDNA(Imperator.Characters.Character irCharacter, PortraitDat
225225
accessoryDNAValues[blindfoldGeneId] = new(blindfoldTemplate.Id, blindfoldObjectName, blindfoldWeighBlock); // TODO: check if this is correctly added to portrait modifiers if needed
226226
}
227227
} else if (irCharacter.Traits.Contains("one_eyed")) {
228-
var eyePatchTemplate = ck3GenesDB.SpecialAccessoryGenes["special_headgear_eye_patch"]
228+
var eyePatchTemplate = ck3GenesDB.SpecialAccessoryGenes["special_headgear_spectacles"]
229229
.GeneTemplates["eye_patch"];
230230
if (eyePatchTemplate.AgeSexWeightBlocks.TryGetValue(irCharacter.AgeSex, out WeightBlock? eyePatchWeighBlock)) {
231231
var eyePatchObjectName = eyePatchWeighBlock.GetMatchingObject(1) ?? eyePatchWeighBlock.ObjectNames.Last();
232-
accessoryDNAValues["special_headgear_eye_patch"] = new(eyePatchTemplate.Id, eyePatchObjectName, eyePatchWeighBlock); // TODO: check if this is correctly added to portrait modifiers if needed
232+
accessoryDNAValues["special_headgear_spectacles"] = new(eyePatchTemplate.Id, eyePatchObjectName, eyePatchWeighBlock); // TODO: check if this is correctly added to portrait modifiers if needed
233233
}
234234
}
235235

ImperatorToCK3/CK3/World.cs

+1
Original file line numberDiff line numberDiff line change
@@ -1136,6 +1136,7 @@ private void DetermineCK3Dlcs(Configuration config) {
11361136
{"dlc016.dlc", "west_slavic_attire"},
11371137
{"dlc017.dlc", "medieval_monuments"},
11381138
{"dlc018.dlc", "arctic_attire"},
1139+
{"dlc019.dlc", "crowns_of_the_world"},
11391140
};
11401141

11411142
var dlcFiles = Directory.GetFiles(dlcFolderPath, "*.dlc", SearchOption.AllDirectories);

ImperatorToCK3/Data_Files/configurables/removable_file_blocks.txt

+12-15
Original file line numberDiff line numberDiff line change
@@ -4005,7 +4005,10 @@ bookmark.1069 = {
40054005
change_government = theocracy_government
40064006
}
40074007
}
4008-
fire_councillor = character:528
4008+
if = {
4009+
limit = { character:528 = { is_councillor_of = root } }
4010+
fire_councillor = character:528
4011+
}
40094012
assign_councillor_type = {
40104013
type = councillor_court_chaplain
40114014
remove_existing_councillor = yes
@@ -6057,6 +6060,13 @@ game_rule.1143 = {
60576060
template = fp1_high_nobility_clothes
60586061
value = 1.0
60596062
}
6063+
accessory = {
6064+
mode = add
6065+
gene = hairstyles
6066+
template = fp1_hairstyles_wavy
6067+
value = 0.0 # Please replace with accessory = accessory_name
6068+
#accessory = female_hair_fp1_02
6069+
}
60606070
accessory = {
60616071
mode = add
60626072
gene = cloaks
@@ -7608,19 +7618,6 @@ game_rule.1143 = {
76087618
}
76097619
weight = {
76107620
base = 0
7611-
7612-
modifier = {
7613-
add = 999
7614-
exists = this
7615-
exists = character:easteregg_elisabeth_gangenes
7616-
this = character:easteregg_elisabeth_gangenes
7617-
}
7618-
modifier = {
7619-
add = 999
7620-
exists = this
7621-
exists = character:easteregg_lucia_dzediti
7622-
this = character:easteregg_lucia_dzediti
7623-
}
76247621
}
76257622
}
76267623

@@ -9895,7 +9892,7 @@ hasan_found_the_assassins = {
98959892
#############################################
98969893
hasan_expand_the_assassins = {
98979894
picture = {
9898-
reference = "gfx/interface/illustrations/decisions/fp3/fp3_decision_foundation.dds"
9895+
reference = "gfx/interface/illustrations/decisions/decision_legitimacy.dds"
98999896
}
99009897
sort_order = 500
99019898
ai_check_interval = 120
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Version info
22

3-
name = "Trajan"
3+
name = "Hadrian"
44
source = "Imperator"
55
minSource = "2.0"
66
maxSource = "2.0"
77
target = "CK3"
8-
minTarget = "1.14"
9-
maxTarget = "1.14"
8+
minTarget = "1.15"
9+
maxTarget = "1.15"

ImperatorToCK3/Data_Files/converter_globals/ReadMe.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GitHub project: https://github.com/ParadoxGameConverters/ImperatorToCK3
1010
REQUIREMENTS
1111
----
1212
Imperator: Rome - version 2.0
13-
Crusader Kings III - version 1.14
13+
Crusader Kings III - version 1.15
1414

1515
-----
1616
INSTRUCTIONS
Loading
Binary file not shown.

0 commit comments

Comments
 (0)