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.

Sign up for GitHub

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

fix: inconsistency in farm ownership pms #410

Merged
merged 3 commits into from
Jul 11, 2023
Merged

fix: inconsistency in farm ownership pms #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeae2b7
fix: inconsistency in farm ownership pms
DZappala Jul 9, 2023
267ff13
Merge branch 'dev' into pm-errors
DZappala Jul 9, 2023
a1c1213
Merge branch 'dev' into pm-errors
DZappala Jul 11, 2023
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
3 changes: 3 additions & 0 deletions common/production_methods/02_agro.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,9 @@ pm_worker_cooperatives_farm = {
texture = "gfx/interface/icons/production_method_icons/worker_cooperative.dds"
disallowing_laws = {
law_total_nationalization
law_heavy_industry_nationalization
law_military_industry_nationalization
law_resource_extraction_nationalization
}
unlocking_laws = {
law_socialization
Expand Down
27 changes: 15 additions & 12 deletions common/production_methods/12_subsistence.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,43 +366,46 @@ pm_smallholder_owner_building_subsistence = {
}
}

pm_worker_cooperatives_building_subsistence = {
texture = "gfx/interface/icons/production_method_icons/worker_cooperative.dds"
pm_government_run_building_subsistence = {
texture = "gfx/interface/icons/production_method_icons/government_run.dds"
disallowing_laws = {
law_total_nationalization
law_no_nationalization
law_public_utility_companies
law_heavy_industry_nationalization
law_military_industry_nationalization
law_resource_extraction_nationalization
}
unlocking_laws = {
law_socialization
law_interventionism
}
building_modifiers = {
level_scaled = {
building_employment_informal_workers_add = 300
building_employment_administrators_add = 200
}
unscaled = {
building_workforce_shares_add = 1
building_government_shares_add = 1
}
}
}

pm_government_run_building_subsistence = {
texture = "gfx/interface/icons/production_method_icons/government_run.dds"
pm_worker_cooperatives_building_subsistence = {
texture = "gfx/interface/icons/production_method_icons/worker_cooperative.dds"
disallowing_laws = {
law_no_nationalization
law_public_utility_companies
law_total_nationalization
law_heavy_industry_nationalization
law_military_industry_nationalization
law_resource_extraction_nationalization
}
unlocking_laws = {
law_socialization
law_interventionism
}
building_modifiers = {
level_scaled = {
building_employment_administrators_add = 200
building_employment_informal_workers_add = 300
}
unscaled = {
building_government_shares_add = 1
building_workforce_shares_add = 1
}
}
}
Expand Down