Skip to content

Commit

Permalink
Higher prio on Auxiliary Recruitment if has Proscribed Canon
Browse files Browse the repository at this point in the history
  • Loading branch information
@Anbeeld
Anbeeld committed Feb 16, 2025
1 parent 0149de7 commit c4a6018
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 34 deletions.
26 changes: 13 additions & 13 deletions common/inventions/00_religious_inventions.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand All @@ -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
}
}
}
Expand Down Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion common/inventions/invention_relative_chance.info
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down
49 changes: 29 additions & 20 deletions common/script_values/inventions_values.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1181,77 +1190,77 @@ 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
}
}

# 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
}
}

# 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
}
}

# 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
Expand Down

0 comments on commit c4a6018

Please sign in to comment.