From c4a601838fa133bcff6ba5b6d30a8bf034ac4c64 Mon Sep 17 00:00:00 2001 From: Anbeeld Date: Sun, 16 Feb 2025 14:34:49 +0100 Subject: [PATCH] Higher prio on Auxiliary Recruitment if has Proscribed Canon --- common/inventions/00_religious_inventions.txt | 26 +++++----- .../inventions/invention_relative_chance.info | 2 +- common/script_values/inventions_values.txt | 49 +++++++++++-------- 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/common/inventions/00_religious_inventions.txt b/common/inventions/00_religious_inventions.txt index ebe684d9f..c2f083d46 100644 --- a/common/inventions/00_religious_inventions.txt +++ b/common/inventions/00_religious_inventions.txt @@ -10,7 +10,7 @@ religious_1 = { # Open Religion, Formulaic Worship, Proscribed Canon, Auxiliary Recruitment and Scribae trees ai_will_do = { modifier = { - factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95__cdt_open_religion_35__cdt_scribae_20_to_55 + factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95__cdt_open_religion_35__cdt_scribae_20_to_55 } } } @@ -23,7 +23,7 @@ religious_1 = { # Open Religion, Formulaic Worship, Proscribed Canon and Auxiliary Recruitment trees ai_will_do = { modifier = { - factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95__cdt_open_religion_35 + factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95__cdt_open_religion_35 } } } @@ -51,11 +51,11 @@ religious_1 = { ai_will_do = { modifier = { factor = cdt_open_religion_target_100 - cdt_open_religion_target_100 >= cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95 + cdt_open_religion_target_100 >= cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95 } modifier = { - factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95 - cdt_open_religion_target_100 < cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95 + factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95 + cdt_open_religion_target_100 < cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95 } } } @@ -123,7 +123,7 @@ religious_1 = { # Proscribed Canon, Formulaic Worship and Auxiliary Recruitment trees ai_will_do = { modifier = { - factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 + factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 } } } @@ -248,7 +248,7 @@ religious_1 = { # Proscribed Canon, Formulaic Worship and Auxiliary Recruitment trees ai_will_do = { modifier = { - factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 + factor = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 } } } @@ -537,11 +537,11 @@ religious_1 = { ai_will_do = { modifier = { factor = cdt_proscribed_canon_target_1_to_100 - cdt_proscribed_canon_target_1_to_100 >= cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40 + cdt_proscribed_canon_target_1_to_100 >= cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40_to_65 } modifier = { - factor = cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40 - cdt_proscribed_canon_target_1_to_100 < cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40 + factor = cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40_to_65 + cdt_proscribed_canon_target_1_to_100 < cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40_to_65 } } } @@ -827,7 +827,7 @@ religious_1 = { # Auxiliary Recruitment and Formulaic Worship trees ai_will_do = { modifier = { - factor = cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40 + factor = cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40_to_65 } } } @@ -1282,7 +1282,7 @@ religious_1 = { # Auxiliary Recruitment tree ai_will_do = { modifier = { - factor = uct_auxiliary_recruitment_40 + factor = uct_auxiliary_recruitment_40_to_65 } } } @@ -1433,7 +1433,7 @@ religious_1 = { # Auxiliary Recruitment tree ai_will_do = { modifier = { - factor = uct_auxiliary_recruitment_40 + factor = uct_auxiliary_recruitment_40_to_65 } } } diff --git a/common/inventions/invention_relative_chance.info b/common/inventions/invention_relative_chance.info index 481614780..275fde391 100644 --- a/common/inventions/invention_relative_chance.info +++ b/common/inventions/invention_relative_chance.info @@ -114,7 +114,7 @@ happiness_for_wrong_group_modifier_inv_2 = { # Proscribed Canon and Auxiliary Recruitment trees ai_will_do = { modifier = { - factor = cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 + factor = cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 } } } diff --git a/common/script_values/inventions_values.txt b/common/script_values/inventions_values.txt index e28b2f7d2..c740990d0 100644 --- a/common/script_values/inventions_values.txt +++ b/common/script_values/inventions_values.txt @@ -1103,8 +1103,17 @@ cdt_proscribed_canon_target_1_to_100 = { } # Auxiliary Recruitment - unconditional tree -uct_auxiliary_recruitment_40 = { - value = irc_40 +uct_auxiliary_recruitment_40_to_65 = { + # If we got Proscribed Canon already, might as well invest further + if = { + limit = { + invention = omen_power_inv_4 + } + value = irc_65 + } + else = { + value = irc_40 + } } uct_auxiliary_recruitment_target_100 = { value = irc_100 @@ -1181,38 +1190,38 @@ uct_zero_target_100 = { } # Selector of Proscribed Canon vs Auxiliary Recruitment -cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 = { +cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 = { if = { limit = { - cdt_proscribed_canon_1_to_90 >= uct_auxiliary_recruitment_40 + cdt_proscribed_canon_1_to_90 >= uct_auxiliary_recruitment_40_to_65 } value = cdt_proscribed_canon_1_to_90 } else = { - value = uct_auxiliary_recruitment_40 + value = uct_auxiliary_recruitment_40_to_65 } } # Selector of Formulaic Worship vs Auxiliary Recruitment -cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40 = { +cdt_formulaic_worship_1_to_75__uct_auxiliary_recruitment_40_to_65 = { if = { limit = { - cdt_formulaic_worship_1_to_75 >= uct_auxiliary_recruitment_40 + cdt_formulaic_worship_1_to_75 >= uct_auxiliary_recruitment_40_to_65 } value = cdt_formulaic_worship_1_to_75 } else = { - value = uct_auxiliary_recruitment_40 + value = uct_auxiliary_recruitment_40_to_65 } } # Selector of Formulaic Worship vs Proscribed Canon vs Auxiliary Recruitment -cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 = { +cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 = { if = { limit = { - cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 >= cdt_formulaic_worship_1_to_75 + cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 >= cdt_formulaic_worship_1_to_75 } - value = cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 + value = cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 } else = { value = cdt_formulaic_worship_1_to_75 @@ -1220,12 +1229,12 @@ cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recru } # Selector of Formulaic Worship vs Proscribed Canon vs Auxiliary Recruitment vs Theological Colleges -cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95 = { +cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95 = { if = { limit = { - cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 >= cdt_theological_colleges_1_to_95 + cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 >= cdt_theological_colleges_1_to_95 } - value = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40 + value = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65 } else = { value = cdt_theological_colleges_1_to_95 @@ -1233,12 +1242,12 @@ cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recru } # Selector of Formulaic Worship vs Proscribed Canon vs Auxiliary Recruitment vs Theological Colleges vs Open Religion -cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95__cdt_open_religion_35 = { +cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95__cdt_open_religion_35 = { if = { limit = { - cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95 >= cdt_open_religion_35 + cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95 >= cdt_open_religion_35 } - value = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95 + value = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95 } else = { value = cdt_open_religion_35 @@ -1246,12 +1255,12 @@ cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recru } # Selector of Formulaic Worship vs Proscribed Canon vs Auxiliary Recruitment vs Theological Colleges vs Open Religion vs Scribae -cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95__cdt_open_religion_35__cdt_scribae_20_to_55 = { +cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95__cdt_open_religion_35__cdt_scribae_20_to_55 = { if = { limit = { - cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95__cdt_open_religion_35 >= cdt_scribae_20_to_55 + cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95__cdt_open_religion_35 >= cdt_scribae_20_to_55 } - value = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40__cdt_theological_colleges_1_to_95__cdt_open_religion_35 + value = cdt_formulaic_worship_1_to_75__cdt_proscribed_canon_1_to_90__uct_auxiliary_recruitment_40_to_65__cdt_theological_colleges_1_to_95__cdt_open_religion_35 } else = { value = cdt_scribae_20_to_55