From 37121b8e9b609f50bb6c0d17d23c73c78ed145bb Mon Sep 17 00:00:00 2001 From: "Yi Yang @ Anteros" Date: Sat, 18 Nov 2023 21:35:15 +0800 Subject: [PATCH] (Aegis) pass test --- industry/economies/vanilla_subarctic.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/industry/economies/vanilla_subarctic.py b/industry/economies/vanilla_subarctic.py index a684eb17..ae695c22 100644 --- a/industry/economies/vanilla_subarctic.py +++ b/industry/economies/vanilla_subarctic.py @@ -108,7 +108,7 @@ def get_economy(self, parameters): ret.graph[printing_works].produces += (engineering_supplies,) ret.graph[oil_refinery].produces += (farm_supplies,) - if parameters["WORKFORCE"].startswith("YETI") and parameters["WORKER_PARTICIPATION"] != "NONE": + if parameters["WORKFORCE"].startswith("YETI"): ret.graph[worker_yard] = WorkerYard(workers, boosters=(goods, gold)) if parameters["WORKFORCE"] == "YETI": ret.graph[worker_yard] = WorkerYard(workers, boosters=(goods, gold)) @@ -119,9 +119,15 @@ def get_economy(self, parameters): elif parameters["WORKFORCE"] == "YETI_TIRED": ret.graph[worker_yard] = WorkerYard(workers, boosters=(goods, gold, tired_workers)) - # FIXME - ret.graph[coal_mine].boosters = workers - if parameters["WORKER_PARTICIPATION"] == "PRIMARY_INDUSTRY": + if parameters["WORKER_PARTICIPATION"] == "NONE": + ret.graph[coal_mine].boosters = workers + elif parameters["WORKER_PARTICIPATION"] == "PRIMARY_INDUSTRY": + for i in [coal_mine, oil_wells, gold_mine, farm, forest]: + ret.graph[i] = ret.graph[i].to_secondary(workers) + if parameters["WORKFORCE"] == "YETI_TIRED": + ret.graph[i].produces += (tired_workers,) + elif parameters["WORKER_PARTICIPATION"] == "SECONDARY_INDUSTRY": + # FIXME for i in [coal_mine, oil_wells, gold_mine, farm, forest]: ret.graph[i] = ret.graph[i].to_secondary(workers) if parameters["WORKFORCE"] == "YETI_TIRED":