diff --git a/industry/aegis_gen.py b/industry/aegis_gen.py index 36e59d18..bdba56cc 100644 --- a/industry/aegis_gen.py +++ b/industry/aegis_gen.py @@ -177,7 +177,7 @@ def main(): try: validate(economy) except AssertionError: - print(f"Economy: {meta_economy.name}") + print(f"Economy: {meta_economy.translation_name}") for k, v in variation.items(): print(f"{k}: {v}") raise diff --git a/industry/economies/vanilla_subarctic.py b/industry/economies/vanilla_subarctic.py index ae695c22..98fecc92 100644 --- a/industry/economies/vanilla_subarctic.py +++ b/industry/economies/vanilla_subarctic.py @@ -119,15 +119,12 @@ def get_economy(self, parameters): elif parameters["WORKFORCE"] == "YETI_TIRED": ret.graph[worker_yard] = WorkerYard(workers, boosters=(goods, gold, tired_workers)) - if parameters["WORKER_PARTICIPATION"] == "NONE": + # FIXME: remove PRESET; support SECONDARY + if parameters["WORKER_PARTICIPATION"] in ("PRESET", "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 + if parameters["WORKFORCE"] == "YETI_TIRED": + ret.graph[coal_mine].produces += (tired_workers,) + if parameters["WORKER_PARTICIPATION"] in ("PRIMARY_INDUSTRY", "SECONDARY_INDUSTRY", "BOTH"): 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":