diff --git a/agrf/split_action/meta_sprite_mixin.py b/agrf/split_action/meta_sprite_mixin.py index 586dbd02..f7ea1ccf 100644 --- a/agrf/split_action/meta_sprite_mixin.py +++ b/agrf/split_action/meta_sprite_mixin.py @@ -60,7 +60,7 @@ def dynamic_definitions(self, all_choices, parameters, i=0): var_id = all_choices[i] sublists = [] hashes = [] - for choice in range(len(self._parameter_list.parameters[var_id].enum)): + for choice in self._parameter_list.parameters[var_id].enum.keys(): parameters[var_id] = choice sublist, h = self.dynamic_definitions(all_choices, parameters, i + 1) sublists.append(sublist) diff --git a/industry/aegis_gen.py b/industry/aegis_gen.py index 6486a846..36e59d18 100644 --- a/industry/aegis_gen.py +++ b/industry/aegis_gen.py @@ -28,18 +28,54 @@ def initialize_metadata(): for industry in all_industries: industry._props["exists"] = SplitDefinition( - ("ECONOMY", "POLICY", "PRIMARY_INDUSTRY_GROWTH", "WORKFORCE", "SEA_INDUSTRY", "TOWN_GOODS"), {} + ( + "ECONOMY", + "POLICY", + "PRIMARY_INDUSTRY_GROWTH", + "WORKFORCE", + "WORKER_PARTICIPATION", + "SEA_INDUSTRY", + "TOWN_GOODS", + ), + {}, ) industry._props["production_types"] = SplitDefinition( - ("ECONOMY", "POLICY", "PRIMARY_INDUSTRY_GROWTH", "WORKFORCE", "SEA_INDUSTRY", "TOWN_GOODS"), {} + ( + "ECONOMY", + "POLICY", + "PRIMARY_INDUSTRY_GROWTH", + "WORKFORCE", + "WORKER_PARTICIPATION", + "SEA_INDUSTRY", + "TOWN_GOODS", + ), + {}, ) industry._props["acceptance_types"] = SplitDefinition( - ("ECONOMY", "POLICY", "PRIMARY_INDUSTRY_GROWTH", "WORKFORCE", "SEA_INDUSTRY", "TOWN_GOODS"), {} + ( + "ECONOMY", + "POLICY", + "PRIMARY_INDUSTRY_GROWTH", + "WORKFORCE", + "WORKER_PARTICIPATION", + "SEA_INDUSTRY", + "TOWN_GOODS", + ), + {}, ) for cargo in all_cargos: cargo._props["exists"] = SplitDefinition( - ("ECONOMY", "POLICY", "PRIMARY_INDUSTRY_GROWTH", "WORKFORCE", "SEA_INDUSTRY", "TOWN_GOODS"), {} + ( + "ECONOMY", + "POLICY", + "PRIMARY_INDUSTRY_GROWTH", + "WORKFORCE", + "WORKER_PARTICIPATION", + "SEA_INDUSTRY", + "TOWN_GOODS", + ), + {}, ) for i, meta_economy in enumerate(all_economies): @@ -55,7 +91,15 @@ def initialize_metadata(): 4: "BASIC_ARCTIC", }[i], ) + tuple( - variation[i] for i in ("POLICY", "PRIMARY_INDUSTRY_GROWTH", "WORKFORCE", "SEA_INDUSTRY", "TOWN_GOODS") + variation[i] + for i in ( + "POLICY", + "PRIMARY_INDUSTRY_GROWTH", + "WORKFORCE", + "WORKER_PARTICIPATION", + "SEA_INDUSTRY", + "TOWN_GOODS", + ) ) for industry in all_industries: if industry in economy.industries: diff --git a/industry/lib/parameters.py b/industry/lib/parameters.py index 51e5091e..58482397 100644 --- a/industry/lib/parameters.py +++ b/industry/lib/parameters.py @@ -242,6 +242,7 @@ ], ) docs_parameter_choices.update_params("WORKFORCE", ["ABSTRACT", "PROFESSIONAL", "YETI"]) +docs_parameter_choices.update_params("WORKER_PARTICIPATION", ["NONE", "PRIMARY_INDUSTRY", "SECONDARY_INDUSTRY"]) docs_parameter_choices.update_params("SEA_INDUSTRY", ["ORGANIC"]) docs_parameter_choices.update_params("TOWN_GOODS", ["ORGANIC"]) @@ -251,6 +252,7 @@ "POLICY": "AUTARKY", "PRIMARY_INDUSTRY_GROWTH": "NONE", "WORKFORCE": "ABSTRACT", + "WORKER_PARTICIPATION": "NONE", "SEA_INDUSTRY": "ORGANIC", "TOWN_GOODS": "ORGANIC", }, @@ -258,6 +260,7 @@ "POLICY": "FREE_TRADE", "PRIMARY_INDUSTRY_GROWTH": "GENERIC_SUPPLIES", "WORKFORCE": "ABSTRACT", + "WORKER_PARTICIPATION": "NONE", "SEA_INDUSTRY": "ORGANIC", "TOWN_GOODS": "ORGANIC", }, @@ -265,6 +268,7 @@ "POLICY": "AUTARKY", "PRIMARY_INDUSTRY_GROWTH": "UNIVERSAL_SUPPLIES", "WORKFORCE": "YETI", + "WORKER_PARTICIPATION": "PRIMARY_INDUSTRY", "SEA_INDUSTRY": "ORGANIC", "TOWN_GOODS": "ORGANIC", }, @@ -272,6 +276,7 @@ "POLICY": "EXPORT", "PRIMARY_INDUSTRY_GROWTH": "GENERIC_SUPPLIES", "WORKFORCE": "ABSTRACT", + "WORKER_PARTICIPATION": "SECONDARY_INDUSTRY", "SEA_INDUSTRY": "ORGANIC", "TOWN_GOODS": "ORGANIC", }, @@ -279,6 +284,7 @@ "POLICY": "AUTARKY", "PRIMARY_INDUSTRY_GROWTH": "GENERIC_SUPPLIES", "WORKFORCE": "ABSTRACT", + "WORKER_PARTICIPATION": "SECONDARY_INDUSTRY", "SEA_INDUSTRY": "ORGANIC", "TOWN_GOODS": "ORGANIC", },