diff --git a/industry/economies/firs_temperate.py b/industry/economies/firs_temperate.py index ed7053b4..d80b5ff4 100644 --- a/industry/economies/firs_temperate.py +++ b/industry/economies/firs_temperate.py @@ -73,7 +73,7 @@ def get_economy(self, parameters): fishing_grounds: PrimaryIndustry(fish), dairy_farm: PrimaryIndustry((milk, livestock)), orchard_and_piggery: PrimaryIndustry((fruit, livestock)), - chemical_plant: PrimaryIndustry(chemicals), # FIXME + chemical_plant: PrimaryIndustry(chemicals), steel_mill: SecondaryIndustry((coal, iron_ore, scrap_metal), steel), dairy: SecondaryIndustry(milk, food), glass_works: SecondaryIndustry((sand, chemicals), goods), diff --git a/industry/economies/vanilla_subarctic.py b/industry/economies/vanilla_subarctic.py index 902f0422..d2db5763 100644 --- a/industry/economies/vanilla_subarctic.py +++ b/industry/economies/vanilla_subarctic.py @@ -82,7 +82,10 @@ def get_economy(self, parameters): ret.graph[farm].boosters = engineering_supplies ret.graph[forest].boosters = engineering_supplies - ret.graph[printing_works].produces += (engineering_supplies,) + if parameters["POLICY"] in ("SELF_SUFFICIENT", "FREE_TRADE", "EXPORT"): + ret.graph[port].produces += (engineering_supplies,) + else: + ret.graph[printing_works].produces += (engineering_supplies,) elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES": ret.graph[coal_mine].boosters = engineering_supplies ret.graph[oil_wells].boosters = engineering_supplies @@ -90,8 +93,14 @@ def get_economy(self, parameters): ret.graph[farm].boosters = farm_supplies ret.graph[forest].boosters = farm_supplies - ret.graph[printing_works].produces += (engineering_supplies,) - ret.graph[oil_refinery].produces += (farm_supplies,) + if parameters["POLICY"] in ("SELF_SUFFICIENT", "FREE_TRADE", "EXPORT"): + ret.graph[port].produces += ( + engineering_supplies, + farm_supplies, + ) + else: + ret.graph[printing_works].produces += (engineering_supplies,) + ret.graph[oil_refinery].produces += (farm_supplies,) elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES_PASSENGERS": ret.graph[coal_mine].boosters = engineering_supplies ret.graph[oil_wells].boosters = passengers @@ -99,8 +108,14 @@ def get_economy(self, parameters): ret.graph[farm].boosters = farm_supplies ret.graph[forest].boosters = farm_supplies - ret.graph[printing_works].produces += (engineering_supplies,) - ret.graph[oil_refinery].produces += (farm_supplies,) + if parameters["POLICY"] in ("SELF_SUFFICIENT", "FREE_TRADE", "EXPORT"): + ret.graph[port].produces += ( + engineering_supplies, + farm_supplies, + ) + else: + ret.graph[printing_works].produces += (engineering_supplies,) + ret.graph[oil_refinery].produces += (farm_supplies,) self.default_worker_support( ret, diff --git a/industry/economies/vanilla_subtropical.py b/industry/economies/vanilla_subtropical.py index 27ae23dd..6c97f878 100644 --- a/industry/economies/vanilla_subtropical.py +++ b/industry/economies/vanilla_subtropical.py @@ -80,7 +80,10 @@ def get_economy(self, parameters): ret.graph[farm].boosters = engineering_supplies ret.graph[lumber_mill].boosters = engineering_supplies - ret.graph[factory].produces += (engineering_supplies,) + if parameters["POLICY"] in ("SELF_SUFFICIENT", "FREE_TRADE", "EXPORT"): + ret.graph[port].produces += (engineering_supplies,) + else: + ret.graph[factory].produces += (engineering_supplies,) elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES": ret.graph[diamond_mine].boosters = engineering_supplies ret.graph[oil_wells].boosters = engineering_supplies @@ -88,8 +91,11 @@ def get_economy(self, parameters): ret.graph[farm].boosters = farm_supplies ret.graph[lumber_mill].boosters = farm_supplies - ret.graph[factory].produces += (engineering_supplies,) - ret.graph[oil_refinery].produces += (farm_supplies,) + if parameters["POLICY"] in ("SELF_SUFFICIENT", "FREE_TRADE", "EXPORT"): + ret.graph[port].produces += (engineering_supplies, farm_supplies) + else: + ret.graph[factory].produces += (engineering_supplies,) + ret.graph[oil_refinery].produces += (farm_supplies,) self.default_worker_support( ret, diff --git a/industry/economies/vanilla_temperate.py b/industry/economies/vanilla_temperate.py index 146232f6..1812c8cb 100644 --- a/industry/economies/vanilla_temperate.py +++ b/industry/economies/vanilla_temperate.py @@ -86,7 +86,10 @@ def get_economy(self, parameters): ret.graph[farm].boosters = engineering_supplies ret.graph[forest].boosters = engineering_supplies - ret.graph[factory].produces += (engineering_supplies,) + if parameters["POLICY"] in ("SELF_SUFFICIENT", "FREE_TRADE", "EXPORT"): + ret.graph[port].produces += (engineering_supplies,) + else: + ret.graph[factory].produces += (engineering_supplies,) elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES": ret.graph[coal_mine].boosters = engineering_supplies ret.graph[oil_wells].boosters = engineering_supplies @@ -95,8 +98,11 @@ def get_economy(self, parameters): ret.graph[farm].boosters = farm_supplies ret.graph[forest].boosters = farm_supplies - ret.graph[factory].produces += (engineering_supplies,) - ret.graph[oil_refinery].produces += (farm_supplies,) + if parameters["POLICY"] in ("SELF_SUFFICIENT", "FREE_TRADE", "EXPORT"): + ret.graph[port].produces += (engineering_supplies, farm_supplies) + else: + ret.graph[factory].produces += (engineering_supplies,) + ret.graph[oil_refinery].produces += (farm_supplies,) self.default_worker_support( ret,