(Aegis) pass test

ahyangyi · Nov 18, 2023 · 37121b8 · 37121b8
1 parent e19f39a
commit 37121b8
Showing 1 changed file with 10 additions and 4 deletions.
diff --git 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":