Skip to content

Commit 61b0e24

Browse files
authored
Change the second parent of Indo-Greek to Punjabi (Gandhari for TFE) (#3125) #patch
1 parent a594b51 commit 61b0e24

3 files changed

Lines changed: 14 additions & 3 deletions

File tree

ImperatorToCK3/Data_Files/configurables/converter_cultures.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1489,8 +1489,15 @@ indogreek = {
14891489
}
14901490
}
14911491
language = language_greek
1492-
parents = { hellenic_greek bactrian }
1492+
MOD_DEPENDENT = {
1493+
IF tfe = {
1494+
parents = { hellenic_greek gandhari }
1495+
} ELSE = {
1496+
parents = { hellenic_greek punjabi }
1497+
}
1498+
}
14931499
created = 2.1.1
1500+
history_loc_override = indogreek_history_loc
14941501
ethos = ethos_bureaucratic
14951502
head_determination = head_determination_domain
14961503

ImperatorToCK3/Data_Files/configurables/localization/base/english/CONVERTER_cultures_l_english.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ l_english:
108108
indogreek: "Indo-Greek"
109109
indogreek_collective_noun: "Indo-Greeks"
110110
indogreek_prefix: "Indo-Greco" # prefix for Greek is Greco
111+
indogreek_history_loc: "Formed from Greco-Bactrians adopting Indo-Aryan customs"
111112

112113
lusoiberian: "Lusitanian"
113114
lusoiberian_collective_noun: "Lusitanians"

ImperatorToCK3/Program.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ private static void RegisterGlobalExceptionHandlers() {
5555
if (ex.StackTrace is not null) {
5656
Logger.Debug(ex.StackTrace);
5757
}
58+
// Ensure the process exits with a non-zero code. Should be 1 for user errors and -1 for other exceptions.
59+
Environment.Exit(ex is UserErrorException ? 1 : -1);
5860
} else {
5961
Logger.Log(Level.Fatal, "An unhandled exception occurred, but it could not be identified.");
62+
Environment.Exit(-1);
6063
}
61-
Environment.Exit(-1); // Ensure the process exits with a non-zero code.
6264
};
6365
TaskScheduler.UnobservedTaskException += (sender, eventArgs) => {
6466
Exception ex = eventArgs.Exception;
@@ -71,7 +73,8 @@ private static void RegisterGlobalExceptionHandlers() {
7173
if (ex.StackTrace is not null) {
7274
Logger.Debug(ex.StackTrace);
7375
}
74-
Environment.Exit(-1); // Ensure the process exits with a non-zero code.
76+
// Ensure the process exits with a non-zero code. Should be 1 for user errors and -1 for other exceptions.
77+
Environment.Exit(ex is UserErrorException ? 1 : -1);
7578
};
7679
}
7780

0 commit comments

Comments
 (0)