Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

error fixes #504

Merged
merged 3 commits into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common/coat_of_arms/coat_of_arms/CBP_countries.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7247,7 +7247,6 @@ HYD = { #Hyderabad

textured_emblem = {
texture = "hyderabad.dds"
color1 = color2
}
}

Expand Down
10 changes: 0 additions & 10 deletions common/country_creation/00_releasable_countries.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2056,16 +2056,6 @@ SAO = {
}
}

BGL = {
states = {
STATE_NORTH_BENGAL
STATE_SOUTH_BENGAL
}
ai_will_do = {
always = no
}
}

NCD = {
provinces = {
x302090 x665AAF x2BEBD1
Expand Down
1 change: 1 addition & 0 deletions common/defines/cwp_defines.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ NDiplomacy = {
}

NPops = {
SLAVE_POP_TYPE = "slum_dwellers" # This is the type of pop that debtors will become
LOYALTIES_GAIN_GRACE_PERIOD = "1948.1.1" # Until this date, only a scaling part of the Radicals and Loyalists gained from SOL changes will be applied

ASSIMILATION_RATE = 0.01 # Percentage of pops who will Assimilate into a different Culture each month, if eligible
Expand Down
9 changes: 0 additions & 9 deletions common/flag_definitions/00_flag_definitions_CWP.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3664,15 +3664,6 @@ PAK = {
}
}

BGL = {
flag_definition = {
coa = BGL
subject_canton = BGL
allow_overlord_canton = no
priority = 1
}
}

NCD = {
flag_definition = {
coa = NCD
Expand Down
47 changes: 47 additions & 0 deletions common/pop_types/cwp_slum_dwellers.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
slum_dwellers = {
#todo add icon
texture = gfx/interface/icons/pops_icons/informal_workers.dds
color = {
138
175
207
}
strata = poor
subsistence_income = yes
can_always_hire = yes
ignores_employment_proportionality = yes
start_quality_of_life = 4
working_adult_ratio = 0.3
wage_weight = 0.2
consumption_mult = 0.1 # The portion of Informal Worker buy packages that are added as state region consumption
dependent_wage = 0.25 # per year
unemployment = no
# 0% - 50% politically engaged
political_engagement_base = 0
political_engagement_literacy_factor = 0.5
#todo add more political engagement factors
political_engagement_mult = {
value = 1
add = {
desc = POP_STARVATION
if = {
limit = {
standard_of_living < 5
}
value = 1
}
}
}
portrait_age = {
integer_range = {
min = define:NPortrait|GRACEFUL_AGING_START
max = define:NPortrait|GRACEFUL_AGING_END
}
}
portrait_pose = {
value = 0
}
portrait_is_female = {
always = yes
}
}
3 changes: 1 addition & 2 deletions common/production_methods/06_urban_center.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1966,15 +1966,14 @@ pm_worker_cooperatives_hospital = {
}

########## Slums ############
#FIXME are we getting rid of slums?
pm_slums_base = {
texture = "gfx/interface/icons/production_method_icons/urban/wooden_buildings.dds"
building_modifiers = {
workforce_scaled = {
building_output_housing_add = 2.5
}
level_scaled = {
building_employment_informal_workers_add = 10000
building_employment_slum_dwellers_add = 10000
}
unscaled = {
building_workforce_shares_add = 1
Expand Down
1 change: 1 addition & 0 deletions common/scripted_triggers/00_clothes_triggers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@ poor_clothes_pop_trigger = {
OR = {
is_pop_type = farmers
is_pop_type = informal_workers
is_pop_type = slum_dwellers
is_pop_type = laborers
is_pop_type = technicians
}
Expand Down
1 change: 1 addition & 0 deletions common/scripted_triggers/00_scripted_triggers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ country_has_voting_franchise = {
modifier:country_technicians_voting_power_add > 0
modifier:country_officers_voting_power_add > 0
modifier:country_informal_workers_voting_power_add > 0
modifier:country_slum_dwellers_voting_power_add > 0
modifier:country_farmers_voting_power_add > 0
modifier:country_servicemembers_voting_power_add > 0
modifier:country_creatives_voting_power_add > 0
Expand Down
18 changes: 18 additions & 0 deletions gui/texticons.gui
Original file line number Diff line number Diff line change
Expand Up @@ -1303,6 +1303,24 @@ texticon = {
}
}

texticon = {
icon = slum_dwellers
iconsize = {
offset = { 0 5 }
texture = "gfx/interface/icons/pops_icons/informal_workers_15.dds"
fontsize = 30
}
}

texticon = {
icon = slum_dwellers
iconsize = {
offset = { 0 50 }
texture = "gfx/interface/icons/pops_icons/informal_workers.dds"
fontsize = 250
}
}

texticon = {
icon = servicemembers
iconsize = {
Expand Down
1 change: 1 addition & 0 deletions localization/english/CWP/CWP_interfaces_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
POP_PROFESSIONALS: "$professionals$ [concept_profession]"
POP_TECHNICIANS: "$technicians$ [concept_profession]"
POP_INFORMAL_WORKERS: "$informal_workers$ [concept_profession]"
POP_SLUM_DWELLERS: "$slum_dwellers$ [concept_profession]"
POP_SERVICE_WORKERS: "$service_workers$ [concept_profession]"
POP_SERVICEMEMBERS: "$servicemembers$ [concept_profession]"
POP_CREATIVES: "$creatives$ [concept_profession]"
Expand Down
32 changes: 25 additions & 7 deletions localization/english/CWP/CWP_modifiers_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
deflation: "Deflation"
investor_confidence: "Investor Confidence"
interest_rates: "Interest Rates"

####################################################
#################### Corruption ####################
####################################################
Expand Down Expand Up @@ -170,6 +170,10 @@
modifier_building_employment_informal_workers_add_desc: "Modifies the amount of $informal_workers$ a building can hire per level"
modifier_building_employment_informal_workers_mult: "$modifier_building_employment_informal_workers_add$"
modifier_building_employment_informal_workers_mult_desc: "$modifier_building_employment_informal_workers_add_desc$"
modifier_building_employment_slum_dwellers_add: "$slum_dwellers$ Per Level"
modifier_building_employment_slum_dwellers_add_desc: "Modifies the amount of $slum_dwellers$ a building can hire per level"
modifier_building_employment_slum_dwellers_mult: "$modifier_building_employment_slum_dwellers_add$"
modifier_building_employment_slum_dwellers_mult_desc: "$modifier_building_employment_slum_dwellers_add_desc$"
modifier_building_employment_investors_add: "$investors$ Per Level"
modifier_building_employment_investors_add_desc: "Modifies the amount of $investors$ a building can hire per level"
modifier_building_employment_investors_mult: "$modifier_building_employment_investors_add$"
Expand Down Expand Up @@ -204,6 +208,8 @@
modifier_building_creatives_mortality_mult_desc: "$modifier_state_creatives_mortality_mult_desc$"
modifier_building_informal_workers_mortality_mult: "$modifier_state_informal_workers_mortality_mult$"
modifier_building_informal_workers_mortality_mult_desc: "$modifier_state_informal_workers_mortality_mult_desc$"
modifier_building_slum_dwellers_mortality_mult: "$modifier_state_slum_dwellers_mortality_mult$"
modifier_building_slum_dwellers_mortality_mult_desc: "$modifier_state_slum_dwellers_mortality_mult_desc$"
modifier_building_investors_mortality_mult: "$modifier_state_investors_mortality_mult$"
modifier_building_investors_mortality_mult_desc: "$modifier_state_investors_mortality_mult_desc$"
modifier_building_landlords_mortality_mult: "$modifier_state_landlords_mortality_mult$"
Expand All @@ -224,6 +230,8 @@
modifier_state_creatives_mortality_mult_desc: "An increase or decrease in the [Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $creatives$"
modifier_state_informal_workers_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $informal_workers$"
modifier_state_informal_workers_mortality_mult_desc: "An increase or decrease in the [Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $informal_workers$"
modifier_state_slum_dwellers_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $slum_dwellers$"
modifier_state_slum_dwellers_mortality_mult_desc: "An increase or decrease in the [Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $slum_dwellers$"
modifier_state_investors_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $investors$"
modifier_state_investors_mortality_mult_desc: "An increase or decrease in the [Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $investors$"
modifier_state_landlords_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $landlords$"
Expand All @@ -246,6 +254,8 @@
modifier_building_creatives_shares_add_desc: "An increase or decrease in an $creatives$ [Concept('concept_ownership_share', '$concept_ownership_shares$')]"
modifier_building_informal_workers_shares_add: "$informal_workers$ [Concept('concept_ownership_share', '$concept_ownership_shares$')]"
modifier_building_informal_workers_shares_add_desc: "An increase or decrease in an $informal_workers$ [Concept('concept_ownership_share', '$concept_ownership_shares$')]"
modifier_building_slum_dwellers_shares_add: "$slum_dwellers$ [Concept('concept_ownership_share', '$concept_ownership_shares$')]"
modifier_building_slum_dwellers_shares_add_desc: "An increase or decrease in an $slum_dwellers$ [Concept('concept_ownership_share', '$concept_ownership_shares$')]"
modifier_building_investors_shares_add: "$investors$ [Concept('concept_ownership_share', '$concept_ownership_shares$')]"
modifier_building_investors_shares_add_desc: "An increase or decrease in an $investors$ [Concept('concept_ownership_share', '$concept_ownership_shares$')]"
modifier_building_landlords_shares_add: "$landlords$ [Concept('concept_ownership_share', '$concept_ownership_shares$')]"
Expand Down Expand Up @@ -274,6 +284,10 @@
modifier_state_informal_workers_investment_pool_contribution_add_desc: "How much of their profits $informal_workers$ will invest"
modifier_state_informal_workers_investment_pool_efficiency_mult: "$informal_workers$ [concept_investment_pool] contribution efficiency"
modifier_state_informal_workers_investment_pool_efficiency_mult_desc: "An increase or decrease to how much the invested profits from $informal_workers$ will contribute to the [concept_investment_pool]"
modifier_state_slum_dwellers_investment_pool_contribution_add: "$slum_dwellers$ [concept_investment_pool] contribution"
modifier_state_slum_dwellers_investment_pool_contribution_add_desc: "How much of their profits $slum_dwellers$ will invest"
modifier_state_slum_dwellers_investment_pool_efficiency_mult: "$slum_dwellers$ [concept_investment_pool] contribution efficiency"
modifier_state_slum_dwellers_investment_pool_efficiency_mult_desc: "An increase or decrease to how much the invested profits from $slum_dwellers$ will contribute to the [concept_investment_pool]"
modifier_state_investors_investment_pool_contribution_add: "$investors$ [concept_investment_pool] contribution"
modifier_state_investors_investment_pool_contribution_add_desc: "How much of their profits $investors$ will invest"
modifier_state_investors_investment_pool_efficiency_mult: "$investors$ [concept_investment_pool] contribution efficiency"
Expand Down Expand Up @@ -316,6 +330,10 @@
modifier_country_informal_workers_pol_str_mult_desc: "An increase or decrease in the [concept_political_strength] of $informal_workers$"
modifier_country_informal_workers_voting_power_add: "[concept_political_strength] from the [concept_votes] of $informal_workers$"
modifier_country_informal_workers_voting_power_add_desc: "An increase or decrease to amount of [concept_political_strength] gained from the [concept_votes] of $informal_workers$ in Elections"
modifier_country_slum_dwellers_pol_str_mult: "[concept_political_strength] of $slum_dwellers$"
modifier_country_slum_dwellers_pol_str_mult_desc: "An increase or decrease in the [concept_political_strength] of $slum_dwellers$"
modifier_country_slum_dwellers_voting_power_add: "[concept_political_strength] from the [concept_votes] of $slum_dwellers$"
modifier_country_slum_dwellers_voting_power_add_desc: "An increase or decrease to amount of [concept_political_strength] gained from the [concept_votes] of $slum_dwellers$ in Elections"
modifier_country_investors_pol_str_mult: "[concept_political_strength] of $investors$"
modifier_country_investors_pol_str_mult_desc: "An increase or decrease in the [concept_political_strength] of $investors$"
modifier_country_investors_voting_power_add: "[concept_political_strength] from the [concept_votes] of $investors$"
Expand Down Expand Up @@ -902,7 +920,7 @@
modifier_building_group_bg_light_industry_technicians_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_light_industry_technicians_mortality_mult$"
modifier_building_group_bg_heavy_industry_technicians_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $technicians$ employed in Heavy Industry"
modifier_building_group_bg_heavy_industry_technicians_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_heavy_industry_technicians_mortality_mult$"

modifier_building_group_bg_heavy_industry_professionals_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $professionals$ employed in Heavy Industry"
modifier_building_group_bg_heavy_industry_professionals_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_heavy_industry_professionals_mortality_mult$"

Expand Down Expand Up @@ -993,7 +1011,7 @@
#Mines - global
modifier_building_group_bg_mining_technicians_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $technicians$ employed in Mines"
modifier_building_group_bg_mining_technicians_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_mining_technicians_mortality_mult$"

modifier_building_group_bg_mining_professionals_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $professionals$ employed in Mines"
modifier_building_group_bg_mining_professionals_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_heavy_industry_professionals_mortality_mult$"

Expand Down Expand Up @@ -1096,7 +1114,7 @@
# Housing
modifier_state_building_housing_max_level_add: "$building_housing$ Max Level"
modifier_state_building_housing_max_level_add_desc: "A bonus or penalty to the maximum level of $building_housing$ buildings."

modifier_building_group_bg_housing_throughput_mult: "$bg_housing$ [concept_throughput]"
modifier_building_group_bg_housing_throughput_mult_desc: "A bonus or penalty to both input and output of $bg_housing$"

Expand All @@ -1122,7 +1140,7 @@
# Infrastructure
modifier_building_group_bg_infrastructure_technicians_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $technicians$ employed in Infrastructure"
modifier_building_group_bg_infrastructure_technicians_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_infrastructure_technicians_mortality_mult$"

modifier_building_group_bg_infrastructure_professionals_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $professionals$ employed in Infrastructure"
modifier_building_group_bg_infrastructure_professionals_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_infrastructure_professionals_mortality_mult$"

Expand Down Expand Up @@ -1318,7 +1336,7 @@

modifier_building_group_bg_fossil_fuels_engineers_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $engineers$ employed in Fossil Fuels"
modifier_building_group_bg_fossil_fuels_engineers_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_fossil_fuels_engineers_mortality_mult$"

modifier_building_group_bg_fossil_fuels_professionals_mortality_mult: "[Concept('concept_pop_growth', '$concept_pop_growth_mortality$')] of $professionals$ employed in Fossil Fuels"
modifier_building_group_bg_fossil_fuels_professionals_mortality_mult_desc: "An increase or decrease in the $modifier_building_group_bg_fossil_fuels_professionals_mortality_mult$"

Expand Down Expand Up @@ -1699,7 +1717,7 @@
warsaw_pact_cohesion: "Warsaw Pact Cohesion"
modifier_corruption: "Corruptible Character"
modifier_honest: "Honest Character"
# Sol
# Sol
offensive_focused_soldiers: "Soldiers trained with focus on being offensive"
defensive_focused_soldiers: "Soldiers trained with focus on being defensive"
mobility_focused_soldiers: "Soldiers trained with focus on being mobile"
Expand Down
5 changes: 5 additions & 0 deletions localization/english/pop_types_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@
servicemembers_no_icon: "Service Members"
servicemembers_only_icon: "@servicemembers!"
servicemembers: "@servicemembers! $servicemembers_no_icon$"

slum_dwellers_desc: "Destitute people who are living in makeshift housing. Politically they are unaligned."
slum_dwellers_no_icon: "Slum Dwellers"
slum_dwellers_only_icon: "@slum_dwellers!"
slum_dwellers: "@slum_dwellers! $slum_dwellers_no_icon$"

technicians_desc: "Technicians, mechanics and other professionals working with machinery. Politically, they tend to be part of the Intelligentsia."
technicians_no_icon: "Technicians"
Expand Down