Skip to content

Commit fbb0f30

Browse files
authored
tanner918 AUH Patch (#2812)
CHANGES - Modified removable/replaceable_files_blocks to get no errors on conversion (there is still more to add to it that was added in AUH, but there are at least no errors for now) - Added a check to make sure faiths have a theism doctrine (adding polytheism as a fallback if they don't) - Added new Baiyue, Mohism, and Shenic faiths - Redid and organized `religion_map.txt` for most of the Terra-Indomita religions so it is easier to read and hopefully have the proper faiths get chosen - Added new Dongyi, Baiyue, and Bashu cultures - Redid and organized `culture_map.txt` for most of the Terra-Indomita cultures so it is easier to read and hopefully have the proper cultures get chosen - Added culture House COA frames to converter cultures - Modified the following base game cultures: - Made `tujia` have Lolo Heritage (new heritage alongside Bashu), and its own language - Made `bai` have Lolo Heritage (new heritage alongside Bashu), and its own language - Made `yi` have Lolo Heritage (new heritage alongside Bashu), and its own language - Added some heritage empire mappings for new heritages and empire titles - Added some title mappings for the Korean kingdom titles to ones that made sense (will still likely need to add a new decision that allows Silla/Baekje/Goguryeo to be formed by their relevant cultures, or modify the "Unite Husamguk" decision to not require those titles) - Changed some of the references of `e_western_roman_empire` to `h_western_roman_empire` to get ready for those changes
1 parent fb95701 commit fbb0f30

33 files changed

+4839
-1651
lines changed

ImperatorToCK3/CK3/Religions/ReligionCollection.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,22 @@ public void LoadConverterFaiths(string converterFaithsPath, ColorFactory colorFa
109109
}
110110
}
111111
}
112+
113+
// Validation: every faith should have a theism doctrine.
114+
string? theismFallback = DoctrineCategories.TryGetValue("doctrine_theism", out var theismCategory)
115+
? theismCategory.DoctrineIds.FirstOrDefault(d => d == "doctrine_polytheist")
116+
: null;
117+
foreach (var converterFaith in loadedConverterFaiths) {
118+
var theismDoctrine = converterFaith.GetDoctrineIdsForDoctrineCategoryId("doctrine_theism");
119+
if (theismDoctrine.Count == 0) {
120+
if (theismFallback is not null) {
121+
Logger.Warn($"Faith {converterFaith.Id} has no theism doctrine! Setting {theismFallback}");
122+
converterFaith.DoctrineIds.Add(theismFallback);
123+
} else {
124+
Logger.Warn($"Faith {converterFaith.Id} has no theism doctrine!");
125+
}
126+
}
127+
}
112128
}
113129

114130
public void RemoveChristianAndIslamicSyncretismFromAllFaiths() {

ImperatorToCK3/CK3/World.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,6 +1190,7 @@ private void DetermineCK3Dlcs(Configuration config) {
11901190
{"dlc019.dlc", "crowns_of_the_world"},
11911191
{"dlc020.dlc", "khans_of_the_steppe"},
11921192
{"dlc021.dlc", "coronations"},
1193+
{"dlc022.dlc", "all_under_heaven"},
11931194
};
11941195

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

ImperatorToCK3/Data_Files/blankMod/output/common/coat_of_arms/coat_of_arms/99_attributed_arms.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ purple_coa = {
196196
color2 = "purple"
197197
}
198198

199-
e_western_roman_empire = {
199+
h_western_roman_empire = {
200200
pattern = "pattern_solid.tga"
201201
color1 = "roman_red"
202202
color2 = "roman_gold"

ImperatorToCK3/Data_Files/blankMod/output/common/landed_titles/irtock3_titles.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
capital = c_arrajan # IRToCK3: adjusted for vanilla CK3 map
1313
}
1414

15-
e_western_roman_empire = {
15+
h_western_roman_empire = {
1616
color = hsv { 0 0.91 0.55 }
1717

1818
capital = c_roma # Rome

ImperatorToCK3/Data_Files/blankMod/output/common/scripted_effects/irtock3_scripted_effects.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ irtock3_confederation_setup_effect = {
7474
ordered_in_list = {
7575
limit = {
7676
CL_uses_leagues = yes
77-
NOT = { this = scope:actor }
77+
this != scope:actor
7878
}
7979
alternative_limit = { # Incase somehow this was chosen and no one is actually capable of using leagues, need to make sure someone is chosen
80-
NOT = { this = scope:actor }
80+
this != scope:actor
8181
}
8282
list = irtock3_confederation_members
8383
order_by = max_military_strength
@@ -106,10 +106,10 @@ irtock3_confederation_setup_effect = {
106106
ordered_in_list = {
107107
limit = {
108108
CL_uses_confederations = yes
109-
NOT = { this = scope:actor }
109+
this != scope:actor
110110
}
111111
alternative_limit = { # Incase somehow this was chosen an no one is actually capable of using confederations, need to make sure someone is chosen
112-
NOT = { this = scope:actor }
112+
this != scope:actor
113113
}
114114
list = irtock3_confederation_members
115115
order_by = max_military_strength
@@ -193,7 +193,7 @@ irtock3_confederation_setup_effect = {
193193
# Get second member, for the 'recipient' scope
194194
ordered_in_list = {
195195
limit = {
196-
NOT = { this = scope:actor }
196+
this != scope:actor
197197
}
198198
list = irtock3_confederation_members
199199
order_by = max_military_strength
Binary file not shown.
Binary file not shown.

ImperatorToCK3/Data_Files/blankMod/output/gfx/interface/icons/faith/permission.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ For Nhialacism icons:
1111
Ask B7E7, the author of Africa Plus mod for CK3.
1212

1313

14+
For Shenic icon:
15+
https://www.flaticon.com/free-icons/chinese-dragon by cube29
16+
17+
For Baiyue icon:
18+
https://www.flaticon.com/free-icons/chinese-dragon by Iconic Artisan
19+
20+
1421
For every other icon:
1522

1623
Use these wherever you want, just credit me as the contributor whenever you upload something containing these.
Binary file not shown.

ImperatorToCK3/Data_Files/blankMod/output/localization/english/CONVERTER_dejure_titles_static_l_english.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
k_betique: "Baetica"
1111
k_contestania: "Contestania"
1212
k_tarragonaise: "Tarragonaise"
13-
e_western_roman_empire_article: "the "
14-
e_western_roman_empire: "Western Roman Empire"
15-
e_western_roman_empire_adj: "Western Roman"
13+
h_western_roman_empire_article: "the "
14+
h_western_roman_empire: "Western Roman Empire"
15+
h_western_roman_empire_adj: "Western Roman"
1616
k_north_italy: "North Italy"
1717
k_central_italy: "Central Italy"
1818
k_magna_graecia: "Greater Greece"

0 commit comments

Comments
 (0)