diff --git a/common/pop_types/cwp_clergy.txt b/common/pop_types/cwp_clergy.txt index 6f025c45c..08986fde4 100644 --- a/common/pop_types/cwp_clergy.txt +++ b/common/pop_types/cwp_clergy.txt @@ -34,14 +34,27 @@ qualifications = { if = { limit = { - literacy_rate > 0.1 + or = { + literacy_rate > 0.1 + religion_accepted = yes + } } add = { value = literacy_rate subtract = 0.1 + min = 0 multiply = 15 desc = QUALIFICATIONS_LITERACY_FACTOR } + if = { + limit = { + religion_accepted = yes + } + add = { + value = 0.1 + desc = QUALIFICATIONS_ACCEPTED_POP_RELIGION + } + } if = { limit = { or = { diff --git a/common/pop_types/cwp_service_workers.txt b/common/pop_types/cwp_service_workers.txt index 7688e2327..fe60ca1aa 100644 --- a/common/pop_types/cwp_service_workers.txt +++ b/common/pop_types/cwp_service_workers.txt @@ -44,7 +44,7 @@ } add = { value = 0.1 - desc = QUALIFICATIONS_ACCEPTED_POP + desc = QUALIFICATIONS_ACCEPTED_POP_CULTURE } } if = { diff --git a/localization/english/CWP/CWP_interfaces_l_english.yml b/localization/english/CWP/CWP_interfaces_l_english.yml index a78f21d39..d14adeddc 100644 --- a/localization/english/CWP/CWP_interfaces_l_english.yml +++ b/localization/english/CWP/CWP_interfaces_l_english.yml @@ -140,7 +140,8 @@ POP_SERVICEMEMBERS: "$servicemembers$ [concept_profession]" POP_CREATIVES: "$creatives$ [concept_profession]" - QUALIFICATIONS_ACCEPTED_POP: "Accepted [concept_culture]" + QUALIFICATIONS_ACCEPTED_POP_CULTURE: "Accepted [concept_culture]" + QUALIFICATIONS_ACCEPTED_POP_RELIGION: "Accepted [concept_religion]" # Fixed vanilla typos in loc enntry - we'll see duplicate in error log once PDX fixes it. ACCEPTED_TOOLTIP_PRIMARY_CULTURE: "As this Pop is of the [Concept('concept_primary_cultures','$concept_primary_culture$')] they will always be Accepted\n\n" diff --git a/localization/english/pop_types_l_english.yml b/localization/english/pop_types_l_english.yml index f313fd6d4..710d74e80 100644 --- a/localization/english/pop_types_l_english.yml +++ b/localization/english/pop_types_l_english.yml @@ -75,15 +75,15 @@ technicians: "@technicians! $technicians_no_icon$" # Pop Qualifications - ACADEMICS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $academics$#!. Potential increases with greater [concept_literacy] and [concept_wealth]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time. #v $creatives$#!, #v $administrators$#!, and #v $clergy$#! have a slight proclivity toward becoming #v $academics$#!." - ADMINISTRATORS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $administrators$#!. Potential increases with greater [concept_literacy]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time. #v $academics$#! have a slight leaning $EM_DASH$ whilst #v $professionals$#!, #v $servicemembers$#!, and #v $service_workers$#! have a strong proclivity $EM_DASH$ toward becoming #v $administrators$#!." - CLERGY_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $clergy$#!. Potential increases with greater [concept_literacy]. Pops whose [concept_religion] faces [concept_discrimination] take a much longer time, while it goes faster for those of [concept_accepted_religion]. #v $academics$#!, #v $laborers$#!, #v $informal_workers$#! and #v $farmers$#! have slight tendency toward becoming #v $clergy$#!." - CREATIVES_QUALIFICATIONS_DESC: "Any pop can become #v $creatives$#!. Potential increases with greater [concept_wealth]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time. #v $service_workers$#!, #v $clergy$#! have slight $EM_DASH$ whilst #v $academics$#! and #v $professionals$#! have a strong $EM_DASH$ proclivity towards becoming #v $creatives$#!." - ENGINEERS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $engineers$#!. Potential increases with greater [concept_literacy] and [concept_wealth]. #v $technicians$#! have strong tendencies; #v $landlords$#! and #v $investors$#! have some tendencies; and #v $farmers$#! have a slight tendency towards becoming #v $engineers$#!." - LANDLORDS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_wealth] can become #v $landlords$#!. Potential increases with greater [concept_wealth] and to a lesser degree [concept_literacy]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time. #v $investors$#!, #v $engineers$#!, #v $farmers$#!, and #v $clergy$#! have some tendency towards becoming #v $landlords$#!." - INVESTORS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_wealth] can become #v $investors$#!. Potential increases with greater [concept_wealth] and to a lesser degree [concept_literacy]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time. #v $landlords$#!, #v $engineers$#!, #v $professionals$#!, #v $clergy$#! are the pops that have an easier time becoming #v $investors$#!." + ACADEMICS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $academics$#!. Potential increases with greater [concept_literacy] and [concept_wealth]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time to promote. #v $creatives$#!, #v $administrators$#!, and #v $clergy$#! have a slight bonus toward becoming #v $academics$#!." + ADMINISTRATORS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $administrators$#!. Potential increases with greater [concept_literacy]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time to promote. #v $academics$#! have a slight bonus $EM_DASH$ whilst #v $professionals$#!, #v $servicemembers$#!, and #v $service_workers$#! have a strong bonus towards becoming #v $administrators$#!." + CLERGY_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $clergy$#!. Potential increases with greater [concept_literacy]. Pops whose [concept_religion] faces [concept_discrimination] take a much longer time to promote, while for those of [concept_accepted_religion] promotion comes faster. #v $academics$#!, #v $laborers$#!, #v $informal_workers$#! and #v $farmers$#! have a slight bonus toward becoming #v $clergy$#!." + CREATIVES_QUALIFICATIONS_DESC: "Any pop can become #v $creatives$#!. Potential increases with greater [concept_wealth]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time to promote. #v $service_workers$#!, #v $clergy$#! have slight bonus whilst #v $academics$#! and #v $professionals$#! have a strong bonus towards becoming #v $creatives$#!." + ENGINEERS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $engineers$#!. Potential increases with greater [concept_literacy] and [concept_wealth]. #v $technicians$#! have a strong bonus; #v $landlords$#! and #v $investors$#! have a moderate bonus; and #v $farmers$#! have a slight bonus towards becoming #v $engineers$#!." + LANDLORDS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_wealth] can become #v $landlords$#!. Potential increases with greater [concept_wealth] and to a lesser degree [concept_literacy]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time to promote. #v $investors$#!, #v $engineers$#!, #v $farmers$#!, and #v $clergy$#! have some bonus towards becoming #v $landlords$#!." + INVESTORS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_wealth] can become #v $investors$#!. Potential increases with greater [concept_wealth] and to a lesser degree [concept_literacy]. Pops whose [concept_culture] faces [concept_discrimination] take a much longer time to promote. #v $landlords$#!, #v $engineers$#!, #v $professionals$#!, #v $clergy$#! have a bonus towards becoming #v $investors$#!." FARMERS_QUALIFICATIONS_DESC: "Any pop can become #v $farmers$#!. Potential increases with greater [concept_wealth]. #v $landlords$#! have the largest chance of becoming #v $farmers$#!; followed by #v $laborers$#! and #v $informal_workers$#! to a lesser degree." - OFFICERS_QUALIFICATIONS_DESC: "Only #v $servicemembers$#! or pops of [concept_accepted_culture] can become #v $officers$#!. Potential increases with greater [concept_literacy]. $servicemembers$#! have a proclivity towards $EM_DASH$ whilst #v $professionals$#! have a slight chance of $EM_DASH$ becoming #v $officers$#!. #v $officers$#! are less common in nations with an irregular military." - PROFESSIONALS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $professionals$#!. Potential increases with greater [concept_literacy] and [concept_wealth]. #v $creatives$#!, #v $academics$#! show the strongest tendency $EM_DASH$ whilst #v $farmers$#!, #v $officers$#!, #v $administrators$#!, #v $landlords$#!, and #v $investors$#! have some chance of $EM_DASH$ becoming #v $professionals$#!." - SERVICE_WORKERS_QUALIFICATIONS_DESC: "Any pop can become #v $service_workers$#!. Potential increases with greater [concept_literacy]. #v $professionals$#! have the strongly leaning; #v $administrators$#! and #v $informal_workers$#! have some leaning; and #v $creatives$#! have a slight leaning towards becoming #v $service_workers$#!." + OFFICERS_QUALIFICATIONS_DESC: "Only #v $servicemembers$#! or pops of [concept_accepted_culture] can become #v $officers$#!. Potential increases with greater [concept_literacy]. $servicemembers$#! have a bonus towards $EM_DASH$ whilst #v $professionals$#! have a slight chance of $EM_DASH$ becoming #v $officers$#!. #v $officers$#! are less common in nations with an irregular military." + PROFESSIONALS_QUALIFICATIONS_DESC: "Only pops with adequate [concept_literacy] can become #v $professionals$#!. Potential increases with greater [concept_literacy] and [concept_wealth]. #v $creatives$#!, #v $academics$#! show the strongest bonus $EM_DASH$ whilst #v $farmers$#!, #v $officers$#!, #v $administrators$#!, #v $landlords$#!, and #v $investors$#! have some chance of $EM_DASH$ becoming #v $professionals$#!." + SERVICE_WORKERS_QUALIFICATIONS_DESC: "Any pop can become #v $service_workers$#!, but promote more easily when an [concept_accepted_culture]. Potential increases with greater [concept_literacy]. #v $professionals$#! have a strong bonus; #v $administrators$#! and #v $informal_workers$#! have a moderate bonus; and #v $creatives$#! have the strongest bonus towards becoming #v $service_workers$#!." TECHNICIANS_QUALIFICATIONS_DESC: "Pops with minimal [concept_literacy] can become #v $technicians$#!. Potential increases with greater [concept_literacy]. #v $laborers$#! and #v $engineers$#! have a particularly easy time becoming #v $technicians$#!."